Version bump and remove old.

Package-Manager: portage-2.2.0_alpha37/cvs/Linux x86_64

5 files changed, 47 insertions, 48 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/Manifest b/app-misc/binwalk/Manifest
index 57cbe6306302..17ab31216062 100644
--- a/app-misc/binwalk/Manifest
+++ b/app-misc/binwalk/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX binwalk-0.3.0-makefile.patch 827 RMD160 9245d40539b28df8202b003be1d3066485dd909c SHA1 8583ea23661ee56e42a7d9f449cb2f2494d69a28 SHA256 88b1613e7a95ac72abef524f616201d3802281012e3b944d24f3475fb8933f4f
-DIST binwalk-0.3.0.tar.gz 425008 RMD160 122d83fdced07715735c55df1e51d5aa64dec163 SHA1 afb8f51eea51787930daf9fb3852f16dfc0decd1 SHA256 2d462525dd9e91e8e70cd4218b02941f60001a11dcaf72720e7f88d5b85c3144
-EBUILD binwalk-0.3.0.ebuild 683 RMD160 83f36273966c45d8be6da55733960b5f967c4549 SHA1 fa0acc02dcee0b30a77c2c53246f3ecabd76e226 SHA256 3cb59ac170ccf909601a1cc8a919619d2d5751e3b4a775cea5fc51bf150e5d29
-MISC ChangeLog 383 RMD160 5d425f44fce84b6e5e47c6e0011fe065fa08f1e3 SHA1 118ed8c16b338e9dfa8bf8d9e8faec2712652d4f SHA256 5cfc14e0baf00e7500eb7757227d9a5b4d1cb37fd10641671f0a2cbd9fad073f
+AUX binwalk-0.3.1-destdir.patch 653 RMD160 f950e3bf3fa480fad7e6755a7ea1561b1e2e2cd4 SHA1 0f7d17d2c46a00c14deb667f7d9b63d0a570bbd2 SHA256 aaec537c3332bedfa45e5b457c9a77b48dbe46b4efed31b9cf4adb017162e60a
+DIST binwalk-0.3.1.tar.gz 471442 RMD160 fc36ce8baee76549d2d8e9b202790bae560bcabb SHA1 4f9f7a3e906c899536c796ae3951006cfdf5cfcd SHA256 479816e0d4e6f0d9d9f889650a0cb76c5dcec16028171e9d8fc7c44334164e4a
+EBUILD binwalk-0.3.1.ebuild 606 RMD160 c81c8be2d9f81a1113eda0b0bbb9f106f9a5092b SHA1 481d1a0edee7e9754f24ae7cc2efb4b6c47581ef SHA256 cd7e966ec9123626340a547d813ab47a8dc43fda9cd6b2dd9df04773e79768ad
+MISC ChangeLog 617 RMD160 2d07b0872c01c5081d01f216fea593d50d6f28e1 SHA1 a5ec8a43717d415444070dff438588c72cb32344 SHA256 74f9908b38486b2d4a753729e98a9613421b29ca39348cecf3daa4813a486711
 MISC metadata.xml 827 RMD160 1ba768cca66466c3720aec02be56a260ead11caa SHA1 35969ed0b01a97ad9c1bb9858433ecfeecc815fd SHA256 483ac629370bf9b36aa6453c466102c3b580bc95d99ee3dbc5926025338f3d3c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJN5CpcAAoJEEqz6FtPBkyjT5UH/iygFmFi1ZI0kLxgAInM/F5m
-d+IesL9DkY8B8UiQbUgJfDBEbfERA/RpMqt5anp20SINCHljdqaEQbZSnzPiq0J5
-93Dqe+hcymnyJDxyXhZPmUvPQNuVJusy4LLQifG1ZYznwzetn3wmxOo93tJ9dpky
-tkGI5qkJdubA6DN3Vw/oZYAAQxJydI6P/mgsGSf/pAnB+hF0Vsx67L/Gj+S+u0OB
-krnaeEm5inJGLiy6SmLffyKjAbuUDhddvLXSVDPWu+G0XfhuJsPmnVaL8vObX/FD
-RZcS69E2QhI86TnU8ZGg+nY5OyhNTFDEjA+vdeUNNbUiggTKRean+qy1ODzdx8s=
-=boti
+iQEcBAEBAgAGBQJN6JWNAAoJEEqz6FtPBkyj+Q4H/2J+r/QBa5UzmyalgAWM32/P
+W/waQtWneY8WwKXouj0SxaAbzuOWjSzpEn+hG14HpVeatruNORI17WiSLahXe4PC
+o7olplUv8OsnWqlOwHjtYwk9uOWc2C23Dz1LrhiSbHtP4I5f8OGE47tfejtOyMKI
+7tl/gNiSCcThOrIXWvoCdov5JmnFpov6j3B2WI+pN1anG6Dw2WKr4uBiyFlzvqur
+duJ9d0WMrFegs2SJwFShj2MgcdegIa5CVnPTTx5BswikT1qvNO6PQ24QYPf+Nv5O
+kF3FVHG8WdzIIrpAlh05x6uCTffgZBp7AqyWP5wmylExX2ntFPzFSCZ8Yyz8SL4=
+=NiL/
 -----END PGP SIGNATURE-----
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)
+