Version bump (bug #532964). Clean up older versions.

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0x0F9C590B7FF324F6!)

3 files changed, 19 insertions, 93 deletions

diff --git a/app-text/qpdfview/ChangeLog b/app-text/qpdfview/ChangeLog
index c0d3bc7ee303..32767312d02a 100644
--- a/app-text/qpdfview/ChangeLog
+++ b/app-text/qpdfview/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/qpdfview
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/ChangeLog,v 1.60 2014/12/25 10:29:17 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/ChangeLog,v 1.61 2014/12/25 10:59:27 yngwin Exp $
+
+*qpdfview-0.4.13 (25 Dec 2014)
+
+  25 Dec 2014; Ben de Groot <yngwin@gentoo.org> +qpdfview-0.4.13.ebuild,
+  -qpdfview-0.4.11.1.ebuild, -qpdfview-0.4.7.ebuild:
+  Version bump (bug #532964). Clean up older versions.
 
   25 Dec 2014; Ben de Groot <yngwin@gentoo.org> qpdfview-0.4.12.ebuild:
   Add dev-qt/linguist-tools:5 dependency for qt5 lrelease (bug #532962).
diff --git a/app-text/qpdfview/qpdfview-0.4.11.1.ebuild b/app-text/qpdfview/qpdfview-0.4.13.ebuild
index 271ac8c65b54..5955e5c1b90f 100644
--- a/app-text/qpdfview/qpdfview-0.4.11.1.ebuild
+++ b/app-text/qpdfview/qpdfview-0.4.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/qpdfview-0.4.11.1.ebuild,v 1.2 2014/09/28 11:49:13 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/qpdfview-0.4.13.ebuild,v 1.1 2014/12/25 10:59:27 yngwin Exp $
 
 EAPI=5
 
@@ -16,37 +16,31 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="cups dbus djvu fitz +pdf postscript +qt4 qt5 sqlite +svg synctex"
 
-REQUIRED_USE="
-	^^ ( qt4 qt5 )
-	?? ( fitz pdf )
-"
+REQUIRED_USE="^^ ( qt4 qt5 )
+	?? ( fitz pdf )"
 
-RDEPEND="
-	cups? ( net-print/cups )
+RDEPEND="cups? ( net-print/cups )
 	djvu? ( app-text/djvu )
 	fitz? ( app-text/mupdf:0/1.4 )
 	postscript? ( app-text/libspectre )
-	qt4? (
-		dev-qt/qtcore:4[iconv]
+	qt4? ( dev-qt/qtcore:4[iconv]
 		dev-qt/qtgui:4
 		dbus? ( dev-qt/qtdbus:4 )
 		pdf? ( app-text/poppler[qt4] )
 		sqlite? ( dev-qt/qtsql:4[sqlite] )
-		svg? ( dev-qt/qtsvg:4 )
-	)
-	qt5? (
+		svg? ( dev-qt/qtsvg:4 ) )
+	qt5? ( dev-qt/linguist-tools:5
+		dev-qt/qtconcurrent:5
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
 		dbus? ( dev-qt/qtdbus:5 )
 		pdf? ( >=app-text/poppler-0.26.4[qt5] )
 		sqlite? ( dev-qt/qtsql:5[sqlite] )
-		svg? ( dev-qt/qtsvg:5 )
-	)
-	!svg? ( virtual/freedesktop-icon-theme )
-"
+		svg? ( dev-qt/qtsvg:5 ) )
+	!svg? ( virtual/freedesktop-icon-theme )"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
+	virtual/pkgconfig"
 
 DOCS=( CHANGES CONTRIBUTORS README TODO )
 
diff --git a/app-text/qpdfview/qpdfview-0.4.7.ebuild b/app-text/qpdfview/qpdfview-0.4.7.ebuild
deleted file mode 100644
index 4a9e631af335..000000000000
--- a/app-text/qpdfview/qpdfview-0.4.7.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/qpdfview-0.4.7.ebuild,v 1.2 2013/12/14 11:03:53 hwoarang Exp $
-
-EAPI=5
-
-PLOCALES="ast az bg bs ca cs da de el en_GB eo es eu fi fr gl he hr id it kk ky ms my pl pt pt_BR ro ru sk tr ug uk zh_CN"
-inherit l10n multilib qt4-r2
-
-DESCRIPTION="A tabbed document viewer"
-HOMEPAGE="http://launchpad.net/qpdfview"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="cups dbus djvu +pdf postscript sqlite +svg synctex"
-
-RDEPEND="dev-qt/qtcore:4[iconv]
-	dev-qt/qtgui:4
-	cups? ( net-print/cups )
-	dbus? ( dev-qt/qtdbus:4 )
-	djvu? ( app-text/djvu )
-	pdf? ( app-text/poppler[qt4] )
-	postscript? ( app-text/libspectre )
-	sqlite? ( dev-qt/qtsql:4[sqlite] )
-	svg? ( dev-qt/qtsvg:4 )
-	!svg? ( virtual/freedesktop-icon-theme )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=("${FILESDIR}/${P}-fix-sqlite-build.patch")
-DOCS=( CHANGES CONTRIBUTORS README TODO )
-
-prepare_locale() {
-	lrelease "translations/${PN}_${1}.ts" || die "preparing ${1} locale failed"
-}
-
-rm_help() {
-	if [[ -e "miscellaneous/help_${1}.html" ]]; then
-		rm "miscellaneous/help_${1}.html" || die "removing extraneous help files failed"
-	fi
-}
-
-src_prepare() {
-	l10n_find_plocales_changes "translations" "${PN}_" '.ts'
-	l10n_for_each_locale_do prepare_locale
-	l10n_for_each_disabled_locale_do rm_help
-	# adapt for prefix
-	sed -i \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		qpdfview.pri || die
-	qt4-r2_src_prepare
-}
-
-src_configure() {
-	local config i
-
-	for i in cups dbus pdf djvu svg synctex ; do
-		if ! use ${i} ; then
-			config+=" without_${i}"
-		fi
-	done
-
-	if ! use sqlite ; then
-		config+=" without_sql"
-	fi
-
-	if ! use postscript ; then
-		config+=" without_ps"
-	fi
-
-	eqmake4 CONFIG+="${config}" PLUGIN_INSTALL_PATH="${EPREFIX}/usr/$(get_libdir)/${PN}"
-}