Add patch from bug #145450

Package-Manager: portage-2.1.1-r2

diff --git a/net-libs/liblockfile/ChangeLog b/net-libs/liblockfile/ChangeLog
index 036997af31abf58e226efbafb548c566e26ce615..57ffee728461fb8222fd3951636b9b1ca5ae43f5 100644 (file)
--- a/net-libs/liblockfile/ChangeLog
+++ b/net-libs/liblockfile/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/liblockfile
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/liblockfile/ChangeLog,v 1.40 2006/10/21 18:19:54 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/liblockfile/ChangeLog,v 1.41 2006/12/20 13:22:11 ferdy Exp $
+
+*liblockfile-1.06-r2 (20 Dec 2006)
+
+  20 Dec 2006; Fernando J. Pereda <ferdy@gentoo.org>
+  +files/liblockfile-orphan-file.patch, +liblockfile-1.06-r2.ebuild:
+  Add patch from bug #145450
 
   21 Oct 2006; Bryan Østergaard <kloeri@gentoo.org>
   liblockfile-1.06-r1.ebuild:

diff --git a/net-libs/liblockfile/Manifest b/net-libs/liblockfile/Manifest
index fbb9f38b95a83e99d03d0b8322bc3e0b13eb9eab..7594e5a0be57d25ad4e604404a482284867ed311 100644 (file)
--- a/net-libs/liblockfile/Manifest
+++ b/net-libs/liblockfile/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX liblockfile-1.06-glibc24.patch 356 RMD160 43352a39091a5552501d93899f49cc12c6fea0c8 SHA1 8bdd7521f561bec2597ba377bb0ee7bd0c62b0ee SHA256 38886f3010cf2eb68c272296d1d3fcd4f7938f9a1ec73200d38218a48ec2dc66
 MD5 d51b8e968f1880362d45b9689d10466a files/liblockfile-1.06-glibc24.patch 356
 RMD160 43352a39091a5552501d93899f49cc12c6fea0c8 files/liblockfile-1.06-glibc24.patch 356
@@ -6,19 +9,27 @@ AUX liblockfile-1.06-respectflags.patch 665 RMD160 586457f34e60bb66b74e1d041a6ba
 MD5 5c0cd23bb40a7c8869e7d4d355c0f372 files/liblockfile-1.06-respectflags.patch 665
 RMD160 586457f34e60bb66b74e1d041a6ba45ec537e250 files/liblockfile-1.06-respectflags.patch 665
 SHA256 c1ef8e3baa31291d5ac32e9ab76c4fcdb669852b1b3a6502fef74ced9566b386 files/liblockfile-1.06-respectflags.patch 665
+AUX liblockfile-orphan-file.patch 613 RMD160 424fd60b683919a0507959bfeb62831357674cea SHA1 affa5e3288be70975baed5ba6657bc734ad64fd6 SHA256 5e058b5c370a6256947ae664c9f44ba0eee59d0c80dd062a032fc9ec5a216859
+MD5 c90778b4f151b8537d0fb42094b7dc5c files/liblockfile-orphan-file.patch 613
+RMD160 424fd60b683919a0507959bfeb62831357674cea files/liblockfile-orphan-file.patch 613
+SHA256 5e058b5c370a6256947ae664c9f44ba0eee59d0c80dd062a032fc9ec5a216859 files/liblockfile-orphan-file.patch 613
 DIST liblockfile_1.06.tar.gz 32007 RMD160 704222295720c1b07e7474b49de1098cc5e2c997 SHA1 2ca962ff913e190931a0a4941300c3d1ce04a508 SHA256 14f9690328318d11f9ba13a9356a2c008bdd169b7a817f38cb7f9eb32cf7240e
 EBUILD liblockfile-1.06-r1.ebuild 1063 RMD160 0086e7e19c362021564cd095332c56578a3dc131 SHA1 6217406ae1d9483687eaf5aa93a7077731a273f5 SHA256 a9e60afd0cfe896d3c8bfdf49aef0c7dc633f9b777693f04ef9fcf9a8e0cdd6e
 MD5 d8c4e999cb2ac48a0c869f374f1f3c2f liblockfile-1.06-r1.ebuild 1063
 RMD160 0086e7e19c362021564cd095332c56578a3dc131 liblockfile-1.06-r1.ebuild 1063
 SHA256 a9e60afd0cfe896d3c8bfdf49aef0c7dc633f9b777693f04ef9fcf9a8e0cdd6e liblockfile-1.06-r1.ebuild 1063
