oroborus-extras to /usr

3 files changed, 66 insertions, 65 deletions

diff --git a/x11-wm/oroborus-extras/files/digest-oroborus-extras-2.0.1 b/x11-wm/oroborus-extras/files/digest-oroborus-extras-2.0.1-r1
index af88185c29ea..2066229f3c41 100644
--- a/x11-wm/oroborus-extras/files/digest-oroborus-extras-2.0.1
+++ b/x11-wm/oroborus-extras/files/digest-oroborus-extras-2.0.1-r1
@@ -1,3 +1,3 @@
+MD5 17beeaa3295e28d99ca80b926b05c96a desklaunch-1.1.0.tar.gz
 MD5 8ac3d4dfbf1f5c35ea6544be9bcc96a5 deskmenu-1.3.0.tar.gz
 MD5 f4f7e73d84a635b5aa2fb1738a3f965f keylaunch-1.3.0.tar.gz
-MD5 17beeaa3295e28d99ca80b926b05c96a desklaunch-1.1.0.tar.gz
diff --git a/x11-wm/oroborus-extras/oroborus-extras-2.0.1-r1.ebuild b/x11-wm/oroborus-extras/oroborus-extras-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..a4d68599fb63
--- /dev/null
+++ b/x11-wm/oroborus-extras/oroborus-extras-2.0.1-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Ben Lutgens <lamer@gentoo.org>
+
+S=${WORKDIR}
+DESCRIPTION="Other stuff for oroborus"
+SRC_URI="http://www.kensden.pwp.blueyonder.co.uk/Oroborus/files/deskmenu-1.3.0.tar.gz
+	 http://www.kensden.pwp.blueyonder.co.uk/Oroborus/files/keylaunch-1.3.0.tar.gz
+	 http://www.kensden.pwp.blueyonder.co.uk/Oroborus/files/desklaunch-1.1.0.tar.gz"
+HOMEPAGE="http://www.kensden.pwp.blueyonder.co.uk/Oroborus/"
+
+DEPEND="x11-wm/oroborus"
+
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}/keylaunch
+	sed -e 's:/usr/X11:/usr/X11R6:' Makefile |cat >Makefile
+}
+
+src_compile() {
+
+# Deskmenu first
+	cd ${S}/deskmenu-1.3.0
+	make PREFIX=/usr || die
+
+# Keylaunch next
+	cd ${S}/keylaunch
+	make PREFIX=/usr || die
+
+# Desklaunch last
+	cd ${S}/desklaunch
+	make PREFIX=/usr || die
+}
+
+src_install () {
+
+	dodir /usr/bin
+	
+# Deskmenu first
+	cd ${S}/deskmenu-1.3.0
+	make PREFIX=${D}/usr install || die
+	
+	newdoc README README.deskmenu
+	newdoc CHANGES CHANGES.deskmenu
+	newdoc example_rc example_rc.deskmenu
+	dodoc LICENSE
+
+# Keylaunch next 
+	cd ${S}/keylaunch
+	make PREFIX=${D}/usr install || die
+	
+	newdoc README README.keylaunch
+	newdoc LICENSE LICENSE.keylaunch
+	newdoc example_rc example_rc.keylaunch
+
+# Desklaunch last
+	cd ${S}/desklaunch
+	make PREFIX=${D}/usr install || die
+	
+	newdoc README README.desklaunch
+}
+
diff --git a/x11-wm/oroborus-extras/oroborus-extras-2.0.1.ebuild b/x11-wm/oroborus-extras/oroborus-extras-2.0.1.ebuild
deleted file mode 100644
index 832e888412db..000000000000
--- a/x11-wm/oroborus-extras/oroborus-extras-2.0.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Ben Lutgens <lamer@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/oroborus-extras/oroborus-extras-2.0.1.ebuild,v 1.1 2001/08/02 04:35:59 lamer Exp $
-A="deskmenu-1.3.0.tar.gz keylaunch-1.3.0.tar.gz desklaunch-1.1.0.tar.gz" 
-A2="keylaunch-1.3.0.tar.gz"
-A3="desklaunch-1.1.0.tar.gz"
-S=${WORKDIR}
-DESCRIPTION="Other stuff for oroborus"
-SRC_URI="http://www.kensden.pwp.blueyonder.co.uk/Oroborus/files/${A}
-http://www.kensden.pwp.blueyonder.co.uk/Oroborus/files/${A2}
-http://www.kensden.pwp.blueyonder.co.uk/Oroborus/files/${A3}"
-HOMEPAGE="http://www.kensden.pwp.blueyonder.co.uk/Oroborus/"
-DEPEND=""
-
-#RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	unpack ${A2}
-	unpack ${A3}
-	cd ${S}/keylaunch
-	sed -e "s:\/usr\/X11:\/usr\/X11R6:" Makefile |cat > Makefile
-}
-
-
-src_compile() {
-
-# Deskmenu first
-	cd ${S}/deskmenu-1.3.0
-	try make
-
-# Keylaunch next
-	cd ${S}/keylaunch
-   try make
-
-# desklaunch third
-	cd ${S}/desklaunch
-   try make
-}
-
-src_install () {
-# make the dirs
-	dodir /usr/X11R6/bin
-# Deskmenu first
-	cd ${S}/deskmenu-1.3.0
-    try make PREFIX=${D}/usr/X11R6 install
-	newdoc README README.deskmenu
-	newdoc CHANGES CHANGES.deskmenu
-	newdoc example_rc example.deskmenurc
-	dodoc license
-
-# Keylaunch next 
-	cd ${S}/keylaunch
-	try make PREFIX=${D}/usr/X11R6 install
-	newdoc README README.keylaunch
-	newdoc example_rc example_rc_keylaunch
-
-# desklaunch third
-   cd ${S}/desklaunch
-	try make PREFIX=${D}/usr/X11R6 install
-	newdoc README README.desklaunch
-}
-