Remove old, add CONFIG_PROTECT to fix bug 351614, QA: install some misc files, sort dependencies, add debug and doc USE flags.

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

4 files changed, 38 insertions, 50 deletions

diff --git a/x11-themes/oxygen-gtk/ChangeLog b/x11-themes/oxygen-gtk/ChangeLog
index 460ae511b06b..83a5647c40b8 100644
--- a/x11-themes/oxygen-gtk/ChangeLog
+++ b/x11-themes/oxygen-gtk/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-themes/oxygen-gtk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/oxygen-gtk/ChangeLog,v 1.3 2011/01/13 18:51:39 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/oxygen-gtk/ChangeLog,v 1.4 2011/01/20 01:20:38 reavertm Exp $
+
+*oxygen-gtk-1.0.1-r1 (20 Jan 2011)
+
+  20 Jan 2011; Maciej Mrozowski <reavertm@gentoo.org>
+  -oxygen-gtk-1.0.0.ebuild, -oxygen-gtk-1.0.1.ebuild,
+  +oxygen-gtk-1.0.1-r1.ebuild:
+  Remove old, add CONFIG_PROTECT to fix bug 351614, install some misc files,
+  sort dependencies, add debug and doc USE flags.
 
 *oxygen-gtk-1.0.1 (13 Jan 2011)
 
diff --git a/x11-themes/oxygen-gtk/Manifest b/x11-themes/oxygen-gtk/Manifest
index 1db8e40e2d37..dce314f671c9 100644
--- a/x11-themes/oxygen-gtk/Manifest
+++ b/x11-themes/oxygen-gtk/Manifest
@@ -1,20 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-DIST oxygen-gtk-1.0.0.tar.bz2 122365 RMD160 40e1f5e59018a6c8ba7c146e62ccb0605ae586d3 SHA1 7bb77a1eba6803cef43b4055f8632b558a54107e SHA256 aeb961d482af173ece7052add800e4a9b8e77dc6f44692f861498de8e11e0692
 DIST oxygen-gtk-1.0.1.tar.bz2 126619 RMD160 e152ecd00e24885bfc86ba5aa886b37cd2a1e94f SHA1 7603949cb4dd7e2c52b1d1d957cd4c16d368f886 SHA256 6264e5e4406a95801cb5c0e6072743a02b56dcef19fd2be84224aa9229c5284e
-EBUILD oxygen-gtk-1.0.0.ebuild 645 RMD160 71bb45de8d45adf31ef1bed7186cf4d30a80e6ed SHA1 6a07057900a3faf24ffe994adb5ad219af7ffb4c SHA256 a80e4b72303467ca3e3aa007ed0704ac645f613f7638a0c09cf4735df51f6bb4
-EBUILD oxygen-gtk-1.0.1.ebuild 641 RMD160 cc16203a169bf89ba2dd011431d462492e348b43 SHA1 ae76a75f1b2022946cbbb3e088e704274f8385cd SHA256 fcd4b9707ecb461d433d55fba113cf5909ffe659ec77f084027d8ee76d864693
-MISC ChangeLog 612 RMD160 6f1d9cb46bcc5b0ba0acbae7ad94d3ac3075ad17 SHA1 c089d2f0e1cdfcf2c437d9e3226c4dbd79ec28f2 SHA256 fcc8c187c4bf1a744bc94a05d095dd6fa9da016f29b239d8b8d216d2d7682499
+EBUILD oxygen-gtk-1.0.1-r1.ebuild 1004 RMD160 3ef6871b1c6183058dc89b087d46583fa371fdd4 SHA1 d5164aec1aea91530e0bf04f40d26e79c01e0cb6 SHA256 3c2838e11ef4a6deb5bbaea29fec0ceaa5c4a846607e4a8c663f24b9005b1c0d
+MISC ChangeLog 918 RMD160 3e785b8278abf7a5491d996b6af6b6019bff87dc SHA1 81213e65bb6c1af5b183138e44a098dba4e62a22 SHA256 324bb7eb58cda85726039c35a8377766a7e16f5a60357164eab613e6006125a2
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iQEcBAEBCgAGBQJNL0nCAAoJEAWF714uGAc6ZlQIAKZnzj4ouR4jTma8WYDE3/3p
-dLcEZ6Z7z6llJJx0G3dmCASac++i5ZxY0hcIYeRf7zz87afvR/xsk069YwAHsZug
-Ag1yRwCWdzrWTIbG7RBthL4dusdHnNbftNrNRtRvxt2YBXY0wPBSpEX+e5OWPOBR
-LX0BerlmRhVS6F0uy7f4nqaBk/xxs9dyj3XqDeMcbn8BstSqyOhwX1C5WTtesynl
-wb5EiFKYTsnyKvBwDrPTuhq5sN2WSUQeWjbElA8wAOEccWTL5/DnbfSb6RJQxd4G
-wmCj9NA2lkb5DDFtYxU8wUUfCt1WnSlOOerUufhDm8ipAcWN0j+qlzDdqTiv5xk=
-=O4+9
------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
deleted file mode 100644
index 5208a9b6935f..000000000000
--- a/x11-themes/oxygen-gtk/oxygen-gtk-1.0.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2010 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.2 2010/12/13 17:57:48 spatz Exp $
-
-EAPI=3
-
-inherit cmake-utils
-
-DESCRIPTION="(yet another) Gtk port of KDE's oxygen widget style"
-HOMEPAGE="https://projects.kde.org/projects/playground/artwork/oxygen-gtk"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+
-	x11-libs/cairo
-	dev-libs/glib
-	x11-libs/libX11
-	x11-libs/pango"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
diff --git a/x11-themes/oxygen-gtk/oxygen-gtk-1.0.1.ebuild b/x11-themes/oxygen-gtk/oxygen-gtk-1.0.1-r1.ebuild
index c561fa9bb981..86ba077f3a77 100644
--- a/x11-themes/oxygen-gtk/oxygen-gtk-1.0.1.ebuild
+++ b/x11-themes/oxygen-gtk/oxygen-gtk-1.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.1 2011/01/13 18:51:39 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/oxygen-gtk/oxygen-gtk-1.0.1-r1.ebuild,v 1.1 2011/01/20 01:20:38 reavertm Exp $
 
 EAPI=3
 
@@ -11,14 +11,34 @@ HOMEPAGE="https://projects.kde.org/projects/playground/artwork/oxygen-gtk"
 SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
-SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+SLOT="0"
+IUSE="debug doc"
 
-RDEPEND="x11-libs/gtk+
-	x11-libs/cairo
+RDEPEND="
 	dev-libs/glib
+	x11-libs/cairo
+	x11-libs/gtk+
 	x11-libs/libX11
-	x11-libs/pango"
+	x11-libs/pango
+"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+	dev-util/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+DOCS=(AUTHORS README)
+
+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
+}