remove old

Signed-off-by: aballier@gentoo.org
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

5 files changed, 11 insertions, 241 deletions

diff --git a/app-text/djview/ChangeLog b/app-text/djview/ChangeLog
index 219ef9a71181..08ecbeab8f1a 100644
--- a/app-text/djview/ChangeLog
+++ b/app-text/djview/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/djview
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djview/ChangeLog,v 1.26 2014/03/06 10:29:18 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/djview/ChangeLog,v 1.27 2015/03/09 07:59:35 aballier Exp $
+
+  09 Mar 2015; Alexis Ballier <aballier@gentoo.org> -djview-4.7.ebuild,
+  -djview-4.8.ebuild, -files/djview-4.8-qt48.patch:
+  remove old
 
   06 Mar 2014; Agostino Sarubbo <ago@gentoo.org> djview-4.9.ebuild:
   Stable for ppc64, wrt bug #457032
diff --git a/app-text/djview/Manifest b/app-text/djview/Manifest
index d0b934c68845..853de9421444 100644
--- a/app-text/djview/Manifest
+++ b/app-text/djview/Manifest
@@ -1,29 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX djview-4.8-qt48.patch 1580 SHA256 11bbbc18025218f0f29631903fbe569fff69dff8a4c558b4621e438bad219332 SHA512 803906c6874557689c81ebe3758fa25dd18dfda7b33b0685112f5cfd86a80614476c094df52dac7be788687a77819f8466ff580b47cb9d58a4eed60d33f0664b WHIRLPOOL 51580693d2c6e7cb117b44799b016e007daaa6bcb3186c3528f7367087b8fb0a65f15e4e0382980b2d36736f8aee36d8b07b179045d64fc866f8789c0c1019e2
-DIST djview-4.7.tar.gz 876307 SHA256 2c5df0f96031e2f4b1b1c05728396e918a404f715f981da7ab6fbb0ee7c8ef2d SHA512 312abbe02dcef49e8deb7251a333efdfbcbdbd7aab31e2a0037cbd20acab148bb05a31b9fb1020fb825cafe6b6ca9509740970ff1bc2ea7931c98ae5070f24ec WHIRLPOOL e56d24ad87a5468208a3d0002d006662732533224ac020b4a909ce9ddc79a45f773bdb9ecf5b2c09fc8084961f0b398d77c3e47d6a35d4d0512951a45e740892
-DIST djview-4.8.tar.gz 883481 SHA256 8c746e7c2945ca6e08046b49d0d0aeca95d389d82365cd71111025b9d796c89f SHA512 21bdf30bd4b63f95fe0bb25650c08defc43bdd3041122c7c78a93268942d0e2e92822a78a8e101e35f50c363a3b3ce5dd31d6ff1c19c163833d086bd8422402c WHIRLPOOL 028f2d865c03e61cc341bcea368f2b3cc4689108d0ceabbc6830cb1f1160f444838125a8551576c50cffc6908ca8dd791527bbf5eb3d5bacc9bcd965c9d9eb69
 DIST djview-4.9.tar.gz 930676 SHA256 d150f557aaa073356d77c1f5e566a6a566281df5f92395b6822139f0e5c90e0c SHA512 dc2862d673eb77cca77a512a64257e7b37707789de41362fb62295ef495201a81cf31d0282a88ed70e32f8c7cd5643b568ce9761297d0e61d72fdbea7ecbfa94 WHIRLPOOL b522f9ba7283430fa7134f172b6a358c95da03e10fcf1e5f55bdd5c9be1f2929c07682e48e3a90695c838dfd2ffb875794c95e70d4096dd9595da402f76523fd
