Don't install init/conf files as baselayout-1.12 (now stable) has inbuilt

  ifplugd support.
Package-Manager: portage-2.1.1_pre5-r1

4 files changed, 105 insertions, 10 deletions

diff --git a/sys-apps/ifplugd/ChangeLog b/sys-apps/ifplugd/ChangeLog
index 8355854760fc..6b1c7f726e6a 100644
--- a/sys-apps/ifplugd/ChangeLog
+++ b/sys-apps/ifplugd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/ifplugd
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifplugd/ChangeLog,v 1.34 2006/04/14 11:59:13 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifplugd/ChangeLog,v 1.35 2006/08/16 10:15:42 uberlord Exp $
+
+*ifplugd-0.28-r7 (16 Aug 2006)
+
+  16 Aug 2006; Roy Marples <uberlord@gentoo.org> +ifplugd-0.28-r7.ebuild:
+  Don't install init/conf files as baselayout-1.12 (now stable) has inbuilt
+  ifplugd support.
 
 *ifplugd-0.28-r6 (14 Apr 2006)
 
diff --git a/sys-apps/ifplugd/Manifest b/sys-apps/ifplugd/Manifest
index b137281bd522..6841a3e17d1c 100644
--- a/sys-apps/ifplugd/Manifest
+++ b/sys-apps/ifplugd/Manifest
@@ -1,33 +1,50 @@
-MD5 d72dc607b05d3e3a9873aea6c010c812 ChangeLog 6745
-RMD160 7a633c246845c5ff5cd9776f4a31cd8b9ec08011 ChangeLog 6745
-SHA256 cd82caf4607a8e69068877e3fee568fbac3a8ca11d6896c2aeb59c96d9f7289d ChangeLog 6745
-MD5 83ebee09d9faecc03912ee8631d7f372 files/digest-ifplugd-0.28-r5 238
-RMD160 f0dc5bf3ea7253ad7658562a12c7d2ed991069f1 files/digest-ifplugd-0.28-r5 238
-SHA256 b94ae260a7fcdbd983c2809b8df46f528f65e42a61fa3402316fb67bb17939e5 files/digest-ifplugd-0.28-r5 238
-MD5 83ebee09d9faecc03912ee8631d7f372 files/digest-ifplugd-0.28-r6 238
-RMD160 f0dc5bf3ea7253ad7658562a12c7d2ed991069f1 files/digest-ifplugd-0.28-r6 238
-SHA256 b94ae260a7fcdbd983c2809b8df46f528f65e42a61fa3402316fb67bb17939e5 files/digest-ifplugd-0.28-r6 238
+AUX ifplugd-0.28-interface.patch 314 RMD160 279d2241107413a3d818f7ec3658898a41300dae SHA1 5e139adab498de8b4e775f2a16673ee2a7717826 SHA256 1bdbe17f26f467be2a5f300f20f2f8aa332ffa48cbe50bfc4bbff37de8f1bc67
 MD5 54eb22844b5aeed161c0b80aa9008570 files/ifplugd-0.28-interface.patch 314
 RMD160 279d2241107413a3d818f7ec3658898a41300dae files/ifplugd-0.28-interface.patch 314
 SHA256 1bdbe17f26f467be2a5f300f20f2f8aa332ffa48cbe50bfc4bbff37de8f1bc67 files/ifplugd-0.28-interface.patch 314
+AUX ifplugd-0.28-nlapi.diff 639 RMD160 2fbf6329fb16118de0f1122aa41bca6a2906d0f3 SHA1 396bef6f2b478b3244fe68689b7246b422142d23 SHA256 f648c027fb446d0b25cc5dbca9db57dc33f5b8bff8dfbf1009847504f2229dfb
 MD5 d16fbcdc0a1c6f5be1aa3bf0c3a932f6 files/ifplugd-0.28-nlapi.diff 639
 RMD160 2fbf6329fb16118de0f1122aa41bca6a2906d0f3 files/ifplugd-0.28-nlapi.diff 639
 SHA256 f648c027fb446d0b25cc5dbca9db57dc33f5b8bff8dfbf1009847504f2229dfb files/ifplugd-0.28-nlapi.diff 639
+AUX ifplugd.action 891 RMD160 1ee45a699b2402598cc4c6a18a3d294c4914a105 SHA1 e59bf81beb02b4ebf9c1d6538e00c473e3b78bf2 SHA256 55c88d2c773bc242e81f9fe310cd48999e69543fa8e0b2389c054e8890260015
 MD5 e6174a8e4c2c6b451d78267453379a51 files/ifplugd.action 891
 RMD160 1ee45a699b2402598cc4c6a18a3d294c4914a105 files/ifplugd.action 891
 SHA256 55c88d2c773bc242e81f9fe310cd48999e69543fa8e0b2389c054e8890260015 files/ifplugd.action 891
