Version bump, migrated to gen-2 eclass. Adds examples USE flag to install demos. Remove unused version and change 221-r5 to more proper 2.21.5. Will seem like a downgrade, that's fine."

Package-Manager: portage-2.1.3.4

8 files changed, 93 insertions, 68 deletions

diff --git a/dev-java/jdbc-informix/ChangeLog b/dev-java/jdbc-informix/ChangeLog
index 58cbfb372104..8700d7a5c331 100644
--- a/dev-java/jdbc-informix/ChangeLog
+++ b/dev-java/jdbc-informix/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-java/jdbc-informix
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-informix/ChangeLog,v 1.13 2007/07/02 14:31:56 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-informix/ChangeLog,v 1.14 2007/08/15 09:09:50 caster Exp $
+
+*jdbc-informix-3.00.3 (15 Aug 2007)
+*jdbc-informix-2.21.5 (15 Aug 2007)
+
+  15 Aug 2007; Vlastimil Babka <caster@gentoo.org>
+  +jdbc-informix-2.21.5.ebuild, +jdbc-informix-3.00.3.ebuild,
+  -jdbc-informix-221-r4.ebuild, -jdbc-informix-221-r5.ebuild:
+  Version bump, migrated to gen-2 eclass. Adds examples USE flag to install
+  demos. Remove unused version and change 221-r5 to more proper 2.21.5. Will
+  seem like a downgrade, that's fine.
 
   02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org>
   jdbc-informix-221-r4.ebuild, jdbc-informix-221-r5.ebuild:
