[gentoo-commits] proj/sci:master commit in: sci-biology/codonw/

["Justin Lecher" <jlec@gentoo.org>]

commit:     b227f985711f1cfb5fac1f68edcb816b5ae150d6
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat May 30 05:52:06 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Jun  5 06:21:03 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=b227f985

sci-biology/codonw: Workaround file collision by appending PN to every command, bug #344713, bug #550388

Package-Manager: portage-2.2.20

 sci-biology/codonw/ChangeLog                                   |  8 +++++++-
 .../codonw/{codonw-1.4.4-r1.ebuild => codonw-1.4.4-r2.ebuild}  |  8 +++++---
 sci-biology/codonw/metadata.xml                                | 10 +++++-----
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/sci-biology/codonw/ChangeLog b/sci-biology/codonw/ChangeLog
index 00b6629..ee52e96 100644
--- a/sci-biology/codonw/ChangeLog
+++ b/sci-biology/codonw/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*codonw-1.4.4-r2 (30 May 2015)
+
+  30 May 2015; Justin Lecher <jlec@gentoo.org> +codonw-1.4.4-r2.ebuild,
+  -codonw-1.4.4-r1.ebuild, metadata.xml:
+  sci-biology/codonw: Workaround file collision by appending PN to every
+  command, bug #344713, bug #550388
+
   10 Jan 2015; Marius Brehler <marbre@linux.sungazer.de>
   condow-1.4.4-r1.ebuild:
   Move to EAPI=5.
@@ -14,4 +21,3 @@
 
   28 Feb 2009; Andrey Kislyuk <weaver@gentoo.org> ChangeLog:
   New package sci-biology/codonw, ebuild written by me
-

diff --git a/sci-biology/codonw/codonw-1.4.4-r1.ebuild b/sci-biology/codonw/codonw-1.4.4-r2.ebuild
similarity index 89%
rename from sci-biology/codonw/codonw-1.4.4-r1.ebuild
rename to sci-biology/codonw/codonw-1.4.4-r2.ebuild
index 85c0c5e..99c6994 100644
--- a/sci-biology/codonw/codonw-1.4.4-r1.ebuild
+++ b/sci-biology/codonw/codonw-1.4.4-r2.ebuild
@@ -20,7 +20,8 @@ KEYWORDS="~amd64 ~x86"
 S=${WORKDIR}/codonW
 
 src_prepare() {
-	sed -e 's/$(CC) -c/& -DBSD/' \
+	sed \
+		-e 's/$(CC) -c/& -DBSD/' \
 		-e 's/$(CFLAGS)  $(objects)/$(CFLAGS) $(LDFLAGS) $(objects)/' \
 		-i Makefile || die
 }
@@ -30,10 +31,11 @@ src_compile() {
 }
 
 src_install() {
-	dobin codonw
+	local i
+	dobin ${PN}
 	# woohoo watch out for collisions
 	for i in rscu cu aau raau tidy reader cutab cutot transl bases base3s dinuc cai fop gc3s gc cbi enc; do
-		dosym codonw /usr/bin/${i}
+		dosym codonw /usr/bin/${i}-${PN}
 	done
 	dodoc *.txt
 }

diff --git a/sci-biology/codonw/metadata.xml b/sci-biology/codonw/metadata.xml
index 3302123..fc7c769 100644
--- a/sci-biology/codonw/metadata.xml
+++ b/sci-biology/codonw/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>weaver@gentoo.org</email>
-		<name>Andrey Kislyuk</name>
-	</maintainer>
-	<herd>sci-biology</herd>
+  <maintainer>
+    <email>weaver@gentoo.org</email>
+    <name>Andrey Kislyuk</name>
+  </maintainer>
+  <herd>sci-biology</herd>
 </pkgmetadata>