Version bump and remove old.

(Portage version: 2.2.0_alpha37/cvs/Linux x86_64)

4 files changed, 36 insertions, 37 deletions

diff --git a/app-misc/binwalk/ChangeLog b/app-misc/binwalk/ChangeLog
index 9c0528534adc..ad52c18b056a 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.1 2011/05/30 23:37:54 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/binwalk/ChangeLog,v 1.2 2011/06/03 08:04:15 radhermit Exp $
+
+*binwalk-0.3.1 (03 Jun 2011)
+
+  03 Jun 2011; Tim Harder <radhermit@gentoo.org> -binwalk-0.3.0.ebuild,
+  -files/binwalk-0.3.0-makefile.patch, +binwalk-0.3.1.ebuild,
+  +files/binwalk-0.3.1-destdir.patch:
+  Version bump and remove old.
 
 *binwalk-0.3.0 (30 May 2011)
 
diff --git a/app-misc/binwalk/binwalk-0.3.0.ebuild b/app-misc/binwalk/binwalk-0.3.1.ebuild
index 5023532906e9..c686506a79df 100644
--- a/app-misc/binwalk/binwalk-0.3.0.ebuild
+++ b/app-misc/binwalk/binwalk-0.3.1.ebuild
@@ -1,10 +1,10 @@
 # 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.0.ebuild,v 1.1 2011/05/30 23:37:54 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/binwalk/binwalk-0.3.1.ebuild,v 1.1 2011/06/03 08:04:15 radhermit Exp $
 
 EAPI=4
 
-inherit eutils toolchain-funcs
+inherit eutils
 
 DESCRIPTION="A tool for identifying files embedded inside firmware images"
 HOMEPAGE="http://code.google.com/p/binwalk/"
@@ -21,9 +21,5 @@ DEPEND="${RDEPEND}"
 S=${WORKDIR}/${P}/src
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}"
+	epatch "${FILESDIR}"/${P}-destdir.patch
 }
diff --git a/app-misc/binwalk/files/binwalk-0.3.0-makefile.patch b/app-misc/binwalk/files/binwalk-0.3.0-makefile.patch
deleted file mode 100644
index 8afa140ce48e..000000000000
--- a/app-misc/binwalk/files/binwalk-0.3.0-makefile.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- binwalk-0.3.0/src/Makefile.orig
-+++ binwalk-0.3.0/src/Makefile
-@@ -7,7 +7,7 @@
- OUTDIR=../bin
- 
- $(TARGET): md5.o mparse.o
--	$(CC) $(TARGET).c -o $(TARGET) *.o -lmagic -lz $(CFLAGS)
-+	$(CC) $(TARGET).c -o $(TARGET) *.o -lmagic -lz $(CFLAGS) $(LDFLAGS)
- 	cp $(TARGET) $(OUTDIR)
- 
- md5.o:
-@@ -17,12 +17,13 @@
- 	$(CC) -c mparse.c $(CFLAGS)
- 
- install:
--	if ! test -d $(ETC); then mkdir $(ETC); fi
--	cp $(MAGIC) $(ETC)/$(MAGIC)
--	cp $(OUTDIR)/$(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 $(OUTDIR)/$(TARGET) $(DESTDIR)$(BIN)/$(TARGET)
- 
- remove:
--	rm -rf $(ETC) $(BIN)/$(TARGET)
-+	rm -rf $(DESTDIR)$(ETC) $(DESTDIR)$(BIN)/$(TARGET)
- 
- clean:
- 	rm -f $(TARGET) *.o
diff --git a/app-misc/binwalk/files/binwalk-0.3.1-destdir.patch b/app-misc/binwalk/files/binwalk-0.3.1-destdir.patch
new file mode 100644
index 000000000000..f4d65185651a
--- /dev/null
+++ b/app-misc/binwalk/files/binwalk-0.3.1-destdir.patch
@@ -0,0 +1,25 @@
+--- 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)
+