ohnobinki_overlay Changeset - 071bf3597f1d

Changeset - 071bf3597f1d

Parent rev.

Child rev.

[Not reviewed]

default

13 4 0

Nathan Brink (binki) - 16 years ago 2010-02-22 20:55:45
ohnobinki@ohnopublishing.net

Make sure that eqmake4 is run by the ebuild so that doxygen's Makefiles don't get to call qmake directly. Remove old doxygen versions and patches.
(Portage version: 2.2_rc62-r4/hg/Linux x86_64)
(Unsigned Manifest commit)

17 files changed with 32 insertions and 1087 deletions:

app-doc/doxygen/Manifest

app-doc/doxygen/doxygen-1.4.7.ebuild

119

app-doc/doxygen/doxygen-1.5.4.ebuild

154

app-doc/doxygen/doxygen-1.5.5.ebuild

154

app-doc/doxygen/doxygen-1.5.6.ebuild

154

app-doc/doxygen/doxygen-1.5.7.1.ebuild

161

app-doc/doxygen/doxygen-1.5.8-r1.ebuild

app-doc/doxygen/doxygen-1.5.9.ebuild

app-doc/doxygen/doxygen-1.6.1.ebuild

app-doc/doxygen/files/1.4.7/01_all_cp1251.patch

app-doc/doxygen/files/1.4.7/05_all_system-libpng.patch

124

app-doc/doxygen/files/1.4.7/06_all_qtools.patch

app-doc/doxygen/files/doxygen-1.4.3-cp1251.patch

app-doc/doxygen/files/doxygen-1.4.3-nls.patch

app-doc/doxygen/files/doxygen-1.4.4-darwin.patch

app-doc/doxygen/files/doxygen-1.5-qtlibdir.patch

app-doc/doxygen/files/doxygen-1.5.7.1-substitute.patch

0 comments (0 inline, 0 general)

app-doc/doxygen/Manifest

➞

