3 files changed, 125 insertions, 1 deletions
diff --git a/net-libs/libs3/ChangeLog b/net-libs/libs3/ChangeLog
index bce9afb71f8b..9aa33f88502f 100644
--- a/net-libs/libs3/ChangeLog
+++ b/net-libs/libs3/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/libs3
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libs3/ChangeLog,v 1.2 2012/02/20 04:20:30 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libs3/ChangeLog,v 1.3 2012/11/10 11:21:40 jlec Exp $
+
+*libs3-2.0-r1 (10 Nov 2012)
+
+  10 Nov 2012; Justin Lecher <jlec@gentoo.org> +libs3-2.0-r1.ebuild,
+  +files/libs3-2.0-build.patch:
+  Drop Werror; do not strip files, #438416; respect CC; be verbose in build;
+  support sane multilib; handle static libs
 
   20 Feb 2012; Mike Gilbert <floppym@gentoo.org> metadata.xml:
   Drop no-herd.
diff --git a/net-libs/libs3/files/libs3-2.0-build.patch b/net-libs/libs3/files/libs3-2.0-build.patch
new file mode 100644
index 000000000000..804a0d28332a
--- /dev/null
+++ b/net-libs/libs3/files/libs3-2.0-build.patch
@@ -0,0 +1,83 @@
+ GNUmakefile | 23 ++++++++++++-----------
+ 1 file changed, 12 insertions(+), 11 deletions(-)
+
+diff --git a/GNUmakefile b/GNUmakefile
+index 36398c1..dc24843 100644
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -60,7 +60,7 @@ LIBS3_VER := $(LIBS3_VER_MAJOR).$(LIBS3_VER_MINOR)
+ # any value, then verbosity is turned on".  So don't define VERBOSE if you
+ # don't want verbosity in the build process.
+ # -----------------------------------------------------------------------------
+-
++VERBOSE = true
+ ifdef VERBOSE
+         VERBOSE = true
+         VERBOSE_ECHO = @ echo
+@@ -125,7 +125,7 @@ ifndef CFLAGS
+     endif
+ endif
+ 
+-CFLAGS += -Wall -Werror -Wshadow -Wextra -Iinc \
++CFLAGS += -Wall -Wshadow -Wextra -Iinc \
+           $(CURL_CFLAGS) $(LIBXML2_CFLAGS) \
+           -DLIBS3_VER_MAJOR=\"$(LIBS3_VER_MAJOR)\" \
+           -DLIBS3_VER_MINOR=\"$(LIBS3_VER_MINOR)\" \
+@@ -134,7 +134,8 @@ CFLAGS += -Wall -Werror -Wshadow -Wextra -Iinc \
+           -D_ISOC99_SOURCE \
+           -D_POSIX_C_SOURCE=200112L
+ 
+-LDFLAGS = $(CURL_LIBS) $(LIBXML2_LIBS) -lpthread
++LDFLAGS += -lpthread
++LIBS = $(CURL_LIBS) $(LIBXML2_LIBS)
+ 
+ 
+ # --------------------------------------------------------------------------
+@@ -157,11 +158,11 @@ exported: libs3 s3 headers
+ .PHONY: install
+ install: exported
+ 	$(QUIET_ECHO) $(DESTDIR)/bin/s3: Installing executable
+-	$(VERBOSE_SHOW) install -Dps -m u+rwx,go+rx $(BUILD)/bin/s3 \
++	$(VERBOSE_SHOW) install -Dp -m u+rwx,go+rx $(BUILD)/bin/s3 \
+                     $(DESTDIR)/bin/s3
+ 	$(QUIET_ECHO) \
+         $(DESTDIR)/lib/libs3.so.$(LIBS3_VER): Installing shared library
+-	$(VERBOSE_SHOW) install -Dps -m u+rw,go+r \
++	$(VERBOSE_SHOW) install -Dp -m u+rw,go+r \
+                $(BUILD)/lib/libs3.so.$(LIBS3_VER_MAJOR) \
+                $(DESTDIR)/lib/libs3.so.$(LIBS3_VER)
+ 	$(QUIET_ECHO) \
+@@ -199,18 +200,18 @@ uninstall:
+ $(BUILD)/obj/%.o: src/%.c
+ 	$(QUIET_ECHO) $@: Compiling object
+ 	@ mkdir -p $(dir $(BUILD)/dep/$<)
+-	@ gcc $(CFLAGS) -M -MG -MQ $@ -DCOMPILINGDEPENDENCIES \
++	$(CC) $(CFLAGS) -M -MG -MQ $@ -DCOMPILINGDEPENDENCIES \
+         -o $(BUILD)/dep/$(<:%.c=%.d) -c $<
+ 	@ mkdir -p $(dir $@)
+-	$(VERBOSE_SHOW) gcc $(CFLAGS) -o $@ -c $<
++	$(VERBOSE_SHOW) $(CC) $(CFLAGS) -o $@ -c $<
+ 
+ $(BUILD)/obj/%.do: src/%.c
+ 	$(QUIET_ECHO) $@: Compiling dynamic object
+ 	@ mkdir -p $(dir $(BUILD)/dep/$<)
+-	@ gcc $(CFLAGS) -M -MG -MQ $@ -DCOMPILINGDEPENDENCIES \
++	$(CC) $(CFLAGS) -M -MG -MQ $@ -DCOMPILINGDEPENDENCIES \
+         -o $(BUILD)/dep/$(<:%.c=%.dd) -c $<
+ 	@ mkdir -p $(dir $@)
+-	$(VERBOSE_SHOW) gcc $(CFLAGS) -fpic -fPIC -o $@ -c $< 
++	$(VERBOSE_SHOW) $(CC) $(CFLAGS) -fpic -fPIC -o $@ -c $< 
+ 
+ 
+ # --------------------------------------------------------------------------
+@@ -230,8 +231,8 @@ LIBS3_SOURCES := acl.c bucket.c error_parser.c general.c \
+ $(LIBS3_SHARED): $(LIBS3_SOURCES:%.c=$(BUILD)/obj/%.do)
+ 	$(QUIET_ECHO) $@: Building shared library
+ 	@ mkdir -p $(dir $@)
+-	$(VERBOSE_SHOW) gcc -shared -Wl,-soname,libs3.so.$(LIBS3_VER_MAJOR) \
+-        -o $@ $^ $(LDFLAGS)
++	$(VERBOSE_SHOW) $(CC) $(LDFLAGS) -shared -Wl,-soname,libs3.so.$(LIBS3_VER_MAJOR) \
++        -o $@ $^ $(LIBS)
+ 
+ $(LIBS3_STATIC): $(LIBS3_SOURCES:%.c=$(BUILD)/obj/%.o)
+ 	$(QUIET_ECHO) $@: Building static library
diff --git a/net-libs/libs3/libs3-2.0-r1.ebuild b/net-libs/libs3/libs3-2.0-r1.ebuild
new file mode 100644
index 000000000000..5e64a4be00cb
--- /dev/null
+++ b/net-libs/libs3/libs3-2.0-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libs3/libs3-2.0-r1.ebuild,v 1.1 2012/11/10 11:21:40 jlec Exp $
+
+EAPI=4
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="A C Library API for Amazon S3"
+HOMEPAGE="http://libs3.ischo.com.s3.amazonaws.com/index.html"
+SRC_URI="http://libs3.ischo.com.s3.amazonaws.com/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+RDEPEND="
+	net-misc/curl
+	dev-libs/libxml2"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
+	sed \
+		-e "s:/lib/:/$(get_libdir)/:g" \
+		-i *makefile* || die
+	tc-export CC
+}
+
+src_install() {
+	emake DESTDIR="${ED}/usr" install
+	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*a
+}