diff --git a/dev-java/jdbc-informix/Manifest b/dev-java/jdbc-informix/Manifest
index af8797aa3607..21d91736647b 100644
--- a/dev-java/jdbc-informix/Manifest
+++ b/dev-java/jdbc-informix/Manifest
@@ -1,34 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST JDBC.2.21.JC5.tar 17607168 RMD160 d500118af7df779c07419d76d5a9702bd2f1ee9b SHA1 895a52f48535214220879b06dafc0f2e2e8a7760 SHA256 4c444317f28a9f3f600f652ea9a0d8675055d959a7ad478cbd79d5b7b5036a73
-DIST jdbc-221-JC4-JAVA.tar 18004480 RMD160 1e1ce3c554a7b9ef8c9ff284cb2177cb9c551f29 SHA1 55317ecab3e9c311637800c585a926c2797fd522 SHA256 a8880822ca9701d1dabdaaf6cdcbe043ef60d8ba125089944ebb38c9c0b782d5
-EBUILD jdbc-informix-221-r4.ebuild 941 RMD160 b68ed253acb8fc02b5f6ee1ce7ec41c13882cdac SHA1 a5da549378f377ce112bf8e69b43be3deed72b70 SHA256 6242903626c37684b6a386e1c02e2b453b63bccba54cc1dc99cb687a8705d163
-MD5 a982d8e25b57cfb85e136e57cdd130b6 jdbc-informix-221-r4.ebuild 941
-RMD160 b68ed253acb8fc02b5f6ee1ce7ec41c13882cdac jdbc-informix-221-r4.ebuild 941
-SHA256 6242903626c37684b6a386e1c02e2b453b63bccba54cc1dc99cb687a8705d163 jdbc-informix-221-r4.ebuild 941
-EBUILD jdbc-informix-221-r5.ebuild 935 RMD160 dd77c31a03077b7d5efd28d1cf866e9835d1644f SHA1 ae75d0ccf00101dec5935aa5a6c498c70dd1e12c SHA256 2761d72fb196b696798b9813fb04a4079794685f572316585653f71c3832d1d7
-MD5 352c695270c985193fec821cd6b14b2e jdbc-informix-221-r5.ebuild 935
-RMD160 dd77c31a03077b7d5efd28d1cf866e9835d1644f jdbc-informix-221-r5.ebuild 935
-SHA256 2761d72fb196b696798b9813fb04a4079794685f572316585653f71c3832d1d7 jdbc-informix-221-r5.ebuild 935
-MISC ChangeLog 1823 RMD160 4c45fe02a61c1d301b101db3522fead097976b76 SHA1 87f78fbd79b984e56792e03d278869e5bd20425e SHA256 03b9f322013e929337eca3b805c57780844fba14e931213383e0f372b38f4a85
-MD5 a631b1b35189f0a5a589f55f3244fd1b ChangeLog 1823
-RMD160 4c45fe02a61c1d301b101db3522fead097976b76 ChangeLog 1823
-SHA256 03b9f322013e929337eca3b805c57780844fba14e931213383e0f372b38f4a85 ChangeLog 1823
+DIST JDBC.3.00.JC3.tar 18447872 RMD160 f38781b5deb7076e854000849e1c1d41231439dc SHA1 856ca3f54433cd3220ce598fde75bbf13cb31839 SHA256 b8a894c0aff02bd690d2082cb4e0e4d2f8e73ff59e3cbdafd28562346902ced7
+EBUILD jdbc-informix-2.21.5.ebuild 936 RMD160 7c892911c81169082e42def8c33b0590f4d8b74e SHA1 606354e3e6e99d2ef822ab1d5776a502ba7aae99 SHA256 ddd8197e0e9019309ff80b2d738055d660da01cd919c0839989bcbacdd4ce53b
+MD5 dd5bed03c6cd060ca4904c4ac90cd3a7 jdbc-informix-2.21.5.ebuild 936
+RMD160 7c892911c81169082e42def8c33b0590f4d8b74e jdbc-informix-2.21.5.ebuild 936
+SHA256 ddd8197e0e9019309ff80b2d738055d660da01cd919c0839989bcbacdd4ce53b jdbc-informix-2.21.5.ebuild 936
+EBUILD jdbc-informix-3.00.3.ebuild 1755 RMD160 685be1ef9448bcc96dfc12aed5ed137ec91a42f7 SHA1 889a54cbe271a28ac328e5258b432757feda0562 SHA256 93f0fa02512c71d07d8c7e30413abd6d17ecbed35c641b4936cf398e8d3100ab
+MD5 2d1b50a273567ed4e4ed6b5c9818fcd3 jdbc-informix-3.00.3.ebuild 1755
+RMD160 685be1ef9448bcc96dfc12aed5ed137ec91a42f7 jdbc-informix-3.00.3.ebuild 1755
+SHA256 93f0fa02512c71d07d8c7e30413abd6d17ecbed35c641b4936cf398e8d3100ab jdbc-informix-3.00.3.ebuild 1755
+MISC ChangeLog 2264 RMD160 06d973fb287a2cd758659b1e168ee212548ce311 SHA1 4c2b715b6dac1462162c486a33dc3c12387abdc3 SHA256 f23e9269ea3aa8f9f88ca663b867943632624b0c97b440f660ba9e708591e032
+MD5 3c732185fe3587644134c9eab581f288 ChangeLog 2264
+RMD160 06d973fb287a2cd758659b1e168ee212548ce311 ChangeLog 2264
+SHA256 f23e9269ea3aa8f9f88ca663b867943632624b0c97b440f660ba9e708591e032 ChangeLog 2264
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata.xml 157
-MD5 66dffe19629dbbea2f720145823e8582 files/digest-jdbc-informix-221-r4 250
-RMD160 10fafae2afcca76e58547d523bda7400f6181a83 files/digest-jdbc-informix-221-r4 250
-SHA256 841e05f90fdfb57d46ea2b3b363fa29eb40535a728f34686be40e108f2ddf7f6 files/digest-jdbc-informix-221-r4 250
-MD5 7807ffb48585db1502a3d316d0c11857 files/digest-jdbc-informix-221-r5 238
-RMD160 a372d36ec47d3463dba3125ccfb00849ccf4d22d files/digest-jdbc-informix-221-r5 238
-SHA256 17b4e6ff6dfd395d6e368ac8d9ef0f4299e628293ead565411d8fa55b2fdd5df files/digest-jdbc-informix-221-r5 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGiQxippoStNGKGywRAtkDAJ4hYu/mqMgcK0mIoLPJkAfyN9BTNACcCWhr
-t5YskwsnsuImyziQt2d2uWM=
-=v6DO
------END PGP SIGNATURE-----
+MD5 7807ffb48585db1502a3d316d0c11857 files/digest-jdbc-informix-2.21.5 238
+RMD160 a372d36ec47d3463dba3125ccfb00849ccf4d22d files/digest-jdbc-informix-2.21.5 238
+SHA256 17b4e6ff6dfd395d6e368ac8d9ef0f4299e628293ead565411d8fa55b2fdd5df files/digest-jdbc-informix-2.21.5 238
+MD5 aebe78cdae6a22124bbafa013ef4e797 files/digest-jdbc-informix-3.00.3 238
+RMD160 8c3e4dcec5e994dd6aa83fce708a1e0d5b5a2e26 files/digest-jdbc-informix-3.00.3 238
+SHA256 d20daeb238dcf5dc6e91bc661ff3ca6c30111368aad760680095eaadd1c52fe7 files/digest-jdbc-informix-3.00.3 238
diff --git a/dev-java/jdbc-informix/files/digest-jdbc-informix-221-r5 b/dev-java/jdbc-informix/files/digest-jdbc-informix-2.21.5
index 99fa54b8c75d..99fa54b8c75d 100644
--- a/dev-java/jdbc-informix/files/digest-jdbc-informix-221-r5
+++ b/dev-java/jdbc-informix/files/digest-jdbc-informix-2.21.5
diff --git a/dev-java/jdbc-informix/files/digest-jdbc-informix-221-r4 b/dev-java/jdbc-informix/files/digest-jdbc-informix-221-r4
deleted file mode 100644
index e1536d6cf6fb..000000000000
--- a/dev-java/jdbc-informix/files/digest-jdbc-informix-221-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 370a98e2bb353232109bc6a5138eb8fa jdbc-221-JC4-JAVA.tar 18004480
-RMD160 1e1ce3c554a7b9ef8c9ff284cb2177cb9c551f29 jdbc-221-JC4-JAVA.tar 18004480
-SHA256 a8880822ca9701d1dabdaaf6cdcbe043ef60d8ba125089944ebb38c9c0b782d5 jdbc-221-JC4-JAVA.tar 18004480
diff --git a/dev-java/jdbc-informix/files/digest-jdbc-informix-3.00.3 b/dev-java/jdbc-informix/files/digest-jdbc-informix-3.00.3
new file mode 100644
index 000000000000..1de739b2fb65
--- /dev/null
+++ b/dev-java/jdbc-informix/files/digest-jdbc-informix-3.00.3
@@ -0,0 +1,3 @@
+MD5 02d966a92916349a081609676b895700 JDBC.3.00.JC3.tar 18447872
+RMD160 f38781b5deb7076e854000849e1c1d41231439dc JDBC.3.00.JC3.tar 18447872
+SHA256 b8a894c0aff02bd690d2082cb4e0e4d2f8e73ff59e3cbdafd28562346902ced7 JDBC.3.00.JC3.tar 18447872
diff --git a/dev-java/jdbc-informix/jdbc-informix-221-r5.ebuild b/dev-java/jdbc-informix/jdbc-informix-2.21.5.ebuild
index aae358ab90c4..d72f04c32f1a 100644
--- a/dev-java/jdbc-informix/jdbc-informix-221-r5.ebuild
+++ b/dev-java/jdbc-informix/jdbc-informix-2.21.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.9 2007/07/02 14:31:56 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-informix/jdbc-informix-2.21.5.ebuild,v 1.1 2007/08/15 09:09:50 caster Exp $
 
 inherit java-pkg
 
