Version bump to 0.6.1. Remove old release candidates.

(Portage version: 2.2_rc63/cvs/Linux x86_64)

7 files changed, 78 insertions, 167 deletions

diff --git a/app-portage/porthole/ChangeLog b/app-portage/porthole/ChangeLog
index 3ec6a0b7a0bf..61785d4cbc4c 100644
--- a/app-portage/porthole/ChangeLog
+++ b/app-portage/porthole/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-portage/porthole
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/porthole/ChangeLog,v 1.41 2009/10/27 14:53:36 idl0r Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/porthole/ChangeLog,v 1.42 2010/02/26 18:31:57 idl0r Exp $
+
+*porthole-0.6.1 (26 Feb 2010)
+
+  26 Feb 2010; Christian Ruppert <idl0r@gentoo.org>
+  -porthole-0.6.0_rc2.ebuild, -porthole-0.6.0_rc3.ebuild,
+  -porthole-0.6.0_rc4.ebuild, -files/porthole-0.6.0_rc2-pocompile.patch,
+  -files/porthole-0.6.0_rc3-oneshot-fix.patch, +porthole-0.6.1.ebuild:
+  Version bump to 0.6.1. Remove old release candidates.
 
   27 Oct 2009; Christian Ruppert <idl0r@gentoo.org> metadata.xml:
   Add Brian to the metadata.
