version bump, renamed style to GTK+, removed old

Package-Manager: portage-2.2.0_alpha25/cvs/Linux x86_64

7 files changed, 55 insertions, 102 deletions

diff --git a/x11-themes/qgtkstyle/ChangeLog b/x11-themes/qgtkstyle/ChangeLog
index 6f5321832b7f..686ab14a3766 100644
--- a/x11-themes/qgtkstyle/ChangeLog
+++ b/x11-themes/qgtkstyle/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-themes/qgtkstyle
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/qgtkstyle/ChangeLog,v 1.5 2010/11/13 20:53:07 wired Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qgtkstyle/ChangeLog,v 1.6 2011/03/02 01:00:27 wired Exp $
+
+*qgtkstyle-4.7.2 (02 Mar 2011)
+*qgtkstyle-4.7.1-r2 (02 Mar 2011)
+
+  02 Mar 2011; Alex Alexander <wired@gentoo.org> -qgtkstyle-4.6.3.ebuild,
+  -qgtkstyle-4.6.3-r1.ebuild, -qgtkstyle-4.7.1.ebuild,
+  -qgtkstyle-4.7.1-r1.ebuild, +qgtkstyle-4.7.1-r2.ebuild,
+  +qgtkstyle-4.7.2.ebuild, files/main.cpp:
+  version bump, renamed style to GTK+, removed old
 
   13 Nov 2010; Alex Alexander <wired@gentoo.org> qgtkstyle-4.6.3-r1.ebuild,
   qgtkstyle-4.7.1-r1.ebuild:
diff --git a/x11-themes/qgtkstyle/Manifest b/x11-themes/qgtkstyle/Manifest
index 43f00787b68a..c85da9862d73 100644
--- a/x11-themes/qgtkstyle/Manifest
+++ b/x11-themes/qgtkstyle/Manifest
@@ -1,31 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX main.cpp 1547 RMD160 c17d69b82b893bfe7ed29fa9ebd741f4b7a05487 SHA1 21473b110befeac127d7a1a803409161887db2f2 SHA256 36353cfb2cd99417473aa64ba4b8183d92312a063859733b52c211631e863ada
+AUX main.cpp 1549 RMD160 3e9b0eb139f4427252079c79fca3a7bc3f1ad9f4 SHA1 abbb5d4d967f0de4239aee34bbb6162b0f95abec SHA256 84a2adf33b0ac85f68d19581c24bc1893ed03f79250bb355321409f4763ed0be
 AUX qgtkstyle-gentoo.patch 703 RMD160 41d706c22e4bd3844b46fb8b912eb0277ff157fd SHA1 a9298e178c662e1e8662d5a4a3372549bf77590e SHA256 8ec08c184b3d4d695ced13a43b16afbe006dc191be1768b7dd18f27f2ed9b9d9
 AUX qgtkstyle.pro 1481 RMD160 8edd6c0f5fb8444145820a038c09da3d3a6097c1 SHA1 8af534fdf3a2df2088b77eee86925c38db21e068 SHA256 e1c396f5a6567f4fda9a2a52919a521df769d8fddc5cbcab189f8b543a20edc9
-DIST qt-everywhere-opensource-src-4.6.3.tar.gz 160993454 RMD160 ceb3ca78263d0d9cdf92fef903e30c0026db6bff SHA1 1c18a564df9296c7cb0e0dedde40b9843e1b30e8 SHA256 f4e0ada8d4d516bbb8600a3ee7d9046c9c79e38cd781df9ffc46d8f16acd1768
 DIST qt-everywhere-opensource-src-4.7.1.tar.gz 211768512 RMD160 de6998948eb9f51a9193b9020ba80cfd52d50899 SHA1 fcf764d39d982c7f84703821582bd10c3192e341 SHA256 8cb5277c41f824cfc6dcee0e95e0bf23a9ad2c8d18d245105137481d092b124a
