Fix building with GTK+-2.20 wrt #325877 by Christoph Mende.

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

diff --git a/app-misc/gentoo/ChangeLog b/app-misc/gentoo/ChangeLog
index ff21b5c2be5cb1eaa34716f22ef1be8d8f6400ff..00aec94bbb9ac372cdc4e2c9926e74f381738912 100644 (file)
--- a/app-misc/gentoo/ChangeLog
+++ b/app-misc/gentoo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-misc/gentoo
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gentoo/ChangeLog,v 1.83 2010/02/08 09:25:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gentoo/ChangeLog,v 1.84 2010/06/27 21:52:28 ssuominen Exp $
+
+  27 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> gentoo-0.15.6.ebuild:
+  Fix building with GTK+-2.20 wrt #325877 by Christoph Mende.
 
 *gentoo-0.15.6 (08 Feb 2010)
 

diff --git a/app-misc/gentoo/Manifest b/app-misc/gentoo/Manifest
index f4025fcd7513a463162bfa21fb1aeb3f139f04d5..8aa3b55de9a7b30ec2c508107364aec3e26f1a15 100644 (file)
--- a/app-misc/gentoo/Manifest
+++ b/app-misc/gentoo/Manifest
@@ -1,6 +1,6 @@
 DIST gentoo-0.15.4.tar.gz 1468308 RMD160 22722dcd023d031a20c58a31758209cc548be30e SHA1 e191ca5603673e3610b82111c6d6dced074b1454 SHA256 f17a5030370cd9ceeaef076bfe3fbd13da3f50e674f8cd706449a48d70d28fd3
 DIST gentoo-0.15.6.tar.gz 1467732 RMD160 8baf1db8926211dc2839484cdce48393b2bacbc6 SHA1 9de0c09aa03babeee714dcc99b1a594035426379 SHA256 c3108bd7bcd6dc0f19c0f30dab4f6ce0f36d2d020048899c74d5667afe439d9d
 EBUILD gentoo-0.15.4.ebuild 1315 RMD160 02f84933d95ee2d7dd1b2917591b633f7ebf20fe SHA1 535858295c6ffd5c86c3a56c86976e5817cb7319 SHA256 f2452729434139152d0fab48277862074b799b4dc921b32022f8706ef9499ac5
-EBUILD gentoo-0.15.6.ebuild 1290 RMD160 05490cdafda9c2ba8eff6a85970e892aa981906b SHA1 580f0d79b82d5a9bf0841d25a55208a25325cc50 SHA256 15ebe654f5543ac88a69704034f99d1ad1f9f3706d58cad7a429ce9c9b92bc69
-MISC ChangeLog 12511 RMD160 39234ddb5240c063d427364aa97847b4e49ea5eb SHA1 8779f31ac7bda29c756afe6c95e0a22b2b316e7b SHA256 52b12e72c50835c539c1a5afb675e4a68ad4965eb4bcdd8390f62d4b7f931f48
+EBUILD gentoo-0.15.6.ebuild 1219 RMD160 4dd39b8b444fd3636db5fd51d8a03ab47301610d SHA1 7508d5118ffa13a8169f2668c2e19516c0160ba8 SHA256 bcb23dd77a36a2678283aca382864114ece4245a25a7eaa39f116b72a03f5110
+MISC ChangeLog 12650 RMD160 28da44e7193d9260b933b1fe395ada51e5551296 SHA1 f407b5e1258b912e7504b8b3744d5bdd1710d904 SHA256 2ba2075565ba4e0e8a75d44b21f96de385c7a9442618a42a97932c38fd016867
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826

diff --git a/app-misc/gentoo/gentoo-0.15.6.ebuild b/app-misc/gentoo/gentoo-0.15.6.ebuild
index 9838ca0cab737772b6a8d6eda897d0f559175a7d..18d13542aed902597eacf6e86ccf5c50bcf3130a 100644 (file)
--- a/app-misc/gentoo/gentoo-0.15.6.ebuild
+++ b/app-misc/gentoo/gentoo-0.15.6.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/app-misc/gentoo/gentoo-0.15.6.ebuild,v 1.1 2010/02/08 09:25:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gentoo/gentoo-0.15.6.ebuild,v 1.2 2010/06/27 21:52:28 ssuominen Exp $
 
 EAPI=2
 inherit eutils
@@ -20,6 +20,12 @@ RDEPEND="x11-libs/gtk+:2
 DEPEND="${RDEPEND}
        nls? ( sys-devel/gettext )"
 
+src_prepare() {
+       sed -i \
+               -e '/GTK_DISABLE_DEPRECATED/d' \
+               src/odmultibutton.c || die
+}
+
 src_configure() {
        econf \
                --disable-dependency-tracking \
@@ -42,8 +48,3 @@ src_install() {
                /usr/share/${PN}/icons/${PN}.png \
                "System;FileTools;FileManager"
 }
-
-pkg_postinst() {
-       elog "This package doesn't have anything to do with the Gentoo Foundation"
-       elog "or Gentoo Linux in general. The name is just a coincidence."
-}