fix popt linking thanks to David Li <matrixhax0r@gmail.com> in bug 147332

Package-Manager: portage-2.1.1

4 files changed, 52 insertions, 10 deletions

diff --git a/sys-fs/captive/ChangeLog b/sys-fs/captive/ChangeLog
index 8488e8557215..9e0b184c1131 100644
--- a/sys-fs/captive/ChangeLog
+++ b/sys-fs/captive/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/captive
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/captive/ChangeLog,v 1.17 2006/08/12 22:58:10 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/captive/ChangeLog,v 1.18 2006/09/12 20:11:06 genstef Exp $
+
+  12 Sep 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/captive-popt.diff, captive-1.1.7-r1.ebuild:
+  fix popt linking thanks to David Li <matrixhax0r@gmail.com> in bug 147332
 
   12 Aug 2006; Stefan Schweizer <genstef@gentoo.org>
   +files/captive-fuse-2.6.0_pre3.patch, captive-1.1.7-r1.ebuild:
diff --git a/sys-fs/captive/Manifest b/sys-fs/captive/Manifest
index 4d8939942ee2..a5cae40221ff 100644
--- a/sys-fs/captive/Manifest
+++ b/sys-fs/captive/Manifest
@@ -2,15 +2,19 @@ AUX captive-fuse-2.6.0_pre3.patch 357 RMD160 8eb16ac396d52eb2b880690238b473b0661
 MD5 9de1490a39143b9ae317e3f902583e22 files/captive-fuse-2.6.0_pre3.patch 357
 RMD160 8eb16ac396d52eb2b880690238b473b0661766ef files/captive-fuse-2.6.0_pre3.patch 357
 SHA256 ece98c449381689f3dbf1858290266623ccba46ff93800dcc4f145b20e2fb053 files/captive-fuse-2.6.0_pre3.patch 357
+AUX captive-popt.diff 2173 RMD160 b5185d4ac84d3bd61128690b3f77beb3017e6acc SHA1 db1e9b9d0bed21edeea0a77248c993e678e41598 SHA256 2f5c864e2123eb03483c46c3429f82d89e58ee568e0b682ec9960ee2e93d14e7
+MD5 fc026f46eda6c25aa89dc2cf27bbaf46 files/captive-popt.diff 2173
+RMD160 b5185d4ac84d3bd61128690b3f77beb3017e6acc files/captive-popt.diff 2173
+SHA256 2f5c864e2123eb03483c46c3429f82d89e58ee568e0b682ec9960ee2e93d14e7 files/captive-popt.diff 2173
 DIST captive-1.1.7.tar.gz 2896597 RMD160 cd1f7f8e0faf27374cfe25713bf9aebd8e3d27b7 SHA1 510afe3d9b5da69732b05a3195a2b0c654ab8c3b SHA256 5bbeb56bd42a928737ee8bf804ce2b3532607bff80b398c6e2ab1762f719ef25
-EBUILD captive-1.1.7-r1.ebuild 2483 RMD160 8741e831343a46b8e7295ffcfa1b82773bcd5547 SHA1 d735709e5d825d5199ecb1883a151f9d7fb92321 SHA256 871cdfa138b6b4daa97a8f452e06a4feda6a02b753290905c44d15927ed07b13
-MD5 ebab99125f76bff5d5d587b34badf016 captive-1.1.7-r1.ebuild 2483
-RMD160 8741e831343a46b8e7295ffcfa1b82773bcd5547 captive-1.1.7-r1.ebuild 2483
-SHA256 871cdfa138b6b4daa97a8f452e06a4feda6a02b753290905c44d15927ed07b13 captive-1.1.7-r1.ebuild 2483
-MISC ChangeLog 3938 RMD160 b3d1d605fde370b99c17717e3698251da4263f48 SHA1 0da05fe669ccba4382d5dfcb8d024897dfa8b306 SHA256 6be9cedc5bb7b4a1fb5deb3691c62e8beede13569e0d90582eed0adf84c3916b
-MD5 2513720307bac2e326e3ab088b0d7789 ChangeLog 3938
-RMD160 b3d1d605fde370b99c17717e3698251da4263f48 ChangeLog 3938
-SHA256 6be9cedc5bb7b4a1fb5deb3691c62e8beede13569e0d90582eed0adf84c3916b ChangeLog 3938
+EBUILD captive-1.1.7-r1.ebuild 2521 RMD160 3c887a1eacf8a212ced05d08f823d8a9b5db76af SHA1 5681f2607303b9ddea50a215a9d8f513fb09f24b SHA256 6dbbd5befebbe5255b1f0153cd91392b3de862fdae43481a0d34c6c55fad8cbf
+MD5 a804e417357b73c3fcf51c5bf051eaee captive-1.1.7-r1.ebuild 2521
+RMD160 3c887a1eacf8a212ced05d08f823d8a9b5db76af captive-1.1.7-r1.ebuild 2521
+SHA256 6dbbd5befebbe5255b1f0153cd91392b3de862fdae43481a0d34c6c55fad8cbf captive-1.1.7-r1.ebuild 2521
+MISC ChangeLog 4121 RMD160 d22edc37cfc5834b2e797eee902b3fb0d3a8bb6d SHA1 1ad6e8e1d0f0242f06961c622e48d33b9d7d52bd SHA256 578368e6072faaedd079ec077737c1e70d8f94774c4c1710bc885a53b831b81c
+MD5 d272afab6c088f92baf07c93ef502f59 ChangeLog 4121
+RMD160 d22edc37cfc5834b2e797eee902b3fb0d3a8bb6d ChangeLog 4121
+SHA256 578368e6072faaedd079ec077737c1e70d8f94774c4c1710bc885a53b831b81c ChangeLog 4121
 MISC metadata.xml 264 RMD160 ff3b07b3794623e4733a4dd289cffc9606d6e432 SHA1 310c846802ac0f01334ee8677c428e2962594d01 SHA256 62bbe388ec16f0c4a20cfbb752b05fdefd1349254c494cdea67c096bb553c06b
 MD5 6e89ba8198764bfd079a0cfa18dca593 metadata.xml 264
 RMD160 ff3b07b3794623e4733a4dd289cffc9606d6e432 metadata.xml 264
