Fix USE=-snappy handling #541186 by Johan Bergström. Move memenv.h header to leveldb/helpers/ to match Debian.

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 143 insertions, 15 deletions

diff --git a/dev-libs/leveldb/ChangeLog b/dev-libs/leveldb/ChangeLog
index a0ef9bf01c7f..dc0dcbcccada 100644
--- a/dev-libs/leveldb/ChangeLog
+++ b/dev-libs/leveldb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/leveldb
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/leveldb/ChangeLog,v 1.27 2015/02/21 18:34:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/leveldb/ChangeLog,v 1.28 2015/03/06 09:12:42 vapier Exp $
+
+*leveldb-1.18-r1 (06 Mar 2015)
+
+  06 Mar 2015; Mike Frysinger <vapier@gentoo.org>
+  +files/leveldb-1.18-configure.patch, +leveldb-1.18-r1.ebuild:
+  Fix USE=-snappy handling #541186 by Johan Bergström. Move memenv.h header to
+  leveldb/helpers/ to match Debian.
 
 *leveldb-1.18 (21 Feb 2015)
 
diff --git a/dev-libs/leveldb/Manifest b/dev-libs/leveldb/Manifest
index cf998d920894..a4d84087b69f 100644
--- a/dev-libs/leveldb/Manifest
+++ b/dev-libs/leveldb/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX leveldb-1.18-configure.patch 1452 SHA256 1b8cfb6eae7a0f613019ab88b85fbcde7c647ba52cca82acfb4a3d52f10a99ab SHA512 86bae8c8d5d722435bedc68333c97f318847c93503368d815157a46ab15ad1795f8a585027dcecb7a94c338d25eeb69f94df87f2da2cd9f5805838f0a29dc08e WHIRLPOOL 7f30063d0255d0477ccf1ec99ff127ecc810c4dd044016efdb989f71768ec783b746622b587d4fcea8ebf269fcd77b59d5a1c9288e7fe7091beb97e072b8fc48
 AUX leveldb-1.18-mips.patch 1399 SHA256 c6547ce7050b1d5078c72e8db777bae77d83d0d4bd4a3c7f5942c9bddbb603f5 SHA512 8d968371007d163cbbb87546cbfe246e399f083bacea415f2d8b68355a5d3363df51f34e9bd29ee558ae475414b3c331b7473ef2d7e432ebfa786d55a08b2e54 WHIRLPOOL aca9868351fef0ae368e6e5a4f0c2ba425647523eaab884c7ea840265f0553be91ca0345cb1a0f3ce029e4af6201044d7eaec3545acb6021b4f908a97bbc1a41
 AUX leveldb-1.9.0-configure.patch 990 SHA256 7e509d4a77fc8ae77082f9b54e505dd6b42eca9af36e2b9e03bfe4a25472b529 SHA512 28f08e257d0f067d93ea88ee30719c092660ab7d220a55d4fa1cec5c5fd8195465e374670aa46c7a125f218ae3a689f3bb58ce66ddc720a2fc1caed552ed27e5 WHIRLPOOL eafac457577fc66a0d096b50c408c5e5298278cc071c5ea867ea61c4bdff1c95759ea73cf60be4ee6f5dfa20babce075d2efe928345f39538789c8c3995403de
 AUX leveldb-1.9.0-forwardcompat.patch 3464 SHA256 1ca68f5dc7d3da0083e497d2e6ceb27675890a18db29f99f9cdf2c3cf5f7628b SHA512 d55d4469a9cb118688233b82df3f19d08a8fb3f53a3d1d990d485a0cb91872eb2fd3699288369a96ee59739be730ce9437f9d1f8b51d095dd014adf475de7824 WHIRLPOOL 54b19b1990b7c962e285878297e4a09479eb9d3cdb08ee36b4ab6cbf8e22ac486c062b3097b0970e6ed346d3765f76048518a41b1541647049f051d20571f5e4
