Make libpdf non-optionally disabled due to media-libs/pdflib's pending removal. Remove intermediate versions

(Portage version: 2.1.9.40/cvs/Linux i686)

6 files changed, 13 insertions, 321 deletions

diff --git a/dev-lang/pike/ChangeLog b/dev-lang/pike/ChangeLog
index 56d43802d194..f66b04805086 100644
--- a/dev-lang/pike/ChangeLog
+++ b/dev-lang/pike/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/pike
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/pike/ChangeLog,v 1.39 2011/02/25 19:25:58 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/pike/ChangeLog,v 1.40 2011/03/02 16:26:58 darkside Exp $
+
+  02 Mar 2011; Jeremy Olexa <darkside@gentoo.org> pike-7.6.86-r1.ebuild,
+  -pike-7.6.112.ebuild, -pike-7.6.112-r1.ebuild, -pike-7.8.316.ebuild,
+  pike-7.8.352-r1.ebuild:
+  Make libpdf non-optionally disabled due to media-libs/pdflib's pending
+  removal. Remove intermediate versions
 
   25 Feb 2011; Kevin McCarthy <signals@gentoo.org> pike-7.6.86-r1.ebuild,
   pike-7.6.112.ebuild, pike-7.6.112-r1.ebuild, pike-7.8.316.ebuild,
