some quotation and fix bug #167316

Package-Manager: portage-2.1.2.4

diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog
index 73b202b7953a6d89c26c04653bcc785a10d735d2..a2b4ea928ad481c5170d323b4fcfbdb5dea4c395 100644 (file)
--- a/app-misc/mc/ChangeLog
+++ b/app-misc/mc/ChangeLog
@@ -1,6 +1,9 @@
 # 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.114 2007/03/12 11:57:16 the_paya Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.115 2007/04/23 18:38:33 jokey Exp $
+
+  23 Apr 2007; Markus Ullmann <jokey@gentoo.org> mc-4.6.1-r3.ebuild:
+  some quotation and fix bug #167316
 
   12 Mar 2007; Javier Villavicencio <the_paya@gentoo.org>
   +files/mc-4.6.1-charset-locale-aliases.patch, mc-4.6.1-r3.ebuild:

diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 9ce8f8c7755226f24d7bda31fb1a78bc14186adf..0c00373779ae14b155a7b4344ea63f13d35bf7c9 100644 (file)
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,3 +1,6 @@
+-----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
@@ -47,18 +50,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 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-r3.ebuild 4207 RMD160 abaecba9a849665cc23425c1376e374c854ab06f SHA1 fa31f4f6bc244f540599c40f59d69c5a4630d0da SHA256 ed1a3d16f11a0815b3710cb2e5a18d3f1c9d4f35a780689ea5b6a57e332dd903
+MD5 b8cb3fd8757a6f6b306e4347922b9783 mc-4.6.1-r3.ebuild 4207
+RMD160 abaecba9a849665cc23425c1376e374c854ab06f mc-4.6.1-r3.ebuild 4207
+SHA256 ed1a3d16f11a0815b3710cb2e5a18d3f1c9d4f35a780689ea5b6a57e332dd903 mc-4.6.1-r3.ebuild 4207
 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 17067 RMD160 ab4f3e395d2c5abb741d2a9e70e524ce181a350f SHA1 bb267caf5e5eebf8dd890d089698a71a675a8c2d SHA256 b3254ebdf9d6c3a48c3acbbf19ebc260ccf02e7c2d4292911bd735d203f30480
-MD5 f7ae4cdff296e2c3098973920fda498e ChangeLog 17067
-RMD160 ab4f3e395d2c5abb741d2a9e70e524ce181a350f ChangeLog 17067
-SHA256 b3254ebdf9d6c3a48c3acbbf19ebc260ccf02e7c2d4292911bd735d203f30480 ChangeLog 17067
+MISC ChangeLog 17171 RMD160 037de42fb2742b32fbc32b32f0b02d797a286682 SHA1 3d2be7ba0c4f51044c3b84b69df6bed0492549d2 SHA256 228336f12a1c1441fe9cbee227c80f88952d2c7408061e4677ce0b2a68d471f8
+MD5 f8e07a56656f3d969a7c2644a60c1774 ChangeLog 17171
+RMD160 037de42fb2742b32fbc32b32f0b02d797a286682 ChangeLog 17171
+SHA256 228336f12a1c1441fe9cbee227c80f88952d2c7408061e4677ce0b2a68d471f8 ChangeLog 17171
 MISC metadata.xml 233 RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 SHA1 9b94f113e7f382076b1749c2a856e409c96cade3 SHA256 dce03f6cdd96135caf3c971a5ca4a8c916f44532fe8cfb6df88b7bdade407e8b
 MD5 4eda2fda81ea6a89d8f1f4a2dcd12a85 metadata.xml 233
 RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 metadata.xml 233
@@ -69,3 +72,10 @@ 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.3 (GNU/Linux)
+
+iD8DBQFGLP0yz974XjDVpbkRAvd/AJ9AYSiEYjsVtKsByXj8/ZrO9P+FlgCdF3Av
+gwFheUBQmVNXqpKhiV1ESFs=
+=ynbz
+-----END PGP SIGNATURE-----

diff --git a/app-misc/mc/mc-4.6.1-r3.ebuild b/app-misc/mc/mc-4.6.1-r3.ebuild
index 3e96eb92fd0dfff43d2dc0e17b0ffe82d1c5e37f..28ed949c31580e5a4265f69da7586b16f8c75b41 100644 (file)
--- 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.3 2007/03/12 11:57:16 the_paya Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.6.1-r3.ebuild,v 1.4 2007/04/23 18:38:33 jokey Exp $
 
 inherit flag-o-matic eutils
 
@@ -43,31 +43,40 @@ RDEPEND="kernel_linux? ( >=sys-fs/e2fsprogs-1.19 )
 DEPEND="${RDEPEND}
        dev-util/pkgconfig"
 
