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

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

4 files changed, 59 insertions, 64 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/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
+}