Merge branch 'master' of git+ssh://git.gentoo.org/repo/gentoo

5 files changed, 74 insertions, 6 deletions

diff --git a/net-misc/dibbler/Manifest b/net-misc/dibbler/Manifest
index e8f71fb453db..92042eed1110 100644
--- a/net-misc/dibbler/Manifest
+++ b/net-misc/dibbler/Manifest
@@ -1,3 +1,4 @@
 DIST dibbler-0.8.4.tar.gz 4292008 SHA256 90382709200b6f1c4d403aceeedb52fd5633cfb71c7df3742062ddfe8b71c013 SHA512 7d0323abd42d0ab57fcaecb30c1354a831f2b8b8b300a9a20678062ef52743b5724569d1885f3866d517abbfae48651966734d47a6c5f43d19fd65332ebeca6c WHIRLPOOL f1d9c2219daebe3f69fbcde956a164902fa2b6ba1448d95a00aaada0423a995d013256fc35fbc8c860efd11f28b0dd42f97de4761a31f0b7662dec23bb36b25a
 DIST dibbler-1.0.0.tar.gz 4372693 SHA256 51283702a1e56c1bfe56fb95469ec7b1fc56ecb8e9a2c6d296b81d43bec14048 SHA512 38eae78e5d5dab2484c6467eb91e7e8eed62067a1f375a9a0e0ed3639c1bd9db7230bc7a33ee41ffd785d031994c6bec4a6b2eb75bb5c0d4645c7e669f568434 WHIRLPOOL 80a9deb26802b0d26a108abffb09a9b3e81faf1e2fda1f25f5a71b855741ee967b82486e0f7e79f9d1560abd43dfe6934e2d69c486c6302f0154972041e98d46
 DIST dibbler-1.0.0RC2.tar.gz 4331108 SHA256 206a27421db7ae5298805d00f9adcafcf6aef7496a5fb23640f6fa99a6ee2d68 SHA512 b0384629a4139bc95609eaf19df6d0c57daebfd0ecd063981271153e3c3cd1658376fd8a473a6568f8b782e58c08c44a101209b49ea3ac39436a3aac4cb27259 WHIRLPOOL 6377ad56bbe61eb7e88f0e92814fd4cbceb4518419b0ec74bceaa7fd09d8de8b00061d73d8d2dead2c3b4389b058ab968586d8373e9b47f1eede0e18b91784f4
