Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/jdbc-postgresql/
Date: Sat, 05 Dec 2015 19:49:43
Message-Id: 1449170660.4c342418ac5ee5a442b0079549e2511e77455329.monsieurp@gentoo
1 commit: 4c342418ac5ee5a442b0079549e2511e77455329
2 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
3 AuthorDate: Thu Dec 3 19:19:00 2015 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 3 19:24:20 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c342418
7
8 dev-java/jdbc-postgresql: Drop old
9
10 Package-Manager: portage-2.2.26
11
12 dev-java/jdbc-postgresql/Manifest | 1 -
13 .../jdbc-postgresql-9.4_p1204.ebuild | 104 ---------------------
14 2 files changed, 105 deletions(-)
15
16 diff --git a/dev-java/jdbc-postgresql/Manifest b/dev-java/jdbc-postgresql/Manifest
17 index 74718c7..998d5cd 100644
18 --- a/dev-java/jdbc-postgresql/Manifest
19 +++ b/dev-java/jdbc-postgresql/Manifest
20 @@ -1,6 +1,5 @@
21 DIST postgresql-jdbc-9.2-1003.src.tar.gz 1843082 SHA256 d61449b8a17ce540b26437382c33a59a49a94c578c943fccf91139ee06478968 SHA512 f91d9617726722998a51275c625f6ea89dfe0ac7ce415cc6fa76302b13762bcf825cd61ec69d25d0199ca21de8a24286eeffb843ad59c06fd3049a289ac2b702 WHIRLPOOL a7994d7ce38bd17e9353339d2838601a22328c8eff03baa122663526ef2c0c2afa8b16d9c93ea9fbff7a756612cddffef41ec00552640766acc5e1fbe4996282
22 DIST postgresql-jdbc-9.2-1004.src.tar.gz 1842921 SHA256 eeadff0d830cd19a4f52a9489748a7126b0c1d4863bf9a5d65618158dfc6ae68 SHA512 6e218b7df3d772e4fb9053672f5f77f6012fe6e652a536dfe171408e957465520b05994d4fa13c4d478b595a55b8068da663b9f3dcb544a46fcf91d71ba8fdf5 WHIRLPOOL f1afa3201fbaaf47edb0224d3263642b3202fbf6fc922318354db86e394f0005611b0981da043a4e14cbb67224ac8fa6d96880e0763fcd4d5b502423c7eaa0c7
23 DIST postgresql-jdbc-9.3-1100.src.tar.gz 1852465 SHA256 e6be53d4cda04735f5f147d2296acb9a22630b062fa3a4ef894073f23efc6d55 SHA512 43968a62f9443739721016ede186b2f41fa6db2d1ef319cd65059f8715e90eda7c7f568995b293578c39e04d43085cfdfece587500f99ed1a49964c12d8c747a WHIRLPOOL 9bf218936a00df00fb4b4f6ed6c3bbe06cdcfcd14d306a4f7bf3073e83f1c51bc85c0a061c2e04790bcebf9183b8aabd056522fa5d18b0734a4aec34b3ab14a0
24 -DIST postgresql-jdbc-9.4-1204.src.tar.gz 2018904 SHA256 c22862ce505c501115e9f72ae10cd8b5a02ff7f8c7c2f1475f4035b3c85f170b SHA512 659e60fe3ea54f87396d9f32521799d78381a87530c167e903820f3990facc04f3e145685a9c40d74ba3167a404c144fefa781568b9cea2910399cfe2632f25e WHIRLPOOL e5703de1053b5136656c496b4d9518b8044d6a27d431d054d1c48101364b6a999cb4c97295aecca99edf8cb80bf3b2a4b60b740901b9c3f15340eb51197e9cc1
25 DIST postgresql-jdbc-9.4-1205.src.tar.gz 2028968 SHA256 bb06d9d94ce1f873df4f6090b26f8d2bb358601f71ba1fbdb782bb58a1164366 SHA512 ebb46c0cfcabc34083e6f481bc97536fba98d082462670d39efdd75e6463f1286db6fa07cd35546c749e456f1c06fb1d022cbc9f5cace2a1b968fab76a57d281 WHIRLPOOL a501cb12486ea1903442aa15c03ba7e9f5b127d3e1aa0d90991f6ded517b4dc792488431cf2047efe1a3ac8652ff527d810e1138235a4353cf5cd44031d2b641
26 DIST postgresql-jdbc-9.4-1206.src.tar.gz 2029837 SHA256 2793d89eb87f913f82af0898fbb17c2d1b64c4b39a444fe19fe621cb5f11fc80 SHA512 b16816f1afd3ee5986fca197bd7608c2e2f334054e41a8c541c47985827f4f59d7691d23983bdac01c85fc364cd001c991ac6b4e8567429b9d1f4161388dd6bd WHIRLPOOL 0729913fd98088c4f8caeafbb519b45ac673cdb9ff1342f0a1146a2dc87d0c530385089c80c498d416d6601151e00d863831be22b570c3c19070ba3f1ea3ff73
27
28 diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1204.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1204.ebuild
29 deleted file mode 100644
30 index 359132c..0000000
31 --- a/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1204.ebuild
32 +++ /dev/null
33 @@ -1,104 +0,0 @@
34 -# Copyright 1999-2015 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -# $Id$
37 -
38 -EAPI="5"
39 -
40 -JAVA_PKG_IUSE="doc source"
41 -
42 -inherit eutils java-pkg-2 java-ant-2
43 -
44 -MY_PN="postgresql-jdbc"
45 -MY_PV="${PV/_p/-}"
46 -MY_P="${MY_PN}-${MY_PV}.src"
47 -
48 -DESCRIPTION="JDBC Driver for PostgreSQL"
49 -SRC_URI="http://jdbc.postgresql.org/download/${MY_P}.tar.gz"
50 -HOMEPAGE="http://jdbc.postgresql.org/"
51 -
52 -LICENSE="POSTGRESQL"
53 -SLOT="0"
54 -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
55 -IUSE="test"
56 -
57 -DEPEND="
58 - >=virtual/jdk-1.6
59 - doc? (
60 - dev-libs/libxslt
61 - app-text/docbook-xsl-stylesheets
62 - )
63 - test? (
64 - >=dev-db/postgresql-9.3[server]
65 - dev-java/ant-junit
66 - dev-java/junit:4
67 - dev-java/xml-commons
68 - )"
69 -RDEPEND=">=virtual/jre-1.6"
70 -
71 -RESTRICT="test" # Requires external postgresql server setup
72 -
73 -S="${WORKDIR}/postgresql-jdbc-${MY_PV}.src"
74 -
75 -JAVA_ANT_REWRITE_CLASSPATH="yes"
76 -JAVA_ANT_ENCODING="UTF-8"
77 -EANT_DOC_TARGET="publicapi"
78 -
79 -java_prepare() {
80 - # Strip build.xml of maven deps
81 - sed -i -e '/<classpath.*dependency\.compile\.classpath/c\' build.xml || die
82 - sed -i -e '/<classpath.*dependency\.runtime\.classpath/c\' build.xml || die
83 - sed -i -e '/<classpath.*dependency\.test\.classpath/c\' build.xml || die
84 - sed -i -e '/<target name="artifact-version"/,/<[/]target>/{s/depends="maven-dependencies"//}' build.xml || die
85 - sed -i -e '/<target name="compile"/ s/,maven-dependencies//' build.xml || die
86 -
87 - # Remove SSPI, it pulls in Waffle-JNA and is only used on Windows
88 - sed -i -e '/<include.*sspi/c\' build.xml || die
89 - rm -vrf org/postgresql/sspi || die "Error removing sspi"
90 - epatch "${FILESDIR}"/${PN}-9.4_p1204-remove-sspi.patch
91 -
92 - # FIXME @someone who cares: enable through osgi flag?
93 - sed -i -e '/<include.*osgi/c\' build.xml || die
94 - sed -i -e '/<test.*osgi/c\' build.xml || die
95 - rm -vrf org/postgresql/osgi || die "Error removing osgi"
96 - rm -vrf org/postgresql/test/osgi || die "Error removing osgi tests"
97 - epatch "${FILESDIR}"/${PN}-9.4_p1201-remove-osgi.patch
98 -
99 - java-pkg_clean
100 -}
101 -
102 -src_compile() {
103 - EANT_BUILD_TARGET="release-version jar"
104 - java-pkg-2_src_compile
105 -
106 - # There is a task that creates this doc but I didn't find a way how to use system catalog
107 - # to lookup the stylesheet so the 'doc' target is rewritten here to use system call instead.
108 - if use doc; then
109 - mkdir -p "${S}/build/doc" || die
110 - xsltproc -o "${S}/build/doc/pgjdbc.html" http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl \
111 - "${S}/doc/pgjdbc.xml" || die
112 - fi
113 -}
114 -
115 -src_test() {
116 - einfo "In order to run the tests successfully, you have to have:"
117 - einfo "1) PostgreSQL server running"
118 - einfo "2) database 'test' defined with user 'test' with password 'test'"
119 - einfo " as owner of the database"
120 - einfo "3) plpgsql support in the 'test' database"
121 - einfo
122 - einfo "You can find a general info on how to perform these steps at"
123 - einfo "https://wiki.gentoo.org/wiki/PostgreSQL"
124 -
125 - ANT_TASKS="ant-junit" eant test -Dgentoo.classpath=$(java-pkg_getjars --build-only "junit-4,xml-commons")
126 -}
127 -
128 -src_install() {
129 - java-pkg_newjar build/jars/postgresql*.jar jdbc-postgresql.jar
130 -
131 - if use doc ; then
132 - java-pkg_dojavadoc build/publicapi
133 - dohtml build/doc/pgjdbc.html
134 - fi
135 -
136 - use source && java-pkg_dosrc org
137 -}