Version bump from Necoro and drop old

(Portage version: 2.1.3.13)

4 files changed, 48 insertions, 44 deletions

diff --git a/app-portage/portato/ChangeLog b/app-portage/portato/ChangeLog
index 2e58f1a00f0e..61fba7e90437 100644
--- a/app-portage/portato/ChangeLog
+++ b/app-portage/portato/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-portage/portato
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/portato/ChangeLog,v 1.1 2007/09/09 21:10:34 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/portato/ChangeLog,v 1.2 2007/10/20 17:03:43 jokey Exp $
+
+*portato-0.8.6 (20 Oct 2007)
+
+  20 Oct 2007; Markus Ullmann <jokey@gentoo.org> -portato-0.8.5.ebuild,
+  +portato-0.8.6.ebuild:
+  Version bump from Necoro and drop old
 
 *portato-0.8.5 (09 Sep 2007)
 
diff --git a/app-portage/portato/files/digest-portato-0.8.5 b/app-portage/portato/files/digest-portato-0.8.5
deleted file mode 100644
index d0e646c33721..000000000000
--- a/app-portage/portato/files/digest-portato-0.8.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 95598d5f7dd0296f9929ff27ceccf36f portato-0.8.5.tar.gz 97633
-RMD160 70464bd4176ff17c65ed6ad763404df6bae56905 portato-0.8.5.tar.gz 97633
-SHA256 1c9c9ae2f93fb775cff2fa766e5b05a9c028e51c94c118f7a59afe9953aeb930 portato-0.8.5.tar.gz 97633
diff --git a/app-portage/portato/files/digest-portato-0.8.6 b/app-portage/portato/files/digest-portato-0.8.6
new file mode 100644
index 000000000000..01b749ffd239
--- /dev/null
+++ b/app-portage/portato/files/digest-portato-0.8.6
@@ -0,0 +1,3 @@
+MD5 417fb1bbf9f7536e6d007727d0b1b25d portato-0.8.6.tar.gz 98020
+RMD160 3b55d59af5a77fd8e5a4a067b7d5c1543273d42e portato-0.8.6.tar.gz 98020
+SHA256 53d06c91497dd6685e6f12b6aa7b280c9f542cc2aba1a453dff70c34a5c9940b portato-0.8.6.tar.gz 98020
diff --git a/app-portage/portato/portato-0.8.5.ebuild b/app-portage/portato/portato-0.8.6.ebuild
index e3e90d8296d3..639018a6c8f1 100644
--- a/app-portage/portato/portato-0.8.5.ebuild
+++ b/app-portage/portato/portato-0.8.6.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/portato/portato-0.8.5.ebuild,v 1.1 2007/09/09 21:10:34 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/portato/portato-0.8.6.ebuild,v 1.1 2007/10/20 17:03:43 jokey Exp $
 
-inherit eutils distutils
+NEED_PYTHON="2.5"
+inherit python eutils distutils
 
 DESCRIPTION="A GUI for Portage written in Python."
-HOMEPAGE="http://portato.sourceforge.net/"
-SRC_URI="mirror://sourceforge/portato/${P}.tar.gz"
+HOMEPAGE="http://portato.origo.ethz.ch/"
+SRC_URI="http://download.origo.ethz.ch/portato/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="kde libnotify nls userpriv"
 
 RDEPEND=">=sys-apps/portage-2.1.2
@@ -18,7 +19,7 @@ RDEPEND=">=sys-apps/portage-2.1.2
 		>=dev-python/pygtk-2.10.4
 		>=x11-libs/vte-0.12.2
 		>=gnome-base/libglade-2.5.1
