Remove old ones using dev-java/servletapi. #398689

Package-Manager: portage-2.1.11.3/cvs/Linux x86_64

4 files changed, 15 insertions, 92 deletions

diff --git a/dev-java/jcifs/ChangeLog b/dev-java/jcifs/ChangeLog
index 8db2d13100e3..287828e2a8af 100644
--- a/dev-java/jcifs/ChangeLog
+++ b/dev-java/jcifs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jcifs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jcifs/ChangeLog,v 1.34 2012/05/21 09:35:16 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jcifs/ChangeLog,v 1.35 2012/07/02 12:32:07 sera Exp $
+
+  02 Jul 2012; Ralph Sennhauser <sera@gentoo.org> -jcifs-1.3.13.ebuild,
+  -jcifs-1.3.15.ebuild:
+  Remove old ones using dev-java/servletapi. #398689
 
   21 May 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> jcifs-1.3.17-r1.ebuild:
   x86 stable wrt bug #399997
diff --git a/dev-java/jcifs/Manifest b/dev-java/jcifs/Manifest
index cf4dc8f5b6af..b0bcadfe9842 100644
--- a/dev-java/jcifs/Manifest
+++ b/dev-java/jcifs/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX 1.3.17-build.xml.patch 578 RMD160 a8d3d9aedeac23da3bc6ad0c49953cdc9def0c9f SHA1 2aa2b4c7675b5d64c8c4950b917f57cd1195d3fc SHA256 e92af71ef8b678563a5313f4ff392bf21c1e3739247599ea2e1efd08ed0b466b
-DIST jcifs-1.3.13.tgz 900999 RMD160 ea8a54aae488df6573775705dd84db503676eb60 SHA1 33cee5b60c2ae60f021396e0a13a36df43931875 SHA256 cb33e4852b6d1557490b015c4ec57cf8440e23fdcfe2ceb4ef29f0250ccbe432
-DIST jcifs-1.3.15.tgz 852051 RMD160 9c6545bb6370bdfc7a56709609a294cab365b4eb SHA1 5bfd7fa1818fd325becf406413803960380397d2 SHA256 4e5031ce2a4bf2f4729417e61972259b844c8d9b8aaf1d91db2b766bd67419fa
 DIST jcifs-1.3.17.tgz 862091 RMD160 bdb5b32333057ac201c0183a749814d06a1466af SHA1 e6a5e0324ffd86f2996b9b6b0137c5f99d22f8c7 SHA256 b6c5d82ed0bc015986206101a908eacd96bca8915187a092e34ebb373eeb545d
-EBUILD jcifs-1.3.13.ebuild 1058 RMD160 4b8d863e0991b7eb7862f6a0868125a595242bcc SHA1 7dfbff13987627e51764e66f022c2a2d29252530 SHA256 d6e705b9f73225356866d34f2ac256155dbbd311d586f988a915bec90f7a908b
-EBUILD jcifs-1.3.15.ebuild 1032 RMD160 129914bcf09e3da49ae675316a116219b7d5a0b6 SHA1 057547ae83cc9d29bc58624e94d4b07640ee6a7c SHA256 618f5bca284470b73995f2873315d0c56ab976ca494a8658360094c23ec1b6f5
 EBUILD jcifs-1.3.17-r1.ebuild 1086 RMD160 a72174b115c538095208f30165ee446b04cdded3 SHA1 d6eed013f5f55dd941a06fb3eb58701dcc00b212 SHA256 593e3a866bed5b47ecf44126928c5cd78110af6f178de3177d68f94d0920492c
-MISC ChangeLog 4141 RMD160 bdef1c1a7bb0a36cf40c242b00506f877ad0d154 SHA1 53b9b67f296497623e1c5d3c25b475331c54e68f SHA256 87930a7e84efa2efebb2c832af86bd5823e20a0297f241424a7a303d330e9427
+MISC ChangeLog 4285 RMD160 31a56b81c0cf24835690e5bb194330b56a99565c SHA1 f50b89dffd6f3dee4bf776186746293a6666e21a SHA256 35811e3bfa77249a8ceb558588771f4447c40f447a5b37e8037b92bb67748111
 MISC metadata.xml 473 RMD160 36262a19ef75a3afe9a2ec997ee97e4d4a47b90e SHA1 47cd90e024399463a61787888db8de5ff6479442 SHA256 6b47549bfa5327e1f71ad2b6cc52f2fb65cd442a4a7c116d699d85a4601b399c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAk+6DFIACgkQuUQtlDBCeQLFIACbBbXi9ipF+wSww//ZaGm+Llsc
