6 files changed, 25 insertions, 120 deletions
diff --git a/x11-themes/oxygen-gtk/ChangeLog b/x11-themes/oxygen-gtk/ChangeLog
index 21c950be2262..bf2d26f71acc 100644
--- a/x11-themes/oxygen-gtk/ChangeLog
+++ b/x11-themes/oxygen-gtk/ChangeLog
@@ -1,6 +1,10 @@
 # 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.40 2012/07/18 15:00:46 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/oxygen-gtk/ChangeLog,v 1.41 2012/08/01 21:53:30 scarabeus Exp $
+
+  01 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org> -oxygen-gtk-1.0.5.ebuild,
+  -oxygen-gtk-1.2.5.ebuild, oxygen-gtk-1.1.0.ebuild, oxygen-gtk-1.3.0.ebuild:
+  Stabilise amd64 and x86 both slot latest versions. Remove older.
 
 *oxygen-gtk-1.1.0 (18 Jul 2012)
 
diff --git a/x11-themes/oxygen-gtk/Manifest b/x11-themes/oxygen-gtk/Manifest
index aeebf09a7163..44dbd7394757 100644
--- a/x11-themes/oxygen-gtk/Manifest
+++ b/x11-themes/oxygen-gtk/Manifest
@@ -1,24 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST oxygen-gtk2-1.2.5.tar.bz2 191613 SHA256 adab470bea43edc43c11b3d51635a4f1e697310aca561798b6a62a46842da7b3 SHA512 9b6968539dbde0ea7ca939166a85e086ba6eed5b6c6e8191109105dba57b4b727fc069256459d96bf2bfac9299d5add8ffbe1a4539ef7e8c2eabbfa7851822f7 WHIRLPOOL e8161a5c878740983e308faacd5cf8384fa3be2f432c2ab1872e27eadd85bdd833e935f09984d1b06e62b20075e3fec4269cd151493e2a4242fefc813e9b40aa
 DIST oxygen-gtk2-1.3.0.tar.bz2 193987 SHA256 a8879f18ed454e51f9dda1a242412b08d8a08481beb311bcc294dbec8ad0fd33 SHA512 18833fe056e711a99b1f52957e5b1c2e68cd4954b78370b8bccf9d1947e0ce3e0e6d6a0bf764984bea6e6bd89f48e590d6838590339e102cf0f1d118e0ccc253 WHIRLPOOL 00e724f8c7b2ffa2d7cd76f19a23db911f485290f6ad9d3bdd56b1df72b7140237e381d84ca3d5e7f70fbe8b688fb025f09c56b95fecbcf615450b46315d4be3
-DIST oxygen-gtk3-1.0.5.tar.bz2 185761 SHA256 210193d8d394fc76f5aaec5168b4a0e45f5b86afc9c5fa14e179a73e07696d4e SHA512 d0afd8cd30a8a3dbf7cf9f253f185c7e9f14fe2b6ebffe818396ec692235202910149130a745c55a3b83b8863212edce6abef28575abfaddf2af40e201c14daa WHIRLPOOL b9cb0fd402615ed401bdd1c64663e804a68537a239c4179a482ab22bfa3a50a2e18e0ca1fad494b35e6587c4d1c853597f83c8f815a5c2696e8840638ec02a1e
 DIST oxygen-gtk3-1.1.0.tar.bz2 187778 SHA256 c3cbc6b86124dcc4f99faeb8e7b389f7259cbf86e293766fa92219cb79b9d0a0 SHA512 6524c2dd6c5792bb386a25f6bb9bd6f1c92d600392f70ad83e5f8031dbf1f9b66e8ac1d7ffaf9e2ed9aa92fcb440dd394808fc34e4b2908841947b35a48236cb WHIRLPOOL df32d2a36b7e7f15a9d328b8a15d75722cc9b43cfe06339e1942823db3c9b16245e5c2bf92fd27a8481cafa786ef9c1221f03b5855af5745b544db38e0d9b1b6
