Revision bump by Michael (kensington) <gentoo@scribeofthenile.com>. Bumps to EAPI 4, fixes QA issues and build with gold linker bug #369449.

Package-Manager: portage-2.2.0_alpha95/cvs/Linux i686

5 files changed, 99 insertions, 12 deletions

diff --git a/net-im/qtwitter/ChangeLog b/net-im/qtwitter/ChangeLog
index ffbfd37f1468..986468c2573a 100644
--- a/net-im/qtwitter/ChangeLog
+++ b/net-im/qtwitter/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-im/qtwitter
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/qtwitter/ChangeLog,v 1.26 2012/03/25 19:16:22 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/qtwitter/ChangeLog,v 1.27 2012/03/28 13:48:58 johu Exp $
+
+*qtwitter-0.10.0-r1 (28 Mar 2012)
+
+  28 Mar 2012; Johannes Huber <johu@gentoo.org>
+  +files/qtwitter-0.10.0-gold.patch, +qtwitter-0.10.0-r1.ebuild,
+  qtwitter-0.10.0.ebuild:
+  Revision bump by Michael (kensington) <gentoo@scribeofthenile.com>. Bumps to
+  EAPI 4, fixes QA issues and build with gold linker bug #369449.
 
   25 Mar 2012; Johannes Huber <johu@gentoo.org> -qtwitter-0.9.2.ebuild:
   Remove old.
diff --git a/net-im/qtwitter/Manifest b/net-im/qtwitter/Manifest
index 4f3bd867e073..beda56e19937 100644
--- a/net-im/qtwitter/Manifest
+++ b/net-im/qtwitter/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX qtwitter-0.10.0-gold.patch 394 RMD160 017c504ec35a1de469875df7b7717068767055a3 SHA1 609d4cb54214d2d93b6756110fdaef8365488d56 SHA256 6a2c15a9191c98f78ae1a6f802a21e386b464fca2b5e453df0625c8972fd488c
 DIST qtwitter-0.10.0-src.tar.gz 698851 RMD160 420e939243c2583cba8455cbec4fe2509b8eacdf SHA1 d5d8fc85b0ffe55b5f10a9362d8f4fb5ac90d5ce SHA256 0a649d8e5cfeb5aa5c168b7b07c46b79605783a2d0f0a04527dc5883f5b4e951
-EBUILD qtwitter-0.10.0.ebuild 1370 RMD160 e3c9808a76f1021d7b4a917fb4494bcc88f2f766 SHA1 70720425b4ff33afccbd87dd15ec4e5af670a45b SHA256 cdec187feb18240e6222f5daf049f9fb18a250c302fe8e21faa51b74b3ed11ff
-MISC ChangeLog 3841 RMD160 d510ecc2b35ccf8e17fa96c70e80d9b6dd2ea553 SHA1 cda4b8c68300f5cade0de13ac2dc3a5c417ca79c SHA256 8c07269182f472b19ac5b53a4def6936a39147b8fd31d9187e671413ffda2ab9
+EBUILD qtwitter-0.10.0-r1.ebuild 1620 RMD160 7f7e2e40734b6d1d12ee96d4086c631ca58572ea SHA1 872ff5d9b2f39187759c02b28d8b92981fdd9162 SHA256 d093ca607396aea66a03e50ea9575064b5a69ebe4c66c4fdf975b9af98dd2c95
+EBUILD qtwitter-0.10.0.ebuild 1369 RMD160 79712635cb84c8ff2ba419ae28b0104f43439fcb SHA1 f49e0020d7e024e763e2e7ea09ca59f8cb908509 SHA256 019a93ad74fbff3b47924bce6f929d6e1865980de6d68b34faff7f75eb07f01b
+MISC ChangeLog 4161 RMD160 e16286a55ed4492fd98eb3339cfd5915c282eb88 SHA1 587e51d006e834f2cea121ec9f14d79e25bfedd8 SHA256 e782e703e859435cf57514be47d50c663aad947521e173e6a171dfe6ea2dfd8d
 MISC metadata.xml 203 RMD160 f21ab0adb7ed966ccbfb8706172574746bf83c45 SHA1 9929f57d84969eaa6e4f2b8d399921bc4c7ba1e4 SHA256 e70e3acb51ca19e8ef1c7b3fe1356e152781028e0bdccd400e0979db61b77070
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPb3B0AAoJEO+t9ga+3I3a6nkH/AgoyTYat50qwIQQPnJS5vTK
-eu7uXwCsGXYwgZbOkMj8LLs4/ICd7OUHUazWpc7lzRVY9kPuqRWcY+QIBzcf1mfx
-b/u1LprTHBZ8SjZtZPzmkMBY24e38Vy30RcJYL/bLjOC2qSLbUA0p3q/BsQN1DiC
-oJ40iFffqZthVzDO6bcnxpuy2HJXX71mwvNWsdpdFUfbivXiB0E2xvQMAIxZqeDu
-S1sv1uLfcQRNr0qMNlZUh09m1AEsnp5SHFfIbeU/xWP5ZR0lprHrYRUH/GTiZKGd
-VsC+ZXXzStQTUDKirxjre2WfP3qdbKneoT4hAKBw6DWmsuoYhAfcAytr7g+xqcI=
-=uUb2
+iQEcBAEBCgAGBQJPcxbeAAoJEO+t9ga+3I3aDKIIAJFIwyatWTRov0hyYzISRs11
+qV300gx4be5/3KNGYmxz0Cl7HemNozymu3UMteeiZn0rt/PIy5bWyZlGI19r+92y
+zbY7ugkd58tsZvFUNNRrTJp/6+JX0CkLO4AiMhmvTGs7ZCMiEPTbNFBa1BH+Dr9v
+mN+J7gsa5hPlM02XzIFnySyPUZ0MdY3Sx4DJ00dF4kt7M/itxJm6lJWGblSWZFKh
+d90vtLMBDBfGiNUALr4GoNA9tb3KGG93WcrMtxAOvifBTHZYHG/Ff3Fkft9kVHlX
+ae0bg9rfd8wTTTHUCf6/bYCygn2AFzlVPhoF/dQxonw28xBTMA5f0CMb36V+X3s=
+=JDw5
 -----END PGP SIGNATURE-----
