Version bump. Removed old.

Package-Manager: portage-2.2.0_alpha110_p5/cvs/Linux x86_64

6 files changed, 73 insertions, 71 deletions

diff --git a/dev-util/bdelta/ChangeLog b/dev-util/bdelta/ChangeLog
index 07dadef0f8ca..1a4cd617e415 100644
--- a/dev-util/bdelta/ChangeLog
+++ b/dev-util/bdelta/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/bdelta
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bdelta/ChangeLog,v 1.11 2012/01/29 08:22:00 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bdelta/ChangeLog,v 1.12 2012/06/10 08:14:29 slyfox Exp $
+
+*bdelta-0.3.0 (10 Jun 2012)
+
+  10 Jun 2012; Sergei Trofimovich <slyfox@gentoo.org> +bdelta-0.3.0.ebuild,
+  -bdelta-0.1.0.ebuild, -files/bdelta-0.1.0-ldflags.patch, bdelta-9999.ebuild:
+  Version bump. Removed old.
 
 *bdelta-9999 (29 Jan 2012)
 
diff --git a/dev-util/bdelta/Manifest b/dev-util/bdelta/Manifest
index 36c254bbe012..b94343cea73a 100644
--- a/dev-util/bdelta/Manifest
+++ b/dev-util/bdelta/Manifest
@@ -1,7 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX bdelta-0.1.0-ldflags.patch 907 RMD160 b41d9ff926d08bc3e868c65d5bf5f9fa048ffdb4 SHA1 e210509705c42ba37d93e9efad0ca7a41a298c4b SHA256 cf2bd17a23b944fde6cc00617e5e42360b9663a5c6af6c9faf7763b03ecf66b3
 AUX bdelta-0.2.3-Makefile-add-make-clean-target.patch 1309 RMD160 d115269ead8ea8b01c76477880a43fd0fb5294bc SHA1 acf7281db551ac48be4b000e2f7192f3a3bd932a SHA256 15d04ff33e94eac53df1698c680fd465ac17756725ec962e5fe76913a616d371
 AUX bdelta-0.2.3-Makefile-create-LIBDIR-as-well.patch 850 RMD160 34a0a9b1880da537710440a02152ec34bf967c55 SHA1 dfda2a96d4605331397e481b3622bdf3ef2d3377 SHA256 d741f1929a01244e1c010cb2994d1dd36b5c3206918a3d83f130433faeb9acf5
 AUX bdelta-0.2.3-Makefile-fix-paralell-building-bdelta-depends-on-it-.patch 946 RMD160 4209040ed81d32c6b76ad1775c590b124a293b45 SHA1 79ec014c513b4f88dfb8a483459b9f9f24b2e758 SHA256 2ab1298257f0c00673a230fd3afabfb19d42494a81ebfe119744bf3767f761d9
@@ -9,17 +8,17 @@ AUX bdelta-0.2.3-bdelta.h-make-header-C-compatible.patch 1808 RMD160 0c8a33ce0e7
 AUX bdelta-0.2.3-fix-stack-smash.patch 2027 RMD160 d5f496eec7854f63474cb1799ad41163afc78068 SHA1 97ec4a1b94d49af3f5f286ad89028a938c352d47 SHA256 30093e88a2c6aaf763a584532545960c707f4d855795b1296aefe371f188bb33
 AUX bdelta-0.2.3-libbdelta-rename-NDEBUG-to-DO_STATS_DEBUG.patch 1931 RMD160 baf03134d033805ae4573145c083008fa1dc46ad SHA1 f04d0b52487c60617973ab34bcd815339d69e1a4 SHA256 d34dc697f76086ff81622d5b6c4b48e261c3992bffef864fbe306f603989f0b0
 AUX bdelta-0.2.3-makefile-restect-user-s-LDFLAGS-CXXFLAGS-and-other-v.patch 1599 RMD160 2509f12cc365a16d2ab86182928f7c24775aa39a SHA1 7fde7bc229fe0353a85082a49784f52a5aa3fb3a SHA256 9fc35e43e6ffc18e0b2a919c6502f6dde81c4ad79894061f87b45a71b308e081
-DIST bdelta-0.1.0.tar.gz 7418 RMD160 5bc144bc8b40a667de4fe44611585f6241e38b79 SHA1 93ffce7de26deeaaa10a4c113101d874501f6767 SHA256 7222011d8e3d2955f1ed094a0cc3edde6c681dd82bad5edb829ed68df32cd78d
 DIST bdelta-0.2.3.tar.gz 11591 RMD160 e9e2a95601a5a9de0ca2bdb05929f767a2bc0cad SHA1 8b1bebf8c66e5a68eb0b3640df69a2fce3895a4f SHA256 331441bba7288399889e0e2d49fd469b7681b94b76682ef89dba867de4535073
