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, 59 insertions, 79 deletions

diff --git a/dev-java/glib-java/ChangeLog b/dev-java/glib-java/ChangeLog
index 5294e44cfc6a..1e955659779d 100644
--- a/dev-java/glib-java/ChangeLog
+++ b/dev-java/glib-java/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/glib-java
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/glib-java/ChangeLog,v 1.11 2006/07/17 19:11:57 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/glib-java/ChangeLog,v 1.12 2006/09/14 19:45:23 nichoj Exp $
+
+  14 Sep 2006; Joshua Nichols <nichoj@gentoo.org> metadata.xml,
+  glib-java-0.2.1.ebuild, glib-java-0.2.2.ebuild, glib-java-0.2.3.ebuild,
+  glib-java-0.2.3-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>
   glib-java-0.2.3-r1.ebuild:
diff --git a/dev-java/glib-java/Manifest b/dev-java/glib-java/Manifest
index 6a4c2cdad29f..4c3a6d7376cd 100644
--- a/dev-java/glib-java/Manifest
+++ b/dev-java/glib-java/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX aclocal_voodoo.patch 749 RMD160 ae731fbbcb529dfb0231f85430aacb912d7040f3 SHA1 4d50db15a8bce78bc45019b98eb1c982d41f8c1e SHA256 5129cfd8bffc258fa132dd2a16a01d0f95c9bd16d437219e5b75e906e38e98ef
 MD5 6f1550893a37966aca2b2c7ceb220b71 files/aclocal_voodoo.patch 749
 RMD160 ae731fbbcb529dfb0231f85430aacb912d7040f3 files/aclocal_voodoo.patch 749
@@ -12,30 +9,30 @@ SHA256 a3bcb5dbee0062864e6d73333925c922e0b4cca488ee8e7021db42f399934296 files/jg
 DIST glib-java-0.2.1.tar.gz 325434 RMD160 0f6400a5c9e573af67f45c7c161ee3efa5b6c2d5 SHA256 b1537b9429745bced371afa8b67da891fbd90ffc8709c48a33260ae615fff994
 DIST glib-java-0.2.2.tar.gz 325749 RMD160 a54b6fb280849b856e97868414033155d80a51d2 SHA256 11b19c2a876977d933b0c25a4e0bb995bd79027d65f819514481e2cc4f8fd7b2
 DIST glib-java-0.2.3.tar.gz 325579 RMD160 5527f17459f326094c09e7b62f38af417e21a45c SHA1 56f1e9ddf1fbaafeb1f57de7ac7f25baccc4a1ff SHA256 7659ca0bb56955ab468ece9229261e0f80eb731eb78a657048230fa907c60a5b