+EBUILD liblockfile-1.06-r2.ebuild 1119 RMD160 dc7a77c33505e0cffa22d13e22eff3f5891bd3a8 SHA1 7c71560ab3de14306e55774f50305b202e21ac18 SHA256 5d81e6c0dc9c598211baf254c722db7a60182911af3e0bfbec3d5e43d976f035
+MD5 44b698f6657c8217a43173432d779762 liblockfile-1.06-r2.ebuild 1119
+RMD160 dc7a77c33505e0cffa22d13e22eff3f5891bd3a8 liblockfile-1.06-r2.ebuild 1119
+SHA256 5d81e6c0dc9c598211baf254c722db7a60182911af3e0bfbec3d5e43d976f035 liblockfile-1.06-r2.ebuild 1119
 EBUILD liblockfile-1.06.ebuild 871 RMD160 b29c6229e9f6f93a3484c2bbc931c9983a180e46 SHA1 3208663dc5516a970f8e0dfe11068ee08f15874b SHA256 7faced088513c89c926d2403652db0417d9c6af51d8e3a10f580af1ce8168dce
 MD5 8e511b5ef0108f12000cb0524940e5a0 liblockfile-1.06.ebuild 871
 RMD160 b29c6229e9f6f93a3484c2bbc931c9983a180e46 liblockfile-1.06.ebuild 871
 SHA256 7faced088513c89c926d2403652db0417d9c6af51d8e3a10f580af1ce8168dce liblockfile-1.06.ebuild 871
-MISC ChangeLog 5410 RMD160 79691cc27476ac3b88477942051aa7b7fd64ebee SHA1 759e2d8c8c1d72a1282bc2b1384221ca7ae08e58 SHA256 7026419cea4e0e41b2aea0ba0fcebc4f114b52d928daf4b6ce3b4f4f6c13c7c6
-MD5 4ae7630dd63478235d433a62b0594fd3 ChangeLog 5410
-RMD160 79691cc27476ac3b88477942051aa7b7fd64ebee ChangeLog 5410
-SHA256 7026419cea4e0e41b2aea0ba0fcebc4f114b52d928daf4b6ce3b4f4f6c13c7c6 ChangeLog 5410
+MISC ChangeLog 5597 RMD160 f0368011fc50c76d454137ea9c5fbd85397a77b5 SHA1 889dc91209634cb11f5ce1444f899ac3292b1b7b SHA256 4a2655f9d5eb676497a9d6284a1f840463c105abffe72352963bb7606d17c546
+MD5 189a2b95065957cf90992a7c99026182 ChangeLog 5597
+RMD160 f0368011fc50c76d454137ea9c5fbd85397a77b5 ChangeLog 5597
+SHA256 4a2655f9d5eb676497a9d6284a1f840463c105abffe72352963bb7606d17c546 ChangeLog 5597
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
@@ -29,3 +40,13 @@ SHA256 3f507a8d864ba3e37f1703027f8f96117df1da3df9f24cc06d0b3a9d7d9098d2 files/di
 MD5 63c9c515f1ccdd4147e085295a2684e4 files/digest-liblockfile-1.06-r1 247
 RMD160 712d3ca0b19497ee2a1f4021adf43c96b6edc6a5 files/digest-liblockfile-1.06-r1 247
 SHA256 3f507a8d864ba3e37f1703027f8f96117df1da3df9f24cc06d0b3a9d7d9098d2 files/digest-liblockfile-1.06-r1 247
