9 files changed, 4 insertions, 292 deletions
diff --git a/app-shells/smrsh/Manifest b/app-shells/smrsh/Manifest
index e8d0593d02e1..15fb45ce61b4 100644
--- a/app-shells/smrsh/Manifest
+++ b/app-shells/smrsh/Manifest
@@ -1,6 +1 @@
-DIST sendmail.8.14.5.tar.gz 2092508 SHA256 fb65a86a0f87f12aefb933ee8990540f7a680a594f7fedfdd28918f3934bfb88 SHA512 178addd247f1c7c8ca90d70b9240db4cad4e55f0710d5df0fe979e5473a182d2035150c352836576a28bb2b9660b0d5ebfcd95269a156ac0d2c3dba3edb60452 WHIRLPOOL 2e073759a44d535629d9cce91da4a7082e085defeb9491a4470a8a8c8b18e1545129527c0138a74edb405a9c9724e5a597ee99c7852a423696c495ad8fef783f
-DIST sendmail.8.14.6.tar.gz 2104299 SHA256 4ecbaeb2fec8829cd2852acbd8aca66a1383c1237e8401b2fa5377ee3b6d80cd SHA512 012fc396723a97ea5ad95e8b3ea6a3a40aeb97b85ed8af20ae9486729abe149e85cef4a8a16f763ae3d772a41547066434f97b25055e37590a768efa0c9c3757 WHIRLPOOL 271a09a49ab27e99365f171c617738b35a05949aeea8e6941caad712d75c0a3881da6e5528f0ca2900853a224d54db51800d1797ca80cfe7c9716a1283ff2a4d
-DIST sendmail.8.14.7.tar.gz 2112670 SHA256 fa4ff9e67d1e5a42f353eedb207e08b38c0ac31030f7165866de2c520f508710 SHA512 872fef1be984ae8aecdf4299459de50fea86a3b3758e0aac01ea4307fa936a03e66d3ef8d1352cd21afe588b53b04a1cea6e099ba64a5edab5a31e25fb8e0bd3 WHIRLPOOL 82d7b85a130900bd18e43df182850c1fd589caa21e90c055592ebd89e9da6a6dfa35b2baed87b56ca7772b24bb8567266cfad7352167068aad405e3fcfe9202e
-DIST sendmail.8.14.8.tar.gz 2114959 SHA256 02eb69125fc19890fa922496a5230ebb32faedc8da670d8500a8ff37e4fcb0fe SHA512 16cda9ff2af325e661d2be0008bed27e170cfe75aeab2b0a56e5579046309509bed4415494dbfb831cc723ab3ffab03dcef2748c16bb0b8f7fe9b4891467b425 WHIRLPOOL 5916e9667ee0df144d8b8c84e2c0a0a38a197b90e53c4ca02fe13d6e44e9bbf8987fcb036c42a1d43f7ab75a7cd8b68f746d5b90af727ca3788a047bd40eac0a
-DIST sendmail.8.14.9.tar.gz 2114293 SHA256 f5a497151abd8f341cca0736c3f9bd703d574d93146b2989689dff6d7a445d75 SHA512 a541fe687e9967fb87f2f6c6263ecc698aac42c6a52e81e7ee556f0c3d719b9c996dfccf10cc2e0e5c6d03dd8d3ce79b856b78ca049dd47665e38c77763fa424 WHIRLPOOL c1b290d66d9397bbe8041cd17cfc1fbc205c9d5439d89ee59c339e3febe605d964e7a50482101edec8f0b9cd6df38138e489869a5404dbfc2b7ba57dbeef1c55
 DIST sendmail.8.15.2.tar.gz 2207417 SHA256 24f94b5fd76705f15897a78932a5f2439a32b1a2fdc35769bb1a5f5d9b4db439 SHA512 04feb37316c13b66b1518596507a7da7c16cb0bf1abf10367f7fd888a428fadb093a9efa55342fa55b936c3f0cbdc63b9e2505cd99201a69a0c05b8ad65f49f9 WHIRLPOOL be9ec97041c01a3bda30d9ea6090c29a993439ed38e12c96fd0de880b0667a5df3133179382959539289c1489d23991749aa42e7ac4eb5e9a32fde84d4eb0554