-EBUILD djview-4.7.ebuild 1966 SHA256 0cfe92347a1ff3f1fc00e0cb02361687bef7157c9715b31906b2c85e939c09e6 SHA512 2f3a20bbb7637e46e49fbb69a3377912566a4fd4799399a6cb9f391cc0ed6c8ee47395e72a5e20191f90c0549d6daf3ce53901a8ea9b5f8e602d2f98b881ab61 WHIRLPOOL 45eaf2739669b3a503cd95a794d01452358cef7669826374a3ad52a57e9afa868acdb888642bb1b7cdb114a9bb1ba714d6968ed3af8675de485baec963f412ef
-EBUILD djview-4.8.ebuild 2126 SHA256 0681dea9da8442494fd420581d51ac3a8154adf45ffeeee40cbd7474c3e1bcf9 SHA512 0c5ef7aaede441a01b29f87eab8c41a2b70d0af3aed0c974cac0aedb328219c84d5fe21b518d8b5c0f1b97a9fcca60fe6fa33941f94069e399b807e768ad26c5 WHIRLPOOL 7e755beb58663fcaa81f92b21e4d3ceefc40264ee7e417f97c2beed62a7bd2fafa1f1a15bc2c51dd40eca365a5a849dd5dacae9cd4a296c3f2d0628f7a9808cd
 EBUILD djview-4.9.ebuild 2050 SHA256 dfa3bcb70ea3c77fc84517cb1c5326512075c55cf4e080adc7a6b0aa32071817 SHA512 41deaa6502ba42097a1bf05985710cf55a4ead1fb6bc0762f6fe76db32966d907813caf54d4aa4adad49319ce91a922b94c9712230adb9a2352e448ebb5677a0 WHIRLPOOL 3ca7c29c64fbbafecd8dcce6d38add9f12940a4ca1fa388e98badcab51655a4427930e1c969a41c9bb932a66147e64537ef63bd53459372be916884d597be9c1
-MISC ChangeLog 3374 SHA256 cde287bd969b8f45d77a7072433fcc90f9872346a618972599484eeccc5ca294 SHA512 b0ea717a4e44be12148d9643f53d60c8d0c0ded548571743406c33c5b2647f04db92a5b1e51269651db99481b4fa6e22723e847d420b242268019642db4470f4 WHIRLPOOL 65077ff3fac4e8d507c4ac00b7b782e72038f6c705f95a4b305d0d53b1e85414325072f0f44d90459bad6c9c4c5ad42c0053776d686d3e8bfd2cbcfa431f84e9
+MISC ChangeLog 3517 SHA256 d422001a9c729127adf2712c44d070c62fd5541b8ee3e22b4b2d15fc92d5deba SHA512 ec64437b3c8f4635f69c33e6d0cc5c0e0284b85fc43e39f86b28145c497fbdacdb5a3afcb0b4c44d568513c4f52d835eb2bfad9c1f30d856c18926bb93e65351 WHIRLPOOL 01d10c340f5954054cfa2c5bb556fbdc7646dbdc7e2e44fccd3341482fd1d4935e513d8a149d6f26eda89222084ede0c55c3a0d161af5742d3372421f015c8bd
 MISC metadata.xml 156 SHA256 b4971b8472ab3fe4fbfe41b331a79193ca19e86c08d055ad1c20eaf9e04b79b6 SHA512 cecee760dd314c182191a282255f2415e479a8cc6cab9cb664e5b82d52b700a3444aa0d33b30a721a756e432819decc8c92588c769ea6fd33dabe9adc16d75c0 WHIRLPOOL 88a15092b616df72dd0ae91d89c80d852ad49ab9fee8a9688f3a1be59c365cc3dc77e90be68b5c4ec9cc1dc9885e06e723abc96830df4d0628df8c97f8b2a332
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTGE3/AAoJELp701BxlEWfJbwQALRt2y5+cXy2cdHzBIrlRDeJ
-ukzxk8fdOJyjXJjbHD9R/mNjAELFGl2SDCjgGpCLQIPUce3Rb5ny4K8jl4yRhGRM
-P0gmSZLOfdcKiS1koSpRbSMMbmw2cXVUYgJ9bJJMfTTojLZlNgCostde/4cXIJsB
-mGjG8RiKNahSMZHVr/0n76IqeB0+QLK3555y8thXEBoHAv9O70QAmtZ26nfHGsJg
-FNcOkAY7T1WllyC5/LlGoF/M2qR2KrhYmXJlWQ7eHucJfvJEQdNADUsAtU13FuB6
-uUmzC8BA883GtshUjsgHE5JCRbtdGzu/e7k54x1aZu+SytSjGVNzW5qpIeHayg5i
-3eHbP22KQk3hKVheiDCh8eFyQs8d1oTiOyL+DvdYy8s6df8VT64HwdnmDO/B0BN7
-PM7FTmTlzLp5ce5k1f+vdGarcOS79aknPmh6z0zlyodkW2wjkURw0VCTafyNCcyp
-5cU3q1ApdN98WvuiM3uw+kqjnfBFmXVMvP2bWhwYqD56XvLUUgSq/8LK5W0oh5K0
-y7uKzxOS9upA//NEKmfwQs7JrrT8E8E52qGWgoqwysYT0C2NoRW2hjwDyRe6Npt3
-xj+RsVCIaBbZ/PUQVXpvdCNg1x/2O53LcKNLtmRihE0YQXxFZz1hi96NH4AvJJso
-zCMq9xJPL3IC7w1tgLxW
-=S++2
+iEYEAREIAAYFAlT9UugACgkQvFcC4BYPU0pQVgCfSPm7TqX7GHXruPLpcI71LcxV
+BQwAoIh/4q1bj8N7/y84EZoXoob/5oK5
+=IcGU
 -----END PGP SIGNATURE-----
