added note about econf and einstall

13 files changed, 231 insertions, 40 deletions

diff --git a/dev-libs/DirectFB/DirectFB-0.9.14.ebuild b/dev-libs/DirectFB/DirectFB-0.9.14.ebuild
new file mode 100644
index 000000000000..4ce90f5a4a29
--- /dev/null
+++ b/dev-libs/DirectFB/DirectFB-0.9.14.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/DirectFB-0.9.14.ebuild,v 1.1 2002/11/08 22:03:45 seemant Exp $
+
+IUSE="gif quicktime mpeg png truetype flash jpeg mmx sse sdl"
+
+S=${WORKDIR}/${P}
+DESCRIPTION="DirectFB is a thin library on top of the Linux framebuffer devices"
+SRC_URI="http://www.directfb.org/download/DirectFB/${P}.tar.gz"
+HOMEPAGE="http://www.directfb.org/"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~x86 ~ppc ~sparc ~sparc64 ~alpha"
+
+DEPEND="sys-devel/perl
+	gif? ( media-libs/giflib )
+	png? ( media-libs/libpng )
+	jpeg? ( media-libs/jpeg )
+	mpeg? ( media-libs/libmpeg3 )
+	flash? ( >=media-libs/libflash-0.4.10 )
+	truetype? ( >=media-libs/freetype-2.0.1 )
+	quicktime? ( media-libs/quicktime4linux )"
+#	avi? ( >=media-video/avifile-0.7.4.20020426-r2 )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	cp configure configure.orig
+	sed -e 's:ac_safe=`echo "libmpeg3.h:ac_safe=`echo "libmpeg3/libmpeg3.h:' \
+		-e 's:#include <libmpeg3.h>:#include <libmpeg3/libmpeg3.h>:' \
+		configure.orig > configure
+}
+
+src_compile() {
+	local myconf=""
+	
+	# Bug in the ./configure script that breaks if you
+	# have --enable-mmx
+	use mmx \
+		&& myconf="${myconf} --enable-mmx" \
+		|| myconf="${myconf} --disable-mmx"
+
+	use sse \
+		&& myconf="${myconf} --enable-sse" \
+		|| myconf="${myconf} --disable-sse"
+
+# Still do not work currently
+#	use avi	\
+#		&& myconf="${myconf} --enable-avifile" \
+#		|| myconf="${myconf} --disable-avifile"
+	myconf="${myconf} --disable-avifile"
+	
+	use mpeg \
+		&& myconf="${myconf} --enable-libmpeg3" \
+		|| myconf="${myconf} --disable-libmpeg3"
+	
+	use sdl \
+		&& myconf="${myconf} --enable-sdl" \
+		|| myconf="${myconf} --disable-sdl"
+
+	use flash \
+		&& myconf="${myconf} --enable-flash" \
+		|| myconf="${myconf} --disable-flash"
+
+	use jpeg \
+		&& myconf="${myconf} --enable-jpeg" \
+		|| myconf="${myconf} --disable-jpeg"
+
+	use png \
+		&& myconf="${myconf} --enable-png" \
+		|| myconf="${myconf} --disable-png"
+
+	use gif \
+		&& myconf="${myconf} --enable-gif" \
+		|| myconf="${myconf} --disable-gif"
+
+	use truetype \
+		&& myconf="${myconf} --enable-freetype" \
+		|| myconf="${myconf} --disable-freetype"
+
+	# fix gcc3.x linking with libflash
+	cp configure configure.old
+	sed -e 's:-lflash:-lflash -lstdc++:' configure.old > configure
+	econf ${myconf}
+
+	use mpeg && ( \
+		cd ${S}/interfaces/IDirectFBVideoProvider
+		cp idirectfbvideoprovider_libmpeg3.c \
+			idirectfbvideoprovider_libmpeg3.c.orig
+	
+		sed s':#include <libmpeg3.h>:#include <libmpeg3/libmpeg3.h>:' \
+			idirectfbvideoprovider_libmpeg3.c.orig > \
+				idirectfbvideoprovider_libmpeg3.c
+		cd ${S}
+	)
+
+	# add extra -lstdc++ so libpng/libflash link correctly
+	make LDFLAGS="${LDFLAGS} -lstdc++" || die
+}
+
+src_install() {
+	insinto /etc
+	doins fb.modes
+
+	make DESTDIR=${D} install || die
+
+	dodoc AUTHORS COPYING ChangeLog NEWS README* TODO
+	dohtml -r docs/html
+}
diff --git a/dev-libs/DirectFB/files/digest-DirectFB-0.9.14 b/dev-libs/DirectFB/files/digest-DirectFB-0.9.14
new file mode 100644
index 000000000000..02a2284cfdb1
--- /dev/null
+++ b/dev-libs/DirectFB/files/digest-DirectFB-0.9.14
@@ -0,0 +1 @@
+MD5 fc57b71776c27d448f98eaeffbcd09d1 DirectFB-0.9.14.tar.gz 881567
diff --git a/eclass/libtool.eclass b/eclass/libtool.eclass
index 6de77f9c5615..58098966ee2f 100644
--- a/eclass/libtool.eclass
+++ b/eclass/libtool.eclass
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
 # Author: Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.16 2002/10/25 19:57:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.17 2002/11/08 22:03:45 seemant Exp $
 # This eclass patches ltmain.sh distributed with libtoolized packages with the
 # relink and portage patch
 