diff --git a/dev-java/jdbc-informix/jdbc-informix-221-r4.ebuild b/dev-java/jdbc-informix/jdbc-informix-221-r4.ebuild
deleted file mode 100644
index 6435b3230b87..000000000000
--- a/dev-java/jdbc-informix/jdbc-informix-221-r4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2007 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.11 2007/07/02 14:31:56 peper Exp $
-
-inherit java-pkg
-
-At="jdbc-221-JC4-JAVA.tar"
-S=${WORKDIR}
-DESCRIPTION="JDBC Type 4 Drivers for Informix"
-SRC_URI="ftp://ftp.software.ibm.com/software/data/informix/downloads/${At}"
-HOMEPAGE="http://www-306.ibm.com/software/data/informix/tools/jdbc/"
-KEYWORDS="x86 ppc ~amd64"
-LICENSE="informix-jdbc"
-SLOT="0"
-DEPEND=""
-RDEPEND=">=virtual/jre-1.2"
-RESTRICT="mirror"
-IUSE="doc"
-
-src_unpack() {
-	tar xf ${DISTDIR}/${At} || die "failed to unpack"
-}
-
-src_compile() {
-	addpredict /root/vpd.properties
-	addpredict /var/lib/rpm/
-	java -jar setup.jar -P  product.installLocation=. -silent
-}
-
-src_install() {
-	use doc && dodoc doc/release/jdbc4pg.pdf
-	use doc && java-pkg_dohtml -r doc/
-	java-pkg_dojar lib/ifx*.jar
-}
diff --git a/dev-java/jdbc-informix/jdbc-informix-3.00.3.ebuild b/dev-java/jdbc-informix/jdbc-informix-3.00.3.ebuild
new file mode 100644
index 000000000000..0352375aff51
--- /dev/null
+++ b/dev-java/jdbc-informix/jdbc-informix-3.00.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-informix/jdbc-informix-3.00.3.ebuild,v 1.1 2007/08/15 09:09:50 caster Exp $
+
+JAVA_PKG_IUSE="doc examples"
+
+inherit versionator java-pkg-2
+
+MY_PV="$(replace_version_separator 2 .JC)"
+
+At="JDBC.${MY_PV}.tar"
+DESCRIPTION="JDBC Type 4 Drivers for Informix"
+SRC_URI="${At}"
+HOMEPAGE="http://www.ibm.com/software/data/informix/tools/jdbc/"
+DOWNLOADPAGE="http://www14.software.ibm.com/webapp/download/search.jsp?go=y&rs=ifxjdbc"
+KEYWORDS="~amd64 ~ppc ~x86"
+LICENSE="informix-jdbc"
+SLOT="0"
+DEPEND=">=virtual/jre-1.4"
+RDEPEND=">=virtual/jre-1.4"
+RESTRICT="fetch"
+IUSE=""
+
+S="${WORKDIR}"
+
+pkg_nofetch() {
+	einfo "Due to licensing restrictions, you need to download the distfile manually."
+	einfo "Please navigate to ${DOWNLOADPAGE}"
+	einfo "Click on the 'Informix JDBC Driver' link, version ${MY_PV}"
+	einfo "Sign up with your IBM account (you need to register)."
+	einfo "Go through the license agreement and survey."
+	einfo "Download ${At} and place it into ${DISTDIR}"
+	einfo "And restart the installation."
+}
+
+src_compile() {
+	einfo "Performing silent installation"
+	java -jar setup.jar -P product.installLocation=. -silent
+	if use examples; then
+		einfo "Cleaning compiled examples"
+		find demo \( -name \*.so -o -name \*.class -o -name \*.dll \) -delete
+	fi
+}
+
+src_install() {
+	java-pkg_dojar lib/*.jar
+
+	# these are to be copied to app server as servlets
+	insinto /usr/share/${PN}/
+	doins -r proxy
+
+	if use doc; then
+		java-pkg_dojavadoc doc/javadoc
+		dodoc doc/release/jdbc4pg.pdf doc/release/sqlj/ifxsqljug.pdf || die
+		dohtml -r doc/release/* || die
+	fi
+
+	use examples && java-pkg_doexamples demo
+}