-EBUILD bdelta-0.1.0.ebuild 918 RMD160 a7c178567c648093b66bd85818c2747cc57cfac1 SHA1 353b12e30ea1786180113b20915512f952b72358 SHA256 49dffbc7022e010aa17c9a17eb78c49eabf461c38a140517bf516a734048cabe
+DIST bdelta-0.3.0.tar.gz 12165 RMD160 20c7492c69abf4cd02d01929a7d163359893774c SHA1 41bc9c86719648ea50bda382f119d304601aa990 SHA256 0b47c6196021bbf9c6195dd50d845373a683ef8d47bfb45f913a73b744d23dee
 EBUILD bdelta-0.2.3.ebuild 1353 RMD160 c063b583efcb6cc5ba65a5407b6dc578b19ed593 SHA1 14109f8d3ffa933cdf442014a65cb0dbf9f41c91 SHA256 6da471d208df32eeefdaab125f12ed6ef031c590a27844d28a21e19a83c96af1
-EBUILD bdelta-9999.ebuild 705 RMD160 e5aafd1ef5fdf103a7f8931d6b5bcb61b7ef4cd3 SHA1 1d4ad4053be4ea5ee19c5c5f3999c2c21fddba05 SHA256 263fd1f82f1abe117c17a78f8c3c72c515d52396d9137a2612d8c0baa4fea9e0
-MISC ChangeLog 2257 RMD160 96f9d933bb2d6cd17b75c25d0b77b5b1df0b3126 SHA1 e80c21d5e1290a8f161d7527ffefa589ff771ed5 SHA256 6f577fa353f3baa343b519446df48b4d2a84210c8bfb902fdda037bcfefd0128
+EBUILD bdelta-0.3.0.ebuild 994 RMD160 370434046d9bc2c44b252ac4958be0e7952f4764 SHA1 d4a5ac8a3383c7b1606a74e2746885db48cd8f65 SHA256 d7a244efe009ac8a9dc87a37a114f21e1edf67a388d4a16068ec0bb4969a45cf
+EBUILD bdelta-9999.ebuild 993 RMD160 b06ac237f38641e6a1a1cb2931277f1e72a66e03 SHA1 5ab1f1e94dd5b6b6e4ebbf53b2eea0ab40fe7a38 SHA256 e629f2b8f3d13e9588cb925887cb132e308242c364972974063f610f71f94bab
+MISC ChangeLog 2471 RMD160 cd03179b1609500a297872ad233877470001aed3 SHA1 0d9e35314db04e9114a6dfe6f35e1d838bdea7b9 SHA256 5423e72cbd43f07f26ad2984719066281051f37c1c6088a624fff514e3e93e23
 MISC metadata.xml 322 RMD160 8292bc57400fbe15ef6a9df74f278445d50cc351 SHA1 df693a5cf09c9308060b010684aedd3f07080c56 SHA256 417eaecffa630e3e379e46d7b6cd9b5a48c27ab7b0eb2f581076efd79df49262
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk8lArIACgkQcaHudmEf86r7fgCeOrupXPJ7Aw/d8K3E1gZ0OUzf
-nZgAninm67OaL/0zm2ljEmZPfd20YTof
-=olaa
+iEYEARECAAYFAk/UWK4ACgkQcaHudmEf86px2ACfXEXQT8NgG5taMzya+i3Qy57O
+QVYAnRgYiVL9R0R564ys38yFHeQI/f9+
+=t1tE
 -----END PGP SIGNATURE-----
