[gentoo-commits] gentoo-x86 commit in app-text/poppler: poppler-0.12.4.ebuild ChangeLog

[Fabian Groffen (grobian)]

grobian     10/02/21 16:43:56

  Modified:             poppler-0.12.4.ebuild ChangeLog
  Log:
  Drop flag-o-matic ugly hack in favour of patch by upstream to solve Solaris -lrt problem
  (Portage version: 2.2.00.15335-prefix/cvs/SunOS i386, RepoMan options: --force)

Revision  Changes    Path
1.3                  app-text/poppler/poppler-0.12.4.ebuild

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

Index: poppler-0.12.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.12.4.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- poppler-0.12.4.ebuild	19 Feb 2010 18:01:06 -0000	1.2
+++ poppler-0.12.4.ebuild	21 Feb 2010 16:43:56 -0000	1.3
@@ -1,10 +1,10 @@
 # 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.12.4.ebuild,v 1.2 2010/02/19 18:01:06 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.12.4.ebuild,v 1.3 2010/02/21 16:43:56 grobian Exp $
 
 EAPI="2"
 
-inherit cmake-utils flag-o-matic
+inherit cmake-utils
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
 HOMEPAGE="http://poppler.freedesktop.org/"
@@ -46,6 +46,7 @@
 	epatch "${FILESDIR}"/${PN}-0.12.3-darwin-gtk-link.patch
 	epatch "${FILESDIR}"/${P}-config.patch  #304407
 	epatch "${FILESDIR}"/${PN}-0.12.3-cairo-downscale.patch  #303817
+	epatch "${FILESDIR}"/${PN}-0.12.4-nanosleep-rt.patch
 }
 
 src_configure() {
@@ -68,9 +69,6 @@
 		$(cmake-utils_use exceptions USE_EXCEPTIONS)
 	)
 
-	# http://bugs.freedesktop.org/show_bug.cgi?id=26650
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lrt # for nanosleep
-
 	cmake-utils_src_configure
 }
 



1.225                app-text/poppler/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/poppler/ChangeLog?rev=1.225&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/poppler/ChangeLog?rev=1.225&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/poppler/ChangeLog?r1=1.224&r2=1.225

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -r1.224 -r1.225
--- ChangeLog	19 Feb 2010 18:01:06 -0000	1.224
+++ ChangeLog	21 Feb 2010 16:43:56 -0000	1.225
@@ -1,6 +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.224 2010/02/19 18:01:06 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.225 2010/02/21 16:43:56 grobian Exp $
+
+  21 Feb 2010; Fabian Groffen <grobian@g.o> poppler-0.12.4.ebuild,
+  +files/poppler-0.12.4-nanosleep-rt.patch:
+  Drop flag-o-matic ugly hack in favour of patch by upstream to solve
+  Solaris -lrt problem
 
   19 Feb 2010; Fabian Groffen <grobian@g.o> poppler-0.12.4.ebuild:
   make sure we link with -lrt on Solaris, problem reported upstream