aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory M. Tuner <gmt@be-evil.net>2014-01-21 11:51:35 -0800
committerGregory M. Tuner <gmt@be-evil.net>2014-01-21 11:51:35 -0800
commitcbe3b079e31c759006b06e3266b8fc3ab4589abb (patch)
treeb7487f9d966d7bdfeaf31fab9b7eab39dc48809e /app-text/poppler
parent(squashme?: clone upstream) remove old version (diff)
downloadgmt-cbe3b079e31c759006b06e3266b8fc3ab4589abb.tar.gz
gmt-cbe3b079e31c759006b06e3266b8fc3ab4589abb.tar.bz2
gmt-cbe3b079e31c759006b06e3266b8fc3ab4589abb.zip
app-text/poppler-0.24.5-r1: multilib-utize
Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>
Diffstat (limited to 'app-text/poppler')
-rw-r--r--app-text/poppler/Manifest2
-rw-r--r--app-text/poppler/poppler-0.24.5-r1.ebuild45
2 files changed, 22 insertions, 25 deletions
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 19228b9..fd7c475 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,4 +1,4 @@
DIST poppler-0.24.5.tar.xz 1512476 SHA256 a2654910100c923c44e366242495e226db2798254f2fa2781138867348759f84 SHA512 dfb40f7d864614f4ad7e8729334931c4b40c48c0dc3d7a8c33b14134cf13c61f8a562cc790a08bee4a43c2c29e587a9d26330437858d465e18ceafd69521250c WHIRLPOOL 066924beb46e58c2906a3b278e617438bd966e2b7bd884e110949f0d149d2cca0bf6326f2fa8c99e3a2c0f2d3cb3f145c8eeee4f060d17e3dded501ef8ec7f33
-EBUILD poppler-0.24.5-r1.ebuild 2602 SHA256 cb8900e99d5f0e894accbb5e5d179aa73bd684017b647dfed6fd075225614c9a SHA512 151a6e6e412322e6660bafc3382dcd70104273dfc2722ca50e78a0a6a7aa1319a0a7f2b8a28811bcf2a4b72abecde2287eb96a9b84244f8e997bf28e719e6623 WHIRLPOOL 6e1166b52ef222e5f9741bd6674daf360f1da751e6e9fd22f3a0053c7a00ab11fb136a02bff595dab1656a5a04e57ada1ffc5cd04648915ca10f7909e6b7d748
+EBUILD poppler-0.24.5-r1.ebuild 2417 SHA256 1881183bfdc8d668c8e4bba9f4a418b1f76804108cd5d774cccdd3ba8df42f41 SHA512 c76b038e011e789f62cfd53dd5688a57525d99ed0d24b38651713f0f8422538f2c456773cca521122f0dbbf3ef6a41a433944eeca5f1810a7e5ca81114141839 WHIRLPOOL 9a506c7ff942ccdac9b7da556828cf0630578f36267a4c417ae9770021843595c58bb5999749df985fbca676708fe917be3811b1c69651c8372c305ffcceb262
MISC ChangeLog 57440 SHA256 18ca3e29efe5a2ab5a0aa8ac1786dc6ae96c48b32d11af7f8808ff6e9e6c5018 SHA512 7002cce9caaffdd2a8c9b2f3887f89431f18461e974660243f22f6e829c95aef7949dd01fc00c32998bcead02f941cb500e302ac796f56e62166dafb9c73d00a WHIRLPOOL 62aaa94dc7062edb800f6aed9bdaff525293bacd09abcaee7aa73ace302154055bc4e9a3ee505d626a2dbfacf5cc91497c21cb3291ab893b8c6c2a7a85522708
MISC metadata.xml 436 SHA256 11c2593e7d35deb49a1e6d7a5d08ba970b82a4071b7c5fcdc88645fa33c362a1 SHA512 6a82698c8890cd386d3011c003088f3f97f2a83aff0fde6ed13e38a3ed7ea99a3716da8a5b3f91ddcde617f8445d5ed95460011ac86101174479f640d93a7216 WHIRLPOOL 056ed300269a0ad2d9669f454b12569af79294a252b49f946bbf3cecc323485c3341895fc43bca91aedadaa7109909ec01f4c63b0c209115d8459c6ad05d8a91
diff --git a/app-text/poppler/poppler-0.24.5-r1.ebuild b/app-text/poppler/poppler-0.24.5-r1.ebuild
index 500862b..f10e4f7 100644
--- a/app-text/poppler/poppler-0.24.5-r1.ebuild
+++ b/app-text/poppler/poppler-0.24.5-r1.ebuild
@@ -4,14 +4,17 @@
EAPI=5
-inherit cmake-utils toolchain-funcs
+# bug 495394
+CMAKE_MIN_VERSION=2.8.12.1-r2
+
+inherit cmake-multilib toolchain-funcs
DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
HOMEPAGE="http://poppler.freedesktop.org/"
SRC_URI="http://poppler.freedesktop.org/${P}.tar.xz"
LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~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"
+KEYWORDS="~amd64"
SLOT="0/44"
IUSE="cairo cjk curl cxx debug doc +introspection +jpeg jpeg2k +lcms png qt4 tiff +utils"
@@ -19,24 +22,24 @@ IUSE="cairo cjk curl cxx debug doc +introspection +jpeg jpeg2k +lcms png qt4 tif
RESTRICT="test"
COMMON_DEPEND="
- >=media-libs/fontconfig-2.6.0
- >=media-libs/freetype-2.3.9
- sys-libs/zlib
+ >=media-libs/fontconfig-2.6.0[${MULTILIB_USEDEP}]
+ >=media-libs/freetype-2.3.9[${MULTILIB_USEDEP}]
+ sys-libs/zlib[${MULTILIB_USEDEP}]
cairo? (
- dev-libs/glib:2
- >=x11-libs/cairo-1.10.0
- introspection? ( >=dev-libs/gobject-introspection-1.32.1 )
+ dev-libs/glib:2[${MULTILIB_USEDEP}]
+ >=x11-libs/cairo-1.10.0[${MULTILIB_USEDEP}]
+ introspection? ( >=dev-libs/gobject-introspection-1.32.1[${MULTILIB_USEDEP}] )
)
- curl? ( net-misc/curl )
- jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( media-libs/openjpeg:0 )
- lcms? ( media-libs/lcms:2 )
- png? ( media-libs/libpng:0= )
+ curl? ( net-misc/curl[${MULTILIB_USEDEP}] )
+ jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+ jpeg2k? ( media-libs/openjpeg:0[${MULTILIB_USEDEP}] )
+ lcms? ( media-libs/lcms:2[${MULTILIB_USEDEP}] )
+ png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
+ dev-qt/qtcore:4[${MULTILIB_USEDEP}]
+ dev-qt/qtgui:4[${MULTILIB_USEDEP}]
)
- tiff? ( media-libs/tiff:0 )
+ tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
"
DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
@@ -49,12 +52,6 @@ DOCS=(AUTHORS NEWS README README-XPDF TODO)
src_configure() {
# this is needed for multilib, see bug 459394
- local ft_libdir ft_includedir
- ft_libdir="$($(tc-getPKG_CONFIG) freetype2 --variable=libdir)"
- ft_includedir="$($(tc-getPKG_CONFIG) freetype2 --variable=includedir)"
- export FREETYPE_DIR="${ft_libdir}:${ft_includedir%/include}"
- einfo "Detected FreeType at ${FREETYPE_DIR}"
-
mycmakeargs=(
-DBUILD_GTK_TESTS=OFF
-DBUILD_QT4_TESTS=OFF
@@ -81,11 +78,11 @@ src_configure() {
mycmakeargs+=(-DENABLE_CMS=)
fi
- cmake-utils_src_configure
+ cmake-multilib_src_configure
}
src_install() {
- cmake-utils_src_install
+ cmake-multilib_src_install
if use cairo && use doc; then
# For now install gtk-doc there