Restore --sbindir to work around broken @sbindir@ usage, bug 484752.

Package-Manager: portage-2.2.4/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

4 files changed, 251 insertions, 7 deletions

diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index f5674dd4a88a..17f66f83538d 100644
--- a/sys-fs/lvm2/ChangeLog
+++ b/sys-fs/lvm2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/lvm2
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.318 2013/09/14 20:49:13 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.319 2013/09/14 23:19:03 floppym Exp $
+
+*lvm2-2.02.100-r2 (14 Sep 2013)
+
+  14 Sep 2013; Mike Gilbert <floppym@gentoo.org> +lvm2-2.02.100-r2.ebuild,
+  lvm2-2.02.100-r1.ebuild:
+  Restore --sbindir to work around broken @sbindir@ usage, bug 484752.
 
 *lvm2-2.02.100-r1 (14 Sep 2013)
 
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 6bac3140b7ea..63f5faec6054 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -35,15 +35,16 @@ AUX lvm2-2.02.99-selinux-static.patch 4695 SHA256 62571ea45660dc518b36128d929927
 DIST LVM2.2.02.100.tgz 1324911 SHA256 450302f909a93a44710ed3ae70894d3774f2eab52ecb1e3e6cac16d0239bd3a0 SHA512 97cac59bae5627b29bd32d46e7fa96063874a6b17f20c2c7f3a82bb0a7c1d155da9dbd224c3201116544f866796ee2219a79e3478e62365b68c6a982eead0312 WHIRLPOOL 51a7a24184ea3db40da1cec238b6aae8a4db0f60779095eaaa4a44ea149504f34e6307b5fee5e7dc3aa94d834ab517b6607a3a25ff7a5c27434224447000df6f
 DIST LVM2.2.02.97.tgz 1193141 SHA256 edda82012e8a9e1f0b00ba5a331468d3e0201992be14c0dbea71bf564a51fc2b SHA512 c209054832f36d7b9cbf833c702410ac95c9de1e213b550c01c42f087fcae346d3c931c409184086bc1fcbcbc154c9a4f8b82b06291cefeb7ae22fe7a4c254a0 WHIRLPOOL d4dafde0ae1607cb231acbf07e8aecd579b9e9042e9356df1074a2683f5f2d1036a3483e1799cf7dd14e64f1f4c5506d3628979fd7128cea70ad45b653403dfa
 DIST LVM2.2.02.99.tgz 1317810 SHA256 493c9ad85bada036418671072355b2fc57fc30eb5a63fd14a7dfe8ed28dca040 SHA512 665c8be867b44a258e37e12f2202352dfe0d4b7a5018e041ef01ce53d59b88dd96195943f12bd6915ebadbc605340de138bb2268527fd830d35deb4d43ab561b WHIRLPOOL 13fbb82cada1b8c08c881070ce5400517e44b287402ff1e5637ba4b684b4af22a3c7197a0a004d4a43f3584ae257307bb3734e9f3152733368e39a1b7f8c9d89
-EBUILD lvm2-2.02.100-r1.ebuild 7602 SHA256 0dea511c7e791148975097bec1f346dc5280620a98447663cc0bbca353055e95 SHA512 b7c1c6f88917f62132e34fe5ab90fc10b18b83c69b7e0908d060b8681b8372743a82ab47ddf5851c965c6be167f5affad3d51c4633cb50800054698276980b36 WHIRLPOOL eda75c30f1df3491c1b97e6224de8eccf1b0ec107df21ae3f64e631ce03e7ef102350071bfe7bacfd4720c9c2ff665a27d6269e795156941ea21c01e6093ea19
+EBUILD lvm2-2.02.100-r1.ebuild 7634 SHA256 a869d076299bf024b2311c1ce9faae960c042ec4f2400cd2c7fa7752d44b3a36 SHA512 02593aa7fb667f353c682347db41667490e15ec9de8de3ca721b9765c01864ea85f7f8b67e19a9393c567847813a154610d51af5ace3f10b345643203b035de5 WHIRLPOOL e7e501ded5bfac8b0074b315e72307ff475a255f2ea13a9ec4f28eca0ec2c9f4d05b8ff1f057226d80d7f651585973924d2d37ce4f4f5b597bea25c20811a36b
+EBUILD lvm2-2.02.100-r2.ebuild 7634 SHA256 ae4869bd0940b8537b6861040c7f12223605ec5c0a8b361d5409fb400daa5355 SHA512 724399ed596faee7a3d9316e7626c97cf95c51bb7ac3e44847d02064f7aea203667acfdd676802b2b4dc45f46c93d73050f977045b628c8c5fcbd04fcea1303d WHIRLPOOL 8d124b373de5f25077db02156f01255e6b4d36668d63fcad0bf7c448854eecd50ea647a835195377d747b5d7fa5dcead4bb12c34b06b1ae25adfe45d88b78743
 EBUILD lvm2-2.02.97-r1.ebuild 9072 SHA256 616ff463fda707204c5e92c3a22651ec3e87168ead21b859f6ad0f00c2775960 SHA512 d395b0dc1a18846f76bc79f7fef2cbb649bbee179ea800d6b82398ff113d21c84d987107d14397986d2dc7f5127345cde7e1c588ddfcab339e016f3133dc6080 WHIRLPOOL f14c3e31b83d73b4e996e47c1db7e79e293881dfb1bc519383cfdaac35331ff4fb0a735d2c138433855b1795f084552126b340624191ba8aaf0069011eb6d823
 EBUILD lvm2-2.02.99-r2.ebuild 8217 SHA256 3b2b043cb028b55af42e88a5567267ac837f648e4c5f6327b2e97989eb86d444 SHA512 1f831d00e140b6ffe5ba64a48bfef8ec11ae66981451c9d64d50a6e60c04ba05a4bdfda38400a4d1501e7d4c150e745d0e3ed9512e0f4294fa79286237b66f5a WHIRLPOOL a92d6ad1769a239a65312065074730e9ccc7149b4d71dd19cbee5eafa334c703dad24a8a55e039f0ecfa6187d5cf1e69f3ffcd022485f5f7f2498da0d6e8c929
