diff options
Diffstat (limited to 'sys-fs/encfs')
| -rw-r--r-- | sys-fs/encfs/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-fs/encfs/encfs-1.5.ebuild | 4 | ||||
| -rw-r--r-- | sys-fs/encfs/files/encfs-1.5-boost-system-and-as-needed.patch | 21 | ||||
| -rw-r--r-- | sys-fs/encfs/files/encfs-1.5-boost-system.patch | 12 |
4 files changed, 30 insertions, 15 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/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) |