Ensure src/libbson is never even prepared.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

diff --git a/dev-libs/mongo-c-driver/ChangeLog b/dev-libs/mongo-c-driver/ChangeLog
index 25a30b73c5a027bcf33b0c196d1efa3f85f7f04e..ae803958edae7e29e03cbae8c4ebc9122b52ec8b 100644 (file)
--- a/dev-libs/mongo-c-driver/ChangeLog
+++ b/dev-libs/mongo-c-driver/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/mongo-c-driver
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/mongo-c-driver/ChangeLog,v 1.19 2015/03/23 09:02:26 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mongo-c-driver/ChangeLog,v 1.20 2015/03/29 07:55:28 jer Exp $
+
+  29 Mar 2015; Jeroen Roovers <jer@gentoo.org> mongo-c-driver-1.1.2-r1.ebuild:
+  Ensure src/libbson is never even prepared.
 
 *mongo-c-driver-1.1.2-r1 (23 Mar 2015)
 

diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest
index 80c21b5cf3d380b9998dd0c2f131f7dfdae1818a..956370214b7814d78b46588aeb08b7efcf49d4b1 100644 (file)
--- a/dev-libs/mongo-c-driver/Manifest
+++ b/dev-libs/mongo-c-driver/Manifest
@@ -9,13 +9,13 @@ DIST mongo-c-driver-1.1.2.tar.gz 5443153 SHA256 ba97f4304883abf6d57ac96751260c4b
 EBUILD mongo-c-driver-0.7.1-r1.ebuild 1173 SHA256 e8d65f033ee5ca381e55df821ded60a4cd2aab9fff02853257008ab0fa9b4e45 SHA512 397faf2a6f3d81cace80da1b437017bb7ec67c8f51e3a0c50ad9702730dc7818bf63c44584f57a732e19a44d5d2ccdcce3d0526e8b22fc1bc255c2dea07076c2 WHIRLPOOL 3f87a1f41a82e21cab83aada363fe57370791b3bdd2173bd0e67de2b0def29fb497f9a089ae989de451e1e917696738a307a09ad72e4a26e95fa1cc23faf6991
 EBUILD mongo-c-driver-0.8.1-r1.ebuild 1273 SHA256 e309e0f0fb3ba2f620ebe5112429790905e39b85d7ebeb579a34ead98b83ff8b SHA512 9135d2f8a611ddca06f29d3d2ec55818c3d60892a6e2cfe5c4bf81983cc497f10112d1b6822dc53c90b4366c8b9ba11060bd363f71fec90bc8803450025bc21f WHIRLPOOL 9d8e2d55cbdad0142e7092d462bdede771d716a2a16faad8436bf0af00989e6af337749fdbdb55f5e99ec0e9f64071723d32eb4977fcd60099197a1429682c1e
 EBUILD mongo-c-driver-0.98.2.ebuild 1756 SHA256 2b960febc3cbf8e669d491d025be9e37e899f66d35c98d60f963333d8f6c2aee SHA512 93a8918ae3e0f837852365d89498f6e021ad90e220505579873342de26f1542b8c44364b15b45da59f94b87dda714cfb10ef294390abc2260b3452c096f7dcb8 WHIRLPOOL 5f8549c02725047d01fae618b04c99ca91a9931695627a5b50273a5ca8d1c03f245462afcece52ad2f11c01347c46326724f0461b106a8637c9831ffbafa2648
