Revbump to improve ebuils (thanks for suggestions by Bertrand Jacquin and Diego Elio Pettenò on bug 421171), drop old.

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

4 files changed, 82 insertions, 21 deletions

diff --git a/net-misc/miredo/ChangeLog b/net-misc/miredo/ChangeLog
index bde12b4e4bff..3f2f1d2cace7 100644
--- a/net-misc/miredo/ChangeLog
+++ b/net-misc/miredo/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/miredo
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/miredo/ChangeLog,v 1.13 2012/06/13 07:35:21 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/miredo/ChangeLog,v 1.14 2012/06/20 06:22:44 xmw Exp $
+
+*miredo-1.2.5-r1 (20 Jun 2012)
+
+  20 Jun 2012; Michael Weber <xmw@gentoo.org>
+  +files/miredo-1.2.5-configure-libcap.diff, +miredo-1.2.5-r1.ebuild,
+  -miredo-1.2.3-r1.ebuild:
+  Revbump to improve ebuils (thanks for suggestions by Bertrand Jacquin and
+  Diego Elio Pettenò on bug 421171), drop old.
 
   13 Jun 2012; Jeff Horelick <jdhore@gentoo.org> miredo-1.2.5.ebuild:
   marked x86 per bug 419313
diff --git a/net-misc/miredo/Manifest b/net-misc/miredo/Manifest
index 06d2a0784d60..fc38110e54b4 100644
--- a/net-misc/miredo/Manifest
+++ b/net-misc/miredo/Manifest
@@ -1,10 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX miredo-1.2.5-configure-libcap.diff 918 RMD160 a632a8c81fd9775e2e5cd3eac41216e9b9ba5637 SHA1 28bcc62327ae46b035cff9dfa47d549b1e0d5e61 SHA256 0e78e9311d3e493b290e21550d1cf9d3227a591d79714b41797d1f8b8f936eca
 AUX miredo-server.conf 153 RMD160 932382395edc4fdfa4bb07b153cea074bfe8775a SHA1 4f0a0d4f201fbdcf1c85a369eb538047638cfe4f SHA256 6f00335aa1c763a5776ea160722a0e83f9bf8454a5672381e0234dfb80a2a91b
 AUX miredo-server.rc 677 RMD160 026f84a97ccf7a7a7c24dadf6ecfee650f29035c SHA1 57a4d1b06b0b651b703f024a4cd74b94703f7a85 SHA256 127fe97a18997e6811101673822657e342dad47888eaefdacd633b684454764e
 AUX miredo.conf 151 RMD160 abc0ef64c6683b7a51fb6d39119348f680034bbf SHA1 c5486c6572532f02240b9d18f09c3804f2dd05fd SHA256 662e7ac2262c9d2b89887a14a4366e1f938ca82a04a55d72340db5a1e91f3cce
 AUX miredo.rc 621 RMD160 e8303c768818c823c09abb1ad9efc0b70d324dd6 SHA1 4c22ee0632423014a5523c66174020e03050b749 SHA256 08f15f157365ec3ebb1ac364092aa66e76cdde23fcf34a3231efe822bbdd9a6c
-DIST miredo-1.2.3.tar.bz2 530455 RMD160 e1ce0e332f775b5c58f53bfb52ab04e579bbecac SHA1 1ee8f24077cc707938360e4cf78948c8f7ae6dac SHA256 01a2b8aacca7b217cee6f668d77f0836c274b52328be4055f2c4d149959d95c8
 DIST miredo-1.2.5.tar.xz 474236 RMD160 19a2b6dd462eadb2a6de03c003eb5e7ad6193fc2 SHA1 3aa4f35e78ffaca2c8652f428401be6e384888c9 SHA256 9d6c6aacfbde0e152481273cda4dc9a62f8724c4c941fa8e0806e89ab9992262
-EBUILD miredo-1.2.3-r1.ebuild 1301 RMD160 cb59cffd53bf4d8b2026a1dd187d9497f996bce5 SHA1 0797f6f64d99017a5fd46d9ad577676f564b52b6 SHA256 e5b8d6956dd610142de7cf5468ee85f44f8aafeb31d1301e8defc63b9adbb333
+EBUILD miredo-1.2.5-r1.ebuild 1349 RMD160 7ed0b06e5b33195aad171c03e0266a19c105b6b5 SHA1 edeed87e5b76c945c5e25821101a8ede51971e45 SHA256 ce4f127f605a53103afbe135c80988530d4ab121cb48c3398200feb5f56d7289
 EBUILD miredo-1.2.5.ebuild 1424 RMD160 ada5c2f265d8e25fc35ae8629277bdc6958ccb31 SHA1 4e5ade5a909f8b71fd9924b8717fa50b29337911 SHA256 448880827d5741f93bd41611aba66f2b894b796efda64ddcf96efc3f2ad15475
