Added calls to java-pkg_pkg_setup, see bug #142708. Cleaned up whitespace. Removed compnerd as maintainer.

Package-Manager: portage-2.1.1

7 files changed, 63 insertions, 80 deletions

diff --git a/dev-java/libgconf-java/ChangeLog b/dev-java/libgconf-java/ChangeLog
index 18fa28bb4aea..58fa65f4d51b 100644
--- a/dev-java/libgconf-java/ChangeLog
+++ b/dev-java/libgconf-java/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/libgconf-java
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libgconf-java/ChangeLog,v 1.16 2006/07/17 19:12:30 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgconf-java/ChangeLog,v 1.17 2006/09/14 20:02:20 nichoj Exp $
+
+  14 Sep 2006; Joshua Nichols <nichoj@gentoo.org> metadata.xml,
+  libgconf-java-2.8.3.1.ebuild, libgconf-java-2.10.1.ebuild,
+  libgconf-java-2.12.1.ebuild, libgconf-java-2.12.1-r1.ebuild:
+  Added calls to java-pkg_pkg_setup, see bug #142708. Cleaned up whitespace.
+  Removed compnerd as maintainer.
 
   17 Jul 2006; Daniel Gryniewicz <dang@gentoo.org>
   libgconf-java-2.12.1-r1.ebuild:
diff --git a/dev-java/libgconf-java/Manifest b/dev-java/libgconf-java/Manifest
index bebba84ce8cc..ce645f018f73 100644
--- a/dev-java/libgconf-java/Manifest
+++ b/dev-java/libgconf-java/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX libgconf-java-2.10.0_fix-install-dir.patch 420 RMD160 907033077c5603f5799ca295742d4bf89dd083f7 SHA1 fb6b1d37acc7479de1412fceb3e9618f1772bd50 SHA256 80098bd5bd67a9a40502569ca4db82fa52fcaee3cf1b236532efcb8f290d3820
 MD5 4028a5325b5787c89a1eceddb66bc437 files/libgconf-java-2.10.0_fix-install-dir.patch 420
 RMD160 907033077c5603f5799ca295742d4bf89dd083f7 files/libgconf-java-2.10.0_fix-install-dir.patch 420
@@ -16,30 +13,30 @@ SHA256 1bcd4e9ad4ec8b9647af4643a7dc5f0b68617fe3d9b466be6dd491ba6b195776 files/li
 DIST libgconf-java-2.10.1.tar.bz2 232533
 DIST libgconf-java-2.12.1.tar.gz 336474 RMD160 f05354004358ad64fc71ec65389dbb7f733dec90 SHA1 9ce1aaf3fbc9e60744fa635538200e6e4feee855 SHA256 07521e12151e82ae7e621a6cf26263ec8d76c7abd11d7b184d9f7988b3592f44
 DIST libgconf-java-2.8.3.1.tar.bz2 233574
