Remove defective version, add ewarn on tests failing if locale is unset.

(Portage version: 2.2_rc12/cvs/Linux 2.6.27-rc8 x86_64)

6 files changed, 24 insertions, 123 deletions

diff --git a/app-text/poppler-bindings/ChangeLog b/app-text/poppler-bindings/ChangeLog
index 77053d8a3345..5d5acbf656aa 100644
--- a/app-text/poppler-bindings/ChangeLog
+++ b/app-text/poppler-bindings/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/poppler-bindings
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/ChangeLog,v 1.112 2008/10/14 06:37:26 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/ChangeLog,v 1.113 2008/10/14 21:25:24 loki_val Exp $
+
+  14 Oct 2008; Peter Alfredsen <loki_val@gentoo.org>
+  poppler-bindings-0.6.1.ebuild, poppler-bindings-0.6.3.ebuild,
+  poppler-bindings-0.8.7.ebuild, -poppler-bindings-0.10.0.ebuild,
+  poppler-bindings-0.10.0-r1.ebuild:
+  Remove defective version, add ewarn on tests failing if locale is unset.
 
   14 Oct 2008; Jeroen Roovers <jer@gentoo.org>
   poppler-bindings-0.10.0-r1.ebuild:
diff --git a/app-text/poppler-bindings/poppler-bindings-0.10.0-r1.ebuild b/app-text/poppler-bindings/poppler-bindings-0.10.0-r1.ebuild
index 7b0a6383f7c7..8f97a77105a1 100644
--- a/app-text/poppler-bindings/poppler-bindings-0.10.0-r1.ebuild
+++ b/app-text/poppler-bindings/poppler-bindings-0.10.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/poppler-bindings-0.10.0-r1.ebuild,v 1.2 2008/10/14 06:37:26 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/poppler-bindings-0.10.0-r1.ebuild,v 1.3 2008/10/14 21:25:24 loki_val Exp $
 
 EAPI="2"
 
