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

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 33 insertions, 79 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/Manifest b/net-dialup/cistronradius/Manifest
index fb0bc0904270..00c709dc0b71 100644
--- a/net-dialup/cistronradius/Manifest
+++ b/net-dialup/cistronradius/Manifest
@@ -1,17 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX cistronradius-1.6.8-gcc41.patch 452 SHA256 c534985f74b9404059877f03b62de86ecb8120055a9f9ed838f507f81cde218e SHA512 c99ecdaa8bb9e1152c58f8a5cce79e3af058825de1b6818679e059b1c98e0ed72640dc5cdcf6c66a7b5f91792208bd1b0d4ede2c753f5f8dacc1ed4c64091f37 WHIRLPOOL 6a78b1ca1fd0827a59f94fb9f33bf625d569acbe8e1b398360714244f5b529a28dbf0cb763549c1ed02f54ecd7d168777573024e0e4fa719fe941b99fd4e78b3
 AUX cistronradius.rc 839 SHA256 ea70b4ec4ab62dca3b40196eec43e7ad5be07a8ea4b7699d88329288f283f06f SHA512 0b400995d548488cf9bcbe7fdea7e4fb7d66958fa1f54923a2739fc8c1d2f92b1dfb13cc22f9b1b1597eb2e11bb07e87c7474eec214d9d1b3843089fbba58348 WHIRLPOOL 2215bcb3dbdb12b7b453194f096ade594438f87067da7d615320f8ac71d66922f4d2dff927bb2c79492bc2e71470f3cce3d55ed0e1f661001dda5516416c55ac
 DIST radiusd-cistron-1.6.8.tar.gz 199459 SHA256 ed08ff8fb3f49ac5a921c2e23b639e9b87db85e3e6105953c5a921b9a2cc6150
-EBUILD cistronradius-1.6.8-r1.ebuild 1336 SHA256 5139f21458041518c57d47d63b0c0992ac32f1d50864e74b60b4acec3bf69f58 SHA512 b905858659ad6a08efa4d7be90f08dd9f169a32a088bbbace65ce2e582c571d0c3c57861876936d3c134f03ff03da0e49c4ed27d41d6fcc2cadaa47fbd6cc1c6 WHIRLPOOL 771449203a6f0efa08efa1bec8734ea6d05be098d69329caa98940a3432c3c734444b413d97f75e75dbe7c69c1535c0a4c896efeb2236ee57af60751923d47e6
-EBUILD cistronradius-1.6.8.ebuild 1458 SHA256 3035c867ae1ec6adc7a8492225eca95b42be2f56661ed5afb9c17c6663b9b995 SHA512 c84ef9327c0f815e3e42f74f909a5f8ac17748b2c852801c8c2c8066e78f42389043b3bc1a8a757617d448fa1238219be507c2de93d4dd66e699652c06cba593 WHIRLPOOL d34b5371238d99cc4cb333c374013026f5bbd5063debfe2a548be33aeda9131964e0a425d3b208a30dae5d7f7a69eae80c3d2437c9761f43ebf3e0d12752a424
-MISC ChangeLog 2912 SHA256 62341b812516e78429271fe7805ed960ad27b78907da02f9bba962121628ad19 SHA512 4f41aae798cf69d12edd165eb7885eaebab3ca9ffa6dbbd9be3c1478c1b9e668c7a6e985ee2502a799c233cbaff41e223bd34bdf6b4e3e443a5bf95108e98afc WHIRLPOOL a0911687b6c63d96d261e9b0371d4dcdf906921ff17d24ecd2ea13362740fc5f75ea85a1a66dcb0066c18e57a9ef46e7cbdf4fad24f237d5dd365c06d1dfe5d8
+EBUILD cistronradius-1.6.8-r1.ebuild 1300 SHA256 a2328bce7c6d247428c0763e6f0090f4a543f05d1c64a191e7fe42eeca5b5da9 SHA512 9b98d96dd11fd1943e885e04836aa5f1a8c3ec1e748dafab1736911292a6f4d25872eaa84e5183ebcb4ecd7f2ea748f67cc10040293c6239b6abaa4bf3d09f94 WHIRLPOOL 6ca2e2d076132f9c5d5857aae879dd04789e38465f76f6bb73de836812363bd6fe8427fbe7b7651123ea9c4e3e383aafff0fc2375fe4cf7450fc8f56ff7de822
+MISC ChangeLog 3080 SHA256 822bc28d91c5ddd9d16738266d818c069ed42af0be0b5be0da423c175ccd567c SHA512 3c66c3bf17f6493f52bee80a03160a1f29ccc270d2281d0c973b80d4b5dd2260fadba8b7b1f1ddb2876f1002e1b69e224f0e42dd42e40b2ea76e60a383b59d57 WHIRLPOOL 181974be304c99c4f9402a48a9445ef1727eb25d809523ac705743cde1352ec1f6e83cfdf61ccf2990dfe61ea22108f6f7954fd84cf446bfaf7f47821f8e72de
 MISC metadata.xml 293 SHA256 c1dece59799e2b5463ccba08710428188dc162d318c2e90f7e0d0cbdd892098d SHA512 82e379aecde1fca930d4b61c280909403d74b74669123d0e51d1b066145a21c7932e6f409fbf6796448f8e2484254f6eaa7f12f7c900454248eaacfb2d8e190c WHIRLPOOL 5d3524a709be51d22c115ee4b626532b76f4479fa18218a85c1ccf59fbd6c1246823b256d7ceb25fc4ba1f4e24ba41ac9ec7eacdacceaad687c52dc646d820c4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn3EIACgkQcaHudmEf86rGoACePgI+/26tdjazxqUI+iR5fIFy
-F8cAn2CaBOfs3rP589oY2lVZRSrP/vji
-=BFB6
+iQJ8BAEBCgBmBQJVDb7QXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirg2MQAKIoPs93ZbrKLATJeyVYOV6p
+ByeDkkoSmitL3LvW80CDe/DK6yCk7pojO9hgZkw6c+MMUCWKijsfnn9bSI8QPcYD
+yejqhYLOzRWU4Rpj4acskrkGzrzvS+R9HQIgaeX/IfXMqRoeX0Bm67geox5jRXJR
+zcUZk3Xa+EUmX4Dl9PJP+B90qAx/VLtlspzdKJi4DzUOPzyQFqb9q9E5ffVkw8hY
+rRssr8lnV/bNuPqRRIO+BSBOCTKIy1Ffq4ezq5e3KV/HypC2SCI8EiUP1wQX0+/+
+XC0GFGNhv2JkxRm532x525IQtuLj6caqk1B6sOReJVTs7sL26qBCoFYWuhoGZDl0
+3vlpz7XnWJoOc1DiSM6ZCCl6pCtyj7lQycCf+4t/4Q1hjzG9lKJGM34DWLmlGSoC
+yEiVSIO9IO9iNCDehRGle6rW+H79jZjD+0lklgdSOEifQ0KUYJBVPgH/vTSUQq+x
+1ykzu/V8ZHVnVHwW0DNo7ogz1SaFlPtsJ9Y63jtzcP5tHJ30YywdchEvR2NwJOCY
+o0Om8fysbjf9DjRDpWd0u/fanf7XyjOVCXh02s3r3KmHO2rmCxzXZTjxwD9VimSn
+4ubq+Ba6EGUdxhKrrHOrYKI3CD48AhhPLTsupkvZi0NJl8shYWTHpZKT/8k+PEO2
+kM6i2MvGS1H+b3d49Yn7
+=HgZP
 -----END PGP SIGNATURE-----
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}
-}