Fix --as-needed patching to work on both x86 and amd64.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/net-misc/xrdp/ChangeLog b/net-misc/xrdp/ChangeLog
index b9dea96a43961d35187e90d97357cd21a9f3d7e6..f8768c86886c45d0eeeda7c7258b50484a41d906 100644 (file)
--- a/net-misc/xrdp/ChangeLog
+++ b/net-misc/xrdp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/xrdp
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/xrdp/ChangeLog,v 1.6 2010/01/25 17:33:35 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/xrdp/ChangeLog,v 1.7 2010/04/05 14:06:49 flameeyes Exp $
+
+  05 Apr 2010; Diego E. Pettenò <flameeyes@gentoo.org> xrdp-0.4.1.ebuild,
+  files/xrdp-0.4.1-asneeded.patch:
+  Fix --as-needed patching to work on both x86 and amd64.
 
   25 Jan 2010; Raúl Porcel <armin76@gentoo.org> -xrdp-0.3.1.ebuild,
   xrdp-0.4.1.ebuild:

diff --git a/net-misc/xrdp/Manifest b/net-misc/xrdp/Manifest
index 60e592656c82b00ad0ef81fda889f2c1b2c57270..b987b30df2089c91945877f17685a42ca8a422e8 100644 (file)
--- a/net-misc/xrdp/Manifest
+++ b/net-misc/xrdp/Manifest
@@ -1,11 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX startwm.sh 203 RMD160 6258cb60cb90913a77268657e8427348034b885b SHA1 4bdd9f00fc3c3fb32068b4b50e3e372366801285 SHA256 436cef06a851176e18011dc67549c232d1edf865e1380e31f65ad62f2ae95b5d
 AUX xrdp-0.3.1-curdir.patch 1802 RMD160 b1726e31b289897635d6272c03f67ca66ef7d686 SHA1 5ea79e39c55228f3375952e1c1af3da28f61adf2 SHA256 01daf21be042c10a1df9ba88d6b54c5b9de4755f0cb876be887c0a804e70edfa
 AUX xrdp-0.3.1-respect-cflags.patch 2727 RMD160 fd9ac0b99d619c01eb3f311dd5e3dcd2f9b7c350 SHA1 c314dadbe7e92ba13e4c770bab83d40732400e8b SHA256 205f491018875666f7b44bce241d9a37308a947c2336bb73102a50fb4c44f2f7
-AUX xrdp-0.4.1-asneeded.patch 2391 RMD160 39c173efba5e1ff746bda0d3682f17e8a9b6a6d8 SHA1 c3694fd3476c1668e0be98c66371d2732321eee9 SHA256 6bc1744d46ed30cc468072b4224875dbb3f6726a1e98f3ccb7d904d8404fc880
+AUX xrdp-0.4.1-asneeded.patch 2345 RMD160 7f80fb72363c1fa097eddbf6f3757a72f8424689 SHA1 26c190da23ae4beb830d0d3f6157f6a36c2370a0 SHA256 715499dcde48211208eaef7e74ee30b9aa47b3768bf7b8a153dc09bd5c706273
 AUX xrdp-0.4.1-curdir.patch 1871 RMD160 5621d4a59d0956e1435ae0ad9037a5d6f2885ff9 SHA1 0bc5273020d8d44e2dd962d0045790ad61d1c72a SHA256 1f8c2b573969493137649c8f40a0777f7af3017ddeeca93c1290a16cd5e72c48
 AUX xrdp-confd 140 RMD160 c04cd60eff7d3f5de1427ce87bc1f34b4befefe3 SHA1 e0c4a8b089f1e556c3fcd42c5c42327c24bc3634 SHA256 f25c9c409096f71ab2d66d8ee2de47702456367d7a25efeb8ec3b3a84ff7cf4f
 AUX xrdp-initd 979 RMD160 1040d4145236de910892d479b564e6157d584c13 SHA1 b147ccd38c6d9cfd1b26d4c6f8851836678dadb2 SHA256 a5e36c24c93ab813d0fe91d1edcb0199d159a09a0b76b3f11026991dd1201c41
 DIST xrdp-0.4.1.tar.gz 238850 RMD160 67e3bbeeed13e491bf626efd80bf25c4b59f87f9 SHA1 bbe320c049c47c28d3250627ad72481215a8763e SHA256 275cb009cb837c5d59a0d1a2d062d137c8d8ed781cfc699d59ff5452891c18f0
-EBUILD xrdp-0.4.1.ebuild 1738 RMD160 2b5225502e81120bfb21ddb9f8937d780c528603 SHA1 7db9aec2c462e490fe84e0bd5401ad0787504cc0 SHA256 a0b0aae6927c23609e350ba259bbac7b6077cfb7ffaf1d2742bf9fe4ead84b33
-MISC ChangeLog 1258 RMD160 09e62411249734e66f6278b4edf582040f76b590 SHA1 cdb280c1910c2f7bed996397c6cb20e2f2fe6b4b SHA256 40b44a6dfad2c1be81bf1be5591e0449145f99b5b8097376459b4c242b074506
+EBUILD xrdp-0.4.1.ebuild 1730 RMD160 4a75eaa0abf1ac15b5573da3f01c823c5ae5f34b SHA1 2477beeccd21bc31e4bb5e41f22171e8bc3ea07f SHA256 1047ccb076f7a5e214b56be2e6f893351e919cf6ef866c28e0a0293f7c67c042
+MISC ChangeLog 1429 RMD160 84b98e7b32cf7180feba91d4cbd44c60a003caac SHA1 b76d90127de42e24db14a2d00c193fb1663e61d5 SHA256 d0cc2c2adf3a936ade2f2a47e1dd501a5e3c7e92617499a2454d219f9ad87210
 MISC metadata.xml 251 RMD160 9f6c5022895c245c7b1fdbaa24ae19cab04502c8 SHA1 4f7b27e3a8043f87fea8d4bc308e4b947f0e8675 SHA256 fd85d2faaf1d0c0eab6a4d2ab9eaa493e087a6108aafd0a5db6436bfc181783b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAku57oAACgkQAiZjviIA2XjFNACg7+QMz7Jxdnkt/6eASmsiXdJe
