Version bump, mostly fixes rule-generator

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

3 files changed, 239 insertions, 5 deletions

diff --git a/sys-fs/eudev/ChangeLog b/sys-fs/eudev/ChangeLog
index 0864b89dc4e5..b253b90df1e7 100644
--- a/sys-fs/eudev/ChangeLog
+++ b/sys-fs/eudev/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/eudev
 # Copyright 1999- Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.43 2013/07/04 15:30:02 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.44 2013/07/11 17:57:24 blueness Exp $
+
+*eudev-1.1 (11 Jul 2013)
+
+  11 Jul 2013; Anthony G. Basile <blueness@gentoo.org> +eudev-1.1.ebuild:
+  Version bump, mostly fixes rule-generator
 
   04 Jul 2013; Ian Stakenvicius <axs@gentoo.org> files/udev-postmount:
   udev-postmount: ensure /etc/udev/rules.d exists if missing, when possible
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index 64560c129a70..09a2f14a4cc2 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -7,18 +7,30 @@ AUX eudev-fix-typo-util.c.patch 889 SHA256 9c9811d8a71939a69ce94e9cff2989326458c
 AUX eudev-hwdb-offset-root.patch 8128 SHA256 c8ae85b2bc69e360b96d9b47fb55b3cec5c44d3ed9cb0ed20f70d05ac2e2d230 SHA512 596cf5f936a1a9ae25ea77ebe2a414271998e2d6931bada6d0548efbdbfde73dba21717157508e5bd89925b868f3bee41492ea149c8ea8a339b3319010798f99 WHIRLPOOL 420c422ce99818f2c321d920fcacf8a37980dc7f540bacc57d87bf426c18dc5d650ef5e70cac3ae3a33cfc4b6632307d97ceb219c9f4518b2ab7a473273881cc
 AUX udev-postmount 1207 SHA256 0220e949b1f31832a205021c0a8615e77b27b73b7c9b16ef4a61bbd2774aeecb SHA512 a69338328fee67617cddab8375d5008bbed41e82c67610cb9df168ffd95bfa016e3b63544b380afa0b98bb1731e4d76960efbdec5c79bb5e844ca10d6c334e2f WHIRLPOOL c1f027a7200a435d163c7ac66a0afc0b004c97ee9c1ecc8406f981b05e6ef95221d0df51d3abc46e494d3a35a07831cbab8d393b3a7d05b5f0aec70e88d894a2
 DIST eudev-1.0.tar.gz 1676858 SHA256 bb15dd5d74e63b7351c42609b1c2f1518cd2b7660abc326c22f330d0e9ae61de SHA512 7a09cf41be7b3eebfe09c190309e661eb851b4f13964e2d02eb78ebf0c62b6f6a3a53368d329568826dbd12cdb2378b926c3b68767dae0d715cfe270d1967a6a WHIRLPOOL c127f3e7965d29ad81bd0ec593ea953dc5f638ef6b28767be031c039321034cfb6e4f54af9586849e26a6c556fcc3037133ed003eedff93dbbcec10816568a6d
