Version bump, mark qt-sql as build DEPEND.

(Portage version: 2.1.11.12/cvs/Linux x86_64)

5 files changed, 70 insertions, 16 deletions

diff --git a/net-misc/hotot/ChangeLog b/net-misc/hotot/ChangeLog
index d1ccb053b226..d7ca0180b150 100644
--- a/net-misc/hotot/ChangeLog
+++ b/net-misc/hotot/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/hotot
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hotot/ChangeLog,v 1.21 2012/08/29 15:00:14 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hotot/ChangeLog,v 1.22 2012/08/29 22:22:13 xmw Exp $
+
+*hotot-0.9.8.8_pre (29 Aug 2012)
+
+  29 Aug 2012; Michael Weber <xmw@gentoo.org>
+  +files/hotot-0.9.8.8_pre-it_IT.patch, +hotot-0.9.8.8_pre.ebuild,
+  -hotot-0.9.8.7-r1.ebuild, hotot-0.9.8.7.ebuild, hotot-9999.ebuild:
+  Version bump, mark qt-sql as build DEPEND.
 
   29 Aug 2012; Michael Weber <xmw@gentoo.org> hotot-0.9.8.7-r1.ebuild,
   hotot-0.9.8.7.ebuild:
diff --git a/net-misc/hotot/files/hotot-0.9.8.8_pre-it_IT.patch b/net-misc/hotot/files/hotot-0.9.8.8_pre-it_IT.patch
new file mode 100644
index 000000000000..eb091997451e
--- /dev/null
+++ b/net-misc/hotot/files/hotot-0.9.8.8_pre-it_IT.patch
@@ -0,0 +1,40 @@
+diff --git a/po/it_IT.po b/po/it_IT.po
+index 5c1d3a5..127c761 100644
+--- a/po/it_IT.po
++++ b/po/it_IT.po
+@@ -232,7 +232,7 @@ msgstr "_Visualizza"
+ #~ msgstr "'Cerca qualcuno che ti piace'"
+ 
+ #~ msgid "'Font Family'"
+-#~ msgstr "'Famiglia di font""
++#~ msgstr "'Famiglia di font'"
+ 
+ #~ msgid "'Font Size'"
+ #~ msgstr "'Dimensione del font'"
+@@ -337,7 +337,7 @@ msgstr "_Visualizza"
+ #~ msgstr "'Website'"
+ 
+ #~ msgid "'What is happening?'"
+-#~ msgstr "'Che c\'è di nuovo?'"
++#~ msgstr "'Che c'è di nuovo?'"
+ 
+ #~ msgid "- Credits -"
+ #~ msgstr "- Ringraziamenti -"
+@@ -533,7 +533,7 @@ msgstr "_Visualizza"
+ #~ msgstr "Abilita"
+ 
+ #~ msgid "Enter action mode"
+-#~ msgstr "Inserisci modalità d\'azione "
++#~ msgstr "Inserisci modalità d'azione"
+ 
+ #~ msgid "Enter compose mode"
+ #~ msgstr "Inserisci modalità di scrittura"
+@@ -1117,7 +1117,7 @@ msgstr "_Visualizza"
+ #~ msgid ""
+ #~ "You MUST restart Hotot for some changes below to take effect. And these "
+ #~ "changes will affect ALL accounts"
+-#~ msgstr "* Devi RIAVVIARE Hotot affinche\' le modifiche abbiano effetto. I cambiamenti influiranno su TUTTI gli account"
++#~ msgstr "* Devi RIAVVIARE Hotot affinche' le modifiche abbiano effetto. I cambiamenti influiranno su TUTTI gli account"
+ 
+ #~ msgid ""
+ #~ "You need to go to twitter.com to send a request before you can start "
diff --git a/net-misc/hotot/hotot-0.9.8.7.ebuild b/net-misc/hotot/hotot-0.9.8.7.ebuild
index 65716d60215e..40be193cdd47 100644
--- a/net-misc/hotot/hotot-0.9.8.7.ebuild
+++ b/net-misc/hotot/hotot-0.9.8.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hotot/hotot-0.9.8.7.ebuild,v 1.7 2012/08/29 15:00:14 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hotot/hotot-0.9.8.7.ebuild,v 1.8 2012/08/29 22:22:13 xmw Exp $
 
 EAPI=4
 
