gentoo resync : 31.12.2017 (final resync this year)

8 files changed, 128 insertions, 25 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 7a4afb4e133c..06bf47d06146 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/dvtm/Manifest b/app-misc/dvtm/Manifest
index 9ac62a9e8c82..13a5887d8d3c 100644
--- a/app-misc/dvtm/Manifest
+++ b/app-misc/dvtm/Manifest
@@ -1,6 +1,9 @@
+AUX dvtm-0.15-gentoo.patch 961 BLAKE2B 611e19b936957c80eb234186a4199f32e83aefc7a3be90b6b896e9655dd7b1aa0b6528bb7f2fc92f40d448823990f60f5d58726e7358f6ce8304875ae2dc8903 SHA512 dd660b77457326949d41e80527fc81738c3a54f957f47d2bff94c9ee84dbbc5d2f31d43db9e85311826398c50927d18711816dfabba3ce9cddde0da66e15fe09
+AUX dvtm-9999-gentoo.patch 426 BLAKE2B b5cd8066a16005b240c5725374ea31fa42394076ea477f9ed35576b57a2d816123fbd4adfd877a092b56ecd42f321d4a092a20b20a7848a16df8fdb93fcfb7d3 SHA512 ee3d94108e8d74ef4777c2bdbb2887af9a4f62832311524cde7a69b0307a71edd89616e475c486745b2f5461932cb13cb46dbb2a6ab4af0a8ad8caae92e10275
 DIST dvtm-0.14.tar.gz 35893 BLAKE2B 3fc98614f4a8d3013a98a0e2766c2827a5d9f1046fb32a38b9e26de8c34d6ae03ef16294c5e80aab277e8abc529110560eb1d2b987007a9ffe990b1cbe362483 SHA512 d47f55b4ce47582f665ac5b5d86bb9137722f65b157bdd80aaaf45a2cd8d783a3b0718886c7a7ea1d900762359316c2d76816460dac03484e122d43c64f57dd6
 DIST dvtm-0.15.tar.gz 40511 BLAKE2B cc5075b5337a66b3eb5a3845f18aaadc6be36804e1a0e217e6bfe640893ec5af7553aa69578f8bda6c3b11b28c02ba5398e19f9cad9844bfcb1bd32ca4f24c12 SHA512 48a0c8fd6a50fe5d43414d0223c9f4b9920a31d42fe3bfc428ce1ae7d0e41a41ebe2597eae0824c7c76bfb0e32a13e440c8d5fcdb1886d55d6791fa3fe3fd77b
 EBUILD dvtm-0.14.ebuild 1500 BLAKE2B 5380d05c9590229e2a1ce89b4c6344f20f87e036bd2a500e083ad65c879924b3cb90f278953ff11985ccceeeab0e31f64c489acd919a6d4d992383b216f05ada SHA512 fb1e68406859da697006b1fd0647557b18b9917b5cdfbd8af723e33cb3ffd9c61c04be2d520e79d216e341691911c46c5ac0cbb90840f20133f1be3ff987ac5a
+EBUILD dvtm-0.15-r1.ebuild 1216 BLAKE2B e84166bd15f8d4c1a5f1bb80d658c6ab8521341e9a53c6b0f05aaa60fe882d5006e916c21d79065231e7a5c8b6b9502376712925d0dc834ecb65cd9967455acc SHA512 c177b2b549c85ee2797a57248ad393b7e256ee5d206fd2ae616342182455ab731d7694e4ae0bd5e67b1f24b12cbc0592fa63375fb395d0be9a8d0533c4639458
 EBUILD dvtm-0.15.ebuild 1506 BLAKE2B 3a29dfc11cdb5c73feb8f599b65fe27e36e9e520e4f5064264e4b6c3eeb396fe8761a1f0880da74c46b5e4f32b7e7471e3cbcdd83a4c1ad9e1bdaa4bef50c1d7 SHA512 cb0ff91d7f7893b9f369698f70f54fc3655c378f7149e3ee64ddf2aba8f5359ddce401bc1d46819b5aed0f5deff6325f7c0b4a117e68219191baf996f4c47f79
