Remove old.

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

3 files changed, 5 insertions, 190 deletions

diff --git a/www-client/qupzilla/ChangeLog b/www-client/qupzilla/ChangeLog
index 5191d837a9be..88db1b0638b6 100644
--- a/www-client/qupzilla/ChangeLog
+++ b/www-client/qupzilla/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/qupzilla
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/qupzilla/ChangeLog,v 1.54 2015/02/25 16:01:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/qupzilla/ChangeLog,v 1.55 2015/03/04 17:17:56 kensington Exp $
+
+  04 Mar 2015; Michael Palimaka <kensington@gentoo.org> -qupzilla-1.8.4.ebuild,
+  -qupzilla-1.8.5.ebuild:
+  Remove old.
 
   25 Feb 2015; Agostino Sarubbo <ago@gentoo.org> qupzilla-1.8.6.ebuild:
   Stable for x86, wrt bug #541206
diff --git a/www-client/qupzilla/qupzilla-1.8.4.ebuild b/www-client/qupzilla/qupzilla-1.8.4.ebuild
deleted file mode 100644
index 3ee393a7ff3b..000000000000
--- a/www-client/qupzilla/qupzilla-1.8.4.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/qupzilla/qupzilla-1.8.4.ebuild,v 1.3 2014/12/28 10:19:55 ago Exp $
-
-EAPI=5
-PLOCALES="ar_SA bg_BG ca_ES cs_CZ de_DE el_GR es_ES es_MX es_VE eu_ES fa_IR fi_FI fr_FR gl_ES he_IL hr_HR hu_HU id_ID it_IT ja_JP ka_GE lg lv_LV nl_NL nqo pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sr sr@ijekavian sr@ijekavianlatin sr@latin sv_SE tr_TR uk_UA uz@Latn zh_CN zh_TW"
-PLUGINS_HASH='bb52c82eeedae50ac33a8d10943998193491230b'
-PLUGINS_VERSION='2014.10.02' # if there are no updates, we can use the older archive
-
-inherit eutils l10n multilib qmake-utils vcs-snapshot
-
-DESCRIPTION="Qt WebKit web browser"
-HOMEPAGE="http://www.qupzilla.com/"
-SRC_URI="https://github.com/QupZilla/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/QupZilla/${PN}-plugins/archive/${PLUGINS_HASH}.tar.gz -> ${PN}-plugins-${PLUGINS_VERSION}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="dbus debug gnome-keyring kde nonblockdialogs +qt4 qt5"
-REQUIRED_USE="^^ ( qt4 qt5 )"
-
-RDEPEND="dev-libs/openssl:0
-	gnome-keyring? ( gnome-base/gnome-keyring )
-	kde? ( kde-base/kwalletd:4 )
-	qt4? ( >=dev-qt/qtcore-4.8:4
-		>=dev-qt/qtgui-4.8:4
-		>=dev-qt/qtscript-4.8:4
-		>=dev-qt/qtsql-4.8:4[sqlite]
-		>=dev-qt/qtwebkit-4.8:4
-		dbus? ( >=dev-qt/qtdbus-4.8:4 ) )
-	qt5? ( dev-qt/linguist-tools:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtconcurrent:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtscript:5
-		dev-qt/qtsql:5[sqlite]
-		dev-qt/qtwebkit:5
-		dbus? ( dev-qt/qtdbus:5 ) )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS CHANGELOG FAQ README.md )
-
-src_prepare() {
-	rm_loc() {
-		# remove localizations the user has not specified
-		sed -i -e "/${1}.ts/d" translations/translations.pri || die
-		rm translations/${1}.ts || die
-	}
-
-	# remove outdated prebuilt localizations
-	rm -rf bin/locale || die
-
-	# remove empty locale
-	rm translations/empty.ts || die
-
-	# get extra plugins into qupzilla build tree
-	mv "${WORKDIR}"/${PN}-plugins-${PLUGINS_VERSION}/plugins/* "${S}"/src/plugins/ || die
-
-	l10n_find_plocales_changes "translations" "" ".ts"
-	l10n_for_each_disabled_locale_do rm_loc
-}
-
-src_configure() {
-	# see BUILDING document for explanation of options
-	export \
-		QUPZILLA_PREFIX="${EPREFIX}/usr/" \
-		USE_LIBPATH="${EPREFIX}/usr/$(get_libdir)" \
-		USE_QTWEBKIT_2_2=true \
-		DISABLE_DBUS=$(usex dbus '' 'true') \
-		KDE_INTEGRATION=$(usex kde 'true' '') \
-		NONBLOCK_JS_DIALOGS=$(usex nonblockdialogs 'true' '')
-
-	if use qt4 ; then
-		eqmake4 $(use gnome-keyring && echo "DEFINES+=GNOME_INTEGRATION")
-	else
-		eqmake5 $(use gnome-keyring && echo "DEFINES+=GNOME_INTEGRATION")
-	fi
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
-
-pkg_postinst() {
-	if has_version www-plugins/adobe-flash; then
-		ewarn "For using adobe flash plugin you most likely need to run"
-		ewarn "    \"paxctl-ng -m /usr/bin/qupzilla\""
-	fi
-}
diff --git a/www-client/qupzilla/qupzilla-1.8.5.ebuild b/www-client/qupzilla/qupzilla-1.8.5.ebuild
deleted file mode 100644
index abb715564a97..000000000000
--- a/www-client/qupzilla/qupzilla-1.8.5.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/qupzilla/qupzilla-1.8.5.ebuild,v 1.1 2014/12/25 06:10:00 yngwin Exp $
-
-EAPI=5
-MY_PN="QupZilla"
-MY_P=${MY_PN}-${PV}
-PLOCALES="ar_SA bg_BG ca_ES cs_CZ de_DE el_GR es_ES es_MX es_VE eu_ES fa_IR fi_FI fr_FR gl_ES he_IL hr_HR hu_HU id_ID it_IT ja_JP ka_GE lg lv_LV nl_NL nqo pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sr sr@ijekavian sr@ijekavianlatin sr@latin sv_SE tr_TR uk_UA uz@Latn zh_CN zh_TW"
-PLUGINS_HASH='83cc6f26e10291bf2dafd40212649c06d1d7635c'
-PLUGINS_VERSION='2014.12.17' # if there are no updates, we can use the older archive
-
-inherit eutils l10n multilib qmake-utils vcs-snapshot
-
-DESCRIPTION="Qt WebKit web browser"
-HOMEPAGE="http://www.qupzilla.com/"
-SRC_URI="https://github.com/${MY_PN}/${PN}/releases/download/v${PV}/${MY_P}.tar.xz
-	https://github.com/${MY_PN}/${PN}-plugins/archive/${PLUGINS_HASH}.tar.gz -> ${PN}-plugins-${PLUGINS_VERSION}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="dbus debug gnome-keyring kde nonblockdialogs +qt4 qt5"
-REQUIRED_USE="^^ ( qt4 qt5 )"
-
-RDEPEND="dev-libs/openssl:0
-	gnome-keyring? ( gnome-base/gnome-keyring )
-	kde? ( kde-base/kwalletd:4 )
-	qt4? ( >=dev-qt/qtcore-4.8:4
-		>=dev-qt/qtgui-4.8:4
-		>=dev-qt/qtscript-4.8:4
-		>=dev-qt/qtsql-4.8:4[sqlite]
-		>=dev-qt/qtwebkit-4.8:4
-		dbus? ( >=dev-qt/qtdbus-4.8:4 ) )
-	qt5? ( dev-qt/linguist-tools:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtconcurrent:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtscript:5
-		dev-qt/qtsql:5[sqlite]
-		dev-qt/qtwebkit:5
-		dbus? ( dev-qt/qtdbus:5 ) )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS CHANGELOG FAQ README.md )
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	rm_loc() {
-		# remove localizations the user has not specified
-		sed -i -e "/${1}.ts/d" translations/translations.pri || die
-		rm translations/${1}.ts || die
-	}
-
-	# remove outdated prebuilt localizations
-	rm -rf bin/locale || die
-
-	# remove empty locale
-	rm translations/empty.ts || die
-
-	# get extra plugins into qupzilla build tree
-	mv "${WORKDIR}"/${PN}-plugins-${PLUGINS_VERSION}/plugins/* "${S}"/src/plugins/ || die
-
-	l10n_find_plocales_changes "translations" "" ".ts"
-	l10n_for_each_disabled_locale_do rm_loc
-}
-
-src_configure() {
-	# see BUILDING document for explanation of options
-	export \
-		QUPZILLA_PREFIX="${EPREFIX}/usr/" \
-		USE_LIBPATH="${EPREFIX}/usr/$(get_libdir)" \
-		USE_QTWEBKIT_2_2=true \
-		DISABLE_DBUS=$(usex dbus '' 'true') \
-		KDE_INTEGRATION=$(usex kde 'true' '') \
-		NONBLOCK_JS_DIALOGS=$(usex nonblockdialogs 'true' '')
-
-	if use qt4 ; then
-		eqmake4 $(use gnome-keyring && echo "DEFINES+=GNOME_INTEGRATION")
-	else
-		eqmake5 $(use gnome-keyring && echo "DEFINES+=GNOME_INTEGRATION")
-	fi
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
-
-pkg_postinst() {
-	if has_version www-plugins/adobe-flash; then
-		ewarn "For using adobe flash plugin you may need to run"
-		ewarn "    \"paxctl-ng -m /usr/bin/qupzilla\""
-	fi
-}