diff --git a/net-im/qtwitter/files/qtwitter-0.10.0-gold.patch b/net-im/qtwitter/files/qtwitter-0.10.0-gold.patch
new file mode 100644
index 000000000000..d5aff527bead
--- /dev/null
+++ b/net-im/qtwitter/files/qtwitter-0.10.0-gold.patch
@@ -0,0 +1,12 @@
+--- qtwitter-app/qtwitter-app.pro
++++ qtwitter-app/qtwitter-app.pro
+@@ -82,7 +82,8 @@
+ else:unix {
+     LIBS += -L$${DESTDIR} \
+         -Wl,-rpath,$${DESTDIR} \
+-        $$TWITTERAPI_LIB
++        $$TWITTERAPI_LIB \
++	-lX11
+     target.path = $${INSTALL_PREFIX}/bin
+     PLUGINS_DIR = $${INSTALL_PREFIX}/lib$${LIB_SUFFIX}/$${TARGET}/plugins
+     DEFINES += PLUGINS_DIR='\\\"$${PLUGINS_DIR}\\\"'
\ No newline at end of file
diff --git a/net-im/qtwitter/qtwitter-0.10.0-r1.ebuild b/net-im/qtwitter/qtwitter-0.10.0-r1.ebuild
new file mode 100644
index 000000000000..f6550e6859ad
--- /dev/null
+++ b/net-im/qtwitter/qtwitter-0.10.0-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/qtwitter/qtwitter-0.10.0-r1.ebuild,v 1.1 2012/03/28 13:48:58 johu Exp $
+
+EAPI=4
+
+LANGS="nb_NO pt_BR"
+LANGSLONG="ca_ES cs_CZ de_DE es_ES fr_FR it_IT ja_JP pl_PL"
+
+inherit qt4-r2
+
+DESCRIPTION="A Qt-based microblogging client"
+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"
+
+DEPEND="x11-libs/libX11
+	>=x11-libs/qt-core-4.5:4
+	>=x11-libs/qt-gui-4.5:4
+	>=x11-libs/qt-dbus-4.5:4
+	>=dev-libs/qoauth-1.0"
+RDEPEND="${DEPEND}"
+
+DOCS="README CHANGELOG"
+PATCHES=( "${FILESDIR}/${P}-gold.patch" )
+
+src_prepare() {
+	qt4-r2_src_prepare
+
+	echo "CONFIG += nostrip" >> "${S}"/${PN}.pro
+
+	local langs=
+	for lingua in $LINGUAS; do
+		if has $lingua $LANGS; then
+			langs="$langs ${lingua}"
+		else
+			for a in $LANGSLONG; do
+				if [[ $lingua == ${a%_*} ]]; then
+					langs="$langs ${a}"
+				fi
+			done
+		fi
+	done
+
+	# remove translations and add only the selected ones
+	sed -e '/^ *LANGS/,/^$/s/^/#/' \
+		-e "/LANGS =/s/.*/LANGS = ${langs}/" \
+		-i translations/translations.pri || die "sed translations failed"
+
+	# fix insecure runpaths
+	sed -e '/-Wl,-rpath,\$\${DESTDIR}/d' \
+		-i qtwitter-app/qtwitter-app.pro || die "sed rpath failed"
+
+	# to pass validation
+	sed -e 's/Instant Messaging/InstantMessaging/' \
+		-i qtwitter-app/x11/qtwitter.desktop || die "sed .desktop failed"
+}
+
+src_configure() {
+	eqmake4 PREFIX="/usr"
+}
diff --git a/net-im/qtwitter/qtwitter-0.10.0.ebuild b/net-im/qtwitter/qtwitter-0.10.0.ebuild
index 2e668238c533..a5eff13f9e7d 100644
--- a/net-im/qtwitter/qtwitter-0.10.0.ebuild
+++ b/net-im/qtwitter/qtwitter-0.10.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/qtwitter/qtwitter-0.10.0.ebuild,v 1.4 2010/01/02 14:05:29 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/qtwitter/qtwitter-0.10.0.ebuild,v 1.5 2012/03/28 13:48:58 johu Exp $
 
 EAPI="2"