@@ -22,25 +23,26 @@ EBUILD leveldb-1.14.0.ebuild 1342 SHA256 bc516a3404a623a556d8ccb90a7c235d782d450
 EBUILD leveldb-1.15.0-r1.ebuild 1552 SHA256 56e817a3b79fe24e2afe11774b46f759507e8dc16d2d727dd9293fd84f3676f1 SHA512 de830e802c8819e9d1f3c18998b90370d844f563f258fc5f656a1041daa9e833360316ae2b4d3dd77a43b7c2108b8aabae93cec56bfeb36baadedd21d15672c6 WHIRLPOOL 869dc35a57bd7359a4cf33a12415a1ec61914c3caa471d173d87c0672ce501f343c2850cb3f9fc9cb379d77cb4d382a0bdb16962687a8d8d6b91aedb8f5bcde1
 EBUILD leveldb-1.15.0.ebuild 1342 SHA256 fe53e3017996212bb438beffd77e8094d21ffc48a009e9d17cca70d1af12a278 SHA512 d2266f66a1250836b6dd58dcffa23fa88b19db91095216cb71160246532dd2bd978972ad327ace9e6d27b81e6e0cd6fc832ded952c371068be904b638dfaab9c WHIRLPOOL d647b6041211d6ed81c66adbc66bd1ece887b3a570fa88735e3c2907639c1666789714bfc546ce30f6e6a79cd739a5cad84a10ae86460e6bb62ec1db5d59347f
 EBUILD leveldb-1.17.ebuild 1830 SHA256 9da89f011144d954d9286fe32733b8a92d53a0b18aadf17653d4c9e1041bda9c SHA512 2a4f5a5415168899e971ca7fab01b0cdc94951c623673f2205679780d6349489cfd551b38ea9b6c47b095b358a2387ab3770f45339ada505824c33a9388344e3 WHIRLPOOL 66dc86b22373f330ac5e6587798ca1bdf2bbb46256780692f1b8b945fb7677c8e14ed90717cee3f718d2c18a5c016a137ef25a9b06faf941dd021d0f1d2b0266
+EBUILD leveldb-1.18-r1.ebuild 1869 SHA256 8bbe8c22d7962814277a7150e62d936523c2e541c9979a36f7dd310cdb049737 SHA512 7faeb42ea14f87885f47584aef516b26bcbacbf4ada9dd66d69a81dbb58b54a599cde2df1e718796d006117e9282897e1b039322bab25a8c981183dc74f49d89 WHIRLPOOL 723c0451ebe9e9fccaa1d8813e521fd114df60f9bd561795d9d9b9d87c3380ea90d6c4f713487d4634e57f931bdae8508ece004d36cd31268e600dd7be5c64d6
 EBUILD leveldb-1.18.ebuild 1758 SHA256 cf9ac0760fb229a28a538df2bbb44cab14a4130d2443d9d88b952444c1cde956 SHA512 b6865746a9e9e0b8c9a30549723bd433341fe8a76c480cf43dbbc17c232a1aa44aefe53ba55db337d282dafea415cd00ae3874f0ff7db7c0b0fa6ec78eee3de8 WHIRLPOOL 0c2ed6ef1fedce30d90307d56e1e04ab4fbcc9871d27bd490ddce5d056df1027fe3a1eb3fe98b25e36c60fd680fb9ae7b58d31082e06b9002b002a2ba036f53d
 EBUILD leveldb-1.9.0-r5.ebuild 1337 SHA256 6a010183c84897cafd5fd715ce84197fc1af7221b2f315e8ffee479a29920c0c SHA512 2a7cee3529836ad74453bf200f5bcc98ce71b3f2fbbb23b1cfda48b5f6addd94f76460965050590f057a64e7653a9246927cb0015b2a144b772b77effcb7897f WHIRLPOOL ae7c0dce8f25c8097b8d2b532ecb5769d0fddd5ce1e10129626e35e9bea1203ea950c7a2dee219618458fca057c6325b89e06511cf157804dc72075b37082ccf
 EBUILD leveldb-1.9.0-r6.ebuild 1391 SHA256 7b2f71b4c7e8cddb52cf687733b8aafaf7eabc50a1c392355a81fc7c3802c6e8 SHA512 651b95a5db25811d2300c9c62d7f04d3282f7fbd9bf8e6775b14e6e0103b63df6196fa387978ced5c5b96ad9235d394b073b3f97c606add8998fbf5b8659f724 WHIRLPOOL 2567e082f42a5f9a00887213a6a93a327b49d633a5bea0095457c724dab372cd0d4de690bde10cf119f8053b572c28f4a2bc5cb639969afd12fee8cf7495863b