@@ -57,7 +57,7 @@ pkg_setup() {
 		eerror "gtk, qt3, qt4, cairo"
 		die "Please select a toolkit"
 	fi
-
+	use test && ewarn "Tests will fail if your locale is unset."
 }
 
 src_prepare() {
diff --git a/app-text/poppler-bindings/poppler-bindings-0.10.0.ebuild b/app-text/poppler-bindings/poppler-bindings-0.10.0.ebuild
deleted file mode 100644
index 3748d7566d2e..000000000000
--- a/app-text/poppler-bindings/poppler-bindings-0.10.0.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/poppler-bindings-0.10.0.ebuild,v 1.1 2008/10/12 21:48:08 loki_val Exp $
-
-EAPI="2"
-
-inherit autotools eutils multilib
-
-MY_P=${P/-bindings/}
-DESCRIPTION="rendering bindings for GUI toolkits for poppler"
-HOMEPAGE="http://poppler.freedesktop.org/"
-
-# Creating the testsuite tarball
-# must be done if upstream has added tests since last release.
-# can be checked at cgit.freedesktop.org
-#
-# git clone git://anongit.freedesktop.org/git/poppler/test
-# rm -rf test/.git
-# tar czf poppler-test-${PV}.tar.gz test
-
-SRC_URI="http://poppler.freedesktop.org/${MY_P}.tar.gz
-	test? ( mirror://gentoo/poppler-test-0.9.2.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="gtk qt3 cairo qt4 test"
-
-RDEPEND="~app-text/poppler-${PV}
-	cairo? (
-		>=x11-libs/cairo-1.4
-		!gtk? (
-			>=x11-libs/gtk+-2.8
-			>=dev-libs/glib-2.8
-		 )
-	)
-	gtk? (
-		>=x11-libs/gtk+-2.8
-		>=dev-libs/glib-2.8
-	)
-	qt3? ( =x11-libs/qt-3* )
-	qt4? ( || ( ( x11-libs/qt-core:4
-			x11-libs/qt-gui:4
-			x11-libs/qt-test:4 )
-		=x11-libs/qt-4.3*:4 ) )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	test? ( gtk? ( >=gnome-base/libglade-2 ) )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if ! { use gtk || use qt3 || use qt4 || use cairo; }
-	then
-		eerror "You've selected to build no bindings for poppler."
-		eerror "Please select at least one of:"
-		eerror "gtk, qt3, qt4, cairo"
-		die "Please select a toolkit"
-	fi
-
-}
-
-src_prepare() {
-	sed -i \
-		-e 's:$(top_builddir)/poppler/libpoppler.la:-lpoppler:'	\
-		$(find . -name 'Makefile.am' ) || die "404"
-	sed -i \
-		-e '/libpoppler_la_LIBADD/,/win32_libs/d'		\
-		-e '/libpoppler_la_SOURCES/,/XpdfPluginAPI.cc/d'	\
-		-e '/libpoppler.la/d'					\
-		-e '/libpoppler_la/d'					\
-		poppler/Makefile.am || die "404"
-
-	sed -i \
-		-e '/if BUILD_SPLASH_OUTPUT/,/endif/d'			\
-		-e '/poppler.pc\t/d'					\
-		-e ':$(splash_pc_file):d'				\
-		Makefile.am || die "404"
-
-	eautoreconf
-}
-
-src_configure() {
-	# Configure needs help finding qt libs on multilib systems
-	export QTLIB="${QTDIR}/$(get_libdir)"
-	echo $QTLIB
-
-	econf	--disable-utils						\
-		--disable-static					\
-		$(use_enable gtk poppler-glib)				\
-		$(use_enable qt3 poppler-qt)				\
-		$(use_enable qt4 poppler-qt4)				\
-		$(use_enable cairo poppler-glib)			\
-		$(use_enable cairo cairo-output)			\
-		|| die "configuration failed"
-}
-
-src_compile() {
-	cd poppler
-	if use cairo; then
-		emake libpoppler-cairo.la || die "cairo failed"
-	fi
-	if use qt4; then
-		emake libpoppler-arthur.la || die "arthur failed"
-	fi
-	cd ..
-	emake || die "compilation failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	rm -f $(find "${D}" -name '*.la')
-}
-
-pkg_postinst() {
-	ewarn "You need to rebuild everything depending on poppler, use revdep-rebuild"
-}
diff --git a/app-text/poppler-bindings/poppler-bindings-0.6.1.ebuild b/app-text/poppler-bindings/poppler-bindings-0.6.1.ebuild
index c2302c57b10e..e2409b29eca0 100644
--- a/app-text/poppler-bindings/poppler-bindings-0.6.1.ebuild
+++ b/app-text/poppler-bindings/poppler-bindings-0.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/poppler-bindings-0.6.1.ebuild,v 1.12 2008/06/11 13:12:31 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/poppler-bindings-0.6.1.ebuild,v 1.13 2008/10/14 21:25:24 loki_val Exp $
 
 inherit autotools eutils multilib
 
@@ -37,6 +37,10 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
+pkg_setup(){
+	use test && ewarn "Tests will fail if your locale is unset."
+}
+
 src_unpack(){
 	unpack ${A}
 	cd "${S}"
diff --git a/app-text/poppler-bindings/poppler-bindings-0.6.3.ebuild b/app-text/poppler-bindings/poppler-bindings-0.6.3.ebuild
index a915dc907502..e8f09e1dba8f 100644
--- a/app-text/poppler-bindings/poppler-bindings-0.6.3.ebuild
+++ b/app-text/poppler-bindings/poppler-bindings-0.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/poppler-bindings-0.6.3.ebuild,v 1.8 2008/04/17 11:25:20 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/poppler-bindings-0.6.3.ebuild,v 1.9 2008/10/14 21:25:24 loki_val Exp $
 
 inherit autotools eutils multilib
 
@@ -36,6 +36,10 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
+pkg_setup(){
+	use test && ewarn "Tests will fail if your locale is unset."
+}
+
 src_unpack(){
 	unpack ${A}
 	cd "${S}"
diff --git a/app-text/poppler-bindings/poppler-bindings-0.8.7.ebuild b/app-text/poppler-bindings/poppler-bindings-0.8.7.ebuild
index 86a0ec4fee3c..fd1ec7ae05bc 100644
--- a/app-text/poppler-bindings/poppler-bindings-0.8.7.ebuild
+++ b/app-text/poppler-bindings/poppler-bindings-0.8.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/poppler-bindings-0.8.7.ebuild,v 1.9 2008/10/08 19:29:10 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/poppler-bindings-0.8.7.ebuild,v 1.10 2008/10/14 21:25:24 loki_val Exp $
 
 EAPI="1"
 
@@ -41,6 +41,10 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+pkg_setup(){
+	use test && ewarn "Tests will fail if your locale is unset."
+}
+
 src_unpack(){
 	unpack ${A}
 	cd "${S}"