various fixes

13 files changed, 112 insertions, 21 deletions

diff --git a/app-text/ghostscript/ghostscript-6.50-r2.ebuild b/app-text/ghostscript/ghostscript-6.50-r2.ebuild
index 3fd783387354..4f8a58e37fae 100644
--- a/app-text/ghostscript/ghostscript-6.50-r2.ebuild
+++ b/app-text/ghostscript/ghostscript-6.50-r2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ghostscript-6.50-r2.ebuild,v 1.7 2001/06/08 02:32:43 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ghostscript-6.50-r2.ebuild,v 1.8 2001/06/23 21:34:37 achim Exp $
 
 GPV="4.1.1"
 A="${P}.tar.gz ghostscript-fonts-std-6.0.tar.gz print-${GPV}.tar.gz"
 A1=jpegsrc.v6b.tar.gz
 A2=zlib-1.1.3.tar.gz
-A3=libpng-1.0.11.tar.gz
+A3=libpng-1.0.12.tar.gz
 
 S=${WORKDIR}/gs${PV}
 DESCRIPTION="Aladin Ghostscript"
@@ -19,7 +19,7 @@ SRC_URI="http://download.sourceforge.net/ghostscript/${P}.tar.gz
         ftp://ftp.freesoftware.com/pub/infozip/zlib/${A2}"
 
 DEPEND="virtual/glibc