-EBUILD dvtm-9999.ebuild 1506 BLAKE2B 3a29dfc11cdb5c73feb8f599b65fe27e36e9e520e4f5064264e4b6c3eeb396fe8761a1f0880da74c46b5e4f32b7e7471e3cbcdd83a4c1ad9e1bdaa4bef50c1d7 SHA512 cb0ff91d7f7893b9f369698f70f54fc3655c378f7149e3ee64ddf2aba8f5359ddce401bc1d46819b5aed0f5deff6325f7c0b4a117e68219191baf996f4c47f79
+EBUILD dvtm-9999.ebuild 1216 BLAKE2B b97b350b9ca2fe9f6774538c9f7c7bcbd8d0b1c66b84a3159a55feb5b913def2e93c8593f55873479e0ec955aeec1e0c26a63d91517e0a45c667f004699d9dae SHA512 361eac65bb1368285cf8bd7f6589a8d66d74c38c5dedc29338146637a70db1b78afc029b54c16c4afe73d365e1e49dc6c4b98320fe60169b50c3b68e7ef36674
 MISC metadata.xml 266 BLAKE2B dcea8fa0295f75ca11474aafd9d1b56cf5c6d01fdb4444a82a0b93e818cf8e692076a1f5dc30a5098779afdff5190e2f877836b3ee87cbc1f8a529c32149ea94 SHA512 4da13e3e2134d06372d9bdc1de80cef972ac5db82e7ee8b3cfe620712610fd863c9037a6b8c84ee7a6c8eb8f0cb52568f040474eddb73a7afa07b5a53f512ac5
diff --git a/app-misc/dvtm/dvtm-0.15-r1.ebuild b/app-misc/dvtm/dvtm-0.15-r1.ebuild
new file mode 100644
index 000000000000..8a4b03dec2eb
--- /dev/null
+++ b/app-misc/dvtm/dvtm-0.15-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit savedconfig toolchain-funcs
+
+DESCRIPTION="Dynamic virtual terminal manager"
+HOMEPAGE="http://www.brain-dump.org/projects/dvtm/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://repo.or.cz/dvtm.git"
+else
+	SRC_URI="http://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="sys-libs/ncurses:0=[unicode]"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.15-gentoo.patch
+)
+
+src_prepare() {
+	default
+
+	restore_config config.h
+}
+
+src_compile() {
+	tc-export PKG_CONFIG
+	local msg=""
+	use savedconfig && msg=", please check the configfile"
+	emake CC=$(tc-getCC) ${PN} || die "emake failed${msg}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" STRIP=true install
+
+	insinto /usr/share/${PN}
+	newins config.h ${PF}.config.h
+
+	dodoc README.md
+
+	save_config config.h
+}
+
+pkg_postinst() {
+	elog "This ebuild has support for user defined configs"
+	elog "Please read this ebuild for more details and re-emerge as needed"
+	elog "if you want to add or remove functionality for ${PN}"
+}
diff --git a/app-misc/dvtm/dvtm-9999.ebuild b/app-misc/dvtm/dvtm-9999.ebuild
index a579a42918d3..557a8538c0a9 100644
--- a/app-misc/dvtm/dvtm-9999.ebuild
+++ b/app-misc/dvtm/dvtm-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit savedconfig toolchain-funcs
 
@@ -18,39 +18,31 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="unicode"
 
