diff options
| author |   Steve Arnold <nerdboy@gentoo.org> | 2011-03-20 01:39:54 +0000 |
|---|---|---|
| committer | Steve Arnold <nerdboy@gentoo.org> | 2011-03-20 01:39:54 +0000 |
| commit | fd97f9a8bc4a8dd210970db558e1c2d66d824a0b (patch) | |
| tree | abb956b5c4704b252531029dde24d9aeb80be9cd /app-doc | |
| parent | Adding eselect-postgresql-1.0.3.ebuild. Rewrite of module. Should fix bugs (diff) | |
| download | historical-fd97f9a8bc4a8dd210970db558e1c2d66d824a0b.tar.gz historical-fd97f9a8bc4a8dd210970db558e1c2d66d824a0b.tar.bz2 historical-fd97f9a8bc4a8dd210970db558e1c2d66d824a0b.zip | |
Added final kluge to force local LDFLAGS on doxywizard.
Package-Manager: portage-2.1.9.43/cvs/Linux x86_64
Diffstat (limited to 'app-doc')
| -rw-r--r-- | app-doc/doxygen/ChangeLog | 6 | ||||
| -rw-r--r-- | app-doc/doxygen/Manifest | 14 | ||||
| -rw-r--r-- | app-doc/doxygen/doxygen-1.7.3.ebuild | 12 |
3 files changed, 17 insertions, 15 deletions
diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog index 44bc5c397856..353ccf28555b 100644 --- a/app-doc/doxygen/ChangeLog +++ b/app-doc/doxygen/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-doc/doxygen # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.197 2011/03/19 19:56:26 tomka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.198 2011/03/20 01:39:54 nerdboy Exp $ + + 20 Mar 2011; Steve Arnold <nerdboy@gentoo.org> doxygen-1.7.3.ebuild: + Added final kluge to force local LDFLAGS on doxywizard. Tested on amd64 + but not yet marked stable. 19 Mar 2011; Thomas Kahle <tomka@gentoo.org> doxygen-1.7.3.ebuild: x86 stable per bug 356813 diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest index 0484c12a3803..0027467e49c5 100644 --- a/app-doc/doxygen/Manifest +++ b/app-doc/doxygen/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - 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 @@ -41,13 +38,6 @@ EBUILD doxygen-1.6.2.ebuild 5146 RMD160 30e58447ad9b12b69893eec1c2a31e6cafb01719 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 EBUILD doxygen-1.7.2.ebuild 5554 RMD160 4998e8d3fad9060e16a9562564a06c02a434e23b SHA1 138a9ad80e18255e2a49096d247a67c993eaf9b1 SHA256 d7168596217bc6f470c1d684035a352e5f33c3ae341b08f4475abd8158f79fe1 -EBUILD doxygen-1.7.3.ebuild 5558 RMD160 bca3efb11a4411880669e7c7b6d8c411e07814ed SHA1 0afb7a6af6f38a09b4f3237585f4186a8059065f SHA256 9e8eb3ec9d7872725582364667be52c309328daaa4e5fd31e7c180bbd59f34bc -MISC ChangeLog 33086 RMD160 1bcb501c8da1c05c97d90d54402653ed91c9b09e SHA1 a04e0e74785522ea777d409737aa79fb92a67a80 SHA256 e20d6421a99507822e49ede904cc41e9efaced7c6a65909fc95beba7af4df146 +EBUILD doxygen-1.7.3.ebuild 5804 RMD160 2a7ce6d879b8cdf1f223dcd09854392cccba3643 SHA1 95f9241f9bf117a40b07aeafad3b19abd9d2f688 SHA256 d3d48a9ab8f499385e85e14c3333bfeead76daec76563f4beceb6cd5d31c80ea +MISC ChangeLog 33264 RMD160 ae7640e94dabb210b6791a69539c440498f6017a SHA1 61a0140e95e8b42ad1765f8c1cf0d7ead57eec42 SHA256 2de4aa1f144bc6ba2eb77051ae0ab9d522a2dc0c3b64ea59310985d3841dcfc0 MISC metadata.xml 831 RMD160 1a40ce1c3afecb14f2706c413b0d4a4fea3bb55f SHA1 258d06797a0b59edab6716e9ead66bb7df6b0e6e SHA256 802686f997f166ad02f46f8abc382dace5b23bac8db51c5f4a963afa3f75a6e2 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iEYEARECAAYFAk2FDfsACgkQnZsgo/h8kNbRcACglfdHLXdntZM1TR84e/IpaDCw -rvcAniEbKPCAumc+Dq0Ky+VZ/UEnpz/p -=tUjD ------END PGP SIGNATURE----- diff --git a/app-doc/doxygen/doxygen-1.7.3.ebuild b/app-doc/doxygen/doxygen-1.7.3.ebuild index c6cea9f024ac..1ff2aad4a0ee 100644 --- a/app-doc/doxygen/doxygen-1.7.3.ebuild +++ b/app-doc/doxygen/doxygen-1.7.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.7.3.ebuild,v 1.2 2011/03/19 19:56:26 tomka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.7.3.ebuild,v 1.3 2011/03/20 01:39:54 nerdboy Exp $ EAPI=3 @@ -38,7 +38,7 @@ src_prepare() { sed -i.orig -e 's:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= $(ECFLAGS):' \ -e 's:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= $(ECXXFLAGS):' \ -e 's:^\(TMAKE_LFLAGS_RELEASE\s*\)=.*$:\1= $(ELDFLAGS):' \ - tmake/lib/{{linux,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++}/tmake.conf \ + tmake/lib/{{linux,gnu,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++,linux-64}/tmake.conf \ || die "sed 1 failed" # Ensure we link to -liconv @@ -107,6 +107,14 @@ src_compile() { CFLAGS+="${ECFLAGS}" CXXFLAGS+="${ECXXFLAGS}" LFLAGS+="${ELDFLAGS}" \ emake all || die 'emake failed' + # force stupid qmake to use LDFLAGS - yes, it's a big kluge... + if use qt4 ; then + rm -f bin/doxywizard + sed -i -e "s|\-Wl,\-O1 |\-Wl,\-O1 ${ELDFLAGS} |" \ + addon/doxywizard/Makefile.doxywizard + make -C addon/doxywizard + fi + # generate html and pdf (if tetex in use) documents. # errors here are not considered fatal, hence the ewarn message # TeX's font caching in /var/cache/fonts causes sandbox warnings, |