summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2008-09-16 12:04:34 +0000
committerPeter Volkov <pva@gentoo.org>2008-09-16 12:04:34 +0000
commit15325ee51d561ef79ae7e4254047dc4e831c1832 (patch)
treec14e4f6b371c35d770fec12b385c7fc5b70b34fc /app-text/dos2unix
parentBump to be in line with upstream (diff)
downloadgentoo-2-15325ee51d561ef79ae7e4254047dc4e831c1832.tar.gz
gentoo-2-15325ee51d561ef79ae7e4254047dc4e831c1832.tar.bz2
gentoo-2-15325ee51d561ef79ae7e4254047dc4e831c1832.zip
Use toolchain-funcs to set correct compiler, fix compilation warnings, bug #237456, thank Toralf Förster for report.
(Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo i686)
Diffstat (limited to 'app-text/dos2unix')
-rw-r--r--app-text/dos2unix/ChangeLog8
-rw-r--r--app-text/dos2unix/dos2unix-3.1-r2.ebuild15
2 files changed, 17 insertions, 6 deletions
diff --git a/app-text/dos2unix/ChangeLog b/app-text/dos2unix/ChangeLog
index 06eb65d06dc1..ac10ac64bdf9 100644
--- a/app-text/dos2unix/ChangeLog
+++ b/app-text/dos2unix/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-text/dos2unix
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/ChangeLog,v 1.37 2007/09/29 08:02:28 pva Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/ChangeLog,v 1.38 2008/09/16 12:04:34 pva Exp $
+
+ 16 Sep 2008; Peter Volkov <pva@gentoo.org> dos2unix-3.1-r2.ebuild:
+ Use toolchain-funcs to set correct compiler, fix compilation warnings, bug
+ #237456, thank Toralf Förster for report.
29 Sep 2007; <pva@gentoo.org> -dos2unix-3.1-r1.ebuild:
Remove old.
diff --git a/app-text/dos2unix/dos2unix-3.1-r2.ebuild b/app-text/dos2unix/dos2unix-3.1-r2.ebuild
index 3785b67057be..f03462421a2c 100644
--- a/app-text/dos2unix/dos2unix-3.1-r2.ebuild
+++ b/app-text/dos2unix/dos2unix-3.1-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-3.1-r2.ebuild,v 1.11 2007/09/28 06:49:50 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-3.1-r2.ebuild,v 1.12 2008/09/16 12:04:34 pva Exp $
-inherit eutils
+inherit eutils toolchain-funcs
DESCRIPTION="Dos2unix converts DOS or MAC text files to UNIX format"
HOMEPAGE="none"
@@ -26,7 +26,14 @@ src_unpack() {
epatch "${FILESDIR}"/${P}-manpage-update.patch
epatch "${FILESDIR}"/${P}-safeconv.patch
epatch "${FILESDIR}"/${P}-workaround-rename-EXDEV.patch
- make -s clean || die
+ sed -i -e 's:\(^#endif \).*:\1:' \
+ -e 's:\(^#else \).*:\1:' dos2unix.c dos2unix.h
+ rm -f dos2unix mac2unix mac2unix.1 *~ *.orig core
+}
+
+src_compile() {
+ tc-export CC
+ emake || die
}
src_install() {