-MISC ChangeLog 2132 RMD160 1c76ce9c45586c84e5f3441ce16bba1d20c6ee76 SHA1 05aebe386c882c139013e56df8d737febd95c510 SHA256 e7968d09ccc723e2742cd8c0918849adbd16628ad68ebecd8441b4a73016c6ac
+MISC ChangeLog 2429 RMD160 2c5c515a1dae23c7e9df4e6dd466efa392a4e6ee SHA1 58c7959e4ba1e8dd1153e58047a4d35756f448b5 SHA256 170c9000d271c4af4412a5c7ebf31f2f6e748be69d9fc4703fe6e94db06b72aa
 MISC metadata.xml 560 RMD160 7c57ac5edd3532db3e3fc09133995ea74bbd33e2 SHA1 744529789815d0361d7a3a4a0709dddf9bc86376 SHA256 f1112f93ea4867d6fc57b3503ad2989d695a860c5ba474f80bc2b30b1164d2e7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk/hbBAACgkQknrdDGLu8JDDJgD/Yr9W9RvKiln5Hozmt7VTq1L1
+3kBLKuhER/wgPJ2W5ikA/32AEJQxMaYY6wAEOGeLCflRUDQXZ6lmZfarGgW8IBcn
+=/9mI
+-----END PGP SIGNATURE-----
diff --git a/net-misc/miredo/files/miredo-1.2.5-configure-libcap.diff b/net-misc/miredo/files/miredo-1.2.5-configure-libcap.diff
new file mode 100644
index 000000000000..cffdbf1e562e
--- /dev/null
+++ b/net-misc/miredo/files/miredo-1.2.5-configure-libcap.diff
@@ -0,0 +1,33 @@
+--- configure.ac.ori	2012-06-14 21:55:13.756603416 +0200
++++ configure.ac	2012-06-14 23:12:01.425399836 +0200
+@@ -150,16 +150,23 @@
+ 
+ # POSIX capabilities
+ LIBCAP=""
+-AC_CHECK_HEADERS([sys/capability.h], [
+-	AC_CHECK_LIB(cap, cap_set_proc, [
+-		LIBCAP="-lcap"
+-		AC_DEFINE(HAVE_LIBCAP, 1,
+-			  [Define to 1 if you have the `cap' library (-lcap).])
+-	])
++AC_ARG_WITH(libcap,
++  AS_HELP_STRING([--with-libcap], [enable POSIX 1003.1e capabilities]),
++    with_libcap=$withval,
++    with_libcap=auto)
++AC_MSG_CHECKING([whether to enable POSIX 1003.1e capabilities])
++AC_MSG_RESULT($with_libcap)
++
++AS_IF([test "x$with_libcap" != "xno"], [
++  AC_CHECK_HEADERS([sys/capability.h])
++  AC_CHECK_LIB(cap, cap_set_proc, [
++    LIBCAP="-lcap"
++    AC_DEFINE(HAVE_LIBCAP, 1,
++      [Define to 1 if you have the cap library (-lcap).])
++  ])
+ ])
+ AC_SUBST(LIBCAP)
+ 
+-
+ # Judy
+ AC_ARG_WITH(Judy,
+ 	    [AS_HELP_STRING(--with-Judy,
diff --git a/net-misc/miredo/miredo-1.2.3-r1.ebuild b/net-misc/miredo/miredo-1.2.5-r1.ebuild
index f4e5554a403f..24b21e53869b 100644
--- a/net-misc/miredo/miredo-1.2.3-r1.ebuild
+++ b/net-misc/miredo/miredo-1.2.5-r1.ebuild
@@ -1,47 +1,57 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/miredo/miredo-1.2.3-r1.ebuild,v 1.3 2011/06/08 18:22:15 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/miredo/miredo-1.2.5-r1.ebuild,v 1.1 2012/06/20 06:22:44 xmw Exp $
 
-EAPI=3
+EAPI=4
 
-inherit eutils
+inherit autotools eutils linux-info
 
 DESCRIPTION="Miredo is an open-source Teredo IPv6 tunneling software."
 HOMEPAGE="http://www.remlab.net/miredo/"
-SRC_URI="http://www.remlab.net/files/miredo/miredo-1.2.3.tar.bz2"
+SRC_URI="http://www.remlab.net/files/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+caps"
 
-DEPEND="dev-libs/judy
+RDEPEND="sys-apps/iproute2
+	dev-libs/judy
 	caps? ( sys-libs/libcap )"
-RDEPEND="${DEPEND}
-	sys-apps/iproute2"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils"
+
+CONFIG_CHECK="~IPV6" #318777
 
 #tries to connect to external networks (#339180)
 RESTRICT="test"
 
+DOCS=( AUTHORS ChangeLog NEWS README TODO THANKS )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-configure-libcap.diff
+	eautoreconf
+}
+
 src_configure() {
-	econf --enable-miredo-user \
-		--prefix=/usr \
-		--sysconfdir=/etc \
+	econf \
+		--disable-static \
+		--enable-miredo-user \
 		--localstatedir=/var \
-		--docdir="/usr/share/doc/${P}"
-	use caps || \
-		echo "#undef HAVE_SYS_CAPABILITY_H" >> config.h
+		$(use_with caps libcap "${ROOT}usr")
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "failed install"
+	default
+	prune_libtool_files
+
 	newinitd "${FILESDIR}"/miredo-server.rc miredo-server
 	newconfd "${FILESDIR}"/miredo-server.conf miredo-server
 	newinitd "${FILESDIR}"/miredo.rc miredo
 	newconfd "${FILESDIR}"/miredo.conf miredo
+
 	insinto /etc/miredo
 	doins misc/miredo-server.conf
-	dodoc README NEWS ChangeLog AUTHORS THANKS TODO
 }
 
 pkg_preinst() {