Fix build with gtk+ 2.22 (bug #341143) and cleanup old versions.

(Portage version: 2.2_rc96/cvs/Linux x86_64)

4 files changed, 9 insertions, 83 deletions

diff --git a/x11-wm/emerald/ChangeLog b/x11-wm/emerald/ChangeLog
index ba0e9419a68d..526935a11c43 100644
--- a/x11-wm/emerald/ChangeLog
+++ b/x11-wm/emerald/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/emerald
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/emerald/ChangeLog,v 1.33 2010/09/26 19:23:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/emerald/ChangeLog,v 1.34 2010/10/15 18:13:38 flameeyes Exp $
+
+  15 Oct 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -emerald-0.8.4.ebuild, -emerald-0.8.4-r1.ebuild, emerald-0.8.4-r2.ebuild:
+  Fix build with gtk+ 2.22 (bug #341143) and cleanup old versions.
 
 *emerald-0.8.4-r2 (26 Sep 2010)
 
diff --git a/x11-wm/emerald/emerald-0.8.4-r1.ebuild b/x11-wm/emerald/emerald-0.8.4-r1.ebuild
deleted file mode 100644
index 7a4c9b69eaf1..000000000000
--- a/x11-wm/emerald/emerald-0.8.4-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/emerald/emerald-0.8.4-r1.ebuild,v 1.3 2010/04/03 06:41:27 jmbsvicetto Exp $
-
-EAPI="2"
-
-inherit eutils
-
-THEMES_RELEASE=0.5.2
-
-DESCRIPTION="Emerald Window Decorator"
-HOMEPAGE="http://www.compiz.org/"
-SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-PDEPEND="~x11-themes/emerald-themes-${THEMES_RELEASE}"
-
-RDEPEND="
-	>=x11-libs/gtk+-2.8.0
-	>=x11-libs/libwnck-2.14.2
-	>=x11-wm/compiz-${PV}
-"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.19
-	>=sys-devel/gettext-0.15
-"
-
-src_prepare() {
-	# Fixing GTK symbol - bug 308791.
-	epatch "${FILESDIR}/${P}-gtk+-2.20-build.patch"
-}
-
-src_configure() {
-	econf --disable-mime-update || die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
diff --git a/x11-wm/emerald/emerald-0.8.4-r2.ebuild b/x11-wm/emerald/emerald-0.8.4-r2.ebuild
index 3c66c6c82a60..bec84e6f3a4f 100644
--- a/x11-wm/emerald/emerald-0.8.4-r2.ebuild
+++ b/x11-wm/emerald/emerald-0.8.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/emerald/emerald-0.8.4-r2.ebuild,v 1.1 2010/09/26 19:23:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/emerald/emerald-0.8.4-r2.ebuild,v 1.2 2010/10/15 18:13:38 flameeyes Exp $
 
 EAPI="2"
 
@@ -34,6 +34,9 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	# Fixing GTK symbol - bug 308791.
 	epatch "${FILESDIR}/${P}-gtk+-2.20-build.patch"
+	# fix build with gtk+-2.22 - bug 341143
+	sed -i -e '/#define G[DT]K_DISABLE_DEPRECATED/s:^://:' \
+		include/emerald.h || die
 }
 
 src_configure() {
diff --git a/x11-wm/emerald/emerald-0.8.4.ebuild b/x11-wm/emerald/emerald-0.8.4.ebuild
deleted file mode 100644
index 4ceb034c7862..000000000000
--- a/x11-wm/emerald/emerald-0.8.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/emerald/emerald-0.8.4.ebuild,v 1.1 2009/10/15 20:27:05 mrpouet Exp $
-
-EAPI="2"
-
-inherit eutils
-
-THEMES_RELEASE=0.5.2
-
-DESCRIPTION="Emerald Window Decorator"
-HOMEPAGE="http://www.compiz.org/"
-SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-PDEPEND="~x11-themes/emerald-themes-${THEMES_RELEASE}"
-
-RDEPEND=">=x11-libs/gtk+-2.8.0
-	>=x11-libs/libwnck-2.14.2
-	~x11-wm/compiz-${PV}"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.19
-	>=sys-devel/gettext-0.15"
-src_configure() {
-	econf --disable-mime-update || die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}