Version bump, #395723 by Ivan S. Titov. Allow www-client/icecat to satisfy the mozill...

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

diff --git a/x11-themes/gtk-engines-qtcurve/ChangeLog b/x11-themes/gtk-engines-qtcurve/ChangeLog
index 3f5db7badac0a1583d7337b8d085a097cfb66003..0eca5b8d87b7a18e54103b1b85bf96ec2fe81e8a 100644 (file)
--- 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.108 2011/11/01 04:01:46 jer Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qtcurve/ChangeLog,v 1.109 2012/01/01 21:56:46 pesa Exp $
+
+*gtk-engines-qtcurve-1.8.12 (01 Jan 2012)
+
+  01 Jan 2012; Davide Pesavento <pesa@gentoo.org>
+  +gtk-engines-qtcurve-1.8.12.ebuild, -gtk-engines-qtcurve-0.69.2.ebuild,
+  -gtk-engines-qtcurve-1.8.5.ebuild, -gtk-engines-qtcurve-1.8.7.ebuild:
+  Version bump, #395723 by Ivan S. Titov. Allow www-client/icecat to satisfy the
+  mozilla dependency (bug #370165 by Matija "hook" Šuklje). Remove old.
 
   01 Nov 2011; Jeroen Roovers <jer@gentoo.org>
   gtk-engines-qtcurve-0.69.2.ebuild, gtk-engines-qtcurve-1.6.4.ebuild,

diff --git a/x11-themes/gtk-engines-qtcurve/Manifest b/x11-themes/gtk-engines-qtcurve/Manifest
index f16932c04d2dd47820dbfa2a8afba06b72f147eb..ebcc12ca8a4be79e60848c299a0f65e1dff5b2b4 100644 (file)
--- a/x11-themes/gtk-engines-qtcurve/Manifest
+++ b/x11-themes/gtk-engines-qtcurve/Manifest
@@ -1,22 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
-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.8.5.tar.bz2 159764 RMD160 3cc78648760ef12a4551c2b5f308a5dde33b7ac2 SHA1 7d8d4042dce9c952a5553b6b165bf59e1bb2f5e8 SHA256 da3fd90127da73d9f96d61cc27125afb18921765a0532b1a9951290a865d8f45
-DIST QtCurve-Gtk2-1.8.7.tar.bz2 160197 RMD160 3aa82364799760dae848cec2d022e2e250159015 SHA1 e294bc0e77ac9d2c4b3fe35b370a69b82735d970 SHA256 0dec10ec0a3daf57dc5d71e2eebbeb977fcdbf38f66f04c90b2df0221dee3b81
+DIST QtCurve-Gtk2-1.8.12.tar.bz2 184244 RMD160 e3bb22a8e35b85f5b15697d15ff3b93b9793b109 SHA1 3b107aee1cf7dbd3ac47c693e82cd877a0fe2d5f SHA256 86eec886449039f7c58db798b8c5b694c36d5502ef5d8420668e63c9cc113752
 DIST QtCurve-Gtk2-1.8.9.tar.bz2 160474 RMD160 721a4aee988ea7dc240025211dcf7d6317a268c9 SHA1 0b4cfd30b84f15ad139cb825168b7111a71aa49d SHA256 e8baa0e8fdc7a1aab2fd2fd461de14ff65c259d844e1288389cd6598a4203239
-EBUILD gtk-engines-qtcurve-0.69.2.ebuild 1097 RMD160 74840e87fd8620fa83fc93b962c3f72b37a81370 SHA1 aa1ba140109915fc908a943ca4312c261c5d895d SHA256 5072dba281b77482c6f86f699838e6bdc0a21654edfd6160b79540f3d99eb35f
 EBUILD gtk-engines-qtcurve-1.6.4.ebuild 1095 RMD160 975f2bee9a9b9c2f4e8857bfe25ff5ef6943da20 SHA1 a19f9f62d4a97ec803fd2271091f987ba1567c6e SHA256 3f3f7f9ee06c09a53023bbc4464c9094c73512d1dc17f08119f9d9edb4cb8759
-EBUILD gtk-engines-qtcurve-1.8.5.ebuild 1046 RMD160 11eab00e6db45c62ba917c6acff45710f7d00ed9 SHA1 1c3c1379c84f4963d7c10b69a893fa4017416ec5 SHA256 2d7495c3632bf926b6b1a744c8fc775f55dedb747cf2a5bb4f83dd925e9cfd59
-EBUILD gtk-engines-qtcurve-1.8.7.ebuild 1046 RMD160 b585c932a2bf41b115ff9eb7f53534034f6aa30d SHA1 71ece6db9478467698e599ee91af89c7f8b160c1 SHA256 27c0c1257423b02b8acc67bc7b59ec557c7c5e1d9cadfcbe1be1e272f935a2e1
+EBUILD gtk-engines-qtcurve-1.8.12.ebuild 1021 RMD160 6c30f651899aaa511184ff04ee15191f2a6bf05a SHA1 4f6e159e8d433419636969aab9fb8d12ecf4e09a SHA256 f7710b81b1a4d318b96bcf19f5b2bd4759dcdd0614f1adb2b5ed345059280159
 EBUILD gtk-engines-qtcurve-1.8.9.ebuild 1046 RMD160 80318a381d57912fb240e02019bfa5013d9e1e79 SHA1 8d06a3f20a9d0043ca97b6a7a6ac0f32b8b7a73a SHA256 a324b7a3ea02a22d1bae3efdac3a6d1e3db2545a18e145b9de60abb83cbb9544
-MISC ChangeLog 5866 RMD160 dd12cf2d463d0506a5cb664e029d6d378ceb8a7b SHA1 59e679dfb6d3694a492165cf124adceb4c5c7e56 SHA256 28bb3415bcecdea32cc843add3efa2d35191c28a2d8d853285404188b5f00456
+MISC ChangeLog 6261 RMD160 910a44f843c19dbb1ac1002097dbdf95db3618ce SHA1 93c129683db2fd1b9136219f48bd0e770245329e SHA256 9d653ccc1b847ef6fe137afa25aef8538338db22eda287ebfaa728b0b8fdc624
 MISC metadata.xml 614 RMD160 945dec18bc56dbc10bbef8b78a080f829412d158 SHA1 565acefae27b59c1f88412a6364c5ee37b30b022 SHA256 abf24345d71c8024681c614c2da0710461f49c2105b9dcb89518e17528085317
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6vbzsACgkQVWmRsqeSphOv+gCeIbkj1PygmoZ6QWAJwEAlm7av
-VYMAn0hS8LnQkDd/n4BA1MVr5CCDdoPI
-=qfGD
+iQIcBAEBCgAGBQJPANamAAoJENXLsxwXqFxyRz4P/jrePetZM88RVhNe/+l6SSoe
+ZYdrq0GNOa4JGE6HCngvDVEOXdhECwhxVp0KAzE0cXBAevxvxDX9EnB9h3+8xrA+
+0dxmWUDBinZ6Tu/UqwTJFKX10GYSe5d/sNWnLR0zj2z9ysiuJ9Vgkg1TqpQ/1LhP
+7YyA0e5JhlThCfG7v3FqVhsi+ivYTvBp+dA3qu/2N/WZLWQRehlwQN1LQ/Ah/Mof
+sTiC0c49b5igatBMZqAkod5OVhLYGfkqiL4pBXPvirpPIbtKn3hxtbTE1+xAgAux
+fufbJj7klFQFvCoV+ZoOMVARXVloKWWjkHdNCgCG8UCRFkBbFYyQEx3jUOh5b9xu
+E3dcQ1TiZwC4C1Bw5SiYJhZrk0gpy2RKJEuHFO7jyMrVYyUOxlsCgL3nhAWtjJE5
+GJnTuMUvr1ecblBOst0+fBakchNiyb2rczalVyY7KvX9zrcIlbbtkPJBF4dGNnbD
+LB3wTy/jysggy+XH44HMzRDZhzknCSJhQ1fTrhDod/owg67g6p52A2DWLZoR7fU4
+SSKHAlaoTESZEPbHuVwdqQUQKLSd24WY52wzcJKrLnSC3JokZGLl+fEYj3GN0w8Q
+O5MraE7U1IcL/kzWU5aMk4GZ7uUmapcPWZdEfnVq3mjwnvxoEtFLUp2shxkEe65d
+rC41PjS2tUd9aWdBU0i7
+=NoD2
 -----END PGP SIGNATURE-----

diff --git a/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-0.69.2.ebuild b/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-0.69.2.ebuild
deleted file mode 100644 (file)
index 97a302a..0000000
--- a/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-0.69.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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-0.69.2.ebuild,v 1.11 2011/11/01 04:01:46 jer 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 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.8.5.ebuild b/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-1.8.12.ebuild
similarity index 65%
rename from x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-1.8.5.ebuild
rename to x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-1.8.12.ebuild
index 10036ced6d3b35626d227a0ee72c26f522e09f05..a40f98d7e655ce2e51f79e60fa8e465374748db9 100644 (file)
--- a/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-1.8.5.ebuild
+++ b/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-1.8.12.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.5.ebuild,v 1.2 2011/11/01 04:01:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-1.8.12.ebuild,v 1.1 2012/01/01 21:56:46 pesa Exp $
 
 EAPI=4
 inherit 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"
+DESCRIPTION="A set of widget styles for GTK2 based apps, also available for Qt4/KDE4"
 HOMEPAGE="http://www.kde-look.org/content/show.php?content=40492"
 SRC_URI="http://craigd.wikispaces.com/file/view/${MY_P}.tar.bz2"
 
@@ -16,25 +16,27 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="mozilla"
 
-RDEPEND="x11-libs/gtk+:2
-       x11-libs/cairo
-       mozilla? (
-               || (
-                       >=www-client/firefox-3.0
-                       >=www-client/firefox-bin-3.0
-               )
-       )"
-DEPEND="x11-libs/gtk+:2
-       x11-libs/cairo
-       dev-util/pkgconfig"
+CDEPEND="
+       x11-libs/gtk+:2
+"
+DEPEND="${CDEPEND}
+       dev-util/pkgconfig
+"
+RDEPEND="${CDEPEND}
+       mozilla? ( || (
+               >=www-client/firefox-3.0
+               >=www-client/firefox-bin-3.0
+               >=www-client/icecat-3.0
+       ) )
+"
 
 S=${WORKDIR}/${MY_P}
+
 DOCS="ChangeLog README TODO"
 
 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/gtk-engines-qtcurve-1.8.7.ebuild b/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-1.8.7.ebuild
deleted file mode 100644 (file)
index ec2a83a..0000000
--- a/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-1.8.7.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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.8.7.ebuild,v 1.2 2011/11/01 04:01:46 jer Exp $
-
-EAPI=4
-inherit 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 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="mozilla"
-
-RDEPEND="x11-libs/gtk+:2
-       x11-libs/cairo
-       mozilla? (
-               || (
-                       >=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_configure() {
-       local mycmakeargs=(
-               "-DQTC_OLD_MOZILLA=OFF"
-               "-QTC_USE_CAIRO_FOR_ARROWS=ON"
-               $(cmake-utils_use mozilla QTC_MODIFY_MOZILLA)
-       )
-       cmake-utils_src_configure
-}