Version bump to latest debian patchset, also update modprobe.d file to have .conf suffix for new modprobe.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

3 files changed, 72 insertions, 2 deletions

diff --git a/net-misc/ifenslave/ChangeLog b/net-misc/ifenslave/ChangeLog
index 4df1c1c00fda..72a9cb254a69 100644
--- a/net-misc/ifenslave/ChangeLog
+++ b/net-misc/ifenslave/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/ifenslave
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ifenslave/ChangeLog,v 1.19 2009/04/12 20:49:06 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ifenslave/ChangeLog,v 1.20 2009/07/05 20:05:42 robbat2 Exp $
+
+*ifenslave-1.1.0-r5 (05 Jul 2009)
+
+  05 Jul 2009; Robin H. Johnson <robbat2@gentoo.org>
+  +ifenslave-1.1.0-r5.ebuild:
+  Version bump to latest debian patchset, also update modprobe.d file to
+  have .conf suffix for new modprobe.
 
   12 Apr 2009; Robin H. Johnson <robbat2@gentoo.org>
   -ifenslave-1.1.0.ebuild, -ifenslave-1.1.0-r1.ebuild,
diff --git a/net-misc/ifenslave/Manifest b/net-misc/ifenslave/Manifest
index f9e264484283..0ee72493aaae 100644
--- a/net-misc/ifenslave/Manifest
+++ b/net-misc/ifenslave/Manifest
@@ -1,9 +1,11 @@
 AUX modules.d-bond 1153 RMD160 dd94ef5dac64fc31a175b88497f5ddc6898552ec SHA1 a707ec2eec878c885073fbcf74c3b59d52e4fa39 SHA256 6da462eff9fd682ad8a208efe9ea34cacf6d2ef7b5c808fcb419d10b9cc82064
 AUX modules.d-bond-1.1.0-r3 1138 RMD160 77a6901d5379c9e0f4adabef1b93989c98d743e0 SHA1 bd31e93b7c78e0dfb5f007e563d60584d8dc8dae SHA256 4b2646077490c14434d23d4019a54bfe00115a3ce9455edb461bab75ccdf6c7f
 DIST ifenslave-2.6_1.1.0-12.diff.gz 7208 RMD160 a89b5d27b252602270af889cae5e84ee39c0a496 SHA1 6c5f971e806d5888aba13e6628e093ca63ce0818 SHA256 2c71992bd1365e22b35d19fb04ba004d63de4493b07ae1270f89897b58dcefe8
+DIST ifenslave-2.6_1.1.0-13.diff.gz 7569 RMD160 fb8654201d8bd1ee082f813a1c0496f7de7ba910 SHA1 1298da3b8dc3c764dc97f2ad725141642ef52cbf SHA256 5f5d233b0c1b38507458eef267c3316af7c466e003e8a302b616ddc05369a628
 DIST ifenslave-2.6_1.1.0-6.diff.gz 3614 RMD160 0cac03ed064aaa5afacd74d03f472dc8604e18fa SHA1 965357cdd3921c96ae5c4697e59d25e488d338b8 SHA256 2fe153422e48bb9e2748e79e97740d4ec640d99b28cbde842dfba569f9d0a643
 DIST ifenslave-2.6_1.1.0.orig.tar.gz 8002 RMD160 fdf08ef8c6318f8cf8847a555978949135632b82 SHA1 84e787863dc10ee7e48dd7ca04381308f3c1dbd7 SHA256 7917bf34de80a2492eb225adf9168c83a4854ac8a008ed0fd5b3fd147ccd3041
 EBUILD ifenslave-1.1.0-r3.ebuild 1463 RMD160 0323ae678f5b394828d2c5b332dae52c46c52c82 SHA1 8c6f3192e8fa9a038d0c0684cfaea512ce765d57 SHA256 5cbe58560bed0386b51a75e72d9d071fe1d2561b453d28848427e32360982e6b
 EBUILD ifenslave-1.1.0-r4.ebuild 1722 RMD160 ae57e0600096533d05d129e7e7ef53743b8dd1ae SHA1 61a5eb118d2eddd6042b34bf6c6e02a87267c99a SHA256 7fa9adbf87f658bee3ead03ce63a7a1c3dca57569638fe481bd0b568c082a574
