Removed installation of example INDI code. This resolves the file collisions with media-graphics/feh (see bug #224705).

Package-Manager: portage-2.2_rc5/cvs/Linux 2.6.26-SENTINEL-1 i686

3 files changed, 13 insertions, 21 deletions

diff --git a/sci-astronomy/xephem/ChangeLog b/sci-astronomy/xephem/ChangeLog
index cf2e2039a4c3..97e5f530f86b 100644
--- a/sci-astronomy/xephem/ChangeLog
+++ b/sci-astronomy/xephem/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-astronomy/xephem
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xephem/ChangeLog,v 1.30 2008/07/05 15:57:29 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xephem/ChangeLog,v 1.31 2008/08/09 02:28:40 markusle Exp $
+
+  09 Aug 2008; Markus Dittrich <markusle@gentoo.org> xephem-3.7.3.ebuild:
+  Removed installation of example INDI code. This resolves the file
+  collisions with media-graphics/feh (see bug #224705).
 
   05 Jul 2008; Markus Meier <maekke@gentoo.org> xephem-3.7.3.ebuild:
   amd64 stable, bug #229885
diff --git a/sci-astronomy/xephem/Manifest b/sci-astronomy/xephem/Manifest
index 9fee30c82914..bea34d92a449 100644
--- a/sci-astronomy/xephem/Manifest
+++ b/sci-astronomy/xephem/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 3.7.2.patch 1290 RMD160 e1f2e66a1b417b2fb66a3c13e74760d8f87977f5 SHA1 5d49ec0a316943287a94ad473778b56db02bf7f2 SHA256 c314c3f969eb13cf2151c4698e0721cebe714e62263d15dc3a7406daecf94a35
 AUX xephem-3.7.3-use-system-lib.patch 1528 RMD160 885ba835c49451963832bbf9bf5428470dcfb293 SHA1 52fe41ffac51863e9ad247cf86412599ec00290b SHA256 6eef7fe09b9b8020197e1627d4d63372f320f1d0bb5291002f677f979caa8aef
 DIST xephem-3.7.2.tar.gz 19369598 RMD160 585ed51d167869919b512561714d380c83db8865 SHA1 8027f73e934e257316d15c474c88d435241c521d SHA256 51697f36e08000fc5f8f5e5edc570f82c92d0b323331291877814410396d0354
 DIST xephem-3.7.3.tar.gz 22148450 RMD160 d292a30cd6acbdd5dabf345aefd34b596534ce68 SHA1 b19c528097f7357e90a18bc605128eca9394b748 SHA256 450fa05a36ce4c8ceca80bd5a003c060bc4d9e07719aebcb13565b563b90e337
 EBUILD xephem-3.7.2.ebuild 2271 RMD160 e0693a6b0ec3cb35ec3a1f8a1843584324a2a239 SHA1 d45b122526bb65ea4f1d1272cfc823bceaad59fd SHA256 b6f7d0dde2e57f5ff658d786f8d981a47c6ef2c8afd040cc747dcf42e98088c9
-EBUILD xephem-3.7.3.ebuild 2441 RMD160 65a96918fbdc4e9ec7ddbad85e79765adfbe7ff2 SHA1 3e1623f625eb29e05260491951a0cf4333458901 SHA256 e28cd885a1f9dbacbd49ef1d4557f0a9e1cd6f574338a7dad1a4ff3333589ac8
-MISC ChangeLog 6792 RMD160 9a22a62ecdf3d3d2b40b9ef770de89162c0d00c4 SHA1 138d2eca54281a3d668ed929f2e756f3707486bc SHA256 865dbba1316a22c6bbc6293633a90aa7b6d9b518bbcaaec733ea54a0c9851ff1
+EBUILD xephem-3.7.3.ebuild 2367 RMD160 e58e558bf37fde2444b71c3ed8cf3db33d05e79c SHA1 f819059fe4a50e5bbd2870f2fee49f3ecbab262b SHA256 be6eef61f12b3e8609344a1af3a3e4110a792826fb6a0f0f4a78b1c8b467ac54
+MISC ChangeLog 6993 RMD160 b97f33536e82678179ac9ad6f64e1240862427d7 SHA1 37e5fb89192983d5442fa194c386f35da214edf5 SHA256 50dc01c1cc129140e996d2c2346a943c28e713a76567824589c611bd60f91a7b
 MISC metadata.xml 607 RMD160 5306c189a61a6ba80120f1710ecf8a93f956b45c SHA1 81b781ce504bd9e905fdd50e4266576436014114 SHA256 3cc09e691f00a06ccfc77a1561e8176128474398ecf451f4a668415494082109
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkhvmi4ACgkQkKaRLQcq0GInngCfWnYa+XjyM4+aztf3hfnUZK/w
-cqsAn2rPdDxZaSfalgfuVfxryDIfmoip
-=L3d+
------END PGP SIGNATURE-----
diff --git a/sci-astronomy/xephem/xephem-3.7.3.ebuild b/sci-astronomy/xephem/xephem-3.7.3.ebuild
index 44850c1b87c9..559897f2a0f7 100644
--- a/sci-astronomy/xephem/xephem-3.7.3.ebuild
+++ b/sci-astronomy/xephem/xephem-3.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xephem/xephem-3.7.3.ebuild,v 1.8 2008/07/05 15:57:29 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xephem/xephem-3.7.3.ebuild,v 1.9 2008/08/09 02:28:40 markusle Exp $
 
 inherit eutils
 
@@ -11,8 +11,7 @@ KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
 IUSE=""
 SLOT="0"
 LICENSE="as-is"
-DEPEND="!media-gfx/feh
-	x11-libs/openmotif
+DEPEND="x11-libs/openmotif
 	media-libs/jpeg
 	media-libs/libpng"
 
@@ -22,8 +21,8 @@ src_unpack() {
 
 	# make sure we use system libs not the ones that
 	# ship with the xephem tarball
-	rm -fr libjpegd/ libpng/ libz/ libXm/ \
-		|| die "Failed to remove unneeded libs"
+	rm -fr libjpegd/ libpng/ libz/ libXm/ GUI/xephem/tools/indi \
+		|| die "Failed to remove unneeded libs and tools"
 	epatch "${FILESDIR}"/${P}-use-system-lib.patch
 
 	for i in libastro/Makefile libip/Makefile liblilxml/Makefile \
@@ -63,11 +62,10 @@ src_install() {
 	into /usr
 	cd "${S}"/GUI/xephem
 	dobin xephem  || die "dobin xephem failed"
-	for file in tools/indi/{evalINDI,getINDI,setINDI,tmount,ota,wx,cam,security,indiserver} \
-		tools/{lx200xed/lx200xed,xedb/xedb,xephemdbd/xephemdbd}; do
+	for file in tools/{lx200xed/lx200xed,xedb/xedb,xephemdbd/xephemdbd}; do
 		dobin ${file} || die "dobin ${file} failed"
 	done
-	doman xephem.1 tools/*/*.1
+	doman xephem.1
 	mv tools .. # do not install tool sources into share directory
 	for i in $(find . -mindepth 1 -type d); do
 		insinto /usr/share/${PN}/${i}