Make the -pre file behave the same way as upstream wrapper script in populating CLASSPATH.

Package-Manager: portage-2.1.2.5

5 files changed, 99 insertions, 13 deletions

diff --git a/dev-db/henplus/ChangeLog b/dev-db/henplus/ChangeLog
index 2c40fdc1ac94..9bec023d3f45 100644
--- a/dev-db/henplus/ChangeLog
+++ b/dev-db/henplus/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/henplus
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/henplus/ChangeLog,v 1.15 2007/04/26 23:06:41 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/henplus/ChangeLog,v 1.16 2007/05/07 16:29:59 betelgeuse Exp $
+
+*henplus-0.9.7-r1 (07 May 2007)
+
+  07 May 2007; Petteri Räty <betelgeuse@gentoo.org> files/henplus.pre,
+  +henplus-0.9.7-r1.ebuild:
+  Make the -pre file behave the same way as upstream wrapper script in
+  populating CLASSPATH.
 
   26 Apr 2007; Petteri Räty <betelgeuse@gentoo.org> henplus-0.9.7.ebuild:
   inherit java-ant-2 to make JAVA_PKG_STRICT happy and stylistic cleanup.
diff --git a/dev-db/henplus/Manifest b/dev-db/henplus/Manifest
index e3ab2c3a51ac..146914461697 100644
--- a/dev-db/henplus/Manifest
+++ b/dev-db/henplus/Manifest
@@ -9,24 +9,28 @@ AUX henplus.patch 1329 RMD160 f43f9085f05f80e274b3fe139f8a2cb144e26b68 SHA1 4b8c
 MD5 9dd8009f86e55c8154dcc8d97e35bc74 files/henplus.patch 1329
 RMD160 f43f9085f05f80e274b3fe139f8a2cb144e26b68 files/henplus.patch 1329
 SHA256 f535509b226772439ed05f727fa5083a16aef68e9bb25620842cb1a4105add8c files/henplus.patch 1329
-AUX henplus.pre 755 RMD160 43bc3a35733437aba608f7eb140f7b13a7fc9a6e SHA1 8c6d8c79aef88e8147c2c5f21420a808a0db1755 SHA256 8d76d36e80a5b6bf68b3bc0656214171c1fe7081a1cece92755801d15c48b83b
-MD5 ab2d7529fab1bda936b7686f27730b17 files/henplus.pre 755
-RMD160 43bc3a35733437aba608f7eb140f7b13a7fc9a6e files/henplus.pre 755
-SHA256 8d76d36e80a5b6bf68b3bc0656214171c1fe7081a1cece92755801d15c48b83b files/henplus.pre 755
+AUX henplus.pre 1418 RMD160 081ee34a05050686188d26c9b7faf786c9db8027 SHA1 59aa42d756568e4bca383f7fc7b75dff511b08f2 SHA256 cfd948b2b124202cc6c30d95ca29ce47c6ec43eae8fc6724e2fcd978a4442784
+MD5 29e4cc9af3d07cb5430bca03cc473203 files/henplus.pre 1418
+RMD160 081ee34a05050686188d26c9b7faf786c9db8027 files/henplus.pre 1418
+SHA256 cfd948b2b124202cc6c30d95ca29ce47c6ec43eae8fc6724e2fcd978a4442784 files/henplus.pre 1418
 DIST henplus-0.9.5.tar.gz 106161 RMD160 06d6ec9e4955e3fc35a195a2b2ce0a516e59497f SHA1 8282090268cd9aedad4bda6bfefe89c7751f6a57 SHA256 d324b1ebdb417c9e65638a8e184be79914419f38010fddd6d8a62170a287c426
 DIST henplus-0.9.7.tar.gz 219625 RMD160 42c8067f8b0f205a34cb79bd053650debe9382e3 SHA1 d6e19c5ea6ad22a0b2913e800609d5211c38ee86 SHA256 9dff883c30c377a5e2c58928ad7442ed94710252df0f1d96fc509063839d33e7
 EBUILD henplus-0.9.5-r2.ebuild 1144 RMD160 ef2b869bdd01ae16dfe8ee0c99595793384f912e SHA1 391f8ebedf10dd3019379ba5a25f09a33e51af66 SHA256 3b951500342568f2ab2b6c7122171d6b0695d2bf4651106cf054f8816c27a792
 MD5 47d8e2740a8a01b972f65adc64b50366 henplus-0.9.5-r2.ebuild 1144
 RMD160 ef2b869bdd01ae16dfe8ee0c99595793384f912e henplus-0.9.5-r2.ebuild 1144
 SHA256 3b951500342568f2ab2b6c7122171d6b0695d2bf4651106cf054f8816c27a792 henplus-0.9.5-r2.ebuild 1144
