Drop old.

(Portage version: 2.2.0_alpha183/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

4 files changed, 8 insertions, 129 deletions

diff --git a/media-gfx/zbar/ChangeLog b/media-gfx/zbar/ChangeLog
index 89472c282056..25c22d5e051b 100644
--- a/media-gfx/zbar/ChangeLog
+++ b/media-gfx/zbar/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/zbar
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/ChangeLog,v 1.10 2013/04/19 20:11:10 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/ChangeLog,v 1.11 2013/06/23 18:57:40 xmw Exp $
+
+  23 Jun 2013; Michael Weber <xmw@gentoo.org> -zbar-0.10-r1.ebuild,
+  -zbar-0.10-r2.ebuild, zbar-0.10-r3.ebuild:
+  Drop old.
 
 *zbar-0.10-r3 (19 Apr 2013)
 
diff --git a/media-gfx/zbar/zbar-0.10-r1.ebuild b/media-gfx/zbar/zbar-0.10-r1.ebuild
deleted file mode 100644
index 4928a1d1a42c..000000000000
--- a/media-gfx/zbar/zbar-0.10-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/zbar-0.10-r1.ebuild,v 1.3 2013/03/02 21:41:57 hwoarang Exp $
-
-EAPI=4
-PYTHON_DEPEND="2:2.6"
-inherit autotools eutils python
-
-DESCRIPTION="Library and tools for reading barcodes from images or video"
-HOMEPAGE="http://zbar.sourceforge.net/"
-SRC_URI="mirror://sourceforge/zbar/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk imagemagick jpeg python qt4 static-libs +threads v4l X xv"
-
-RDEPEND="gtk? ( =dev-libs/glib-2* x11-libs/gtk+:2 )
-	imagemagick? ( >=media-gfx/imagemagick-6.2.6 )
-	jpeg? ( virtual/jpeg )
-	python? ( gtk? ( >=dev-python/pygtk-2 ) )
-	qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 )
-	X? ( x11-libs/libXext
-		xv? ( x11-libs/libXv ) )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-no-v4l1-check.patch
-	python_convert_shebangs 2 examples/upcrpc.py test/{barcodetest,test_pygtk}.py
-	sed -i -e '/AM_INIT_AUTOMAKE/s:-Werror ::' configure.ac || die #423581
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with jpeg) \
-		$(use_with gtk) \
-		$(use_with imagemagick) \
-		$(use_with python) \
-		$(use_with qt4 qt) \
-		$(use_enable static-libs static) \
-		$(use_enable threads pthread) \
-		$(use_with X x) \
-		$(use_with xv xv) \
-		$(use_enable v4l video)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc HACKING NEWS README TODO
-	rm -r "${ED}"/usr/share/doc/${PN}
-	prune_libtool_files --all
-}
diff --git a/media-gfx/zbar/zbar-0.10-r2.ebuild b/media-gfx/zbar/zbar-0.10-r2.ebuild
deleted file mode 100644
index 3ef243dda98a..000000000000
--- a/media-gfx/zbar/zbar-0.10-r2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/zbar-0.10-r2.ebuild,v 1.3 2013/03/02 21:41:57 hwoarang Exp $
-
-EAPI=5
-PYTHON_DEPEND="2:2.6"
-
-inherit autotools eutils flag-o-matic python
-
-DESCRIPTION="Library and tools for reading barcodes from images or video"
-HOMEPAGE="http://zbar.sourceforge.net/"
-SRC_URI="mirror://sourceforge/zbar/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk imagemagick jpeg python qt4 static-libs +threads v4l X xv"
-
-RDEPEND="gtk? ( =dev-libs/glib-2* x11-libs/gtk+:2 )
-	imagemagick? ( 
-		|| ( media-gfx/imagemagick 
-		media-gfx/graphicsmagick[imagemagick] ) )
-	jpeg? ( virtual/jpeg )
-	python? ( gtk? ( >=dev-python/pygtk-2 ) )
-	qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 )
-	X? ( x11-libs/libXext
-		xv? ( x11-libs/libXv ) )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-no-v4l1-check.patch
-	epatch "${FILESDIR}"/${P}-errors.patch
-
-	python_convert_shebangs 2 examples/upcrpc.py test/{barcodetest,test_pygtk}.py
-
-	sed -i -e '/AM_INIT_AUTOMAKE/s:-Werror ::' configure.ac || die #423581
-	eautoreconf
-}
-
-src_configure() {
-	append-cflags -DNDEBUG
-	econf \
-		$(use_with jpeg) \
-		$(use_with gtk) \
-		$(use_with imagemagick) \
-		$(use_with python) \
-		$(use_with qt4 qt) \
-		$(use_enable static-libs static) \
-		$(use_enable threads pthread) \
-		$(use_with X x) \
-		$(use_with xv xv) \
-		$(use_enable v4l video)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc HACKING NEWS README TODO
-	rm -r "${ED}"/usr/share/doc/${PN}
-	prune_libtool_files --all
-}
diff --git a/media-gfx/zbar/zbar-0.10-r3.ebuild b/media-gfx/zbar/zbar-0.10-r3.ebuild
index 35928cde0421..dc4fa2705016 100644
--- a/media-gfx/zbar/zbar-0.10-r3.ebuild
+++ b/media-gfx/zbar/zbar-0.10-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/zbar-0.10-r3.ebuild,v 1.1 2013/04/19 20:11:10 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/zbar-0.10-r3.ebuild,v 1.2 2013/06/23 18:57:40 xmw Exp $
 
 EAPI=5
 PYTHON_DEPEND="2:2.6"
@@ -17,8 +17,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE="gtk imagemagick jpeg python qt4 static-libs +threads v4l X xv"
 
 RDEPEND="gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 )
-	imagemagick? ( 
-		|| ( media-gfx/imagemagick 
+	imagemagick? (
+		|| ( media-gfx/imagemagick
 		media-gfx/graphicsmagick[imagemagick] ) )
 	jpeg? ( virtual/jpeg )
 	python? ( gtk? ( >=dev-python/pygtk-2 ) )