monsieurp 15/04/22 22:27:05 Modified: jdbc-postgresql-9.3_p1100.ebuild ChangeLog Added: jdbc-postgresql-9.4_p1201.ebuild Log: Version bump courtesy of Andreas Sturmlechner <[email protected]>. Fix bug 545004. Signed-off-by: Patrice Clement <[email protected]> (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 93491BB8)
Revision Changes Path 1.4 dev-java/jdbc-postgresql/jdbc-postgresql-9.3_p1100.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jdbc-postgresql/jdbc-postgresql-9.3_p1100.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jdbc-postgresql/jdbc-postgresql-9.3_p1100.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jdbc-postgresql/jdbc-postgresql-9.3_p1100.ebuild?r1=1.3&r2=1.4 Index: jdbc-postgresql-9.3_p1100.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/jdbc-postgresql/jdbc-postgresql-9.3_p1100.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- jdbc-postgresql-9.3_p1100.ebuild 28 Dec 2014 15:24:21 -0000 1.3 +++ jdbc-postgresql-9.3_p1100.ebuild 22 Apr 2015 22:27:05 -0000 1.4 @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-postgresql/jdbc-postgresql-9.3_p1100.ebuild,v 1.3 2014/12/28 15:24:21 titanofold Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-postgresql/jdbc-postgresql-9.3_p1100.ebuild,v 1.4 2015/04/22 22:27:05 monsieurp Exp $ EAPI="5" 1.57 dev-java/jdbc-postgresql/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jdbc-postgresql/ChangeLog?rev=1.57&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jdbc-postgresql/ChangeLog?rev=1.57&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jdbc-postgresql/ChangeLog?r1=1.56&r2=1.57 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/jdbc-postgresql/ChangeLog,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- ChangeLog 28 Dec 2014 15:24:21 -0000 1.56 +++ ChangeLog 22 Apr 2015 22:27:05 -0000 1.57 @@ -1,6 +1,15 @@ # ChangeLog for dev-java/jdbc-postgresql -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-postgresql/ChangeLog,v 1.56 2014/12/28 15:24:21 titanofold Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-postgresql/ChangeLog,v 1.57 2015/04/22 22:27:05 monsieurp Exp $ + +*jdbc-postgresql-9.4_p1201 (22 Apr 2015) + + 22 Apr 2015; Patrice Clement <[email protected]> + +files/jdbc-postgresql-9.4_p1201-remove-osgi.patch, + +files/jdbc-postgresql-9.4_p1201-remove-sspi.patch, + +jdbc-postgresql-9.4_p1201.ebuild, jdbc-postgresql-9.3_p1100.ebuild: + Version bump courtesy of Andreas Sturmlechner + <[email protected]>. Fix bug 545004. 28 Dec 2014; Aaron W. Swenson <[email protected]> jdbc-postgresql-8.3_p603.ebuild, jdbc-postgresql-8.4_p701-r1.ebuild, 1.1 dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1201.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1201.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1201.ebuild?rev=1.1&content-type=text/plain Index: jdbc-postgresql-9.4_p1201.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1201.ebuild,v 1.1 2015/04/22 22:27:05 monsieurp Exp $ EAPI="5" JAVA_PKG_IUSE="doc source" inherit java-pkg-2 java-ant-2 MY_PN="postgresql-jdbc" MY_PV="${PV/_p/-}" MY_P="${MY_PN}-${MY_PV}.src" DESCRIPTION="JDBC Driver for PostgreSQL" SRC_URI="http://jdbc.postgresql.org/download/${MY_P}.tar.gz"; HOMEPAGE="http://jdbc.postgresql.org/"; LICENSE="POSTGRESQL" SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="test" DEPEND=" >=virtual/jdk-1.6 doc? ( dev-libs/libxslt app-text/docbook-xsl-stylesheets ) test? ( dev-java/ant-junit dev-java/junit:4 >=dev-db/postgresql-9.3[server] )" RDEPEND=">=virtual/jre-1.6" S="${WORKDIR}/postgresql-jdbc-${MY_PV}.src" java_prepare() { find -name "*.class" -type f -exec rm -v {} + || die # Strip build.xml of maven deps sed -i -e '/<classpath.*dependency\.compile\.classpath/c\' build.xml || die sed -i -e '/<classpath.*dependency\.runtime\.classpath/c\' build.xml || die sed -i -e '/<classpath.*dependency\.test\.classpath/c\' build.xml || die sed -i -e '/<target name="artifact-version"/,/<[/]target>/{s/depends="maven-dependencies"//}' build.xml || die sed -i -e '/<target name="compile"/ s/,maven-dependencies//' build.xml || die # Remove SSPI, it pulls in Waffle-JNA and is only used on Windows sed -i -e '/<include.*sspi/c\' build.xml || die rm -vrf org/postgresql/sspi || die "Error removing sspi" epatch "${FILESDIR}"/${P}-remove-sspi.patch # FIXME @someone who cares: enable through osgi flag? sed -i -e '/<include.*osgi/c\' build.xml || die sed -i -e '/<test.*osgi/c\' build.xml || die rm -vrf org/postgresql/osgi || die "Error removing osgi" rm -vrf org/postgresql/test/osgi || die "Error removing osgi tests" epatch "${FILESDIR}"/${P}-remove-osgi.patch } JAVA_ANT_REWRITE_CLASSPATH="yes" EANT_DOC_TARGET="publicapi" src_compile() { EANT_BUILD_TARGET="release-version jar" java-pkg-2_src_compile # There is a task that creates this doc but I didn't find a way how to use system catalog # to lookup the stylesheet so the 'doc' target is rewritten here to use system call instead. if use doc; then mkdir -p "${S}/build/doc" xsltproc -o "${S}/build/doc/pgjdbc.html" http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl \ "${S}/doc/pgjdbc.xml" fi } src_test() { einfo "In order to run the tests successfully, you have to have:" einfo "1) PostgreSQL server running" einfo "2) database 'test' defined with user 'test' with password 'test'" einfo " as owner of the database" einfo "3) plpgsql support in the 'test' database" einfo einfo "You can find a general info on how to perform these steps at" einfo "https://wiki.gentoo.org/wiki/PostgreSQL"; ANT_TASKS="ant-junit" eant test -Dgentoo.classpath=$(java-pkg_getjars --build-only junit-4) } src_install() { java-pkg_newjar build/jars/postgresql*.jar jdbc-postgresql.jar if use doc ; then java-pkg_dojavadoc build/publicapi dohtml build/doc/pgjdbc.html fi use source && java-pkg_dosrc org }
