Fixed collision with app-admin/analog, bug #207423.

Package-Manager: portage-2.1.4.1

3 files changed, 23 insertions, 18 deletions

diff --git a/sci-electronics/chipmunksystem/ChangeLog b/sci-electronics/chipmunksystem/ChangeLog
index abfa86aec14c..b9af12f18635 100644
--- a/sci-electronics/chipmunksystem/ChangeLog
+++ b/sci-electronics/chipmunksystem/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-electronics/chipmunksystem
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/chipmunksystem/ChangeLog,v 1.11 2007/07/22 07:17:13 dberkholz Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/chipmunksystem/ChangeLog,v 1.12 2008/02/09 11:11:27 calchan Exp $
+
+  09 Feb 2008; Denis Dupeyron <calchan@gentoo.org>
+  chipmunksystem-20060624.ebuild:
+  Fixed collision with app-admin/analog, bug #207423.
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
   chipmunksystem-20060624.ebuild:
diff --git a/sci-electronics/chipmunksystem/Manifest b/sci-electronics/chipmunksystem/Manifest
index a4d24440377b..e1da1d8d55ab 100644
--- a/sci-electronics/chipmunksystem/Manifest
+++ b/sci-electronics/chipmunksystem/Manifest
@@ -10,6 +10,6 @@ DIST view-1.14.tar.gz 359473 RMD160 e7368e68ec223236ddc6a731d022568d4149ba2d SHA
 DIST webdoc-1.49.tar.gz 1428900 RMD160 ef52adeba0b03b72931f3166a4974b060124f488 SHA1 25da22ed0a12c297dabbf96d6fc9ff0c992e04bb SHA256 9e704a3da5858f987560845fb373333416b7a5cc9649e269980df9fc88d07615
 DIST wol-1.14.tar.gz 324674 RMD160 e884723b5b8c5a39750afdd3c1d7472898270988 SHA1 3d143013750fcb48b3e2898aabcd05533cd16f69 SHA256 f0bb0cac49c1050ba07ea69ef922bf3d16e2841622de45276ec8dc3ff3063aea
 DIST wolcomp-1.14.tar.gz 22224 RMD160 3d9dbe2df40014c810296eabc21a1bf4377bb240 SHA1 e562c45f475419d9bf6b439f93aecc4868cb3763 SHA256 63b9ea8d180d2883122c98b8d3b7c5a3800625cc5a505f18070ec62b71f20579
-EBUILD chipmunksystem-20060624.ebuild 6887 RMD160 33e677874cbbe1fad5641723498b36d8859b04ef SHA1 fd1911ddfff928d36ab99a14b00cd940893750dc SHA256 0891a5c3a9392e134677fde4d45b69cafe670d5794a7ea7ab93bafe8a8bd061b
-MISC ChangeLog 3036 RMD160 2081b72907c3bea3934aa56d112813b47360b875 SHA1 99c1d77e237b939f9c8b517a5a1683b7c3cee83d SHA256 43b8cbd1942bd6a7f485fde53b6269ee9fa10dff3791ea42d3a44dcf87cdce7e
+EBUILD chipmunksystem-20060624.ebuild 6963 RMD160 460b85029cb9ba345ac34586e40a654ba2695bfb SHA1 db291ed579ee0d854f19bc90e2d32d5d4f1dab74 SHA256 4db99c14706ce9dc4fb7f7b3f76e0a10ddbf8c6b0f5a1dc35bc41b234df0e958
+MISC ChangeLog 3174 RMD160 99f9de78e128a128d6de85e9e9b11f5bd9eb21c0 SHA1 ea472405e5f45ff05ebe273da67e195c2277013b SHA256 f4f4991f01552bec0d177831f4503a639812b54b70bda49c9f713e3bde3dd9de
 MISC metadata.xml 804 RMD160 a2558651819ea5ea321e11676aa5cba939f43703 SHA1 79decbf5fb3ece0a5d7925d94bbbc62f9190a449 SHA256 5e9d3d93288dd521358373aebf9e0952e2d1aec4637ed2da5a7ef3e661d440f3