Show inline comments

 -----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
 AUX bsd-configure.patch 504 RMD160 4d3321c677bbfcae2c25c7937ef015ff41812594 SHA1 df68c4be15c41b02c822364b5f54214ce65b3fc0 SHA256 8aa47622750701cd492b35e8037b3b8a5ed1c13e564d0a0081a09877717b9cf1
 AUX doxygen-1.4.3-cp1251.patch 683 RMD160 732924265c1ae02cb1d66ad8857e5969f2285751 SHA1 9dbaffced9b125258529fd8290c1aa33ad76f99f SHA256 782c207692ff691936d010f5c8e25858722e29a9a23ee940305aeb38f2b23e8e
 AUX doxygen-1.4.3-nls.patch 1019 RMD160 e8899cc8c20ee501c57106c065926624c28669a1 SHA1 086b81341bd81e6b589356896ed9379663226496 SHA256 44a603217bb38844bdb7ed13396fd3bfd96e36763952354c10e706dab788e5c7
 AUX doxygen-1.4.4-darwin.patch 536 RMD160 367a923f0ddda5f52487896d86301aaef7328ddb SHA1 230823cec84a2ea7bc0986f1f22f52856a522848 SHA256 a7a0ff21dbff292e389d7c5a6ce26b7059ea8bf3aebc2187a78b88afc3f49b41
 AUX doxygen-1.5-dot-eps.patch 2247 RMD160 b34b332df8b6769f73613ba11f98b3c5bdee40c6 SHA1 ab5c78d0599661e82a9ac1f4bf0117318e54712e SHA256 6dc47978298a39bc520a1f48206be26f76657842f14aba3413768352c7e87d45
 AUX doxygen-1.5-legacy-patches.diff 7242 RMD160 0100a2305101b392764eaf867a32e0d14dcf9208 SHA1 bb564532f157e72436e0c8ecbbed163d96db3674 SHA256 f696c10fe571d281ed8178e7a07864c7a5bba9cc21ac723ee9669ac32e43e114
 AUX doxygen-1.5-qtlibdir.patch 354 RMD160 9c9491d89379f1e68e57722be438ce6af80110cd SHA1 7a26ec0fdc2dd22f97c1fd2acad21188137c71b2 SHA256 602038066a93ffd163c7f18b15362a9f2443bb7e842675d7de81bf5026ca9c2e
 AUX doxygen-1.5-system-libpng.patch 5332 RMD160 cfa7709a0f867609cf149407d19df2ecf53af750 SHA1 9b0547b64fd9b15406a72b18fe19673f784c50f9 SHA256 5800013e75e3fdb4a6dbc513a25393ec9cef0dfa412032c1c3de562829ddaeab
 AUX doxygen-1.5.6-prefix-misc-alt.patch 2017 RMD160 fba979abf6b0db3c32a1a9509c0a98d7e452a86f SHA1 3bb95cd36289a46d7ba221319421c82e5433e60e SHA256 ee4b8c11c8af9bc3dfb365eff06addf3d7ec73931a234ac3651be2ba28ad3b44
 AUX doxygen-1.5.7.1-substitute.patch 656 RMD160 3730347b9fba4ceef96b6852c164ca4c9037c250 SHA1 e470ee8ede9293cda8ef00d059ca338c725e8523 SHA256 204f140187865c9eb5ca76a421cf1271dfb696858269477468bd605070bd41fd
 AUX doxygen-1.5.8-kdedocs.patch 854 RMD160 945e07ab7f5f168d63f5a99423a56d9b12477df8 SHA1 5e987c64b95500441a668fd4912db32714de495d SHA256 48703fc843633e774e05c64e6903badfd74f456f7099399d44b3150f9b964e6c
 AUX doxygen-gcc4.patch 267 RMD160 f96f301331db451247fc1fb061f35e173ec1cff8 SHA1 ac7ed139251d87876e67b3e5ce04652b3ac27795 SHA256 df914a5303499c5293c0fcec3e126260157a15bbdc605040d4161ef9599fa2ce
 AUX doxywizard.png 4231 RMD160 b194049b42aad3466a5ef9c69ff3504536223dae SHA1 0902260c7169e60a504b29feec419b3a4183081f SHA256 eb648ebd3a194a56d9ed6e47cc8dbf1af2e124d83c2c42af9bf86bd837984209
 DIST doxygen-1.4.7-utf8-ru.patch.gz 14755 RMD160 8d83de95c416a352caa101277874caa1f68347f1 SHA1 ad1d388686b9cd9f330bc5091f15ccc485c8d614 SHA256 a4293ad1687c911ec6074677292172897bdec386f142c9af4b2f0726b91f2069
 DIST doxygen-1.4.7.src.tar.gz 2928354 RMD160 4de02b866cef53a7fd6f54e0ba90111814a9d77a SHA1 42a33d676fbd471165d02f531bfe98f433ecb432 SHA256 5db0e9ddf6fe74273096419d53d3835e9f1822581f20f5f20c057500a5e512ed
 DIST doxygen-1.5.4.src.tar.gz 3762535 RMD160 263e2287da4fbe91a429dc53fe3569b150c76fdf SHA1 1a815f7de6b412f7852d57dec9eb50f7c4b03268 SHA256 12e6a2166b8c78a991d4ceef1dd9042117b24b76e20ccfdfdfc30bc4a7e31df2
 DIST doxygen-1.5.5.src.tar.gz 4010148 RMD160 212ef3eca6a43c33189b11d3ab400f5b2069b019 SHA1 16b555f5d191cc0f854ae9856c49e4823a51c595 SHA256 b09aebefe212e414282a07301e81316726d5f9b79c0b848474e08bcf346c444a
 DIST doxygen-1.5.6.src.tar.gz 4011956 RMD160 94c0d1fe325fa6c9f4a86e2a68e7516dccc4108b SHA1 a478176b9183aef299418e655d6e38b8f8f4e4a5 SHA256 6f5d9ab77a21c7b0e6ebd1524ffa498cc2738ef9a1d8a2ed355117efb3685588
 DIST doxygen-1.5.7.1.src.tar.gz 4096168 RMD160 f9614bb076d6531334a212a95dfbb862a7502c69 SHA1 aecb0c453f76e900eb2aa8132ad063215005fca3 SHA256 7ce9cf96731121aa22365d2aef3dde841a3c4622d4d70282398438275ad26d29
 DIST doxygen-1.5.8.src.tar.gz 4125837 RMD160 e392cd00960c4036661c8cda3ec6bc6ee3fe300c SHA1 a55b1c41417be8acb3ac5e1553a711ffa437cba2 SHA256 01540aaf7e929e7784e3392331f2c915480acb174a16e8652855d90965f44ff8
 DIST doxygen-1.5.9.src.tar.gz 4141375 RMD160 51d79c0f8846f47e9aa8c37cd0eb9db630491885 SHA1 6211b850bdaa2198e35546e4299a27774c957ece SHA256 89c3d1102e9e5c63ff735dee88b595bc986fbb2b5944b28ba5f91d31adf8958e
 DIST doxygen-1.6.1.src.tar.gz 3902407 RMD160 0a9c5962dbd076bac418b85b72a4874576c9da4d SHA1 31f861841eba1ebdded1b4bf70bdecb42441dafd SHA256 4c5aedf052a14a0f7fe8c126140ff1c5c50887c74814a4804181c61625d539d3
 EBUILD doxygen-1.4.7.ebuild 3704 RMD160 2eb5f033e3c74151a47810ff891da56f6496c540 SHA1 0391691e76518782caeb2cb65da588dc5dc3d5b0 SHA256 ca8f96af859e6edf280819f3f022051688a3606a78fc0fa6e73e7856c7579306
 EBUILD doxygen-1.5.4.ebuild 4529 RMD160 31458ab58660ca639375d1976eafa3fde39db6b6 SHA1 a7aa62f3a45baeb832b6e915f7c2a85f59674b57 SHA256 0778d0f7905e75ad14ce09a88c0af12fd75ae7524b7fb8381a2b345dd35df127
 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 5365 RMD160 c7e343b90603436a1650197307a7d1f8f80b2137 SHA1 2b878c6baf31fb3ea0c1b5a8699d3551e844ec9a SHA256 f26e333750ba0da6bd4840597f1a7d1f7d80aebb29d7195c3447e3b68fce59be
 EBUILD doxygen-1.5.9.ebuild 5144 RMD160 d244e60be9c36417a3e769c67b194176b5dee9dd SHA1 4e12937fd29dda8d660cf9bef4dd3791828f77bd SHA256 bdfe3f87de8d0024022fe0d89384bd3eee1f7aea3a53d384e7c439c6a535f883
 EBUILD doxygen-1.6.1.ebuild 5338 RMD160 57de63321a37fe5edda3b65cfb7e9fc42fd9cfdc SHA1 4288ce22c04c099ab4f33ddaa854f0caa3c07c25 SHA256 6a9ceab95df22430b405ac12e12be8bf0c89098ee513eb36395ae59c1a1572f9
 EBUILD doxygen-1.5.8-r1.ebuild 5595 RMD160 27f83c683eccbe835d0639e3d72f9382c175270c SHA1 c0346fdc2ed0f609a901b77794de063960f54c53 SHA256 97db981432bd0c0432a11ccc272f0b51913869d1ebc73a4e99da1d0e16fdf375
 EBUILD doxygen-1.5.9.ebuild 5393 RMD160 3b0fcfb62e47acc69a88012c572096aaf7d8a01e SHA1 699126289a600197b6c0768f06979c9afdcd7c01 SHA256 a4893be42a65463170f70d0275ed54db72a056dfc61a50171dfdbc0f395a4a4d
 EBUILD doxygen-1.6.1.ebuild 5587 RMD160 96c5af4fffd4300f699f653b1516d5085b5e84b9 SHA1 7f6537e8f73100f4337d916c614f2f450b3cdcc1 SHA256 6702116e1ad87e711f2e2d863aa702d5a6cf2a0261f17b71509134d0874e0b5d
 MISC ChangeLog 29688 RMD160 adbad11a188df92f9471a8c9527072cc465454fa SHA1 d20de9c622aaf40fc946da7f4408ddcbffc20ce0 SHA256 88aeea7349c3daf2012b5e22c513974a085ef59ef3a1679e939356d5427200f5
 MISC metadata.xml 740 RMD160 288a23989773f251e7acccaf77ae390ca2376c3a SHA1 8fc5f720b18d2952fd0519fd73e3dcb66aa94ee4 SHA256 90abffce7a6f2d24635ea2cf3cb7e64c9374304d9f9daacf5f963e0d8bfcb4f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 iEUEARECAAYFAktwZG4ACgkQOypDUo0oQOrEQgCYi3sOxqXNWgaxZ91oip8KvVfi
 QCgwaQerzAWmW53Kt6S33K3dfM/M4o=
 =Vu47
 -----END PGP SIGNATURE-----

