net-dialup/radiusclient: Sync with upstream

5 files changed, 47 insertions, 30 deletions

diff --git a/metadata/md5-cache/net-dialup/radiusclient-0.3.2 b/metadata/md5-cache/net-dialup/radiusclient-0.3.2
deleted file mode 100644
index 7ba363a7..00000000
--- a/metadata/md5-cache/net-dialup/radiusclient-0.3.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=!net-dialup/radiusclient-ng !net-dialup/freeradius-client !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A library for writing RADIUS clients accompanied with several client utilities
-EAPI=0
-HOMEPAGE=http://freshmeat.net/projects/radiusclient/
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=!net-dialup/radiusclient-ng !net-dialup/freeradius-client
-SLOT=0
-SRC_URI=ftp://ftp.cityline.net/pub/radiusclient/radiusclient-0.3.2.tar.gz
-_eclasses_=autotools	542bf3f83917668f3893f4da1ca238ff	eutils	43da5163ba106e87d22d2e7d6d67537f	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	1dfcad7b3f439dbc511d76c49f23da0d
-_md5_=088fe1d0bf281b357b8c6c72ebd153c8
diff --git a/metadata/md5-cache/net-dialup/radiusclient-0.3.2-r1 b/metadata/md5-cache/net-dialup/radiusclient-0.3.2-r1
new file mode 100644
index 00000000..bb5895d4
--- /dev/null
+++ b/metadata/md5-cache/net-dialup/radiusclient-0.3.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!net-dialup/radiusclient-ng !net-dialup/freeradius-client !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A library for writing RADIUS clients accompanied with several client utilities
+EAPI=5
+HOMEPAGE=http://freshmeat.net/projects/radiusclient/
+IUSE=static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+LICENSE=BSD
+RDEPEND=!net-dialup/radiusclient-ng !net-dialup/freeradius-client
+SLOT=0
+SRC_URI=ftp://ftp.cityline.net/pub/radiusclient/radiusclient-0.3.2.tar.gz
+_eclasses_=autotools	542bf3f83917668f3893f4da1ca238ff	autotools-utils	0bf099a6e3dfeaf20a7a94504d8dd896	eutils	43da5163ba106e87d22d2e7d6d67537f	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	1dfcad7b3f439dbc511d76c49f23da0d
+_md5_=cf436be8fb83b5c9927d9f4acd09cb17
diff --git a/net-dialup/radiusclient/Manifest b/net-dialup/radiusclient/Manifest
index 053dcb65..bed340d3 100644
--- a/net-dialup/radiusclient/Manifest
+++ b/net-dialup/radiusclient/Manifest
@@ -1,6 +1,7 @@
 AUX pkgsysconfdir-install.patch 805 SHA256 cde89415675f7743f2def9d57439fdad12d4f60cd836fcaf5ff75161b1f922e3 WHIRLPOOL e947b5221f699f4bcc3d9089cdad3b63e7e336e96776e7810a8c359b140680923ff3b653a473f14112c7b8d8bd14ac83db56468bece0ca9da9eea8e847ffc5f6
+AUX radiusclient-0.3.2-64bit-compat.patch 559 SHA256 5b82a7e6beb64d1891842eba9dcee2102747519c052c5cfe1d3c4bd02957ae61 WHIRLPOOL d71af24ec848e54ecf166fc8dc5b4c4f54f01aaecc3ae62c6ec6da75af028b1e2a73bf62ab7b7650960cba93b12d639f2d27c306f2220d1a9cca631683e4c38c
 AUX radiusclient-0.3.2-BJA-cross.diff 1718 SHA256 945e39f52fe65ebb50254dc2cb879a6b090d1b4f36a99b8556e93ceb3358d47a WHIRLPOOL 4a66c903974df3e7d9136e5330c53fb2234447f22e5d06ed28ca08d17b9d9c92b2f6ae6a5528421d9f254c4d2e988316e216e46244ccea92b6e5809070061d06
 DIST radiusclient-0.3.2.tar.gz 147004 SHA256 ebf5efdd6efe385faba39f48b39ebc4ee6857ccf59adf5174a5865ac7c05b6fe WHIRLPOOL 9c5e609232e8a89c3b0b30b98da4c83e4ac1845dd95eb5e5ab4234fe761c98192d69f79cb17989153d9adf9860610e313504a89c67ee38624bb5cfd9385d8299