-EBUILD oxygen-gtk-1.0.5.ebuild 1099 SHA256 d82f3d3dea125885d860201f7245aa0b9e9584e06bf03d8e2440198dd5b7ccf3 SHA512 9415f63241724fcb29a4c6a7b6ea80ffd5d75b0f8bd893c99440892c612daee9f229e1e99afe4cb1426af114c930604ef116cd99e38cf3f214dfa1723d15eecd WHIRLPOOL 4821fd5b4ef6fd07dca17c9f3568ebc1c4e6610514424dec73f781fec64be2f284b36140036e52a417356a0bbe4f4c272c5465ac3d5742d7c8e55b4d7de67bc8
-EBUILD oxygen-gtk-1.1.0.ebuild 1101 SHA256 011896c6b20c74566dc375ea376ee45f71458a3754c93ec1f7123bc797186755 SHA512 850df9a365198b022fe46223adbdefb46caefa94a7c6e27f6c38ed18c5f5082b6fec00c33e920df649f2252b70404f8a16ac746d8ba268431f7309a0c8fb159a WHIRLPOOL 39bd0956f58c8e89e1d0820438e315256001e4be6f262c09d3d38b74f03ccff8d853b76948fa422d79f6808a8fe4d09e6dd06a3e27642b88cbc7b810c15f3405
-EBUILD oxygen-gtk-1.2.5.ebuild 1124 SHA256 ca079cdfdfb8db9aa47c7928430b6cc379e4d73c4429a205c2418f25addac569 SHA512 573e0df5443081214851d1c75d069d7ed590437acff94fe5667c02812b53ae213c33c0ae663dc5672c7d733e61d7bd1eb5591df652d34ceb18e61b03c0f87d27 WHIRLPOOL 5faa5ae410bf692c475feefe2757eb6ae495a186e15491c7a517be8a342d5d8b97ce11e449e28389a23d324c8a7aa59dc5211861412a732e80c3a790821d6d52
-EBUILD oxygen-gtk-1.3.0.ebuild 1126 SHA256 1667397fc61cad293bf31228040e8bcb7797e5e71dab7e1131c7a6fd7b6aa842 SHA512 c1f48205f4236d0a9e296971301e094127ca38ad395346d932ecb1462b8c555e87b5bf761a0dcff29386d2ffabb220fe601c4f96157d76a65245d66550cc8250 WHIRLPOOL 104892337d6c133f64d2ee88d2c4ee75034571c4e4c4711a4a370a5b6d7ce1de6b695472ad6236b8d15ba4a95c9076f22952063ec60b8bcc88bec00c18eebfd1
-MISC ChangeLog 7174 SHA256 20e4521042250c2155a715bf9bd242438183b16b52f9168551c57d5ec0d8d6d6 SHA512 b830147f8d77b0cd90cb26db2d49ad21a82bdf2cf89b6beb0c18f6387eebfe76bd7fd547fe7e6b0ad2db0b2c3cf02d1c9e722cdf8d1b1684550936d1ba8ba303 WHIRLPOOL 11eb0648bd9f435bca59d52b5ed987f8953fdc65658fae105b7ad3144ef6ec48453bf5f58aceba012cf1e3f2479dace435a4e45d1129537593b494a0088e3906
+EBUILD oxygen-gtk-1.1.0.ebuild 1104 SHA256 87ad5d99d08362ead4a192f2f2a0c88026556d61d1625673a0315b8a9804b9c5 SHA512 2dff3f449836cfec0932ed0fe9d60e569239d6e1e4cce84ebdbd52fa800c5c35681063b666d8a69f4d57a90cf4890758e17d792107803ce64c7451a3f757d2c2 WHIRLPOOL 9afe4a274f42a941b6218283fa43c7d72e0a92a95cff16eb1cde82b5762e9b51df54b70088ca3ede47e96874c46892eb8769baca88ee1389093acdd157b0d82c
+EBUILD oxygen-gtk-1.3.0.ebuild 1129 SHA256 379dcfb8a3c6cc5810818c17017ca446d39299b86a885cbe729dbdf376b85273 SHA512 dd0536e944f7fa318aef8f2b1c4bfc9232e2b98708cace339b5dc9da41023650fb129f1f12dac0b98bb4c3b0b3e57208dc2ac66dbc3c1af71a997b0b25fe9bea WHIRLPOOL f5991ce8d81b8a82ed929696e0b733790c08a5945787373bf5f8095708d1db4633161d21ec8816e7903aad98c26ab144e4d0a4ad88391df3577c477dc7e69ba0
+MISC ChangeLog 7406 SHA256 7adbe8da8a90a68bd74a96964ab3b8adaf6002af40f8b867be178e26ce78a8f5 SHA512 114c6e19ffdab778dd536750b1962cd945540dc48e8f0900ac95e0ac329dd6af5291503d44bb6d69054604425cf897672633c38b970560bc5adb88bf2e9fa79a WHIRLPOOL ae44e1050c63135de5668edf9077b96e486f40bb098db418b985434d4c0ac54727ec3a13bf68dbabce987c97a793fa4ebf846945e51b301d4e9ae655edb57406
 MISC metadata.xml 157 SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 SHA512 657d6b0a31ceb7ac10bedfd5cbd634d4ff47938bd2f321203f0233e53686f7e0fd460e81f82793804895c7e97cfa472c1ca44b93314574262ee8cc5745a3efd0 WHIRLPOOL 785331909f1834cdd5d797ad484ea0e35c3e44c79a8a7517a6fb5de926acd181abd57910c8d960fb2e11ea38ddea336bca309af16fcc2df68fe4b602bca120b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQBs+lAAoJEO+t9ga+3I3a3oQH/jsrZJwCXUhRskgY43t1tFD7