-EBUILD qgtkstyle-4.6.3-r1.ebuild 1873 RMD160 c6797729ad3222d1cfff5a6187e59d002bc629d4 SHA1 610dda92bf5fe7c9f7cedda901f572302f4f4068 SHA256 2626b5e465a7ccca5ec8e813fd6c634f0f0e557888256e67bd82b94365ff48f6
-EBUILD qgtkstyle-4.6.3.ebuild 1025 RMD160 a66116259b6211d56a791ba07f9440093a3f0fc6 SHA1 756905c6d6d22f5437f9e376823b16e7d6459557 SHA256 707c15dd643e8dbe45890f3934ce4fb56a0db92805139ea49ef984a4981aee3f
-EBUILD qgtkstyle-4.7.1-r1.ebuild 1874 RMD160 bdd245323db50bfb65aa9973ea7017dbdcd666bb SHA1 6daf77686779c441592e38e18ecf35717502b3dd SHA256 366a4ef81a6842c85c29c1f0100408bfa7cb0a9b37f4de7d6c22db00f149fb62
-EBUILD qgtkstyle-4.7.1.ebuild 1017 RMD160 10fd053fb1be6b2779503fa3d564617c2c94acd0 SHA1 46028f4cf9c8a6bb6cdcabe41d4579ca7ff0391d SHA256 b452a9b1de9820121513c86a9ae08112f3ae5e672bb057f4e69db056e6c2bc92
-MISC ChangeLog 1078 RMD160 7f13c54993ab7dee919c23f34bda1e56a7119a1f SHA1 02df44f3558f4588720911c41a269028f27830f6 SHA256 9e77a9a1fd757925e6a727e805cfaf928ce94f9a41d9fc089d04f53d8d5e2ae8
+DIST qt-everywhere-opensource-src-4.7.2.tar.gz 213663032 RMD160 de3d1c172c23c33681a0945c331db179c84cb7b5 SHA1 84414f82bbc9e8d356b986d5d1ebee89d06e4f2e SHA256 d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336
+EBUILD qgtkstyle-4.7.1-r2.ebuild 2104 RMD160 a84e72c92441f05daca6b89b271da7792abbff48 SHA1 94b94651184e35518bae812f188b3a9b4357d95d SHA256 e51ec6ba9d98b0e81a7d8b7413e2dd053b75969c2617f2638ccd9a6865d0d6ae
+EBUILD qgtkstyle-4.7.2.ebuild 2097 RMD160 1257b1ac0dd91f7d1f2cb1c47955dd1dd7be75dc SHA1 1e6a11d4b84dfc252f9aded61ca1a4e20eaa9cd1 SHA256 790a305ccbb023e17a167026c78a190048da109b27dfe536fc29165756a7f4ee
+MISC ChangeLog 1426 RMD160 a92494a104ec81db6b9728455f64c833163ba0e6 SHA1 82d9bab49593ac057267a73292f919196952f819 SHA256 283201d05bd4dfd263fdf406680d54a392d141ad9d0ae244e289e72b786db161
 MISC metadata.xml 156 RMD160 2c307fe3d7f514f10f158344b51114121632f411 SHA1 1b61305bd125f03b40ed85c17989140608e1efee SHA256 2bc85ad7339ae0191c26e435f2da777058779a7ebf73d14658a6ea7bfcec01b2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.12 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJM3vsNAAoJEDZF8K7rm0r6/bsP/iVetGvBnzl3y1dAvonvTrfT
