From 632383a85804a1150521c53cc453f1206225a8a2 Mon Sep 17 00:00:00 2001 From: Javier Villavicencio Date: Mon, 12 Mar 2007 11:57:16 +0000 Subject: [PATCH] Fix for bug 169678. Package-Manager: portage-2.1.2.2 --- app-misc/mc/ChangeLog | 6 ++- app-misc/mc/Manifest | 30 ++++++-------- .../mc-4.6.1-charset-locale-aliases.patch | 40 +++++++++++++++++++ app-misc/mc/mc-4.6.1-r3.ebuild | 8 ++-- 4 files changed, 61 insertions(+), 23 deletions(-) create mode 100644 app-misc/mc/files/mc-4.6.1-charset-locale-aliases.patch diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog index 378696e361c6..73b202b7953a 100644 --- a/app-misc/mc/ChangeLog +++ b/app-misc/mc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-misc/mc # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.113 2007/01/28 05:19:46 genone Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.114 2007/03/12 11:57:16 the_paya Exp $ + + 12 Mar 2007; Javier Villavicencio + +files/mc-4.6.1-charset-locale-aliases.patch, mc-4.6.1-r3.ebuild: + Correctly generate charset.alias. Fixes bug 169678. 28 Jan 2007; Marius Mauch mc-4.6.1.ebuild, mc-4.6.1-r3.ebuild: diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest index 58fddaa928b5..9ce8f8c77552 100644 --- a/app-misc/mc/Manifest +++ b/app-misc/mc/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX chdir-4.6.0.gentoo 159 RMD160 5edd511a40033bc11ed6e486edcce5b23c8305a2 SHA1 f9d22b48903f1f5c7f3ae885c6949c65827583b5 SHA256 92fbe981eda972767866b388548c1837dcc32b06549b2dcf3c44d8bfe62d398f MD5 9f528fa7b6b4d2c202ce5f4e3a5173ba files/chdir-4.6.0.gentoo 159 RMD160 5edd511a40033bc11ed6e486edcce5b23c8305a2 files/chdir-4.6.0.gentoo 159 @@ -21,6 +18,10 @@ AUX mc-4.6.1-bash-all.patch 926 RMD160 9883d81179cbf39ef05769cdbe24928f173abe02 MD5 d0c5d1f7258daf2a86b41b185524dced files/mc-4.6.1-bash-all.patch 926 RMD160 9883d81179cbf39ef05769cdbe24928f173abe02 files/mc-4.6.1-bash-all.patch 926 SHA256 d825b4654da8819e352b5ff49225323fb6b6e8695ad322ec6b5cdec7110312da files/mc-4.6.1-bash-all.patch 926 +AUX mc-4.6.1-charset-locale-aliases.patch 1529 RMD160 2adaa973e9d021ca79c3d3a1693b296635a2a0ac SHA1 1446e749c6c2b372f3c4f966b1fa13dc67619adc SHA256 fce9179fe4481104448779d51602b593b15d45f56825fce43b4c85c1194c743e +MD5 409d5523a49e8aa3af5352aea01938e7 files/mc-4.6.1-charset-locale-aliases.patch 1529 +RMD160 2adaa973e9d021ca79c3d3a1693b296635a2a0ac files/mc-4.6.1-charset-locale-aliases.patch 1529 +SHA256 fce9179fe4481104448779d51602b593b15d45f56825fce43b4c85c1194c743e files/mc-4.6.1-charset-locale-aliases.patch 1529 AUX mc-4.6.1-find.patch 5522 RMD160 edba65b5c797d4ac1a4230c24d5746c8f5d06664 SHA1 7611f81a9f69ba3e62931f73fa0bfd56a5706e10 SHA256 70afc16da05d7d10bc1965039090546856692ed6013acf51b2a9d9ca85ed6868 MD5 3c950491cdf44091df216cfa709d133a files/mc-4.6.1-find.patch 5522 RMD160 edba65b5c797d4ac1a4230c24d5746c8f5d06664 files/mc-4.6.1-find.patch 5522 @@ -46,18 +47,18 @@ DIST mc-4.6.1-utf8.patch.bz2 30401 RMD160 f23680c85328b4b0435065f9e5cf430e0cd6b0 DIST mc-4.6.1.tar.gz 3928370 RMD160 d565ee95a8916d73fad5e0defeb9f2f57e50962b SHA1 92be0802143245e0fb7e3847d70da614cad7d5fb SHA256 086ab03daaac28a28c0ddb9a709040b59e1322f6bfa68e39d004d9c66b119e7e DIST u7z-4.16beta.tar.bz2 3041 RMD160 4a682b3b4bc6c09c7414f8d585829763f6c112ea SHA1 5a4898c732ee423bbf9bd38d3b6f0ebab655881c SHA256 668ed6a0484358e51de1be8d8581cc36dd3c915872fb1082550437a2d7aa67dd DIST u7z-4.29.tar.bz2 2951 RMD160 1ab0cfea1563e81bdde9c0552d37efe710ea14bf SHA1 1a8c65dcb58a8f1be9d7fa8a3b91b1819fbb3360 SHA256 0d046e76fade7c7e31be01626bb3fcb0afcb5f62809733d0c70e0e12c655348d -EBUILD mc-4.6.1-r3.ebuild 3892 RMD160 181bea3389f35cad8d74be0deeccb16d954a8c58 SHA1 f94aa886de91227be8cbb21681d7e2a5f6dd8f58 SHA256 64af5d5f993603dec7f2a395c20671539572c29f4f056fee22a414d463323d60 -MD5 77bef8e0f415a9322247e3c3ebeb8c24 mc-4.6.1-r3.ebuild 3892 -RMD160 181bea3389f35cad8d74be0deeccb16d954a8c58 mc-4.6.1-r3.ebuild 3892 -SHA256 64af5d5f993603dec7f2a395c20671539572c29f4f056fee22a414d463323d60 mc-4.6.1-r3.ebuild 3892 +EBUILD mc-4.6.1-r3.ebuild 3934 RMD160 cae8be4507d2e1e3cb995d72d0bfac92cc2d2694 SHA1 c6bdcb563df3e0656a6d08c46ae49a233719696a SHA256 6ddd17427482e967e286601ce7b9860d3a9d6328950eecaa7d70146cfa3ac55c +MD5 29c05ccb5c8ce0a44cde9f02d95f04c4 mc-4.6.1-r3.ebuild 3934 +RMD160 cae8be4507d2e1e3cb995d72d0bfac92cc2d2694 mc-4.6.1-r3.ebuild 3934 +SHA256 6ddd17427482e967e286601ce7b9860d3a9d6328950eecaa7d70146cfa3ac55c mc-4.6.1-r3.ebuild 3934 EBUILD mc-4.6.1.ebuild 3549 RMD160 3a7cc3fe14bfd9644f18dc1871f70fb3edb78f2c SHA1 a99d3b844d8202a47eb5002291e3c05afee64fe7 SHA256 82e8a754abe7cd8da235bce77e487c72ad730fc88c313ef9009692fc58955c32 MD5 a8c84f723d1118bef0aa327438ab444f mc-4.6.1.ebuild 3549 RMD160 3a7cc3fe14bfd9644f18dc1871f70fb3edb78f2c mc-4.6.1.ebuild 3549 SHA256 82e8a754abe7cd8da235bce77e487c72ad730fc88c313ef9009692fc58955c32 mc-4.6.1.ebuild 3549 -MISC ChangeLog 16884 RMD160 db6e726860c0305a9327883f5a7579d839b40bd8 SHA1 d8df921da198d0208892b6251063144bf71882a9 SHA256 9fe5b2413afda7046426b933088220783910c1d337b91c13423bc40aadd42340 -MD5 b25ac6b01d57d90692af6e33f88c69ee ChangeLog 16884 -RMD160 db6e726860c0305a9327883f5a7579d839b40bd8 ChangeLog 16884 -SHA256 9fe5b2413afda7046426b933088220783910c1d337b91c13423bc40aadd42340 ChangeLog 16884 +MISC ChangeLog 17067 RMD160 ab4f3e395d2c5abb741d2a9e70e524ce181a350f SHA1 bb267caf5e5eebf8dd890d089698a71a675a8c2d SHA256 b3254ebdf9d6c3a48c3acbbf19ebc260ccf02e7c2d4292911bd735d203f30480 +MD5 f7ae4cdff296e2c3098973920fda498e ChangeLog 17067 +RMD160 ab4f3e395d2c5abb741d2a9e70e524ce181a350f ChangeLog 17067 +SHA256 b3254ebdf9d6c3a48c3acbbf19ebc260ccf02e7c2d4292911bd735d203f30480 ChangeLog 17067 MISC metadata.xml 233 RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 SHA1 9b94f113e7f382076b1749c2a856e409c96cade3 SHA256 dce03f6cdd96135caf3c971a5ca4a8c916f44532fe8cfb6df88b7bdade407e8b MD5 4eda2fda81ea6a89d8f1f4a2dcd12a85 metadata.xml 233 RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 metadata.xml 233 @@ -68,10 +69,3 @@ SHA256 b20f6209af8c836b2acba79723cf9854b69e0145a41af195932c947e2713123f files/di MD5 e44020f133c8e16d56784bd3ae21041e files/digest-mc-4.6.1-r3 708 RMD160 b4f25a3be25edbcc6ba52ae2be1a087955b3db16 files/digest-mc-4.6.1-r3 708 SHA256 f9ded44bd363c563a74300baf1026ec9e962cf1ab22376f4cba7281ac008b71a files/digest-mc-4.6.1-r3 708 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.1 (GNU/Linux) - -iD8DBQFFvDUd6J2i8a8J4okRAvaSAKDZJvoGabozjg8ryaZf83vcZmOLcgCfSCkX -fqfpCoADR+leQYuGOhPBm6A= -=unE8 ------END PGP SIGNATURE----- diff --git a/app-misc/mc/files/mc-4.6.1-charset-locale-aliases.patch b/app-misc/mc/files/mc-4.6.1-charset-locale-aliases.patch new file mode 100644 index 000000000000..53aedd0d4a99 --- /dev/null +++ b/app-misc/mc/files/mc-4.6.1-charset-locale-aliases.patch @@ -0,0 +1,40 @@ +diff -ruN mc-4.6.1.orig/intl/Makefile.in mc-4.6.1/intl/Makefile.in +--- mc-4.6.1.orig/intl/Makefile.in 2007-03-06 22:31:02.000000000 +0300 ++++ mc-4.6.1/intl/Makefile.in 2007-03-06 22:38:52.000000000 +0300 +@@ -156,12 +156,7 @@ + test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \ + temp=$(DESTDIR)$(libdir)/t-charset.alias; \ + dest=$(DESTDIR)$(libdir)/charset.alias; \ +- if test -f $(DESTDIR)$(libdir)/charset.alias; then \ +- orig=$(DESTDIR)$(libdir)/charset.alias; \ +- sed -f ref-add.sed $$orig > $$temp; \ +- $(INSTALL_DATA) $$temp $$dest; \ +- rm -f $$temp; \ +- else \ ++ if ! test -f $(libdir)/charset.alias; then \ + if test @GLIBC21@ = no; then \ + orig=charset.alias; \ + sed -f ref-add.sed $$orig > $$temp; \ +@@ -170,14 +165,14 @@ + fi; \ + fi; \ + $(mkinstalldirs) $(DESTDIR)$(localedir); \ +- test -f $(DESTDIR)$(localedir)/locale.alias \ +- && orig=$(DESTDIR)$(localedir)/locale.alias \ +- || orig=$(srcdir)/locale.alias; \ +- temp=$(DESTDIR)$(localedir)/t-locale.alias; \ +- dest=$(DESTDIR)$(localedir)/locale.alias; \ +- sed -f ref-add.sed $$orig > $$temp; \ +- $(INSTALL_DATA) $$temp $$dest; \ +- rm -f $$temp; \ ++ if ! test -f $(localedir)/locale.alias; then \ ++ orig=$(srcdir)/locale.alias; \ ++ temp=$(DESTDIR)$(localedir)/t-locale.alias; \ ++ dest=$(DESTDIR)$(localedir)/locale.alias; \ ++ sed -f ref-add.sed $$orig > $$temp; \ ++ $(INSTALL_DATA) $$temp $$dest; \ ++ rm -f $$temp; \ ++ fi; \ + else \ + : ; \ + fi diff --git a/app-misc/mc/mc-4.6.1-r3.ebuild b/app-misc/mc/mc-4.6.1-r3.ebuild index 81bd1ba30eff..3e96eb92fd0d 100644 --- a/app-misc/mc/mc-4.6.1-r3.ebuild +++ b/app-misc/mc/mc-4.6.1-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.6.1-r3.ebuild,v 1.2 2007/01/28 05:19:47 genone Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.6.1-r3.ebuild,v 1.3 2007/03/12 11:57:16 the_paya Exp $ inherit flag-o-matic eutils @@ -65,6 +65,9 @@ src_unpack() { # - not using bindnow-flags() because cons.saver is only built on GNU/Linux sed -i -e "s:^\(cons_saver_LDADD = .*\):\1 -Wl,-z,now:" \ src/Makefile.in + # Correctly generate charset.alias. + # Fixes bugs 71275, 105960 and 169678 + epatch ${FILESDIR}/${P}-charset-locale-aliases.patch } src_compile() { @@ -131,9 +134,6 @@ src_install() { doins ${FILESDIR}/ebuild.syntax cd ${D}/usr/share/mc/syntax epatch ${FILESDIR}/${PN}-4.6.0-ebuild-syntax.patch - - # http://bugs.gentoo.org/show_bug.cgi?id=71275 - rm -f ${D}/usr/share/locale/locale.alias } pkg_postinst() { -- 2.26.2