diff --git a/sys-fs/captive/captive-1.1.7-r1.ebuild b/sys-fs/captive/captive-1.1.7-r1.ebuild
index 9f171d9829b0..f0053e544389 100644
--- a/sys-fs/captive/captive-1.1.7-r1.ebuild
+++ b/sys-fs/captive/captive-1.1.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/captive/captive-1.1.7-r1.ebuild,v 1.6 2006/08/12 22:58:10 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/captive/captive-1.1.7-r1.ebuild,v 1.7 2006/09/12 20:11:06 genstef Exp $
 
 inherit eutils
 
@@ -49,6 +49,7 @@ src_unpack() {
 	if has_version '>=sys-fs/fuse-2.6.0_pre3'; then
 		epatch ${FILESDIR}/captive-fuse-2.6.0_pre3.patch
 	fi
+	epatch ${FILESDIR}/captive-popt.diff
 }
 
 src_compile() {
diff --git a/sys-fs/captive/files/captive-popt.diff b/sys-fs/captive/files/captive-popt.diff
new file mode 100644
index 000000000000..05e8fa0096e5
--- /dev/null
+++ b/sys-fs/captive/files/captive-popt.diff
@@ -0,0 +1,33 @@
+--- captive-1.1.7/src/client/cmdline/Makefile.in	2006-01-26 16:20:40.000000000 -0500
++++ captive-1.1.7/src/client/cmdline/Makefile.in	2006-09-12 10:44:22.110968408 -0400
+@@ -459,7 +459,7 @@
+ 		utf8.h
+ 
+ captive_cmdline_CFLAGS = $(GNOME_VFS_CFLAGS) $(LIBXML_CFLAGS) 
+-captive_cmdline_LDADD = $(captive_library) $(GNOME_VFS_LIBS)   $(LIBXML_LIBS)   $(READLINE_LIBS) $(INTLLIBS)
++captive_cmdline_LDADD = $(captive_library) $(GNOME_VFS_LIBS)   $(LIBXML_LIBS)   $(READLINE_LIBS) $(INTLLIBS) $(POPT_LIBS)
+ captive_cmdline_LDFLAGS = $(READLINE_LDFLAGS)
+ @ENABLE_MAN_PAGES_TRUE@captive_cmdline_man_cond = captive-cmdline.1
+ man_MANS = $(captive_cmdline_man_cond)
+--- captive-1.1.7/src/client/sandbox-server/Makefile.in	2006-01-26 16:20:43.000000000 -0500
++++ captive-1.1.7/src/client/sandbox-server/Makefile.in	2006-09-12 10:50:15.509243704 -0400
+@@ -401,7 +401,7 @@
+ 		main.c
+ 
+ captive_sandbox_server_CFLAGS = $(ORBIT_CFLAGS) $(LINC_CFLAGS) $(GNOME_VFS_CFLAGS) $(LIBXML_CFLAGS) 
+-captive_sandbox_server_LDADD = $(ORBIT_LIBS)   $(LINC_LIBS)   $(GNOME_VFS_LIBS)   $(LIBXML_LIBS)   $(captive_library) $(INTLLIBS)
++captive_sandbox_server_LDADD = $(ORBIT_LIBS)   $(LINC_LIBS)   $(GNOME_VFS_LIBS)   $(LIBXML_LIBS)   $(captive_library) $(INTLLIBS) $(POPT_LIBS)
+ @ENABLE_MAN_PAGES_TRUE@captive_sandbox_server_man_cond = captive-sandbox-server.1
+ man_MANS = $(captive_sandbox_server_man_cond)
+ all: $(BUILT_SOURCES)
+--- captive-1.1.7/src/client/fuse/Makefile.in	2006-01-26 16:20:41.000000000 -0500
++++ captive-1.1.7/src/client/fuse/Makefile.in	2006-09-12 10:55:57.854199360 -0400
+@@ -505,7 +505,7 @@
+ mount_captive_CFLAGS = $(GNOME_VFS_CFLAGS) $(LIBXML_CFLAGS) \
+ 	$(FUSE_CFLAGS) -DLIBEXECDIR="$(libexecdir)" \
+ 	-DVARLIBCAPTIVEDIR="$(localstatedir)/lib/$(PACKAGE)"
+-mount_captive_LDADD = $(captive_library) $(GNOME_VFS_LIBS)   $(LIBXML_LIBS)   $(FUSE_LIBS)   $(INTLLIBS)
++mount_captive_LDADD = $(captive_library) $(GNOME_VFS_LIBS)   $(LIBXML_LIBS)   $(FUSE_LIBS)   $(INTLLIBS)   $(POPT_LIBS)
+ mount_captive_LDFLAGS = $(READLINE_LDFLAGS)
+ @ENABLE_FUSE_TRUE@@ENABLE_SBIN_MOUNT_TRUE@mount_captive_cond = mount.captive
+ @ENABLE_FUSE_TRUE@@ENABLE_SBIN_MOUNT_TRUE@initd_SCRIPTS_cond = captive