diff options
| author |   Serkan Kaba <serkan@gentoo.org> | 2008-10-01 11:35:00 +0000 |
|---|---|---|
| committer | Serkan Kaba <serkan@gentoo.org> | 2008-10-01 11:35:00 +0000 |
| commit | 9359420c3da0492d23d6afda872a4b1924335395 (patch) | |
| tree | 637c403fb62065f2c1e05bc5cbbdd18d28b48074 /dev-java/java-gnome | |
| parent | Initial commit, ebuild based on the one submitted by Cristi Magherusan <majer... (diff) | |
| download | gentoo-2-9359420c3da0492d23d6afda872a4b1924335395.tar.gz gentoo-2-9359420c3da0492d23d6afda872a4b1924335395.tar.bz2 gentoo-2-9359420c3da0492d23d6afda872a4b1924335395.zip | |
Move configure to src_configure to avoid running it twice. Move epatch calls to src_prepare.
(Portage version: 2.2_rc11/cvs/Linux 2.6.25-gentoo-r7 x86_64)
Diffstat (limited to 'dev-java/java-gnome')
| -rw-r--r-- | dev-java/java-gnome/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-java/java-gnome/java-gnome-4.0.7-r1.ebuild | 6 | ||||
| -rw-r--r-- | dev-java/java-gnome/java-gnome-4.0.8-r1.ebuild | 11 |
3 files changed, 15 insertions, 9 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/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" |