summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Nichols <nichoj@gentoo.org>2006-09-14 20:20:26 +0000
committerJoshua Nichols <nichoj@gentoo.org>2006-09-14 20:20:26 +0000
commit156cab447682282f45fd5c6650e646ad62e9306d (patch)
tree6ac77302d9976fa7efc108929dbcd47116000ddb /dev-java
parentAdded DEPEND on >=dev-tcltk/itk-3.3-r1 as suggested in bug #115177. Dropped a... (diff)
downloadgentoo-2-156cab447682282f45fd5c6650e646ad62e9306d.tar.gz
gentoo-2-156cab447682282f45fd5c6650e646ad62e9306d.tar.bz2
gentoo-2-156cab447682282f45fd5c6650e646ad62e9306d.zip
Added calls to java-pkg_pkg_setup, see bug #142708. Cleaned up whitespace. Removed compnerd as maintainer.
(Portage version: 2.1.1)
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/libgnome-java/ChangeLog8
-rw-r--r--dev-java/libgnome-java/libgnome-java-2.10.1.ebuild14
-rw-r--r--dev-java/libgnome-java/libgnome-java-2.12.1-r1.ebuild18
-rw-r--r--dev-java/libgnome-java/libgnome-java-2.12.1.ebuild27
-rw-r--r--dev-java/libgnome-java/libgnome-java-2.8.3.1.ebuild18
5 files changed, 43 insertions, 42 deletions
diff --git a/dev-java/libgnome-java/ChangeLog b/dev-java/libgnome-java/ChangeLog
index cd3121cec666..8e191fe98ac0 100644
--- a/dev-java/libgnome-java/ChangeLog
+++ b/dev-java/libgnome-java/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-java/libgnome-java
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libgnome-java/ChangeLog,v 1.19 2006/07/17 19:13:28 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgnome-java/ChangeLog,v 1.20 2006/09/14 20:20:26 nichoj Exp $
+
+ 14 Sep 2006; Joshua Nichols <nichoj@gentoo.org>
+ libgnome-java-2.8.3.1.ebuild, libgnome-java-2.10.1.ebuild,
+ libgnome-java-2.12.1.ebuild, libgnome-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>
libgnome-java-2.12.1-r1.ebuild:
diff --git a/dev-java/libgnome-java/libgnome-java-2.10.1.ebuild b/dev-java/libgnome-java/libgnome-java-2.10.1.ebuild
index a844b7ec1192..5f48a8f541b4 100644
--- a/dev-java/libgnome-java/libgnome-java-2.10.1.ebuild
+++ b/dev-java/libgnome-java/libgnome-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/libgnome-java/libgnome-java-2.10.1.ebuild,v 1.3 2005/07/19 11:13:38 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgnome-java/libgnome-java-2.10.1.ebuild,v 1.4 2006/09/14 20:20:26 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
@@ -54,7 +54,7 @@ src_compile() {
cd ${S}
#
- # Ordinarily, moving things around post `make install` would do
+ # Ordinarily, moving things around post `make install` would do
# the trick, but there are paths hard coded in .pc files and in the
# `make install` step itself that need to be influenced.
#
@@ -79,7 +79,7 @@ src_install() {
cd ${S}/src/java
find . -name '*.java' | xargs zip ${D}/usr/share/${PN}-${SLOT}/src/libgnome-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/libgnome-java/libgnome-java-2.12.1-r1.ebuild b/dev-java/libgnome-java/libgnome-java-2.12.1-r1.ebuild
index b02d0675629a..8bbb510a13b3 100644
--- a/dev-java/libgnome-java/libgnome-java-2.12.1-r1.ebuild
+++ b/dev-java/libgnome-java/libgnome-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/libgnome-java/libgnome-java-2.12.1-r1.ebuild,v 1.4 2006/07/17 19:13:28 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgnome-java/libgnome-java-2.12.1-r1.ebuild,v 1.5 2006/09/14 20:20:26 nichoj Exp $
# Must be before the gnome.org inherit
GNOME_TARBALL_SUFFIX="gz"
-
inherit java-pkg eutils gnome.org
DESCRIPTION="Java bindings for GNOME"
@@ -19,21 +18,20 @@ KEYWORDS="amd64 ppc x86"
IUSE="doc gcj source"
DEPS=">=gnome-base/libgnome-2.10.0
- >=gnome-base/libgnomeui-2.12.0
- >=gnome-base/libgnomecanvas-2.12.0
- >=dev-java/glib-java-0.2.1
- >=dev-java/libgtk-java-2.8.1
- dev-util/pkgconfig"
+ >=gnome-base/libgnomeui-2.12.0
+ >=gnome-base/libgnomecanvas-2.12.0
+ >=dev-java/glib-java-0.2.1
+ >=dev-java/libgtk-java-2.8.1"
DEPEND=">=virtual/jdk-1.4
- >=sys-apps/sed-4
- ${DEPS}"
+ ${DEPS}"
RDEPEND=">=virtual/jre-1.4
- ${DEPS}"
+ ${DEPS}"
JARNAME="gnome${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/libgnome-java/libgnome-java-2.12.1.ebuild b/dev-java/libgnome-java/libgnome-java-2.12.1.ebuild
index 40e9d7859425..b8d358f94517 100644
--- a/dev-java/libgnome-java/libgnome-java-2.12.1.ebuild
+++ b/dev-java/libgnome-java/libgnome-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/libgnome-java/libgnome-java-2.12.1.ebuild,v 1.5 2005/12/30 02:48:15 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgnome-java/libgnome-java-2.12.1.ebuild,v 1.6 2006/09/14 20:20:26 nichoj Exp $
# Must be before the gnome.org inherit
GNOME_TARBALL_SUFFIX="gz"
-
inherit java-pkg eutils gnome.org
DESCRIPTION="Java bindings for GNOME"
@@ -19,19 +18,17 @@ KEYWORDS="~amd64 ~ppc ~x86"
IUSE="doc gcj"
DEPS=">=gnome-base/libgnome-2.10.0
- >=gnome-base/libgnomeui-2.12.0
- >=gnome-base/libgnomecanvas-2.12.0
- >=dev-java/glib-java-0.2.1
- >=dev-java/libgtk-java-2.8.1
- dev-util/pkgconfig"
-
+ >=gnome-base/libgnomeui-2.12.0
+ >=gnome-base/libgnomecanvas-2.12.0
+ >=dev-java/glib-java-0.2.1
+ >=dev-java/libgtk-java-2.8.1"
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
@@ -46,9 +43,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/libgnome-java/libgnome-java-2.8.3.1.ebuild b/dev-java/libgnome-java/libgnome-java-2.8.3.1.ebuild
index 163603f8dba2..a37807f690d7 100644
--- a/dev-java/libgnome-java/libgnome-java-2.8.3.1.ebuild
+++ b/dev-java/libgnome-java/libgnome-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/libgnome-java/libgnome-java-2.8.3.1.ebuild,v 1.6 2005/09/11 11:25:31 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgnome-java/libgnome-java-2.8.3.1.ebuild,v 1.7 2006/09/14 20:20:26 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
@@ -48,7 +48,7 @@ src_compile() {
cd ${S}
#
- # Ordinarily, moving things around post `make install` would do
+ # Ordinarily, moving things around post `make install` would do
# the trick, but there are paths hard coded in .pc files and in the
# `make install` step itself that need to be influenced.
#
@@ -57,7 +57,7 @@ src_compile() {
--host=${CHOST} \
--prefix=/usr \
${conf} || die "./configure failed"
- make INCLUDES="-I${JDK_HOME}/include -I${JDK_HOME}/include/linux/" || die
+ make INCLUDES="-I${JDK_HOME}/include -I${JDK_HOME}/include/linux/" || die
}
src_install() {
@@ -75,7 +75,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
@@ -86,7 +86,7 @@ src_install() {
cd ${S}/src/java
zip -r ${D}/usr/share/${PN}-${SLOT}/src/libgnome-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}" \