gentoo resync : 02.03.2018

4 files changed, 121 insertions, 3 deletions

diff --git a/sys-apps/duc/Manifest b/sys-apps/duc/Manifest
index 0a3ca3dbfccd..3fef843eea77 100644
--- a/sys-apps/duc/Manifest
+++ b/sys-apps/duc/Manifest
@@ -1,4 +1,7 @@
+AUX duc-1.4.1-tinfo.patch 751 BLAKE2B 2928f2a12dc8755c5b43ce8255958ceac4b85dadd716d989bf1472b31ef9ee32e799fb83f4c69b617ef80d7479c070fcf784fc9b6efcdf234547167cca4d2119 SHA512 d0bfa984cad2691106038392297ae3e9ccb0dbf83a45456f50918c88d93bbddd33f9c5359367e6348d161b639e03f6e5339a44842d7fd5edb0306e21df846b4f
 DIST duc-1.4.1.tar.gz 325689 BLAKE2B 1e23204b60d1dd67eb094c1152c5056d0abc1fc6037a3811df5be18cbc4d61ccd2077b175f8f75559f368e2633476990e0c453cf88cff03c8aa3fc1796a42440 SHA512 88aa8f51651adf019c3a91c83eca308b822ff7569d6f6d30cf91338740ec9b0bd21c4f5dd783cf46c8d67aad6b03ad908cd7ed472e5db6feaf66ee02582d9f88
+DIST duc-1.4.3.tar.gz 363507 BLAKE2B 8d4364d48c247d7a83c8c5dd900b1c36ec78c68fa7d090e178a0e3209583e433c2e459d192f65ac350038c7e0d5a57df2c5c0d649cc9f554d7af74ad960c8db5 SHA512 5eb3e862e7003838e012dd1faab507a9b58607b77bd2af70a662005b6e4008ac44d1fb2e17b99da8e42ddfadb1cede2a468144ace7a72c12d0825fc7df4d18cd
 EBUILD duc-1.4.1-r1.ebuild 1749 BLAKE2B 17bba3460f3e11451315cde56b1428e53c1a43f405f47037edff35bdf8fa6af3018112aae6318fdbd78a07ec99c0a250cee01b936459bd60e42183413e0a9a35 SHA512 341c0fc7bdc58c3326e96ed1f924aedeba77d67ddbc7c6d7ff227bfb01bc8eb0594c2ee169a674e4ffb64eba17d422949d8e70a5b37a1053b89e9d32dd424808
-EBUILD duc-9999.ebuild 1749 BLAKE2B 17bba3460f3e11451315cde56b1428e53c1a43f405f47037edff35bdf8fa6af3018112aae6318fdbd78a07ec99c0a250cee01b936459bd60e42183413e0a9a35 SHA512 341c0fc7bdc58c3326e96ed1f924aedeba77d67ddbc7c6d7ff227bfb01bc8eb0594c2ee169a674e4ffb64eba17d422949d8e70a5b37a1053b89e9d32dd424808
+EBUILD duc-1.4.3.ebuild 1800 BLAKE2B 9a4d39aa899f8e604de6d317e3a194c0a5eecd95044589168d6ce972625689b520c2d64bfda9e29bf030090daf51395b30ee753c06a0d61e5d08c5c3906adf25 SHA512 44a8972a14c6efed140ff0e5d72191f1ce76dd80c649946abe8ef8007df0f1a9119de7ed45041bd26509c9d3a0ee57842990c07ae966be579c32f3dfeea8732b
+EBUILD duc-9999.ebuild 1800 BLAKE2B 9a4d39aa899f8e604de6d317e3a194c0a5eecd95044589168d6ce972625689b520c2d64bfda9e29bf030090daf51395b30ee753c06a0d61e5d08c5c3906adf25 SHA512 44a8972a14c6efed140ff0e5d72191f1ce76dd80c649946abe8ef8007df0f1a9119de7ed45041bd26509c9d3a0ee57842990c07ae966be579c32f3dfeea8732b
 MISC metadata.xml 899 BLAKE2B 390fd22c6c48feb24433dee58f2f7b96ea75ea41fd77e35222e68f8cb7cb5bafb694af00074a98c0a18a50359ce635fb814de4d12798c5349a1ad8cc99880eea SHA512 44329c606478e5335f5566e9a2b8660e4135c77e25c769916fa0a10129a097eec1820e154bcf6edc785c579fbb8273e21d8b36d114d077f642f9cffd4df56c6f
