partual gtk+ dep update / move to /usr

12 files changed, 27 insertions, 49 deletions

diff --git a/x11-libs/gtk-engines/files/digest-gtk-engines-0.12 b/x11-libs/gtk-engines/files/digest-gtk-engines-0.12
deleted file mode 100644
index 8326c972b3cd..000000000000
--- a/x11-libs/gtk-engines/files/digest-gtk-engines-0.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c867d1ebd6dbea355765d689a11330ec gtk-engines-0.12.tar.gz
diff --git a/x11-libs/gtk-engines/files/digest-gtk-engines-0.12-r1 b/x11-libs/gtk-engines/files/digest-gtk-engines-0.12-r2
index ba0ef27aeadf..ba0ef27aeadf 100644
--- a/x11-libs/gtk-engines/files/digest-gtk-engines-0.12-r1
+++ b/x11-libs/gtk-engines/files/digest-gtk-engines-0.12-r2
diff --git a/x11-libs/gtk-engines/gtk-engines-0.12-r1.ebuild b/x11-libs/gtk-engines/gtk-engines-0.12-r2.ebuild
index 9b48393ff16f..99a5ed5f7810 100644
--- a/x11-libs/gtk-engines/gtk-engines-0.12-r1.ebuild
+++ b/x11-libs/gtk-engines/gtk-engines-0.12-r2.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-libs/gtk-engines/gtk-engines-0.12-r1.ebuild,v 1.1 2001/07/09 01:26:28 lamer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk-engines/gtk-engines-0.12-r2.ebuild,v 1.1 2001/10/06 10:08:19 azarah Exp $
 
 A="${P}.tar.gz Xenophilia-1.2.x.tar.gz"
 S=${WORKDIR}/${P}
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz http://d
 HOMEPAGE="http://www.gnome.org/"
 
 DEPEND="virtual/glibc virtual/x11
-	>=media-libs/imlib-1.9.8.1"
+	>=media-libs/imlib-1.9.10-r1"
 
 src_unpack() {
 	unpack ${P}.tar.gz
@@ -19,19 +19,19 @@ src_unpack() {
 }
 
 src_compile() {                           
-  try ./configure --host=${CHOST} --prefix=/usr/X11R6
+  try ./configure --host=${CHOST} --prefix=/usr
   try make
 
 	cd ${S}/Xenophilia-0.7
-	try make PREFIX=/usr/X11R6 FONTDIR=/usr/X11R6/lib/X11/fonts/misc
+	try make PREFIX=/usr FONTDIR=/usr/X11R6/lib/X11/fonts/misc
 
 }
 
 src_install() {                               
-  try make prefix=${D}/usr/X11R6 install
+  try make prefix=${D}/usr install
   dodoc AUTHORS COPYING* ChangeLog README NEWS
   cd Xenophilia-0.7
-	try make PREFIX=${D}/usr/X11R6 FONTDIR=/usr/X11R6/lib/X11/fonts/misc install
+	try make PREFIX=${D}/usr FONTDIR=/usr/X11R6/lib/X11/fonts/misc install
   dodoc AUTHORS  CONFIGURATION TODO COPYING* ChangeLog README 
 }
 
diff --git a/x11-libs/gtk-engines/gtk-engines-0.12.ebuild b/x11-libs/gtk-engines/gtk-engines-0.12.ebuild
deleted file mode 100644
index 940be9d29d4a..000000000000
--- a/x11-libs/gtk-engines/gtk-engines-0.12.ebuild
+++ /dev/null
@@ -1,27 +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/x11-libs/gtk-engines/gtk-engines-0.12.ebuild,v 1.2 2001/06/04 00:16:12 achim Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="gtk-engines"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A}"
-HOMEPAGE="http://www.gnome.org/"
-
-DEPEND="virtual/glibc virtual/x11
-	>=media-libs/imlib-1.9.8.1"
-
-src_compile() {                           
-  try ./configure --host=${CHOST} --prefix=/usr/X11R6
-  try make
-}
-
-src_install() {                               
-  try make prefix=${D}/usr/X11R6 install
-  dodoc AUTHORS COPYING* ChangeLog README NEWS
-}
-
-
-
-
diff --git a/x11-libs/gtk-thinice-theme/files/digest-gtk-thinice-theme-1.0.4 b/x11-libs/gtk-thinice-theme/files/digest-gtk-thinice-theme-1.0.4-r1
index c002591a6695..c002591a6695 100644
--- a/x11-libs/gtk-thinice-theme/files/digest-gtk-thinice-theme-1.0.4
+++ b/x11-libs/gtk-thinice-theme/files/digest-gtk-thinice-theme-1.0.4-r1
diff --git a/x11-libs/gtk-thinice-theme/gtk-thinice-theme-1.0.4.ebuild b/x11-libs/gtk-thinice-theme/gtk-thinice-theme-1.0.4-r1.ebuild
index db3925c993c7..3822cca920f9 100644
--- a/x11-libs/gtk-thinice-theme/gtk-thinice-theme-1.0.4.ebuild
+++ b/x11-libs/gtk-thinice-theme/gtk-thinice-theme-1.0.4-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Your Name <your email>
 # /home/cvsroot/gentoo-x86/skel.build,v 1.2 2001/02/15 18:17:31 achim Exp
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk-thinice-theme/gtk-thinice-theme-1.0.4.ebuild,v 1.3 2001/08/31 03:23:39 pm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk-thinice-theme/gtk-thinice-theme-1.0.4-r1.ebuild,v 1.1 2001/10/06 10:08:19 azarah Exp $
 
 
 S=${WORKDIR}/${P}