-		>=dev-util/portatosourceview-2.16.1
+		>=dev-python/pygtksourceview-2.0.0
 
 		!userpriv? (
 			kde? ( || ( >=kde-base/kdesu-3.5.5 >=kde-base/kdebase-3.5.5	) )
@@ -27,19 +28,36 @@ RDEPEND=">=sys-apps/portage-2.1.2
 		libnotify? ( >=dev-python/notify-python-0.1.1 )
 		nls? ( virtual/libintl )"
 
-DEPEND="${RDEPEND}
-		nls? ( sys-devel/gettext )"
+# only needs gettext as build dependency
+# python should be set as DEPEND in the python-eclass
+DEPEND="nls? ( sys-devel/gettext )"
 
 S="${WORKDIR}/${PN}"
-CONFIG_DIR="/etc/${PN}/"
-DATA_DIR="/usr/share/${PN}/"
-LOCALE_DIR="/usr/share/locale/"
+CONFIG_DIR="etc/${PN}/"
+DATA_DIR="usr/share/${PN}/"
+LOCALE_DIR="usr/share/locale/"
 PLUGIN_DIR="${DATA_DIR}/plugins"
 ICON_DIR="${DATA_DIR}/icons"
 
 apply_sed ()
 {
-	cd "${S}"/${PN}
+	cd "${S}/${PN}"
+
+}
+
+pkg_setup ()
+{
+	if ! built_with_use x11-libs/vte python; then
+		echo
+		eerror "x11-libs/vte has not been built with python support."
+		eerror "Please re-emerge vte with the python use-flag enabled."
+		die "missing python flag for x11-libs/vte"
+	fi
+}
+
+src_compile ()
+{
+	cd "${S}"
 
 	# currently only gtk is supported
 	local std="gtk"
@@ -48,42 +66,24 @@ apply_sed ()
 	local su="\"gksu -D 'Portato'\""
 	use kde && su="\"kdesu -t --nonewdcop -i %s -c\" % APP_ICON"
 
-	sed -i  -e "s;^\(VERSION\s*=\s*\).*;\1\"${PV}\";" \
+	sed -i 	-e "s;^\(VERSION\s*=\s*\).*;\1\"${PV}\";" \
 			-e "s;^\(CONFIG_DIR\s*=\s*\).*;\1\"${CONFIG_DIR}\";" \
 			-e "s;^\(DATA_DIR\s*=\s*\).*;\1\"${DATA_DIR}\";" \
+			-e "s;^\(TEMPLATE_DIR\s*=\s*\).*;\1DATA_DIR;" \
 			-e "s;^\(ICON_DIR\s*=\s*\).*;\1\"${ICON_DIR}\";" \
-			-e "s;^\(PLUGIN_DIR\s*=\s*\).*;\1\"${PLUGIN_DIR}\";" \
-			-e "s;^\(XSD_DIR\s*=\s*\).*;\1\"${DATA_DIR}\";" \
 			-e "s;^\(LOCALE_DIR\s*=\s*\).*;\1\"${LOCALE_DIR}\";" \
-			-e "s;^\(FRONTENDS\s*=\s*\).*;\1$frontends;" \
-			-e "s;^\(STD_FRONTEND\s*=\s*\).*;\1\"$std\";" \
-			-e "s;^\(SU_COMMAND\s*=\s*\).*;\1$su;" \
+			-e "s;^\(FRONTENDS\s*=\s*\).*;\1${frontends};" \
+			-e "s;^\(STD_FRONTEND\s*=\s*\).*;\1\"${std}\";" \
+			-e "s;^\(SU_COMMAND\s*=\s*\).*;\1${su};" \
+			-e "s;^\(USE_CATAPULT\s*=\s*\).*;\1False;" \
 			constants.py
 
-	cd ..
-
 	# don't do this as "use userpriv && ..." as it makes the whole function
 	# fail, if userpriv is not set
 	if use userpriv; then
 		sed -i -e "s/Exec=.*/Exec=portato --no-listener/" portato.desktop
 	fi
-}
 
-pkg_setup ()
-{
-	if ! built_with_use x11-libs/vte python; then
-		echo
-		eerror "x11-libs/vte has not been built with python support."
-		eerror "Please re-emerge vte with the python use-flag enabled."
-		die "missing python flag for x11-libs/vte"
-	fi
-}
-
-src_compile ()
-{
-	apply_sed || die "Applying sed-commands failed."
-
-	cd ${S}
 	use nls && ./pocompile.sh -emerge
 
 	distutils_src_compile
@@ -105,12 +105,10 @@ src_install ()
 	insinto ${PLUGIN_DIR}
 	keepdir ${PLUGIN_DIR}
 
-	use libnotify && doins "plugins/notify.xml"
+	use libnotify && doins plugins/notify.xml
 
-	# icon
+	# desktop
 	doicon icons/portato-icon.png
-
-	# menus
 	domenu portato.desktop
 
 	# nls