Merge pull request #1989 from mischief/docker-journald

link docker against journald compat libs for 'docker logs' read support for journal driver

sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.10.3-r5.ebuild

@@ -0,0 +1 @@
+docker-9999.ebuild

sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild

@@ -23,7 +23,8 @@ DESCRIPTION="Docker complements kernel namespacing with a high-level API which o
 HOMEPAGE="https://dockerproject.org"
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="apparmor aufs +btrfs contrib +device-mapper experimental +overlay seccomp +selinux vim-syntax zsh-completion"
+IUSE="apparmor aufs +btrfs contrib +device-mapper experimental +overlay seccomp
+	+selinux vim-syntax zsh-completion +journald"
 
 # https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#build-dependencies
 CDEPEND="
@@ -34,6 +35,9 @@ CDEPEND="
 	seccomp? (
 		>=sys-libs/libseccomp-2.2.1[static-libs]
 	)
+	journald? (
+		>=sys-apps/systemd-225
+	)
 "
 
 #dev-go/go-md2man
@@ -228,6 +232,9 @@ src_compile() {
 	if use apparmor; then
 		DOCKER_BUILDTAGS+=' apparmor'
 	fi
+	if use journald; then
+		DOCKER_BUILDTAGS+=' journald'
+	fi
 
 	if has_version '<sys-fs/lvm2-2.02.110' ; then
 		# Docker uses the host files when testing features, so force

sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild

@@ -323,6 +323,12 @@ multilib_src_install() {
 
 		emake "${mymakeopts[@]}"
 	fi
+
+	# install compat pkg-config files
+	# Change dbus to >=sys-apps/dbus-1.8.8 if/when this is dropped.
+	local pcfiles=( src/compat-libs/libsystemd-{daemon,id128,journal,login}.pc )
+	emake "${mymakeopts[@]}" install-pkgconfiglibDATA \
+		pkgconfiglib_DATA="${pcfiles[*]}"
 }
 
 multilib_src_install_all() {