Version bumped. Marked 0.5.4.2 stable. Removed 0.5 from CVS.

6 files changed, 24 insertions, 14 deletions

diff --git a/net-www/ochusha/ChangeLog b/net-www/ochusha/ChangeLog
index baed0ea3c55d..1b100a4d470a 100644
--- a/net-www/ochusha/ChangeLog
+++ b/net-www/ochusha/ChangeLog
@@ -1,6 +1,12 @@
 # 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.29 2004/05/24 17:56:25 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/ochusha/ChangeLog,v 1.30 2004/06/06 10:14:04 usata Exp $
+
+*ochusha-0.5.4.3 (06 Jun 2004)
+
+  06 Jun 2004; Mamoru KOMACHI <usata@gentoo.org> ochusha-0.5.4.2.ebuild,
+  +ochusha-0.5.4.3.ebuild, -ochusha-0.5.ebuild:
+  Version bumped. Marked 0.5.4.2 stable. Removed 0.5 from CVS.
 
 *ochusha-0.5.4.2 (25 May 2004)
 
diff --git a/net-www/ochusha/Manifest b/net-www/ochusha/Manifest
index b34326f85140..d82f8c8cedf2 100644
--- a/net-www/ochusha/Manifest
+++ b/net-www/ochusha/Manifest
@@ -3,6 +3,8 @@ MD5 715cc02d1b4b2257f9d243491e8abdbe ochusha-0.5.4.1.ebuild 940
 MD5 b1c4606338d6d40bfd2e4659aed74bec ChangeLog 5405
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 MD5 1d6873d472396d2458a6c6255227a825 ochusha-0.5.4.2.ebuild 920
+MD5 481180cbfaa6dbd1a06aeda05807777f ochusha-0.5.4.3.ebuild 920
 MD5 5759e944a867fd14973b4fb0e89d67ea files/digest-ochusha-0.5.4.1 69
 MD5 9c14c49897f6b5f3253dfea1b5608f48 files/digest-ochusha-0.5 65
 MD5 2053547db5a9a1405f8c9546de66c86e files/digest-ochusha-0.5.4.2 69
+MD5 173bbb5d094b2c95c5df9aec8b175e0f files/digest-ochusha-0.5.4.3 69
diff --git a/net-www/ochusha/files/digest-ochusha-0.5 b/net-www/ochusha/files/digest-ochusha-0.5
deleted file mode 100644
index e0458d30d66d..000000000000
--- a/net-www/ochusha/files/digest-ochusha-0.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b328838e40546c8cccfdaac466e40c72 ochusha-0.5.tar.bz2 1648362
diff --git a/net-www/ochusha/files/digest-ochusha-0.5.4.3 b/net-www/ochusha/files/digest-ochusha-0.5.4.3
new file mode 100644
index 000000000000..6a343964dd19
--- /dev/null
+++ b/net-www/ochusha/files/digest-ochusha-0.5.4.3
@@ -0,0 +1 @@
+MD5 7bd47de5bf33661cb27cf1b5c571f992 ochusha-0.5.4.3.tar.bz2 1684450
diff --git a/net-www/ochusha/ochusha-0.5.4.2.ebuild b/net-www/ochusha/ochusha-0.5.4.2.ebuild
index dc083b2ae20e..31c008c02472 100644
--- a/net-www/ochusha/ochusha-0.5.4.2.ebuild
+++ b/net-www/ochusha/ochusha-0.5.4.2.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.4.2.ebuild,v 1.1 2004/05/24 17:56:26 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/ochusha/ochusha-0.5.4.2.ebuild,v 1.2 2004/06/06 10:14:04 usata Exp $
 
 IUSE="nls ssl"
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/9615/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 DEPEND="virtual/xft
 	>=x11-libs/gtk+-2.2.4
diff --git a/net-www/ochusha/ochusha-0.5.ebuild b/net-www/ochusha/ochusha-0.5.4.3.ebuild
index 22cd7505f3b6..a578238fc258 100644
--- a/net-www/ochusha/ochusha-0.5.ebuild
+++ b/net-www/ochusha/ochusha-0.5.4.3.ebuild
@@ -1,16 +1,16 @@
 # 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.4 2004/05/05 08:16:32 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/ochusha/ochusha-0.5.4.3.ebuild,v 1.1 2004/06/06 10:14:04 usata Exp $
 
-IUSE=""
+IUSE="nls ssl"
 
 DESCRIPTION="Ochusha - 2ch viewer for GTK+"
 HOMEPAGE="http://ochusha.sourceforge.jp/"
-SRC_URI="mirror://sourceforge.jp/${PN}/8439/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge.jp/${PN}/9791/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 
 DEPEND="virtual/xft
 	>=x11-libs/gtk+-2.2.4
@@ -18,15 +18,17 @@ DEPEND="virtual/xft
 	>=dev-libs/libxml2-2.5.0
 	>=gnome-base/libghttp-1.0.9
 	sys-libs/zlib
-	sys-devel/gettext"
+	nls? ( sys-devel/gettext )
+	ssl? ( dev-libs/openssl )"
 
 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
+	econf `use_enable nls` \
+		`use_with ssl` \
+		--enable-regex \
+		--disable-shared \
+		--enable-static \
+		--with-included-oniguruma || die
 	emake || die
 }