remove old

Signed-off-by: aballier@gentoo.org
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

4 files changed, 6 insertions, 221 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/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 */