Version bump, drop old.

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

8 files changed, 40 insertions, 103 deletions

diff --git a/net-misc/miredo/ChangeLog b/net-misc/miredo/ChangeLog
index 3f5f4c0707e9..4b9662a6c225 100644
--- a/net-misc/miredo/ChangeLog
+++ b/net-misc/miredo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/miredo
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/miredo/ChangeLog,v 1.17 2013/04/05 21:48:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/miredo/ChangeLog,v 1.18 2013/05/31 12:48:28 xmw Exp $
+
+*miredo-1.2.6 (31 May 2013)
+
+  31 May 2013; Michael Weber <xmw@gentoo.org> +miredo-1.2.6.ebuild,
+  -files/miredo-server.conf, -files/miredo-server.rc, -files/miredo.conf,
+  -files/miredo.rc, -miredo-1.2.5.ebuild, miredo-1.2.5-r2.ebuild:
+  Version bump, drop old.
 
   05 Apr 2013; Agostino Sarubbo <ago@gentoo.org> miredo-1.2.5-r2.ebuild:
   Stable for x86, wrt bug #463124
diff --git a/net-misc/miredo/Manifest b/net-misc/miredo/Manifest
index b40a1d3ff2ca..dfab0f9cd6f5 100644
--- a/net-misc/miredo/Manifest
+++ b/net-misc/miredo/Manifest
@@ -1,33 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX miredo-1.2.5-configure-libcap.diff 918 SHA256 0e78e9311d3e493b290e21550d1cf9d3227a591d79714b41797d1f8b8f936eca SHA512 151a5edc97c021b8d54dfb4664321c1774ce703bf9eaebb0079ba04100e5af1f632218172f674b781f8d1df64993761435c78a26cb0c4158929cdf9e0ba27523 WHIRLPOOL 92dcd4cf531a0c6db2029ddfcd12a194c9e6d7bcc0d61ac4303ae180c2651e2e5646d3489f7be79d9b9d462dec986e81f832e06e7a2ef747486089c774f575d4
 AUX miredo-1.2.5-ip-path.patch 802 SHA256 67a7cb33b45613b587d94e620e179b988525143164f3f131cdaed1296630189b SHA512 dba30cebdc245f623b75cfcf018508af31619eeb3f1830bb767cd4d6d5aeeb8988948f57d454cc96bcbaae793374e83645dbb4782c717b60ab3738cfd4e804ab WHIRLPOOL 32e983df3544539d7c0c0df0c903207afbeda6145d5ab2748460151afea22250c110941d05ef218340bda71f3cfa7ee6d59d3cbcea7fb7f033cf921a5e6d6a63
-AUX miredo-server.conf 153 SHA256 6f00335aa1c763a5776ea160722a0e83f9bf8454a5672381e0234dfb80a2a91b SHA512 6d094b34fca7f95dde72c3c0a588aa377b2fcefafd528457c96ad529b6ac805e6524956d47453d42f01c3cdfe111c1f56720dc30089796f4030830ee89b8ed4f WHIRLPOOL 9d260f8e958d51ee79303bbf7c37bd23bcd0c0a02aef960c2f65c2884e1d77c40f4b4d3e7ce3b95acc28375712cac36fc0fc9d1d00fe9f0efb7234d99c071671
-AUX miredo-server.rc 677 SHA256 127fe97a18997e6811101673822657e342dad47888eaefdacd633b684454764e SHA512 298e9f6febc29860eec2019a088090431d698f2ecde3172afb43d369c654083477f171face4ea8ee8be336c7636825284ca79c007228586de1e2217d8a27d31d WHIRLPOOL a465b4bf5ff3cef31929793a46deb3f20aeca362730e01cd91785a34aca5572341ac8ff00ac42cca0fb07aa028badb6ba7cb1dbf0dbd827320ec4389595a3e62
-AUX miredo.conf 151 SHA256 662e7ac2262c9d2b89887a14a4366e1f938ca82a04a55d72340db5a1e91f3cce SHA512 7aafbf28a67b98af4dea7f97b760fb230fc9ce97e5e4d839ec5ff909732be10039e873c1ce132e33e767c449233f1bebc49feb30533aa2ba25dfe7a5909d8d89 WHIRLPOOL 8582143c6cdf4a1870cca1e090884a0c8b51f486fe577e66526423fb18a9449b6df5e729ceb1abc4e3f2689c05dab6f626788f84b5e8e41fa7f9e728b49e5a2b
 AUX miredo.conf.2 46 SHA256 4ddee52d16bf7510b5eae619507a0d4a2039a5c91d55ca35f1aed54a977a6058 SHA512 a0257aee71f0aa476bc5876854e1a08387812ea7b5048a8f5d67d4202d27e8d76c0826720b8a84f4bbaed3ed209e94bf723123b8dcfc8a953fc6abdb831235c3 WHIRLPOOL 89c1083f127122f079a54d7a8d2a6da7d73ff9482f13ee082a1bdfde2f72b34fa6e3ab2c28e4f26b74587235c014badb7d7cbf4e14919c3d4c642abf17c20573