diff --git a/app-shells/smrsh/files/site.config.m4 b/app-shells/smrsh/files/site.config.m4
index 3ce1c7248c8b..24ef462ba2eb 100644
--- a/app-shells/smrsh/files/site.config.m4
+++ b/app-shells/smrsh/files/site.config.m4
@@ -1,13 +1,14 @@
 define(`confCCOPTS', `@@confCCOPTS@@')
 define(`confSTDIO_TYPE', `portable')
 define(`confENVDEF', `-DXDEBUG=0')
-define(`confLDOPTS', `-s')
+define(`confLDOPTS', `@@confLDOPTS@@')
 define(`confMANOWN', `root')
 define(`confMANGRP', `root')
 define(`confMANMODE', `644')
 define(`confMAN1SRC', `1')
 define(`confMAN5SRC', `5')
 define(`confMAN8SRC', `8')
-define(`confLDOPTS_SO', `-shared -Wl')
+define(`confLDOPTS_SO', `@@confLDOPTS@@')
+define(`confCC', `@@confCC@@')
 APPENDDEF(`conf_smrsh_ENVDEF', `-DSMRSH_PATH=\"/bin:/usr/bin\"')
 APPENDDEF(`conf_smrsh_ENVDEF', `-DSMRSH_CMDDIR=\"/var/lib/smrsh\"')
diff --git a/app-shells/smrsh/files/smrsh-8.14.5-site.config.m4 b/app-shells/smrsh/files/smrsh-8.14.5-site.config.m4
deleted file mode 100644
index 24ef462ba2eb..000000000000
--- a/app-shells/smrsh/files/smrsh-8.14.5-site.config.m4
+++ /dev/null
@@ -1,14 +0,0 @@
-define(`confCCOPTS', `@@confCCOPTS@@')
-define(`confSTDIO_TYPE', `portable')
-define(`confENVDEF', `-DXDEBUG=0')
-define(`confLDOPTS', `@@confLDOPTS@@')
-define(`confMANOWN', `root')
-define(`confMANGRP', `root')
-define(`confMANMODE', `644')
-define(`confMAN1SRC', `1')
-define(`confMAN5SRC', `5')
-define(`confMAN8SRC', `8')
-define(`confLDOPTS_SO', `@@confLDOPTS@@')
-define(`confCC', `@@confCC@@')
-APPENDDEF(`conf_smrsh_ENVDEF', `-DSMRSH_PATH=\"/bin:/usr/bin\"')
-APPENDDEF(`conf_smrsh_ENVDEF', `-DSMRSH_CMDDIR=\"/var/lib/smrsh\"')
diff --git a/app-shells/smrsh/smrsh-8.14.5.ebuild b/app-shells/smrsh/smrsh-8.14.5.ebuild
deleted file mode 100644
index da34e28154c9..000000000000
--- a/app-shells/smrsh/smrsh-8.14.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit toolchain-funcs
-
-DESCRIPTION="Sendmail restricted shell, for use with MTAs other than Sendmail"
-HOMEPAGE="http://www.sendmail.org/"
-SRC_URI="ftp://ftp.sendmail.org/pub/sendmail/sendmail.${PV}.tar.gz"
-
-LICENSE="Sendmail"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-DEPEND="sys-devel/m4
-	>=sys-apps/sed-4"
-RDEPEND="${DEPEND}
-	!mail-mta/sendmail"
-
-S="${WORKDIR}/sendmail-${PV}"
-
-src_prepare() {
-	cd "${S}/${PN}"
-	sed -e "s:/usr/libexec:/usr/sbin:g" \
-		-e "s:/usr/adm/sm.bin:/var/lib/smrsh:g" \
-		-i README -i smrsh.8 || die "sed failed"
-
-	sed -e "s:@@confCCOPTS@@:${CFLAGS}:" \
-		-e "s:@@confLDOPTS@@:${LDFLAGS}:" \
-		-e "s:@@confCC@@:$(tc-getCC):" "${FILESDIR}/${P}-site.config.m4" \
-		> "${S}/devtools/Site/site.config.m4" || die "sed failed"
-}
-
-src_compile() {
-	cd "${S}/${PN}"
-	/bin/sh Build
-}
-
-src_install() {
-	dosbin "${S}/obj.$(uname -s).$(uname -r).$(arch)/${PN}/${PN}" || die
-
-	cd "${S}/${PN}"
-	doman smrsh.8 || die
-	dodoc README || die
-
-	keepdir /var/lib/smrsh
-}
-
-pkg_postinst() {
-	elog "smrsh is compiled to look for programs in /var/lib/smrsh."
-	echo
-}
diff --git a/app-shells/smrsh/smrsh-8.14.6.ebuild b/app-shells/smrsh/smrsh-8.14.6.ebuild
deleted file mode 100644
index c54a0d877178..000000000000
--- a/app-shells/smrsh/smrsh-8.14.6.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit toolchain-funcs
-
-DESCRIPTION="Sendmail restricted shell, for use with MTAs other than Sendmail"
-HOMEPAGE="http://www.sendmail.org/"
-SRC_URI="ftp://ftp.sendmail.org/pub/sendmail/sendmail.${PV}.tar.gz"
-
-LICENSE="Sendmail"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-devel/m4
-	>=sys-apps/sed-4"
-RDEPEND="${DEPEND}
-	!mail-mta/sendmail"
-
-S="${WORKDIR}/sendmail-${PV}"
-
-src_prepare() {
-	cd "${S}/${PN}"
-	sed -e "s:/usr/libexec:/usr/sbin:g" \
-		-e "s:/usr/adm/sm.bin:/var/lib/smrsh:g" \
-		-i README -i smrsh.8 || die "sed failed"
-
-	sed -e "s:@@confCCOPTS@@:${CFLAGS}:" \
-		-e "s:@@confLDOPTS@@:${LDFLAGS}:" \
-		-e "s:@@confCC@@:$(tc-getCC):" "${FILESDIR}/${PN}-8.14.5-site.config.m4" \
-		> "${S}/devtools/Site/site.config.m4" || die "sed failed"
-}
-
-src_compile() {
-	cd "${S}/${PN}"
-	/bin/sh Build
-}
-
-src_install() {
-	dosbin "${S}/obj.$(uname -s).$(uname -r).$(arch)/${PN}/${PN}" || die
-
-	cd "${S}/${PN}"
-	doman smrsh.8 || die
-	dodoc README || die
-
-	keepdir /var/lib/smrsh
-}
-
-pkg_postinst() {
-	elog "smrsh is compiled to look for programs in /var/lib/smrsh."
-	echo
-}
diff --git a/app-shells/smrsh/smrsh-8.14.7.ebuild b/app-shells/smrsh/smrsh-8.14.7.ebuild
deleted file mode 100644
index a5f18bd2d013..000000000000
--- a/app-shells/smrsh/smrsh-8.14.7.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit toolchain-funcs
-
-DESCRIPTION="Sendmail restricted shell, for use with MTAs other than Sendmail"
-HOMEPAGE="http://www.sendmail.org/"
-SRC_URI="ftp://ftp.sendmail.org/pub/sendmail/sendmail.${PV}.tar.gz"
-
-LICENSE="Sendmail"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-DEPEND="sys-devel/m4
-	>=sys-apps/sed-4"
-RDEPEND="${DEPEND}
-	!mail-mta/sendmail"
-
-S="${WORKDIR}/sendmail-${PV}"
-
-src_prepare() {
-	cd "${S}/${PN}"
-	sed -e "s:/usr/libexec:/usr/sbin:g" \
-		-e "s:/usr/adm/sm.bin:/var/lib/smrsh:g" \
-		-i README -i smrsh.8 || die "sed failed"
-
-	sed -e "s:@@confCCOPTS@@:${CFLAGS}:" \
-		-e "s:@@confLDOPTS@@:${LDFLAGS}:" \
-		-e "s:@@confCC@@:$(tc-getCC):" "${FILESDIR}/${PN}-8.14.5-site.config.m4" \
-		> "${S}/devtools/Site/site.config.m4" || die "sed failed"
-}
-
-src_compile() {
-	cd "${S}/${PN}"
-	/bin/sh Build
-}
-
-src_install() {
-	dosbin "${S}/obj.$(uname -s).$(uname -r).$(arch)/${PN}/${PN}" || die
-
-	cd "${S}/${PN}"
-	doman smrsh.8 || die
-	dodoc README || die
-
-	keepdir /var/lib/smrsh
-}
-
-pkg_postinst() {
-	elog "smrsh is compiled to look for programs in /var/lib/smrsh."
-	echo
-}
diff --git a/app-shells/smrsh/smrsh-8.14.8.ebuild b/app-shells/smrsh/smrsh-8.14.8.ebuild
deleted file mode 100644
index 13edae9dcf88..000000000000
--- a/app-shells/smrsh/smrsh-8.14.8.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit toolchain-funcs
-
-DESCRIPTION="Sendmail restricted shell, for use with MTAs other than Sendmail"
-HOMEPAGE="http://www.sendmail.org/"
-SRC_URI="ftp://ftp.sendmail.org/pub/sendmail/sendmail.${PV}.tar.gz"
-
-LICENSE="Sendmail"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-devel/m4
-	>=sys-apps/sed-4"
-RDEPEND="${DEPEND}
-	!mail-mta/sendmail"
-
-S="${WORKDIR}/sendmail-${PV}"
-
-src_prepare() {
-	cd "${S}/${PN}"
-	sed -e "s:/usr/libexec:/usr/sbin:g" \
-		-e "s:/usr/adm/sm.bin:/var/lib/smrsh:g" \
-		-i README -i smrsh.8 || die "sed failed"
-
-	sed -e "s:@@confCCOPTS@@:${CFLAGS}:" \
-		-e "s:@@confLDOPTS@@:${LDFLAGS}:" \
-		-e "s:@@confCC@@:$(tc-getCC):" "${FILESDIR}/${PN}-8.14.5-site.config.m4" \
-		> "${S}/devtools/Site/site.config.m4" || die "sed failed"
-}
-
-src_compile() {
-	cd "${S}/${PN}"
-	/bin/sh Build
-}
-
-src_install() {
-	dosbin "${S}/obj.$(uname -s).$(uname -r).$(arch)/${PN}/${PN}" || die
-
-	cd "${S}/${PN}"
-	doman smrsh.8 || die
-	dodoc README || die
-
-	keepdir /var/lib/smrsh
-}
-
-pkg_postinst() {
-	elog "smrsh is compiled to look for programs in /var/lib/smrsh."
-	echo
-}
diff --git a/app-shells/smrsh/smrsh-8.14.9.ebuild b/app-shells/smrsh/smrsh-8.14.9.ebuild
deleted file mode 100644
index 13edae9dcf88..000000000000
--- a/app-shells/smrsh/smrsh-8.14.9.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit toolchain-funcs
-
-DESCRIPTION="Sendmail restricted shell, for use with MTAs other than Sendmail"
-HOMEPAGE="http://www.sendmail.org/"
-SRC_URI="ftp://ftp.sendmail.org/pub/sendmail/sendmail.${PV}.tar.gz"
-
-LICENSE="Sendmail"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-devel/m4
-	>=sys-apps/sed-4"
-RDEPEND="${DEPEND}
-	!mail-mta/sendmail"
-
-S="${WORKDIR}/sendmail-${PV}"
-
-src_prepare() {
-	cd "${S}/${PN}"
-	sed -e "s:/usr/libexec:/usr/sbin:g" \
-		-e "s:/usr/adm/sm.bin:/var/lib/smrsh:g" \
-		-i README -i smrsh.8 || die "sed failed"
-
-	sed -e "s:@@confCCOPTS@@:${CFLAGS}:" \
-		-e "s:@@confLDOPTS@@:${LDFLAGS}:" \
-		-e "s:@@confCC@@:$(tc-getCC):" "${FILESDIR}/${PN}-8.14.5-site.config.m4" \
-		> "${S}/devtools/Site/site.config.m4" || die "sed failed"
-}
-
-src_compile() {
-	cd "${S}/${PN}"
-	/bin/sh Build
-}
-
-src_install() {
-	dosbin "${S}/obj.$(uname -s).$(uname -r).$(arch)/${PN}/${PN}" || die
-
-	cd "${S}/${PN}"
-	doman smrsh.8 || die
-	dodoc README || die
-
-	keepdir /var/lib/smrsh
-}
-
-pkg_postinst() {
-	elog "smrsh is compiled to look for programs in /var/lib/smrsh."
-	echo
-}
diff --git a/app-shells/smrsh/smrsh-8.15.2.ebuild b/app-shells/smrsh/smrsh-8.15.2.ebuild
index 889452daa21f..52c94f564d86 100644
--- a/app-shells/smrsh/smrsh-8.15.2.ebuild
+++ b/app-shells/smrsh/smrsh-8.15.2.ebuild
@@ -29,7 +29,7 @@ src_prepare() {
 
 	sed -e "s:@@confCCOPTS@@:${CFLAGS}:" \
 		-e "s:@@confLDOPTS@@:${LDFLAGS}:" \
-		-e "s:@@confCC@@:$(tc-getCC):" "${FILESDIR}/${PN}-8.14.5-site.config.m4" \
+		-e "s:@@confCC@@:$(tc-getCC):" "${FILESDIR}/site.config.m4" \
 		> "${S}/devtools/Site/site.config.m4" || die "sed failed"
 }