old

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

5 files changed, 14 insertions, 232 deletions

diff --git a/app-text/apvlv/ChangeLog b/app-text/apvlv/ChangeLog
index 33e246165e13..27f2bf49318b 100644
--- a/app-text/apvlv/ChangeLog
+++ b/app-text/apvlv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/apvlv
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/apvlv/ChangeLog,v 1.23 2013/03/17 13:19:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/apvlv/ChangeLog,v 1.24 2013/03/17 13:20:04 ssuominen Exp $
+
+  17 Mar 2013; Samuli Suominen <ssuominen@gentoo.org>
+  -files/apvlv-0.1.0-poppler-0.16.patch, -apvlv-0.1.2-r1.ebuild,
+  -files/apvlv-0.1.2-poppler-0.18.patch:
+  old
 
   17 Mar 2013; Samuli Suominen <ssuominen@gentoo.org> apvlv-0.1.4.ebuild:
   amd64/x86 stable
diff --git a/app-text/apvlv/Manifest b/app-text/apvlv/Manifest
index 3f3b39bf5ddf..f2f2bb42cbec 100644
--- a/app-text/apvlv/Manifest
+++ b/app-text/apvlv/Manifest
@@ -1,23 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX apvlv-0.1.0-poppler-0.16.patch 433 SHA256 c7065f3a123378cb0bf574ef8bbfe2c5b894ddb7380933c23e39653c81bd3b17 SHA512 07307ad3b1968ca11603dd493620d8cd3f97a8a063f7888d59ef7bdc0c0ae038db8e272ce7c00d45284861a760cff7fef8dafa23b2bbcbf334f6eba49edbf8d5 WHIRLPOOL 16ea15b08b78beafbf6b6e82efb38401f56d14dc7902b805b1504b73dfc5fa4a0ac9fb3aef9b0696e443518c6c4d7af48ec2edd344620e17fd02ea5420283fce
-AUX apvlv-0.1.2-poppler-0.18.patch 4311 SHA256 b1dbf0a268b28af49f3de98794e66b5c16b10f03f007fddaf27861e14ffce59a SHA512 1b72b751bfaf9df121184982ae4fa4a967ce4580763ef89ff4d693030c4e378aebbac1eca4a5a506803561beea9b93326ee1f7f2efe05dfa9bc7532b704fdd6b WHIRLPOOL 14039b9598b0d7b91d1f9a756ea109068f22facb9f8d46b6efa2e05f318c3a5c8be1f7f9758e4cf3d1f368d57aeb39d70120050864d06f1d734a9d2d33208392
 AUX apvlv-0.1.4-cmake.patch 1292 SHA256 760b4d1d827dd70a26b937b20c6d34306c337d11d859ac1f66c52c977bd671fe SHA512 340980aac8eb6aeb96a33d773ccd27a93b6118c37b372bd2f87c61b0b31193ddbbdebaaef50f60cc7201e4c68d3ffd8716cda8c2a260aa4209276dfae5b55871 WHIRLPOOL 9d0f7476e6257e9734bc8ff50bf7c8ccbb2dcd8a961d12682d95a1c895d22de9d682af0d07138893c9ed875e9831ceaa923e45ff3d58c720983361e84e8d35ba
-DIST apvlv-0.1.2-Source.tar.gz 331595 SHA256 65f010287dd98644d25997f95054bc95abc22fd8d5e2d7bc3b3b59978fbb470a SHA512 a2cfd3fda715a37480c4d4f9899d8debfd683154beade5e49340715df35837e7c0c9f296db304dace067dfdf0a03b2db4ec1244a0197c03efa0c2c2b0e6c80ff WHIRLPOOL 0cad1b8e25c9e681048e5112a0b004010c631b4b7d9ac1863a0dd767ee9cb6570fb99c337085f83c64526d43497fe664f4dd5249768a69e26d199a34debd2eec
 DIST apvlv-0.1.4-Source.tar.gz 337182 SHA256 f803de89aed82fea08f9386a6d6ddec999d0c96bb68c85e4cd527803838d17cd SHA512 798db075e702b02323e4df9f2ed07478aca975feca9ec7cae386792cdb4dbdcf016e7569e8f16bce6ffea0fe5482b5ea8551de10cbd0652f5607e5f0c0ea024b WHIRLPOOL fc9b66d829de17442efe7f782e44dd8024fbaf680a12a260504592bd8a44f48e7d5ace30f18f3ddec4df178fc772f4046ba0fe3e0c100195d86f05bea9703a0a