-AUX miredo.rc 621 SHA256 08f15f157365ec3ebb1ac364092aa66e76cdde23fcf34a3231efe822bbdd9a6c SHA512 53e983039780474987ba48428cc9be7fa8fc6e965a4023dc3418ce027c6e1569962d8e40d17b32250c8203bcf1566560174c5d70775f1d6882b3902ae1837ea7 WHIRLPOOL ef7ddef65ee1872a021791cc6469a212f52bca63773a2a8411deaeda356b769b3a20ad9ba24ab050485c872d76021555b5fe075d1897d2fc3ea391686ffe3207
 AUX miredo.rc.2 394 SHA256 c7863e6b9c3e5b64d15b6d0a09f073419e0a4083b678b6718c4c0e23f4ef6d11 SHA512 d4c387ebd97d644514e46ab7e86f163277ab0d7ce389b9b0c5c856c2864be7d338aa548610012432dac99bbd7e77c6007bd60af168a645410b1d0f3be4d64a23 WHIRLPOOL 63238914091fdf1219c6f750cbeb5f18d804884e44e33f2fec0da629112ef9f3b9fdd5c95cdbce2c757716db6e60d16941e5e59540559880e0f6fdac0ba7011d
 DIST miredo-1.2.5.tar.xz 474236 SHA256 9d6c6aacfbde0e152481273cda4dc9a62f8724c4c941fa8e0806e89ab9992262 SHA512 94bc71b7093783ad103a0aceb95ad3de1739e4ec1d763b3c6cea9bb1768f55359448957f623ee3f966955c555bb9f71ff0216d9d4e8d2ff244bb058731702c70 WHIRLPOOL 45b38f19fc50bb5661dcc51166c721c507d70b29072c7a2c3195c093ec91259dfbcdc40e3889f5242af79cf2f04fb7fdb3e48f7bd2cc15d6262813891fa9624c
