public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in app-text/poppler: ChangeLog poppler-0.14.0-r1.ebuild
@ 2010-06-09 14:38 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 3+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2010-06-09 14:38 UTC (permalink / raw
  To: gentoo-commits

scarabeus    10/06/09 14:38:36

  Modified:             ChangeLog poppler-0.14.0-r1.ebuild
  Log:
  Use preserved_old_lib features to be nice on <portage-2.2 guys.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.236                app-text/poppler/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/ChangeLog?rev=1.236&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/ChangeLog?rev=1.236&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/ChangeLog?r1=1.235&r2=1.236

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -r1.235 -r1.236
--- ChangeLog	9 Jun 2010 14:06:42 -0000	1.235
+++ ChangeLog	9 Jun 2010 14:38:35 -0000	1.236
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/poppler
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.235 2010/06/09 14:06:42 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.236 2010/06/09 14:38:35 scarabeus Exp $
+
+  09 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  poppler-0.14.0-r1.ebuild:
+  Use preserved_old_lib features to be nice on <portage-2.2 guys.
 
 *poppler-0.14.0-r1 (09 Jun 2010)
 



1.2                  app-text/poppler/poppler-0.14.0-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.14.0-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.14.0-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.14.0-r1.ebuild?r1=1.1&r2=1.2

Index: poppler-0.14.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.14.0-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- poppler-0.14.0-r1.ebuild	9 Jun 2010 14:06:43 -0000	1.1
+++ poppler-0.14.0-r1.ebuild	9 Jun 2010 14:38:35 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.14.0-r1.ebuild,v 1.1 2010/06/09 14:06:43 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.14.0-r1.ebuild,v 1.2 2010/06/09 14:38:35 scarabeus Exp $
 
 EAPI="2"
 
@@ -88,8 +88,12 @@
 	fi
 }
 
+pkg_preinst() {
+	preserve_old_lib /usr/$(get_libdir)/libpoppler-glib.so.5
+	preserve_old_lib /usr/$(get_libdir)/libpoppler.so.6
+}
+
 pkg_postinst() {
-	ewarn 'After upgrading app-text/poppler you may need to reinstall packages'
-	ewarn 'depending on it. If you have gentoolkit installed, you can find those'
-	ewarn 'with `equery d poppler`.'
+	preserve_old_lib_notify /usr/$(get_libdir)/libpoppler-glib.so.5
+	preserve_old_lib_notify /usr/$(get_libdir)/libpoppler.so.6
 }






^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-text/poppler: ChangeLog poppler-0.14.0-r1.ebuild
@ 2010-06-21  9:57 Samuli Suominen (ssuominen)
  0 siblings, 0 replies; 3+ messages in thread
