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

4 files changed, 6 insertions, 47 deletions

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 
-}
-