global addpredit == evil

4 files changed, 22 insertions, 12 deletions

diff --git a/dev-java/jdbc-informix/ChangeLog b/dev-java/jdbc-informix/ChangeLog
index 29643da141fd..d68b1b4ebf4f 100644
--- a/dev-java/jdbc-informix/ChangeLog
+++ b/dev-java/jdbc-informix/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jdbc-informix
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-informix/ChangeLog,v 1.5 2004/10/20 09:24:55 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-informix/ChangeLog,v 1.6 2004/10/22 18:58:30 axxo Exp $
+
+  22 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  jdbc-informix-221-r4.ebuild, jdbc-informix-221-r5.ebuild:
+  global addpredit == evil
 
 *jdbc-informix-221-r5 (20 Oct 2004)
 
diff --git a/dev-java/jdbc-informix/Manifest b/dev-java/jdbc-informix/Manifest
index 2e70f62d46d4..7718e01ad656 100644
--- a/dev-java/jdbc-informix/Manifest
+++ b/dev-java/jdbc-informix/Manifest
@@ -1,6 +1,16 @@
-MD5 672e37c758f5df6f2adeba96c9ab1590 ChangeLog 854
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b67fed34e002c39b985c4188ef7f0510 jdbc-informix-221-r5.ebuild 996
+MD5 bb2dadb3733d53e72ab847676c66467f jdbc-informix-221-r4.ebuild 997
+MD5 dd2dc6b35c419306f2bfc1df719bc0f7 ChangeLog 987
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 c1ac613f90bb99415420aeaf841f7e05 jdbc-informix-221-r4.ebuild 1059
-MD5 5cadcb55e78c16704cbb816ecab8b327 jdbc-informix-221-r5.ebuild 1058
 MD5 8b12e0a70cd5d80f175aec66cb56c11b files/digest-jdbc-informix-221-r4 68
 MD5 89b8615a82147b851118d73318989143 files/digest-jdbc-informix-221-r5 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBeVh3/rLF9B432nYRAgJKAJ9/8zyLCHzfY6bK4r5t2RGDKyzCmQCfana3
+wJaZV+D6hS5M/JMRfCBBMlI=
+=ZHJV
+-----END PGP SIGNATURE-----
diff --git a/dev-java/jdbc-informix/jdbc-informix-221-r4.ebuild b/dev-java/jdbc-informix/jdbc-informix-221-r4.ebuild
index f35883c95e36..8d4df6603ced 100644
--- a/dev-java/jdbc-informix/jdbc-informix-221-r4.ebuild
+++ b/dev-java/jdbc-informix/jdbc-informix-221-r4.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/jdbc-informix/jdbc-informix-221-r4.ebuild,v 1.5 2004/10/20 09:24:55 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-informix/jdbc-informix-221-r4.ebuild,v 1.6 2004/10/22 18:58:30 axxo Exp $
 
 inherit java-pkg
 
@@ -17,9 +17,6 @@ RDEPEND=">=virtual/jdk-1.2"
 RESTRICT="nomirror"
 IUSE="doc"
 
-# Necessary because of InstallShield (thanks to carpaski)
-addpredict /root/vpd.properties
-
 src_unpack() {
 	einfo "Unpacking archive ..."
 	tar xf ${DISTDIR}/${At}
@@ -27,6 +24,7 @@ src_unpack() {
 
 src_compile() {
 	einfo "Running InstallShield to extract ..."
+	addpredict /root/vpd.properties
 	`/usr/bin/java-config --java` -jar setup.jar -P  product.installLocation=. -silent
 }
 
diff --git a/dev-java/jdbc-informix/jdbc-informix-221-r5.ebuild b/dev-java/jdbc-informix/jdbc-informix-221-r5.ebuild
index 473f440381f8..3d35f7132cdf 100644
--- a/dev-java/jdbc-informix/jdbc-informix-221-r5.ebuild
+++ b/dev-java/jdbc-informix/jdbc-informix-221-r5.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/jdbc-informix/jdbc-informix-221-r5.ebuild,v 1.1 2004/10/20 09:24:55 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-informix/jdbc-informix-221-r5.ebuild,v 1.2 2004/10/22 18:58:30 axxo Exp $
 
 inherit java-pkg
 
@@ -17,9 +17,6 @@ RDEPEND=">=virtual/jdk-1.2"
 RESTRICT="nomirror"
 IUSE="doc"
 
-# Necessary because of InstallShield (thanks to carpaski)
-addpredict /root/vpd.properties
-
 src_unpack() {
 	einfo "Unpacking archive ..."
 	tar xf ${DISTDIR}/${At}
@@ -27,6 +24,7 @@ src_unpack() {
 
 src_compile() {
 	einfo "Running InstallShield to extract ..."
+	addpredict /root/vpd.properties
 	`/usr/bin/java-config --java` -jar setup.jar -P  product.installLocation=. -silent
 }