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

(Portage version: 2.1.10.65/cvs/Linux x86_64)

3 files changed, 69 insertions, 18 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/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() {