update comment, the whole problem is caused by our own patches, and hence not a probl...

Package-Manager: portage-2.2.00.15842-prefix/cvs/Darwin powerpc

diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 522c02ace7d7bfcaac579af86012c0e189b3027e..7b36431221a6128843e6c0549739a141fb5ba5d3 100644 (file)
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -12,6 +12,6 @@ AUX poppler-0.12.4-xopen_source.patch 1878 RMD160 13541fb85dec76297d1d35c9591c1f
 DIST poppler-0.12.3.tar.gz 1616883 RMD160 a8fd07ec4dc918cc17390a5236aff9a43e1f7253 SHA1 bce8b675fb7c22d507b1965efa7bd71d9ce09460 SHA256 7a4ffe6d2950c446c285700d3b2dc399540a27ce635dd712aff646f02f8dfbcc
 DIST poppler-0.12.4.tar.gz 1674400 RMD160 9c212ebb8fc3d4cbc532f1c826428cc4d195cb5b SHA1 306507e0fbf47736b456218618f043a216c263ef SHA256 2afa2a54bd4ccb09e92f82b64bcafa95d39a404a3b3db9d6a5fcad0e0229857a
 EBUILD poppler-0.12.3-r3.ebuild 2747 RMD160 3b9629709338dc993c64423268f90af4d530421a SHA1 272b0a771c3a713d1ec925d3d715f17445e1ec53 SHA256 e4e21785e8ddb4b693ad12a0a59a1aad1fa1d4f61267b5b884cb7dca8f873ab1
-EBUILD poppler-0.12.4-r3.ebuild 3314 RMD160 bc7160d7c91987acbf9366953070733e843eddc1 SHA1 065137397cd9577fecea0c57c066370c76159515 SHA256 d6e1947a99a51ed4213595f696551d0ed16bb1b223032dd945d3c11434e7154d
+EBUILD poppler-0.12.4-r3.ebuild 3610 RMD160 798cc00dff52a47904db0351c2d925c74ca4604c SHA1 403f9d04211ed1562b935d3078d6ce4ed343fbd3 SHA256 c2b00c3fae994209a9de1f3adf73355294ed5a6de644a0d234e3fc70ad3b958f
 MISC ChangeLog 33622 RMD160 7e9a97827183f64e97933a5f520ff9503d0d14c1 SHA1 9e43a0a65a407793e8c2317310aed8142f81c6d4 SHA256 6a9b60460a7c542a1a342b135ec5d8fef2e931eea95abb8f355939d1e1a9d4a7
 MISC metadata.xml 662 RMD160 b2bfa73aa44dfcdd9174ab7ae7e210957dd1dead SHA1 c53dbd326209bbbd743a539c08a07bb4d045507b SHA256 484bd11aa8a96c00b419805d8ca7537ac1adb99385894ff0f3d6cb7f8d1cc3ae

diff --git a/app-text/poppler/poppler-0.12.4-r3.ebuild b/app-text/poppler/poppler-0.12.4-r3.ebuild
index 6e62bd202a6ca747d69235054b49992471c7e607..cd99e9f52a495c3387e18a9e8a998ed68727be36 100644 (file)
--- a/app-text/poppler/poppler-0.12.4-r3.ebuild
+++ b/app-text/poppler/poppler-0.12.4-r3.ebuild
@@ -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.12.4-r3.ebuild,v 1.6 2010/06/08 12:28:55 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.12.4-r3.ebuild,v 1.7 2010/06/08 19:18:43 grobian Exp $
 
 EAPI="2"
 
@@ -59,8 +59,12 @@ src_prepare() {
        epatch "${FILESDIR}"/${PN}-0.12.4-nanosleep-rt.patch
        epatch "${FILESDIR}"/${PN}-0.12.4-strings_h.patch #314925
        epatch "${FILESDIR}"/${PN}-0.12.4-xopen_source.patch #314925
-       # The whole _XOPEN_SOURCE thing breaks OSX Tiger and Solaris,
-       # upstream bug 28442.
+       # The whole _XOPEN_SOURCE thing breaks OSX Tiger and Solaris, this
+       # is introduced by #309297, and made worse by #314925.  Since
+       # vanilla sources don't have this enabled, the whole _XOPEN_SOURCE
+       # isn't set by default, and hence correct from upstream's point of
+       # view.  FreeBSD folks should file a proper bug for #314925 if they
+       # really need it to compile vanilla sources.
        [[ ${CHOST} == *-darwin8 || ${CHOST} == *-solaris* ]] && \
                sed -i -e '/add_definitions/d' cmake/modules/PopplerMacros.cmake
 }