Stable 1.0.0-r1:3 and 1.2.0-r1:2 on amd64 and x86. Drop older

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

5 files changed, 28 insertions, 64 deletions

diff --git a/x11-themes/oxygen-gtk/ChangeLog b/x11-themes/oxygen-gtk/ChangeLog
index cdb1c685e042..844404763b44 100644
--- a/x11-themes/oxygen-gtk/ChangeLog
+++ b/x11-themes/oxygen-gtk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-themes/oxygen-gtk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/oxygen-gtk/ChangeLog,v 1.24 2012/01/18 17:22:30 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/oxygen-gtk/ChangeLog,v 1.25 2012/02/16 19:07:33 scarabeus Exp $
+
+  16 Feb 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  oxygen-gtk-1.0.0-r1.ebuild, -oxygen-gtk-1.1.6.ebuild,
+  oxygen-gtk-1.2.0-r1.ebuild:
+  Stable 1.0.0-r1:3 and 1.2.0-r1:2 on amd64 and x86. Drop older
 
   18 Jan 2012; Johannes Huber <johu@gentoo.org> oxygen-gtk-1.0.0-r1.ebuild:
   Move blocker to RDEPEND, thx zmedico. Fixes bug #399285.
diff --git a/x11-themes/oxygen-gtk/Manifest b/x11-themes/oxygen-gtk/Manifest
index 10650a941664..ea05b2018ba0 100644
--- a/x11-themes/oxygen-gtk/Manifest
+++ b/x11-themes/oxygen-gtk/Manifest
@@ -1,22 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
-DIST oxygen-gtk-1.1.6.tar.bz2 191531 RMD160 ad3ac6bc943613803d27a7497e6d2ec1327f2847 SHA1 9a466484743a56d5a2da62d71400ef7429d51551 SHA256 197c0b505fe7a0dbb15ff951bd3bf29f0c8322cac4aa99434cfd09d26b0ce260
 DIST oxygen-gtk2-1.2.0.tar.bz2 191654 RMD160 d8221cb14f7882a64430fe4e729542a77d44d937 SHA1 d9720b9d95f2e1dc05de34c41539935a0e87abe4 SHA256 3742fb5bd65dad1a26e973fcf0488f35f824f92660b67066536ba480b6b4ad8f
 DIST oxygen-gtk3-1.0.0.tar.bz2 185889 RMD160 34ecbde5ef6581e410f9b10fe6411e26003cec35 SHA1 247a7b28ea189070f82dfafa997481c5b6b73ced SHA256 9a89e4767d0afedb7a7b6b580cba74dcc14c72ab898c1d70376619d9675f2642
-EBUILD oxygen-gtk-1.0.0-r1.ebuild 1100 RMD160 54dae411dc0897c8b39f97a1985535fb032ca7c5 SHA1 2bd7ac288368f4d3fb6432862c93dfed5c292588 SHA256 ac08217d07e185448090c35ff1f289fa97606c0192672823884a52c8362d6559
-EBUILD oxygen-gtk-1.1.6.ebuild 1025 RMD160 71a5877aa55461221274decf480613b5cd2f4325 SHA1 78b39311c383c7726bb0583932815e6dd4d81c33 SHA256 2ef452cc533ac5d6e203d7df67299ec3eeb492da44ab6a398ebf6dfa679c06e8
-EBUILD oxygen-gtk-1.2.0-r1.ebuild 1128 RMD160 8d8f2963c2aefc842f17ffd37d8dfdd20b43272b SHA1 a7c5335be3b651b44123b0b99bdf03b3e3dc308f SHA256 7c4a7fc52234fea8bf7e2902714dd3f567d04a01ee06f1b04ed42548fb1c2eb9
-MISC ChangeLog 4305 RMD160 64dd4dce38c2e776ffde89e9165352d4a83eae9c SHA1 9266a15b2ca10e22b0cf86e766fe2cd579a9e728 SHA256 a138a2f8c6fc703a9454125eeadee90016da5a20d0a6b10b4b13a12ee2d7e864
+EBUILD oxygen-gtk-1.0.0-r1.ebuild 1103 RMD160 aa4d895367afd74d115f5e9ecaf60c83b9e4bd56 SHA1 df657302918796b6b12cab18a6fc241a05d80457 SHA256 4665be6f1a26b69a5295c63dfdbe1f02a1798daa84e70a37b6c06206733ca528
+EBUILD oxygen-gtk-1.2.0-r1.ebuild 1128 RMD160 602881f35b29d54dfe9fe25e976e2269a8767373 SHA1 0c11235ac3d7905f3017f701b6ee6ae239b62be3 SHA256 aeb077ec303344aaab4e048a509be395159e80c36d66d65c983c863eac2e46e3
+MISC ChangeLog 4516 RMD160 77936d84182f341b8fc7df7e3e70ae8eaa8ac74a SHA1 83550128fbd7acd818ad545afaae2e5daca380a4 SHA256 bc4e8b5b3d3a9466f77c734b39d7dd77b915956232f5329ba33a575d08bd5a20
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPFv+qAAoJEO+t9ga+3I3aCjAH/3X3qNvVK+DbS2MM/7e1xYVq
-yZr7obHyB45KkWtpPa7QnVYUr5bykwlioCc23iosZABgj43r745JdpblO5zz84PW
-2K9g8l9e1G3sxAHfGuT8QRepEwgljS/PDw0LrLRt5C6jUQsNRcIQdePrQ2HP8mGC
-ynmAxxRsEXu7k5ZOGTH9zHhObr8IYxnxeX1YFnaStCNUFJzKzLzcT/m3A7qeKDOm
-1nvcqbEWLNo3I6WR2XmtK4OkdHy4KXy/UygzKbZwPt+6quqAccpBE6oVDBNJZAoe
-LlsOIp2EyFwikwQV2BYQ4nJwN4ZtBLD8FYC+d0TaVdOiN7gpN723aJ9VexarZEA=
-=aUVj
+iQIcBAEBAgAGBQJPPVQGAAoJEOSiRoyO7jvo8PMP/1bd6be6orqTpEb4S1q/0bEM
+twN0Qoo6JLPri3OgTkUXm0K6tSMUJkpg+qZRpvYQ3S1Q+Wr8pKPIGvK9G1qSsSds
+Ee8c+fkqptgA9Na3PzWkkOxqpZ52uviwefIRhURXTRWdUYuFMhH58PJ4qIk8/K13
+aYopBXqKV8alnQr49Z5b9pKCLPXb6+E6VpRdEWmop/BhGmmXHYEU4VFL+lAPufpQ
+ULYPmx/y6jqZygkWAfyKSGCadadfshkglXH4OhauLUwcZyvjI+vUg9ML9B286UKL
+pPs3wZzHBBZj9gLucVvOTT17NDa69u9DUx59nLeAWYxgO8bupzSrjGj76xDeggMl
+LFRtijhiyS43VCsI1uJexqHR9WhiB0zCxUXRKoxBrA0g7E5868wV24x/eVrA2u5X
+U6ex7ScrCSzsOMfRKrrnin9ymIEvxPtVXjtzWlchSizzWuRMySNE/PtMB687MYyS
+7fCJP5GrB1VailoCvI+7tivee2PZp/W6IQGCRm98A3j6ihB3VEd/bJn1Kjpi45GX
+GKrVjceARXZTTPBXBmoQprFFX1PlN6CNF7y0R53QETy2djVYNvplCogm66pgi1sv
+rR9XVerknpdAeyejlXFyuJcGREozfpSnmX3ismWPUEfVY5D0vizTN/NI6EeIWjto
+T6uOWY+QTKzFlSnLypQS
+=yIUd
 -----END PGP SIGNATURE-----