+J70AnjqdQIjDGqZkm2DIYVnPCdob744G
+=hpWp
+-----END PGP SIGNATURE-----

diff --git a/net-misc/xrdp/files/xrdp-0.4.1-asneeded.patch b/net-misc/xrdp/files/xrdp-0.4.1-asneeded.patch
index 416b2f09d9ad5ab00790507fc3fa403a8371b583..e44026a821336f1b3be2f71a113d45e90d07374d 100644 (file)
--- a/net-misc/xrdp/files/xrdp-0.4.1-asneeded.patch
+++ b/net-misc/xrdp/files/xrdp-0.4.1-asneeded.patch
@@ -3,9 +3,9 @@
 @@ -14,17 +14,18 @@
  DEFINES = -DLIBSCP_CLIENT
  
- CFLAGS += -I../../common -I../ -I/usr/include/nptl -I../libscp $(DEFINES)
--LDFLAGS = -L/usr/gnu/lib -L/usr/lib64/nptl -L../libscp -Wl,-rpath,/usr/lib64/xrdp -lpthread -ldl -lscp
-+LDFLAGS = -L/usr/gnu/lib -L/usr/lib64/nptl -L../libscp -Wl,-rpath,/usr/lib64/xrdp
+ CFLAGS = -Wall -O2 -I../../common -I../ -I/usr/include/nptl -I../libscp $(DEFINES)
+-LDFLAGS = -L/usr/gnu/lib -L/usr/lib/nptl -L../libscp -Wl,-rpath,. -lpthread -ldl -lscp
++LDFLAGS = -L/usr/gnu/lib -L/usr/lib/nptl -L../libscp -Wl,-rpath,.
 +LIBS = -lpthread -ldl -lscp
  C_OS_FLAGS = $(CFLAGS) -c
  CC = gcc
@@ -27,9 +27,9 @@
 @@ -18,7 +18,8 @@
          -DSESMAN_DESTDIR=\"$(DESTDIR)\"
  
- CFLAGS += -I../common -I/usr/include/nptl -I./libscp $(DEFINES)
--LDFLAGS = -L/usr/gnu/lib -L/usr/lib64/nptl -L./libscp -Wl,-rpath,/usr/lib64/xrdp -lpthread -ldl -lscp
-+LDFLAGS = -L/usr/gnu/lib -L/usr/lib64/nptl -L./libscp -Wl,-rpath,/usr/lib64/xrdp
+ CFLAGS = -Wall -O2 -I../common -I/usr/include/nptl -I./libscp $(DEFINES)
+-LDFLAGS = -L/usr/gnu/lib -L/usr/lib/nptl -L./libscp -Wl,-rpath,. -lpthread -ldl -lscp
++LDFLAGS = -L/usr/gnu/lib -L/usr/lib/nptl -L./libscp -Wl,-rpath,.
 +LIBS=-lpthread -ldl -lscp
  C_OS_FLAGS = $(CFLAGS) -c
  CC = gcc

diff --git a/net-misc/xrdp/xrdp-0.4.1.ebuild b/net-misc/xrdp/xrdp-0.4.1.ebuild
index b5dd158187312bd8fda95235c933d429330f99f0..bfe02c2afb976ef2575be28c0bda8fae83a7cc88 100644 (file)
--- a/net-misc/xrdp/xrdp-0.4.1.ebuild
+++ b/net-misc/xrdp/xrdp-0.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/xrdp/xrdp-0.4.1.ebuild,v 1.3 2010/01/25 17:33:35 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/xrdp/xrdp-0.4.1.ebuild,v 1.4 2010/04/05 14:06:49 flameeyes Exp $
 
 EAPI="2"
 
@@ -26,18 +26,17 @@ src_unpack() {
        cd "${S}"
 
        epatch "${FILESDIR}/${P}-curdir.patch"
+       epatch "${FILESDIR}"/${P}-asneeded.patch
 
        # fix cflags, broken paths, multilib, and insecure rpath in all makefiles
-       for MAKE in $(find . -name Makefile) ; do
-               sed -i "s:CFLAGS = -Wall -O. :CFLAGS += :
+       find . -name Makefile -print0 | \
+               xargs -0 sed \
+               -i "s:CFLAGS = -Wall -O. :CFLAGS += :
                        s:/usr/xrdp:${DESTDIR}:g
                        s:/usr/lib/:/usr/$(get_libdir)/:g
-                       s:rpath,\.:rpath,${DESTDIR}:g" ${MAKE}
-       done
+                       s:rpath,\.:rpath,${DESTDIR}:g"
 
        sed -i '/instfiles\/xrdp_control1.sh/ d' Makefile
-
-       epatch "${FILESDIR}"/${P}-asneeded.patch
 }
 
 src_compile() {