Fix collision with media-gfx/inkscape

Package-Manager: portage-2.1.2.4

3 files changed, 31 insertions, 21 deletions

diff --git a/games-sports/xmoto/ChangeLog b/games-sports/xmoto/ChangeLog
index c018d59d2d4f..aa24676e3ea1 100644
--- a/games-sports/xmoto/ChangeLog
+++ b/games-sports/xmoto/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-sports/xmoto
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/xmoto/ChangeLog,v 1.13 2007/04/07 13:37:55 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/xmoto/ChangeLog,v 1.14 2007/04/23 12:23:40 nyhm Exp $
+
+  23 Apr 2007; Tristan Heaven <nyhm@gentoo.org> xmoto-0.2.7.ebuild:
+  Fix collision with media-gfx/inkscape
 
 *xmoto-0.2.7 (20 Mar 2007)
 
diff --git a/games-sports/xmoto/Manifest b/games-sports/xmoto/Manifest
index 4f22ef98590c..3f6d8c2fe0ed 100644
--- a/games-sports/xmoto/Manifest
+++ b/games-sports/xmoto/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX xmoto-as-needed.patch 1222 RMD160 a13f3fd2ad07307eed649122b9a7bd0cd0b20ba7 SHA1 eabb5a6921a42c81d093d0fb14a52cb76de16636 SHA256 ec076ff6e958de76325d153437e0bbfba601d279b8a690cf90fb0ca4923af2a6
 MD5 993995342255d5ce7ae43766013d210a files/xmoto-as-needed.patch 1222
 RMD160 a13f3fd2ad07307eed649122b9a7bd0cd0b20ba7 files/xmoto-as-needed.patch 1222
@@ -18,14 +21,14 @@ EBUILD xmoto-0.2.6.ebuild 1187 RMD160 67ddf5ebd414d426f69c507cfb119fd85a3029f2 S
 MD5 9cbd287fe4b511a09f1bd907d8ed5f76 xmoto-0.2.6.ebuild 1187
 RMD160 67ddf5ebd414d426f69c507cfb119fd85a3029f2 xmoto-0.2.6.ebuild 1187
 SHA256 6d074efbe415e89e73fed55e675c1f904ce90c87505ab8962b77c4b0157462cd xmoto-0.2.6.ebuild 1187
-EBUILD xmoto-0.2.7.ebuild 1799 RMD160 ff1a96f5f2eb8c60cd9211eda05f33699b7cc937 SHA1 c667de2a44964b19ac4cec3dcf2b658f73c16799 SHA256 1de492a055d4889d9f0745250ceeb13a94a468df85d218b9ea102ddfeabb444b
-MD5 398db7dd900719e5d503a3ec58722ec5 xmoto-0.2.7.ebuild 1799
-RMD160 ff1a96f5f2eb8c60cd9211eda05f33699b7cc937 xmoto-0.2.7.ebuild 1799
-SHA256 1de492a055d4889d9f0745250ceeb13a94a468df85d218b9ea102ddfeabb444b xmoto-0.2.7.ebuild 1799
-MISC ChangeLog 2047 RMD160 377342c2b247ade4e22ba69b8e1dbdd6269f5d24 SHA1 b32de8d9173d2a279425de8bab18985606aa4263 SHA256 d98bfea75028fe39e1ac6da687b9cc6b660a7732c0a899b4b407a65aa923d3cd
-MD5 f2cd595cc332ce12bbf96f199cb6f00d ChangeLog 2047
-RMD160 377342c2b247ade4e22ba69b8e1dbdd6269f5d24 ChangeLog 2047
-SHA256 d98bfea75028fe39e1ac6da687b9cc6b660a7732c0a899b4b407a65aa923d3cd ChangeLog 2047
+EBUILD xmoto-0.2.7.ebuild 1805 RMD160 d78e1f6b7ffa16bf9b74c62329bc853cd329e7fc SHA1 6d99014e9f2481cf98aa8bbd032d50a4ab62ce01 SHA256 c0210f6d4ac123f91f6253930bd4e4dae480632df4b1bb4f4ec8c4336e8b2f9d
+MD5 e2bad30fd63267ceea949dbb92b2de5a xmoto-0.2.7.ebuild 1805
+RMD160 d78e1f6b7ffa16bf9b74c62329bc853cd329e7fc xmoto-0.2.7.ebuild 1805
+SHA256 c0210f6d4ac123f91f6253930bd4e4dae480632df4b1bb4f4ec8c4336e8b2f9d xmoto-0.2.7.ebuild 1805
+MISC ChangeLog 2153 RMD160 d9af05603e53f61400828c7da2a7df01d3840831 SHA1 49be699b3f07d040bf366cc826a2f682b43f5185 SHA256 ffe2eb81ab9d0958acde0af9032625b2f640b77e1ee68c0bb1523a6e1536ca84
+MD5 1e95edce660ae2cb7621090403d731c9 ChangeLog 2153
+RMD160 d9af05603e53f61400828c7da2a7df01d3840831 ChangeLog 2153
+SHA256 ffe2eb81ab9d0958acde0af9032625b2f640b77e1ee68c0bb1523a6e1536ca84 ChangeLog 2153
 MISC metadata.xml 217 RMD160 977d5d8ddea912e2fc3790188ac36ab3c6bc12bf SHA1 abdc0d9cb9d8d87942487f2cd0174db2421f12a9 SHA256 8a8bfa1875b6f354b36daf63166ff751fa87769c8bfb3b14031f7aa6faa5f99a
 MD5 a34b3ecca59b0e0d1e6e4e799f3bb7ee metadata.xml 217
 RMD160 977d5d8ddea912e2fc3790188ac36ab3c6bc12bf metadata.xml 217
