Rewrite from scratch to fix innumerable errors.

Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

6 files changed, 127 insertions, 40 deletions

diff --git a/dev-libs/leveldb/ChangeLog b/dev-libs/leveldb/ChangeLog
index 541ccf7b0682..be7b56915ec9 100644
--- a/dev-libs/leveldb/ChangeLog
+++ b/dev-libs/leveldb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/leveldb
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/leveldb/ChangeLog,v 1.6 2013/03/26 09:11:42 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/leveldb/ChangeLog,v 1.7 2013/04/13 06:03:36 vapier Exp $
+
+*leveldb-1.9.0-r5 (13 Apr 2013)
+
+  13 Apr 2013; Mike Frysinger <vapier@gentoo.org>
+  +files/leveldb-1.9.0-configure.patch, +leveldb-1.9.0-r5.ebuild,
+  -leveldb-1.9.0-r3.ebuild, metadata.xml:
+  Rewrite from scratch to fix innumerable errors.
 
 *leveldb-1.9.0-r3 (26 Mar 2013)
 
diff --git a/dev-libs/leveldb/Manifest b/dev-libs/leveldb/Manifest
index 217271f6f5d7..f2c51e58c018 100644
--- a/dev-libs/leveldb/Manifest
+++ b/dev-libs/leveldb/Manifest
@@ -1,4 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX leveldb-1.9.0-configure.patch 990 SHA256 7e509d4a77fc8ae77082f9b54e505dd6b42eca9af36e2b9e03bfe4a25472b529 SHA512 28f08e257d0f067d93ea88ee30719c092660ab7d220a55d4fa1cec5c5fd8195465e374670aa46c7a125f218ae3a689f3bb58ce66ddc720a2fc1caed552ed27e5 WHIRLPOOL eafac457577fc66a0d096b50c408c5e5298278cc071c5ea867ea61c4bdff1c95759ea73cf60be4ee6f5dfa20babce075d2efe928345f39538789c8c3995403de
 DIST leveldb-1.9.0.tar.gz 203872 SHA256 b2699b04e5aba8e98382c4955b94725d1f76bd0b5decd60c5628205b717a1d4f SHA512 47b0a3272eef2d677ddeb8d0c973e59a1be4bff580528c3bc3f83a654f41485ecc86892d9124ce21ef747c220f98cdad687436849dc978adfd42f8c8c05b9160 WHIRLPOOL 301ba45968095420ff72da36f128bd916d4e039385270eecd8e077aac3781ed12931c9a7d426842e197fd62a99ad6477e5eabbca7524fcba2a185a702f4ef22a