-EBUILD apvlv-0.1.2-r1.ebuild 1435 SHA256 045a3d2cd0dfe9160d13efac3c8554493e455d6e1ddb694130d0bf493aaeee64 SHA512 6d89b4841a58dfe87d8b5c25c9daa8eb0fbed96178f2a44aea620b503b7126d8524ef9b0345a03aed1d19dcc286b29c03f8953bf7f3f1ba3c1e49c0b251fc92a WHIRLPOOL 864846dd68fd77b469c1a10215488dc16ef434863a40b8cfba305f102b48a0a365d832ae4238f724083bd3e4cf71558b767fa4d682e017dfdcdb8f403a8d3a02
 EBUILD apvlv-0.1.4.ebuild 1391 SHA256 b81e4af736e3615cc823c8d584412aaeec125a5246022911602389482f088210 SHA512 867fa246534ad04b283f09a16786637571513bb2f537aac506433db6722841f518ca80adca48ec3165b48ab7c8e57b6c721a87392c9da8a582edb59d04e45a4e WHIRLPOOL ee072d7101e5a7a57ca8116cb84b76298add453af631d94e0e62c2916f8edd9bbef8e83a1b10438dd85a0c550a6c8bdbfb88a4b370b4d0de6402d02bee6a906a
-MISC ChangeLog 3608 SHA256 1653abf336d49e0c882eb96320a8275f7f9f1709f7ed8850313bc16780d60fb0 SHA512 b45172e4eb7dcd0c8da592dabb554d739351b6577e624886870a53314311c2d84234cc80f72fa7a68b3a0b7e9d8c92ba87bbaf66d6c7e3d6b3795b4875f33e32 WHIRLPOOL 676bdb463afe11c7b9dd365d75d2342238cd31a2851b71c62649df8170d25a4f56f9f6c14d95021e4c392624d8fd19dd9ae5e95afc4a10ef812a5b3fdd24f158
+MISC ChangeLog 3775 SHA256 c92b6945cbfdc643276d041371480b1bb6d121f49c29ee425e798f86137a8f20 SHA512 e47a1d02d28aa35e6229c7934961b7d5862ec063b7e7cc3ce4985f253f026de6f7013395887a1f29ca652897b7ff46d34e93f99d58194c101a7fb0208b623737 WHIRLPOOL f59df59ebe35b070fcc586a19d21e1f96661ad8572c8fc68522d1cb30aff985e660e8122e711b0097246c5a2a969e2ef19cab1069d5e9b82888abb71a90bc3a0
 MISC metadata.xml 307 SHA256 956e2121f8a7f5ae4c65b4313414ef3b526a1c869d3c8774f98103d2f4e66935 SHA512 621cc7f9b5cd05d06f3641a35792b0b12460113562b2f622c53871fcf3de894e73cbb57e70d9e21a167d8d0e0175c7f1c8b3ffa5a09d5e450b03ed88012bd4a8 WHIRLPOOL f2578348c3053b7a20fd65ec89f5f65d14a736a92f473aa23489da3c97f01de5bea0034e64cb8dcfeb575d6cabb52e36b1e8570c606efb1ef6ab262ba56b4071
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRRcKyAAoJEEdUh39IaPFNkIMH/393g/OVBTDR0GBEH3xLOgQl
-m1zRxz1TZJdNNej5BN0YLeRUkNypgk8Nk37Xb0yujXzi4wIlzoJoKpwudg997uPb
-f9MJBR7hBn2FD1Aa4DL3yZVAr5P82eKhE4Ooi1fo0J7ngkVC6FjORPH7qprtHRS/
-M8t4gvbMSCu4BtQYRs4c1f7G0G1VtlTun/z+Mj4fYqk+yIIXGml54Z2Gaqc2wW6l
-/ajLAa6kVLw0LwtbjVajKtIDO2XuKGKHd0ZPvEMShDnTmxbUygnq6OFtlPK6AhXo
-EtEDjjN6E4zSI2HGS3seiWNgHvyCWE2rax+cXv+i0MCa+d03fIWOV6bqiQHA7E4=
-=rYrY
+iQEcBAEBCAAGBQJRRcLuAAoJEEdUh39IaPFN+RYH/2Yp4tn41R6ypPCfV88JHbUd
+ff+Z379uOfzYOorSKUGYBMTZi04XHop1wxLMgDOCPS7a6OgPzgIlKhKw287ln5QO
+/EoMhK9yrQM+M0YEZYU9SxvwFWFdgKsrwzKVBCWntgiWBMTiJjDHDTgyYd9/edmZ
+SMT5ltg/rNQQfz2ouAEucz5tMGqDKaob8eMvcFTWALaXzCYnGBydHrghzGCYdWkw
+83GPjCQREdV7TmxNv3fpGFROa7BGAJ5aWC2KcgIrT3EXZUnO0jFZXgWZkbnVETp9
+7xK8yrafic4mfM1iYwqUf/S4buXRjoRMDoo+m4EZm2cT6ufU+va5C9/BdN6Jric=
+=bod7
 -----END PGP SIGNATURE-----