-DEPEND="sys-libs/ncurses:0=[unicode?]"
-RDEPEND=${DEPEND}
+RDEPEND="sys-libs/ncurses:0=[unicode]"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-9999-gentoo.patch
+)
 
 src_prepare() {
-	sed -i \
-		-e 's|FLAGS =|FLAGS +=|' \
-		-e 's|-I/usr/local/include||' \
-		-e 's|-L/usr/local/lib||' \
-		-e 's|-Os||' \
-		config.mk || die "sed config.mk failed"
-	use unicode || {
-		sed -i \
-			-e 's|-lncursesw|-lncurses|' \
-			config.mk || die "sed config.mk failed"
-	}
-	sed -i \
-		-e '/strip/d' \
-		-e 's:@tic :@tic -o ${DESTDIR}${PREFIX}/share/terminfo :g' \
-		Makefile || die "sed Makefile failed"
+	default
 
 	restore_config config.h
 }
 
 src_compile() {
+	tc-export PKG_CONFIG
 	local msg=""
 	use savedconfig && msg=", please check the configfile"
 	emake CC=$(tc-getCC) ${PN} || die "emake failed${msg}"
 }
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" STRIP=true install
 
 	insinto /usr/share/${PN}
 	newins config.h ${PF}.config.h
diff --git a/app-misc/dvtm/files/dvtm-0.15-gentoo.patch b/app-misc/dvtm/files/dvtm-0.15-gentoo.patch
new file mode 100644
index 000000000000..3bb7dec3721f
--- /dev/null
+++ b/app-misc/dvtm/files/dvtm-0.15-gentoo.patch
@@ -0,0 +1,36 @@
+--- a/config.mk
++++ b/config.mk
+@@ -10,12 +10,12 @@
+ TERMINFO := ${DESTDIR}${PREFIX}/share/terminfo
+ 
+ INCS = -I.
+-LIBS = -lc -lutil -lncursesw
+-CPPFLAGS = -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -D_XOPEN_SOURCE_EXTENDED
++LIBS = -lc -lutil $(shell $(PKG_CONFIG) --libs ncursesw)
++CPPFLAGS += -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -D_XOPEN_SOURCE_EXTENDED
+ CFLAGS += -std=c99 ${INCS} -DVERSION=\"${VERSION}\" -DNDEBUG ${CPPFLAGS}
+ LDFLAGS += ${LIBS}
+ 
+-DEBUG_CFLAGS = ${CFLAGS} -UNDEBUG -O0 -g -ggdb -Wall -Wextra -Wno-unused-parameter
++DEBUG_CFLAGS += ${CFLAGS} -UNDEBUG -O0 -g -ggdb -Wall -Wextra -Wno-unused-parameter
+ 
+ CC ?= cc
+ STRIP ?= strip
+--- a/Makefile
++++ b/Makefile
+@@ -16,13 +16,13 @@
+ 
+ .c.o:
+ 	@echo CC $<
+-	@${CC} -c ${CFLAGS} $<
++	${CC} -c ${CFLAGS} $<
+ 
+ ${OBJ}: config.h config.mk
+ 
+ dvtm: ${OBJ}
+ 	@echo CC -o $@
+-	@${CC} -o $@ ${OBJ} ${LDFLAGS}
++	${CC} -o $@ ${OBJ} ${LDFLAGS}
+ 
+ debug: clean
+ 	@make CFLAGS='${DEBUG_CFLAGS}'
diff --git a/app-misc/dvtm/files/dvtm-9999-gentoo.patch b/app-misc/dvtm/files/dvtm-9999-gentoo.patch
new file mode 100644
index 000000000000..f29e316c3e5c
--- /dev/null
+++ b/app-misc/dvtm/files/dvtm-9999-gentoo.patch
@@ -0,0 +1,13 @@
+--- a/config.mk
++++ b/config.mk
+@@ -7,8 +7,8 @@
+ TERMINFO := ${DESTDIR}${PREFIX}/share/terminfo
+ 
+ INCS = -I.
+-LIBS = -lc -lutil -lncursesw
+-CPPFLAGS = -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -D_XOPEN_SOURCE_EXTENDED
++LIBS = -lc -lutil $(shell $(PKG_CONFIG) --libs ncursesw)
++CPPFLAGS += -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -D_XOPEN_SOURCE_EXTENDED
+ CFLAGS += -std=c99 ${INCS} -DNDEBUG ${CPPFLAGS}
+ 
+ CC ?= cc
diff --git a/app-misc/xmind/Manifest b/app-misc/xmind/Manifest
index ef65e01a9396..21af2e11e584 100644
--- a/app-misc/xmind/Manifest
+++ b/app-misc/xmind/Manifest
@@ -2,11 +2,11 @@ AUX xmind-3.4.0-config.ini 1671 BLAKE2B 1db0351ca78f06ebd2966d32c402334ceca45cc9
 AUX xmind-wrapper 488 BLAKE2B 5880ece73df047121bbda1eb8f6b891685bba3e704ac9d47f79970a81be8f8e20c35febd278278a2825692c12ea34a4d24627ef8b9ba91f1c6ea8f602fe8eddf SHA512 f400d3f527897f087d5e20bce43299a20bd64a458f7c95a47447c78bf0c2b951a8f38d29e4a6ce028a9b421c41880fb5850184cb0b190de79f712ec807dbf9d7
 AUX xmind-wrapper-3.5.3 493 BLAKE2B 82aa49de2c90e2f943550d328253749310032e95e1dbd33e092383240950698ccf61bd85e1b9315275ebacc89cef78c518152e6e70f9f3246af8d41f850d7aad SHA512 555e1103dc5714bb5924421899262f1112c83807233c9969afdaa0eb0cba631b13e4fa984af7c2029fe57fb7e135f51a1d00e3dd3fffb8bcf3bb96eb93dfad80
 AUX xmind-wrapper-3.7.0 504 BLAKE2B 3528749643f3686d11afc7817e6b3e3228e3ef22105a013046aa8dd8c0c5463490918182a52d8fbf476332265685a9a80785dfa431dd912ff22145a13a00b99f SHA512 452560c9b1ab68df745616ac032089fb05f1aab61c7e1b247eb241195dd38e11b69459abb5e2b6696db76e2e421291de4dc41030f525f77f0e30522b52540248
