Skip to content

Commit

Permalink
games-action/minetest: Remove misleading USE=jsoncpp flag
Browse files Browse the repository at this point in the history
* dev-libs/jsoncpp is required unconditionally,
  USE=jsoncpp would just toggle between the bundled
  and system one, which is obviously wrong.

Closes: https://bugs.gentoo.org/682996
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: David Seifert <[email protected]>
  • Loading branch information
SoapGentoo committed Apr 10, 2019
1 parent 03b1aa5 commit d26b3a3
Showing 1 changed file with 6 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,12 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1+ CC-BY-SA-3.0 OFL-1.1 Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="+curl dedicated doc jsoncpp +leveldb luajit ncurses nls postgres redis +server +sound spatial +truetype"
IUSE="+curl dedicated doc +leveldb luajit ncurses nls postgres redis +server +sound spatial +truetype"

RDEPEND="
dev-db/sqlite:3
dev-libs/gmp:0=
dev-libs/jsoncpp:=
sys-libs/zlib
curl? ( net-misc/curl )
!dedicated? (
Expand All @@ -34,7 +35,6 @@ RDEPEND="
)
truetype? ( media-libs/freetype:2 )
)
jsoncpp? ( dev-libs/jsoncpp )
leveldb? ( dev-libs/leveldb:= )
luajit? ( dev-lang/luajit:2 )
ncurses? ( sys-libs/ncurses:0= )
Expand Down Expand Up @@ -64,6 +64,9 @@ src_prepare() {
-e "s#@BINDIR@#${EPREFIX}/usr/bin#g" \
-e "s#@GROUP@#${PN}#g" \
"${FILESDIR}"/minetestserver.confd > "${T}"/minetestserver.confd || die

# remove bundled gmp/jsoncpp
rm -rf lib/{gmp,jsoncpp} || die
}

src_configure() {
Expand All @@ -85,7 +88,7 @@ src_configure() {
-DENABLE_REDIS=$(usex redis)
-DENABLE_SPATIAL=$(usex spatial)
-DENABLE_SOUND=$(usex sound)
-DENABLE_SYSTEM_JSONCPP=$(usex jsoncpp)
-DENABLE_SYSTEM_JSONCPP=1
-DRUN_IN_PLACE=0
)

Expand Down

0 comments on commit d26b3a3

Please sign in to comment.