+DIST eudev-1.1.tar.gz 1706277 SHA256 462659ef77802f244f55cee58fcd6b2a0cf6c24716f64fbb0c6d88a580f398a8 SHA512 e7b54eaa49e21b350341c39848712458d85cd2d3a69233e11fa7e57e93cb7db2382d1138ebd9eebf971650af85b2aebeff2b71a8396c78c444b6759523e69730 WHIRLPOOL 57782df80ef923f9507e0edf31ead8528c764e0b653f69b9ed4c42925e88d5d26a7953d21083dece84e0bcd5521b6ef81e3ffb97215de934c9b631f8dc5ecb52
 DIST eudev-1_beta2.tar.gz 1671231 SHA256 359ed1a6d8e48599c1337f54a5c796fe3195f210f89ff22b352f622afe112fd6 SHA512 7a63d411221f4e267de95f500d1f4c69017abd26af212dbaf0af770346ad3942bd1af125a525fe1a57185f085710495369dd1495ee2df714f7dbbdca12fa4717 WHIRLPOOL a43777891fe303d68ba59f221c1698e450ab346392a157e82f750e0a7698c35a31801d4f0876b546b4c486b548eb10394e0c5a517af28762edaf2df09745aa32
 DIST eudev-1_beta4.tar.gz 1765936 SHA256 d2b9906e1cdcaec02220e51d83420cd7ab6b831c14139d93c66a28144e4096ce SHA512 964d1a8de2dfde5ca14a736db8266483e0a589e63607b5028de4415f291d19dc5aeed9cf8ed4954fccd72c76043d2de62488e47a4ac8e5948f00e5dffffb88fb WHIRLPOOL 4534e8e001e46d985dcc36b158abc2f17c9fd00bba1e2de20a619857b33479225de98091d6693832ecaf0ec8fff2b2ceba866574c370ca38bf4ad1f1d322fc36
 EBUILD eudev-1.0.ebuild 5998 SHA256 82cfc0141d2f8e74ae667489a6a5a30aaa89f44f42b795fffec41aeaf6271955 SHA512 f50a5b5fdb9ce7ac0cbd2b73cc3e6db84960d3461d91768e3be057780637ede617541082b4caf532d51a80bc34b494db5121d5b411105c0f4ac2301c40e5fde5 WHIRLPOOL 45eea80754dd9b7e9a6e953354c3d22bfa262e4689bc7074fafaf805346a5da920df5c47ab4acf06f7cb267bc30a1dd4b0ec8649b20da2c1fc58b86405280cda
+EBUILD eudev-1.1.ebuild 5998 SHA256 57d30bc1135b00129881a7f1f0cd05a5ecd9d5f4d3a804b1183ed4811362a416 SHA512 7abc13c3a223ecba08ddca646b383e9df6a45be79ceb59ea4ad54c2acb04315ce1a9098258bdf15306dc57d908a7d037900ddd667fcf598ad09bf08168b7a910 WHIRLPOOL 5c53df92e6f7cd14c4bd5d6eebd617b4d6e189c52ead5f0c8870c8dd3124ba899ae3c281e8cf996302773e5b228ed79b867a97bcdfaaa5f3fdc724e32d1b8e8f
 EBUILD eudev-1_beta2-r2.ebuild 6278 SHA256 234f41e47d70b0704c83b8ec75bcd43ed6f4134d210f5b4527a83f6d91fd5c87 SHA512 25591cc1a930d05fc4d9aafa47a3f8da54d2d8ca426af67fa18c7d3a472d9bef8c3338fbd7bed0663e05a27c50fb9fd5ca65eea77a8ceab1f756ab8cfc86036e WHIRLPOOL fb4e9aa8594add38620ca1448943b2172486ee320fa1979ef605cc9c3d67ae7ae378a1878e5a415b754279502d964c4ca672d14bec37c406e6eb52d3eb94b793
 EBUILD eudev-1_beta4-r1.ebuild 7409 SHA256 ddd50a5f20867f1f4ecbab622017f5842e627bd298fb48b72ffd51c8fe704c91 SHA512 9d549d97607572dfab79009ceb4cf947090b7cc24b1092f1e7559e23553b32d242d4c2da0096bf4d33d00bfaed6351de45e9aad314215f6567926b5f3dd9e96b WHIRLPOOL 37f7b22102eb9e6d0421edd86c556e8e06b2d68f7c3960b9c480523a944f7f8129005dd903acfed9657057b8d556b5b7c97da1d351b1f71fa78c5caa335faa86
 EBUILD eudev-9999.ebuild 6000 SHA256 43f8380b2572697fb86b00bbf335a4d63954de48058c8f6e3799a65196044e8a SHA512 cd3e5906df98ec8f3f47a35609e704d76bb26ead8a7af69973ad2285f8cdaa24564f8a79e2a09ce1bbbd4bb5a6c955e6f413a74107d21db015597246d46c23db WHIRLPOOL e112d6fa979dd6ff604fe3501a2157cb616c5ad1734c02b1e1162af76bb4d3e84bdcc862eb7faa0b973e4259ca921ffc0c0df554f1ca81a3c23cc10856b60398
