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

(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 1CD13C8AD4301342)

4 files changed, 37 insertions, 42 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/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