-EBUILD glib-java-0.2.1.ebuild 1962 RMD160 3c8319af218f4e6c0c45335c0166428e77772747 SHA1 179c131f0f8e66f9292dbfe6bd5865780fe87a8f SHA256 d608b7f11073fdb46fa3e53e165b8f3dee90b2e4d72d4bd90e4c9f56cdaf9816
-MD5 3480719d0ce24733bd92a7827d5776a1 glib-java-0.2.1.ebuild 1962
-RMD160 3c8319af218f4e6c0c45335c0166428e77772747 glib-java-0.2.1.ebuild 1962
-SHA256 d608b7f11073fdb46fa3e53e165b8f3dee90b2e4d72d4bd90e4c9f56cdaf9816 glib-java-0.2.1.ebuild 1962
-EBUILD glib-java-0.2.2.ebuild 2016 RMD160 4a79176c3f8254464c8881ef1ba1e68ae0d97020 SHA1 966641baa0b1a8909526c74c69e4fe78c66d7c82 SHA256 36f3f3c4a3f9fe8e985cdcda6ba6095c14d15706118b5440f1aa36b6900bae11
-MD5 4a88692583319263f67ae2994e3093dd glib-java-0.2.2.ebuild 2016
-RMD160 4a79176c3f8254464c8881ef1ba1e68ae0d97020 glib-java-0.2.2.ebuild 2016
-SHA256 36f3f3c4a3f9fe8e985cdcda6ba6095c14d15706118b5440f1aa36b6900bae11 glib-java-0.2.2.ebuild 2016
-EBUILD glib-java-0.2.3-r1.ebuild 2189 RMD160 010e45e0b56ecaaaae2be42354cfdaeebced547c SHA1 02d211fcaeac9252d5bb4d11560cac150ce2d5d1 SHA256 8e4aaf1930d702b174fd438b858b292f5c29c169b1c533a836e70cda06bd5e0e
-MD5 320a09cfb9cc93fdc355c7acdbe2d01f glib-java-0.2.3-r1.ebuild 2189
-RMD160 010e45e0b56ecaaaae2be42354cfdaeebced547c glib-java-0.2.3-r1.ebuild 2189
-SHA256 8e4aaf1930d702b174fd438b858b292f5c29c169b1c533a836e70cda06bd5e0e glib-java-0.2.3-r1.ebuild 2189
-EBUILD glib-java-0.2.3.ebuild 2016 RMD160 e8c9d684535f382710aa0396e6a443b03f3d0eba SHA1 afd850028fe75618fff43492778dfe5966ac7037 SHA256 78b607b0a8d07f230ea80bc1e5d174e2088d1c92ac739427b5e07fdcf36fe40a
-MD5 3485d5c52dc53f492baa14776998ca34 glib-java-0.2.3.ebuild 2016
-RMD160 e8c9d684535f382710aa0396e6a443b03f3d0eba glib-java-0.2.3.ebuild 2016
-SHA256 78b607b0a8d07f230ea80bc1e5d174e2088d1c92ac739427b5e07fdcf36fe40a glib-java-0.2.3.ebuild 2016
-MISC ChangeLog 1763 RMD160 f0bc4dac37a77f4b1b2ec0f6ae0c4c806e250077 SHA1 c2187c46125f21f466f152af06b99bfb65013c5f SHA256 fbd2dd85978d38efb09d612d92511ea3cce9abf1553f94222ee29e78635e8543
-MD5 d2a92baad43447e362689c0c581179fc ChangeLog 1763
-RMD160 f0bc4dac37a77f4b1b2ec0f6ae0c4c806e250077 ChangeLog 1763
-SHA256 fbd2dd85978d38efb09d612d92511ea3cce9abf1553f94222ee29e78635e8543 ChangeLog 1763
-MISC metadata.xml 351 RMD160 0e264a3a00a4e9596de198ba12c78e70a80c4971 SHA1 d1e8b5585626339587d0846a86fc8e607a169c7c SHA256 150643467149fc29f21bc81dfb154912778d0c212638490d474fe46450f26ce4
-MD5 5c652987877650c412fa53be7fdc9210 metadata.xml 351
-RMD160 0e264a3a00a4e9596de198ba12c78e70a80c4971 metadata.xml 351
-SHA256 150643467149fc29f21bc81dfb154912778d0c212638490d474fe46450f26ce4 metadata.xml 351
+EBUILD glib-java-0.2.1.ebuild 1931 RMD160 771e7e54d958e84d538fb21a3a1290643e21f8d3 SHA1 c26aee9d97f7d9be785a312c24d05af8c88eb231 SHA256 84370150496599a9a1f15f49c80d7e4522e0ff1162151960543addcc748458bc
+MD5 e118fdafbefd8e693a41263c0acb3efb glib-java-0.2.1.ebuild 1931
+RMD160 771e7e54d958e84d538fb21a3a1290643e21f8d3 glib-java-0.2.1.ebuild 1931
+SHA256 84370150496599a9a1f15f49c80d7e4522e0ff1162151960543addcc748458bc glib-java-0.2.1.ebuild 1931
+EBUILD glib-java-0.2.2.ebuild 2004 RMD160 4f49868bbfe1187914f703ad649ed0f92ddb2690 SHA1 3c9b078c79d52390546ff99bd81582fe58868b54 SHA256 a3c3476e28d4445338dfb1cc79d70ac0ad62e5e6208596852c8898ec780e4608
+MD5 4fd53b2d4363c9be392b17b9d2b85c68 glib-java-0.2.2.ebuild 2004
+RMD160 4f49868bbfe1187914f703ad649ed0f92ddb2690 glib-java-0.2.2.ebuild 2004
+SHA256 a3c3476e28d4445338dfb1cc79d70ac0ad62e5e6208596852c8898ec780e4608 glib-java-0.2.2.ebuild 2004
+EBUILD glib-java-0.2.3-r1.ebuild 2162 RMD160 b15e054b0f157b43b4fbdc56268197d62bc8052d SHA1 6f70f296fd74fcad845a7eef760183b8e2bd5f25 SHA256 ba695530761b7f77bdc2ed56428e75ae75c365fccac93003bcda865c79f9f5bc
+MD5 f3b6749a3018d8084a4c765ebff2a534 glib-java-0.2.3-r1.ebuild 2162
+RMD160 b15e054b0f157b43b4fbdc56268197d62bc8052d glib-java-0.2.3-r1.ebuild 2162
+SHA256 ba695530761b7f77bdc2ed56428e75ae75c365fccac93003bcda865c79f9f5bc glib-java-0.2.3-r1.ebuild 2162
+EBUILD glib-java-0.2.3.ebuild 1965 RMD160 e4d8e21b52fa1250aa24a608d23b36535889fe7a SHA1 767e6eb794f2947b5307c2933752dfe133ecc48c SHA256 c6218b651ade25f548511083f84b9071fcbe882bc904f979f698dfa0a7948644
+MD5 979cf07ddaf6d03f8a31923fe156525a glib-java-0.2.3.ebuild 1965
+RMD160 e4d8e21b52fa1250aa24a608d23b36535889fe7a glib-java-0.2.3.ebuild 1965
+SHA256 c6218b651ade25f548511083f84b9071fcbe882bc904f979f698dfa0a7948644 glib-java-0.2.3.ebuild 1965
+MISC ChangeLog 2044 RMD160 528eda59263ea1b75c8ffcd69dcf1d822e89deb8 SHA1 1f5609415191103997b958e5df7ed1d1babb0da2 SHA256 a6f95ff6989d4c7f53bfbc33f94dca7c58d9d217157a6503e8a126f091a0d0f7
+MD5 9b3c182dcaeb7af9ed4591cf5e1f6b50 ChangeLog 2044
+RMD160 528eda59263ea1b75c8ffcd69dcf1d822e89deb8 ChangeLog 2044
+SHA256 a6f95ff6989d4c7f53bfbc33f94dca7c58d9d217157a6503e8a126f091a0d0f7 ChangeLog 2044
+MISC metadata.xml 251 RMD160 694f584a18d47a4cff16db8ae42496f2829c2e97 SHA1 ae5c4821f81d9c2d61f1fe2c1ba2b0cacc9197e6 SHA256 adb4aacc19c29c6e1d42606c7cabaef85edacabf26ef69c1cbc79f4b749351d0
+MD5 01c5680508495a6c9737daaa2a47b555 metadata.xml 251
+RMD160 694f584a18d47a4cff16db8ae42496f2829c2e97 metadata.xml 251
+SHA256 adb4aacc19c29c6e1d42606c7cabaef85edacabf26ef69c1cbc79f4b749351d0 metadata.xml 251
 MD5 8f4c95d3f52c8f0664fcb8b02b969d25 files/digest-glib-java-0.2.1 247
 RMD160 4a84590b8c2b0afd2e3ae39c6466d35929a5bcd1 files/digest-glib-java-0.2.1 247
 SHA256 63a2618267f19158e6bcfe028999e80ced940aa3461f63441fedfe2d37015c8d files/digest-glib-java-0.2.1 247
