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

Package-Manager: portage-2.1.10.59/cvs/Linux x86_64

5 files changed, 77 insertions, 49 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/Manifest b/app-arch/deltarpm/Manifest
index ddc82f811557..14ae07518b24 100644
--- a/app-arch/deltarpm/Manifest
+++ b/app-arch/deltarpm/Manifest
@@ -2,14 +2,15 @@
 Hash: SHA1
 
 AUX 3.5-zlib.patch 1809 RMD160 cfdc6bbb5d413ab68bba1dcc13f09f61359cce74 SHA1 61e6f77b6ee5c11b56cbe01804e27925a2c47b39 SHA256 00a06bbc7fa27c77d2856a1035a103fb95d887b653d49a14f5b4e9ef775f13aa
-DIST deltarpm-3.5.tar.bz2 492136 RMD160 6dd307261ab546d238a8009dc6f73d1eb16fbf76 SHA1 07cc1ec30f63344fde0eee478e146b77dd0e80c0 SHA256 db534094ce7ae7e50f85fb085ebb9147054383cec87279df34eed0434ec8a321
-EBUILD deltarpm-3.5.ebuild 883 RMD160 bdb0fe34192238e09418b8ca930ef2880bd6b997 SHA1 9672d1d14dccb64715c02023bd2affb1250007b3 SHA256 baf39db57dd3331bbd1a8701c3ec6bdd0fdcd8d883bc0a7e0c456d069d384b94
-MISC ChangeLog 1238 RMD160 68d427fc32aa6fba2840afe0c369723357cabef5 SHA1 34018867d37f4a467f2d4f5602e3da925aec5644 SHA256 cef20c923e3c36f9b9245e49345b9cda398908aa5ea5ff329cce37bc23652964
+AUX 3.6_pre20110223-build.patch 671 RMD160 cbdace745ea97aae0471a19d34314593dcbdb282 SHA1 3d7bb1a2b80a41a6794e0ccb642e85f64c9ceb19 SHA256 8546c0cb64b9f05637409fc3a583463a81372e943de338018383781e72ca05e5
+DIST deltarpm-git-20110223.tar.bz2 499623 RMD160 a574852d57ec890c85845586d43ff19827ace57a SHA1 9f8b104b655443808918be1479da95b2edffb8b0 SHA256 e4d6cad74cece0c6e48d5c49929e00a23ba116ff88a09245ad1d7ac84610c089
+EBUILD deltarpm-3.6_pre20110223.ebuild 1194 RMD160 b720ab94b6d4210d22b455eb9d957a02dd49e105 SHA1 73abb1ecca33e5fbcbebf8e6f209493282c25436 SHA256 2889ed994491c556d77e0262f6e725a2147edd6732e1ff3f6196b83a88fc1e3f
+MISC ChangeLog 1531 RMD160 7d4be0ffc030aa054ed80b617b83987aa1e26893 SHA1 1514750008842013f4acf8b5925260407da46d0b SHA256 6c6289b3b7d93cf402782b18c39a417c9beb838bc2cadf95e423509189caeefb
 MISC metadata.xml 283 RMD160 93acc86af98a92564ffca5ac2702e9479f6307c7 SHA1 d3bceeeb9c4f9fc77cde39a1c18905cf7a375f5f SHA256 3247d30e9493e7df96765019120ffbb070bee3007e584d2a7909e55ddcddb078
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk+nniwACgkQCaWpQKGI+9Q6jQCfQuL9zT37ZEGxN1lJPZhI7+Fw
-TM0An0iQwgSl3gjhhrZCiUCcNDRvSXtT
-=c9hz
+iEYEARECAAYFAk+yFtwACgkQCaWpQKGI+9SDmACfc8ZFzwtyk4oBplK78Ejq+FBz
+UmsAn0Gl3n5y3kZvDbNr+yVds4MFPOnL
+=Vykt
 -----END PGP SIGNATURE-----
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