-	=media-libs/libpng-1.0.11
+	=media-libs/libpng-1.0.12
 	virtual/x11"
 
 src_unpack() {
diff --git a/dev-libs/DirectFB/DirectFB-0.9.3.ebuild b/dev-libs/DirectFB/DirectFB-0.9.3.ebuild
index 6247297ba4c4..b06b121deeac 100644
--- a/dev-libs/DirectFB/DirectFB-0.9.3.ebuild
+++ b/dev-libs/DirectFB/DirectFB-0.9.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/DirectFB-0.9.3.ebuild,v 1.1 2001/06/21 17:46:41 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/DirectFB-0.9.3.ebuild,v 1.2 2001/06/23 21:34:37 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -35,7 +35,7 @@ src_compile() {
       mkdir ${S}/interfaces/IDirectFBVideoProvider/no
       cp /usr/lib/libmpeg3.a ${S}/interfaces/IDirectFBVideoProvider/no
     else
-      myconf="$myconf --without-libmpeg3"
+      myconf="$myconf --disable-libmpeg3"
     fi
     if [ "$DEBUG" ] ; then
       myconf="$myconf --enable-debug"
diff --git a/dev-libs/dietlibc/dietlibc-0.6.13.ebuild b/dev-libs/dietlibc/dietlibc-0.6.13.ebuild
index 78edf745d5ba..801ebe2a9daf 100644
--- a/dev-libs/dietlibc/dietlibc-0.6.13.ebuild
+++ b/dev-libs/dietlibc/dietlibc-0.6.13.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/dietlibc-0.6.13.ebuild,v 1.2 2001/05/28 14:35:01 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/dietlibc-0.6.13.ebuild,v 1.3 2001/06/23 21:34:37 achim Exp $
 
 S=${WORKDIR}/${PN}
 DESCRIPTION="A minimal libc"
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.fefe.de/dietlibc"
 src_unpack() {
   unpack ${A}
   mkdir ${S}/include/asm
-  cp /usr/src/linux/include/asm/posix_types.h ${S}/include/asm
+  cp /usr/include/asm/posix_types.h ${S}/include/asm
 }
 
 src_compile() {
diff --git a/dev-libs/popt/popt-1.5.ebuild b/dev-libs/popt/popt-1.5.ebuild
index def8b988b6af..a30b1c659750 100644
--- a/dev-libs/popt/popt-1.5.ebuild
+++ b/dev-libs/popt/popt-1.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Ben Lutgens <lamer@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/popt-1.5.ebuild,v 1.2 2001/06/21 19:47:01 lamer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/popt-1.5.ebuild,v 1.3 2001/06/23 21:34:37 achim Exp $
 
 #P=
 A=${P}.tar.gz
@@ -10,11 +10,14 @@ DESCRIPTION="libpopt needed for lots of gnome stuff"
 SRC_URI="ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/${A}"
 HOMEPAGE="http://www.rpm.org"
 
-DEPEND=""
+DEPEND="virtual/glibc nls? ( sys-devel/gettext )"
 
 src_compile() {
-
-    try ./configure --prefix=/usr --host=${CHOST}
+    local myconf
+    if [ -z "`use nls`" ] ; then
+      myconf="--disable-nls"
+    fi
+    try ./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST} $myconf
     try make
 
 }
diff --git a/gnome-base/ORBit/ORBit-0.5.8.ebuild b/gnome-base/ORBit/ORBit-0.5.8.ebuild
index d86ed29f8e4c..646b0fe98728 100644
--- a/gnome-base/ORBit/ORBit-0.5.8.ebuild
+++ b/gnome-base/ORBit/ORBit-0.5.8.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/ORBit/ORBit-0.5.8.ebuild,v 1.3 2001/06/11 08:11:28 hallski Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/ORBit/ORBit-0.5.8.ebuild,v 1.4 2001/06/23 21:34:37 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -32,7 +32,7 @@ src_install() {
 
   try make prefix=${D}/opt/gnome sysconfdir=${D}/etc/opt/gnome \
   install
-
+  dosed /opt/gnome/lib/*.la
   dodoc AUTHORS COPYING* ChangeLog README NEWS TODO
   dodoc docs/*.txt docs/IDEA1
   docinto idl
diff --git a/kde-base/kdelibs/kdelibs-2.1.2.ebuild b/kde-base/kdelibs/kdelibs-2.1.2.ebuild
index a5f7d45200c3..3a0f4edaece8 100644
--- a/kde-base/kdelibs/kdelibs-2.1.2.ebuild
+++ b/kde-base/kdelibs/kdelibs-2.1.2.ebuild
@@ -18,6 +18,7 @@ DEPEND=">=sys-devel/gcc-2.95.2  sys-devel/perl
 	>=media-libs/audiofile-0.1.9
 	>=x11-libs/qt-x11-2.3.0
         >=sys-apps/bzip2-1.0.1
+	>=dev-libs/libpcre-3.4
 	ssl? ( >=dev-libs/openssl-0.9.6 )
 	mysql? ( >=dev-db/mysql-3.23.30 )
 	postgres? ( >=dev-db/postgresql-7.0.3 )
@@ -28,6 +29,7 @@ RDEPEND=">=sys-devel/gcc-2.95.2
 	 >=media-libs/audiofile-0.1.9
          >=media-libs/tiff-3.5.5
          >=sys-apps/bzip2-1.0.1
+	 >=dev-libs/libpcre-3.4
 	 >=x11-libs/qt-x11-2.3.0
          >=kde-base/kde-env-2.1-r1
          app-text/sgml-common
diff --git a/media-libs/SoGtk/SoGtk-20010601.ebuild b/media-libs/SoGtk/SoGtk-20010601.ebuild
index 08f03e69fa5a..a5692575f17a 100644
--- a/media-libs/SoGtk/SoGtk-20010601.ebuild
+++ b/media-libs/SoGtk/SoGtk-20010601.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/media-libs/SoGtk/SoGtk-20010601.ebuild,v 1.2 2001/06/09 14:11:57 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/SoGtk/SoGtk-20010601.ebuild,v 1.3 2001/06/23 21:34:37 achim Exp $
 
 
 A=${P}.tar.gz
@@ -28,7 +28,7 @@ src_compile() {
 
 src_install () {
     
-    try make DESTDIR=${D} install
+    try make prefix=${D}/usr/X11R6 install
     cd ${S}
     dodoc AUTHORS COPYING ChangeLog* LICENSE* NEWS README*
     docinto txt
diff --git a/media-libs/imlib2/imlib2-1.0.3.ebuild b/media-libs/imlib2/imlib2-1.0.3.ebuild
index cee7f2d2156f..cc7d285c4c2e 100644
--- a/media-libs/imlib2/imlib2-1.0.3.ebuild
+++ b/media-libs/imlib2/imlib2-1.0.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.0.3.ebuild,v 1.1 2001/06/21 18:41:08 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.0.3.ebuild,v 1.2 2001/06/23 21:34:37 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -13,7 +13,9 @@ DEPEND="virtual/glibc
 	>=media-libs/giflib-4.1.0
 	>=media-libs/libpng-1.0.7
 	>=media-libs/tiff-3.5.5
+	<=media-libs/freetype-1.4
 	>=x11-libs/gtk+-1.2.10
+	dev-db/edb
 	virtual/x11"
 
 src_compile() {
diff --git a/media-libs/libmpeg3/libmpeg3-1.2.3.ebuild b/media-libs/libmpeg3/libmpeg3-1.2.3.ebuild
index e1dd4580cb2e..6061ba7508ec 100644
--- a/media-libs/libmpeg3/libmpeg3-1.2.3.ebuild
+++ b/media-libs/libmpeg3/libmpeg3-1.2.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/libmpeg3-1.2.3.ebuild,v 1.2 2001/06/21 17:39:19 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/libmpeg3-1.2.3.ebuild,v 1.3 2001/06/23 21:34:37 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -9,7 +9,8 @@ DESCRIPTION="An mpeg library for linux"
 SRC_URI="http://www.directfb.org/download/contrib/${A}"
 HOMEPAGE="http://"
 
-DEPEND="virtual/glibc sys-libs/zlib media-libs/jpeg"
+RDEPEND="virtual/glibc sys-libs/zlib media-libs/jpeg"
+DEPEND="$RDEPEND dev-lang/nasm"
 
 src_compile() {
     if [ -z "`use mmx`" ] ; then
diff --git a/net-ftp/proftpd/files/digest-proftpd-1.2.2_rc3 b/net-ftp/proftpd/files/digest-proftpd-1.2.2_rc3
new file mode 100644
index 000000000000..1443bdaff037
--- /dev/null
+++ b/net-ftp/proftpd/files/digest-proftpd-1.2.2_rc3
@@ -0,0 +1,2 @@
+MD5 6cf5790721722da80e0e17d2cd6fb7c0 mod_sql-3.2.2.tar.gz
+MD5 4c40f7fb9efa2886c0b5b82c972eed37 proftpd-1.2.2rc3.tar.bz2
diff --git a/net-ftp/proftpd/proftpd-1.2.2_rc3.ebuild b/net-ftp/proftpd/proftpd-1.2.2_rc3.ebuild
new file mode 100644
index 000000000000..c34ff81f098d
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.2.2_rc3.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Achim Gottinger <achim@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.2_rc3.ebuild,v 1.1 2001/06/23 21:34:37 achim Exp $
+
+P=${PN}-1.2.2rc3
+S=${WORKDIR}/${P}
+DESCRIPTION="proftpd."
+SRC_URI="ftp://ftp.proftpd.org/distrib/${P}.tar.bz2
+	 http://www.lastditcheffort.org/aah/src/mod_sql-3.2.2.tar.gz"
+HOMEPAGE="http://www.proftpd.net/"
+
+DEPEND="virtual/glibc
+	pam? ( >=sys-libs/pam-0.75 )
+	mysql? ( >=dev-db/mysql-3.23.26 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	postgres? ( >=dev-db/postgresql-7.1 )"
+
+
+src_unpack() {
+
+    unpack ${P}.tar.bz2
+    cd ${S}/contrib
+    unpack mod_sql-3.2.2.tar.gz
+}
+
+src_compile() {                           
+    local modules
+    local myinc
+    modules="mod_ratio:mod_readme:mod_linuxprivs"
+    if [ "`use pam`" ] ; then
+	modules="$modules:mod_pam"
+    fi
+    if [ "`use mysql`" ] ; then
+	modules="$modules:mod_sql:mod_sql_mysql"
+    else
+      if [ "`use postgres`" ] ; then
+    	  modules="$modules:mod_sql:mod_sql_postgres"
+	  myinc="/usr/include/postgresql"
+      fi
+    fi
+    if [ "`use ldap`" ] ; then
+	modules="$modules:mod_ldap"
+    fi
+
+    if [ "$myinc" ] ; then
+	myinc="--with-includes=$myinc"
+    fi
+	
+    ./configure --host=${CHOST} --prefix=/usr --sbindir=/usr/sbin \
+		--sysconfdir=/etc/proftp --localstatedir=/var/run --mandir=/usr/share/man \
+		--with-modules=$modules --disable-sendfile --enable-shadow --enable-autoshadow $myinc
+    try make
+
+}
+
+src_install() {                               
+     try make install prefix=${D}/usr sysconfdir=${D}/etc/proftp \
+	mandir=${D}/usr/share/man \
+	localstatedir=${D}/var/run sbindir=${D}/usr/sbin
+
+     into /usr
+     dodir /home/ftp
+     dobin contrib/genuser.pl
+     dodoc COPYING CREDITS ChangeLog NEWS
+     dodoc README* contrib/README.mod_sql
+     cd doc
+     dodoc API Changes-1.2.0pre3 license.txt GetConf ShowUndocumented
+     dodoc Undocumented.txt development.notes 
+     docinto html
+     dodoc *.html
+     docinto rfc
+     dodoc rfc/*.txt
+     cp ${FILESDIR}/proftpd.conf ${D}/etc/proftp
+}
+
+
+
+
diff --git a/x11-base/xfree/files/4.1.0/site.def b/x11-base/xfree/files/4.1.0/site.def
index d5dc45d59fe0..3ba2770ef0e2 100644
--- a/x11-base/xfree/files/4.1.0/site.def
+++ b/x11-base/xfree/files/4.1.0/site.def
@@ -3,5 +3,7 @@
 #define ForceNormalLib YES
 #define BuildXinerama YES
 #define SharedLibXau YES
-
+#define BuildGLULibrary NO
+#define SharedLibGLU NO
+#define NormalLibGLU NO
 
diff --git a/x11-base/xfree/xfree-4.1.0.ebuild b/x11-base/xfree/xfree-4.1.0.ebuild
index c9bb1bcf9de5..dc1af6954033 100644
--- a/x11-base/xfree/xfree-4.1.0.ebuild
+++ b/x11-base/xfree/xfree-4.1.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.1.0.ebuild,v 1.2 2001/06/06 16:55:51 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.1.0.ebuild,v 1.3 2001/06/23 21:34:37 achim Exp $
 
 A="X410src-1.tgz X410src-2.tgz X410src-3.tgz truetype.tar.gz"
 S=${WORKDIR}/xc
@@ -24,7 +24,7 @@ DEPEND=">=sys-libs/ncurses-5.1
 
 RDEPEND=">=sys-libs/ncurses-5.1"
 
-PROVIDE="virtual/x11 virtual/opengl virtual/glu"
+PROVIDE="virtual/x11 virtual/opengl"
 
 src_unpack () {