diff options
| author |   hasufell <hasufell@hasufell.de> | 2015-01-23 18:52:10 +0100 |
|---|---|---|
| committer | hasufell <hasufell@hasufell.de> | 2015-01-23 20:06:42 +0100 |
| commit | c6494cf599c4abba777c7b361b34a8eb7f7d31e5 (patch) | |
| tree | 80e9f23ecfc568171fc249f1bb7900f54478e0e5 /www-client | |
| parent | Merge branch 'master' of git://github.com/lluixhi/libressl into master (diff) | |
| download | libressl-c6494cf599c4abba777c7b361b34a8eb7f7d31e5.tar.gz libressl-c6494cf599c4abba777c7b361b34a8eb7f7d31e5.tar.bz2 libressl-c6494cf599c4abba777c7b361b34a8eb7f7d31e5.zip | |
Use 'libressl' USE flag instead of virtual/openssl
This has several advantages:
* more explicit control, less breakage by missynced virtuals or
switching the provider
* subslots work correctly
Currently, we don't add a '!dev-libs/openssl:0' blocker to
dev-libs/libressl to be able to test all packages.
However, this should be done when importing it into the tree.
Diffstat (limited to 'www-client')
| -rw-r--r-- | www-client/links/links-2.8-r1.ebuild | 7 | ||||
| -rw-r--r-- | www-client/links/links-2.9.ebuild | 7 | ||||
| -rw-r--r-- | www-client/w3m/w3m-0.5.3-r5.ebuild | 7 |
3 files changed, 15 insertions, 6 deletions
diff --git a/www-client/links/links-2.8-r1.ebuild b/www-client/links/links-2.8-r1.ebuild index 8442488..081e4d6 100644 --- a/www-client/links/links-2.8-r1.ebuild +++ b/www-client/links/links-2.8-r1.ebuild @@ -15,7 +15,7 @@ SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2 LICENSE="GPL-2" SLOT="2" KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="bzip2 directfb fbcon gpm ipv6 jpeg livecd lzma ssl suid svga tiff unicode X zlib" +IUSE="bzip2 directfb fbcon gpm ipv6 jpeg libressl livecd lzma ssl suid svga tiff unicode X zlib" GRAPHICS_DEPEND="media-libs/libpng:0=" @@ -34,7 +34,10 @@ RDEPEND=">=sys-libs/ncurses-5.7-r7 virtual/jpeg:0 ) lzma? ( app-arch/xz-utils ) - ssl? ( dev-libs/openssl:0 ) + ssl? ( + !libressl? ( dev-libs/openssl:0 ) + libressl? ( dev-libs/libressl:= ) + ) svga? ( ${GRAPHICS_DEPEND} media-libs/svgalib diff --git a/www-client/links/links-2.9.ebuild b/www-client/links/links-2.9.ebuild index 456409e..5ace78a 100644 --- a/www-client/links/links-2.9.ebuild +++ b/www-client/links/links-2.9.ebuild @@ -15,7 +15,7 @@ SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2 LICENSE="GPL-2" SLOT="2" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="bzip2 directfb fbcon gpm ipv6 jpeg livecd lzma ssl suid svga tiff unicode X zlib" +IUSE="bzip2 directfb fbcon gpm ipv6 jpeg libressl livecd lzma ssl suid svga tiff unicode X zlib" GRAPHICS_DEPEND="media-libs/libpng:0=" @@ -34,7 +34,10 @@ RDEPEND=">=sys-libs/ncurses-5.7-r7 virtual/jpeg:0 ) lzma? ( app-arch/xz-utils ) - ssl? ( dev-libs/openssl:0 ) + ssl? ( + !libressl? ( dev-libs/openssl:0 ) + libressl? ( dev-libs/libressl:= ) + ) svga? ( ${GRAPHICS_DEPEND} media-libs/svgalib diff --git a/www-client/w3m/w3m-0.5.3-r5.ebuild b/www-client/w3m/w3m-0.5.3-r5.ebuild index f48988e..eb9bb78 100644 --- a/www-client/w3m/w3m-0.5.3-r5.ebuild +++ b/www-client/w3m/w3m-0.5.3-r5.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/w3m/${P}.tar.gz" LICENSE="w3m" SLOT="0" KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris" -IUSE="X fbcon gpm gtk imlib lynxkeymap migemo nls nntp ssl unicode vanilla xface linguas_ja" +IUSE="X fbcon gpm gtk imlib libressl lynxkeymap migemo nls nntp ssl unicode vanilla xface linguas_ja" # We cannot build w3m with gtk+2 w/o X because gtk+2 ebuild doesn't # allow us to build w/o X, so we have to give up framebuffer w3mimg.... @@ -27,7 +27,10 @@ RDEPEND=">=sys-libs/ncurses-5.2-r3 xface? ( media-libs/compface ) gpm? ( >=sys-libs/gpm-1.19.3-r5 ) migemo? ( >=app-text/migemo-0.40 ) - ssl? ( >=dev-libs/openssl-0.9.6b )" + ssl? ( + !libressl? ( >=dev-libs/openssl-0.9.6b:0 ) + libressl? ( dev-libs/libressl:= ) + )" DEPEND="${RDEPEND} virtual/pkgconfig" |