diff --git a/app-editors/nano/nano-8.0.ebuild b/app-editors/nano/nano-8.0.ebuild index 1ab91a8b3d8f4..4fd1b503d2c78 100644 --- a/app-editors/nano/nano-8.0.ebuild +++ b/app-editors/nano/nano-8.0.ebuild @@ -19,19 +19,15 @@ HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Guide" LICENSE="GPL-3+ LGPL-2.1+ || ( GPL-3+ FDL-1.2+ )" SLOT="0" -IUSE="debug justify magic minimal ncurses nls +spell static unicode" +IUSE="debug justify magic minimal ncurses nls +spell unicode" -LIB_DEPEND=" +RDEPEND=" >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] - sys-libs/ncurses:=[static-libs(+)] - magic? ( sys-apps/file[static-libs(+)] ) + sys-libs/ncurses:= + magic? ( sys-apps/file ) nls? ( virtual/libintl ) " -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" -DEPEND=" - ${RDEPEND} - static? ( ${LIB_DEPEND} ) -" +DEPEND="${RDEPEND}" BDEPEND=" nls? ( sys-devel/gettext ) virtual/pkgconfig @@ -53,8 +49,6 @@ src_prepare() { } src_configure() { - use static && append-ldflags -static - local myconfargs=( --bindir="${EPREFIX}"/bin --htmldir=/trash diff --git a/app-editors/nano/nano-9999.ebuild b/app-editors/nano/nano-9999.ebuild index e66a301a6c4b3..864ebe37cbae9 100644 --- a/app-editors/nano/nano-9999.ebuild +++ b/app-editors/nano/nano-9999.ebuild @@ -19,19 +19,15 @@ HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Guide" LICENSE="GPL-3+ LGPL-2.1+ || ( GPL-3+ FDL-1.2+ )" SLOT="0" -IUSE="debug justify magic minimal ncurses nls +spell static unicode" +IUSE="debug justify magic minimal ncurses nls +spell unicode" -LIB_DEPEND=" +RDEPEND=" >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] - sys-libs/ncurses:=[static-libs(+)] - magic? ( sys-apps/file[static-libs(+)] ) + sys-libs/ncurses:= + magic? ( sys-apps/file ) nls? ( virtual/libintl ) " -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" -DEPEND=" - ${RDEPEND} - static? ( ${LIB_DEPEND} ) -" +DEPEND="${RDEPEND}" BDEPEND=" nls? ( sys-devel/gettext ) virtual/pkgconfig @@ -53,8 +49,6 @@ src_prepare() { } src_configure() { - use static && append-ldflags -static - local myconfargs=( --bindir="${EPREFIX}"/bin --htmldir=/trash