Version bump wrt #460858

(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key F8551514)

8 files changed, 56 insertions, 208 deletions

diff --git a/net-misc/mikutter/ChangeLog b/net-misc/mikutter/ChangeLog
index 39ddb97f13e4..d1d8b884f369 100644
--- a/net-misc/mikutter/ChangeLog
+++ b/net-misc/mikutter/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/mikutter
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mikutter/ChangeLog,v 1.33 2013/02/20 15:35:05 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mikutter/ChangeLog,v 1.34 2013/03/31 13:15:44 naota Exp $
+
+*mikutter-0.2.1.1141 (31 Mar 2013)
+
+  31 Mar 2013; Naohiro Aota <naota@gentoo.org> +mikutter-0.2.1.1141.ebuild,
+  -mikutter-0.0.4.690.ebuild, -mikutter-0.1.0.723.ebuild,
+  -mikutter-0.1.1.780.ebuild, -mikutter-0.1.1.863.ebuild,
+  -mikutter-0.2.1.1127.ebuild, files/mikutter, mikutter-9999.ebuild:
+  Version bump wrt #460858
 
 *mikutter-0.2.1.1127 (20 Feb 2013)
 
diff --git a/net-misc/mikutter/files/mikutter b/net-misc/mikutter/files/mikutter
index 52592be284bf..6e2b5d8fb280 100644
--- a/net-misc/mikutter/files/mikutter
+++ b/net-misc/mikutter/files/mikutter
@@ -2,5 +2,5 @@
 
 EPREFIX=${0%/usr/bin/mikutter}
 
-$EPREFIX/usr/bin/ruby $EPREFIX/usr/share/mikutter/mikutter.rb
+$EPREFIX/usr/bin/ruby $EPREFIX/usr/share/mikutter/mikutter.rb $*
 
