dojar --> java-pkg_dojar

42 files changed, 165 insertions, 88 deletions

diff --git a/app-portage/portagemaster/ChangeLog b/app-portage/portagemaster/ChangeLog
index 52af6b6b2214..a5320f58ad88 100644
--- a/app-portage/portagemaster/ChangeLog
+++ b/app-portage/portagemaster/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-portage/portagemaster
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/portagemaster/ChangeLog,v 1.13 2004/06/24 21:50:46 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/portagemaster/ChangeLog,v 1.14 2004/10/16 23:07:08 axxo Exp $
+
+  17 Oct 2004; Thomas Matthijs <axxo@gentoo.org> portagemaster-0.2.0.ebuild,
+  portagemaster-0.2.1.ebuild:
+  dojar --> java-pkg_dojar
 
   02 Jun 2004; Aron Griffis <agriffis@gentoo.org> portagemaster-0.2.0.ebuild,
   portagemaster-0.2.1.ebuild:
diff --git a/app-portage/portagemaster/portagemaster-0.2.0.ebuild b/app-portage/portagemaster/portagemaster-0.2.0.ebuild
index 0abd663e09ac..7c7069790b16 100644
--- a/app-portage/portagemaster/portagemaster-0.2.0.ebuild
+++ b/app-portage/portagemaster/portagemaster-0.2.0.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/portagemaster/portagemaster-0.2.0.ebuild,v 1.8 2004/06/24 21:50:46 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/portagemaster/portagemaster-0.2.0.ebuild,v 1.9 2004/10/16 23:07:08 axxo Exp $
+
+inherit java-pkg
 
 DESCRIPTION="A java portage browser and installer"
 HOMEPAGE="http://portagemaster.sourceforge.net/"
@@ -42,6 +44,6 @@ src_compile() {
 }
 
 src_install() {
-	dojar packages/portagemaster-${PV}.jar
+	java-pkg_dojar packages/portagemaster-${PV}.jar
 	dobin src/portagemaster
 }
diff --git a/app-portage/portagemaster/portagemaster-0.2.1.ebuild b/app-portage/portagemaster/portagemaster-0.2.1.ebuild
index 9cbf5c2cb95d..569845bc7ee6 100644
--- a/app-portage/portagemaster/portagemaster-0.2.1.ebuild
+++ b/app-portage/portagemaster/portagemaster-0.2.1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/portagemaster/portagemaster-0.2.1.ebuild,v 1.12 2004/06/24 21:50:46 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/portagemaster/portagemaster-0.2.1.ebuild,v 1.13 2004/10/16 23:07:08 axxo Exp $
+
+inherit java-pkg
 
 DESCRIPTION="A java portage browser and installer"
 HOMEPAGE="http://portagemaster.sourceforge.net/"
@@ -42,6 +44,6 @@ src_compile() {
 }
 
 src_install() {
-	dojar packages/portagemaster-${PV}.jar
+	java-pkg_dojar packages/portagemaster-${PV}.jar
 	dobin src/portagemaster
 }
diff --git a/app-sci/glpk/ChangeLog b/app-sci/glpk/ChangeLog
index 69c43d6dbe47..ca47d690eb9c 100644
--- a/app-sci/glpk/ChangeLog
+++ b/app-sci/glpk/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-sci/glpk
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/glpk/ChangeLog,v 1.4 2004/06/24 22:01:12 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/glpk/ChangeLog,v 1.5 2004/10/16 23:07:30 axxo Exp $
+
+  17 Oct 2004; Thomas Matthijs <axxo@gentoo.org> glpk-4.2.ebuild:
+  dojar --> java-pkg_dojar
 
   19 Apr 2004; Patrick Kursawe <phosphan@gentoo.org> glpk-4.2.ebuild:
   Added IUSE, fixed bugs #44467 and #46955.
diff --git a/app-sci/glpk/glpk-4.2.ebuild b/app-sci/glpk/glpk-4.2.ebuild
index 194abb7cdaf3..01b42f7ae9e7 100644
--- a/app-sci/glpk/glpk-4.2.ebuild
+++ b/app-sci/glpk/glpk-4.2.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/glpk/glpk-4.2.ebuild,v 1.4 2004/06/24 22:01:12 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/glpk/glpk-4.2.ebuild,v 1.5 2004/10/16 23:07:30 axxo Exp $
+
+inherit java-pkg
 
 DESCRIPTION="GNU Linear Programming Kit"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/${PN}/"
