Remove old.

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!

4 files changed, 21 insertions, 211 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/Manifest b/www-client/qupzilla/Manifest
index 108d77b0927f..43414d4d8717 100644
--- a/www-client/qupzilla/Manifest
+++ b/www-client/qupzilla/Manifest
@@ -1,31 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST QupZilla-1.8.5.tar.xz 3096640 SHA256 8ea7d3f9f9283e85b9ce0f7c86b4162a93c0cd68dfb3a7e70560dd7b8ded7d9c SHA512 1c8f1821caf1eccd88c7a3413b3c53e5730a09853855d5663cc63731ecca944174b7c929fdae3da291b991030942d9a73f78005cb960fbf1f8a70250b0145ea1 WHIRLPOOL 0686833ac04a284c8224d019d286644ed188b7899110ae8cdf55d13d965908cd1015d9e698e1764899910abca9be65050136ff128cd056f763e5ed5fe7f1bf4d
 DIST QupZilla-1.8.6.tar.xz 3205912 SHA256 aecda29f8994c9dc4d6b5f76ce5b1ba947272a0d5a40b5d83a54023dd5d7a6a5 SHA512 36f1c79b7932b76f3ecbc4d1ea1bb207fe7e0477a98d583e13ab7df1703a5529e2d599c42b8f0a6792692c09e257abfdec398a1537a9002c1fd98d2128f4b627 WHIRLPOOL e60f66749654bd135fa2552ed2d75095c00108be6992b5d0e1609d7b458690218e601af317b3219f6e106e19870e46207109659e8aa9182117532bda7481f8e3
-DIST qupzilla-1.8.4.tar.gz 4534193 SHA256 25ed8d0cad0bec7eef3da70e6197b95ae8dee304a2396ed73a66bbab576e73ba SHA512 944b46d05a416da13abb01a41b40f6e93658cc77e3ab9f9d4c69b034b109871f745745207fb0e93be515c5b6c14f763fdab718876a0d5f16ec8852dd6aff329e WHIRLPOOL 71f89bceb2229770038f4b5c4b0c404caeae5b0caf489f1f9ce78ee0af0bb1a17cdab54a0234a02d08b10a6056fa3007be12cc14a70534dbd1fb4c9f54c1a100
-DIST qupzilla-plugins-2014.10.02.tar.gz 202285 SHA256 e02044bd7202b937b37275a34774f33c476f8e66f6ec409165787cd526c25315 SHA512 f22ee86d9fc91257eb8a1296afb558628209b680ed6f728c9e6584785d390f22cc5c5651c9d4c8f16a786fa69d40a80647f2e60569fe44967f4447d720c506d9 WHIRLPOOL 569db0fbc74b18b8712f98c90bf5a244ca889dbb1e9ba1e68279b4336d04a6fe3b046ddbcbbfcda0d49c58dde316c237cffa3e5625e46c1c484d8defc1eb5d9d
-DIST qupzilla-plugins-2014.12.17.tar.gz 254732 SHA256 f613cdf5e6b669bf996f48e5812f2c24d8e3e7939b37f5e6382fb4a231e93da5 SHA512 652e45da59760d6cd8794ccc13f0446f8a9f07ebba1674205417a30bd65dfc14f84da6c67726d744a17a65c6de70b4e65ead7a6e0eee5515fe9f4b553f8cfd60 WHIRLPOOL ef213f96524afe8283be6dba559edd6787782621919c3100e4a40c67df560dc1c457b4d9e4b4082223b1692361383c30261057b3a30582c3f3903f4b2da6f0c5
 DIST qupzilla-plugins-2015.01.27.tar.gz 335585 SHA256 466d2cc4a0b904705e2d23b6c05be6d36c74065f81b24aa9b82be0e377960e55 SHA512 0354b96530eca72d27838acfcd6605c0a14095f741587b89d1d4292e57bebe54d17e49464dc0a41af99873031c69ef09120c07053452568caf16dca222f1371b WHIRLPOOL a849f120f7f7a9e4dae6fa9abb2d3a66295a4778101887e99248f1ebd46e9231481f99f1d8fd9478e12f5cedbc5be055948ebe026d504d6b5d2d362ee222ba49
-EBUILD qupzilla-1.8.4.ebuild 2968 SHA256 f5d798643b7fa0078fed20b2b56ca724df8280c413b27ec700ab900ac2d2ceb6 SHA512 e1411d1f7647bfaa36aee19ef87d0c0f4d48220e6126931f408a68d021259c7c7b16ced36e08733c7ec535f07b9fb1d044ea587349753537330adebcd0f541c8 WHIRLPOOL 1afe076a21f9c6fc41d81f2151675f05ae35d7ba15074496b74121ac6fd68334920bb54ecf8249799a6ba06f14a346e7c34861b67a1215dff9c310e5be705349
-EBUILD qupzilla-1.8.5.ebuild 3026 SHA256 02f64525e892aa5fd14c7489cba4612b98798e9032619f7ab9d2b528561fc953 SHA512 7a88c53d8282ea6ef18c0386fc7ab00ed24ca3c14632df9dd78d0018304eb9de83463de74e7869f017a9d8650ad572c2d9abb64cd08445f8cdbcf3370edff56a WHIRLPOOL 3968d967d0873af09a1841d411b84d85163d5515d133b063df03b21c9765f8c95e224ad614f41a5a7d44e7603a537daccd1bb6bbda42c3c4d4268db8c1261689
 EBUILD qupzilla-1.8.6.ebuild 3021 SHA256 e284754bfb6deae09fde25a200e865a749669c209426d8297ed0f38fb0f9ad1d SHA512 b7fa6107345164541c1dc338a6f1ddd9e020ca5d1952cd56a2e04b24c9e90ab325ad440689a96650ff2e31e22ebf06fc716d96944e9d55ca190049782adcd7ac WHIRLPOOL 5a9540c546700b92f7a13b497dfde4fb262bcd4dbd11761b63b9f82e29529f71434602a5a4f616af979abfe02c00e9d81318c6aa5d58d769dcf53e8a117458cd
