commit: e5976f5462b19b5c5cd61db49fe3bd1913103534
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 22 10:04:40 2018 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Thu Feb 22 10:04:40 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5976f54
net-misc/nx: drop old
Package-Manager: Portage-2.3.24, Repoman-2.3.6
net-misc/nx/Manifest | 2 -
net-misc/nx/files/1.5.0/nxcomp-1.5.0-pic.patch | 20 ----
.../files/nx-3.2.0-nxproxy_read_from_stdin.patch | 68 -------------
.../nx/files/nx-3.5.0.17-cflags_ar_ranlib.patch | 100 -------------------
.../files/nx-3.5.0.30-fix_X11_underlinking.patch | 11 ---
net-misc/nx/nx-3.5.0.30.ebuild | 106 ---------------------
net-misc/nx/nx-3.5.0.32.ebuild | 104 --------------------
7 files changed, 411 deletions(-)
diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
index 782057d00b2..e276636a000 100644
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -1,3 +1 @@
-DIST nx-libs-3.5.0.30-full.tar.gz 6639925 BLAKE2B
81b8bb4f39b6d7881c5a488e43ffcd2450917f48887f20eb9f1d98772a9a3aaaee9b901f9568b70bd9a2ae8f94768fb91b88b3aed8687871933f7b5506f1eb79
SHA512
223c73de1b8988d17a555a7dd56c14ddc27855b7c1d9a9b28c053161a707520c1fcef697c3d9148222dae23e1465e72821455271477ac835d5cc63498b45e005
-DIST nx-libs-3.5.0.32-full.tar.gz 6801696 BLAKE2B
05101b49e2e18d38527aaade47b067f0f7bb744ee2c9b0fde0458117630bd1b75990e0258cec092149026635e142f2a031fdc1656a5770111c445a7e7989c6b2
SHA512
8b4a042993d45e1aee3e13e8b86f68cd5b2a8b52e9299de6129abd8e3bb89d73cf2b44b03d3c7fabbd8329abc06dc912ac95bbf936b6478b05fc202cc29a090f
DIST nx-libs-3.5.0.33-full.tar.gz 6811378 BLAKE2B
f20de5f9f7214fa38f290b2a200481aeb80461b07839a19ca54059d0fb26de769f0d11720b6d443dd618b6ac5ce590a086a21745420411e6a09bfad65e8f8d79
SHA512
cfaa201e5422ddd8d1f12d3f0711d6d7a05fcd92379e5108c7c066ce8ae748f2f80f3bbbbba093d73cfe671fffc912443eb3ced0eeca1ab5a221c46488aa8bc5
diff --git a/net-misc/nx/files/1.5.0/nxcomp-1.5.0-pic.patch
b/net-misc/nx/files/1.5.0/nxcomp-1.5.0-pic.patch
deleted file mode 100644
index 2ccaf978dd0..00000000000
--- a/net-misc/nx/files/1.5.0/nxcomp-1.5.0-pic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- nxcomp/Makefile.in.agriffis 2005-11-12 12:48:42.000000000 -0500
-+++ nxcomp/Makefile.in 2005-12-15 12:24:46.000000000 -0500
-@@ -32,7 +32,7 @@
-
- CXX = @CXX@
- CXXFLAGS = @CXXFLAGS@ @X_CFLAGS@ @DEFS@ \
-- -Wall -Wpointer-arith
-+ -Wall -Wpointer-arith -fPIC
- CXXINCLUDES =
- CXXDEFINES =
-
-@@ -42,7 +42,7 @@
-
- CC = @CC@
- CCFLAGS = @CFLAGS@ @X_CFLAGS@ @DEFS@ \
-- -Wall -Wpointer-arith
-+ -Wall -Wpointer-arith -fPIC
- CCINCLUDES =
- CCDEFINES =
-
diff --git a/net-misc/nx/files/nx-3.2.0-nxproxy_read_from_stdin.patch
b/net-misc/nx/files/nx-3.2.0-nxproxy_read_from_stdin.patch
deleted file mode 100644
index bce692d10a7..00000000000
--- a/net-misc/nx/files/nx-3.2.0-nxproxy_read_from_stdin.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- Main.c.old 2007-07-18 17:39:13.000000000 +0200
-+++ Main.c 2008-03-12 04:40:30.000000000 +0100
-@@ -36,28 +36,48 @@
- int result = -1;
-
- char *options = NULL;
--
-+
-+ char *nx_commfd_str = NULL;
-+
- options = getenv("NX_DISPLAY");
--
-- if (NXTransParseCommandLine(argc, argv) < 0)
-+
-+ if ((nx_commfd_str = getenv("NX_COMMFD")) != NULL)
- {
-- NXTransCleanup();
-- }
-+ int nx_commfd = atoi(nx_commfd_str);
-
-- if (NXTransParseEnvironment(options, 0) < 0)
-- {
-- NXTransCleanup();
-+ if (result)
-+ result = NXTransCreate(nx_commfd, NX_MODE_SERVER, options);
-+
-+ // go into endless loop
-+
-+ if (result)
-+ {
-+ while (NXTransRunning(NX_FD_ANY))
-+ result = NXTransContinue(NULL);
-+ }
- }
-+ else
-+ {
-+ if (NXTransParseCommandLine(argc, argv) < 0)
-+ {
-+ NXTransCleanup();
-+ }
-+
-+ if (NXTransParseEnvironment(options, 0) < 0)
-+ {
-+ NXTransCleanup();
-+ }
-+
-+ /*
-+ * This should not return...
-+ */
-+
-+ #ifdef TEST
-+ fprintf(stderr, "Main: Yielding control to NX entry point.\n");
-+ #endif
-
-- /*
-- * This should not return...
-- */
--
-- #ifdef TEST
-- fprintf(stderr, "Main: Yielding control to NX entry point.\n");
-- #endif
--
-- result = NXTransProxy(NX_FD_ANY, NX_MODE_ANY, NX_DISPLAY_ANY);
-+ result = NXTransProxy(NX_FD_ANY, NX_MODE_ANY, NX_DISPLAY_ANY);
-+ }
-
- /*
- * ...So these should not be called.
diff --git a/net-misc/nx/files/nx-3.5.0.17-cflags_ar_ranlib.patch
b/net-misc/nx/files/nx-3.5.0.17-cflags_ar_ranlib.patch
deleted file mode 100644
index 668a6bf4c31..00000000000
--- a/net-misc/nx/files/nx-3.5.0.17-cflags_ar_ranlib.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff -Naur nx-libs-3.5.0.17.orig/nxcomp/Makefile.in
nx-libs-3.5.0.17/nxcomp/Makefile.in
---- nx-libs-3.5.0.17.orig/nxcomp/Makefile.in 2013-01-09 15:03:33.152952758
+0100
-+++ nx-libs-3.5.0.17/nxcomp/Makefile.in 2013-01-09 15:05:39.771898159
+0100
-@@ -243,8 +243,8 @@
-
- $(LIBARCHIVE): $(CXXOBJ) $(COBJ)
- rm -f $(LIBARCHIVE)
-- ar clq $(LIBARCHIVE) $(CXXOBJ) $(COBJ)
-- ranlib $(LIBARCHIVE)
-+ $(AR) $(LIBARCHIVE) $(CXXOBJ) $(COBJ)
-+ $(RANLIB) $(LIBARCHIVE)
-
- $(LIBCYGSHARED): $(LIBARCHIVE)
- $(CC) -shared -o $(LIBCYGSHARED) \
-diff -Naur nx-libs-3.5.0.17.orig/nxcomp/configure.in
nx-libs-3.5.0.17/nxcomp/configure.in
---- nx-libs-3.5.0.17.orig/nxcomp/configure.in 2013-01-09 15:03:33.151952758
+0100
-+++ nx-libs-3.5.0.17/nxcomp/configure.in 2013-01-09 15:04:03.312940892
+0100
-@@ -7,8 +7,7 @@
-
- dnl Set our default compilation flags.
-
--CXXFLAGS="$CXXFLAGS -O3 -fno-rtti -fno-exceptions"
--CFLAGS="$CFLAGS -O3"
-+CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions"
-
- dnl Reset default linking directives.
-
-diff -Naur nx-libs-3.5.0.17.orig/nxcompext/Makefile.in
nx-libs-3.5.0.17/nxcompext/Makefile.in
---- nx-libs-3.5.0.17.orig/nxcompext/Makefile.in 2013-01-09
15:03:33.164952753 +0100
-+++ nx-libs-3.5.0.17/nxcompext/Makefile.in 2013-01-09 15:06:08.747879052
+0100
-@@ -125,8 +125,8 @@
-
- $(LIBARCHIVE): $(CXXOBJ) $(COBJ)
- rm -f $(LIBARCHIVE)
-- ar clq $(LIBARCHIVE) $(CXXOBJ) $(COBJ)
-- ranlib $(LIBARCHIVE)
-+ $(AR) $(LIBARCHIVE) $(CXXOBJ) $(COBJ)
-+ $(RANLIB) $(LIBARCHIVE)
-
- $(LIBCYGSHARED): $(LIBARCHIVE)
- $(CC) -shared -o $(LIBCYGSHARED) \
-diff -Naur nx-libs-3.5.0.17.orig/nxcompext/configure.in
nx-libs-3.5.0.17/nxcompext/configure.in
---- nx-libs-3.5.0.17.orig/nxcompext/configure.in 2013-01-09
15:03:33.164952753 +0100
-+++ nx-libs-3.5.0.17/nxcompext/configure.in 2013-01-09 15:04:16.247935801
+0100
-@@ -5,11 +5,6 @@
- AC_INIT(NXlib.h)
- AC_PREREQ(2.13)
-
--dnl Reset default compilation flags.
--
--CXXFLAGS="$CXXFLAGS -O3"
--CFLAGS="$CFLAGS -O3"
--
- dnl Reset default linking directives.
-
- LIBSTATIC=""
-diff -Naur nx-libs-3.5.0.17.orig/nxcompshad/Makefile.in
nx-libs-3.5.0.17/nxcompshad/Makefile.in
---- nx-libs-3.5.0.17.orig/nxcompshad/Makefile.in 2013-01-09
15:03:33.163952754 +0100
-+++ nx-libs-3.5.0.17/nxcompshad/Makefile.in 2013-01-09 15:06:16.933873660
+0100
-@@ -158,8 +158,8 @@
-
- $(LIBARCHIVE): $(CXXOBJ) $(COBJ)
- rm -f $(LIBARCHIVE)
-- ar clq $(LIBARCHIVE) $(CXXOBJ) $(COBJ)
-- ranlib $(LIBARCHIVE)
-+ $(AR) $(LIBARCHIVE) $(CXXOBJ) $(COBJ)
-+ $(RANLIB) $(LIBARCHIVE)
-
- $(LIBDLL): $(LIBARCHIVE)
- $(CC) -o $@ \
-diff -Naur nx-libs-3.5.0.17.orig/nxcompshad/configure.in
nx-libs-3.5.0.17/nxcompshad/configure.in
---- nx-libs-3.5.0.17.orig/nxcompshad/configure.in 2013-01-09
15:03:33.163952754 +0100
-+++ nx-libs-3.5.0.17/nxcompshad/configure.in 2013-01-09 15:04:20.073934295
+0100
-@@ -5,11 +5,6 @@
- AC_INIT(Shadow.h)
- AC_PREREQ(2.13)
-
--dnl Reset default compilation flags.
--
--CXXFLAGS="$CXXFLAGS -O3"
--CPPFLAGS="$CPPFLAGS -O3"
--
- dnl Reset default linking directives.
-
- LIBSTATIC=""
-diff -Naur nx-libs-3.5.0.17.orig/nxproxy/configure.in
nx-libs-3.5.0.17/nxproxy/configure.in
---- nx-libs-3.5.0.17.orig/nxproxy/configure.in 2013-01-09 15:03:33.163952754
+0100
-+++ nx-libs-3.5.0.17/nxproxy/configure.in 2013-01-09 15:04:24.842932418
+0100
-@@ -5,11 +5,6 @@
- AC_INIT(Main.c)
- AC_PREREQ(2.13)
-
--dnl Reset default compilation flags.
--
--CXXFLAGS="$CXXFLAGS -O3"
--CPPFLAGS="$CPPFLAGS -O3"
--
- dnl Prefer headers and libraries from nx-X11 if present.
-
- if test -d "../nx-X11/exports/include" ; then
diff --git a/net-misc/nx/files/nx-3.5.0.30-fix_X11_underlinking.patch
b/net-misc/nx/files/nx-3.5.0.30-fix_X11_underlinking.patch
deleted file mode 100644
index 87d73c5a8d3..00000000000
--- a/net-misc/nx/files/nx-3.5.0.30-fix_X11_underlinking.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- nx-X11/lib/X11/Imakefile.orig 2015-04-24 15:24:36.171666957 +0200
-+++ nx-X11/lib/X11/Imakefile 2015-04-24 15:25:17.516179627 +0200
-@@ -107,7 +107,7 @@
- EXCLUDE_SYMBOL = -Wl,--exclude-symbol,XdmcpWrap:_XdmcpWrapperToOddParity
- #endif
-
--REQUIREDLIBS=$(REQUIREDX11LIBS) $(REQUIREDI18NLIBS) $(EXCLUDE_SYMBOL)
$(NX_REQUIREDLIBS)
-+REQUIREDLIBS=$(REQUIREDX11LIBS) $(REQUIREDI18NLIBS) $(EXCLUDE_SYMBOL)
$(NX_REQUIREDLIBS) -ldl
-
- #if defined(MacIIArchitecture) || defined(SequentArchitecture) ||
defined(i386ScoArchitecture)
- XBSDLIB = /**/
diff --git a/net-misc/nx/nx-3.5.0.30.ebuild b/net-misc/nx/nx-3.5.0.30.ebuild
deleted file mode 100644
index 36d736fb7a3..00000000000
--- a/net-misc/nx/nx-3.5.0.30.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils multilib readme.gentoo
-
-DESCRIPTION="NX compression technology core libraries"
-HOMEPAGE="http://www.x2go.org/doku.php/wiki:libs:nx-libs";
-
-SRC_URI="http://code.x2go.org/releases/source/nx-libs/nx-libs-${PV}-full.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="elibc_glibc"
-
-RDEPEND="media-libs/freetype:2
- >=media-libs/libpng-1.2.8:*
- >=sys-libs/zlib-1.2.3
- virtual/jpeg:*"
-
-DEPEND="${RDEPEND}
- x11-libs/libfontenc
- x11-misc/gccmakedep
- x11-misc/imake
- x11-proto/inputproto"
-
-S=${WORKDIR}/nx-libs-${PV}
-
-DOC_CONTENTS="If you get problems with rendering gtk+ apps, enable the xlib-xcb
-useflag on x11-libs/cairo."
-
-src_prepare() {
- # For nxcl/qtnx
- cd "${S}"/nxproxy
- epatch "${FILESDIR}"/${PN}-3.2.0-nxproxy_read_from_stdin.patch
-
- cd "${S}"
- # -fPIC
- epatch "${FILESDIR}"/1.5.0/nxcomp-1.5.0-pic.patch
- # Drop force -O3, set AR/RANLIB
- epatch "${FILESDIR}"/${PN}-3.5.0.17-cflags_ar_ranlib.patch
- # Fix libX11 underlinking, #546868
- epatch "${FILESDIR}"/${P}-fix_X11_underlinking.patch
-
- # run autoreconf in all neeed folders
- for i in nxcomp nxcompext nxcompshad nxproxy; do
- cd "${S}"/${i}
- eautoreconf ${i}
- cd "${S}"
- done
-
- # From xorg-x11-6.9.0-r3.ebuild
- cd "${S}/nx-X11"
- HOSTCONF="config/cf/host.def"
- echo "#define CcCmd $(tc-getCC)" >> ${HOSTCONF}
- echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >>
${HOSTCONF}
- echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs"
>> ${HOSTCONF}
- # Respect LDFLAGS
- echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF}
- echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF}
-}
-
-src_configure() {
- cd "${S}"/nxproxy
- econf
-}
-
-src_compile() {
- cd "${S}/nx-X11"
- FAST=1 emake World WORLDOPTS="" MAKE="make" \
- AR="$(tc-getAR) clq" RANLIB="$(tc-getRANLIB)" \
- CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-
- cd "${S}"/nxproxy
- emake
-}
-
-src_install() {
- NX_ROOT=/usr/$(get_libdir)/NX
-
- for x in nxagent nxauth nxproxy; do
- make_wrapper $x ./$x ${NX_ROOT}/bin ${NX_ROOT}/$(get_libdir) ||
- die " $x wrapper creation failed"
- done
-
- into ${NX_ROOT}
- dobin "${S}"/nx-X11/programs/Xserver/nxagent
- dobin "${S}"/nx-X11/programs/nxauth/nxauth
- dobin "${S}"/nxproxy/nxproxy
-
- for lib in X11 Xau Xcomposite Xdamage Xdmcp Xext Xfixes Xinerama Xpm
Xrandr Xrender Xtst;
- do
- dolib.so "${S}"/nx-X11/lib/${lib}/libNX_${lib}.so*
- done
-
- dolib.so "${S}"/nxcomp/libXcomp.so*
- dolib.so "${S}"/nxcompext/libXcompext.so*
- dolib.so "${S}"/nxcompshad/libXcompshad.so*
-
- insinto /etc/nxagent
- newins etc/keystrokes.cfg keystroke.cfg
- doicon nx-X11/programs/Xserver/hw/nxagent/x2go.xpm
-
- readme.gentoo_create_doc
-}
diff --git a/net-misc/nx/nx-3.5.0.32.ebuild b/net-misc/nx/nx-3.5.0.32.ebuild
deleted file mode 100644
index d992d5fb33d..00000000000
--- a/net-misc/nx/nx-3.5.0.32.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils multilib readme.gentoo
-
-DESCRIPTION="NX compression technology core libraries"
-HOMEPAGE="http://www.x2go.org/doku.php/wiki:libs:nx-libs";
-
-SRC_URI="http://code.x2go.org/releases/source/nx-libs/nx-libs-${PV}-full.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="elibc_glibc"
-
-RDEPEND="media-libs/freetype:2
- >=media-libs/libpng-1.2.8:*
- >=sys-libs/zlib-1.2.3
- virtual/jpeg:*"
-
-DEPEND="${RDEPEND}
- x11-libs/libfontenc
- x11-misc/gccmakedep
- x11-misc/imake
- x11-proto/inputproto"
-
-S=${WORKDIR}/nx-libs-${PV}
-
-DOC_CONTENTS="If you get problems with rendering gtk+ apps, enable the xlib-xcb
-useflag on x11-libs/cairo."
-
-src_prepare() {
- # For nxcl/qtnx
- cd "${S}"/nxproxy
- epatch "${FILESDIR}"/${PN}-3.2.0-nxproxy_read_from_stdin.patch
-
- cd "${S}"
- # -fPIC
- epatch "${FILESDIR}"/1.5.0/nxcomp-1.5.0-pic.patch
- # Drop force -O3, set AR/RANLIB
- epatch "${FILESDIR}"/${PN}-3.5.0.17-cflags_ar_ranlib.patch
-
- # run autoreconf in all neeed folders
- for i in nxcomp nxcompext nxcompshad nxproxy; do
- cd "${S}"/${i}
- eautoreconf ${i}
- cd "${S}"
- done
-
- # From xorg-x11-6.9.0-r3.ebuild
- cd "${S}/nx-X11"
- HOSTCONF="config/cf/host.def"
- echo "#define CcCmd $(tc-getCC)" >> ${HOSTCONF}
- echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >>
${HOSTCONF}
- echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs"
>> ${HOSTCONF}
- # Respect LDFLAGS
- echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF}
- echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF}
-}
-
-src_configure() {
- cd "${S}"/nxproxy
- econf
-}
-
-src_compile() {
- cd "${S}/nx-X11"
- FAST=1 emake World WORLDOPTS="" MAKE="make" \
- AR="$(tc-getAR) clq" RANLIB="$(tc-getRANLIB)" \
- CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-
- cd "${S}"/nxproxy
- emake
-}
-
-src_install() {
- NX_ROOT=/usr/$(get_libdir)/NX
-
- for x in nxagent nxauth nxproxy; do
- make_wrapper $x ./$x ${NX_ROOT}/bin ${NX_ROOT}/$(get_libdir) ||
- die " $x wrapper creation failed"
- done
-
- into ${NX_ROOT}
- dobin "${S}"/nx-X11/programs/Xserver/nxagent
- dobin "${S}"/nx-X11/programs/nxauth/nxauth
- dobin "${S}"/nxproxy/nxproxy
-
- for lib in X11 Xau Xcomposite Xdamage Xdmcp Xext Xfixes Xinerama Xpm
Xrandr Xrender Xtst;
- do
- dolib.so "${S}"/nx-X11/lib/${lib}/libNX_${lib}.so*
- done
-
- dolib.so "${S}"/nxcomp/libXcomp.so*
- dolib.so "${S}"/nxcompext/libXcompext.so*
- dolib.so "${S}"/nxcompshad/libXcompshad.so*
-
- insinto /etc/nxagent
- newins etc/keystrokes.cfg keystroke.cfg
- doicon nx-X11/programs/Xserver/hw/nxagent/x2go.xpm
-
- readme.gentoo_create_doc
-}