-EBUILD radiusclient-0.3.2.ebuild 826 SHA256 3695dd25b8c2eecc9882d3361211928090de07ffadbf2888056faaf61000ba72 WHIRLPOOL 015dca53b7db1e80afa60bff9fa5b21a3318c5bbaabf692c9d8aea742ad7106159ff3493c4c43c12fbe23efe20504f34ea732d0e996e4dc53d97e219ed438722
+EBUILD radiusclient-0.3.2-r1.ebuild 806 SHA256 187447ede4ed2b96de7bc30bb9fa2b92f5cca247e57b8aa6cd2eb956916dc1b0 WHIRLPOOL 2494a851abccb7b77a361828a87205b1c32efef093c5653519c7af95b85481d7c379c4d1a8bfac0f7e1688d57ce3ec6b11ddca9b640da95f3c0f5dc7b976bfe8
 MISC ChangeLog 981 SHA256 392760f605376e89c2f0ad077e839fed6072d39cd9338a2434ecd83bf670d9ae WHIRLPOOL 1c42214ff74f96d7b3baef318459d2beed4b85c9beba5abac14cad9bf2e0dff17622226b7e823d70c2575d760b37b9210556abdeca8f50cffae35c255723e39a
 MISC metadata.xml 285 SHA256 6f5a0f1b620c38f22ecff1ea3d9cd55c7e2d2cac93b941bcb597cf1e3d4fdeea WHIRLPOOL 8bd98c3e9a10d81435e57caf77f913e9dee908d4abeab668d18efda3cf8f79afbc6391174e49589cd0a59847eff84ccda32128c9a0e134d2e23768247f7b702c
diff --git a/net-dialup/radiusclient/files/radiusclient-0.3.2-64bit-compat.patch b/net-dialup/radiusclient/files/radiusclient-0.3.2-64bit-compat.patch
new file mode 100644
index 00000000..49f6afc9
--- /dev/null
+++ b/net-dialup/radiusclient/files/radiusclient-0.3.2-64bit-compat.patch
@@ -0,0 +1,19 @@
+Gentoo bug report - https://bugs.gentoo.org/show_bug.cgi?id=399433
+Patch from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=321229
+
+--- include/radiusclient.h.orig	2005-08-04 10:50:19.636354682 +0200
++++ include/radiusclient.h	2005-08-04 10:48:47.955569910 +0200
+@@ -38,8 +38,13 @@
+ # define __P(protos) ()
+ #endif
+ 
++#if !(defined(__x86_64__))
+ typedef unsigned long UINT4;
+ typedef long 	      INT4;
++#else
++typedef unsigned int UINT4;
++typedef int 	     INT4;
++#endif
+ 
+ #define AUTH_VECTOR_LEN		16
+ #define AUTH_PASS_LEN		(3 * 16) /* multiple of 16 */
diff --git a/net-dialup/radiusclient/radiusclient-0.3.2.ebuild b/net-dialup/radiusclient/radiusclient-0.3.2-r1.ebuild
index f607fcd9..a73eac93 100644
--- a/net-dialup/radiusclient/radiusclient-0.3.2.ebuild
+++ b/net-dialup/radiusclient/radiusclient-0.3.2-r1.ebuild
@@ -2,7 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-inherit eutils autotools
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+inherit autotools-utils
 
 DESCRIPTION="A library for writing RADIUS clients accompanied with several client utilities"
 HOMEPAGE="http://freshmeat.net/projects/radiusclient/"
@@ -10,24 +13,17 @@ SRC_URI="ftp://ftp.cityline.net/pub/radiusclient/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="static-libs"
 
 DEPEND="!net-dialup/radiusclient-ng
 	!net-dialup/freeradius-client"
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}/pkgsysconfdir-install.patch"
-	epatch "${FILESDIR}/${P}-BJA-cross.diff"
-	eautoreconf
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc README BUGS CHANGES COPYRIGHT
-	dohtml doc/instop.html
-}
+DOCS=( BUGS CHANGES README )
+HTML_DOCS=( doc/instop.html )
+PATCHES=(
+	"${FILESDIR}/pkgsysconfdir-install.patch"
+	"${FILESDIR}/${P}-64bit-compat.patch" # bug #399433
+	"${FILESDIR}/${P}-BJA-cross.diff" # bug #373347
+)