Stabilise latest to be done with the lo issues for good.

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

6 files changed, 25 insertions, 126 deletions

diff --git a/x11-themes/oxygen-gtk/ChangeLog b/x11-themes/oxygen-gtk/ChangeLog
index 1663b57caeb8..5949cb3ac68b 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.37 2012/06/19 12:05:41 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/oxygen-gtk/ChangeLog,v 1.38 2012/06/19 12:11:40 scarabeus Exp $
+
+  19 Jun 2012; Tomáš Chvátal <scarabeus@gentoo.org> -oxygen-gtk-1.0.3.ebuild,
+  -oxygen-gtk-1.2.3.ebuild, oxygen-gtk-1.0.5.ebuild, oxygen-gtk-1.2.5.ebuild:
+  Stabilise latest to be done with the lo issues for good.
 
 *oxygen-gtk-1.0.5 (19 Jun 2012)
 *oxygen-gtk-1.2.5 (19 Jun 2012)
diff --git a/x11-themes/oxygen-gtk/Manifest b/x11-themes/oxygen-gtk/Manifest
index 6b93e12f5213..807c0bf3588b 100644
--- a/x11-themes/oxygen-gtk/Manifest
+++ b/x11-themes/oxygen-gtk/Manifest
@@ -1,30 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST oxygen-gtk2-1.2.3.tar.bz2 190619 RMD160 b0b7dba66d2b836fc21c5cc0c553a6062af1523f SHA1 ebdfba440fc3b87f6e35fcc57ac579f4bc131e16 SHA256 a898296a2530f1247307331264cbc6c6c6a1fd261c761543b72666d9c1e57215
 DIST oxygen-gtk2-1.2.5.tar.bz2 191613 RMD160 ec65ded52145af7142e949bd5022b7b0b4b299a5 SHA1 1313aa11e334c7f8eb6cf54b8117b1a4ebc0641b SHA256 adab470bea43edc43c11b3d51635a4f1e697310aca561798b6a62a46842da7b3
-DIST oxygen-gtk3-1.0.3.tar.bz2 185705 RMD160 ce90e961f313322af7829c53fc6a9aaac416bad6 SHA1 e85eb59d36f239f2fba9fea54f4edafacd4a28ef SHA256 42d57cf71e6d809bed8f42e358929ec7b1755b9ebe342226f6a8e56d1aae1c00
 DIST oxygen-gtk3-1.0.5.tar.bz2 185761 RMD160 cdadc6f40deb7800268c748f17214a6a102dcd97 SHA1 c8b0d547c2ead462b4c25ad5a2ea1c1a9b614edf SHA256 210193d8d394fc76f5aaec5168b4a0e45f5b86afc9c5fa14e179a73e07696d4e
