| 1 |
commit: 697f3bfe5db06f0d251ac88dd4f67e92b1373b6c |
| 2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 28 03:57:04 2016 +0000 |
| 4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 28 03:57:04 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=697f3bfe |
| 7 |
|
| 8 |
app-doc/doxygen: bump to 1.8.11, fix lingua support (bug #566510), EAPI 5, qt5 |
| 9 |
|
| 10 |
- Version bump to newly released 1.8.11. |
| 11 |
|
| 12 |
- Change EAPI to 5. |
| 13 |
|
| 14 |
- Switch Qt support (for doxywizard) to Qt5. |
| 15 |
|
| 16 |
- Fix LINGUAS support |
| 17 |
|
| 18 |
- Update live ebuild |
| 19 |
|
| 20 |
Gentoo-Bugs: 566510 |
| 21 |
|
| 22 |
Package-Manager: portage-2.2.26 |
| 23 |
|
| 24 |
app-doc/doxygen/Manifest | 1 + |
| 25 |
.../{doxygen-9999.ebuild => doxygen-1.8.11.ebuild} | 21 +++++++------- |
| 26 |
app-doc/doxygen/doxygen-9999.ebuild | 20 +++++++------- |
| 27 |
.../files/doxygen-1.8.11-link_with_pthread.patch | 32 ++++++++++++++++++++++ |
| 28 |
4 files changed, 54 insertions(+), 20 deletions(-) |
| 29 |
|
| 30 |
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest |
| 31 |
index c193ff5..0216bc8 100644 |
| 32 |
--- a/app-doc/doxygen/Manifest |
| 33 |
+++ b/app-doc/doxygen/Manifest |
| 34 |
@@ -1,2 +1,3 @@ |
| 35 |
DIST doxygen-1.8.10.src.tar.gz 4818276 SHA256 cedf78f6d213226464784ecb999b54515c97eab8a2f9b82514292f837cf88b93 SHA512 a7f29b5f7b9f55b7e5382b7b7dc7212247a27869bc265433c0ee51480645b3f5f0732d1f5aefd54952204c8a1c98b96ec1ecc22c1ff7a072db5b2356b5981074 WHIRLPOOL 5607e1da5cf8e653ec895a7601a3a6585790a555207928bde6d154ab06173c68e088a61c1963da8d8cdc1a571b66eeaa102acc2a2e4291e0be87634d8e554962 |
| 36 |
+DIST doxygen-1.8.11.src.tar.gz 4834291 SHA256 65d08b46e48bd97186aef562dc366681045b119e00f83c5b61d05d37ea154049 SHA512 44f3f9d2715c4cfe628b988809a6264681c43634dfa830f604b6cc853fa6679eca112cc9c01cee5b019f7f01f0a0acdf4f7d3aaec0848783399d17904caf1a3e WHIRLPOOL 240c84bd02ea3ab747e59bb8db434e40e743ed24cbb8ca78b8846d3bb4f7672497106fd620c14851c06d80e474301811978def5d85db5b01df97b40a4ec74813 |
| 37 |
DIST doxywizard.png 4231 SHA256 eb648ebd3a194a56d9ed6e47cc8dbf1af2e124d83c2c42af9bf86bd837984209 SHA512 5e2d26e7427b86866ebe75ec2c66c0f1100d230f3f3e4d66bac424a8dd0d42f0831d936ff03318dfa1bf73cbd9fb53717636d0c91ae3eea0f4e24641479d25d5 WHIRLPOOL bb0c13b382c4069ca310ff53a03b36499a2bf6e0e8c0647efc032530f429f483b5d6f2925b7e996d4f84c8f2b77eb883533f4b7abc88745a2cfa596d3dd4f3fb |
| 38 |
|
| 39 |
diff --git a/app-doc/doxygen/doxygen-9999.ebuild b/app-doc/doxygen/doxygen-1.8.11.ebuild |
| 40 |
similarity index 90% |
| 41 |
copy from app-doc/doxygen/doxygen-9999.ebuild |
| 42 |
copy to app-doc/doxygen/doxygen-1.8.11.ebuild |
| 43 |
index 22f3267..fefba30 100644 |
| 44 |
--- a/app-doc/doxygen/doxygen-9999.ebuild |
| 45 |
+++ b/app-doc/doxygen/doxygen-1.8.11.ebuild |
| 46 |
@@ -5,16 +5,15 @@ |
| 47 |
EAPI=5 |
| 48 |
PYTHON_COMPAT=( python{2_7,3_3,3_4} ) |
| 49 |
|
| 50 |
-inherit cmake-utils eutils fdo-mime flag-o-matic python-any-r1 qt4-r2 |
| 51 |
+inherit cmake-utils eutils fdo-mime flag-o-matic python-any-r1 |
| 52 |
if [[ ${PV} = *9999* ]]; then |
| 53 |
inherit git-r3 |
| 54 |
EGIT_REPO_URI="git://github.com/doxygen/doxygen.git" |
| 55 |
SRC_URI="" |
| 56 |
- KEYWORDS="" |
| 57 |
+ KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86" |
| 58 |
else |
| 59 |
- SRC_URI="https://github.com/doxygen/doxygen/archive/Release_${PV//\./_}.tar.gz -> ${P}.tar.gz" |
| 60 |
+ SRC_URI="http://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz" |
| 61 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" |
| 62 |
- S="${WORKDIR}/${PN}-Release_${PV//\./_}" |
| 63 |
fi |
| 64 |
SRC_URI+=" https://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png" |
| 65 |
|
| 66 |
@@ -23,7 +22,7 @@ HOMEPAGE="http://www.doxygen.org/" |
| 67 |
|
| 68 |
LICENSE="GPL-2" |
| 69 |
SLOT="0" |
| 70 |
-IUSE="clang debug doc dot doxysearch latex qt4 sqlite userland_GNU" |
| 71 |
+IUSE="clang debug doc dot doxysearch latex qt5 sqlite userland_GNU" |
| 72 |
|
| 73 |
#missing SerbianCyrilic, JapaneseEn, KoreanEn, Chinesetraditional |
| 74 |
LANGS=(hy ar pt_BR ca zh cs de da eo es fa fi fr el hr hu id it ja ko lt mk |
| 75 |
@@ -43,7 +42,10 @@ RDEPEND="app-text/ghostscript-gpl |
| 76 |
) |
| 77 |
doxysearch? ( =dev-libs/xapian-1.2* ) |
| 78 |
latex? ( app-text/texlive[extra] ) |
| 79 |
- qt4? ( dev-qt/qtgui:4 ) |
| 80 |
+ qt5? ( |
| 81 |
+ dev-qt/qtgui:5 |
| 82 |
+ dev-qt/qtwidgets:5 |
| 83 |
+ ) |
| 84 |
sqlite? ( dev-db/sqlite:3 ) |
| 85 |
" |
| 86 |
|
| 87 |
@@ -83,7 +85,7 @@ get_langs() { |
| 88 |
my_linguas+=(${lingua}) |
| 89 |
fi |
| 90 |
done |
| 91 |
- f_langs="${my_linguas[@]}" |
| 92 |
+ f_langs="${my_linguas[@]^^}" |
| 93 |
echo ${f_langs// /;} |
| 94 |
} |
| 95 |
|
| 96 |
@@ -102,7 +104,6 @@ src_prepare() { |
| 97 |
# Call dot with -Teps instead of -Tps for EPS generation - bug #282150 |
| 98 |
sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die |
| 99 |
|
| 100 |
- # prefix search tools patch, plus OSX fixes |
| 101 |
epatch "${FILESDIR}"/${PN}-1.8.9.1-empty-line-sigsegv.patch #454348 |
| 102 |
|
| 103 |
epatch "${FILESDIR}"/${P}-link_with_pthread.patch |
| 104 |
@@ -129,7 +130,7 @@ src_configure() { |
| 105 |
$(cmake-utils_use clang use_libclang) |
| 106 |
$(cmake-utils_use doc build_doc) |
| 107 |
$(cmake-utils_use doxysearch build_search) |
| 108 |
- $(cmake-utils_use qt4 build_wizard) |
| 109 |
+ $(cmake-utils_use qt5 build_wizard) |
| 110 |
$(cmake-utils_use sqlite use_sqlite3) |
| 111 |
) |
| 112 |
|
| 113 |
@@ -153,7 +154,7 @@ src_compile() { |
| 114 |
} |
| 115 |
|
| 116 |
src_install() { |
| 117 |
- if use qt4; then |
| 118 |
+ if use qt5; then |
| 119 |
doicon "${DISTDIR}/doxywizard.png" |
| 120 |
make_desktop_entry doxywizard "DoxyWizard ${PV}" \ |
| 121 |
"/usr/share/pixmaps/doxywizard.png" \ |
| 122 |
|
| 123 |
diff --git a/app-doc/doxygen/doxygen-9999.ebuild b/app-doc/doxygen/doxygen-9999.ebuild |
| 124 |
index 22f3267..6be87bc 100644 |
| 125 |
--- a/app-doc/doxygen/doxygen-9999.ebuild |
| 126 |
+++ b/app-doc/doxygen/doxygen-9999.ebuild |
| 127 |
@@ -5,7 +5,7 @@ |
| 128 |
EAPI=5 |
| 129 |
PYTHON_COMPAT=( python{2_7,3_3,3_4} ) |
| 130 |
|
| 131 |
-inherit cmake-utils eutils fdo-mime flag-o-matic python-any-r1 qt4-r2 |
| 132 |
+inherit cmake-utils eutils fdo-mime flag-o-matic python-any-r1 |
| 133 |
if [[ ${PV} = *9999* ]]; then |
| 134 |
inherit git-r3 |
| 135 |
EGIT_REPO_URI="git://github.com/doxygen/doxygen.git" |
| 136 |
@@ -23,7 +23,7 @@ HOMEPAGE="http://www.doxygen.org/" |
| 137 |
|
| 138 |
LICENSE="GPL-2" |
| 139 |
SLOT="0" |
| 140 |
-IUSE="clang debug doc dot doxysearch latex qt4 sqlite userland_GNU" |
| 141 |
+IUSE="clang debug doc dot doxysearch latex qt5 sqlite userland_GNU" |
| 142 |
|
| 143 |
#missing SerbianCyrilic, JapaneseEn, KoreanEn, Chinesetraditional |
| 144 |
LANGS=(hy ar pt_BR ca zh cs de da eo es fa fi fr el hr hu id it ja ko lt mk |
| 145 |
@@ -43,7 +43,10 @@ RDEPEND="app-text/ghostscript-gpl |
| 146 |
) |
| 147 |
doxysearch? ( =dev-libs/xapian-1.2* ) |
| 148 |
latex? ( app-text/texlive[extra] ) |
| 149 |
- qt4? ( dev-qt/qtgui:4 ) |
| 150 |
+ qt5? ( |
| 151 |
+ dev-qt/qtgui:5 |
| 152 |
+ dev-qt/qtwidgets:5 |
| 153 |
+ ) |
| 154 |
sqlite? ( dev-db/sqlite:3 ) |
| 155 |
" |
| 156 |
|
| 157 |
@@ -83,7 +86,7 @@ get_langs() { |
| 158 |
my_linguas+=(${lingua}) |
| 159 |
fi |
| 160 |
done |
| 161 |
- f_langs="${my_linguas[@]}" |
| 162 |
+ f_langs="${my_linguas[@]^^}" |
| 163 |
echo ${f_langs// /;} |
| 164 |
} |
| 165 |
|
| 166 |
@@ -102,10 +105,7 @@ src_prepare() { |
| 167 |
# Call dot with -Teps instead of -Tps for EPS generation - bug #282150 |
| 168 |
sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die |
| 169 |
|
| 170 |
- # prefix search tools patch, plus OSX fixes |
| 171 |
- epatch "${FILESDIR}"/${PN}-1.8.9.1-empty-line-sigsegv.patch #454348 |
| 172 |
- |
| 173 |
- epatch "${FILESDIR}"/${P}-link_with_pthread.patch |
| 174 |
+ epatch "${FILESDIR}"/${PN}-1.8.11-link_with_pthread.patch |
| 175 |
|
| 176 |
# fix pdf doc |
| 177 |
sed -i.orig -e "s:g_kowal:g kowal:" \ |
| 178 |
@@ -129,7 +129,7 @@ src_configure() { |
| 179 |
$(cmake-utils_use clang use_libclang) |
| 180 |
$(cmake-utils_use doc build_doc) |
| 181 |
$(cmake-utils_use doxysearch build_search) |
| 182 |
- $(cmake-utils_use qt4 build_wizard) |
| 183 |
+ $(cmake-utils_use qt5 build_wizard) |
| 184 |
$(cmake-utils_use sqlite use_sqlite3) |
| 185 |
) |
| 186 |
|
| 187 |
@@ -153,7 +153,7 @@ src_compile() { |
| 188 |
} |
| 189 |
|
| 190 |
src_install() { |
| 191 |
- if use qt4; then |
| 192 |
+ if use qt5; then |
| 193 |
doicon "${DISTDIR}/doxywizard.png" |
| 194 |
make_desktop_entry doxywizard "DoxyWizard ${PV}" \ |
| 195 |
"/usr/share/pixmaps/doxywizard.png" \ |
| 196 |
|
| 197 |
diff --git a/app-doc/doxygen/files/doxygen-1.8.11-link_with_pthread.patch b/app-doc/doxygen/files/doxygen-1.8.11-link_with_pthread.patch |
| 198 |
new file mode 100644 |
| 199 |
index 0000000..cdc630c |
| 200 |
--- /dev/null |
| 201 |
+++ b/app-doc/doxygen/files/doxygen-1.8.11-link_with_pthread.patch |
| 202 |
@@ -0,0 +1,32 @@ |
| 203 |
+diff --git a/addon/doxysearch/CMakeLists.txt b/addon/doxysearch/CMakeLists.txt |
| 204 |
+index 33e01c1..165fc3e 100644 |
| 205 |
+--- a/addon/doxysearch/CMakeLists.txt |
| 206 |
++++ b/addon/doxysearch/CMakeLists.txt |
| 207 |
+@@ -20,6 +20,7 @@ target_link_libraries(doxyindexer |
| 208 |
+ ${ZLIB_LIBRARIES} |
| 209 |
+ ${WIN_EXTRA_LIBS} |
| 210 |
+ qtools |
| 211 |
++ pthread |
| 212 |
+ ) |
| 213 |
+ |
| 214 |
+ add_executable(doxysearch.cgi |
| 215 |
+@@ -29,6 +30,7 @@ target_link_libraries(doxysearch.cgi |
| 216 |
+ ${XAPIAN_LIBRARIES} |
| 217 |
+ ${ZLIB_LIBRARIES} |
| 218 |
+ ${WIN_EXTRA_LIBS} |
| 219 |
++ pthread |
| 220 |
+ ) |
| 221 |
+ |
| 222 |
+ install(TARGETS doxyindexer doxysearch.cgi DESTINATION bin) |
| 223 |
+diff --git a/addon/doxywizard/CMakeLists.txt b/addon/doxywizard/CMakeLists.txt |
| 224 |
+index bf2eda8..8eb2a1c 100644 |
| 225 |
+--- a/addon/doxywizard/CMakeLists.txt |
| 226 |
++++ b/addon/doxywizard/CMakeLists.txt |
| 227 |
+@@ -109,6 +109,7 @@ ${doxywizard_RESOURCES_RCC} |
| 228 |
+ qt_use_modules(doxywizard Core Gui Widgets Xml) |
| 229 |
+ target_link_libraries(doxywizard |
| 230 |
+ ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} |
| 231 |
++pthread |
| 232 |
+ ) |
| 233 |
+ |
| 234 |
+ install(TARGETS doxywizard DESTINATION bin) |
Archives
