Version bumped.

(Portage version: 2.1.6.3/cvs/Linux 2.6.28-gentoo x86_64)

4 files changed, 17 insertions, 174 deletions

diff --git a/www-client/jd/ChangeLog b/www-client/jd/ChangeLog
index 4a315eade35c..8fb67ac640e1 100644
--- a/www-client/jd/ChangeLog
+++ b/www-client/jd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/jd
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/jd/ChangeLog,v 1.5 2008/12/16 17:11:18 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/jd/ChangeLog,v 1.6 2008/12/28 15:50:34 matsuu Exp $
+
+*jd-2.1.0_p081228 (28 Dec 2008)
+
+  28 Dec 2008; MATSUU Takuto <matsuu@gentoo.org> -jd-2.0.2_p080919.ebuild,
+  -jd-2.0.3_p081124.ebuild, -jd-2.1.0_beta081216.ebuild,
+  +jd-2.1.0_p081228.ebuild:
+  Version bumped. Removed old versions.
 
 *jd-2.1.0_beta081216 (16 Dec 2008)
 
diff --git a/www-client/jd/jd-2.0.3_p081124.ebuild b/www-client/jd/jd-2.0.3_p081124.ebuild
deleted file mode 100644
index 26f2e7b629b9..000000000000
--- a/www-client/jd/jd-2.0.3_p081124.ebuild
+++ /dev/null
@@ -1,77 +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/jd/jd-2.0.3_p081124.ebuild,v 1.1 2008/11/28 16:53:38 matsuu Exp $
-
-inherit eutils autotools
-
-MY_P="${P/_p/-}"
-MY_P="${MY_P/_beta/-}"
-
-DESCRIPTION="gtk2 based 2ch browser written in C++"
-HOMEPAGE="http://jd4linux.sourceforge.jp/"
-SRC_URI="mirror://sourceforge.jp/jd4linux/33877/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa gnome gnutls"
-#IUSE="alsa gnome gnutls migemo"
-
-RDEPEND=">=dev-cpp/gtkmm-2.8
-	>=dev-libs/glib-2
-	x11-misc/xdg-utils
-	alsa? ( >=media-libs/alsa-lib-1 )
-	gnome? ( >=gnome-base/libgnomeui-2 )
-	!gnome? (
-		x11-libs/libSM
-		x11-libs/libICE
-	)
-	gnutls? ( >=net-libs/gnutls-1.2 )
-	!gnutls? ( >=dev-libs/openssl-0.9 )"
-#	migemo? ( app-text/cmigemo )
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	eautoreconf
-}
-
-src_compile() {
-	local myconf="--with-xdgopen"
-
-	# use gnomeui sm instead of Xorg SM/ICE
-	if use gnome ; then
-		myconf="${myconf} --with-sessionlib=gnomeui"
-	else
-		myconf="${myconf} --with-sessionlib=xsmp"
-	fi
-
-	if use gnutls ; then
-		myconf="${myconf} --without-openssl"
-	else
-		myconf="${myconf} --with-openssl"
-	fi
-
-	#if use migemo ; then
-	#	myconf="${myconf} --with-migemo --with-migemodict=/usr/share/migemo/migemo-dict"
-	#else
-	#	myconf="${myconf} --without-migemo"
-	#fi
-
-	econf \
-		$(use_with alsa) \
-		${myconf} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	doicon ${PN}.png
-	domenu ${PN}.desktop
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/www-client/jd/jd-2.1.0_beta081216.ebuild b/www-client/jd/jd-2.1.0_beta081216.ebuild
deleted file mode 100644
index 47e2e0eddd84..000000000000
--- a/www-client/jd/jd-2.1.0_beta081216.ebuild
+++ /dev/null
@@ -1,77 +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/jd/jd-2.1.0_beta081216.ebuild,v 1.1 2008/12/16 17:11:18 matsuu Exp $
-
-inherit eutils autotools
-
-MY_P="${P/_p/-}"
-MY_P="${MY_P/_beta/-beta}"
-
-DESCRIPTION="gtk2 based 2ch browser written in C++"
-HOMEPAGE="http://jd4linux.sourceforge.jp/"
-SRC_URI="mirror://sourceforge.jp/jd4linux/36586/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa gnome gnutls"
-#IUSE="alsa gnome gnutls migemo"
-
-RDEPEND=">=dev-cpp/gtkmm-2.8
-	>=dev-libs/glib-2
-	x11-misc/xdg-utils
-	alsa? ( >=media-libs/alsa-lib-1 )
-	gnome? ( >=gnome-base/libgnomeui-2 )
-	!gnome? (
-		x11-libs/libSM
-		x11-libs/libICE
-	)
-	gnutls? ( >=net-libs/gnutls-1.2 )
-	!gnutls? ( >=dev-libs/openssl-0.9 )"
-#	migemo? ( app-text/cmigemo )
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	eautoreconf
-}
-
-src_compile() {
-	local myconf="--with-xdgopen"
-
-	# use gnomeui sm instead of Xorg SM/ICE
-	if use gnome ; then
-		myconf="${myconf} --with-sessionlib=gnomeui"
-	else
-		myconf="${myconf} --with-sessionlib=xsmp"
-	fi
-
-	if use gnutls ; then
-		myconf="${myconf} --without-openssl"
-	else
-		myconf="${myconf} --with-openssl"
-	fi
-
-	#if use migemo ; then
-	#	myconf="${myconf} --with-migemo --with-migemodict=/usr/share/migemo/migemo-dict"
-	#else
-	#	myconf="${myconf} --without-migemo"
-	#fi
-
-	econf \
-		$(use_with alsa) \
-		${myconf} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	doicon ${PN}.png
-	domenu ${PN}.desktop
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/www-client/jd/jd-2.0.2_p080919.ebuild b/www-client/jd/jd-2.1.0_p081228.ebuild
index 0c5a25c19a5a..0a8f73fe624c 100644
--- a/www-client/jd/jd-2.0.2_p080919.ebuild
+++ b/www-client/jd/jd-2.1.0_p081228.ebuild
@@ -1,21 +1,20 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/jd/jd-2.0.2_p080919.ebuild,v 1.1 2008/09/20 02:37:04 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/jd/jd-2.1.0_p081228.ebuild,v 1.1 2008/12/28 15:50:34 matsuu Exp $
 
 inherit eutils autotools
 
 MY_P="${P/_p/-}"
-MY_P="${MY_P/_beta/-}"
+MY_P="${MY_P/_/-}"
 
 DESCRIPTION="gtk2 based 2ch browser written in C++"
 HOMEPAGE="http://jd4linux.sourceforge.jp/"
-SRC_URI="mirror://sourceforge.jp/jd4linux/32951/${MY_P}.tgz"
+SRC_URI="mirror://sourceforge.jp/jd4linux/36802/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="alsa gnome gnutls"
-#IUSE="alsa gnome gnutls migemo"
+IUSE="alsa gnome gnutls migemo"
 
 RDEPEND=">=dev-cpp/gtkmm-2.8
 	>=dev-libs/glib-2
@@ -27,8 +26,8 @@ RDEPEND=">=dev-cpp/gtkmm-2.8
 		x11-libs/libICE
 	)
 	gnutls? ( >=net-libs/gnutls-1.2 )
-	!gnutls? ( >=dev-libs/openssl-0.9 )"
-#	migemo? ( app-text/cmigemo )
+	!gnutls? ( >=dev-libs/openssl-0.9 )
+	migemo? ( app-text/cmigemo )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
@@ -51,20 +50,11 @@ src_compile() {
 		myconf="${myconf} --with-sessionlib=xsmp"
 	fi
 
-	if use gnutls ; then
-		myconf="${myconf} --without-openssl"
-	else
-		myconf="${myconf} --with-openssl"
-	fi
-
-	#if use migemo ; then
-	#	myconf="${myconf} --with-migemo --with-migemodict=/usr/share/migemo/migemo-dict"
-	#else
-	#	myconf="${myconf} --without-migemo"
-	#fi
-
 	econf \
 		$(use_with alsa) \
+		$(use_with !gnutls openssl) \
+		$(use_with migemo) \
+		$(use_with migemo migemodict /usr/share/migemo/migemo-dict) \
 		${myconf} || die "econf failed"
 	emake || die "emake failed"
 }