Move configure to src_configure to avoid running it twice. Move epatch calls to src_prepare.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.25-gentoo-r7 x86_64

4 files changed, 21 insertions, 15 deletions

diff --git a/dev-java/java-gnome/ChangeLog b/dev-java/java-gnome/ChangeLog
index aaa6f516e918..91d56cbc2ffb 100644
--- a/dev-java/java-gnome/ChangeLog
+++ b/dev-java/java-gnome/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/java-gnome
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/ChangeLog,v 1.68 2008/09/27 13:59:06 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/ChangeLog,v 1.69 2008/10/01 11:35:00 serkan Exp $
+
+  01 Oct 2008; Serkan Kaba <serkan@gentoo.org> java-gnome-4.0.7-r1.ebuild,
+  java-gnome-4.0.8-r1.ebuild:
+  Move configure to src_configure to avoid running it twice. Move epatch
+  calls to src_prepare.
 
 *java-gnome-4.0.8-r1 (27 Sep 2008)
 *java-gnome-4.0.7-r1 (27 Sep 2008)
diff --git a/dev-java/java-gnome/Manifest b/dev-java/java-gnome/Manifest
index 87576276593e..e48ead9bbdf2 100644
--- a/dev-java/java-gnome/Manifest
+++ b/dev-java/java-gnome/Manifest
@@ -9,15 +9,15 @@ DIST java-gnome-4.0.7.tar.bz2 451009 RMD160 8131ff8be7f06cbf8a6312a73b4cb227ccfc
 DIST java-gnome-4.0.8.tar.bz2 464915 RMD160 cb2ed316ec9a18a4dcb696ae67c5d4de04ef99a6 SHA1 9d8d4ba1276ff5a15ebed4ec4b477468f006f659 SHA256 2880b212fb0df16d514f2ccccfb0f63d0f200947e872d19f8c139ebdd4b19e47
 EBUILD java-gnome-4.0.5.ebuild 1474 RMD160 8bbd395e9857fe15671984255887b2efd465f77d SHA1 37a6ad5e1ed80d38785a03afdb6c3db396c320dc SHA256 553d72c8578f3dc01a8befb9d6c7c9a5f581fc30103c1f58239f9e7c89f90431
 EBUILD java-gnome-4.0.6.ebuild 1449 RMD160 1916e36f98aa4af25b19c256ee8a33c73f16231d SHA1 957a51335c2b080ffa8b5108d1c44b04f32fdf81 SHA256 4ef22e37128c74a4ca918a1ff337adf6d32ac1ce01d98ffe264e72512276272a
-EBUILD java-gnome-4.0.7-r1.ebuild 1485 RMD160 d3f7e98eee9511a922552f6f1cb2748e0dd0cdd6 SHA1 cf8e9f800925bb424b70c905b7a8898730280642 SHA256 3c0bce5fbd3192127e5e9c74bec98f3674dbdfc9a602ec95783f7f8e27ec0355
+EBUILD java-gnome-4.0.7-r1.ebuild 1505 RMD160 d255e4852d648d95390b59aa6ae5a9eec5adeb3d SHA1 629b181e930d06afe30e4de69dc5855839cead75 SHA256 b1fc47ecd90c45f7a4139d4b5828f4186592fc25650bfc1791e0a2080a5a3fe4
 EBUILD java-gnome-4.0.7.ebuild 1717 RMD160 c5c830ded3e845daca7e3e63becabfe3b5a4509d SHA1 cb5ee517af4dfa9f5851e357efcc36dc5a5787a7 SHA256 9a4cf4618c8918b9eba6234327f5a0849cecc855e5cf78f87464fb9b955044b7