@@ -39,3 +42,10 @@ SHA256 0132e9955ce47613aad72b6f24b6474e3fd9b14abfe13a6f006ff40db5da2967 files/di
 MD5 7aaea7c5dedb36b4267fa9a3bb9ca15f files/digest-xmoto-0.2.7 491
 RMD160 6e8caa45bc8ea4fec73d3aca7de19d6f3bb03301 files/digest-xmoto-0.2.7 491
 SHA256 d4a91cf85aa42c948f30ee0133933a01dc3ac34f7f3ae11ce0a1cf92bc1c94c7 files/digest-xmoto-0.2.7 491
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGLKVTdz7hIScOURERAsaQAJ4mpJaBKqQA5ltii7jxGCBw08vBXQCfVoUl
+Z/dx4iuS+2hFwRZN84+92tQ=
+=cN+y
+-----END PGP SIGNATURE-----
diff --git a/games-sports/xmoto/xmoto-0.2.7.ebuild b/games-sports/xmoto/xmoto-0.2.7.ebuild
index b45cf7a04551..9de5add17111 100644
--- a/games-sports/xmoto/xmoto-0.2.7.ebuild
+++ b/games-sports/xmoto/xmoto-0.2.7.ebuild
@@ -1,13 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/xmoto/xmoto-0.2.7.ebuild,v 1.2 2007/04/07 13:37:55 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/xmoto/xmoto-0.2.7.ebuild,v 1.3 2007/04/23 12:23:40 nyhm Exp $
 
 inherit eutils games
 
-LVL_N="svg2lvl"
-LVL_V="0.3.0"
-LVL="${LVL_N}-${LVL_V}"
-
+LVL="svg2lvl-0.3.0"
 DESCRIPTION="A challenging 2D motocross platform game"
 HOMEPAGE="http://xmoto.tuxfamily.org"
 SRC_URI="http://download.tuxfamily.org/${PN}/${PN}/${PV}/${P}-src.tar.gz
@@ -37,6 +34,7 @@ src_unpack() {
 	cd "${S}"
 	sed -i 's:$(localedir):/usr/share/locale:' po/Makefile.in.in \
 		|| die "sed Makefile.in.in failed"
+	use editor && rm -f "${WORKDIR}"/${LVL}/{bezmisc,inkex}.py
 }
 
 src_compile() {
@@ -60,17 +58,16 @@ src_install() {
 
 	if use editor; then
 	  insinto /usr/share/inkscape/extensions
-	  doins ${WORKDIR}/${LVL}/*.inx
-	  doins ${WORKDIR}/${LVL}/*.py
-	  doins ${WORKDIR}/${LVL}/*.xml
+	  doins "${WORKDIR}"/${LVL}/*.{inx,py,xml} || die "doins failed"
 	fi
 }
 
 pkg_postinst() {
+	games_pkg_postinst
 	if use editor; then
-	  einfo "If you want to know how to create xmoto-levels"
-	  einfo "have a look at this Tutorial:"
-	  einfo "http://wiki.xmoto.free.fr/index.php?title=Inkscape-0.3.0#Tutorial"
-	  einfo "You can share your levels on the xmoto-homepage."
+	  elog "If you want to know how to create Xmoto levels"
+	  elog "have a look at this Tutorial:"
+	  elog "http://wiki.xmoto.free.fr/index.php?title=Inkscape-0.3.0#Tutorial"
+	  elog "You can share your levels on the Xmoto homepage."
 	fi
 }