Version bump. Removed old

(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

4 files changed, 30 insertions, 63 deletions

diff --git a/app-text/dos2unix/ChangeLog b/app-text/dos2unix/ChangeLog
index 79d42c263121..bd762508e734 100644
--- a/app-text/dos2unix/ChangeLog
+++ b/app-text/dos2unix/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/dos2unix
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/ChangeLog,v 1.152 2015/01/15 10:47:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/ChangeLog,v 1.153 2015/02/16 21:05:23 polynomial-c Exp $
+
+*dos2unix-7.2 (16 Feb 2015)
+
+  16 Feb 2015; Lars Wendler <polynomial-c@gentoo.org> -dos2unix-6.0.3.ebuild,
+  -dos2unix-7.0.ebuild, +dos2unix-7.2.ebuild,
+  +files/dos2unix-7.2-gb18030-test.patch:
+  Version bump. Removed old.
 
   15 Jan 2015; Raúl Porcel <armin76@gentoo.org> dos2unix-6.0.6.ebuild:
   ia64/s390/sh/sparc/x86 stable wrt #522520
diff --git a/app-text/dos2unix/dos2unix-6.0.3.ebuild b/app-text/dos2unix/dos2unix-6.0.3.ebuild
deleted file mode 100644
index 5e9db9facafe..000000000000
--- a/app-text/dos2unix/dos2unix-6.0.3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-6.0.3.ebuild,v 1.13 2013/03/15 15:13:01 jer Exp $
-
-EAPI=4
-
-inherit toolchain-funcs
-
-DESCRIPTION="Convert DOS or MAC text files to UNIX format or vice versa"
-HOMEPAGE="http://www.xs4all.nl/~waterlan/dos2unix.html http://sourceforge.net/projects/dos2unix/"
-SRC_URI="
-	http://www.xs4all.nl/~waterlan/${PN}/${P}.tar.gz
-	mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
-IUSE="debug nls"
-
-RDEPEND="
-	!app-text/hd2u
-	!app-text/unix2dos
-	virtual/libintl"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-	dev-lang/perl"
-
-src_prepare() {
-	sed \
-		-e '/^LDFLAGS/s|=|+=|' \
-		-e '/^CC/s|=|?=|' \
-		-e '/CFLAGS_OS \+=/d' \
-		-e '/LDFLAGS_EXTRA \+=/d' \
-		-e "/^CFLAGS/s|-O2|${CFLAGS}|" \
-		-i Makefile || die
-
-	if use debug ; then
-		sed -e "/^DEBUG/s:0:1:" \
-			-e "/EXTRA_CFLAGS +=/s:-g::" \
-			-i Makefile || die
-	fi
-
-	tc-export CC
-}
-
-lintl() {
-	# same logic as from virtual/libintl
-	use !elibc_glibc && use !elibc_uclibc && echo "-lintl"
-}
-
-src_compile() {
-	emake prefix="${EPREFIX}/usr" \
-		$(use nls && echo "LDFLAGS_EXTRA=$(lintl)" || echo "ENABLE_NLS=")
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
-		$(use nls || echo "ENABLE_NLS=") install
-}
diff --git a/app-text/dos2unix/dos2unix-7.0.ebuild b/app-text/dos2unix/dos2unix-7.2.ebuild
index 2bfacaa058c2..e6d9ca4a20ae 100644
--- a/app-text/dos2unix/dos2unix-7.0.ebuild
+++ b/app-text/dos2unix/dos2unix-7.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-7.0.ebuild,v 1.1 2014/09/11 05:20:14 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-7.2.ebuild,v 1.1 2015/02/16 21:05:23 polynomial-c Exp $
 
 EAPI=5
 
@@ -28,6 +28,8 @@ DEPEND="
 	dev-lang/perl"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-gb18030-test.patch
+
 	sed \
 		-e '/^LDFLAGS/s|=|+=|' \
 		-e '/CFLAGS_OS \+=/d' \
diff --git a/app-text/dos2unix/files/dos2unix-7.2-gb18030-test.patch b/app-text/dos2unix/files/dos2unix-7.2-gb18030-test.patch
new file mode 100644
index 000000000000..a454f0ff0f97
--- /dev/null
+++ b/app-text/dos2unix/files/dos2unix-7.2-gb18030-test.patch
@@ -0,0 +1,18 @@
+diff -r -N -u dos2unix-7.2.orig/test/Makefile dos2unix-7.2/test/Makefile
+--- dos2unix-7.2.orig/test/Makefile	2014-12-26 23:53:46.000000000 +0100
++++ dos2unix-7.2/test/Makefile	2015-02-16 13:05:52.829468088 +0100
+@@ -2,12 +2,10 @@
+ 
+ d2u_os=$(shell uname -s)
+ 
+-# GB18030 test is not working on Cygwin and MSYS. They do not support zh_CN.GB18030 locale.
+-ifeq ($(findstring CYGWIN,$(d2u_os)),)
+-ifeq ($(findstring MSYS,$(d2u_os)),)
++# Checking WIN32 version in MSYS shell.
++ifeq ($(findstring MINGW,$(d2u_os)),MINGW)
+ TESTS += gb18030.t
+ endif
+-endif
+ 
+ # Windows version does not support symlinks like the Unix version.
+ ifneq ($(findstring MINGW,$(d2u_os)),MINGW)