@@ -48,10 +45,3 @@ SHA256 780864c68aa4c69d8db86bc0bf78d2d79a20106b96ed62736ac678aa7637d8b0 files/di
 MD5 6fefbc436dfe3bc884f2587845ee88fe files/digest-glib-java-0.2.3-r1 247
 RMD160 7f2e9be95b15a40aa25ffda3b77a00378e0553d4 files/digest-glib-java-0.2.3-r1 247
 SHA256 780864c68aa4c69d8db86bc0bf78d2d79a20106b96ed62736ac678aa7637d8b0 files/digest-glib-java-0.2.3-r1 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFEu+DuomPajV0RnrERAiCOAJoC5A/IRzWZqSZkqeCh5rVkFuvgQQCfS9il
-XrwfinLQQq01wV0QWwB6o3w=
-=Imz0
------END PGP SIGNATURE-----
diff --git a/dev-java/glib-java/glib-java-0.2.1.ebuild b/dev-java/glib-java/glib-java-0.2.1.ebuild
index a8f8333c4a70..ee78f3941e62 100644
--- a/dev-java/glib-java/glib-java-0.2.1.ebuild
+++ b/dev-java/glib-java/glib-java-0.2.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/glib-java/glib-java-0.2.1.ebuild,v 1.3 2005/11/19 21:19:45 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/glib-java/glib-java-0.2.1.ebuild,v 1.4 2006/09/14 19:45:23 nichoj Exp $
 
 # Must be before the gnome.org inherit
 GNOME_TARBALL_SUFFIX="gz"
-
 inherit java-pkg eutils gnome.org
 
 DESCRIPTION="Java bindings for glib"
@@ -18,16 +17,14 @@ SLOT="0.2"
 KEYWORDS="~x86 ~amd64"
 IUSE="doc gcj"
 
-DEPS=">=dev-libs/glib-2.8.1
-		dev-util/pkgconfig"
-
+DEPS=">=dev-libs/glib-2.8.1"
 DEPEND=">=virtual/jdk-1.4