-EBUILD libgconf-java-2.10.1.ebuild 2277 RMD160 edfaa98bfcc081aa95a184daf3b9677f4ddb9589 SHA1 438bb70426d48c8914d840dec2532754481cc28e SHA256 febd6edd69385a8d5b1c2e2e51a8ecef70ce8d8d6a8ca0090a28131264bc264d
-MD5 48b501573839b1a057b784392842ecc8 libgconf-java-2.10.1.ebuild 2277
-RMD160 edfaa98bfcc081aa95a184daf3b9677f4ddb9589 libgconf-java-2.10.1.ebuild 2277
-SHA256 febd6edd69385a8d5b1c2e2e51a8ecef70ce8d8d6a8ca0090a28131264bc264d libgconf-java-2.10.1.ebuild 2277
-EBUILD libgconf-java-2.12.1-r1.ebuild 2066 RMD160 2bc81d8e04fd45b86819124585dbf239856a1bf3 SHA1 1dd3e145d792fb4087fde6f117da2ff7d0846ab9 SHA256 8d995de1e2e6e335a39f90bc5b7025b0f970eadc3d5ffea581671ea9ef42230e
-MD5 eff4eb1f80e977c85733aa320fc1bbe5 libgconf-java-2.12.1-r1.ebuild 2066
-RMD160 2bc81d8e04fd45b86819124585dbf239856a1bf3 libgconf-java-2.12.1-r1.ebuild 2066
-SHA256 8d995de1e2e6e335a39f90bc5b7025b0f970eadc3d5ffea581671ea9ef42230e libgconf-java-2.12.1-r1.ebuild 2066
-EBUILD libgconf-java-2.12.1.ebuild 1823 RMD160 aee0b5087f8c44d00dab5ce4597fb6234d6e1165 SHA1 1acf090f4df5094ff2131467d453133310b8a0e6 SHA256 aa62b2c656cd9af0cc87324abd74ec51538158d18eedfbc71e33c9ba0c1a24d0
-MD5 e5afa6fd39aff6f6198875a86392558f libgconf-java-2.12.1.ebuild 1823
-RMD160 aee0b5087f8c44d00dab5ce4597fb6234d6e1165 libgconf-java-2.12.1.ebuild 1823
-SHA256 aa62b2c656cd9af0cc87324abd74ec51538158d18eedfbc71e33c9ba0c1a24d0 libgconf-java-2.12.1.ebuild 1823
-EBUILD libgconf-java-2.8.3.1.ebuild 2912 RMD160 43829d009db1e19ca2ced16d8169650bf9525326 SHA1 f400798684404c02d05a0df61e3bd9775815c791 SHA256 46407a219169ce3065105016e42292b0fbc121ea086c92b4019023a9dd2bde0b
-MD5 d172708ae5e53ab4f75b1c3eabc95712 libgconf-java-2.8.3.1.ebuild 2912
-RMD160 43829d009db1e19ca2ced16d8169650bf9525326 libgconf-java-2.8.3.1.ebuild 2912
-SHA256 46407a219169ce3065105016e42292b0fbc121ea086c92b4019023a9dd2bde0b libgconf-java-2.8.3.1.ebuild 2912
-MISC ChangeLog 2725 RMD160 57309c0824da048e5bcf9b1245823de80d6e1154 SHA1 49f51b55ba6f9c60e1687b68ff774834cd29188a SHA256 0534eab71d9363cca029881a109d6053cfac60a99c4c8312979f62fa10e8a05f
-MD5 ac3d6c1fb624a4a0d96ac900cea632c3 ChangeLog 2725
-RMD160 57309c0824da048e5bcf9b1245823de80d6e1154 ChangeLog 2725
-SHA256 0534eab71d9363cca029881a109d6053cfac60a99c4c8312979f62fa10e8a05f ChangeLog 2725
-MISC metadata.xml 1142 RMD160 b4cfcc9105c24f92718989ddb9ebac713b83a15f SHA1 9fbbb9d233d22ae0016fda47a042a542bb0b9ce3 SHA256 3be4774da8d2b91eb1ba59d3476f524409f12e39d7b1b00097b46ead89425b06
-MD5 7fb48767f052a6a6dee17d585c1cbd32 metadata.xml 1142
-RMD160 b4cfcc9105c24f92718989ddb9ebac713b83a15f metadata.xml 1142
-SHA256 3be4774da8d2b91eb1ba59d3476f524409f12e39d7b1b00097b46ead89425b06 metadata.xml 1142
+EBUILD libgconf-java-2.10.1.ebuild 2275 RMD160 f1dc903f33da978f41f923bb8abd091a4da2adf5 SHA1 c80e3a7e78b7fe93782b19b6ef12298de9766ed7 SHA256 f4d77fc51bb039c3b82009c7b0cbe15fe5a473b0d273222cc4f988ca1903e6ea
+MD5 673db28ff6a4f66c12c160d5794b1f4d libgconf-java-2.10.1.ebuild 2275
+RMD160 f1dc903f33da978f41f923bb8abd091a4da2adf5 libgconf-java-2.10.1.ebuild 2275
+SHA256 f4d77fc51bb039c3b82009c7b0cbe15fe5a473b0d273222cc4f988ca1903e6ea libgconf-java-2.10.1.ebuild 2275
+EBUILD libgconf-java-2.12.1-r1.ebuild 2038 RMD160 b9e1ec86a54116939cd76b74e527785ebf3b7bde SHA1 4d755f30ee31115784bf3a65e95ecf854b5b8a7b SHA256 47ff5959260b9c89df47a1fb5a6f424d7cb448bf8404cb54bec29b723b16853b
+MD5 db12b7b27a8f528a04a865ba3aef018f libgconf-java-2.12.1-r1.ebuild 2038
+RMD160 b9e1ec86a54116939cd76b74e527785ebf3b7bde libgconf-java-2.12.1-r1.ebuild 2038
+SHA256 47ff5959260b9c89df47a1fb5a6f424d7cb448bf8404cb54bec29b723b16853b libgconf-java-2.12.1-r1.ebuild 2038
+EBUILD libgconf-java-2.12.1.ebuild 1784 RMD160 edb53c2eccf2582f3c0f33587f6e0649b1a251a9 SHA1 430645a220e719ec212421d1841330956b78403e SHA256 8bee5597fe7217da3b99204a93ffa14aad9dfcca3a1b6a46da7a2f395ec6b6c6
+MD5 80c13cc0f7d4f7284c530e75f135401b libgconf-java-2.12.1.ebuild 1784
+RMD160 edb53c2eccf2582f3c0f33587f6e0649b1a251a9 libgconf-java-2.12.1.ebuild 1784
+SHA256 8bee5597fe7217da3b99204a93ffa14aad9dfcca3a1b6a46da7a2f395ec6b6c6 libgconf-java-2.12.1.ebuild 1784
+EBUILD libgconf-java-2.8.3.1.ebuild 2909 RMD160 9596c64b7c34a987e38020fa1476d5e0a6715ad5 SHA1 cb635a6f5b4f768a93e56b3c32da7188e2e57ae2 SHA256 464967f8432a19adf56d845ecf62802aba000a9a4ac072212d25ef7d4630b015
+MD5 37130a0e6590c57dfda83311949eb2e9 libgconf-java-2.8.3.1.ebuild 2909
+RMD160 9596c64b7c34a987e38020fa1476d5e0a6715ad5 libgconf-java-2.8.3.1.ebuild 2909
+SHA256 464967f8432a19adf56d845ecf62802aba000a9a4ac072212d25ef7d4630b015 libgconf-java-2.8.3.1.ebuild 2909
+MISC ChangeLog 3027 RMD160 997efb33823b9b63cca10d4c25609ab7da1a096a SHA1 2b60a239312db5b238414c2e7eaa9747d9ed6622 SHA256 e68bffc44ec1c6b5ea27de0f9b80f43dcc1888fa7db04a4bde0a6e4cb43d227b
+MD5 40df2a8bdb9fdf636729ea32cf8e6615 ChangeLog 3027
+RMD160 997efb33823b9b63cca10d4c25609ab7da1a096a ChangeLog 3027
+SHA256 e68bffc44ec1c6b5ea27de0f9b80f43dcc1888fa7db04a4bde0a6e4cb43d227b ChangeLog 3027
+MISC metadata.xml 937 RMD160 fcac32c848075cc2fbde437d008dea1cf7fbcc35 SHA1 07542b2424f2f7f360fbc2a467f2b83a4cea71f6 SHA256 f94596eb55aeebd10e931d0a5d776e100502fb4db6133f08d5420045593e0a3e
+MD5 61db22eb5596bab350597bec3e25ec7b metadata.xml 937
+RMD160 fcac32c848075cc2fbde437d008dea1cf7fbcc35 metadata.xml 937
+SHA256 f94596eb55aeebd10e931d0a5d776e100502fb4db6133f08d5420045593e0a3e metadata.xml 937
 MD5 00133abfc0fddd7799314a248ebeb6c9 files/digest-libgconf-java-2.10.1 73
 RMD160 61ec2b0d1cb72676f7291cbae2d50af11dc37347 files/digest-libgconf-java-2.10.1 73
 SHA256 a8b79d336abdbb7c3b459c71f3c83670e07229d19ca79ec6eb664153bc5d7d84 files/digest-libgconf-java-2.10.1 73
