Version bump. Removed old.

(Portage version: 2.2.0_alpha110_p5/cvs/Linux x86_64)

5 files changed, 66 insertions, 63 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/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)