Bump. Adds a new relief style, fixes build problems, including with glib-2.31. Drop old.

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

5 files changed, 66 insertions, 72 deletions

diff --git a/x11-themes/gtk-engines-murrine/ChangeLog b/x11-themes/gtk-engines-murrine/ChangeLog
index 1ceeb1b1b060..f6424a78fc3b 100644
--- a/x11-themes/gtk-engines-murrine/ChangeLog
+++ b/x11-themes/gtk-engines-murrine/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-themes/gtk-engines-murrine
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-murrine/ChangeLog,v 1.51 2011/10/06 12:57:18 chainsaw Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-murrine/ChangeLog,v 1.52 2012/01/26 05:39:01 tetromino Exp $
+
+*gtk-engines-murrine-0.98.2 (26 Jan 2012)
+
+  26 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -files/gtk-engines-murrine-0.53.1-use-gtk_free.patch,
+  -gtk-engines-murrine-0.98.0.ebuild, +gtk-engines-murrine-0.98.2.ebuild:
+  Bump. Adds a new relief style, fixes build problems, including with
+  glib-2.31. Drop old.
 
   06 Oct 2011; Tony Vroon <chainsaw@gentoo.org>
   gtk-engines-murrine-0.98.1.1.ebuild:
diff --git a/x11-themes/gtk-engines-murrine/Manifest b/x11-themes/gtk-engines-murrine/Manifest
index c7ca8edf466d..1389a82be7f6 100644
--- a/x11-themes/gtk-engines-murrine/Manifest
+++ b/x11-themes/gtk-engines-murrine/Manifest
@@ -1,19 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX gtk-engines-murrine-0.53.1-use-gtk_free.patch 473 RMD160 de3e052afa48129c031b7a64fc051720428c279e SHA1 b69c32c079dd3311fb243af0f3f24e9a3d8370cc SHA256 73354c6420ecaeccdf0ac3a199cc0b2f1f21ce6be709bf4be0eee8ec47923e08
 DIST murrine-0.90.3.tar.bz2 271512 RMD160 347909724a11cfe53f922208f46e39f47b420459 SHA1 5c65acf7948d23bb1693728157425120486303a8 SHA256 c61ff7614e68b705560612ea7485454d1a7947422ac8cfe11d75e45370e2f0ba
-DIST murrine-0.98.0.tar.bz2 303495 RMD160 4dd79351ab967b2b872c844983ef2db9ca20e849 SHA1 9b37c0c43c0e2fb43a69c7af1cb27feee2a68e56 SHA256 6e82f6f15df775c794494aea1fff9baafdf2ffedcc76e81fb6672a1ab97d750b
 DIST murrine-0.98.1.1.tar.bz2 311660 RMD160 2afd59cb389694b26fc2822c67cdd030f0c810fd SHA1 ffd6226b9941c01696497ec7c881551ea2f150c7 SHA256 e6a2af72674403d06c03e067d915004e8d9cdeec206f3350c7f3ee595b139912
+DIST murrine-0.98.2.tar.xz 296944 RMD160 d408ce9ca25be3e3b7afe9ce1e6127ffa0d9cff3 SHA1 ddaca56b6e10736838572014ae9d20b814242615 SHA256 e9c68ae001b9130d0f9d1b311e8121a94e5c134b82553ba03971088e57d12c89
 EBUILD gtk-engines-murrine-0.90.3-r1.ebuild 986 RMD160 5802d355628fefbb399fc515b39fb7f70461d95d SHA1 de1f516d0f5460bd5aa8b1fdf16e144210fb668f SHA256 b3d2b3c2b127640fc995c5434294af4eeec0de219865dc4e891eb3d8b362186c
-EBUILD gtk-engines-murrine-0.98.0.ebuild 1095 RMD160 640382d0dfe2ac640e4f554f2fd775473738c9ab SHA1 df0ba4218c15528bd6648ee87acbf007657830e5 SHA256 853ccb2d00b757cb66f4be87a3f490a10fbdcaeb71e51f972ca46e6aa332f9a3
 EBUILD gtk-engines-murrine-0.98.1.1.ebuild 1024 RMD160 2630ccf5c862756a4610cd4063b055a783d56911 SHA1 6827fd25b08eef29749d68082ba80bd3ace63df4 SHA256 691546ae116a67f26c7af3e4868c61b5823d10c54b5426233616772bb491cde3
-MISC ChangeLog 7465 RMD160 790c23ca5c7cf9c2d1ba0b75417e9bd407e27790 SHA1 e3b19f5c7caf856365ff16b08e9930d3288159c3 SHA256 23175f6e42f85fc17c4cdd6b466c85e0916c70abb16ff6b7fdbe8876fc7ce3df
+EBUILD gtk-engines-murrine-0.98.2.ebuild 1240 RMD160 84f51927bd19dc06d8f3066c6928176e54282805 SHA1 b13c9bd61d00216ae4aa22301ba8eb6d5c5a1fe7 SHA256 b3c6d1ad1542387ff728a5ea2ef458fee48b62d7480a1a6f0f9b0bd6959e85ef
+MISC ChangeLog 7792 RMD160 2531e73410f999991c41214e07e51f9f279e0d56 SHA1 57ae599397cae30113163a7434009559635f6fc4 SHA256 2f15e995209c05354a6725f7ed83f4d13d2e6968034e8ee6693b4610742fe0bf
 MISC metadata.xml 955 RMD160 4ed026526d05a584a117afbd97a88b01f66d4650 SHA1 990aace832f8315d7f4f99e3473069a87be2142d SHA256 3800eadb0f710cfbc1dda52a8757f59a8a11e365178a552810f8aebfcbdf8e2a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6NpbsACgkQp5vW4rUFj5qnKACdHCKNTJglTTt2QrJYecfU5HjZ