diff --git a/net-misc/mikutter/mikutter-0.0.4.690.ebuild b/net-misc/mikutter/mikutter-0.0.4.690.ebuild
deleted file mode 100644
index 4a48b5c63eaa..000000000000
--- a/net-misc/mikutter/mikutter-0.0.4.690.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mikutter/mikutter-0.0.4.690.ebuild,v 1.1 2012/02/18 14:27:07 naota Exp $
-
-EAPI=3
-
-USE_RUBY="ruby18 ruby19"
-
-inherit ruby-ng
-
-MY_P="${PN}.${PV}"
-
-DESCRIPTION="mikutter is simple, powerful and moeful twitter client"
-HOMEPAGE="http://mikutter.hachune.net/"
-SRC_URI="http://mikutter.hachune.net/bin/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+libnotify sound"
-
-DEPEND=""
-RDEPEND="libnotify? ( x11-libs/libnotify )
-	sound? ( media-sound/alsa-utils )"
-
-ruby_add_rdepend "dev-ruby/ruby-gtk2
-	dev-ruby/rcairo
-	dev-ruby/httpclient
-	virtual/ruby-ssl"
-
-S="${WORKDIR}/${PN}"
-
-each_ruby_install() {
-	exeinto /usr/share/mikutter
-	doexe mikutter.rb
-	insinto /usr/share/mikutter
-	doins -r core plugin
-	exeinto /usr/bin
-	doexe "${FILESDIR}"/mikutter
-	dodoc README
-}
diff --git a/net-misc/mikutter/mikutter-0.1.0.723.ebuild b/net-misc/mikutter/mikutter-0.1.0.723.ebuild
deleted file mode 100644
index 9457401c58a8..000000000000
--- a/net-misc/mikutter/mikutter-0.1.0.723.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mikutter/mikutter-0.1.0.723.ebuild,v 1.1 2012/03/29 14:13:14 naota Exp $
-
-EAPI=3
-
-USE_RUBY="ruby19"
-
-inherit ruby-ng
-
-if [ "${PV}" = "9999" ]; then
-	ESVN_REPO_URI="svn://toshia.dip.jp/mikutter/trunk"
-	inherit subversion
-	KEYWORDS=""
-else
-	MY_P="${PN}.${PV}"
-	SRC_URI="http://mikutter.hachune.net/bin/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="mikutter is simple, powerful and moeful twitter client"
-HOMEPAGE="http://mikutter.hachune.net/"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+libnotify sound"
-
-DEPEND=""
-RDEPEND="libnotify? ( x11-libs/libnotify )
-	sound? ( media-sound/alsa-utils )"
-
-ruby_add_rdepend "dev-ruby/ruby-gtk2
-	dev-ruby/rcairo
-	dev-ruby/httpclient
-	virtual/ruby-ssl"
-
-S="${WORKDIR}/${PN}"
-
-each_ruby_install() {
-	exeinto /usr/share/mikutter
-	doexe mikutter.rb
-	insinto /usr/share/mikutter
-	doins -r core plugin
-	exeinto /usr/bin
-	doexe "${FILESDIR}"/mikutter
-	dodoc README
-}
diff --git a/net-misc/mikutter/mikutter-0.1.1.780.ebuild b/net-misc/mikutter/mikutter-0.1.1.780.ebuild
deleted file mode 100644
index bc79672cabdd..000000000000
--- a/net-misc/mikutter/mikutter-0.1.1.780.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mikutter/mikutter-0.1.1.780.ebuild,v 1.1 2012/05/28 14:25:02 naota Exp $
-
-EAPI=3
-
-USE_RUBY="ruby19"
-
-inherit ruby-ng
-
-if [ "${PV}" = "9999" ]; then
-	ESVN_REPO_URI="svn://toshia.dip.jp/mikutter/trunk"
-	inherit subversion
-	KEYWORDS=""
-else
-	MY_P="${PN}.${PV}"
-	SRC_URI="http://mikutter.hachune.net/bin/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="mikutter is simple, powerful and moeful twitter client"
-HOMEPAGE="http://mikutter.hachune.net/"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+libnotify sound"
-
-DEPEND=""
-RDEPEND="libnotify? ( x11-libs/libnotify )
-	sound? ( media-sound/alsa-utils )"
-
-ruby_add_rdepend "dev-ruby/ruby-gtk2
-	dev-ruby/rcairo
-	dev-ruby/httpclient
-	virtual/ruby-ssl"
-
-S="${WORKDIR}/${PN}"
-
-each_ruby_install() {
-	exeinto /usr/share/mikutter
-	doexe mikutter.rb
-	insinto /usr/share/mikutter
-	doins -r core plugin
-	exeinto /usr/bin
-	doexe "${FILESDIR}"/mikutter
-	dodoc README
-}
diff --git a/net-misc/mikutter/mikutter-0.1.1.863.ebuild b/net-misc/mikutter/mikutter-0.1.1.863.ebuild
deleted file mode 100644
index c2383432e755..000000000000
--- a/net-misc/mikutter/mikutter-0.1.1.863.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mikutter/mikutter-0.1.1.863.ebuild,v 1.1 2012/10/05 00:55:07 naota Exp $
-
-EAPI=3
-
-USE_RUBY="ruby19"
-
-inherit ruby-ng
-
-if [ "${PV}" = "9999" ]; then
-	ESVN_REPO_URI="svn://toshia.dip.jp/mikutter/trunk"
-	inherit subversion
-	KEYWORDS=""
-else
-	MY_P="${PN}.${PV}"
-	SRC_URI="http://mikutter.hachune.net/bin/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="mikutter is simple, powerful and moeful twitter client"
-HOMEPAGE="http://mikutter.hachune.net/"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+libnotify sound"
-
-DEPEND=""
-RDEPEND="libnotify? ( x11-libs/libnotify )
-	sound? ( media-sound/alsa-utils )"
-
-ruby_add_rdepend "dev-ruby/ruby-gtk2
-	dev-ruby/rcairo
-	dev-ruby/httpclient
-	virtual/ruby-ssl"
-
-S="${WORKDIR}/${PN}"
-
-each_ruby_install() {
-	exeinto /usr/share/mikutter
-	doexe mikutter.rb
-	insinto /usr/share/mikutter
-	doins -r core plugin
-	exeinto /usr/bin
-	doexe "${FILESDIR}"/mikutter
-	dodoc README
-}
diff --git a/net-misc/mikutter/mikutter-0.2.1.1127.ebuild b/net-misc/mikutter/mikutter-0.2.1.1141.ebuild
index 048ae36bf93b..959b0c0e04fa 100644
--- a/net-misc/mikutter/mikutter-0.2.1.1127.ebuild
+++ b/net-misc/mikutter/mikutter-0.2.1.1141.ebuild
@@ -1,21 +1,23 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mikutter/mikutter-0.2.1.1127.ebuild,v 1.1 2013/02/20 15:35:05 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mikutter/mikutter-0.2.1.1141.ebuild,v 1.1 2013/03/31 13:15:44 naota Exp $
 
-EAPI=3
+EAPI=5
 
 USE_RUBY="ruby19"
 
-inherit ruby-ng
+inherit ruby-ng eutils
 
 if [ "${PV}" = "9999" ]; then