-EBUILD oxygen-gtk-1.0.3.ebuild 1094 RMD160 ac95501b631edbb98b8a29e4efa9e4efccd974b3 SHA1 8506e6d9eb5227f9f82fa8d104280615261040d7 SHA256 223960e39e07a7108d546a80e52d3f5d2d47eabdd22c8e32a067b8d3e18d0265
-EBUILD oxygen-gtk-1.0.5.ebuild 1101 RMD160 dd23b8f97bf0cd25160e8483bc6087f07b2aefc4 SHA1 3ddce4979c2027bdd7de598418d728d913c72c50 SHA256 630838def700b8e5e5128e702a05cdc0f36cec15693fd040f1d342b5ae6b3d66
-EBUILD oxygen-gtk-1.2.3.ebuild 1119 RMD160 ea43128277034722e0e17ee37e57efdce9ff8464 SHA1 368079105a952fc5d03896f7161cde244c8f7c42 SHA256 166d443d9b2fe42db713677f0a2cad4fddea8bea129f88b11cfc114ae1835c68
-EBUILD oxygen-gtk-1.2.5.ebuild 1126 RMD160 ac0fd7a36a8ecf1c430f93cb00aab8f7629ebae1 SHA1 0af2a9749b6f7ec796712cf8cad4090317f318fc SHA256 35c72aff677e08cda598236645783134da59aa3f6ee73d1fb54290ad7427bfd0
-MISC ChangeLog 6693 RMD160 c760e21c7d74ea8a3087f40e51327a9808e5291f SHA1 2c63f20a41f231c81d0f0dc19c7705341ecd9e95 SHA256 dee0a9a00a455291dcceb6bc1b26c0e81d54ef1ca2e0b0ea088a82df3effc071
+EBUILD oxygen-gtk-1.0.5.ebuild 1099 RMD160 445bd9728db6b558b0fe58dca56de92d7a615c75 SHA1 1fe65853508f04624eeabc4794e03e0d27d0f055 SHA256 d82f3d3dea125885d860201f7245aa0b9e9584e06bf03d8e2440198dd5b7ccf3
+EBUILD oxygen-gtk-1.2.5.ebuild 1124 RMD160 c5ac8d9d682b5ce4c21fe6cf31fc2e649d6dafd4 SHA1 307b362a25e0e590ec0822e5f85bb132f891150f SHA256 ca079cdfdfb8db9aa47c7928430b6cc379e4d73c4429a205c2418f25addac569
+MISC ChangeLog 6912 RMD160 93fdeb0ce26230eb24a3f2360d97a15349677e21 SHA1 bd2e0f0987f5de0aa365428fc902f0355deffa4f SHA256 afc92997de673d7bdc5a86ba87cab956bc59c40f8803c7faa96e8ef08bb3aa99
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJP4GwFAAoJEOSiRoyO7jvoXTkP/1aibzFqoaQCCiKlw3NAqAax
-A+4/4ZyfY3O4Xu7fP18kpV2PkMiV7Z2pXG/+613UfRCPersnxakbgkaK6aN95jy5
-3wTwis5AStvB/kvBrYFk9kEgUjrWmr2WKzNcApkv4hArhmbFsKMLZ/jEwgMTIiMT
-ODideNXW7Gblz/y6WKCjJSdZODKZj0Jhnvjd2/rjh9cU3cauJh6ZKzT25R3QP1U/
-ywpgR3euCe5yUHZmhZ5tO2JppW1aRVGAriD4pJ0c4ITe3Vjtndl3HUq9I0IR0Gre
-0vBU83x7IJLbNWJuZMuCLtijyk4gaiqo3LeqKjMyT5ppjLdsLQ1Z8e2oR7+a+uaC
-7Oq6xxcrUwGYBhqpiovPmgE3T3sGkxtg2oV9lfw0HAZaDo0C1PWBC14XbsClgkVA
-9FAhNf1uLz8F+9IJd2fVA4mKi05b/hk7Smhp2KXtMnI/zHbq+NPSPW8hBkoPEN2w
-+0Eh+RqblhZlrcYymMRVdaxoXxBYng3AzDoZmNKUJ4sBMJUC4h5ZN6098Kalv3SY
-nSTAD63NwRRdaeqiLixCWAapuqZ27z1gyL1bQDERVEPxB5XbKf94AJHZqUzS/DAr
-ZqSbm26iNRKoCH4mNId7W/FOGl+eWAZ1xSq+T8MjVuTHS5V29o0ld90MWDZw+x9g
-7Ol7GhJx28WLzyPRdcIC
-=235z
+iQIcBAEBAgAGBQJP4Gy9AAoJEOSiRoyO7jvoCfAP/ijNF8Dg/ilBMeczgYeyboKQ
+bYYRXgV3Y7TaA7fy/OkcNTeL4PU2eWo+0sRiEd3zCnYua+b1W3Hy5TwYZgCHl7pR
+caIVe89HS6DMCzjxJUwxyxoLMvZ9oSnTBD31PF7k+5XW+QxQAYtf3RQQK3mzjW/r
+1mHbrPvh95g+EGW2y1hiNKFvWe1muMjJqv0dugJZ/h9b9gOLD7/2MaRgKAFYgDLa
+Ih+xrvTvBsMtXHk2D48FZWFCQzo8lks9Imr3A++yY/b5xswT/6T53QXt22zboJZh
+16Yz4qPEjsK4ozgO9KphnJsn4zK3i3aGcqho85GAiRXkcVZZGFFSxgWuqE11KYrP
+d0n+9oJtVptB+IyfHsxpPxKOPFBsAmt7E3rgXiPkvfU9DYfhZVDgi8ZgBiT1nAa0
+TnU9CNU3AnCDmc96P2BNRJaN+B4FMNdg2f4PKmTtxjXSYFHR6jXTjZt6w6llJ8wF
+51bQrTW1T/cjM40UJ2PEXLcs0U2sKjgK6VOw4bKNiYuEtDjggjf0+H6i+ckzTYQ+
+P5m/vvg29Ikb4hNs5CeijkMNUchoQgm1DU9CtUc1UZTxGGcgr6hFV7mf15ZckDFc
+39XpraGlTd1XQk2R5W6HwtfpS61dvOEamPYa07T88UvM+NAAsFgwsnK0gT96itsw
+DCFmmqWCDBjr+VrA+k5D
+=OK9G
 -----END PGP SIGNATURE-----
diff --git a/x11-themes/oxygen-gtk/oxygen-gtk-1.0.3.ebuild b/x11-themes/oxygen-gtk/oxygen-gtk-1.0.3.ebuild
deleted file mode 100644
index 6b2e54d4395c..000000000000
--- a/x11-themes/oxygen-gtk/oxygen-gtk-1.0.3.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.3.ebuild,v 1.5 2012/05/04 14:05:29 johu 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.0.5.ebuild b/x11-themes/oxygen-gtk/oxygen-gtk-1.0.5.ebuild
index 090026413678..a65536505bce 100644
--- a/x11-themes/oxygen-gtk/oxygen-gtk-1.0.5.ebuild
+++ b/x11-themes/oxygen-gtk/oxygen-gtk-1.0.5.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.5.ebuild,v 1.4 2012/06/19 12:05:41 scarabeus Exp $
+# $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
 
@@ -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.3.ebuild b/x11-themes/oxygen-gtk/oxygen-gtk-1.2.3.ebuild
deleted file mode 100644
index 8a3d6ecbb72a..000000000000
--- a/x11-themes/oxygen-gtk/oxygen-gtk-1.2.3.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.3.ebuild,v 1.3 2012/05/04 14:05:29 johu 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.2.5.ebuild b/x11-themes/oxygen-gtk/oxygen-gtk-1.2.5.ebuild
index b77d6dce2961..9eeb67eb55c7 100644
--- a/x11-themes/oxygen-gtk/oxygen-gtk-1.2.5.ebuild
+++ b/x11-themes/oxygen-gtk/oxygen-gtk-1.2.5.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.5.ebuild,v 1.1 2012/06/19 12:05:41 scarabeus Exp $
+# $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
 
@@ -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"