Add as needed patch, patch Makefile.am instead of Makefile.in. Thanks to

Alexandre Rostovtsev <tetromino at gmail dot com> in bug 245782.
Package-Manager: portage-2.1.4.5

5 files changed, 36 insertions, 21 deletions

diff --git a/sys-fs/encfs/ChangeLog b/sys-fs/encfs/ChangeLog
index b3336b548cf5..954914ef6043 100644
--- a/sys-fs/encfs/ChangeLog
+++ b/sys-fs/encfs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/encfs
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/encfs/ChangeLog,v 1.34 2008/11/03 01:58:01 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/encfs/ChangeLog,v 1.35 2008/11/10 01:55:48 vanquirius Exp $
+
+  10 Nov 2008; Marcelo Goes <vanquirius@gentoo.org>
+  -files/encfs-1.5-boost-system.patch,
+  +files/encfs-1.5-boost-system-and-as-needed.patch, encfs-1.5.ebuild:
+  Add as needed patch, patch Makefile.am instead of Makefile.in. Thanks to
+  Alexandre Rostovtsev <tetromino at gmail dot com> in bug 245782.
 
 *encfs-1.5 (03 Nov 2008)
 
diff --git a/sys-fs/encfs/Manifest b/sys-fs/encfs/Manifest
index 080acfbec870..6747fda7e526 100644
--- a/sys-fs/encfs/Manifest
+++ b/sys-fs/encfs/Manifest
@@ -3,7 +3,7 @@ Hash: SHA1
 
 AUX encfs-1.3.2.1-gcc-4.3.patch 6126 RMD160 6a5d61cc965f57f3baf5a2fc1dec0bf7f30187b4 SHA1 f757a6f768e1624ea3d7b6b40445857d0990220c SHA256 f5cb234c916810ef8a89e42b77397e08c528c49825120a3e873ed12e0f3a61e2
 AUX encfs-1.4.2-gcc-4.3.patch 3177 RMD160 386e547078e2e1304e6e84d14c243ad6c89b2ee1 SHA1 dbf9d60b41ce79edbc96ca301cb1a6c6c5353fc5 SHA256 f957d533b8f6096f05fd1a1c3be48b884c45070f02a41685307fe195ec3c1e6d
-AUX encfs-1.5-boost-system.patch 626 RMD160 3934a8ee1fdf48e938ef47517391371368fae98a SHA1 097cc2245b12f9294c8214d063db123b24b338d6 SHA256 5d52bb5e3f4a1822ffd1fa7824119ce2f9c254030a8d18c98b4b843d14a6698a
+AUX encfs-1.5-boost-system-and-as-needed.patch 795 RMD160 609c3c8cab47a1aba63af5adfb4ce348dd1b1edd SHA1 94f98e040ab50ec301b77d10fb55364ad0adeb6d SHA256 6121bfe7cd4ee574f4f68e2898e7c0382bec09a88756b7804ac4fdfb6729c222
 DIST encfs-1.2.5-1.tgz 695712 RMD160 996387cfb1f3b10299a4ef59a7282e5ad4055bff SHA1 d9637b77dd218f8e58b8b3bdfaaa6d14a6358dee SHA256 319c563bcc34e2845413eb57b3b38d02b4149be4e6f2a3d2ce901da01eaf5d17
 DIST encfs-1.3.1-1.tgz 702028 RMD160 122fd8169a669f9d732e5d1e757a551b38b85d4e SHA1 5da44d148788bad8bf5de1ab01f432e169f60a63 SHA256 d9070c859c64a697573353c03bfe99c2910e05aa6d660f5a6cd9ca645f486369
 DIST encfs-1.3.2-1.tgz 711838 RMD160 bfdbb8c0da65139eedbff0a0e40c0e7a181e4cf3 SHA1 6b200c9f7e0118e974384a5daa6c9b3301df076e SHA256 3825cf0724fcfdc4bd8073227f4437c3b25056571fb94709ba463fb1f70d0a85
@@ -14,13 +14,13 @@ EBUILD encfs-1.3.1.1.ebuild 962 RMD160 55495d2f93a5ca0ef2ec8ceada5ecd085b954a7f
 EBUILD encfs-1.3.2.1-r1.ebuild 1046 RMD160 745164b10f4e13d9bac149a9f7abd681140e9079 SHA1 5f33fd0606b3133a63690453c98bfb6ae46829e7 SHA256 bb2230cb1049188c09e15925505191ae6b9502aa14e121ec45ad7b22d80936f5
 EBUILD encfs-1.3.2.1.ebuild 949 RMD160 1de1adbfe2facac35a4567c080ad7b6fd4ae94ab SHA1 efb9e86f0bef21c8330b053057b8ac422d774d68 SHA256 5d3771ab748b6b500065e65f4789f9a7945b2404ceb7cc1b693ec68d03cb2e1c
 EBUILD encfs-1.4.2.ebuild 951 RMD160 72865adfbb4e66a702c1e020dce0b24aa4a6dc9c SHA1 5e674b8a5ef5fa2a3888122b5913f70421ad9469 SHA256 c6d01ca79347656abe5b7279ff843da74adcad1fb96f6ecb0eda7ecd40548188
