Use proper libdir. Disable USE=pam as the build system will use PAM when it pleases. Prune .la file (bug #451766). Clean up patch.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)

3 files changed, 80 insertions, 5 deletions

diff --git a/net-dialup/gnuradius/ChangeLog b/net-dialup/gnuradius/ChangeLog
index 02d472694ab0..b28f1027aa89 100644
--- a/net-dialup/gnuradius/ChangeLog
+++ b/net-dialup/gnuradius/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/gnuradius
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/gnuradius/ChangeLog,v 1.22 2013/05/12 03:58:40 patrick Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/gnuradius/ChangeLog,v 1.23 2014/05/24 10:25:05 jer Exp $
+
+*gnuradius-1.6.1-r1 (24 May 2014)
+
+  24 May 2014; Jeroen Roovers <jer@gentoo.org> +gnuradius-1.6.1-r1.ebuild,
+  files/gnuradius-1.6.1-qa-false-positives.patch:
+  Use proper libdir. Disable USE=pam as the build system will use PAM when it
+  pleases. Prune .la file (bug #451766). Clean up patch.
 
   12 May 2013; Patrick Lauer <patrick@gentoo.org> gnuradius-1.6.1.ebuild:
   Move epatch to src_prepare phase
diff --git a/net-dialup/gnuradius/files/gnuradius-1.6.1-qa-false-positives.patch b/net-dialup/gnuradius/files/gnuradius-1.6.1-qa-false-positives.patch
index 9d1c7f119e38..8f48ff67260c 100644
--- a/net-dialup/gnuradius/files/gnuradius-1.6.1-qa-false-positives.patch
+++ b/net-dialup/gnuradius/files/gnuradius-1.6.1-qa-false-positives.patch
@@ -1,6 +1,5 @@
-diff -Nru radius-1.6.1.orig/radscripts/Makefile.in radius-1.6.1/radscripts/Makefile.in
---- radius-1.6.1.orig/radscripts/Makefile.in	2009-03-01 11:02:16.000000000 +0000
-+++ radius-1.6.1/radscripts/Makefile.in	2009-03-01 11:12:52.000000000 +0000
+--- a/radscripts/Makefile.in
++++ b/radscripts/Makefile.in
 @@ -854,19 +854,19 @@
  
  
diff --git a/net-dialup/gnuradius/gnuradius-1.6.1-r1.ebuild b/net-dialup/gnuradius/gnuradius-1.6.1-r1.ebuild
new file mode 100644
index 000000000000..3de65b022809
--- /dev/null
+++ b/net-dialup/gnuradius/gnuradius-1.6.1-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/gnuradius/gnuradius-1.6.1-r1.ebuild,v 1.1 2014/05/24 10:25:05 jer Exp $
+
+EAPI=5
+
+inherit eutils multilib pam
+
+MY_P="${P#gnu}"
+
+DESCRIPTION="GNU radius authentication server"
+HOMEPAGE="http://www.gnu.org/software/radius/radius.html"
+SRC_URI="mirror://gnu/radius/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="
+	dbm debug guile mysql nls odbc postgres readline snmp static-libs
+"
+
+DEPEND="
+	!net-dialup/cistronradius
+	!net-dialup/freeradius
+	dbm? ( sys-libs/gdbm )
+	guile? ( >=dev-scheme/guile-1.4 )
+	mysql? ( virtual/mysql )
+	odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
+	postgres? ( dev-db/postgresql-server )
+	readline? ( sys-libs/readline )
+	snmp? ( net-analyzer/net-snmp )
+	virtual/pam
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="test"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-qa-false-positives.patch
+}
+
+src_configure() {
+	econf \
+		--disable-maintainer-mode \
+		--enable-client \
+		--enable-pam \
+		--enable-server \
+		--libdir=/usr/$(get_libdir) \
+		--with-pamdir=/usr/$(getpam_mod_dir) \
+		$(use_enable dbm) \
+		$(use_enable debug) \
+		$(use_enable nls) \
+		$(use_enable snmp) \
+		$(use_enable static-libs static) \
+		$(use_with guile) \
+		$(use_with guile server-guile) \
+		$(use_with mysql) \
+		$(use_with odbc) \
+		$(use_with postgres) \
+		$(use_with readline)
+}
+
+src_install() {
+	default
+
+	prune_libtool_files
+}