Restored libxapian.la, needed for xapian-bindings' xapian-config, thanks Arfrever

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

diff --git a/dev-libs/xapian/ChangeLog b/dev-libs/xapian/ChangeLog
index b3dd7a030e68d2e7b468a75180bb1eac8abc9a8c..9e29ac95e38e070032e04e191ba3100bf681f7d2 100644 (file)
--- a/dev-libs/xapian/ChangeLog
+++ b/dev-libs/xapian/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/xapian
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/ChangeLog,v 1.68 2011/12/14 11:19:43 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/ChangeLog,v 1.69 2011/12/14 21:08:05 blueness Exp $
+
+  14 Dec 2011; Anthony G. Basile <blueness@gentoo.org> xapian-1.2.8.ebuild:
+  Restored libxapian.la, needed for xapian-bindings' xapian-config, thanks
+  Arfrever
 
 *xapian-1.2.8 (14 Dec 2011)
 

diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index 3ee5064488ee2e5125a703b0dd7a00e2077b6be0..33a1570f18d672dc82876f8e0c165e439642cdc1 100644 (file)
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -7,13 +7,13 @@ DIST xapian-core-1.2.8.tar.gz 4106342 RMD160 f6a88984e553cbf6c56c339bcb61a68c45e
 EBUILD xapian-1.2.5.ebuild 729 RMD160 fa1d4692231ad65ff4eb1c006a6bd83ffa1defae SHA1 9e93590ef4a41a839afb70fef9c804a2692c8d06 SHA256 710b8c5176de0c38eddfcd0ed41dadff19c15b305128bff40825bb2fab0db2da
 EBUILD xapian-1.2.7-r1.ebuild 837 RMD160 8068c7d9ca1d959631898a0c2032f522aa8bddc9 SHA1 bebbb81af43d2aaecbdaa70f2f5bc34c172055b0 SHA256 3d90f738c7d068f6d437b4c1ca2093a5c0e9f7ea220be7e32bebe71a8d318c83
 EBUILD xapian-1.2.7-r3.ebuild 1493 RMD160 0df4cc97dd996e6422c0b705279d1522638bfacf SHA1 9770c31b349b11e5b325224629624c0795fcc91e SHA256 a7d43c5169f6f847987db4b74348f6045c5f70e3e892c62f94f29312b84a619c
-EBUILD xapian-1.2.8.ebuild 1553 RMD160 c783ce24f205adae72bb6d9f4509728a68dba8bb SHA1 dde05d3caeacc80c1c8d53f09177082f99bf84f9 SHA256 5cdb37e015a294f87465979b3a74f32d9549afe1a550a4f04a4b69da40fb443b
-MISC ChangeLog 9400 RMD160 e271e8832b57e6be8fc0d08d4cb002b08851d8a8 SHA1 909207d648ed965ced14df2e6400e84a59f14cfd SHA256 aa7558a6ecf245c6f4a2eb3362e7b258a5e94fa4c3a3f42b56cc8fb48aa48953
+EBUILD xapian-1.2.8.ebuild 1490 RMD160 4c759b0756498e6db5a5a8e4e79e78ff08bae692 SHA1 4a1daee305e8c378ff778b891f34af1f6ce13d0a SHA256 01034527b341a9c0334b051f0df634ac24b70ddeaff2ee1767c8542ae2188083
+MISC ChangeLog 9563 RMD160 80d0e054e70b920efa3222ae925432dd9d9a08f2 SHA1 e0e7d87691e0a1f0e79297783b5904aa96af69ea SHA256 3db3eb6f37f7487c9a214af61cefa5bf7d85174704e2e4d8d0b7c60e8b99d9da
 MISC metadata.xml 1077 RMD160 8f251dc8f61c1f14907939da53ad88488427c806 SHA1 185b629bc6f09f6e6005bb34c38434fad12b8473 SHA256 797893144a240c317073bb1885ed2f8f40e648fe9b20050f339401e17232695c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk7ohl4ACgkQl5yvQNBFVTWMxQCfTovMll7JnHHmBw5BRObKISGy
-bPsAoIZFplX3jcfzM++7Llpj7sVRcvH+
-=lJod
+iEYEAREIAAYFAk7pEEAACgkQl5yvQNBFVTWMPACdHFTSen04X8xMwAXqgD2EtwxT
+aVIAnisZSBLIS+7si9xRSdB/b07j6F1F
+=PWRL
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/xapian/xapian-1.2.8.ebuild b/dev-libs/xapian/xapian-1.2.8.ebuild
index 7ca14d40570e68d3eba4b1fb56a8274f1a587e82..1e0062c563de9f0cde4a13460723ee4f78486e26 100644 (file)
--- a/dev-libs/xapian/xapian-1.2.8.ebuild
+++ b/dev-libs/xapian/xapian-1.2.8.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/xapian-1.2.8.ebuild,v 1.1 2011/12/14 11:19:43 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/xapian-1.2.8.ebuild,v 1.2 2011/12/14 21:08:05 blueness Exp $
 
 EAPI=4
 
-inherit multilib
-
 MY_P="${PN}-core-${PV}"
 
 DESCRIPTION="Xapian Probabilistic Information Retrieval library"
@@ -53,7 +51,6 @@ src_configure() {
 
 src_install() {
        emake DESTDIR="${D}" install
-       rm -rf "${D}usr/$(get_libdir)/libxapian.la"
 
        mv "${D}usr/share/doc/xapian-core" "${D}usr/share/doc/${PF}"
        use doc || rm -rf "${D}usr/share/doc/${PF}"