Missing build dependency on x11-libs/libfontenc, thanks everyone in bug #536058. Remove some versions

(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key C74525F2)

5 files changed, 12 insertions, 255 deletions

diff --git a/net-misc/nx/ChangeLog b/net-misc/nx/ChangeLog
index a0e34c6bb58c..9f13ee735fb8 100644
--- a/net-misc/nx/ChangeLog
+++ b/net-misc/nx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/nx
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.89 2014/11/14 12:40:56 voyageur Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.90 2015/02/18 17:19:38 voyageur Exp $
+
+  18 Feb 2015; Bernard Cafarelli <voyageur@gentoo.org> -nx-3.5.0.24.ebuild,
+  -nx-3.5.0.27.ebuild, nx-3.5.0.28.ebuild, -files/nx-3.5.0.27-jpeg-9a.patch:
+  Missing build dependency on x11-libs/libfontenc, thanks everyone in bug
+  #536058. Remove some versions
 
 *nx-3.5.0.28 (14 Nov 2014)
 
diff --git a/net-misc/nx/files/nx-3.5.0.27-jpeg-9a.patch b/net-misc/nx/files/nx-3.5.0.27-jpeg-9a.patch
deleted file mode 100644
index 4c0aeb2f4091..000000000000
--- a/net-misc/nx/files/nx-3.5.0.27-jpeg-9a.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-http://bugs.gentoo.org/481360
-
---- nxcomp/Jpeg.cpp
-+++ nxcomp/Jpeg.cpp
-@@ -443,7 +443,7 @@
- 
-   JpegSetSrcManager(&cinfo, compressedData, compressedLen);
- 
--  jpeg_read_header(&cinfo, 1);
-+  jpeg_read_header(&cinfo, TRUE);
- 
-   if (jpegError) goto AbortDecompressJpeg16;
- 
-@@ -584,7 +584,7 @@
- 
-   JpegSetSrcManager(&cinfo, compressedData, compressedLen);
- 
--  jpeg_read_header(&cinfo, 1);
-+  jpeg_read_header(&cinfo, TRUE);
- 
-   if (jpegError) goto AbortDecompressJpeg24;
- 
-@@ -721,7 +721,7 @@
- 
-   JpegSetSrcManager(&cinfo, compressedData, compressedLen);
- 
--  jpeg_read_header(&cinfo, 1);
-+  jpeg_read_header(&cinfo, TRUE);
- 
-   if (jpegError) goto AbortDecompressJpeg32;
- 
-@@ -836,7 +836,7 @@
-   jpegSrcManager.bytes_in_buffer = jpegBufferLen;
-   jpegSrcManager.next_input_byte = (JOCTET *)jpegBufferPtr;
- 
--  return 1;
-+  return TRUE;
- }
- 
- static void JpegSkipInputData(j_decompress_ptr cinfo, long num_bytes)
diff --git a/net-misc/nx/nx-3.5.0.24.ebuild b/net-misc/nx/nx-3.5.0.24.ebuild
deleted file mode 100644
index 31d89f67e57b..000000000000
--- a/net-misc/nx/nx-3.5.0.24.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-3.5.0.24.ebuild,v 1.2 2014/08/22 08:20:03 voyageur Exp $
-
-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="elibc_glibc? ( || ( net-libs/libtirpc <sys-libs/glibc-2.14 ) )
-	media-libs/freetype:2
-	>=media-libs/libpng-1.2.8
-	>=sys-libs/zlib-1.2.3
-	virtual/jpeg"
-
-DEPEND="${RDEPEND}
-		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 and
-	# run autoreconf in all neeed folders
-	epatch "${FILESDIR}"/${PN}-3.5.0.17-cflags_ar_ranlib.patch
-	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.27.ebuild b/net-misc/nx/nx-3.5.0.27.ebuild
deleted file mode 100644
index 232ea0d18ca9..000000000000
--- a/net-misc/nx/nx-3.5.0.27.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-3.5.0.27.ebuild,v 1.3 2014/08/22 08:20:03 voyageur Exp $
-
-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="elibc_glibc? ( || ( net-libs/libtirpc <sys-libs/glibc-2.14 ) )
-	media-libs/freetype:2
-	>=media-libs/libpng-1.2.8
-	>=sys-libs/zlib-1.2.3
-	virtual/jpeg"
-
-DEPEND="${RDEPEND}
-		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}"
-	epatch "${FILESDIR}"/${P}-jpeg-9a.patch #481360
-	# -fPIC
-	epatch "${FILESDIR}"/1.5.0/nxcomp-1.5.0-pic.patch
-	# Drop force -O3, set AR/RANLIB and
-	# run autoreconf in all neeed folders
-	epatch "${FILESDIR}"/${PN}-3.5.0.17-cflags_ar_ranlib.patch
-	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.28.ebuild b/net-misc/nx/nx-3.5.0.28.ebuild
index 0f0ff0856e64..eaa10e9d8b83 100644
--- a/net-misc/nx/nx-3.5.0.28.ebuild
+++ b/net-misc/nx/nx-3.5.0.28.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-3.5.0.28.ebuild,v 1.1 2014/11/14 12:40:56 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-3.5.0.28.ebuild,v 1.2 2015/02/18 17:19:38 voyageur Exp $
 
 EAPI=5
 inherit autotools eutils multilib readme.gentoo
@@ -17,11 +17,12 @@ IUSE="elibc_glibc"
 
 RDEPEND="elibc_glibc? ( || ( net-libs/libtirpc <sys-libs/glibc-2.14 ) )
 	media-libs/freetype:2
-	>=media-libs/libpng-1.2.8
+	>=media-libs/libpng-1.2.8:*
 	>=sys-libs/zlib-1.2.3
-	virtual/jpeg"
+	virtual/jpeg:*"
 
 DEPEND="${RDEPEND}
+		x11-libs/libfontenc
 		x11-misc/gccmakedep
 		x11-misc/imake
 		x11-proto/inputproto"