Version bump introduce slotted gtk3 and gtk2 versions in slot 2 and 3 respectively.

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

4 files changed, 129 insertions, 11 deletions

diff --git a/x11-themes/oxygen-gtk/ChangeLog b/x11-themes/oxygen-gtk/ChangeLog
index 387ddcbfca93..3c37b4fdbdb8 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.20 2012/01/13 23:00:09 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/oxygen-gtk/ChangeLog,v 1.21 2012/01/17 11:33:39 scarabeus Exp $
+
+*oxygen-gtk-1.2.0 (17 Jan 2012)
+
+  17 Jan 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  +oxygen-gtk-1.0.0.ebuild, +oxygen-gtk-1.2.0.ebuild:
+  Version bump introduce slotted gtk3 and gtk2 versions in slot 2 and 3
+  respectively.
 
   13 Jan 2012; Johannes Huber <johu@gentoo.org> -oxygen-gtk-1.0.5.ebuild,
   -oxygen-gtk-1.1.5.ebuild:
diff --git a/x11-themes/oxygen-gtk/Manifest b/x11-themes/oxygen-gtk/Manifest
index 7082cd5b361d..fbcf27a28db2 100644
--- a/x11-themes/oxygen-gtk/Manifest
+++ b/x11-themes/oxygen-gtk/Manifest
@@ -1,18 +1,28 @@
 -----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.ebuild 1100 RMD160 63ba4bc6eb787649370ee671ad218714e0f12be3 SHA1 9a3db28d64351b8290c87c0f72bb35d8cd1e3de5 SHA256 c745bec489ff9883f1ff19a9af8bff15dbefbf690a0145b26a2fbb57c83d8e83
 EBUILD oxygen-gtk-1.1.6.ebuild 1025 RMD160 71a5877aa55461221274decf480613b5cd2f4325 SHA1 78b39311c383c7726bb0583932815e6dd4d81c33 SHA256 2ef452cc533ac5d6e203d7df67299ec3eeb492da44ab6a398ebf6dfa679c06e8
-MISC ChangeLog 3491 RMD160 7b37c8812a0bb0de55f2e8f74dc495a8c448647f SHA1 cd2680194457c93b4d08bba67acd99d5f54254c8 SHA256 038c28943ed700e577d289743c0ffbd6ab617b7f97bd9b5220fdf174ec858822
+EBUILD oxygen-gtk-1.2.0.ebuild 1125 RMD160 f7a82915e0dc701d13a1b51c0973cb25838f027e SHA1 19cd6087b537c2f144124a9e3f512abaf6376ac5 SHA256 78f323bbf92085f120d67787f6db0ef791e61f0c67cdaee40fcfce0c0d76bb9f
+MISC ChangeLog 3727 RMD160 d7ff8b41b85bf702f002a7c6c431c969f25345ff SHA1 dc3e6a318b889a6bd16ec7c386f4303bde9645f1 SHA256 1e6484a94091b227837fea48d79019c35387b84766976734dd14fef1ff300889
 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)
 
-iQEcBAEBCgAGBQJPELhAAAoJEO+t9ga+3I3alzIIALVx33648kxTJ9eVTuOxzRQF
-5l7K/tJlsx8zIoW/wUkwJdqGjsArctKmGD9KDMZuA9/XJ/YOAGhI+IKFFdWOgjZG
-rsQ+0Du+6To+g/2EtTcqKnksPnH+xRRrWSJr636pXNMNcctCO9ypmTsmiAnZZfW9
-cP8aqAtTXjW/uQ559WfaCf96sgHoynR65liYUQHtiV0msc1s1xjKMoXEU46AdWft
-tMe/Jylk16Kbf96ZXroMfOQYebMVUAnSK/dU8+7Po9K0JVIJqP6jewZ1+SEcT+d5
-MaZLgQh6jIX61ZMUh9Sh8cn+4eRWc6s/66aov/lUhm8b9wugNdmKgtCsRfSmshA=
-=06Lr
+iQIcBAEBAgAGBQJPFVzFAAoJEOSiRoyO7jvoPhUQAJbgZm9yaqseaFog2+0adi32
+tQ3bxkRMOuOpXN15GuDI2x4RG0Meg9JCfn0M+9wIHyLaasVNl5y5YHv3PKt8o5T9
+Vmb4d8HaXjfjt4y6u51jJturVPDDGz04KXMmZ/BOQQwrfupJN39e7DDQeKYp4RDn
+aeIMFePklo9CQdgWMpQfTGaMcY1wwIN5/9ChUFQ1U3bWisPHVFkgFU7WmBdCixP2
+G+V73/muIaHavFMZ6v2u7Q1lgMsz/oXIs853qwpHp/NtX0lpvaHNuB/CyiGNELAG
+iGt5yaBD2ZDHLUexiA5GunqKunjVuDk0lFRp9qdGM6GqzgT6tK8uL23QtVH/cI2Y
+o4jgUzji0nxSzCNHXyNKww/rWMhbKqWAesbM5C/eFUaEeVSnNAHgmuWB3jFy3Rdr
+l+A7MBSN05YG9qYdbvJd3XByV7xWbknL+EIDCXbPJ9wJwo4COt4Vu2SrckbSmPvo
+DjIck73Y538yGzlKROTuncgVh1d3jMYFGVRkZoackkEQlJYtNNWicG0rBftAjOTg
++w2tKllSfBpnj9joSX0PpKZ+RdyR1T28rImRwmhCtO3SI7EvrgsDgbpaf33eTIdD
+RNAHIZzlbWnKYj3Nl094tIsv+lgLMDWOrpG0LTBcL1DC72glo0Y6J/5yFcHaa0dQ
+c0WQEScxssq0HCJVI/gD
+=zefh
 -----END PGP SIGNATURE-----
diff --git a/x11-themes/oxygen-gtk/oxygen-gtk-1.0.0.ebuild b/x11-themes/oxygen-gtk/oxygen-gtk-1.0.0.ebuild
new file mode 100644
index 000000000000..e77273f7c9cd
--- /dev/null
+++ b/x11-themes/oxygen-gtk/oxygen-gtk-1.0.0.ebuild
@@ -0,0 +1,50 @@
+# 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.ebuild,v 1.4 2012/01/17 11:33:39 scarabeus Exp $
+
+EAPI=4
+
+MY_PN=${PN}3
+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="3"
+IUSE="debug doc"
+
+RDEPEND="
+	dev-libs/dbus-glib
+	dev-libs/glib
+	x11-libs/cairo
+	x11-libs/gtk+:3
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}
+	!x11-themes/oxygen-gtk:0
+	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-gtk
+CONFIG_PROTECT="${EPREFIX}/usr/share/themes/oxygen-gtk/gtk-3.0"
+EOF
+	doenvd 99oxygen-gtk
+}
diff --git a/x11-themes/oxygen-gtk/oxygen-gtk-1.2.0.ebuild b/x11-themes/oxygen-gtk/oxygen-gtk-1.2.0.ebuild
new file mode 100644
index 000000000000..6023bc9b6504
--- /dev/null
+++ b/x11-themes/oxygen-gtk/oxygen-gtk-1.2.0.ebuild
@@ -0,0 +1,51 @@
+# 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.ebuild,v 1.1 2012/01/17 11:33:39 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="
+	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}
+	!x11-themes/oxygen-gtk:0
+	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-gtk
+CONFIG_PROTECT="${EPREFIX}/usr/share/themes/oxygen-gtk/gtk-2.0"
+EOF
+	doenvd 99oxygen-gtk
+}