Add 1.0.2 for gtk3. Stabilise 1.0.1 and 1.2.1 on amd64 and x86.

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

5 files changed, 14 insertions, 58 deletions

diff --git a/x11-themes/oxygen-gtk/ChangeLog b/x11-themes/oxygen-gtk/ChangeLog
index ca42cb0aa79d..f855dbdeb95d 100644
--- a/x11-themes/oxygen-gtk/ChangeLog
+++ b/x11-themes/oxygen-gtk/ChangeLog
@@ -1,6 +1,13 @@
 # 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.28 2012/03/12 12:30:46 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/oxygen-gtk/ChangeLog,v 1.29 2012/03/12 12:46:10 scarabeus Exp $
+
+*oxygen-gtk-1.0.2 (12 Mar 2012)
+
+  12 Mar 2012; Tomáš Chvátal <scarabeus@gentoo.org> +oxygen-gtk-1.0.2.ebuild,
+  -oxygen-gtk-1.0.0-r1.ebuild, -oxygen-gtk-1.2.0-r1.ebuild,
+  oxygen-gtk-1.0.1.ebuild, oxygen-gtk-1.2.1.ebuild:
+  Add 1.0.2 for gtk3. Stabilise 1.0.1 and 1.2.1 on amd64 and x86.
 
 *oxygen-gtk-1.2.2 (12 Mar 2012)
 
diff --git a/x11-themes/oxygen-gtk/oxygen-gtk-1.0.1.ebuild b/x11-themes/oxygen-gtk/oxygen-gtk-1.0.1.ebuild
index fa1083e3fc4e..b8ca4c8819a9 100644
--- a/x11-themes/oxygen-gtk/oxygen-gtk-1.0.1.ebuild
+++ b/x11-themes/oxygen-gtk/oxygen-gtk-1.0.1.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.1.ebuild,v 1.3 2012/02/17 01:32:21 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/oxygen-gtk/oxygen-gtk-1.0.1.ebuild,v 1.4 2012/03/12 12:46:10 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.0.0-r1.ebuild b/x11-themes/oxygen-gtk/oxygen-gtk-1.0.2.ebuild
index 429fff0f2360..9cba0978f555 100644
--- a/x11-themes/oxygen-gtk/oxygen-gtk-1.0.0-r1.ebuild
+++ b/x11-themes/oxygen-gtk/oxygen-gtk-1.0.2.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.3 2012/02/16 19:07:33 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/oxygen-gtk/oxygen-gtk-1.0.2.ebuild,v 1.4 2012/03/12 12:46:10 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.0-r1.ebuild b/x11-themes/oxygen-gtk/oxygen-gtk-1.2.0-r1.ebuild
deleted file mode 100644
index 4f421d7c2876..000000000000
--- a/x11-themes/oxygen-gtk/oxygen-gtk-1.2.0-r1.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.0-r1.ebuild,v 1.3 2012/02/16 19:07:33 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}
-	dev-util/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.1.ebuild b/x11-themes/oxygen-gtk/oxygen-gtk-1.2.1.ebuild
index 21c8135a8dc2..1f38bcb11719 100644
--- a/x11-themes/oxygen-gtk/oxygen-gtk-1.2.1.ebuild
+++ b/x11-themes/oxygen-gtk/oxygen-gtk-1.2.1.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.1.ebuild,v 1.1 2012/02/17 00:04:31 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/oxygen-gtk/oxygen-gtk-1.2.1.ebuild,v 1.2 2012/03/12 12:46:10 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"