+pkg_setup() {
+       if use unicode && ! use slang ; then
+               eerror "You must either disable unicode useflag or, if you want a"
+               eerror "unicode-aware mc, set the slang useflag as well."
+               die "set slang or unset unicode"
+       fi
+}
+
 src_unpack() {
        if ( use x86 || use amd64 || use ppc ) && use 7zip; then
                unpack ${U7Z}
        fi
        unpack ${P}.tar.gz
-       cd ${S}
+       cd "${S}"
 
-       epatch ${FILESDIR}/${P}-find.patch
+       epatch "${FILESDIR}"/${P}-find.patch
        if ( use x86 || use amd64 || use ppc ) && use 7zip; then
-               epatch ${FILESDIR}/${PN}-4.6.0-7zip.patch
+               epatch "${FILESDIR}"/${PN}-4.6.0-7zip.patch
        fi
-       epatch ${FILESDIR}/${P}-largefile.patch
+       epatch "${FILESDIR}"/${P}-largefile.patch
        if use slang && use unicode; then
-               epatch ${DISTDIR}/${P}-utf8-r1.patch.bz2
+               epatch "${DISTDIR}"/${P}-utf8-r1.patch.bz2
        fi
-       epatch ${FILESDIR}/${P}-nonblock.patch
-       epatch ${FILESDIR}/${P}-bash-all.patch
+       epatch "${FILESDIR}"/${P}-nonblock.patch
+       epatch "${FILESDIR}"/${P}-bash-all.patch
 
        # Prevent lazy bindings in cons.saver binary. (bug #135009)
        #  - 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
+       epatch "${FILESDIR}"/${P}-charset-locale-aliases.patch
 }
 
 src_compile() {
@@ -88,39 +97,39 @@ src_compile() {
        myconf="${myconf} `use_with gpm gpm-mouse`"
 
        use nls \
-           && myconf="${myconf} --with-included-gettext" \
-           || myconf="${myconf} --disable-nls"
+               && myconf="${myconf} --with-included-gettext" \
+               || myconf="${myconf} --disable-nls"
 
        myconf="${myconf} `use_with X x`"
 
        use samba \
-           && myconf="${myconf} --with-samba --with-configdir=/etc/samba --with-codepagedir=/var/lib/samba/codepages --with-privatedir=/etc/samba/private" \
-           || myconf="${myconf} --without-samba"
+               && myconf="${myconf} --with-samba --with-configdir=/etc/samba --with-codepagedir=/var/lib/samba/codepages --with-privatedir=/etc/samba/private" \
+               || myconf="${myconf} --without-samba"
 
        econf \
-           --with-vfs \
-           --with-ext2undel \
-           --with-edit \
+               --with-vfs \
+               --with-ext2undel \
+               --with-edit \
                --enable-charset \
-           ${myconf} || die
+       ${myconf} || die "econf failed"
 
-       emake || die
+       emake || die "emake failed"
 }
 
 src_install() {
-        cat ${FILESDIR}/chdir-4.6.0.gentoo >>\
-                ${S}/lib/mc-wrapper.sh
+       cat "${FILESDIR}"/chdir-4.6.0.gentoo >>\
+               "${S}"/lib/mc-wrapper.sh
 
-       make install DESTDIR="${D}" || die
+       make install DESTDIR="${D}" || die "make install failed"
 
        # install cons.saver setuid, to actually work
-       chmod u+s ${D}/usr/lib/mc/cons.saver
+       fperms u+s /usr/lib/mc/cons.saver
 
        dodoc ChangeLog AUTHORS MAINTAINERS FAQ INSTALL* NEWS README*
 
        insinto /usr/share/mc
-       doins ${FILESDIR}/mc.gentoo
-       doins ${FILESDIR}/mc.ini
+       doins "${FILESDIR}"/mc.gentoo
+       doins "${FILESDIR}"/mc.ini
 
        if ( use x86 || use amd64 || use ppc ) && use 7zip; then
                cd ../${U7Z_PV}
@@ -131,9 +140,9 @@ src_install() {
        fi
 
        insinto /usr/share/mc/syntax
-       doins ${FILESDIR}/ebuild.syntax
-       cd ${D}/usr/share/mc/syntax
-       epatch ${FILESDIR}/${PN}-4.6.0-ebuild-syntax.patch
+       doins "${FILESDIR}"/ebuild.syntax
+       cd "${D}"/usr/share/mc/syntax
+       epatch "${FILESDIR}"/${PN}-4.6.0-ebuild-syntax.patch
 }
 
 pkg_postinst() {