update debian patchset

Package-Manager: portage-2.2_pre5

3 files changed, 14 insertions, 40 deletions

diff --git a/app-arch/unace/Manifest b/app-arch/unace/Manifest
index 7b12a5109b27..2b77a3414a0d 100644
--- a/app-arch/unace/Manifest
+++ b/app-arch/unace/Manifest
@@ -1,12 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX unace-1.2b-64bit.patch 1604 RMD160 fb7cc31a9b73f918da5907d54ba7ec54e450b4b9 SHA1 d9cece37bf6fce4c72625dfb08ad544e8eed8192 SHA256 ce7233f16b6001079749cfc5bfc4d52d2f0711c3cc2943c3272d58644c59caa8
 AUX unace-1.2b-CAN-2005-0160-CAN-2005-0161.patch 4618 RMD160 e638448a91f1017f62bd1d351ef3762370beee04 SHA1 ea7b95c24b1c4d94182bc773b167ee76f0214a37 SHA256 c8327d6ae8bf1b905e7faaf43a54cae7e01ace9eb8aefb61b9a6fabbf4d78c74
-AUX unace-2.5-build.patch 961 RMD160 6c1cc8e752380658846cfe3496acd00c7c068a1c SHA1 709e3d8077353742a84de5c80863fe860ec1ffbd SHA256 d5ec5a9bce9909303b8d81dd13ef19af67185dabb9c4095358e58870e10346a0
 DIST linunace25.tgz 202606 RMD160 ac7bcc89452e6d410a0d638df5737bbecaaa9165 SHA1 64169a8f63aab9749beacc66ab0572981bd28c0f SHA256 7ef5dd1828e7ec15f4961a0396cdc2db59ba042162409ed074fda05ff9888c84
 DIST unace-1.2b.tar.gz 20784 RMD160 09c9f427db01c39851c9865766f1dea726b19df3 SHA1 f3ea47f3be70e5bd19914fbf7ea44d70bad04855 SHA256 7e7d11b05baa6ecb8b70274dc909362f8277003962c665226abb8e433460ecf5
-DIST unace-nonfree_2.5-4.diff.gz 13646 RMD160 a5a06a1cef946899605ba7e37f7abeb228b67809 SHA1 e4ec21a9e51b300db11f2ac6c5fc63fcbf326410 SHA256 8936e2f6eba9286e7ccd08c5b4bef1eca1d223b5b2bf867700e0882a7825914b
+DIST unace-nonfree_2.5-5.diff.gz 13921 RMD160 7e618bdbd98101bc95d7f140ed8dfa6b266d2e6c SHA1 21f6133ee2d076053296f8375fc8f54122032fd5 SHA256 c9666d9739e0047483c7dfc822f606ec17465e0618a6fd1f98030f86a8469a3b
 DIST unace-nonfree_2.5.orig.tar.gz 122509 RMD160 f899e1e43d9ab039d1340347cfc1804d71b1c1b0 SHA1 f658f03aa6f663c1a90af85e3e8c6e7ef12adb42 SHA256 5a85480ed0d39672962a05dc835efc0876be4f0d47b0fa7741b955ae7b148566
 EBUILD unace-1.2b-r1.ebuild 887 RMD160 3dced1c2c3503d1849513c4b6494daa11ad36ec7 SHA1 47cc49aadebbc9c64362e5faefb0fe1db17f072f SHA256 f2f208b79c53df8bc3f72f02592094c4672b37d24d2129b1469e55566d4ff351
