diff options
| author |   Alex Alexander <wired@gentoo.org> | 2010-10-07 23:08:03 +0000 |
|---|---|---|
| committer | Alex Alexander <wired@gentoo.org> | 2010-10-07 23:08:03 +0000 |
| commit | ede1ff36796238e99fafcf4dd92980aab06ec276 (patch) | |
| tree | 447929d021c47afe1ebc8bc1cdc4e54fc5535af6 /app-doc | |
| parent | rm (diff) | |
| download | historical-ede1ff36796238e99fafcf4dd92980aab06ec276.tar.gz historical-ede1ff36796238e99fafcf4dd92980aab06ec276.tar.bz2 historical-ede1ff36796238e99fafcf4dd92980aab06ec276.zip | |
only call eqmake4 if use qt4, bug #340092
Package-Manager: portage-2.2_rc89/cvs/Linux x86_64
Diffstat (limited to 'app-doc')
| -rw-r--r-- | app-doc/doxygen/ChangeLog | 5 | ||||
| -rw-r--r-- | app-doc/doxygen/Manifest | 24 | ||||
| -rw-r--r-- | app-doc/doxygen/doxygen-1.5.8-r1.ebuild | 11 |
3 files changed, 31 insertions, 9 deletions
diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog index f8ff9a957548..c075d3e2f52d 100644 --- a/app-doc/doxygen/ChangeLog +++ b/app-doc/doxygen/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-doc/doxygen # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.181 2010/10/04 06:10:38 nerdboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.182 2010/10/07 23:08:03 wired Exp $ + + 07 Oct 2010; Alex Alexander <wired@gentoo.org> doxygen-1.5.8-r1.ebuild: + only call eqmake4 if use qt4, bug #340092 04 Oct 2010; Steve Arnold <nerdboy@gentoo.org> doxygen-1.5.8-r1.ebuild: Needed additional updates to pick up the qt4 qmake config correctly. diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest index 39902ceca6d8..23d6c411247c 100644 --- a/app-doc/doxygen/Manifest +++ b/app-doc/doxygen/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX 1.4.7/01_all_cp1251.patch 683 RMD160 732924265c1ae02cb1d66ad8857e5969f2285751 SHA1 9dbaffced9b125258529fd8290c1aa33ad76f99f SHA256 782c207692ff691936d010f5c8e25858722e29a9a23ee940305aeb38f2b23e8e AUX 1.4.7/05_all_system-libpng.patch 5329 RMD160 b02366ba5a19688a0fc68a76ebb8fc8593a22ab8 SHA1 68daa798034b9b813e5548319c0d91cc60ebffec SHA256 53caccaa6f3934abc57e8cf06d7828bfe94f6faf1be1cac0db4a729f9cd76dc9 AUX 1.4.7/06_all_qtools.patch 1230 RMD160 fa564bb88910b8eb4e0a2b38afdac6b44312e4f2 SHA1 4a0ed54a4eaee1786c9179c8a7011a31de3c96cf SHA256 1f2f25cada1c000f74f5b23a90358353462deeaf5a060f9d3923fab4497b72b2 @@ -33,11 +36,28 @@ EBUILD doxygen-1.5.4.ebuild 4529 RMD160 31458ab58660ca639375d1976eafa3fde39db6b6 EBUILD doxygen-1.5.5.ebuild 4499 RMD160 ee0464c5b924f1895bde7b956526d78dd50e86dc SHA1 8e6f528aed0369a6214689916f1497ed01b40456 SHA256 fe0b01e91433a9cc4afb45aad725fbd9a9f4ffaaa3a422b9571409407f43e088 EBUILD doxygen-1.5.6.ebuild 4499 RMD160 470b6034a63d4bdebd48443b063e6565ba926b01 SHA1 943482558e93d3dd6de145532c95f2e203eca6e3 SHA256 01028754cf1a7be1e012e3df8ba3d433e48d63aa7e54b5323764fd0aa090ec21 EBUILD doxygen-1.5.7.1.ebuild 4726 RMD160 bdd542705abb6c260fd29f6c02f0664979d1c8af SHA1 97513e9b35b7fd410754b587c418a1b5102cf86e SHA256 d8f68d435453a9a34cdfd29044ba999cfdd2f09dee293d9d05f7676a56506850 -EBUILD doxygen-1.5.8-r1.ebuild 5427 RMD160 8e00f51035bc64146849cc453c9700c3fa64dbfa SHA1 efb0de47e4658b13d639c00fbd06bf92a2436ad4 SHA256 39d509b3a80ba3f63c47c916d5d539680acc548a81d653431ad57f6f06dffb1c +EBUILD doxygen-1.5.8-r1.ebuild 5429 RMD160 5225f7083f5b4ead905b6b2c7fad8a3c85867199 SHA1 990bc64d91cee5c5d07a7fd68c763a0aaf56929e SHA256 89300f0eb2f71c69b64b0396d1716dfa1f0bd8fd007f17939566e40c2aad371a EBUILD doxygen-1.5.9.ebuild 5144 RMD160 d244e60be9c36417a3e769c67b194176b5dee9dd SHA1 4e12937fd29dda8d660cf9bef4dd3791828f77bd SHA256 bdfe3f87de8d0024022fe0d89384bd3eee1f7aea3a53d384e7c439c6a535f883 EBUILD doxygen-1.6.1.ebuild 5327 RMD160 5cae97bf462e0ca2bb58ad9cabf6893a688be2c0 SHA1 71d307fce65e0d39ac8d728513ab3e60944b4c8d SHA256 bfc366a15795bafbf70b25385eeb8fa96039bfcbe4adf6f8716b0ce04961bcc0 EBUILD doxygen-1.6.2.ebuild 5146 RMD160 30e58447ad9b12b69893eec1c2a31e6cafb01719 SHA1 57f17659d5d902a005f647d991206084ebcd4c1f SHA256 af0c0b5216a59ce9aaa0978bfc11a900e84b401839c619f3222c81397978f610 EBUILD doxygen-1.6.3.ebuild 5153 RMD160 96721b42675af763276f72298215d201e2daf072 SHA1 635cb35dfd0c4211d7ae9baab8ccba6247915535 SHA256 c4371ceabf44d69fccb34066f662a5e6a3723d3e4efbf25820709d7ffbd577ec EBUILD doxygen-1.7.1.ebuild 5249 RMD160 60f6f651029c9410d4cc5019eac12c78ca3b2a2e SHA1 ac8c7ae7aeb053945fbf40b6522ab214edc35dc3 SHA256 afad9f53aca6de69123d7ab108594d39cc913a151682903850a94c8b10d9c343 -MISC ChangeLog 30815 RMD160 dbccd24eb841a1fc2c3f26ab56afa8683d3d87fb SHA1 0bf295dd05d2862afe820ad338aa0a6be4dfb53a SHA256 a9eb0540626febc1c639d26a785c29ec0cceb82649e699cc3a929d9c5105db45 +MISC ChangeLog 30932 RMD160 97a5e86a98d348b831ccd151d7b05af695d6a1c1 SHA1 2790ce21d99eb9019ab1f946663db8973b7c5ba3 SHA256 72a7019e2a0a70b9bd8fd750893fb3a53aca461916e260c006e556242a9acddb MISC metadata.xml 740 RMD160 288a23989773f251e7acccaf77ae390ca2376c3a SHA1 8fc5f720b18d2952fd0519fd73e3dcb66aa94ee4 SHA256 90abffce7a6f2d24635ea2cf3cb7e64c9374304d9f9daacf5f963e0d8bfcb4f8 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.12 (GNU/Linux) + +iQIcBAEBCAAGBQJMrlPWAAoJEDZF8K7rm0r6TQUQAIlYKFONcyYOzUenfOflG9Cy +jON3q5v1UTjhhEMjEqN3tHkEY46ZyLv6XeViYXZeFqDzc4fNgv2ijyTiwFBPyvaD +VHSIICsUfZj0RD9WVJ0pidOaSk6r7KpdoTV70EgLqIzy4YSY4DqBqi8er4e2TkEV +KbrFq8FIONfYUUJogALE0HDcN/yx1gHKLswTl6y9QmPEvIOW8B5qwtLtieiCC5Hg +4oJriP/5ZFlzIipLOuvaT+0T55WuxLqXKoQOeWYy41cwGtBoSBo7tXLsLg1IoFq3 +BBrGE6SOVnX6CJCATWLQZ3wu+GAbN62guMPNujusk9d/PPlNB2SlU2QIombyrqWk +4Yrq1c3kef/GZ847u01WB9yRiWvy9sBGqQGvp3EufzfFg709z6cn5NBLaKPYdCn0 +4hjAOm7D0AmpyvKg9jIo1WDaOWP/Tc4SFabGgzbDjx37x9RWyuZovl442HJIx+f6 +cOg1TXym3hQkZeWWrZFvZyaf3QiO7hwEK5PF2EN0w1oso54hZvUh9cbvDoXq4SBn +fUVlh3R0lY036fRiZqykn+Cv5nE6BlrOBPD0idSpe09Yup6VBqmkDwTq3yBckgrV +tKyad/Nxi2Tor8wkZIqCPReTR9eUR8qXCF26goqZXw0mt8Ko1L0mhH3RutuW6wS5 +Re/eok1rf2PNvp+P6Znl +=don9 +-----END PGP SIGNATURE----- diff --git a/app-doc/doxygen/doxygen-1.5.8-r1.ebuild b/app-doc/doxygen/doxygen-1.5.8-r1.ebuild index fa53f8a892fd..038da13be091 100644 --- a/app-doc/doxygen/doxygen-1.5.8-r1.ebuild +++ b/app-doc/doxygen/doxygen-1.5.8-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.8-r1.ebuild,v 1.9 2010/10/04 06:10:38 nerdboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.8-r1.ebuild,v 1.10 2010/10/07 23:08:03 wired Exp $ EAPI=2 @@ -98,14 +98,13 @@ src_configure() { export LD_LIBRARY_PATH="${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}" ./configure ${my_conf} $(use_with qt4 doxywizard) \ || die 'configure with qt4 failed' + # this appears to work as a fix for the final ignoring LDFLAGS issue... + pushd "${S}"/addon/doxywizard + eqmake4 "CONFIG+=nostrip" doxywizard.pro -o Makefile.doxywizard + popd else ./configure ${my_conf} || die 'configure failed' fi - - # this appears to work as a fix for the final ignoring LDFLAGS issue... - pushd "${S}"/addon/doxywizard - eqmake4 "CONFIG+=nostrip" doxywizard.pro -o Makefile.doxywizard - popd } src_compile() { |