public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/kde:master commit in: app-text/poppler/
@ 2014-05-10 13:06 Johannes Huber
  0 siblings, 0 replies; 6+ messages in thread
From: Johannes Huber @ 2014-05-10 13:06 UTC (permalink / raw
  To: gentoo-commits

commit:     b5469b66b04f2d542faaf0f10f0713ee797e2406
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat May 10 11:52:57 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat May 10 11:52:57 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b5469b66

[app-text/poppler] Import from qt overlay for maintenance

Package-Manager: portage-2.2.10

---
 app-text/poppler/metadata.xml        | 17 +++++++
 app-text/poppler/poppler-9999.ebuild | 98 ++++++++++++++++++++++++++++++++++++
 2 files changed, 115 insertions(+)

diff --git a/app-text/poppler/metadata.xml b/app-text/poppler/metadata.xml
new file mode 100644
index 0000000..75a5717
--- /dev/null
+++ b/app-text/poppler/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>kde</herd>
+<herd>printing</herd>
+<maintainer>
+	<email>reavertm@gentoo.org</email>
+	<name>Maciej Mrozowski</name>
+</maintainer>
+<use>
+	<flag name='abiword'>Enable support for <pkg>app-office/abiword</pkg> output. Requires <pkg>dev-libs/libxml2</pkg>.</flag>
+	<flag name='exceptions'>Enable exceptions throwing.</flag>
+	<flag name='introspection'>Enable GObject introspection.</flag>
+	<flag name='utils'>Install command-line PDF converters and various utilities.</flag>
+	<flag name='xpdf-headers'></flag>
+</use>
+</pkgmetadata>

diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
new file mode 100644
index 0000000..ba2094e
--- /dev/null
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.22.5.ebuild,v 1.2 2013/07/12 20:34:24 dilfridge Exp $
+
+EAPI=5
+
+inherit cmake-utils toolchain-funcs git-2
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="http://poppler.freedesktop.org/"
+EGIT_REPO_URI="git://git.freedesktop.org/git/poppler/poppler"
+
+LICENSE="GPL-2"
+KEYWORDS=""
+SLOT="0/43"
+IUSE="cairo cjk curl cxx debug doc +introspection +jpeg jpeg2k +lcms png qt4 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=media-libs/fontconfig-2.6.0
+	>=media-libs/freetype-2.3.9
+	sys-libs/zlib
+	cairo? (
+		dev-libs/glib:2
+		>=x11-libs/cairo-1.10.0
+		introspection? ( >=dev-libs/gobject-introspection-1.32.1 )
+	)
+	curl? ( net-misc/curl )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	png? ( media-libs/libpng:0= )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	!dev-libs/poppler
+	!dev-libs/poppler-glib
+	!dev-libs/poppler-qt3
+	!dev-libs/poppler-qt4
+	!app-text/poppler-utils
+	cjk? ( >=app-text/poppler-data-0.4.4 )
+"
+
+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
+		-DBUILD_CPP_TESTS=OFF
+		-DENABLE_SPLASH=ON
+		-DENABLE_ZLIB=ON
+		-DENABLE_XPDF_HEADERS=ON
+		$(cmake-utils_use_enable curl LIBCURL)
+		$(cmake-utils_use_enable cxx CPP)
+		$(cmake-utils_use_enable jpeg2k LIBOPENJPEG)
+		$(cmake-utils_use_enable utils)
+		$(cmake-utils_use_with cairo)
+		$(cmake-utils_use_with introspection GObjectIntrospection)
+		$(cmake-utils_use_with jpeg)
+		$(cmake-utils_use_with png)
+		$(cmake-utils_use_with qt4)
+		$(cmake-utils_use_with tiff)
+	)
+	if use lcms; then
+		mycmakeargs+=(-DENABLE_CMS=lcms2)
+	else
+		mycmakeargs+=(-DENABLE_CMS=)
+	fi
+
+	cmake-utils_src_configure
+}
+
+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/*
+	fi
+}


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

* [gentoo-commits] proj/kde:master commit in: app-text/poppler/
@ 2014-05-10 13:06 Johannes Huber
  0 siblings, 0 replies; 6+ messages in thread
From: Johannes Huber @ 2014-05-10 13:06 UTC (permalink / raw
  To: gentoo-commits

commit:     9e746f7f8ef3243da6a32de768b6031442d0fe08
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat May 10 11:55:46 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat May 10 11:55:46 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=9e746f7f

[app-text/poppler] Sync with tree, cleanup header

Package-Manager: portage-2.2.10

---
 app-text/poppler/metadata.xml        |  3 ---
 app-text/poppler/poppler-9999.ebuild | 11 ++++-------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/app-text/poppler/metadata.xml b/app-text/poppler/metadata.xml
index 75a5717..9124e13 100644
--- a/app-text/poppler/metadata.xml
+++ b/app-text/poppler/metadata.xml
@@ -8,10 +8,7 @@
 	<name>Maciej Mrozowski</name>
 </maintainer>
 <use>
-	<flag name='abiword'>Enable support for <pkg>app-office/abiword</pkg> output. Requires <pkg>dev-libs/libxml2</pkg>.</flag>
-	<flag name='exceptions'>Enable exceptions throwing.</flag>
 	<flag name='introspection'>Enable GObject introspection.</flag>
 	<flag name='utils'>Install command-line PDF converters and various utilities.</flag>
-	<flag name='xpdf-headers'></flag>
 </use>
 </pkgmetadata>

diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index ba2094e..d123bd2 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.22.5.ebuild,v 1.2 2013/07/12 20:34:24 dilfridge Exp $
+# $Header: $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ EGIT_REPO_URI="git://git.freedesktop.org/git/poppler/poppler"
 
 LICENSE="GPL-2"
 KEYWORDS=""
-SLOT="0/43"
+SLOT="0/46"
 IUSE="cairo cjk curl cxx debug doc +introspection +jpeg jpeg2k +lcms png qt4 tiff +utils"
 
 # No test data provided
@@ -42,11 +42,6 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 "
 RDEPEND="${COMMON_DEPEND}
-	!dev-libs/poppler
-	!dev-libs/poppler-glib
-	!dev-libs/poppler-qt3
-	!dev-libs/poppler-qt4
-	!app-text/poppler-utils
 	cjk? ( >=app-text/poppler-data-0.4.4 )
 "
 
@@ -63,6 +58,7 @@ src_configure() {
 	mycmakeargs=(
 		-DBUILD_GTK_TESTS=OFF
 		-DBUILD_QT4_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
 		-DBUILD_CPP_TESTS=OFF
 		-DENABLE_SPLASH=ON
 		-DENABLE_ZLIB=ON
@@ -76,6 +72,7 @@ src_configure() {
 		$(cmake-utils_use_with jpeg)
 		$(cmake-utils_use_with png)
 		$(cmake-utils_use_with qt4)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Core=ON
 		$(cmake-utils_use_with tiff)
 	)
 	if use lcms; then


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

* [gentoo-commits] proj/kde:master commit in: app-text/poppler/
@ 2014-05-10 13:06 Johannes Huber
  0 siblings, 0 replies; 6+ messages in thread
From: Johannes Huber @ 2014-05-10 13:06 UTC (permalink / raw
  To: gentoo-commits

commit:     61fa04dac18d2bd05a617e9146b091550b03a19e
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat May 10 12:33:16 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat May 10 12:33:16 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=61fa04da

[app-text/poppler] Move to git-r3 eclass

Package-Manager: portage-2.2.10

---
 app-text/poppler/poppler-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index d123bd2..b3fd066 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -4,11 +4,11 @@
 
 EAPI=5
 
-inherit cmake-utils toolchain-funcs git-2
+inherit cmake-utils toolchain-funcs git-r3
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
 HOMEPAGE="http://poppler.freedesktop.org/"
-EGIT_REPO_URI="git://git.freedesktop.org/git/poppler/poppler"
+EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
 
 LICENSE="GPL-2"
 KEYWORDS=""


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

* [gentoo-commits] proj/kde:master commit in: app-text/poppler/
@ 2014-05-17 15:13 Alexey Shvetsov
  0 siblings, 0 replies; 6+ messages in thread
From: Alexey Shvetsov @ 2014-05-17 15:13 UTC (permalink / raw
  To: gentoo-commits

commit:     2eab01ce2be4dbfa91738421dc72bf432ad0aac9
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sat May 17 15:12:30 2014 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sat May 17 15:12:30 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=2eab01ce

[app-text/poppler] Add qt5 support

Package-Manager: portage-2.2.10

---
 app-text/poppler/poppler-0.26.0-r1.ebuild | 102 ++++++++++++++++++++++++++++++
 1 file changed, 102 insertions(+)

diff --git a/app-text/poppler/poppler-0.26.0-r1.ebuild b/app-text/poppler/poppler-0.26.0-r1.ebuild
new file mode 100644
index 0000000..59e930f
--- /dev/null
+++ b/app-text/poppler/poppler-0.26.0-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.26.0.ebuild,v 1.1 2014/04/27 13:08:38 dilfridge Exp $
+
+EAPI=5
+
+inherit cmake-utils 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"
+SLOT="0/46"
+IUSE="cairo cjk curl cxx debug doc +introspection +jpeg jpeg2k +lcms png qt4 qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=media-libs/fontconfig-2.6.0
+	>=media-libs/freetype-2.3.9
+	sys-libs/zlib
+	cairo? (
+		dev-libs/glib:2
+		>=x11-libs/cairo-1.10.0
+		introspection? ( >=dev-libs/gobject-introspection-1.32.1 )
+	)
+	curl? ( net-misc/curl )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	png? ( media-libs/libpng:0= )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtxml:5
+	)
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	cjk? ( >=app-text/poppler-data-0.4.4 )
+"
+
+DOCS=(AUTHORS NEWS README README-XPDF TODO)
+
+PATCHES=( "${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch" )
+
+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
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DENABLE_SPLASH=ON
+		-DENABLE_ZLIB=ON
+		-DENABLE_XPDF_HEADERS=ON
+		$(cmake-utils_use_enable curl LIBCURL)
+		$(cmake-utils_use_enable cxx CPP)
+		$(cmake-utils_use_enable jpeg2k LIBOPENJPEG)
+		$(cmake-utils_use_enable utils)
+		$(cmake-utils_use_with cairo)
+		$(cmake-utils_use_with introspection GObjectIntrospection)
+		$(cmake-utils_use_with jpeg)
+		$(cmake-utils_use_with png)
+		$(cmake-utils_use_with qt4)
+		$(cmake-utils_use_find_package qt5 Qt5Core)
+		$(cmake-utils_use_with tiff)
+	)
+	if use lcms; then
+		mycmakeargs+=(-DENABLE_CMS=lcms2)
+	else
+		mycmakeargs+=(-DENABLE_CMS=)
+	fi
+
+	cmake-utils_src_configure
+}
+
+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/*
+	fi
+}


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

* [gentoo-commits] proj/kde:master commit in: app-text/poppler/
@ 2014-05-24 20:09 Andreas Hüttel
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Hüttel @ 2014-05-24 20:09 UTC (permalink / raw
  To: gentoo-commits

commit:     85f1c58192b1eb2217ac6ea2444a8f9272cf68e9
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat May 24 20:09:02 2014 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat May 24 20:09:02 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=85f1c581

[app-text/poppler] remove obsolete revbump

Package-Manager: portage-2.2.10

---
 app-text/poppler/poppler-0.26.0-r1.ebuild | 102 ------------------------------
 1 file changed, 102 deletions(-)

diff --git a/app-text/poppler/poppler-0.26.0-r1.ebuild b/app-text/poppler/poppler-0.26.0-r1.ebuild
deleted file mode 100644
index 59e930f..0000000
--- a/app-text/poppler/poppler-0.26.0-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.26.0.ebuild,v 1.1 2014/04/27 13:08:38 dilfridge Exp $
-
-EAPI=5
-
-inherit cmake-utils 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"
-SLOT="0/46"
-IUSE="cairo cjk curl cxx debug doc +introspection +jpeg jpeg2k +lcms png qt4 qt5 tiff +utils"
-
-# No test data provided
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=media-libs/fontconfig-2.6.0
-	>=media-libs/freetype-2.3.9
-	sys-libs/zlib
-	cairo? (
-		dev-libs/glib:2
-		>=x11-libs/cairo-1.10.0
-		introspection? ( >=dev-libs/gobject-introspection-1.32.1 )
-	)
-	curl? ( net-misc/curl )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	png? ( media-libs/libpng:0= )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtxml:5
-	)
-	tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	cjk? ( >=app-text/poppler-data-0.4.4 )
-"
-
-DOCS=(AUTHORS NEWS README README-XPDF TODO)
-
-PATCHES=( "${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch" )
-
-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
-		-DBUILD_QT5_TESTS=OFF
-		-DBUILD_CPP_TESTS=OFF
-		-DENABLE_SPLASH=ON
-		-DENABLE_ZLIB=ON
-		-DENABLE_XPDF_HEADERS=ON
-		$(cmake-utils_use_enable curl LIBCURL)
-		$(cmake-utils_use_enable cxx CPP)
-		$(cmake-utils_use_enable jpeg2k LIBOPENJPEG)
-		$(cmake-utils_use_enable utils)
-		$(cmake-utils_use_with cairo)
-		$(cmake-utils_use_with introspection GObjectIntrospection)
-		$(cmake-utils_use_with jpeg)
-		$(cmake-utils_use_with png)
-		$(cmake-utils_use_with qt4)
-		$(cmake-utils_use_find_package qt5 Qt5Core)
-		$(cmake-utils_use_with tiff)
-	)
-	if use lcms; then
-		mycmakeargs+=(-DENABLE_CMS=lcms2)
-	else
-		mycmakeargs+=(-DENABLE_CMS=)
-	fi
-
-	cmake-utils_src_configure
-}
-
-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/*
-	fi
-}


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

* [gentoo-commits] proj/kde:master commit in: app-text/poppler/
@ 2014-05-24 20:29 Andreas Hüttel
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Hüttel @ 2014-05-24 20:29 UTC (permalink / raw
  To: gentoo-commits

commit:     c54a8d5c7e631c35fee8e5f52cbb8f36794ae8b3
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat May 24 20:29:00 2014 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat May 24 20:29:00 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c54a8d5c

[app-text/poppler] make hybrid live/nonlive ebuild

Package-Manager: portage-2.2.10

---
 app-text/poppler/poppler-9999.ebuild | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index 53e061b..b869f21 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -4,15 +4,23 @@
 
 EAPI=5
 
-inherit cmake-utils toolchain-funcs git-r3
+inherit cmake-utils toolchain-funcs
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
+	KEYWORDS=""
+	SLOT="0/9999"
+else
+	SRC_URI="http://poppler.freedesktop.org/${P}.tar.xz"
+	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"
+	SLOT="0/46"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
 HOMEPAGE="http://poppler.freedesktop.org/"
-EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
 
 LICENSE="GPL-2"
-KEYWORDS=""
-SLOT="0/46"
 IUSE="cairo cjk curl cxx debug doc +introspection +jpeg jpeg2k +lcms png qt4 qt5 tiff +utils"
 
 # No test data provided


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

end of thread, other threads:[~2014-05-24 20:29 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-10 13:06 [gentoo-commits] proj/kde:master commit in: app-text/poppler/ Johannes Huber
  -- strict thread matches above, loose matches on Subject: below --
2014-05-24 20:29 Andreas Hüttel
2014-05-24 20:09 Andreas Hüttel
2014-05-17 15:13 Alexey Shvetsov
2014-05-10 13:06 Johannes Huber
2014-05-10 13:06 Johannes Huber

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