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

10 files changed, 23 insertions, 63 deletions

diff --git a/app-misc/gfontview/files/digest-gfontview-0.5.0 b/app-misc/gfontview/files/digest-gfontview-0.5.0-r1
index 0c59cfe7d33b..0c59cfe7d33b 100644
--- a/app-misc/gfontview/files/digest-gfontview-0.5.0
+++ b/app-misc/gfontview/files/digest-gfontview-0.5.0-r1
diff --git a/app-misc/gfontview/gfontview-0.5.0.ebuild b/app-misc/gfontview/gfontview-0.5.0-r1.ebuild
index 9eb303b16e9b..c1398d85e885 100644
--- a/app-misc/gfontview/gfontview-0.5.0.ebuild
+++ b/app-misc/gfontview/gfontview-0.5.0-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/app-misc/gfontview/gfontview-0.5.0.ebuild,v 1.3 2001/06/04 03:33:03 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gfontview/gfontview-0.5.0-r1.ebuild,v 1.1 2001/10/06 12:36:36 azarah Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -10,13 +10,13 @@ SRC_URI="http://download.sourceforge.net/gfontview/"${A}
 HOMEPAGE="http://gfontview.sourceforge.net"
 
 DEPEND="virtual/glibc
-    >=sys-devel/gcc-2.95
+	>=sys-devel/gcc-2.95
 	=media-libs/freetype-1.3.1-r2
 	>=media-libs/t1lib-1.0.1
-	>=x11-libs/gtk+-1.2.8
+	>=x11-libs/gtk+-1.2.10-r4
 	virtual/lpr
