summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2018-03-08 10:09:25 +0100
committerBernard Cafarelli <voyageur@gentoo.org>2018-03-08 10:53:33 +0100
commit0c78a83a62d81724ba41f1b7fde8e084db5b6861 (patch)
tree20d281a77fd41c3fad8c6c62bade27a57119ce7e /net-misc
parentgames-misc/funny-manpages: Bump to version 2.3 (diff)
downloadgentoo-0c78a83a62d81724ba41f1b7fde8e084db5b6861.tar.gz
gentoo-0c78a83a62d81724ba41f1b7fde8e084db5b6861.tar.bz2
gentoo-0c78a83a62d81724ba41f1b7fde8e084db5b6861.zip
net-misc/nx: 3.5.99.15 bump
Still need some tests and fixes Package-Manager: Portage-2.3.24, Repoman-2.3.6
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/nx/Manifest2
-rw-r--r--net-misc/nx/nx-3.5.99.15.ebuild (renamed from net-misc/nx/nx-3.5.99.14.ebuild)21
2 files changed, 6 insertions, 17 deletions
diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
index dc5e88e708a..648fa107679 100644
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -1,2 +1,2 @@
DIST nx-libs-3.5.0.33-full.tar.gz 6811378 BLAKE2B f20de5f9f7214fa38f290b2a200481aeb80461b07839a19ca54059d0fb26de769f0d11720b6d443dd618b6ac5ce590a086a21745420411e6a09bfad65e8f8d79 SHA512 cfaa201e5422ddd8d1f12d3f0711d6d7a05fcd92379e5108c7c066ce8ae748f2f80f3bbbbba093d73cfe671fffc912443eb3ced0eeca1ab5a221c46488aa8bc5
-DIST nx-libs-3.5.99.14-full.tar.gz 5265600 BLAKE2B de95c2f432a6708187bbe40a5fb6682275e759953e006add5e528acf67b72bb3fedc23a0a15f4cb52e8dab843de591cbd9ea199db45b37a86476b52b080af87f SHA512 0d6afd0acef2327b5746737f4a570d818948e4e57151be749320999008ad8fd188a2b6beae5da8f12675a9640c29f83f9d4f5ed2c53fb6b943836dcd04c380f0
+DIST nx-libs-3.5.99.15-full.tar.gz 5269081 BLAKE2B 79301870463aae8e71eaf8cad64ad03376c33d42c76884313ca78d439a070d41fff91af4894b60e38bbcc97c3e08e167b45675641cd8d06959fc68f1fece9de4 SHA512 b292e938bc8da7456418ef5356ebe04910ad306d6bb16d6befa3bb875f82b11a2a3f07488e42c6379bef60fc9e150695a8ec84e7af2f594fbd94883d90030e3f
diff --git a/net-misc/nx/nx-3.5.99.14.ebuild b/net-misc/nx/nx-3.5.99.15.ebuild
index 45c2791e745..fd9f30ce014 100644
--- a/net-misc/nx/nx-3.5.99.14.ebuild
+++ b/net-misc/nx/nx-3.5.99.15.ebuild
@@ -60,7 +60,7 @@ src_prepare() {
}
src_configure() {
- for i in nxcomp nx-X11/lib nxproxy ; do
+ for i in nxcomp nx-X11/lib nxcompshad nxproxy ; do
pushd ${i} || die
econf
popd || die
@@ -76,13 +76,8 @@ src_compile() {
# - calls autoreconf several times
# - invokes make directly but we prefer our emake
- pushd nxcomp || die
- emake
- popd || die
-
- pushd nx-X11/lib || die
- emake
- popd || die
+ emake -C nxcomp
+ emake -C nx-X11/lib
mkdir -p nx-X11/exports/lib/ || die
local nxlib
@@ -90,20 +85,14 @@ src_compile() {
ln -s ../../lib/src/.libs/${nxlib} nx-X11/exports/lib/${nxlib} || die
done
- pushd nxcompshad || die
- # Configuration can only run after X11 lib compilation
- econf
- emake
- popd || die
+ emake -C nxcompshad
./mesa-quilt push -a || die
emake -C nx-X11 BuildDependsOnly FONT_DEFINES="-DHAS_XFONT2"
emake -C nx-X11 World USRLIBDIR="/usr/$(get_libdir)/${PN}/X11" SHLIBDIR="/usr/$(get_libdir)" FONT_DEFINES="-DHAS_XFONT2" XFONTLIB="-lXfont2"
- pushd nxproxy || die
- emake
- popd || die
+ emake -C nxproxy
}
src_install() {