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

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

5 files changed, 9 insertions, 106 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/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"