From 67941423a9e500b20c2b4e741e6d44aa6ff74556 Mon Sep 17 00:00:00 2001
From: Geoff Clements <geoff@electron.me.uk>
Date: Sat, 24 Jun 2006 23:22:04 +0000
Subject: Make use of doins -r Tidy up code for installing python executables

svn path=/sunrise/; revision=249
---
 dev-db/daboide/Manifest                   | 20 +++++++++++-------
 dev-db/daboide/daboide-0.5.6.ebuild       | 35 +++++++++----------------------
 dev-db/daboide/files/digest-daboide-0.5.6 |  2 ++
 3 files changed, 24 insertions(+), 33 deletions(-)

(limited to 'dev-db')

diff --git a/dev-db/daboide/Manifest b/dev-db/daboide/Manifest
index 1711b52eb..21f810268 100644
--- a/dev-db/daboide/Manifest
+++ b/dev-db/daboide/Manifest
@@ -1,12 +1,16 @@
-DIST daboide-0.5.6-mac-nix.tar.gz 210101
-EBUILD daboide-0.5.6.ebuild 1429 RMD160 bdca9372cc4d7174cf7f1ec51e11a00c5a36ab20 SHA1 41f992a1db4b135c8d7fb6840c7c8316f7c76bcd SHA256 fe8b92ed95cda881d5953de2fe5a1cef7cff9e6323790d908c778856c59e9084
-MD5 5bbd54efc5804a79d8d310f20a401331 daboide-0.5.6.ebuild 1429
-RMD160 bdca9372cc4d7174cf7f1ec51e11a00c5a36ab20 daboide-0.5.6.ebuild 1429
-SHA256 fe8b92ed95cda881d5953de2fe5a1cef7cff9e6323790d908c778856c59e9084 daboide-0.5.6.ebuild 1429
+DIST daboide-0.5.6-mac-nix.tar.gz 210101 RMD160 425f6c4c01f9c7c32098523aae1f955e27562ffc SHA1 ac47437bbb629b603bf924a390639632ba1c252e SHA256 67c56ef664d8529d770803017d40312e611d2f2198bbb8b0f34b2f1a850da188
+EBUILD daboide-0.5.6.ebuild 1078 RMD160 ee35acc254d026b5dc288ad92f70d8ca8549fb84 SHA1 38511284bfc5dc2d86d9714003f0a6b934002984 SHA256 528c66ee912fdd288904a90a6c25e4346507bfea9ce2ef876e5bcc36f03c3919
+MD5 e2f439d1e671a682b1f8fc6ce5a4bb69 daboide-0.5.6.ebuild 1078
+RMD160 ee35acc254d026b5dc288ad92f70d8ca8549fb84 daboide-0.5.6.ebuild 1078
+SHA256 528c66ee912fdd288904a90a6c25e4346507bfea9ce2ef876e5bcc36f03c3919 daboide-0.5.6.ebuild 1078
 MISC ChangeLog 209 RMD160 cf257ebb9003cfbb96806bd19a171b1a9b042ca8 SHA1 69e88cdbed86820211cbd91f4d4a5c80e0b14971 SHA256 f50a528793e5b65f6d46b9d122fb6d37c26758e4601f008bd9291294650e67c7
 MD5 a930c4906548c5b5cba67972a77df872 ChangeLog 209
 RMD160 cf257ebb9003cfbb96806bd19a171b1a9b042ca8 ChangeLog 209
 SHA256 f50a528793e5b65f6d46b9d122fb6d37c26758e4601f008bd9291294650e67c7 ChangeLog 209
