summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2012-06-19 16:21:02 +0000
committerMike Gilbert <floppym@gentoo.org>2012-06-19 16:21:02 +0000
commita495499e3a35800d078885cb339a1e6d16bc6827 (patch)
tree5c5bfbf760a4b1a93c6dcfcb4894d215c26d0ead /net-libs
parentsun to oracle, fix hompage, download link and license. #421569 (diff)
downloadhistorical-a495499e3a35800d078885cb339a1e6d16bc6827.tar.gz
historical-a495499e3a35800d078885cb339a1e6d16bc6827.tar.bz2
historical-a495499e3a35800d078885cb339a1e6d16bc6827.zip
Force gcrypt when gnutls is selected, bug 420803. Add openssl dependency. Rename crypt and no24bpp use flags to gcrypt and 24bpp.
Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64
Diffstat (limited to 'net-libs')
-rw-r--r--net-libs/libvncserver/ChangeLog7
-rw-r--r--net-libs/libvncserver/Manifest15
-rw-r--r--net-libs/libvncserver/libvncserver-0.9.8.2.ebuild55
-rw-r--r--net-libs/libvncserver/libvncserver-0.9.9.ebuild23
-rw-r--r--net-libs/libvncserver/metadata.xml2
5 files changed, 31 insertions, 71 deletions
diff --git a/net-libs/libvncserver/ChangeLog b/net-libs/libvncserver/ChangeLog
index 86917fc11e8e..b65ca36ae6ea 100644
--- a/net-libs/libvncserver/ChangeLog
+++ b/net-libs/libvncserver/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-libs/libvncserver
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libvncserver/ChangeLog,v 1.60 2012/06/14 15:26:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libvncserver/ChangeLog,v 1.61 2012/06/19 16:21:02 floppym Exp $
+
+ 19 Jun 2012; Mike Gilbert <floppym@gentoo.org> -libvncserver-0.9.8.2.ebuild,
+ libvncserver-0.9.9.ebuild, metadata.xml:
+ Force gcrypt when gnutls is selected, bug 420803. Add openssl dependency.
+ Rename crypt and no24bpp use flags to gcrypt and 24bpp.
14 Jun 2012; Jeroen Roovers <jer@gentoo.org> libvncserver-0.9.8.2-r2.ebuild:
Stable for HPPA (bug #419275).
diff --git a/net-libs/libvncserver/Manifest b/net-libs/libvncserver/Manifest
index 86f6ed6ecb29..e84b44acc5cd 100644
--- a/net-libs/libvncserver/Manifest
+++ b/net-libs/libvncserver/Manifest
@@ -1,5 +1,5 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
AUX libvncserver-memcpy.patch 861 RMD160 9d6c380589f48b1724b98dde244e1fd4d41afbda SHA1 118d66de6cbd0653dadca4c87243772ae846b825 SHA256 193e426d0cc10a0718afdca616a1686d2e766fe24a139db04ba8f7048f96866f
DIST LibVNCServer-0.9.7.tar.gz 1105538 RMD160 50325d0827a0e65e9da91991011e2a1b05c491e2 SHA1 681b0f3d000ad8c18d3643e1148e1ae5052c8a9a SHA256 2adb60ebb64706df088418cfb01691d9c273040fc286618e021e51ac61a77571
@@ -7,14 +7,13 @@ DIST LibVNCServer-0.9.8.2.tar.gz 1238439 RMD160 0dbb7bd53f0298be948a2b47a5f900eb
DIST LibVNCServer-0.9.9.tar.gz 1678609 RMD160 e62e0903124abb85746bcac6498214fe09c3b4d7 SHA1 2004c6ae493baeff3da40b61e0a0f73c83182dad SHA256 cf060d3525c2fb92be2fa18bbc697fb355592b52484e60745f3bcac5c3f803f9
EBUILD libvncserver-0.9.7.ebuild 1396 RMD160 aed1f63e4932f6f830b0b9dabeedd92b182a80cd SHA1 725a7e57b9e522d4594497876f3f936b2ae22174 SHA256 0596eb3dde3204cedfa0a5fdc836fdf9a99f2266cacd74c9c85f744515551a22
EBUILD libvncserver-0.9.8.2-r2.ebuild 1476 RMD160 79f06df4b5f0c510b515c03e61c068d3564439b8 SHA1 4be3b53c7d89d9e45398829a29afa8dd5e310a2b SHA256 e4dbbbf8fb830ce9433ca55741b21097a43ada1092bd479a5c43b6ccafbbd3dc
-EBUILD libvncserver-0.9.8.2.ebuild 1392 RMD160 e45829e5ba29d8177a3b074635559b9955bc6385 SHA1 442b1a28ad7b05b60c428a79e237c8f5558a7243 SHA256 06c6d9664f23cab9366898dd7c46d97354e25f655c9c557ab1547f5fb87b74ed
-EBUILD libvncserver-0.9.9.ebuild 1424 RMD160 3fad92698ec5469a8d59aa8f64b8205e6de8bbb5 SHA1 61b11763b70e1103969ed32ecb497938877c56fb SHA256 9fcfc9555bca812aa2a3e3f3a616a03b00a1051f7b5d589fcf4178f0ca8a5fff
-MISC ChangeLog 7577 RMD160 691af3872bb09117762ad39576812f29e9c8431c SHA1 4bba9229efa44ff4105502da4c26ebe99b5f9856 SHA256 64b73053f9c6e08b22f723984655a08c1d07eb2619cff5c5056eec29456a29fc
-MISC metadata.xml 757 RMD160 e805b4b210be0e9c4308d47c90f1c1aca11af4d6 SHA1 c2e85ef12289b24461200de35d63b9473ca31415 SHA256 f6415250b3799cf21be025b55b3e80643e99eaacdac4383cb31e7e42e5c02b03
+EBUILD libvncserver-0.9.9.ebuild 1562 RMD160 d391c24320d3ef5cad0bc9b350987af94a1723f5 SHA1 fd54a4cf60a17eccf6269dd13e9a9ff0fe4eaa3d SHA256 2e71ba2edcaf8e433106b1e554a7842d0f38d41f068ab3942c85228682c225da
+MISC ChangeLog 7838 RMD160 630ffedb19c920004d10a1309916c0b9e553cde8 SHA1 59a5b5582692d7cbe79e43f62902fc3b5eea641f SHA256 a051a5af1b76f4b36b05e111dc0d152c0f5ff4795e949d8311f4e7a3cb126277
+MISC metadata.xml 861 RMD160 b9062357f0f74d5ba0315cded1cc82fcb704e0f5 SHA1 6e35614535c227bdd893428f1e5566a43d1f5e50 SHA256 ca2a17264b0224539f744cc2e89c3b27225baf7e2b524d4f70d3c30cb17d0acb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk/aApcACgkQVWmRsqeSphMdagCeLPPNeP4ZRbFSpBMO+QqMiPW6
-GN8An2KHMw2cV1+ZHjcEoTCxxIpp9kSt
-=toFF
+iF4EAREIAAYFAk/gpvQACgkQC77qH+pIQ6RvZAD+PutqAlIVGkm0YKh4OtXojANg
+UZdDDJvBTPOjmczNSjIA/2/ZecGEtMqB3aRMI+fa9Qb95LS4eKn12wL0sG8VKx5l
+=kQiw
-----END PGP SIGNATURE-----
diff --git a/net-libs/libvncserver/libvncserver-0.9.8.2.ebuild b/net-libs/libvncserver/libvncserver-0.9.8.2.ebuild
deleted file mode 100644
index 15606a017d58..000000000000
--- a/net-libs/libvncserver/libvncserver-0.9.8.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libvncserver/libvncserver-0.9.8.2.ebuild,v 1.2 2011/11/16 02:17:31 xmw Exp $
-
-EAPI="4"
-
-inherit libtool
-
-DESCRIPTION="library for creating vnc servers"
-HOMEPAGE="http://libvncserver.sourceforge.net/"
-SRC_URI="http://libvncserver.sourceforge.net/LibVNCServer-${PV/_}.tar.gz
- mirror://sourceforge/libvncserver/LibVNCServer-${PV/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="no24bpp crypt gnutls ipv6 +jpeg test threads +zlib"
-
-DEPEND="crypt? ( dev-libs/libgcrypt )
- gnutls? ( net-libs/gnutls )
- jpeg? ( virtual/jpeg )
- zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/LibVNCServer-${PV/_}
-
-src_prepare() {
- sed -i -r \
- -e '/^CFLAGS =/d' \
- -e "/^SUBDIRS/s:\<($(use test || echo 'test|')client_examples|examples)\>::g" \
- Makefile.in || die
-
- elibtoolize
-}
-
-src_configure() {
- econf \
- --without-x11vnc \
- $(use_with !no24bpp 24bpp) \
- $(use_with crypt gcrypt) \
- $(use_with ipv6) \
- $(use_with jpeg) \
- $(use_with threads pthread) \
- $(use_with zlib)
-}
-
-src_compile() {
- default
- emake -C examples noinst_PROGRAMS=storepasswd
-}
-
-src_install() {
- emake install DESTDIR="${D}"
- dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/net-libs/libvncserver/libvncserver-0.9.9.ebuild b/net-libs/libvncserver/libvncserver-0.9.9.ebuild
index 4bf08183fd85..ecaf3a1c47cc 100644
--- a/net-libs/libvncserver/libvncserver-0.9.9.ebuild
+++ b/net-libs/libvncserver/libvncserver-0.9.9.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libvncserver/libvncserver-0.9.9.ebuild,v 1.2 2012/06/06 15:45:58 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libvncserver/libvncserver-0.9.9.ebuild,v 1.3 2012/06/19 16:21:02 floppym Exp $
EAPI="4"
@@ -14,12 +14,20 @@ SRC_URI="http://libvncserver.sourceforge.net/LibVNCServer-${PV/_}.tar.gz
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="no24bpp crypt gnutls ipv6 +jpeg test threads +zlib"
+IUSE="+24bpp gcrypt gnutls ipv6 +jpeg ssl test threads +zlib"
-DEPEND="crypt? ( dev-libs/libgcrypt )
- gnutls? ( net-libs/gnutls )
+DEPEND="
+ gcrypt? ( dev-libs/libgcrypt )
+ gnutls? (
+ net-libs/gnutls
+ dev-libs/libgcrypt
+ )
+ !gnutls? (
+ ssl? ( dev-libs/openssl )
+ )
jpeg? ( virtual/jpeg )
- zlib? ( sys-libs/zlib )"
+ zlib? ( sys-libs/zlib )
+"
RDEPEND="${DEPEND}"
S="${WORKDIR}"/LibVNCServer-${PV/_}
@@ -36,9 +44,10 @@ src_prepare() {
src_configure() {
econf \
--without-x11vnc \
- $(use_with !no24bpp 24bpp) \
- $(use_with crypt gcrypt) \
+ $(use_with 24bpp) \
$(use_with gnutls) \
+ $(usex gnutls --with-gcrypt $(use_with gcrypt)) \
+ $(usex gnutls --without-ssl $(use_with ssl)) \
$(use_with ipv6) \
$(use_with jpeg) \
$(use_with threads pthread) \
diff --git a/net-libs/libvncserver/metadata.xml b/net-libs/libvncserver/metadata.xml
index e1c4646f8769..57495e5a5bd4 100644
--- a/net-libs/libvncserver/metadata.xml
+++ b/net-libs/libvncserver/metadata.xml
@@ -17,6 +17,8 @@ Now that you want to make a VNC server, that is, a server which speaks
the RFB protocol, you can download this library from sourceforge.
</longdescription>
<use>
+ <flag name="24bpp">enable 24bpp support</flag>
<flag name="no24bpp">disable 24bpp support</flag>
+ <flag name="gcrypt">enable support for gcrypt</flag>
</use>
</pkgmetadata>