-MISC ChangeLog 61075 SHA256 6eb50df631d45fa079c1f6e4f390fdc3d271d5165c036613abc68c377aae980e SHA512 84f7c73c8f301e494896f8d67364aec6123a1ffddd9bc64305856a9fc3cd373994f8b344c462406f8c3ed72928ca44405986c3fe434ef5599738d04296e677f2 WHIRLPOOL f32222582dc0e70b6360cc81653b7d1dfaa5a31dce81ccaea8177d370cdc04a2dba3d5fcd569f0725b49ca0b32f548d269dec63a914fac17d64d16b2f8f25b46
+MISC ChangeLog 61282 SHA256 1e69407dd7ff09090d3491802fa83b6e4bf1fbb7153cf45efd3eea96a7b2975d SHA512 58fffea289fa5dfba2f3a8c15d1a9c2b66ca0c1c6a0c2b11a5745e728c02922110cc2536ce2d39fe61e46538d0a6ba1aafee83501fbc96d1ac1b9a8ed13c0d4e WHIRLPOOL 1dcad311fc97ef81c53a6883e53e6fe3f9066b156f14cb0069b0bab1768c0d313021b63799412c74c3200fe29746ed7241e9dd060717cc14a2e00011b419228c
 MISC metadata.xml 984 SHA256 8f554d97062552d62ce2d81c8e4536b3e97539a497dd8cddda3eeab24b4ef73a SHA512 9c0a10af6149817269590cd28e7dc7eb84539184d41123b12bfada3857f87d813199cfbecd7c8219ce1b6a70f4ee72cf7a911854fcdb1fbfd90e3146122bca7f WHIRLPOOL e98d441e34d6a8fe540c7526da3418417cfc10e31c52b42d7827b151f7e3e20f8b088ee49b3ebd67ec304143593a6319c8ea42094d62315e47f210b0e52fe149
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iF4EAREIAAYFAlI0y80ACgkQC77qH+pIQ6QSvgD9GzvczWdGqDkcmq/srzgMHgsN
-dEVv2+2EfCWofqf0u58A/1+EFonjC6dM3PpCZTE+O/VP5FgSwkjK3BRVpqZbQxZo
-=13lA
+iF4EAREIAAYFAlI07ukACgkQC77qH+pIQ6SVewD/XN5nWFuu7rcOyvYMYnxQHCeL
+U/dHJehiK67p4/keTesBAKQOx3PT/TIZ/6oJTAy94CHbYQDgGFWPUXzSOSnW4liP
+=V2v7
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/lvm2/lvm2-2.02.100-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.100-r1.ebuild
index 123c83a6d6c5..b83d09b62553 100644
--- a/sys-fs/lvm2/lvm2-2.02.100-r1.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.100-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.100-r1.ebuild,v 1.1 2013/09/14 20:49:13 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.100-r1.ebuild,v 1.2 2013/09/14 23:19:03 floppym Exp $
 
 EAPI=5
 inherit autotools eutils linux-info multilib systemd toolchain-funcs udev
