[gentoo-commits] repo/gentoo:master commit in: app-misc/mc/

["Sergei Trofimovich" <slyfox@gentoo.org>]

commit:     b8bb62f24882f4db3f16b80b650bc4c575223e0b
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed May 15 07:45:52 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed May 15 07:46:10 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8bb62f2

app-misc/mc: drop USE=mclib, bug #685938

Today mclib does not expose any headers and is linked to
single 'mc' binary. Thus there is no advantage of having
a library. Let's avoid shared library altogether
as it also conflicts with sci-libs/mc.

Reported-by: Toralf Förster
Closes: https://bugs.gentoo.org/685938
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 app-misc/mc/mc-4.8.22.ebuild | 8 ++++++--
 app-misc/mc/mc-9999.ebuild   | 8 ++++++--
 app-misc/mc/metadata.xml     | 1 -
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/app-misc/mc/mc-4.8.22.ebuild b/app-misc/mc/mc-4.8.22.ebuild
index f8cbc5a2c39..1e7d94b1081 100644
--- a/app-misc/mc/mc-4.8.22.ebuild
+++ b/app-misc/mc/mc-4.8.22.ebuild
@@ -14,7 +14,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"
-IUSE="+edit gpm mclib nls samba sftp +slang spell test unicode X +xdg"
+IUSE="+edit gpm nls samba sftp +slang spell test unicode X +xdg"
 
 REQUIRED_USE="spell? ( edit )"
 
@@ -57,7 +57,11 @@ src_configure() {
 		--with-homedir=$(usex xdg 'XDG' '.mc')
 		--with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')")
 		$(use_enable kernel_linux vfs-undelfs)
-		$(use_enable mclib)
+		# Today mclib does not expose any headers and is linked to
+		# single 'mc' binary. Thus there is no advantage of having
+		# a library. Let's avoid shared library altogether
+		# as it also conflicts with sci-libs/mc: bug #685938
+		--disable-mclib
 		$(use_enable nls)
 		$(use_enable samba vfs-smb)
 		$(use_enable sftp vfs-sftp)

diff --git a/app-misc/mc/mc-9999.ebuild b/app-misc/mc/mc-9999.ebuild
index d27af1106ec..a8a30b230b1 100644
--- a/app-misc/mc/mc-9999.ebuild
+++ b/app-misc/mc/mc-9999.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="https://www.midnight-commander.org"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="+edit gpm mclib nls samba sftp +slang spell test unicode X +xdg"
+IUSE="+edit gpm nls samba sftp +slang spell test unicode X +xdg"
 
 REQUIRED_USE="spell? ( edit )"
 
@@ -70,7 +70,11 @@ src_configure() {
 		--with-homedir=$(usex xdg 'XDG' '.mc')
 		--with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')")
 		$(use_enable kernel_linux vfs-undelfs)
-		$(use_enable mclib)
+		# Today mclib does not expose any headers and is linked to
+		# single 'mc' binary. Thus there is no advantage of having
+		# a library. Let's avoid shared library altogether
+		# as it also conflicts with sci-libs/mc: bug #685938
+		--disable-mclib
 		$(use_enable nls)
 		$(use_enable samba vfs-smb)
 		$(use_enable sftp vfs-sftp)

diff --git a/app-misc/mc/metadata.xml b/app-misc/mc/metadata.xml
index 35fa1001c11..5c99ff657dd 100644
--- a/app-misc/mc/metadata.xml
+++ b/app-misc/mc/metadata.xml
@@ -15,7 +15,6 @@
   </maintainer>
   <use>
     <flag name="edit">Compile and install the mcedit application</flag>
-    <flag name="mclib">Compile and install the libmc.so shared library</flag>
     <flag name="sftp">Add support for sftp (uses <pkg>net-libs/libssh2</pkg> for it).</flag>
     <flag name="slang">Use <pkg>sys-libs/slang</pkg> instead of <pkg>sys-libs/ncurses</pkg>.</flag>
     <flag name="xdg">Toggles mc's config dir location. Enable for $XDG_CONFIG_HOME/mc, disable for $HOME/.mc</flag>