+HOMEPAGE="http://www.gnu.org/software/glpk/"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -53,7 +55,7 @@ src_install() {
 	if use java; then
 		cd ${S}/contrib/jni
 		dolib c/libglpk_jni.so
-		dojar java/glpk.jar
+		java-pkg_dojar java/glpk.jar
 		docinto java
 		mv contrib/java/sample/README contrib/java/sample/README.sample
 		dodoc contrib/java/README contrib/java/sample/*
diff --git a/app-text/trang/ChangeLog b/app-text/trang/ChangeLog
index 2e6ae971c939..5dee86eb19e1 100644
--- a/app-text/trang/ChangeLog
+++ b/app-text/trang/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/trang
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/trang/ChangeLog,v 1.4 2004/08/24 03:20:57 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/trang/ChangeLog,v 1.5 2004/10/16 23:07:49 axxo Exp $
+
+  17 Oct 2004; Thomas Matthijs <axxo@gentoo.org> trang-20030619.ebuild:
+  dojar --> java-pkg_dojar
 
   23 Aug 2004; Chris Aniszczyk <zx@gentoo.org> trang-20030619.ebuild:
   Marking stable on x86
diff --git a/app-text/trang/trang-20030619.ebuild b/app-text/trang/trang-20030619.ebuild
index a19010245240..fcbf05b18462 100644
--- a/app-text/trang/trang-20030619.ebuild
+++ b/app-text/trang/trang-20030619.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/trang/trang-20030619.ebuild,v 1.5 2004/08/24 03:20:57 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/trang/trang-20030619.ebuild,v 1.6 2004/10/16 23:07:49 axxo Exp $
+
+inherit java-pkg
 
 DESCRIPTION="Trang: Multi-format schema converter based on RELAX NG"
 HOMEPAGE="http://thaiopensource.com/relaxng/trang.html"
@@ -16,7 +18,7 @@ DEPEND=""
 
 
 src_install() {
-	dojar trang.jar
+	java-pkg_dojar trang.jar
 	cat >trang <<'EOF'
 #!/bin/sh
 exec `java-config --java` -jar `java-config -p trang` "$@"
diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog
index 79f89691ce6d..b3750cfff40e 100644
--- a/dev-db/postgresql/ChangeLog
+++ b/dev-db/postgresql/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/postgresql
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.145 2004/10/16 14:01:57 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.146 2004/10/16 23:08:50 axxo Exp $
+
+  17 Oct 2004; Thomas Matthijs <axxo@gentoo.org> postgresql-7.3.6-r1.ebuild,
+  postgresql-7.3.7-r1.ebuild, postgresql-7.3.7-r2.ebuild,
+  postgresql-7.3.7.ebuild, postgresql-7.4.3-r1.ebuild,
+  postgresql-7.4.3.ebuild, postgresql-7.4.5-r1.ebuild,
+  postgresql-7.4.5-r2.ebuild, postgresql-7.4.5.ebuild:
+  dojar --> java-pkg_dojar
 
   16 Oct 2004; Danny van Dyk <kugelfang@gentoo.org>
   postgresql-7.3.7-r2.ebuild, postgresql-7.4.5-r2.ebuild:
diff --git a/dev-db/postgresql/postgresql-7.3.6-r1.ebuild b/dev-db/postgresql/postgresql-7.3.6-r1.ebuild
index a47da10f8ea5..d846881b75d9 100644
--- a/dev-db/postgresql/postgresql-7.3.6-r1.ebuild
+++ b/dev-db/postgresql/postgresql-7.3.6-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.6-r1.ebuild,v 1.6 2004/07/05 22:20:02 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.6-r1.ebuild,v 1.7 2004/10/16 23:08:50 axxo Exp $
 
-inherit flag-o-matic
+inherit flag-o-matic java-pkg
 
 DESCRIPTION="sophisticated Object-Relational DBMS"
 
@@ -131,7 +131,7 @@ src_install() {
 	dodoc contrib/adddepend/*
 
 	if use java; then
-		dojar ${D}/usr/share/postgresql/java/postgresql.jar
+		java-pkg_dojar ${D}/usr/share/postgresql/java/postgresql.jar
 		rm ${D}/usr/share/postgresql/java/postgresql.jar
 	fi
 
diff --git a/dev-db/postgresql/postgresql-7.3.7-r1.ebuild b/dev-db/postgresql/postgresql-7.3.7-r1.ebuild
index f4815d1e5fc5..00d13a5f112e 100644
--- a/dev-db/postgresql/postgresql-7.3.7-r1.ebuild
+++ b/dev-db/postgresql/postgresql-7.3.7-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.7-r1.ebuild,v 1.1 2004/10/02 23:57:49 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.7-r1.ebuild,v 1.2 2004/10/16 23:08:50 axxo Exp $
 
-inherit eutils gnuconfig flag-o-matic
+inherit eutils gnuconfig flag-o-matic java-pkg
 
 DESCRIPTION="sophisticated Object-Relational DBMS"
 
@@ -133,7 +133,7 @@ src_install() {
 	if use java; then
 		# we need to remove jar file after dojar; otherwise two same jar
 		# file are installed.
-		dojar ${D}/usr/share/postgresql/java/postgresql.jar
+		java-pkg_dojar ${D}/usr/share/postgresql/java/postgresql.jar
 		rm ${D}/usr/share/postgresql/java/postgresql.jar
 	fi
 
diff --git a/dev-db/postgresql/postgresql-7.3.7-r2.ebuild b/dev-db/postgresql/postgresql-7.3.7-r2.ebuild
index 073718506aa0..30dcf5dba8d1 100644
--- a/dev-db/postgresql/postgresql-7.3.7-r2.ebuild
+++ b/dev-db/postgresql/postgresql-7.3.7-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.7-r2.ebuild,v 1.6 2004/10/16 14:01:57 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.7-r2.ebuild,v 1.7 2004/10/16 23:08:50 axxo Exp $
 
-inherit eutils gnuconfig flag-o-matic
+inherit eutils gnuconfig flag-o-matic java-pkg
 
 DESCRIPTION="sophisticated Object-Relational DBMS"
 
@@ -134,7 +134,7 @@ src_install() {
 	if use java; then
 		# we need to remove jar file after dojar; otherwise two same jar
 		# file are installed.
-		dojar ${D}/usr/share/postgresql/java/postgresql.jar
+		java-pkg_dojar ${D}/usr/share/postgresql/java/postgresql.jar
 		rm ${D}/usr/share/postgresql/java/postgresql.jar
 	fi
 
diff --git a/dev-db/postgresql/postgresql-7.3.7.ebuild b/dev-db/postgresql/postgresql-7.3.7.ebuild
index d469bcce34dd..e8cfebf9922c 100644
--- a/dev-db/postgresql/postgresql-7.3.7.ebuild
+++ b/dev-db/postgresql/postgresql-7.3.7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.7.ebuild,v 1.3 2004/10/08 15:30:29 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.7.ebuild,v 1.4 2004/10/16 23:08:50 axxo Exp $
 
-inherit gnuconfig flag-o-matic
+inherit gnuconfig flag-o-matic java-pkg
 
 DESCRIPTION="sophisticated Object-Relational DBMS"
 
@@ -133,7 +133,7 @@ src_install() {
 	if use java; then
 		# we need to remove jar file after dojar; otherwise two same jar
 		# file are installed.
-		dojar ${D}/usr/share/postgresql/java/postgresql.jar
+		java-pkg_dojar ${D}/usr/share/postgresql/java/postgresql.jar
 		rm ${D}/usr/share/postgresql/java/postgresql.jar
 	fi
 
diff --git a/dev-db/postgresql/postgresql-7.4.3-r1.ebuild b/dev-db/postgresql/postgresql-7.4.3-r1.ebuild
index 573ff95a60dd..6667e9102271 100644
--- a/dev-db/postgresql/postgresql-7.4.3-r1.ebuild
+++ b/dev-db/postgresql/postgresql-7.4.3-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.3-r1.ebuild,v 1.9 2004/10/09 23:17:17 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.3-r1.ebuild,v 1.10 2004/10/16 23:08:50 axxo Exp $
 
-inherit eutils gnuconfig flag-o-matic
+inherit eutils gnuconfig flag-o-matic java-pkg
 
 DESCRIPTION="sophisticated Object-Relational DBMS."
 HOMEPAGE="http://www.postgresql.org/"
@@ -157,9 +157,9 @@ src_install() {
 	if use java; then
 		# we need to remove jar file after dojar; otherwise two same jar
 		# file are installed.
-		dojar ${D}/usr/share/postgresql/java/postgresql.jar || die
+		java-pkg_dojar ${D}/usr/share/postgresql/java/postgresql.jar || die
 		rm ${D}/usr/share/postgresql/java/postgresql.jar
-		dojar ${D}/usr/share/postgresql/java/postgresql-examples.jar || die
+		java-pkg_dojar ${D}/usr/share/postgresql/java/postgresql-examples.jar || die
 		rm ${D}/usr/share/postgresql/java/postgresql-examples.jar
 	fi
 
diff --git a/dev-db/postgresql/postgresql-7.4.3.ebuild b/dev-db/postgresql/postgresql-7.4.3.ebuild
index 3042ba23de9e..03b3be71ae7c 100644
--- a/dev-db/postgresql/postgresql-7.4.3.ebuild
+++ b/dev-db/postgresql/postgresql-7.4.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.3.ebuild,v 1.7 2004/10/09 23:17:17 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.3.ebuild,v 1.8 2004/10/16 23:08:50 axxo Exp $
 
-inherit eutils gnuconfig flag-o-matic
+inherit eutils gnuconfig flag-o-matic java-pkg
 
 DESCRIPTION="sophisticated Object-Relational DBMS."
 HOMEPAGE="http://www.postgresql.org/"
@@ -157,9 +157,9 @@ src_install() {
 	if use java; then
 		# we need to remove jar file after dojar; otherwise two same jar
 		# file are installed.
-		dojar ${D}/usr/share/postgresql/java/postgresql.jar || die
+		java-pkg_dojar ${D}/usr/share/postgresql/java/postgresql.jar || die
 		rm ${D}/usr/share/postgresql/java/postgresql.jar
-		dojar ${D}/usr/share/postgresql/java/postgresql-examples.jar || die
+		java-pkg_dojar ${D}/usr/share/postgresql/java/postgresql-examples.jar || die
 		rm ${D}/usr/share/postgresql/java/postgresql-examples.jar
 	fi
 
diff --git a/dev-db/postgresql/postgresql-7.4.5-r1.ebuild b/dev-db/postgresql/postgresql-7.4.5-r1.ebuild
index a20378ba0901..715408e2e722 100644
--- a/dev-db/postgresql/postgresql-7.4.5-r1.ebuild
+++ b/dev-db/postgresql/postgresql-7.4.5-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.5-r1.ebuild,v 1.3 2004/10/09 23:17:17 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.5-r1.ebuild,v 1.4 2004/10/16 23:08:50 axxo Exp $
 
-inherit eutils gnuconfig flag-o-matic
+inherit eutils gnuconfig flag-o-matic java-pkg
 
 DESCRIPTION="sophisticated Object-Relational DBMS."
 HOMEPAGE="http://www.postgresql.org/"
@@ -157,9 +157,9 @@ src_install() {
 	if use java; then
 		# we need to remove jar file after dojar; otherwise two same jar
 		# file are installed.
-		dojar ${D}/usr/share/postgresql/java/postgresql.jar || die
+		java-pkg_dojar ${D}/usr/share/postgresql/java/postgresql.jar || die
 		rm ${D}/usr/share/postgresql/java/postgresql.jar
-		dojar ${D}/usr/share/postgresql/java/postgresql-examples.jar || die
+		java-pkg_dojar ${D}/usr/share/postgresql/java/postgresql-examples.jar || die
 		rm ${D}/usr/share/postgresql/java/postgresql-examples.jar
 	fi
 
diff --git a/dev-db/postgresql/postgresql-7.4.5-r2.ebuild b/dev-db/postgresql/postgresql-7.4.5-r2.ebuild
index 447f9f603d5a..af75948e701c 100644
--- a/dev-db/postgresql/postgresql-7.4.5-r2.ebuild
+++ b/dev-db/postgresql/postgresql-7.4.5-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.5-r2.ebuild,v 1.10 2004/10/16 14:01:57 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.5-r2.ebuild,v 1.11 2004/10/16 23:08:50 axxo Exp $
 
-inherit eutils gnuconfig flag-o-matic
+inherit eutils gnuconfig flag-o-matic java-pkg
 
 DESCRIPTION="sophisticated Object-Relational DBMS."
 HOMEPAGE="http://www.postgresql.org/"
@@ -159,9 +159,9 @@ src_install() {
 	if use java; then
 		# we need to remove jar file after dojar; otherwise two same jar
 		# file are installed.
-		dojar ${D}/usr/share/postgresql/java/postgresql.jar || die
+		java-pkg_dojar ${D}/usr/share/postgresql/java/postgresql.jar || die
 		rm ${D}/usr/share/postgresql/java/postgresql.jar
-		dojar ${D}/usr/share/postgresql/java/postgresql-examples.jar || die
+		java-pkg_dojar ${D}/usr/share/postgresql/java/postgresql-examples.jar || die
 		rm ${D}/usr/share/postgresql/java/postgresql-examples.jar
 	fi
 
diff --git a/dev-db/postgresql/postgresql-7.4.5.ebuild b/dev-db/postgresql/postgresql-7.4.5.ebuild
index f929ab4c0708..6409368f5db9 100644
--- a/dev-db/postgresql/postgresql-7.4.5.ebuild
+++ b/dev-db/postgresql/postgresql-7.4.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.5.ebuild,v 1.8 2004/10/09 23:17:17 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.5.ebuild,v 1.9 2004/10/16 23:08:50 axxo Exp $
 
-inherit eutils gnuconfig flag-o-matic
+inherit eutils gnuconfig flag-o-matic java-pkg
 
 DESCRIPTION="sophisticated Object-Relational DBMS."
 HOMEPAGE="http://www.postgresql.org/"
@@ -157,9 +157,9 @@ src_install() {
 	if use java; then
 		# we need to remove jar file after dojar; otherwise two same jar
 		# file are installed.
-		dojar ${D}/usr/share/postgresql/java/postgresql.jar || die
+		java-pkg_dojar ${D}/usr/share/postgresql/java/postgresql.jar || die
 		rm ${D}/usr/share/postgresql/java/postgresql.jar
-		dojar ${D}/usr/share/postgresql/java/postgresql-examples.jar || die
+		java-pkg_dojar ${D}/usr/share/postgresql/java/postgresql-examples.jar || die
 		rm ${D}/usr/share/postgresql/java/postgresql-examples.jar
 	fi
 
diff --git a/dev-java/crimson/ChangeLog b/dev-java/crimson/ChangeLog
index 3350a26d85cd..be74793a9c64 100644
--- a/dev-java/crimson/ChangeLog
+++ b/dev-java/crimson/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/crimson
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/crimson/ChangeLog,v 1.6 2004/10/16 17:10:12 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/crimson/ChangeLog,v 1.7 2004/10/16 23:09:09 axxo Exp $
+
+  17 Oct 2004; Thomas Matthijs <axxo@gentoo.org> crimson-1.1.3.ebuild:
+  dojar --> java-pkg_dojar
 
   16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> crimson-1.1.3.ebuild:
   use java-pkg_dohtml instead of dohtml to also install the package-list in
diff --git a/dev-java/crimson/crimson-1.1.3.ebuild b/dev-java/crimson/crimson-1.1.3.ebuild
index 571c1bbb6349..45370c607abf 100644
--- a/dev-java/crimson/crimson-1.1.3.ebuild
+++ b/dev-java/crimson/crimson-1.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/crimson/crimson-1.1.3.ebuild,v 1.6 2004/10/16 17:10:12 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/crimson/crimson-1.1.3.ebuild,v 1.7 2004/10/16 23:09:09 axxo Exp $
 
 inherit java-pkg
 
@@ -18,7 +18,7 @@ src_compile() {
 }
 
 src_install() {
-	dojar build/crimson.jar
+	java-pkg_dojar build/crimson.jar
 	dodoc build/ChangeLog
 	dohtml build/README.html
 	java-pkg_dohtml -r build/docs
diff --git a/dev-java/libreadline-java/ChangeLog b/dev-java/libreadline-java/ChangeLog
index 6fc15b749f6e..bebe5955fe73 100644
--- a/dev-java/libreadline-java/ChangeLog
+++ b/dev-java/libreadline-java/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/libreadline-java
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libreadline-java/ChangeLog,v 1.15 2004/10/16 17:28:58 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libreadline-java/ChangeLog,v 1.16 2004/10/16 23:09:28 axxo Exp $
+
+  17 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  libreadline-java-0.8.0-r1.ebuild:
+  dojar --> java-pkg_dojar
 
   16 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
   libreadline-java-0.8.0-r1.ebuild:
diff --git a/dev-java/libreadline-java/libreadline-java-0.8.0-r1.ebuild b/dev-java/libreadline-java/libreadline-java-0.8.0-r1.ebuild
index 87fcd2a24cae..c7665c095bda 100644
--- a/dev-java/libreadline-java/libreadline-java-0.8.0-r1.ebuild
+++ b/dev-java/libreadline-java/libreadline-java-0.8.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libreadline-java/libreadline-java-0.8.0-r1.ebuild,v 1.6 2004/10/16 17:28:58 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libreadline-java/libreadline-java-0.8.0-r1.ebuild,v 1.7 2004/10/16 23:09:28 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -32,7 +32,7 @@ src_test() { :; }
 
 src_install() {
 	dolib.so *.so
-	dojar *.jar
+	java-pkg_dojar *.jar
 	use doc && java-pkg_dohtml -r api/*
 	dodoc  ChangeLog NEWS README README.1st TODO
 }
diff --git a/dev-java/picocontainer/ChangeLog b/dev-java/picocontainer/ChangeLog
index ead2654fb048..7a0ca43b14dd 100644
--- a/dev-java/picocontainer/ChangeLog
+++ b/dev-java/picocontainer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/picocontainer
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/picocontainer/ChangeLog,v 1.8 2004/10/16 17:32:11 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/picocontainer/ChangeLog,v 1.9 2004/10/16 23:09:47 axxo Exp $
+
+  17 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  picocontainer-1.0_beta3.ebuild, picocontainer-1.0_beta4.ebuild:
+  dojar --> java-pkg_dojar
 
   16 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
   picocontainer-1.0_beta3.ebuild, picocontainer-1.0_beta4.ebuild:
diff --git a/dev-java/picocontainer/picocontainer-1.0_beta3.ebuild b/dev-java/picocontainer/picocontainer-1.0_beta3.ebuild
index 55031cfccaff..961af654153a 100644
--- a/dev-java/picocontainer/picocontainer-1.0_beta3.ebuild
+++ b/dev-java/picocontainer/picocontainer-1.0_beta3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/picocontainer/picocontainer-1.0_beta3.ebuild,v 1.6 2004/10/16 17:32:11 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/picocontainer/picocontainer-1.0_beta3.ebuild,v 1.7 2004/10/16 23:09:47 axxo Exp $
 
 inherit java-pkg
 
@@ -40,5 +40,5 @@ src_compile() {
 src_install() {
 	dodoc LICENSE.txt
 	use doc && ( java-pkg_dohtml -r dist/docs/api )
-	dojar target/picocontainer-1.0.jar
+	java-pkg_dojar target/picocontainer-1.0.jar
 }
diff --git a/dev-java/picocontainer/picocontainer-1.0_beta4.ebuild b/dev-java/picocontainer/picocontainer-1.0_beta4.ebuild
index 1e206df8ced2..36196289a126 100644
--- a/dev-java/picocontainer/picocontainer-1.0_beta4.ebuild
+++ b/dev-java/picocontainer/picocontainer-1.0_beta4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/picocontainer/picocontainer-1.0_beta4.ebuild,v 1.5 2004/10/16 17:32:11 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/picocontainer/picocontainer-1.0_beta4.ebuild,v 1.6 2004/10/16 23:09:47 axxo Exp $
 
 inherit java-pkg
 
@@ -40,5 +40,5 @@ src_compile() {
 src_install() {
 	dodoc LICENSE.txt
 	use doc && ( java-pkg_dohtml -r dist/docs/api )
-	dojar target/picocontainer-1.0.jar
+	java-pkg_dojar target/picocontainer-1.0.jar
 }
diff --git a/dev-java/xdoclet/ChangeLog b/dev-java/xdoclet/ChangeLog
index 1871b7cd1fa0..88a7e5fd9f59 100644
--- a/dev-java/xdoclet/ChangeLog
+++ b/dev-java/xdoclet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/xdoclet
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xdoclet/ChangeLog,v 1.9 2004/10/16 08:58:37 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xdoclet/ChangeLog,v 1.10 2004/10/16 23:10:06 axxo Exp $
+
+  17 Oct 2004; Thomas Matthijs <axxo@gentoo.org> xdoclet-1.2.0_beta1.ebuild,
+  xdoclet-1.2.1.ebuild:
+  dojar --> java-pkg_dojar
 
   16 Oct 2004; Dylan Carlson <absinthe@gentoo.org>
   xdoclet-1.2.0_beta1.ebuild, xdoclet-1.2.1.ebuild:
diff --git a/dev-java/xdoclet/xdoclet-1.2.0_beta1.ebuild b/dev-java/xdoclet/xdoclet-1.2.0_beta1.ebuild
index f96a75439518..6bfd039949c0 100644
--- a/dev-java/xdoclet/xdoclet-1.2.0_beta1.ebuild
+++ b/dev-java/xdoclet/xdoclet-1.2.0_beta1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xdoclet/xdoclet-1.2.0_beta1.ebuild,v 1.9 2004/10/16 08:58:37 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xdoclet/xdoclet-1.2.0_beta1.ebuild,v 1.10 2004/10/16 23:10:06 axxo Exp $
+
+inherit java-pkg
 
 DESCRIPTION="A code-generation engine primarily for EJB"
 HOMEPAGE="http://xdoclet.sf.net/"
@@ -31,7 +33,7 @@ src_compile() {
 }
 
 src_install() {
-	dojar target/lib/*.jar
+	java-pkg_dojar target/lib/*.jar
 	dodoc LICENSE.txt
 	cp -r target/docs target/generated-xdocs samples ${D}/usr/share/doc/${P}
 }
diff --git a/dev-java/xdoclet/xdoclet-1.2.1.ebuild b/dev-java/xdoclet/xdoclet-1.2.1.ebuild
index 5b7b93b9073c..84a591c94bbc 100644
--- a/dev-java/xdoclet/xdoclet-1.2.1.ebuild
+++ b/dev-java/xdoclet/xdoclet-1.2.1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xdoclet/xdoclet-1.2.1.ebuild,v 1.4 2004/10/16 08:58:37 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xdoclet/xdoclet-1.2.1.ebuild,v 1.5 2004/10/16 23:10:06 axxo Exp $
+
+inherit java-pkg
 
 XJAVADOC_PV=1.0.3
 
@@ -48,7 +50,7 @@ src_compile() {
 }
 
 src_install() {
-	dojar target/lib/*.jar
+	java-pkg_dojar target/lib/*.jar
 	dodoc LICENSE.txt
 	cp -r target/docs target/generated-xdocs samples ${D}/usr/share/doc/${P}
 }
diff --git a/dev-lang/helium/ChangeLog b/dev-lang/helium/ChangeLog
index c881b4b49563..b1ee401065e5 100644
--- a/dev-lang/helium/ChangeLog
+++ b/dev-lang/helium/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/helium
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/helium/ChangeLog,v 1.9 2004/07/02 04:27:20 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/helium/ChangeLog,v 1.10 2004/10/16 23:10:26 axxo Exp $
+
+  17 Oct 2004; Thomas Matthijs <axxo@gentoo.org> helium-1.1.ebuild,
+  helium-1.2.ebuild:
+  dojar --> java-pkg_dojar
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> helium-1.1.ebuild,
   helium-1.2.ebuild:
diff --git a/dev-lang/helium/helium-1.1.ebuild b/dev-lang/helium/helium-1.1.ebuild
index 98410a84617f..67888cb08e55 100644
--- a/dev-lang/helium/helium-1.1.ebuild
+++ b/dev-lang/helium/helium-1.1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/helium/helium-1.1.ebuild,v 1.12 2004/07/02 04:27:20 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/helium/helium-1.1.ebuild,v 1.13 2004/10/16 23:10:26 axxo Exp $
+
+inherit java-pkg
 
 DESCRIPTION="Helium (for learning Haskell)"
 HOMEPAGE="http://www.cs.uu.nl/helium"
@@ -55,7 +57,7 @@ src_install() {
 		demodir=${D}/usr/lib/helium/demo \
 		install || die
 	# install hint
-	dojar ${DISTDIR}/Hint.jar
+	java-pkg_dojar ${DISTDIR}/Hint.jar
 	# create wrappers
 	dobin ${FILESDIR}/helium-wrapper
 	dosym /usr/bin/helium-wrapper /usr/bin/helium
diff --git a/dev-lang/helium/helium-1.2.ebuild b/dev-lang/helium/helium-1.2.ebuild
index 8690ac693c85..3e01b15c9f7a 100644
--- a/dev-lang/helium/helium-1.2.ebuild
+++ b/dev-lang/helium/helium-1.2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/helium/helium-1.2.ebuild,v 1.5 2004/07/02 04:27:20 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/helium/helium-1.2.ebuild,v 1.6 2004/10/16 23:10:26 axxo Exp $
+
+inherit java-pkg
 
 DESCRIPTION="Helium (for learning Haskell)"
 HOMEPAGE="http://www.cs.uu.nl/helium"
@@ -50,7 +52,7 @@ src_install() {
 		demodir=${D}/usr/lib/helium/demo \
 		install || die
 	# install hint
-	dojar ${DISTDIR}/Hint.jar
+	java-pkg_dojar ${DISTDIR}/Hint.jar
 	# create wrappers
 	dobin ${FILESDIR}/helium-wrapper
 	dosym /usr/bin/helium-wrapper /usr/bin/helium
diff --git a/dev-lisp/kawa/ChangeLog b/dev-lisp/kawa/ChangeLog
index 7d309b3bdf5b..055e2207e0fa 100644
--- a/dev-lisp/kawa/ChangeLog
+++ b/dev-lisp/kawa/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lisp/kawa
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/kawa/ChangeLog,v 1.5 2004/06/24 23:59:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/kawa/ChangeLog,v 1.6 2004/10/16 23:10:44 axxo Exp $
+
+  17 Oct 2004; Thomas Matthijs <axxo@gentoo.org> kawa-1.7.ebuild:
+  dojar --> java-pkg_dojar
 
 *kawa-1.7 (13 May 2004)
 
diff --git a/dev-lisp/kawa/kawa-1.7.ebuild b/dev-lisp/kawa/kawa-1.7.ebuild
index a4640dea73ae..8226f5a370ef 100644
--- a/dev-lisp/kawa/kawa-1.7.ebuild
+++ b/dev-lisp/kawa/kawa-1.7.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/kawa/kawa-1.7.ebuild,v 1.3 2004/07/13 06:31:57 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/kawa/kawa-1.7.ebuild,v 1.4 2004/10/16 23:10:44 axxo Exp $
+
+inherit java-pkg
 
 DESCRIPTION="Kawa, the Java-based Scheme system"
 HOMEPAGE="http://www.gnu.org/software/kawa/"
@@ -28,7 +30,7 @@ src_compile() {
 src_install () {
 	make DESTDIR=${D} install || die
 	rm -rf ${D}/usr/share/kawa/ ${D}/usr/share/java/
-	dojar kawa-${PV}.jar
+	java-pkg_dojar kawa-${PV}.jar
 	dodoc COPYING TODO README NEWS
 	doinfo doc/kawa.info*
 	dodir /usr/bin
diff --git a/dev-util/xdoclet-bin/ChangeLog b/dev-util/xdoclet-bin/ChangeLog
index 2ac253938194..ce16cfbb76a9 100644
--- a/dev-util/xdoclet-bin/ChangeLog
+++ b/dev-util/xdoclet-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/xdoclet-bin
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xdoclet-bin/ChangeLog,v 1.4 2004/10/16 18:17:52 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xdoclet-bin/ChangeLog,v 1.5 2004/10/16 23:11:03 axxo Exp $
+
+  17 Oct 2004; Thomas Matthijs <axxo@gentoo.org> xdoclet-bin-1.2.1.ebuild,
+  xdoclet-bin-1.2.ebuild:
+  dojar --> java-pkg_dojar
 
   16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> xdoclet-bin-1.2.1.ebuild,
   xdoclet-bin-1.2.ebuild:
diff --git a/dev-util/xdoclet-bin/xdoclet-bin-1.2.1.ebuild b/dev-util/xdoclet-bin/xdoclet-bin-1.2.1.ebuild
index 7fada509ce79..a955e853121d 100644
--- a/dev-util/xdoclet-bin/xdoclet-bin-1.2.1.ebuild
+++ b/dev-util/xdoclet-bin/xdoclet-bin-1.2.1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xdoclet-bin/xdoclet-bin-1.2.1.ebuild,v 1.2 2004/10/16 18:17:52 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xdoclet-bin/xdoclet-bin-1.2.1.ebuild,v 1.3 2004/10/16 23:11:03 axxo Exp $
+
+inherit java-pkg
 
 DESCRIPTION="XDoclet is a code generation engine."
 SRC_URI="mirror://sourceforge/xdoclet/${P}.tgz"
@@ -15,6 +17,6 @@ RESTRICT="nomirror"
 S=${WORKDIR}/${PN%%-bin}-${PV}
 
 src_install() {
-	dojar lib/*.jar
+	java-pkg_dojar lib/*.jar
 	use doc && java-pkg_dohtml -r docs/*
 }
diff --git a/dev-util/xdoclet-bin/xdoclet-bin-1.2.ebuild b/dev-util/xdoclet-bin/xdoclet-bin-1.2.ebuild
index 1fc8da3732d0..e00bf581e6eb 100644
--- a/dev-util/xdoclet-bin/xdoclet-bin-1.2.ebuild
+++ b/dev-util/xdoclet-bin/xdoclet-bin-1.2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xdoclet-bin/xdoclet-bin-1.2.ebuild,v 1.4 2004/10/16 18:17:52 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xdoclet-bin/xdoclet-bin-1.2.ebuild,v 1.5 2004/10/16 23:11:03 axxo Exp $
+
+inherit java-pkg
 
 DESCRIPTION="XDoclet is a code generation engine."
 SRC_URI="mirror://sourceforge/xdoclet/${P}.tgz"
@@ -14,6 +16,6 @@ RDEPEND=" || ( >=virtual/jre-1.4 >=virtual/jdk-1.4 )"
 S=${WORKDIR}/${PN%%-bin}-${PV}
 
 src_install() {
-	dojar lib/*.jar
+	java-pkg_dojar lib/*.jar
 	use doc && java-pkg_dohtml -r docs/*
 }
diff --git a/media-gfx/opcion/ChangeLog b/media-gfx/opcion/ChangeLog
index 547d8dc5edd1..1d9ac9bc93d0 100644
--- a/media-gfx/opcion/ChangeLog
+++ b/media-gfx/opcion/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/opcion
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/opcion/ChangeLog,v 1.1 2004/10/02 07:01:01 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/opcion/ChangeLog,v 1.2 2004/10/16 23:11:21 axxo Exp $
+
+  17 Oct 2004; Thomas Matthijs <axxo@gentoo.org> opcion-1.1.1.ebuild:
+  dojar --> java-pkg_dojar
 
 *opcion-1.1.1 (02 Oct 2004)
 
diff --git a/media-gfx/opcion/opcion-1.1.1.ebuild b/media-gfx/opcion/opcion-1.1.1.ebuild
index bb2cbef49d8d..964f45628817 100644
--- a/media-gfx/opcion/opcion-1.1.1.ebuild
+++ b/media-gfx/opcion/opcion-1.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/opcion/opcion-1.1.1.ebuild,v 1.1 2004/10/02 07:01:01 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/opcion/opcion-1.1.1.ebuild,v 1.2 2004/10/16 23:11:21 axxo Exp $
 
 inherit java-pkg
 
@@ -31,7 +31,7 @@ src_compile() {
 }
 
 src_install() {
-	dojar *.jar
+	java-pkg_dojar *.jar
 
 	echo "#!/bin/sh" > ${T}/opcion
 	echo "java -jar /usr/share/opcion/lib/${MY_P}.jar" >> ${T}/opcion
diff --git a/media-libs/pdflib/ChangeLog b/media-libs/pdflib/ChangeLog
index e17674e8fd00..7ca12c32e925 100644
--- a/media-libs/pdflib/ChangeLog
+++ b/media-libs/pdflib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/pdflib
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/pdflib/ChangeLog,v 1.40 2004/10/07 03:02:34 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/pdflib/ChangeLog,v 1.41 2004/10/16 23:11:42 axxo Exp $
+
+  17 Oct 2004; Thomas Matthijs <axxo@gentoo.org> pdflib-5.0.2.ebuild:
+  dojar --> java-pkg_dojar
 
   06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
   pdflib-5.0.2.ebuild:
diff --git a/media-libs/pdflib/pdflib-5.0.2.ebuild b/media-libs/pdflib/pdflib-5.0.2.ebuild
index 219b452fe061..64ba8f583e37 100644
--- a/media-libs/pdflib/pdflib-5.0.2.ebuild
+++ b/media-libs/pdflib/pdflib-5.0.2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/pdflib/pdflib-5.0.2.ebuild,v 1.21 2004/10/07 03:02:34 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/pdflib/pdflib-5.0.2.ebuild,v 1.22 2004/10/16 23:11:42 axxo Exp $
+
+inherit java-pkg
 
 MY_PN="${PN/pdf/PDF}-Lite"
 MY_P="${MY_PN}-${PV}-Unix-src"
@@ -78,7 +80,7 @@ src_install() {
 
 	# seemant: seems like the makefiles for pdflib generate the .jar file
 	# anyway
-	use java && dojar bind/pdflib/java/pdflib.jar
+	use java && java-pkg_dojar bind/pdflib/java/pdflib.jar
 
 	# karltk: This is definitely NOT how it should be done!
 	# we need this to create pdflib.jar (we will not have the source when
@@ -94,6 +96,6 @@ src_install() {
 #
 #		jar cf pdflib.jar com/pdflib/*.class
 #
-#		dojar pdflib.jar
+#		java-pkg_dojar pdflib.jar
 #	fi
 }
diff --git a/www-servers/orion/ChangeLog b/www-servers/orion/ChangeLog
index 173b8d487472..c7dcc7f8c409 100644
--- a/www-servers/orion/ChangeLog
+++ b/www-servers/orion/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-servers/orion
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/orion/ChangeLog,v 1.4 2004/10/08 13:38:48 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/orion/ChangeLog,v 1.5 2004/10/16 23:12:02 axxo Exp $
+
+  17 Oct 2004; Thomas Matthijs <axxo@gentoo.org> orion-2.0.1.ebuild,
+  orion-2.0.2.ebuild:
+  dojar --> java-pkg_dojar
 
   08 Oct 2004; Thomas Matthijs <axxo@gentoo.org> files/2.0/orion.init,
   files/2.0.1/orion.init, files/2.0.2/orion.init:
diff --git a/www-servers/orion/orion-2.0.1.ebuild b/www-servers/orion/orion-2.0.1.ebuild
index 82d3459e1164..361fd578a5d4 100644
--- a/www-servers/orion/orion-2.0.1.ebuild
+++ b/www-servers/orion/orion-2.0.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/orion/orion-2.0.1.ebuild,v 1.1 2004/08/08 17:51:02 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/orion/orion-2.0.1.ebuild,v 1.2 2004/10/16 23:12:02 axxo Exp $
 
-inherit eutils
+inherit eutils java-pkg
 
 S=${WORKDIR}/${PN}
 
@@ -81,7 +81,7 @@ src_install() {
 	# INSTALL JARS
 	cd ${S}
 	for i in `ls *.jar` ; do
-		dojar $i
+		java-pkg_dojar $i
 	done
 
 	# LINK IN SDK TOOLS.JAR
diff --git a/www-servers/orion/orion-2.0.2.ebuild b/www-servers/orion/orion-2.0.2.ebuild
index 18a126e905b4..e6a64c4d7392 100644
--- a/www-servers/orion/orion-2.0.2.ebuild
+++ b/www-servers/orion/orion-2.0.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/orion/orion-2.0.2.ebuild,v 1.1 2004/08/08 17:51:02 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/orion/orion-2.0.2.ebuild,v 1.2 2004/10/16 23:12:02 axxo Exp $
 
-inherit eutils
+inherit eutils java-pkg
 
 S=${WORKDIR}/${PN}
 
@@ -81,7 +81,7 @@ src_install() {
 	# INSTALL JARS
 	cd ${S}
 	for i in `ls *.jar` ; do
-		dojar $i
+		java-pkg_dojar $i
 	done
 
 	# LINK IN SDK TOOLS.JAR