app-doc/doxygen/doxygen-1.4.7.ebuild

➞

Show inline comments

deleted file

app-doc/doxygen/doxygen-1.5.4.ebuild

➞

Show inline comments

deleted file

app-doc/doxygen/doxygen-1.5.5.ebuild

➞

Show inline comments

deleted file

app-doc/doxygen/doxygen-1.5.6.ebuild

➞

Show inline comments

deleted file

app-doc/doxygen/doxygen-1.5.7.1.ebuild

➞

Show inline comments

deleted file

app-doc/doxygen/doxygen-1.5.8-r1.ebuild

➞

Show inline comments

 # Copyright 1999-2009 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.6 2009/12/26 17:24:39 pva Exp $
-EAPI=1
+EAPI=2
 inherit eutils flag-o-matic toolchain-funcs qt4 fdo-mime
 DESCRIPTION="documentation system for C++, C, Java, Objective-C, Python, IDL, and other languages"
 HOMEPAGE="http://www.doxygen.org/"
 SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz"
@@ @@ -31,16 +31,13 @@ RDEPEND="qt4? ( x11-libs/qt-gui:4 ) @@
 DEPEND=">=sys-apps/sed-4
 	sys-devel/flex
 	${RDEPEND}"
 EPATCH_SUFFIX="patch"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 src_prepare() {
 	# use CFLAGS, CXXFLAGS, LDFLAGS
 	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 \
 		|| die "sed failed"
@@ @@ -74,13 +71,13 @@ src_unpack() { @@
 		elog "Continuing with -O2 instead ..."
 		echo
 		replace-flags "-O3" "-O2"
 	fi
+}
-src_compile() {
+src_configure() {
 	export ECFLAGS="${CFLAGS}" ECXXFLAGS="${CXXFLAGS}" ELDFLAGS="${LDFLAGS}"
 	# set ./configure options (prefix, Qt based wizard, docdir)
 	local my_conf=""
 	if use debug; then
 		my_conf="--prefix /usr --debug"
@@ @@ -103,13 +100,22 @@ src_compile() { @@
 		./configure ${my_conf} $(use_with qt4 doxywizard) \
 		|| die 'configure with qt4 failed'
 	else
 		./configure ${my_conf} || die 'configure failed'
 	fi
 	# and compile
 	if use qt4; then
 		# prevent generated Makefiles from trying to run qmake themselves
 		# by running it ourselves. This feels slightly hacky ;-) --ohnobinki
 		pushd addon/doxywizard || die
 		eqmake4 doxywizard.pro -o Makefile.doxywizard
 		popd
 	fi
+}
 src_compile() {
 	emake all || die 'emake failed'
 	# 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,
 	# so we allow it.

app-doc/doxygen/doxygen-1.5.9.ebuild

➞

Show inline comments

@@ @@ -96,12 +96,20 @@ src_configure() { @@
 		einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'."
 		./configure ${my_conf} $(use_with qt4 doxywizard) \
 		|| die 'configure with qt4 failed'
 	else
 		./configure ${my_conf} || die 'configure failed'
 	fi
 	if use qt4; then
 		# prevent generated Makefiles from trying to run qmake themselves
 		# by running it ourselves. This feels slightly hacky ;-) --ohnobinki
 		pushd addon/doxywizard || die
 		eqmake4 doxywizard.pro -o Makefile.doxywizard
 		popd
 	fi
+}
 src_compile() {
 	emake all || die 'emake failed'
 	# generate html and pdf (if tetex in use) documents.

app-doc/doxygen/doxygen-1.6.1.ebuild

➞

Show inline comments

@@ @@ -92,12 +92,20 @@ src_configure() { @@
 		einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'."
 		./configure --prefix "${EPREFIX}/usr" ${my_conf} $(use_with qt4 doxywizard) \
 		|| die 'configure with qt4 failed'
 	else
 		./configure --prefix "${EPREFIX}/usr" ${my_conf} || die 'configure failed'
 	fi
 	if use qt4; then
 		# prevent generated Makefiles from trying to run qmake themselves
 		# by running it ourselves. This feels slightly hacky ;-) --ohnobinki
 		pushd addon/doxywizard || die
 		eqmake4 doxywizard.pro -o Makefile.doxywizard
 		popd
 	fi
+}
 src_compile() {
 	emake all || die 'emake failed'
 	# generate html and pdf (if tetex in use) documents.

app-doc/doxygen/files/1.4.7/01_all_cp1251.patch

➞

Show inline comments

deleted file

app-doc/doxygen/files/1.4.7/05_all_system-libpng.patch

➞

Show inline comments

deleted file

app-doc/doxygen/files/1.4.7/06_all_qtools.patch

➞

Show inline comments

deleted file

app-doc/doxygen/files/doxygen-1.4.3-cp1251.patch

➞

Show inline comments

deleted file

app-doc/doxygen/files/doxygen-1.4.3-nls.patch

➞

Show inline comments

deleted file

app-doc/doxygen/files/doxygen-1.4.4-darwin.patch

➞

Show inline comments

deleted file

app-doc/doxygen/files/doxygen-1.5-qtlibdir.patch

➞

Show inline comments

deleted file

app-doc/doxygen/files/doxygen-1.5.7.1-substitute.patch

➞

Show inline comments

deleted file

0 comments (0 inline, 0 general)