diff options
| -rw-r--r-- | app-misc/mc/ChangeLog | 8 | ||||
| -rw-r--r-- | app-misc/mc/Manifest | 30 | ||||
| -rw-r--r-- | app-misc/mc/files/mc-4.7.3_copy_move_dialog_to_field_fix.patch | 37 | ||||
| -rw-r--r-- | app-misc/mc/mc-4.7.3-r2.ebuild | 72 |
4 files changed, 132 insertions, 15 deletions
diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog index c6b0433f73b4..72c82059ac47 100644 --- a/app-misc/mc/ChangeLog +++ b/app-misc/mc/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-misc/mc # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.202 2010/07/09 08:16:06 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.203 2010/07/19 18:43:08 wired Exp $ + +*mc-4.7.3-r2 (19 Jul 2010) + + 19 Jul 2010; Alex Alexander <wired@gentoo.org> +mc-4.7.3-r2.ebuild, + +files/mc-4.7.3_copy_move_dialog_to_field_fix.patch: + fixed bug #328845 *mc-4.7.3-r1 (09 Jul 2010) diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest index 3154e4ac5acd..03bb65c8e686 100644 --- a/app-misc/mc/Manifest +++ b/app-misc/mc/Manifest @@ -5,6 +5,7 @@ AUX mc-4.7.0.2_hotlist_fix.patch 913 RMD160 344e35fbd503e6fd1f245fe896f4b3c499bd AUX mc-4.7.0.2_syntax_fix.patch 187 RMD160 393228cf02a9e4d1a600e0cffc51eb05e5e00512 SHA1 760cbb70eae34511e5132289639ebb1449c35a76 SHA256 5b7567e9b293b0598c444640f5272f8c78085f7e6920b5c6182d6c4a9852b933 AUX mc-4.7.1_find-results-panelization-crash.patch 411 RMD160 9c4b8fb9bc9829ec3101b124ad5e8b85c564f248 SHA1 0286d97763c8cc37d16b98f77a236cbd524dd39e SHA256 1ad39b36d5eb0708842cf764a2e963ca3bc7cb19d5af0bf3648d623ce18c4d3d AUX mc-4.7.3_advanced_chown_segfault_fix.patch 501 RMD160 044cc1a819606132fa7cd373d081d9ac01778379 SHA1 d22a128595cd83088de8e76feb0222fb70b94f92 SHA256 4ae9d11233b9117d746a6d2f43d2c438360904d54c04163cd6c60f7705321b5f +AUX mc-4.7.3_copy_move_dialog_to_field_fix.patch 1112 RMD160 d05b353cde121afeabb4b47f61757f90909e01c1 SHA1 2678686c73f03e7f5457f81a092e15764ff683ea SHA256 47d0e620044d45da094025cf02f88761440cd7f177c4a554c40c760c457df68a AUX mc-4.7.3_mcedit_quit_dialog_default.patch 933 RMD160 50d3c337069512da5e377d17b4adb648f55e08aa SHA1 d9f2d5984f63d6df3ea5070d3524e38736179be4 SHA256 c7631ae8590745c7c037b2d86a391a09c0f5f72f2b5d59d2f124b6297119afe9 AUX mc-4.7_mcedit_fix.patch 475 RMD160 eb2234acd6f99abb06c5ae4e20661b43675f2c73 SHA1 f960a559fa7fe3fcb0909ef1b8687c3d786a0b4c SHA256 c08899151ea58423db30eb4d7e5cfb91cc1abec9f1e5b654ed3654f47ea604e6 DIST mc-4.7.0.1.tar.bz2 2831780 RMD160 15d77153377ea8b11910179e7267d70c2ccc303d SHA1 a5953341eee78c29d84f2c426c082a58516904e5 SHA256 4abb66b20c46c583159b29109282cf0d8cf2c7cc078e6062d914c95e776057c4 @@ -19,23 +20,24 @@ EBUILD mc-4.7.0.6.ebuild 1719 RMD160 2a8a7d595fa94d12f890dc70650d906e7202f588 SH EBUILD mc-4.7.0.7.ebuild 1719 RMD160 9adbda0d5874d80a8868f6f85d8036cfd90decca SHA1 c841504075cfe25fcadc2238f794a6b3e6592ab5 SHA256 2b0eaf2d7aaf519ba1b8b7be14c590ce16233dd9aa50646cdced168e750d0f28 EBUILD mc-4.7.2.ebuild 1717 RMD160 9d6f6028b4e7380fb599c03a7aa21efe88478d94 SHA1 98d3b7e52c0fe314e1b51f10b8781f14b3548b2c SHA256 5b6aaea6cdd8d6d3472e270e8b1e2de073f90e7539daa32a82e0501ab4d3f670 EBUILD mc-4.7.3-r1.ebuild 1854 RMD160 1bcd83cbc26a736495a902239b412c756f1cf817 SHA1 3ea5a38d056de4db98ae53f547958381017608d2 SHA256 5a8883329098345a97bff5de6d1fdccc6c85b0ff5dd6b2de996ed2a21e85f580 +EBUILD mc-4.7.3-r2.ebuild 1910 RMD160 37e2bb0a6e8259b8d7b4a645e1ceccae5a678df1 SHA1 ebbc751d687aeab70ddfd9b8334540ae0c22535a SHA256 5fb678bb7b440acf8de5318f0a918c19000cd1e63653f803f235431e80b1744e EBUILD mc-4.7.3.ebuild 1717 RMD160 57ba3a69ae8aba15029922b20d3f63860e647fe2 SHA1 fb0f36d846b2f3c5a49389b0c248f210e4a16760 SHA256 e868e52b5ba00104e451372166e78970f0dba191e5ade210c9680042e41abe9f -MISC ChangeLog 28596 RMD160 1c82ecd8486ab955dc74fd74d73d79220b3e8151 SHA1 2c1cf7d2f5199fb813c6f28af37693b5eb1da48a SHA256 4d36f4c390c846e4d6705c94f560c9238f82876b3312cc3e4cf318f90c31cc4f +MISC ChangeLog 28770 RMD160 fb7c611513a687f0cc993b308a3dcbb2e973c056 SHA1 245658ae7ee6aaa103ffda750ad482c462e94c55 SHA256 216850e2f967fa4d7604f3bd618455309b290a07f923a40af0058a5de93d4bf4 MISC metadata.xml 305 RMD160 319f6d3a222a3028d69dfb5ece59f4ae0343125a SHA1 705291c975a8b25ccc5a040d4fa7feab9190048e SHA256 e8245261e4eaebac2b2f5017c36165f9e733bc1e3619392b8f64c0d5392e7cd9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.12 (GNU/Linux) -iQIcBAEBCAAGBQJMNtuFAAoJEDZF8K7rm0r6TBMQAJSYqFnI7j3WJ6oWjYS1AQ/m -B+logL3YA1qnu+bHowxbVFCYpFX95HHa2Kvc8gIyj7WvpbI0KOP/qbGC21Z/snxR -gncYz+KPYalZIw8U0cAsSFcaPn6k7WHx7iDsTgsZYZ/mCMvW1kuyIzG3fJ+8OQhS -3SGMv/OFiYdh61Amlva3MYkfxeXnnzVJeL67YcIpqL6He1uqbZ/0KzvxpmsAiHb+ -UyYxw6Q44LNvV7z/4xZ/hQLuOWxc0ZHFVwGJj7QKqnGmlpPZU4HGaD2/u2pAUv0W -4YX9s0gMQGg3TD5LRa/FoDQ2jJIHmMdNvVUHumxNn9EZmv54cpbrzwkmOwM5+T6y -szvjjhfq0r2EUROaB7mWY6yEBnASvH5h0+ISAUkTX+yeUfn4GEqidvBn8BlBNLes -b55yygCKkU8JsJ7HpR4Gu9ZpK9kuois3NkP+fX8ByXBE/HUtYgX9FoRLxcHsVIWl -mh4IT3OvDoP+QDGN/k/EtSVMyXp0JGCzHuchxas27NMU7m75yNMY5I1otRCF/NqE -gV353CoswWjk99/GJnGQi0leynKiakiLoqPOL92JuPiQB7IDgJi0LtlSsMhvp3Po -Ou8EGDKM90ZrUmGnqiEdfbnX1JSUmv5uioHpnjM9Xm6n7uCr+nj1iZY2MaBVsfrd -D6MUcGRZLEbYEkIFagRb -=jBMR +iQIcBAEBCAAGBQJMRJ0tAAoJEDZF8K7rm0r66TYP/3jOfVjxhx3TxvCYOtSdjnSS +C1/ehYFQoJYwIJr4rYXPsd4+9Qbnjglzt6GBVWewYIE24YAaWZmwd6lR+rW2i+GE +IL/ztxa5awdHkXmjUg8tsMDX8jhpUCRcsgYp4kdpb4qmfNKKTRvQb04yTVfnnDF/ +sQPJLrwSJwMsuj1ZvqMhRakcIOX0hN6E/YiohIYsBdYfdZ9lYFog2wwPi27ikMrz +MSgLl9Jt03at5zcDUqjTTM/SjZcW5D8wFP5hnepBtpSzeu0VbgbU2XGCDzHTUcPg +HiU9kgsBthWRusiwfWLvXWQEn+3AHiBqi4O0IxpGTN3Ahm2/TxElTuMjfkprzf4A +wcgfAo8G9UUioszd3XJTH0Ob0uBZCMrUJdmBUUZ6AflcMG6VYAVmNIS98Wvlg1hs +GJcrSNOji+KKcrP5DWjnAXn3PkYcFL+Nf29ZzOvbJbg4pmf3BDUvwXI3INcn76yW +M4REui4rMjP8oF0MXL6WPwugvPSTwNC1Cy+aFpwysHT6SHimYApTKH3uHiSeZtEV +l0h9lkVe0X/YHB4N5ggmiOZWYuhGjEw4Zv1fjBgd4YpTc13hXX9cA8R+LImb8pUQ +K2LF/ke9Ps3IMCF3qK/8+R1OCliuQ8Fx0LMRztJm2pBRzVtVqYjChFY1qODvG2HR +UYLkmzFsCex1xggZWDbq +=S8G5 -----END PGP SIGNATURE----- diff --git a/app-misc/mc/files/mc-4.7.3_copy_move_dialog_to_field_fix.patch b/app-misc/mc/files/mc-4.7.3_copy_move_dialog_to_field_fix.patch new file mode 100644 index 000000000000..8fd8c88c0cf0 --- /dev/null +++ b/app-misc/mc/files/mc-4.7.3_copy_move_dialog_to_field_fix.patch @@ -0,0 +1,37 @@ +Index: src/file.c +=================================================================== +--- a/src/file.c ++++ b/src/file.c +@@ -2067,5 +2067,4 @@ + else + dest_dir = panel->cwd; +- + /* + * Add trailing backslash only when do non-local ops. +@@ -2073,20 +2072,14 @@ + * dir is deleted) + */ +- if (force_single || dest_dir[0] == '\0') ++ if (!force_single && dest_dir[0] != '\0' && dest_dir[strlen (dest_dir) - 1] != PATH_SEP) ++ { ++ /* add trailing separator */ ++ dest_dir_ = g_strconcat (dest_dir, PATH_SEP_STR, (char *) NULL); ++ } ++ else + { + /* just copy */ + dest_dir_ = g_strdup (dest_dir); + } +- else if (single_entry) +- { +- /* add filename to dest path */ +- dest_dir_ = g_build_filename (dest_dir, source, (char *) NULL); +- } +- else +- { +- /* add trailing separator */ +- dest_dir_ = g_strconcat (dest_dir, PATH_SEP_STR, (char *) NULL); +- } +- + if (dest_dir_ == NULL) + { diff --git a/app-misc/mc/mc-4.7.3-r2.ebuild b/app-misc/mc/mc-4.7.3-r2.ebuild new file mode 100644 index 000000000000..9a5a54daa235 --- /dev/null +++ b/app-misc/mc/mc-4.7.3-r2.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.7.3-r2.ebuild,v 1.1 2010/07/19 18:43:08 wired Exp $ + +EAPI=3 + +inherit base + +MY_P=${P/_/-} + +DESCRIPTION="GNU Midnight Commander is a text based file manager" +HOMEPAGE="http://www.midnight-commander.org" +SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris" +IUSE="+edit gpm nls samba slang X" + +RDEPEND=">=dev-libs/glib-2.8:2 + gpm? ( sys-libs/gpm ) + kernel_linux? ( sys-fs/e2fsprogs ) + samba? ( net-fs/samba ) + slang? ( >=sys-libs/slang-2 ) + !slang? ( sys-libs/ncurses ) + X? ( x11-libs/libX11 + x11-libs/libICE + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libSM )" +DEPEND="${RDEPEND} + dev-util/pkgconfig + nls? ( sys-devel/gettext )" + +S=${WORKDIR}/${MY_P} + +# bug #327573 +PATCHES=( + "${FILESDIR}/${P}_advanced_chown_segfault_fix.patch" + "${FILESDIR}/${P}_mcedit_quit_dialog_default.patch" + "${FILESDIR}/${P}_copy_move_dialog_to_field_fix.patch" +) + +src_configure() { + local myscreen=ncurses + use slang && myscreen=slang + + econf \ + --disable-dependency-tracking \ + $(use_enable nls) \ + --enable-vfs \ + $(use_enable kernel_linux vfs-undelfs) \ + --enable-charset \ + $(use_with X x) \ + $(use_with samba) \ + --with-configdir="${EPREFIX}"/etc/samba \ + --with-codepagedir="${EPREFIX}"/var/lib/samba/codepages \ + $(use_with gpm gpm-mouse) \ + --with-screen=${myscreen} \ + $(use_with edit) +} + +src_install() { + emake DESTDIR="${D}" install || die + dodoc AUTHORS README +} + +pkg_postinst() { + elog "To enable exiting to latest working directory," + elog "put this into your ~/.bashrc:" + elog ". ${EPREFIX}/usr/libexec/mc/mc.sh" +} |