revbump with improved patch for prefix. Thanks to Fabian Groffen and Mario Fetka for their help. Bug #365817

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

4 files changed, 76 insertions, 40 deletions

diff --git a/app-admin/chrpath/ChangeLog b/app-admin/chrpath/ChangeLog
index 7d696d38ed99..003a2320bbec 100644
--- a/app-admin/chrpath/ChangeLog
+++ b/app-admin/chrpath/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/chrpath
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/chrpath/ChangeLog,v 1.14 2010/04/26 02:25:17 vapier Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chrpath/ChangeLog,v 1.15 2011/08/29 19:23:22 hwoarang Exp $
+
+*chrpath-0.13-r2 (29 Aug 2011)
+
+  29 Aug 2011; Markos Chandras <hwoarang@gentoo.org> -chrpath-0.13-r1.ebuild,
+  +chrpath-0.13-r2.ebuild, +files/chrpath-0.13-multilib.patch,
+  -files/chrpath-multilib.patch:
+  revbump with improved patch for prefix. Thanks to Fabian Groffen and Mario
+  Fetka for their help. Bug #365817
 
   26 Apr 2010; Mike Frysinger <vapier@gentoo.org> chrpath-0.13-r1.ebuild:
   Clean up installed paths.
diff --git a/app-admin/chrpath/Manifest b/app-admin/chrpath/Manifest
index b53408a73ea4..43ffb9033dc6 100644
--- a/app-admin/chrpath/Manifest
+++ b/app-admin/chrpath/Manifest
@@ -1,18 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
+AUX chrpath-0.13-multilib.patch 4130 RMD160 b128209343ac2fbf38d1fc2c8297c1c5ea7ad641 SHA1 5a638bb7ce305d09b46237b3bf3a32ffb4121ec3 SHA256 6abe262096db93bb62f0eccb8ed4da1a29f53076353da9dc4e1527165bd870c0
 AUX chrpath-0.13-testsuite-1.patch 575 RMD160 0cf149b5798f3f0fd15ea98f89700feee2104cea SHA1 3683b4e6ef4219fd815367d2a638c4ab646a7188 SHA256 f780b05ce1bc8b77012bb81dabdbd9ef7487643e767c734275f5d8f915355dd4
 AUX chrpath-keepgoing.patch 1041 RMD160 9c454d96245d434b69db0b176a792f50eb882429 SHA1 a213403888ca21aa7730b4957b8f9f7e6c4b05b6 SHA256 6c45aa896835cea3df7b0edcadea2171e8e5833b4d40c99babab15b5648d219a
-AUX chrpath-multilib.patch 3549 RMD160 1ebe77532319fd4877fbea019b519b4b78cb1427 SHA1 2a1189a4e7743b3707de929bacc162c73ac0549d SHA256 36241db7e559ed8cfa0d239d63d17e4c33d63d58a10981f18dfa6e7c2004aac7
 DIST chrpath-0.13.tar.gz 125129 RMD160 89b91919e3f629173388f10469dc94fadd46aa56 SHA1 11ff3e3dda2acaf1e529475f394f74f2ef7a8204 SHA256 c1aa5342eac0daad81b8da05aa282ae1ccd6f68bc75ca94064304f541eed071b
-EBUILD chrpath-0.13-r1.ebuild 1022 RMD160 04c08ddf77d700b0e7dee29f9bc48fdde086b306 SHA1 afebbd67034e1601769cfe9ad6b877f3ac7a236d SHA256 32003a2bb285d77383b8db4fe85c8f20a1f771bda9e5c4dc7fc0453a98a38857
+EBUILD chrpath-0.13-r2.ebuild 1023 RMD160 2f77b0acf34363ed236afa01076aa893c357021b SHA1 4278fd9b585d17d634e9f1e03179dfa3bac90c61 SHA256 9c33f0e651c1c158bd5e3bfe261976a9afce0e41b1e32eac3bd6760570539c11
 EBUILD chrpath-0.13.ebuild 777 RMD160 c866c1dea58ce705a286aac74fdc2e74bbcd28da SHA1 932ac7854d6b67618c8a050d10f1d4b8cfb9cfe6 SHA256 4dd3ad86be94f3a13a57e561b9038da08931cbd3654f9c9a6b96e172a5961b53