+DIST dibbler-1.0.1.tar.gz 4375118 SHA256 27869877e060c039cbc24a5f6a9dd69006bf67de0ffdf29a645a80aef6e476a1 SHA512 2369d4a3ca50a1c60bd5a47bf4168d4c113e2fdcb1ae4d937a3bf226c057142f2e81f6c46bf4e1dfa9ca0d2e92f7f857572a4bfb0d0dd721c35efe762e6c3ea0 WHIRLPOOL dafc1663b487bc62068ef86be6261484729cf8da966f5572b1e459fb3a902c9474d9a8bea361dba683111f9f7994b86a3a7484333c77c9f977ec54169653898d
diff --git a/net-misc/dibbler/dibbler-1.0.1.ebuild b/net-misc/dibbler/dibbler-1.0.1.ebuild
new file mode 100644
index 000000000000..93b9c87e7bd1
--- /dev/null
+++ b/net-misc/dibbler/dibbler-1.0.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit eutils readme.gentoo systemd
+
+DESCRIPTION="Portable DHCPv6 implementation (server, client and relay)"
+HOMEPAGE="http://klub.com.pl/dhcpv6/"
+SRC_URI="http://klub.com.pl/dhcpv6/dibbler/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~mips ~x86"
+IUSE="doc"
+
+DEPEND="doc? ( || (
+		dev-texlive/texlive-latexextra
+		dev-tex/floatflt )
+	)"
+RDEPEND=""
+
+DOC_CONTENTS="Make sure that you modify client.conf, server.conf and/or relay.conf
+to suit your needs. They are stored in /etc/dibbler"
+
+src_prepare() {
+	epatch_user
+}
+
+src_compile() {
+	emake
+	# devel documentation is broken and users should consult the online version
+	# http://klub.com.pl/dhcpv6/doxygen/
+	use doc && emake -C doc/ user
+}
+
+src_install() {
+	readme.gentoo_create_doc
+
+	dosbin dibbler-{client,relay,server}
+	doman doc/man/*.8
+
+	insinto /etc/dibbler
+	doins doc/examples/*.conf
+	dodir /var/lib/dibbler
+
+	dodoc AUTHORS CHANGELOG RELNOTES TODO
+	use doc && dodoc doc/dibbler-user.pdf
+
+	doinitd "${FILESDIR}"/dibbler-{client,relay,server}
+	systemd_dounit "${FILESDIR}"/dibbler-client.service
+}
diff --git a/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-build_doc.patch b/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-build_doc.patch
new file mode 100644
index 000000000000..d53ce193ca25
--- /dev/null
+++ b/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-build_doc.patch
@@ -0,0 +1,12 @@
+diff -Naur llvm-3.7.0.src.orig/docs/CMakeLists.txt llvm-3.7.0.src/docs/CMakeLists.txt
+--- llvm-3.7.0.src.orig/docs/CMakeLists.txt	2015-08-18 18:48:44.000000000 +0200
++++ llvm-3.7.0.src/docs/CMakeLists.txt	2015-10-12 14:40:00.985384589 +0200
+@@ -115,7 +115,7 @@
+ endif()
+ 
+ list(FIND LLVM_BINDINGS_LIST ocaml uses_ocaml)
+-if( NOT uses_ocaml LESS 0 )
++if( NOT uses_ocaml LESS 0 AND LLVM_BUILD_DOCS )
+   set(doc_targets
+         ocaml_llvm
+         ocaml_llvm_all_backends
diff --git a/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-multilib.patch b/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-multilib.patch
index caba3d17bb74..024bad737de5 100644
--- a/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-multilib.patch
+++ b/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-multilib.patch
@@ -14,13 +14,13 @@
  
    install(FILES ${install_files}
 -          DESTINATION lib/ocaml)
-+          DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml)
++          DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm)
    install(FILES ${install_shlibs}
            PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
                        GROUP_READ GROUP_EXECUTE
                        WORLD_READ WORLD_EXECUTE
 -          DESTINATION lib/ocaml)
-+          DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml)
++          DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm)
  
    foreach( install_file ${install_files} ${install_shlibs} )
      get_filename_component(filename "${install_file}" NAME)
@@ -31,7 +31,7 @@
  
    install(FILES "${LLVM_LIBRARY_DIR}/ocaml/META.llvm_${TARGET}"
 -          DESTINATION lib/ocaml)
-+          DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml)
++          DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm)
  endforeach()
 --- llvm-3.7.0rc3.src-orig/bindings/ocaml/llvm/CMakeLists.txt	2014-12-30 14:24:07.000000000 +1100
 +++ llvm-3.7.0rc3.src/bindings/ocaml/llvm/CMakeLists.txt	2015-08-30 19:23:43.561583624 +1000
@@ -40,4 +40,4 @@
  
  install(FILES "${LLVM_LIBRARY_DIR}/ocaml/META.llvm"
 -        DESTINATION lib/ocaml)
-+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml)
++        DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm)
diff --git a/sys-devel/llvm/llvm-3.7.0-r2.ebuild b/sys-devel/llvm/llvm-3.7.0-r2.ebuild
index de885b71de67..303ce9872f50 100644
--- a/sys-devel/llvm/llvm-3.7.0-r2.ebuild
+++ b/sys-devel/llvm/llvm-3.7.0-r2.ebuild
@@ -40,9 +40,10 @@ COMMON_DEPEND="
 	libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
 	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
 	ocaml? (
-		dev-lang/ocaml:0=
+		>=dev-lang/ocaml-4.00.0:0=
 		dev-ml/findlib
-		dev-ml/ocaml-ctypes )"
+		dev-ml/ocaml-ctypes
+		!!<=sys-devel/llvm-3.7.0-r2[ocaml] )"
 # configparser-3.2 breaks the build (3.3 or none at all are fine)
 DEPEND="${COMMON_DEPEND}
 	dev-lang/perl
@@ -151,6 +152,8 @@ src_prepare() {
 	sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml  || die
 	# Fix libdir for ocaml bindings install, bug #559134
 	epatch "${FILESDIR}"/cmake/${P}-ocaml-multilib.patch
+	# Do not build/install ocaml docs with USE=-doc, bug #562008
+	epatch "${FILESDIR}"/cmake/${P}-ocaml-build_doc.patch
 
 	# Make it possible to override Sphinx HTML install dirs
 	# https://llvm.org/bugs/show_bug.cgi?id=23780