summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2007-06-13 23:03:04 +0000
committerMike Frysinger <vapier@gentoo.org>2007-06-13 23:03:04 +0000
commit1e94c5521754008ca17bf02943656f16c57c1469 (patch)
tree6570353161bf205dd84b0dd8f8616250fb5fdbdc /sys-apps/diffutils
parentVersion bump #181910 by Raul Porcel. (diff)
downloadhistorical-1e94c5521754008ca17bf02943656f16c57c1469.tar.gz
historical-1e94c5521754008ca17bf02943656f16c57c1469.tar.bz2
historical-1e94c5521754008ca17bf02943656f16c57c1469.zip
old
Diffstat (limited to 'sys-apps/diffutils')
-rw-r--r--sys-apps/diffutils/diffutils-2.8.4-r4.ebuild59
-rw-r--r--sys-apps/diffutils/diffutils-2.8.7-r1.ebuild57
-rw-r--r--sys-apps/diffutils/files/diffutils-2.8.4-Makefile-fix-typeo.patch24
-rw-r--r--sys-apps/diffutils/files/diffutils-2.8.4-no-manpage.patch37
-rw-r--r--sys-apps/diffutils/files/diffutils-2.8.4-tabsize-dumps-core.diff20
-rw-r--r--sys-apps/diffutils/files/digest-diffutils-2.8.4-r43
-rw-r--r--sys-apps/diffutils/files/digest-diffutils-2.8.7-r16
7 files changed, 0 insertions, 206 deletions
diff --git a/sys-apps/diffutils/diffutils-2.8.4-r4.ebuild b/sys-apps/diffutils/diffutils-2.8.4-r4.ebuild
deleted file mode 100644
index 2cdcd7edcb5a..000000000000
--- a/sys-apps/diffutils/diffutils-2.8.4-r4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/diffutils-2.8.4-r4.ebuild,v 1.22 2005/01/04 03:43:28 vapier Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Tools to make diffs and compare files"
-HOMEPAGE="http://www.gnu.org/software/diffutils/diffutils.html"
-SRC_URI="ftp://alpha.gnu.org/gnu/diffutils/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
-IUSE="nls static"
-
-RDEPEND="virtual/libc"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )"
-
-src_unpack() {
- unpack ${A}
- cd ${S}
-
- # Build fails with make -j5 or greater on pentium4. This is because
- # the jobs creating the opjects, which depend on paths.h is sheduled
- # at the same time paths.h is generated. This patch just fix a small
- # typeo that caused this. This closes bug #8934.
- # <azarah@gentoo.org> (14 Oct 2002)
- epatch ${FILESDIR}/${P}-Makefile-fix-typeo.patch
-
- # Removes waitpid() call after pclose() on piped diff stream, closing
- # bug #11728, thanks to D Wollmann <converter@dalnet-perl.org>
- epatch ${FILESDIR}/${P}-sdiff-no-waitpid.patch
-
- # --tabsize option, undocumented in diff but used in sdiff, makes
- # diff dump core, closing #24238.
- # <taviso@gentoo.org> (1 Aug 2003)
- epatch ${FILESDIR}/${P}-tabsize-dumps-core.diff
-
- # Make sure we don't try generating the manpages ... this requires
- # 'help2man' which is a perl app which is not available in a
- # stage2 / stage3 ... don't DEPEND on it or we get a DEPEND loop :(
- # for more info, see #55479
- touch man/*.1
-}
-
-src_compile() {
- econf $(use_enable nls) || die "econf"
- use static && append-ldflags -static
- emake LDFLAGS="${LDFLAGS}" || die "make"
-}
-
-src_install() {
- make install DESTDIR="${D}" || die
- dodoc ChangeLog NEWS README
-
- # use the manpage from 'sys-apps/man-pages'
- rm -f "${D}"/usr/share/man/man1/diff.1*
-}
diff --git a/sys-apps/diffutils/diffutils-2.8.7-r1.ebuild b/sys-apps/diffutils/diffutils-2.8.7-r1.ebuild
deleted file mode 100644
index 917de003f7e9..000000000000
--- a/sys-apps/diffutils/diffutils-2.8.7-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/diffutils-2.8.7-r1.ebuild,v 1.13 2007/02/28 22:19:35 genstef Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Tools to make diffs and compare files"
-HOMEPAGE="http://www.gnu.org/software/diffutils/diffutils.html"
-SRC_URI="ftp://alpha.gnu.org/gnu/diffutils/${P}.tar.gz
- mirror://gentoo/${P}-i18n.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="nls static"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- # Removes waitpid() call after pclose() on piped diff stream, closing
- # bug #11728, thanks to D Wollmann <converter@dalnet-perl.org>
- epatch "${FILESDIR}"/diffutils-2.8.4-sdiff-no-waitpid.patch
-
- # Fix utf8 support. Patch from MDK. #71689
- epatch "${WORKDIR}"/${P}-i18n.patch
-
- # Make sure we don't try generating the manpages ... this requires
- # 'help2man' which is a perl app which is not available in a
- # stage2 / stage3 ... don't DEPEND on it or we get a DEPEND loop :(
- # for more info, see #55479
- touch man/*.1
-
- # There's no reason for this crap to use the private version
- sed -i 's:__mempcpy:mempcpy:g' lib/*.c
-
- # Fix userpriv perm problems #76600
- chmod ug+w config/*
-}
-
-src_compile() {
- econf $(use_enable nls) || die "econf"
- use static && append-ldflags -static
- emake LDFLAGS="${LDFLAGS}" || die "make"
-}
-
-src_install() {
- make install DESTDIR="${D}" || die
- dodoc ChangeLog NEWS README
-
- # use the manpage from 'sys-apps/man-pages'
- rm -f "${D}"/usr/share/man/man1/diff.1*
-}
diff --git a/sys-apps/diffutils/files/diffutils-2.8.4-Makefile-fix-typeo.patch b/sys-apps/diffutils/files/diffutils-2.8.4-Makefile-fix-typeo.patch
deleted file mode 100644
index 75cf72b795e6..000000000000
--- a/sys-apps/diffutils/files/diffutils-2.8.4-Makefile-fix-typeo.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -urN diffutils-2.8.4/src/Makefile.am diffutils-2.8.4.azarah/src/Makefile.am
---- diffutils-2.8.4/src/Makefile.am 2002-06-17 07:55:42.000000000 +0200
-+++ diffutils-2.8.4.azarah/src/Makefile.am 2002-10-19 08:53:41.000000000 +0200
-@@ -37,7 +37,7 @@
-
- MOSTLYCLEANFILES = paths.h
-
--cmp.$(OBJEXT) diff3.$(OBJECT) diff.$(OBJECT) sdiff.$(OBJECT): paths.h
-+cmp.$(OBJEXT) diff3.$(OBJEXT) diff.$(OBJEXT) sdiff.$(OBJEXT): paths.h
- paths.h:
- (echo '#define DEFAULT_DIFF_PROGRAM "$(bindir)/'`echo diff|sed '$(transform)'`'"' && \
- echo '#define LOCALEDIR "$(localedir)"') >$@
-diff -urN diffutils-2.8.4/src/Makefile.in diffutils-2.8.4.azarah/src/Makefile.in
---- diffutils-2.8.4/src/Makefile.in 2002-06-28 09:04:20.000000000 +0200
-+++ diffutils-2.8.4.azarah/src/Makefile.in 2002-10-19 08:54:09.000000000 +0200
-@@ -410,7 +410,7 @@
- uninstall-binPROGRAMS uninstall-info-am
-
-
--cmp.$(OBJEXT) diff3.$(OBJECT) diff.$(OBJECT) sdiff.$(OBJECT): paths.h
-+cmp.$(OBJEXT) diff3.$(OBJEXT) diff.$(OBJEXT) sdiff.$(OBJEXT): paths.h
- paths.h:
- (echo '#define DEFAULT_DIFF_PROGRAM "$(bindir)/'`echo diff|sed '$(transform)'`'"' && \
- echo '#define LOCALEDIR "$(localedir)"') >$@
diff --git a/sys-apps/diffutils/files/diffutils-2.8.4-no-manpage.patch b/sys-apps/diffutils/files/diffutils-2.8.4-no-manpage.patch
deleted file mode 100644
index 03ea7be5f310..000000000000
--- a/sys-apps/diffutils/files/diffutils-2.8.4-no-manpage.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -urN diffutils-2.8.4.orig/man/Makefile.am diffutils-2.8.4/man/Makefile.am
---- diffutils-2.8.4.orig/man/Makefile.am 2002-03-10 20:53:34.000000000 -0800
-+++ diffutils-2.8.4/man/Makefile.am 2003-12-09 19:54:47.000000000 -0800
-@@ -17,12 +17,11 @@
- ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- ## 02111-1307, USA.
-
--dist_man_MANS = cmp.1 diff.1 diff3.1 sdiff.1
-+dist_man_MANS = cmp.1 diff3.1 sdiff.1
- MAINTAINERCLEANFILES = $(dist_man_MANS)
-
- S = $(top_srcdir)/src
- cmp.1: $S/cmp.c
--diff.1: $S/diff.c
- diff3.1: $S/diff3.c
- sdiff.1: $S/sdiff.c
-
-diff -urN diffutils-2.8.4.orig/man/Makefile.in diffutils-2.8.4/man/Makefile.in
---- diffutils-2.8.4.orig/man/Makefile.in 2002-06-28 00:04:58.000000000 -0700
-+++ diffutils-2.8.4/man/Makefile.in 2003-12-09 19:54:58.000000000 -0800
-@@ -108,7 +108,7 @@
- am__quote = @am__quote@
- install_sh = @install_sh@
-
--dist_man_MANS = cmp.1 diff.1 diff3.1 sdiff.1
-+dist_man_MANS = cmp.1 diff3.1 sdiff.1
- MAINTAINERCLEANFILES = $(dist_man_MANS)
-
- S = $(top_srcdir)/src
-@@ -282,7 +282,6 @@
- uninstall-info-am uninstall-man uninstall-man1
-
- cmp.1: $S/cmp.c
--diff.1: $S/diff.c
- diff3.1: $S/diff3.c
- sdiff.1: $S/sdiff.c
-
diff --git a/sys-apps/diffutils/files/diffutils-2.8.4-tabsize-dumps-core.diff b/sys-apps/diffutils/files/diffutils-2.8.4-tabsize-dumps-core.diff
deleted file mode 100644
index acc79f0bba8e..000000000000
--- a/sys-apps/diffutils/files/diffutils-2.8.4-tabsize-dumps-core.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-############################################################
-# Added by Tavis Ormandy <taviso@gentoo.org> 01/08/2003
-# Reproduce with
-#
-# $ diff --tabsize
-# Segmentation fault.
-#
-###############################
-diff -ruN diffutils-2.8.4.orig/src/diff.c diffutils-2.8.4/src/diff.c
---- diffutils-2.8.4.orig/src/diff.c 2002-06-17 06:55:42.000000000 +0100
-+++ diffutils-2.8.4/src/diff.c 2003-08-01 17:51:58.000000000 +0100
-@@ -234,7 +234,7 @@
- {"starting-file", 1, 0, 'S'},
- {"strip-trailing-cr", 0, 0, STRIP_TRAILING_CR_OPTION},
- {"suppress-common-lines", 0, 0, SUPPRESS_COMMON_LINES_OPTION},
-- {"tabsize", 0, 0, TABSIZE_OPTION},
-+ {"tabsize", 1, 0, TABSIZE_OPTION},
- {"text", 0, 0, 'a'},
- {"to-file", 1, 0, TO_FILE_OPTION},
- {"unchanged-group-format", 1, 0, UNCHANGED_GROUP_FORMAT_OPTION},
diff --git a/sys-apps/diffutils/files/digest-diffutils-2.8.4-r4 b/sys-apps/diffutils/files/digest-diffutils-2.8.4-r4
deleted file mode 100644
index 89d0060b9f70..000000000000
--- a/sys-apps/diffutils/files/digest-diffutils-2.8.4-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a9c028579abc79ecd6842d60a13abf1d diffutils-2.8.4.tar.gz 828766
-RMD160 dafa1a85496b382f7ce1ebd870348680d2dee8e4 diffutils-2.8.4.tar.gz 828766
-SHA256 06e46e297381e08b8fd9ed0b2e2cfb52e63de41fc4f3566adc69341d13d18227 diffutils-2.8.4.tar.gz 828766
diff --git a/sys-apps/diffutils/files/digest-diffutils-2.8.7-r1 b/sys-apps/diffutils/files/digest-diffutils-2.8.7-r1
deleted file mode 100644
index 90aa20a30302..000000000000
--- a/sys-apps/diffutils/files/digest-diffutils-2.8.7-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 406c758a923f531f350edb82423aef56 diffutils-2.8.7-i18n.patch.bz2 4388
-RMD160 c1d8640f86e2362551d1e94893f7f0079839fa75 diffutils-2.8.7-i18n.patch.bz2 4388
-SHA256 a6a8f47d75ea9e61a0b9dba45f4a85bf1d54572c191bb7ad9e0cb7e8edd867c0 diffutils-2.8.7-i18n.patch.bz2 4388
-MD5 18d6587cb915e7aa110a5d463d6ed156 diffutils-2.8.7.tar.gz 1057977
-RMD160 389518f9008e56a283884809d7abac4b3cb8edce diffutils-2.8.7.tar.gz 1057977
-SHA256 53d9c10830ac322c00dfcccf60d961014e767da86d2c802ccc5cbad7e7aea07c diffutils-2.8.7.tar.gz 1057977