+AUX ifplugd.conf 2255 RMD160 7cac216a7c37a041426668b5ccfe827ff702e976 SHA1 ef32d9e2f69220b9236520e3fc534614e539b78b SHA256 d318c611efa481ab845112c12af0242093219633a980b722c14d06c1eabe5875
 MD5 aaff46e0cdc7f78ba616e8093700cadf files/ifplugd.conf 2255
 RMD160 7cac216a7c37a041426668b5ccfe827ff702e976 files/ifplugd.conf 2255
 SHA256 d318c611efa481ab845112c12af0242093219633a980b722c14d06c1eabe5875 files/ifplugd.conf 2255
+AUX ifplugd.init 4237 RMD160 079baef3c50c287122e19b64ee697813770508e4 SHA1 9cda4fe53e969b924d24f0440e77fac32571e662 SHA256 854926883a73744574463a98b1b11234efb4c9d1e73ba0e3466f00ff9e970554
 MD5 518fd2b1b26794a727e1da6243866c11 files/ifplugd.init 4237
 RMD160 079baef3c50c287122e19b64ee697813770508e4 files/ifplugd.init 4237
 SHA256 854926883a73744574463a98b1b11234efb4c9d1e73ba0e3466f00ff9e970554 files/ifplugd.init 4237
+DIST ifplugd-0.28.tar.gz 142677 RMD160 09914a1914a4432822bb660d6aef194debe688f1 SHA1 0f00e6b544c0b7ed6c66fc58cb74f038d3fba77a SHA256 474754ac4ab32d738cbf2a4a3e87ee0a2c71b9048a38bdcd7df1e4f9fd6541f0
+EBUILD ifplugd-0.28-r5.ebuild 1326 RMD160 0a7c2d51b6629611717c1d285b1b61ef7d7598af SHA1 c952cb38fe4ab7685e194d64ea641d1e276565e4 SHA256 dd959b2b28da61ee19f613c60ee4ee2a14d18ddaeb2d8c417b84cc4365f6efd9
 MD5 db8e3e67f45bdd5d06bcdba1387708aa ifplugd-0.28-r5.ebuild 1326
 RMD160 0a7c2d51b6629611717c1d285b1b61ef7d7598af ifplugd-0.28-r5.ebuild 1326
 SHA256 dd959b2b28da61ee19f613c60ee4ee2a14d18ddaeb2d8c417b84cc4365f6efd9 ifplugd-0.28-r5.ebuild 1326
+EBUILD ifplugd-0.28-r6.ebuild 1372 RMD160 02f83cf0c1080c4f964cdf271bb34d9c243498b8 SHA1 ef62a469e5682047c656977e63c9121333d0b2ec SHA256 ec80d400d124bd23b46378fc3e8231d2dc4f001aa2c91b79f2fe0df7df452bd1
 MD5 ccb5c08de2ab301ac6212f25a70b37cc ifplugd-0.28-r6.ebuild 1372
 RMD160 02f83cf0c1080c4f964cdf271bb34d9c243498b8 ifplugd-0.28-r6.ebuild 1372
 SHA256 ec80d400d124bd23b46378fc3e8231d2dc4f001aa2c91b79f2fe0df7df452bd1 ifplugd-0.28-r6.ebuild 1372
+EBUILD ifplugd-0.28-r7.ebuild 1886 RMD160 bcf528834cf827700edca844bb7f1742ff40cc3d SHA1 437c8d30b400ab03a514307b5baa19357fef5ce1 SHA256 2e1e446742cab71b9f0d95fbb4c85938bbb9dffe0c0a831ac96e6a06919b3494
+MD5 1949c4e23386769f524f55143ae34a8a ifplugd-0.28-r7.ebuild 1886
+RMD160 bcf528834cf827700edca844bb7f1742ff40cc3d ifplugd-0.28-r7.ebuild 1886
+SHA256 2e1e446742cab71b9f0d95fbb4c85938bbb9dffe0c0a831ac96e6a06919b3494 ifplugd-0.28-r7.ebuild 1886
+MISC ChangeLog 6947 RMD160 09d3deb21a6c632ea33ee8eb4b5af4f62cb68c1b SHA1 15a45a918f07fdaccf2635993cb2653a079e845c SHA256 d8e8b0130fe960f0851885f337d1fb6ec0e2007e44a238d1050addf768daac53
+MD5 9c0985f4e320992a635baee80908340b ChangeLog 6947
+RMD160 09d3deb21a6c632ea33ee8eb4b5af4f62cb68c1b ChangeLog 6947
+SHA256 d8e8b0130fe960f0851885f337d1fb6ec0e2007e44a238d1050addf768daac53 ChangeLog 6947
+MISC metadata.xml 359 RMD160 a6e7020e754414ebf691db22495b6adf36c080dc SHA1 bfd0c8a6a1dda10ea8b4b0feba1ba91cdf0bfc5a SHA256 c2255a7d82e88d539b6acdb44db885d353f8943602c36acbe256910d776ec955
 MD5 d13433a9981e2386ff10934a71b003a6 metadata.xml 359
 RMD160 a6e7020e754414ebf691db22495b6adf36c080dc metadata.xml 359
 SHA256 c2255a7d82e88d539b6acdb44db885d353f8943602c36acbe256910d776ec955 metadata.xml 359