-EBUILD miredo-1.2.5-r2.ebuild 1369 SHA256 fd097546cf61297bab284be13c56b9ac570f5696c53d3d52e967f43473c9d57f SHA512 e2cc74ebfc7560629e6098c568cd7ec88a6a3bb2453474b792d6478c3f88bfccc5beb542fdec5f71f5974c2f67a72f5ce982131212bd9ab294d6dd1cc2646e7e WHIRLPOOL 12f02a8629ddb71e219a19929e4e5502f128f87128df63eed84058b88dcb88d883381bf7384da72c15273eb0db74ffe18fa12590cc07cd12d221f05d12eb1e59
-EBUILD miredo-1.2.5.ebuild 1424 SHA256 448880827d5741f93bd41611aba66f2b894b796efda64ddcf96efc3f2ad15475 SHA512 28cf15addf42a99dd588b7ea1fa8b72abd6ad80d7fca8194b0031902c9f73046ed9dcd01f8df70426c4885e1157bc5fa2fe9d78a2e9b37faacf7dd8d71567fdf WHIRLPOOL f59bff87a6c3953f123924a54e93d30e763171be7cd18521077a3c1c436148f6f295244fc926402ac6ed9d98d6313d943a2285bb0fc9e7f8fe2fbdcd4e4d9f05
-MISC ChangeLog 3028 SHA256 f580875579f16f4ba5815d6e2b70491d22e8f7d91d390aa375146d3457400549 SHA512 7e7f1d0210bc7a29dc2e84b1e3cbd0b9a0a28a17fdfd7637d0bb795b01c5d50959f6a02b2c8bca8d10844932b115537617becf9003e89cea629aca60632bf9c2 WHIRLPOOL e2e03698d357085a7ad59f5cf37c6406d0831ad83535d25b50d13d5513d2b8f0ff9d0da0ad25161705136de9fa0568f9b70151e7cdb2585ccb300c8f64275735
+DIST miredo-1.2.6.tar.xz 477668 SHA256 fa26d2f4a405415833669e2e2e22677b225d8f83600844645d5683535ea43149 SHA512 9cbc604aecde566f921834a220be7675981e1c603cbcc81c3e2e9c58fdcdae2e78ec6ffc180939d5b8f6d7598ba3967270532b2c0c04de8b688a86c436719caf WHIRLPOOL 5b2723568e1cc583e15b32dbb578c12438ba30802bc1e11a912829c010d655d8a867f8070e1b9a4a2c1c910ca4abc1ef6109d87372f382e8787d4514d035d513
+EBUILD miredo-1.2.5-r2.ebuild 1374 SHA256 bcab25b77cf8270fd531e85f18e60e90ee5bcf4f34370c52e47dd71cabaff3f8 SHA512 f6838aa9ffa558a121de1467ebd6f01758aa1cdd04f0c5b57c5746f7c94cfd8a1bbf635bf88714a6baf8e4e152e6445a9546bdcac532a207820c07616fb4997c WHIRLPOOL 495b3621c29a0d92b28c02a3a7581d6837401582d5fde3313ac871c0b8df9870d9a5420a4bd9400d0b2dfe068af18462c223323277bf139a8e63df8abc581e58
+EBUILD miredo-1.2.6.ebuild 1387 SHA256 4d02cb7a7d74e5fc94dc88dbe6cc6497a1f774632a94a541312eb9c724b93ed2 SHA512 acd7801e3e832e65ab8ed6f5fdbb6681276cbe38d1f2684cb9852b8c44056deda9ee9be21511d857ec1e1a0cd4253caa4c78c785ad2d082641307696b017b83b WHIRLPOOL bc671464fa96d91bc73aedd5c3509312186b066c22ab889ad8efe1491eb74c52b02ef5eaf1c5f406f61e7672d45b62ed2ce509cd88853c8a5bee4910bdb4773d
+MISC ChangeLog 3292 SHA256 d8ba03dc3b1a1a80e2faae5d2b47b72e3cbfa772eea82e392bbdac312109ccb0 SHA512 4ee06d9e8f1d31f3c22d4c8bd08345fecfaaa70c15c975ba5aae022aa99f3075b300258b8496ac854da636fc0b46f8ffc4371e8c2e776011e1f1671d0c0aca02 WHIRLPOOL 082458b8ae447951415f2a3f20fa5302c10416a2e402f909f36d7954933104867e4bb64ed39a48c6b1b5148e046442cf3263c58ad9385466f24a05d93142524f
 MISC metadata.xml 625 SHA256 5fcdaed41a3e9520e1dc32238784a48afa87d0352cb6c236775a1b51f77d5286 SHA512 5333a67fcc97d78b0497c0074be2f3ed0f4636307bd76a09a92bd012a632998286a4bfcf67ee1627cacef2baaadf8204480ae3a7001719a44206247fcc40255e WHIRLPOOL 499a94b6bca12b7c70036d999a5be812571270e24c3903c7270352a327f8765d63fb21c24e5fbc1adc4847682f58007bf3ca984f185508521b98b7efc82dfde4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRX0a4AAoJELp701BxlEWfSfQQAJHoZTtgUgI87ik3oD6Yay0t
