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

Package-Manager: portage-2.2_rc96/cvs/Linux x86_64

5 files changed, 14 insertions, 90 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/Manifest b/x11-wm/emerald/Manifest
index 27858e01cd23..d5649b92a038 100644
--- a/x11-wm/emerald/Manifest
+++ b/x11-wm/emerald/Manifest
@@ -3,15 +3,13 @@ Hash: SHA1
 
 AUX emerald-0.8.4-gtk+-2.20-build.patch 1194 RMD160 f87d90db0341b77937b1c32521752bf0420974f8 SHA1 849f7aadb60dc702260e9900330cd5bc2a5a3242 SHA256 c196b2720ffa2996992e02b62d02f67c0f7f9dd7301fc6ceb26a1b1c81d5bcec
 DIST emerald-0.8.4.tar.bz2 525316 RMD160 de04228414419141c3df0e7f32a062cc6dfabcda SHA1 408bef6ba7822bd933448f16dc43bbd3d801d9c9 SHA256 7ed5009a739219c61c26176f738ba5264e93557f353fdf9fc480c73fe8b05e26
-EBUILD emerald-0.8.4-r1.ebuild 969 RMD160 460af3495eab2d4c90d4b128b29de98049aa01f2 SHA1 73864cb09414f09f374029c8abfef5842557a1da SHA256 29374776efec2e84e2d82a77601c037eb4e6ab005ec61145ea8cba2772293a4d
-EBUILD emerald-0.8.4-r2.ebuild 1094 RMD160 c5903aadf6ce6d7a1ea5fdfd9da4ddc57493a724 SHA1 50c750597f5fbd62fdd857b301a17e88fc3c9104 SHA256 850bc649f7670dc60968f4a9c125f0cae29e864cc473c05fa6a3b16108572247
-EBUILD emerald-0.8.4.ebuild 853 RMD160 bdfd0dd37cb47afee946d081b988d94804105e3f SHA1 58cf310fc9d422f41ac742b150eb696d9c71f8f8 SHA256 fb66f806e20d5857154dd16305c484b7ee616007b84efb194546a3ac74f2b8ac
-MISC ChangeLog 5335 RMD160 301929de1a383e6aadac7fa075e157f16d1e3ce5 SHA1 1c8f88118fcec0075b6100f88b047ee57dd404c9 SHA256 168f71d29207bccdffac4727d1e0a5f009e4c00a8651e842158ce867cebe2bb5
+EBUILD emerald-0.8.4-r2.ebuild 1220 RMD160 db33206799a1fd00c355e9804f5f9c79e4d4dc6b SHA1 45e44c611392d50b5b5dc22d5b8516bf81a47a37 SHA256 831911c8d592bd5820cd584e06f4be1ec4a27907834bf39ffd810db26f0ae5d8
+MISC ChangeLog 5535 RMD160 280d7c413cd6361483fb368d2581acf12afb3bf5 SHA1 2df9f309a3c4770e04cf78b510d35d21ba376099 SHA256 1691ba88b2a4c00ce7a66fad40b97bceb38e1ff6919328473d39fe8b065a9559
 MISC metadata.xml 294 RMD160 4e679fcbec940438f4c6918c047a4703a9edf7f7 SHA1 a10877882be8eb3e6b2cde8df9aad51f39ecd4a4 SHA256 3f2e1d5e049bf839f1dce07e7680ebf64c7e7713c0dadd799c9b7e49b701a98e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyfnb8ACgkQAiZjviIA2XhASgCfU8RA6+ofyX09/ReVe5l4+y5E
-ZcIAn0+gq0D7PrCsRrKZqwxyaKvn9s+D
-=EdWT
+iEYEARECAAYFAky4maYACgkQAiZjviIA2Xh+ygCfSSPhKQEEtQknvLQOTVTYXlDC
+DOIAni1mYkS2sNUV5bNVqKRI9AZegblM
+=qVKN
 -----END PGP SIGNATURE-----
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"
-}