-MD5 bbb16b9bad451b31ccc0833becb00b92 files/digest-daboide-0.5.6 73
-RMD160 0f94f74d4876592cf0a1e8311225532dd38c7f7a files/digest-daboide-0.5.6 73
-SHA256 2f513d1b67fbd275fb6d4be6f8df590aaab2c6b6d0a4fa9c9703a3115c928e05 files/digest-daboide-0.5.6 73
+MISC daboide-0.5.6.ebuild.old 1266 RMD160 dbf59836f6e7e4c25857802f9a37eaf07e542a2f SHA1 f2e04600ec9910e57976e979b78bf96926acbd32 SHA256 fe3378d572a4e8646b95b33c230455099181478bad4157194cd271dfbaee39a2
+MD5 e6522fb6d7c5c0591bb178f0dc695116 daboide-0.5.6.ebuild.old 1266
+RMD160 dbf59836f6e7e4c25857802f9a37eaf07e542a2f daboide-0.5.6.ebuild.old 1266
+SHA256 fe3378d572a4e8646b95b33c230455099181478bad4157194cd271dfbaee39a2 daboide-0.5.6.ebuild.old 1266
+MD5 f08a87216edea78c65c9de4e910d1d78 files/digest-daboide-0.5.6 265
+RMD160 46e6f763d7193de2b4e91e1284a7e2704f730c18 files/digest-daboide-0.5.6 265
+SHA256 52a556ec18428ab2c37773749a35cc4b1ca1db9a6c0be3d5a8ae6fbe8a47de1d files/digest-daboide-0.5.6 265
diff --git a/dev-db/daboide/daboide-0.5.6.ebuild b/dev-db/daboide/daboide-0.5.6.ebuild
index 80af01289..9847efaf3 100644
--- a/dev-db/daboide/daboide-0.5.6.ebuild
+++ b/dev-db/daboide/daboide-0.5.6.ebuild
@@ -27,38 +27,23 @@ src_compile() { :; }
 src_install() {
 	# Install daboide into site-packages
 	distutils_python_version
-	INS=/usr/lib/python${PYVER}/site-packages/${P}
+	INS=/usr/lib/python${PYVER}/site-packages/${PN}
 
 	dodoc ChangeLog
 
-	# investigate usage of doins -r please
-	# for each source directory
-	for DDIR in $(find . -type d)
-	do
-		# if there are any files - install them
-		if [ $(ls -l ${DDIR} | grep ^[-l] | wc -l) != "0" ]
-		then
-			insinto ${INS}/${DDIR}
-			doins ${DDIR}/*
-		fi
-
-		# if we have any python files
-		if [ $(ls -l ${DDIR}/*.py 2>/dev/null | wc -l) != "0" ]
-		then
-			# pick out those files which should be executable
-			EFIL=$(grep '^#!' ${DDIR}/*.py | cut -d : -f 1)
+	insinto ${INS}
+	doins -r .
 
-			# and if there are any - install them
-			if [ -n "${EFIL}" ]
-			then
-				exeinto ${INS}/${DDIR}
-				doexe ${EFIL}
-			fi
-		fi
+	# pick out those files which should be executable
+	for EFIL in $(grep -RI '^#!' * | cut -d : -f 1)
+	do
+		# and if there are any - install them
+		exeinto ${INS}/${EFIL%%$(basename ${EFIL})}
+		doexe ${EFIL}
 	done
 
 	# Create executable
 	echo '#!/bin/sh' > daboide
-	echo "exec /usr/lib/python${PYVER}/site-packages/${P}/IDE.py" >> daboide
+	echo "exec /usr/lib/python${PYVER}/site-packages/${PN}/IDE.py" >> daboide
 	dobin daboide
 }
diff --git a/dev-db/daboide/files/digest-daboide-0.5.6 b/dev-db/daboide/files/digest-daboide-0.5.6
index aeae003ee..bfea21c9e 100644
--- a/dev-db/daboide/files/digest-daboide-0.5.6
+++ b/dev-db/daboide/files/digest-daboide-0.5.6
@@ -1 +1,3 @@
 MD5 cddb795cdd4baf5642431ce40e004c8a daboide-0.5.6-mac-nix.tar.gz 210101
+RMD160 425f6c4c01f9c7c32098523aae1f955e27562ffc daboide-0.5.6-mac-nix.tar.gz 210101
+SHA256 67c56ef664d8529d770803017d40312e611d2f2198bbb8b0f34b2f1a850da188 daboide-0.5.6-mac-nix.tar.gz 210101
-- 
cgit v1.2.3-18-g5258