-		>=sys-apps/sed-4
 		${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
@@ -56,9 +53,9 @@ src_unpack() {
 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/glib-java/glib-java-0.2.2.ebuild b/dev-java/glib-java/glib-java-0.2.2.ebuild
index 690e0cb32845..c6247c3f18b3 100644
--- a/dev-java/glib-java/glib-java-0.2.2.ebuild
+++ b/dev-java/glib-java/glib-java-0.2.2.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/glib-java/glib-java-0.2.2.ebuild,v 1.3 2006/03/04 22:24:15 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/glib-java/glib-java-0.2.2.ebuild,v 1.4 2006/09/14 19:45:23 nichoj Exp $
 
 # Must be before the gnome.org inherit
 GNOME_TARBALL_SUFFIX="gz"
-
 inherit java-pkg eutils gnome.org
 
 DESCRIPTION="Java bindings for glib"
@@ -18,17 +17,16 @@ SLOT="0.2"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc gcj source"
 
-DEPS=">=dev-libs/glib-2.8.1
-		dev-util/pkgconfig"
-
+DEPS=">=dev-libs/glib-2.8.1"
 DEPEND=">=virtual/jdk-1.4
 		>=sys-apps/sed-4
 		source? ( app-arch/zip )
 		${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
@@ -56,9 +54,9 @@ src_unpack() {
 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/glib-java/glib-java-0.2.3-r1.ebuild b/dev-java/glib-java/glib-java-0.2.3-r1.ebuild
index e7280804c7dd..3f633bfacdc0 100644
--- a/dev-java/glib-java/glib-java-0.2.3-r1.ebuild
+++ b/dev-java/glib-java/glib-java-0.2.3-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/glib-java/glib-java-0.2.3-r1.ebuild,v 1.4 2006/07/17 19:11:57 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/glib-java/glib-java-0.2.3-r1.ebuild,v 1.5 2006/09/14 19:45:23 nichoj Exp $
 
 # Must be before the gnome.org inherit
 GNOME_TARBALL_SUFFIX="gz"
-
 inherit java-pkg eutils gnome.org
 
 DESCRIPTION="Java bindings for glib"
@@ -18,17 +17,15 @@ SLOT="0.2"
 KEYWORDS="amd64 ppc x86"
 IUSE="doc gcj source"
 
-DEPS=">=dev-libs/glib-2.8.1
-		dev-util/pkgconfig"
-
+DEPS=">=dev-libs/glib-2.8.1"
 DEPEND=">=virtual/jdk-1.4
-		>=sys-apps/sed-4
 		source? ( app-arch/zip )
 		${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
@@ -58,9 +55,9 @@ src_compile() {
 	local myflags
 	use gcj || myflags="${myflags} --without-gcj-compile"
 	econf ${myflags} \
-		  $(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/glib-java/glib-java-0.2.3.ebuild b/dev-java/glib-java/glib-java-0.2.3.ebuild
index f200f2133d35..d15971426de4 100644
--- a/dev-java/glib-java/glib-java-0.2.3.ebuild
+++ b/dev-java/glib-java/glib-java-0.2.3.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/glib-java/glib-java-0.2.3.ebuild,v 1.2 2006/03/04 22:24:15 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/glib-java/glib-java-0.2.3.ebuild,v 1.3 2006/09/14 19:45:23 nichoj Exp $
 
 # Must be before the gnome.org inherit
 GNOME_TARBALL_SUFFIX="gz"
-
 inherit java-pkg eutils gnome.org
 
 DESCRIPTION="Java bindings for glib"
@@ -18,15 +17,12 @@ SLOT="0.2"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc gcj source"
 
-DEPS=">=dev-libs/glib-2.8.1
-		dev-util/pkgconfig"
-
+DEPS=">=dev-libs/glib-2.8.1"
 DEPEND=">=virtual/jdk-1.4
-		>=sys-apps/sed-4
 		source? ( app-arch/zip )
 		${DEPS}"
 RDEPEND=">=virtual/jre-1.4
-		 ${DEPS}"
+		${DEPS}"
 
 pkg_setup() {
 	if use gcj ; then
@@ -56,9 +52,9 @@ src_unpack() {
 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/glib-java/metadata.xml b/dev-java/glib-java/metadata.xml
index d385ddce3bc9..fbf5eec7cd7c 100644
--- a/dev-java/glib-java/metadata.xml
+++ b/dev-java/glib-java/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
-	<maintainer>
-		<email>compnerd@gentoo.org</email>
-		<name>Saleem Abdulrasool</name>
-	</maintainer>
 	<longdescription lang="en">
 		Core library for JAVA bindings for GNOME
 	</longdescription>