-EBUILD leveldb-1.9.0-r3.ebuild 1036 SHA256 9ebe4dc21fbd646b133aaf81d3513766e0c7ce38b06b19d8ef5ce1a34b1c7ce0 SHA512 1e2e81ec80ec0d99f26b5285f62298901bf9e1dd760355feb69f987965670006f0b74a30fd1a0098e72240a210b2765f5d9b78cb2b29cb6b006a860de4240c92 WHIRLPOOL 2bdf920d604abe24fc2599930be979cd6f836b8cf525adef95de1c7a3e8e6665b9f811991809224e999e01dbdbf35664457f217a110011a335720c6fd1b75674
-MISC ChangeLog 1079 SHA256 a63eb2b6f8b59c80a6fff1916ae73cd2f3dd9040dfd67969d9fff2540bb9ac10 SHA512 dd93123a0e807eab81dc59dc0d1a3b1421b801b1333b8d55d1a67db8a4f421df3af7ac784ceb9c5f895e5f79c077c601ebd6f523f2f4c7e8cc7f87979b3f5ca7 WHIRLPOOL 19670933c4f85f5100f1350c5cd09d131b29f9b237b117f59f4a32d0e1bed9e232fd338898ba43cf50dec0aa735a82016f1486d709c191be82e9db20a0f017ff
-MISC metadata.xml 233 SHA256 65209e280ca6de32a92e1a57301ff69fb3472e55ba07848d6f80405d35e92d47 SHA512 0d30bfb39315a04767e07896409f5d3954f8e954e20fcbac7b92bb9a636c9f61c50b1b2cf55e6c1db9a199a0edc159b5c8cc8f541efb9c4adafa28e3652cff7b WHIRLPOOL 027c5101e1cbc665c9d2ef240f73a874c9f49a9b70175c5947e012df61de484585088a46b6ce9078816e548e6bcc326e7223539cc999159eee2757d0a2eb1480
+EBUILD leveldb-1.9.0-r5.ebuild 1328 SHA256 0b98c4b2cb3ae64d197e5e509d31069e79de9fb0eb50b07e0da78cf0e224f751 SHA512 89227299eda88517bd80c56736b2f2122ace5a25b4afe9f0ea48e8a52cede3d3c3edc61f57f2ef1c83d5523d4002c9a07c95d17d2dde255ea518d1e1ef6227ba WHIRLPOOL f8f4ba35b0da009901b448289bef152eec96834d8cc5b8cdebed32187c5061d0901af41ae614ff96d85a4ddbb5c8564e6ac401820fe947bcbdfd12fdb58d1546
+MISC ChangeLog 1320 SHA256 d86d44931f0ba146774108c97294abc15e2b31b494ee0328ce6a9004eb726221 SHA512 f9d7eb1568fa53ba6414c656f9863168c95389deedfad35033eab9c4121055577040f4a31033f8a8e57338993d93afb8405d1edd5ce0de4c305127864f78298c WHIRLPOOL e3cbceeadece285aee02cb67f7e3dca9c4443edbedd07ad9405429b7a5bd5cb22759e6a9d28a68ad4ebd6d69e982ad863794ec8fb10126d4454dc58287527814
+MISC metadata.xml 316 SHA256 aa2f1474541fc5a99a65dc0b6660cb6738bd9b147d988dab61aa84e1e7284004 SHA512 c7efdc1ef3d47b68061968e2794b26e06655f7d8d95a2f06c251d14fb0a93f42c9277b4714807e6d9281867e97bb0f1e2e51632ba41d4456e8d81bbf11baab2c WHIRLPOOL 75ee0f94e506c13c10b1557cf7ac3db73aff8e518785e8620fb6466f347ec0006870858d5e1862fc0a83d6154a3da6223a4db6d671875857191ec43395d05e92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJRaPWYAAoJELEHsLL7fEFW2KYQALZCgY+pdLshlZjI4M0KsNMO
+Jma8elZzjQcm0U6rUVIJX27mEsnbkctO5VcaIY6VCRzvlcSU1cxgUEzwYTOCURkw
+U3kPCk4v0og0iNeLkXI9b8TSj395TSxNhQWtr0s0klWJdn+817yBnChUeeF4OlIj
+IaOwcDjLsOAEhCTMx+ewLjqjMTApiCqkN/5eydEaJYenlGbOzR1iWFN2DeLTgLQT
+1mVzmMQP/eAJXO5ClFSP2gyGCt49b2KYRLW9PjsTwzo95mLZLhqVM/hLAajmJHYD
+Jyf3YKC+eYCu0OIBa4GKKZgRLCa27TzULh2yYvUles5c9Iw1WeD50aYSwO4WYHd0
+zUjXiQdFg2/sTaegFiaunkiwOWmb6I3/eyFCkMvfECftDhUAYU5bFjmMKtkv+us+
+OaMTSHV7/7cfkv04fhV2OmhXtVf2CYEauTs7QYqYaoMFaY5ped3w7tfZmpf1jaYe
++yZY+nbPidGwJIztU9nzfXwkQ8TX/C3l0AIFr3JU+OK8uAEKFYqU8cU+3XC89gox
+EycWzfogl8sKd9gQ9jg6qps3szG/1z7GC49ZzJP87Klf/+SYdybr34dp93rasz0K
+MTt6xLUtdFVDM3+AM41Qg7tmx8hjK6FCvAqc5aPR973uvBAlcoXwXerCqq8Y9qZU
+aM1jGQ/K5cNS0MSvJsMv
+=g4Lt
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/leveldb/files/leveldb-1.9.0-configure.patch b/dev-libs/leveldb/files/leveldb-1.9.0-configure.patch
new file mode 100644
index 000000000000..d25fe01f6835
--- /dev/null
+++ b/dev-libs/leveldb/files/leveldb-1.9.0-configure.patch
@@ -0,0 +1,35 @@
+diff --git a/build_detect_platform b/build_detect_platform
+index 5801d20..4b4bb0d 100755
+--- a/build_detect_platform
++++ b/build_detect_platform
+@@ -169,20 +169,30 @@ EOF
+ 
+     # Test whether Snappy library is installed
+     # http://code.google.com/p/snappy/
++if [ "${USE_SNAPPY:-auto}" = "auto" ]; then
+     $CXX $CXXFLAGS -x c++ - -o /dev/null 2>/dev/null  <<EOF
+       #include <snappy.h>
+       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
+ 
+     # Test whether tcmalloc is available
++if [ "${USE_TCMALLOC:-auto}" = "auto" ]; then
+     $CXX $CXXFLAGS -x c++ - -o /dev/null -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
+ fi
diff --git a/dev-libs/leveldb/leveldb-1.9.0-r3.ebuild b/dev-libs/leveldb/leveldb-1.9.0-r3.ebuild
deleted file mode 100644
index 742d7d103e37..000000000000
--- a/dev-libs/leveldb/leveldb-1.9.0-r3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/leveldb/leveldb-1.9.0-r3.ebuild,v 1.1 2013/03/26 09:11:42 patrick Exp $
-EAPI=4
-
-PYTHON_DEPEND="2:2.6"
-inherit eutils multilib
-
-DESCRIPTION="A fast key-value storage library written at Google"
-
-HOMEPAGE="http://code.google.com/p/leveldb/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-IUSE=""
-
-DEPEND="app-arch/snappy"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	emake all || die
-	emake libmemenv.a || die
-}
-
-src_install() {
-	mkdir -p "${D}/usr/include"
-	cp -r include/* "${D}/usr/include" || die
-	cp helpers/memenv/memenv.h "${D}/usr/include" || die
-	dolib.so libleveldb.so.${PV/.0} || die
-	dosym libleveldb$(get_libname ).1.9 /usr/$(get_libdir)/libleveldb$(get_libname ) || die
-	dosym libleveldb$(get_libname ).1.9 /usr/$(get_libdir)/libleveldb$(get_libname ).1 || die
-	dolib.a libleveldb.a || die
-	dolib.a libmemenv.a || die
-}
diff --git a/dev-libs/leveldb/leveldb-1.9.0-r5.ebuild b/dev-libs/leveldb/leveldb-1.9.0-r5.ebuild
new file mode 100644
index 000000000000..c8de6d8d1de2
--- /dev/null
+++ b/dev-libs/leveldb/leveldb-1.9.0-r5.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/leveldb/leveldb-1.9.0-r5.ebuild,v 1.1 2013/04/13 06:03:36 vapier Exp $
+
+EAPI=4
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="a fast key-value storage library written at Google"
+HOMEPAGE="http://code.google.com/p/leveldb/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+snappy static-libs"
+
+DEPEND="
+	snappy? (
+		app-arch/snappy
+		static-libs? ( app-arch/snappy[static-libs] )
+	)"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.9.0-configure.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}"
+	# Probably needs more filling out
+	export TARGET_OS
+	case ${CHOST} in
+	*) TARGET_OS="Linux";;
+	esac
+	export USE_SNAPPY=$(usex snappy)
+	export USE_TCMALLOC=no
+}
+
+src_compile() {
+	emake $(usex static-libs '' 'LIBRARY=') all libmemenv.a
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	insinto /usr/include
+	doins -r include/* helpers/memenv/memenv.h
+	dolib.so libleveldb*$(get_libname)*
+	use static-libs && dolib.a libleveldb.a
+	dolib.a libmemenv.a
+}
diff --git a/dev-libs/leveldb/metadata.xml b/dev-libs/leveldb/metadata.xml
index 24cbb90cf0c4..2179f7283bec 100644
--- a/dev-libs/leveldb/metadata.xml
+++ b/dev-libs/leveldb/metadata.xml
@@ -5,4 +5,7 @@
 		<email>patrick@gentoo.org</email>
 		<name>Patrick Lauer</name>
 	</maintainer>
+	<use>
+		<flag name='snappy'>support the snappy compression library</flag>
+	</use>
 </pkgmetadata>