-oxUAn2ABXJH1xu2QmDF+IPcFY0Kqn4uJ
-=ue0W
+iQEcBAEBAgAGBQJP8ZTXAAoJEIUJ+svaV163xecH/1RWflWtlEc/qz/4gdROKLgt
+ckAOUE4Ew7yO9DdW/AqZ5o5t6PAHdeVPtuceSVQxmfGxAW9wI7IZZtnGI2/uk+Op
+wUfXpAwkncRgUJ17Q5uBs/PVQYsimAevbIvHNEmSpgzopOnTW55+vqOld/nkmo44
+Rh6dqJTNGpG0kseSKCH+vrfQbGVIMT7ZZuvVS6Gg7CBI/MD/HuRJiVJAzEE7NcGB
+N7ZxZ9FQnQm2+B7KmfGBzmDQNrJRORS+utAvdHzwyhHYPS+xF3Fb6MAbjEq3p1FG
+BGQQNdW2s1DSq5pFjLec3dTGKJJoMtI6hPHHKjGwM8xOqjLdkc3TIPj9Kkqlos8=
+=cfDk
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jcifs/jcifs-1.3.13.ebuild b/dev-java/jcifs/jcifs-1.3.13.ebuild
deleted file mode 100644
index 8af67c530d2d..000000000000
--- a/dev-java/jcifs/jcifs-1.3.13.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jcifs/jcifs-1.3.13.ebuild,v 1.5 2010/05/23 17:47:41 pacho Exp $
-
-EAPI="2"
-JAVA_PKG_IUSE="doc examples source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Library that implements the CIFS/SMB networking protocol in Java"
-SRC_URI="http://jcifs.samba.org/src/${P}.tgz"
-HOMEPAGE="http://jcifs.samba.org/"
-LICENSE="LGPL-2.1"
-SLOT="1.1"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-RDEPEND=">=virtual/jre-1.4
-	dev-java/servletapi:2.4"
-DEPEND=">=virtual/jdk-1.4
-	${RDEPEND}"
-IUSE=""
-
-S=${WORKDIR}/${P/-/_}
-
-java_prepare() {
-	rm -v *.jar || die
-	rm -v examples/*.class || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_EXTRA_ARGS="-DhasServlet=true"
-EANT_GENTOO_CLASSPATH="servletapi-2.4"
-
-src_install() {
-	java-pkg_newjar ${P}.jar
-
-	dodoc README.txt || die
-	# other stuff besides javadocs
-	use doc && java-pkg_dohtml -r docs/*
-	use source && java-pkg_dosrc src/*
-	use examples && java-pkg_doexamples examples
-}
diff --git a/dev-java/jcifs/jcifs-1.3.15.ebuild b/dev-java/jcifs/jcifs-1.3.15.ebuild
deleted file mode 100644
index 23b0bd7554ba..000000000000
--- a/dev-java/jcifs/jcifs-1.3.15.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jcifs/jcifs-1.3.15.ebuild,v 1.5 2011/07/15 15:57:26 xarthisius Exp $
-
-EAPI="2"
-JAVA_PKG_IUSE="doc examples source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Library that implements the CIFS/SMB networking protocol in Java"
-SRC_URI="http://jcifs.samba.org/src/${P}.tgz"
-HOMEPAGE="http://jcifs.samba.org/"
-LICENSE="LGPL-2.1"
-SLOT="1.1"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-RDEPEND=">=virtual/jre-1.4
-	dev-java/servletapi:2.4"
-DEPEND=">=virtual/jdk-1.4
-	${RDEPEND}"
-IUSE=""
-
-S=${WORKDIR}/${P/-/_}
-
-java_prepare() {
-	rm -v *.jar || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_EXTRA_ARGS="-DhasServlet=true"
-EANT_GENTOO_CLASSPATH="servletapi-2.4"
-
-src_install() {
-	java-pkg_newjar ${P}.jar
-
-	dodoc README.txt || die
-	# other stuff besides javadocs
-	use doc && java-pkg_dohtml -r docs/*
-	use source && java-pkg_dosrc src/*
-	use examples && java-pkg_doexamples examples
-}