summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2011-06-07 05:02:02 +0000
committerTim Harder <radhermit@gentoo.org>2011-06-07 05:02:02 +0000
commit22785ff5a43a8b392f8320f9df0f1e8fb05d125b (patch)
treedb2b79c0703bd3b1fe3d535e19d6862f1f797b48 /app-misc/binwalk
parentVersion bump (bug #370173). Update to EAPI 4, add RDEPEND, and respect CXXFLAGS. (diff)
downloadgentoo-2-22785ff5a43a8b392f8320f9df0f1e8fb05d125b.tar.gz
gentoo-2-22785ff5a43a8b392f8320f9df0f1e8fb05d125b.tar.bz2
gentoo-2-22785ff5a43a8b392f8320f9df0f1e8fb05d125b.zip
Version bump and remove old.
(Portage version: 2.2.0_alpha37/cvs/Linux x86_64)
Diffstat (limited to 'app-misc/binwalk')
-rw-r--r--app-misc/binwalk/ChangeLog9
-rw-r--r--app-misc/binwalk/binwalk-0.3.2.ebuild (renamed from app-misc/binwalk/binwalk-0.3.1.ebuild)9
-rw-r--r--app-misc/binwalk/files/binwalk-0.3.1-destdir.patch25
-rw-r--r--app-misc/binwalk/files/binwalk-0.3.1-ldflags.patch11
4 files changed, 9 insertions, 45 deletions
diff --git a/app-misc/binwalk/ChangeLog b/app-misc/binwalk/ChangeLog
index b6cdfb5ba106..7225495b36f3 100644
--- a/app-misc/binwalk/ChangeLog
+++ b/app-misc/binwalk/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for app-misc/binwalk
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/binwalk/ChangeLog,v 1.3 2011/06/03 08:21:54 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/binwalk/ChangeLog,v 1.4 2011/06/07 05:02:00 radhermit Exp $
+
+*binwalk-0.3.2 (07 Jun 2011)
+
+ 07 Jun 2011; Tim Harder <radhermit@gentoo.org> -binwalk-0.3.1.ebuild,
+ -files/binwalk-0.3.1-destdir.patch, -files/binwalk-0.3.1-ldflags.patch,
+ +binwalk-0.3.2.ebuild:
+ Version bump and remove old.
03 Jun 2011; Tim Harder <radhermit@gentoo.org> binwalk-0.3.1.ebuild,
+files/binwalk-0.3.1-ldflags.patch:
diff --git a/app-misc/binwalk/binwalk-0.3.1.ebuild b/app-misc/binwalk/binwalk-0.3.2.ebuild
index c02a6f0b421d..13744fb31875 100644
--- a/app-misc/binwalk/binwalk-0.3.1.ebuild
+++ b/app-misc/binwalk/binwalk-0.3.2.ebuild
@@ -1,11 +1,9 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/binwalk/binwalk-0.3.1.ebuild,v 1.2 2011/06/03 08:21:54 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/binwalk/binwalk-0.3.2.ebuild,v 1.1 2011/06/07 05:01:59 radhermit Exp $
EAPI=4
-inherit eutils
-
DESCRIPTION="A tool for identifying files embedded inside firmware images"
HOMEPAGE="http://code.google.com/p/binwalk/"
SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
@@ -19,8 +17,3 @@ RDEPEND="sys-apps/file"
DEPEND="${RDEPEND}"
S=${WORKDIR}/${P}/src
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-destdir.patch \
- "${FILESDIR}"/${P}-ldflags.patch
-}
diff --git a/app-misc/binwalk/files/binwalk-0.3.1-destdir.patch b/app-misc/binwalk/files/binwalk-0.3.1-destdir.patch
deleted file mode 100644
index f4d65185651a..000000000000
--- a/app-misc/binwalk/files/binwalk-0.3.1-destdir.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- binwalk-0.3.1/src/Makefile.in.orig
-+++ binwalk-0.3.1/src/Makefile.in
-@@ -22,9 +22,10 @@
- $(CC) $(CFLAGS) -c filter.c
-
- install:
-- if ! test -d $(ETC); then mkdir $(ETC); fi
-- cp $(MAGIC) $(ETC)/$(MAGIC)
-- cp $(TARGET) $(BIN)/$(TARGET)
-+ if ! test -d $(DESTDIR)$(ETC); then mkdir -p $(DESTDIR)$(ETC); fi
-+ if ! test -d $(DESTDIR)$(BIN); then mkdir -p $(DESTDIR)$(BIN); fi
-+ cp $(MAGIC) $(DESTDIR)$(ETC)/$(MAGIC)
-+ cp $(TARGET) $(DESTDIR)$(BIN)/$(TARGET)
-
- clean:
- rm -f $(TARGET) *.o
-@@ -34,6 +35,6 @@
- rm -f Makefile
-
- distclean: cleanall
-- rm -rf $(ETC)
-- rm -f $(BIN)/$(TARGET)
-+ rm -rf $(DESTDIR)$(ETC)
-+ rm -f $(DESTDIR)$(BIN)/$(TARGET)
-
diff --git a/app-misc/binwalk/files/binwalk-0.3.1-ldflags.patch b/app-misc/binwalk/files/binwalk-0.3.1-ldflags.patch
deleted file mode 100644
index 6a72d5f4cdca..000000000000
--- a/app-misc/binwalk/files/binwalk-0.3.1-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- binwalk-0.3.1/src/Makefile.in.orig
-+++ binwalk-0.3.1/src/Makefile.in
-@@ -1,7 +1,7 @@
- CC=@CC@
- CFLAGS=@CFLAGS@
- BUILD_LIBS=@BUILD_LIBS@
--LDFLAGS=-lmagic @LZ@
-+LDFLAGS=-lmagic @LZ@ @LDFLAGS@
- TARGET=binwalk
- MAGIC=magic
- ETC=/etc/$(TARGET)