Version bump. Remove old.

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

5 files changed, 22 insertions, 86 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/Manifest b/app-text/qpdfview/Manifest
index 86bcb5b9164f..41dd32d80b95 100644
--- a/app-text/qpdfview/Manifest
+++ b/app-text/qpdfview/Manifest
@@ -1,8 +1,4 @@
-DIST qpdfview-0.2.2.tar.gz 97108 RMD160 2ab3d88a6b04da15e0b91ec0bcad44424696cfe5 SHA1 cc6f5f0e51704e21189e56987f8b8a4900f676e5 SHA256 d04623ad1d4e5f1f55d41989b08748ed0d034556c4f28ab0b6d6bf1e6e516cdb
-DIST qpdfview-0.3beta2.tar.gz 82515 RMD160 64658854be2e79919136ae4fc9ee322bfd3e30c9 SHA1 8d25ef52063087177958708cb621e292b89faab0 SHA256 9def0270e092b3f195047dc0fd368006c8f3e63fe7602d77c4890f36708191db
-DIST qpdfview-0.3beta3.tar.gz 85858 RMD160 0d37f66bd8ec5be8793a2a8e1b81dbc3ff9256d1 SHA1 f253b1756ac36dc39b2cfc1df0f01dd174d7dfe5 SHA256 6e55685bb3dcb89cbcf1b82e845554ab2d53084a8bce43954e4805b6b051725f
-EBUILD qpdfview-0.2.2.ebuild 617 RMD160 daf97b13924b1cce83596d6502af78f90556985e SHA1 987e9a37d5b2ee9cc375511a849ce2e98fbc1ecb SHA256 f7098de65d6d3ee5982be16edfbf173cfbd0baf4d2a0395fb3f8de23fbd13210
-EBUILD qpdfview-0.3_beta2.ebuild 871 RMD160 635d739aa1973787202689db6fe2053f665b8bfe SHA1 6aaef950d8a6038c25001af2a43081565cc5f460 SHA256 4bce5999acdff6e9e3b9e04391fab96db86e926f6f18de0e269b434b4e2a39fc
-EBUILD qpdfview-0.3_beta3.ebuild 878 RMD160 b710bfee087d69f2859a28b4a4891f7dba07d993 SHA1 04e59bc1b6daf9560e2fae52f5514172cb42e86f SHA256 e223fe392828e8efce58c47c3d575c1e6dd5d5e288cf29da0585c0792bad4f0c
-MISC ChangeLog 1104 RMD160 a218a61b9fcdd5ccf024a594d679cbe7f9b189b0 SHA1 a08867e1611e30dacfbe856a7e84bdd08c9cfeac SHA256 0356002df7c76a5ffa015602531765bb1f155a52ac6eb14a7403d62420cfd248
+DIST qpdfview-0.3.tar.gz 101769 RMD160 e7d5c80c6b75948b4e6d4e8a3ac8a85eaf74dcb1 SHA1 9ff111c53b4d0ed605f7581f220b9126f6afe721 SHA256 cba7efd473c2ed88747add888813f472d28a7775ce934c3f2d7cc136418c987c
+EBUILD qpdfview-0.3.ebuild 906 RMD160 cd38330f99d5cf6aaef7cbf04b187976c6924ea8 SHA1 26c9bfefbde655ee3c5c57d61b359843afc4eb2d SHA256 4b83f026f199a009bef32244d0b9896dc7113e71ec6378d00244badad9056e9c
+MISC ChangeLog 1315 RMD160 0c0f870f2dba658bcb1abf0081dac3ceb7166d9f SHA1 20a6b489c255cc8b85e920ce4aa8bb11cc31910b SHA256 1207f8015cf05e26b4648e88c3e2f8a0d45cece3ac2f9bb46ad677d414e73e4e
 MISC metadata.xml 261 RMD160 531dc9368ca014828ea666ea181a0964b85c6599 SHA1 8ab4ac3f879eab826f2b1b10f4447011a311f7ad SHA256 e62ce21a3bc7f443e27f2855a442538d9f23e9bcbd90b80481f21fd789cad6d5
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}"
-}