From 727197b42b7d8876ff8daf1267749ca335ccbb29 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 13 Jan 2007 23:33:33 +0000 Subject: [PATCH] cleanup --- dev-libs/popt/Manifest | 46 +++++++++---------- dev-libs/popt/files/popt-1.10.4-lib64.patch | 29 +++--------- dev-libs/popt/files/popt-1.10.4-nls.patch | 10 ++-- .../popt/files/popt-1.10.4-regression.patch | 4 +- 4 files changed, 36 insertions(+), 53 deletions(-) diff --git a/dev-libs/popt/Manifest b/dev-libs/popt/Manifest index 079596b55145..9d23b388da3a 100644 --- a/dev-libs/popt/Manifest +++ b/dev-libs/popt/Manifest @@ -1,18 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX popt-1.10.4-lib64.patch 930 RMD160 f164ac8b27609475114c1c123bce87ea3d94653c SHA1 9988e3d97767d2f6c0fa3cb5b43f9710097aaf5f SHA256 275670fd8084ec383382c9c01f87a755b3fdeec7d594b435e88dd36754980a5c -MD5 8a936081f98e277545a42196582f0674 files/popt-1.10.4-lib64.patch 930 -RMD160 f164ac8b27609475114c1c123bce87ea3d94653c files/popt-1.10.4-lib64.patch 930 -SHA256 275670fd8084ec383382c9c01f87a755b3fdeec7d594b435e88dd36754980a5c files/popt-1.10.4-lib64.patch 930 -AUX popt-1.10.4-nls.patch 1922 RMD160 c4cc1523a9f2618b5655b2625ffffb828525ba94 SHA1 a9936ba32a344ade12d13349ada4bf61546b60e5 SHA256 ea35416a55ef6a55ab5e79955d96a07b6bf49f29f21c7df47fe8308fba8e9de1 -MD5 0f7b3549b18a6a95717cb7cd65d1fef3 files/popt-1.10.4-nls.patch 1922 -RMD160 c4cc1523a9f2618b5655b2625ffffb828525ba94 files/popt-1.10.4-nls.patch 1922 -SHA256 ea35416a55ef6a55ab5e79955d96a07b6bf49f29f21c7df47fe8308fba8e9de1 files/popt-1.10.4-nls.patch 1922 -AUX popt-1.10.4-regression.patch 504 RMD160 b499b5682852f23b927cc087ba0c5d4ea531e6e8 SHA1 72175578f31ba28c7f810bd85f0c67e314f2bca9 SHA256 4db2a98c96c47fb85300487654cf9f607454a0ee795850cb1956903d0dbad9f9 -MD5 926247bf47d9d3f339b2b49c967ae571 files/popt-1.10.4-regression.patch 504 -RMD160 b499b5682852f23b927cc087ba0c5d4ea531e6e8 files/popt-1.10.4-regression.patch 504 -SHA256 4db2a98c96c47fb85300487654cf9f607454a0ee795850cb1956903d0dbad9f9 files/popt-1.10.4-regression.patch 504 +AUX popt-1.10.4-lib64.patch 499 RMD160 750431554c2c4f54216883701c85c05f355655f6 SHA1 af9f48d17241b00c3a081b31fa97da0e471dbd46 SHA256 df437ce0d85a42a1bc57710e7c8114d0495f113079f3b0f78bf2e8a9f1fd313d +MD5 24fe544142df626647ddc6a0623db858 files/popt-1.10.4-lib64.patch 499 +RMD160 750431554c2c4f54216883701c85c05f355655f6 files/popt-1.10.4-lib64.patch 499 +SHA256 df437ce0d85a42a1bc57710e7c8114d0495f113079f3b0f78bf2e8a9f1fd313d files/popt-1.10.4-lib64.patch 499 +AUX popt-1.10.4-nls.patch 1646 RMD160 44520dae22f7059e3533ebafe8e01dcf417c0f53 SHA1 4c8897540b2964653659726aaf9ad09959736e11 SHA256 8b8a095775314d5e90bf38963c783a94adf2235b32cd5fa9fe38400964d5ce19 +MD5 86c3bf505638988a2fb223d39351228c files/popt-1.10.4-nls.patch 1646 +RMD160 44520dae22f7059e3533ebafe8e01dcf417c0f53 files/popt-1.10.4-nls.patch 1646 +SHA256 8b8a095775314d5e90bf38963c783a94adf2235b32cd5fa9fe38400964d5ce19 files/popt-1.10.4-nls.patch 1646 +AUX popt-1.10.4-regression.patch 432 RMD160 7d2748d5b4a0269527291a98fd15e387adcfb644 SHA1 c0da2274c3a14b803e1c0af91728d3360464fcbc SHA256 aea460ab83c99a9f3284f78857a34eeeabdc75f5a62f74b7a41e8f6696913915 +MD5 fcde5ce8c66077ba90838f9eee193b77 files/popt-1.10.4-regression.patch 432 +RMD160 7d2748d5b4a0269527291a98fd15e387adcfb644 files/popt-1.10.4-regression.patch 432 +SHA256 aea460ab83c99a9f3284f78857a34eeeabdc75f5a62f74b7a41e8f6696913915 files/popt-1.10.4-regression.patch 432 AUX popt-1.7-missing-tests.patch 552 RMD160 9e13b505de24b95e03f3b9fb930f01e0c76dad1a SHA1 cc82b360c466a1a19a81cfba09c3f91b88454fbd SHA256 50ab39942289a1ba728d025fab609556315669f6dc2a47161fcaf0c65c0e83d9 MD5 65e91b3cbc5d3c136d141bae0629fc6a files/popt-1.7-missing-tests.patch 552 RMD160 9e13b505de24b95e03f3b9fb930f01e0c76dad1a files/popt-1.7-missing-tests.patch 552 @@ -28,18 +28,18 @@ EBUILD popt-1.10.4-r3.ebuild 972 RMD160 cbefa290d48dd521ba79f1c474d4e32ecb68feb0 MD5 8c4104013256fb7d1db10e9d98df9418 popt-1.10.4-r3.ebuild 972 RMD160 cbefa290d48dd521ba79f1c474d4e32ecb68feb0 popt-1.10.4-r3.ebuild 972 SHA256 17cabd232215ea36613613a2a01531c7a66c5933ea7d8185d3a4f9d5eaa226f5 popt-1.10.4-r3.ebuild 972 -EBUILD popt-1.10.7.ebuild 988 RMD160 af727cf0ae719a31fd16c798d7525218ceb5471e SHA1 2aec9db98b8a71ee00d5b6e4fd61e6746557b7cf SHA256 50c3c5362f59a41c31e53d7b583b77f7371316d43b77d76355586834b95b724f -MD5 71e3cbd1ad9a830e5b2fb64c04da3d33 popt-1.10.7.ebuild 988 -RMD160 af727cf0ae719a31fd16c798d7525218ceb5471e popt-1.10.7.ebuild 988 -SHA256 50c3c5362f59a41c31e53d7b583b77f7371316d43b77d76355586834b95b724f popt-1.10.7.ebuild 988 +EBUILD popt-1.10.7.ebuild 898 RMD160 c37dfdd4d9cdde943f245f1dfc8ce82e48fa8ea7 SHA1 f8015b1cafde43765594cfe4fdd62ba1f6cafbcf SHA256 b03505c03ae57bb4a1c299a099bd21bdc7b4cd92e563c11a87e47f6efa47b2ec +MD5 0670d89749dfbbdc40061ca7b1bbcafb popt-1.10.7.ebuild 898 +RMD160 c37dfdd4d9cdde943f245f1dfc8ce82e48fa8ea7 popt-1.10.7.ebuild 898 +SHA256 b03505c03ae57bb4a1c299a099bd21bdc7b4cd92e563c11a87e47f6efa47b2ec popt-1.10.7.ebuild 898 EBUILD popt-1.7-r1.ebuild 981 RMD160 27a1d5715bee8e326e352343437cc2a2fa9014f9 SHA1 2bca91c8d2e2d28adb450f4d63972df671525944 SHA256 6d785f5f5d8c3eac8d15b33529d142921569e96833d00efc460f947452711d32 MD5 4920f54afc86850739bf07b583811d5b popt-1.7-r1.ebuild 981 RMD160 27a1d5715bee8e326e352343437cc2a2fa9014f9 popt-1.7-r1.ebuild 981 SHA256 6d785f5f5d8c3eac8d15b33529d142921569e96833d00efc460f947452711d32 popt-1.7-r1.ebuild 981 -MISC ChangeLog 7558 RMD160 60ad08c3e1e608c00fe5feed5af2ecd7ea670a9c SHA1 5fc00ee9a655fd8c6c358b03187524cde78cc730 SHA256 beab4f6d6a5ce32c58b850c8a8f11bee5e0227b105365d1423ee8bbb3a26c845 -MD5 6a788e26ddb8829ee2b3769062e044b4 ChangeLog 7558 -RMD160 60ad08c3e1e608c00fe5feed5af2ecd7ea670a9c ChangeLog 7558 -SHA256 beab4f6d6a5ce32c58b850c8a8f11bee5e0227b105365d1423ee8bbb3a26c845 ChangeLog 7558 +MISC ChangeLog 7683 RMD160 4b437747226db89c2d0a934a59caf225f53f8868 SHA1 95344f5c5d894c458b1ebed08a62141c10f72c13 SHA256 5bf3ac955b8fb0a50072f4c274e84a63f4cf2550f687e8d48362df9b97cabcd9 +MD5 4edc201b5b3634e00e65aae2cac9dbf7 ChangeLog 7683 +RMD160 4b437747226db89c2d0a934a59caf225f53f8868 ChangeLog 7683 +SHA256 5bf3ac955b8fb0a50072f4c274e84a63f4cf2550f687e8d48362df9b97cabcd9 ChangeLog 7683 MISC metadata.xml 200 RMD160 331ec44f62309eb45aea8c9eab75e00969431e6d SHA1 38bcf7483ccd7147602ab1a4a684f670a8b2b5d0 SHA256 c230e59ad2ffb0572f140ddeb37a4ca49a99d74b8bc61558bdae47b1d087478d MD5 12d99f523f4f80f436a421930e3cc4d8 metadata.xml 200 RMD160 331ec44f62309eb45aea8c9eab75e00969431e6d metadata.xml 200 @@ -56,7 +56,7 @@ SHA256 ca02fb4b04a3255cf323e653dc5f48866f12ecd3f72c1fe40b1cbf8b52d2e62b files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFqWgm8bi6rjpTunYRAjJZAKC4XD8Y39Qo1qZDTm+db+wRpCs0hgCbB6Fk -k/eYtsLGPLbNtNamn48OyxQ= -=al0F +iD8DBQFFqWyk8bi6rjpTunYRAltMAKDeOAa5qDPwvvhV0Sk24R0Z4QxhJACg2k+n +C/79njnTuPe7rGHA3jjoXsk= +=UjJ0 -----END PGP SIGNATURE----- diff --git a/dev-libs/popt/files/popt-1.10.4-lib64.patch b/dev-libs/popt/files/popt-1.10.4-lib64.patch index 6cf5389f397a..3cc8ce820e8f 100644 --- a/dev-libs/popt/files/popt-1.10.4-lib64.patch +++ b/dev-libs/popt/files/popt-1.10.4-lib64.patch @@ -1,29 +1,14 @@ -diff -ru popt-1.10.4.orig/Makefile.am popt-1.10.4/Makefile.am ---- popt-1.10.4.orig/Makefile.am 2005-09-16 14:19:21 +0100 -+++ popt-1.10.4/Makefile.am 2006-10-12 09:36:16 +0100 +It doesnt matter if MARK64 gets set in the configure file as the toplevel +makefile is the only thing that uses it ... plus we avoid re-running autotools + +--- popt-1.10.4/Makefile.in ++++ popt-1.10.4/Makefile.in @@ -35,7 +35,7 @@ + TESTS = testit.sh include_HEADERS = popt.h - -usrlibdir = $(libdir)@MARK64@ +usrlibdir = $(libdir) usrlib_LTLIBRARIES = libpopt.la - libpopt_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c -diff -ru popt-1.10.4.orig/configure.ac popt-1.10.4/configure.ac ---- popt-1.10.4.orig/configure.ac 2005-11-17 20:14:31 +0000 -+++ popt-1.10.4/configure.ac 2006-10-12 09:35:59 +0100 -@@ -59,13 +59,6 @@ - fi - AC_SUBST(TARGET) - --dnl XXX Choose /usr/lib or /usr/lib64 for library installs. --MARK64= --case "${target_cpu}" in --x86_64*|powerpc64*|ppc64*|sparc64*|s390x*) MARK64=64 ;; --esac --AC_SUBST(MARK64) -- - AC_CHECK_HEADERS(alloca.h float.h libintl.h mcheck.h unistd.h) - AC_MSG_CHECKING(for /usr/ucblib in LIBS) - if test -d /usr/ucblib ; then + libpopt_la_LDFLAGS = -no-undefined @INTLLIBS@ $(am__append_1) diff --git a/dev-libs/popt/files/popt-1.10.4-nls.patch b/dev-libs/popt/files/popt-1.10.4-nls.patch index 7550add87b13..0bb2b6cd5393 100644 --- a/dev-libs/popt/files/popt-1.10.4-nls.patch +++ b/dev-libs/popt/files/popt-1.10.4-nls.patch @@ -1,6 +1,5 @@ -diff -ur popt-1.10.4.orig/configure.ac popt-1.10.4.my/configure.ac ---- popt-1.10.4.orig/configure.ac 2006-10-21 13:14:32.000000000 +0200 -+++ popt-1.10.4.my/configure.ac 2006-10-21 13:13:24.000000000 +0200 +--- popt-1.10.4.orig/configure.ac ++++ popt-1.10.4.my/configure.ac @@ -92,14 +92,6 @@ [ : ] ) AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes") @@ -29,9 +28,8 @@ diff -ur popt-1.10.4.orig/configure.ac popt-1.10.4.my/configure.ac -AC_OUTPUT([Doxyfile Makefile intl/Makefile po/Makefile.in]) +AC_OUTPUT([Doxyfile Makefile]) -diff -ur popt-1.10.4.orig/Makefile.am popt-1.10.4.my/Makefile.am ---- popt-1.10.4.orig/Makefile.am 2006-10-21 13:14:32.000000000 +0200 -+++ popt-1.10.4.my/Makefile.am 2006-10-21 13:10:09.000000000 +0200 +--- popt-1.10.4.orig/Makefile.am ++++ popt-1.10.4.my/Makefile.am @@ -9,8 +9,6 @@ po/*.in po/*.po po/popt.pot \ popt.ps diff --git a/dev-libs/popt/files/popt-1.10.4-regression.patch b/dev-libs/popt/files/popt-1.10.4-regression.patch index 141a25e5d573..83ed0229e998 100644 --- a/dev-libs/popt/files/popt-1.10.4-regression.patch +++ b/dev-libs/popt/files/popt-1.10.4-regression.patch @@ -1,5 +1,5 @@ ---- popt.c.bak 2006-11-04 00:14:31.553881369 +0100 -+++ popt.c 2006-11-04 00:15:19.607576097 +0100 +--- popt.c.bak ++++ popt.c @@ -748,9 +748,7 @@ if (origOptString == NULL) /* XXX can't happen */ return POPT_ERROR_BADOPT; -- 2.26.2