Add missing gdbm to python dep, bug #554396; drop old; version Bump

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!)

5 files changed, 23 insertions, 84 deletions

diff --git a/net-misc/polly/ChangeLog b/net-misc/polly/ChangeLog
index 3c55c9bc74b8..85cdb7617d6e 100644
--- a/net-misc/polly/ChangeLog
+++ b/net-misc/polly/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/polly
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/polly/ChangeLog,v 1.4 2015/04/08 18:04:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/polly/ChangeLog,v 1.5 2015/07/28 14:00:30 jlec Exp $
+
+*polly-0.93.12 (28 Jul 2015)
+
+  28 Jul 2015; Justin Lecher <jlec@gentoo.org> +polly-0.93.12.ebuild,
+  -files/polly-0.93.10-desktop.patch, -polly-0.93.10.ebuild,
+  -polly-0.93.9.ebuild, polly-0.93.11.ebuild:
+  Add missing gdbm to python dep, bug #554396; drop old; version Bump
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> polly-0.93.10.ebuild,
   polly-0.93.11.ebuild, polly-0.93.9.ebuild:
diff --git a/net-misc/polly/files/polly-0.93.10-desktop.patch b/net-misc/polly/files/polly-0.93.10-desktop.patch
deleted file mode 100644
index 6d2998ebf161..000000000000
--- a/net-misc/polly/files/polly-0.93.10-desktop.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- polly-0.93.10/share/applications/polly.desktop
-+++ polly-0.93.10/share/applications/polly.desktop
-@@ -11,5 +11,5 @@
- TryExec=polly
- Exec=polly
- Terminal=false
--Categories=GTK;Network
-+Categories=GTK;Network;
- StartupWMClass=polly
diff --git a/net-misc/polly/polly-0.93.10.ebuild b/net-misc/polly/polly-0.93.10.ebuild
deleted file mode 100644
index 6db207a0ae05..000000000000
--- a/net-misc/polly/polly-0.93.10.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/polly/polly-0.93.10.ebuild,v 1.3 2015/04/08 18:04:50 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_NO_PARALLEL_BUILD=1
-
-inherit distutils-r1 gnome2-utils vcs-snapshot
-
-DESCRIPTION="twitter client designed for multiple columns of multiple accounts"
-HOMEPAGE="https://launchpad.net/polly"
-SRC_URI="https://launchpad.net/${PN}/1.0/pre-alpha-2/+download/Polly-${PV}%20%28pre-alpha%203.10%29.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-NC-SA-3.0 GPL-2 GPL-3+ MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RDEPEND="${PYTHON_DEPS}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/gconf-python
-	dev-python/gtkspell-python
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/keyring[${PYTHON_USEDEP}]
-	dev-python/notify-python[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/oauth2[${PYTHON_USEDEP}]
-	dev-python/pycurl[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/socksipy[${PYTHON_USEDEP}]"
-DEPEND="${PYTHON_DEPS}"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.93.10-desktop.patch )
-
-python_install_all() {
-	insinto /etc/gconf/schemas
-	doins share/gconf/schemas/${PN}.schemas
-	rm -rf share/gconf || die
-
-	distutils-r1_python_install_all
-}
-
-pkg_preinst() {
-	gnome2_gconf_savelist
-}
-
-pkg_postinst() {
-	gnome2_gconf_install
-}
-
-pkg_postrm() {
-	gnome2_gconf_uninstall
-}
diff --git a/net-misc/polly/polly-0.93.11.ebuild b/net-misc/polly/polly-0.93.11.ebuild
index 2862cde643f9..5f36f2d8e1c3 100644
--- a/net-misc/polly/polly-0.93.11.ebuild
+++ b/net-misc/polly/polly-0.93.11.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/polly/polly-0.93.11.ebuild,v 1.2 2015/04/08 18:04:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/polly/polly-0.93.11.ebuild,v 1.3 2015/07/28 14:00:30 jlec Exp $
 
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
+PYTON_REQ_USE=( gdbm )
 DISTUTILS_NO_PARALLEL_BUILD=1
 
 inherit distutils-r1 gnome2-utils vcs-snapshot
@@ -18,11 +19,10 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="${PYTHON_DEPS}
 	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/gconf-python
-	dev-python/gtkspell-python
+	dev-python/gconf-python[${PYTHON_USEDEP}]
+	dev-python/gtkspell-python[${PYTHON_USEDEP}]
 	dev-python/httplib2[${PYTHON_USEDEP}]
 	dev-python/keyring[${PYTHON_USEDEP}]
 	dev-python/notify-python[${PYTHON_USEDEP}]
@@ -31,7 +31,7 @@ RDEPEND="${PYTHON_DEPS}
 	dev-python/pycurl[${PYTHON_USEDEP}]
 	dev-python/pyxdg[${PYTHON_USEDEP}]
 	dev-python/socksipy[${PYTHON_USEDEP}]"
-DEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
 
 python_prepare_all() {
 	rm -rf external/keyring || die
diff --git a/net-misc/polly/polly-0.93.9.ebuild b/net-misc/polly/polly-0.93.12.ebuild
index 46898be4adf2..fa43eb712d4d 100644
--- a/net-misc/polly/polly-0.93.9.ebuild
+++ b/net-misc/polly/polly-0.93.12.ebuild
@@ -1,28 +1,28 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/polly/polly-0.93.9.ebuild,v 1.3 2015/04/08 18:04:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/polly/polly-0.93.12.ebuild,v 1.1 2015/07/28 14:00:30 jlec Exp $
 
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
+PYTON_REQ_USE=( gdbm )
 DISTUTILS_NO_PARALLEL_BUILD=1
 
 inherit distutils-r1 gnome2-utils vcs-snapshot
 
 DESCRIPTION="twitter client designed for multiple columns of multiple accounts"
 HOMEPAGE="https://launchpad.net/polly"
-SRC_URI="https://launchpad.net/${PN}/1.0/pre-alpha-2/+download/Polly-${PV}%20%28pre-alpha%203.9%29.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://launchpad.net/${PN}/1.0/pre-alpha-2/+download/Polly-${PV}.tar.gz"
 
 LICENSE="CC-BY-NC-SA-3.0 GPL-2 GPL-3+ MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="${PYTHON_DEPS}
 	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/gconf-python
-	dev-python/gtkspell-python
+	dev-python/gconf-python[${PYTHON_USEDEP}]
+	dev-python/gtkspell-python[${PYTHON_USEDEP}]
 	dev-python/httplib2[${PYTHON_USEDEP}]
 	dev-python/keyring[${PYTHON_USEDEP}]
 	dev-python/notify-python[${PYTHON_USEDEP}]
@@ -31,16 +31,13 @@ RDEPEND="${PYTHON_DEPS}
 	dev-python/pycurl[${PYTHON_USEDEP}]
 	dev-python/pyxdg[${PYTHON_USEDEP}]
 	dev-python/socksipy[${PYTHON_USEDEP}]"
-DEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${PN}-0.93.10-desktop.patch )
+S="${WORKDIR}"/Polly-${PV}
 
-python_install_all() {
-	insinto /etc/gconf/schemas
-	doins share/gconf/schemas/${PN}.schemas
-	rm -rf share/gconf || die
-
-	distutils-r1_python_install_all
+python_prepare_all() {
+	rm -rf external/keyring || die
+	distutils-r1_python_prepare_all
 }
 
 pkg_preinst() {