bump to 1.2, fix bug #205640. Thanks to Pacho Ramos.

(Portage version: 2.2_rc3/cvs/Linux 2.6.26-gentoo-mactel x86_64)

3 files changed, 146 insertions, 2 deletions

diff --git a/x11-themes/metacity-themes/ChangeLog b/x11-themes/metacity-themes/ChangeLog
index 01659ced8348..696228637708 100644
--- a/x11-themes/metacity-themes/ChangeLog
+++ b/x11-themes/metacity-themes/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-themes/metacity-themes
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/metacity-themes/ChangeLog,v 1.18 2007/04/03 10:31:19 leio Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/metacity-themes/ChangeLog,v 1.19 2008/08/03 20:55:08 eva Exp $
+
+*metacity-themes-1.2 (03 Aug 2008)
+
+  03 Aug 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/metacity-themes-1.2-gentoo.diff, +metacity-themes-1.2.ebuild:
+  bump to 1.2, fix bug #205640. Thanks to Pacho Ramos.
 
   03 Apr 2007; Mart Raudsepp <leio@gentoo.org> -metacity-themes-1.0.ebuild:
   Remove old
diff --git a/x11-themes/metacity-themes/files/metacity-themes-1.2-gentoo.diff b/x11-themes/metacity-themes/files/metacity-themes-1.2-gentoo.diff
new file mode 100644
index 000000000000..5a5e7bb01ea1
--- /dev/null
+++ b/x11-themes/metacity-themes/files/metacity-themes-1.2-gentoo.diff
@@ -0,0 +1,45 @@
+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/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/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.2.ebuild b/x11-themes/metacity-themes/metacity-themes-1.2.ebuild
new file mode 100644
index 000000000000..8a876730528a
--- /dev/null
+++ b/x11-themes/metacity-themes/metacity-themes-1.2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2008 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.2.ebuild,v 1.1 2008/08/03 20:55:08 eva 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-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-ClearboxLookBis.tar.gz
+	${THEME_URI}MCity-Clearlooks2Squared.tar.bz2
+	${THEME_URI}MCity-Clearlooks2SquaredBerries.tar.gz
+	${THEME_URI}MCity-ClearlooksBlend.tar.bz2
+	${THEME_URI}MCity-ClearlooksWithACherryOnTop.tar.gz
+	${THEME_URI}MCity-CorrecaminsTheme1.tar.bz2
+	${THEME_URI}MCity-Gilouche.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-MetaGrip.tar.gz
+	${THEME_URI}MCity-MetaMile-Marker-0.2.tar.gz
+	${THEME_URI}MCity-Mista.tar.bz2
+	${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-VistaBasic.tar.gz
+	${THEME_URI}MCity-W2k.tar.gz
+	${THEME_URI}SmallPill-Citrus-0.2.tar.gz"
+# File collisions with gnome-themes
+#	${THEME_URI}MCity-Clearlooks2.tar.gz
+
+HOMEPAGE="http://art.gnome.org/themes/metacity/"
+
+RDEPEND="x11-wm/metacity"
+DEPEND="${RDEPEND}"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~amd64 ~hppa ~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 "${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
+}