Drop old

(Portage version: 2.1.11.10/cvs/Linux x86_64)

3 files changed, 5 insertions, 99 deletions

diff --git a/app-text/pdfshuffler/ChangeLog b/app-text/pdfshuffler/ChangeLog
index 1405d42fa9c9..a4d8e51dd6b0 100644
--- a/app-text/pdfshuffler/ChangeLog
+++ b/app-text/pdfshuffler/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/pdfshuffler
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pdfshuffler/ChangeLog,v 1.17 2012/08/18 14:28:39 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pdfshuffler/ChangeLog,v 1.18 2012/08/20 10:37:22 xmw Exp $
+
+  20 Aug 2012; Michael Weber <xmw@gentoo.org>
+  -files/pdfshuffler-poppler-0.18.patch, -pdfshuffler-0.5.1-r1.ebuild:
+  Drop old
 
   18 Aug 2012; Johannes Huber <johu@gentoo.org> pdfshuffler-0.6.0.ebuild:
   Stable for x86, wrt bug #428904
@@ -72,4 +76,3 @@
   01 Jun 2009; Peter Alfredsen <loki_val@gentoo.org>
   +pdfshuffler-0.4.2.ebuild, +metadata.xml:
   Initial commit. Ebuild by me.
-
diff --git a/app-text/pdfshuffler/files/pdfshuffler-poppler-0.18.patch b/app-text/pdfshuffler/files/pdfshuffler-poppler-0.18.patch
deleted file mode 100644
index 98bc637241fc..000000000000
--- a/app-text/pdfshuffler/files/pdfshuffler-poppler-0.18.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Stop using render_to_pixbuf, removed from Poppler 0.18.
-
-Instead draw to a gdk Pixmap, then get a Pixbuf from that.
-
-A more complete fix (dropping Pixmap/Pixbuf usage) is in upstream svn,
-but that is too large a change for us to take.
-
-Based on a patch from Rafał Mużyło in gentoo bug #390607.
---- pdfshuffler
-+++ pdfshuffler
-@@ -982,9 +982,15 @@
-             pix_w, pix_h = page.get_size()
-             pix_w = int(pix_w * self.scale)
-             pix_h = int(pix_h * self.scale)
--            thumbnail = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, False,
--                                       8, pix_w , pix_h)
--            page.render_to_pixbuf(0,0,pix_w,pix_h,self.scale,0,thumbnail)
-+            pixmap = gtk.gdk.Pixmap(None, pix_w, pix_h, 24)
-+            cr = pixmap.cairo_create()
-+            # The pixmap data is not initialized, so paint it white first:
-+            cr.set_source_rgb(1, 1, 1)
-+            cr.paint()
-+            cr.scale(self.scale, self.scale)
-+            page.render(cr)
-+            thumbnail = gtk.gdk.pixbuf_get_from_drawable(
-+                None, pixmap, gtk.gdk.colormap_get_system(), 0, 0, 0, 0, pix_w, pix_h)
-             rotation = (-rotation) % 360
-             rotation = ((rotation + 45) / 90) * 90
-             thumbnail = thumbnail.rotate_simple(rotation)
-@@ -1003,11 +1009,13 @@
-                 pix_w = thumbnail.get_width()
-                 pix_h = thumbnail.get_height()
-         except:
-+            import traceback
-+            traceback.print_exc()
-             pix_w = self.default_width
-             pix_h = pix_w
-             thumbnail = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, False,
-                                        8, pix_w, pix_h)
--            pixbuf.fill(0xffffffff)
-+            thumbnail.fill(0xffffffff)
- 
-         #add border
-         thickness = 3
-
diff --git a/app-text/pdfshuffler/pdfshuffler-0.5.1-r1.ebuild b/app-text/pdfshuffler/pdfshuffler-0.5.1-r1.ebuild
deleted file mode 100644
index d40ee0283341..000000000000
--- a/app-text/pdfshuffler/pdfshuffler-0.5.1-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pdfshuffler/pdfshuffler-0.5.1-r1.ebuild,v 1.3 2012/06/08 12:01:19 phajdan.jr Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-
-inherit distutils eutils fdo-mime gnome2-utils
-
-DESCRIPTION="PDF-Shuffler is GUI app that can merge or split pdfs and rotate, crop and rearrange their pages."
-HOMEPAGE="http://sourceforge.net/projects/pdfshuffler/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/pyPdf
-	dev-python/python-poppler"
-RDEPEND="${DEPEND}"
-
-DOCS="ChangeLog README TODO AUTHORS"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	distutils_src_prepare
-
-	epatch "${FILESDIR}/pdfshuffler-poppler-0.18.patch"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}