-5jQAn1hwEM4r0ZNlUY1/quleWz2skiC8
-=ZOC0
+iF4EAREIAAYFAk8g5wMACgkQdjK8w9WeBnAKSQD8DMsyYRKuHNhfYoubFWQKIZ0I
+QUI/jCqXXhS7BfH6icwA/0NKK6gt/uvt2amKS/zBYXLpfOMTnKgN/a4dFnbVzUfU
+=6EcU
 -----END PGP SIGNATURE-----
diff --git a/x11-themes/gtk-engines-murrine/files/gtk-engines-murrine-0.53.1-use-gtk_free.patch b/x11-themes/gtk-engines-murrine/files/gtk-engines-murrine-0.53.1-use-gtk_free.patch
deleted file mode 100644
index 7a69c8021a84..000000000000
--- a/x11-themes/gtk-engines-murrine/files/gtk-engines-murrine-0.53.1-use-gtk_free.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- murrine-0.53.1.orig/src/support.c
-+++ murrine-0.53.1/src/support.c
-@@ -274,7 +274,7 @@
- 	if (tmp_size)
- 	{
- 		*indicator_size = *tmp_size;
--		g_free (tmp_size);
-+		gtk_requisition_free (tmp_size);
- 	}
- 	else
- 		*indicator_size = default_option_indicator_size;
-@@ -282,7 +282,7 @@
- 	if (tmp_spacing)
- 	{
- 		*indicator_spacing = *tmp_spacing;
--		g_free (tmp_spacing);
-+		gtk_border_free (tmp_spacing);
- 	}
- 	else
- 		*indicator_spacing = default_option_indicator_spacing;
diff --git a/x11-themes/gtk-engines-murrine/gtk-engines-murrine-0.98.0.ebuild b/x11-themes/gtk-engines-murrine/gtk-engines-murrine-0.98.0.ebuild
deleted file mode 100644
index 9c3827a6c7c5..000000000000
--- a/x11-themes/gtk-engines-murrine/gtk-engines-murrine-0.98.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-murrine/gtk-engines-murrine-0.98.0.ebuild,v 1.3 2011/08/18 19:42:37 chainsaw Exp $
-
-EAPI="2"
-
-inherit eutils gnome.org
-
-MY_PN="murrine"
-DESCRIPTION="Murrine GTK+2 Cairo Engine"
-
-HOMEPAGE="http://www.cimitan.com/murrine/"
-SRC_URI="${SRC_URI//${PN}/${MY_PN}}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="+themes animation-rtl"
-
-# pixman and cairo aren't checked for in configure, but are #include-ed
-RDEPEND=">=x11-libs/gtk+-2.18:2
-	x11-libs/cairo
-	x11-libs/pixman"
-PDEPEND="themes? ( x11-themes/murrine-themes )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.37.1
-	sys-devel/gettext
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_configure() {
-	econf --enable-animation \
-		--enable-rgba \
-		$(use_enable animation-rtl animationrtl)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog NEWS TODO
-}
diff --git a/x11-themes/gtk-engines-murrine/gtk-engines-murrine-0.98.2.ebuild b/x11-themes/gtk-engines-murrine/gtk-engines-murrine-0.98.2.ebuild
new file mode 100644
index 000000000000..95156e05d265
--- /dev/null
+++ b/x11-themes/gtk-engines-murrine/gtk-engines-murrine-0.98.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-murrine/gtk-engines-murrine-0.98.2.ebuild,v 1.1 2012/01/26 05:39:01 tetromino Exp $
+
+EAPI="4"
+GNOME_ORG_MODULE="murrine"
+
+inherit gnome.org
+
+DESCRIPTION="Murrine GTK+2 Cairo Engine"
+
+HOMEPAGE="http://www.cimitan.com/murrine/"
+
+LICENSE="LGPL-2.1 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+IUSE="+themes animation-rtl"
+
+RDEPEND=">=x11-libs/gtk+-2.18:2
+	dev-libs/glib:2
+	x11-libs/gdk-pixbuf:2
+	x11-libs/cairo
+	x11-libs/pango
+	x11-libs/pixman"
+PDEPEND="themes? ( x11-themes/murrine-themes )"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.37.1
+	sys-devel/gettext
+	dev-util/pkgconfig"
+
+DOCS="AUTHORS ChangeLog NEWS TODO"
+
+src_prepare() {
+	# Linking fix, in next release (commit 6e8eb244). Sed to avoid eautoreconf.
+	sed -e 's:\($(GTK_LIBS) $(pixman_LIBS)\)$:\1 -lm:' \
+		-i Makefile.* || die "sed failed"
+}
+
+src_configure() {
+	econf --enable-animation \
+		--enable-rgba \
+		$(use_enable animation-rtl animationrtl)
+}
+
+src_install() {
+	default
+	# Remove useless .la files
+	find "${D}" -name '*.la' -exec rm -f {} + || die
+}