-EBUILD unace-2.5-r1.ebuild 967 RMD160 679572f9cd1e4d5514c9acc9622b4a007925e1b6 SHA1 1de4096dee84b9e6129f8ea0805a39112e1fec0a SHA256 4ea96d4300443b3f1aa33841d0dcb6c245a6dd882968e8b6d9b9e8563ce5c432
+EBUILD unace-2.5-r1.ebuild 928 RMD160 17af2a491104112d754e6fa096ae8d201c18e135 SHA1 2e17feff4ca42ae2d501a11c10aeea55ffea7d80 SHA256 f418b25a87d6124acd2a711e795f8700021e7d20158636c70e6c3a1430fe04f1
 EBUILD unace-2.5.ebuild 492 RMD160 614114166d53d3d943f29c57e4fd7b88e29dac53 SHA1 12ebeb169c7412deef10488453d3d79c961b6516 SHA256 3f5b2ca69a37696c7ec6cd9fad1876be39cd7715429a6845b9ce30a8154c92a0
 MISC ChangeLog 3966 RMD160 671b3338754ceccb24b094610b543adf40f01a26 SHA1 8c5cfe3015ae4cf2d96e08663fcf4c57c66c6566 SHA256 b8bbce28faec58bfd8d0cf6f95352a49f7233e6a0ea28b07fa80df2c92224c09
 MISC metadata.xml 303 RMD160 1be4070a07fb83737bfeac8626a0d3ef653a3f53 SHA1 4af1c0392fb22afcd5625d808ddc1a136aa1ccd8 SHA256 b57b72eea37b59d126aec96a9f2fc236c32ad5d044735bb76e889442dc79507a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFIBMYLj9hvisErhMIRAr/hAJ9Kd03XS4POj4ug9CBwJR8sy8nU5wCfYSkC
+gW018UHF0jQ8iyJlmD36/Ks=
+=JQ5F
+-----END PGP SIGNATURE-----
diff --git a/app-arch/unace/files/unace-2.5-build.patch b/app-arch/unace/files/unace-2.5-build.patch
deleted file mode 100644
index 48197407b4fb..000000000000
--- a/app-arch/unace/files/unace-2.5-build.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- makefile
-+++ makefile
-@@ -14,17 +14,16 @@
- SRCSsl          = $(BASIC_DIR)source
- SRCS            = $(SRCSsl)/

- 

-+ifdef SYSINC

- INCLSYSDIR 	= //usr/include/sys

- INCLDIR 	= //usr/include

--

--DEFINES		= -D__LINUX__ -D__unix__ -D__GCC__ -U__HAS_IO_H__

--

--ifdef DEBUG

--LSWITCHES	=

-+INCLS		= -I$(INCLDIR) -idirafter $(INCLSYSDIR)

- else

--LSWITCHES	= -Wl,-s

-+INCLS		=

- endif

- 

-+DEFINES		= -D__LINUX__ -D__unix__ -D__GCC__ -U__HAS_IO_H__

-+

- ##############################################################################

- all: unace
- 
-@@ -47,7 +46,7 @@
-   $(APPS_UNACEEXE_CFILES)

- 

- unace: $(UNACEEXELIN_CFILES)

--	$(CC) $(CFLAGS) $(LSWITCHES) -I$(INCLDIR) -idirafter $(INCLSYSDIR) -I$(SRCSsl) $(DEFINES) $(UNACEEXELIN_CFILES) -ggdb -o$(EXECS_DIR)unace
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(INCLS) -I$(SRCSsl) $(DEFINES) $(UNACEEXELIN_CFILES) -ggdb -o$(EXECS_DIR)unace
- ifndef DEBUG

- 	tar cfvz linunace25.tgz unace file_id.diz licence
- 	#sh linpack.sh

diff --git a/app-arch/unace/unace-2.5-r1.ebuild b/app-arch/unace/unace-2.5-r1.ebuild
index 93741800bc7b..0f5e9148eba0 100644
--- a/app-arch/unace/unace-2.5-r1.ebuild
+++ b/app-arch/unace/unace-2.5-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/unace/unace-2.5-r1.ebuild,v 1.5 2008/04/05 23:31:49 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unace/unace-2.5-r1.ebuild,v 1.6 2008/04/15 15:13:09 vapier Exp $
 
 inherit eutils toolchain-funcs
 
-DEB_VER="4"
+DEB_VER="5"
 DESCRIPTION="ACE unarchiver"
 HOMEPAGE="http://www.winace.com/"
 SRC_URI="mirror://debian/pool/non-free/u/unace-nonfree/unace-nonfree_${PV}.orig.tar.gz
@@ -25,7 +25,6 @@ src_unpack() {
 	for p in $(<unace-nonfree-${PV}/debian/patches/00list) ; do
 		epatch unace-nonfree-${PV}/debian/patches/${p}.dpatch
 	done
-	epatch "${FILESDIR}"/${P}-build.patch
 	tc-export CC
 }