Port ebuild to EAPI4 so we can use REQUIRED_USE for frxp and threads. Bug #385575

Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64

diff --git a/net-dialup/freeradius/ChangeLog b/net-dialup/freeradius/ChangeLog
index e9f20381404a4601480faa267595b7efff5214f5..61346745c35bc867ec9a9b9e3ae663af76822487 100644 (file)
--- a/net-dialup/freeradius/ChangeLog
+++ b/net-dialup/freeradius/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dialup/freeradius
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.95 2011/09/27 10:47:17 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.96 2011/10/06 22:58:24 hwoarang Exp $
+
+  06 Oct 2011; Markos Chandras <hwoarang@gentoo.org> freeradius-2.1.11.ebuild:
+  Port ebuild to EAPI4 so we can use REQUIRED_USE for frxp and threads. Bug
+  #385575
 
 *freeradius-2.1.11 (26 Sep 2011)
 

diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest
index 8179fdc6ed29536c76c2509fb3336900cbd74fd2..a527f6221f671b7acfac1a1e515b9d2054f057cb 100644 (file)
--- a/net-dialup/freeradius/Manifest
+++ b/net-dialup/freeradius/Manifest
@@ -38,26 +38,26 @@ DIST freeradius-server-2.1.7.tar.gz 3894247 RMD160 52225b612af87bdf74844ea361de3
 EBUILD freeradius-2.0.5.ebuild 3899 RMD160 5f9a0b84652318dfa25cf22ba5e2a4e7b2f6067f SHA1 194c4b1bd0122c7498b8ae3c2e67b951e0addd79 SHA256 5732a5a8fd50151c937c352524bd142640881d12e8e76a658af776c13a1855dc
 EBUILD freeradius-2.1.1.ebuild 3901 RMD160 1d8aeeb5cbdc5f8acc494a65c6644a5f3f45d2f4 SHA1 df5b1b763551248420201a2e80a8a45f996e9e41 SHA256 902942ea0f5ecc1552ce1bad82498bdee27b4c30d1ef955594aad0ddb5f55e7f
 EBUILD freeradius-2.1.10.ebuild 4149 RMD160 a06b5ba72c46392f4ea90f940eee1456de54da64 SHA1 06535622b688eb16debb807f8bf65636d3cde681 SHA256 e3b0dbdd7ff5a187ee1a59ac03aaab8618f8b5b6bc654d3320b7e170dc676702
-EBUILD freeradius-2.1.11.ebuild 4165 RMD160 6fce4d8015deb3ec4b1b733e533a05b3fe2022de SHA1 20b191b2dc3b88de2314d1bd8e96f98604659e8c SHA256 3155f28773e1d74fc5b48d4d80c6e9c5408e7b480f7f8e10275484077f17dcc1
+EBUILD freeradius-2.1.11.ebuild 4220 RMD160 d6e9f2320e2b6218c2d4d5ed9b273104d2de1eeb SHA1 feb59f2cb724618cafb347e18ea1f31bab20e53f SHA256 d74de72c4e77f98fbfaf8419dc267309c540856b51da634c0f454ba3abf4c045
 EBUILD freeradius-2.1.3-r1.ebuild 4136 RMD160 74fe2732df62c70304a5effd24bdd0b350b9f4e3 SHA1 656cfcbc64baa153270474a87341f6c90db91b2c SHA256 600a46f320d164cdf95cfebab7a87ac1f666c8ea956754200b28decede8b51b5
 EBUILD freeradius-2.1.6.ebuild 4152 RMD160 89e3c9e6dae2f053b5d2fce3566ec5f1e817f7a3 SHA1 4410d13106048e8b0c591d4a6c0eb9db03d1a6c5 SHA256 ca21b544f3f8782eca5d1230c2a62ff00d1746fd844110331f15b40d6a52114a
 EBUILD freeradius-2.1.7.ebuild 4152 RMD160 9a5fba8cf99e437fe7e1035fc77f794ef844c13d SHA1 f1e1c947ddbb68bfb0bb021eee186ba79734e08f SHA256 000df7fa3c166f4f620b0e55bfe19489f5b20204d8da3604cb4c8d96293d6fd8
-MISC ChangeLog 19577 RMD160 ac77f7ffb51707db2c6c9089490a6d439725c712 SHA1 0d9fc3a318e35d37173dda294222efac1d9510fb SHA256 91d7e0a3c61c18f1db96a5439b0a9ec85f9fc74991dd4b1a5b191e9fd27ca8c4
+MISC ChangeLog 19743 RMD160 d52a2bb3d954b1dbd40162462b5d72494216a436 SHA1 4074c0cf5246eb38b0bb65505490f7b17a32fe8f SHA256 5097423cde9ac40fb0071b53750695aaa9170ce8bc9339ef8ca825112736f870
 MISC metadata.xml 662 RMD160 012a8de3e3f92245daab2e990c0e7c4f7869d52d SHA1 458d2af2523e5271e868bf90e203906ba01db0c3 SHA256 5c2f186c265e36fe36ea663e04d0a1604af89b3be4e7af52c0fdca7e0db84db8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOgamIAAoJEPqDWhW0r/LCkmkP/0da0MbrdqgJKo9WRAa500Op
