move gtk+ apps to /usr and use gtk+-1.2.10-r4, #2

8 files changed, 10 insertions, 180 deletions

diff --git a/media-gfx/gimp/files/digest-gimp-1.2.1 b/media-gfx/gimp/files/digest-gimp-1.2.1
deleted file mode 100644
index 204f69cb97fe..000000000000
--- a/media-gfx/gimp/files/digest-gimp-1.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0839d75836cf08210efe1d44a5613f5f gimp-1.2.1.tar.bz2
diff --git a/media-gfx/gimp/files/digest-gimp-1.2.1-r1 b/media-gfx/gimp/files/digest-gimp-1.2.1-r1
deleted file mode 100644
index 204f69cb97fe..000000000000
--- a/media-gfx/gimp/files/digest-gimp-1.2.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0839d75836cf08210efe1d44a5613f5f gimp-1.2.1.tar.bz2
diff --git a/media-gfx/gimp/files/digest-gimp-1.2.2 b/media-gfx/gimp/files/digest-gimp-1.2.2-r1
index e08e34b9fa6c..e08e34b9fa6c 100644
--- a/media-gfx/gimp/files/digest-gimp-1.2.2
+++ b/media-gfx/gimp/files/digest-gimp-1.2.2-r1
diff --git a/media-gfx/gimp/files/gimp-1.2.2-gentoo.diff b/media-gfx/gimp/files/gimp-1.2.2-gentoo.diff
deleted file mode 100644
index 2021e975f7ba..000000000000
--- a/media-gfx/gimp/files/gimp-1.2.2-gentoo.diff
+++ /dev/null
@@ -1,25 +0,0 @@
---- Makefile.am~	Mon Dec 18 16:14:07 2000
-+++ Makefile.am	Fri Jun 22 16:58:34 2001
-@@ -105,6 +105,7 @@
- 	polar \
- 	ps \
- 	psd \
-+	psd_save \
- 	$(PSP) \
- 	randomize \
- 	ripple \
-@@ -944,6 +945,14 @@
- 	psd.c
-
- psd_LDADD = \
-+	$(top_builddir)/libgimp/libgimp.la	\
-+	$(GLIB_LIBS)				\
-+	$(INTLLIBS)
-+
-+psd_save_SOURCES = \
-+	psd_save.c
-+
-+psd_save_LDADD = \
- 	$(top_builddir)/libgimp/libgimp.la	\
- 	$(GLIB_LIBS)				\
- 	$(INTLLIBS)
diff --git a/media-gfx/gimp/files/gimp-1.2.1-r1-gentoo.diff b/media-gfx/gimp/files/gimp-1.2.2-r1-gentoo.diff
index 2021e975f7ba..2021e975f7ba 100644
--- a/media-gfx/gimp/files/gimp-1.2.1-r1-gentoo.diff
+++ b/media-gfx/gimp/files/gimp-1.2.2-r1-gentoo.diff
diff --git a/media-gfx/gimp/gimp-1.2.1-r1.ebuild b/media-gfx/gimp/gimp-1.2.1-r1.ebuild
deleted file mode 100644
index 2bac8b315e02..000000000000
--- a/media-gfx/gimp/gimp-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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-gfx/gimp/gimp-1.2.1-r1.ebuild,v 1.4 2001/06/23 02:25:35 achim Exp $
-
-A=${P}.tar.bz2
-S=${WORKDIR}/${P}
-DESCRIPTION="GIMP"
-SRC_URI="ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/gimp/v1.2/v${PV}/"${A}
-HOMEPAGE="http://www.gimp.org"
-
-DEPEND="nls? ( sys-devel/gettext )
-        sys-devel/autoconf sys-devel/automake
-	>=x11-libs/gtk+-1.2.8
-	>=media-libs/mpeg-lib-1.3.1
-	aalib? ( >=media-libs/aalib-1.2 )
-	perl? ( >=dev-perl/PDL-2.2.1
-        	>=dev-perl/Parse-RecDescent-1.80 )
-	gnome? ( >=gnome-base/gnome-libs-1.2.4 )"
-
-RDEPEND=">=x11-libs/gtk+-1.2.8
-	 aalib? ( >=media-libs/aalib-1.2 )
-         perl? ( >=dev-perl/PDL-2.2.1
-	         >=dev-perl/Parse-RecDescent-1.80 )
-	 gnome? ( >=gnome-base/gnome-libs-1.2.4 )"
-
-src_unpack() {
-  unpack ${A}
-  cd ${S}/plug-ins/common
-  cp ${FILESDIR}/psd_save.c .
-  patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
-  cd ${S}
-  automake
-  autoconf
-}
-
-src_compile() {                           
-  local myconf
-  local mymake
-  if [ -z "`use nls`" ] ; then
-    myconf="--disable-nls"
-  fi
-
-  if [ -z "`use perl`" ] ; then
-    myconf="$myconf --disable-perl"
-  fi
-
-  if [ -z "`use aalib`" ] ; then
-    mymake="LIBAA= AA="
-  fi
-
-  if [ -z "`use gnome`" ] ; then
-    mymake="$mymake HELPBROWSER="
-  fi
-
-  try ./configure --host=${CHOST} --prefix=/usr/X11R6 --sysconfdir=/etc --with-mp ${myconf}
-
-  try make $mymake  # Doesn't work with -j 4 (hallski)
-}
-
-src_install() {
-  local mymake                               
-  if [ -z "`use aalib`" ] ; then
-    mymake="LIBAA= AA="
-  fi
-
-  if [ -z "`use gnome`" ] ; then
-    mymake="$mymake HELPBROWSER="
-  fi
-  dodir /usr/X11R6/lib/gimp/1.2/plug-ins
-  try make prefix=${D}/usr/X11R6 gimpsysconfdir=${D}/etc/gimp/1.2 \
-	mandir=${D}/usr/X11R6/man PREFIX=${D}/usr $mymake install
-  preplib /usr/X11R6
-  dodoc AUTHORS COPYING ChangeLog* *MAINTAINERS README* TODO
-  dodoc docs/*.txt docs/*.ps docs/Wilber* docs/quick_reference.tar.gz
-  docinto html/libgimp
-  dodoc devel-docs/libgimp/html/*.html
-  docinto devel
-  dodoc devel-docs/*.txt
-}
-
-
-
-
-
diff --git a/media-gfx/gimp/gimp-1.2.1.ebuild b/media-gfx/gimp/gimp-1.2.1.ebuild
deleted file mode 100644
index 88f91d5f85be..000000000000
--- a/media-gfx/gimp/gimp-1.2.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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-gfx/gimp/gimp-1.2.1.ebuild,v 1.5 2001/06/11 10:29:06 hallski Exp $
-
-A=${P}.tar.bz2
-S=${WORKDIR}/${P}
-DESCRIPTION="GIMP"
-SRC_URI="ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/gimp/v1.2/v${PV}/"${A}
-HOMEPAGE="http://www.gimp.org"
-
-DEPEND="nls? ( sys-devel/gettext )
-	>=sys-libs/slang-1.4.2
-	>=gnome-base/gnome-libs-1.2.4
-	>=media-libs/mpeg-lib-1.3.1
-	aalib? ( >=media-libs/aalib-1.2 )
-	perl? ( >=dev-perl/PDL-2.2.1
-	>=dev-perl/Parse-RecDescent-1.80 )"
-
-RDEPEND=">=sys-libs/slang-1.4.2
-	 >=gnome-base/gnome-libs-1.2.4
-	 aalib? ( >=media-libs/aalib-1.2i )
-         perl? ( >=dev-perl/PDL-2.2.1
-	>=dev-perl/Parse-RecDescent-1.80 )"
-
-
-src_compile() {                           
-  local myconf
-  if [ -z "`use nls`" ]
-  then
-    myconf="--disable-nls"
-  fi
-  if [ -z "`use perl`" ]
-  then
-    myconf="--disable-perl"
-  fi
-  try ./configure --host=${CHOST} --prefix=/usr/X11R6 --sysconfdir=/etc --with-mp ${myconf}
-  try make   # Doesn't work with -j 4 (hallski)
-}
-
-src_install() {                               
-
-  dodir /usr/X11R6/lib/gimp/1.2/plug-ins
-  try make prefix=${D}/usr/X11R6 gimpsysconfdir=${D}/etc/gimp/1.2 \
-	mandir=${D}/usr/X11R6/man PREFIX=${D}/usr install
-  preplib /usr/X11R6
-  dodoc AUTHORS COPYING ChangeLog* *MAINTAINERS README* TODO
-  dodoc docs/*.txt docs/*.ps docs/Wilber* docs/quick_reference.tar.gz
-  docinto html/libgimp
-  dodoc devel-docs/libgimp/html/*.html
-  docinto devel
-  dodoc devel-docs/*.txt
-}
-
-
-
-
-
diff --git a/media-gfx/gimp/gimp-1.2.2.ebuild b/media-gfx/gimp/gimp-1.2.2-r1.ebuild
index 08e63b8ddb77..41a5288c85b1 100644
--- a/media-gfx/gimp/gimp-1.2.2.ebuild
+++ b/media-gfx/gimp/gimp-1.2.2-r1.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-gfx/gimp/gimp-1.2.2.ebuild,v 1.1 2001/09/26 07:42:12 blocke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.2.2-r1.ebuild,v 1.1 2001/10/06 10:38:04 azarah Exp $
 
 A=${P}.tar.bz2
 S=${WORKDIR}/${P}
@@ -11,20 +11,20 @@ HOMEPAGE="http://www.gimp.org"
 
 DEPEND="nls? ( sys-devel/gettext )
         sys-devel/autoconf sys-devel/automake
-	>=x11-libs/gtk+-1.2.8
+	>=x11-libs/gtk+-1.2.10-r4
 	>=media-libs/mpeg-lib-1.3.1
 	aalib? ( >=media-libs/aalib-1.2 )
 	perl? ( >=dev-perl/PDL-2.2.1
         	>=dev-perl/Parse-RecDescent-1.80 
 		>=dev-perl/gtk-perl-0.7004 )
-	gnome? ( >=gnome-base/gnome-libs-1.2.4 )"
+	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )"
 
-RDEPEND=">=x11-libs/gtk+-1.2.8
+RDEPEND=">=x11-libs/gtk+-1.2.10-r4
 	 aalib? ( >=media-libs/aalib-1.2 )
          perl? ( >=dev-perl/PDL-2.2.1
 	         >=dev-perl/Parse-RecDescent-1.80 
 		 >=dev-perl/gtk-perl-0.7004 )
-	 gnome? ( >=gnome-base/gnome-libs-1.2.4 )"
+	 gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )"
 
 src_unpack() {
   unpack ${A}
@@ -58,7 +58,7 @@ src_compile() {
     mymake="$mymake HELPBROWSER="
   fi
 
-  try ./configure --host=${CHOST} --prefix=/usr/X11R6 --sysconfdir=/etc --with-mp ${myconf}
+  try ./configure --host=${CHOST} --prefix=/usr --sysconfdir=/etc --with-mp ${myconf}
 
   try make $mymake  # Doesn't work with -j 4 (hallski)
 }
@@ -72,10 +72,10 @@ src_install() {
   if [ -z "`use gnome`" ] ; then
     mymake="$mymake HELPBROWSER="
   fi
-  dodir /usr/X11R6/lib/gimp/1.2/plug-ins
-  try make prefix=${D}/usr/X11R6 gimpsysconfdir=${D}/etc/gimp/1.2 \
-	mandir=${D}/usr/X11R6/man PREFIX=${D}/usr $mymake install
-  preplib /usr/X11R6
+  dodir /usr/lib/gimp/1.2/plug-ins
+  try make prefix=${D}/usr gimpsysconfdir=${D}/etc/gimp/1.2 \
+	mandir=${D}/usr/share/man PREFIX=${D}/usr $mymake install
+  preplib /usr
   dodoc AUTHORS COPYING ChangeLog* *MAINTAINERS README* TODO
   dodoc docs/*.txt docs/*.ps docs/Wilber* docs/quick_reference.tar.gz
   docinto html/libgimp