-EBUILD mongo-c-driver-1.1.2-r1.ebuild 1781 SHA256 9b2c1b6f40783365f3ae81d179319bad6af512505288abe11141b63d372d4628 SHA512 4f1b73e6607e59243c60962201d56bc3c9772ca51b1dbb5e85704b245a7d77886a06586c1eca3103dd039b99c68f42e5c67118a0db9e5daf3347af9e94d5e6bc WHIRLPOOL 78397a6b90106505fb085c7880507a7027839cbc5bf669a631a04013662a773a04c0eef6a6a3c9af9114724d9fed31783564304b262917a7842f402ee6e3e288
-MISC ChangeLog 3113 SHA256 2c9f16f27ccca45b4f0c85097ac42f15b0f61255dd769233f73ac1572505f157 SHA512 9cfc9598c0dc131b8a123bd581f7b9348c103fc302341a822937e8501ece906a4033b0d1079d739ee830eeda5ecde1c2f73de00ff63606e0f0a580091f35144f WHIRLPOOL 5bf8cc2156d62c5828f187ce22ac220985f6980f0d835b800c5a5255ec2e938cf4ea607cf5c4f868fb76cde5dab5fb223d1bb62ec8b2d697dfb78812ba40268e
+EBUILD mongo-c-driver-1.1.2-r1.ebuild 1861 SHA256 71f2a83d7f2ee5c07accedb1996d05a9cac2b1623d74afd59112e078fec0378d SHA512 6cabf6aef0858217e52112851e86f4f4a55714e5eb1c6fad59f1b3560958591d08cec3fbc04be38b4e6dbe1a43f2430b2b0fb6c046c8acfc31757cb7bcb6bdda WHIRLPOOL 1c2716ab96c5d1415f4ac5d440bb8aebfb993e6b5231a062572f87d3d829047a1cc68928a8e776121ed72ab16dd5bf8e59db60f5f55a0c1e89ed22ee441b1ffc
+MISC ChangeLog 3233 SHA256 e784ea8ac5b190d76a0b7d79b5e8e8fc987c24825ae543692298290ee5fdca87 SHA512 05e98e228f7c1e77bed76aa4cf50139d6bc0a6e707e9c3f1c3af1ac2aa22780a687cda0bb83080b399263d56f34918693c55c75ba9dbea56590b81a52a4974b2 WHIRLPOOL 8f06d304baebef10ce03ac2518efc4ef62066635f93dd84e430ce766fa6d16b59b66bf45c749a9ab50edfea4ec62d6930e79f0e8353a63e9027fd80f7d83a26e
 MISC metadata.xml 412 SHA256 dfb6e343d26a3fad209c0e2e0d2d66dce241ebfbc33e208c113dbfde989445ed SHA512 e4e29acd6759fcd9e188a45199f60bf81150dfc89f6ea2ee32d9e8b69208c91fd00675b290615265c30d5acce8dd4a7bffc70720055abf3198cb7f92c3c5857a WHIRLPOOL d889b77c6dc51c7210885a1c8a08788f3c96c2fd0baaadc239c0707305f09db201c9d86601cddc92cb5caebc9e4465c44a202f5e9f66d7f4dcec314607c381e9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlUP1qYACgkQKiQSS7ZY+hM5SgD/U4+Fc9OUCudDiUXwzza/jxcT
-i8Dbk4lypZzjGrMb28YBAJE1Mie9wgg+bllHljJqki+wgtJnuPnva/FMzrfFAAnG
-=Ud5F
+iEYEAREIAAYFAlUXr/UACgkQVWmRsqeSphPvrQCcDljeLVbkiq7pViPJvpkYOQAO
+w/0An2Atf1yMUaREqjjQAyAVa6+vYuLh
+=8UfI
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.1.2-r1.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.1.2-r1.ebuild
index b1c4e0d55be44a9462d27e269bacd8bf1ee5cb83..5e682c31e4a413b2102274fa20f3bd392cc99ff5 100644 (file)
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.1.2-r1.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/mongo-c-driver/mongo-c-driver-1.1.2-r1.ebuild,v 1.1 2015/03/23 09:02:26 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mongo-c-driver/mongo-c-driver-1.1.2-r1.ebuild,v 1.2 2015/03/29 07:55:28 jer Exp $
 
 EAPI=5
 
@@ -24,6 +24,9 @@ DEPEND="${RDEPEND}
 DOCS=( NEWS README.rst TUTORIAL.md )
 
 src_prepare() {
+       rm -r src/libbson || die
+       sed -i -e '/SUBDIRS/s:src/libbson::g' Makefile.am || die
+
        # https://github.com/mongodb/mongo-c-driver/issues/54
        sed -i -e "s/PTHREAD_LIBS/PTHREAD_CFLAGS/g" src/Makefile.am \
                tests/Makefile.am || die