Version bump. Drop older. Cleanup mozilla useflag handling.

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

6 files changed, 32 insertions, 93 deletions

diff --git a/x11-themes/gtk-engines-qtcurve/ChangeLog b/x11-themes/gtk-engines-qtcurve/ChangeLog
index 62fd1ae268ea..25283990a3b4 100644
--- a/x11-themes/gtk-engines-qtcurve/ChangeLog
+++ b/x11-themes/gtk-engines-qtcurve/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-themes/gtk-engines-qtcurve
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qtcurve/ChangeLog,v 1.103 2011/01/29 13:44:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qtcurve/ChangeLog,v 1.104 2011/01/29 17:44:33 scarabeus Exp $
+
+*gtk-engines-qtcurve-1.8.5 (29 Jan 2011)
+
+  29 Jan 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -gtk-engines-qtcurve-0.65.2.ebuild, -gtk-engines-qtcurve-1.7.2.ebuild,
+  -gtk-engines-qtcurve-1.8.1.ebuild, +gtk-engines-qtcurve-1.8.5.ebuild,
+  metadata.xml:
+  Version bump. Drop older. Cleanup mozilla useflag handling.
 
   29 Jan 2011; Raúl Porcel <armin76@gentoo.org>
   gtk-engines-qtcurve-1.6.4.ebuild:
diff --git a/x11-themes/gtk-engines-qtcurve/Manifest b/x11-themes/gtk-engines-qtcurve/Manifest
index 9129b7fcd5c8..e4aa80984146 100644
--- a/x11-themes/gtk-engines-qtcurve/Manifest
+++ b/x11-themes/gtk-engines-qtcurve/Manifest
@@ -1,12 +1,8 @@
-DIST QtCurve-Gtk2-0.65.2.tar.bz2 116014 RMD160 a0c735b7474a9e0bda2747c261f112ca34c9e740 SHA1 8a8391d71930ec63a91dfc8da013b1dc3daca83f SHA256 fcd9bb64979196c816057c7ef30bce1c6647208f38598a6b2321117cdf21f2b6
 DIST QtCurve-Gtk2-0.69.2.tar.bz2 121654 RMD160 bb64eb8bad6b55f0430bd93debdf1078f27d933a SHA1 825ad56d6b388f56aa8fae09c02bf27410b11f1e SHA256 7e37db61ba70faf8072f9e4a4230f7e330ec656b55de67f3d9ab5f2643992309
 DIST QtCurve-Gtk2-1.6.4.tar.bz2 142767 RMD160 fe4c6029b61c88133aea7b9bf2cba481a625b19f SHA1 0b4b3e183183c5f7c92a4afa51541e84c1acdf8f SHA256 cada5fbba041a050ddc34ca4059bbb9221f5585a003c1488b4878d32e51b7328
-DIST QtCurve-Gtk2-1.7.2.tar.bz2 151038 RMD160 fd957ac51d9597af9806dc43a63b22a2ba164e76 SHA1 717e6ca3c8cbeac751cd12cdc99220932640bf40 SHA256 aa23f3bca5089cf484f39ff89215428551356472e390be38df305d91d2966c61
-DIST QtCurve-Gtk2-1.8.1.tar.bz2 154603 RMD160 ddff6699da3f6ad3cea76a68954ff8cdd7855028 SHA1 2c3b50ad3db1d218ecebee028402d772416a276c SHA256 9bec0ebbfa2aab48633666cd859ef8143c186e3cb263e70c06e610537b53cea5
-EBUILD gtk-engines-qtcurve-0.65.2.ebuild 1147 RMD160 91384592c5dcd87337d4af198f1de4224896315f SHA1 64fdf2738dd2d16606f03914f2d049a8c45b9fcf SHA256 f5a23fa12ce18e4b0254df3f0e24b3da6e4a8d01535ed6dfaf1c5880de70a21e
+DIST QtCurve-Gtk2-1.8.5.tar.bz2 159764 RMD160 3cc78648760ef12a4551c2b5f308a5dde33b7ac2 SHA1 7d8d4042dce9c952a5553b6b165bf59e1bb2f5e8 SHA256 da3fd90127da73d9f96d61cc27125afb18921765a0532b1a9951290a865d8f45
 EBUILD gtk-engines-qtcurve-0.69.2.ebuild 1107 RMD160 cd96c574bf5a105a3c42df53079230d1613e5cb6 SHA1 544593737e61bf769d33eadc7a7a91436c7d4eb0 SHA256 03c6b460c6727128ce5333459a69ecd07515e2866706ef2f76d5e85bfc19ccd1
 EBUILD gtk-engines-qtcurve-1.6.4.ebuild 1106 RMD160 8956b1e88a7ec4e385a089f7d640a404a850d4f6 SHA1 8f0bf4042624219b0e2104589481693ba90bb6c5 SHA256 624ead0c014d7c188fd0ab08d64c33cb269f8302e9cb0aafa6a18d3faf469d7b
