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

(Portage version: 2.1.1)

5 files changed, 32 insertions, 32 deletions

diff --git a/dev-java/cairo-java/ChangeLog b/dev-java/cairo-java/ChangeLog
index 3ffc07d57093..ae3db4ba3c68 100644
--- a/dev-java/cairo-java/ChangeLog
+++ b/dev-java/cairo-java/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/cairo-java
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/cairo-java/ChangeLog,v 1.10 2006/07/17 19:11:28 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cairo-java/ChangeLog,v 1.11 2006/09/14 19:39:34 nichoj Exp $
+
+  14 Sep 2006; Joshua Nichols <nichoj@gentoo.org> metadata.xml,
+  cairo-java-1.0.1.ebuild, cairo-java-1.0.2.ebuild,
+  cairo-java-1.0.2-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>
   cairo-java-1.0.2-r1.ebuild:
diff --git a/dev-java/cairo-java/cairo-java-1.0.1.ebuild b/dev-java/cairo-java/cairo-java-1.0.1.ebuild
index 170127bfc27a..2a59db9bf44d 100644
--- a/dev-java/cairo-java/cairo-java-1.0.1.ebuild
+++ b/dev-java/cairo-java/cairo-java-1.0.1.ebuild
@@ -1,6 +1,6 @@
-# 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/cairo-java/cairo-java-1.0.1.ebuild,v 1.4 2005/11/19 21:22:20 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cairo-java/cairo-java-1.0.1.ebuild,v 1.5 2006/09/14 19:39:34 nichoj Exp $
 
 # Must be before the gnome.org inherit
 GNOME_TARBALL_SUFFIX="gz"
@@ -19,18 +19,18 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc gcj"
 
 DEPS=">=x11-libs/cairo-1.0.0-r2
-	  >=dev-java/glib-java-0.2.1
-	  >=media-libs/fontconfig-2.3.1
-	  >=dev-libs/glib-2.6.0
-		dev-util/pkgconfig"
+	>=dev-java/glib-java-0.2.1
+	>=media-libs/fontconfig-2.3.1
+	>=dev-libs/glib-2.6.0"
 
 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
@@ -58,9 +58,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/cairo-java/cairo-java-1.0.2-r1.ebuild b/dev-java/cairo-java/cairo-java-1.0.2-r1.ebuild
index 2d3b162043bc..7133cf35d0f8 100644
--- a/dev-java/cairo-java/cairo-java-1.0.2-r1.ebuild
+++ b/dev-java/cairo-java/cairo-java-1.0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/cairo-java/cairo-java-1.0.2-r1.ebuild,v 1.4 2006/07/17 19:11:28 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cairo-java/cairo-java-1.0.2-r1.ebuild,v 1.5 2006/09/14 19:39:34 nichoj Exp $
 
 # Must be before the gnome.org inherit
 GNOME_TARBALL_SUFFIX="gz"
@@ -19,19 +19,18 @@ KEYWORDS="amd64 ppc x86"
 IUSE="doc gcj source"
 
 DEPS=">=x11-libs/cairo-1.0.0-r2
-	  >=dev-java/glib-java-0.2.2
-	  >=media-libs/fontconfig-2.3.1
-	  >=dev-libs/glib-2.6.0
-	    dev-util/pkgconfig"
+	>=dev-java/glib-java-0.2.2
+	>=media-libs/fontconfig-2.3.1
+	>=dev-libs/glib-2.6.0"
 
 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
diff --git a/dev-java/cairo-java/cairo-java-1.0.2.ebuild b/dev-java/cairo-java/cairo-java-1.0.2.ebuild
index a5b1c2e34a71..2abd1f48fdbb 100644
--- a/dev-java/cairo-java/cairo-java-1.0.2.ebuild
+++ b/dev-java/cairo-java/cairo-java-1.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/cairo-java/cairo-java-1.0.2.ebuild,v 1.3 2006/01/11 01:43:12 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cairo-java/cairo-java-1.0.2.ebuild,v 1.4 2006/09/14 19:39:34 nichoj Exp $
 
 # Must be before the gnome.org inherit
 GNOME_TARBALL_SUFFIX="gz"
@@ -19,19 +19,18 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc gcj source"
 
 DEPS=">=x11-libs/cairo-1.0.0-r2
-	  >=dev-java/glib-java-0.2.2
-	  >=media-libs/fontconfig-2.3.1
-	  >=dev-libs/glib-2.6.0
-	    dev-util/pkgconfig"
+	>=dev-java/glib-java-0.2.2
+	>=media-libs/fontconfig-2.3.1
+	>=dev-libs/glib-2.6.0"
 
 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
@@ -46,9 +45,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/cairo-java/metadata.xml b/dev-java/cairo-java/metadata.xml
index e3cc8f4cf36c..5f39b6968935 100644
--- a/dev-java/cairo-java/metadata.xml
+++ b/dev-java/cairo-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">
 		JAVA bindings for CAIRO.
 	</longdescription>