@@ -52,10 +49,3 @@ SHA256 a685d7d9edbce7d67758e79f771a19b340b80252f858195b9bce4d182bc5f140 files/di
 MD5 fa4698389381ae96bb70cc672750fe57 files/digest-libgconf-java-2.8.3.1 74
 RMD160 d09ead63988210ca2225367efd6d2bc2a1d81763 files/digest-libgconf-java-2.8.3.1 74
 SHA256 a5e49c27988dce36b29e94bd78606393dbfa321724423b4a077ee621f5fbe9ed files/digest-libgconf-java-2.8.3.1 74
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFEu+EPomPajV0RnrERApnhAJ0Q0KJ488WPWk2O1aMJR/ljyeTDhQCeP2Lx
-/64Q0SsHEiRtcLnJWEjI+vw=
-=t111
------END PGP SIGNATURE-----
diff --git a/dev-java/libgconf-java/libgconf-java-2.10.1.ebuild b/dev-java/libgconf-java/libgconf-java-2.10.1.ebuild
index 9991146c626a..7f981a052c6d 100644
--- a/dev-java/libgconf-java/libgconf-java-2.10.1.ebuild
+++ b/dev-java/libgconf-java/libgconf-java-2.10.1.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libgconf-java/libgconf-java-2.10.1.ebuild,v 1.3 2005/07/19 11:58:20 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgconf-java/libgconf-java-2.10.1.ebuild,v 1.4 2006/09/14 20:02:20 nichoj Exp $
 
 #