-MgSdvsBffSFeE9AjjckbK5dtIeAI1BDtl5ANCD66s1tOpf9L0Q/UNvA61KUk75c6
-RSd7F+6aNmrB+2n4AC6dIju3ipIC7Yt3Z9tOeN9Vru/lWAPyr1NertO2CxEtfDQQ
-bvFxNppReDeKu9wUNNJkYoL6TE1MH7OKcMkziK9TuPYzOm7Xxol0He9KW06yoIZB
-ddL6i/2QjMv6uZhwI1DpFDsTzAHr/ZLAnRbyu6cV/lLWgnhhJKzk0wegR1Gsr2hq
-Z+wM9jYD0Hk0lfhDK2qemQY6ChN/xeki6+yvRzDJMrIUpix7AdgfE3CGS/nc/yM=
-=K8qn
+iQIcBAEBCAAGBQJQGaVeAAoJEOSiRoyO7jvoO1MQAKLsq4V0YsCC1eziR60KRHb+
+S+j73wFiZ9yCn0Q3bCCwv49e4poRQqrAoC4T/W3qMxc8HZVX+oC7s0AiCb1zX6Y1
+Oq5z5SDqRb/GZtAi14X6AjOTPjK+ox2r43o7183Qa4i2tG1ovFCWhuuwXYEpklMa
+NBEVznhpOl3Nd0TOER/JZXLho1QvIGLiuRrCSnemNi/bdQIWz4LhovIPmKFbrSvb
+jSjY2gMZfvpJjXSDd8NQyE4yUXVz+NWwawg3kykRGzNDliz006gWl3xHrpxIAobK
+iIgKpCgvbYaaOsn9wvweId2XkgqiKh0bi372+MlzwGvpur6PpIpG6+UVF61R7UMV
+W5FPYo7ZhMWFlPJGn/Thsp0dT0NVpfdGuVbTH1qCOFY6vbOI7q95gj7fOTNNT59U
+E94zR8noT2RKSSoh1F5JlDkbQpeQo6+DnDiUJcMPj5RdeZLYmJCkVjSwbLfcjgdI
+zQ2w49qHHRAdg6onUyQ/6DSN9NMKj556V3jMwIXEguwqqq3WnnKm3x87T9IAbAwd
+e6wCOeXY7wWhEHv/ZnS8Vu3B25vnuy4+zPmVq8Ourj3lkfnmQ5DMjR2ugavpJDl3
+OnLhkWco8WTL09czKZiI213wFZKOOTUhbp+YscBEYbje2/O0YhCd8vYPS209PS9G
+VEk4HadoaVKZz8Z4OApu
+=Qduv
 -----END PGP SIGNATURE-----
