summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2010-10-14 18:33:54 +0000
committerMike Frysinger <vapier@gentoo.org>2010-10-14 18:33:54 +0000
commit4619cccdb7f48ea43ed760a70975e79a8ab84494 (patch)
treea2b58ce23842740ab34ac0a1868ed174103a9e02 /sys-apps
parentstable ppc, bug 330519 (diff)
downloadgentoo-2-4619cccdb7f48ea43ed760a70975e79a8ab84494.tar.gz
gentoo-2-4619cccdb7f48ea43ed760a70975e79a8ab84494.tar.bz2
gentoo-2-4619cccdb7f48ea43ed760a70975e79a8ab84494.zip
old
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/sed/files/sed-4.1.4-makeinfo-c-locale.patch18
-rw-r--r--sys-apps/sed/files/sed-4.1.5-prototypes.patch10
-rw-r--r--sys-apps/sed/sed-4.1.5-r1.ebuild74
3 files changed, 0 insertions, 102 deletions
diff --git a/sys-apps/sed/files/sed-4.1.4-makeinfo-c-locale.patch b/sys-apps/sed/files/sed-4.1.4-makeinfo-c-locale.patch
deleted file mode 100644
index ede6dc8e30bf..000000000000
--- a/sys-apps/sed/files/sed-4.1.4-makeinfo-c-locale.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Running makeinfo on sed.texi in some locales can cause
-problems (probably due to range matching not being the
-same). So we force the C locale and just take the lazy
-way out.
-
-http://bugs.gentoo.org/show_bug.cgi?id=83984
-
---- doc/Makefile.in
-+++ doc/Makefile.in
-@@ -615,7 +615,7 @@
-
- @MAKEINFO_HTML_TRUE@sed.html: sed.texi sed.info
- @MAKEINFO_HTML_TRUE@ builddir=`pwd` && cd $(srcdir) && \
--@MAKEINFO_HTML_TRUE@ $(MAKEINFO) --html --no-split -o $$builddir/sed.html sed.texi
-+@MAKEINFO_HTML_TRUE@ LC_ALL="C" $(MAKEINFO) --html --no-split -o $$builddir/sed.html sed.texi
-
- @MAKEINFO_HTML_TRUE@html: sed.html
-
diff --git a/sys-apps/sed/files/sed-4.1.5-prototypes.patch b/sys-apps/sed/files/sed-4.1.5-prototypes.patch
deleted file mode 100644
index d82ee5f6c98b..000000000000
--- a/sys-apps/sed/files/sed-4.1.5-prototypes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/utils.c.orig 2008-01-29 19:23:27.000000000 -0500
-+++ lib/utils.c 2008-01-29 19:23:37.000000000 -0500
-@@ -19,6 +19,7 @@
- #include "config.h"
-
- #include <stdio.h>
-+#include <unistd.h>
-
- #include <errno.h>
- #ifndef errno
diff --git a/sys-apps/sed/sed-4.1.5-r1.ebuild b/sys-apps/sed/sed-4.1.5-r1.ebuild
deleted file mode 100644
index e09ec38cad3d..000000000000
--- a/sys-apps/sed/sed-4.1.5-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/sed-4.1.5-r1.ebuild,v 1.7 2008/06/22 15:26:11 vapier Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Super-useful stream editor"
-HOMEPAGE="http://sed.sourceforge.net/"
-SRC_URI="mirror://gnu/sed/${P}.tar.gz"
-
-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="nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )"
-
-src_bootstrap_sed() {
- # make sure system-sed works #40786
- export NO_SYS_SED=""
- if ! type -p sed > /dev/null ; then
- NO_SYS_SED="!!!"
- ./bootstrap.sh || die "couldnt bootstrap"
- cp sed/sed "${T}"/ || die "couldnt copy"
- export PATH="${PATH}:${T}"
- make clean || die "couldnt clean"
- fi
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${PN}-4.1.4-makeinfo-c-locale.patch
- epatch "${FILESDIR}"/${P}-alloca.patch
- epatch "${FILESDIR}"/${P}-prototypes.patch
- # don't use sed here if we have to recover a broken host sed
-}
-
-src_compile() {
- src_bootstrap_sed
- # make sure all sed operations here are repeatable
- sed -i \
- -e '/docdir =/s:=.*/doc:= $(datadir)/doc/'${PF}'/html:' \
- doc/Makefile.in || die "sed html doc"
-
- local myconf= bindir=/bin
- if ! use userland_GNU ; then
- myconf="--program-prefix=g"
- bindir=/usr/bin
- fi
-
- if echo "#include <regex.h>" | $(tc-getCPP) > /dev/null ; then
- myconf="${myconf} --without-included-regex"
- fi
-
- use static && append-ldflags -static
- econf \
- --bindir=${bindir} \
- $(use_enable nls) \
- ${myconf} \
- || die "Configure failed"
- emake || die "build failed"
-}
-
-src_install() {
- emake install DESTDIR="${D}" || die "Install failed"
- dodoc NEWS README* THANKS AUTHORS BUGS ChangeLog
- docinto examples
- dodoc "${FILESDIR}"/{dos2unix,unix2dos}
-
- rm -f "${D}"/usr/lib/charset.alias "${D}"/usr/share/locale/locale.alias
-}