Version bump.

(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key B427ABC8)

4 files changed, 35 insertions, 41 deletions

diff --git a/app-portage/gentoolkit-dev/ChangeLog b/app-portage/gentoolkit-dev/ChangeLog
index 0834b50d6e2e..194227280256 100644
--- a/app-portage/gentoolkit-dev/ChangeLog
+++ b/app-portage/gentoolkit-dev/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-portage/gentoolkit-dev
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/ChangeLog,v 1.117 2013/05/10 22:54:23 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/ChangeLog,v 1.118 2013/05/11 22:02:22 idl0r Exp $
+
+*gentoolkit-dev-0.2.8.3 (11 May 2013)
+
+  11 May 2013; Christian Ruppert <idl0r@gentoo.org>
+  -gentoolkit-dev-0.2.8.2.ebuild, +gentoolkit-dev-0.2.8.3.ebuild,
+  +files/gentoolkit-dev-0.2.8.3-tests.patch, -files/echangelog_test.patch:
+  Version bump.
 
   10 May 2013; Christian Ruppert <idl0r@gentoo.org>
   gentoolkit-dev-0.2.8.2.ebuild, gentoolkit-dev-9999.ebuild,
diff --git a/app-portage/gentoolkit-dev/files/echangelog_test.patch b/app-portage/gentoolkit-dev/files/echangelog_test.patch
deleted file mode 100644
index 7109f5c2174a..000000000000
--- a/app-portage/gentoolkit-dev/files/echangelog_test.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 84321cc30126edc9a3fe51458a251b06fddce1ca Mon Sep 17 00:00:00 2001
-From: Wang Jiajun <Amesists@gmail.com>
-Date: Sat, 11 May 2013 00:46:25 +0200
-Subject: [PATCH] Fix bug #454782 by config the user name and email
-
----
- src/echangelog/test/test.sh | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/echangelog/test/test.sh b/src/echangelog/test/test.sh
-index 74d815f..0559113 100755
---- a/src/echangelog/test/test.sh
-+++ b/src/echangelog/test/test.sh
-@@ -12,7 +12,8 @@ _ROOT=$(pwd)
- unset GENTOO_AUTHOR_NAME GENTOO_AUTHOR_EMAIL \
- 	GENTOO_COMMITTER_NAME GENTOO_COMMITTER_EMAIL
- 
--export ECHANGELOG_USER="Just a test <echangelogtest@gentoo.org>"
-+export GENTOO_COMMITTER_NAME="Just a test"
-+export GENTOO_COMMITTER_EMAIL="echangelogtest@gentoo.org"
- 
- MD5_INIT="21ac109c53cf02378593a4f613b2bb55"
- MD5_PATCH="f3fa1cacae3bf51d6188278e6a5fd0c6"
-@@ -56,6 +57,11 @@ make_test() {
- 
- 	if [ "${vcs}" = "git" ]; then
- 		git init
-+
-+		# bug 454782
-+		git config user.name "${GENTOO_COMMITTER_NAME}"
-+		git config user.email "${GENTOO_COMMITTER_EMAIL}"
-+
- 		touch .gitignore
- 		git add .gitignore
- 		git commit -a -m 'Initial Commit'
--- 
-1.8.1.5
-
diff --git a/app-portage/gentoolkit-dev/files/gentoolkit-dev-0.2.8.3-tests.patch b/app-portage/gentoolkit-dev/files/gentoolkit-dev-0.2.8.3-tests.patch
new file mode 100644
index 000000000000..533491d76897
--- /dev/null
+++ b/app-portage/gentoolkit-dev/files/gentoolkit-dev-0.2.8.3-tests.patch
@@ -0,0 +1,25 @@
+From 2da4232cfd9597b829dda4bcfbf3aab25f243950 Mon Sep 17 00:00:00 2001
+From: Christian Ruppert <idl0r@gentoo.org>
+Date: Sat, 11 May 2013 23:56:25 +0200
+Subject: [PATCH] Fix echangelog test
+
+---
+ src/echangelog/test/test.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/echangelog/test/test.sh b/src/echangelog/test/test.sh
+index 0559113..53bb0b5 100755
+--- a/src/echangelog/test/test.sh
++++ b/src/echangelog/test/test.sh
+@@ -160,7 +160,7 @@ ebegin "Preparing echangelog"
+ 
+ if [ -e "../echangelog" ]; then
+ 	cp ../echangelog "${_ROOT}/tmp" || set $?
+-	sed -i -e 's:use POSIX qw.*:use POSIX qw(setlocale getcwd);\nuse TEST qw(strftime);:' "${_ROOT}/tmp/echangelog" || set $?
++	sed -i -e 's:use POSIX qw.*:use POSIX qw(locale_h setlocale getcwd);\nuse TEST qw(strftime);:' "${_ROOT}/tmp/echangelog" || set $?
+ 	eend ${1:-0} || exit ${1}
+ else
+ 	eerror "error"
+-- 
+1.8.1.5
+
diff --git a/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.2.ebuild b/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.3.ebuild
index 1ab933349218..fa7dc18f73f1 100644
--- a/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.2.ebuild
+++ b/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.2.ebuild,v 1.2 2013/05/10 22:54:23 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.3.ebuild,v 1.1 2013/05/11 22:02:22 idl0r Exp $
 
 EAPI="5"
 
@@ -24,7 +24,7 @@ RDEPEND="sys-apps/portage
 	sys-apps/diffutils"
 
 src_prepare() {
-	epatch "${FILESDIR}/echangelog_test.patch"
+	epatch "${FILESDIR}/${P}-tests.patch"
 }
 
 src_test() {