-# WARNING: Because java-gnome is a set of bindings to native GNOME libraries, 
-# it has, like any GNOME project, a massive autoconf setup, and unlike many 
+# WARNING: Because java-gnome is a set of bindings to native GNOME libraries,
+# it has, like any GNOME project, a massive autoconf setup, and unlike many
 # other java libraries, it has its own [necessary] `make install` step.
 # As a result, this ebuild is VERY sensitive to the internal layout of the
 # upstream project. Because these issues are currently evolving upstream,
 # simply version bumping this ebuild is not likely to work but FAILURES WILL
 # BE VERY SUBTLE IF IT DOES NOT WORK.
-# 
+#
 
 inherit eutils gnome.org
 
@@ -67,7 +67,7 @@ src_install() {
 	cd ${S}/src/java
 	find . -name '*.java' | xargs zip ${D}/usr/share/${PN}-${SLOT}/src/libgconf-java-${PV}.src.zip
 
-	# with dojar misbehaving, better do to this manually for the 
+	# with dojar misbehaving, better do to this manually for the
 	# time being. Yes, this is bad hard coding, but what in this ebuild isn't?
 
 	echo "DESCRIPTION=${DESCRIPTION}" \
diff --git a/dev-java/libgconf-java/libgconf-java-2.12.1-r1.ebuild b/dev-java/libgconf-java/libgconf-java-2.12.1-r1.ebuild
index 3df930afcc5f..44d3628bc10d 100644
--- a/dev-java/libgconf-java/libgconf-java-2.12.1-r1.ebuild
+++ b/dev-java/libgconf-java/libgconf-java-2.12.1-r1.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libgconf-java/libgconf-java-2.12.1-r1.ebuild,v 1.4 2006/07/17 19:12:30 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgconf-java/libgconf-java-2.12.1-r1.ebuild,v 1.5 2006/09/14 20:02:20 nichoj Exp $
 
 # Must be before the gnome.org inherit
 GNOME_TARBALL_SUFFIX="gz"
-
 inherit java-pkg eutils gnome.org
 
 DESCRIPTION="Java bindings for Glade"
@@ -19,18 +18,17 @@ KEYWORDS="amd64 ppc x86"
 IUSE="doc gcj source"
 
 DEPS=">=gnome-base/gconf-2.12.0
-	  >=dev-java/glib-java-0.2.1
-	  >=dev-java/libgtk-java-2.8.1
-	  >=dev-java/libgnome-java-2.8.0
-		dev-util/pkgconfig"
-
+	>=dev-java/glib-java-0.2.1
+	>=dev-java/libgtk-java-2.8.1
+	>=dev-java/libgnome-java-2.8.0"
 DEPEND=">=virtual/jdk-1.4
-		>=sys-apps/sed-4
-		${DEPS}"
+	${DEPS}"
 RDEPEND=">=virtual/jre-1.4
-		 ${DEPS}"
+	${DEPS}"
 JARNAME="gconf${SLOT}.jar"
+
 pkg_setup() {
+	java-pkg_pkg_setup
 	if use gcj ; then
 		if ! built_with_use sys-devel/gcc gcj ; then
 			ewarn
diff --git a/dev-java/libgconf-java/libgconf-java-2.12.1.ebuild b/dev-java/libgconf-java/libgconf-java-2.12.1.ebuild
index 1636d59de85b..6d73296214b1 100644
--- a/dev-java/libgconf-java/libgconf-java-2.12.1.ebuild
+++ b/dev-java/libgconf-java/libgconf-java-2.12.1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libgconf-java/libgconf-java-2.12.1.ebuild,v 1.5 2005/12/30 02:52:06 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgconf-java/libgconf-java-2.12.1.ebuild,v 1.6 2006/09/14 20:02:20 nichoj Exp $
 
 # Must be before the gnome.org inherit
 GNOME_TARBALL_SUFFIX="gz"
-
 inherit java-pkg eutils gnome.org
 
 DESCRIPTION="Java bindings for Glade"
@@ -19,18 +18,16 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc gcj"
 
 DEPS=">=gnome-base/gconf-2.12.0
-	  >=dev-java/glib-java-0.2.1
-	  >=dev-java/libgtk-java-2.8.1
-	  >=dev-java/libgnome-java-2.8.0
-		dev-util/pkgconfig"
-
+	>=dev-java/glib-java-0.2.1
+	>=dev-java/libgtk-java-2.8.1
+	>=dev-java/libgnome-java-2.8.0"
 DEPEND=">=virtual/jdk-1.4
-		>=sys-apps/sed-4
-		${DEPS}"
+	${DEPS}"
 RDEPEND=">=virtual/jre-1.4
-		 ${DEPS}"
+	${DEPS}"
 
 pkg_setup() {
+	java-pkg_pkg_setup
 	if use gcj ; then
 		if ! built_with_use sys-devel/gcc gcj ; then
 			ewarn
@@ -45,9 +42,9 @@ pkg_setup() {
 src_compile() {
 	# JARDIR is a hack for java-config
 	econf $(use_with gcj gcj-compile) \
-		  $(use_with doc javadocs) \
-		  --with-jardir=/usr/share/${PN}-${SLOT}/lib \
-		  || die "configure failed"
+		$(use_with doc javadocs) \
+		--with-jardir=/usr/share/${PN}-${SLOT}/lib \
+		|| die "configure failed"
 
 	emake || die "compile failed"
 
diff --git a/dev-java/libgconf-java/libgconf-java-2.8.3.1.ebuild b/dev-java/libgconf-java/libgconf-java-2.8.3.1.ebuild
index 8cf4440be480..490f2535be63 100644
--- a/dev-java/libgconf-java/libgconf-java-2.8.3.1.ebuild
+++ b/dev-java/libgconf-java/libgconf-java-2.8.3.1.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libgconf-java/libgconf-java-2.8.3.1.ebuild,v 1.5 2005/07/19 11:58:20 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgconf-java/libgconf-java-2.8.3.1.ebuild,v 1.6 2006/09/14 20:02:20 nichoj Exp $
 
 #
-# WARNING: Because java-gnome is a set of bindings to native GNOME libraries, 
-# it has, like any GNOME project, a massive autoconf setup, and unlike many 
+# WARNING: Because java-gnome is a set of bindings to native GNOME libraries,
+# it has, like any GNOME project, a massive autoconf setup, and unlike many
 # other java libraries, it has its own [necessary] `make install` step.
 # As a result, this ebuild is VERY sensitive to the internal layout of the
 # upstream project. Because these issues are currently evolving upstream,
 # simply version bumping this ebuild is not likely to work but FAILURES WILL
 # BE VERY SUBTLE IF IT DOES NOT WORK.
-# 
+#
 
 inherit eutils gnome.org
 
@@ -71,7 +71,7 @@ src_install() {
 	# the upstream install scatters things around a bit. The following cleans
 	# that up to make it policy compliant.
 
-	# I originally tried java-pkg_dojar here, but it has a few glitches 
+	# I originally tried java-pkg_dojar here, but it has a few glitches
 	# like not copying symlinks as symlinks which makes a mess.
 
 	dodir /usr/share/${PN}-${SLOT}/lib
@@ -82,7 +82,7 @@ src_install() {
 	cd ${S}/src/java
 	zip -r ${D}/usr/share/${PN}-${SLOT}/src/libgconf-java-${PV}.src.zip *
 
-	# again, with dojar misbehaving, better do to this manually for the 
+	# again, with dojar misbehaving, better do to this manually for the
 	# time being. Yes, this is bad hard coding, but what in this ebuild isn't?
 
 	echo "DESCRIPTION=${DESCRIPTION}" \
diff --git a/dev-java/libgconf-java/metadata.xml b/dev-java/libgconf-java/metadata.xml
index 950fc8fdf788..56ce88eafafb 100644
--- a/dev-java/libgconf-java/metadata.xml
+++ b/dev-java/libgconf-java/metadata.xml
@@ -2,14 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
-	<maintainer>
-		<email>andrew@operationaldynamics.com</email>
-		<name>Andrew Cowie</name>
-	</maintainer>
-	<maintainer>
-		<email>compnerd@gentoo.org</email>
-		<name>Saleem Abdulrasool</name>
-	</maintainer>
 	<longdescription>
 		An elegant set of language bindings to allow you to write
 		native GNOME applications in Java. Works with both traditional