some more apps to install into /usr nistead of /usr/X11R6

5 files changed, 8 insertions, 68 deletions

diff --git a/media-sound/grip/files/digest-grip-2.95 b/media-sound/grip/files/digest-grip-2.95
deleted file mode 100644
index a4f9795cdf57..000000000000
--- a/media-sound/grip/files/digest-grip-2.95
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fabf302f9f35708725415b2d1f7d3602 grip-2.95.tgz
diff --git a/media-sound/grip/files/digest-grip-2.96-r1 b/media-sound/grip/files/digest-grip-2.96-r1
deleted file mode 100644
index 453339451bd2..000000000000
--- a/media-sound/grip/files/digest-grip-2.96-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 93bd9c4672a8d53daf32772812e624d8 grip-2.96.tgz
diff --git a/media-sound/grip/files/digest-grip-2.96 b/media-sound/grip/files/digest-grip-2.96-r2
index 453339451bd2..453339451bd2 100644
--- a/media-sound/grip/files/digest-grip-2.96
+++ b/media-sound/grip/files/digest-grip-2.96-r2
diff --git a/media-sound/grip/grip-2.95.ebuild b/media-sound/grip/grip-2.95.ebuild
deleted file mode 100644
index b57249347c71..000000000000
--- a/media-sound/grip/grip-2.95.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 Bruce A. Locke <blocke@shivan.org>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/grip/grip-2.95.ebuild,v 1.3 2001/08/31 03:23:39 pm Exp $
-
-
-A=${P}.tgz
-S=${WORKDIR}/${P}
-DESCRIPTION="GTK+ based Audio CD Ripper"
-SRC_URI="http://www.nostatic.org/grip/${A}"
-HOMEPAGE="http://www.nostatic.org/grip"
-
-DEPEND="media-sound/cdparanoia"
-
-src_compile() {
-
-   # grip doesn't have a nice configure script and requires some
-   # symlink love to build
-
-   cd $S
-
-   mkdir cdparanoia
-   mkdir cdparanoia/interface
-   mkdir cdparanoia/paranoia
-   ln -s /usr/lib/libcdda* cdparanoia/interface/
-   ln -s /usr/lib/libcdda* cdparanoia/paranoia/
-   ln -s /usr/include/*cdda* cdparanoia/interface/
-   ln -s /usr/include/*cdda* cdparanoia/paranoia/
-   ln -s /usr/include/utils.h cdparanoia/utils.h
-
-   # apply CFLAGS
-   mv Makefile Makefile.old
-   sed -e "s/-Wall/-Wall ${CFLAGS}/" -e "s/PREFIX=\/usr/PREFIX=\/usr\/X11R6/" Makefile.old > Makefile
-
-   try make all
-
-}
-
-src_install () {
-    cd ${S}
-
-    dodir /usr/X11R6/bin
-
-    cp ${S}/grip ${D}/usr/X11R6/bin
-    cp ${S}/gcd ${D}/usr/X11R6/bin
-
-    dodir /usr/X11R6/man/man1
-
-    cp ${S}/grip.1 ${D}/usr/X11R6/man/man1
-    # make install copies it over....
-    cp ${S}/grip.1 ${D}/usr/X11R6/man/man1/gcd.1
-
-    dodoc README LICENSE TODO CREDITS CHANGES
-
-    insinto /usr/X11R6/include/X11/pixmaps
-    doins pixmaps/*.xpm
-
-}
diff --git a/media-sound/grip/grip-2.96-r1.ebuild b/media-sound/grip/grip-2.96-r2.ebuild
index 60c4eaf3179e..cabf3e0eaca8 100644
--- a/media-sound/grip/grip-2.96-r1.ebuild
+++ b/media-sound/grip/grip-2.96-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/media-sound/grip/grip-2.96-r1.ebuild,v 1.1 2001/09/14 23:01:59 lordjoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/grip/grip-2.96-r2.ebuild,v 1.1 2001/10/07 17:29:35 danarmak Exp $
 
 
 A=${P}.tgz
@@ -48,20 +48,20 @@ src_compile() {
 src_install () {
     cd ${S}
 
-    dodir /usr/X11R6/bin
+    dodir /usr/bin
 
-    cp ${S}/grip ${D}/usr/X11R6/bin
-    cp ${S}/gcd ${D}/usr/X11R6/bin
+    cp ${S}/grip ${D}/usr/bin
+    cp ${S}/gcd ${D}/usr/bin
 
-    dodir /usr/X11R6/man/man1
+    dodir /usr/man/man1
 
     gzip ${S}/grip.1
-    cp ${S}/grip.1.gz ${D}/usr/X11R6/man/man1
-    cp ${S}/grip.1.gz ${D}/usr/X11R6/man/man1/gcd.1.gz
+    cp ${S}/grip.1.gz ${D}/usr/man/man1
+    cp ${S}/grip.1.gz ${D}/usr/man/man1/gcd.1.gz
 
     dodoc README LICENSE TODO CREDITS CHANGES
 
-    insinto /usr/X11R6/include/X11/pixmaps
+    insinto /usr/include/X11/pixmaps
     doins pixmaps/*.xpm
 
 }