Version bump. Remove old.

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

4 files changed, 19 insertions, 79 deletions

diff --git a/app-text/qpdfview/ChangeLog b/app-text/qpdfview/ChangeLog
index c62fa7bcb255..e77125af30ea 100644
--- a/app-text/qpdfview/ChangeLog
+++ b/app-text/qpdfview/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/qpdfview
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/ChangeLog,v 1.5 2012/06/14 09:16:36 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/ChangeLog,v 1.6 2012/06/27 14:56:23 yngwin Exp $
+
+*qpdfview-0.3 (27 Jun 2012)
+
+  27 Jun 2012; Ben de Groot <yngwin@gentoo.org> +qpdfview-0.3.ebuild,
+  -qpdfview-0.2.2.ebuild, -qpdfview-0.3_beta2.ebuild,
+  -qpdfview-0.3_beta3.ebuild:
+  Version bump. Remove old.
 
 *qpdfview-0.3_beta3 (14 Jun 2012)
 
@@ -30,4 +37,3 @@
   09 Mar 2012; Samuli Suominen <ssuominen@gentoo.org>
   +qpdfview-0.2_beta1.ebuild:
   Initial commit.
-
diff --git a/app-text/qpdfview/qpdfview-0.2.2.ebuild b/app-text/qpdfview/qpdfview-0.2.2.ebuild
deleted file mode 100644
index 65f0c957ea89..000000000000
--- a/app-text/qpdfview/qpdfview-0.2.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/qpdfview-0.2.2.ebuild,v 1.1 2012/05/05 14:19:10 yngwin Exp $
-
-EAPI=4
-inherit qt4-r2
-
-DESCRIPTION="A tabbed PDF viewer using the poppler library"
-HOMEPAGE="http://launchpad.net/qpdfview"
-SRC_URI="https://launchpad.net/${PN}/${PV%.*}.x/${PV/_}/+download/${P/_}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-text/poppler[qt4]
-	x11-libs/qt-core:4
-	x11-libs/qt-gui:4"
-DEPEND="${RDEPEND}"
-
-DOCS="README TODO"
-
-S=${WORKDIR}/${P/_}
diff --git a/app-text/qpdfview/qpdfview-0.3_beta3.ebuild b/app-text/qpdfview/qpdfview-0.3.ebuild
index b532cdb524c8..db4c5aaa7ee7 100644
--- a/app-text/qpdfview/qpdfview-0.3_beta3.ebuild
+++ b/app-text/qpdfview/qpdfview-0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/qpdfview-0.3_beta3.ebuild,v 1.1 2012/06/14 09:16:36 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/qpdfview-0.3.ebuild,v 1.1 2012/06/27 14:56:23 yngwin Exp $
 
 EAPI=4
 inherit qt4-r2
@@ -12,30 +12,29 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV/_}/+download/${P/_}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="cups dbus"
+IUSE="cups dbus svg"
 
 RDEPEND="app-text/poppler[qt4]
 	x11-libs/qt-core:4[iconv]
 	x11-libs/qt-gui:4
 	cups? ( net-print/cups )
-	dbus? ( x11-libs/qt-dbus:4 )"
+	dbus? ( x11-libs/qt-dbus:4 )
+	svg? ( x11-libs/qt-svg:4 )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-DOCS="README TODO"
+DOCS="CONTRIBUTORS README TODO"
 
 S=${WORKDIR}/${P/_}
 
 src_configure() {
-	local config
+	local config opt
 
-	if ! use cups ; then
-		config+=" without_cups"
-	fi
-
-	if ! use dbus ; then
-		config+=" without_dbus"
-	fi
+	for i in cups dbus svg ; do
+		if ! use ${i} ; then
+			config+=" without_${i}"
+		fi
+	done
 
 	eqmake4 CONFIG+="${config}"
 }
diff --git a/app-text/qpdfview/qpdfview-0.3_beta2.ebuild b/app-text/qpdfview/qpdfview-0.3_beta2.ebuild
deleted file mode 100644
index 1090e072c2eb..000000000000
--- a/app-text/qpdfview/qpdfview-0.3_beta2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/qpdfview-0.3_beta2.ebuild,v 1.1 2012/06/12 05:00:26 yngwin Exp $
-
-EAPI=4
-inherit qt4-r2
-
-DESCRIPTION="A tabbed PDF viewer using the poppler library"
-HOMEPAGE="http://launchpad.net/qpdfview"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV/_}/+download/${P/_}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cups dbus"
-
-RDEPEND="app-text/poppler[qt4]
-	x11-libs/qt-core:4
-	x11-libs/qt-gui:4
-	cups? ( net-print/cups )
-	dbus? ( x11-libs/qt-dbus:4 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS="README TODO"
-
-S=${WORKDIR}/${P/_}
-
-src_configure() {
-	local config
-
-	if ! use cups ; then
-		config+=" without_cups"
-	fi
-
-	if ! use dbus ; then
-		config+=" without_dbus"
-	fi
-
-	eqmake4 CONFIG+="${config}"
-}