-DIST xmind-8-update1-linux.zip 142395100 BLAKE2B 79ccca279f9c8bd6dba47b78b81692613602e2d1dbedd38a4a85ffdc296b4743192496a70884bfe473b76ea6aa8d4b79277ed3bb16c0c83c06407ac95d0fbd34 SHA512 725268287dfa9dc9a5d9fd429277eecd43ef2e09158b3bb8ef51e06355620741b2aa709c227debd0069f4401623b7274082f6b81b3ace153289ef7ffac25fca4
 DIST xmind-8-update2-linux.zip 120800791 BLAKE2B 2128d3d6a2c120b226b02128aede12aad062e72e4e322f910100663a37be9ae9a722270c36318a21897aa6489d9bfad118145e0852463e31b17bc1d377c12725 SHA512 e658714a5944e8de62577302c22763e9c55d1f82ce6cbda187ec39801ac7cbd5c34de6e4d7d9735546bcef26795c21c194ff026cebf39b2c9af2663cec98ce58
+DIST xmind-8-update6-linux.zip 120903858 BLAKE2B 8dd45f06a0a1486fe65b99668dcba7f17d4763caa2ec2542c60040f0e3701b76946810b7fa242726a8a3c6d3c46b4b7d9a0a67666d4c2814509215395170ce80 SHA512 0e4871a385c8449da000ee3bcf1a44fe63075af4f592f43a01635e017ab253a996739c63f9c71f098529adf62b5df4018440c7db1c44040488c0e3186abe6248
 DIST xmind-icons.tar.xz 5024 BLAKE2B 3391d931dc7d3094ad1213c9cbd43c6b3f151c7f7321ff23139c7f1b69c3fdc662902a95714bac240b1962c26210f3edc41752f315c885581e9ba03efa9069e6 SHA512 3ee6b8e42b75305bec8f97f733575f10ca3d08e1c5a76a10700776cb7740ae6f8a0f3dfbc4112d60ab2499915ca4ea0e3d56fd49e55bec00fccdc8710d9f9f0d
 DIST xmind-portable-3.5.3.201506180105.zip 159265180 BLAKE2B dde948c9e16cb02607b8fd23a315b0ff5d5ec75b4feb79d62cde1e0d11f06e477068435dd8856d573b7f01e7959a19169357b477841a1d5057367cd3c4f8b8c3 SHA512 d41deebec769d06276d051c57e546c44e4283feabd5f6c45ce97efdbf755d75e9b99d39b6fd10baf2f4735f25a695d2902ca9888d94ad414318f38c55e3f4af5
 EBUILD xmind-3.5.3.201506180105-r2.ebuild 2215 BLAKE2B e7cfad25893f5c2a9433b0600fa5f96fa1012a4a315c53d3b3f008b42b82dc56711d35bc546501117a4146e9f86f0a501c1e653df6e5b4bda140c1c9d424d241 SHA512 af0c431cca019f4b5b1228daf2931e1bed1d8d01711aa1a19aa3b73d75176f08e10d6353c8a0460f33dff0b13dcd9d4f3b7cd8d32fa89611663ead849674d7a0