diff --git a/sci-electronics/chipmunksystem/chipmunksystem-20060624.ebuild b/sci-electronics/chipmunksystem/chipmunksystem-20060624.ebuild
index 23786d2eb839..48ee2081492a 100644
--- a/sci-electronics/chipmunksystem/chipmunksystem-20060624.ebuild
+++ b/sci-electronics/chipmunksystem/chipmunksystem-20060624.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/chipmunksystem/chipmunksystem-20060624.ebuild,v 1.3 2007/07/22 07:17:13 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/chipmunksystem/chipmunksystem-20060624.ebuild,v 1.4 2008/02/09 11:11:27 calchan Exp $
 
 inherit toolchain-funcs
 
@@ -40,7 +40,7 @@ DEPEND="${RDEPEND}
 src_compile() {
 	local COMPILING_ERROR
 	COMPILING_ERROR="Compiling of ${P} FAILED"
-	cd ${WORKDIR}
+	cd "${WORKDIR}"
 
 	sed -e "s:^CHIPMUNKCC.*:CHIPMUNKCC = $(tc-getCC) ${CFLAGS}:" \
 		-e 's:^CHIPMUNKFLAGS.*:CHIPMUNKFLAGS = -DBSD -Dlinux -DF_OK=0 -DFONTLIB=\\"/usr/lib\\" -DPSLIB=\\"/usr/lib\\":' \
@@ -109,9 +109,10 @@ src_compile() {
 }
 
 src_install () {
-	cd ${WORKDIR}
+	cd "${WORKDIR}"
 
 	# Renaming executables with a too generic name in order to avoid collisions
+	mv bin/analog bin/chipmunk-analog
 	mv bin/sf bin/chipmunk-sf
 	mv bin/ss bin/chipmunk-ss
 	mv bin/vc bin/chipmunk-vc
@@ -120,16 +121,16 @@ src_install () {
 	dolib wolcomp/wolcomp.a
 
 	dodir /usr/share/${P}/lib
-	cp -pPR log/lib/* ${D}/usr/share/${P}/lib
-	cp -pPR view/lib/* ${D}/usr/share/${P}/lib
+	cp -pPR log/lib/* "${D}"/usr/share/${P}/lib
+	cp -pPR view/lib/* "${D}"/usr/share/${P}/lib
 	dodir /usr/share/${P}/until/designrules
-	cp -pPR until/designrules/* ${D}/usr/share/${P}/until/designrules
-	cp until/V1.2/*.ff ${D}/usr/share/${P}/until
+	cp -pPR until/designrules/* "${D}"/usr/share/${P}/until/designrules
+	cp until/V1.2/*.ff "${D}"/usr/share/${P}/until
 	dodir /usr/share/${P}/netcmp
-	cp netcmp/*.ntk ${D}/usr/share/${P}/netcmp
+	cp netcmp/*.ntk "${D}"/usr/share/${P}/netcmp
 	dodir /usr/share/doc/${P}/html
-	cp -pPR webdoc/* ${D}/usr/share/doc/${P}/html
-	cp -pPR example ${D}/usr/share/${P}
+	cp -pPR webdoc/* "${D}"/usr/share/doc/${P}/html
+	cp -pPR example "${D}"/usr/share/${P}
 
 	newdoc ${P}-readme README
 	dodoc log/src/LNOTES util/sctomat/doc/scope_to_mat.ps
@@ -150,9 +151,9 @@ src_install () {
 }
 
 pkg_postinst() {
-	elog "Please note that the sf, ss and vc executables have been renamed"
-	elog "respectively chipmunk-sf, chipmunk-ss and chipmunk-vc in order to"
-	elog "avoid collisions with other packages."
+	elog "Please note that the analog, sf, ss and vc executables have been"
+	elog "renamed respectively chipmunk-analog, chipmunk-sf, chipmunk-ss and"
+	elog "chipmunk-vc in order to avoid collisions with other packages."
 	elog "You may want to emerge xcircuit which integrates well with the"
 	elog "Chipmunk tools."
 }