diff options
author | 2015-02-18 17:19:49 +0000 | |
---|---|---|
committer | 2015-02-18 17:19:49 +0000 | |
commit | 8e57513cb156cd5b0b87afdb24d8b8ba534b2967 (patch) | |
tree | ac078e0d612a14ae24ec3908b559aaf1cc9692a4 | |
parent | Fix SIGABRT failure when compiled with SSP-enabled gcc, bug #511698, patch by... (diff) | |
download | historical-8e57513cb156cd5b0b87afdb24d8b8ba534b2967.tar.gz historical-8e57513cb156cd5b0b87afdb24d8b8ba534b2967.tar.bz2 historical-8e57513cb156cd5b0b87afdb24d8b8ba534b2967.zip |
Missing build dependency on x11-libs/libfontenc, thanks everyone in bug #536058. Remove some versions
Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xC74525F2
-rw-r--r-- | net-misc/nx/ChangeLog | 9 | ||||
-rw-r--r-- | net-misc/nx/Manifest | 15 | ||||
-rw-r--r-- | net-misc/nx/files/nx-3.5.0.27-jpeg-9a.patch | 40 | ||||
-rw-r--r-- | net-misc/nx/nx-3.5.0.24.ebuild | 104 | ||||
-rw-r--r-- | net-misc/nx/nx-3.5.0.27.ebuild | 105 | ||||
-rw-r--r-- | net-misc/nx/nx-3.5.0.28.ebuild | 9 |
6 files changed, 17 insertions, 265 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/Manifest b/net-misc/nx/Manifest index df6fcef7e312..48c61514b954 100644 --- a/net-misc/nx/Manifest +++ b/net-misc/nx/Manifest @@ -6,21 +6,16 @@ AUX 1.5.0/nxcomp-1.5.0-pic.patch 522 SHA256 d4fb814d5ee3bd13c39e535b731caab0acb9 AUX nx-3.2.0-nxproxy_read_from_stdin.patch 1382 SHA256 7674e887e1be1134110e2219a96b413efa2b32d9be50de77d15b9dcbad8a4d76 SHA512 d7ae8eb5e43371b913ebb182436284c3a7526b1485bd2e4a969e0e02299315d6a4f036f54f477ebb4299138ba23d830aea46ef2ff6e90ada2a74ef6e95948924 WHIRLPOOL 940299b85e79c6e2e23d2255acf8d37d3f38606d084dd51347dbf67e00283ad8993b6281095d499d4a78e9de11bbf866120ab42ca0d1dcf65590eb53f71f61db AUX nx-3.3.0-cflags.patch 1322 SHA256 88e9506a5809e1357c29b4f0ec1777b69335e35e90a22ab14f98fd616d67fc6e SHA512 ae85b1084b0226c14fdf2aae8f3a3c2fcb6d2fd2a1a14d931ddb51657b91c5c4296036332f7e0cde3c26d715061d68cfe685883162440663e07496b9fc2862ae WHIRLPOOL e4ab646c3a9dd97d886f6aca64096c0bf2ad32d8bae72596e81d5d2aa7f1a70cf5eb9e0c7cd4737dc843ad68cdba54c5f4693649741ddd9247ce0a19d8b07039 AUX nx-3.5.0.17-cflags_ar_ranlib.patch 3518 SHA256 a129ea9d774997d946babe09d431e21ee4eaf5538b52a6a8a4fe2f9ff7c78f25 SHA512 df036cafc3526526e6768976f6ddca97584dbea2f7008c9c6a977922389e0e12901fd399794a10e2050380e5ad4066f364c2ebd5bd6e94e65143ccb100000400 WHIRLPOOL 6a6c909699ff9be60ecba4990b131cdd68d44959d35f95bd166846517065ee044784a48b2eec0fad6c80ecef0b821e75953a7189275a3e69bb88eaa573de61b2 -AUX nx-3.5.0.27-jpeg-9a.patch 916 SHA256 e0a8772cc509c1e4cba98340241d1b84bdf2766c790a318321cb75004cf8b326 SHA512 274ed1702d01e66b862151cb7486bc0061c6354d3971f4f52c3104f3ffe70dfd8adbd79ee8db7a58b4ef0bebf824ba28c80007d4bf800955dc5fe2c981d13fc6 WHIRLPOOL d04a5ee6262788e1a5acbdff6908dae3adb58a405d55d2e7f702762a4a0564f57ef02f43503b910ce68b02101012cf956c6fd846a74da333cd1ed28a9f7d4d38 DIST nx-libs-3.5.0.20-full.tar.gz 21875905 SHA256 ce53b1c1cc5115d1303b652099c7b7e1a50a996ff0f136853a6fd54bb5668da8 SHA512 0cecdde638c454e6bf48cb73037a0b6651eda4cf93c5953f678a122219df6c06cea70509b044482ea1b630ae413b26a701341b20d55347b57170517aa9709eef WHIRLPOOL a2d8e64db333d02ca22d0d0a8e9e2ea97199fb3315af8cb60ffd617a8e8a0b2851ce87d912d40c3cd00e7455a67a096ac48360a5a1df2ffb4c627ecd0dbed513 -DIST nx-libs-3.5.0.24-full.tar.gz 15569555 SHA256 95ed68d34ceec0ce43cb8175d6b555dfde46b5ae8c3fb943ed5a9ff138d5b94b SHA512 b73e657d29c58da46d05ec3b5fd988aa87a77cda288094f26a97ce067539e8517615eca4c7e66239c97a4414d2176179f1ca35a88c22d1b98eca1b1e25dda58b WHIRLPOOL 287d66536d2c09b5a5fd44bf9f8d181752ae5ba9d3036af059ccae768b2c08d221c90ac126cb582dbbbc64cd0e1dcb19f6c42ed9bce20240ac5a52b261a6fe94 -DIST nx-libs-3.5.0.27-full.tar.gz 15583374 SHA256 4b328acc9ca680566baf1657a5d26d2d47594ea749cfb4a15e064889287f3efa SHA512 618d98f2a3ddae697ddc7a6f59c9b7c7cd7026aa9c719cc3f4acda10fba1904bef7a7b7f9f4ba2a4c492f04ea3d8baaa9fe5be26b5438a342e5092b7c8128192 WHIRLPOOL 505d3177f8bef3b7d2ece913ebdb14c0c1a1bfc1e97a303f644d9ffbb2a279990d2226e40a71adf0bfce0efbfffc010d5b8501ddd3aa09afa226dc680fab72a6 DIST nx-libs-3.5.0.28-full.tar.gz 15589759 SHA256 c0448884f35280f92db639a91d3f3a35b3b57581949bd3a4b9da0ae685b57429 SHA512 1139e1f48f566fc9c5ef105ba5f674e6a3881f75b96fc0e1dbdc9e450b53bcf3a29d2422573b69e240840c2941cee67efc96f2024b24f69068c4abebee42660c WHIRLPOOL 4e062aea33fe2d2ac2ffa6baba29cab3a91c6d34cc3b35e95219de83f22ae1e77d55d4b77502a96ad3bd8dc0a3c500e839ec1dbae6b5c98f74baf70bd2ebfcce EBUILD nx-3.5.0.20.ebuild 2650 SHA256 bd3ec2628457e408d58e2add8d1063321b2749c98f24e52959d09c8681ff0599 SHA512 81d838b8c4b77ce2c372cf2c54f42a7b8237eca881302938a7eaec36ce2432328d1821db4d6ed4a4887ed258714b90d2ea07d2c1f6af9accdd2dce2c48496d22 WHIRLPOOL a1167f37505c2a82332f4b3a582f81294b644156aaa452f88da7d92a082a183d4c610af9800d09b9390d255ee04477782e904752303ddfe594fdcb55f6013a63 -EBUILD nx-3.5.0.24.ebuild 2803 SHA256 2c16fbc41f0c8397bf3ea90002fe462ab07d71faa93eca07a3d08b1645614269 SHA512 776cf2b8156b420b275046aa752ebf38195c786150774a88d644fe645e145bf7c356772c2c5a01dfc12701e156cd26d0ae0ebe4f9ac4c9264f426893bf676670 WHIRLPOOL 5478bac9c578a570654d74dc3a895fa4cae35e4d8f35d83e2019b3b75356938882daef9e35c38d3c4a632039ac3ea744c3ef0a90ef2176bdf61a87342a8145f5 -EBUILD nx-3.5.0.27.ebuild 2852 SHA256 320131763130c3262b8134999cd614e1aa40d8245a122083cf6660802f7eccc7 SHA512 7941b1dc2825522462ccb988d10055cd6d430f14b6e19b64efd6200ab9306a75722f480e055396887766b09eb0a6374475b962a58b7857a38311d45ca88a2a84 WHIRLPOOL 25a8809fdcf15cc81b8449448fd84dc79b0749389645e5849a973a67664ec551ca003769f4584423b392ae59ec33fd30bec720167aa2dadf026bcca365b48417 -EBUILD nx-3.5.0.28.ebuild 2803 SHA256 3f799808fac650b656cc9628e659188ee9e176e09ad372fa800073371dde87a0 SHA512 67a153473d8eee4e5f41fab5e074fea8c33f05c2f0cbbfae89663cbc1e85ee728bba0552c0631807c4e963aa1c6f7794de8264821a72dd18c3a53f60cee980fc WHIRLPOOL 22d6cc85bc4d5c33154f7df62ac7dcc6a68a3a0836d76256cb35a58fe09d2e097d2dfacc70a0accacad257d9c75a8905c1cf41a887c64f2167fb4ddd8e16669e -MISC ChangeLog 14232 SHA256 a296fcc9fb7e20a1d270542f399a03ed83326ad20c80323708ed65607aab82ae SHA512 67e4c3c9dc6314e609101c86ca2f4154111a78e29eaebce0692b504d0a3fb8d062b3b41cf1702c9f2282b579e229bc9fcf126b759295bd6857dc59943ef93fa7 WHIRLPOOL 3ba8fdbb6236b52b7931b68169a03269696da39791a37c7a18aad3e89febbf8cd3246e22dbba7d3c66c1cbfd4774f3ff700aeb0a68ed4e6d54a18284adf8772c +EBUILD nx-3.5.0.28.ebuild 2829 SHA256 30a57ec8066dbcdfa99773ee2ab02366b63fdba824150b9411be8abee1de26f8 SHA512 f90aad4b8ee3163a958c900cff682d171e4885030a1ec03718759831e657ae936f5d47871abdf85b1b96c595d513037aa0422111560747dc680b1bfa0460ba62 WHIRLPOOL 753b962d1fc35e389ae96731ce32cd80b3e198850edb57f279ab2eb30b8c03569dcfa5a5b5f433230efbde40945d68eb25da547aa8eda0735acdbda506ab293d +MISC ChangeLog 14492 SHA256 460f8ac6cb975fd13b5bdae450e468b1861769ab8214c1a82b6a045077f7fc03 SHA512 238077f475223052a0c8c2f7ea86d8924b4c1ff489ecb3e9f9c43f3aab521a2f376214d1411cae8a9f84b2c68bbc6c7d223aaada8dc5dbc41b45e717208cd103 WHIRLPOOL 83917919d74f8d8e4c0294704974accae0e535ea7572523b2acf7dde8a495e0e9ffde017d3eb867a0c00aaaf7d20d4ffd39c39cd5ca460afeb0f194a02269e7c MISC metadata.xml 254 SHA256 2952f5071f21b100d9704142bb38a3e126a2ed3f41b4232e213ce607f7780033 SHA512 ec6af573e67162251786be7ef21a5ea10a4c5ca8b9f080828fa5b72f5d20862150b5033f80afdb6665b243bd24d1c82348b65c91855f4756c5585738a7ce4286 WHIRLPOOL 4456b9fe62e80868740cabd66c246a77ebdab37904be853b977a38a974f07e89d3abcd82e3502e741bc7004016b455768b08ba9cda76bd42a535b1d3ac6ca2ec -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iF4EAREIAAYFAlRl+F0ACgkQFYEBGcdFJfJFiQD/c/E/JuQOR3KSqJKtx6MmVpaG -dU37YGV3KEaldKDCgiABAK0Ml/CmN3P5aAdYiNs4TzlECdrL7P3X/5hUjS+SwY7v -=CVsg +iF4EAREIAAYFAlTkybMACgkQFYEBGcdFJfLKpQD/b6O661K21RgP21L2JnvQl8j6 +nGON0IfPP7YRh+Cw45oA/35giFxflFCRao6sufgaElR5b7Vn1WaXpGmIDSEDh125 +=+ViY -----END PGP SIGNATURE----- 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" |