Version bump, add a check for ipv6 (bug #318777 by Nikolaj Sjujskij, drop old.

(Portage version: 2.1.10.49/cvs/Linux x86_64)

3 files changed, 65 insertions, 51 deletions

diff --git a/net-misc/miredo/ChangeLog b/net-misc/miredo/ChangeLog
index f425b1625076..3e1201b74bea 100644
--- a/net-misc/miredo/ChangeLog
+++ b/net-misc/miredo/ChangeLog
@@ -1,6 +1,12 @@
 # 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.9 2012/01/15 19:40:44 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/miredo/ChangeLog,v 1.10 2012/03/03 15:08:02 pacho Exp $
+
+*miredo-1.2.5 (03 Mar 2012)
+
+  03 Mar 2012; Pacho Ramos <pacho@gentoo.org> +miredo-1.2.5.ebuild,
+  -miredo-1.2.4.ebuild:
+  Version bump, add a check for ipv6 (bug #318777 by Nikolaj Sjujskij, drop old.
 
   15 Jan 2012; Torsten Veller <tove@gentoo.org> files/miredo.rc,
   files/miredo-server.rc:
diff --git a/net-misc/miredo/miredo-1.2.4.ebuild b/net-misc/miredo/miredo-1.2.4.ebuild
deleted file mode 100644
index f8ae6b5cea60..000000000000
--- a/net-misc/miredo/miredo-1.2.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/miredo/miredo-1.2.4.ebuild,v 1.1 2011/07/26 21:59:17 xmw Exp $
-
-EAPI=3
-
-inherit eutils
-
-DESCRIPTION="Miredo is an open-source Teredo IPv6 tunneling software."
-HOMEPAGE="http://www.remlab.net/miredo/"
-SRC_URI="http://www.remlab.net/files/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+caps"
-
-DEPEND="dev-libs/judy
-	caps? ( sys-libs/libcap )"
-RDEPEND="${DEPEND}
-	sys-apps/iproute2"
-
-#tries to connect to external networks (#339180)
-RESTRICT="test"
-
-src_configure() {
-	econf --enable-miredo-user \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--docdir="/usr/share/doc/${P}"
-	use caps || \
-		echo "#undef HAVE_SYS_CAPABILITY_H" >> config.h
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	newinitd "${FILESDIR}"/miredo-server.rc miredo-server || die
-	newconfd "${FILESDIR}"/miredo-server.conf miredo-server || die
-	newinitd "${FILESDIR}"/miredo.rc miredo || die
-	newconfd "${FILESDIR}"/miredo.conf miredo || die
-	insinto /etc/miredo
-	doins misc/miredo-server.conf || die
-	dodoc README NEWS ChangeLog AUTHORS THANKS TODO || die
-}
-
-pkg_preinst() {
-	enewgroup miredo
-	enewuser miredo -1 -1 /var/empty miredo
-}
diff --git a/net-misc/miredo/miredo-1.2.5.ebuild b/net-misc/miredo/miredo-1.2.5.ebuild
new file mode 100644
index 000000000000..2e4d2e6cd80f
--- /dev/null
+++ b/net-misc/miredo/miredo-1.2.5.ebuild
@@ -0,0 +1,58 @@
+# 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.5.ebuild,v 1.1 2012/03/03 15:08:02 pacho Exp $
+
+EAPI=4
+
+inherit 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/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+caps"
+
+RDEPEND="sys-apps/iproute2
+	caps? ( sys-libs/libcap )"
+DEPEND="${RDEPEND}
+	dev-libs/judy
+	app-arch/xz-utils"
+
+CONFIG_CHECK="~IPV6" #318777
+
+#tries to connect to external networks (#339180)
+RESTRICT="test"
+
+src_configure() {
+	econf --disable-static \
+		--enable-miredo-user \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--docdir="/usr/share/doc/${P}"
+	use caps || \
+		echo "#undef HAVE_SYS_CAPABILITY_H" >> config.h
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
+
+	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() {
+	enewgroup miredo
+	enewuser miredo -1 -1 /var/empty miredo
+}