minor fixes for rc5

18 files changed, 47 insertions, 41 deletions

diff --git a/app-crypt/seahorse/seahorse-0.5.0.ebuild b/app-crypt/seahorse/seahorse-0.5.0.ebuild
index c44f1f00b22b..e78089ecfab7 100644
--- a/app-crypt/seahorse/seahorse-0.5.0.ebuild
+++ b/app-crypt/seahorse/seahorse-0.5.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 Ben Lutgens <blutgens@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-0.5.0.ebuild,v 1.5 2001/06/11 08:11:28 hallski Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-0.5.0.ebuild,v 1.6 2001/06/24 20:11:29 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -19,7 +19,9 @@ src_compile() {
 }
 
 src_install() {
-  try make prefix=${D}/opt/gnome install
+  try make DESTDIR=${D} localedir=${D}/opt/gnome/share/locale \
+  	gnulocaledir=${D}/opt/gnome/share/locale install
+  #try make prefix=${D}/opt/gnome install
   dodoc AUTHORS COPYING ChangeLog NEWS README TODO
 
 }
diff --git a/app-misc/gtktalog/gtktalog-0.99.5.ebuild b/app-misc/gtktalog/gtktalog-0.99.5.ebuild
index 95de29689dfd..b81b889af3d9 100644
--- a/app-misc/gtktalog/gtktalog-0.99.5.ebuild
+++ b/app-misc/gtktalog/gtktalog-0.99.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 Mikael Hallendal <hallski@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gtktalog/gtktalog-0.99.5.ebuild,v 1.1 2001/06/21 10:38:31 hallski Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gtktalog/gtktalog-0.99.5.ebuild,v 1.2 2001/06/24 20:11:29 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -20,8 +20,7 @@ src_compile() {
     if [ -z "`use nls`" ] ; then
         myconf="--disable-nls"
     fi
-    try ./configure --prefix=/opt/gnome --sysconfdir=/etc/opt/gnome \
-	            --mandir=/opt/gnome/man --host=${CHOST} \
+    try ./configure --prefix=/opt/gnome --sysconfdir=/etc/opt/gnome --host=${CHOST} \
 	            --enable-htmltitle --enable-mp3info --enable-aviinfo \
 	            --enable-mpeginfo --enable-modinfo --enable-catalog2
                     --enable-catalog3 $myconf
@@ -31,8 +30,8 @@ src_compile() {
 }
 
 src_install () {
-
-    try make DESTDIR=${D} install
+    # DESTDIR does not work for mo-files
+    try make prefix=${D}/opt/gnome sysconfdir=${D}/etc/opt/gnome install
     dodoc AUTHORS BUGS COPYING ChangeLog NEWS README TODO
 
 }
diff --git a/app-office/mrproject/files/digest-mrproject-0.3.0 b/app-office/mrproject/files/digest-mrproject-0.3.0
index ace357038633..955c1d19c894 100644
--- a/app-office/mrproject/files/digest-mrproject-0.3.0
+++ b/app-office/mrproject/files/digest-mrproject-0.3.0
@@ -1 +1 @@
-MD5 c8173dc0887ef329f431a607433b35bd mrproject-0.3.0.tar.gz
+MD5 cca367a2f8f75650c6084b95a5051213 mrproject-0.3.0.tar.gz
diff --git a/gnome-apps/gtktalog/gtktalog-0.99.5.ebuild b/gnome-apps/gtktalog/gtktalog-0.99.5.ebuild
index 60ad25de0c14..54e8d0783805 100644
--- a/gnome-apps/gtktalog/gtktalog-0.99.5.ebuild
+++ b/gnome-apps/gtktalog/gtktalog-0.99.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 Mikael Hallendal <hallski@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/gnome-apps/gtktalog/gtktalog-0.99.5.ebuild,v 1.1 2001/06/21 10:38:31 hallski Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-apps/gtktalog/gtktalog-0.99.5.ebuild,v 1.2 2001/06/24 20:11:29 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -20,8 +20,7 @@ src_compile() {
     if [ -z "`use nls`" ] ; then
         myconf="--disable-nls"
     fi
-    try ./configure --prefix=/opt/gnome --sysconfdir=/etc/opt/gnome \
-	            --mandir=/opt/gnome/man --host=${CHOST} \
+    try ./configure --prefix=/opt/gnome --sysconfdir=/etc/opt/gnome --host=${CHOST} \
 	            --enable-htmltitle --enable-mp3info --enable-aviinfo \
 	            --enable-mpeginfo --enable-modinfo --enable-catalog2
                     --enable-catalog3 $myconf
@@ -31,8 +30,8 @@ src_compile() {
 }
 
 src_install () {
-
-    try make DESTDIR=${D} install
+    # DESTDIR does not work for mo-files
+    try make prefix=${D}/opt/gnome sysconfdir=${D}/etc/opt/gnome install
     dodoc AUTHORS BUGS COPYING ChangeLog NEWS README TODO
 
 }
diff --git a/gnome-apps/seahorse/seahorse-0.5.0.ebuild b/gnome-apps/seahorse/seahorse-0.5.0.ebuild
index 964d5b45c1bd..0df3ccf3a380 100644
--- a/gnome-apps/seahorse/seahorse-0.5.0.ebuild
+++ b/gnome-apps/seahorse/seahorse-0.5.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 Ben Lutgens <blutgens@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/gnome-apps/seahorse/seahorse-0.5.0.ebuild,v 1.5 2001/06/11 08:11:28 hallski Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-apps/seahorse/seahorse-0.5.0.ebuild,v 1.6 2001/06/24 20:11:29 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -19,7 +19,9 @@ src_compile() {
 }
 
 src_install() {
-  try make prefix=${D}/opt/gnome install
+  try make DESTDIR=${D} localedir=${D}/opt/gnome/share/locale \
+  	gnulocaledir=${D}/opt/gnome/share/locale install
+  #try make prefix=${D}/opt/gnome install
   dodoc AUTHORS COPYING ChangeLog NEWS README TODO
 
 }
diff --git a/gnome-extra/gnome-db/gnome-db-0.2.10.ebuild b/gnome-extra/gnome-db/gnome-db-0.2.10.ebuild
index a0c773ea847f..a0b9b140c85d 100644
--- a/gnome-extra/gnome-db/gnome-db-0.2.10.ebuild
+++ b/gnome-extra/gnome-db/gnome-db-0.2.10.ebuild
@@ -26,7 +26,7 @@ src_compile() {
 }
 
 src_install() {                               
-  try make prefix=${D}/opt/gnome \
+  try make prefix=${D}/opt/gnome localedir=${D}/opt/gnome/share/local \
 	GNOME_sysconfdir=${D}/opt/gnome/etc \
 	GNOME_datadir=${D}/opt/gnome/share \
 	GNOMEDB_oafinfodir=${D}/opt/gnome/share/oaf \
diff --git a/gnome-office/gnome-db/gnome-db-0.2.10.ebuild b/gnome-office/gnome-db/gnome-db-0.2.10.ebuild
index a0c773ea847f..a0b9b140c85d 100644
--- a/gnome-office/gnome-db/gnome-db-0.2.10.ebuild
+++ b/gnome-office/gnome-db/gnome-db-0.2.10.ebuild
@@ -26,7 +26,7 @@ src_compile() {
 }
 
 src_install() {                               
-  try make prefix=${D}/opt/gnome \
+  try make prefix=${D}/opt/gnome localedir=${D}/opt/gnome/share/local \
 	GNOME_sysconfdir=${D}/opt/gnome/etc \
 	GNOME_datadir=${D}/opt/gnome/share \
 	GNOMEDB_oafinfodir=${D}/opt/gnome/share/oaf \
diff --git a/gnome-office/mrproject/files/digest-mrproject-0.3.0 b/gnome-office/mrproject/files/digest-mrproject-0.3.0
index ace357038633..955c1d19c894 100644
--- a/gnome-office/mrproject/files/digest-mrproject-0.3.0
+++ b/gnome-office/mrproject/files/digest-mrproject-0.3.0
@@ -1 +1 @@
-MD5 c8173dc0887ef329f431a607433b35bd mrproject-0.3.0.tar.gz
+MD5 cca367a2f8f75650c6084b95a5051213 mrproject-0.3.0.tar.gz
diff --git a/media-sound/dcd/dcd-0.90.ebuild b/media-sound/dcd/dcd-0.90.ebuild
index d5b2ed2eaa47..b4ed2bb831b9 100644
--- a/media-sound/dcd/dcd-0.90.ebuild
+++ b/media-sound/dcd/dcd-0.90.ebuild
@@ -17,8 +17,9 @@ src_unpack() {
     unpack ${A}
     cd ${S}
     cp Makefile Makefile.orig
-    cat Makefile.orig | sed "s:PREFIX = .*$:PREFIX = \"${D}/usr\":" |\
-    sed "s:# CDROM = /dev/cdroms/cdrom0:CDROM = \"/dev/cdroms/cdrom0\":"\
+    cat Makefile.orig | sed -e "s:PREFIX = .*$:PREFIX = \"${D}/usr\":" \
+    -e "s:/man/:/share/man/:" \
+    -e "s:# CDROM = /dev/cdroms/cdrom0:CDROM = \"/dev/cdroms/cdrom0\":"\
     > Makefile
    
 }
diff --git a/media-sound/lopster/lopster-0.9.9.ebuild b/media-sound/lopster/lopster-0.9.9.ebuild
index fc579767b627..1388387dba97 100644
--- a/media-sound/lopster/lopster-0.9.9.ebuild
+++ b/media-sound/lopster/lopster-0.9.9.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-sound/lopster/lopster-0.9.9.ebuild,v 1.1 2001/06/04 06:41:14 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lopster/lopster-0.9.9.ebuild,v 1.2 2001/06/24 20:12:40 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -28,7 +28,7 @@ src_compile() {
 
 src_install () {
 
-    try make DESTDIR=${D} install
+    try make DESTDIR=${D} gnulocaledir=${D}/usr/X11R6/locale install
     dodoc AUTHORS BUGS COPYING README ChangeLog NEWS
 }
 
diff --git a/media-sound/shorten/shorten-3.2.ebuild b/media-sound/shorten/shorten-3.2.ebuild
index c30905b5ba49..1f0b44784c0c 100644
--- a/media-sound/shorten/shorten-3.2.ebuild
+++ b/media-sound/shorten/shorten-3.2.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 Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/shorten/shorten-3.2.ebuild,v 1.2 2001/05/28 05:24:13 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/shorten/shorten-3.2.ebuild,v 1.3 2001/06/24 20:12:40 achim Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Open source, popular and fast lossless audio compressor"
@@ -12,7 +12,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	mv Makefile Makefile.orig
-	sed -e "s:-O:${CFLAGS}:g" -e 's:/usr/local:/usr:g' Makefile.orig > Makefile
+	sed -e "s:-O:${CFLAGS}:g" -e 's:/usr/local:/usr:g' -e 's:/man/:/share/man/:' Makefile.orig > Makefile
 }
 
 src_compile() {                           
diff --git a/net-analyzer/ethereal/ethereal-0.8.18.ebuild b/net-analyzer/ethereal/ethereal-0.8.18.ebuild
index 7b8f75eb5603..660e41a1561d 100644
--- a/net-analyzer/ethereal/ethereal-0.8.18.ebuild
+++ b/net-analyzer/ethereal/ethereal-0.8.18.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/net-analyzer/ethereal/ethereal-0.8.18.ebuild,v 1.3 2001/06/17 17:55:26 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.8.18.ebuild,v 1.4 2001/06/24 20:13:37 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -33,14 +33,14 @@ src_compile() {
   fi
 
   LDFLAGS="-L/usr/lib -lz" try ./configure --host=${CHOST} --prefix=/usr --with-plugindir=/usr/lib/ethereal/plugins/${PV} \
-	--sysconfdir=/etc/ethereal --enable-pcap --enable-zlib --enable-ipv6 $myconf
+	--mandir=/usr/share/man --sysconfdir=/etc/ethereal --enable-pcap --enable-zlib --enable-ipv6 $myconf
   try make
 }
 
 src_install() {
 
   dodir /usr/lib/ethereal/plugins/${PV}
-  try make prefix=${D}/usr sysconfdir=${D}/etc/ethereal \
+  try make prefix=${D}/usr sysconfdir=${D}/etc/ethereal mandir=${D}/usr/share/man \
 	plugindir=${D}/usr/lib/ethereal/plugins/${PV} install
   dodoc AUTHORS COPYING ChangeLog INSTALL.* NEWS README* TODO
 
diff --git a/net-fs/samba-winbind/samba-winbind-20010329.ebuild b/net-fs/samba-winbind/samba-winbind-20010329.ebuild
index d114bb151f7b..6cb3b803d84a 100644
--- a/net-fs/samba-winbind/samba-winbind-20010329.ebuild
+++ b/net-fs/samba-winbind/samba-winbind-20010329.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/net-fs/samba-winbind/samba-winbind-20010329.ebuild,v 1.3 2001/05/28 14:32:32 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-winbind/samba-winbind-20010329.ebuild,v 1.4 2001/06/24 20:13:37 achim Exp $
 
 A=samba-tng-cvs-${PV}.tbz2
 S=${WORKDIR}/tng
@@ -23,7 +23,9 @@ src_compile() {
   local myconf
   if [ "`use pam`" ]
   then
-    myconf="--with-pam"
+    myconf="--without-pam"
+    echo "disabled cuz broken"
+#    myconf="--with-pam"
   else
     myconf="--without-pam"
   fi
diff --git a/net-ftp/ncftp/ncftp-3.0.2.ebuild b/net-ftp/ncftp/ncftp-3.0.2.ebuild
index bfd63fda28b0..dd9dc20d4dc8 100644
--- a/net-ftp/ncftp/ncftp-3.0.2.ebuild
+++ b/net-ftp/ncftp/ncftp-3.0.2.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 Jerry Alexandratos <jerry@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/ncftp-3.0.2.ebuild,v 1.3 2001/05/28 05:24:13 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/ncftp-3.0.2.ebuild,v 1.4 2001/06/24 20:13:37 achim Exp $
 
 A=${P}-src.tar.gz
 S=${WORKDIR}/${P}
@@ -13,13 +13,13 @@ DEPEND="virtual/glibc >=sys-libs/ncurses-5.2"
 
 src_compile() {
 
-    try ./configure --prefix=/usr --host=${CHOST}
+    try ./configure --prefix=/usr/share/man --host=${CHOST}
     try make
 }
 
 src_install () {
-    
-    try make prefix=${D}/usr install
+    dodir /usr/share
+    try make prefix=${D}/usr mandir=${D}/usr/share/man install
 
     dodoc CHANGELOG FIREWALL-PROXY-README LICENSE.txt
         READLINE-README README WHATSNEW-3.0
diff --git a/net-im/everybuddy/everybuddy-0.2.1.ebuild b/net-im/everybuddy/everybuddy-0.2.1.ebuild
index 8608fad9944a..c8cd9cf86008 100644
--- a/net-im/everybuddy/everybuddy-0.2.1.ebuild
+++ b/net-im/everybuddy/everybuddy-0.2.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Ben Lutgens  <blutgens@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-im/everybuddy/everybuddy-0.2.1.ebuild,v 1.2 2001/05/25 15:42:29 blutgens Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/everybuddy/everybuddy-0.2.1.ebuild,v 1.3 2001/06/24 20:13:37 achim Exp $
 
 A=everybuddy-0.2.1beta3.tar.gz
 S=${WORKDIR}/everybuddy-0.2.1beta3
@@ -19,7 +19,7 @@ src_compile() {
         myconf="--disable-arts"
     fi
 
-    try ./configure --prefix=/usr --host=${CHOST} ${myconf}
+    try ./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST} ${myconf}
     try make
 
 }
diff --git a/net-mail/ssmtp/ssmtp-2.38.14-r1.ebuild b/net-mail/ssmtp/ssmtp-2.38.14-r1.ebuild
index b9c924e26284..cd9662560b88 100644
--- a/net-mail/ssmtp/ssmtp-2.38.14-r1.ebuild
+++ b/net-mail/ssmtp/ssmtp-2.38.14-r1.ebuild
@@ -7,10 +7,10 @@ S=${WORKDIR}/${P}
 DESCRIPTION="Extremely simple MTA to get mail off the system to a Mailhub"
 SRC_URI="ftp://ftp.ibiblio.org/pub/Linux/system/mail/mta/${A}"
 
-DEPEND="virtual/glibc
-        >=net-mail/mailbase-0.00"
+DEPEND="virtual/glibc"
 
-RDEPEND="!virtual/mta"
+
+RDEPEND="!virtual/mtai net-mail/mailbase"
 
 PROVIDE="virtual/mta"
 
diff --git a/net-print/LPRng/LPRng-3.6.26.ebuild b/net-print/LPRng/LPRng-3.6.26.ebuild
index 8c664f2de12e..68fa7eacc973 100644
--- a/net-print/LPRng/LPRng-3.6.26.ebuild
+++ b/net-print/LPRng/LPRng-3.6.26.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/net-print/LPRng/LPRng-3.6.26.ebuild,v 1.5 2001/05/29 17:28:19 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/LPRng/LPRng-3.6.26.ebuild,v 1.6 2001/06/24 20:13:37 achim Exp $
 
 A=${P}.tgz
 S=${WORKDIR}/${P}
@@ -27,7 +27,7 @@ src_compile() {
     myconf="--enable-nls"
   fi
   try ./configure --host=${CHOST} --prefix=/usr --sysconfdir=/etc/lprng \
-	$myconf
+	--mandir=/usr/share/man --libexecdir=/usr/lib $myconf
 
   try make
 }
diff --git a/net-www/apache-ssl/apache-ssl-1.3.20.2.8.4.ebuild b/net-www/apache-ssl/apache-ssl-1.3.20.2.8.4.ebuild
index ce04c450c9ff..f95ca0e158c9 100644
--- a/net-www/apache-ssl/apache-ssl-1.3.20.2.8.4.ebuild
+++ b/net-www/apache-ssl/apache-ssl-1.3.20.2.8.4.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/net-www/apache-ssl/apache-ssl-1.3.20.2.8.4.ebuild,v 1.4 2001/06/17 12:51:07 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache-ssl/apache-ssl-1.3.20.2.8.4.ebuild,v 1.5 2001/06/24 20:13:37 achim Exp $
 
 AV="1.3.20"
 MSV="2.8.4"
@@ -51,6 +51,7 @@ src_install() {
     sed -e "s:^PIDFILE.*:PIDFILE=/var/run/httpd.pid:" \
 	apachectl.orig > apachectl
     rm apachectl.orig
+    cd ${S}
     dodoc ABOUT_APACHE Announcement INSTALL* KEYS LICENSE* README* WARNING*
     docinto mod_ssl
     cd ../mod_ssl-${MSV}-${AV}