fix for 29694

5 files changed, 117 insertions, 11 deletions

diff --git a/sys-fs/lvm-user/ChangeLog b/sys-fs/lvm-user/ChangeLog
index 822cf9f56aa2..ecc0f071aa04 100644
--- a/sys-fs/lvm-user/ChangeLog
+++ b/sys-fs/lvm-user/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/lvm-user
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm-user/ChangeLog,v 1.1 2003/09/15 17:46:25 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm-user/ChangeLog,v 1.2 2003/11/01 04:34:02 pebenito Exp $
+
+*lvm-user-1.0.7-r1 (31 Oct 2003)
+
+  31 Oct 2003; Chris PeBenito <pebenito@gentoo.org> lvm-user-1.0.7-r1.ebuild,
+  files/lvm-user-1.0.7-statics.diff:
+  Add patch to create static vgchange and vgscan if not USE=static, to close
+  29694.
 
 *lvm-user-1.0.4 (15 Sep 2003)
 
diff --git a/sys-fs/lvm-user/Manifest b/sys-fs/lvm-user/Manifest
index c2509ff647c1..40a6ff5ceb91 100644
--- a/sys-fs/lvm-user/Manifest
+++ b/sys-fs/lvm-user/Manifest
@@ -1,15 +1,18 @@
-MD5 96ee7b27ad969df522a2a6821d01b343 lvm-user-1.0.6.ebuild 1458
-MD5 9061ead30165168aa45224b47d22078e lvm-user-1.0.3.ebuild 1178
-MD5 384b438cd16e810b2626c72ced18f77e lvm-user-1.0.1_rc4-r1.ebuild 1179
 MD5 dcdc51cb59c206fd16676a92d7715254 lvm-user-1.0.1_rc4.ebuild 1104
+MD5 3d217d48916d0f74f1db8ad735c7fc36 lvm-user-1.0.4.ebuild 1331
+MD5 96ee7b27ad969df522a2a6821d01b343 lvm-user-1.0.6.ebuild 1458
 MD5 909d7335fa32d3549293ac1d76565b50 lvm-user-1.0.5.ebuild 1281
+MD5 a90842dd0cdbc52eed38e0c2de773ce5 ChangeLog 3861
+MD5 9061ead30165168aa45224b47d22078e lvm-user-1.0.3.ebuild 1178
 MD5 bb079cdf1b933f6774d96c1bfa21ed37 lvm-user-1.0.7.ebuild 1296
-MD5 4f45e2a02a4b599a2c8b43cc56826d0e ChangeLog 3624
-MD5 3d217d48916d0f74f1db8ad735c7fc36 lvm-user-1.0.4.ebuild 1331
-MD5 2b10a1a6318a6f58c03b6186451b05dd files/digest-lvm-user-1.0.3 61
-MD5 d29fb5fcc112eaf89e0ca282a5d49f1e files/digest-lvm-user-1.0.4 61
-MD5 3c660d5d2ef7ab2759ad56ee6c33e634 files/digest-lvm-user-1.0.5 61
-MD5 f1353504d261cee034d82171452b8ab4 files/digest-lvm-user-1.0.6 61
+MD5 14a6ea760e7d35ef75a079a6131b9cd5 lvm-user-1.0.7-r1.ebuild 1672
+MD5 384b438cd16e810b2626c72ced18f77e lvm-user-1.0.1_rc4-r1.ebuild 1179
 MD5 b8c544acbd931e92ce7d68d1f54ef230 files/digest-lvm-user-1.0.7 61
-MD5 3b82c9404362b6f9edae1553e241edbe files/digest-lvm-user-1.0.1_rc4-r1 65
 MD5 3b82c9404362b6f9edae1553e241edbe files/digest-lvm-user-1.0.1_rc4 65
