Include many more themes (bug #388483 by Jesús Guerrero), move to eapi4 and call commands in proper phases. Remove old.

(Portage version: 2.1.10.40/cvs/Linux x86_64)

4 files changed, 144 insertions, 207 deletions

diff --git a/x11-themes/metacity-themes/ChangeLog b/x11-themes/metacity-themes/ChangeLog
index 20c7fa199c5a..ca38fd5378b1 100644
--- a/x11-themes/metacity-themes/ChangeLog
+++ b/x11-themes/metacity-themes/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-themes/metacity-themes
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/metacity-themes/ChangeLog,v 1.26 2010/07/20 15:49:01 jer Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/metacity-themes/ChangeLog,v 1.27 2011/12/18 14:38:27 pacho Exp $
+
+*metacity-themes-1.3 (18 Dec 2011)
+
+  18 Dec 2011; Pacho Ramos <pacho@gentoo.org> +metacity-themes-1.3.ebuild,
+  -files/metacity-themes-1.0-gentoo.diff, -metacity-themes-1.1.ebuild:
+  Include many more themes (bug #388483 by Jesús Guerrero), move to eapi4 and
+  call commands in proper phases. Remove old.
 
   20 Jul 2010; Jeroen Roovers <jer@gentoo.org> metacity-themes-1.1.ebuild,
   metacity-themes-1.2.ebuild:
diff --git a/x11-themes/metacity-themes/files/metacity-themes-1.0-gentoo.diff b/x11-themes/metacity-themes/files/metacity-themes-1.0-gentoo.diff
deleted file mode 100644
index 93b19fc6664e..000000000000
--- a/x11-themes/metacity-themes/files/metacity-themes-1.0-gentoo.diff
+++ /dev/null
@@ -1,111 +0,0 @@
-diff -NurB themes/AEon_Marbles_v1.1/metacity-1/metacity-theme-1.xml themes-alt/AEon_Marbles_v1.1/metacity-1/metacity-theme-1.xml
---- themes/AEon_Marbles_v1.1/metacity-1/metacity-theme-1.xml	2002-10-29 03:37:07.000000000 -0500
-+++ themes-alt/AEon_Marbles_v1.1/metacity-1/metacity-theme-1.xml	2002-10-29 03:39:33.000000000 -0500
-@@ -427,6 +427,7 @@
- <window type="modal_dialog" style_set="normal"/>
- <window type="menu" style_set="normal"/>
- <window type="utility" style_set="normal"/>
-+<window type="border" style_set="normal"/>
- 
- <menu_icon function="close" state="normal">
-   <draw_ops> 
-diff -NurB themes/Adept/metacity-1/metacity-theme-1.xml themes-alt/Adept/metacity-1/metacity-theme-1.xml
---- themes/Adept/metacity-1/metacity-theme-1.xml	2002-10-29 03:37:07.000000000 -0500
-+++ themes-alt/Adept/metacity-1/metacity-theme-1.xml	2002-10-29 03:39:02.000000000 -0500
-@@ -226,6 +226,7 @@
- <window type="modal_dialog" style_set="normal"/>
- <window type="menu" style_set="normal"/>
- <window type="utility" style_set="normal"/>
-+<window type="border" style_set="normal"/>
- 
- <menu_icon function="maximize" state="normal">
-   <draw_ops>
-diff -NurB themes/Amadeus/metacity-1/metacity-theme-1.xml themes-alt/Amadeus/metacity-1/metacity-theme-1.xml
---- themes/Amadeus/metacity-1/metacity-theme-1.xml	2002-10-29 03:37:08.000000000 -0500
-+++ themes-alt/Amadeus/metacity-1/metacity-theme-1.xml	2002-10-29 03:40:15.000000000 -0500
-@@ -394,6 +394,7 @@
- <window type="modal_dialog" style_set="normal"/>
- <window type="menu" style_set="normal"/>
- <window type="utility" style_set="normal"/>
-+<window type="border" style_set="normal"/>
- 
- <menu_icon function="close" state="normal">
-   <draw_ops> 
-diff -NurB themes/Beautiful_and_Free/metacity-1/metacity-theme-1.xml themes-alt/Beautiful_and_Free/metacity-1/metacity-theme-1.xml
---- themes/Beautiful_and_Free/metacity-1/metacity-theme-1.xml	2002-10-29 03:37:08.000000000 -0500
-+++ themes-alt/Beautiful_and_Free/metacity-1/metacity-theme-1.xml	2002-10-29 03:40:47.000000000 -0500
-@@ -483,6 +483,7 @@
- <window type="modal_dialog" style_set="normal"/>
- <window type="menu" style_set="normal"/>
- <window type="utility" style_set="normal"/>
-+<window type="border" style_set="normal"/>
- 
- 
- <menu_icon function="maximize" state="normal">
-diff -NurB themes/Bee/metacity-1/metacity-theme-1.xml themes-alt/Bee/metacity-1/metacity-theme-1.xml
---- themes/Bee/metacity-1/metacity-theme-1.xml	2002-10-29 03:37:08.000000000 -0500
-+++ themes-alt/Bee/metacity-1/metacity-theme-1.xml	2002-10-29 03:41:14.000000000 -0500
-@@ -369,6 +369,7 @@
-   <window type="modal_dialog" style_set="normal"/>
-   <window type="menu" style_set="normal"/>
-   <window type="utility" style_set="normal"/>
-+  <window type="border" style_set="normal"/>
- 
-   <menu_icon function="close" state="normal" draw_ops="active-close-n"/>
-   <menu_icon function="maximize" state="normal" draw_ops="active-maximize-n"/>
-diff -NurB themes/Cazador/metacity-1/metacity-theme-1.xml themes-alt/Cazador/metacity-1/metacity-theme-1.xml
---- themes/Cazador/metacity-1/metacity-theme-1.xml	2002-10-29 03:37:09.000000000 -0500
-+++ themes-alt/Cazador/metacity-1/metacity-theme-1.xml	2002-10-29 03:41:49.000000000 -0500
-@@ -350,6 +350,7 @@
- <window type="modal_dialog" style_set="normal"/>
- <window type="menu" style_set="normal"/>
- <window type="utility" style_set="utility"/>
-+<window type="border" style_set="normal"/>
- 
- <menu_icon function="close" state="normal" draw_ops="close_button"/>
- <menu_icon function="maximize" state="normal" draw_ops="maximize_button"/>
-diff -NurB themes/PrettyMeta-Thin/metacity-1/metacity-theme-1.xml themes-alt/PrettyMeta-Thin/metacity-1/metacity-theme-1.xml
---- themes/PrettyMeta-Thin/metacity-1/metacity-theme-1.xml	2002-10-29 03:37:10.000000000 -0500
-+++ themes-alt/PrettyMeta-Thin/metacity-1/metacity-theme-1.xml	2002-10-29 03:44:12.000000000 -0500
-@@ -295,6 +295,7 @@
- <window type="modal_dialog" style_set="normal"/>
- <window type="menu" style_set="normal"/>
- <window type="utility" style_set="utility"/>
-+<window type="border" style_set="normal"/>
- 
- <menu_icon function="close" state="normal" draw_ops="button_close"/>
- <menu_icon function="maximize" state="normal" draw_ops="button_maximize"/>
-diff -NurB themes/Urbicande/metacity-1/metacity-theme-1.xml themes-alt/Urbicande/metacity-1/metacity-theme-1.xml
---- themes/Urbicande/metacity-1/metacity-theme-1.xml	2002-10-29 03:37:11.000000000 -0500
-+++ themes-alt/Urbicande/metacity-1/metacity-theme-1.xml	2002-10-29 03:44:47.000000000 -0500
-@@ -446,6 +446,7 @@
- <window type="modal_dialog" style_set="normal"/>
- <window type="menu" style_set="normal"/>
- <window type="utility" style_set="normal"/>
-+<window type="border" style_set="normal"/>
- 
- <menu_icon function="close" state="normal">
-   <draw_ops> 
-diff -NurB themes/mceazel-blue/metacity-1/metacity-theme-1.xml themes-alt/mceazel-blue/metacity-1/metacity-theme-1.xml
---- themes/mceazel-blue/metacity-1/metacity-theme-1.xml	2002-10-29 03:37:10.000000000 -0500
-+++ themes-alt/mceazel-blue/metacity-1/metacity-theme-1.xml	2002-10-29 03:42:34.000000000 -0500
-@@ -226,6 +226,7 @@
- <window type="modal_dialog" style_set="normal"/>
- <window type="menu" style_set="normal"/>
- <window type="utility" style_set="normal"/>
-+<window type="border" style_set="normal"/>
- 
- <menu_icon function="maximize" state="normal">
-   <draw_ops>
-diff -NurB themes/metamile-marker-02/metacity-1/metacity-theme-1.xml themes-alt/metamile-marker-02/metacity-1/metacity-theme-1.xml
---- themes/metamile-marker-02/metacity-1/metacity-theme-1.xml	2002-10-29 03:37:10.000000000 -0500
-+++ themes-alt/metamile-marker-02/metacity-1/metacity-theme-1.xml	2002-10-29 03:43:36.000000000 -0500
-@@ -309,7 +309,7 @@
- <window type="modal_dialog" style_set="normal"/>

- <window type="menu" style_set="normal"/>

- <window type="utility" style_set="utility"/>

--<window type="border" style_set="border"/> 

-+<window type="border" style_set="normal"/>

- 

- <menu_icon function="close" state="normal" draw_ops="button_close"/>

- <menu_icon function="maximize" state="normal" draw_ops="button_maximize"/>

diff --git a/x11-themes/metacity-themes/metacity-themes-1.1.ebuild b/x11-themes/metacity-themes/metacity-themes-1.1.ebuild
deleted file mode 100644
index 2a736323a93e..000000000000
--- a/x11-themes/metacity-themes/metacity-themes-1.1.ebuild
+++ /dev/null
@@ -1,94 +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/metacity-themes/metacity-themes-1.1.ebuild,v 1.9 2010/07/20 15:49:01 jer Exp $
-
-inherit eutils
-
-DESCRIPTION="Some nice themes for MetaCity"
-S=${WORKDIR}
-THEME_URI="http://ftp.gnome.org/pub/GNOME/teams/art.gnome.org/themes/metacity/"
-SRC_URI="${THEME_URI}CityBox-0.10.tar.gz
-	${THEME_URI}MCity-Adept.tar.gz
-	${THEME_URI}MCity-AEonMarbles-1.1.tar.bz2
-	${THEME_URI}MCity-Amadeus-1.0.tar.gz
-	${THEME_URI}MCity-Amber.tar.gz
-	${THEME_URI}MCity-BeautifulAndFree-0.1.tar.gz
-	${THEME_URI}MCity-Bee.tar.gz
-	${THEME_URI}MCity-Carved-1.0.tar.gz
-	${THEME_URI}MCity-Cazador.tar.gz
-	${THEME_URI}MCity-ClearboxLookBis.tar.gz
-	${THEME_URI}MCity-Clearlooks2Squared.tar.bz2
-	${THEME_URI}MCity-Derivative_1.0.tar.gz
-	${THEME_URI}MCity-Drake.tar.gz
-	${THEME_URI}MCity-Gilouche.tar.gz
-	${THEME_URI}MCity-icE.tar.gz
-	${THEME_URI}MCity-Immortal.tar.gz
-	${THEME_URI}MCity-Iris.tar.gz
-	${THEME_URI}MCity-Keramik-SCO-Blue-0.1.tar.gz
-	${THEME_URI}MCity-McBlue-1.0.tar.gz
-	${THEME_URI}MCity-McEazel-Blue.tar.gz
-	${THEME_URI}MCity-MetaMile-Marker-0.2.tar.gz
-	${THEME_URI}MCity-Outline.tar.gz
-	${THEME_URI}MCity-Posh.tar.gz
-	${THEME_URI}MCity-PrettyMeta-Thin-0.1.tar.gz
-	${THEME_URI}MCity-Quiet-Purple.tar.gz
-	${THEME_URI}MCity-ShinyTango.tar.gz
-	${THEME_URI}MCity-TangoDance.tar.bz2
-	${THEME_URI}MCity-TigertCrack-1.2.1.tar.gz
-	${THEME_URI}MCity-Ugly-0.2.tar.bz2
-	${THEME_URI}MCity-Urbicande-1.0.tar.bz2
-	${THEME_URI}SmallPill-Citrus-0.2.tar.gz"
-
-HOMEPAGE="http://art.gnome.org/theme_list.php?category=metacity"
-
-RDEPEND="x11-wm/metacity"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-src_unpack() {
-	return 0
-}
-
-src_compile() {
-	einfo "Nothing to compile"
-}
-
-src_install() {
-	dodir /usr/share/themes
-	cd "${D}/usr/share/themes"
-
-	unpack ${A}
-
-	find .  -exec touch "{}" \;
-
-	for dir in *
-	do
-		# Fix directory names that contain spaces
-		if echo "${dir}" | egrep -q "[[:space:]]"
-		then
-			new_dir=`echo "${dir}" | sed -e 's: :_:g'`
-			mv "${dir}" $new_dir
-			dir=$new_dir
-		fi
-
-		if [ ! -d "${dir}/metacity-1" ]
-		then
-			mkdir tmp
-			mv "${dir}"/* tmp
-			mv tmp "${dir}"/metacity-1
-		fi
-	done
-
-	# This patch corrects some XML files that are considered incomplete by
-	# Metacity
-	epatch "${FILESDIR}/${PN}-1.0-gentoo.diff"
-
-	chmod -R ugo=rX *
-
-	# Remove all of the .xvpics directories, see bug #97368
-	find . -type d -iname ".xvpics" | xargs rm -rf
-
-}
diff --git a/x11-themes/metacity-themes/metacity-themes-1.3.ebuild b/x11-themes/metacity-themes/metacity-themes-1.3.ebuild
new file mode 100644
index 000000000000..5403fdeadfbe
--- /dev/null
+++ b/x11-themes/metacity-themes/metacity-themes-1.3.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/metacity-themes/metacity-themes-1.3.ebuild,v 1.1 2011/12/18 14:38:27 pacho Exp $
+
+EAPI="4"
+
+inherit eutils
+
+DESCRIPTION="Some nice themes for MetaCity"
+S=${WORKDIR}
+THEME_URI="http://ftp.gnome.org/pub/GNOME/teams/art.gnome.org/themes/metacity/"
+SRC_URI="${THEME_URI}CityBox-0.10.tar.gz
+	${THEME_URI}MCity-BeautifulAndFree-0.1.tar.gz
+	${THEME_URI}MCity-C2.tar.gz
+	${THEME_URI}MCity-Carved-1.0.tar.gz
+	${THEME_URI}MCity-Cazador.tar.gz
+	${THEME_URI}MCity-Iris.tar.gz
+	${THEME_URI}MCity-Keramik-SCO-Blue-0.1.tar.gz
+	${THEME_URI}MCity-McBlue-1.0.tar.gz
+	${THEME_URI}MCity-MetaMile-Marker-0.2.tar.gz
+	${THEME_URI}MCity-Outline.tar.gz
+	${THEME_URI}MCity-Posh.tar.gz
+	${THEME_URI}MCity-PrettyMeta-Thin-0.1.tar.gz
+	${THEME_URI}MCity-Quiet-Purple.tar.gz
+	${THEME_URI}MCity-TigertCrack-1.2.1.tar.gz
+	${THEME_URI}SmallPill-Citrus-0.2.tar.gz
+	${THEME_URI}MCity-4DWM.tar.gz
+	${THEME_URI}MCity-Agata.tar.bz2
+	${THEME_URI}MCity-Almond.tar.gz
+	${THEME_URI}MCity-Alphacube.tar.gz
+	${THEME_URI}MCity-AlphacubeMetacity.tar.gz
+	${THEME_URI}MCity-Amiga.tar.gz
+	${THEME_URI}MCity-AmigaRelief.tar.gz
+	${THEME_URI}MCity-Aquarius.tar.gz
+	${THEME_URI}MCity-Bentham.tar.gz
+	${THEME_URI}MCity-Black.tar.gz
+	${THEME_URI}MCity-BlueSky.tar.gz
+	${THEME_URI}MCity-BlueSkyFixedBar.tar.gz
+	${THEME_URI}MCity-Boxx.tar.gz
+	${THEME_URI}MCity-C2.tar.gz
+	${THEME_URI}MCity-Carved2.tar.gz
+	${THEME_URI}MCity-Chiro.tar.gz
+	${THEME_URI}MCity-Clearbox.tar.gz
+	${THEME_URI}MCity-ClearboxLookBis.tar.gz
+	${THEME_URI}MCity-Clearlooks2Squared.tar.bz2
+	${THEME_URI}MCity-Clearlooks2SquaredBerries.tar.gz
+	${THEME_URI}MCity-ClearlooksBlend.tar.bz2
+	${THEME_URI}MCity-ClearlooksPinstripe.tar.gz
+	${THEME_URI}MCity-ClearlooksRedExit.tar.bz2
+	${THEME_URI}MCity-ClearlooksWithACherryOnTop.tar.gz
+	${THEME_URI}MCity-CorrecaminsTheme1.tar.bz2
+	${THEME_URI}MCity-EasyListening.tar.bz2
+	${THEME_URI}MCity-Firey.tar.bz2
+	${THEME_URI}MCity-Gilouche.tar.gz
+	${THEME_URI}MCity-GiloucheIM.tar.gz
+	${THEME_URI}MCity-Graphite.tar.gz
+	${THEME_URI}MCity-GraySky.tar.gz
+	${THEME_URI}MCity-GraySkyFixedBar.tar.gz
+	${THEME_URI}MCity-MWM.tar.gz
+	${THEME_URI}MCity-Maemo.tar.gz
+	${THEME_URI}MCity-MetaGrip.tar.gz
+	${THEME_URI}MCity-Mista.tar.bz2
+	${THEME_URI}MCity-Outcrop.tar.gz
+	${THEME_URI}MCity-POS.tar.gz
+	${THEME_URI}MCity-QuietEnvironment.tar.gz
+	${THEME_URI}MCity-QuietEnvironmentV2.tar.gz
+	${THEME_URI}MCity-QuietGraphite.tar.gz
+	${THEME_URI}MCity-QuietGraphiteV2.tar.gz
+	${THEME_URI}MCity-QuietHuman.tar.gz
+	${THEME_URI}MCity-QuietPurple2K6.tar.gz
+	${THEME_URI}MCity-QuietPurple2K6V2.tar.gz
+	${THEME_URI}MCity-Redmond.tar.gz
+	${THEME_URI}MCity-River.tar.gz
+	${THEME_URI}MCity-SandwishBetter.tar.gz
+	${THEME_URI}MCity-Shiny.tar.gz
+	${THEME_URI}MCity-ShinyTango.tar.gz
+	${THEME_URI}MCity-ShinyTangoSmoother.tar.gz
+	${THEME_URI}MCity-Silverado.tar.gz
+	${THEME_URI}MCity-Simplebox.tar.gz
+	${THEME_URI}MCity-Sloth.tar.gz
+	${THEME_URI}MCity-SmoothGNOME.tar.gz
+	${THEME_URI}MCity-SoftSquares.tar.gz
+	${THEME_URI}MCity-Tactile.tar.gz
+	${THEME_URI}MCity-TangoDance.tar.bz2
+	${THEME_URI}MCity-TeletelestaiModern.tar.gz
+	${THEME_URI}MCity-ThinMC.tar.gz
+	${THEME_URI}MCity-VistaBasic.tar.gz
+	${THEME_URI}MCity-W2k.tar.gz"
+
+HOMEPAGE="http://art.gnome.org/themes/metacity/"
+
+RDEPEND="x11-wm/metacity"
+DEPEND="${RDEPEND}"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+src_prepare() {
+	find "${WORKDIR}"  -exec touch "{}" \;
+
+	for dir in *
+	do
+		# Fix directory names that contain spaces
+		if echo "${dir}" | egrep -q "[[:space:]]"
+		then
+			new_dir=`echo "${dir}" | sed -e 's: :_:g'`
+			mv "${dir}" $new_dir
+			dir=$new_dir
+		fi
+
+		if [ ! -d "${dir}"/metacity-1 ]
+		then
+			mkdir tmp
+			mv "${dir}"/* tmp
+			mv tmp "${dir}"/metacity-1
+		fi
+	done
+
+	# This patch corrects some XML files that are considered incomplete by
+	# Metacity
+	epatch "${FILESDIR}/${PN}-1.2-gentoo.diff"
+
+	chmod -R ugo=rX *
+
+	# Remove all of the .xvpics directories, see bug #97368
+	find . -type d -iname ".xvpics" | xargs rm -rf
+}
+
+src_install() {
+	dodir /usr/share/themes
+	insinto /usr/share/themes
+	doins -r "${WORKDIR}"/*
+}