version bump; clean up old ebuilds.

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

9 files changed, 33 insertions, 282 deletions

diff --git a/net-misc/mikutter/ChangeLog b/net-misc/mikutter/ChangeLog
index ceec5ebf1755..054c37984ca8 100644
--- a/net-misc/mikutter/ChangeLog
+++ b/net-misc/mikutter/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/mikutter
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mikutter/ChangeLog,v 1.41 2014/03/22 08:29:28 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mikutter/ChangeLog,v 1.42 2014/06/11 07:57:38 naota Exp $
+
+*mikutter-3.0.0 (11 Jun 2014)
+
+  11 Jun 2014; Naohiro Aota <naota@gentoo.org> +mikutter-3.0.0.ebuild,
+  -files/mikutter-0.2.2.1430-cairo.patch, -mikutter-0.2.1.1141.ebuild,
+  -mikutter-0.2.2.1328.ebuild, -mikutter-0.2.2.1410.ebuild,
+  -mikutter-0.2.2.1430.ebuild, -mikutter-0.2.2.1476.ebuild,
+  mikutter-0.2.2.1537.ebuild, mikutter-9999.ebuild:
+  version bump; clean up old ebuilds.
 
 *mikutter-0.2.2.1537 (22 Mar 2014)
 
diff --git a/net-misc/mikutter/files/mikutter-0.2.2.1430-cairo.patch b/net-misc/mikutter/files/mikutter-0.2.2.1430-cairo.patch
deleted file mode 100644
index 195471e25757..000000000000
--- a/net-misc/mikutter/files/mikutter-0.2.2.1430-cairo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/Gemfile b/Gemfile
-index 320c73c..a15b392 100644
---- a/Gemfile
-+++ b/Gemfile
-@@ -8,6 +8,7 @@ group :default do
-   gem 'memoize'
-   gem 'ruby-hmac'
-   gem 'typed-array'
-+  gem 'cairo'
- end
- 
- group :test do
diff --git a/net-misc/mikutter/mikutter-0.2.1.1141.ebuild b/net-misc/mikutter/mikutter-0.2.1.1141.ebuild
deleted file mode 100644
index 959b0c0e04fa..000000000000
--- a/net-misc/mikutter/mikutter-0.2.1.1141.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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.1141.ebuild,v 1.1 2013/03/31 13:15:44 naota Exp $
-
-EAPI=5
-
-USE_RUBY="ruby19"
-
-inherit ruby-ng eutils
-
-if [ "${PV}" = "9999" ]; then
-	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"
-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/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"
-
-all_ruby_unpack() {
-	if [ "${PV}" = "9999" ];then
-		git-2_src_unpack
-	else
-		default
-	fi
-}
-
-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
-	make_desktop_entry mikutter Mikutter \
-		/usr/share/mikutter/core/skin/data/icon.png
-}
diff --git a/net-misc/mikutter/mikutter-0.2.2.1328.ebuild b/net-misc/mikutter/mikutter-0.2.2.1328.ebuild
deleted file mode 100644
index c57a0a4ef417..000000000000
--- a/net-misc/mikutter/mikutter-0.2.2.1328.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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.2.1328.ebuild,v 1.1 2013/09/06 08:34:13 naota Exp $
-
-EAPI=5
-
-USE_RUBY="ruby19"
-
-inherit ruby-ng eutils
-
-if [ "${PV}" = "9999" ]; then
-	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"
-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/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"
-
-all_ruby_unpack() {
-	if [ "${PV}" = "9999" ];then
-		git-2_src_unpack
-	else
-		default
-	fi
-}
-
-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
-	make_desktop_entry mikutter Mikutter \
-		/usr/share/mikutter/core/skin/data/icon.png
-}
diff --git a/net-misc/mikutter/mikutter-0.2.2.1410.ebuild b/net-misc/mikutter/mikutter-0.2.2.1410.ebuild
deleted file mode 100644
index 0d9d0e5ea7b7..000000000000
--- a/net-misc/mikutter/mikutter-0.2.2.1410.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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.2.1410.ebuild,v 1.2 2013/11/18 06:16:52 naota Exp $
-
-EAPI=5
-
-USE_RUBY="ruby19"
-
-inherit ruby-ng eutils
-
-if [ "${PV}" = "9999" ]; then
-	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"
-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/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"
-
-all_ruby_unpack() {
-	if [ "${PV}" = "9999" ];then
-		git-2_src_unpack
-	else
-		default
-	fi
-}
-
-each_ruby_install() {
-	exeinto /usr/share/mikutter
-	doexe mikutter.rb
-	insinto /usr/share/mikutter
-	doins -r core plugin Gemfile
-	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-0.2.2.1430.ebuild b/net-misc/mikutter/mikutter-0.2.2.1430.ebuild
deleted file mode 100644
index 6075c7730ac2..000000000000
--- a/net-misc/mikutter/mikutter-0.2.2.1430.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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.2.1430.ebuild,v 1.1 2013/12/25 21:32:59 naota Exp $
-
-EAPI=5
-
-USE_RUBY="ruby19"
-
-inherit ruby-ng eutils
-
-if [ "${PV}" = "9999" ]; then
-	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"
-	RUBY_S="${PN}"
-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/addressable
-	dev-ruby/bsearch
-	dev-ruby/json
-	dev-ruby/json_pure
-	dev-ruby/memoize
-	>=dev-ruby/oauth-0.4.7
-	dev-ruby/rcairo
-	>=dev-ruby/ruby-gtk2-2.0.2
-	dev-ruby/ruby-hmac
-	dev-ruby/typed-array
-	virtual/ruby-ssl"
-
-RUBY_PATCHES=( "${FILESDIR}"/${P}-cairo.patch )
-
-all_ruby_unpack() {
-	if [ "${PV}" = "9999" ];then
-		git-2_src_unpack
-	else
-		default
-	fi
-}
-
-each_ruby_install() {
-	exeinto /usr/share/mikutter
-	doexe mikutter.rb
-	insinto /usr/share/mikutter
-	doins -r core plugin Gemfile
-	exeinto /usr/bin
-	doexe "${FILESDIR}"/mikutter
-	dodoc README
-	make_desktop_entry mikutter Mikutter \
-		/usr/share/mikutter/core/skin/data/icon.png
-
-	cd "${ED}"usr/share/mikutter
-	"${RUBY}" -S bundle install --local || die
-}
diff --git a/net-misc/mikutter/mikutter-0.2.2.1537.ebuild b/net-misc/mikutter/mikutter-0.2.2.1537.ebuild
index 657854bbc61f..a69fdde70dff 100644
--- a/net-misc/mikutter/mikutter-0.2.2.1537.ebuild
+++ b/net-misc/mikutter/mikutter-0.2.2.1537.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mikutter/mikutter-0.2.2.1537.ebuild,v 1.1 2014/03/22 08:29:28 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mikutter/mikutter-0.2.2.1537.ebuild,v 1.2 2014/06/11 07:57:38 naota Exp $
 
 EAPI=5
 
@@ -42,10 +42,9 @@ ruby_add_rdepend "dev-ruby/addressable
 	dev-ruby/ruby-hmac
 	dev-ruby/typed-array
 	virtual/ruby-ssl"
-ruby_add_bdepend "dev-ruby/bundler"
 
 RUBY_PATCHES=(
-	"${FILESDIR}"/${P}-disable-bundler.patch
+	"${FILESDIR}"/${PN}-0.2.2.1537-disable-bundler.patch
 )
 
 all_ruby_unpack() {
@@ -60,7 +59,7 @@ each_ruby_install() {
 	exeinto /usr/share/mikutter
 	doexe mikutter.rb
 	insinto /usr/share/mikutter
-	doins -r core plugin Gemfile
+	doins -r core plugin
 	exeinto /usr/bin
 	doexe "${FILESDIR}"/mikutter
 	dodoc README
diff --git a/net-misc/mikutter/mikutter-0.2.2.1476.ebuild b/net-misc/mikutter/mikutter-3.0.0.ebuild
index e3b51f3f121c..e78d7425755d 100644
--- a/net-misc/mikutter/mikutter-0.2.2.1476.ebuild
+++ b/net-misc/mikutter/mikutter-3.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mikutter/mikutter-0.2.2.1476.ebuild,v 1.1 2014/01/16 09:03:58 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mikutter/mikutter-3.0.0.ebuild,v 1.1 2014/06/11 07:57:38 naota Exp $
 
 EAPI=5
 
@@ -33,18 +33,20 @@ RDEPEND="libnotify? ( x11-libs/libnotify )
 
 ruby_add_rdepend "dev-ruby/addressable
 	dev-ruby/bsearch
+	dev-ruby/delayer
 	dev-ruby/json
-	dev-ruby/json_pure
 	dev-ruby/memoize
 	>=dev-ruby/oauth-0.4.7
 	dev-ruby/rcairo
-	>=dev-ruby/ruby-gtk2-2.1.0
+	>=dev-ruby/ruby-gettext-3.0.1
+	>=dev-ruby/ruby-gtk2-2.2.0
 	dev-ruby/ruby-hmac
 	dev-ruby/typed-array
 	virtual/ruby-ssl"
-ruby_add_bdepend "dev-ruby/bundler"
 
-RUBY_PATCHES=( "${FILESDIR}"/${PN}-0.2.2.1430-cairo.patch )
+RUBY_PATCHES=(
+	"${FILESDIR}"/${PN}-0.2.2.1537-disable-bundler.patch
+)
 
 all_ruby_unpack() {
 	if [ "${PV}" = "9999" ];then
@@ -58,13 +60,10 @@ each_ruby_install() {
 	exeinto /usr/share/mikutter
 	doexe mikutter.rb
 	insinto /usr/share/mikutter
-	doins -r core plugin Gemfile
+	doins -r core plugin
 	exeinto /usr/bin
 	doexe "${FILESDIR}"/mikutter
 	dodoc README
 	make_desktop_entry mikutter Mikutter \
 		/usr/share/mikutter/core/skin/data/icon.png
-
-	cd "${ED}"usr/share/mikutter
-	"${RUBY}" -S bundle install --local || die
 }
diff --git a/net-misc/mikutter/mikutter-9999.ebuild b/net-misc/mikutter/mikutter-9999.ebuild
index 349b8b67716b..d4370c761955 100644
--- a/net-misc/mikutter/mikutter-9999.ebuild
+++ b/net-misc/mikutter/mikutter-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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.4 2013/03/31 13:15:44 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mikutter/mikutter-9999.ebuild,v 1.5 2014/06/11 07:57:38 naota Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ if [ "${PV}" = "9999" ]; then
 else
 	MY_P="${PN}.${PV}"
 	SRC_URI="http://mikutter.hachune.net/bin/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64"
 	RUBY_S="${PN}"
 fi
 
@@ -33,13 +33,21 @@ RDEPEND="libnotify? ( x11-libs/libnotify )
 
 ruby_add_rdepend "dev-ruby/addressable
 	dev-ruby/bsearch
+	dev-ruby/delayer
 	dev-ruby/json
 	dev-ruby/memoize
 	>=dev-ruby/oauth-0.4.7
-	dev-ruby/ruby-gtk2
+	dev-ruby/rcairo
+	>=dev-ruby/ruby-gettext-3.0.1
+	>=dev-ruby/ruby-gtk2-2.2.0
+	dev-ruby/ruby-hmac
 	dev-ruby/typed-array
 	virtual/ruby-ssl"
 
+RUBY_PATCHES=(
+	"${FILESDIR}"/${PN}-0.2.2.1537-disable-bundler.patch
+)
+
 all_ruby_unpack() {
 	if [ "${PV}" = "9999" ];then
 		git-2_src_unpack