Ported to qt4-r2 eclass + switched to EAPI="2" for 1.5.9

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 29 insertions, 14 deletions

diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog
index e537b07b17db..27e773012070 100644
--- a/app-doc/doxygen/ChangeLog
+++ b/app-doc/doxygen/ChangeLog
@@ -1,6 +1,10 @@
 # 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.172 2010/01/02 22:22:09 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.173 2010/01/17 16:31:11 ayoy Exp $
+
+  17 Jan 2010; Dominik Kapusta <ayoy@gentoo.org> doxygen-1.5.9.ebuild,
+  doxygen-1.6.1.ebuild:
+  Ported to qt4-r2 eclass + switched to EAPI="2" for 1.5.9
 
   02 Jan 2010; Ben de Groot <yngwin@gentoo.org> doxygen-1.4.7.ebuild,
   doxygen-1.5.4.ebuild, doxygen-1.5.5.ebuild, doxygen-1.5.6.ebuild,
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 0bbc1df44e4f..9dea6313957c 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1,3 +1,6 @@
+-----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
@@ -28,7 +31,14 @@ EBUILD doxygen-1.5.5.ebuild 4499 RMD160 ee0464c5b924f1895bde7b956526d78dd50e86dc
 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 5134 RMD160 c879376a2fdb798e50bc78ba9564b7c6fa88809c SHA1 6f9e6a91a64f7b62c4c247d23a20200a4050eb6a SHA256 6b50555d0ef1266849f45526e59f9dd4f0343cafdb466de48aee3ab80dc8ca64
-EBUILD doxygen-1.6.1.ebuild 5119 RMD160 0f2be4dfab53bccd8372c417ad8a3050991013c9 SHA1 4f33d92e8e53956ff442a656326e8e568579d3cd SHA256 8ae76a81712198f6d8d4b30a75e0d7f7fe919348e4c7d79c54915afbac9d3d7e
-MISC ChangeLog 29365 RMD160 0686a01ab61e796def70676f18043ebcf90e4561 SHA1 91f02ec5b75c6fe36e93bde7bccc867914604fa6 SHA256 35b316762f47b079696d3fcb6c016f5720654960488b4e134d3d322b43120c55
+EBUILD doxygen-1.5.9.ebuild 5144 RMD160 d244e60be9c36417a3e769c67b194176b5dee9dd SHA1 4e12937fd29dda8d660cf9bef4dd3791828f77bd SHA256 bdfe3f87de8d0024022fe0d89384bd3eee1f7aea3a53d384e7c439c6a535f883
+EBUILD doxygen-1.6.1.ebuild 5123 RMD160 1a33c017abcb168727c5c49014c30f82e37f91a1 SHA1 e90d1e198b9fdefc88d477e46ed9894119045d36 SHA256 fced10c5ca06b1fd0984a3494bf06781391132a02f0dae070405d3c8db46ecc7
+MISC ChangeLog 29518 RMD160 a930a4ff157f75179bdafb157cf31150168f25f5 SHA1 fe2c547e7eb235132abb45da60337f6935b609f2 SHA256 5c7c275edb50dd49a0330ee8e33275105a5f08380827959b1ebc5c03b18662b5
 MISC metadata.xml 740 RMD160 288a23989773f251e7acccaf77ae390ca2376c3a SHA1 8fc5f720b18d2952fd0519fd73e3dcb66aa94ee4 SHA256 90abffce7a6f2d24635ea2cf3cb7e64c9374304d9f9daacf5f963e0d8bfcb4f8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAktTO1kACgkQ+CZEqwt+F6ad5wCdEjjquyJER2R3l26XxjFo/1gn
+4GcAn1rMzoSqTvARwsJco0KqbnZope3v
+=BSiK
+-----END PGP SIGNATURE-----
diff --git a/app-doc/doxygen/doxygen-1.5.9.ebuild b/app-doc/doxygen/doxygen-1.5.9.ebuild
index 1be52144510b..56ac8f3af629 100644
--- a/app-doc/doxygen/doxygen-1.5.9.ebuild
+++ b/app-doc/doxygen/doxygen-1.5.9.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.9.ebuild,v 1.3 2009/12/26 17:24:39 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.9.ebuild,v 1.4 2010/01/17 16:31:11 ayoy Exp $
 
-EAPI=1
+EAPI=2
 
-inherit eutils flag-o-matic toolchain-funcs qt4 fdo-mime
+inherit eutils flag-o-matic toolchain-funcs qt4-r2 fdo-mime
 
 DESCRIPTION="documentation system for C++, C, Java, Objective-C, Python, IDL, and other languages"
 HOMEPAGE="http://www.doxygen.org/"
@@ -34,7 +34,7 @@ DEPEND=">=sys-apps/sed-4
 
 EPATCH_SUFFIX="patch"
 
-src_unpack() {
+src_prepare() {
 	unpack ${A}
 	cd "${S}"
 
@@ -71,7 +71,7 @@ src_unpack() {
 	fi
 }
 
-src_compile() {
+src_configure() {
 	export ECFLAGS="${CFLAGS}" ECXXFLAGS="${CXXFLAGS}" ELDFLAGS="${LDFLAGS}"
 	# set ./configure options (prefix, Qt based wizard, docdir)
 
@@ -99,8 +99,9 @@ src_compile() {
 	else
 		./configure ${my_conf} || die 'configure failed'
 	fi
+}
 
-	# and compile
+src_compile() {
 	emake all || die 'emake failed'
 
 	# generate html and pdf (if tetex in use) documents.
diff --git a/app-doc/doxygen/doxygen-1.6.1.ebuild b/app-doc/doxygen/doxygen-1.6.1.ebuild
index d50ad83901a5..1da95379b391 100644
--- a/app-doc/doxygen/doxygen-1.6.1.ebuild
+++ b/app-doc/doxygen/doxygen-1.6.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.6.1.ebuild,v 1.2 2009/12/26 17:24:39 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.6.1.ebuild,v 1.3 2010/01/17 16:31:11 ayoy Exp $
 
 EAPI=2
 
-inherit eutils flag-o-matic toolchain-funcs qt4 fdo-mime
+inherit eutils flag-o-matic toolchain-funcs qt4-r2 fdo-mime
 
 DESCRIPTION="documentation system for C++, C, Java, Objective-C, Python, IDL, and other languages"
 HOMEPAGE="http://www.doxygen.org/"