-EBUILD encfs-1.5.ebuild 972 RMD160 60171d63a74c957010178b6cfd6cecb2f9a2f5e7 SHA1 bb1982da37e1cc5b0c383e0558e9b5d8dd77cd55 SHA256 6c1f892a77d14c7d339e53e55d457ff71e976c2a8378c2f400b81f53c925eac9
-MISC ChangeLog 5848 RMD160 f8a6ebaeff4402fd0bc8692adbdbc73b571e80d0 SHA1 f86310d993616fa7889dd4cc559f6b564339a791 SHA256 162295e92d6973244f66ead1666e8f46fe7d8aef3e5958ab965baf5fd31b303f
+EBUILD encfs-1.5.ebuild 986 RMD160 b900f2f357d96317356ddc93fca9ef719ac6e243 SHA1 d2ec7c025dc7ec34acb7738c963db121dfb314ef SHA256 ab186f6fb5314370dc9d8e186f5d23c8607fd43cb8b0cd018280cea9bc9c269c
+MISC ChangeLog 6153 RMD160 0fc12caedc074665c879334c1142c1a5850f49c6 SHA1 880408ece520d034b9d650f54b4eaac899fa83b7 SHA256 ac8a1cda10dc15e3005eae5963afce8251645f5144cbced4b6e37cbdf469f1ae
 MISC metadata.xml 262 RMD160 f3d8d0dd73230dfdca175ef66a091c78e44d0f98 SHA1 f08c61f42ce181c625ddaf232ba6e2c86af06250 SHA256 d90fbcb5c6704d3d97dc2cceb80fee7acde549638a4f0270b0d87f64fcee82fa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkOWroACgkQ0axuTq83eto9NACgj+3cn680oevOb7USzrk8p1wA
-UNkAn2Jkh4ozXDMTjsV7VfXJBgJJTgpv
-=+WrW
+iEYEARECAAYFAkkXlJwACgkQrV3T0ZYD7E5o6wCfazWBsZwV09/hFAsNTzciuehz
+p2gAn2jJcJggCx4GyXrcFAsmdiTXk49E
+=/VcX
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/encfs/encfs-1.5.ebuild b/sys-fs/encfs/encfs-1.5.ebuild
index 60ad9a512a4b..b57a6d25bf52 100644
--- a/sys-fs/encfs/encfs-1.5.ebuild
+++ b/sys-fs/encfs/encfs-1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/encfs/encfs-1.5.ebuild,v 1.1 2008/11/03 01:58:01 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/encfs/encfs-1.5.ebuild,v 1.2 2008/11/10 01:55:48 vanquirius Exp $
 
 inherit eutils
 
@@ -23,7 +23,7 @@ DEPEND=">=dev-libs/openssl-0.9.7
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-boost-system.patch
+	epatch "${FILESDIR}"/${P}-boost-system-and-as-needed.patch
 }
 
 src_compile() {
diff --git a/sys-fs/encfs/files/encfs-1.5-boost-system-and-as-needed.patch b/sys-fs/encfs/files/encfs-1.5-boost-system-and-as-needed.patch
new file mode 100644
index 000000000000..5928f87373bf
--- /dev/null
+++ b/sys-fs/encfs/files/encfs-1.5-boost-system-and-as-needed.patch
@@ -0,0 +1,21 @@
+diff -ru encfs-1.5.orig/encfs/Makefile.am encfs-1.5/encfs/Makefile.am
+--- encfs-1.5.orig/encfs/Makefile.am	2008-08-23 17:48:12.000000000 -0400
++++ encfs-1.5/encfs/Makefile.am	2008-11-09 12:43:21.000000000 -0500
+@@ -3,7 +3,7 @@
+ 
+ ALL_INCLUDES = @RLOG_CFLAGS@ @OPENSSL_CFLAGS@ @BOOST_CPPFLAGS@
+ ALL_LDFLAGS = @RLOG_LIBS@ @OPENSSL_LIBS@ @FUSE_LIBS@ 
+-ALL_LDFLAGS += @BOOST_SERIALIZATION_LIB@ @BOOST_FILESYSTEM_LIB@
++ALL_LDFLAGS += @BOOST_SERIALIZATION_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_SYSTEM_LIB@
+ 
+ INCLUDES = $(all_includes) -I../intl
+ 
+@@ -43,7 +43,7 @@
+ #       :  +1 :           => internal changes, nothing breaks
+ #
+ libencfs_la_LDFLAGS = -version-info 5:0:1
+-libencfs_la_LIBADD = -lrlog
++libencfs_la_LIBADD = -lrlog @OPENSSL_LIBS@
+ 
+ EXTRASRC = ../intl/autosprintf.cpp
+ if BUILD_OPENSSL
diff --git a/sys-fs/encfs/files/encfs-1.5-boost-system.patch b/sys-fs/encfs/files/encfs-1.5-boost-system.patch
deleted file mode 100644
index fc9ad0572c22..000000000000
--- a/sys-fs/encfs/files/encfs-1.5-boost-system.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur encfs-1.5/encfs/Makefile.in encfs-1.5.new/encfs/Makefile.in
---- encfs-1.5/encfs/Makefile.in	2008-09-10 07:55:07.000000000 +0200
-+++ encfs-1.5.new/encfs/Makefile.in	2008-10-07 17:30:35.467163118 +0200
-@@ -297,7 +297,7 @@
- KDE_OPTIONS = qtonly
- ALL_INCLUDES = @RLOG_CFLAGS@ @OPENSSL_CFLAGS@ @BOOST_CPPFLAGS@
- ALL_LDFLAGS = @RLOG_LIBS@ @OPENSSL_LIBS@ @FUSE_LIBS@ \
--	@BOOST_SERIALIZATION_LIB@ @BOOST_FILESYSTEM_LIB@ \
-+	@BOOST_SERIALIZATION_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_SYSTEM_LIB@ \
- 	$(am__append_2)
- INCLUDES = $(all_includes) -I../intl
- AM_CXXFLAGS = -DRLOG_COMPONENT="encfs" $(ALL_INCLUDES) $(am__append_1)