-MISC ChangeLog 2223 RMD160 fa37460c305e1d1c6fa5a266e24205f019f3b31e SHA1 795645f5e1dc19d7ca05af06392ad98ed5a8ae1f SHA256 1ecab2d263526d52e10ed52ef1b28156043c9bd741d9442a93d3c061ae816467
+MISC ChangeLog 2545 RMD160 2c1c3e53ce6e4d2440ff03618011d9d45e532559 SHA1 5b34dd2a1e9ee7211dd3ab2ee77a842a4371f217 SHA256 563c6dfbfcedafc98ed9660977830dbcf7af8ed16aa1acdc2eaff2abfebf5363
 MISC metadata.xml 225 RMD160 64d906ab1e771348a42813c979ca57263c640dc4 SHA1 ab1badf0dc60ef92417bf6b220dd37dcb4239e1a SHA256 3c78c095ab816f7d77c844d89c690163c08b505d6d7382195271b54a6b645d99
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAkvU+f8ACgkQTwhj9JtAlp7vtQEAxXw4XolrikMiAEBAcp3KISxY
-nRG7lHkM55FaihTOG7sBAJEGXqX4pTxvrT2hTjoJGb/E2W9QKEU64JKqcgN0jnuX
-=nHif
+iQIcBAEBCgAGBQJOW+cIAAoJEPqDWhW0r/LCFl8P/17ffzm6nldz7Jv6IKPNDdSQ
+aMrHWNROgQ6nADIKygFw9fgdaxorsjyommFKacTHZQhSg1LMwexha9fwit2Cr3/Z
+O+qLt6NafIUlgOIMLUBMZJ2Rq/bFd82d6ajknvip28AcRB7SDi5eFG2HG+/SCCjo
+i2oUACP8ElwFWPYRfh4c04W2tFePEsmJCRky0sWAafip4D2w7Qp1fD8oCkIUQFPu
+tgiHMZp01WZtRlAvHYT/mpV4mU0Qqg7u4R/miFxcQdIOAKTnewfOf0jRBTB67RhR
+wuH7qGqB4KoBNz33d9/8Gs7XTnHU5ZmjxR7MXqIPgBKPiZabTnldbOON4cnDtub8
+V4GnCGszmXHJ4u/jkLBzdXfWiWoRwgTnz9+06TCFfB0EzAQHeO/Tjb/ZWbq2khUs
+ricPTFSfb+xW/+FDBTnO+unz9VRE88KGUSQ23w6tIZlcUCnKHSimush7t4OkXUGN
+kdmMj6R7I07YfbE2D0SvMOjoHuaJe66Z5Y+b4fUFyjVP5VZ17h5VOpi4QMd0W0jl
+4d7V3lSiCJ7lsKzMo9MRF7BfScGvaaTdiIwpUlAhPZje0DF0CD10b0eVN2za0sDP
+B7Z4zLByEeIofITLa7SV/d7D/spMfJqvPF50B84cRg2gpyKAvhR13TaX2Om/Oo1b
+SoXBQ8/0o8a/2WEZ2VlQ
+=+bHI
 -----END PGP SIGNATURE-----
diff --git a/app-admin/chrpath/chrpath-0.13-r1.ebuild b/app-admin/chrpath/chrpath-0.13-r2.ebuild
index 8d46b061a860..dff81c7cf066 100644
--- a/app-admin/chrpath/chrpath-0.13-r1.ebuild
+++ b/app-admin/chrpath/chrpath-0.13-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/chrpath/chrpath-0.13-r1.ebuild,v 1.3 2010/04/26 02:25:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chrpath/chrpath-0.13-r2.ebuild,v 1.1 2011/08/29 19:23:22 hwoarang Exp $
 
 EAPI="2"
 
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~
 IUSE=""
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-multilib.patch
+	epatch "${FILESDIR}"/${P}-multilib.patch
 	epatch "${FILESDIR}"/${PN}-keepgoing.patch
 	epatch "${FILESDIR}"/${P}-testsuite-1.patch
 	sed -i -e '/^docdir/d' Makefile.am # use standard docdir