-wN8iRY95hG4O5iWr+eUw3j29xjHLqSoiPvFXLmjaTxl0BxzxYbzgYRpzSikXalR7
-jP+1HA491VqHppwFyhYCfb4/AxkHTLwTrH+Z8eeKQdq66aATetYUtzho8OLD/OUb
-GD1++Q98AD1Y5J1DSVvH86dpQbUHU/X6OeO7s/w9QkDFG7nbhQIU/N0S2yx5o0G1
-O056KrV89rFgODt8ML5CP7yP6Khy7QEqC+twjmMSq1IbYXpWBzVvUAAUen4Mkgja
-ZNyZcQMJcSC5yjsyf9GBs0W+eNSO7+YBQ8j6mc2M41CIC9r3ROhVKbZb7GSDZLOD
-6Opj1+ZJ5rmkMOKRkhqDNxSI1HoHJk2msE9IFY9qaMbGOj1B2/JxIWNKg0u1kGeJ
-nADxuj/mgYItrP4Ta4d6tf+tH85QUZyYB4v7RL60pMyBaZiHn8/XO/P+F7Mz7M+g
-+R5NzZEQPwOdIhFHbtNryJ5xqakiRDF5rMGxREDD0DjHhJjGLdOfTmryTJ3vBKec
-HtBkAT66P0JbWVWT61YA9KHYkFbJfH4dUQnNajzJOvwKTldRhDgWD4/5Tsy8H0iW
-ShIZqtFa5K4ccnpwZodGtMq9M4GZfF18xBtvIELrG/de3zca0XbtTrdDh93bcxhR
-n8t2kzu2TPeQcBnOPzTp
-=CO0v
+iQIcBAEBCAAGBQJNbZbYAAoJEDZF8K7rm0r6BiUQAIvvAIZg3+KS+TNeW6QLeTOu
+LLkxlRsdIU7FavY3UHHYwUvYzweVJmc8kXPfJIcXDgJgkrSJQ6MBALnU+h6SKoxU
+FfjGzcxZJz5KT4iJJQkn0b1N9TkscLFK9JAV7pcIIwnejfcE4gOyujYGnJi0JAOM
+YuRNjYyxdkEfqy2LmgiKa4gDAFTmjUTjlVCjPO8REBLGCQtWa6cZ6gxkLBOv+kco
+0On/fgpswb8cT5Ry71cauShnMnQxd/SzGOKPjPfxjUQGBuvTmwb5Rycdho5bBgAL
+/edTMoq5KPtbYg4VotqDoRUH9YCX8+Ux/f8d+asVjSPxFRJQiZWWKADey1E0Bp5H
+jJv1OAWEV7ILHlanO3qQCMMe+/ABhf48hctFDCcMbo7CQYc+0FksLZkT36v7nkVP
+WM8KYcNPHdSNDD7T9kyYaM2BgctXY3RyYauC6RgiZEOpFRlwL0um0ZNl8ijkcFQO
+HrSZRZb/hgOL9MZPneznE3MRB8mgVjA7gDAQKrt/npsLRCW5rAgIYSF+exhJZ6zs
+swdAPtjAhNq7s4cifA8OsNAaHU4BW/PsNztihDXurSZU7H4EOpZEntqkEJWzV56/
+QkXcs4w8O7b48aRe4rOOyXpFnFp9ikD1vfj2VKk01wYXztm/QPNxdQTIXXs+s8pc
+cMJ7P3E22DDZ6jNAFCOq
+=DLxd
 -----END PGP SIGNATURE-----
diff --git a/x11-themes/qgtkstyle/files/main.cpp b/x11-themes/qgtkstyle/files/main.cpp
index 51f2ad7cbfee..12786b4f5f3d 100644
--- a/x11-themes/qgtkstyle/files/main.cpp
+++ b/x11-themes/qgtkstyle/files/main.cpp
@@ -37,12 +37,12 @@ QGtkStylePlugin::QGtkStylePlugin()
 
 QStyle *QGtkStylePlugin::create(const QString &key)
 {
-    return (key.toLower() == "gtk") ? new QGtkStyle : 0;
+    return (key.toLower() == "gtk+") ? new QGtkStyle : 0;
 }
 
 QStringList QGtkStylePlugin::keys() const
 {
-    return QStringList() << "GTK";
+    return QStringList() << "GTK+";
 }
 
 Q_EXPORT_PLUGIN2(qgtkstyle, QGtkStylePlugin)
diff --git a/x11-themes/qgtkstyle/qgtkstyle-4.6.3.ebuild b/x11-themes/qgtkstyle/qgtkstyle-4.6.3.ebuild
deleted file mode 100644
index 3f28afc92181..000000000000
--- a/x11-themes/qgtkstyle/qgtkstyle-4.6.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/qgtkstyle/qgtkstyle-4.6.3.ebuild,v 1.3 2010/11/10 21:29:11 hwoarang Exp $
-
-EAPI="3"
-inherit qt4-r2
-
-MY_PV=${PV/_/-}
-MY_P=qt-everywhere-opensource-src-${MY_PV}
-
-DESCRIPTION="Qt style that uses the active GTK theme."
-HOMEPAGE="http://qt.nokia.com/"
-SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 GPL-3 )"
-SLOT="4"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-COMMON_DEPEND="
-	x11-libs/gtk+:2
-	>=x11-libs/qt-gui-${PV}-r1
-"
-DEPEND="${COMMON_DEPEND}
-	x11-libs/cairo
-"
-RDEPEND="${COMMON_DEPEND}
-	!>x11-libs/qt-gui-${PV}-r9999
-"
-
-src_unpack() {
-	tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${MY_P}/src/gui/styles/ || die
-	mv ${MY_P}/src/gui/styles "${S}" || die
-	cp "${FILESDIR}"/qgtkstyle.pro "${S}"/ || die
-}
diff --git a/x11-themes/qgtkstyle/qgtkstyle-4.7.1-r1.ebuild b/x11-themes/qgtkstyle/qgtkstyle-4.7.1-r2.ebuild
index 812dab03394f..a481bced1e31 100644
--- a/x11-themes/qgtkstyle/qgtkstyle-4.7.1-r1.ebuild
+++ b/x11-themes/qgtkstyle/qgtkstyle-4.7.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/qgtkstyle/qgtkstyle-4.7.1-r1.ebuild,v 1.2 2010/11/13 20:53:07 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qgtkstyle/qgtkstyle-4.7.1-r2.ebuild,v 1.1 2011/03/02 01:00:27 wired Exp $
 
 EAPI="3"
 inherit confutils qt4-build