diff --git a/x11-themes/oxygen-gtk/oxygen-gtk-1.0.5.ebuild b/x11-themes/oxygen-gtk/oxygen-gtk-1.0.5.ebuild
deleted file mode 100644
index a65536505bce..000000000000
--- a/x11-themes/oxygen-gtk/oxygen-gtk-1.0.5.ebuild
+++ /dev/null
@@ -1,50 +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.0.5.ebuild,v 1.5 2012/06/19 12:11:40 scarabeus Exp $
-
-EAPI=4
-
-MY_PN=${PN}3
-MY_P=${MY_PN}-${PV}
-
-inherit cmake-utils
-
-DESCRIPTION="Official GTK+:3 port of KDE's Oxygen widget style"
-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"
-SLOT="3"
-IUSE="debug doc"
-
-RDEPEND="
-	!x11-themes/oxygen-gtk:0
-	dev-libs/dbus-glib
-	dev-libs/glib
-	x11-libs/cairo
-	x11-libs/gtk+:3
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-DOCS=(AUTHORS README)
-
-S="${WORKDIR}/${MY_P}"
-
-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-gtk3
-CONFIG_PROTECT="${EPREFIX}/usr/share/themes/oxygen-gtk/gtk-3.0"
-EOF
-	doenvd 99oxygen-gtk3
-}
diff --git a/x11-themes/oxygen-gtk/oxygen-gtk-1.1.0.ebuild b/x11-themes/oxygen-gtk/oxygen-gtk-1.1.0.ebuild
index ac229b35d158..4af532836bf5 100644
--- a/x11-themes/oxygen-gtk/oxygen-gtk-1.1.0.ebuild
+++ b/x11-themes/oxygen-gtk/oxygen-gtk-1.1.0.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.1.0.ebuild,v 1.3 2012/07/18 15:00:46 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/oxygen-gtk/oxygen-gtk-1.1.0.ebuild,v 1.4 2012/08/01 21:53:30 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.2.5.ebuild b/x11-themes/oxygen-gtk/oxygen-gtk-1.2.5.ebuild
deleted file mode 100644
index 9eeb67eb55c7..000000000000
--- a/x11-themes/oxygen-gtk/oxygen-gtk-1.2.5.ebuild
+++ /dev/null
@@ -1,51 +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.2.5.ebuild,v 1.2 2012/06/19 12:11:40 scarabeus Exp $
-
-EAPI=4
-
-MY_PN=${PN}2
-MY_P=${MY_PN}-${PV}
-
-inherit cmake-utils
-
-DESCRIPTION="Official GTK+:2 port of KDE's Oxygen widget style"
-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"
-SLOT="2"
-IUSE="debug doc"
-
-RDEPEND="
-	!x11-themes/oxygen-gtk:0
-	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}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-DOCS=(AUTHORS README)
-
-S="${WORKDIR}/${MY_P}"
-
-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-gtk2
-CONFIG_PROTECT="${EPREFIX}/usr/share/themes/oxygen-gtk/gtk-2.0"
-EOF
-	doenvd 99oxygen-gtk2
-}
diff --git a/x11-themes/oxygen-gtk/oxygen-gtk-1.3.0.ebuild b/x11-themes/oxygen-gtk/oxygen-gtk-1.3.0.ebuild
index 8f70902f7ccf..99138754a572 100644
--- a/x11-themes/oxygen-gtk/oxygen-gtk-1.3.0.ebuild
+++ b/x11-themes/oxygen-gtk/oxygen-gtk-1.3.0.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.3.0.ebuild,v 1.1 2012/07/18 14:31:48 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/oxygen-gtk/oxygen-gtk-1.3.0.ebuild,v 1.2 2012/08/01 21:53:30 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"