4 files changed, 14 insertions, 66 deletions
diff --git a/app-shells/smrsh/ChangeLog b/app-shells/smrsh/ChangeLog
index 5135afd05967..827e5abf63ed 100644
--- a/app-shells/smrsh/ChangeLog
+++ b/app-shells/smrsh/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-shells/smrsh
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/smrsh/ChangeLog,v 1.11 2011/11/22 16:13:13 phajdan.jr Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/smrsh/ChangeLog,v 1.12 2013/01/15 14:28:17 eras Exp $
+
+*smrsh-8.14.6 (15 Jan 2013)
+
+  15 Jan 2013; Eray Aslan <eras@gentoo.org> +smrsh-8.14.6.ebuild,
+  -files/smrsh-8.14.4-site.config.m4, -smrsh-8.12.10.ebuild,
+  -smrsh-8.14.4.ebuild:
+  Version bump - bug #451682 and remove old
 
   22 Nov 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> smrsh-8.14.5.ebuild:
   x86 stable wrt bug #391097
@@ -40,4 +47,3 @@
 
   21 Jul 2003; Max Kalika <max@gentoo.org> smrsh-8.12.9.ebuild:
   Initial import.
-
diff --git a/app-shells/smrsh/files/smrsh-8.14.4-site.config.m4 b/app-shells/smrsh/files/smrsh-8.14.4-site.config.m4
deleted file mode 100644
index a5627e2412f2..000000000000
--- a/app-shells/smrsh/files/smrsh-8.14.4-site.config.m4
+++ /dev/null
@@ -1,13 +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@@')
-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.12.10.ebuild b/app-shells/smrsh/smrsh-8.12.10.ebuild
deleted file mode 100644
index 224c54f11316..000000000000
--- a/app-shells/smrsh/smrsh-8.12.10.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/smrsh/smrsh-8.12.10.ebuild,v 1.8 2009/12/03 11:41:55 maekke Exp $
-
-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_compile() {
-	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}:" "${FILESDIR}/site.config.m4" \
-		> "${S}/devtools/Site/site.config.m4" || die "sed failed"
-
-	/bin/sh Build
-}
-
-src_install() {
-	cd "${S}/${PN}"
-	dosbin "${S}/obj.$(uname -s).$(uname -r).$(arch)/${PN}/${PN}"
-
-	doman smrsh.8
-	dodoc README
-
-	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.4.ebuild b/app-shells/smrsh/smrsh-8.14.6.ebuild
index 7e5c144fc768..2ba7de6f741c 100644
--- a/app-shells/smrsh/smrsh-8.14.4.ebuild
+++ b/app-shells/smrsh/smrsh-8.14.6.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/smrsh/smrsh-8.14.4.ebuild,v 1.1 2011/05/12 12:10:58 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/smrsh/smrsh-8.14.6.ebuild,v 1.1 2013/01/15 14:28:17 eras Exp $
 
 EAPI=4
+inherit toolchain-funcs
 
 DESCRIPTION="Sendmail restricted shell, for use with MTAs other than Sendmail"
 HOMEPAGE="http://www.sendmail.org/"
@@ -27,7 +28,8 @@ src_prepare() {
 		-i README -i smrsh.8 || die "sed failed"
 
 	sed -e "s:@@confCCOPTS@@:${CFLAGS}:" \
-		-e "s:@@confLDOPTS@@:${LDFLAGS}:" "${FILESDIR}/${P}-site.config.m4" \
+		-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"
 }