-EBUILD gtk-engines-qtcurve-1.7.2.ebuild 1109 RMD160 877faed012fa67bf7b6bf5036e9aca0a941804c2 SHA1 29bfab52d6b4f3f51e2c561e8a265f48902ad616 SHA256 eb58ed134d03b60f8299f1d3af4e7626ebf5fcca6eee0b3f11bf5d8e63a5f848
-EBUILD gtk-engines-qtcurve-1.8.1.ebuild 1109 RMD160 c115e3990a0ce930891251411c05808932f1ebc0 SHA1 5045e6462439f0c7ab216b2b5591922cc146d141 SHA256 756eef7d32a52c06a9cea5610343336587eeab552f45758c90d3eaa8d3faac9e
-MISC ChangeLog 4890 RMD160 305d166fb4fc5e0b8f25d9d4a535e3f49ea7a45b SHA1 e86ff720f2c85e1c708d8674c863f0e793c459ba SHA256 6c55429e8ae70da6e65a1241c679561b89fa9736d698adb122277237fb23f419
-MISC metadata.xml 641 RMD160 607755ea532eaf7eefec189c84ea9c616b7fded0 SHA1 dd539560649ebf7e4d6431fee00d24ecb8d31582 SHA256 8c378eeb48896482d93f3c064563560735ff1bf369f1ee5dae1433fc28b60ca7
+EBUILD gtk-engines-qtcurve-1.8.5.ebuild 1058 RMD160 51fe66cf1360e5697919c1805be2a7530085d345 SHA1 a2f0f4d7008340befef35d8dfe1109b9abf14204 SHA256 224678a9daafcdb71b0692734ef06755b38ed2032fe58edcbb764914570b2fe1
+MISC ChangeLog 5213 RMD160 3d9a906cd6fec51b82c6ce822530993f8d7ae55d SHA1 74a7a7692bfceb4ac14656ec1ca239121cf733f8 SHA256 455b05d111e7a62ca7724422f5e7d17b088288070b7e193dc8dc36f1d129c8a0
+MISC metadata.xml 614 RMD160 945dec18bc56dbc10bbef8b78a080f829412d158 SHA1 565acefae27b59c1f88412a6364c5ee37b30b022 SHA256 abf24345d71c8024681c614c2da0710461f49c2105b9dcb89518e17528085317
diff --git a/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-0.65.2.ebuild b/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-0.65.2.ebuild
deleted file mode 100644
index 3376939fc384..000000000000
--- a/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-0.65.2.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/gtk-engines-qtcurve/gtk-engines-qtcurve-0.65.2.ebuild,v 1.7 2010/07/25 19:11:46 nirbheek Exp $
-
-EAPI=1
-inherit eutils cmake-utils
-
-MY_P=${P/gtk-engines-qtcurve/QtCurve-Gtk2}
-
-DESCRIPTION="A set of widget styles for GTK2 based apps, also available for KDE3 and Qt4"
-HOMEPAGE="http://www.kde-look.org/content/show.php?content=40492"
-SRC_URI="http://home.freeuk.com/cpdrummond/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ~ppc64 ~sparc x86"
-IUSE="mozilla firefox3"
-
-RDEPEND="x11-libs/gtk+:2
-	x11-libs/cairo
-	firefox3? ( || ( >=www-client/firefox-3.0
-		>=www-client/firefox-bin-3.0 ) )"
-DEPEND="x11-libs/gtk+:2
-	x11-libs/cairo
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-DOCS="ChangeLog README TODO"
-
-src_compile() {
-	local mycmakeargs=""
-	use mozilla && mycmakeargs="-DQTC_MODIFY_MOZILLA=true -DQTC_MODIFY_MOZILLA_USER_JS=true"
-	use firefox3 && mycmakeargs="-DQTC_NEW_MOZILLA=true -DQTC_MODIFY_MOZILLA=true -DQTC_MODIFY_MOZILLA_USER_JS=true"
-	cmake-utils_src_compile
-}
diff --git a/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-1.8.1.ebuild b/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-1.8.1.ebuild
deleted file mode 100644
index 288a0fd90879..000000000000
--- a/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-1.8.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/gtk-engines-qtcurve/gtk-engines-qtcurve-1.8.1.ebuild,v 1.1 2010/12/05 22:49:54 wired Exp $
-
-EAPI=1
-inherit eutils cmake-utils
-
-MY_P=${P/gtk-engines-qtcurve/QtCurve-Gtk2}
-
-DESCRIPTION="A set of widget styles for GTK2 based apps, also available for KDE3 and Qt4"
-HOMEPAGE="http://www.kde-look.org/content/show.php?content=40492"
-SRC_URI="http://craigd.wikispaces.com/file/view/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="mozilla firefox3"
-
-RDEPEND="x11-libs/gtk+:2
-	x11-libs/cairo
-	firefox3? ( || ( >=www-client/firefox-3.0
-		>=www-client/firefox-bin-3.0 ) )"
-DEPEND="x11-libs/gtk+:2
-	x11-libs/cairo
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-DOCS="ChangeLog README TODO"
-
-src_compile() {
-	local mycmakeargs=""
-	use mozilla && mycmakeargs="-DQTC_MODIFY_MOZILLA=true -DQTC_OLD_MOZILLA=true"
-	use firefox3 && mycmakeargs="-DQTC_MODIFY_MOZILLA=true -DQTC_OLD_MOZILLA=false"
-	cmake-utils_src_compile
-}
diff --git a/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-1.7.2.ebuild b/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-1.8.5.ebuild
index 17cb37f7a5dd..4f1e6070a123 100644
--- a/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-1.7.2.ebuild
+++ b/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-1.8.5.ebuild
@@ -1,9 +1,9 @@
-# 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/gtk-engines-qtcurve/gtk-engines-qtcurve-1.7.2.ebuild,v 1.1 2010/11/17 08:49:21 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-1.8.5.ebuild,v 1.1 2011/01/29 17:44:33 scarabeus Exp $
 
