Build the module straight into the ebuild, and make sure to hide symbols that are not part of the interface.

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x1CD13C8AD4301342

5 files changed, 52 insertions, 53 deletions

diff --git a/sys-auth/pam_radius/ChangeLog b/sys-auth/pam_radius/ChangeLog
index a605b4db4f07..544417b8819d 100644
--- a/sys-auth/pam_radius/ChangeLog
+++ b/sys-auth/pam_radius/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-auth/pam_radius
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_radius/ChangeLog,v 1.1 2008/06/28 06:51:40 mrness Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_radius/ChangeLog,v 1.2 2013/02/24 01:36:09 flameeyes Exp $
+
+*pam_radius-1.3.17-r1 (24 Feb 2013)
+
+  24 Feb 2013; Diego E. Pettenò <flameeyes@gentoo.org>
+  +pam_radius-1.3.17-r1.ebuild, -pam_radius-1.3.17.ebuild,
+  files/pam_radius-1.3.17-gentoo.patch, metadata.xml:
+  Build the module straight into the ebuild, and make sure to hide symbols that
+  are not part of the interface.
 
 *pam_radius-1.3.17 (28 Jun 2008)
 
@@ -8,4 +16,3 @@
   +files/pam_radius-1.3.17-gentoo.patch, +files/server, +metadata.xml,
   +pam_radius-1.3.17.ebuild:
   Initial import from bug #211062.