-EBUILD java-gnome-4.0.8-r1.ebuild 1627 RMD160 f01794629339276841e03f04c0888ff06e2f859c SHA1 0176ff50e5170a43f90954ea9a1b2e8f5e5968a7 SHA256 97f3e4ccf5686ab5842e29813248abbbae1c7afb00ac6abb59b951cb4d970481
-MISC ChangeLog 11677 RMD160 24016ec854b416eebccab86fc6c3f7764d8eee98 SHA1 3beec5ef98f89f5194df1eb2919bdf51917b3b23 SHA256 12c5141fc9942526aded49af6ab7a0b059cbbaa1f7529a9af1472434be6baac5
+EBUILD java-gnome-4.0.8-r1.ebuild 1623 RMD160 94e99c5a6a8db0a6cae978c8aef321f9c6c252f7 SHA1 28263cfec4d58f6b7aaa3d646b6167d6e4a076e4 SHA256 d73a4e1145038617ad951f7557a2c6ed267e73f0d7ec1e2160147a412c1be468
+MISC ChangeLog 11880 RMD160 37ff9102c35ec3d302b847854582e0d56b82960d SHA1 48d780f59bbd3ab401a6eebd605d6840183aef6b SHA256 8ed3eda65bda13ee204f19b2897044b8830c301de24409f6bd4d0a04f5720876
 MISC metadata.xml 1084 RMD160 4bea9b6a1a08b968b94a1212b5f98dfd307c2cca SHA1 900ef9e5e2089937b83868332db0a7a039803611 SHA256 b705cf4e2792eec42ece7e8a70cb3f032f54ce2ad1e0ee88433994e3f71a9ec2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjePDgACgkQRh6X64ivZaJG/gCfZ7P5TpRwNwObYQhg5P+/luDv
-X/QAn0mbdvusI/tb0FJhznhop3uXxf0k
-=osaE
+iEYEARECAAYFAkjjYG4ACgkQRh6X64ivZaK4hgCdFN41cSo37UkHqzshtyk8zv6M
+1BgAn2ezRaN1wtDHaUiQJnFkXmuC2UW0
+=tYHH
 -----END PGP SIGNATURE-----
diff --git a/dev-java/java-gnome/java-gnome-4.0.7-r1.ebuild b/dev-java/java-gnome/java-gnome-4.0.7-r1.ebuild
index f52c2889d5cb..e60ad325c1f3 100644
--- a/dev-java/java-gnome/java-gnome-4.0.7-r1.ebuild
+++ b/dev-java/java-gnome/java-gnome-4.0.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.7-r1.ebuild,v 1.1 2008/09/27 13:59:06 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.7-r1.ebuild,v 1.2 2008/10/01 11:35:00 serkan Exp $
 
 EAPI=2
 JAVA_PKG_IUSE="doc examples source"
@@ -32,10 +32,12 @@ DEPEND="${RDEPEND}
 # Needs X11
 RESTRICT="test"
 
-src_compile() {
+src_configure() {
 	# Handwritten in perl so not using econf
 	./configure --prefix=/usr || die
+}
 
+src_compile() {
 	# Fails parallel build in case GCJ is detected
 	# See https://bugs.gentoo.org/show_bug.cgi?id=200550
 	emake -j1 || die "Compilation of java-gnome failed"
diff --git a/dev-java/java-gnome/java-gnome-4.0.8-r1.ebuild b/dev-java/java-gnome/java-gnome-4.0.8-r1.ebuild
index 98637c352e95..aecff11763e7 100644
--- a/dev-java/java-gnome/java-gnome-4.0.8-r1.ebuild
+++ b/dev-java/java-gnome/java-gnome-4.0.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.8-r1.ebuild,v 1.1 2008/09/27 13:59:06 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.8-r1.ebuild,v 1.2 2008/10/01 11:35:00 serkan Exp $
 
 EAPI=2
 JAVA_PKG_IUSE="doc examples source"
@@ -32,18 +32,17 @@ DEPEND="${RDEPEND}
 # Needs X11
 RESTRICT="test"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	epatch "${FILESDIR}/${P}-disable-doc-snapshots.patch"
 	epatch "${FILESDIR}/${P}-deprecated.patch"
 }
 
-src_compile() {
+src_configure() {
 	# Handwritten in perl so not using econf
 	./configure --prefix=/usr || die
+}
 
+src_compile() {
 	# Fails parallel build in case GCJ is detected
 	# See https://bugs.gentoo.org/show_bug.cgi?id=200550
 	emake -j1 || die "Compilation of java-gnome failed"