Fix herd name in metadata.xml. Remove old.

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key )

4 files changed, 6 insertions, 97 deletions

diff --git a/sys-apps/ucspi-ssl/ChangeLog b/sys-apps/ucspi-ssl/ChangeLog
index 4ef0b52312e3..5ee99ca33115 100644
--- a/sys-apps/ucspi-ssl/ChangeLog
+++ b/sys-apps/ucspi-ssl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/ucspi-ssl
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-ssl/ChangeLog,v 1.45 2015/05/29 04:23:23 jmorgan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-ssl/ChangeLog,v 1.46 2015/05/31 11:42:09 mrueg Exp $
+
+  31 May 2015; Manuel Rüger <mrueg@gentoo.org> -ucspi-ssl-0.70-r1.ebuild,
+  -ucspi-ssl-0.94.ebuild, metadata.xml:
+  Fix herd name in metadata.xml. Remove old.
 
   29 May 2015; Jack Morgan <jmorgan@gentoo.org> ucspi-ssl-0.94-r1.ebuild:
   sparc stable wrt bug #516868
diff --git a/sys-apps/ucspi-ssl/metadata.xml b/sys-apps/ucspi-ssl/metadata.xml
index bbf9a59c202c..57d4295a292a 100644
--- a/sys-apps/ucspi-ssl/metadata.xml
+++ b/sys-apps/ucspi-ssl/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maint@gentoo.org</herd>
+	<herd>proxy-maint</herd>
 	<maintainer>
 		<email>powerman-asdf@yandex.ru</email>
                 <description>Primary maintainer</description>
diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.70-r1.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.70-r1.ebuild
deleted file mode 100644
index 0bb14be7f1de..000000000000
--- a/sys-apps/ucspi-ssl/ucspi-ssl-0.70-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-ssl/ucspi-ssl-0.70-r1.ebuild,v 1.18 2014/08/10 20:25:24 slyfox Exp $
-
-inherit eutils fixheadtails qmail
-
-DESCRIPTION="Command-line tools for building SSL client-server applications"
-HOMEPAGE="http://www.superscript.com/ucspi-ssl/"
-SRC_URI="http://www.superscript.com/ucspi-ssl/${P}.tar.gz
-		http://www.suspectclass.com/~sgifford/ucspi-tls/files/ucspi-ssl-0.70-ucspitls-0.1.patch"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="perl tls"
-
-DEPEND=">=dev-libs/openssl-0.9.6g
-	sys-apps/ucspi-tcp"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/host/superscript.com/net/${P}/src
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	use tls && epatch "${DISTDIR}"/ucspi-ssl-0.70-ucspitls-0.1.patch
-
-	ht_fix_all
-	sed -i -e 's:HOME/command:/usr/bin:' sslcat.sh sslconnect.sh https\@.sh
-	sed -i -e 's:auto:gcc:' conf-cc conf-ld
-
-	qmail_set_cc
-
-	echo "/usr/bin" > conf-tcpbin
-	echo "/usr/" > home
-	echo "/usr/share/ca-certificates/" > conf-cadir
-	echo "${QMAIL_HOME}/control/dh1024.pem" > conf-dhfile
-}
-
-src_compile() {
-	make || die "make failed"
-}
-
-src_install() {
-	dodoc CHANGES TODO UCSPI-SSL
-	dobin sslserver sslclient sslcat sslconnect https\@ || die
-	use perl && dobin sslperl
-}
diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.94.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.94.ebuild
deleted file mode 100644
index 80b6644a0029..000000000000
--- a/sys-apps/ucspi-ssl/ucspi-ssl-0.94.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-ssl/ucspi-ssl-0.94.ebuild,v 1.7 2015/04/14 12:32:10 ago Exp $
-
-EAPI=5
-
-inherit eutils fixheadtails qmail
-
-DESCRIPTION="Command-line tools for building SSL client-server applications"
-HOMEPAGE="http://www.fehcom.de/ipnet/ucspi-ssl.html"
-SRC_URI="http://www.fehcom.de/ipnet/ucspi-ssl/${P}.tgz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
-IUSE="perl"
-
-DEPEND=">=dev-libs/openssl-0.9.6g:="
-RDEPEND="${DEPEND}
-	sys-apps/ucspi-tcp"
-
-S="${WORKDIR}"/host/superscript.com/net/${P}/src
-
-src_prepare() {
-	ht_fix_all
-	sed -i -e 's:HOME/command:/usr/bin:' sslcat.sh sslconnect.sh https\@.sh
-	sed -i -e 's:auto:gcc:' conf-cc conf-ld
-
-	qmail_set_cc
-
-	echo "/usr/bin" > conf-tcpbin
-	echo "/usr/" > home
-	echo "/usr/share/ca-certificates/" > conf-cadir
-	echo "${QMAIL_HOME}/control/dh1024.pem" > conf-dhfile
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	dodoc ../doc/*
-	doman ../man/*.*
-	dobin sslserver sslclient sslcat sslconnect https\@ || die
-	use perl && dobin sslperl
-}