-MISC ChangeLog 7203 SHA256 04e7fa6c3db10bf5e2be721a0994c24f4be78d6fb0121418034b05b9087e5cc2 SHA512 3d66d8700d3e662efbc93c7904ae62e3da897882251815cbd1dacab7af87af6620d786a46c68ea3b965645d30e514f06307a66133062aa2a4e50babc68d134f8 WHIRLPOOL 49bbbb94e623ef07ae922c806a667909fe14d31073e8d30bbf4a0090a272013feb003847b97953bbf4f93b232ca731a54ab864e660cd5d4c64886e9eead16b95
+MISC ChangeLog 7353 SHA256 76f245a4b23d4eeb53886ae257013fa2c416d4377ccc0471e7e1ff096f581d8b SHA512 09fdde4b8a18d2e550dbc6509efd0ab345e3689893c2135a8b83d0cfd946271eebd49011309246f2036381ee5f703631a0ffc2a7f6644595f4d8ed06e9a3b7d1 WHIRLPOOL dc12091fe24a12515d8a72aba7fedd53b5158aecdc21a872a6cf6924ea9c7f69facc4b029a3e7c1cddb8a843495aeb29d6764f8ade715207469bf5a2c478bef5
 MISC metadata.xml 1060 SHA256 7bb47974b960522b6d6ca66bb95b839e39e094b46ef9ecfcb0892e85ac29eadf SHA512 212b2ca66460121e885c3e77193707370df7ab48bba40a7e8efe22743dc7e6beca0001c455eb8c1951a1eaeb94c5869ecf3955061de9b6118498475201e84659 WHIRLPOOL 23cea982b20968ba862db60a96ad5cf1e20cc33ffe2efd4739f431dd5b9ec991a3b1f2322d5499b5fee2dfd8f93e5cc56d4bd4da0f602fb699fd7f1b97253165
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlHVlYsACgkQ2ugaI38ACPDQUwD/YFXHw3fENVW12gn1xWp0Boba
-oEySsCmkvwH0i6XgljwA/0sFZBsy9GvJO0NagADU/XoNc+8NWpaTASsWj/DLr+bN
-=zqlR
+iQIcBAEBCAAGBQJR3vKGAAoJEJOE+m71LUu6SzQP/jDtzK1RGnE7WznvnTNZwBuW
+3IYoAR/SUeJYD8tlT2aFMc85+wkkbc2DYXRvPJIiZ++DVrZqBM0jwzaNiUMscpaX
+Qf5/8DsNXgvjxYOt6SBOePYyOrnvUUenkRTAFsUqs3h0g6rXuOIakFYplGZGLuAx
+7UfMl9qtIm+pEisdsXjAEr6F2o+Ce9cVzxG7n6cIZMpKJ++WTS0jYc3ZeprZDTpr
+JUpo6v4h3IvkIK2moJO7Ts0RcaVlFNRPKLEbQsSlDSSD6nzEWO9ZvwPluOa49/3s
+quVpfdN7r9UfvISyWoXQbRqIP/XFwh0zUMzuyw5IUK8eHBuCnykdC4C9hwDpA0df
+s6XWdDPnVJMLbkySSKn2jZ3YSMokWAthnNzPJ0+LMIYsknoxumn80VwPjM7JgLfL
+QDDibbD37K8mCMYEaNZr8eI/RC3bH61stcEp9Sgl5bqYsZLA5ZQNk5l9w8xZi+YH
+3RV6YdgNK3fJ/DGoF9uQpZSNjDfrTDhof1TvYvyI5Vx5XgMuO6JLihuaVVnBhY6M
+9hMe8+OT+Bl1jbT6mNpmkP/o7ED5+kzYWuwJgg+ndkcB5XQvJ2WsBQxvcHsKUWIi
+aAnja2z9Vstwbdp6Q2+x6urj1EyAuIjMMiojqcWX39S+j00TGjZ840ekDXLUgt+2
+EH3hpL1y45eFuVgPMheT
+=sBqP
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/eudev/eudev-1.1.ebuild b/sys-fs/eudev/eudev-1.1.ebuild
new file mode 100644
index 000000000000..c9acf0e93c0f
--- /dev/null
+++ b/sys-fs/eudev/eudev-1.1.ebuild
@@ -0,0 +1,217 @@
+# Copyright 1999- Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-1.1.ebuild,v 1.1 2013/07/11 17:57:24 blueness Exp $
+
+EAPI="5"
+
+KV_min=2.6.31
+
+inherit autotools eutils linux-info
+
+if [[ ${PV} = 9999* ]]
+then
+	EGIT_REPO_URI="git://github.com/gentoo/eudev.git"
+	inherit git-2
+else
+	SRC_URI="http://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
+HOMEPAGE="https://github.com/gentoo/eudev"
+
+LICENSE="LGPL-2.1 MIT GPL-2"
+SLOT="0"
+IUSE="doc gudev hwdb kmod introspection keymap +modutils +openrc +rule-generator selinux static-libs"
+
+RESTRICT="test"
+
+COMMON_DEPEND="gudev? ( dev-libs/glib:2 )
+	kmod? ( sys-apps/kmod )
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
+	selinux? ( sys-libs/libselinux )
+	>=sys-apps/util-linux-2.20
+	!<sys-libs/glibc-2.11"
+
+DEPEND="${COMMON_DEPEND}
+	keymap? ( dev-util/gperf )
+	>=dev-util/intltool-0.40.0
+	virtual/pkgconfig
+	virtual/os-headers
+	!<sys-kernel/linux-headers-${KV_min}
+	doc? ( dev-util/gtk-doc )
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt"
+
+RDEPEND="${COMMON_DEPEND}
+	hwdb? ( >=sys-apps/hwids-20121202.2[udev] )
+	!sys-fs/udev
+	!sys-apps/coldplug
+	!sys-apps/systemd
+	!<sys-fs/lvm2-2.02.97
+	!sys-fs/device-mapper
+	!<sys-fs/udev-init-scripts-18"
+
+PDEPEND=">=virtual/udev-180
+	openrc? ( >=sys-fs/udev-init-scripts-18 )"
+
+pkg_pretend()
+{
+	if ! use rule-generator; then
+		ewarn
+		ewarn "As of 2013-01-29, ${P} provides the new interface renaming functionality,"
+		ewarn "as described in the URL below:"
+		ewarn "http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
+		ewarn
+		ewarn "This functionality is enabled BY DEFAULT because eudev has no means of synchronizing"
+		ewarn "between the default or user-modified choice of sys-fs/udev.  If you wish to disable"
+		ewarn "this new iface naming, please be sure that /etc/udev/rules.d/80-net-name-slot.rules"
+		ewarn "exists:"
+		ewarn "\ttouch /etc/udev/rules.d/80-net-name-slot.rules"
+		ewarn
+		ewarn "We are working on a better solution for the next beta release."
+		ewarn
+	fi
+}
+
+pkg_setup()
+{
+	linux-info_pkg_setup
+	get_running_version
+
+	# These are required kernel options, but we don't error out on them
+	# because you can build under one kernel and run under another.
+	CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~SIGNALFD ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2"
+
+	if kernel_is lt ${KV_min//./ }; then
+		ewarn
+		ewarn "Your current running kernel version ${KV_FULL} is too old to run ${P}."
+		ewarn "Make sure to run udev under kernel version ${KV_min} or above."
+		ewarn
+	fi
+}
+
+src_prepare()
+{
+	# change rules back to group uucp instead of dialout for now
+	sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \
+	|| die "failed to change group dialout to uucp"
+
+	epatch_user
+
+	if [[ ! -e configure ]]
+	then
+		if use doc
+		then
+			gtkdocize --docdir docs || die "gtkdocize failed"
+		else
+			echo 'EXTRA_DIST =' > docs/gtk-doc.make
+		fi
+		eautoreconf
+	else
+		elibtoolize
+	fi
+}
+
+src_configure()
+{
+	local econf_args
+
+	econf_args=(
+		ac_cv_search_cap_init=
+		ac_cv_header_sys_capability_h=yes
+		DBUS_CFLAGS=' '
+		DBUS_LIBS=' '
+		--with-rootprefix=
+		--docdir=/usr/share/doc/${PF}
+		--libdir=/usr/$(get_libdir)
+		--with-firmware-path="${EPREFIX}usr/lib/firmware/updates:${EPREFIX}usr/lib/firmware:${EPREFIX}lib/firmware/updates:${EPREFIX}lib/firmware"
+		--with-html-dir="/usr/share/doc/${PF}/html"
+		--with-rootlibdir=/$(get_libdir)
+		--enable-split-usr
+		--exec-prefix=/
+		$(use_enable doc gtk-doc)
+		$(use_enable gudev)
+		$(use_enable introspection)
+		$(use_enable keymap)
+		$(use_enable kmod libkmod)
+		$(use_enable modutils modules)
+		$(use_enable selinux)
+		$(use_enable static-libs static)
+		$(use_enable rule-generator)
+	)
+	econf "${econf_args[@]}"
+}
+
+src_install()
+{
+	emake DESTDIR="${D}" install
+
+	prune_libtool_files --all
+	rm -rf "${ED}"/usr/share/doc/${PF}/LICENSE.*
+
+	use rule-generator && use openrc && doinitd "${FILESDIR}"/udev-postmount
+
+	# drop distributed hwdb files, they override sys-apps/hwids
+	rm -f "${ED}"/etc/udev/hwdb.d/*.hwdb
+}
+
+pkg_preinst()
+{
+	local htmldir
+	for htmldir in gudev libudev; do
+		if [[ -d ${EROOT}usr/share/gtk-doc/html/${htmldir} ]]
+		then
+			rm -rf "${EROOT}"usr/share/gtk-doc/html/${htmldir}
+		fi
+		if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]]
+		then
+			dosym ../../doc/${PF}/html/${htmldir} \
+				/usr/share/gtk-doc/html/${htmldir}
+		fi
+	done
+}
+
+pkg_postinst()
+{
+	mkdir -p "${EROOT}"run
+
+	# "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
+	# So try to remove it here (will only work if empty).
+	rmdir "${EROOT}"dev/loop 2>/dev/null
+	if [[ -d ${EROOT}dev/loop ]]
+	then
+		ewarn "Please make sure you remove /dev/loop, else losetup"
+		ewarn "may be confused when looking for unused devices."
+	fi
+
+	# 64-device-mapper.rules now gets installed by sys-fs/device-mapper
+	# remove it if user don't has sys-fs/device-mapper installed, 27 Jun 2007
+	if [[ -f ${EROOT}etc/udev/rules.d/64-device-mapper.rules ]] &&
+		! has_version sys-fs/device-mapper
+	then
+		rm -f "${EROOT}"etc/udev/rules.d/64-device-mapper.rules
+		einfo "Removed unneeded file 64-device-mapper.rules"
+	fi
+
+	use hwdb && udevadm hwdb --update --root="${ROOT%/}"
+
+	ewarn
+	ewarn "You need to restart eudev as soon as possible to make the"
+	ewarn "upgrade go into effect:"
+	ewarn "\t/etc/init.d/udev --nodeps restart"
+
+	if use rule-generator && use openrc; then
+		ewarn
+		ewarn "Please add the udev-postmount init script to your default runlevel"
+		ewarn "to ensure the legacy rule-generator functionality works as reliably"
+		ewarn "as possible."
+		ewarn "\trc-update add udev-postmount default"
+	fi
+
+	elog
+	elog "For more information on eudev on Gentoo, writing udev rules, and"
+	elog "fixing known issues visit:"
+	elog "         http://www.gentoo.org/doc/en/udev-guide.xml"
+	elog
+}