@@ -18,14 +18,13 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="chrome gtk kde qt4"
 
-RDEPEND="dev-python/PyQt4[sql]
-	dev-python/dbus-python
+RDEPEND="dev-python/dbus-python
 	gtk? ( dev-python/pywebkitgtk )
 	qt4? ( x11-libs/qt-webkit:4
-		x11-libs/qt-sql:4
 		kde? ( kde-base/kdelibs ) )"
 DEPEND="${RDEPEND}
-	sys-devel/gettext"
+	sys-devel/gettext
+	qt4? ( x11-libs/qt-sql:4 )"
 
 REQUIRED_USE="|| ( chrome gtk qt4 )"
 
diff --git a/net-misc/hotot/hotot-0.9.8.7-r1.ebuild b/net-misc/hotot/hotot-0.9.8.8_pre.ebuild
index 92ed2750779c..9524e1aac923 100644
--- a/net-misc/hotot/hotot-0.9.8.7-r1.ebuild
+++ b/net-misc/hotot/hotot-0.9.8.8_pre.ebuild
@@ -1,31 +1,30 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hotot/hotot-0.9.8.7-r1.ebuild,v 1.2 2012/08/29 15:00:14 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hotot/hotot-0.9.8.8_pre.ebuild,v 1.1 2012/08/29 22:22:13 xmw Exp $
 
 EAPI=4
 
 PYTHON_DEPEND="gtk? 2"
 RESTRICT_PYTHON_ABIS="3.*"
 
-inherit cmake-utils python vcs-snapshot
+inherit cmake-utils eutils python vcs-snapshot
 
 DESCRIPTION="lightweight & open source microblogging client"
 HOMEPAGE="http://hotot.org"
-SRC_URI="https://github.com/shellex/Hotot/tarball/${PV} -> ${P}.tar.gz"
+SRC_URI="https://github.com/shellex/Hotot/tarball/d1ad4f714 -> ${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="chrome gtk kde qt4"
 
-RDEPEND="dev-python/PyQt4[sql]
-	dev-python/dbus-python
+RDEPEND="dev-python/dbus-python
 	gtk? ( dev-python/pywebkitgtk )
 	qt4? ( x11-libs/qt-webkit:4
-		x11-libs/qt-sql:4
 		kde? ( kde-base/kdelibs ) )"
 DEPEND="${RDEPEND}
-	sys-devel/gettext"
+	sys-devel/gettext
+	qt4? ( x11-libs/qt-sql:4 )"
 
 REQUIRED_USE="|| ( chrome gtk qt4 )"
 
@@ -38,6 +37,10 @@ pkg_setup() {
 	python_pkg_setup
 }
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-it_IT.patch
+}
+
 src_configure() {
 	mycmakeargs="${mycmakeargs} \
 		$(cmake-utils_use_with chrome CHROME) \
diff --git a/net-misc/hotot/hotot-9999.ebuild b/net-misc/hotot/hotot-9999.ebuild
index e145535ef7b6..97c0b78123bf 100644
--- a/net-misc/hotot/hotot-9999.ebuild
+++ b/net-misc/hotot/hotot-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hotot/hotot-9999.ebuild,v 1.4 2012/07/08 08:54:50 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hotot/hotot-9999.ebuild,v 1.5 2012/08/29 22:22:13 xmw Exp $
 
 EAPI=4
 
@@ -18,12 +18,13 @@ SLOT="0"
 KEYWORDS=""
 IUSE="chrome gtk kde qt4"
 
-RDEPEND="
+RDEPEND="dev-python/dbus-python
 	gtk? ( dev-python/pywebkitgtk )
 	qt4? ( x11-libs/qt-webkit:4
 		kde? ( kde-base/kdelibs ) )"
 DEPEND="${RDEPEND}
-	sys-devel/gettext"
+	sys-devel/gettext
+	qt4? ( x11-libs/qt-sql:4 )"
 
 REQUIRED_USE="|| ( chrome gtk qt4 )"
 
@@ -36,6 +37,10 @@ pkg_setup() {
 	python_pkg_setup
 }
 
+src_prepare() {
+	rm -v po/it_IT.po || die
+}
+
 src_configure() {
 	mycmakeargs="${mycmakeargs} \
 		$(cmake-utils_use_with chrome CHROME) \