-MISC ChangeLog 8310 SHA256 1043a36a824b98eb379b84676b6e2128ab4fde515ff1765f561254840e7fa5a5 SHA512 651b97368f33be10d5bc63cc97e2525a22316bf5456d47465f5e87d10a2139c46e751b4fa030148ba054483eabf507982ff61c2e4bfbdfe9cb94464f659972c1 WHIRLPOOL 4ec02bbf4213d3f557cd8fb124119e4999eea71a2da2ba8931af60a36e3ae046ac6ebe511e5b879826c509f405f976ae29a904e345600ceceb9663dd2a9aafdf
+MISC ChangeLog 8438 SHA256 5a9effd51e35751d831989bb1d196f68ebde4c3c502d78231d0df94ffd9bbe79 SHA512 1903c26bce2bebc96819a0a80acbb7bacbbb31afd954f6580f9abc6d4422a470ad1666164cae0d49a85e021c1e252063449e75ef7085adebb86ef9859d2f5deb WHIRLPOOL dae4bf5864d068cb25b2d00bcfab6b9c02f70c8de9c6f8c349980f7c05bb1a5fb86aef830b6afe122e4b413d292a2ff00b8ced3f8848936cc4c0c3fc0fa61ae2
 MISC metadata.xml 416 SHA256 1b51452eaf560d3cd580b3530bb739a415a34188f5ba555d2af9d36da646fe0b SHA512 4918aafacd22beb0817572692c198c99fb588c226abc469fc9a01c02ddcd685584bc756bc595a936f3e48c535f2203e2384f8dd6d96bffe5ad152f84c7812e56 WHIRLPOOL 17d97783743b7140be444e359e62da877ba30134b8abb83912c8f5633c9a5e94981d9db2a062f03467b4fb89b7ca6ef2d755e359a56d9c31dc26eae2eb7ccd1c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJU7fHlAAoJELp701BxlEWf9/0P/3r0uZcoHRBZv1XOvJPICPuP
-3VaxiYZuXCPeVlfn5w+N7ipvbGRCJKCC2N6JbbyJ1VfgYDpr/nfuL+P1jTkEu4dK
-zwkjUOyYGA6le+jnqAC1ZCJDRN44mJEjzNjmEZ6CTWR7YCyH7LA5JYN3h4DfMR/t
-in6PZiY1dvrANF1xjPytFCp4498EiLVQw/lWMLUYEXkxcsTvvq9lYXlLe2WQYKrB
-fxtQu+Cqu0uoD5sXkHlYxVhbbg+8XWq/dl/lQgpCzzXZHlxn3OSRHmndLDtnzJXV
-y+2mpHkxg2dnziC7+F1lfdiwmRshM7Ks1/lOWdZsS7wgUkHRa65q0ff1rhBGvSM+
-0fDRSGtJsRUI76OMCZKHkh2iUM93Qn7wuGQL37CRWrl3DwOcY3CFTR0SszUHMdAR
-TnI2R5BVjP0k7IgGSs4lz+vNZYVwKD1RA0EEeePmxziiDCFr1mAToEmEMDj6QYPB
-eWiS/65hcNz1b75T8i9F4TO47U4XKnrkBl2N4XZj5sLZ0gsV3cQnroqiE0IXKVQk
-DrKr1WWbV8H1Y9eS9rmnnlXyEz/i6GypuqiCXUnu3xjq3po3y39FUrFB73AO5kQ/
-3CRbo1Qq1g0scA2PgviEezwowaqKvxGKMgki+xDNH8c1VDZOzhX65VDy3XmndoCp
-NeZUnDIrK1KFALPBssZv
-=Imau
+iQJiBAEBCABMBQJU9z5RRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7NVKD/0fRD1rsy+vyAWaisFfMvLs3C3qjo9xOh938bwDXnm8Oe0TeH/tt/wopYmZ
+fdkzsrsVjw7SXIqf1rvIKgOkMXshX0GYVIcyy0sb217VUMKAGhOliHoFATcuPmc6
+bLdWpkqcxjzjHqVpWAFbE+GXBoMttHVso1jSk80H3VLskdO2u6BFww/z5n3NIPA8
+mMfdk2uJ04/7rmQp5gN08uAlJCPduvLIBNSPlYTVk4g7WCRKLin2UrjVjXvqSfiY
+m+QXo0Wb4c/TbboSacL/rVxUH4vwn1dJV6Qt8Zb4iexiNCmLY07KwmMbu6Nl8OpT
+Ov/7txmy3txR26sqLZ34BJzYMuvScpIlHQGUWqNaYa5IpYzTlWbfFhRHQjrocvo8
+wS+3H5aoqh96fYSSyi7bJ5DCZbXb6VRMxLE1392NukKKkvfmKcnxbG6rUfCAmPhR
+Wt4cCYKAqaQUB3MwnvNlsfS5zOs16DVTH/ANYaylozux8C1gNP2P7b6ofrVGi1RB
+26T0PfPk5sqb6VMk8oWx9A40QcskKQ/V9L52K9ZjYIFanOEh2OMgkhExn6V194fw
+fJfxHJ7gykchjoib4vH+rEFcxDUpSJpq8yipbPUzsNyNBIcjnBHvgAk5ksYTPHvT
+XxuB+Hm1tojd4+jgHKrv4fB0DiD+/Yerp32O3jWthQHTKV0GFQ==
+=iymQ
 -----END PGP SIGNATURE-----
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
-}