commit: f4dfb5e18f9a60719c293881ae9d851fa6112b29 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Tue Oct 3 22:16:10 2017 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Tue Oct 3 22:19:22 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4dfb5e1
dev-java/gnu-classpath-inetlib: Remove last-rited pkg Closes: https://bugs.gentoo.org/553186 dev-java/gnu-classpath-inetlib/Manifest | 2 - .../files/gnu-classpath-inetlib-1.0-jdk15.patch | 64 ---------------- .../files/gnu-classpath-inetlib-1.1-jdk15.patch | 87 ---------------------- .../gnu-classpath-inetlib-1.0-r3.ebuild | 63 ---------------- .../gnu-classpath-inetlib-1.1-r3.ebuild | 57 -------------- dev-java/gnu-classpath-inetlib/metadata.xml | 15 ---- profiles/package.mask | 1 - 7 files changed, 289 deletions(-) diff --git a/dev-java/gnu-classpath-inetlib/Manifest b/dev-java/gnu-classpath-inetlib/Manifest deleted file mode 100644 index 8f66244d852..00000000000 --- a/dev-java/gnu-classpath-inetlib/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST inetlib-1.0.tar.gz 151002 SHA256 f59a46051b01dd01f04d0cc677d95a6c02b3389787d59a63b0f74bef20f887f8 SHA512 f3efa679d4f09d65025b3a903bb94eeced6470fff4414a1a1dc00985f644855bef9aaf5015c24c4321a6088e5ca48ced2177548f11dc84c07b4e5281b9709ede WHIRLPOOL 8f79486a4c11926ab9063a25efe411c39adebe377c93a8bc2484fc09907ed97455f231778d462aaae5fb8830da1d39d9a00cdbdc50e83905df4e9bc1491399d8 -DIST inetlib-1.1.tar.gz 177251 SHA256 2b30cad60f3136b04f9ae4a906da8ac964654dacd3281097ec3558e67c9a51a0 SHA512 0ebc112bc8758ca8da23797d71d91d386896be6105cc1a40448445e59a6cdc43dc5dcd84f8b69332d7b7eaf11efd474588cadcb68f7356f2aa40657aaf62147b WHIRLPOOL 48bc55ac1b102c81f3de0d1e943ff51731e963b5cd9ac080a91a99f3da7ed48966deb034f4c863d722aef0461ff96f153dccb62c1edced5ac7c8c1897bb0b5d6 diff --git a/dev-java/gnu-classpath-inetlib/files/gnu-classpath-inetlib-1.0-jdk15.patch b/dev-java/gnu-classpath-inetlib/files/gnu-classpath-inetlib-1.0-jdk15.patch deleted file mode 100644 index c6db3e2f695..00000000000 --- a/dev-java/gnu-classpath-inetlib/files/gnu-classpath-inetlib-1.0-jdk15.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff -uNr inetlib-1.0.orig/source/gnu/inet/imap/IMAPConnection.java inetlib-1.0/source/gnu/inet/imap/IMAPConnection.java ---- inetlib-1.0.orig/source/gnu/inet/imap/IMAPConnection.java 2006-09-19 13:18:21.512067374 +0200 -+++ inetlib-1.0/source/gnu/inet/imap/IMAPConnection.java 2006-09-19 13:19:07.024373510 +0200 -@@ -45,7 +45,6 @@ - import java.util.Iterator; - import java.util.List; - import java.util.Map; --import java.util.Properties; - - import javax.net.ssl.SSLContext; - import javax.net.ssl.SSLSocket; -@@ -555,7 +554,7 @@ - String[] m = new String[] { mechanism }; - CallbackHandler ch = new SaslCallbackHandler(username, password); - // Avoid lengthy callback procedure for GNU Crypto -- Properties p = new Properties(); -+ HashMap p = new HashMap(); - p.put("gnu.crypto.sasl.username", username); - p.put("gnu.crypto.sasl.password", password); - SaslClient sasl = Sasl.createSaslClient(m, null, "smtp", -diff -uNr inetlib-1.0.orig/source/gnu/inet/pop3/POP3Connection.java inetlib-1.0/source/gnu/inet/pop3/POP3Connection.java ---- inetlib-1.0.orig/source/gnu/inet/pop3/POP3Connection.java 2006-09-19 13:18:21.531064997 +0200 -+++ inetlib-1.0/source/gnu/inet/pop3/POP3Connection.java 2006-09-19 13:20:28.841137790 +0200 -@@ -39,8 +39,8 @@ - import java.security.MessageDigest; - import java.security.NoSuchAlgorithmException; - import java.util.ArrayList; -+import java.util.HashMap; - import java.util.List; --import java.util.Properties; - - import javax.net.ssl.SSLContext; - import javax.net.ssl.SSLSocket; -@@ -220,7 +220,7 @@ - String[] m = new String[] { mechanism }; - CallbackHandler ch = new SaslCallbackHandler (username, password); - // Avoid lengthy callback procedure for GNU Crypto -- Properties p = new Properties (); -+ HashMap p = new HashMap(); - p.put ("gnu.crypto.sasl.username", username); - p.put ("gnu.crypto.sasl.password", password); - SaslClient sasl = -diff -uNr inetlib-1.0.orig/source/gnu/inet/smtp/SMTPConnection.java inetlib-1.0/source/gnu/inet/smtp/SMTPConnection.java ---- inetlib-1.0.orig/source/gnu/inet/smtp/SMTPConnection.java 2006-09-19 13:18:21.533064747 +0200 -+++ inetlib-1.0/source/gnu/inet/smtp/SMTPConnection.java 2006-09-19 13:21:16.996113371 +0200 -@@ -37,8 +37,8 @@ - import java.security.GeneralSecurityException; - import java.util.ArrayList; - import java.util.Collections; -+import java.util.HashMap; - import java.util.List; --import java.util.Properties; - - import javax.net.ssl.SSLContext; - import javax.net.ssl.SSLSocket; -@@ -567,7 +567,7 @@ - String[] m = new String[] { mechanism }; - CallbackHandler ch = new SaslCallbackHandler (username, password); - // Avoid lengthy callback procedure for GNU Crypto -- Properties p = new Properties (); -+ HashMap p = new HashMap(); - p.put ("gnu.crypto.sasl.username", username); - p.put ("gnu.crypto.sasl.password", password); - SaslClient sasl = diff --git a/dev-java/gnu-classpath-inetlib/files/gnu-classpath-inetlib-1.1-jdk15.patch b/dev-java/gnu-classpath-inetlib/files/gnu-classpath-inetlib-1.1-jdk15.patch deleted file mode 100644 index e717fd4e52c..00000000000 --- a/dev-java/gnu-classpath-inetlib/files/gnu-classpath-inetlib-1.1-jdk15.patch +++ /dev/null @@ -1,87 +0,0 @@ -diff -uNr inetlib.orig/source/gnu/inet/imap/IMAPConnection.java inetlib/source/gnu/inet/imap/IMAPConnection.java ---- inetlib.orig/source/gnu/inet/imap/IMAPConnection.java 2006-09-19 10:25:48.402313856 +0200 -+++ inetlib/source/gnu/inet/imap/IMAPConnection.java 2006-09-19 10:27:02.775026067 +0200 -@@ -46,7 +46,6 @@ - import java.util.Iterator; - import java.util.List; - import java.util.Map; --import java.util.Properties; - - import javax.net.ssl.SSLContext; - import javax.net.ssl.SSLSocket; -@@ -653,7 +652,7 @@ - String[] m = new String[] { mechanism }; - CallbackHandler ch = new SaslCallbackHandler (username, password); - // Avoid lengthy callback procedure for GNU Crypto -- Properties p = new Properties (); -+ HashMap p = new HashMap(); - p.put ("gnu.crypto.sasl.username", username); - p.put ("gnu.crypto.sasl.password", password); - SaslClient sasl = Sasl.createSaslClient (m, null, "smtp", -diff -uNr inetlib.orig/source/gnu/inet/nntp/NNTPConnection.java inetlib/source/gnu/inet/nntp/NNTPConnection.java ---- inetlib.orig/source/gnu/inet/nntp/NNTPConnection.java 2006-09-19 10:25:48.420311609 +0200 -+++ inetlib/source/gnu/inet/nntp/NNTPConnection.java 2006-09-19 10:29:02.781039000 +0200 -@@ -42,7 +42,7 @@ - import java.util.Calendar; - import java.util.Date; - import java.util.GregorianCalendar; --import java.util.Properties; -+import java.util.HashMap; - import java.util.TimeZone; - - import javax.security.auth.callback.CallbackHandler; -@@ -1140,7 +1140,7 @@ - String[] m = new String[] { mechanism }; - CallbackHandler ch = new SaslCallbackHandler (username, password); - // Avoid lengthy callback procedure for GNU Crypto -- Properties p = new Properties (); -+ HashMap p = new HashMap(); - p.put ("gnu.crypto.sasl.username", username); - p.put ("gnu.crypto.sasl.password", password); - SaslClient sasl = -diff -uNr inetlib.orig/source/gnu/inet/pop3/POP3Connection.java inetlib/source/gnu/inet/pop3/POP3Connection.java ---- inetlib.orig/source/gnu/inet/pop3/POP3Connection.java 2006-09-19 10:25:48.426310859 +0200 -+++ inetlib/source/gnu/inet/pop3/POP3Connection.java 2006-09-19 10:27:59.374957608 +0200 -@@ -41,10 +41,10 @@ - import java.security.NoSuchAlgorithmException; - import java.util.ArrayList; - import java.util.Collections; -+import java.util.HashMap; - import java.util.LinkedHashMap; - import java.util.List; - import java.util.Map; --import java.util.Properties; - - import javax.net.ssl.SSLContext; - import javax.net.ssl.SSLSocket; -@@ -232,7 +232,7 @@ - String[] m = new String[] { mechanism }; - CallbackHandler ch = new SaslCallbackHandler (username, password); - // Avoid lengthy callback procedure for GNU Crypto -- Properties p = new Properties (); -+ HashMap p = new HashMap(); - p.put ("gnu.crypto.sasl.username", username); - p.put ("gnu.crypto.sasl.password", password); - SaslClient sasl = -diff -uNr inetlib.orig/source/gnu/inet/smtp/SMTPConnection.java inetlib/source/gnu/inet/smtp/SMTPConnection.java ---- inetlib.orig/source/gnu/inet/smtp/SMTPConnection.java 2006-09-19 10:25:48.428310610 +0200 -+++ inetlib/source/gnu/inet/smtp/SMTPConnection.java 2006-09-19 10:26:34.107606132 +0200 -@@ -38,8 +38,8 @@ - import java.security.GeneralSecurityException; - import java.util.ArrayList; - import java.util.Collections; -+import java.util.HashMap; - import java.util.List; --import java.util.Properties; - - import javax.net.ssl.SSLContext; - import javax.net.ssl.SSLSocket; -@@ -598,7 +598,7 @@ - String[] m = new String[] { mechanism }; - CallbackHandler ch = new SaslCallbackHandler (username, password); - // Avoid lengthy callback procedure for GNU Crypto -- Properties p = new Properties (); -+ HashMap p = new HashMap(); - p.put ("gnu.crypto.sasl.username", username); - p.put ("gnu.crypto.sasl.password", password); - SaslClient sasl = diff --git a/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0-r3.ebuild b/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0-r3.ebuild deleted file mode 100644 index 9406f606ba3..00000000000 --- a/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0-r3.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit java-pkg-2 - -MY_PN="inetlib" -MY_P="${MY_PN}-${PV}" -DESCRIPTION="Network extensions library for GNU classpath and classpathx" -HOMEPAGE="https://www.gnu.org/software/classpath/"; -SRC_URI="mirror://gnu/classpath/${MY_P}.tar.gz" -LICENSE="GPL-2-with-linking-exception" -SLOT="1.0" -KEYWORDS="amd64 x86" -IUSE="doc" -RDEPEND=">=virtual/jre-1.3 - >=dev-java/gnu-crypto-2.0.1" -DEPEND=">=virtual/jdk-1.3 - ${RDEPEND}" -S="${WORKDIR}/${MY_P}" - -# TODO we could give configure the lib dir on the live filesystem -# instead of populating ${S}/ext with the jars we need -nichoj -# TODO fix jikes support. Related to bug #89711 - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}/${P}-jdk15.patch" - - mkdir ext && cd ext - java-pkg_jar-from gnu-crypto javax-security.jar javax-security-auth-callback.jar - java-pkg_jar-from gnu-crypto javax-security.jar javax-security-sasl.jar - # fake jar to shut build system up, jsse is part of JDK's classpath already - ln -s javax-security-sasl.jar jsse.jar -} - -src_compile() { - econf \ - --enable-smtp \ - --enable-imap \ - --enable-pop3 \ - --enable-nntp \ - --enable-ftp \ - --enable-gopher \ - --with-jsse-jar="${S}"/ext \ - --with-javax-security-auth-callback-jar="${S}"/ext \ - --with-javax-security-sasl-jar="${S}"/ext \ - || die "econf failed" - # https://bugs.gentoo.org/show_bug.cgi?id=179897 - emake JAVACFLAGS="${JAVACFLAGS}" -j1 || die "emake failed" - if use doc ; then - emake -j1 javadoc || die "emake javadoc failed" - fi -} - -src_install() { - einstall || die - rm -rf "${D}"/usr/share/java - java-pkg_dojar ${MY_PN}.jar - use doc && java-pkg_dojavadoc docs - dodoc AUTHORS NEWS README || die -} diff --git a/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.1-r3.ebuild b/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.1-r3.ebuild deleted file mode 100644 index 3110cb5125f..00000000000 --- a/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.1-r3.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit java-pkg-2 java-ant-2 - -MY_PN="inetlib" -MY_P="${MY_PN}-${PV}" -DESCRIPTION="Network extensions library for GNU classpath and classpathx" -HOMEPAGE="https://www.gnu.org/software/classpath/"; -SRC_URI="mirror://gnu/classpath/${MY_P}.tar.gz" -LICENSE="GPL-2-with-linking-exception" -SLOT="1.1" -KEYWORDS="amd64 x86" -IUSE="doc" -RDEPEND=">=virtual/jre-1.3 - >=dev-java/gnu-crypto-2.0.1" -DEPEND=">=virtual/jdk-1.3 - ${RDEPEND}" -S="${WORKDIR}/${MY_PN}" - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}/${P}-jdk15.patch" - - mkdir ext && cd ext - java-pkg_jar-from gnu-crypto - # fake jar to shut build system up, jsse is part of JDK's classpath already - ln -s javax-security.jar jsse.jar -} - -src_compile() { - econf \ - --enable-smtp \ - --enable-imap \ - --enable-pop3 \ - --enable-nntp \ - --enable-ftp \ - --enable-gopher \ - --with-jsse-jar="${S}"/ext \ - --with-javax-security-jar="${S}"/ext \ - || die - # https://bugs.gentoo.org/show_bug.cgi?id=179897 - emake JAVACFLAGS="${JAVACFLAGS}" -j1 || die - if use doc ; then - emake -j1 javadoc || die - fi -} - -src_install() { - einstall || die - rm -rf "${D}"/usr/share/java - java-pkg_dojar inetlib.jar - use doc && java-pkg_dojavadoc docs - dodoc AUTHORS NEWS README || die -} diff --git a/dev-java/gnu-classpath-inetlib/metadata.xml b/dev-java/gnu-classpath-inetlib/metadata.xml deleted file mode 100644 index eda7f5994ec..00000000000 --- a/dev-java/gnu-classpath-inetlib/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<maintainer type="project"> - <email>[email protected]</email> - <name>Java</name> -</maintainer> - -<longdescription> -GNU Classpath inetlib is an extension library to provide extra network -protocol support for GNU Classpath and ClasspathX project, but it can -also used standalone to make adding http, imap, pop3 and smtp client -support to applictions. -</longdescription> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index 5f55b5e7fd0..e3b3c23aad4 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -240,7 +240,6 @@ net-analyzer/ntop # James Le Cuirot <[email protected]> (29 Aug 2017) # The FOSS-friendly oracle-javamail has rendered other implementations # and the virtual obsolete. Removal in 30 days. See bug #553186. -dev-java/gnu-classpath-inetlib java-virtuals/javamail # Anthony G. Basile <[email protected]> (27 Aug 2017)
