Version bumped, bug #2#48480.

Package-Manager: portage-2.1.6/cvs/Linux 2.6.27-gentoo-r4 x86_64

5 files changed, 57 insertions, 117 deletions

diff --git a/www-client/ochusha/ChangeLog b/www-client/ochusha/ChangeLog
index fb9f0300678c..be751dd8fb56 100644
--- a/www-client/ochusha/ChangeLog
+++ b/www-client/ochusha/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/ochusha
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/ochusha/ChangeLog,v 1.31 2008/06/21 20:09:53 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/ochusha/ChangeLog,v 1.32 2008/12/24 00:39:43 matsuu Exp $
+
+*ochusha-0.6 (24 Dec 2008)
+
+  24 Dec 2008; MATSUU Takuto <matsuu@gentoo.org> -ochusha-0.5.8.2-r1.ebuild,
+  -ochusha-0.5.8.2-r2.ebuild, +ochusha-0.6.ebuild:
+  Version bumped, bug #2#48480. Removed old versions.
 
   21 Jun 2008; Markus Rothe <corsair@gentoo.org> ochusha-0.5.8.2-r3.ebuild:
   Stable on ppc64; bug #227905
diff --git a/www-client/ochusha/Manifest b/www-client/ochusha/Manifest
index ba05c21c022e..225f5ed0f8d9 100644
--- a/www-client/ochusha/Manifest
+++ b/www-client/ochusha/Manifest
@@ -4,8 +4,8 @@ AUX ochusha-0.5.8.2-glibc2.diff 370 RMD160 6f331c7818b630822b7b74157b4120975f6ee
 AUX ochusha-0.5.8.2-gtk-2.12.diff 6854 RMD160 10ccfcbcb7402049105eb337ffadd965e3cd78e8 SHA1 ee04b3199df6f8d6552d88c2854aa5280300c621 SHA256 b1cd009d3216c78931ebd9dcc67431d65e1c04954490cd879ef937c208541910
 AUX ochusha-0.5.8.2-type-punning.diff 1238 RMD160 b38fb1708042488bf6597a277e957681ec392675 SHA1 392a71b1aa38b9e0dd4377fa88c9ce8b93e73c6c SHA256 9e3e686bb089e189bc184ddaa5bcf057b237637bbd76acdfe162bacc7029810b
 DIST ochusha-0.5.8.2.tar.bz2 1794268 RMD160 5990fd327165b3d3c415aec5639babe1ce9ad6ba SHA1 1b302b9cc084d5e44eb32b68f67399f6f37deda1 SHA256 91a4429b085be335ad34c9af3ed2ab8871b6245839348abe21073a48789dbe7c
-EBUILD ochusha-0.5.8.2-r1.ebuild 1151 RMD160 0617e0f078062308cbcc1cdb722d5635bc8dc911 SHA1 0ebe52f7976c26fe5a764a5946449b1e2d2d7d07 SHA256 8a509d43441444109279b61a630f49c6f55a119c51ee5e328c1e58c15df198fa
-EBUILD ochusha-0.5.8.2-r2.ebuild 1526 RMD160 69d18d4f6d487baddb93b36566d31a90623e4511 SHA1 fd0efe5fcc39f1c29febfe1d04fcdab816828654 SHA256 1bc45b84d755fb838cab9d16bd0da9522d2af7f336d3ea6685b3ffa8310af089
+DIST ochusha-0.6.tar.bz2 2404408 RMD160 7c9dc7d9e64eb7b6dbf8583cb4e250576f0ae0cc SHA1 abf55f23eb916ca7e110d790235cab1beb106cb5 SHA256 daffc86c4a683c2d7db9c827a0912264cf2fb977b1a628f23a1552a1e289d810
 EBUILD ochusha-0.5.8.2-r3.ebuild 1559 RMD160 a4d50ce4d8081d544e84d5531ef3e89520346ce7 SHA1 cf8057256c0a46433b8b6e211c571179200ef8ee SHA256 e628ee65971fcf9b368f57112afc13bbb9528e32d4b5ab157fa397b342b88b1b