-EAPI=1
-inherit eutils cmake-utils
+EAPI=4
+inherit cmake-utils
 
 MY_P=${P/gtk-engines-qtcurve/QtCurve-Gtk2}
 
@@ -14,12 +14,16 @@ SRC_URI="http://craigd.wikispaces.com/file/view/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="mozilla firefox3"
+IUSE="mozilla"
 
 RDEPEND="x11-libs/gtk+:2
 	x11-libs/cairo
-	firefox3? ( || ( >=www-client/firefox-3.0
-		>=www-client/firefox-bin-3.0 ) )"
+	mozilla? (
+		|| (
+			>=www-client/firefox-3.0
+			>=www-client/firefox-bin-3.0
+		)
+	)"
 DEPEND="x11-libs/gtk+:2
 	x11-libs/cairo
 	dev-util/pkgconfig"
@@ -27,9 +31,11 @@ DEPEND="x11-libs/gtk+:2
 S=${WORKDIR}/${MY_P}
 DOCS="ChangeLog README TODO"
 
-src_compile() {
-	local mycmakeargs=""
-	use mozilla && mycmakeargs="-DQTC_MODIFY_MOZILLA=true -DQTC_OLD_MOZILLA=true"
-	use firefox3 && mycmakeargs="-DQTC_MODIFY_MOZILLA=true -DQTC_OLD_MOZILLA=false"
-	cmake-utils_src_compile
+src_configure() {
+	local mycmakeargs=(
+		"-DQTC_OLD_MOZILLA=OFF"
+		"-QTC_USE_CAIRO_FOR_ARROWS=ON"
+		$(cmake-utils_use mozilla QTC_MODIFY_MOZILLA)
+	)
+	cmake-utils_src_configure
 }
diff --git a/x11-themes/gtk-engines-qtcurve/metadata.xml b/x11-themes/gtk-engines-qtcurve/metadata.xml
index b2bba161f0eb..53b16f8cad0a 100644
--- a/x11-themes/gtk-engines-qtcurve/metadata.xml
+++ b/x11-themes/gtk-engines-qtcurve/metadata.xml
@@ -12,8 +12,7 @@
 			<pkg>www-client/firefox</pkg>
 		</flag>
 		<flag name="mozilla">Install GUI theme tweaks for mozilla based
-			browsers, including version 2 of
-			<pkg>www-client/firefox</pkg>
+			browsers <pkg>www-client/firefox</pkg>
 		</flag>
 	</use>
 </pkgmetadata>