+MD5 83ebee09d9faecc03912ee8631d7f372 files/digest-ifplugd-0.28-r5 238
+RMD160 f0dc5bf3ea7253ad7658562a12c7d2ed991069f1 files/digest-ifplugd-0.28-r5 238
+SHA256 b94ae260a7fcdbd983c2809b8df46f528f65e42a61fa3402316fb67bb17939e5 files/digest-ifplugd-0.28-r5 238
+MD5 83ebee09d9faecc03912ee8631d7f372 files/digest-ifplugd-0.28-r6 238
+RMD160 f0dc5bf3ea7253ad7658562a12c7d2ed991069f1 files/digest-ifplugd-0.28-r6 238
+SHA256 b94ae260a7fcdbd983c2809b8df46f528f65e42a61fa3402316fb67bb17939e5 files/digest-ifplugd-0.28-r6 238
+MD5 83ebee09d9faecc03912ee8631d7f372 files/digest-ifplugd-0.28-r7 238
+RMD160 f0dc5bf3ea7253ad7658562a12c7d2ed991069f1 files/digest-ifplugd-0.28-r7 238
+SHA256 b94ae260a7fcdbd983c2809b8df46f528f65e42a61fa3402316fb67bb17939e5 files/digest-ifplugd-0.28-r7 238
diff --git a/sys-apps/ifplugd/files/digest-ifplugd-0.28-r7 b/sys-apps/ifplugd/files/digest-ifplugd-0.28-r7
new file mode 100644
index 000000000000..d58875572dca
--- /dev/null
+++ b/sys-apps/ifplugd/files/digest-ifplugd-0.28-r7
@@ -0,0 +1,3 @@
+MD5 df6f4bab52f46ffd6eb1f5912d4ccee3 ifplugd-0.28.tar.gz 142677
+RMD160 09914a1914a4432822bb660d6aef194debe688f1 ifplugd-0.28.tar.gz 142677
+SHA256 474754ac4ab32d738cbf2a4a3e87ee0a2c71b9048a38bdcd7df1e4f9fd6541f0 ifplugd-0.28.tar.gz 142677
diff --git a/sys-apps/ifplugd/ifplugd-0.28-r7.ebuild b/sys-apps/ifplugd/ifplugd-0.28-r7.ebuild
new file mode 100644
index 000000000000..8492391aed8a
--- /dev/null
+++ b/sys-apps/ifplugd/ifplugd-0.28-r7.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifplugd/ifplugd-0.28-r7.ebuild,v 1.1 2006/08/16 10:15:42 uberlord Exp $
+
+inherit eutils
+
+DESCRIPTION="Brings up/down ethernet ports automatically with cable detection"
+HOMEPAGE="http://0pointer.de/lennart/projects/ifplugd/"
+SRC_URI="http://0pointer.de/lennart/projects/ifplugd/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc"
+
+DEPEND="dev-util/pkgconfig
+	doc? ( www-client/lynx )
+	>=dev-libs/libdaemon-0.5"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-nlapi.diff"
+	epatch "${FILESDIR}/${P}-interface.patch"
+}
+
+src_compile() {
+	econf $(use_enable doc lynx) \
+		--with-initdir=/etc/init.d \
+		--disable-xmltoman \
+		--disable-subversion \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	# Remove init.d configuration as we no longer use it
+	rm -rf "${D}/etc/ifplugd" "${D}/etc/init.d/${PN}"
+
+	dodir "/etc/${PN}"
+	exeinto "/etc/${PN}"
+	newexe "${FILESDIR}/${PN}.action" "${PN}.action" || die
+
+	cd "${S}/doc"
+	dodoc README SUPPORTED_DRIVERS
+	use doc && dohtml *.{html,css}
+}
+
+pkg_postinst() {
+	# Warn about old init script
+	einfo "baselayout now starts ifplugd automatically on wired interfaces"
+	einfo "If you do not want this behaviour then add !plug to your modules"
+	einfo "in /etc/conf.d/net like so"
+	einfo "   modules=( \"!plug\" )"
+
+	if [[ -e "${ROOT}/etc/init.d/ifplugd" \
+		|| -e "${ROOT}/etc/conf.d/ifplugd" ]] ; then
+		echo
+		ewarn "You should stop the ifplugd service now and remove its init"
+		ewarn "script and config file"
+		if [[ ${ROOT} == "/" ]] ; then
+			ewarn "   /etc/init.d/ifplugd stop"
+			ewarn "   rc-update del ifplugd"
+			ewarn "   rm -f /etc/{conf,init}.d/ifplugd"
+		fi
+	fi
+}