-h8+ZP0vISuKhgIfJwHvYrnI6iD+vvc8iaPHAwgJJBX1Cs5GeIAO3+rEw7LJn9kEg
-bO3UBkEpZm7I/rb2lX3+mBTV7t69wZOnNLUHHRNKbeD7tGagrvYwqHeMuwUDh5WM
-CX5mTD5V8A4mcGMC1r0uorGZJ0qP2QKeftFpaKkvZAFKdThU+OFyG2MFuMFN5PvH
-uc1IIGJQ8w2pVlTxNtUZFHcNiY3rSPKEPD9X2N8bjrbfeoNOkokKxgD1CxYTe5hU
-aFYrDExDXZR1APZ7bWfwKyC1ekOlsn5rAJckRqfPBOYEaiv3+b4VxwqYrff6Pk3S
-3p31hKBs1S2bq5g5hWYsw8snGGBSzH+CaFdNI5CgOz4Dt2iFOhl1K5vm1m/9hv9f
-uYb/TNMZCYkSHfJ9vO8/G5LBYjXLENoU2TxxR4IozP0n3WcgOUzHItNY7ejEUIDx
-JUpmyMk2L9aDet0EXEEjqDw6WZqOMHgVj8nHTrBIFfwLatvoDlhLZKNxuqv139h6
-QQDADbauww6xmHiPLRON6vrxUZEcXuPy42PK4N8DAlKxjGZbRq2xuA1dJxGNeOog
-zjL2vQ5H2s7vq6gNvyGLxuzDqRTHVnbC+TBB0iIl+ko9FrXJKt5GxcM3kZeTT7cX
-NU7TXMb2cmhFqt6Gj+tD
-=qKUW
+iQIcBAEBCgAGBQJOjjJ7AAoJEPqDWhW0r/LCyNQQAIHGeU7HKj9AlkexBX0fuoBJ
+gCMXF7gTbkJtffdiqZ9ybb1gHt6q4/YAiClHQ9Uog7gD/h66eLDHgAy4yIT9h1PC
+bVG0JVvlThH+WdTbMkBz3jsiIGiNEVaRZDKZRHvXrXxovlmiTMTKl2DDMpQmnHr2
+j9jCGM2gIluPSWv5CWbGLBvV8WxG35+BkeDFd8IlU7orbhjJo/4jqQ+R+o5K8e04
+vUMhj8QLH7O2k+yYYiBv1pY5XpP/YyLtYrMQhj/8QUUkgiS0uo/II8NUXNx9XHjb
+RN77t93vUEWeVnbqbCvjN5zhRJn4MyiJ18noD02327j+Wg1b5s6heTyud4XzX+FO
+agUPQAdrn2f6AskjqQ6Bb2jhCA8JFdV9H/J36ZrusYnBKw/kLBJIlvB7kWEt0KI8
+uL0eiTfMA0zhDDSeS3qfTOfEhzjeS2mbT+XuP7ehJ4TGcXBwEe3cGKcU6HyM3YHj
+MplbRrYJmRv3UdjRiKZz/p16i6iYQfCh2+CRpqtL1WqPPDerekqrxTco29RkztWD
+qEN91HeC4AmcJNNDl5TfJLl4hYTFVt4UQm4HE5er5wo5L9BDbMdTDis7VkcADN9d
+txXyjP0obBlA3pbrEKuro4WOTbzfXKQMTOXdopeYF0GkwrJH15wjiacyf7t71lQq
+z+FNRy5IQvBluPUiI5Z1
+=t5ID
 -----END PGP SIGNATURE-----

diff --git a/net-dialup/freeradius/freeradius-2.1.11.ebuild b/net-dialup/freeradius/freeradius-2.1.11.ebuild
index 9e8d95723248e593381c5b2360e890df5f631520..d91e6f0602c8f0e1f41196e48750715b5010eb01 100644 (file)
--- a/net-dialup/freeradius/freeradius-2.1.11.ebuild
+++ b/net-dialup/freeradius/freeradius-2.1.11.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-2.1.11.ebuild,v 1.1 2011/09/27 10:47:17 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-2.1.11.ebuild,v 1.2 2011/10/06 22:58:24 hwoarang Exp $
 
-EAPI="2"
+EAPI="4"
 
 inherit eutils multilib pam autotools libtool
 
@@ -33,6 +33,8 @@ RDEPEND="!net-dialup/cistronradius
        frxp? ( dev-lang/python )"
 DEPEND="${RDEPEND}"
 
+REQUIRED_USE="frxp? ( threads )"
+
 S="${WORKDIR}/${PN}-server-${PV}"
 
 pkg_setup() {
@@ -51,6 +53,7 @@ src_prepare() {
        epatch "${FILESDIR}/${PN}-2.1.10-qafixes.patch"
        epatch "${FILESDIR}/${PN}-2.1.10-pkglibdir.patch"
 
+       append-flags -lpthread
        # kill modules we don't use
        if ! use ssl; then
                einfo "removing rlm_eap_{tls,ttls,ikev2,peap} modules  (no use ssl)"
@@ -126,14 +129,13 @@ src_install() {
        diropts
 
        make R="${D}" install || die "make install failed"
-       dosed 's:^#user *= *nobody:user = radiusd:;s:^#group *= *nobody:group = radiusd:' \
-           /etc/raddb/radiusd.conf
+       sed -i -e 's:^#user *= *nobody:user = radiusd:;s:^#group *= *nobody:group = radiusd:' \
+           "${D}"/etc/raddb/radiusd.conf
        chown -R root:radiusd "${D}"/etc/raddb/*
 
        pamd_mimic_system radiusd auth account password session
 
        mv "${D}/usr/share/doc/${PN}" "${D}/usr/share/doc/${PF}"
-       prepalldocs
        dodoc CREDITS
 
        rm "${D}/usr/sbin/rc.radiusd"