-
diff --git a/sys-auth/pam_radius/Manifest b/sys-auth/pam_radius/Manifest
index e52d6792bd06..99860cff42f9 100644
--- a/sys-auth/pam_radius/Manifest
+++ b/sys-auth/pam_radius/Manifest
@@ -1,16 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX pam_radius-1.3.17-gentoo.patch 2095 RMD160 d0e492fe8e69c8ec880b3372a186aada7fb7c891 SHA1 cd49bd06188b77178c189d4f31abfbf6198015d9 SHA256 bcd84b2401dfec6201e3a648d9a141b684cf532a2c420ef58f26009cc1cfddd5
-AUX server 955 RMD160 1358a2c61a525330e265f47dd51dd8d625e25680 SHA1 ce41716ea814d9359b0b4a67fbfbc5c738a4f033 SHA256 1f936dd73ae61d305f18be2ca3465531f2ce9cdad3e393dd8f2a807db6e08c03
-DIST pam_radius-1.3.17.tar.gz 31341 RMD160 c3873d5a4275170420f98c2f37def0593293f463 SHA1 7623ca1b636bba729c69c3f50254b856bb4519a7 SHA256 60ee863cbea797be46eff8b9d568af057c6e54335bdb19a6bd2cadde389d7dca
-EBUILD pam_radius-1.3.17.ebuild 917 RMD160 eb7f3d38a1f731327282098cd0c3b09796c75791 SHA1 e3b357e03ff40044b7810d5b57a9bfd71ddc3b6d SHA256 d1b03cc7b16d02cb147cf02ddcb7e158881c589a971e7c66b380fca14a00fdf7
-MISC ChangeLog 429 RMD160 cee4cd84c5ee651b06bfb8b88792561108e86501 SHA1 1f2d6066d642add211cdca5792ab2fce47e370c3 SHA256 f997381d12fb31b8817c0f057367b81675b900268b9597877c461b40f8f92414
-MISC metadata.xml 359 RMD160 6c932f2515d10ee7519a06f75d13e5a668680a94 SHA1 5856252cc5aa7570668975d304af079129c83cdc SHA256 d4ffea49f4f0cbe9ebc32f850bc1f49d78c878bffed9fb60f63b4774631f82ad
+AUX pam_radius-1.3.17-gentoo.patch 1061 SHA256 768b55e3cd6c7cf4c159af5b896d27041d16a81d7334f0400a14d4ec367c44dc SHA512 1dfd9aa33e7da3982633797bd00a6ebb765c614798f4cc2ae072d721466f88a0f4a5dfb146a274a9ea7147fff51bd61e6e64e24ca0776ea29818400196013a4e WHIRLPOOL b3c0038237ff522be348daeb6292aa1f85ad323b30dc7a06e133003ba43defec01be16e1a855e6be2191ed00b218d30f25c083fefe4e7c7b860773003ce3261e
+AUX server 955 SHA256 1f936dd73ae61d305f18be2ca3465531f2ce9cdad3e393dd8f2a807db6e08c03 SHA512 c91b321973d6452e952ab8a8c43f916a73a01426f53d398444618297b86037ce146017674f51796749dc272f6914967e0ca3c8b40a2f0199f62c1519b8212d81 WHIRLPOOL c802e67005956cc971d0cba8863e54db0d3ad3261325f4c843c112986c346a5e91489fbf0f2cd37cb82bf3c1820d1b4bd17d42300725ecfaafbe0ec714567cdf
+DIST pam_radius-1.3.17.tar.gz 31341 SHA256 60ee863cbea797be46eff8b9d568af057c6e54335bdb19a6bd2cadde389d7dca SHA512 82fc1431e8fc18c389880da4f93490363af8acd605283a5923c531fede77f449324f1ac4850783355cc7d610b3ee73bd172c94d8b73800c3deaa649af4c41060 WHIRLPOOL 4f0ad918c4bbe7a74fb1b3b3a292842fd8610ae12b3f9d21895c02efade27833c9c85ff42efce03e7500b4389198bb198bc0ecc87555e745ef0f4841a25a7262
+EBUILD pam_radius-1.3.17-r1.ebuild 1205 SHA256 8febf0d814b3f1316ef467a75a773bfdb24227921c2afa28f3afc713af3fa572 SHA512 bfe4ece5dc48ff187b5e436ad31835ef2b0f6c46d3812bf6a77d7e228ecd2759fd80d66f19b53ad6de6cfb54497a24e9ce784f36ff405eac0c64f61f31805484 WHIRLPOOL be3f82ead6dd8c511b65215294960b6620c55bc2526c7016082562730d4da0c444a674dbe341f950c6ae71b95792176e9705024e871a755f6425f7235aec2cec
+MISC ChangeLog 751 SHA256 e928bf8eb89dd4df72e22a1c800ca6bc7b9cb5201b106701133c93070b08e9e6 SHA512 677d0d114f2342fcf9f7a3f17a66d65fcb9057af342a3b583cb883d49314d85285a3489c37c36e8eeb18d338c81ba47dc4e9ba8253e1094de27e22be4446b6c5 WHIRLPOOL 0bf8f48bd049a6a7a9d19adc8cb2874291bfc9aca255398740dbe7c757dfff9d73614c57f231a1d2685a004ab7941a1c93f2c09adfde9f588bf16a7032cb04bd
+MISC metadata.xml 368 SHA256 41260f9c5036c337a67c2dda5a94d82193a199b6f886cd6c56f5138c1f2edad7 SHA512 904c1d68aac52bcfaaf3b809d4268719607a66db3091e5dedfc1942949bfec2eec2cacacfc87b788de9a595f56fe549e0a7c4caaac278798a7f6230b61a93c3b WHIRLPOOL fdb6de348fe2ee41bf474bece6366c05dc553efd8532282829e2c13e6a941fb3ae81675092ff841c52622e445cb3761fc9b95fdb6fcfd27e83011cfe9a7316f6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAkhl34kACgkQPrHvTlXvhtsRvQCeKWu8yq0Q8u86k30+dTXT1oWZ
-gIQAoKeaNky/36uVXL9NRSw5ItEN9tOU
-=Sdng
+iQEcBAEBCAAGBQJRKW6aAAoJEBzRPIrUMBNC8UsH/RLkDkv4OW5K7TbI1BMqadn9
+1uj+LJp2gTp+SzrTEvMdAMCZatFCBEL5VI00d8P7jlDfVBM6XB8LIiYTbPQyncHt
+ak7KZv94Ex2MUopSsGrpQnB13fi7fZwkXFK20KjkXXsOnqR9toooE58MuzOA7qim
+vCrKheRdALuI5dmCNkkdXHq1OBHaQff/SOyj2titTaIiHqnpU6+RZ4ax3nK+xrXj
+OWl8fQaYsn2GXEl21z+VjU+nfIKpXw5N59GFKDc9EtIna0X2Yp9RnX59axfpu9gG
+GD+IbS62zbqC54dULKYaW0GVxmP84+rL6yDein2y7CqogvMtpkHGuBjsY9Y/v9A=
+=/7EL
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/pam_radius/files/pam_radius-1.3.17-gentoo.patch b/sys-auth/pam_radius/files/pam_radius-1.3.17-gentoo.patch
index fa493e6d6e9d..3e0b02f7020d 100644
--- a/sys-auth/pam_radius/files/pam_radius-1.3.17-gentoo.patch
+++ b/sys-auth/pam_radius/files/pam_radius-1.3.17-gentoo.patch
@@ -1,32 +1,3 @@
-diff -Nru pam_radius-1.3.17.orig/Makefile pam_radius-1.3.17/Makefile
---- pam_radius-1.3.17.orig/Makefile	2008-06-28 08:43:43.000000000 +0200
-+++ pam_radius-1.3.17/Makefile	2008-06-28 08:42:57.000000000 +0200
-@@ -8,6 +8,7 @@
- 
- VERSION=1.3.17
- 
-+LD=$(CC)
- ######################################################################
- #
- # If we're really paranoid, use these flags
-@@ -15,7 +16,7 @@
- #
- #  If you're not using GCC, then you'll have to change the CFLAGS.
- #
--CFLAGS = -Wall -fPIC
-+CFLAGS += -Wall -fPIC -fno-strict-aliasing
- #
- # On Irix, use this with MIPSPRo C Compiler, and don't forget to export CC=cc
- # gcc on Irix does not work yet for pam_radius
-@@ -55,7 +56,7 @@
- #	gcc -shared pam_radius_auth.o md5.o -lpam -lc -o pam_radius_auth.so
- #
- pam_radius_auth.so: pam_radius_auth.o md5.o
--	ld -Bshareable pam_radius_auth.o md5.o -lpam -o pam_radius_auth.so
-+	$(LD) $(LDFLAGS) -shared $(CFLAGS) pam_radius_auth.o md5.o -lpam -o pam_radius_auth.so
- 
- ######################################################################
- #
 diff -Nru pam_radius-1.3.17.orig/pam_radius_auth.c pam_radius-1.3.17/pam_radius_auth.c
 --- pam_radius-1.3.17.orig/pam_radius_auth.c	2007-03-26 11:36:13.000000000 +0200
 +++ pam_radius-1.3.17/pam_radius_auth.c	2008-06-28 08:43:24.000000000 +0200