-RrZ+2FHTn8JHmWMx7lAs2bDMu7/ifDWE0/+lpSkm1DJ037gORLVY5VwrDxecAtGj
-bwx7pEPBJVMPPTwnbVgSbiiLr3LnF3we+UXP0CozvlL4OVQs38RXMkmf7kUva69+
-j8DGMZv4Xe16o8jcWMez3BV10izNWO83QDn8y+dKp09OFK0yc5BxSTxt5+TAAY5g
-rlFxNEj2K2c0uE+nI/1gieP8gSpbKT1MrZw5wbwY33hapUQBMNikvSV1zpBbDzzz
-dJBMJH7uC8iiZJDR1mMCwmgnHNAJL9ZHJ613axGpfbYtCo3rHRSsRMf/sAMsNFjq
-DSxIQliyyfGJIFiPV6GqlDbUZT7U53UIVJJgUMmSZxLXEnv/2cSm8QjWITsbflnh
-4Fd34fAkQQDhj+dndCfuaEQUNgh6MDtQgZpcW+yNDpPw6Iu9ZDYGKn9N8ceqXSaI
-rBYSsCucXDABTjPU5KuUl6JjslhrA/Rdx+XW8PPIM+uHYGuLgV9J92GmVY9o0iGd
-jqzCuNEgbB31rGSTSSvcEgA8eLHR8+Tw2U+8T81thbF+ShrdObIsxdQKVaDflGtd
-ayG8idB7CvMoRO4wz6dIK6HxuFaHPWYaQWqsT4A8Hxdi26G6I0BQz4xUQ9YRSFgv
-LB95o0fCKIjD3uevZlLw
-=4t1E
+iF4EAREIAAYFAlGonEYACgkQknrdDGLu8JBVCQD+NiNDSz0UtHH8PEjbM1re5Jd5
+YKdhbMNeR2d5UqyrzYIA/1Z2jpehhfkg+UFS3R3ZuRPDSE6p9Se/5qILz7kdkLCI
+=Ydjk
 -----END PGP SIGNATURE-----