diff --git a/app-admin/chrpath/files/chrpath-multilib.patch b/app-admin/chrpath/files/chrpath-0.13-multilib.patch
index a1c45a5447f3..a0d54666ffe0 100644
--- a/app-admin/chrpath/files/chrpath-multilib.patch
+++ b/app-admin/chrpath/files/chrpath-0.13-multilib.patch
@@ -1,24 +1,8 @@
---- a/configure.ac	2004-09-19 10:28:33.000000000 +0200
-+++ b/configure.ac	2006-02-27 16:12:00.282066250 +0100
-@@ -16,6 +16,7 @@
- dnl Checks for programs.
- AC_PROG_CC
- AC_PROG_INSTALL
-+AC_PROG_LIBTOOL
- 
- dnl Checks for libraries.
- 
-@@ -26,7 +27,6 @@
- dnl Checks for typedefs, structures, and compiler characteristics.
- AC_C_CONST
- AC_C_BIGENDIAN
--AC_CHECK_SIZEOF(void *)
- 
- dnl Checks for library functions.
- AC_CHECK_FUNCS(getopt_long)
---- a/Makefile.am	2004-09-19 10:29:28.000000000 +0200
-+++ b/Makefile.am	2006-02-27 16:57:31.166290750 +0100
-@@ -12,12 +12,19 @@
+Index: chrpath-0.13/Makefile.am
+===================================================================
+--- chrpath-0.13.orig/Makefile.am
++++ chrpath-0.13/Makefile.am
+@@ -12,12 +12,19 @@ debs:
  	fakeroot debian/rules binary
  
  chrpath_SOURCES = \
@@ -28,7 +12,7 @@
 -	elf.c		\
  	protos.h
  
-+chrpath_LDADD = -ldl
++chrpath_LDADD = $(LDLIBS)
 +
 +lib_LTLIBRARIES = libchrpath32.la libchrpath64.la
 +libchrpath32_la_SOURCES = chrpath.c killrpath.c elf.c protos.h
@@ -41,8 +25,42 @@
  EXTRA_DIST = ChangeLog.usermap $(man_MANS)
  
  CLEANFILES = *.bb *.bbg *.da *.gcov testsuite/*.bb testsuite/*.bbg
---- a/main.c	2004-09-19 10:33:37.000000000 +0200
-+++ b/main.c	2006-02-27 17:23:39.400267750 +0100
+Index: chrpath-0.13/configure.ac
+===================================================================
+--- chrpath-0.13.orig/configure.ac
++++ chrpath-0.13/configure.ac
+@@ -16,6 +16,7 @@ CHRPATH_LDRPATH_OPTION
+ dnl Checks for programs.
+ AC_PROG_CC
+ AC_PROG_INSTALL
++AC_PROG_LIBTOOL
+ 
+ dnl Checks for libraries.
+ 
+@@ -26,11 +27,18 @@ AC_CHECK_HEADERS([getopt.h elf.h fcntl.h
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+ AC_C_BIGENDIAN
+-AC_CHECK_SIZEOF(void *)
+ 
+ dnl Checks for library functions.
+ AC_CHECK_FUNCS(getopt_long)
+ 
++dnl See if we need -ldl on this platform for dlopen
++LDLIBS=
++save_LIBS="$LIBS"
++LIBS=
++AC_SEARCH_LIBS([dlopen], [dl], [LDLIBS="-ldl"])
++LIBS="${save_LIBS}"
++AC_SUBST([LDLIBS])
++
+ if eval "test x$GCC = xyes"; then
+   for flag in \
+       -ansi \
+Index: chrpath-0.13/main.c
+===================================================================
+--- chrpath-0.13.orig/main.c
++++ chrpath-0.13/main.c
 @@ -12,13 +12,19 @@
  #  include "config.h"
  #endif
@@ -64,7 +82,7 @@
  
  #ifdef HAVE_GETOPT_LONG
  #  define GETOPT_LONG getopt_long
-@@ -61,6 +67,30 @@
+@@ -61,6 +67,30 @@ usage(char *progname)
    printf("\n");
  }
  
@@ -95,7 +113,7 @@
  int
  main(int argc, char * const argv[])
  {
-@@ -73,6 +103,9 @@
+@@ -73,6 +103,9 @@ main(int argc, char * const argv[])
  #ifdef HAVE_GETOPT_LONG
    int option_index = 0;
  #endif /* HAVE_GETOPT_LONG */
@@ -105,7 +123,7 @@
  
    if (argc < 2)
      {
-@@ -116,14 +149,31 @@
+@@ -116,14 +149,31 @@ main(int argc, char * const argv[])
        }
    } while (-1 != opt);