Replace as-needed patch (#176264).

Package-Manager: portage-2.1.2.2

diff --git a/app-mobilephone/obexftp/ChangeLog b/app-mobilephone/obexftp/ChangeLog
index 5bf0477372561e4a69c16b903ea676ee737e2cd3..5f3f91d274aa0f9715669f35acb42df8a243a522 100644 (file)
--- a/app-mobilephone/obexftp/ChangeLog
+++ b/app-mobilephone/obexftp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-mobilephone/obexftp
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/ChangeLog,v 1.23 2007/04/29 21:22:37 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/ChangeLog,v 1.24 2007/05/01 06:29:35 mrness Exp $
+
+  01 May 2007; Alin Năstac <mrness@gentoo.org>
+  files/obexftp-0.21-as-needed.patch:
+  Replace as-needed patch (#176264).
 
   29 Apr 2007; Alin Năstac <mrness@gentoo.org>
   +files/obexftp-0.21-as-needed.patch, obexftp-0.21.ebuild:

diff --git a/app-mobilephone/obexftp/Manifest b/app-mobilephone/obexftp/Manifest
index 58cd25670e088e1561022175cd21e538ce7cdd58..3197e99406be884a511f7d9eac5d12109fdf0559 100644 (file)
--- a/app-mobilephone/obexftp/Manifest
+++ b/app-mobilephone/obexftp/Manifest
@@ -5,10 +5,10 @@ AUX obexftp-0.19-cobex_write.patch 2292 RMD160 0ec6be346020f3f883c96c2764116276f
 MD5 6a6fe66463cf754e0bffe6c432546d25 files/obexftp-0.19-cobex_write.patch 2292
 RMD160 0ec6be346020f3f883c96c2764116276f89fecf4 files/obexftp-0.19-cobex_write.patch 2292
 SHA256 ba3fbfbc3cd40d9635429ee965e9a81f18d577597f2fcade5a706ef1b0c42392 files/obexftp-0.19-cobex_write.patch 2292
-AUX obexftp-0.21-as-needed.patch 396 RMD160 5c4c1409b9a57321e2730e3d91a92674be6a6561 SHA1 b4066135a7bd537d93762c23c403a46a082c1cd4 SHA256 6903575382e405c87ae5069441a711b93a15f731af9412253cdd790b8a88440e
-MD5 16eed3f0c39f3d4cdf86b6d8870ef540 files/obexftp-0.21-as-needed.patch 396
-RMD160 5c4c1409b9a57321e2730e3d91a92674be6a6561 files/obexftp-0.21-as-needed.patch 396
-SHA256 6903575382e405c87ae5069441a711b93a15f731af9412253cdd790b8a88440e files/obexftp-0.21-as-needed.patch 396
+AUX obexftp-0.21-as-needed.patch 1099 RMD160 c27152ca025f46be0ae80ab7e3e0c0d3887ba292 SHA1 dbdacd90962b37f211bd3ea7d08a43d46ad3bfeb SHA256 6a1a897b0b95955719482ba4fb885cafe5d697f6256d4e0199323cf6718420dd
+MD5 baa74cd551c7df30bbe47a795a0a6aef files/obexftp-0.21-as-needed.patch 1099
+RMD160 c27152ca025f46be0ae80ab7e3e0c0d3887ba292 files/obexftp-0.21-as-needed.patch 1099
+SHA256 6a1a897b0b95955719482ba4fb885cafe5d697f6256d4e0199323cf6718420dd files/obexftp-0.21-as-needed.patch 1099
 AUX obexftp-0.21-cobex_write.patch 2292 RMD160 0589e7699bc4ff514f954e4d515465fded71b7ef SHA1 e48bfe29127ad74b199dfc9af103b6e91b0c58f5 SHA256 fd310fe90cf2b4211e394caeacae8d962c08a3233fa0da066b83f6a29144d6d9
 MD5 22ff2b0139e04ee668962537a486e8ab files/obexftp-0.21-cobex_write.patch 2292
 RMD160 0589e7699bc4ff514f954e4d515465fded71b7ef files/obexftp-0.21-cobex_write.patch 2292
@@ -31,10 +31,10 @@ EBUILD obexftp-0.21.ebuild 1718 RMD160 24d3a62be7659b4735dbb8798f56d6e7ce5bafd5
 MD5 45ca8b51a0f40757080172390256b32e obexftp-0.21.ebuild 1718
 RMD160 24d3a62be7659b4735dbb8798f56d6e7ce5bafd5 obexftp-0.21.ebuild 1718
 SHA256 a49b2121c0218f85b66881042620ad20591407319270954ec11c2ee6ab0290f0 obexftp-0.21.ebuild 1718
-MISC ChangeLog 7239 RMD160 83b7aa5280325e285b77e197c983a149690c2c9c SHA1 d8ca7622af8826e9286c187e247f2e433dc7ecfc SHA256 ba980d20cc84059301097058cad1ba2bdfa234041e3f884136284d79c6ef159c
-MD5 dc36884edc6b97ec01f61ecb9dad3c5c ChangeLog 7239
-RMD160 83b7aa5280325e285b77e197c983a149690c2c9c ChangeLog 7239
-SHA256 ba980d20cc84059301097058cad1ba2bdfa234041e3f884136284d79c6ef159c ChangeLog 7239
+MISC ChangeLog 7363 RMD160 ce1bfe1b508a3279119b5a0ee2995aefb9f29a46 SHA1 60f2e2e369b22b2e9026e6c2eae41e6d97f4f427 SHA256 60db42bad43f35d0ffe28c7f84d727e92f77d30913c987194225b9ff0e99fc47
+MD5 a2f48c149e053164dfb3377da048500a ChangeLog 7363
+RMD160 ce1bfe1b508a3279119b5a0ee2995aefb9f29a46 ChangeLog 7363
+SHA256 60db42bad43f35d0ffe28c7f84d727e92f77d30913c987194225b9ff0e99fc47 ChangeLog 7363
 MISC metadata.xml 336 RMD160 80dacb93f1327adc8cb3578a6ffacea1fc817236 SHA1 2826721776ac855b8539336dbcad0750c1399171 SHA256 ac612b65bbad310c1953486d1ce87c081502ec1c90e3d348ae697dc8d3847aff
 MD5 1a820f941ddbd683086de6d92efbdf5c metadata.xml 336
 RMD160 80dacb93f1327adc8cb3578a6ffacea1fc817236 metadata.xml 336
@@ -48,7 +48,7 @@ SHA256 dd7640ca20ce53410403c1fb5dac6d33a4b75fccebb9cfa96ddff446012239e6 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGNQytJnxX6mF440QRAqbUAKCkZIwrrg4vnzucDZ2i/xv2dFcWngCgu73K
-tzkTFPeQuy0Ym2AeiRtoWMM=
-=heq2
+iD8DBQFGNt5dJnxX6mF440QRAiaPAKDKRA6/NLL5xkKwOVyQkIjtQS8pegCeI04h
+N3c7rhtlwxZUNc20+HAHSyQ=
+=uHVb
 -----END PGP SIGNATURE-----

diff --git a/app-mobilephone/obexftp/files/obexftp-0.21-as-needed.patch b/app-mobilephone/obexftp/files/obexftp-0.21-as-needed.patch
index b949f4f51a1322e729a1afcd714fe2e80310761a..15595782e0edeef8c149aec7f747d93ccf2652e9 100644 (file)
--- a/app-mobilephone/obexftp/files/obexftp-0.21-as-needed.patch
+++ b/app-mobilephone/obexftp/files/obexftp-0.21-as-needed.patch
@@ -1,10 +1,31 @@
+diff -Nru obexftp-0.21.orig/multicobex/Makefile.am obexftp-0.21/multicobex/Makefile.am
+--- obexftp-0.21.orig/multicobex/Makefile.am   2007-04-28 20:13:54.000000000 +0200
++++ obexftp-0.21/multicobex/Makefile.am        2007-04-30 13:39:36.000000000 +0200
+@@ -4,7 +4,7 @@
+                               -I$(top_srcdir) \
+                               -I$(top_srcdir)/includes
+ 
+-LDADD =                               @OPENOBEX_LIBS@ \
++libmulticobex_la_LIBADD =     @OPENOBEX_LIBS@ \
+                               ../bfb/libbfb.la
+ 
+ multicobexincludedir =                $(includedir)/multicobex
 diff -Nru obexftp-0.21.orig/obexftp/Makefile.am obexftp-0.21/obexftp/Makefile.am
 --- obexftp-0.21.orig/obexftp/Makefile.am      2007-04-28 20:13:54.000000000 +0200
-+++ obexftp-0.21/obexftp/Makefile.am   2007-04-28 22:25:00.000000000 +0200
-@@ -26,3 +26,6 @@
-       
- libobexftp_la_LDFLAGS =               -version-info $(OBEXFTP_VERSION)
++++ obexftp-0.21/obexftp/Makefile.am   2007-04-30 14:04:22.000000000 +0200
+@@ -4,11 +4,10 @@
+                               -I$(top_srcdir) \
+                               -I$(top_srcdir)/includes
  
-+libobexftp_la_LIBADD =                ../multicobex/libmulticobex.la \
+-LDADD =                         @OPENOBEX_LIBS@
+-#                             @BLUETOOTH_LIBS@ \
+-#                             @USB_LIBS@ \
+-#                             ../multicobex/libmulticobex.la \
+-#                             ../bfb/libbfb.la
++libobexftp_la_LIBADD =                @OPENOBEX_LIBS@ \
++                              @BLUETOOTH_LIBS@ \
++                              ../multicobex/libmulticobex.la \
 +                              ../bfb/libbfb.la
-+
+ 
+ obexftpincludedir =           $(includedir)/obexftp
+