@@ -64,3 +64,11 @@ src_install() {
 	insinto /usr/$(get_libdir)/qt4/plugins/styles/ || die
 	doins lib/libgtkstyle.so || die
 }
+
+pkg_postinst() {
+	ewarn
+	ewarn "The style provided by this package has been renamed to GTK+ (from GTK)"
+	ewarn "to match upstream naming. You may have to re-select it using"
+	ewarn "qtconfig or systemsettings (in KDE)."
+	ewarn
+}
diff --git a/x11-themes/qgtkstyle/qgtkstyle-4.7.1.ebuild b/x11-themes/qgtkstyle/qgtkstyle-4.7.1.ebuild
deleted file mode 100644
index 0304d3c2d65e..000000000000
--- a/x11-themes/qgtkstyle/qgtkstyle-4.7.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/qgtkstyle/qgtkstyle-4.7.1.ebuild,v 1.1 2010/11/10 10:52:13 wired Exp $
-
-EAPI="3"
-inherit qt4-r2
-
-MY_PV=${PV/_/-}
-MY_P=qt-everywhere-opensource-src-${MY_PV}
-
-DESCRIPTION="Qt style that uses the active GTK theme."
-HOMEPAGE="http://qt.nokia.com/"
-SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 GPL-3 )"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-COMMON_DEPEND="
-	x11-libs/gtk+:2
-	>=x11-libs/qt-gui-${PV}-r1
-"
-DEPEND="${COMMON_DEPEND}
-	x11-libs/cairo
-"
-RDEPEND="${COMMON_DEPEND}
-	!>x11-libs/qt-gui-${PV}-r9999
-"
-
-src_unpack() {
-	tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${MY_P}/src/gui/styles/ || die
-	mv ${MY_P}/src/gui/styles "${S}" || die
-	cp "${FILESDIR}"/qgtkstyle.pro "${S}"/ || die
-}
diff --git a/x11-themes/qgtkstyle/qgtkstyle-4.6.3-r1.ebuild b/x11-themes/qgtkstyle/qgtkstyle-4.7.2.ebuild
index 65d8d3aeb232..c34a6ea8632e 100644
--- a/x11-themes/qgtkstyle/qgtkstyle-4.6.3-r1.ebuild
+++ b/x11-themes/qgtkstyle/qgtkstyle-4.7.2.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/qgtkstyle/qgtkstyle-4.6.3-r1.ebuild,v 1.2 2010/11/13 20:53:07 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qgtkstyle/qgtkstyle-4.7.2.ebuild,v 1.1 2011/03/02 01:00:27 wired Exp $
 
 EAPI="3"
 inherit confutils qt4-build
 
 DESCRIPTION="Qt style that uses the active GTK theme."
 SLOT="4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 COMMON_DEPEND="
 	x11-libs/gtk+:2
-	>=x11-libs/qt-gui-${PV}-r1
+	~x11-libs/qt-gui-${PV}
 "
 DEPEND="${COMMON_DEPEND}
 	|| ( >=x11-libs/cairo-1.10.0[-qt4] <x11-libs/cairo-1.10.0 )
@@ -53,7 +53,7 @@ src_configure() {
 	myconf="${myconf} -qt-gif -system-libpng -system-libjpeg
 		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2
 		-no-sql-odbc -no-xrender -no-xrandr -no-xkb -no-xshape -no-sm -no-svg -no-webkit
-		-no-cups -no-glib -no-libmng -no-nis -no-libtiff -no-dbus -no-qdbus
+		-no-cups -no-glib -no-libmng -no-nis -no-libtiff -no-dbus -no-qdbus -no-egl
 		-no-qt3support -no-xinerama -no-phonon -no-opengl -no-accessibility
 		-gtkstyle"
 
@@ -64,3 +64,11 @@ src_install() {
 	insinto /usr/$(get_libdir)/qt4/plugins/styles/ || die
 	doins lib/libgtkstyle.so || die
 }
+
+pkg_postinst() {
+	ewarn
+	ewarn "The style provided by this package has been renamed to GTK+ (from GTK)"
+	ewarn "to match upstream naming. You may have to re-select it using"
+	ewarn "qtconfig or systemsettings (in KDE)."
+	ewarn
+}