diff --git a/dev-lang/pike/pike-7.6.112-r1.ebuild b/dev-lang/pike/pike-7.6.112-r1.ebuild
deleted file mode 100644
index 9a958072f792..000000000000
--- a/dev-lang/pike/pike-7.6.112-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/pike/pike-7.6.112-r1.ebuild,v 1.3 2011/02/25 19:25:58 signals Exp $
-
-DESCRIPTION="Pike programming language and runtime"
-HOMEPAGE="http://pike.ida.liu.se/"
-SRC_URI="http://pike.ida.liu.se/pub/pike/all/${PV}/Pike-v${PV}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="bzip2 debug doc fftw gdbm gtk hardened jpeg kerberos mime mysql opengl pcre pdf scanner sdl ssl svg tiff truetype zlib"
-
-DEPEND="dev-libs/nettle
-	dev-libs/gmp
-	media-libs/giflib
-	bzip2? ( app-arch/bzip2 )
-	fftw? ( sci-libs/fftw )
-	gdbm? ( sys-libs/gdbm )
-	gtk? ( =x11-libs/gtk+-1.2* )
-	jpeg? ( virtual/jpeg )
-	kerberos? ( virtual/krb5 )
-	mysql? ( virtual/mysql )
-	opengl? ( virtual/opengl media-libs/freeglut )
-	pcre? ( dev-libs/libpcre )
-	pdf? ( media-libs/pdflib )
-	!x86-fbsd? ( scanner? ( media-gfx/sane-backends ) )
-	sdl? ( media-libs/libsdl media-libs/sdl-mixer )
-	ssl? ( dev-libs/openssl )
-	svg? ( gnome-base/librsvg )
-	tiff? ( media-libs/tiff )
-	truetype? ( media-libs/freetype )
-	zlib? ( sys-libs/zlib )"
-RDEPEND=""
-
-S=${WORKDIR}/Pike-v${PV}
-
-src_compile() {
-	local myconf=""
-	# ffmpeg is broken atm #110136
-	myconf="${myconf} --without-_Ffmpeg"
-	# on hardened, disable runtime-generated code
-	# otherwise let configure work it out for itself
-	use hardened && myconf="${myconf} --without-machine-code"
-
-	make \
-		CONFIGUREARGS=" \
-			--prefix=/usr \
-			--disable-make_conf \
-			--disable-noopty-retry \
-			--without-cdebug \
-			--without-bundles \
-			--without-copt \
-			--with-crypt \
-			--with-gif \
-			--with-gmp \
-			--with-bignums \
-			$(use_with bzip2 Bz2) \
-			$(use_with debug rtldebug) \
-			$(use_with fftw) \
-			$(use_with gdbm) \
-			$(use_with jpeg jpeglib) \
-			$(use_with kerberos Kerberos) \
-			$(use_with mime MIME) \
-			$(use_with mysql) \
-			$(use_with opengl GL) \
-			$(use_with opengl GLUT) \
-			$(use_with pcre _Regexp_PCRE) \
-			$(use_with pdf libpdf) \
-			$(use_with scanner sane) \
-			$(use_with sdl SDL) \
-			$(use_with sdl SDL_mixer) \
-			$(use_with ssl ssleay) \
-			$(use_with svg) \
-			$(use_with tiff tifflib) \
-			$(use_with truetype ttflib) \
-			$(use_with truetype freetype) \
-			$(use_with zlib) \
-			${myconf} \
-			" || die "compilation failed"
-
-	if use doc; then
-		PATH="${S}/bin:${PATH}" make doc || die "doc failed"
-	fi
-}
-
-src_install() {
-	# do not remove modules to avoid sandbox violation.
-	sed -i s/rm\(mod\+\"\.o\"\)\;/break\;/ "${S}"/bin/install.pike || die "Failed to modify install.pike"
-	if use doc ; then
-		make INSTALLARGS="--traditional" buildroot="${D}" install || die
-		einfo "Installing 60MB of docs, this could take some time ..."
-		dohtml -r "${S}"/refdoc/traditional_manual "${S}"/refdoc/modref
-	else
-		make INSTALLARGS="--traditional" buildroot="${D}" install_nodoc || die
-	fi
-	# Installation is a bit broken.. remove the doc sources.
-	rm -rf "${D}/usr/doc"
-	# Install the man pages in the proper location.
-	rm -rf "${D}/usr/man" && doman "${S}/man/pike.1"
-}
diff --git a/dev-lang/pike/pike-7.6.112.ebuild b/dev-lang/pike/pike-7.6.112.ebuild
deleted file mode 100644
index bd11c74f42aa..000000000000
--- a/dev-lang/pike/pike-7.6.112.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/pike/pike-7.6.112.ebuild,v 1.3 2011/02/25 19:25:58 signals Exp $
-
-DESCRIPTION="Pike programming language and runtime"
-HOMEPAGE="http://pike.ida.liu.se/"
-SRC_URI="http://pike.ida.liu.se/pub/pike/all/${PV}/Pike-v${PV}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="bzip2 debug doc fftw gdbm gtk hardened jpeg kerberos mime mysql opengl pcre pdf scanner sdl ssl svg tiff truetype zlib"
-
-DEPEND="dev-libs/nettle
-	dev-libs/gmp
-	media-libs/giflib
-	bzip2? ( app-arch/bzip2 )
-	fftw? ( sci-libs/fftw )
-	gdbm? ( sys-libs/gdbm )
-	gtk? ( =x11-libs/gtk+-1.2* )
-	jpeg? ( virtual/jpeg )
-	kerberos? ( virtual/krb5 )
-	mysql? ( virtual/mysql )
-	opengl? ( virtual/opengl media-libs/freeglut )
-	pcre? ( dev-libs/libpcre )
-	pdf? ( media-libs/pdflib )
-	!x86-fbsd? ( scanner? ( media-gfx/sane-backends ) )
-	sdl? ( media-libs/libsdl media-libs/sdl-mixer )
-	ssl? ( dev-libs/openssl )
-	svg? ( gnome-base/librsvg )
-	tiff? ( media-libs/tiff )
-	truetype? ( media-libs/freetype )
-	zlib? ( sys-libs/zlib )"
-RDEPEND=""
-
-S=${WORKDIR}/Pike-v${PV}
-
-src_compile() {
-	local myconf=""
-	# ffmpeg is broken atm #110136
-	myconf="${myconf} --without-_Ffmpeg"
-	# on hardened, disable runtime-generated code
-	# otherwise let configure work it out for itself
-	use hardened && myconf="${myconf} --without-machine-code"
-
-	make \
-		CONFIGUREARGS=" \
-			--prefix=/usr \
-			--disable-make_conf \
-			--disable-noopty-retry \
-			--without-cdebug \
-			--without-bundles \
-			--without-copt \
-			--with-crypt \
-			--with-gif \
-			--with-gmp \
-			--with-bignums \
-			$(use_with bzip2 Bz2) \
-			$(use_with debug rtldebug) \
-			$(use_with fftw) \
-			$(use_with gdbm) \
-			$(use_with jpeg jpeglib) \
-			$(use_with kerberos Kerberos) \
-			$(use_with mime MIME) \
-			$(use_with mysql) \
-			$(use_with opengl GL) \
-			$(use_with opengl GLUT) \
-			$(use_with pcre _Regexp_PCRE) \
-			$(use_with pdf libpdf) \
-			$(use_with scanner sane) \
-			$(use_with sdl SDL) \
-			$(use_with sdl SDL_mixer) \
-			$(use_with ssl ssleay) \
-			$(use_with svg) \
-			$(use_with tiff tifflib) \
-			$(use_with truetype ttflib) \
-			$(use_with truetype freetype) \
-			$(use_with zlib) \
-			${myconf} \
-			${EXTRA_ECONF} \
-			" || die
-
-	if use doc; then
-		PATH="${S}/bin:${PATH}" make doc || die "doc failed"
-	fi
-}
-
-src_install() {
-	# do not remove modules to avoid sandbox violation.
-	sed -i s/rm\(mod\+\"\.o\"\)\;/break\;/ "${S}"/bin/install.pike || die "Failed to modify install.pike"
-	if use doc ; then
-		make INSTALLARGS="--traditional" buildroot="${D}" install || die
-		einfo "Installing 60MB of docs, this could take some time ..."
-		dohtml -r "${S}"/refdoc/traditional_manual "${S}"/refdoc/modref
-	else
-		make INSTALLARGS="--traditional" buildroot="${D}" install_nodoc || die
-	fi
-}
diff --git a/dev-lang/pike/pike-7.6.86-r1.ebuild b/dev-lang/pike/pike-7.6.86-r1.ebuild
index d3fb2698ecf1..47dbfd2f0707 100644
--- a/dev-lang/pike/pike-7.6.86-r1.ebuild
+++ b/dev-lang/pike/pike-7.6.86-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/pike/pike-7.6.86-r1.ebuild,v 1.14 2011/02/25 19:25:58 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/pike/pike-7.6.86-r1.ebuild,v 1.15 2011/03/02 16:26:58 darkside Exp $
 
 DESCRIPTION="Pike programming language and runtime"
 HOMEPAGE="http://pike.ida.liu.se/"
@@ -9,7 +9,7 @@ SRC_URI="http://pike.ida.liu.se/pub/pike/all/${PV}/Pike-v${PV}.tar.gz"
 LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-IUSE="bzip2 debug doc fftw gdbm gtk hardened jpeg kerberos mime mysql opengl pcre pdf scanner sdl ssl svg tiff truetype zlib"
+IUSE="bzip2 debug doc fftw gdbm gtk hardened jpeg kerberos mime mysql opengl pcre scanner sdl ssl svg tiff truetype zlib"
 
 DEPEND="<dev-libs/nettle-2
 	dev-libs/gmp
@@ -23,7 +23,6 @@ DEPEND="<dev-libs/nettle-2
 	mysql? ( virtual/mysql )
 	opengl? ( virtual/opengl media-libs/freeglut )
 	pcre? ( dev-libs/libpcre )
-	pdf? ( media-libs/pdflib )
 	!x86-fbsd? ( scanner? ( media-gfx/sane-backends ) )
 	sdl? ( media-libs/libsdl media-libs/sdl-mixer )
 	ssl? ( dev-libs/openssl )
@@ -51,6 +50,7 @@ src_compile() {
 			--without-cdebug \
 			--without-bundles \
 			--without-copt \
+			--without-libpdf \
 			--with-crypt \
 			--with-gif \
 			--with-gmp \
@@ -66,7 +66,6 @@ src_compile() {
 			$(use_with opengl GL) \
 			$(use_with opengl GLUT) \
 			$(use_with pcre _Regexp_PCRE) \
-			$(use_with pdf libpdf) \
 			$(use_with scanner sane) \
 			$(use_with sdl SDL) \
 			$(use_with sdl SDL_mixer) \
diff --git a/dev-lang/pike/pike-7.8.316.ebuild b/dev-lang/pike/pike-7.8.316.ebuild
deleted file mode 100644
index 174be64dc1a1..000000000000
--- a/dev-lang/pike/pike-7.8.316.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/pike/pike-7.8.316.ebuild,v 1.4 2011/02/25 19:25:58 signals Exp $
-
-EAPI="2"
-DESCRIPTION="Pike programming language and runtime"
-HOMEPAGE="http://pike.ida.liu.se/"
-SRC_URI="http://pike.ida.liu.se/pub/pike/all/${PV}/Pike-v${PV}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="bzip2 debug doc fftw gdbm glut gnome gtk hardened java jpeg kerberos mysql odbc opengl pcre pdf scanner sdl sqlite svg test tiff truetype zlib"
-
-DEPEND="<dev-libs/nettle-2
-	dev-libs/gmp
-	media-libs/giflib
-	bzip2? ( app-arch/bzip2 )
-	fftw? ( sci-libs/fftw )
-	gdbm? ( sys-libs/gdbm )
-	gtk? ( =x11-libs/gtk+-1.2* >x11-libs/gtk+-2 )
-	gtk? ( gnome? ( gnome-base/libgnome gnome-base/libgnomeui gnome-base/gnome-applets gnome-base/libglade ) )
-	gtk? ( opengl? ( x11-libs/gtkglarea ) )
-	java? ( virtual/jdk virtual/libffi )
-	jpeg? ( virtual/jpeg )
-	kerberos? ( virtual/krb5 net-libs/libgssglue )
-	mysql? ( virtual/mysql )
-	odbc? ( dev-db/libiodbc )
-	opengl? ( virtual/opengl glut? ( media-libs/freeglut ) )
-	pcre? ( dev-libs/libpcre )
-	pdf? ( media-libs/pdflib )
-	!x86-fbsd? ( scanner? ( media-gfx/sane-backends ) )
-	sdl? ( media-libs/libsdl media-libs/sdl-mixer )
-	sqlite? ( dev-db/sqlite )
-	svg? ( gnome-base/librsvg )
-	test? ( sys-devel/m4 )
-	tiff? ( media-libs/tiff )
-	truetype? ( >media-libs/freetype-2 )
-	zlib? ( sys-libs/zlib )"
-RDEPEND=""
-
-S=${WORKDIR}/Pike-v${PV}
-
-src_compile() {
-	local myconf=""
-	# ffmpeg is broken atm #110136
-	myconf="${myconf} --without-_Ffmpeg"
-	# on hardened, disable runtime-generated code
-	# otherwise let configure work it out for itself
-	use hardened && myconf="${myconf} --without-machine-code"
-
-	make \
-		CONFIGUREARGS=" \
-			--prefix=/usr \
-			--disable-make_conf \
-			--disable-noopty-retry \
-			--without-cdebug \
-			--without-bundles \
-			--without-copt \
-			--without-ssleay \
-			--with-crypt \
-			--with-gif \
-			--with-gmp \
-			--with-bignums \
-			$(use_with bzip2 Bz2) \
-			$(use_with debug rtldebug) \
-			$(use_with fftw) \
-			$(use_with gdbm) \
-			$(use_with java Java) \
-			$(use_with jpeg jpeglib) \
-			$(use_with kerberos Kerberos) \
-			$(use_with kerberos gssapi) \
-			$(use_with mysql) \
-			$(use_with odbc Odbc) \
-			$(use_with opengl GL) \
-			$(use opengl && use_with glut GLUT) \
-			$(use opengl || use_with opengl GLUT) \
-			$(use_with pcre _Regexp_PCRE) \
-			$(use_with pdf libpdf) \
-			$(use_with scanner sane) \
-			$(use_with sdl SDL) \
-			$(use_with sdl SDL_mixer) \
-			$(use_with svg) \
-			$(use_with tiff tifflib) \
-			$(use_with truetype freetype) \
-			$(use_with zlib) \
-			${myconf} \
-			" || die "compilation failed"
-
-	if use doc; then
-		PATH="${S}/bin:${PATH}" make doc || die "doc failed"
-	fi
-}
-
-src_install() {
-	# do not remove modules to avoid sandbox violation.
-	# The sandbox really ought to allow deletion of files
-	# that belong to previous installs of the ebuild, or
-	# even better: hide them.
-	sed -i s/rm\(mod\+\"\.o\"\)\;/break\;/ "${S}"/bin/install.pike || die "Failed to modify install.pike (1)"
-	sed -i 's/\(Array.map *( *files_to_delete *- *files_to_not_delete, *rm *);\)/; \/\/ \1/' "${S}"/bin/install.pike || die "Failed to modify install.pike (2)"
-	if use doc ; then
-		make INSTALLARGS="--traditional" buildroot="${D}" install || die
-		einfo "Installing 60MB of docs, this could take some time ..."
-		dohtml -r "${S}"/refdoc/traditional_manual "${S}"/refdoc/modref
-	else
-		make INSTALLARGS="--traditional" buildroot="${D}" install_nodoc || die
-	fi
-	# Installation is a bit broken.. remove the doc sources.
-	rm -rf "${D}/usr/doc"
-	# Install the man pages in the proper location.
-	rm -rf "${D}/usr/man" && doman "${S}/man/pike.1"
-}
diff --git a/dev-lang/pike/pike-7.8.352-r1.ebuild b/dev-lang/pike/pike-7.8.352-r1.ebuild
index 2ea53b7a30b9..633b49f268dc 100644
--- a/dev-lang/pike/pike-7.8.352-r1.ebuild
+++ b/dev-lang/pike/pike-7.8.352-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/pike/pike-7.8.352-r1.ebuild,v 1.3 2011/02/25 19:25:58 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/pike/pike-7.8.352-r1.ebuild,v 1.4 2011/03/02 16:26:58 darkside Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ SRC_URI="http://pike.ida.liu.se/pub/pike/all/${PV}/Pike-v${PV}.tar.gz"
 LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="bzip2 debug doc fftw gdbm glut gnome gtk hardened java jpeg kerberos mysql odbc opengl pcre pdf scanner sdl sqlite svg test tiff truetype zlib"
+IUSE="bzip2 debug doc fftw gdbm glut gnome gtk hardened java jpeg kerberos mysql odbc opengl pcre scanner sdl sqlite svg test tiff truetype zlib"
 
 DEPEND="<=dev-libs/nettle-2.0
 	dev-libs/gmp
@@ -31,7 +31,6 @@ DEPEND="<=dev-libs/nettle-2.0
 	odbc? ( dev-db/libiodbc )
 	opengl? ( virtual/opengl glut? ( media-libs/freeglut ) )
 	pcre? ( dev-libs/libpcre )
-	pdf? ( media-libs/pdflib )
 	!x86-fbsd? ( scanner? ( media-gfx/sane-backends ) )
 	sdl? ( media-libs/libsdl media-libs/sdl-mixer )
 	sqlite? ( dev-db/sqlite )
@@ -61,6 +60,7 @@ src_compile() {
 			--without-cdebug \
 			--without-bundles \
 			--without-copt \
+			--without-libpdf \
 			--without-ssleay \
 			--with-crypt \
 			--with-gif \
@@ -80,7 +80,6 @@ src_compile() {
 			$(use opengl && use_with glut GLUT) \
 			$(use opengl || use_with opengl GLUT) \
 			$(use_with pcre _Regexp_PCRE) \
-			$(use_with pdf libpdf) \
 			$(use_with scanner sane) \
 			$(use_with sdl SDL) \
 			$(use_with sdl SDL_mixer) \