QA, imported prefix changes

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/app-text/multitail/ChangeLog b/app-text/multitail/ChangeLog
index 8a718d242544646c70fd673b692ac20fccf059f4..0feebb23b0429d220ec7da86786ce04da59afef9 100644 (file)
--- a/app-text/multitail/ChangeLog
+++ b/app-text/multitail/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/multitail
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/multitail/ChangeLog,v 1.72 2010/02/28 11:15:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/multitail/ChangeLog,v 1.73 2010/06/15 11:56:09 jlec Exp $
+
+  15 Jun 2010; Justin Lecher <jlec@gentoo.org> multitail-5.2.6.ebuild:
+  QA, imported prefix changes
 
 *multitail-5.2.6 (28 Feb 2010)
 

diff --git a/app-text/multitail/multitail-5.2.6.ebuild b/app-text/multitail/multitail-5.2.6.ebuild
index b5b98ce5ec45db41a08d40d6e54f8db9f9f0ef80..545c7b45c82e2c7fe68fb210610f5e41e92cf8e4 100644 (file)
--- a/app-text/multitail/multitail-5.2.6.ebuild
+++ b/app-text/multitail/multitail-5.2.6.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/multitail/multitail-5.2.6.ebuild,v 1.1 2010/02/28 11:15:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/multitail/multitail-5.2.6.ebuild,v 1.2 2010/06/15 11:56:09 jlec Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit flag-o-matic toolchain-funcs eutils
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.vanheusden.com/multitail/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
 IUSE="debug doc examples"
 
 DEPEND="sys-libs/ncurses"
