Rewrite from scratch to fix innumerable errors.

(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)

5 files changed, 103 insertions, 37 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/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>