GTK+ 2.4 fix. Marked 0.5 stable on x86.

5 files changed, 25 insertions, 9 deletions

diff --git a/net-www/ochusha/ChangeLog b/net-www/ochusha/ChangeLog
index c4240bb3db23..428675b13204 100644
--- a/net-www/ochusha/ChangeLog
+++ b/net-www/ochusha/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/ochusha
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/ochusha/ChangeLog,v 1.23 2004/02/29 16:39:53 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/ochusha/ChangeLog,v 1.24 2004/04/07 03:47:15 usata Exp $
+
+  07 Apr 2004; Mamoru KOMACHI <usata@gentoo.org> ochusha-0.4.10.1.ebuild,
+  ochusha-0.4.10.3.ebuild, ochusha-0.5.ebuild:
+  GTK+ 2.4 fix. Marked 0.5 stable on x86.
 
 *ochusha-0.5 (01 Mar 2004)
 
diff --git a/net-www/ochusha/Manifest b/net-www/ochusha/Manifest
index abc500fd1895..dac56802474f 100644
--- a/net-www/ochusha/Manifest
+++ b/net-www/ochusha/Manifest
@@ -1,7 +1,7 @@
-MD5 5bb0b3bcfc39b271b262dc8866df2110 ochusha-0.5.ebuild 807
-MD5 f3288f348ba7925fa549cdb61d33e2f3 ochusha-0.4.10.1.ebuild 811
-MD5 9f7a8908c21588d4ef6e97b31f804a92 ochusha-0.4.10.3.ebuild 811
-MD5 cbe44f1a0f29bcc6e31335e8e94e377f ChangeLog 4162
+MD5 80e3991d4c461824480df93a6ff87885 ochusha-0.5.ebuild 923
+MD5 a7182436b6cacd4c72133f7949b44db8 ochusha-0.4.10.1.ebuild 928
+MD5 c1f37c78f176acf2aa77e37730f19357 ochusha-0.4.10.3.ebuild 928
+MD5 1b43277af5aa7b8113590a8dbe53498f ChangeLog 4326
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 MD5 39a9adefff26d40f94fe50ed4379bcbe files/digest-ochusha-0.4.10.3 70
 MD5 dad24ad6daef44f61689ab4cf008fc01 files/digest-ochusha-0.4.10.1 70
diff --git a/net-www/ochusha/ochusha-0.4.10.1.ebuild b/net-www/ochusha/ochusha-0.4.10.1.ebuild
index a81045cc9734..3ff1eb3fc642 100644
--- a/net-www/ochusha/ochusha-0.4.10.1.ebuild
+++ b/net-www/ochusha/ochusha-0.4.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/ochusha/ochusha-0.4.10.1.ebuild,v 1.3 2004/03/11 20:16:15 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/ochusha/ochusha-0.4.10.1.ebuild,v 1.4 2004/04/07 03:47:15 usata Exp $
 
 IUSE=""
 
@@ -24,6 +24,10 @@ S=${WORKDIR}/${P}
 
 src_compile() {
 
+	if has_version '>=x11-libs/gtk+-2.4' ; then
+		perl -i -pe "s/-D.*?DISABLE_DEPRECATED//g" gtk2/Makefile* || die
+	fi
+
 	econf --enable-regex --with-included-oniguruma || die
 	emake || die
 }
diff --git a/net-www/ochusha/ochusha-0.4.10.3.ebuild b/net-www/ochusha/ochusha-0.4.10.3.ebuild
index e5d426f68935..ec6ab5021149 100644
--- a/net-www/ochusha/ochusha-0.4.10.3.ebuild
+++ b/net-www/ochusha/ochusha-0.4.10.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/ochusha/ochusha-0.4.10.3.ebuild,v 1.3 2004/03/11 20:16:15 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/ochusha/ochusha-0.4.10.3.ebuild,v 1.4 2004/04/07 03:47:15 usata Exp $
 
 IUSE=""
 
@@ -24,6 +24,10 @@ S=${WORKDIR}/${P}
 
 src_compile() {
 
+	if has_version '>=x11-libs/gtk+-2.4' ; then
+		perl -i -pe "s/-D.*?DISABLE_DEPRECATED//g" gtk2/Makefile* || die
+	fi
+
 	econf --enable-regex --with-included-oniguruma || die
 	emake || die
 }
diff --git a/net-www/ochusha/ochusha-0.5.ebuild b/net-www/ochusha/ochusha-0.5.ebuild
index 9410910b65b0..25ed11940c8c 100644
--- a/net-www/ochusha/ochusha-0.5.ebuild
+++ b/net-www/ochusha/ochusha-0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/ochusha/ochusha-0.5.ebuild,v 1.2 2004/03/11 20:16:15 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/ochusha/ochusha-0.5.ebuild,v 1.3 2004/04/07 03:47:15 usata Exp $
 
 IUSE=""
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/8439/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 DEPEND="virtual/xft
 	>=x11-libs/gtk+-2.2.4
@@ -24,6 +24,10 @@ S=${WORKDIR}/${P}
 
 src_compile() {
 
+	if has_version '>=x11-libs/gtk+-2.4' ; then
+		perl -i -pe "s/-D.*?DISABLE_DEPRECATED//g" gtk2/Makefile* || die
+	fi
+
 	econf --enable-regex --with-included-oniguruma || die
 	emake || die
 }