@@ -10,13 +10,13 @@ DESCRIPTION="Gtk engine, thinice"
 SRC_URI="http://thinice.sourceforge.net/${P}.tar.gz"
 HOMEPAGE="http://thinice.sourceforge.net"
 
-DEPEND=">=x11-libs/gtk+-1.2.10"
+DEPEND=">=x11-libs/gtk+-1.2.10-r4"
 
 src_compile() {
-    try ./configure --prefix=/usr/X11R6 --host=${CHOST}
+    try ./configure --prefix=/usr --host=${CHOST}
     try pmake
 }
 
 src_install () {
-    try make prefix=${D}/usr/X11R6 install
+    try make prefix=${D}/usr install
 }
diff --git a/x11-libs/gtkDPS/files/digest-gtkDPS-0.3.3 b/x11-libs/gtkDPS/files/digest-gtkDPS-0.3.3-r1
index f8b5d71485e1..f8b5d71485e1 100644
--- a/x11-libs/gtkDPS/files/digest-gtkDPS-0.3.3
+++ b/x11-libs/gtkDPS/files/digest-gtkDPS-0.3.3-r1
diff --git a/x11-libs/gtkDPS/gtkDPS-0.3.3.ebuild b/x11-libs/gtkDPS/gtkDPS-0.3.3-r1.ebuild
index 413b73d94ae4..5978d833bc4b 100644
--- a/x11-libs/gtkDPS/gtkDPS-0.3.3.ebuild
+++ b/x11-libs/gtkDPS/gtkDPS-0.3.3-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/x11-libs/gtkDPS/gtkDPS-0.3.3.ebuild,v 1.4 2001/06/04 03:33:03 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkDPS/gtkDPS-0.3.3-r1.ebuild,v 1.1 2001/10/06 10:08:19 azarah Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -10,7 +10,7 @@ SRC_URI="http://www.aist-nara.ac.jp/~masata-y/gtkDPS/dist/${A}"
 HOMEPAGE="http://www.aist-nara.ac.jp/~masata-y/gtkDPS/"
 
 DEPEND="virtual/glibc nls? ( sys-devel/gettext )
-	>=x11-libs/gtk+-1.2.8
+	>=x11-libs/gtk+-1.2.10-r4
 	>=app-text/dgs-0.5.9.1"
 RDEPEND="virtual/glibc"
 
