From da9a0bdf22d6cc229b2532950d73b6473cba3b3d Mon Sep 17 00:00:00 2001 From: Michael Weber Date: Wed, 20 Jun 2012 06:22:44 +0000 Subject: Revbump to improve ebuils (thanks for suggestions by Bertrand Jacquin and Diego Elio Pettenò on bug 421171), drop old. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (Portage version: 2.1.10.65/cvs/Linux x86_64) --- net-misc/miredo/ChangeLog | 10 +++- .../files/miredo-1.2.5-configure-libcap.diff | 33 ++++++++++++ net-misc/miredo/miredo-1.2.3-r1.ebuild | 50 ------------------ net-misc/miredo/miredo-1.2.5-r1.ebuild | 60 ++++++++++++++++++++++ 4 files changed, 102 insertions(+), 51 deletions(-) create mode 100644 net-misc/miredo/files/miredo-1.2.5-configure-libcap.diff delete mode 100644 net-misc/miredo/miredo-1.2.3-r1.ebuild create mode 100644 net-misc/miredo/miredo-1.2.5-r1.ebuild (limited to 'net-misc/miredo') 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 + +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 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.3-r1.ebuild deleted file mode 100644 index f4e5554a403f..000000000000 --- a/net-misc/miredo/miredo-1.2.3-r1.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.3-r1.ebuild,v 1.3 2011/06/08 18:22:15 maekke 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/miredo/miredo-1.2.3.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 "failed install" - 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 -} diff --git a/net-misc/miredo/miredo-1.2.5-r1.ebuild b/net-misc/miredo/miredo-1.2.5-r1.ebuild new file mode 100644 index 000000000000..24b21e53869b --- /dev/null +++ b/net-misc/miredo/miredo-1.2.5-r1.ebuild @@ -0,0 +1,60 @@ +# 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-r1.ebuild,v 1.1 2012/06/20 06:22:44 xmw Exp $ + +EAPI=4 + +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/${PN}/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+caps" + +RDEPEND="sys-apps/iproute2 + dev-libs/judy + caps? ( sys-libs/libcap )" +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 \ + --disable-static \ + --enable-miredo-user \ + --localstatedir=/var \ + $(use_with caps libcap "${ROOT}usr") +} + +src_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 +} + +pkg_preinst() { + enewgroup miredo + enewuser miredo -1 -1 /var/empty miredo +} -- cgit v1.2.3-65-gdbad