lots of fixups. installs in /usr now. fixed up the gdk-pixbuf depend. clean out some old ebuilds

13 files changed, 53 insertions, 374 deletions

diff --git a/net-irc/xchat/files/digest-xchat-1.6.4 b/net-irc/xchat/files/digest-xchat-1.6.4
deleted file mode 100644
index 6d1083a57ca1..000000000000
--- a/net-irc/xchat/files/digest-xchat-1.6.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 995c02b43454ba76bb641792503c669a xchat-1.6.4.tar.bz2
diff --git a/net-irc/xchat/files/digest-xchat-1.7.6 b/net-irc/xchat/files/digest-xchat-1.7.6
deleted file mode 100644
index 887188c29dde..000000000000
--- a/net-irc/xchat/files/digest-xchat-1.7.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 57f5f5547ac944c1a1f6640663bf3985 xchat-1.7.6.tar.bz2
diff --git a/net-irc/xchat/files/digest-xchat-1.7.7 b/net-irc/xchat/files/digest-xchat-1.7.7
deleted file mode 100644
index af4337b0e3d1..000000000000
--- a/net-irc/xchat/files/digest-xchat-1.7.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e2c9a83176361130036c42ea0f161708 xchat-1.7.7.tar.bz2
diff --git a/net-irc/xchat/files/digest-xchat-1.8.0 b/net-irc/xchat/files/digest-xchat-1.8.0
deleted file mode 100644
index a331f8e1ad0a..000000000000
--- a/net-irc/xchat/files/digest-xchat-1.8.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2d040e1b156b8fed91e7ac3cf83f309a xchat-1.8.0.tar.bz2
diff --git a/net-irc/xchat/files/digest-xchat-1.8.0-r1 b/net-irc/xchat/files/digest-xchat-1.8.0-r1
deleted file mode 100644
index a331f8e1ad0a..000000000000
--- a/net-irc/xchat/files/digest-xchat-1.8.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2d040e1b156b8fed91e7ac3cf83f309a xchat-1.8.0.tar.bz2
diff --git a/net-irc/xchat/files/digest-xchat-1.8.1 b/net-irc/xchat/files/digest-xchat-1.8.1
deleted file mode 100644
index 9cee321c79a8..000000000000
--- a/net-irc/xchat/files/digest-xchat-1.8.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ea1dc6c61f76adad6f72eab94ee83d64 xchat-1.8.1.tar.bz2
diff --git a/net-irc/xchat/files/digest-xchat-1.8.2-r1 b/net-irc/xchat/files/digest-xchat-1.8.2-r1
new file mode 100644
index 000000000000..89fb2e1d1d53
--- /dev/null
+++ b/net-irc/xchat/files/digest-xchat-1.8.2-r1
@@ -0,0 +1 @@
+MD5 51987e6e79d0e902e1928918fdd7b353 xchat-1.8.2.tar.bz2
diff --git a/net-irc/xchat/xchat-1.6.4.ebuild b/net-irc/xchat/xchat-1.6.4.ebuild
deleted file mode 100644
index 9df183ac89d2..000000000000
--- a/net-irc/xchat/xchat-1.6.4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyrigth 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-irc/xchat/xchat-1.6.4.ebuild,v 1.4 2001/07/29 10:53:03 hallski Exp $
-
-A=${P}.tar.bz2
-S=${WORKDIR}/${P}
-DESCRIPTION="xchat"
-SRC_URI="http://www.xchat.org/files/source/1.6/"${A}
-HOMEPAGE="http://www.xchat.org/"
-
-DEPEND=">=media-libs/gdk-pixbuf-0.11.0 
-        perl? ( sys-devel/perl )
-	nls? ( >=sys-devel/gettext-0.10.38 )
-	gnome? ( >=gnome-base/gnome-core-1.2.2.1 )
-        ssl? ( >=dev-libs/openssl-0.9.6a )"
-
-RDEPEND=">=media-libs/gdk-pixbuf-0.11.0
-	gnome? ( >=gnome-base/gnome-core-1.2.2.1 ) 
-        ssl? ( >=dev-libs/openssl-0.9.6a )"
-
-src_unpack() {
-  unpack ${A}
-  cd ${S}/po
-  cp zh_TW.Big5.po zh_TW.Big5.po.orig
-  sed -e 's:\\\\:\\:' zh_TW.Big5.po.orig > zh_TW.Big5.po
-}
-
-src_compile() {
-
-  local myopts
-
-  if [ "`use gnome`" ]
-  then
-	myopts="--enable-gnome --enable-panel --prefix=/opt/gnome"
-  else
-	myopts="--enable-gtkfe --disable-gnome --prefix=/usr/X11R6"
-  fi
-  if [ "`use ssl`" ] ; then
-        myopts="$myopts --enable-openssl"
-  fi 
-  if [ -z "`use perl`" ] ; then
-        myopts="$myopts --disable-perl"
-  fi 
-  if [ -z "`use nls`" ] ; then
-        myopts="$myopts --disable-nls"
-  fi
-  try ./configure --host=${CHOST} --disable-python ${myopts}
-  try pmake
-}
-
-src_install() {
-  cd ${S}
-  if [ -n "`use gnome`" ]
-  then
-  	try make prefix=${D}/opt/gnome install
-  else
-  	try make prefix=${D}/usr/X11R6 install
-  fi
-  dodoc AUTHORS COPYING ChangeLog README
-}
-
-
-
-
-
-
diff --git a/net-irc/xchat/xchat-1.7.7.ebuild b/net-irc/xchat/xchat-1.7.7.ebuild
deleted file mode 100644
index 9a1454f2f786..000000000000
--- a/net-irc/xchat/xchat-1.7.7.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyrigth 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-irc/xchat/xchat-1.7.7.ebuild,v 1.4 2001/07/29 10:53:03 hallski Exp $
-
-A=${P}.tar.bz2
-S=${WORKDIR}/${P}
-DESCRIPTION="xchat"
-SRC_URI="http://www.xchat.org/files/source/1.7/"${A}
-HOMEPAGE="http://www.xchat.org/"
-
-DEPEND=">=media-libs/gdk-pixbuf-0.11.0 
-        perl? ( sys-devel/perl )
-	nls? ( >=sys-devel/gettext-0.10.38 )
-	gnome? ( >=gnome-base/gnome-core-1.2.2.1 )
-        ssl? ( >=dev-libs/openssl-0.9.6a )"
-
-RDEPEND=">=media-libs/gdk-pixbuf-0.11.0
-	gnome? ( >=gnome-base/gnome-core-1.2.2.1 ) 
-        ssl? ( >=dev-libs/openssl-0.9.6a )"
-
-src_unpack() {
-  unpack ${A}
-  cd ${S}/po
-  cp zh_TW.Big5.po zh_TW.Big5.po.orig
-  sed -e 's:\\\\:\\:' zh_TW.Big5.po.orig > zh_TW.Big5.po
-}
-
-src_compile() {
-
-  local myopts
-
-  if [ "`use gnome`" ]
-  then
-	myopts="--enable-gnome --enable-panel --prefix=/opt/gnome"
-  else
-	myopts="--enable-gtkfe --disable-gnome --prefix=/usr/X11R6"
-  fi
-  if [ "`use ssl`" ] ; then
-        myopts="$myopts --enable-openssl"
-  fi 
-  if [ -z "`use perl`" ] ; then
-        myopts="$myopts --disable-perl"
-  fi 
-  if [ -z "`use nls`" ] ; then
-        myopts="$myopts --disable-nls"
-  fi
-  try ./configure --host=${CHOST} --disable-python ${myopts}
-  try pmake
-}
-
-src_install() {
-  cd ${S}
-  if [ -n "`use gnome`" ]
-  then
-  	try make prefix=${D}/opt/gnome install
-  else
-  	try make prefix=${D}/usr/X11R6 install
-  fi
-  dodoc AUTHORS COPYING ChangeLog README
-}
-
-
-
-
-
-
diff --git a/net-irc/xchat/xchat-1.8.0-r1.ebuild b/net-irc/xchat/xchat-1.8.0-r1.ebuild
deleted file mode 100644
index 8a9546af6904..000000000000
--- a/net-irc/xchat/xchat-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyrigth 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-irc/xchat/xchat-1.8.0-r1.ebuild,v 1.2 2001/07/29 10:53:03 hallski Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="xchat"
-SRC_URI="http://www.xchat.org/files/source/${PV}/${P}.tar.bz2"
-HOMEPAGE="http://www.xchat.org/"
-
-DEPEND=">=media-libs/gdk-pixbuf-0.11.0
-        perl? ( sys-devel/perl )
-        python? ( >=dev-lang/python-2.0-r4 )
-        nls? ( >=sys-devel/gettext-0.10.38 )
-        gnome? ( >=gnome-base/gnome-core-1.2.2.1 )
-        ssl? ( >=dev-libs/openssl-0.9.6a )"
-
-RDEPEND=">=media-libs/gdk-pixbuf-0.11
-         gnome? ( >=gnome-base/gnome-core-1.2.2.1 )
-         ssl? ( >=dev-libs/openssl-0.9.6a )"
-
-src_compile() {
-
-  local myopts
-  local myflags
-
-  if [ "`use gnome`" ]
-  then
-	myopts="--enable-gnome --enable-panel --prefix=/opt/gnome"
-  else
-	myopts="--enable-gtkfe --disable-gnome --prefix=/usr/X11R6 --disable-gdk-pixbuf"
-  fi
-  if [ "`use ssl`" ] ; then
-        myopts="$myopts --enable-openssl"
-  fi 
-  if [ -z "`use perl`" ] ; then
-        myopts="$myopts --disable-perl"
-  fi
-  if [ "`use python`" ] ; then
-    myflags="`python-config --libs`"
-  else
-	myopts="$myopts --disable-python"
-  fi 
-  if [ -z "`use nls`" ] ; then
-        myopts="$myopts --disable-nls"
-  fi
-  try ./configure --host=${CHOST} ${myopts} --enable-ipv6
-  if [ "$myflags" ] ; then
-    for i in src/fe-gtk src/fe-text
-    do
-      if [ -e $i/Makefile ] ; then
-        cp  $i/Makefile $i/Makefile.orig
-        sed -e "s:-lpython2.0:$myflags:" \
-	  $i/Makefile.orig > $i/Makefile
-      fi
-    done
-  fi
-  try pmake
-}
-
-src_install() {
-  cd ${S}
-  if [ -n "`use gnome`" ]
-  then
-  	try make prefix=${D}/opt/gnome install
-  else
-  	try make prefix=${D}/usr/X11R6 install
-  fi
-  dodoc AUTHORS COPYING ChangeLog README
-}
-
-
-
-
-
-
diff --git a/net-irc/xchat/xchat-1.8.0.ebuild b/net-irc/xchat/xchat-1.8.0.ebuild
deleted file mode 100644
index 3eed1c32fc08..000000000000
--- a/net-irc/xchat/xchat-1.8.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyrigth 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-irc/xchat/xchat-1.8.0.ebuild,v 1.4 2001/07/29 10:53:03 hallski Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="xchat"
-SRC_URI="http://www.xchat.org/files/source/${PV}/${P}.tar.bz2"
-HOMEPAGE="http://www.xchat.org/"
-
-DEPEND=">=media-libs/gdk-pixbuf-0.11
-        perl? ( sys-devel/perl )
-        python? ( dev-lang/python )
-        nls? ( >=sys-devel/gettext-0.10.38 )
-        gnome? ( >=gnome-base/gnome-core-1.2.2.1 )
-        ssl? ( >=dev-libs/openssl-0.9.6a )"
-
-RDEPEND=">=media-libs/gdk-pixbuf-0.11
-         gnome? ( >=gnome-base/gnome-core-1.2.2.1 )
-         ssl? ( >=dev-libs/openssl-0.9.6a )"
-
-src_compile() {
-
-  local myopts
-  local myflags
-
-  if [ "`use gnome`" ]
-  then
-	myopts="--enable-gnome --enable-panel --prefix=/opt/gnome"
-  else
-	myopts="--enable-gtkfe --disable-gnome --prefix=/usr/X11R6 --disable-gdk-pixbuf"
-  fi
-  if [ "`use ssl`" ] ; then
-        myopts="$myopts --enable-openssl"
-  fi 
-  if [ -z "`use perl`" ] ; then
-        myopts="$myopts --disable-perl"
-  fi
-  if [ "`use python`" ] ; then
-    myflags="-lz"
-    if [ "`use berkdb`" ] ; then
-	myflags="$myflags -ldb-3.2 -lndbm"
-    fi
-    if [ "`use readline`" ] ; then
-	myflags="$myflags -lreadline -lncurses -lcrypt"
-    fi
-  else
-	myopts="$myopts --disable-python"
-  fi 
-  if [ -z "`use nls`" ] ; then
-        myopts="$myopts --disable-nls"
-  fi
-  try ./configure --host=${CHOST} ${myopts} --enable-ipv6
-  if [ "$myflags" ] ; then
-    for i in src/fe-gtk src/fe-text
-    do
-      if [ -e $i/Makefile ] ; then
-        cp  $i/Makefile $i/Makefile.orig
-        sed -e "s:-lpython2.0:-lpython2.0 $myflags:" \
-	  $i/Makefile.orig > $i/Makefile
-      fi
-    done
-  fi
-  try pmake
-}
-
-src_install() {
-  cd ${S}
-  if [ -n "`use gnome`" ]
-  then
-  	try make prefix=${D}/opt/gnome install
-  else
-  	try make prefix=${D}/usr/X11R6 install
-  fi
-  dodoc AUTHORS COPYING ChangeLog README
-}
-
-
-
-
-
-
diff --git a/net-irc/xchat/xchat-1.8.1.ebuild b/net-irc/xchat/xchat-1.8.1.ebuild
deleted file mode 100644
index 203d643adea2..000000000000
--- a/net-irc/xchat/xchat-1.8.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyrigth 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-irc/xchat/xchat-1.8.1.ebuild,v 1.2 2001/07/29 10:53:03 hallski Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="xchat"
-SRC_URI="http://www.xchat.org/files/source/1.8/${P}.tar.bz2"
-HOMEPAGE="http://www.xchat.org/"
-
-DEPEND=">=media-libs/gdk-pixbuf-0.11
-        perl? ( sys-devel/perl )
-        python? ( >=dev-lang/python-2.0-r4 )
-        nls? ( >=sys-devel/gettext-0.10.38 )
-        gnome? ( >=gnome-base/gnome-core-1.2.2.1 )
-        ssl? ( >=dev-libs/openssl-0.9.6a )"
-
-RDEPEND=">=media-libs/gdk-pixbuf-0.11
-         gnome? ( >=gnome-base/gnome-core-1.2.2.1 )
-         ssl? ( >=dev-libs/openssl-0.9.6a )"
-
-src_compile() {
-
-  local myopts
-  local myflags
-
-  if [ "`use gnome`" ]
-  then
-	myopts="--enable-gnome --enable-panel --prefix=/opt/gnome"
-  else
-	myopts="--enable-gtkfe --disable-gnome --prefix=/usr/X11R6 --disable-gdk-pixbuf"
-  fi
-  if [ "`use ssl`" ] ; then
-        myopts="$myopts --enable-openssl"
-  fi 
-  if [ -z "`use perl`" ] ; then
-        myopts="$myopts --disable-perl"
-  fi
-  if [ "`use python`" ] ; then
-    myflags="`python-config --libs`"
-  else
-	myopts="$myopts --disable-python"
-  fi 
-  if [ -z "`use nls`" ] ; then
-        myopts="$myopts --disable-nls"
-  fi
-  try ./configure --host=${CHOST} ${myopts} --enable-ipv6
-  if [ "$myflags" ] ; then
-    for i in src/fe-gtk src/fe-text
-    do
-      if [ -e $i/Makefile ] ; then
-        cp  $i/Makefile $i/Makefile.orig
-        sed -e "s:-lpython2.0:$myflags:" \
-	  $i/Makefile.orig > $i/Makefile
-      fi
-    done
-  fi
-  try pmake
-}
-
-src_install() {
-  cd ${S}
-  if [ -n "`use gnome`" ]
-  then
-  	try make prefix=${D}/opt/gnome install
-  else
-  	try make prefix=${D}/usr/X11R6 install
-  fi
-  dodoc AUTHORS COPYING ChangeLog README
-}
-
-
-
-
-
-
diff --git a/net-irc/xchat/xchat-1.8.2-r1.ebuild b/net-irc/xchat/xchat-1.8.2-r1.ebuild
new file mode 100644
index 000000000000..19bba27ffa4a
--- /dev/null
+++ b/net-irc/xchat/xchat-1.8.2-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyrigth 1999-2000 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Achim Gottinger <achim@gentoo.org>, Donny Davies <woodchip@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-1.8.2-r1.ebuild,v 1.1 2001/09/24 22:41:01 woodchip Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="xchat irc client"
+SRC_URI="http://www.xchat.org/files/source/1.8/${P}.tar.bz2"
+HOMEPAGE="http://www.xchat.org/"
+
+DEPEND=">=x11-libs/gtk+-1.2.8
+        perl? ( sys-devel/perl )
+        python? ( >=dev-lang/python-2.0-r4 )
+        nls? ( >=sys-devel/gettext-0.10.38 )
+        gnome? ( >=gnome-base/gnome-core-1.2.2.1 >=media-libs/gdk-pixbuf-0.11 )
+        ssl? ( >=dev-libs/openssl-0.9.6a )"
+
+RDEPEND=">=x11-libs/gtk+-1.2.8
+         gnome? ( >=gnome-base/gnome-core-1.2.2.1 >=media-libs/gdk-pixbuf-0.11 )
+         ssl? ( >=dev-libs/openssl-0.9.6a )"
+
+src_compile() {
+  local myopts myflags
+
+  use gnome  && myopts="--enable-gnome --enable-panel"
+  use gnome  || myopts="--enable-gtkfe --disable-gnome --disable-gdk-pixbuf --disable-zvt"
+  use ssl    && myopts="$myopts --enable-openssl"
+  use perl   && myopts="$myopts --disable-perl"
+  use python && myflags="`python-config --libs`"
+  use python || myopts="$myopts --disable-python"
+  use nls    || myopts="$myopts --disable-nls"
+
+  ./configure --prefix=/usr --host=${CHOST} ${myopts} --enable-ipv6 || die
+
+  if [ "$myflags" ] ; then
+    for i in src/fe-gtk src/fe-text
+    do
+      if [ -e $i/Makefile ] ; then
+        cp  $i/Makefile $i/Makefile.orig
+        sed -e "s:-lpython2.0:$myflags:" \
+	  $i/Makefile.orig > $i/Makefile
+      fi
+    done
+  fi
+
+  emake || die
+}
+
+src_install() {
+  make prefix=${D}/usr install || die
+  dodoc AUTHORS COPYING ChangeLog README
+}