diff --git a/app-text/djview/djview-4.7.ebuild b/app-text/djview/djview-4.7.ebuild
deleted file mode 100644
index 48d3447aed0e..000000000000
--- a/app-text/djview/djview-4.7.ebuild
+++ /dev/null
@@ -1,77 +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/djview/djview-4.7.ebuild,v 1.11 2013/03/02 19:41:41 hwoarang Exp $
-
-EAPI="4"
-
-inherit eutils autotools versionator toolchain-funcs multilib nsplugins fdo-mime flag-o-matic
-
-MY_P=${PN}-$(replace_version_separator 2 '-')
-
-DESCRIPTION="Portable DjVu viewer using Qt4"
-HOMEPAGE="http://djvu.sourceforge.net/djview4.html"
-SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 x86"
-IUSE="debug nsplugin"
-
-RDEPEND="
-	>=app-text/djvu-3.5.22-r1
-	dev-qt/qtgui:4"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.67
-	virtual/pkgconfig
-	nsplugin? ( dev-libs/glib:2 )"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-2)
-
-src_prepare() {
-	# Force XEmbed instead of Xt-based mainloop (disable Xt autodep)
-	sed -e 's:\(ac_xt=\)yes:\1no:' -i configure* || die
-	sed 's/AC_CXX_OPTIMIZE/OPTS=;AC_SUBST(OPTS)/' -i configure.ac || die #263688
-	rm aclocal.m4 config/{libtool.m4,install-sh,ltmain.sh,lt*.m4}
-	AT_M4DIR="config" eautoreconf
-}
-
-src_configure() {
-	# See config/acinclude.m4
-	use debug || append-cppflags "-DNDEBUG"
-
-	# QTDIR is needed because of kde3
-	QTDIR=/usr \
-	econf \
-		--with-x \
-		$(use_enable nsplugin nsdejavu) \
-		--disable-desktopfiles
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) CXX=$(tc-getCXX)
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		plugindir=/usr/$(get_libdir)/${PLUGINS_DIR} \
-			install
-
-	dodoc README NEWS
-
-	cd desktopfiles
-	insinto /usr/share/icons/hicolor/32x32/apps
-	newins hi32-djview4.png djvulibre-djview4.png
-	insinto /usr/share/icons/hicolor/64x64/apps
-	newins hi64-djview4.png djvulibre-djview4.png
-	insinto /usr/share/icons/hicolor/scalable/apps
-	newins djview.svg djvulibre-djview4.svg
-	domenu djvulibre-djview4.desktop
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/app-text/djview/djview-4.8.ebuild b/app-text/djview/djview-4.8.ebuild
deleted file mode 100644
index ec3c04caf304..000000000000
--- a/app-text/djview/djview-4.8.ebuild
+++ /dev/null
@@ -1,86 +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/djview/djview-4.8.ebuild,v 1.12 2013/10/01 21:16:50 pesa Exp $
-
-EAPI=4
-
-inherit autotools eutils gnome2-utils fdo-mime flag-o-matic versionator toolchain-funcs multilib nsplugins
-
-MY_P=${PN}-$(replace_version_separator 2 '-')
-
-DESCRIPTION="Portable DjVu viewer using Qt4"
-HOMEPAGE="http://djvu.sourceforge.net/djview4.html"
-SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 x86"
-IUSE="debug nsplugin"
-
-RDEPEND="
-	>=app-text/djvu-3.5.22-r1
-	dev-qt/qtdbus:4
-	dev-qt/qtgui:4"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.67
-	virtual/pkgconfig
-	nsplugin? ( dev-libs/glib:2 )"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-2)
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-qt48.patch
-
-	# Force XEmbed instead of Xt-based mainloop (disable Xt autodep)
-	sed -e 's:\(ac_xt=\)yes:\1no:' -i configure* || die
-	sed 's/AC_CXX_OPTIMIZE/OPTS=;AC_SUBST(OPTS)/' -i configure.ac || die #263688
-	rm aclocal.m4 config/{libtool.m4,install-sh,ltmain.sh,lt*.m4}
-	AT_M4DIR="config" eautoreconf
-}
-
-src_configure() {
-	# See config/acinclude.m4
-	use debug || append-cppflags "-DNDEBUG"
-
-	# QTDIR is needed because of kde3
-	QTDIR=/usr \
-	econf \
-		--with-x \
-		$(use_enable nsplugin nsdejavu) \
-		--disable-desktopfiles
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		plugindir=/usr/$(get_libdir)/${PLUGINS_DIR} \
-			install
-
-	dodoc README NEWS
-
-	cd desktopfiles
-	insinto /usr/share/icons/hicolor/32x32/apps
-	newins hi32-djview4.png djvulibre-djview4.png
-	insinto /usr/share/icons/hicolor/64x64/apps
-	newins hi64-djview4.png djvulibre-djview4.png
-	insinto /usr/share/icons/hicolor/scalable/apps
-	newins djview.svg djvulibre-djview4.svg
-	domenu djvulibre-djview4.desktop
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-text/djview/files/djview-4.8-qt48.patch b/app-text/djview/files/djview-4.8-qt48.patch
deleted file mode 100644
index 4db289291ede..000000000000
--- a/app-text/djview/files/djview-4.8-qt48.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From: Leon Bottou <leon@bottou.org>
-Date: Mon, 2 Apr 2012 14:11:36 +0000 (-0700)
-Subject: removed swap (use qSwap instead).
-X-Git-Tag: release.4.9~5
-X-Git-Url: http://djvu.git.sourceforge.net/git/gitweb.cgi?p=djvu%2Fdjview.git;a=commitdiff_plain;h=7d4802964b9e74506c63f43505b632f6e7b5db3c;hp=6389dcba572c6439acd226d27872c2f0db583875
-
-removed swap (use qSwap instead).
-
-Fixes Gentoo bug 401517, compilation problems with qt-4.8.
-Unclear why is namespace std in scope at this point when using qt-4.8...
----
-
-diff --git a/src/qdjvuwidget.cpp b/src/qdjvuwidget.cpp
-index 52ac366..8136d07 100644
---- a/src/qdjvuwidget.cpp
-+++ b/src/qdjvuwidget.cpp
-@@ -152,15 +152,6 @@ all_numbers(const char *s)
-   return true;
- }
- 
--template<class T> static inline void 
--swap(T& x, T& y)
--{
--  T tmp;
--  tmp = x;
--  x = y;
--  y = tmp;
--}
--
- template<class T> static inline int
- ksmallest(T *v, int n, int k)
- {
-@@ -173,11 +164,11 @@ ksmallest(T *v, int n, int k)
-       /* Sort v[lo], v[m], v[hi] by insertion */
-       m = (lo+hi)/2;
-       if (v[lo]>v[m])
--        swap(v[lo],v[m]);
-+        qSwap(v[lo],v[m]);
-       if (v[m]>v[hi]) {
--        swap(v[m],v[hi]);
-+        qSwap(v[m],v[hi]);
-         if (v[lo]>v[m])
--          swap(v[lo],v[m]);
-+          qSwap(v[lo],v[m]);
-       }
-       /* Extract pivot, place sentinel */
-       pivot = v[m];
-@@ -191,7 +182,7 @@ ksmallest(T *v, int n, int k)
-       do ++l; while (v[l]<pivot);
-       do --h; while (v[h]>pivot);
-       if (l < h) { 
--        swap(v[l],v[h]); 
-+        qSwap(v[l],v[h]); 
-         goto loop; 
-       }
-       /* Finish up */