+MD5 f1353504d261cee034d82171452b8ab4 files/digest-lvm-user-1.0.6 61
+MD5 b8c544acbd931e92ce7d68d1f54ef230 files/digest-lvm-user-1.0.7-r1 61
+MD5 3b82c9404362b6f9edae1553e241edbe files/digest-lvm-user-1.0.1_rc4-r1 65
+MD5 7484cb0ecb2a997be4910a8612e951cf files/lvm-user-1.0.7-statics.diff 1040
+MD5 3c660d5d2ef7ab2759ad56ee6c33e634 files/digest-lvm-user-1.0.5 61
+MD5 d29fb5fcc112eaf89e0ca282a5d49f1e files/digest-lvm-user-1.0.4 61
+MD5 2b10a1a6318a6f58c03b6186451b05dd files/digest-lvm-user-1.0.3 61
diff --git a/sys-fs/lvm-user/files/digest-lvm-user-1.0.7-r1 b/sys-fs/lvm-user/files/digest-lvm-user-1.0.7-r1
new file mode 100644
index 000000000000..b22fd4463c8c
--- /dev/null
+++ b/sys-fs/lvm-user/files/digest-lvm-user-1.0.7-r1
@@ -0,0 +1 @@
+MD5 de56e9ab0384596b795702802f1c1e6a lvm_1.0.7.tar.gz 372838
diff --git a/sys-fs/lvm-user/files/lvm-user-1.0.7-statics.diff b/sys-fs/lvm-user/files/lvm-user-1.0.7-statics.diff
new file mode 100644
index 000000000000..1ec0e112f79b
--- /dev/null
+++ b/sys-fs/lvm-user/files/lvm-user-1.0.7-statics.diff
@@ -0,0 +1,25 @@
+diff -urN LVM.orig/1.0.7/tools/Makefile.in LVM/1.0.7/tools/Makefile.in
+--- LVM.orig/1.0.7/tools/Makefile.in	2003-02-06 09:05:29.000000000 -0600
++++ LVM/1.0.7/tools/Makefile.in	2003-10-25 17:33:23.151387547 -0500
+@@ -53,7 +53,7 @@
+ 
+ $(ALL_OBJECTS):	Makefile lib/liblvm.h lvm_user.h
+ 
+-all_this:	$(ALL_OBJECTS) $(ALL) $(ALL_SOURCES) $(ALL_HEADERS) $(OTHER_DEP) $(LIBS)
++all_this:	$(ALL_OBJECTS) $(ALL) $(ALL_SOURCES) $(ALL_HEADERS) $(OTHER_DEP) $(LIBS) vgscan.static vgchange.static
+ 		@echo ""
+ 		@echo "Done Tools parts"
+ 		@echo ""
+@@ -70,6 +70,12 @@
+ 
+ l:	list
+ 
++vgscan.static: vgscan.o
++	$(CC) vgscan.o $(LDFLAGS) $(LOADLIBES) $(LDLIBS) -static -o vgscan.static
++                                                                                                       
++vgchange.static: vgchange.o
++	$(CC) vgchange.o $(LDFLAGS) $(LOADLIBES) $(LDLIBS) -static -o vgchange.static
++
+ install-bin:	$(ALL_TARGETS) $(ALL_SCRIPTS)
+ 	@echo "*** Installing $(ALL_TARGETS) $(ALL_SCRIPTS) in $(DESTDIR)$(sbindir) ***"
+ 	@for f in $(ALL_TARGETS); \
diff --git a/sys-fs/lvm-user/lvm-user-1.0.7-r1.ebuild b/sys-fs/lvm-user/lvm-user-1.0.7-r1.ebuild
new file mode 100644
index 000000000000..67967fc11a4c
--- /dev/null
+++ b/sys-fs/lvm-user/lvm-user-1.0.7-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm-user/lvm-user-1.0.7-r1.ebuild,v 1.1 2003/11/01 04:34:02 pebenito Exp $
+
+IUSE="static"
+
+inherit flag-o-matic
+
+S=${WORKDIR}/LVM/${PV}
+DESCRIPTION="User-land utilities for LVM (Logical Volume Manager) software"
+SRC_URI="ftp://ftp.sistina.com/pub/LVM/1.0/lvm_${PV}.tar.gz"
+HOMEPAGE="http://www.sistina.com/products_lvm.htm"
+KEYWORDS="~x86 ~amd64 -ppc ~sparc ~hppa"
+
+DEPEND=">=sys-apps/sed-4.0 virtual/linux-sources"
+RDEPEND="${DEPEND}
+	!sys-apps/lvm2"
+
+LICENSE="GPL-2 | LGPL-2"
+SLOT="0"
+
+KS=/usr/src/linux
+
+pkg_setup() {
+	check_KV
+}
+
+src_compile() {
+	local myconf
+
+	# bug 598 -- -pipe used by default
+	filter-flags "-fomit-frame-pointer -pipe"
+
+	if use static; then
+		myconf="--enable-static_link"
+	else
+		# bug 29694 -- make static vgscan and vgchange for initrds
+		epatch ${FILESDIR}/lvm-user-1.0.7-statics.diff
+	fi
+
+	./configure --prefix=/ \
+		--mandir=/usr/share/man \
+		--with-kernel_dir="${KS}" ${myconf} || die "configure failed"
+
+	# Fix flags
+	sed -i -e "54,56d" -e "73d" make.tmpl
+
+	make || die "Make failed"
+}
+
+src_install() {
+
+	einstall sbindir=${D}/sbin libdir=${D}/lib
+
+	if use static; then
+		# already static, make symlinks
+		dosym vgscan /sbin/vgscan.static
+		dosym vgchange /sbin/vgchange.static
+	else
+		# install vgscan.static and vgchange.static
+		into /
+		dosbin ${S}/tools/{vgscan,vgchange}.static
+	fi
+
+	# no need for a static library in /lib
+	dodir /usr/lib
+	mv ${D}/lib/*.a ${D}/usr/lib
+
+	dodoc ABSTRACT CONTRIBUTORS COPYING* INSTALL LVM-HOWTO TODO CHANGELOG FAQ KNOWN_BUGS README WHATSNEW
+}