Version bump. Remove old ebuilds

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

3 files changed, 14 insertions, 78 deletions

diff --git a/net-im/qtwitter/ChangeLog b/net-im/qtwitter/ChangeLog
index 69743fe81dc6..4d145ef81a5c 100644
--- a/net-im/qtwitter/ChangeLog
+++ b/net-im/qtwitter/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/qtwitter
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/qtwitter/ChangeLog,v 1.12 2009/07/30 12:49:01 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/qtwitter/ChangeLog,v 1.13 2009/08/08 17:42:03 hwoarang Exp $
+
+*qtwitter-0.8.3 (08 Aug 2009)
+
+  08 Aug 2009; Markos Chandras <hwoarang@gentoo.org> -qtwitter-0.8.1.ebuild,
+  -qtwitter-0.8.2.ebuild, +qtwitter-0.8.3.ebuild:
+  Version bump. Remove old ebuilds
 
 *qtwitter-0.8.2 (30 Jul 2009)
 
diff --git a/net-im/qtwitter/qtwitter-0.8.2.ebuild b/net-im/qtwitter/qtwitter-0.8.2.ebuild
deleted file mode 100644
index 6ba2c3fc02e9..000000000000
--- a/net-im/qtwitter/qtwitter-0.8.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/qtwitter/qtwitter-0.8.2.ebuild,v 1.1 2009/07/30 12:49:01 tampakrap Exp $
-
-EAPI="2"
-
-inherit qt4
-
-DESCRIPTION="A Qt-based client for Twitter and Identi.ca"
-HOMEPAGE="http://www.qt-apps.org/content/show.php/qTwitter?content=99087"
-SRC_URI="http://files.ayoy.net/qtwitter/release/${PV}/src/${P}-src.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +oauth"
-
-DEPEND="x11-libs/qt-gui:4
-	oauth? ( dev-libs/qoauth )"
-RDEPEND="${DEPEND}"
-
-QTWITTER_LANGS="pt_BR"
-QTWITTER_NOLONGLANGS="ca_ES de_DE es_ES fr_FR ja_JP pl_PL"
-
-for L in $QTWITTER_LANGS; do
-	IUSE="$IUSE linguas_$L"
-done
-for L in $QTWITTER_NOLONGLANGS; do
-	IUSE="$IUSE linguas_${L%_*}"
-done
-
-src_prepare() {
-	qt4_src_prepare
-	echo "CONFIG += nostrip" >> "${S}"/${PN}.pro
-
-	local langs=
-	for lingua in $LINGUAS; do
-		if has $lingua $QTWITTER_LANGS; then
-			langs="$langs loc/${PN}_${lingua}.ts"
-		else
-			for a in $QTWITTER_NOLONGLANGS; do
-				if [[ $lingua == ${a%_*} ]]; then
-					langs="$langs loc/${PN}_${a}.ts"
-				fi
-			done
-		fi
-	done
-
-	# remove translations and add only the selected ones
-	sed -i -e '/^ *loc.*\.ts/d' \
-	    -e "/^TRANSLATIONS/s:loc.*:${langs}:" \
-	        qtwitter-app/qtwitter-app.pro || die "sed failed"
-	# first line fixes bug about unsecure runpaths
-	# second disables docs installation by make (done by dodoc in install)
-	sed -i -e '/-Wl,-rpath,\$\${TOP}/d' \
-	    -e '/doc \\/d' \
-	    qtwitter-app/qtwitter-app.pro || die "sed failed"
-
-	sed -i "s!\(\$\${INSTALL_PREFIX}\)/lib!\1/$(get_libdir)!" \
-		twitterapi/twitterapi.pro urlshortener/urlshortener.pro || die "sed failed"
-
-	use oauth || sed -i '/DEFINES += OAUTH/d' ${PN}.pri
-}
-
-src_configure() {
-	eqmake4
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die "emake install failed"
-	dodoc README CHANGELOG || die "dodoc failed"
-}
diff --git a/net-im/qtwitter/qtwitter-0.8.1.ebuild b/net-im/qtwitter/qtwitter-0.8.3.ebuild
index e5ed49c8cc89..7a6adc66b865 100644
--- a/net-im/qtwitter/qtwitter-0.8.1.ebuild
+++ b/net-im/qtwitter/qtwitter-0.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/qtwitter/qtwitter-0.8.1.ebuild,v 1.1 2009/07/16 12:17:09 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/qtwitter/qtwitter-0.8.3.ebuild,v 1.1 2009/08/08 17:42:03 hwoarang Exp $
 
 EAPI="2"
 
@@ -16,11 +16,11 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug +oauth"
 
 DEPEND="x11-libs/qt-gui:4
-	oauth? ( dev-libs/qoauth )"
+	oauth? ( >=dev-libs/qoauth-1.0 )"
 RDEPEND="${DEPEND}"
 
 QTWITTER_LANGS="pt_BR"
-QTWITTER_NOLONGLANGS="ca_ES de_DE es_ES fr_FR ja_JP pl_PL"
+QTWITTER_NOLONGLANGS="ca_ES de_DE es_ES fr_FR it_IT ja_JP pl_PL"
 
 for L in $QTWITTER_LANGS; do
 	IUSE="$IUSE linguas_$L"
@@ -51,7 +51,7 @@ src_prepare() {
 	    -e "/^TRANSLATIONS/s:loc.*:${langs}:" \
 	        qtwitter-app/qtwitter-app.pro || die "sed failed"
 	# first line fixes bug about unsecure runpaths
-	# second disables docs installation by make (done by dodoc in install)
+	# second disables docs installation by make (done by dodoc)
 	sed -i -e '/-Wl,-rpath,\$\${TOP}/d' \
 	    -e '/doc \\/d' \
 	    qtwitter-app/qtwitter-app.pro || die "sed failed"
@@ -59,7 +59,9 @@ src_prepare() {
 	sed -i "s!\(\$\${INSTALL_PREFIX}\)/lib!\1/$(get_libdir)!" \
 		twitterapi/twitterapi.pro urlshortener/urlshortener.pro || die "sed failed"
 
-	use oauth || sed -i '/DEFINES += OAUTH/d' ${PN}.pri
+	if ! use oauth; then
+		sed -i '/DEFINES += OAUTH/d' ${PN}.pri || die "sed failed"
+	fi
 }
 
 src_configure() {