Fix repoman issues

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

9 files changed, 23 insertions, 141 deletions

diff --git a/x11-misc/icewmcp/Manifest b/x11-misc/icewmcp/Manifest
index 2d8dfc163926..b104c5e51a17 100644
--- a/x11-misc/icewmcp/Manifest
+++ b/x11-misc/icewmcp/Manifest
@@ -1,5 +1,4 @@
 DIST IceWMControlPanel-3.2.tar.bz2 586044 RMD160 8637ae5f4b28c2a7a8187dd9f02e6317c6ff925f SHA1 13dcea63146123342cf8c384675fce37a161a184 SHA256 6259d27b5de151049b245cac17606ba77d055766ef1706363dc301085c925af9
-EBUILD icewmcp-3.2-r1.ebuild 2453 RMD160 e58d35dd9215672d9f6e098fcae51f0904e2ebfd SHA1 493b23765a202a3a8084dcd0b3aa50127dc82f75 SHA256 faef91d2f50a2d4383da2eab146808ac04cd26e62899784ddbf43807c9934ec2
 EBUILD icewmcp-3.2-r2.ebuild 2549 RMD160 a96a0ae9c83de4957a899d31aa23d82ef7f14458 SHA1 1ebd9db78c35340831c5424cb92a0348bee2dc3e SHA256 1e58d2165f8579109d19f8a6c7dbc850c01c261d81236a76834e481347862e27
 MISC ChangeLog 1668 RMD160 14bf9b1b74f729b18b3614a93813c8024bd2a2c1 SHA1 93cc9981d19de0018ab6fc20773887106b17b4d8 SHA256 65c81f6781608f00f72f1df7e16c81eb9f31645e7f0193a1407013ef3d0eddfc
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
diff --git a/x11-misc/icewmcp/icewmcp-3.2-r1.ebuild b/x11-misc/icewmcp/icewmcp-3.2-r1.ebuild
deleted file mode 100644
index 6f288b045e9d..000000000000
--- a/x11-misc/icewmcp/icewmcp-3.2-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/icewmcp/icewmcp-3.2-r1.ebuild,v 1.1 2006/10/11 13:24:35 nelchael Exp $
-
-inherit multilib
-
-S=${WORKDIR}/INSTALL-IceWMCP
-MY_PN=IceWMControlPanel
-MY_DEST="usr/$(get_libdir)/${P}"
-MY_BIN="usr/bin"
-
-DESCRIPTION="A complete control panel for IceWM using gtk & python"
-HOMEPAGE="http://icesoundmanager.sourceforge.net/index.php"
-SRC_URI="mirror://sourceforge/icesoundmanager/${MY_PN}-${PV}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="x86 ppc ~amd64"
-IUSE=""
-DEPEND="x11-wm/icewm
-		>=dev-python/pygtk-1.99
-		>=x11-libs/gtk+-2.0.0
-		>=dev-lang/python-2.2"
-
-src_install() {
-	dodir "${MY_DEST}/"
-	dodir "${MY_BIN}/"
-	dodoc ${S}/doc/* ${S}/licenses/*
-	cp ${S}/* ${D}/${MY_DEST}
-	cp -R ${S}/applets ${S}/applet-icons ${S}/help ${S}/icons ${S}/locale ${S}/pixmaps ${D}/${MY_DEST}/
-	# create executable shortcuts to the python scripts
-	echo -e "#!/bin/bash \n python /${MY_DEST}/IceWMCP.py" > ${T}/IceWMCP
-	echo -e "#!/bin/bash \n python /${MY_DEST}/IceWMCPKeyboard.py" > ${T}/IceWMCP-Keyboard
-	echo -e "#!/bin/bash \n python /${MY_DEST}/IceWMCPMouse.py" > ${T}/IceWMCP-Mouse
-	echo -e "#!/bin/bash \n python /${MY_DEST}/pyspool.py" > ${T}/IceWMCP-PySpool
-	echo -e "#!/bin/bash \n python /${MY_DEST}/IceWMCPWallpaper.py" > ${T}/IceWMCP-Wallpaper
-	echo -e "#!/bin/bash \n python /${MY_DEST}/IceWMCPWinOptions.py" > ${T}/IceWMCP-WinOptions
-	echo -e "#!/bin/bash \n python /${MY_DEST}/phrozenclock.py" > ${T}/PhrozenClock
-	echo -e "#!/bin/bash \n python /${MY_DEST}/icesound.py" > ${T}/IceSoundManager
-	echo -e "#!/bin/bash \n python /${MY_DEST}/IceWMCP_GtkPCCard.py" > ${T}/GtkPCCard
-	echo -e "#!/bin/bash \n python /${MY_DEST}/IceMe.py" > ${T}/iceme
-	echo -e "#!/bin/bash \n python /${MY_DEST}/icepref.py" > ${T}/icepref
-	echo -e "#!/bin/bash \n python /${MY_DEST}/icepref_td.py" > ${T}/icepref_td
-	echo -e "#!/bin/bash \n python /${MY_DEST}/IceWMCPGtkIconSelection.py" > ${T}/IceWMCP-Icons
-	echo -e "#!/bin/bash \n python /${MY_DEST}/IceWMCPEnergyStar.py" > ${T}/IceWMCP-EnergyStar
-	dobin ${T}/*
-}
-
-pkg_postinst() {
-	einfo "Some of the icons displayed by IceWMCP may be pointing to"
-	einfo "programs which are not on your system!  You can hide them"
-	einfo "using the Configuration window (Ctrl+C) or change them"
-	einfo "by editing the files in"
-	einfo "/${MY_DEST}/applets and"
-	einfo "/${MY_DEST}/applet-icons."
-}
diff --git a/x11-misc/service-discovery-applet/service-discovery-applet-0.4.3-r1.ebuild b/x11-misc/service-discovery-applet/service-discovery-applet-0.4.3-r1.ebuild
index 813e6ba990a9..49289beb2947 100644
--- a/x11-misc/service-discovery-applet/service-discovery-applet-0.4.3-r1.ebuild
+++ b/x11-misc/service-discovery-applet/service-discovery-applet-0.4.3-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/service-discovery-applet/service-discovery-applet-0.4.3-r1.ebuild,v 1.2 2009/01/06 20:54:45 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/service-discovery-applet/service-discovery-applet-0.4.3-r1.ebuild,v 1.3 2010/07/22 11:25:40 ssuominen Exp $
 
-inherit eutils gnome2
+EAPI=2
+inherit gnome2
 
 DESCRIPTION="Service Discovery Applet"
 HOMEPAGE="http://0pointer.de/~sebest/"
@@ -20,25 +21,11 @@ RDEPEND=">=dev-lang/python-2.4
 	>=dev-python/pygtk-2.0
 	gnome-base/gconf
 	dev-python/dbus-python
-	net-dns/avahi"
+	net-dns/avahi[gdbm,python]"
 DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.21"
+	dev-util/intltool"
 
 pkg_setup() {
-	if ! built_with_use net-dns/avahi python || ! ( has_version dev-python/dbus-python || built_with_use sys-apps/dbus python )
-	then
-		die "Sorry, but you need net-dns/avahi and sys-apps/dbus compiled with python support."
-	fi
-
-	if ! built_with_use net-dns/avahi gdbm
-	then
-		die "Sorry, but you need net-dns/avahi compiled with gdbm support."
-	fi
-
+	DOCS="AUTHORS README"
 	G2CONF="${G2CONF} --disable-schemas-install"
 }
-
-src_install() {
-	USE_DESTDIR="1" gnome2_src_install
-	dodoc AUTHORS README
-}
diff --git a/x11-misc/service-discovery-applet/service-discovery-applet-0.4.3.ebuild b/x11-misc/service-discovery-applet/service-discovery-applet-0.4.3.ebuild
deleted file mode 100644
index beeab08e1dbb..000000000000
--- a/x11-misc/service-discovery-applet/service-discovery-applet-0.4.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/service-discovery-applet/service-discovery-applet-0.4.3.ebuild,v 1.7 2009/01/06 20:54:45 swegener Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="Service Discovery Applet"
-HOMEPAGE="http://0pointer.de/~sebest/"
-SRC_URI="http://0pointer.de/~sebest/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/python-2.4
-	>=dev-python/gnome-python-desktop-2.14.0
-	>=dev-python/pygtk-2.0
-	gnome-base/gconf
-	dev-python/dbus-python
-	net-dns/avahi"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.21"
-
-pkg_setup() {
-	if ! built_with_use net-dns/avahi python || ! ( has_version dev-python/dbus-python || built_with_use sys-apps/dbus python )
-	then
-		die "Sorry, but you need net-dns/avahi and sys-apps/dbus compiled with python support."
-	fi
-
-	if ! built_with_use net-dns/avahi gdbm
-	then
-		die "Sorry, but you need net-dns/avahi compiled with gdbm support."
-	fi
-
-	G2CONF="${G2CONF} --disable-schemas-install"
-}
-
-src_install() {
-	USE_DESTDIR="1" gnome2_src_install
-	dodoc AUTHORS README
-}
diff --git a/x11-misc/synergy-plus/synergy-plus-1.3.4.ebuild b/x11-misc/synergy-plus/synergy-plus-1.3.4.ebuild
index 819d73c8b0f9..e9c49b0d1c5c 100644
--- a/x11-misc/synergy-plus/synergy-plus-1.3.4.ebuild
+++ b/x11-misc/synergy-plus/synergy-plus-1.3.4.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy-plus/synergy-plus-1.3.4.ebuild,v 1.4 2010/06/11 19:52:24 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy-plus/synergy-plus-1.3.4.ebuild,v 1.5 2010/07/22 11:32:34 ssuominen Exp $
 
 EAPI="2"
 
-DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple
-computers. An active fork of synergy"
+DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple computers"
 SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
 #SRC_URI="mirror://google/files/${PN}/${P}.tar.gz"
 HOMEPAGE="http://code.google.com/p/synergy-plus/"
diff --git a/x11-misc/xdaf/xdaf-0.01.11.01.ebuild b/x11-misc/xdaf/xdaf-0.01.11.01.ebuild
index f06d6ba3bdb7..ae3285b2f981 100644
--- a/x11-misc/xdaf/xdaf-0.01.11.01.ebuild
+++ b/x11-misc/xdaf/xdaf-0.01.11.01.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdaf/xdaf-0.01.11.01.ebuild,v 1.8 2006/10/22 00:28:08 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdaf/xdaf-0.01.11.01.ebuild,v 1.9 2010/07/22 11:32:06 ssuominen Exp $
 
 MY_P=${P/-0/-A}
 
-DESCRIPTION="Small tool to provide visual feedback of local disks activity by changing the default X11 mouse pointer"
+DESCRIPTION="A tool to provide visual feedback of local disks activity by changing the default X11 mouse pointer"
 HOMEPAGE="http://ezix.sourceforge.net/software/xdaf.html"
 SRC_URI="mirror://sourceforge/ezix/${MY_P}.tar.gz"
 
diff --git a/x11-misc/xsri/xsri-2.1.0-r1.ebuild b/x11-misc/xsri/xsri-2.1.0-r1.ebuild
index 9788003a2745..02beaaf0eda8 100644
--- a/x11-misc/xsri/xsri-2.1.0-r1.ebuild
+++ b/x11-misc/xsri/xsri-2.1.0-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xsri/xsri-2.1.0-r1.ebuild,v 1.6 2008/05/06 13:41:08 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xsri/xsri-2.1.0-r1.ebuild,v 1.7 2010/07/22 11:29:44 ssuominen Exp $
 
 inherit base rpm
 
 DESCRIPTION="The xsri wallpaper setter from RedHat"
 HOMEPAGE="http://fedora.redhat.com/"
-SRC_URI="http://download.fedora.redhat.com/pub/fedora/linux/core/5/source/SRPMS/${P}-9.2.1.src.rpm"
+SRC_URI="mirror://fedora/5/source/SRPMS/${P}-9.2.1.src.rpm"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-misc/xsri/xsri-2.1.0.ebuild b/x11-misc/xsri/xsri-2.1.0.ebuild
index 9c3e4dcd432e..f5c627aba582 100644
--- a/x11-misc/xsri/xsri-2.1.0.ebuild
+++ b/x11-misc/xsri/xsri-2.1.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xsri/xsri-2.1.0.ebuild,v 1.6 2008/05/06 13:41:08 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xsri/xsri-2.1.0.ebuild,v 1.7 2010/07/22 11:29:44 ssuominen Exp $
 
 inherit base rpm
 
 DESCRIPTION="The xsri wallpaper setter from RedHat"
 HOMEPAGE="http://fedora.redhat.com/"
-SRC_URI="http://download.fedora.redhat.com/pub/fedora/linux/core/4/SRPMS/${P}-9.src.rpm"
+SRC_URI="mirror://gentoo/${P}-9.src.rpm"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-misc/xwrits/xwrits-2.21.ebuild b/x11-misc/xwrits/xwrits-2.21.ebuild
index bac9862bcdb6..56d36c1a2632 100644
--- a/x11-misc/xwrits/xwrits-2.21.ebuild
+++ b/x11-misc/xwrits/xwrits-2.21.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xwrits/xwrits-2.21.ebuild,v 1.17 2007/08/02 13:44:55 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xwrits/xwrits-2.21.ebuild,v 1.18 2010/07/22 11:31:15 ssuominen Exp $
 
-DESCRIPTION="Xwrits reminds you to take wrist breaks, which will hopefully help you prevent repetitive stress injury."
+DESCRIPTION="Reminds you to take wrist breaks, which will hopefully help you prevent repetitive stress injury."
 HOMEPAGE="http://www.lcdf.org/xwrits/"
 SRC_URI="http://www.lcdf.org/${PN}/${P}.tar.gz"
 
@@ -18,12 +18,7 @@ DEPEND="${RDEPEND}
 	x11-proto/xproto
 	x11-proto/xineramaproto"
 
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
+src_install() {
+	emake DESTDIR="${D}" install || die
 	dodoc GESTURES NEWS README
 }