diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog index 3b983cf8..335b5366 100644 --- a/app-misc/mc/ChangeLog +++ b/app-misc/mc/ChangeLog @@ -1,7 +1,15 @@ # ChangeLog for app-misc/mc -# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.145 2008/11/24 17:55:35 ssuominen Exp $ +*mc-4.7.0_pre1 (07 Aug 2009) + + 07 Aug 2009; Mario Fetka +mc-4.7.0_pre1.ebuild, + +files/mc-4.7.0_pre1-ebuild_syntax.patch, + +files/mc-4.7.0_pre1-tbz2_filetype.patch, + +files/mc-4.7.0_pre1-undelfs_configure.patch, files/ebuild.syntax: + update chdir script + 18 Apr 2009; Mario Fetka ChangeLog: add chdir support diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest index 95d08c73..de66759a 100644 --- a/app-misc/mc/Manifest +++ b/app-misc/mc/Manifest @@ -1,5 +1,5 @@ AUX chdir-4.6.0.gentoo 159 RMD160 5edd511a40033bc11ed6e486edcce5b23c8305a2 SHA1 f9d22b48903f1f5c7f3ae885c6949c65827583b5 SHA256 92fbe981eda972767866b388548c1837dcc32b06549b2dcf3c44d8bfe62d398f -AUX ebuild.syntax 2581 RMD160 20b6f49fa9734abf0d1f4ef7031f5c1779501798 SHA1 2e4231e54a8d8eda9e3f67acec23c5d1915bfac5 SHA256 808d91ac2395f7d6189f4b17f3e2b042c2db46674ca019f66ff6f5062eff9ef5 +AUX ebuild.syntax 3336 RMD160 b707506b2df102bee2031791847f4aa3a067aca7 SHA1 ef2a55bd1381d816e09c48798a803db38444acb8 SHA256 6bf215349535902e65e71dc7a8acbb5dd53e87f068e1a12b604d0d56cb36bbb1 AUX mc-4.6.0-7zip.patch 631 RMD160 aee1d87da11c95e18e189874832b97e43521e8e0 SHA1 b8376620d0201963c8595b5ffad4cc631182b2d7 SHA256 371801acda66eed1c2a334385b1dc3854f3d864282aa58650c4fb46d615a93d7 AUX mc-4.6.0-ebuild-syntax.patch 296 RMD160 adc93b215cb7d092226a8a6dc6d7eb1114d031fc SHA1 e6e7d073a533f6020ef72efea22c91cd6d7a42eb SHA256 18787cc1605326aea8e71573780c02992e31404bde79b02b63ca1d2bb14a5aef AUX mc-4.6.1-bash-all.patch 924 RMD160 647b45835dbe3aa879ed333ea42e346c4bbc73eb SHA1 21607d94762c25d16ed402a6841955b69d8819e9 SHA256 0fc6eb34fd885c737913de18dc0b0460a471f938189fdb5ede46e1d068dc7b04 @@ -8,14 +8,19 @@ AUX mc-4.6.1-find.patch 5522 RMD160 edba65b5c797d4ac1a4230c24d5746c8f5d06664 SHA AUX mc-4.6.1-invalid-mtime.patch 787 RMD160 fb02c6c2c672780551a79d942cd7b3be8eb96c1c SHA1 4ef7584019cc5e7632c2a687705d4b2bd7ba457e SHA256 e6cd8c235aed5362538689daf2a92eddb36e2c79387e26c78d8ac71210224520 AUX mc-4.6.1-largefile.patch 6919 RMD160 f6bcb19aed609d89a0fdf36646b991d13f45f1ca SHA1 1bbe8c7d614aae3ed8225237b0ac2fdc6bc4ca64 SHA256 005bbc46f6b4ee3ff8ce29cf1b8974af69e38b4ca5676512927a3a8cd290ee57 AUX mc-4.6.1-nonblock.patch 394 RMD160 414e6d99045ad73d3634e135892d1615cb3322fd SHA1 34b3e6d4807c9e055dbafeede0ed3aa74efe7224 SHA256 49487dbe67eef61543ca9d36f81d2d8884787d2c18dd7ca90ba032ef0ed3c10e +AUX mc-4.7.0_pre1-ebuild_syntax.patch 1352 RMD160 603d62336c00e85712bfbef03218340f27b00074 SHA1 777a58895a67c6c11b6530129eb13ea5a9647eb0 SHA256 0cdc301345fb324df90827fb0c3e32f144a5babb19cd8b1d5ac673d47b0b8e10 +AUX mc-4.7.0_pre1-tbz2_filetype.patch 564 RMD160 c039c1b8c61c4757b73e61fa5baae5bf9eca2542 SHA1 2db984784143e508348d22d1cb53ed27b83f5e24 SHA256 cfe64f0ed7e7388398c5313026dc432585f6fb386e4be6bd7ec8f881cdedb06c +AUX mc-4.7.0_pre1-undelfs_configure.patch 757 RMD160 5f5b65c7d5cde6bff56a8cae0e1725c31dc064a2 SHA1 1ce39e2b7ff2a499d8de0ba85fcd346e9518fba0 SHA256 9dbbf46d6dcf694cd2d831ffb127a15d0f39c866ff5e16e6fa4d3fae9be4b5fc AUX mc.gentoo 322 RMD160 957d5127be68de3eca20ac3121607faa1370d997 SHA1 c13e3625613764aa7c06aaba4519efa30c5722c1 SHA256 6dff61a04bf35cbc5c9570e3ad194a8d8ffd255096c977997d11aa59cd0f24c9 AUX mc.ini 43 RMD160 2254610744c484553cd3332a4f45e439b13cceed SHA1 dde4fa7bc44867f9e1b34e170aec07484e8497dc SHA256 ed0921487e74b913fa34f4d672584b64da6cf5d592b17c65328621934a4d46f1 DIST mc-4.6.1-utf8-r2.patch.bz2 30449 RMD160 ffe89eb0cef217ba87398c93b65ebc0e5fefac5d SHA1 f0994ddc412b4f86a7dab83686e846156fc36de2 SHA256 f58de9e412694958c00c7ef831995f2b56b7add7ea1e26567281516db02f483e DIST mc-4.6.1.tar.gz 3928370 RMD160 d565ee95a8916d73fad5e0defeb9f2f57e50962b SHA1 92be0802143245e0fb7e3847d70da614cad7d5fb SHA256 086ab03daaac28a28c0ddb9a709040b59e1322f6bfa68e39d004d9c66b119e7e DIST mc-4.6.2-pre1-patches-1.tbz2 48513 RMD160 d003bbc281fce5eb1b7040ff29f9ddff6139121e SHA1 6926944d54289a3779fe7da4e906ddc3c9cc8f57 SHA256 7a7465bcde781c174bf7e596f9772e2e027ffb3d54941c4d9d430c913a0e2483 DIST mc-4.6.2-pre1.tar.gz 4009197 RMD160 335d032a9562814ebcab1b2848312d3ee1cb5bab SHA1 9eca70f0b1da9f66207b66c07c6bea49c08b818e SHA256 6aeb0ae5371c8beedec37958f73804f6da44bf9cf738647065b17d959b27be34 +DIST mc-4.7.0-pre1.tar.bz2 2783935 RMD160 0f63d2a3b30af097697ae5fb715bb04249877e9b SHA1 028dcdc998f012445cb9a3c707f9411bbe46ac65 SHA256 a774ff52ef9ba4654e3bf48081f4775ad90fb4d86f1670d6a3a6804d090213ef DIST u7z-4.29.tar.bz2 2951 RMD160 1ab0cfea1563e81bdde9c0552d37efe710ea14bf SHA1 1a8c65dcb58a8f1be9d7fa8a3b91b1819fbb3360 SHA256 0d046e76fade7c7e31be01626bb3fcb0afcb5f62809733d0c70e0e12c655348d EBUILD mc-4.6.1-r4.ebuild 4458 RMD160 310edd888d035b6bce6ebe685cafd96954a24507 SHA1 53d9725cb2fdcae43423727ab0964c07b89cf356 SHA256 1ce723b96dfad2a2a6038600ed5b38bd0205cd6eaeed5efab6a93419f7ff249c EBUILD mc-4.6.2_pre1.ebuild 2795 RMD160 d29040b6861695858c0253357d913054083e83d3 SHA1 8c58668abc87913e08abed23a705014bd38e237d SHA256 6e85b6087fbcc03d9ef93fbb5a2b88ce323745e0451ab9f7a3e5f42839ccaee3 -MISC ChangeLog 21035 RMD160 747cc80cccb291fe90d853672c08e092f8fc3b17 SHA1 dc458844875a972d256c21069e391fca2e326251 SHA256 44bbd7b9d5003457c8f2fe3b247cc6052d2f9064872ddb4636b5a4db83141af0 +EBUILD mc-4.7.0_pre1.ebuild 2050 RMD160 b94bd6b30d7567a4487cc71729dc223882e83c32 SHA1 f4d4e53fc1e179382eec010a7bc6494873074e88 SHA256 23048ed940906c66f42d9a09d4b25589a2c2c26c81d3c6e2c8c27855b6a4cb89 +MISC ChangeLog 21319 RMD160 4e029b4e4a5ce483cb0fd6dee954f9171a92ee10 SHA1 1bf4834984552949dc46c2569b50ae47e743b0e3 SHA256 dffc54ad06cc33b108898f53ca25706be2fd57868c0170e1df74d946f5d8c6b8 MISC metadata.xml 300 RMD160 9f102fd6d3f520bc53b394229456e9b70e91807f SHA1 020bf4ff7b164e352b8340434ed3762430db87bc SHA256 f1f97640f02ba1eca452c927887656187f24f40a0f8ba97223dcbedb21497ef5 diff --git a/app-misc/mc/files/ebuild.syntax b/app-misc/mc/files/ebuild.syntax index 2148ce2a..abaa4577 100644 --- a/app-misc/mc/files/ebuild.syntax +++ b/app-misc/mc/files/ebuild.syntax @@ -1,71 +1,91 @@ context default - keyword linestart HOMEPAGE brightcyan - keyword linestart DESCRIPTION brightcyan - keyword linestart SRC_URI brightcyan - keyword linestart LICENSE brightcyan - keyword linestart SLOT brightcyan - keyword linestart KEYWORDS brightcyan - keyword linestart IUSE brightcyan - keyword linestart RESTRICT brightcyan keyword linestart DEPEND brightcyan - keyword linestart RDEPEND brightcyan + keyword linestart DESCRIPTION brightcyan keyword linestart EAPI brightcyan + keyword linestart HOMEPAGE brightcyan + keyword linestart IUSE brightcyan + keyword linestart KEYWORDS brightcyan + keyword linestart LICENSE brightcyan + keyword linestart PDEPEND brightcyan + keyword linestart PROVIDE brightcyan + keyword linestart RDEPEND brightcyan + keyword linestart RESTRICT brightcyan keyword linestart S brightcyan + keyword linestart SLOT brightcyan + keyword linestart SRC_URI brightcyan + keyword linestart WANT_AUTOCONF brightcyan + keyword linestart WANT_AUTOMAKE brightcyan - keyword whole local yellow - keyword whole use yellow - keyword whole has_version yellow + keyword whole _elibtoolize yellow + keyword whole check_KV yellow keyword whole best_version yellow - keyword whole use_with yellow - keyword whole use_enable yellow - keyword whole keepdir yellow - keyword whole econf yellow - keyword whole einstall yellow + keyword whole built_with_use yellow keyword whole die yellow - keyword whole einfo yellow - keyword whole elog yellow - keyword whole emake yellow - keyword whole eerror yellow - keyword whole epatch yellow - keyword whole ebegin yellow - keyword whole eend yellow - keyword whole ewarn yellow - keyword whole unpack yellow - keyword whole diropts yellow keyword whole dobin yellow keyword whole docinto yellow + keyword whole doconfd yellow keyword whole dodir yellow keyword whole dodoc yellow + keyword whole doenvd yellow keyword whole doexe yellow keyword whole dohard yellow keyword whole dohtml yellow + keyword whole doicon yellow keyword whole doinfo yellow + keyword whole doinitd yellow keyword whole doins yellow + keyword whole dolib yellow keyword whole dolib.a yellow keyword whole dolib.so yellow - keyword whole dolib yellow keyword whole doman yellow + keyword whole domenu yellow keyword whole dosbin yellow + keyword whole dosed yellow keyword whole dosym yellow + keyword whole eautoconf yellow + keyword whole eautoreconf yellow + keyword whole eautomake yellow + keyword whole ebegin yellow + keyword whole econf yellow + keyword whole eend yellow + keyword whole eerror yellow + keyword whole einfo yellow + keyword whole einstall yellow + keyword whole elibtoolize yellow + keyword whole elog yellow + keyword whole emake yellow + keyword whole epatch yellow + keyword whole ewarn yellow keyword whole exeinto yellow keyword whole exeopts yellow keyword whole fowners yellow keyword whole fperms yellow + keyword whole has yellow + keyword whole hasq yellow + keyword whole has_version yellow keyword whole insinto yellow keyword whole insopts yellow keyword whole into yellow + keyword whole keepdir yellow keyword whole libopts yellow + keyword whole local yellow keyword whole newbin yellow + keyword whole newconfd yellow keyword whole newdoc yellow keyword whole newexe yellow keyword whole newins yellow keyword whole newman yellow keyword whole newsbin yellow + keyword whole newinitd yellow keyword whole prepall yellow keyword whole prepalldocs yellow keyword whole prepallinfo yellow keyword whole prepallman yellow + keyword whole unpack yellow + keyword whole use yellow + keyword whole use_enable yellow + keyword whole use_with yellow keyword = yellow keyword : yellow diff --git a/app-misc/mc/files/mc-4.7.0_pre1-ebuild_syntax.patch b/app-misc/mc/files/mc-4.7.0_pre1-ebuild_syntax.patch new file mode 100644 index 00000000..2453115b --- /dev/null +++ b/app-misc/mc/files/mc-4.7.0_pre1-ebuild_syntax.patch @@ -0,0 +1,40 @@ +diff -ur mc-4.7.0-pre1.orig/syntax/ebuild.syntax mc-4.7.0-pre1/syntax/ebuild.syntax +--- mc-4.7.0-pre1.orig/syntax/ebuild.syntax 2009-06-23 21:55:12.000000000 +0300 ++++ mc-4.7.0-pre1/syntax/ebuild.syntax 2009-08-02 18:37:56.000000000 +0300 +@@ -38,9 +38,9 @@ + keyword LINGUAS brightcyan + + keyword whole _elibtoolize yellow +- keyword whole check_KV yellow + keyword whole best_version yellow + keyword whole built_with_use yellow ++ keyword whole check_KV yellow + keyword whole die yellow + keyword whole diropts yellow + keyword whole dobin yellow +@@ -64,6 +64,7 @@ + keyword whole dosbin yellow + keyword whole dosed yellow + keyword whole dosym yellow ++ keyword whole eaclocal yellow + keyword whole eautoconf yellow + keyword whole eautoreconf yellow + keyword whole eautomake yellow +@@ -110,6 +111,8 @@ + keyword whole use yellow + keyword whole use_enable yellow + keyword whole use_with yellow ++ #cvs ++ keyword whole cvs_src_unpack yellow + #flag-o-matic + keyword whole append-flags yellow + keyword whole replace-flags yellow +@@ -118,6 +121,8 @@ + keyword whole git_src_unpack yellow + #java-ant-2 + keyword whole EANT_BUILD_TARGET yellow ++ #mercurial ++ keyword whole mercurial_src_unpack yellow + #svn + keyword whole subversion_src_unpack yellow + diff --git a/app-misc/mc/files/mc-4.7.0_pre1-tbz2_filetype.patch b/app-misc/mc/files/mc-4.7.0_pre1-tbz2_filetype.patch new file mode 100644 index 00000000..69371625 --- /dev/null +++ b/app-misc/mc/files/mc-4.7.0_pre1-tbz2_filetype.patch @@ -0,0 +1,17 @@ +http://www.midnight-commander.org/ticket/1452 +http://bugs.gentoo.org/show_bug.cgi?id=219412 + +Patch by Ian Abbott + +diff -ur mc-4.7.0-pre1.orig/misc/mc.ext.in mc-4.7.0-pre1/misc/mc.ext.in +--- mc-4.7.0-pre1.orig/misc/mc.ext.in 2009-06-23 21:55:11.000000000 +0300 ++++ mc-4.7.0-pre1/misc/mc.ext.in 2009-08-03 13:59:39.000000000 +0300 +@@ -115,7 +115,7 @@ + # Open=%cd %p#utar + View=%view{ascii} bzip -dc %f 2>/dev/null | tar tvvf - + +-regex/\.t(ar\.bz2|bz|b2)$ ++regex/\.t(ar\.bz2|bz2?|b2)$ + Open=%cd %p#utar + View=%view{ascii} bzip2 -dc %f 2>/dev/null | tar tvvf - + diff --git a/app-misc/mc/files/mc-4.7.0_pre1-undelfs_configure.patch b/app-misc/mc/files/mc-4.7.0_pre1-undelfs_configure.patch new file mode 100644 index 00000000..e2bc8d71 --- /dev/null +++ b/app-misc/mc/files/mc-4.7.0_pre1-undelfs_configure.patch @@ -0,0 +1,16 @@ +http://www.midnight-commander.org/ticket/1459 + +Patch from upstream git + +diff -ur mc-4.7.0-pre1.orig/configure.ac mc-4.7.0-pre1/configure.ac +--- mc-4.7.0-pre1.orig/configure.ac 2009-07-31 19:36:24.000000000 +0300 ++++ mc-4.7.0-pre1/configure.ac 2009-08-05 15:16:25.000000000 +0300 +@@ -535,7 +535,7 @@ + AM_CONDITIONAL(USE_EDIT, [test -n "$use_edit"]) + AM_CONDITIONAL(USE_VFS, [test "x$use_vfs" = xyes]) + AM_CONDITIONAL(USE_VFS_NET, [test x"$use_net_code" = xtrue]) +-AM_CONDITIONAL(USE_UNDEL_FS, [test -n "$use_undelfs"]) ++AM_CONDITIONAL(USE_UNDEL_FS, [test -n "$enable_vfs_undelfs"]) + AM_CONDITIONAL(USE_SAMBA_FS, [test -n "$use_smbfs"]) + AM_CONDITIONAL(ENABLE_MCSERVER, [test x"$enable_mcserver" = "xyes"]) + AM_CONDITIONAL(CHARSET, [test -n "$have_charset"]) diff --git a/app-misc/mc/mc-4.7.0_pre1.ebuild b/app-misc/mc/mc-4.7.0_pre1.ebuild new file mode 100644 index 00000000..6e092e38 --- /dev/null +++ b/app-misc/mc/mc-4.7.0_pre1.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.7.0_pre1.ebuild,v 1.7 2009/08/05 12:22:28 ssuominen Exp $ + +EAPI=2 +inherit autotools eutils + +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="~arm ~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="gpm nls samba +slang X" + +RDEPEND=">=dev-libs/glib-2.6: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} + +src_prepare() { + epatch "${FILESDIR}"/${P}-ebuild_syntax.patch \ + "${FILESDIR}"/${P}-tbz2_filetype.patch \ + "${FILESDIR}"/${P}-undelfs_configure.patch + AT_NO_RECURSIVE="yes" eautoreconf +} + +src_configure() { + local myscreen=ncurses + + use slang && myscreen=slang + + econf \ + --disable-dependency-tracking \ + --enable-vfs \ + --enable-vfs-undelfs \ + --enable-charset \ + $(use_with X x) \ + $(use_with samba) \ + --with-configdir=/etc/samba \ + --with-codepagedir=/var/lib/samba/codepages \ + $(use_with gpm gpm-mouse) \ + --with-screen=${myscreen} \ + --with-edit +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc AUTHORS NEWS README + + insinto /usr/share/mc/bin + newins "${FILESDIR}"/chdir-4.6.0.gentoo mc.sh + + insinto /usr/share/mc + doins "${FILESDIR}"/mc.gentoo + +} + +pkg_postinst() { + elog "Add the following line to your ~/.bashrc to" + elog "allow mc to chdir to its latest working dir at exit" + elog "" + elog "# Midnight Commander chdir enhancement" + elog "if [ -f /usr/share/mc/mc.gentoo ]; then" + elog " . /usr/share/mc/mc.gentoo" + elog "fi" +} +