@@ -154,6 +154,7 @@ src_configure() {
 		--enable-pkgconfig \
 		--with-confdir="${EPREFIX}"/etc \
 		--exec-prefix="${EPREFIX}" \
+		--sbindir="${EPREFIX}/sbin" \
 		--with-staticdir="${EPREFIX}"/sbin \
 		--libdir="${EPREFIX}/$(get_libdir)" \
 		--with-usrlibdir="${EPREFIX}/usr/$(get_libdir)" \
diff --git a/sys-fs/lvm2/lvm2-2.02.100-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.100-r2.ebuild
new file mode 100644
index 000000000000..dd2473cc24b6
--- /dev/null
+++ b/sys-fs/lvm2/lvm2-2.02.100-r2.ebuild
@@ -0,0 +1,236 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.100-r2.ebuild,v 1.1 2013/09/14 23:19:03 floppym Exp $
+
+EAPI=5
+inherit autotools eutils linux-info multilib systemd toolchain-funcs udev
+
+DESCRIPTION="User-land utilities for LVM2 (device-mapper) software."
+HOMEPAGE="http://sources.redhat.com/lvm2/"
+SRC_URI="ftp://sources.redhat.com/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
+	ftp://sources.redhat.com/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="readline static static-libs clvm cman +lvm1 lvm2create_initrd selinux +udev +thin"
+
+DEPEND_COMMON="clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* )
+	readline? ( sys-libs/readline )
+	udev? ( >=virtual/udev-200[static-libs?] )"
+# /run is now required for locking during early boot. /var cannot be assumed to
+# be available -- thus, pull in recent enough baselayout for /run.
+# This version of LVM is incompatible with cryptsetup <1.1.2.
+RDEPEND="${DEPEND_COMMON}
+	>=sys-apps/baselayout-2.2
+	!<sys-apps/openrc-0.11
+	!<sys-fs/cryptsetup-1.1.2
+	!!sys-fs/clvm
+	!!sys-fs/lvm-user
+	>=sys-apps/util-linux-2.16
+	lvm2create_initrd? ( sys-apps/makedev )
+	thin? ( >=sys-block/thin-provisioning-tools-0.2.1 )"
+DEPEND="${DEPEND_COMMON}
+	virtual/pkgconfig
+	>=sys-devel/binutils-2.20.1-r1
+	static? (
+		selinux? ( sys-libs/libselinux[static-libs] )
+		udev? ( virtual/udev[static-libs] )
+	)"
+
+S=${WORKDIR}/${PN/lvm/LVM}.${PV}
+
+pkg_setup() {
+	local CONFIG_CHECK="~SYSVIPC"
+
+	if use udev; then
+		local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+		fi
+	fi
+
+	check_extra_config
+
+	# 1. Genkernel no longer copies /sbin/lvm blindly.
+	if use static; then
+		elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with"
+		elog "their static versions. If you need the static binaries,"
+		elog "you must append .static to the filename!"
+	fi
+}
+
+src_prepare() {
+	# Gentoo specific modification(s):
+	epatch "${FILESDIR}"/${PN}-2.02.99-example.conf.in.patch
+	epatch "${FILESDIR}"/${PN}-2.02.100-respect_ar_and_cc.patch #444082
+	sed -i -e "s:@GENTOO_AR@:$(tc-getAR):" make.tmpl.in || die
+	sed -i -e '/FLAG/s:-O2::' configure{,.in} || die #480212
+
+	# For upstream -- review and forward:
+	epatch "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
+	epatch "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
+	epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
+	epatch "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
+	epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed
+	epatch "${FILESDIR}"/${PN}-2.02.92-dynamic-static-ldflags.patch #332905
+	epatch "${FILESDIR}"/${PN}-2.02.100-selinux_and_udev_static.patch #370217, #439414
+
+	# From upstream:
+	epatch "${FILESDIR}"/${P}-lvm_path.patch #479626
+	epatch "${FILESDIR}"/${P}-ignored_loop.patch
+	epatch "${FILESDIR}"/${P}-{vg_free,pvmove}_segfault.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	local buildmode
+
+	myconf="${myconf} --enable-dmeventd"
+	myconf="${myconf} --enable-cmdlib"
+	myconf="${myconf} --enable-applib"
+	myconf="${myconf} --enable-fsadm"
+	myconf="${myconf} --enable-lvmetad"
+
+	# Most of this package does weird stuff.
+	# The build options are tristate, and --without is NOT supported
+	# options: 'none', 'internal', 'shared'
+	if use static; then
+		buildmode="internal"
+		# This only causes the .static versions to become available
+		myconf="${myconf} --enable-static_link"
+	else
+		buildmode="shared"
+	fi
+
+	# dmeventd requires mirrors to be internal, and snapshot available
+	# so we cannot disable them
+	myconf="${myconf} --with-mirrors=internal"
+	myconf="${myconf} --with-snapshots=internal"
+	use thin \
+		&& myconf="${myconf} --with-thin=internal" \
+		|| myconf="${myconf} --with-thin=none"
+
+	if use lvm1; then
+		myconf="${myconf} --with-lvm1=${buildmode}"
+	else
+		myconf="${myconf} --with-lvm1=none"
+	fi
+
+	# disable O_DIRECT support on hppa, breaks pv detection (#99532)
+	use hppa && myconf="${myconf} --disable-o_direct"
+
+	if use clvm; then
+		myconf="${myconf} --with-cluster=${buildmode}"
+		# 4-state! Make sure we get it right, per bug 210879
+		# Valid options are: none, cman, gulm, all
+		#
+		# 2009/02:
+		# gulm is removed now, now dual-state:
+		# cman, none
+		# all still exists, but is not needed
+		#
+		# 2009/07:
+		# TODO: add corosync and re-enable ALL
+		local clvmd=""
+		use cman && clvmd="cman"
+		#clvmd="${clvmd/cmangulm/all}"
+		[ -z "${clvmd}" ] && clvmd="none"
+		myconf="${myconf} --with-clvmd=${clvmd}"
+		myconf="${myconf} --with-pool=${buildmode}"
+	else
+		myconf="${myconf} --with-clvmd=none --with-cluster=none"
+	fi
+
+	econf \
+		$(use_enable readline) \
+		$(use_enable selinux) \
+		--enable-pkgconfig \
+		--with-confdir="${EPREFIX}"/etc \
+		--exec-prefix="${EPREFIX}" \
+		--sbindir="${EPREFIX}/sbin" \
+		--with-staticdir="${EPREFIX}"/sbin \
+		--libdir="${EPREFIX}/$(get_libdir)" \
+		--with-usrlibdir="${EPREFIX}/usr/$(get_libdir)" \
+		--with-default-dm-run-dir=/run \
+		--with-default-run-dir=/run/lvm \
+		--with-default-locking-dir=/run/lock/lvm \
+		--with-default-pid-dir=/run \
+		$(use_enable udev udev_rules) \
+		$(use_enable udev udev_sync) \
+		$(use_with udev udevdir "$(get_udevdir)"/rules.d) \
+		"$(systemd_with_unitdir)" \
+		${myconf} \
+		CLDFLAGS="${LDFLAGS}"
+}
+
+src_compile() {
+	pushd include >/dev/null
+	emake
+	popd >/dev/null
+
+	emake
+	emake CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat
+}
+
+src_install() {
+	local inst
+	for inst in install install_systemd_units install_systemd_generators install_tmpfiles_configuration; do
+		emake DESTDIR="${D}" ${inst}
+	done
+
+	newinitd "${FILESDIR}"/lvm.rc-2.02.95-r2 lvm
+	newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm
+
+	newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.67-r2 lvm-monitoring
+
+	newinitd "${FILESDIR}"/device-mapper.rc-2.02.95-r2 device-mapper
+	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper
+
+	newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd
+
+	if use clvm; then
+		newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd
+		newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd
+	fi
+
+	if use static-libs; then
+		dolib.a libdm/ioctl/libdevmapper.a
+		dolib.a libdaemon/client/libdaemonclient.a #462908
+		#gen_usr_ldscript libdevmapper.so
+		dolib.a daemons/dmeventd/libdevmapper-event.a
+		#gen_usr_ldscript libdevmapper-event.so
+	else
+		rm -f "${ED}"usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
+	fi
+
+	if use lvm2create_initrd; then
+		dosbin scripts/lvm2create_initrd/lvm2create_initrd
+		doman scripts/lvm2create_initrd/lvm2create_initrd.8
+		newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd
+	fi
+
+	insinto /etc
+	doins "${FILESDIR}"/dmtab
+
+	dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf
+}
+
+pkg_postinst() {
+	ewarn "Make sure the \"lvm\" init script is in the runlevels:"
+	ewarn "# rc-update add lvm boot"
+	ewarn
+	ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want"
+	ewarn "to enable lvm autoactivation and metadata caching."
+}
+
+src_test() {
+	einfo "Tests are disabled because of device-node mucking, if you want to"
+	einfo "run tests, compile the package and see ${S}/tests"
+}