+MD5 63c9c515f1ccdd4147e085295a2684e4 files/digest-liblockfile-1.06-r2 247
+RMD160 712d3ca0b19497ee2a1f4021adf43c96b6edc6a5 files/digest-liblockfile-1.06-r2 247
+SHA256 3f507a8d864ba3e37f1703027f8f96117df1da3df9f24cc06d0b3a9d7d9098d2 files/digest-liblockfile-1.06-r2 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFFiTk8ViELBEf1JB0RAgUDAJ4kLSCDzH2IxodZBqllwTshSMnPHwCfQ62Q
+lPFGBarWslSejom735AwdX0=
+=KT5Y
+-----END PGP SIGNATURE-----

diff --git a/net-libs/liblockfile/files/digest-liblockfile-1.06-r2 b/net-libs/liblockfile/files/digest-liblockfile-1.06-r2
new file mode 100644 (file)
index 0000000..d33913c
--- /dev/null
+++ b/net-libs/liblockfile/files/digest-liblockfile-1.06-r2
@@ -0,0 +1,3 @@
+MD5 2de88389da013488bfd31356523070c0 liblockfile_1.06.tar.gz 32007
+RMD160 704222295720c1b07e7474b49de1098cc5e2c997 liblockfile_1.06.tar.gz 32007
+SHA256 14f9690328318d11f9ba13a9356a2c008bdd169b7a817f38cb7f9eb32cf7240e liblockfile_1.06.tar.gz 32007

diff --git a/net-libs/liblockfile/files/liblockfile-orphan-file.patch b/net-libs/liblockfile/files/liblockfile-orphan-file.patch
new file mode 100644 (file)
index 0000000..4a8c75a
--- /dev/null
+++ b/net-libs/liblockfile/files/liblockfile-orphan-file.patch
@@ -0,0 +1,19 @@
+diff -ur liblockfile-1.06-orig/Makefile.in liblockfile-1.06/Makefile.in
+--- liblockfile-1.06-orig/Makefile.in  2006-11-28 06:19:09.000000000 +0100
++++ liblockfile-1.06/Makefile.in       2006-11-28 06:24:30.000000000 +0100
+@@ -5,6 +5,7 @@
+ #
+ 
+ VER   = 1.0
++MVER  = 1
+ NVER  = 0.1
+ 
+ CFLAGS                = @CFLAGS@ -I.
+@@ -55,6 +56,7 @@
+ install_shared:       shared install_common
+               install -m 755 liblockfile.so \
+                       $(ROOT)$(libdir)/liblockfile.so.$(VER)
++              ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so.$(MVER)
+               ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so
+               if test "$(ROOT)" = ""; then @LDCONFIG@; fi
+ 

diff --git a/net-libs/liblockfile/liblockfile-1.06-r2.ebuild b/net-libs/liblockfile/liblockfile-1.06-r2.ebuild
new file mode 100644 (file)
index 0000000..e22c72b
--- /dev/null
+++ b/net-libs/liblockfile/liblockfile-1.06-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/liblockfile/liblockfile-1.06-r2.ebuild,v 1.1 2006/12/20 13:22:11 ferdy Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit eutils multilib flag-o-matic autotools
+
+DESCRIPTION="Implements functions designed to lock the standard mailboxes"
+HOMEPAGE="http://www.debian.org/"
+SRC_URI="mirror://debian/pool/main/libl/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+
+       epatch "${FILESDIR}/${P}-glibc24.patch"
+       epatch "${FILESDIR}/${P}-respectflags.patch"
+       epatch "${FILESDIR}/${PN}-orphan-file.patch"
+
+       eautoreconf
+
+       # Do not use lazy bindings on setXid files
+       sed -i -e 's~-o dotlockfile~'$(bindnow-flags)' &~g' Makefile.in
+
+}
+
+src_compile() {
+       econf --with-mailgroup=mail --enable-shared || die
+       emake || die
+}
+
+src_install() {
+       dodir /usr/{bin,include,$(get_libdir)} /usr/share/man/{man1,man3}
+       make ROOT="${D}" install || die
+}