summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2011-02-02 08:52:12 +0000
committerLars Wendler <polynomial-c@gentoo.org>2011-02-02 08:52:12 +0000
commitbf10545ca478fde39181f56b7a0a2da63dee1c50 (patch)
tree785597b20180582b6b9f9562f140930215c7e496 /app-text/dos2unix
parentVersion bump for security bug #353475. (diff)
downloadgentoo-2-bf10545ca478fde39181f56b7a0a2da63dee1c50.tar.gz
gentoo-2-bf10545ca478fde39181f56b7a0a2da63dee1c50.tar.bz2
gentoo-2-bf10545ca478fde39181f56b7a0a2da63dee1c50.zip
Don't create a pdf file from the man page (bug #353483)
(Portage version: 2.2.0_alpha19/cvs/Linux x86_64)
Diffstat (limited to 'app-text/dos2unix')
-rw-r--r--app-text/dos2unix/ChangeLog8
-rw-r--r--app-text/dos2unix/dos2unix-5.2.ebuild6
-rw-r--r--app-text/dos2unix/files/dos2unix-5.2-makefile.patch21
3 files changed, 32 insertions, 3 deletions
diff --git a/app-text/dos2unix/ChangeLog b/app-text/dos2unix/ChangeLog
index 0d4d8b2aca6c..00814f214416 100644
--- a/app-text/dos2unix/ChangeLog
+++ b/app-text/dos2unix/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-text/dos2unix
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/ChangeLog,v 1.59 2011/02/01 19:24:13 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/ChangeLog,v 1.60 2011/02/02 08:52:12 polynomial-c Exp $
+
+ 02 Feb 2011; Lars Wendler <polynomial-c@gentoo.org> dos2unix-5.2.ebuild,
+ +files/dos2unix-5.2-makefile.patch:
+ non-maintainer commit: Don't create a pdf file from the man page as this
+ would require ghostscript as build dependency. Thanks to Cédric Jeanneret
+ who reported this in bug #353483.
*dos2unix-5.2 (01 Feb 2011)
diff --git a/app-text/dos2unix/dos2unix-5.2.ebuild b/app-text/dos2unix/dos2unix-5.2.ebuild
index b00b93584c33..edec9f4977e5 100644
--- a/app-text/dos2unix/dos2unix-5.2.ebuild
+++ b/app-text/dos2unix/dos2unix-5.2.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-5.2.ebuild,v 1.1 2011/02/01 19:24:13 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-5.2.ebuild,v 1.2 2011/02/02 08:52:12 polynomial-c Exp $
EAPI="3"
-inherit toolchain-funcs
+inherit eutils 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/"
@@ -24,6 +24,8 @@ RDEPEND="
!app-text/unix2dos"
src_prepare() {
+ epatch "${FILESDIR}"/${PN}-5.2-makefile.patch
+
sed \
-e '/^LDFLAGS/s|=|+=|' \
-e '/^CC/s|=|?=|' \
diff --git a/app-text/dos2unix/files/dos2unix-5.2-makefile.patch b/app-text/dos2unix/files/dos2unix-5.2-makefile.patch
new file mode 100644
index 000000000000..a3dbe2a92cbd
--- /dev/null
+++ b/app-text/dos2unix/files/dos2unix-5.2-makefile.patch
@@ -0,0 +1,21 @@
+--- dos2unix-5.2/Makefile
++++ dos2unix-5.2/Makefile
+@@ -77,7 +77,7 @@
+ MOFILES = $(DOS2UNIX_MOFILES) $(UNIX2DOS_MOFILES)
+ endif
+
+-DOCFILES = $(PACKAGE).txt $(PACKAGE).ps $(PACKAGE).pdf $(PACKAGE).htm
++DOCFILES = $(PACKAGE).txt $(PACKAGE).ps $(PACKAGE).htm
+ INSTALL_OBJS_DOC = README.txt NEWS.txt ChangeLog.txt COPYING.txt TODO.txt BUGS.txt $(DOCFILES)
+
+ #PODFILES = man/man1/dos2unix.pod $(wildcard man/*/man1/dos2unix.pod)
+@@ -246,9 +246,6 @@
+ %.ps : man/man1/%.1
+ groff -man $< -T ps > $@
+
+-%.pdf: %.ps
+- ps2pdf $< $@
+-
+ %.htm : man/man1/%.pod
+ pod2html --title="$(PACKAGE) $(DOS2UNIX_VERSION) - DOS/MAC to UNIX and vice versa text file format converter" $< > $@
+