diff --git a/net-misc/miredo/files/miredo-server.conf b/net-misc/miredo/files/miredo-server.conf
deleted file mode 100644
index 167162db79de..000000000000
--- a/net-misc/miredo/files/miredo-server.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# Load the tun module
-MIREDO_MODPROBE_TUN="yes"
-# Load the ipv6 module
-MIREDO_MODPROBE_IPV6="yes"
-# Options to pass to the miredo process
-MIREDO_OPTS=""
diff --git a/net-misc/miredo/files/miredo-server.rc b/net-misc/miredo/files/miredo-server.rc
deleted file mode 100644
index a5546efa378f..000000000000
--- a/net-misc/miredo/files/miredo-server.rc
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/miredo/files/miredo-server.rc,v 1.2 2012/01/15 19:40:44 tove Exp $
-
-depend() {
-	need net
-	use dns logger
-}
-
-start() {
-	ebegin "Starting Miredo server"
-	[ "${MIREDO_SERVER_MODPROBE_IPV6}" == "yes" ] && modprobe ipv6
-	[ "${MIREDO_SERVER_MODPROBE_TUN}" == "yes" ] &&	modprobe tun
-	start-stop-daemon --start --quiet --exec /usr/sbin/miredo-server -- \
-		${MIREDO_SERVER_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Miredo server"
-	start-stop-daemon --stop --quiet --pidfile /var/run/miredo-server.pid
-	eend $?
-}
diff --git a/net-misc/miredo/files/miredo.conf b/net-misc/miredo/files/miredo.conf
deleted file mode 100644
index f15ca62b7bc4..000000000000
--- a/net-misc/miredo/files/miredo.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# Load the tun module
-MIREDO_MODPROBE_TUN="no"
-# Load the ipv6 module
-MIREDO_MODPROBE_IPV6="no"
-# Options to pass to the miredo process
-MIREDO_OPTS=""
diff --git a/net-misc/miredo/files/miredo.rc b/net-misc/miredo/files/miredo.rc
deleted file mode 100644
index 9fc7a6bcacf0..000000000000
--- a/net-misc/miredo/files/miredo.rc
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/miredo/files/miredo.rc,v 1.3 2012/01/15 19:40:44 tove Exp $
-
-depend() {
-	need net
-	use dns logger
-}
-
-start() {
-	ebegin "Starting Miredo"
-	test "${MIREDO_MODPROBE_IPV6}" = "yes" && modprobe ipv6
-	test "${MIREDO_MODPROBE_TUN}" = "yes" && modprobe tun
-	start-stop-daemon --start --quiet --exec /usr/sbin/miredo -- \
-		${MIREDO_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Miredo"
-	start-stop-daemon --stop --quiet --pidfile /var/run/miredo.pid
-	eend $?
-}
diff --git a/net-misc/miredo/miredo-1.2.5-r2.ebuild b/net-misc/miredo/miredo-1.2.5-r2.ebuild
index 2a11a1f30040..6cffd023f2c5 100644
--- a/net-misc/miredo/miredo-1.2.5-r2.ebuild
+++ b/net-misc/miredo/miredo-1.2.5-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 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-r2.ebuild,v 1.3 2013/04/05 21:48:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/miredo/miredo-1.2.5-r2.ebuild,v 1.4 2013/05/31 12:48:28 xmw Exp $
 
 EAPI=4
 
-inherit autotools eutils linux-info
+inherit autotools eutils linux-info user
 
 DESCRIPTION="Miredo is an open-source Teredo IPv6 tunneling software."
 HOMEPAGE="http://www.remlab.net/miredo/"
diff --git a/net-misc/miredo/miredo-1.2.5.ebuild b/net-misc/miredo/miredo-1.2.6.ebuild
index 22a7214b162b..670a2b882500 100644
--- a/net-misc/miredo/miredo-1.2.5.ebuild
+++ b/net-misc/miredo/miredo-1.2.6.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.4 2012/06/13 07:35:21 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/miredo/miredo-1.2.6.ebuild,v 1.1 2013/05/31 12:48:28 xmw Exp $
 
 EAPI=4
 
-inherit eutils linux-info
+inherit autotools eutils linux-info user
 
 DESCRIPTION="Miredo is an open-source Teredo IPv6 tunneling software."
 HOMEPAGE="http://www.remlab.net/miredo/"
@@ -12,7 +12,7 @@ SRC_URI="http://www.remlab.net/files/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+caps"
 
 RDEPEND="sys-apps/iproute2
@@ -26,30 +26,33 @@ CONFIG_CHECK="~IPV6" #318777
 #tries to connect to external networks (#339180)
 RESTRICT="test"
 
+DOCS=( AUTHORS ChangeLog NEWS README TODO THANKS )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.2.5-configure-libcap.diff
+	epatch "${FILESDIR}"/${PN}-1.2.5-ip-path.patch
+	eautoreconf
+}
+
 src_configure() {
-	econf --disable-static \
+	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
+		$(use_with caps libcap)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
+	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
+	newinitd "${FILESDIR}"/miredo.rc.2 miredo
+	newconfd "${FILESDIR}"/miredo.conf.2 miredo
+	newinitd "${FILESDIR}"/miredo.rc.2 miredo-server
+	newconfd "${FILESDIR}"/miredo.conf.2 miredo-server
 
 	insinto /etc/miredo
 	doins misc/miredo-server.conf
-
-	dodoc README NEWS ChangeLog AUTHORS THANKS TODO
 }
 
 pkg_preinst() {