app-portage/portato: Version bump portato

svn path=/sunrise/; revision=4347

3 files changed, 36 insertions, 54 deletions

diff --git a/app-portage/portato/ChangeLog b/app-portage/portato/ChangeLog
index ceaa86c21..409df630e 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: $
 
+  30 Jul 2007; René Neumann (Necoro) <necoro@necoro.net>
+  -portato-0.7.5.ebuild, +portato-0.8.0.ebuild:
+  Version bump portato
+
   23 Jun 2007; René Neumann (Necoro) <necoro@necoro.net>
   -portato-0.7.4.2.ebuild, +portato-0.7.5.ebuild:
   Version bump
diff --git a/app-portage/portato/Manifest b/app-portage/portato/Manifest
index 9629f179f..c6968f7b8 100644
--- a/app-portage/portato/Manifest
+++ b/app-portage/portato/Manifest
@@ -1,4 +1,4 @@
-DIST portato-0.7.5.tar.gz 96695 RMD160 b993eef6af4327ffcaa698e9fc426747a7932dd0 SHA1 b65bccc24bd94d4a51e6e18dba7124e6147bdaeb SHA256 528792c9425f4c69ea9f4d853eef007211918d44aa18172ef597e8f48ff4728a
-EBUILD portato-0.7.5.ebuild 2756 RMD160 09a238f4b8d85cf395cb07b16cbedb09fb01d1aa SHA1 a09b1741b18e48fd64b0b99a1679bdfd732c7abc SHA256 bd2965815ad2d2925da413cf16cb06a093595a46e58f31ac2766df12fc478cd4
-MISC ChangeLog 1063 RMD160 672f5bbaaed78274c4d58f35afcad0f630abf13c SHA1 692656bf6e08112660c184b290026cfffea5b8f0 SHA256 c1cdbb34876845e88ddc957f831abe36e75d6b873e0d1e3e894c78685bad54c9
+DIST portato-0.8.0.tar.gz 111078 RMD160 c0c6cfe11badd4be98870515de53b8eb9d0c372d SHA1 6c08e05040518fc91fae9cb690f479054da8390b SHA256 d7082453362846b5f622e8f5beb2283d2d176692bdbc8d860d93d6f0e6e5cf45
+EBUILD portato-0.8.0.ebuild 2385 RMD160 873a19d7ddc1e973b124a1d44c1d930fb8c086b3 SHA1 a1ef2af0aa0d58c2fe391558c41d7733fd61283b SHA256 cb95c326ada5d2d90cdbc5f462df2fdbc5791101b6995c72e6da875c98e16afe
+MISC ChangeLog 1193 RMD160 16f9abf54368ecc61be8c5a842b13d8e91b9f4a9 SHA1 623dea0a22bb8efd176a796c1ff5c8c702619d41 SHA256 789e983b25c08959b8cd85072cea9c92423b1018cece83a248cd1ef61ab7d71c
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/app-portage/portato/portato-0.7.5.ebuild b/app-portage/portato/portato-0.8.0.ebuild
index f3980e397..c870e8ec8 100644
--- a/app-portage/portato/portato-0.7.5.ebuild
+++ b/app-portage/portato/portato-0.8.0.ebuild
@@ -11,22 +11,17 @@ SRC_URI="mirror://sourceforge/portato/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE="gtk qt4 userpriv etcproposals"
-
-GTKDEPS=">=dev-python/pygtk-2.8.6
-	>=x11-libs/vte-0.12.2
-	>=gnome-base/libglade-2.5.1
-	!userpriv? ( >=x11-libs/gksu-2.0.0 )
-	>=dev-util/portatosourceview-2.16.0"
+IUSE="kde userpriv etcproposals"
 
 RDEPEND=">=sys-apps/portage-2.1.2
-	gtk? ( ${GTKDEPS} )
-	qt4? (
-		>=dev-python/PyQt4-4.1.1
-		!userpriv? ( >=kde-base/kdesu-3.5.5 )
-	)
-	!gtk? ( !qt4? ( ${GTKDEPS}	)	)
-	etcproposals? ( >=app-portage/etcproposals-1.0 )"
+		>=dev-python/lxml-1.3.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
+		!kde? ( !userpriv? ( >=x11-libs/gksu-2.0.0 ) )
+		kde? ( !userpriv? ( >=kde-base/kdesu-3.5.5 ) )
+		etcproposals? ( >=app-portage/etcproposals-1.0 )"
 
 S="${WORKDIR}/${PN}"
 CONFIG_DIR="/etc/${PN}/"
@@ -34,61 +29,44 @@ DATA_DIR="/usr/share/${PN}/"
 PLUGIN_DIR="${DATA_DIR}/plugins"
 ICON_DIR="${DATA_DIR}/icons"
 
-apply_sed() {
+apply_sed ()
+{
 	cd "${S}"/${PN}
 
-	frontends="["
-	std=""
-
-	if ( use gtk || ( ! use gtk && ! use qt4 ) ); then
-		frontends="$frontends\"gtk\""
-		std="gtk"
-	fi
-
-	if use qt4; then
-		frontends="$frontends, \"qt\""
-
-		if test -z $std; then
-			std="qt"
-		fi
-	fi
-
-	frontends="${frontends/\[, /[}]"
+	# currently only gtk is supported
+	local std="gtk"
+	local frontends="[\"$std\"]"
 
-	einfo "Building frontends: $frontends"
-
-	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;^\(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;^\(FRONTENDS\s*=\s*\).*;\1$frontends;" \
 			-e "s;^\(STD_FRONTEND\s*=\s*\).*;\1\"$std\";" \
 			constants.py
 
 	cd ..
-	if use userpriv; then
-		for d in *.desktop; do
-			sed -i -e "s/\(gk\|kde\)su.*\(portato.*\)/\2/" $d
-		done
-	fi
+	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
 }
 
-pkg_setup() {
-	if ( use gtk || ( ! use gtk && ! use qt4 ) ) && ! built_with_use x11-libs/vte python; then
+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
-
-	if ! use gtk && ! use qt4 ; then
-		echo
-		einfo "You have not chosen a frontend. Defaulting to gtk."
-	fi
 }
 
-src_compile() {
+src_compile ()
+{
 	pushd "${S}/${PN}" > /dev/null
 	apply_sed || die "Applying sed-commands failed."
 	popd > /dev/null
@@ -96,7 +74,8 @@ src_compile() {
 	distutils_src_compile
 }
 
-src_install() {
+src_install ()
+{
 	dodir ${DATA_DIR}
 	distutils_src_install
 
@@ -118,6 +97,5 @@ src_install() {
 	doicon icons/portato-icon.png
 
 	# menus
-	( use gtk || ( ! use gtk && ! use qt4 ) ) && domenu portato_gtk.desktop
-	use qt4 && domenu portato_qt.desktop
+	domenu portato.desktop
 }