Version bump (using Fedora snapshot) and remove old. Thanks a lot to Alon Bar-Lev for his help (#396067).

(Portage version: 2.1.10.59/cvs/Linux x86_64)

4 files changed, 70 insertions, 43 deletions

diff --git a/app-arch/deltarpm/ChangeLog b/app-arch/deltarpm/ChangeLog
index f968e85840cc..ab363112b7ee 100644
--- a/app-arch/deltarpm/ChangeLog
+++ b/app-arch/deltarpm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-arch/deltarpm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/deltarpm/ChangeLog,v 1.7 2012/05/07 10:04:22 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/deltarpm/ChangeLog,v 1.8 2012/05/15 08:41:59 pacho Exp $
+
+*deltarpm-3.6_pre20110223 (15 May 2012)
+
+  15 May 2012; Pacho Ramos <pacho@gentoo.org> +deltarpm-3.6_pre20110223.ebuild,
+  +files/3.6_pre20110223-build.patch, -deltarpm-3.5.ebuild:
+  Version bump (using Fedora snapshot) and remove old. Thanks a lot to Alon Bar-
+  Lev for his help (#396067).
 
   07 May 2012; Pacho Ramos <pacho@gentoo.org> -deltarpm-3.3.ebuild,
   -deltarpm-3.4.ebuild:
diff --git a/app-arch/deltarpm/deltarpm-3.5.ebuild b/app-arch/deltarpm/deltarpm-3.5.ebuild
deleted file mode 100644
index 10addb0f20e8..000000000000
--- a/app-arch/deltarpm/deltarpm-3.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/deltarpm/deltarpm-3.5.ebuild,v 1.1 2010/05/18 08:58:16 jlec Exp $
-
-EAPI="3"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="tools to create and apply deltarpms"
-HOMEPAGE="ftp://ftp.suse.com/pub/projects/deltarpm/"
-SRC_URI="ftp://ftp.suse.com/pub/projects/deltarpm/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	sys-libs/zlib
-	app-arch/xz-utils
-	app-arch/bzip2
-	<app-arch/rpm-5"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-zlib.patch
-	sed -i \
-		-e '/^prefix/s:/local::' \
-		-e '/^mandir/s:/man:/share/man:' \
-		Makefile || die
-}
-
-src_compile() {
-	emake \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die
-	dodoc README
-}
diff --git a/app-arch/deltarpm/deltarpm-3.6_pre20110223.ebuild b/app-arch/deltarpm/deltarpm-3.6_pre20110223.ebuild
new file mode 100644
index 000000000000..63970b28ef2c
--- /dev/null
+++ b/app-arch/deltarpm/deltarpm-3.6_pre20110223.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/deltarpm/deltarpm-3.6_pre20110223.ebuild,v 1.1 2012/05/15 08:41:59 pacho Exp $
+
+EAPI="4"
+PYTHON_DEPEND="python? 2:2.7"
+
+inherit eutils toolchain-funcs python
+
+SNAPSHOT="20110223"
+
+DESCRIPTION="tools to create and apply deltarpms"
+HOMEPAGE="http://gitorious.org/deltarpm/deltarpm"
+SRC_URI="http://pkgs.fedoraproject.org/repo/pkgs/${PN}/${PN}-git-${SNAPSHOT}.tar.bz2/70f8884be63614ca7c3fc888cf20ebc8/${PN}-git-${SNAPSHOT}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="python"
+
+DEPEND="sys-libs/zlib
+	app-arch/xz-utils
+	app-arch/bzip2
+	<app-arch/rpm-5"
+
+S="${WORKDIR}/${PN}-git-${SNAPSHOT}"
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	sed -i \
+		-e '/^prefix/s:/local::' \
+		-e '/^mandir/s:/man:/share/man:' \
+		Makefile || die
+	epatch "${FILESDIR}/3.6_pre20110223-build.patch"
+}
+
+src_compile() {
+	emake -j1 CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)"
+
+	if use python; then
+		emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" python
+	fi
+}
diff --git a/app-arch/deltarpm/files/3.6_pre20110223-build.patch b/app-arch/deltarpm/files/3.6_pre20110223-build.patch
new file mode 100644
index 000000000000..c7feea74f893
--- /dev/null
+++ b/app-arch/deltarpm/files/3.6_pre20110223-build.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 0d0028f..9d05d59 100644
+--- a/Makefile
++++ b/Makefile
+@@ -41,7 +41,7 @@ _deltarpmmodule.so: readdeltarpm.o rpmhead.o util.o md5.o cfile.o $(zlibbundled)
+ 			if [ ! -f "python$$PYVER/$@" ]; then \
+ 				mkdir -p python$$PYVER ;\
+ 				$(CC) $(CFLAGS) $$PYCFLAGS $(zlibcppflag) -fPIC -c -o python$$PYVER/deltarpmmodule.o deltarpmmodule.c ;\
+-				$(CC) -o python$$PYVER/$@ python$$PYVER/deltarpmmodule.o $^ -shared -Wl,-soname,_deltarpmmodule.so $(LDLIBS) $$PYLDFLAGS; \
++				$(CC) -o python$$PYVER/$@ python$$PYVER/deltarpmmodule.o $^ -shared -Wl,-soname,_deltarpmmodule.so $(LDLIBS) $(LDFLAGS) $$PYLDFLAGS; \
+ 			fi; \
+ 		fi; \
+ 	done