@@ -20,11 +20,13 @@ RDEPEND="${DEPEND}"
 
 src_prepare() {
        epatch "${FILESDIR}/5.2.2-as-needed.patch"
+       use x86-interix && epatch "${FILESDIR}"/${P}-interix.patch
 }
 
 src_configure() {
        tc-export CC
        use debug && append-flags "-D_DEBUG"
+       use prefix && sed "s:DESTDIR=/:DESTDIR=${EROOT}:g" -i Makefile
 }
 
 src_install () {

diff --git a/app-text/recode/ChangeLog b/app-text/recode/ChangeLog
index 5831e2714d52ab1b6a94cd9f2aa71ea60b2141f1..f6d8b037b2e3c2174ee20d607daf1fbd30cb1fa0 100644 (file)
--- a/app-text/recode/ChangeLog
+++ b/app-text/recode/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/recode
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/recode/ChangeLog,v 1.80 2010/05/21 15:31:43 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/recode/ChangeLog,v 1.81 2010/06/15 12:00:12 jlec Exp $
+
+*recode-3.6_p17-r1 (15 Jun 2010)
+
+  15 Jun 2010; Justin Lecher <jlec@gentoo.org> +recode-3.6_p17-r1.ebuild,
+  +files/recode-3.6-interix-getopt.patch,
+  +files/recode-3.6-ppc-macos-new.diff:
+  QA, imported prefix changes
 
   21 May 2010; Peter Volkov <pva@gentoo.org> recode-3.6_p16.ebuild:
   amd64 stable, bug 307889, thank Matti Bickel for help.

diff --git a/app-text/recode/files/recode-3.6-interix-getopt.patch b/app-text/recode/files/recode-3.6-interix-getopt.patch
new file mode 100644 (file)
index 0000000..6fdfa5a
--- /dev/null
+++ b/app-text/recode/files/recode-3.6-interix-getopt.patch
@@ -0,0 +1,12 @@
+diff -ru recode-3.6.orig/src/Makefile.am recode-3.6/src/Makefile.am
+--- recode-3.6.orig/src/Makefile.am    2008-07-25 13:32:10 +0200
++++ recode-3.6/src/Makefile.am 2008-07-25 13:36:27 +0200
+@@ -47,7 +47,7 @@
+ 
+ librecode_la_SOURCES = argmatch.c charname.c combine.c fr-charname.c \
+ hash.c iconv.c libiconv.c localcharset.c merged.c names.c outer.c quotearg.c \
+-recode.c request.c strip-pool.c task.c xmalloc.c error.c xstrdup.c $(C_STEPS)
++recode.c request.c strip-pool.c task.c xmalloc.c error.c xstrdup.c getopt.c getopt1.c $(C_STEPS)
+ librecode_la_LDFLAGS = -version-info 0:0:0
+ 
+ INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/libiconv

diff --git a/app-text/recode/files/recode-3.6-ppc-macos-new.diff b/app-text/recode/files/recode-3.6-ppc-macos-new.diff
new file mode 100644 (file)
index 0000000..0b862fb
--- /dev/null
+++ b/app-text/recode/files/recode-3.6-ppc-macos-new.diff
@@ -0,0 +1,17 @@
+diff -ru recode-3.6.orig/src/Makefile.am recode-3.6/src/Makefile.am
+--- recode-3.6.orig/src/Makefile.am    2008-07-14 15:53:21 +0200
++++ recode-3.6/src/Makefile.am 2008-07-14 15:55:52 +0200
+@@ -43,11 +43,11 @@
+ L_SURFACES =
+ 
+ recode_SOURCES = main.c freeze.c mixed.c
+-recode_LDADD = librecode.la ../lib/libreco.a
++recode_LDADD = librecode.la
+ 
+ librecode_la_SOURCES = argmatch.c charname.c combine.c fr-charname.c \
+ hash.c iconv.c libiconv.c localcharset.c merged.c names.c outer.c quotearg.c \
+-recode.c request.c strip-pool.c task.c xmalloc.c $(C_STEPS)
++recode.c request.c strip-pool.c task.c xmalloc.c error.c xstrdup.c $(C_STEPS)
+ librecode_la_LDFLAGS = -version-info 0:0:0
+ 
+ INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/libiconv

diff --git a/app-text/recode/recode-3.6_p17-r1.ebuild b/app-text/recode/recode-3.6_p17-r1.ebuild
new file mode 100644 (file)
index 0000000..47e62f8
--- /dev/null
+++ b/app-text/recode/recode-3.6_p17-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/recode/recode-3.6_p17-r1.ebuild,v 1.1 2010/06/15 12:00:12 jlec Exp $
+
+EAPI="3"
+
+inherit autotools eutils flag-o-matic libtool toolchain-funcs
+
+MY_P=${P%_*}
+MY_PV=${PV%_*}
+DEB_PATCH=${PV#*p}
+
+DESCRIPTION="Convert files between various character sets"
+HOMEPAGE="http://recode.progiciels-bpi.ca/"
+SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz
+       mirror://debian/pool/main/r/${PN}/${PN}_${MY_PV}-${DEB_PATCH}.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="nls"
+
+DEPEND="
+       sys-devel/flex
+       nls? ( sys-devel/gettext )"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+       epatch "${FILESDIR}/${MY_P}-gettextfix.diff" #239372
+       epatch "${FILESDIR}"/${MY_P}-as-if.patch #283029
+       epatch "${WORKDIR}"/${PN}_${MY_PV}-${DEB_PATCH}.diff
+       sed -i '1i#include <stdlib.h>' src/argmatch.c || die
+
+       # Needed under FreeBSD, too
+       # Needed under Interix too
+       # now replaced by the -new.patch ...
+       # epatch "${FILESDIR}"/${MY_P}-ppc-macos.diff
+       epatch "${FILESDIR}"/${MY_P}-ppc-macos-new.diff
+       [[ ${CHOST} == *-interix[35]* ]] && epatch "${FILESDIR}"/${PN}-3.6-interix-getopt.patch
+       cp lib/error.c lib/xstrdup.c lib/getopt.c lib/getopt1.c src/ || die "file copy failed"
+
+       # Remove old libtool macros
+       rm "${S}"/acinclude.m4
+
+       eautoreconf
+       elibtoolize
+}
+
+src_configure() {
+       tc-export CC LD
+       # on solaris -lintl is needed to compile
+       [[ ${CHOST} == *-solaris* ]] && append-libs "-lintl"
+       # --without-included-gettext means we always use system headers
+       # and library
+       econf --without-included-gettext $(use_enable nls)
+}
+
+src_install() {
+       emake DESTDIR="${D}" install || die "make install failed"
+       dodoc AUTHORS BACKLOG ChangeLog NEWS README THANKS TODO
+       rm -f "${ED}"/usr/lib/charset.alias
+}

diff --git a/app-text/wdiff/ChangeLog b/app-text/wdiff/ChangeLog
index 4a68ee48270acf5ca936e6ad49a2f2b4366f63a6..61624a79fabdb651b7a5f55e004408b6bcabacb9 100644 (file)
--- a/app-text/wdiff/ChangeLog
+++ b/app-text/wdiff/ChangeLog
@@ -1,12 +1,9 @@
 # ChangeLog for app-text/wdiff
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wdiff/ChangeLog,v 1.39 2010/06/13 01:57:21 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/wdiff/ChangeLog,v 1.40 2010/06/15 11:59:57 jlec Exp $
 
-*wdiff-0.6.3 (13 Jun 2010)
-
-  13 Jun 2010; Jeremy Olexa <darkside@gentoo.org> +wdiff-0.6.3.ebuild:
-  Upstream version bump, updated gnulib modules. Removed old versions. bug
-  323533
+  15 Jun 2010; Justin Lecher <jlec@gentoo.org> wdiff-0.6.3.ebuild:
+  QA, imported prefix changes
 
 *wdiff-0.6.2 (26 May 2010)
 

diff --git a/app-text/wdiff/wdiff-0.6.3.ebuild b/app-text/wdiff/wdiff-0.6.3.ebuild
index 2a5ab0bc7a463ba395fca4a7ddd57aacafa1f115..bdfa7ac4cea3d19bea17bcb22b077741cced66e4 100644 (file)
--- a/app-text/wdiff/wdiff-0.6.3.ebuild
+++ b/app-text/wdiff/wdiff-0.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wdiff/wdiff-0.6.3.ebuild,v 1.1 2010/06/13 01:55:05 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/wdiff/wdiff-0.6.3.ebuild,v 1.2 2010/06/15 11:59:57 jlec Exp $
 
 EAPI="2"
 
@@ -10,13 +10,14 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE=""
 
-DEPEND="sys-apps/diffutils
+DEPEND="
+       sys-apps/diffutils
        sys-apps/less"
 
 src_install() {
        emake DESTDIR="${D}" install || die
-       dodoc ChangeLog NEWS README
+       dodoc ChangeLog NEWS README || die
 }