-    nls? ( sys-devel/gettext )
-    gnome? ( gnome-base/gnome-libs )"
+	nls? ( sys-devel/gettext )
+	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )"
 
 
 src_compile() {
@@ -26,12 +26,12 @@ src_compile() {
   then
     myconf="--disable-nls"
   fi
-  try ./configure --host=${CHOST} --prefix=/usr/X11R6 $myconf
+  try ./configure --host=${CHOST} --prefix=/usr $myconf
   try make
 }
 
 src_install() {
-  try make prefix=${D}/usr/X11R6 install
+  try make prefix=${D}/usr install
   dodoc AUTHORS COPYING ChangeLog NEWS README TODO
   insinto /usr/X11R6/include/X11/pixmaps/
   doins error.xpm openhand.xpm font.xpm t1.xpm tt.xpm 
diff --git a/app-misc/ithought/files/digest-ithought-0.0.5 b/app-misc/ithought/files/digest-ithought-0.0.5-r1
index 202d61705003..202d61705003 100644
--- a/app-misc/ithought/files/digest-ithought-0.0.5
+++ b/app-misc/ithought/files/digest-ithought-0.0.5-r1
diff --git a/app-misc/ithought/ithought-0.0.5.ebuild b/app-misc/ithought/ithought-0.0.5-r1.ebuild
index b21e73cfa35b..f8928b7f968a 100644
--- a/app-misc/ithought/ithought-0.0.5.ebuild
+++ b/app-misc/ithought/ithought-0.0.5-r1.ebuild
diff --git a/app-misc/jpilot/files/digest-jpilot-0.99 b/app-misc/jpilot/files/digest-jpilot-0.99
deleted file mode 100644
index 4790d984e5ba..000000000000
--- a/app-misc/jpilot/files/digest-jpilot-0.99
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a6c8c1a9bc74f8a3f8403c451fdaef0f jpilot-0.99.tar.gz
diff --git a/app-misc/jpilot/files/digest-jpilot-0.99-r1 b/app-misc/jpilot/files/digest-jpilot-0.99-r2
index 47c3d21eae92..47c3d21eae92 100644
--- a/app-misc/jpilot/files/digest-jpilot-0.99-r1
+++ b/app-misc/jpilot/files/digest-jpilot-0.99-r2
diff --git a/app-misc/jpilot/jpilot-0.99-r1.ebuild b/app-misc/jpilot/jpilot-0.99-r2.ebuild
index fb8a4c014e25..934c628ceddf 100644
--- a/app-misc/jpilot/jpilot-0.99-r1.ebuild
+++ b/app-misc/jpilot/jpilot-0.99-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 Bruce A. Locke <blocke@shivan.org>
-# $Header: /var/cvsroot/gentoo-x86/app-misc/jpilot/jpilot-0.99-r1.ebuild,v 1.4 2001/08/31 03:23:38 pm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/jpilot/jpilot-0.99-r2.ebuild,v 1.1 2001/10/06 12:36:36 azarah Exp $
 
 
 A="${P}.tar.gz jpilot-syncmal_0.62.tar.gz malsync_2.0.6.src.tar.gz"
@@ -15,7 +15,7 @@ HOMEPAGE="http://jpilot.org/"
 # for jpilot-syncmal http://people.atl.mediaone.net/jasonday/code/syncmal/
 # And you'll also need an avangto account. 
 
-DEPEND=">=x11-libs/gtk+-1.2.0 >=dev-libs/pilot-link-0.9.5"
+DEPEND=">=x11-libs/gtk+-1.2.10-r4 >=dev-libs/pilot-link-0.9.5"
 
 src_unpack() {
 	unpack ${P}.tar.gz
@@ -32,7 +32,7 @@ src_compile() {
 	NLS_OPTION="--disable-nls"
   fi
 
-  try ./configure --prefix=/usr/X11R6 --host=${CHOST} ${NLS_OPTION}
+  try ./configure --prefix=/usr --host=${CHOST} ${NLS_OPTION}
 
   # cheap fix?
   patch -p0 < ${FILESDIR}/${P}.patch
@@ -44,14 +44,14 @@ src_compile() {
   try make
 
   cd ${S}/jpilot-syncmal_0.62
-  try ./configure --prefix=/usr/X11R6 --host=${CHOST}
+  try ./configure --prefix=/usr --host=${CHOST}
   make
 }
 
 src_install() {
 
-  make prefix=${D}/usr/X11R6 install
-  insinto /usr/X11R6/share/jpilot/plugins
+  make prefix=${D}/usr install
+  insinto /usr/share/jpilot/plugins
   doins jpilot-syncmal_0.62/.libs/libsyncmal.so
   dodoc README TODO UPGRADING ABOUT-NLS BUGS\
 	CHANGELOG COPYING CREDITS INSTALL
diff --git a/app-misc/jpilot/jpilot-0.99.ebuild b/app-misc/jpilot/jpilot-0.99.ebuild
deleted file mode 100644
index 8149c8184cd7..000000000000
--- a/app-misc/jpilot/jpilot-0.99.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Bruce A. Locke <blocke@shivan.org>
-# $Header: /var/cvsroot/gentoo-x86/app-misc/jpilot/jpilot-0.99.ebuild,v 1.3 2001/08/31 03:23:38 pm Exp $
-
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Desktop Organizer Software for the Palm Pilot"
-SRC_URI="http://jpilot.org/${P}.tar.gz"
-HOMEPAGE="http://jpilot.org/"
-
-DEPEND=">=x11-libs/gtk+-1.2.0 >=dev-libs/pilot-link-0.9.0"
-
-src_compile() {
-
-  local myconf
-  if [ -z "`use nls`" ] ; then
-	NLS_OPTION="--disable-nls"
-  fi
-
-  try ./configure --prefix=/usr/X11R6 --host=${CHOST} ${NLS_OPTION}
-
-  # cheap fix?
-  patch -p0 < ${FILESDIR}/${P}.patch
-
-  # make sure we use $CFLAGS
-  mv Makefile Makefile.old
-  sed -e "s/-g -O2/${CFLAGS}/" Makefile.old > Makefile
-
-  try pmake
-}
-
-src_install() {
-
-  make prefix=${D}/usr/X11R6 install
-  dodoc README TODO UPGRADING ABOUT-NLS BUGS\
-	CHANGELOG COPYING CREDITS INSTALL
-  doman docs/*.1 
-}
-
diff --git a/app-misc/xscreensaver/files/digest-xscreensaver-3.32-r1 b/app-misc/xscreensaver/files/digest-xscreensaver-3.32-r2
index 7969fa95edf8..7969fa95edf8 100644
--- a/app-misc/xscreensaver/files/digest-xscreensaver-3.32-r1
+++ b/app-misc/xscreensaver/files/digest-xscreensaver-3.32-r2
diff --git a/app-misc/xscreensaver/xscreensaver-3.32-r1.ebuild b/app-misc/xscreensaver/xscreensaver-3.32-r2.ebuild
index 09336c512865..b392de429ec2 100644
--- a/app-misc/xscreensaver/xscreensaver-3.32-r1.ebuild
+++ b/app-misc/xscreensaver/xscreensaver-3.32-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 Peter Gavin <pete@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-misc/xscreensaver/xscreensaver-3.32-r1.ebuild,v 1.3 2001/06/08 01:58:12 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/xscreensaver/xscreensaver-3.32-r2.ebuild,v 1.1 2001/10/06 12:36:36 azarah Exp $
 
 #P=
 A=${P}.tar.gz
@@ -11,18 +11,18 @@ SRC_URI="http://www.jwz.org/xscreensaver/${A}"
 HOMEPAGE="http://www.jwz.org/xscreensaver/"
 
 DEPEND="virtual/x11 sys-devel/bc
-	gtk? ( >=x11-libs/gtk+-1.2.8 )
+	gtk? ( >=x11-libs/gtk+-1.2.10-r4 )
 	motif? ( >=x11-libs/openmotif-2.1.30 )
 	opengl? ( virtual/opengl >=media-libs/gle-3.0.1 )
-	gnome? ( >=gnome-base/control-center-1.4.0.1 )
+	gnome? ( >=gnome-base/control-center-1.4.0.1-r1 )
         pam? ( >=sys-libs/pam-0.75 )
         kde? ( kde-base/kde-env )"
 
 RDEPEND="virtual/x11
-	gtk? ( >=x11-libs/gtk+-1.2.8 )
+	gtk? ( >=x11-libs/gtk+-1.2.10-r4 )
 	motif? ( >=x11-libs/openmotif-2.1.30 )
 	opengl? ( virtual/opengl >=media-libs/gle-3.0.1 )
-	gnome? ( >=gnome-base/control-center-1.4.0.1 )
+	gnome? ( >=gnome-base/control-center-1.4.0.1-r1 )
         pam? ( >=sys-libs/pam-0.75 )
         kde? ( kde-base/kde-env )"
 
@@ -60,8 +60,8 @@ src_compile() {
     fi
     
 
-   try ./configure --prefix=/usr/X11R6 --mandir=/usr/X11R6/man --host=${CHOST} \
-	    --enable-subdir=/usr/X11R6/lib/xscreensaver $myconf \
+   try ./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST} \
+	    --enable-subdir=/usr/lib/xscreensaver $myconf \
 	    --with-mit-ext --with-dpms-ext --with-xf86vmode-ext \
 	    --with-proc-interrupts --with-xpm --with-xshm-ext \
 	    --with-xdbe-ext --enable-locking
@@ -77,8 +77,9 @@ src_install () {
     try make install_prefix=${D} install
     if [ "`use gnome`" ]
     then
-      dodir /opt/gnome/bin
-      mv ${D}/usr/X11R6/bin/screensaver-properties-capplet ${D}/opt/gnome/bin
+      dodir /usr/bin
+# not need i think, shout if it breaks control-center support
+#      mv ${D}/usr/bin/screensaver-properties-capplet ${D}/usr/bin
    fi
 }