Cleanup

(Portage version: 2.2_rc26/cvs/Linux x86_64)

3 files changed, 5 insertions, 227 deletions

diff --git a/mail-mta/ssmtp/ChangeLog b/mail-mta/ssmtp/ChangeLog
index 492baf352ba7..b07e2a50942c 100644
--- a/mail-mta/ssmtp/ChangeLog
+++ b/mail-mta/ssmtp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-mta/ssmtp
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ChangeLog,v 1.77 2009/03/17 10:51:05 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ChangeLog,v 1.78 2009/03/20 16:27:19 dertobi123 Exp $
+
+  20 Mar 2009; Tobias Scherbaum <dertobi123@gentoo.org>
+  -ssmtp-2.61-r2.ebuild, -ssmtp-2.62-r3.ebuild:
+  Cleanup
 
   17 Mar 2009; Raúl Porcel <armin76@gentoo.org> ssmtp-2.62-r4.ebuild:
   m68k stable wrt #255244, thanks to kolla for testing
diff --git a/mail-mta/ssmtp/ssmtp-2.61-r2.ebuild b/mail-mta/ssmtp/ssmtp-2.61-r2.ebuild
deleted file mode 100644
index 010968b4478c..000000000000
--- a/mail-mta/ssmtp/ssmtp-2.61-r2.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ssmtp-2.61-r2.ebuild,v 1.12 2008/09/12 15:22:30 jer Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Extremely simple MTA to get mail off the system to a Mailhub"
-HOMEPAGE="ftp://ftp.debian.org/debian/pool/main/s/ssmtp/"
-SRC_URI="mirror://debian/pool/main/s/ssmtp/${P/-/_}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="ssl ipv6 md5sum mailwrapper"
-
-DEPEND="virtual/libc
-	ssl? ( dev-libs/openssl )"
-RDEPEND="mailwrapper? ( >=net-mail/mailwrapper-0.2 )
-	!mailwrapper? ( !virtual/mta )
-	net-mail/mailbase
-	ssl? ( dev-libs/openssl )"
-PROVIDE="virtual/mta"
-
-S=${WORKDIR}/ssmtp-2.61
-
-src_unpack() {
-	unpack ${A} ; cd "${S}"
-
-	epatch "${FILESDIR}"/ssmtp-2.61-bug127592.patch
-
-	# Respect LDFLAGS (bug #152197)
-	sed -i -e 's:$(CC) -o:$(CC) @LDFLAGS@ -o:' Makefile.in
-}
-
-src_compile() {
-	tc-export CC LD
-
-	econf \
-		--sysconfdir=/etc/ssmtp \
-		$(use_enable ssl) \
-		$(use_enable ipv6 inet6) \
-		$(use_enable md5sum md5auth) \
-		|| die
-	make clean || die
-	make etcdir=/etc || die
-}
-
-src_install() {
-	dodir /usr/bin /usr/sbin /usr/lib
-	dosbin ssmtp || die
-	fperms 755 /usr/sbin/ssmtp
-	dosym /usr/sbin/sendmail /usr/bin/mailq
-	dosym /usr/sbin/sendmail /usr/bin/newaliases
-	# Removed symlink due to conflict with mailx
-	# See bug #7448
-	#dosym /usr/sbin/ssmtp /usr/bin/mail
-	#The sendmail symlink is now handled by mailwrapper if used
-	use mailwrapper || \
-		dosym /usr/sbin/ssmtp /usr/sbin/sendmail
-	dosym /usr/sbin/sendmail /usr/lib/sendmail
-	doman ssmtp.8
-	#removing the sendmail.8 symlink to support multiple installed mtas.
-	#dosym /usr/share/man/man8/ssmtp.8 /usr/share/man/man8/sendmail.8
-	dodoc INSTALL README TLS CHANGELOG_OLD
-	# This subdir has apparently disappeared in a later release:
-	# dodoc debian/{README.debian,changelog}
-	newdoc ssmtp.lsm DESC
-	insinto /etc/ssmtp
-	doins ssmtp.conf revaliases
-	if use mailwrapper
-	then
-		insinto /etc/mail
-		doins "${FILESDIR}"/mailer.conf
-	fi
-
-	# Set up config file
-	# See bug #22658
-	#local conffile="/etc/ssmtp/ssmtp.conf"
-	#local hostname=`hostname -f`
-	#local domainname=`hostname -d`
-	#mv ${conffile} ${conffile}.orig
-	#sed -e "s:rewriteDomain=:rewriteDomain=${domainname}:g" \
-	#        -e "s:_HOSTNAME_:${hostname}:" \
-	#        -e "s:^mailhub=mail:mailhub=mail.${domainname}:g" \
-	#        ${conffile}.orig > ${conffile}.pre
-	#if use ssl;
-	#then
-	#        sed -e "s:^#UseTLS=YES:UseTLS=YES:g" \
-	#                ${conffile}.pre > ${conffile}
-	#        mv ${conffile}.pre ${conffile}.orig
-	#else
-	#        mv ${conffile}.pre ${conffile}
-	#fi
-
-	# set up config file, v2. Bug 47562
-	local conffile="${D}/etc/ssmtp/ssmtp.conf"
-	mv "${conffile}" "${conffile}.orig"
-	# Sorry about the weird indentation, I couldn't figure out a cleverer way
-	# to do this without having horribly >80 char lines.
-	sed -e "s:^hostname=:\n# Gentoo bug #47562\\
-# Commenting the following line will force ssmtp to figure\\
-# out the hostname itself.\n\\
-# hostname=:" \
-		"${conffile}.orig" > "${conffile}" \
-		|| die "sed failed"
-}
-
-pkg_postinst() {
-	if ! use mailwrapper && [[ -e /etc/mailer.conf ]]
-	then
-		einfo
-		einfo "Since you emerged ssmtp w/o mailwrapper in USE,"
-		einfo "you probably want to 'emerge -C mailwrapper' now."
-		einfo
-	fi
-}
diff --git a/mail-mta/ssmtp/ssmtp-2.62-r3.ebuild b/mail-mta/ssmtp/ssmtp-2.62-r3.ebuild
deleted file mode 100644
index a94a8f89be17..000000000000
--- a/mail-mta/ssmtp/ssmtp-2.62-r3.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ssmtp-2.62-r3.ebuild,v 1.8 2008/11/09 12:18:26 vapier Exp $
-
-inherit eutils toolchain-funcs autotools
-
-DESCRIPTION="Extremely simple MTA to get mail off the system to a Mailhub"
-HOMEPAGE="ftp://ftp.debian.org/debian/pool/main/s/ssmtp/"
-SRC_URI="mirror://debian/pool/main/s/ssmtp/${P/-/_}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="ssl ipv6 md5sum maxsysuid"
-
-DEPEND="ssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}
-	!net-mail/mailwrapper
-	!virtual/mta"
-PROVIDE="virtual/mta"
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-	enewgroup ssmtp
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Allow to specify the last used system user id, bug #231866
-	if use maxsysuid; then
-		epatch "${FILESDIR}"/${P}-maxsysuid.patch
-		epatch "${FILESDIR}"/${P}-maxsysuid-conf.patch
-	fi
-
-	# CVE-2008-3962
-	epatch "${FILESDIR}/CVE-2008-3962.patch"
-
-	epatch "${FILESDIR}/${P}-strndup.patch"
-	eautoreconf
-
-	# Respect LDFLAGS (bug #152197)
-	sed -i -e 's:$(CC) -o:$(CC) @LDFLAGS@ -o:' Makefile.in
-}
-
-src_compile() {
-	tc-export CC LD
-
-	econf \
-		--sysconfdir=/etc/ssmtp \
-		$(use_enable ssl) \
-		$(use_enable ipv6 inet6) \
-		$(use_enable md5sum md5auth) \
-		|| die
-	make clean || die
-	make etcdir=/etc || die
-}
-
-src_install() {
-	dodir /usr/bin /usr/sbin /usr/lib
-	dosbin ssmtp || die
-	fperms 755 /usr/sbin/ssmtp
-
-	doman ssmtp.8
-	dodoc INSTALL README TLS CHANGELOG_OLD
-	newdoc ssmtp.lsm DESC
-
-	insinto /etc/ssmtp
-	doins ssmtp.conf revaliases
-
-	local conffile="${D}etc/ssmtp/ssmtp.conf"
-
-	mv "${conffile}" "${conffile}.orig"
-
-	# Sorry about the weird indentation, I couldn't figure out a cleverer way
-	# to do this without having horribly >80 char lines.
-	sed -e "s:^hostname=:\n# Gentoo bug #47562\\
-# Commenting the following line will force ssmtp to figure\\
-# out the hostname itself.\n\\
-# hostname=:" \
-		"${conffile}.orig" > "${conffile}" \
-		|| die "sed failed"
-
-	rm "${conffile}.orig" || die "Failed to remove temporary created copy of ssmtp.conf"
-
-	# Set restrictive perms on ssmtp.conf as per #187841
-	# Protect the ssmtp configfile from being readable by regular users as it
-	# may contain login/password data to auth against a the mailhub used, add
-	# users to the ssmtp group to enable them to use ssmtp.
-	fowners root:ssmtp /etc/ssmtp/ssmtp.conf
-	fperms 640 /etc/ssmtp/ssmtp.conf
-
-	fowners root:ssmtp /usr/sbin/ssmtp
-	fperms 750 /usr/sbin/ssmtp
-
-	dosym /usr/sbin/ssmtp /usr/lib/sendmail
-	dosym /usr/sbin/ssmtp /usr/bin/sendmail
-	dosym /usr/sbin/ssmtp /usr/sbin/sendmail
-	dosym /usr/sbin/ssmtp /usr/bin/mailq
-	dosym /usr/sbin/ssmtp /usr/bin/newaliases
-}
-
-pkg_postinst() {
-	elog "Starting with =mail-mta/ssmtp-2.62 all users who should be able"
-	elog "to send mails using ssmtp must be added to the ssmtp group."
-	elog
-	elog "See bug #187841 for reference."
-}