diff --git a/dev-util/bdelta/bdelta-0.1.0.ebuild b/dev-util/bdelta/bdelta-0.1.0.ebuild
deleted file mode 100644
index e99002b5a66c..000000000000
--- a/dev-util/bdelta/bdelta-0.1.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bdelta/bdelta-0.1.0.ebuild,v 1.6 2009/07/11 17:35:56 vostorga Exp $
-
-inherit multilib toolchain-funcs eutils
-
-DESCRIPTION="Binary Delta - Efficient difference algorithm and format"
-HOMEPAGE="http://deltup.sourceforge.net"
-SRC_URI="mirror://sourceforge/deltup/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	# Set correct libdir
-	sed -i -e "s:\(LIBDIR=\${PREFIX}/\)lib:\1$(get_libdir):" \
-		"${S}"/Makefile || die "sed failed"
-	# Fixing ldflags
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CXXFLAGS="${CXXFLAGS}" -j1 || die "emake failed"
-}
-
-src_install() {
-	dodir /usr/$(get_libdir)
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc README
-}
diff --git a/dev-util/bdelta/bdelta-0.3.0.ebuild b/dev-util/bdelta/bdelta-0.3.0.ebuild
new file mode 100644
index 000000000000..c28e3ebd71b7
--- /dev/null
+++ b/dev-util/bdelta/bdelta-0.3.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bdelta/bdelta-0.3.0.ebuild,v 1.1 2012/06/10 08:14:29 slyfox Exp $
+
+EAPI=4
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="git://github.com/jjwhitney/BDelta.git"
+	UNPACKER_ECLASS="git-2"
+	LIVE_EBUILD=yes
+else
+	UNPACKER_ECLASS="vcs-snapshot"
+fi
+
+inherit multilib toolchain-funcs ${UNPACKER_ECLASS}
+
+if [[ -z ${LIVE_EBUILD} ]]; then
+	KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-linux"
+	SRC_URI="http://github.com/jjwhitney/BDelta/tarball/v${PV} -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="Binary Delta - Efficient difference algorithm and format"
+HOMEPAGE="http://bdelta.org"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS=""
+IUSE=""
+
+src_compile() {
+	emake -C src \
+		CXX="$(tc-getCXX)" \
+		CXXFLAGS="${CXXFLAGS}"
+}
+
+src_install() {
+	emake -C src install \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+	dodoc README Format
+}
diff --git a/dev-util/bdelta/bdelta-9999.ebuild b/dev-util/bdelta/bdelta-9999.ebuild
index c883bf0a2b0a..28437e380ac2 100644
--- a/dev-util/bdelta/bdelta-9999.ebuild
+++ b/dev-util/bdelta/bdelta-9999.ebuild
@@ -1,15 +1,26 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bdelta/bdelta-9999.ebuild,v 1.1 2012/01/29 08:22:00 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bdelta/bdelta-9999.ebuild,v 1.2 2012/06/10 08:14:29 slyfox Exp $
 
-EAPI="4"
+EAPI=4
 
-inherit git-2 multilib toolchain-funcs
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="git://github.com/jjwhitney/BDelta.git"
+	UNPACKER_ECLASS="git-2"
+	LIVE_EBUILD=yes
+else
+	UNPACKER_ECLASS="vcs-snapshot"
+fi
+
+inherit multilib toolchain-funcs ${UNPACKER_ECLASS}
+
+if [[ -z ${LIVE_EBUILD} ]]; then
+	KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-linux"
+	SRC_URI="http://github.com/jjwhitney/BDelta/tarball/v${PV} -> ${P}.tar.gz"
+fi
 
 DESCRIPTION="Binary Delta - Efficient difference algorithm and format"
 HOMEPAGE="http://bdelta.org"
-SRC_URI=""
-EGIT_REPO_URI="git://github.com/jjwhitney/BDelta.git"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -27,5 +38,5 @@ src_install() {
 		DESTDIR="${D}" \
 		PREFIX="${EPREFIX}/usr" \
 		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-	dodoc README
+	dodoc README Format
 }
diff --git a/dev-util/bdelta/files/bdelta-0.1.0-ldflags.patch b/dev-util/bdelta/files/bdelta-0.1.0-ldflags.patch
deleted file mode 100644
index 587dace27415..000000000000
--- a/dev-util/bdelta/files/bdelta-0.1.0-ldflags.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -NrU5 bdelta-0.1.0.original/Makefile bdelta-0.1.0/Makefile
---- bdelta-0.1.0.original/Makefile	2009-07-11 10:50:13.000000000 -0600
-+++ bdelta-0.1.0/Makefile	2009-07-11 11:01:30.000000000 -0600
-@@ -4,16 +4,16 @@
- LIBDIR=${PREFIX}/lib
- CXXFLAGS=-O2
- 
- all: bpatch libbdelta.so bdelta
- libbdelta.so: libbdelta.cpp container.h
--	${CC} -shared -fPIC ${CXXFLAGS} $< -o $@
-+	${CC} -shared -fPIC ${CXXFLAGS} ${LDFLAGS} $< -o $@
- bdelta: bdelta.cpp container.h file.h
--	${CC} $< -o $@ ${CXXFLAGS} -L. -lbdelta -lstdc++
-+	${CC} $< -o $@ ${CXXFLAGS} ${LDFLAGS} -L. -lbdelta -lstdc++
- bpatch: bpatch.cpp file.h
- % : %.cpp
--	${CC} $< -o $@ ${CXXFLAGS} -lstdc++
-+	${CC} $< -o $@ ${CXXFLAGS} ${LDFLAGS} -lstdc++
- install: libbdelta.so bdelta bpatch
- 	mkdir -p $(DESTDIR)$(BINDIR)
- 	install -m 755 libbdelta.so $(DESTDIR)$(LIBDIR)
- 	install -m 755 bdelta $(DESTDIR)$(BINDIR)
- 	install -m 755 bpatch $(DESTDIR)$(BINDIR)