-MISC ChangeLog 4778 SHA256 edbbf63ae00f07d0249804b055c8a69f1ac54ce804f0da56bf05e89b36946d1e SHA512 07819001dac1ecf5a8bdede0e64f84ce8faa367a8e12f7f5e8b4977267034c9244cd536ed592b07c71d71a32b66f51c791a7e08a4c10531f0b8a27f6d1558da5 WHIRLPOOL ee5b0ebe31eb727db71df8677f1cb189a877c7f86e2e48dec0e102ccf5d6479a5be2078edbfcf325183133d46ffff3bc3bdd3ad830130fac26e9f41765158d0b
+MISC ChangeLog 5041 SHA256 84ab1ccb556d76b24bc49cc0709f04d16d9cc22c866419fedc4046ac9ca3d0a5 SHA512 e65f1e06de8f54d2ff67c8779a7d287e8b3ce16f991ad4a7e2ff59060b833310d56e9d68f6d1ac393a5ca664036cc68e5751710d963ea0973bda356aa4c0524b WHIRLPOOL 72e120944b8385bf17faa87fdf65f3f151ff1cb48387af27f8b14bc22c7be792e377d318402c6d2ee923a0833cdf6cc2c9fab22ce6ee4f6114e93a7880e1f130
 MISC metadata.xml 446 SHA256 f36024a661afe4d9be20033f664174a90b76df85e531da553abe9ca7d10dcb58 SHA512 d61a8e5645c7eff9fed94136ead2ad8d310e0313fd200ae754a8fc13ca8f5378b03ca2c95bd228cd1c7c5227edb00c25ddc512c6a004a9f5514238986b8dbade WHIRLPOOL 65044cd9194579bf1a2e577369cc4b09fa9d84d0d1e78bcdb41b0c70b68369171829ff80c89cbe24c974af0c829f415c207a0b537c8b5e9170fe71eafebb3ef7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU6M+hAAoJEPGu1DbS6WIAN14P+wQLm9yfqTzWlQ6bXXvVtaUp
