summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Goller <morfic@gentoo.org>2004-09-17 03:34:54 +0000
committerDaniel Goller <morfic@gentoo.org>2004-09-17 03:34:54 +0000
commitb3e8f9087c12c069551066eab83a37c717629109 (patch)
treeebeebe41ed832f73cb2929a5d12aab2a848ca8da /app-misc/mmv
parentnew snapshot. among other things it fixes a bug with pthreads.h being unable ... (diff)
downloadhistorical-b3e8f9087c12c069551066eab83a37c717629109.tar.gz
historical-b3e8f9087c12c069551066eab83a37c717629109.tar.bz2
historical-b3e8f9087c12c069551066eab83a37c717629109.zip
closing bug 62771, fixed for gcc3.4
Diffstat (limited to 'app-misc/mmv')
-rw-r--r--app-misc/mmv/ChangeLog6
-rw-r--r--app-misc/mmv/Manifest5
-rw-r--r--app-misc/mmv/files/mmv-gcc34.patch13
-rw-r--r--app-misc/mmv/mmv-1.01b.ebuild11
4 files changed, 30 insertions, 5 deletions
diff --git a/app-misc/mmv/ChangeLog b/app-misc/mmv/ChangeLog
index 97e0c759168b..730df7767546 100644
--- a/app-misc/mmv/ChangeLog
+++ b/app-misc/mmv/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-misc/mmv
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mmv/ChangeLog,v 1.8 2004/06/24 22:24:54 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mmv/ChangeLog,v 1.9 2004/09/17 03:34:54 morfic Exp $
+
+ 16 Sep 2004; Daniel Goller <morfic@gentoo.org> mmv-1.01b.ebuild:
+ applied patch for gcc3.4, closing bug 62711
+ Thanks to autovoicer Magnade for the patch
14 Jun 2004; Daniel Ahlberg <aliz@gentoo.org> mmv-1.01b.ebuild:
Unmasked on amd64.
diff --git a/app-misc/mmv/Manifest b/app-misc/mmv/Manifest
index c3ca93f90ad3..0c78ca9620b3 100644
--- a/app-misc/mmv/Manifest
+++ b/app-misc/mmv/Manifest
@@ -1,3 +1,4 @@
-MD5 746a4e6c1d48f63ed6a23bca88826f0c mmv-1.01b.ebuild 1220
-MD5 816be2e1e9419241f84732ca66149c9b ChangeLog 568
+MD5 b8195b71ba9b52f858c0d09055ce4f16 mmv-1.01b.ebuild 1407
+MD5 4627a328b7457ed56047eddbbc88eb1d ChangeLog 725
+MD5 f3f4a14317f74442417d8006bb412ffb files/mmv-gcc34.patch 340
MD5 75caa5fcf10a949e8b60e4e87498694d files/digest-mmv-1.01b 128
diff --git a/app-misc/mmv/files/mmv-gcc34.patch b/app-misc/mmv/files/mmv-gcc34.patch
new file mode 100644
index 000000000000..5eb44462488f
--- /dev/null
+++ b/app-misc/mmv/files/mmv-gcc34.patch
@@ -0,0 +1,13 @@
+--- mmv-1.01b.orig/mmv.c.old 2004-09-16 19:54:13.775133568 -0700
++++ mmv-1.01b.orig/mmv.c 2004-09-16 19:56:34.161791552 -0700
+@@ -127,10 +127,6 @@
+ #include <sys/stat.h>
+ #include <sys/file.h>
+
+-extern char *getenv();
+-extern long lseek();
+-extern char *malloc();
+-
+ #ifdef HAS_DIRENT
+ #include <dirent.h>
+ typedef struct dirent DIRENTRY;
diff --git a/app-misc/mmv/mmv-1.01b.ebuild b/app-misc/mmv/mmv-1.01b.ebuild
index 5781eace63dd..c0533446a90b 100644
--- a/app-misc/mmv/mmv-1.01b.ebuild
+++ b/app-misc/mmv/mmv-1.01b.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mmv/mmv-1.01b.ebuild,v 1.9 2004/06/24 22:24:54 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mmv/mmv-1.01b.ebuild,v 1.10 2004/09/17 03:34:54 morfic Exp $
-inherit eutils
+inherit eutils gcc
DESCRIPTION="Move/copy/append/link multiple files according to a set of wildcard patterns."
HOMEPAGE="http://packages.debian.org/unstable/utils/mmv.html"
@@ -23,6 +23,13 @@ S=${WORKDIR}/${P}.orig
src_unpack() {
unpack ${P/-/_}.orig.tar.gz
epatch ${DISTDIR}/${P/-/_}-${PATCH_DEB_VER}.diff.gz
+
+ #apply both patches to compile with gcc-3.4 closing bug #62711
+ if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]
+ then
+ epatch ${FILESDIR}/mmv-gcc34.patch
+ fi
+
}
src_compile() {