-MISC ChangeLog 11110 RMD160 2e1bbae97e0551cb1b3c4ecd14cae5a0f43b2870 SHA1 e887d6aee922b06dcd0c1862db6e69f4eb0b25f7 SHA256 af11576bd2e244fa21079c3e124d459b3f4479da2c9ac031edd41a1d1512553b
+EBUILD ochusha-0.6.ebuild 1128 RMD160 c34a9c7928e815c30f38ffe4fea9c0715067ff33 SHA1 98ad472061d588f43913ff14a410c5c49668ab7b SHA256 d850917f3725d7fc294b82beb6ec4c0aeef9b5f889e23158da11f0c5cf3ad3d0
+MISC ChangeLog 11320 RMD160 e7ef9f449fc0b85fa8d084364e61cdba7605731c SHA1 ecd891eb8386d709801edaccd4964422b63bb662 SHA256 616a6384f8008150ede91ac4e80f4264bd512fc79257e20ad59283920b2d06ff
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
diff --git a/www-client/ochusha/ochusha-0.5.8.2-r1.ebuild b/www-client/ochusha/ochusha-0.5.8.2-r1.ebuild
deleted file mode 100644
index 1732be18236b..000000000000
--- a/www-client/ochusha/ochusha-0.5.8.2-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/ochusha/ochusha-0.5.8.2-r1.ebuild,v 1.8 2008/06/21 11:43:36 gentoofan23 Exp $
-
-inherit flag-o-matic eutils
-
-IUSE="nls ssl"
-
-DESCRIPTION="Ochusha - 2ch viewer for GTK+"
-HOMEPAGE="http://ochusha.sourceforge.jp/"
-SRC_URI="mirror://sourceforge.jp/${PN}/16560/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 x86"
-
-RDEPEND="virtual/xft
-	>=x11-libs/gtk+-2.2.4
-	>=dev-libs/glib-2.2.3
-	>=dev-libs/libxml2-2.5.0
-	sys-libs/zlib
-	nls? ( virtual/libintl )
-	ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gentoo.diff
-	epatch "${FILESDIR}"/${P}-glib-2.10.diff
-}
-
-src_compile() {
-
-	econf $(use_enable nls) \
-		$(use_with ssl) \
-		--enable-regex \
-		--disable-shared \
-		--enable-static \
-		--with-included-oniguruma || die
-	emake || die
-}
-
-src_install() {
-
-	make DESTDIR="${D}" install || die
-
-	dodoc ABOUT-NLS ACKNOWLEDGEMENT AUTHORS BUGS \
-		ChangeLog INSTALL* NEWS README TODO
-}
diff --git a/www-client/ochusha/ochusha-0.5.8.2-r2.ebuild b/www-client/ochusha/ochusha-0.5.8.2-r2.ebuild
deleted file mode 100644
index 1e1b40fa1309..000000000000
--- a/www-client/ochusha/ochusha-0.5.8.2-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/ochusha/ochusha-0.5.8.2-r2.ebuild,v 1.5 2007/02/13 10:33:25 corsair Exp $
-
-inherit flag-o-matic eutils
-
-IUSE="nls ssl"
-
-DESCRIPTION="Ochusha - 2ch viewer for GTK+"
-HOMEPAGE="http://ochusha.sourceforge.jp/"
-SRC_URI="mirror://sourceforge.jp/${PN}/16560/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 x86 ~x86-fbsd"
-
-RDEPEND="virtual/xft
-	>=x11-libs/gtk+-2.2.4
-	>=dev-libs/glib-2.2.3
-	>=dev-libs/libxml2-2.5.0
-	sys-libs/zlib
-	nls? ( virtual/libintl )
-	ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gentoo.diff
-	epatch "${FILESDIR}"/${P}-glib-2.10.diff
-}
-
-src_compile() {
-	econf $(use_enable nls) \
-		$(use_with ssl) \
-		--enable-regex \
-		--disable-shared \
-		--enable-static \
-		--with-included-oniguruma || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-
-	rm "${D}"/usr/share/ochusha/ochusha.desktop
-
-	insinto /usr/share/applications
-	doins "${S}/gtk2/ochusha.desktop"
-	sed -i -e 's:Icon=.*:Icon=ochusha:' "${D}"/usr/share/applications/ochusha.desktop
-
-	insinto /usr/share/icons/hicolor/48x48/apps
-	newins "${S}/gtk2/ochusha48.png" ochusha.png
-	insinto /usr/share/icons/hicolor/32x32/apps
-	newins "${S}/gtk2/ochusha32.png" ochusha.png
-
-	dodoc ACKNOWLEDGEMENT AUTHORS BUGS \
-		ChangeLog INSTALL* NEWS README TODO
-}
diff --git a/www-client/ochusha/ochusha-0.6.ebuild b/www-client/ochusha/ochusha-0.6.ebuild
new file mode 100644
index 000000000000..5605ae0a4895
--- /dev/null
+++ b/www-client/ochusha/ochusha-0.6.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/ochusha/ochusha-0.6.ebuild,v 1.1 2008/12/24 00:39:43 matsuu Exp $
+
+inherit eutils
+
+IUSE="nls nls ssl static"
+
+DESCRIPTION="Ochusha - 2ch viewer for GTK+"
+HOMEPAGE="http://ochusha.sourceforge.jp/"
+SRC_URI="mirror://sourceforge.jp/${PN}/36733/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+
+RDEPEND=">=x11-libs/gtk+-2.6
+	>=dev-libs/glib-2.6
+	>=dev-libs/libxml2-2.6
+	>=dev-db/sqlite-3
+	sys-libs/zlib
+	dev-libs/oniguruma
+	nls? ( virtual/libintl )
+	ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_compile() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable nls) \
+		$(use_with ssl) \
+		$(use_with ssl ca-cert-path /etc/ssl/certs) \
+		$(use_enable static) \
+		--with-external-oniguruma || die
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	domenu ochusha/ochusha.desktop
+	#doicon ochusha/ochusha48.png
+
+	dodoc ACKNOWLEDGEMENT AUTHORS BUGS ChangeLog NEWS README TODO
+}