Version bump and remove old.

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

5 files changed, 19 insertions, 57 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/Manifest b/app-misc/binwalk/Manifest
index a8a3b42d2cda..f8e115cd4150 100644
--- a/app-misc/binwalk/Manifest
+++ b/app-misc/binwalk/Manifest
@@ -1,20 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX binwalk-0.3.1-destdir.patch 653 RMD160 f950e3bf3fa480fad7e6755a7ea1561b1e2e2cd4 SHA1 0f7d17d2c46a00c14deb667f7d9b63d0a570bbd2 SHA256 aaec537c3332bedfa45e5b457c9a77b48dbe46b4efed31b9cf4adb017162e60a
-AUX binwalk-0.3.1-ldflags.patch 243 RMD160 3a8b8b7c8def7ec77eac0ab38b35f5c5026aacf7 SHA1 e07c0c8eb2206b5800327e795de310a3eb49994c SHA256 1a645a554bcc67976e9fc18e17966a1699ce8348f7438fc6984824d0b0ecf4df
-DIST binwalk-0.3.1.tar.gz 471442 RMD160 fc36ce8baee76549d2d8e9b202790bae560bcabb SHA1 4f9f7a3e906c899536c796ae3951006cfdf5cfcd SHA256 479816e0d4e6f0d9d9f889650a0cb76c5dcec16028171e9d8fc7c44334164e4a
-EBUILD binwalk-0.3.1.ebuild 643 RMD160 fa118ef144bba82f017a67b7498f61389d10223f SHA1 b6ad0b9da1cf1a123db36f6ede798761e23c71ce SHA256 430d423908c201e898610b01e49625df0599f98b3031e8cb9989ca35324923f3
-MISC ChangeLog 746 RMD160 779f4f62d33cae6f1c6d935bd84c89942822857f SHA1 00c9d5a855b9ff9feb3f47998880858ad6567540 SHA256 64631c6d3cb80f0037365223b0d858c1ed3ce19e06a35194d6868c67e1c5ae83
+DIST binwalk-0.3.2.tar.gz 471605 RMD160 3aa3e863af38b80055166d46d5d6152134ab3831 SHA1 7345bf15ef74f8df33ce3161744ff8891b104505 SHA256 fd85f93997f6c564984c81cd19ef1b09283f0481458e05f2f6443aa7b8621cee
+EBUILD binwalk-0.3.2.ebuild 530 RMD160 e740410e3acb1003baef6bf0723696709d8b84b3 SHA1 25beb8e8df7b9927d07191c8cab238584b863dee SHA256 91a118a4b06c3c8c289197cf952bf8c35f0190c288cc619fea1238682dfc7c6a
+MISC ChangeLog 979 RMD160 f4966969a4f8e4f347c1dfdd4270d7bca7350eb0 SHA1 647c0ad94757a759be2839b577fd5ef1115b6e00 SHA256 697f9363223105247746edd1ad24c3900e896d28738ed522aa24e2ffbfa60b30
 MISC metadata.xml 827 RMD160 1ba768cca66466c3720aec02be56a260ead11caa SHA1 35969ed0b01a97ad9c1bb9858433ecfeecc815fd SHA256 483ac629370bf9b36aa6453c466102c3b580bc95d99ee3dbc5926025338f3d3c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJN6JmoAAoJEEqz6FtPBkyjpqMH/jwq+0KBpQF63DsVRDZLd7d9
-kLBTLmAdyCbai1EmgbFkJgB3SK7QjIVPPEcm23d7cAf2iUCQVhErAmqcl2CJE036
-X7q9Dy6fjQou+h160EUPOpGXAGo2mAYcZFkQC1qe7Ql9Hl2fHfF1GTZ8ycoeBQCV
-L9N7wQgEVCXBSwEvA7lHVerxb1ftkaySX91lGtv59NRNvyl89WkipxXGe1ym0h7J
-QI1Akm8Xep1+wUiWrILYVx8wglO5lN43WG1uOq2/9sCAOHZSaU2jO9iRnDDNAzDz
-p6hPviRyJsGuJMGdokigeIpm0/QF9A223DBXjBIUnQbAK6Pt/fiKORy/eZM3SP4=
-=J0VU
+iQEcBAEBAgAGBQJN7bDPAAoJEEqz6FtPBkyj2UYH/2umRA+qg3uYLIeJyWQdeP2x
+KRNveVMHGAeXPv8oX1PZrOITQbVBqcNEKg19CVydQza/1LBDLaTALWDfvClEckRC
+8h/nhtNDV4rlsVzD/XGsOF6LDmLN2TOYCmQ7u+BXVumecZ+HMGiRcZn4kat2rde7
+cFErvI8QvNLr5u0G/KhhtuvFES05oZB5g/kiuUtRdz+pot5DSA5gT2KsB38UftJm
+86eboruI50McoSVAqXPbXPPyNrvO7JcqxTnmWiT1aPT2YZOWCc2bIi9LdxKCDAnL
+07QJKoONYOF38LxWc1gMWyR7p6y6y9ZfWRQ0NCZb19iKwrVETppGJdh6whgf5k0=
+=pAeR
 -----END PGP SIGNATURE-----
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)