-kPokAgmdz/9WdPOlZntBb/e8nIfgnCpVv+hQiYulJISRMhXBao3xNQCrVXFg9dHe
-pvC3bmHqnossXHRox6T6+aHsMFA/cd8R/Wd0T+g1xiMFj9xIP4B7oZZI+LVC5mFI
-f1QqP74KWhd8UeJG1HzwmDUcD73GIukcoQ9nFgCLoaRZwfvOccCP4e/2IFfJpVf7
-NLxI2KZ90aA157yehWVrbhXdx/BPorZ4j+jBVGiosS3FZiAy9S/xS+LZlN9S46n+
-CBzKM0Tvizhqultj57ayyICvF6aACkzIPXZT69XqiylmHnwjlNT3O7dOnFUIJH1a
-m+Va/E5LNXlyx89QOAwqEKGqp/A3MFErUNfpOmTcrBpleynzxSspewPQrl9xsO4s
-XZewRypclazaHVfqHqKcpPvLTRAh/exA6ZjUreHMO0k9BTwYT2Xc+Lrg4WQNfpSB
-WiUcpM4YTIyOvj4qDQSPLVO//MFvjwliV6/zDqwwjzDSMt1CZMUV1w1gQp/5m0XA
-qHPnYMAOhEtE+xOx+fMJp7CsMQNVzT02i9S9npeAT91bNn+oBGVlbukajoeaHPMo
-RNcE4UQiTIPexGO8s49zysWTXeTsXQZRFLCB2iZP2OsQguKY0e6c4CA3j7ivo5gm
-qLhzP+kt79QQjbKBbvLu
-=hFk/
+iQIcBAEBCAAGBQJU+W+LAAoJEPGu1DbS6WIAZCYP/Aj/un167QxZMbbsUzche8Iu
+pdY+WUa+esnjlzXk+O1Az+OZo5z9MYYpNEqgRZUKc7bdbSjGyaK02bTelROCabQo
+dnwZ45h+HFjpzPBCML07+HamK5NqrT4mWIuBhM0K3huc7cEHLzwYOSoYx/VQKgaD
+39TRGYFmDWlM7xeXdf70YAYofZtrx9vNwSSPTG7d+FdQnk5RhGj0t+hug4+b+xfF
+uY2hReF2wzXhoHvAn7wEbXRsz0k/w7KIhNwe3mb4TPC25iZ3C36ifGp7pA768JCq
+pcbAsOmTk26smW9Hihj4fTaHkh79aEnUXDOC9J2VYAO+p56221ez6xOL0osbJptR
+eM9/RPBsv+so3mLTJ18HBYfy7yZeeIqRnQbarDvNImAEJUp94w5S86Rtu5cnauTH
+2voHEUYIbqsluum/3n0buBesH0ALljoBtaaQNHuDM52NkdZNkR3evpVVROKdx/S8
+YsZuz8+swkDJEEd0WiD4Wko4tZ3TrGUA95cp/ibv+99oyGbj5jCnAvtEU+LpJI3g
+JuHGFVoM/50AvVsWZ3aum3eeWHptJmDuzaCwvr1+GIRF/ZSNedw6J3t7RLSCg1K4
+gL8uGnbhCG418PNhUIV/AumBQAoPSNwqS4V2yikBZuQLUDzMckFbkfF3fXgIr7Jp
+6jij8Xszf0cmT4Hcm3q2
+=47lz
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/leveldb/files/leveldb-1.18-configure.patch b/dev-libs/leveldb/files/leveldb-1.18-configure.patch
new file mode 100644
index 000000000000..ba30fc731ad5
--- /dev/null
+++ b/dev-libs/leveldb/files/leveldb-1.18-configure.patch
@@ -0,0 +1,52 @@
+we'll handle configure ourselves in src_configure
+
+--- a/Makefile
++++ b/Makefile
+@@ -14,9 +14,6 @@ OPT ?= -O2 -DNDEBUG
+ # OPT ?= -O2 -g2 -DNDEBUG
+ #-----------------------------------------------
+ 
+-# detect what platform we're building on
+-$(shell CC="$(CC)" CXX="$(CXX)" TARGET_OS="$(TARGET_OS)" \
+-    ./build_detect_platform build_config.mk ./)
+ # this file is generated by the previous line to set build flags and sources
+ include build_config.mk
+ 
+
+control snappy/tcmalloc explicitly
+
+--- a/build_detect_platform
++++ a/build_detect_platform
+@@ -190,6 +190,7 @@
+         COMMON_FLAGS="$COMMON_FLAGS -DLEVELDB_PLATFORM_POSIX"
+     fi
+ 
++if [ "${USE_SNAPPY:-auto}" = "auto" ]; then
+     # Test whether Snappy library is installed
+     # http://code.google.com/p/snappy/
+     $CXX $CXXFLAGS -x c++ - -o $CXXOUTPUT 2>/dev/null  <<EOF
+@@ -197,15 +198,24 @@
+       int main() {}
+ EOF
+     if [ "$?" = 0 ]; then
++        USE_SNAPPY="yes"
++    fi
++fi
++    if [ "$USE_SNAPPY" = "yes" ]; then
+         COMMON_FLAGS="$COMMON_FLAGS -DSNAPPY"
+         PLATFORM_LIBS="$PLATFORM_LIBS -lsnappy"
+     fi
+ 
++if [ "${USE_TCMALLOC:-auto}" = "auto" ]; then
+     # Test whether tcmalloc is available
+     $CXX $CXXFLAGS -x c++ - -o $CXXOUTPUT -ltcmalloc 2>/dev/null  <<EOF
+       int main() {}
+ EOF
+     if [ "$?" = 0 ]; then
++        USE_TCMALLOC="yes"
++    fi
++fi
++    if [ "$USE_TCMALLOC" = "yes" ]; then
+         PLATFORM_LIBS="$PLATFORM_LIBS -ltcmalloc"
+     fi
+ 
diff --git a/dev-libs/leveldb/leveldb-1.18-r1.ebuild b/dev-libs/leveldb/leveldb-1.18-r1.ebuild
new file mode 100644
index 000000000000..6750bc377c0a
--- /dev/null
+++ b/dev-libs/leveldb/leveldb-1.18-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/leveldb/leveldb-1.18-r1.ebuild,v 1.1 2015/03/06 09:12:42 vapier Exp $
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs versionator
+
+DESCRIPTION="a fast key-value storage library written at Google"
+HOMEPAGE="http://leveldb.org/ https://github.com/google/leveldb"
+SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+snappy static-libs +tcmalloc"
+
+DEPEND="tcmalloc? ( dev-util/google-perftools )
+	snappy? (
+		app-arch/snappy
+		static-libs? ( app-arch/snappy[static-libs] )
+	)"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.18-mips.patch
+	epatch "${FILESDIR}"/${PN}-1.18-configure.patch #541186
+
+	local SHARED_MINOR=$(get_version_component_range 2)
+	sed \
+		-e "s/\(^ SHARED_MINOR =\).*/\1 ${SHARED_MINOR}/" \
+		"${FILESDIR}/${PN}-1.9.0-memenv-so.patch" > memenv-so.patch
+	epatch memenv-so.patch
+}
+
+src_configure() {
+	# These vars all get picked up by build_detect_platform
+	# which the Makefile runs for us automatically.
+	tc-export AR CC CXX
+	export OPT="-DNDEBUG ${CPPFLAGS}"
+
+	TARGET_OS="Linux" \
+	USE_SNAPPY=$(usex snappy) \
+	USE_TCMALLOC=no \
+	TMPDIR=${T} \
+	sh -x ./build_detect_platform build_config.mk ./
+}
+
+src_compile() {
+	emake $(usex static-libs 'libmemenv.a' 'LIBRARY=') all libmemenv.SHARED
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	insinto /usr/include
+	doins -r include/*
+	# This matches the path Debian picked.  Upstream provides no guidance.
+	insinto /usr/include/leveldb/helpers
+	doins helpers/memenv/memenv.h
+
+	dolib.so libleveldb*$(get_libname)*
+	use static-libs && dolib.a libleveldb.a libmemenv.a
+	dolib.so libmemenv*$(get_libname)*
+}