new version; gtk+ support enabled again; no need to filter -fomit-frame-pointer anymore

8 files changed, 25 insertions, 156 deletions

diff --git a/dev-lang/pike/ChangeLog b/dev-lang/pike/ChangeLog
index 52f6fef67b5e..8996dac06356 100644
--- a/dev-lang/pike/ChangeLog
+++ b/dev-lang/pike/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/pike
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/pike/ChangeLog,v 1.6 2003/12/22 21:36:37 scandium Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/pike/ChangeLog,v 1.7 2004/03/05 18:34:37 scandium Exp $
+
+*pike-7.4.44 (05 Mar 2004)
+
+  05 Mar 2004; Rainer Groesslinger <scandium@gentoo.org> pike-7.4.44.ebuild:
+  new version
+  gtk+ support enabled again, no need to filter -fomit-frame-pointer anymore
 
 *pike-7.4.28-r2 (22 Dec 2003)
 
diff --git a/dev-lang/pike/files/digest-pike-7.4.20 b/dev-lang/pike/files/digest-pike-7.4.20
deleted file mode 100644
index ebe3e028f071..000000000000
--- a/dev-lang/pike/files/digest-pike-7.4.20
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b85a717c2f6064e8485c2116e746bbc0 Pike-v7.4.20.tar.gz 6703270
diff --git a/dev-lang/pike/files/digest-pike-7.4.28 b/dev-lang/pike/files/digest-pike-7.4.28
deleted file mode 100644
index f5426a8ea50a..000000000000
--- a/dev-lang/pike/files/digest-pike-7.4.28
+++ /dev/null
@@ -1 +0,0 @@
-MD5 98a7944cea94c7255a24f2cba7d15ec1 Pike-v7.4.28.tar.gz 6712605
diff --git a/dev-lang/pike/files/digest-pike-7.4.28-r1 b/dev-lang/pike/files/digest-pike-7.4.28-r1
deleted file mode 100644
index f5426a8ea50a..000000000000
--- a/dev-lang/pike/files/digest-pike-7.4.28-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 98a7944cea94c7255a24f2cba7d15ec1 Pike-v7.4.28.tar.gz 6712605
diff --git a/dev-lang/pike/files/digest-pike-7.4.44 b/dev-lang/pike/files/digest-pike-7.4.44
new file mode 100644
index 000000000000..53b1fa4aa46f
--- /dev/null
+++ b/dev-lang/pike/files/digest-pike-7.4.44
@@ -0,0 +1 @@
+MD5 e9fe50e56f3fada5de9b4a1dd3113fc6 Pike-v7.4.44.tar.gz 6727055
diff --git a/dev-lang/pike/pike-7.4.20.ebuild b/dev-lang/pike/pike-7.4.20.ebuild
deleted file mode 100644
index e5c07b495509..000000000000
--- a/dev-lang/pike/pike-7.4.20.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc., Emil Skoldberg (see ChangeLog)
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/pike/pike-7.4.20.ebuild,v 1.18 2004/02/07 20:26:47 scandium Exp $
-
-inherit flag-o-matic fixheadtails
-
-# -fomit-frame-pointer breaks the compilation
-filter-flags -fomit-frame-pointer
-
-IUSE="debug doc gdbm mysql zlib"
-
-S="${WORKDIR}/Pike-v${PV}"
-HOMEPAGE="http://pike.ida.liu.se/"
-DESCRIPTION="Pike programming language and runtime"
-SRC_URI="ftp://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="x86 ppc"
-
-DEPEND="dev-libs/gmp
-	sys-devel/gcc
-	sys-devel/make
-	sys-apps/sed
-	sys-devel/bc"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# ht_fix_all kills autoheader stuff, so we use ht_fix_file
-	find . -iname "*.sh" -or -iname "Makefile*" | \
-	while read i; do
-		ht_fix_file $i
-	done
-}
-
-src_compile() {
-	local myconf
-	use zlib  || myconf="${myconf} --without-zlib"
-	use mysql || myconf="${myconf} --without-mysql"
-	use debug || myconf="${myconf} --without-debug"
-	use gdbm  || myconf="${myconf} --without-gdbm"
-
-	# We have to use --disable-make_conf to override make.conf settings
-	# Otherwise it may set -fomit-frame-pointer again
-	# disable ffmpeg support because it does not compile
-	# disable dvb support because it does not compile
-	emake CONFIGUREARGS="${myconf} --prefix=/usr --disable-make_conf --without-ffmpeg --without-dvb" || die
-
-	# only build documentation if 'doc' is in USE
-	if use doc; then
-		PATH="${S}/bin:${PATH}" make doc || die
-	fi
-}
-
-src_install() {
-	# the installer should be stopped from removing files, to prevent sandbox issues
-	sed -i s/rm\(mod\+\"\.o\"\)\;/\{\}/ ${S}/bin/install.pike || die "Failed to modify install.pike"
-
-	make INSTALLARGS="--traditional" buildroot="${D}" install || die
-
-	if use doc; then
-		einfo "Installing 60MB of docs, this could take some time ..."
-		dohtml -r ${S}/refdoc/traditional_manual ${S}/refdoc/modref
-	fi
-}
diff --git a/dev-lang/pike/pike-7.4.28.ebuild b/dev-lang/pike/pike-7.4.28.ebuild
deleted file mode 100644
index 1ba2342c6930..000000000000
--- a/dev-lang/pike/pike-7.4.28.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc., Emil Skoldberg (see ChangeLog)
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/pike/pike-7.4.28.ebuild,v 1.10 2004/02/07 20:26:47 scandium Exp $
-
-inherit flag-o-matic fixheadtails
-
-# -fomit-frame-pointer breaks the compilation
-filter-flags -fomit-frame-pointer
-
-IUSE="debug doc gdbm mysql zlib"
-
-S="${WORKDIR}/Pike-v${PV}"
-HOMEPAGE="http://pike.ida.liu.se/"
-DESCRIPTION="Pike programming language and runtime"
-SRC_URI="ftp://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="x86 ppc"
-
-DEPEND="dev-libs/gmp
-	sys-devel/gcc
-	sys-devel/make
-	sys-apps/sed"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# ht_fix_all kills autoheader stuff, so we use ht_fix_file
-	find . -iname "*.sh" -or -iname "Makefile*" | \
-	while read i; do
-		ht_fix_file $i
-	done
-}
-
-src_compile() {
-	local myconf
-	use zlib  || myconf="${myconf} --without-zlib"
-	use mysql || myconf="${myconf} --without-mysql"
-	use debug || myconf="${myconf} --without-debug"
-	use gdbm  || myconf="${myconf} --without-gdbm"
-
-	# We have to use --disable-make_conf to override make.conf settings
-	# Otherwise it may set -fomit-frame-pointer again
-	# disable ffmpeg support because it does not compile
-	# disable dvb support because it does not compile
-	emake CONFIGUREARGS="${myconf} --prefix=/usr --disable-make_conf --without-ffmpeg --without-dvb" || die
-
-	# only build documentation if 'doc' is in USE
-	if use doc; then
-		PATH="${S}/bin:${PATH}" make doc || die
-	fi
-}
-
-src_install() {
-	# the installer should be stopped from removing files, to prevent sandbox issues
-	sed -i s/rm\(mod\+\"\.o\"\)\;/\{\}/ ${S}/bin/install.pike || die "Failed to modify install.pike"
-
-	make INSTALLARGS="--traditional" buildroot="${D}" install || die
-
-	if use doc; then
-		einfo "Installing 60MB of docs, this could take some time ..."
-		dohtml -r ${S}/refdoc/traditional_manual ${S}/refdoc/modref
-	fi
-}
diff --git a/dev-lang/pike/pike-7.4.28-r1.ebuild b/dev-lang/pike/pike-7.4.44.ebuild
index 72dac0db7906..e76e453d3b73 100644
--- a/dev-lang/pike/pike-7.4.28-r1.ebuild
+++ b/dev-lang/pike/pike-7.4.44.ebuild
@@ -1,13 +1,10 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc., Emil Skoldberg, Fredrik Mellstrom (see ChangeLog)
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/pike/pike-7.4.28-r1.ebuild,v 1.10 2004/02/07 20:26:47 scandium Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/pike/pike-7.4.44.ebuild,v 1.1 2004/03/05 18:34:37 scandium Exp $
 
-inherit flag-o-matic fixheadtails
+inherit fixheadtails
 
-# -fomit-frame-pointer breaks the compilation
-filter-flags -fomit-frame-pointer
-
-IUSE="debug doc gdbm gif java jpeg mysql oci8 odbc opengl pdflib postgres scanner sdl tiff truetype zlib"
+IUSE="debug doc gdbm gif gtk java jpeg mysql oci8 odbc opengl pdflib postgres scanner sdl tiff truetype zlib"
 
 S="${WORKDIR}/Pike-v${PV}"
 HOMEPAGE="http://pike.ida.liu.se/"
@@ -16,7 +13,7 @@ SRC_URI="ftp://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="x86 ppc"
+KEYWORDS="~x86 ~ppc"
 
 DEPEND="dev-libs/gmp
 	zlib?	( sys-libs/zlib )
@@ -33,6 +30,7 @@ DEPEND="dev-libs/gmp
 	opengl?	( virtual/opengl
 		virtual/glut )
 	sdl?	( media-libs/libsdl )
+	gtk?	( =x11-libs/gtk+-1.2* )
 	sys-devel/gcc
 	sys-devel/make
 	sys-apps/sed"
@@ -42,7 +40,7 @@ src_unpack() {
 	cd ${S}
 
 	# ht_fix_all kills autoheader stuff, so we use ht_fix_file
-	find . -iname "*.sh" -or -iname "Makefile*" | \
+	find . -iname "*.sh" -or -iname "*.sh.in" -or -iname "Makefile*" | \
 	while read i; do
 		ht_fix_file $i
 	done
@@ -50,11 +48,6 @@ src_unpack() {
 
 src_compile() {
 
-	einfo 'Gtk+ and Gnome support is disabled for now!'
-	einfo 'Gtk+-2 did not work with pike and'
-	einfo 'Gtk+-1 just caused too many problems'
-	sleep 5
-
 	local myconf
 	use zlib  	|| myconf="${myconf} --without-zlib"
 	use mysql 	|| myconf="${myconf} --without-mysql"
@@ -71,13 +64,15 @@ src_compile() {
 	use jpeg	|| myconf="${myconf} --without-jpeglib"
 	use tiff	|| myconf="${myconf} --without-tifflib"
 	use opengl	|| myconf="${myconf} --without-GL --without-GLUT"
+	use gtk		|| myconf="${myconf} --without-GTK"
 
-	# We have to use --disable-make_conf to override make.conf settings
-	# Otherwise it may set -fomit-frame-pointer again
-	# disable ffmpeg support because it does not compile
-	# disable dvb support because it does not compile
+	# scandium@gentoo.org (5th March 2004)
+	# Check every release:
+	#	- gtk2 changes (does not compile)
+	#	- dvb changes (does not compile)
+	#	- ffmpeg changes (does not compile)
 	emake CONFIGUREARGS="${myconf} --prefix=/usr --disable-make_conf --without-ffmpeg \
-				--without-GTK --without-GTK2 --without-gnome --without-dvb" || die
+				--without-GTK2 --without-dvb" || die
 
 	# only build documentation if 'doc' is in USE
 	if use doc; then
@@ -91,6 +86,9 @@ src_install() {
 
 	make INSTALLARGS="--traditional" buildroot="${D}" install || die
 
+	# We remove all .o files to prevent decode errors, bug #32973
+	rm -vf `find ${D} -regex '.*\.o' -type f | xargs`
+
 	if use doc; then
 		einfo "Installing 60MB of docs, this could take some time ..."
 		dohtml -r ${S}/refdoc/traditional_manual ${S}/refdoc/modref