+EBUILD henplus-0.9.7-r1.ebuild 1187 RMD160 0c2aa3e6196cfc5ec8a5d145edf3ab55c6393eaf SHA1 db1f8fb9866d73899d274264a06dc9ae185d70bd SHA256 8b0d68812cfba49f575a17f49694d7a3d8da53af434c0be96f6fb955bbedeb9f
+MD5 e28476a805ec6ee81be0643d0f0366fe henplus-0.9.7-r1.ebuild 1187
+RMD160 0c2aa3e6196cfc5ec8a5d145edf3ab55c6393eaf henplus-0.9.7-r1.ebuild 1187
+SHA256 8b0d68812cfba49f575a17f49694d7a3d8da53af434c0be96f6fb955bbedeb9f henplus-0.9.7-r1.ebuild 1187
 EBUILD henplus-0.9.7.ebuild 1184 RMD160 a68bef1c11734b2e0f7f3ffed5937aeffa599b74 SHA1 c378b1fef86cea05db39d5da407bb20d1b97679b SHA256 7ea99982163ef18c214431bba3b1e8f54269760c74267017ddbd835de4bd0c3e
 MD5 e564f5dd451b08d5cb8391ee621e2138 henplus-0.9.7.ebuild 1184
 RMD160 a68bef1c11734b2e0f7f3ffed5937aeffa599b74 henplus-0.9.7.ebuild 1184
 SHA256 7ea99982163ef18c214431bba3b1e8f54269760c74267017ddbd835de4bd0c3e henplus-0.9.7.ebuild 1184
-MISC ChangeLog 2011 RMD160 99b47389471c4cd8e0fb76761feb7541c3e1eb8b SHA1 8a79c7fe8bff483919f57b92836cc76c03228d16 SHA256 383005f43f45c8c414bd27f5ccd18fef09641a137a754e159502f1a604b09e72
-MD5 014ece49895dd3fef5339ad28491eab7 ChangeLog 2011
-RMD160 99b47389471c4cd8e0fb76761feb7541c3e1eb8b ChangeLog 2011
-SHA256 383005f43f45c8c414bd27f5ccd18fef09641a137a754e159502f1a604b09e72 ChangeLog 2011
+MISC ChangeLog 2240 RMD160 a955a80f860e465f77e5d75249198e73e37fbd18 SHA1 d6105981ee63a628d2fb45d1406ebc371503815f SHA256 bd394ae8aebed19c17f1dbe6c45d97bd43ef9c586f0899323c333f8356ecee4a
+MD5 56df705672ba6543652182bbdb81259f ChangeLog 2240
+RMD160 a955a80f860e465f77e5d75249198e73e37fbd18 ChangeLog 2240
+SHA256 bd394ae8aebed19c17f1dbe6c45d97bd43ef9c586f0899323c333f8356ecee4a ChangeLog 2240
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -37,10 +41,13 @@ SHA256 bf433248b81b58e5458fa50ff21b8b0852f4761172ee549b165cf8e7ae8176aa files/di
 MD5 3d11478170e77da3c179261d59c8c3be files/digest-henplus-0.9.7 241
 RMD160 f2d06b046e1539ea6247ca74ff1b2c8d0b30fcc0 files/digest-henplus-0.9.7 241
 SHA256 fc618389ebb9a0d99f8229231da97acae74632958926df2e6e6f5669b29d499c files/digest-henplus-0.9.7 241
+MD5 3d11478170e77da3c179261d59c8c3be files/digest-henplus-0.9.7-r1 241
+RMD160 f2d06b046e1539ea6247ca74ff1b2c8d0b30fcc0 files/digest-henplus-0.9.7-r1 241
+SHA256 fc618389ebb9a0d99f8229231da97acae74632958926df2e6e6f5669b29d499c files/digest-henplus-0.9.7-r1 241
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGMTCBcxLzpIGCsLQRAp36AJ4l+FtKUEhV7gmstl3asaAH868dwwCfWpP7
-utn251dK0ZS7QLoSuXrCBBs=
-=tZvO
+iD8DBQFGP1QLcxLzpIGCsLQRAtrvAJ4gPlo6ZheTix1GERwMLI9e1FAEZQCfYiZg
+RV6xGihaZyq/A9y/ROAwt5M=
+=HHHH
 -----END PGP SIGNATURE-----
