summaryrefslogtreecommitdiff
path: root/app-misc/mc
diff options
context:
space:
mode:
Diffstat (limited to 'app-misc/mc')
-rw-r--r--app-misc/mc/Manifest4
-rw-r--r--app-misc/mc/files/mc-4.8.23-gettext-test.patch54
-rw-r--r--app-misc/mc/files/mc-4.8.23-gettext.patch56
-rw-r--r--app-misc/mc/mc-4.8.23-r1.ebuild4
4 files changed, 2 insertions, 116 deletions
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 34b8cd3cae7d..4b14e347144d 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,11 +1,9 @@
AUX mc-4.8.23-3933-iso9660-1.patch 2491 BLAKE2B 30e6db19f3251784dc99fc9fc8bc8961cc2dc2414942ad2fbd62ef7a2d9d6a58416787cd7811bcc33822c3a3407c65f86886117372a3f6828ad2eb83ca516c49 SHA512 3b5e6ee0422a860efd7ec3768746bf3b0a81b4f55d775ac165946ffa5f00507fb1a0d4344d213867088e7152c0f0c12b3bb583b1d247368300b7b9cf2d8f8dd6
AUX mc-4.8.23-3933-iso9660-2.patch 825 BLAKE2B 6f10685889f42553d54d9473a26fd4644163012d8201fe9ac42e02e5d45ee6764ce7c75f7939bb676295c0ef5d9dd4b182bba3ad198ccb2f1b907f0808be0b97 SHA512 1c9c7c961d3a69081ce5835edd386c76c9b947c7b23467f9bfd8979942248ba4382c74dfe67f8615b92b0a18b3754405486bc9a27ac7014655a2ca2f733dce99
-AUX mc-4.8.23-gettext-test.patch 2061 BLAKE2B a4381f4919cc48750994037daad17a3772684a54744e290f379e86cae4e1669499ba56229359b987d8e59a5673033bb11496898377642a246fc380e83eae5ef9 SHA512 eab959879de062301c6ebd04fbd2addb655a369c5cfc5104226f6cdeac6e55439e5769caf62387898fc6a6971fb7261f1e3090c950db47bc6c74671e65898339
-AUX mc-4.8.23-gettext.patch 2017 BLAKE2B 9d67398051f77e94d1b9932a89801335efef851b58471354c48d9c8289a4e4b4f3feb275b6c40e46d66a51a374e4a0712cbbce0d3e4f010b256c59930525a96f SHA512 60db8df34ff93d0ed30604bba1969b4b9832417b0b09fb0d0e86b53669c8349e9ab992d6b84cbe7f0c2d8d8a5ffc6ab9cef0a88a86066f36c0c5e45da79c57e5
DIST mc-4.8.22.tar.xz 2538524 BLAKE2B f7839177dfb02d5b56d6a4ae1f045f7bc501b70fc845efaa6d45ef8e432ec680e51e4530aa5aa25c33ad339171d1ff435f6a1c5dbc5ac150053c64101b7a5c30 SHA512 834d467a4561fe4361bbde61be2c9ded95ade2a89855d953f58b7bfeb21297a3d6ebf674e72ac665b1794e0cbc8da752bc14fb37b129ff870856b339091f6bed
DIST mc-4.8.23.tar.xz 2552944 BLAKE2B f246f30d852f93ac96f81ec7a933a1bcd86ff3bfa040a0fa1cb32c14d781f77df34452e4dd94f0846e379d91a648cd417241e4660930a9c90defe58cb19d1cee SHA512 e51c7f926d296280a57a8ecb5f4b296a850022b7ab9beaba89f5cb7554d8fc3e13c73b8571f78c3162ee85df88f7f46d07c9c893156cda4d1377a01071cdd1c6
EBUILD mc-4.8.22.ebuild 2854 BLAKE2B b62a578f351b1535f3b48ddf01c21aa5ab5bbf02cdabc9b967a108cbaf1304ad3130ea26211d06e45697d00cd65bb7842badbfecdf6f360ae8443afaf812777c SHA512 6534293609a40883ff86f9cbf1894b9898c7a8ea910b1a05f8057ce30e26e726b13f5bab7060e64196376fd244b90f41e48632860684c3c5bb1f85eab6bedf0c
-EBUILD mc-4.8.23-r1.ebuild 3042 BLAKE2B f3a0108866ce9f7cd10d48f402b8c169eee19f5550f9312afefc98c2b8b2593eca1496d6a2f93a275c94860cdd061aa933656aa1a150bd1b70db1b83e06cc7a9 SHA512 1f8dccdab837a650c3b602975bbdadcbcc40be387dbe055daea8db1237dd69e89113158297e56dc9ff0dad752c37858dace0dcf359c1346f20d3092c09f612b1
+EBUILD mc-4.8.23-r1.ebuild 2959 BLAKE2B 5a2907a1bd7ba0f79cf2ee2b89d2ad2abcf2010c45e11c41841372284d68fc216cd1e8bfc802a78f125b138f096b95a0b6e212d1f39d5df371667b09950831d4 SHA512 4cf31cf14bdce25c2a14bc22a06c5390249a735d3ff15080c0be7880bac6c957013c9e65c09c64ad4905443817f66e152a0ee119a9eab85d6586fea50f7e8fe2
EBUILD mc-4.8.23.ebuild 2864 BLAKE2B 4d2fa3896976b9775a0077db49890995d8348caa003357c27cf429c4b372381cb21a66b8477fd28bcbd821b143f94c4753f91abdc96a1f60c1de2dc746412a0f SHA512 439957bfb9c4441a3e344ff8ea7361efec8a19f19a5277237b4ac98152fe59213451d3b04b430c0e558001c7f10119381aed7fa4e3e933a5b02529dc7f948bbf
EBUILD mc-9999.ebuild 3111 BLAKE2B 31c178fdbef8bb48d7ca13c15f7e7e56bb3d3de730ee62bccd75a593d9ad313e5cc6fc6e5dbd60a116ab5770ddcb24d31bc67393b1868b2cb57ea99a8dfb174c SHA512 fc8bbce6e66c343e141fcd0ad6c3a6fd450db0ebc366450589bf24a27556a3e536653c7430b65f2e4766172f8aece01c0206fe8c00a0bfefe4f8676c269e7553
MISC metadata.xml 916 BLAKE2B ebd4f95dda619c29e09fdb42087a52a5c1ff2dfa0d5a7ed5bea12776734247bb04d8e19333be9ea45345a3e520ac7504ea490501767111feacf9f933caf3661a SHA512 e8b3384dc473a15550dca185fce45d12019939170155665ce26e6ce2e0abf8e387501e6429c30eefe0e5f15a1b0b1b49d12e2cf5305ef6c08415bbddb48db9ec
diff --git a/app-misc/mc/files/mc-4.8.23-gettext-test.patch b/app-misc/mc/files/mc-4.8.23-gettext-test.patch
deleted file mode 100644
index 7e19cd7fa119..000000000000
--- a/app-misc/mc/files/mc-4.8.23-gettext-test.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-https://bugs.gentoo.org/693850
-https://midnight-commander.org/raw-attachment/ticket/3629/mc-3629-Linking-fix-for-gettext.patch
-
-Test change counterpart.
-
---- a/tests/lib/Makefile.am
-+++ b/tests/lib/Makefile.am
-@@ -9,3 +9,3 @@ AM_LDFLAGS = @TESTS_LDFLAGS@
- LIBS = @CHECK_LIBS@ \
-- $(top_builddir)/lib/libmc.la
-+ $(top_builddir)/lib/libmc.la $(LIBINTL)
-
---- a/tests/lib/mcconfig/Makefile.am
-+++ b/tests/lib/mcconfig/Makefile.am
-@@ -11,3 +11,3 @@ AM_LDFLAGS = @TESTS_LDFLAGS@
- LIBS = @CHECK_LIBS@ \
-- $(top_builddir)/lib/libmc.la
-+ $(top_builddir)/lib/libmc.la $(LIBINTL)
-
---- a/tests/lib/search/Makefile.am
-+++ b/tests/lib/search/Makefile.am
-@@ -10,3 +10,3 @@ AM_CPPFLAGS = \
- LIBS = @CHECK_LIBS@ \
-- $(top_builddir)/lib/libmc.la @PCRE_LIBS@
-+ $(top_builddir)/lib/libmc.la @PCRE_LIBS@ $(LIBINTL)
-
---- a/tests/lib/vfs/Makefile.am
-+++ b/tests/lib/vfs/Makefile.am
-@@ -14,3 +14,3 @@ EXTRA_DIST = mc.charsets
- LIBS = @CHECK_LIBS@ \
-- $(top_builddir)/lib/libmc.la
-+ $(top_builddir)/lib/libmc.la $(LIBINTL)
-
---- a/tests/lib/Makefile.in
-+++ b/tests/lib/Makefile.in
-@@ -636 +636 @@ LIBPTH_PREFIX = @LIBPTH_PREFIX@
--LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la $(am__append_1)
-+LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la $(LIBINTL) $(am__append_1)
---- a/tests/lib/mcconfig/Makefile.in
-+++ b/tests/lib/mcconfig/Makefile.in
-@@ -542 +542 @@ LIBPTH_PREFIX = @LIBPTH_PREFIX@
--LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la $(am__append_1)
-+LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la $(LIBINTL) $(am__append_1)
---- a/tests/lib/search/Makefile.in
-+++ b/tests/lib/search/Makefile.in
-@@ -584,2 +584 @@ LIBPTH_PREFIX = @LIBPTH_PREFIX@
--LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la @PCRE_LIBS@ \
-- $(am__append_1)
-+LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la @PCRE_LIBS@ $(LIBINTL) $(am__append_1)
---- a/tests/lib/vfs/Makefile.in
-+++ b/tests/lib/vfs/Makefile.in
-@@ -641 +641 @@ LIBPTH_PREFIX = @LIBPTH_PREFIX@
--LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la $(am__append_1)
-+LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la $(LIBINTL) $(am__append_1)
diff --git a/app-misc/mc/files/mc-4.8.23-gettext.patch b/app-misc/mc/files/mc-4.8.23-gettext.patch
deleted file mode 100644
index 3ad67dbe5d40..000000000000
--- a/app-misc/mc/files/mc-4.8.23-gettext.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-https://bugs.gentoo.org/693850
-https://midnight-commander.org/raw-attachment/ticket/3629/mc-3629-Linking-fix-for-gettext.patch
-
-From 2a97524b42eeececd2ecd928a1154da1f5b7378a Mon Sep 17 00:00:00 2001
-From: Andreas Mohr <and@gmx.li>
-Date: Fri, 1 Apr 2016 06:44:22 +0000
-Subject: [PATCH] Linking fix for non-default gettext package
-
-mc lost the linking game if gettext package pulled from outside of system paths.
-(Pulling can be done by suitable C-/CPP/LDFLAGS settings)
-
-Furthermore gettext package depends on libintl (if system lib
-don't provide needed functions) then gettext prepare INITLIBS/LIBINTL variable
-for working libintl pull in from gettext libdir.
-
-https://www.gnu.org/software/gettext/FAQ.html#integrating_undefined
-
-Let respect LIBINTL variable at linking (it is empty if not needed).
-
-Failure example for Solaris 10 with non-system-default gettext package:
-
-Undefined first referenced
- symbol in file
- libintl_bind_textdomain_codeset ./.libs/libinternal.a(args.o)
- libintl_gettext main.o
- libintl_textdomain main.o
- libintl_bindtextdomain main.o
- libintl_ngettext ./.libs/libinternal.a(midnight.o)
-
-Signed-off-by: Andreas Mohr <and@gmx.li>
----
- src/Makefile.am | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -53,7 +53,8 @@ libinternal_la_LIBADD = \
-
- mc_LDADD = \
- libinternal.la \
-- $(top_builddir)/lib/libmc.la
-+ $(top_builddir)/lib/libmc.la \
-+ $(LIBINTL)
-
- if ENABLE_VFS_SMB
- # this is a hack for linking with own samba library in simple way
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -556,7 +557,7 @@ libinternal_la_LIBADD = \
- viewer/libmcviewer.la \
- $(DIFFLIB) $(EDITLIB) $(SUBSHELLLIB)
-
--mc_LDADD = libinternal.la $(top_builddir)/lib/libmc.la $(am__append_6)
-+mc_LDADD = libinternal.la $(top_builddir)/lib/libmc.la $(LIBINTL) $(am__append_6)
- SRC_mc_conssaver = \
- cons.handler.c consaver/cons.saver.h
diff --git a/app-misc/mc/mc-4.8.23-r1.ebuild b/app-misc/mc/mc-4.8.23-r1.ebuild
index 9bbeef2c62c4..cfb708711999 100644
--- a/app-misc/mc/mc-4.8.23-r1.ebuild
+++ b/app-misc/mc/mc-4.8.23-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
IUSE="+edit gpm nls samba sftp +slang spell test unicode X +xdg"
REQUIRED_USE="spell? ( edit )"
@@ -43,8 +43,6 @@ S=${WORKDIR}/${MY_P}
PATCHES=(
"${FILESDIR}"/${P}-3933-iso9660-1.patch
"${FILESDIR}"/${P}-3933-iso9660-2.patch
- "${FILESDIR}"/${PN}-4.8.23-gettext.patch
- "${FILESDIR}"/${PN}-4.8.23-gettext-test.patch
)
pkg_pretend() {
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 13:19:45 +0000