app-portage/portato: Version bump to 0.8.5

svn path=/sunrise/; revision=4503

3 files changed, 30 insertions, 15 deletions

diff --git a/app-portage/portato/ChangeLog b/app-portage/portato/ChangeLog
index 7b38a480b..1c9ac6684 100644
--- a/app-portage/portato/ChangeLog
+++ b/app-portage/portato/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  26 Aug 2007; René Neumann (Necoro) <necoro@necoro.net>
+  -portato-0.8.1.ebuild, +portato-0.8.5.ebuild:
+  Version bump to 0.8.5
+
   24 Aug 2007; René Neumann (Necoro) <necoro@necoro.net>
   portato-0.8.1.ebuild:
   Revert change. vte-0.18.6 works now
diff --git a/app-portage/portato/Manifest b/app-portage/portato/Manifest
index f6b9b9318..d11a22c36 100644
--- a/app-portage/portato/Manifest
+++ b/app-portage/portato/Manifest
@@ -1,4 +1,4 @@
-DIST portato-0.8.1.tar.gz 111105 RMD160 6b8d7df5e22e949f1b2d2e1eae20961a75169b40 SHA1 919166cf3ecf2494315b0e747423cf2781b273e5 SHA256 cbfdb6f2e17960a2d75eb873bd04cfa179c9d10d8d5b2874a4ad4f8574c99ad4
-EBUILD portato-0.8.1.ebuild 2418 RMD160 6e6f79da1cc9d023943aa6ef310b2b8d8f169b8d SHA1 e805ac4f0abf092297ecdf5c3a7fae74a8fb4849 SHA256 0749ac619412554ac9c2f12c0ee742cc22bca699339e87d6b6a1321a9f1fc7c8
-MISC ChangeLog 1687 RMD160 484a80afca246d7b865b34df5a47d2b0c3536240 SHA1 b9e7a0e42003a2e4a07a12c36efafcc747638453 SHA256 7a503bdf104b878b15b28e9b69af5c1f2f1274bc33f42b83fb725d257832bf8c
+DIST portato-0.8.5.tar.gz 97633 RMD160 70464bd4176ff17c65ed6ad763404df6bae56905 SHA1 791c90cb5882c41f2304e6686ffd118181783d6e SHA256 1c9c9ae2f93fb775cff2fa766e5b05a9c028e51c94c118f7a59afe9953aeb930
+EBUILD portato-0.8.5.ebuild 2668 RMD160 022d969e89340dfb62dc99e66c1edf6c9e921243 SHA1 a5da1d3aba6acee3ab31be21dbd359908b40fcfa SHA256 82128050eabdfb93bf10ee2eb4c0f3f8c4a016df910949bac416fa953d8779f4
+MISC ChangeLog 1818 RMD160 dc169db59fa7dc9706e41e2dc8ae13fc0310854e SHA1 a8e03e03121864ce64143b6d2edc25442d9ddd61 SHA256 b86157f703cb4f0cfb0c54db5673589b1d897875e5912ec89cdfcb9f803662ad
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/app-portage/portato/portato-0.8.1.ebuild b/app-portage/portato/portato-0.8.5.ebuild
index 067123775..1e9324cca 100644
--- a/app-portage/portato/portato-0.8.1.ebuild
+++ b/app-portage/portato/portato-0.8.5.ebuild
@@ -10,8 +10,8 @@ SRC_URI="mirror://sourceforge/portato/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="kde userpriv etcproposals"
+KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE="kde libnotify nls userpriv"
 
 RDEPEND=">=sys-apps/portage-2.1.2
 		>=dev-python/lxml-1.3.2
@@ -22,11 +22,13 @@ RDEPEND=">=sys-apps/portage-2.1.2
 		!kde? ( !userpriv? ( >=x11-libs/gksu-2.0.0 ) )
 		kde? ( !userpriv? ( || ( >=kde-base/kdesu-3.5.5 >=kde-base/kdebase-3.5.5
 		) ) )
-		etcproposals? ( >=app-portage/etcproposals-1.0 )"
+		nls? ( virtual/libintl )
+		libnotify? ( >=dev-python/notify-python-0.1.1 )"
 
 S="${WORKDIR}/${PN}"
 CONFIG_DIR="/etc/${PN}/"
 DATA_DIR="/usr/share/${PN}/"
+LOCALE_DIR="/usr/share/locale/"
 PLUGIN_DIR="${DATA_DIR}/plugins"
 ICON_DIR="${DATA_DIR}/icons"
 
@@ -38,22 +40,28 @@ apply_sed ()
 	local std="gtk"
 	local frontends="[\"$std\"]"
 
-	sed -i -e "s;^\(VERSION\s*=\s*\).*;\1\"${PV}\";" \
+	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}\";" \
 			-e "s;^\(CONFIG_DIR\s*=\s*\).*;\1\"${CONFIG_DIR}\";" \
 			-e "s;^\(DATA_DIR\s*=\s*\).*;\1\"${DATA_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;" \
 			constants.py
 
 	cd ..
-	local su="gksu -D \"Portato\" -u root portato gtk"
-	use kde && su="kdesu -t --nonewdcop -c portato gtk"
-	use userpriv && su="portato gtk"
 
-	sed -i -e "s/Exec=.*/Exec=${su}/" portato.desktop
+	# 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 ()
@@ -68,9 +76,10 @@ pkg_setup ()
 
 src_compile ()
 {
-	pushd "${S}/${PN}" > /dev/null
 	apply_sed || die "Applying sed-commands failed."
-	popd > /dev/null
+
+	cd ${S}
+	use nls && ./pocompile.sh -emerge
 
 	distutils_src_compile
 }
@@ -91,12 +100,14 @@ src_install ()
 	insinto ${PLUGIN_DIR}
 	keepdir ${PLUGIN_DIR}
 
-	use userpriv && doins "plugins/noroot.xml"
-	use etcproposals && doins "plugins/etc_proposals.xml"
+	use libnotify && doins "plugins/notify.xml"
 
 	# icon
 	doicon icons/portato-icon.png
 
 	# menus
 	domenu portato.desktop
+
+	# nls
+	use nls && domo i18n/mo/*
 }