diff --git a/sys-auth/pam_radius/metadata.xml b/sys-auth/pam_radius/metadata.xml
index 37c84e9ded05..d8930ed10bc9 100644
--- a/sys-auth/pam_radius/metadata.xml
+++ b/sys-auth/pam_radius/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version = '1.0' encoding = 'UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-dialup</herd>
-  <longdescription>This is the PAM to RADIUS authentication module. It allows any PAM-capable machine to become a RADIUS client for authentication and accounting requests.</longdescription>
+  <herd>pam</herd>
+  <longdescription>
+    This is the PAM to RADIUS authentication module. It allows any
+    PAM-capable machine to become a RADIUS client for authentication
+    and accounting requests.
+  </longdescription>
 </pkgmetadata>
diff --git a/sys-auth/pam_radius/pam_radius-1.3.17.ebuild b/sys-auth/pam_radius/pam_radius-1.3.17-r1.ebuild
index dd37e0838f95..71fcf4690b2c 100644
--- a/sys-auth/pam_radius/pam_radius-1.3.17.ebuild
+++ b/sys-auth/pam_radius/pam_radius-1.3.17-r1.ebuild
@@ -1,27 +1,40 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_radius/pam_radius-1.3.17.ebuild,v 1.1 2008/06/28 06:51:40 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_radius/pam_radius-1.3.17-r1.ebuild,v 1.1 2013/02/24 01:36:09 flameeyes Exp $
 
-inherit eutils pam
+EAPI=5
+
+inherit eutils pam toolchain-funcs
 
 DESCRIPTION="PAM RADIUS authentication module"
 HOMEPAGE="http://www.freeradius.org/pam_radius_auth/"
 SRC_URI="ftp://ftp.freeradius.org/pub/radius/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="sys-libs/pam"
+DEPEND="virtual/pam"
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	unpack ${A}
-
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-gentoo.patch
 }
 
+doecho() {
+	echo "$@"
+	"$@" || die
+}
+
+src_compile() {
+	# using the Makefile would require patching it to work properly, so
+	# rather simply re-create it here.
+
+	pammod_hide_symbols
+	doecho $(tc-getCC) ${CFLAGS} -shared -fPIC ${LDFLAGS} *.c -lpam -o pam_radius_auth.so
+}
+
 src_install() {
 	dopammod pam_radius_auth.so