@@ -25,6 +25,8 @@ elibtoolize() {
 	local doportage="yes"
 	local portage="no"
 	local reversedeps="no"
+	local removeinternaldep="no"
+	local deptoremove=""
 	local mylist=""
 
 	mylist="$(find_ltmain)"
@@ -43,6 +45,11 @@ elibtoolize() {
 		then
 			reversedeps="yes"
 		fi
+                if [ `echo ${x} | grep "^--remove-internal-dep="` ]
+                then
+                        removeinternaldep="yes"
+                        deptoremove=`echo ${x} | sed -e 's/--remove-internal-dep=//'`
+                fi
 		# Only patch the ltmain.sh in ${S}
 		if [ "${x}" = "--shallow" ]
 		then
@@ -145,7 +152,7 @@ elibtoolize() {
 				
 				einfo "Applying libtool-${y/_patch/}.patch..."
 				eval ${y} $>${T}/elibtool.log
-			elif [ "${portage}" = "no" ] && [ "${reversedeps}" = "no" ]
+			elif [ "${portage}" = "no" ] && [ "${reversedeps}" = "no" ] && [ "${removeinternaldep}" = "no" ]
 			then
 				ewarn "Cannot apply any patch, running libtoolize..."
 				libtoolize --copy --force
@@ -159,6 +166,19 @@ elibtoolize() {
 			then
 				einfo "Applying libtool-reverse-deps.patch..."
 				eval reversedeps_patch $>${T}/libtool.foo
+			else
+				ewarn "Not applying libtool-reverse-deps.patch..."
+			fi
+		fi
+		
+		if [ "${removeinternaldep}" = "yes" ]
+		then
+			if eval remove_internal_dep_patch $deptoremove --test $>${T}/libtool.foo
+			then
+				einfo "Applying remove-internal-dep.patch (removing $deptoremove)..."
+				eval remove_internal_dep_patch $deptoremove $>${T}/libtool.foo
+			else
+				ewarn "Not applying libtool-remove-internal-dep.patch..."
 			fi
 		fi
 	done
@@ -774,3 +794,26 @@ reversedeps_patch() {
 	ENDPATCH
 }
 
+remove_internal_dep_patch() {
+       local opts=""
+
+       if [ "${2}" = "--test" ]
+       then
+              opts="--force --dry-run"
+       fi
+
+       patch ${opts} -p0 <<-ENDPATCH
+       --- ltmain.sh.orig      2002-11-01 19:56:50.000000000 -0600
+       +++ ltmain.sh   2002-11-01 19:57:03.000000000 -0600
+       @@ -4551,6 +4551,8 @@
+        	  if test "\$installed" = yes && test "\$D"; then
+        	    install_libdir="\`echo "\$install_libdir" |sed -e "s:\$D::g" -e 's://:/:g'\`"
+        	  fi
+       +	  # Removing $1 from dependency_libs in .la
+       +	  dependency_libs=\`echo \$dependency_libs | \$Xsed -e 's%\([^ ]*lib${1}\.\(so\|la\|a\)\)\|\(-l${1}\)%%g'\`
+        	  \$echo > \$output "\\
+        # \$outputname - a libtool library file
+        # Generated by \$PROGRAM - GNU \$PACKAGE \$VERSION\$TIMESTAMP
+	ENDPATCH
+}
+
diff --git a/media-gfx/gimp/gimp-1.2.3-r3.ebuild b/media-gfx/gimp/gimp-1.2.3-r3.ebuild
index 9ad1646a0869..62e2ccf924bf 100644
--- a/media-gfx/gimp/gimp-1.2.3-r3.ebuild
+++ b/media-gfx/gimp/gimp-1.2.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.2.3-r3.ebuild,v 1.2 2002/11/06 09:29:38 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.2.3-r3.ebuild,v 1.3 2002/11/08 22:03:45 seemant Exp $
 
 IUSE="python nls gnome aalib perl"
 
@@ -101,15 +101,11 @@ src_compile() {
 		mymake="${mymake} HELPBROWSER="
 	fi
 
-	./configure --host=${CHOST} \
-			--prefix=/usr \
-			--mandir=/usr/share/man \
-			--infodir=/usr/share/info \
-			--sysconfdir=/etc \
-			--with-mp \
-			--with-threads \
-			--disable-debug \
-			${myconf} || die
+	econf \
+		--with-mp \
+		--with-threads \
+		--disable-debug \
+		${myconf} || die
 
 	if [ -z "`use aalib`" ] ; then 
 		# Horrible automake brokenness
@@ -136,19 +132,20 @@ src_install() {
   
 	dodir /usr/lib/gimp/1.2/plug-ins
 	
-	make prefix=${D}/usr \
-		 gimpsysconfdir=${D}/etc/gimp/1.2 \
-		 mandir=${D}/usr/share/man \
-		 infodir=${D}/usr/share/info \
-		 PREFIX=${D}/usr \
-		 INSTALLPRIVLIB=${D}/usr/lib/perl5 \
-		 INSTALLSCRIPT=${D}/usr/bin \
-		 INSTALLSITELIB=${D}/usr/lib/perl5/site_perl \
-		 INSTALLBIN=${D}/usr/bin \
-		 INSTALLMAN1DIR=${D}/usr/share/man/man1 \
-		 INSTALLMAN3DIR=${D}/usr/share/man/man3 \
-		 ${mymake} \
-		 install || die
+	make \
+		prefix=${D}/usr \
+		gimpsysconfdir=${D}/etc/gimp/1.2 \
+		mandir=${D}/usr/share/man \
+		infodir=${D}/usr/share/info \
+		PREFIX=${D}/usr \
+		INSTALLPRIVLIB=${D}/usr/lib/perl5 \
+		INSTALLSCRIPT=${D}/usr/bin \
+		INSTALLSITELIB=${D}/usr/lib/perl5/site_perl \
+		INSTALLBIN=${D}/usr/bin \
+		INSTALLMAN1DIR=${D}/usr/share/man/man1 \
+		INSTALLMAN3DIR=${D}/usr/share/man/man3 \
+		${mymake} \
+		install || die
 
 	dosym gimp-1.2 /usr/bin/gimp
 	#this next line closes bug #810
@@ -168,4 +165,3 @@ src_install() {
 	docinto devel
 	dodoc devel-docs/*.txt
 }
-
diff --git a/media-libs/pdflib/files/digest-pdflib-4.0.3 b/media-libs/pdflib/files/digest-pdflib-4.0.3
new file mode 100644
index 000000000000..44f2359e51dc
--- /dev/null
+++ b/media-libs/pdflib/files/digest-pdflib-4.0.3
@@ -0,0 +1 @@
+MD5 1b9e0d16f3e695902301aa26b6e92513 pdflib-4.0.3.tar.gz 2373817
diff --git a/media-video/realplayer/realplayer-8-r2.ebuild b/media-video/realplayer/realplayer-8-r2.ebuild
index f6fad6f7cf6e..3d34e4873e71 100644
--- a/media-video/realplayer/realplayer-8-r2.ebuild
+++ b/media-video/realplayer/realplayer-8-r2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/realplayer/realplayer-8-r2.ebuild,v 1.4 2002/10/04 05:56:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/realplayer/realplayer-8-r2.ebuild,v 1.5 2002/11/08 22:03:45 seemant Exp $
 
 S=${WORKDIR}/usr
 DESCRIPTION="Real Player 8 basic"
 SRC_URI="rp8_linux20_libc6_i386_cs2_rpm"
 HOMEPAGE="http://forms.real.com/real/player/unix/unix.html"
 
-DEPEND=">=app-arch/rpm-3.0.6"
+DEPEND="app-arch/rpm2targz"
 RDEPEND="virtual/x11"
 RESTRICT="fetch"
 
@@ -30,7 +30,7 @@ dyn_fetch() {
 src_unpack() {
 	# You must download rp8_linux20_libc6_i386_cs2_rpm 
 	# from real.com and put it in ${DISTDIR}
-	rpm2cpio ${DISTDIR}/${A} | cpio -i --make-directories
+	rpm2targz ${DISTDIR}/${A}
 }
 
 src_install () {
diff --git a/net-im/gtk+licq/gtk+licq-0.51-r2.ebuild b/net-im/gtk+licq/gtk+licq-0.51-r2.ebuild
index 5970d6cf7dd7..1d674e2330bf 100644
--- a/net-im/gtk+licq/gtk+licq-0.51-r2.ebuild
+++ b/net-im/gtk+licq/gtk+licq-0.51-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gtk+licq/gtk+licq-0.51-r2.ebuild,v 1.8 2002/11/04 17:52:30 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gtk+licq/gtk+licq-0.51-r2.ebuild,v 1.9 2002/11/08 22:03:45 seemant Exp $
 
 IUSE="nls spell gnome"
 
@@ -13,7 +13,7 @@ DEPEND="sys-devel/perl
 	=x11-libs/gtk+-1.2*
 	>=net-im/licq-1.0.2 
 	gnome? ( >=gnome-base/gnome-core-1.4.0.4-r1 )
-	spell? ( >=app-text/pspell-0.11.2 )"
+	spell? ( app-text/aspell )"
 
 RDEPEND="nls? ( sys-devel/gettext )"
 
@@ -27,7 +27,7 @@ src_compile() {
 	local myprefix
 
 	use gnome || myconf="--disable-gnome"
-	use spell || myconf="$myconf --disable-pspell"
+	use spell || myconf="${myconf} --disable-pspell"
 	use nls || myconf="${myconf} --disable-nls"
 
 	CXXFLAGS="${CXXFLAGS} `orbit-config --cflags client`"
diff --git a/net-misc/vnc/files/digest-vnc-3.3.5 b/net-misc/vnc/files/digest-vnc-3.3.5
new file mode 100644
index 000000000000..55cdea9793e1
--- /dev/null
+++ b/net-misc/vnc/files/digest-vnc-3.3.5
@@ -0,0 +1 @@
+MD5 cd1d0cfa4ae7d43d3cbf994b40018f3e vnc-3.3.5-unixsrc.tar.gz 2158661
diff --git a/skel.ebuild b/skel.ebuild
index 89adf20bf6a9..5bd79a7c23c1 100644
--- a/skel.ebuild
+++ b/skel.ebuild
@@ -92,6 +92,11 @@ src_compile() {
 	# this package FHS 2.2-compliant.  For more information, see
 	#   http://www.pathname.com/fhs/
 
+	# Also note that it is cleaner and easier to use econf, which is the
+	# portage shortcut to the above ./configure statement:
+	#
+	# econf
+
 	# emake (previously known as pmake) is a script that calls the
 	# standard GNU make with parallel building options for speedier
 	# builds (especially on SMP systems).  Try emake first.  It might
@@ -118,4 +123,8 @@ src_install() {
 	#	install || die
 	# Again, verify the Makefiles!  We don't want anything falling
 	# outside of ${D}.
+
+	# The portage shortcut to the above command is simply:
+	#
+	#einstall || die
 }
diff --git a/sys-apps/busybox/busybox-0.60.3.ebuild b/sys-apps/busybox/busybox-0.60.3.ebuild
index a2de2abbfbc4..bd75417bb4cc 100644
--- a/sys-apps/busybox/busybox-0.60.3.ebuild
+++ b/sys-apps/busybox/busybox-0.60.3.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.60.3.ebuild,v 1.10 2002/10/20 18:54:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.60.3.ebuild,v 1.11 2002/11/08 22:03:45 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Utilities for rescue and embedded systems"
 SRC_URI="http://www.busybox.net/downloads/${P}.tar.gz"
 HOMEPAGE="http://busybox.lineo.com/"
-KEYWORDS="x86 ppc sparc sparc64"
+
 SLOT="0"
 LICENSE="GPL-2"
+KEYWORDS="x86 ppc sparc sparc64"
 
 DEPEND="virtual/glibc"
 
@@ -20,8 +21,9 @@ src_unpack() {
 }
 
 src_compile() {
-	use static && myconf="$myconf DOSTATIC=true"
-	emake $myconf || die
+	local myconf
+	use static && myconf="${myconf} DOSTATIC=true"
+	emake ${myconf} || die
 }
 
 src_install() {
@@ -34,12 +36,10 @@ src_install() {
 	doman *.1
 	docinto txt
 	dodoc *.txt
-	docinto sgml
-	dodoc *.sgml
 	docinto pod
 	dodoc *.pod
-	docinto html
-	dodoc *.html
+	dohtml *.html
+	dohtml *.sgml
 
 	cd ../scripts
 	docinto scripts
diff --git a/sys-kernel/sparc-sources/files/digest-sparc-sources-2.4.20_rc1 b/sys-kernel/sparc-sources/files/digest-sparc-sources-2.4.20_rc1
new file mode 100644
index 000000000000..5cd7fdfd36bb
--- /dev/null
+++ b/sys-kernel/sparc-sources/files/digest-sparc-sources-2.4.20_rc1
@@ -0,0 +1,3 @@
+MD5 2bb60b7594a416f2c593923ce446160b linux-2.4.19.tar.bz2 26042494
+MD5 8f7dfd6bd2b53b75f3bee333d381b084 patch-2.4.20-rc1.gz 5087631
+MD5 adbd325940df72637b34710e26f4556d patches-2.4.20-rc1-sparc.tar.bz2 31256
diff --git a/x11-plugins/gkrellkam/files/digest-gkrellkam-2.0.0 b/x11-plugins/gkrellkam/files/digest-gkrellkam-2.0.0
new file mode 100644
index 000000000000..ec04078bcaed
--- /dev/null
+++ b/x11-plugins/gkrellkam/files/digest-gkrellkam-2.0.0
@@ -0,0 +1 @@
+MD5 657c99de172bc7598098a6a4196ff07b gkrellkam_2.0.0.tar.gz 27028
diff --git a/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild b/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild
new file mode 100644
index 000000000000..cb11ecdaedac
--- /dev/null
+++ b/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild,v 1.1 2002/11/08 22:03:45 seemant Exp $
+
+MY_P=${P/-/_}
+S=${WORKDIR}/${P}
+DESCRIPTION="an Image-Watcher-Plugin for GKrellM2."
+SRC_URI="mirror://sourceforge/gkrellkam/${MY_P}.tar.gz"
+HOMEPAGE="http://gkrellkam.sourceforge.net"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc sparc sparc64"
+
+DEPEND="=app-admin/gkrellm-2*"
+
+src_compile() {
+	emake || die
+}
+
+src_install () {
+	exeinto /usr/lib/gkrellm2/plugins
+	doexe gkrellkam2.so
+
+	doman gkrellkam-list.5
+	dodoc README Changelog COPYING example.list Release Todo INSTALL
+}