From: Samuli Suominen (ssuominen) @ 2010-06-21  9:57 UTC (permalink / raw
  To: gentoo-commits

ssuominen    10/06/21 09:57:42

  Modified:             ChangeLog poppler-0.14.0-r1.ebuild
  Log:
  Restrict media-libs/lcms depend to old version.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.241                app-text/poppler/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/ChangeLog?rev=1.241&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/ChangeLog?rev=1.241&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/ChangeLog?r1=1.240&r2=1.241

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -r1.240 -r1.241
--- ChangeLog	20 Jun 2010 18:20:53 -0000	1.240
+++ ChangeLog	21 Jun 2010 09:57:41 -0000	1.241
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/poppler
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.240 2010/06/20 18:20:53 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.241 2010/06/21 09:57:41 ssuominen Exp $
+
+  21 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
+  poppler-0.14.0-r1.ebuild:
+  Restrict media-libs/lcms depend to old version.
 
   20 Jun 2010; Raúl Porcel <armin76@gentoo.org> poppler-0.12.4-r3.ebuild:
   alpha/arm/ia64/s390/sh/sparc stable wrt #323271



1.3                  app-text/poppler/poppler-0.14.0-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.14.0-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.14.0-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.14.0-r1.ebuild?r1=1.2&r2=1.3

Index: poppler-0.14.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.14.0-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- poppler-0.14.0-r1.ebuild	9 Jun 2010 14:38:35 -0000	1.2
+++ poppler-0.14.0-r1.ebuild	21 Jun 2010 09:57:41 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.14.0-r1.ebuild,v 1.2 2010/06/09 14:38:35 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.14.0-r1.ebuild,v 1.3 2010/06/21 09:57:41 ssuominen Exp $
 
 EAPI="2"
 
@@ -31,7 +31,7 @@
 	curl? ( net-misc/curl )
 	jpeg? ( >=media-libs/jpeg-7:0 )
 	jpeg2k? ( media-libs/openjpeg )
-	lcms? ( media-libs/lcms )
+	lcms? ( =media-libs/lcms-1* )
 	png? ( media-libs/libpng )
 	qt4? (
 		x11-libs/qt-core:4






^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-text/poppler: ChangeLog poppler-0.14.0-r1.ebuild
@ 2010-06-21 15:32 Samuli Suominen (ssuominen)
  0 siblings, 0 replies; 3+ messages in thread
From: Samuli Suominen (ssuominen) @ 2010-06-21 15:32 UTC (permalink / raw
  To: gentoo-commits

ssuominen    10/06/21 15:32:14

  Modified:             ChangeLog poppler-0.14.0-r1.ebuild
  Log:
  Fix preserve_old_lib wrt #323519. Remove USE="doc" (only for this release) wrt #323409.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.242                app-text/poppler/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/ChangeLog?rev=1.242&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/ChangeLog?rev=1.242&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/ChangeLog?r1=1.241&r2=1.242

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -r1.241 -r1.242
--- ChangeLog	21 Jun 2010 09:57:41 -0000	1.241
+++ ChangeLog	21 Jun 2010 15:32:14 -0000	1.242
@@ -1,10 +1,11 @@
 # ChangeLog for app-text/poppler
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.241 2010/06/21 09:57:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.242 2010/06/21 15:32:14 ssuominen Exp $
 
   21 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
   poppler-0.14.0-r1.ebuild:
-  Restrict media-libs/lcms depend to old version.
+  Fix preserve_old_lib wrt #323519. Remove USE="doc" (only for this release)
+  wrt #323409. Restrict media-libs/lcms depend to old version.
 
   20 Jun 2010; Raúl Porcel <armin76@gentoo.org> poppler-0.12.4-r3.ebuild:
   alpha/arm/ia64/s390/sh/sparc stable wrt #323271



1.4                  app-text/poppler/poppler-0.14.0-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.14.0-r1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.14.0-r1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.14.0-r1.ebuild?r1=1.3&r2=1.4

Index: poppler-0.14.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.14.0-r1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- poppler-0.14.0-r1.ebuild	21 Jun 2010 09:57:41 -0000	1.3
+++ poppler-0.14.0-r1.ebuild	21 Jun 2010 15:32:14 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.14.0-r1.ebuild,v 1.3 2010/06/21 09:57:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.14.0-r1.ebuild,v 1.4 2010/06/21 15:32:14 ssuominen Exp $
 
 EAPI="2"
 
@@ -13,7 +13,8 @@
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
-IUSE="+abiword cairo cjk curl cxx debug doc exceptions jpeg jpeg2k +lcms png qt4 +utils +xpdf-headers"
+IUSE="+abiword cairo cjk curl cxx debug exceptions jpeg jpeg2k +lcms png qt4 +utils +xpdf-headers"
+# doc, see src_install
 
 # No test data provided
 RESTRICT="test"
@@ -81,19 +82,19 @@
 src_install() {
 	cmake-utils_src_install
 
-	if use cairo && use doc; then
-		# For now install gtk-doc there
-		insinto /usr/share/gtk-doc/html/poppler
-		doins -r "${S}"/glib/reference/html/* || die 'failed to install API documentation'
-	fi
+# Restore with 0.14.1 per http://bugs.gentoo.org/323409
+#	if use cairo && use doc; then
+#		insinto /usr/share/doc/${PF}/html
+#		doins -r "${S}"/glib/reference/html/* || die
+#	fi
 }
 
 pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libpoppler-glib.so.5
-	preserve_old_lib /usr/$(get_libdir)/libpoppler.so.6
+	preserve_old_lib /usr/$(get_libdir)/libpoppler-glib.so.4
+	preserve_old_lib /usr/$(get_libdir)/libpoppler.so.5
 }
 
 pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libpoppler-glib.so.5
-	preserve_old_lib_notify /usr/$(get_libdir)/libpoppler.so.6
+	preserve_old_lib_notify /usr/$(get_libdir)/libpoppler-glib.so.4
+	preserve_old_lib_notify /usr/$(get_libdir)/libpoppler.so.5
 }






^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2010-06-21 15:32 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-09 14:38 [gentoo-commits] gentoo-x86 commit in app-text/poppler: ChangeLog poppler-0.14.0-r1.ebuild Tomas Chvatal (scarabeus)
  -- strict thread matches above, loose matches on Subject: below --
2010-06-21  9:57 Samuli Suominen (ssuominen)
2010-06-21 15:32 Samuli Suominen (ssuominen)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox