removed || die from einstall, and added alpha to the list, and made note about unstable/testing profiles

8 files changed, 67 insertions, 25 deletions

diff --git a/gnome-extra/mc/ChangeLog b/gnome-extra/mc/ChangeLog
index db024ea01229..43f4053b2e15 100644
--- a/gnome-extra/mc/ChangeLog
+++ b/gnome-extra/mc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/mc
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/mc/ChangeLog,v 1.13 2002/11/10 08:33:09 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/mc/ChangeLog,v 1.14 2002/11/14 09:43:44 seemant Exp $
+
+*mc-4.6.0_pre1-r4 (13 Nov 2002)
+
+  13 Nov 2002; Brad Cowan <bcowan@gentoo.org> mc-4.6.0_pre1-r4.ebuild,    
+  files/digest-mc-4.6.0_pre1-r4, files/man2hlp.c :
+
+  Replaced man2hlp.c with a cvs version recommended by upstream dev's,
+  still trying to fix problem with /var/tmp filling up.
 
 *mc-4.6.0_pre1-r3 (10 Nov 2002)
 
diff --git a/gnome-extra/mc/files/digest-mc-4.6.0_pre1-r2 b/gnome-extra/mc/files/digest-mc-4.6.0_pre1-r2
index 6f48f663aee1..976f3d4c46db 100644
--- a/gnome-extra/mc/files/digest-mc-4.6.0_pre1-r2
+++ b/gnome-extra/mc/files/digest-mc-4.6.0_pre1-r2
@@ -1,2 +1,2 @@
 MD5 76e9a94f99af475fed6eed4b4a1ea6e4 mc-4.6.0-pre1.tar.gz 3976955
-MD5 7e045082816c77f5b3edb99df5f84a80 mc-4.6.0-pre1-2002-11-04-13.diff.bz2 815426
+MD5 a68aca6b8ceb21aaf697047b6036e8c7 mc-4.6.0-pre1-2002-11-07-15.diff.bz2 817096
diff --git a/media-libs/libpng/files/digest-libpng-1.0.15 b/media-libs/libpng/files/digest-libpng-1.0.15
new file mode 100644
index 000000000000..d89b2110d61f
--- /dev/null
+++ b/media-libs/libpng/files/digest-libpng-1.0.15
@@ -0,0 +1 @@
+MD5 ec2a949b603cba9660f823006b80b088 libpng-1.0.15.tar.gz 502477
diff --git a/media-libs/libpng/libpng-1.2.5.ebuild b/media-libs/libpng/libpng-1.2.5.ebuild
index 88cb3b9e78a0..19b25a9f78e7 100644
--- a/media-libs/libpng/libpng-1.2.5.ebuild
+++ b/media-libs/libpng/libpng-1.2.5.ebuild
@@ -1,25 +1,26 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.5.ebuild,v 1.2 2002/10/28 23:56:15 seemant Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.5.ebuild,v 1.3 2002/11/14 09:43:44 seemant Exp $
 
 S=${WORKDIR}/${P}
-DESCRIPTION="libpng"
+DESCRIPTION="Portable Network Graphics library"
 SRC_URI="ftp://swrinde.nde.swri.edu/pub/png/src/${P}.tar.gz"
 HOMEPAGE="http://www.libpng.org/"
+
 SLOT="1.2"
 LICENSE="as-is"
 KEYWORDS="~x86 ~ppc ~sparc ~sparc64 ~alpha"
 
-DEPEND=">=sys-libs/zlib-1.1.4"
+DEPEND="sys-libs/zlib"
 
 src_compile() {
-	sed -e "s:ZLIBLIB=../zlib:ZLIBLIB=/usr/lib:" \
-		-e "s:ZLIBINC=../zlib:ZLIBINC=/usr/include:" \
+	sed -e "s:ZLIBLIB=.*:ZLIBLIB=/usr/lib:" \
+		-e "s:ZLIBINC=.*:ZLIBINC=/usr/include:" \
 		-e "s/-O3/${CFLAGS}/" \
 		-e "s:prefix=/usr/local:prefix=/usr:" \
 			scripts/makefile.linux > Makefile
 
+	einfo "${LDFLAGS}"
 	emake || die
 }
 
diff --git a/skel.ebuild b/skel.ebuild
index 5bd79a7c23c1..1de982aa1fff 100644
--- a/skel.ebuild
+++ b/skel.ebuild
@@ -43,14 +43,17 @@ SLOT="0"
 # instead of relying on an external package.mask file. Right now, you
 # should set the KEYWORDS variable for every ebuild so that it contains
 # the names of all the architectures with which the ebuild works. We have
-# 4 official architecture names right now: "x86", "ppc", "sparc" and
-# "sparc64". So, if you've confirmed that your ebuild works on x86 and ppc,
-# you'd specify: KEYWORDS="x86 ppc"
+# 5 official architecture names right now: "~x86", "~ppc", "~sparc", "~sparc64"
+# and "~alpha".  The ~ in front of the architecture indicates that the
+# package is new and should be considered unstable until testing proves its
+# stability.  Once packages go stable the ~ prefix is removed.
+# So, if you've confirmed that your ebuild works on x86 and ppc,
+# you'd specify: KEYWORDS="~x86 ~ppc"
 # For packages that are platform-independant (like Java, PHP or Perl
 # applications) specify all keywords.
 # DO NOT USE KEYWORDS="*". This is deprecated and only for backward
 # compatibility reasons.
-KEYWORDS="x86"
+KEYWORDS="~x86"
 
 # Comprehensive list of any and all USE flags leveraged in the ebuild,
 # with the exception of any ARCH specific flags, i.e. "ppc", "sparc",
@@ -73,7 +76,7 @@ DEPEND=""
 # Source directory; the dir where the sources can be found (automatically
 # unpacked) inside ${WORKDIR}.  S will get a default setting of ${WORKDIR}/${P}
 # if you omit this line.