diff --git a/app-text/apvlv/apvlv-0.1.2-r1.ebuild b/app-text/apvlv/apvlv-0.1.2-r1.ebuild
deleted file mode 100644
index d24d62a501f8..000000000000
--- a/app-text/apvlv/apvlv-0.1.2-r1.ebuild
+++ /dev/null
@@ -1,57 +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/apvlv/apvlv-0.1.2-r1.ebuild,v 1.6 2012/08/08 16:57:17 dilfridge Exp $
-
-EAPI=4
-
-inherit eutils cmake-utils
-
-MY_P="${P}-Source"
-DESCRIPTION="Alf's PDF Viewer Like Vim"
-HOMEPAGE="http://naihe2010.github.com/apvlv/"
-SRC_URI="mirror://github/naihe2010/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug djvu"
-
-RDEPEND=">=x11-libs/gtk+-2.10.4:2
-	>=app-text/poppler-0.18[cairo,xpdf-headers(+)]
-	djvu? ( app-text/djvu )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# bug #349979
-	EPATCH_OPTS="-l" epatch \
-		"${FILESDIR}"/${PN}-0.1.0-poppler-0.16.patch \
-		"${FILESDIR}"/${PN}-0.1.2-poppler-0.18.patch
-
-	# Remove prefixes so it works with the cmake-utils eclass
-	sed -i -e "s:APVLV_::" CMakeLists.txt src/CMakeLists.txt || die
-
-	# Don't install tex file
-	sed -i -e "s:Startup.tex::" CMakeLists.txt || die
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DSYSCONFDIR=/etc/${PN}
-		-DDOCDIR=/usr/share/${PN}
-		-DMANDIR=/usr/share/man
-		-DWITH_UMD=OFF
-		$(cmake-utils_use_enable debug)
-		$(cmake-utils_use_with djvu)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc AUTHORS NEWS README THANKS TODO
-	newicon icons/pdf.png ${PN}.png
-	make_desktop_entry ${PN} "Alf's PDF Viewer Like Vim" ${PN} "Office;Viewer"
-}
diff --git a/app-text/apvlv/files/apvlv-0.1.0-poppler-0.16.patch b/app-text/apvlv/files/apvlv-0.1.0-poppler-0.16.patch
deleted file mode 100644
index 3c7df684b3fa..000000000000
--- a/app-text/apvlv/files/apvlv-0.1.0-poppler-0.16.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- apvlv-0.1.0-Source/src/ApvlvFile.cpp.orig
-+++ apvlv-0.1.0-Source/src/ApvlvFile.cpp
-@@ -285,7 +285,7 @@
-   {
-     PopplerRectangle rect = { x1, y1, x2, y2 };
-     PopplerPage *page = poppler_document_get_page (mDoc, pn);
--    *out = poppler_page_get_text (page, POPPLER_SELECTION_WORD, &rect);
-+    *out = poppler_page_get_selected_text (page, POPPLER_SELECTION_WORD, &rect);
-     if (*out != NULL)
-       {
-         return true;
diff --git a/app-text/apvlv/files/apvlv-0.1.2-poppler-0.18.patch b/app-text/apvlv/files/apvlv-0.1.2-poppler-0.18.patch
deleted file mode 100644
index 44331aec7bb2..000000000000
--- a/app-text/apvlv/files/apvlv-0.1.2-poppler-0.18.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-http://bugs.gentoo.org/385057
-http://projects.archlinux.org/svntogit/community.git/tree/trunk/poppler-gdk.patch?h=packages/apvlv
-
---- src/ApvlvFile.cpp
-+++ src/ApvlvFile.cpp
-@@ -29,6 +29,10 @@
- #include "ApvlvUtil.hpp"
- #include "ApvlvView.hpp"
-
-+#ifndef POPPLER_WITH_GDK
-+#include "poppler-gdk.h"
-+#endif
-+
- #ifdef HAVE_LIBUMD
- #define LIBUMD_ENABLE_GTK
- #include <umd.h>
---- src/poppler-gdk.h
-+++ src/poppler-gdk.h
-@@ -0,0 +1,132 @@
-+#include <goo/gtypes.h>
-+
-+static void
-+copy_cairo_surface_to_pixbuf (cairo_surface_t *surface,
-+			      GdkPixbuf       *pixbuf)
-+{
-+  int cairo_width, cairo_height, cairo_rowstride;
-+  unsigned char *pixbuf_data, *dst, *cairo_data;
-+  int pixbuf_rowstride, pixbuf_n_channels;
-+  unsigned int *src;
-+  int x, y;
-+
-+  cairo_width = cairo_image_surface_get_width (surface);
-+  cairo_height = cairo_image_surface_get_height (surface);
-+  cairo_rowstride = cairo_image_surface_get_stride (surface);
-+  cairo_data = cairo_image_surface_get_data (surface);
-+
-+  pixbuf_data = gdk_pixbuf_get_pixels (pixbuf);
-+  pixbuf_rowstride = gdk_pixbuf_get_rowstride (pixbuf);
-+  pixbuf_n_channels = gdk_pixbuf_get_n_channels (pixbuf);
-+
-+  if (cairo_width > gdk_pixbuf_get_width (pixbuf))
-+    cairo_width = gdk_pixbuf_get_width (pixbuf);
-+  if (cairo_height > gdk_pixbuf_get_height (pixbuf))
-+    cairo_height = gdk_pixbuf_get_height (pixbuf);
-+  for (y = 0; y < cairo_height; y++)
-+    {
-+      src = (unsigned int *) (cairo_data + y * cairo_rowstride);
-+      dst = pixbuf_data + y * pixbuf_rowstride;
-+      for (x = 0; x < cairo_width; x++)
-+	{
-+	  dst[0] = (*src >> 16) & 0xff;
-+	  dst[1] = (*src >> 8) & 0xff;
-+	  dst[2] = (*src >> 0) & 0xff;
-+	  if (pixbuf_n_channels == 4)
-+	      dst[3] = (*src >> 24) & 0xff;
-+	  dst += pixbuf_n_channels;
-+	  src++;
-+	}
-+    }
-+}
-+
-+static void
-+_poppler_page_render_to_pixbuf (PopplerPage *page,
-+				int src_x, int src_y,
-+				int src_width, int src_height,
-+				double scale,
-+				int rotation,
-+				GBool printing,
-+				GdkPixbuf *pixbuf)
-+{
-+  cairo_t *cr;
-+  cairo_surface_t *surface;
-+
-+  surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
-+					src_width, src_height);
-+  cr = cairo_create (surface);
-+  cairo_save (cr);
-+  switch (rotation) {
-+  case 90:
-+	  cairo_translate (cr, src_x + src_width, -src_y);
-+	  break;
-+  case 180:
-+	  cairo_translate (cr, src_x + src_width, src_y + src_height);
-+	  break;
-+  case 270:
-+	  cairo_translate (cr, -src_x, src_y + src_height);
-+	  break;
-+  default:
-+	  cairo_translate (cr, -src_x, -src_y);
-+  }
-+
-+  if (scale != 1.0)
-+	  cairo_scale (cr, scale, scale);
-+
-+  if (rotation != 0)
-+	  cairo_rotate (cr, rotation * G_PI / 180.0);
-+
-+  if (printing)
-+	  poppler_page_render_for_printing (page, cr);
-+  else
-+	  poppler_page_render (page, cr);
-+  cairo_restore (cr);
-+
-+  cairo_set_operator (cr, CAIRO_OPERATOR_DEST_OVER);
-+  cairo_set_source_rgb (cr, 1., 1., 1.);
-+  cairo_paint (cr);
-+
-+  cairo_destroy (cr);
-+
-+  copy_cairo_surface_to_pixbuf (surface, pixbuf);
-+  cairo_surface_destroy (surface);
-+}
-+
-+/**
-+ * poppler_page_render_to_pixbuf:
-+ * @page: the page to render from
-+ * @src_x: x coordinate of upper left corner
-+ * @src_y: y coordinate of upper left corner
-+ * @src_width: width of rectangle to render
-+ * @src_height: height of rectangle to render
-+ * @scale: scale specified as pixels per point
-+ * @rotation: rotate the document by the specified degree
-+ * @pixbuf: pixbuf to render into
-+ *
-+ * First scale the document to match the specified pixels per point,
-+ * then render the rectangle given by the upper left corner at
-+ * (src_x, src_y) and src_width and src_height.
-+ * This function is for rendering a page that will be displayed.
-+ * If you want to render a page that will be printed use
-+ * poppler_page_render_to_pixbuf_for_printing() instead
-+ *
-+ * Deprecated: 0.16
-+ **/
-+void
-+poppler_page_render_to_pixbuf (PopplerPage *page,
-+			       int src_x, int src_y,
-+			       int src_width, int src_height,
-+			       double scale,
-+			       int rotation,
-+			       GdkPixbuf *pixbuf)
-+{
-+  g_return_if_fail (POPPLER_IS_PAGE (page));
-+  g_return_if_fail (scale > 0.0);
-+  g_return_if_fail (pixbuf != NULL);
-+
-+  _poppler_page_render_to_pixbuf (page, src_x, src_y,
-+				  src_width, src_height,
-+				  scale, rotation,
-+				  gFalse,
-+				  pixbuf);
-+}