-EBUILD xmind-3.7.1.ebuild 2186 BLAKE2B 5db246d4a5ca8e94ca27b827681499a860e8ed19c7ae8d2cef85ec17d97b9b53846bb52eb4e1209394e43ddcadbe7d5468515c989cdd25966ff4b346201ab178 SHA512 4d6eddb169f546dd7d119525db843abe4b7a450b56fb972c59011ba1d0b994bd25fae4ecf53208632407abaca7796d906a357cf99f60655b47ebb52ae4d0c214
 EBUILD xmind-3.7.2.ebuild 2186 BLAKE2B a815fab4ea635fa0b2f2fc22ca6878dd55f9316bbfe23b0b87afa197c5096aa627a7816c99e4d6da0acf2e7f75f84b15a96b4b49e516290cd994ec168f1ef621 SHA512 d5960a6dbedff1000859ced4aee8e43f86bd5fe63ea61e046c78a31c1634e1e653523f2f446e9429fb5d228623e81fad90279c18d29e1111a9b667543e2c9f1a
+EBUILD xmind-3.7.6.ebuild 2186 BLAKE2B 8d28428f983b211f5b7624d8825a9df417c59402a7ecbe77e158dc503abc207f0538179c714bfcffac7765619d98fa8c9635284d3c662694d45f8a3de807e43a SHA512 e90cabd43dbf81d828d79475cda33f7d6dae3edf295d2407355fefdb4a39ad59e0fe95e647559d1f141a4480f49186e95e03a0cf9920ffc76a9ea6872a640bdf
 MISC metadata.xml 248 BLAKE2B 756531e249f020913a383436ea184d8617481ef1ddefb311630199224eabe6082d396b3058f1123fa97d7aa6f8026de8a256cf4fb253b16381462d64f45373d6 SHA512 29d9aef2134dc48ca8f1cf14bcb7197920bee680270c75fa551c892c9bbaa325a1a6cc6e97a25e1a33c1dc36e1c7085abb3672559b9803285d755db6eefe12a3
diff --git a/app-misc/xmind/xmind-3.7.1.ebuild b/app-misc/xmind/xmind-3.7.6.ebuild
index 3e9a42274d25..f1ab65c41091 100644
--- a/app-misc/xmind/xmind-3.7.1.ebuild
+++ b/app-misc/xmind/xmind-3.7.6.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 inherit eutils multilib gnome2-utils font
 
-MY_PV="8-update1"
+MY_PV="8-update6"
 MY_P="${PN}-${MY_PV}-linux"
 
 DESCRIPTION="A brainstorming and mind mapping software tool"