diff --git a/app-portage/porthole/files/porthole-0.6.0_rc2-pocompile.patch b/app-portage/porthole/files/porthole-0.6.0_rc2-pocompile.patch
deleted file mode 100644
index 954a68110fa2..000000000000
--- a/app-portage/porthole/files/porthole-0.6.0_rc2-pocompile.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -u -r porthole-0.6.0_rc2.orig/scripts/pocompile.sh porthole-0.6.0_rc2/scripts/pocompile.sh
---- porthole-0.6.0_rc2.orig/scripts/pocompile.sh	2008-04-20 16:11:47.000000000 -0500
-+++ porthole-0.6.0_rc2/scripts/pocompile.sh	2008-05-01 23:15:50.000000000 -0500
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- # Helper script to compile all .po files in the i18n directroy into .mo files.
- # Requires sys-devel/gettext.
- #
diff --git a/app-portage/porthole/files/porthole-0.6.0_rc3-oneshot-fix.patch b/app-portage/porthole/files/porthole-0.6.0_rc3-oneshot-fix.patch
deleted file mode 100644
index 679d9b8dce81..000000000000
--- a/app-portage/porthole/files/porthole-0.6.0_rc3-oneshot-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: porthole/mainwindow.py
-===================================================================
---- porthole/mainwindow.py	(revision 968)
-+++ porthole/mainwindow.py	(working copy)
-@@ -845,7 +845,7 @@
-             #debug.dprint(self.packages_list)
-             #debug.dprint(self.keyorder)
-             for key in self.keyorder:
--                if not self.packages_list[key]:
-+                if not self.packages_list[key].in_world:
-                         debug.dprint("MAINWINDOW: upgrade_packages(); dependancy selected: " + key)
-                         if not self.setup_command(key, emerge_cmd +" --oneshot" +
-                                 config.Prefs.emerge.get_string() + key[:]): #use the full name
diff --git a/app-portage/porthole/porthole-0.6.0_rc2.ebuild b/app-portage/porthole/porthole-0.6.0_rc2.ebuild
deleted file mode 100644
index 75d32dfdb6e1..000000000000
--- a/app-portage/porthole/porthole-0.6.0_rc2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/porthole/porthole-0.6.0_rc2.ebuild,v 1.6 2009/05/24 04:19:12 arfrever Exp $
-
-inherit eutils distutils
-
-DESCRIPTION="A GTK+-based frontend to Portage"
-HOMEPAGE="http://porthole.sourceforge.net"
-SRC_URI="mirror://sourceforge/porthole/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="nls"
-
-RDEPEND=">=dev-lang/python-2.3
-	>=sys-apps/portage-2.0.51-r3
-	>=dev-python/pygtk-2.4.0
-	>=dev-python/pyxml-0.8.4
-	>=gnome-base/libglade-2.5.0
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.14 )"
-
-src_unpack() {
-	# Change shebang line to /bin/bash since pocompile.sh is not a posix script
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PF}-pocompile.patch
-}
-
-src_install() {
-	distutils_src_install
-	chmod -R a+rX "${D}"/usr/share/porthole
-	dodoc TODO README NEWS AUTHORS MANIFEST
-	keepdir /var/log/porthole
-	fperms g+w /var/log/porthole
-	keepdir /var/db/porthole
-	fperms g+w /var/db/porthole
-	# Compile localizations if necessary
-	if use nls ; then
-		cd "${D}"/usr/share/porthole
-		./pocompile.sh || die "pocompile.sh failed"
-	fi
-}
-
-pkg_preinst() {
-	chgrp portage "${D}"/var/log/porthole
-	chgrp portage "${D}"/var/db/porthole
-}
diff --git a/app-portage/porthole/porthole-0.6.0_rc3.ebuild b/app-portage/porthole/porthole-0.6.0_rc3.ebuild
deleted file mode 100644
index e18d373512d1..000000000000
--- a/app-portage/porthole/porthole-0.6.0_rc3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/porthole/porthole-0.6.0_rc3.ebuild,v 1.4 2009/05/24 04:19:12 arfrever Exp $
-
-inherit eutils distutils
-
-DESCRIPTION="A GTK+-based frontend to Portage"
-HOMEPAGE="http://porthole.sourceforge.net"
-SRC_URI="mirror://sourceforge/porthole/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="nls"
-
-RDEPEND=">=dev-lang/python-2.3
-	>=sys-apps/portage-2.0.51-r3
-	>=dev-python/pygtk-2.4.0
-	>=dev-python/pyxml-0.8.4
-	>=gnome-base/libglade-2.5.0
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.14 )"
-
-src_unpack() {
-	# fix an "in_world" test so that it adds --oneshot for dependencies
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PF}-oneshot-fix.patch
-}
-
-src_install() {
-	distutils_src_install
-	chmod -R a+rX "${D}"/usr/share/porthole
-	dodoc TODO README NEWS AUTHORS MANIFEST
-	keepdir /var/log/porthole
-	fperms g+w /var/log/porthole
-	keepdir /var/db/porthole
-	fperms g+w /var/db/porthole
-	# Compile localizations if necessary
-	if use nls ; then
-		cd "${D}"/usr/share/porthole
-		./pocompile.sh || die "pocompile.sh failed"
-	fi
-}
-
-pkg_preinst() {
-	chgrp portage "${D}"/var/log/porthole
-	chgrp portage "${D}"/var/db/porthole
-}
diff --git a/app-portage/porthole/porthole-0.6.0_rc4.ebuild b/app-portage/porthole/porthole-0.6.0_rc4.ebuild
deleted file mode 100644
index 26d1606f6c3c..000000000000
--- a/app-portage/porthole/porthole-0.6.0_rc4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/porthole/porthole-0.6.0_rc4.ebuild,v 1.2 2009/05/24 04:19:12 arfrever Exp $
-
-inherit eutils distutils
-
-DESCRIPTION="A GTK+-based frontend to Portage"
-HOMEPAGE="http://porthole.sourceforge.net"
-SRC_URI="mirror://sourceforge/porthole/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="nls"
-
-RDEPEND=">=dev-lang/python-2.3
-	>=sys-apps/portage-2.0.51-r3
-	>=dev-python/pygtk-2.4.0
-	>=dev-python/pyxml-0.8.4
-	>=gnome-base/libglade-2.5.0
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.14 )"
-
-src_install() {
-	distutils_src_install
-	chmod -R a+rX "${D}"/usr/share/porthole
-	dodoc TODO README NEWS AUTHORS MANIFEST
-	keepdir /var/log/porthole
-	fperms g+w /var/log/porthole
-	keepdir /var/db/porthole
-	fperms g+w /var/db/porthole
-	# Compile localizations if necessary
-	if use nls ; then
-		cd "${D}"/usr/share/porthole
-		./pocompile.sh || die "pocompile.sh failed"
-	fi
-}
-
-pkg_preinst() {
-	chgrp portage "${D}"/var/log/porthole
-	chgrp portage "${D}"/var/db/porthole
-}
diff --git a/app-portage/porthole/porthole-0.6.1.ebuild b/app-portage/porthole/porthole-0.6.1.ebuild
new file mode 100644
index 000000000000..44c1b3ee8ea7
--- /dev/null
+++ b/app-portage/porthole/porthole-0.6.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/porthole/porthole-0.6.1.ebuild,v 1.1 2010/02/26 18:31:57 idl0r Exp $
+
+EAPI="2"
+
+inherit distutils
+
+DESCRIPTION="A GTK+-based frontend to Portage"
+HOMEPAGE="http://porthole.sourceforge.net"
+SRC_URI="mirror://sourceforge/porthole/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="nls"
+LANGS="de pl ru vi it fr tr"
+for X in $LANGS; do IUSE="${IUSE} linguas_${X}"; done
+
+RDEPEND=">=dev-lang/python-2.4[xml,threads]
+	>=sys-apps/portage-2.1
+	>=dev-python/pygtk-2.4.0
+	>=gnome-base/libglade-2.5.0
+	dev-python/pygtksourceview:2
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	nls? ( >=sys-devel/gettext-0.14 )"
+
+src_compile(){
+	# Compile localizations if necessary
+	if use nls ; then
+		cd scripts
+		./pocompile.sh -emerge ${LINGUAS} || die "pocompile failed"
+	fi
+}
+
+src_install() {
+	distutils_src_install
+
+	dodoc TODO README NEWS AUTHORS
+
+	keepdir /var/log/porthole
+	fperms g+w /var/log/porthole
+	keepdir /var/db/porthole
+	fperms g+w /var/db/porthole
+
+	# nls
+	if use nls; then
+		# mo directory doesn't exists with nls enabled and unsupported LINGUAS
+		[[ -d porthole/i18n/mo ]] && domo porthole/i18n/mo/*
+	fi
+}
+
+pkg_preinst() {
+	chgrp portage "${D}"/var/log/porthole
+	chgrp portage "${D}"/var/db/porthole
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Porthole has updated the way that the upgrades are sent to emerge."
+	einfo "In this new way the user needs to set any 'Settings' menu emerge options"
+	einfo "Porthole automatically adds '--oneshot' for all upgrades selections"
+	einfo "Other options recommended are '--noreplace'  along with '--update'"
+	einfo "They allow for portage to skip any packages that might have already"
+	einfo "been upgraded as a dependency of another previously upgraded package"
+	einfo
+}