-	ESVN_REPO_URI="svn://toshia.dip.jp/mikutter/trunk"
-	inherit subversion
+	EGIT_REPO_URI="git://toshia.dip.jp/mikutter.git"
+	inherit git-2
 	KEYWORDS=""
+	EGIT_SOURCEDIR="${WORKDIR}/all"
 else
 	MY_P="${PN}.${PV}"
 	SRC_URI="http://mikutter.hachune.net/bin/${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
+	RUBY_S="${PN}"
 fi
 
 DESCRIPTION="mikutter is simple, powerful and moeful twitter client"
@@ -29,13 +31,22 @@ DEPEND=""
 RDEPEND="libnotify? ( x11-libs/libnotify )
 	sound? ( media-sound/alsa-utils )"
 
-ruby_add_rdepend "dev-ruby/bsearch
+ruby_add_rdepend "dev-ruby/addressable
+	dev-ruby/bsearch
+	dev-ruby/json
+	dev-ruby/memoize
+	>=dev-ruby/oauth-0.4.7
 	dev-ruby/ruby-gtk2
-	dev-ruby/rcairo
-	dev-ruby/httpclient
+	dev-ruby/typed-array
 	virtual/ruby-ssl"
 
-S="${WORKDIR}/${PN}"
+all_ruby_unpack() {
+	if [ "${PV}" = "9999" ];then
+		git-2_src_unpack
+	else
+		default
+	fi
+}
 
 each_ruby_install() {
 	exeinto /usr/share/mikutter
@@ -45,4 +56,6 @@ each_ruby_install() {
 	exeinto /usr/bin
 	doexe "${FILESDIR}"/mikutter
 	dodoc README
+	make_desktop_entry mikutter Mikutter \
+		/usr/share/mikutter/core/skin/data/icon.png
 }
diff --git a/net-misc/mikutter/mikutter-9999.ebuild b/net-misc/mikutter/mikutter-9999.ebuild
index 2b50b603a262..349b8b67716b 100644
--- a/net-misc/mikutter/mikutter-9999.ebuild
+++ b/net-misc/mikutter/mikutter-9999.ebuild
@@ -1,21 +1,23 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mikutter/mikutter-9999.ebuild,v 1.3 2011/12/18 01:03:30 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mikutter/mikutter-9999.ebuild,v 1.4 2013/03/31 13:15:44 naota Exp $
 
-EAPI=3
+EAPI=5
 
 USE_RUBY="ruby19"
 
-inherit ruby-ng
+inherit ruby-ng eutils
 
 if [ "${PV}" = "9999" ]; then
-	ESVN_REPO_URI="svn://toshia.dip.jp/mikutter/trunk"
-	inherit subversion
+	EGIT_REPO_URI="git://toshia.dip.jp/mikutter.git"
+	inherit git-2
 	KEYWORDS=""
+	EGIT_SOURCEDIR="${WORKDIR}/all"
 else
 	MY_P="${PN}.${PV}"
 	SRC_URI="http://mikutter.hachune.net/bin/${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
+	RUBY_S="${PN}"
 fi
 
 DESCRIPTION="mikutter is simple, powerful and moeful twitter client"
@@ -29,19 +31,24 @@ DEPEND=""
 RDEPEND="libnotify? ( x11-libs/libnotify )
 	sound? ( media-sound/alsa-utils )"
 
-ruby_add_rdepend "dev-ruby/ruby-gtk2
-	dev-ruby/rcairo
-	dev-ruby/httpclient
+ruby_add_rdepend "dev-ruby/addressable
+	dev-ruby/bsearch
+	dev-ruby/json
+	dev-ruby/memoize
+	>=dev-ruby/oauth-0.4.7
+	dev-ruby/ruby-gtk2
+	dev-ruby/typed-array
 	virtual/ruby-ssl"
 
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	cd "${WORKDIR}"
-	mv mikutter all
+all_ruby_unpack() {
+	if [ "${PV}" = "9999" ];then
+		git-2_src_unpack
+	else
+		default
+	fi
 }
 
-all_ruby_install() {
+each_ruby_install() {
 	exeinto /usr/share/mikutter
 	doexe mikutter.rb
 	insinto /usr/share/mikutter
@@ -49,4 +56,6 @@ all_ruby_install() {
 	exeinto /usr/bin
 	doexe "${FILESDIR}"/mikutter
 	dodoc README
+	make_desktop_entry mikutter Mikutter \
+		/usr/share/mikutter/core/skin/data/icon.png
 }