use dobin instead of exeinto /usr/bin/ && doexe; drop old

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

3 files changed, 14 insertions, 71 deletions

diff --git a/net-dialup/cistronradius/ChangeLog b/net-dialup/cistronradius/ChangeLog
index cdcd19a00e68..9ff8333d22d6 100644
--- a/net-dialup/cistronradius/ChangeLog
+++ b/net-dialup/cistronradius/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dialup/cistronradius
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/cistronradius/ChangeLog,v 1.21 2014/08/10 20:55:30 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/cistronradius/ChangeLog,v 1.22 2015/03/21 18:56:12 jlec Exp $
+
+  21 Mar 2015; Justin Lecher <jlec@gentoo.org> -cistronradius-1.6.8.ebuild,
+  cistronradius-1.6.8-r1.ebuild:
+  use dobin instead of exeinto /usr/bin/ && doexe; drop old
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org>
   cistronradius-1.6.8.ebuild:
diff --git a/net-dialup/cistronradius/cistronradius-1.6.8-r1.ebuild b/net-dialup/cistronradius/cistronradius-1.6.8-r1.ebuild
index cc6997d74f8b..1ea971423fe6 100644
--- a/net-dialup/cistronradius/cistronradius-1.6.8-r1.ebuild
+++ b/net-dialup/cistronradius/cistronradius-1.6.8-r1.ebuild
@@ -1,20 +1,21 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/cistronradius/cistronradius-1.6.8-r1.ebuild,v 1.2 2013/08/07 13:29:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/cistronradius/cistronradius-1.6.8-r1.ebuild,v 1.3 2015/03/21 18:56:12 jlec Exp $
 
 EAPI=5
 
 inherit eutils toolchain-funcs
 
-DESCRIPTION="An authentication and accounting server for terminal servers that speak the RADIUS protocol"
-SRC_URI="ftp://ftp.radius.cistron.nl/pub/radius/radiusd-cistron-${PV}.tar.gz"
+DESCRIPTION="Authentication and accounting server for terminal servers that speak the RADIUS protocol"
 HOMEPAGE="http://www.radius.cistron.nl/"
+SRC_URI="ftp://ftp.radius.cistron.nl/pub/radius/radiusd-cistron-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* x86"
 
-DEPEND="!net-dialup/freeradius
+DEPEND="
+	!net-dialup/freeradius
 	!net-dialup/gnuradius"
 RDEPEND="${DEPEND}"
 
@@ -41,10 +42,8 @@ src_install() {
 	dodoc README doc/{ChangeLog,FAQ.txt,README*}
 	doman doc/{*.1,*.8,*.5rad,*.8rad}
 
-	exeinto /usr/sbin
-	doexe src/{checkrad,radiusd,radrelay}
-	exeinto /usr/bin
-	doexe src/{radclient,radlast,radtest,radwho,radzap}
+	dosbin src/{checkrad,radiusd,radrelay}
+	dobin src/{radclient,radlast,radtest,radwho,radzap}
 
 	newinitd "${FILESDIR}/cistronradius.rc" cistronradius
 }
diff --git a/net-dialup/cistronradius/cistronradius-1.6.8.ebuild b/net-dialup/cistronradius/cistronradius-1.6.8.ebuild
deleted file mode 100644
index 41753a1b58bb..000000000000
--- a/net-dialup/cistronradius/cistronradius-1.6.8.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/cistronradius/cistronradius-1.6.8.ebuild,v 1.5 2014/08/10 20:55:30 slyfox Exp $
-
-inherit eutils
-
-DESCRIPTION="An authentication and accounting server for terminal servers that speak the RADIUS protocol"
-SRC_URI="ftp://ftp.radius.cistron.nl/pub/radius/radiusd-cistron-${PV}.tar.gz"
-HOMEPAGE="http://www.radius.cistron.nl/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="-* x86"
-
-DEPEND="!net-dialup/freeradius
-	!net-dialup/gnuradius"
-
-S="${WORKDIR}/radiusd-cistron-${PV}/src"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gcc41.patch"
-	sed -i -e "s:SHAREDIR/::g" ../raddb/dictionary
-	mv checkrad.pl checkrad
-}
-
-src_compile() {
-	emake \
-	    CFLAGS="${CFLAGS}" LDFLAGS=${LDFLAGS} \
-	    BINDIR=/usr/bin SBINDIR=/usr/sbin \
-	    MANDIR=/usr/share/man SHAREDIR=/usr/share/radius \
-	    || die "make failed"
-}
-
-src_install() {
-	dodir /usr/sbin
-	exeinto /usr/sbin
-	doexe "${S}/checkrad"
-	doexe "${S}/radiusd"
-	doexe "${S}/radrelay"
-	dodir /usr/bin
-	exeinto /usr/bin
-	doexe "${S}/radclient"
-	doexe "${S}/radlast"
-	doexe "${S}/radtest"
-	doexe "${S}/radwho"
-	doexe "${S}/radzap"
-
-	newinitd "${FILESDIR}/cistronradius.rc" cistronradius
-
-	cd "${S}/.."
-	dodir /etc/raddb
-	insinto /etc/raddb
-	doins raddb/*
-	dodoc COPYRIGHT README doc/{ChangeLog,FAQ.txt,README*}
-	doman doc/{*.1,*.8,*.5rad,*.8rad}
-}