@@ -19,7 +19,7 @@ src_compile() {
       myconf="--disable-nls"
     fi
 
-    try ./configure --prefix=/usr/X11R6 --host=${CHOST} \
+    try ./configure --prefix=/usr --host=${CHOST} \
 	--with-x --with-dps $myconf
     try make
 
@@ -27,7 +27,7 @@ src_compile() {
 
 src_install () {
 
-    try make prefix=${D}/usr/X11R6 install
+    try make prefix=${D}/usr install
     dodoc COPYING* ChangeLog GTKDPS-VERSION HACKING NEWS README TODO
 }
 
diff --git a/x11-libs/gtkglarea/files/digest-gtkglarea-1.2.2 b/x11-libs/gtkglarea/files/digest-gtkglarea-1.2.2-r1
index aa94bfa1fa31..aa94bfa1fa31 100644
--- a/x11-libs/gtkglarea/files/digest-gtkglarea-1.2.2
+++ b/x11-libs/gtkglarea/files/digest-gtkglarea-1.2.2-r1
diff --git a/x11-libs/gtkglarea/gtkglarea-1.2.2.ebuild b/x11-libs/gtkglarea/gtkglarea-1.2.2-r1.ebuild
index 5c92c84d0b54..1be080736236 100644
--- a/x11-libs/gtkglarea/gtkglarea-1.2.2.ebuild
+++ b/x11-libs/gtkglarea/gtkglarea-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 Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkglarea/gtkglarea-1.2.2.ebuild,v 1.1 2001/06/04 00:16:12 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkglarea/gtkglarea-1.2.2-r1.ebuild,v 1.1 2001/10/06 10:08:20 azarah Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -9,11 +9,15 @@ DESCRIPTION="GL Extentions for gtk+"
 SRC_URI="http://www.student.oulu.fi/~jlof/gtkglarea/download/${A}"
 HOMEPAGE="http://www.student.oulu.fi/~jlof/gtkglarea/"
 
-DEPEND="virtual/glibc >=x11-libs/gtk+-1.2.10 virtual/glu virtual/opengl"
+DEPEND="virtual/glibc
+	>=x11-libs/gtk+-1.2.10-r4
+	virtual/glu
+	virtual/opengl"
+
 
 src_compile() {
 
-    try ./configure --prefix=/usr/X11R6 --host=${CHOST}
+    try ./configure --prefix=/usr --host=${CHOST}
     try make
 
 }
diff --git a/x11-libs/gtkmm/files/digest-gtkmm-1.2.5 b/x11-libs/gtkmm/files/digest-gtkmm-1.2.5-r1
index b9178a5a799a..b9178a5a799a 100644
--- a/x11-libs/gtkmm/files/digest-gtkmm-1.2.5
+++ b/x11-libs/gtkmm/files/digest-gtkmm-1.2.5-r1
diff --git a/x11-libs/gtkmm/gtkmm-1.2.5.ebuild b/x11-libs/gtkmm/gtkmm-1.2.5-r1.ebuild
index dd66769de048..3db14050ded8 100644
--- a/x11-libs/gtkmm/gtkmm-1.2.5.ebuild
+++ b/x11-libs/gtkmm/gtkmm-1.2.5-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/x11-libs/gtkmm/gtkmm-1.2.5.ebuild,v 1.1 2001/06/14 16:24:40 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkmm/gtkmm-1.2.5-r1.ebuild,v 1.1 2001/10/06 10:08:20 azarah Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -11,7 +11,9 @@ SRC_URI="http://download.sourceforge.net/gtkmm/${A}"
 #	 http://ftp.gnome.org/pub/GNOME/stable/sources/gtk+/${A}"
 HOMEPAGE="http://gtkmm.sourceforge.net/"
 
-DEPEND="virtual/glibc >=x11-libs/gtk+-1.2.10 >=dev-libs/libsigc++-1.0.0"
+DEPEND="virtual/glibc
+	>=x11-libs/gtk+-1.2.10-r4
+	>=dev-libs/libsigc++-1.0.0"
 
 src_compile() {
 	local myconf
@@ -23,8 +25,8 @@ src_compile() {
 		myconf="--enable-debug=no"
 	fi
 	
-  	try ./configure --host=${CHOST} --prefix=/usr/X11R6 ${myconf} \
-	--infodir=/usr/X11R6/info --mandir=/usr/X11R6/man --sysconfdir=/etc/X11 \
+  	try ./configure --host=${CHOST} --prefix=/usr ${myconf} \
+	--infodir=/usr/share/info --mandir=/usr/share/man --sysconfdir=/etc/X11 \
 	--with-xinput=xfree --with-x
 	try make
 }