-MISC ChangeLog 2949 RMD160 921aecb046eb5cf57a18f1936d343c1a86bdf40c SHA1 332e14d056b9e7134d472c96a312f48b8a19fcd9 SHA256 47d220619d2ff768683e7766cf16f5b530c81994662aa2c309ad7a7bde78d906
+EBUILD ifenslave-1.1.0-r5.ebuild 1957 RMD160 37349187e4e73e60eb1ecba5c8380d7d37d0eace SHA1 d8981c166612523038f3c7efbc47a134f8b5277f SHA256 fa0235ce2aedd6db0091f9ff884d76f6a77f575d1ee4b2198a9a8c2bd3888527
+MISC ChangeLog 3179 RMD160 e956c03539fbcfbe300272e5c019e6ac5b33ac0c SHA1 e00729256b87320900dd052166de709e4e1acb8d SHA256 720e6a715f97050a7678bfe70b0a77f4a7f7034433c28b5cd1a7a8aefd019aaa
 MISC metadata.xml 279 RMD160 f84566b5a463b59cc5ddd8a2210a54de9492ed2f SHA1 98caf044b8fce3f5ff202c7f7b71f0dcb9d51947 SHA256 785db7b7f8e4f9a526dc574ce2aa10024cc83af170f38ec9af9f56c23fc15543
diff --git a/net-misc/ifenslave/ifenslave-1.1.0-r5.ebuild b/net-misc/ifenslave/ifenslave-1.1.0-r5.ebuild
new file mode 100644
index 000000000000..ced93f780132
--- /dev/null
+++ b/net-misc/ifenslave/ifenslave-1.1.0-r5.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ifenslave/ifenslave-1.1.0-r5.ebuild,v 1.1 2009/07/05 20:05:42 robbat2 Exp $
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="Attach and detach slave interfaces to a bonding device"
+HOMEPAGE="http://sf.net/projects/bonding/"
+MY_PN="ifenslave-2.6" # this is NOT an error
+DEBIAN_PV="13"
+DEBIANPKG_TARBALL="${MY_PN}_${PV}.orig.tar.gz"
+DEBIANPKG_PATCH="${MY_PN}_${PV}-${DEBIAN_PV}.diff.gz"
+DEBIANPKG_BASE="mirror://debian/pool/main/${MY_PN:0:1}/${MY_PN}"
+SRC_URI="${DEBIANPKG_BASE}/${DEBIANPKG_TARBALL}
+		 ${DEBIANPKG_BASE}/${DEBIANPKG_PATCH}"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+RDEPEND="virtual/libc"
+DEPEND="sys-devel/gcc
+		>=sys-kernel/linux-headers-2.4.22
+		${RDEPEND}"
+
+src_unpack() {
+	unpack ${DEBIANPKG_TARBALL}
+	EPATCH_OPTS="-d ${S} -p1" epatch "${DISTDIR}"/${DEBIANPKG_PATCH}
+}
+
+src_compile() {
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} ${PN}.c -o ${PN} || die "Failed to compile!"
+}
+
+src_install() {
+	doman ${PN}.8
+	into /
+	dosbin ${PN}
+	# there really is no better documentation than the sourcecode :-)
+	dodoc ${PN}.c
+	insinto /etc/modprobe.d
+	newins "${FILESDIR}"/modules.d-bond-1.1.0-r3 bond.conf
+}
+
+pkg_preinst() {
+	if [[ -a /etc/modules.d/bond ]] && [[ ! -a /etc/modprobe.d/bond ]]; then
+		elog "Moving old bond configuration in modules.d to new"
+		elog "location in modprobe.d in /etc/"
+		mv "${ROOT}"/etc/{modules,modprobe}.d/bond
+	fi
+	if [[ -a /etc/modprobe.d/bond ]] && [[ ! -a /etc/modprobe.d/bond.conf ]]; then
+		elog "Moving old bond configuration in modprobe.d to"
+		elog "new naming scheme with trailing .conf"
+		mv "${ROOT}"/etc/modprobe.d/bond{,.conf}
+	fi
+}
+
+pkg_postinst() {
+	einfo "If you want to use bonding on your system, be sure to use"
+	einfo ">=baselayout-1.10, where support is now integrated!"
+	einfo "Using >=baselayout-1.11.6 strongly recommended."
+}