diff --git a/x11-themes/oxygen-gtk/oxygen-gtk-1.0.0-r1.ebuild b/x11-themes/oxygen-gtk/oxygen-gtk-1.0.0-r1.ebuild
index 66b5de0c949b..429fff0f2360 100644
--- a/x11-themes/oxygen-gtk/oxygen-gtk-1.0.0-r1.ebuild
+++ b/x11-themes/oxygen-gtk/oxygen-gtk-1.0.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/oxygen-gtk/oxygen-gtk-1.0.0-r1.ebuild,v 1.2 2012/01/18 17:22:30 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/oxygen-gtk/oxygen-gtk-1.0.0-r1.ebuild,v 1.3 2012/02/16 19:07:33 scarabeus Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ HOMEPAGE="https://projects.kde.org/projects/playground/artwork/oxygen-gtk"
 SRC_URI="mirror://kde/stable/${MY_PN}/${PV}/src/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="3"
 IUSE="debug doc"
 
diff --git a/x11-themes/oxygen-gtk/oxygen-gtk-1.1.6.ebuild b/x11-themes/oxygen-gtk/oxygen-gtk-1.1.6.ebuild
deleted file mode 100644
index 1a1a157e1489..000000000000
--- a/x11-themes/oxygen-gtk/oxygen-gtk-1.1.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/oxygen-gtk/oxygen-gtk-1.1.6.ebuild,v 1.3 2012/01/13 21:58:46 ago Exp $
-
-EAPI=4
-
-inherit cmake-utils
-
-DESCRIPTION="Official GTK+ port of KDE's Oxygen widget style"
-HOMEPAGE="https://projects.kde.org/projects/playground/artwork/oxygen-gtk"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 x86"
-SLOT="0"
-IUSE="debug doc"
-
-RDEPEND="
-	dev-libs/dbus-glib
-	dev-libs/glib
-	x11-libs/cairo
-	>=x11-libs/gtk+-2.24.2:2
-	x11-libs/libX11
-	x11-libs/pango
-"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-DOCS=(AUTHORS README)
-
-src_install() {
-	if use doc; then
-		{ cd "${S}" && doxygen Doxyfile; } || die "Generating documentation failed"
-		HTML_DOCS=( "${S}/doc/html/" )
-	fi
-
-	cmake-utils_src_install
-
-	cat <<-EOF > 99oxygen-gtk
-CONFIG_PROTECT="${EPREFIX}/usr/share/themes/oxygen-gtk/gtk-2.0"
-EOF
-	doenvd 99oxygen-gtk
-}
diff --git a/x11-themes/oxygen-gtk/oxygen-gtk-1.2.0-r1.ebuild b/x11-themes/oxygen-gtk/oxygen-gtk-1.2.0-r1.ebuild
index c67fb5be7fbd..4f421d7c2876 100644
--- a/x11-themes/oxygen-gtk/oxygen-gtk-1.2.0-r1.ebuild
+++ b/x11-themes/oxygen-gtk/oxygen-gtk-1.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/oxygen-gtk/oxygen-gtk-1.2.0-r1.ebuild,v 1.2 2012/01/18 17:02:26 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/oxygen-gtk/oxygen-gtk-1.2.0-r1.ebuild,v 1.3 2012/02/16 19:07:33 scarabeus Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ HOMEPAGE="https://projects.kde.org/projects/playground/artwork/oxygen-gtk"
 SRC_URI="mirror://kde/stable/${MY_PN}/${PV}/src/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="2"
 IUSE="debug doc"