diff --git a/dev-db/henplus/files/digest-henplus-0.9.7-r1 b/dev-db/henplus/files/digest-henplus-0.9.7-r1
new file mode 100644
index 000000000000..8a32ec6a3148
--- /dev/null
+++ b/dev-db/henplus/files/digest-henplus-0.9.7-r1
@@ -0,0 +1,3 @@
+MD5 9e20fad7e4042230cd54f2e49146572f henplus-0.9.7.tar.gz 219625
+RMD160 42c8067f8b0f205a34cb79bd053650debe9382e3 henplus-0.9.7.tar.gz 219625
+SHA256 9dff883c30c377a5e2c58928ad7442ed94710252df0f1d96fc509063839d33e7 henplus-0.9.7.tar.gz 219625
diff --git a/dev-db/henplus/files/henplus.pre b/dev-db/henplus/files/henplus.pre
index 59b20bc3f176..c29585e369fa 100755
--- a/dev-db/henplus/files/henplus.pre
+++ b/dev-db/henplus/files/henplus.pre
@@ -1,3 +1,24 @@
+#
+# Based on the upstream script but parts not relevant to Gentoo
+# stripped away. We would not need this at all but better to make
+# this behave as the upstream docs say and then also have all the 
+# Gentoo goodies.
+# https://bugs.gentoo.org/show_bug.cgi?id=176185
+
+##------------------
+THISDIR=`dirname $0`
+# install layout is: script in /usr/bin/henplus and libs in /usr/share/henplus
+HENPLUSDIR=$THISDIR/../share/henplus
+
+# you may just throw your own jar files in this dir.
+# (like additional JDBC-drivers, that are not in default
+# classpath)
+for f in $HENPLUSDIR/*.jar $HENPLUSDIR/*.zip ; do
+    if [ -r "$f" ] ; then
+        CLASSPATH=$CLASSPATH:$f
+    fi
+done
+
 # starting at the current directory we look for additional
 # JDBC-drivers in .henplus/lib-directories up the path. 
 # if no directory like that has been found the one in the 
@@ -8,7 +29,7 @@ CUSTOM_HENPLUSDIR=""
 while [ $DIR != "/" ] ; do
         if [ -d $DIR"/.henplus/lib" ]; then
             CUSTOM_HENPLUSDIR=$DIR"/.henplus/lib"
-            break
+	    break
         fi
         DIR=`dirname $DIR`
 done
diff --git a/dev-db/henplus/henplus-0.9.7-r1.ebuild b/dev-db/henplus/henplus-0.9.7-r1.ebuild
new file mode 100644
index 000000000000..b9a3609c07ed
--- /dev/null
+++ b/dev-db/henplus/henplus-0.9.7-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/henplus/henplus-0.9.7-r1.ebuild,v 1.1 2007/05/07 16:29:59 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 eutils java-ant-2
+
+DESCRIPTION="Java-based multisession SQL shell for databases with JDBC support."
+HOMEPAGE="http://henplus.sf.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+COMMON_DEPEND="=dev-java/commons-cli-1*
+	dev-java/libreadline-java"
+RDEPEND=">=virtual/jre-1.3
+	${COMMON_DEPEND}"
+DEPEND=">=virtual/jdk-1.3
+	${COMMON_DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-build.xml.patch"
+
+	cd lib
+	rm -v *.jar build/*.jar || die
+	java-pkg_jar-from commons-cli-1 commons-cli.jar
+	java-pkg_jar-from libreadline-java libreadline-java.jar
+}
+
+src_install () {
+	java-pkg_dojar "build/${PN}.jar"
+
+	java-pkg_dolauncher ${PN} -pre "${FILESDIR}/${PN}.pre" \
+		--main henplus.HenPlus
+
+	dodoc README || die
+	dohtml doc/HenPlus.html || die
+	use doc && java-pkg_dojavadoc javadoc/api
+
+	use source && java-pkg_dosrc "src/${PN}"
+}
+