-S="${WORKDIR}/${P}"
+S=${WORKDIR}/${P}
 
 src_compile() {
 	# Most open-source packages use GNU autoconf for configuration.
@@ -126,5 +129,5 @@ src_install() {
 
 	# The portage shortcut to the above command is simply:
 	#
-	#einstall || die
+	#einstall
 }
diff --git a/x11-base/xdirectfb/files/digest-xdirectfb-1.0_rc3 b/x11-base/xdirectfb/files/digest-xdirectfb-1.0_rc3
new file mode 100644
index 000000000000..4aca2c59da7e
--- /dev/null
+++ b/x11-base/xdirectfb/files/digest-xdirectfb-1.0_rc3
@@ -0,0 +1,5 @@
+MD5 c0c46ba0faec8a21c185e09401f6294c X4.2.99.3-1.tar.bz2 9758317
+MD5 d8b3e71f9702148ea1bb5ab71ad1a663 X4.2.99.3-2.tar.bz2 16382189
+MD5 232459a154e500ca98745bf81fcced97 X4.2.99.3-3.tar.bz2 12825629
+MD5 a70e4d28c241374868a099127c668949 truetype.tar.gz 1524606
+MD5 6260f09063c4b30ce38bec36f1692af6 XDirectFB-1.0-rc3.tar.gz 63991
diff --git a/x11-base/xfree/xfree-4.2.99.3.ebuild b/x11-base/xfree/xfree-4.2.99.3.ebuild
index 7014c82187f4..86c96c2140e6 100644
--- a/x11-base/xfree/xfree-4.2.99.3.ebuild
+++ b/x11-base/xfree/xfree-4.2.99.3.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/x11-base/xfree/xfree-4.2.99.3.ebuild,v 1.2 2002/11/14 02:54:19 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.99.3.ebuild,v 1.3 2002/11/14 09:43:44 seemant Exp $
 
 IUSE="3dfx"
 
@@ -22,6 +22,7 @@ SRC_URI="http://www.ibiblio.org/gentoo/gentoo-sources/X${MY_V}-1.tar.bz2
 	http://www.ibiblio.org/gentoo/gentoo-sources/X${MY_V}-2.tar.bz2
 	http://www.ibiblio.org/gentoo/gentoo-sources/X${MY_V}-3.tar.bz2
 	http://www.ibiblio.org/gentoo/gentoo-sources/X${MY_V}-4.tar.bz2
+	mirror://sourceforge/freetype/freetype-${FT2_VER}.tar.bz2
 	http://www.ibiblio.org/gentoo/gentoo-sources/truetype.tar.gz
 	${X_PATCHES}
 	${X_DRIVERS}"
@@ -32,8 +33,8 @@ SLOT="0"
 KEYWORDS="~x86 ~sparc ~sparc64"
 
 DEPEND=">=sys-libs/ncurses-5.1
-	>=sys-libs/pam-0.75
-	>=sys-libs/zlib-1.1.3-r2
+	pam? ( >=sys-libs/pam-0.75 )
+	>=sys-libs/zlib-1.1.4
 	sys-devel/flex
 	sys-devel/perl
 	3dfx? ( >=media-libs/glide-v3-3.10 )"
@@ -52,11 +53,11 @@ src_unpack () {
 	# Deploy our custom freetype2.  We want it static for stability,
 	# and because some things in Gentoo depends the freetype2 that
 	# is distributed with XFree86.
-	#	unpack freetype-${FT2_VER}.tar.bz2
-	#	cd ${S}/extras/freetype2
-	#	rm -rf *
-	#	mv ${WORKDIR}/freetype-${FT2_VER}/* .
-	#	# Enable hinting for truetype fonts
+#	unpack freetype-${FT2_VER}.tar.bz2
+#	cd ${S}/extras/freetype2
+#	rm -rf *
+#	mv ${WORKDIR}/freetype-${FT2_VER}/* .
+	# Enable hinting for truetype fonts
 	cd ${S}/extras/freetype2/include/freetype/config
 	cp ftoption.h ftoption.h.orig
 	sed -e 's:#undef \(TT_CONFIG_OPTION_BYTECODE_INTERPRETER\):#define \1:' \
@@ -212,8 +213,13 @@ src_install() {
 	doexe ${FILESDIR}/${PVR}/Xsession ${FILESDIR}/${PVR}/Xsetup_0
 	insinto /etc/X11/fs
 	newins ${FILESDIR}/${PVR}/xfs.config config
-	insinto /etc/pam.d
-	doins ${FILESDIR}/${PVR}/xdm
+	
+	if use pam
+	then
+		insinto /etc/pam.d
+		doins ${FILESDIR}/${PVR}/xdm
+	fi
+
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/${PVR}/xdm.start xdm
 	newexe ${FILESDIR}/${PVR}/xfs.start xfs
diff --git a/x11-plugins/gkrellscore/gkrellscore-0.0.2.ebuild b/x11-plugins/gkrellscore/gkrellscore-0.0.2.ebuild
index 188073d2e6f5..3a0a964cc29d 100644
--- a/x11-plugins/gkrellscore/gkrellscore-0.0.2.ebuild
+++ b/x11-plugins/gkrellscore/gkrellscore-0.0.2.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/x11-plugins/gkrellscore/gkrellscore-0.0.2.ebuild,v 1.4 2002/10/04 06:45:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellscore/gkrellscore-0.0.2.ebuild,v 1.5 2002/11/14 09:43:44 seemant Exp $
 
 MY_P=${P/-/_}
 S=${WORKDIR}/${P}
@@ -13,14 +13,32 @@ LICENSE="GPL-2"
 KEYWORDS="x86 ppc sparc sparc64"
 
 DEPEND="=app-admin/gkrellm-1.2*
+	sys-apps/supersed
 	>=media-libs/imlib-1.9.10-r1"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	ssed -i "s:excite:yahoo:g" ${PN}.excite
+	mv ${PN}.excite ${PN}.yahoo
+	ssed -i \
+		-e "s:excite:yahoo:g" \
+		-e "s:Excite:Yahoo:g" \
+		-e 's#\(g_strdup_printf ("http://%s/%s/\)#\1teams#' \
+		-e "s:netscape:mozilla:g" \
+		-e "s:\(gkrellscore.yahoo\):/usr/share/gkrellm/\1:" \
+		${PN}.c
+}
+
 src_compile() {
+
 	emake || die
 }
 
 src_install () {
 	exeinto /usr/lib/gkrellm/plugins
 	doexe gkrellscore.so
+	exeinto /usr/share/gkrellm
+	doexe ${PN}.yahoo
 	dodoc README COPYING Changelog
 }