diff --git a/sys-apps/duc/duc-1.4.3.ebuild b/sys-apps/duc/duc-1.4.3.ebuild
new file mode 100644
index 000000000000..55fa313bfe3d
--- /dev/null
+++ b/sys-apps/duc/duc-1.4.3.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/zevv/duc.git"
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/zevv/${PN}/releases/download/${PV}/${P}.tar.gz"
+fi
+
+DESCRIPTION="A library and suite of tools for inspecting disk usage"
+HOMEPAGE="https://github.com/zevv/duc"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="cairo gui -leveldb ncurses -sqlite +tokyocabinet X"
+
+REQUIRED_USE="
+	^^ ( tokyocabinet leveldb sqlite )
+	X? ( cairo gui )
+"
+
+DEPEND="
+	cairo? ( x11-libs/cairo x11-libs/pango )
+	gui? (
+		X? (
+			x11-libs/cairo[X]
+			x11-libs/libX11
+			x11-libs/pango[X]
+		)
+		!X? ( >=media-libs/glfw-3.0 )
+	)
+	leveldb? ( dev-libs/leveldb )
+	ncurses? ( sys-libs/ncurses:= )
+	sqlite? ( dev-db/sqlite:3 )
+	tokyocabinet? ( dev-db/tokyocabinet )
+"
+RDEPEND="${DEPEND}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.1-tinfo.patch
+)
+
+src_unpack() {
+	if [[ "${PV}" == "9999" ]]; then
+		git-r3_src_unpack
+	else
+		unpack ${A}
+	fi
+}
+
+src_prepare() {
+	sed -i -e "/ldconfig/d" -e "/install-exec-hook/d" Makefile.am || die
+
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=( $(use_enable ncurses ui) )
+
+	if use tokyocabinet; then
+		myconf+=( --with-db-backend=tokyocabinet )
+	elif	use leveldb; then
+		myconf+=( --with-db-backend=leveldb )
+	else
+		myconf+=( --with-db-backend=sqlite3 )
+	fi
+
+	# Necessary logic for cairo
+	if use gui && use X; then
+		# X backend GUI
+		myconf+=( --enable-x11 --disable-opengl --enable-cairo )
+	elif use gui; then
+		# OpenGL backend GUI
+		myconf+=( --disable-x11 --enable-opengl $(use_enable cairo) )
+	else
+		# No GUI
+		myconf+=( $(use_enable cairo) --disable-x11 --disable-opengl )
+	fi
+
+	econf ${myconf[@]}
+}
diff --git a/sys-apps/duc/duc-9999.ebuild b/sys-apps/duc/duc-9999.ebuild
index b063305e8b89..55fa313bfe3d 100644
--- a/sys-apps/duc/duc-9999.ebuild
+++ b/sys-apps/duc/duc-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit autotools
 
@@ -42,6 +42,9 @@ DEPEND="
 	tokyocabinet? ( dev-db/tokyocabinet )
 "
 RDEPEND="${DEPEND}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.1-tinfo.patch
+)
 
 src_unpack() {
 	if [[ "${PV}" == "9999" ]]; then
diff --git a/sys-apps/duc/files/duc-1.4.1-tinfo.patch b/sys-apps/duc/files/duc-1.4.1-tinfo.patch
new file mode 100644
index 000000000000..74f0529d6741
--- /dev/null
+++ b/sys-apps/duc/files/duc-1.4.1-tinfo.patch
@@ -0,0 +1,23 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -138,8 +138,8 @@
+ if test "${enable_ui}" = "yes"; then
+         AC_DEFINE([ENABLE_UI], [1], [Enable ui])
+ 
+-	AC_CHECK_LIB([ncursesw], [tputs],, [
+-		AC_CHECK_LIB([ncurses], [tputs],, [
++	AC_CHECK_LIB([ncursesw], [touchwin],, [
++		AC_CHECK_LIB([ncurses], [touchwin],, [
+ 			AC_MSG_ERROR([
+ The ncurses library was not found, which is needed for ui support. Either install
+ the ncurses development libraries, or compile without ui support (--disable-ui)
+@@ -148,6 +148,9 @@
+ 	])
+ fi
+ 
++AC_SEARCH_LIBS([tputs], [tinfo],, [
++	AC_MSG_ERROR([No library was found providing tputs])
++])
+ 
+ if test "${enable_x11}" = "yes"; then
+         test "${enable_cairo}" != "yes" && AC_MSG_ERROR([cairo must be enabled for x11])