6 files changed, 126 insertions, 4 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 72e0b9d01084..8720715ace45 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/tint2/Manifest b/x11-misc/tint2/Manifest
index 55c2826c4ef0..024c093ed345 100644
--- a/x11-misc/tint2/Manifest
+++ b/x11-misc/tint2/Manifest
@@ -5,7 +5,9 @@ AUX 0.14.6-sysconfdir-xdg2.patch 660 BLAKE2B deb073f781e2434e54d158e2ff2fe8482f1
 DIST tint2-0.12.12.tar.gz 469724 BLAKE2B cfb9eb702680e23f7f9c9b98c8853d1e059a4d189347496eaa9e667bb91852b66dfc451d310d0194971b03c8a68ba60a596b380cae046e3d34a75a65523f2bf6 SHA512 10a1f42df6a66f6e092d69cd0ea3d900dcef57b06391206d950a1d7f576a880829bb44d00828a030d3172184db238a22f205169c12cc32cf42c6321d61929a8c
 DIST tint2-0.14.6.tar.gz 466533 BLAKE2B c7308771e8a5a7d49410d99779ee54fd19b7d5b71d6c04eb3835100f74df5c12d692b50ce57a2a31f4956c09e404acd8cfd2bd1ef87e6fc55f21f583f5a13977 SHA512 eb1505bef932aa0cd0291dc762d3c9cbe760e3fea0684fc604aa3cae3f5ddf63e5b791db745eb29384e4732e6de09a01084f3ce2a92931b431cdf69a59b1f6da
 DIST tint2-15.3.tar.gz 500301 BLAKE2B b8b405f1c56c3de41f672dc02acef893b0650fadca9a4823c7b249661e8675e01c92c9c1588d32c2836596f34c4dbc1e5d2608cff3c75590d7eeac9e925eb874 SHA512 41ae8f8e3aac6fe55539c531889ec2883534072ad398f0693e4bfd39c80dd4c64d635a36e063f741fe89fd461f66f92adf6acdde553e0f8b169992d94dc0e344
+DIST tint2-16.1.tar.gz 534354 BLAKE2B 540287bd952ba8b54372d45055efe216dc4d9d192e33d6f83f2c734e97b9e350c7be0cb3e19d414f4e11c0bb7b505307899dea9c10ac382737a2507f7df4fdcc SHA512 c6319d5692d53e56c150906c32c794ee4237e06455efb68527b379b4ae00c48d996c63ea02ee6aefc70266335eb4cb08b4731556075c46d435b7861de6eefd3c
 EBUILD tint2-0.12.12.ebuild 1400 BLAKE2B 9f386182995036c6f99f279c461f26486d3ec05bb3f6fc4eb7e94f12c002f6a2404b3f408e2704f144d26949780dfc6c3686708a3a762479edc4ca5aa1cd3ed8 SHA512 97b0a093ba91d254201b1105524c5eb087d09589be1560f5adfd76da26b803da3efff44f3974e273d694086dc3f50693c6a5cae1798fd1e11be98d6942167d0d
 EBUILD tint2-0.14.6-r2.ebuild 1341 BLAKE2B 8a26bdde86b7c5c0b44e05c184c7f6f2994c1ba52884025032aa71058a6ea3a3f0a35ba0abe69429ba608dc389c28ba609d868bea58a6b4a6ad08981fedb1637 SHA512 a76155df865a0b6dd2c12709f42e2848b9330e51a0c55392c42caa76f017550a94343469b741cfbee375f527b711a8a158efdccf315f3917442f13fec91d19f7
 EBUILD tint2-15.3.ebuild 1273 BLAKE2B f481e61000569a5491f3d02a03fbf74d2e824ece425c38c6ebe2a9d342c53881ac6a53c02c962e783dd609d8cfa4d9ebbd34374f5e2226980c17fa92462a89c9 SHA512 661effd4bf12390e7fdcd08e363ae7d8dc8aa9d4388c65b7f0360d6f9529ac60223edfe0f993cf99edeffe7f002f8e0eab436c58261be7f77f9e933e17667c8e
+EBUILD tint2-16.1.ebuild 1273 BLAKE2B d5b94cf497e38af830142fb500bf3178d3143382e856fe9a08d31774e4dcaee0b396e5e1c0f669cdec34e632d23fc957a67c986b0255a6e3faf75f3bc2135320 SHA512 2ed8566ffaa82189d804d8a5ce891df27e805d3a3539c30fd832c8edf1a779b0e799747a23f9a3d74407453317f77d27c3432e22139c9e09257075f05bb43899
 MISC metadata.xml 789 BLAKE2B 95159a0de8a09e4381a7cccf494554faecd8ca1e20e3d175eeb1ef76015f7609a3fe6cbbc0208414b7b703d78339b0a8b643263766269e1e466506ee25a4cbe7 SHA512 e50c127a10ae89a7ec04c7b3a1d5dad3fd1ca89ac37b66378d8b24921d3ffe43ea4037182e20a624880be0eea527414e3727726e6799bbec4d46e2d3bdc934cf
diff --git a/x11-misc/tint2/tint2-16.1.ebuild b/x11-misc/tint2/tint2-16.1.ebuild
new file mode 100644
index 000000000000..f7cbd25ca6f4
--- /dev/null
+++ b/x11-misc/tint2/tint2-16.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils vcs-snapshot
+
+DESCRIPTION="tint2 is a lightweight panel/taskbar for Linux."
+HOMEPAGE="https://gitlab.com/o9000/tint2"
+SRC_URI="https://gitlab.com/o9000/${PN}/repository/archive.tar.gz?ref=v${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="battery svg startup-notification tint2conf"
+
+DEPEND="
+	dev-libs/glib:2
+	svg? ( gnome-base/librsvg:2 )
+	>=media-libs/imlib2-1.4.2[X,png]
+	x11-libs/cairo[X]
+	x11-libs/pango
+	tint2conf? ( x11-libs/gtk+:2 )
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXinerama
+	>=x11-libs/libXrandr-1.3
+	x11-libs/libXrender
+	startup-notification? ( x11-libs/startup-notification )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+		-DENABLE_BATTERY="$(usex battery)"
+		-DENABLE_TINT2CONF="$(usex tint2conf)"
+		-DENABLE_SN="$(usex startup-notification)"
+		-DENABLE_RSVG="$(usex svg)"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-misc/xvkbd/Manifest b/x11-misc/xvkbd/Manifest
index 04b045d59f5c..563d8f049adc 100644
--- a/x11-misc/xvkbd/Manifest
+++ b/x11-misc/xvkbd/Manifest
@@ -1,4 +1,6 @@
 AUX xvkbd-3.6-last_altgr_mask.patch 202 BLAKE2B d980f06b4975bf5dadd6e6e656fd3471fbfc651cfee7f4c118010b1c38d41f7597f7bd6d7e07e6c261f7fed0b07efefdfd4f09fcee38029f0047ed5fc2a1317f SHA512 d3d58b1ba3a7dc71a0240ba3240fd06cc1719ac35ab8f1b119f7d79823fddcdbe1605a457722ec75d4b74804f0a68ec221c5ec3d6c15bd2c4130ce96c01f771e
 DIST xvkbd-3.7.tar.gz 81645 BLAKE2B 9133b3b8e176034f2c39deb3ad9b334f553c834ba3285aaed59ab2a6f531c0184879c7bfe8c702313c9b0d4089883603c2f8430160f3c2af243705e5328b4ed0 SHA512 19ac5e78c34889d80571bb9feea65582fa413cdce0ba2f949840a08e70c900d720ca789d90d1118aa9667d32183b0f1edb33b7b0029ef5abb1d6faf058134385
-EBUILD xvkbd-3.7.ebuild 1113 BLAKE2B fdbc4dfa7daaf3c372a4a68d9e4f1adedcce5d2fd52130d5168f530beda0b40fe092579c5e3b42daffc034c81a56723ab423437a22ee3040197b0d646cdaf296 SHA512 e6043572ede687bb3b6be6423f92f4dfef0915193154b7210b4cb514baddef28453cf6cd3a761b4f51a32e7f1ba295f69c97f3da510790e6b577d470497db36b
+DIST xvkbd-3.8.tar.gz 88508 BLAKE2B bdaa3b31322ef2393298cb6987e4980536f3a6707df4016acc698a6713f25bff3e92cdecfcbf0c513af5cb8290e9b434fc61108095138c15cbbba9765ba856a1 SHA512 8a1ff96d90d1021bfd60ac6c251e62d68a65e86a1f1ee1fbdbf67344bdd07d7e1929a646e7e80f1da5f3e12e50c655e2be180c9ae4129fa7912f32aa5f40f5f5
+EBUILD xvkbd-3.7.ebuild 1079 BLAKE2B 95d3b4c8fe766b590e65afba5546df9ceef6575acf8038e7de2615cd4c35382e15b459d09d64c8ae8fa5b1ca14cfdbd9768a86289d99f6f125bba1f9201d42b2 SHA512 620dc18b9769695fd17f6f86b21e7370557fd5dd168cc4e8e46a7789f2f4551b439e18ed3e7ba3cbbdcbbe711311be381124bb7eab8cddf3e28b87ffabc9e493
+EBUILD xvkbd-3.8.ebuild 1047 BLAKE2B 18dfa77c061d685dd57e4fc4125fcd027750b621f08b390063ebe3ff6d357bdc88a6560bf24363fe81026c7a2c1d9808ecc14dbcae6b1bccd6d5080bcab1575e SHA512 27af2ff87194e37174f5c59aea7d0806b052d8a3ca23a5a0694dede46d4ea8eb9c085465c70a34c19385b4e8450c04f870f27123b7c2eab6f3ae0ede2c4aff78
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xvkbd/xvkbd-3.7.ebuild b/x11-misc/xvkbd/xvkbd-3.7.ebuild
index d171ff235802..1277bf4b7f60 100644
--- a/x11-misc/xvkbd/xvkbd-3.7.ebuild
+++ b/x11-misc/xvkbd/xvkbd-3.7.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="virtual keyboard for X window system"
-HOMEPAGE="http://homepage3.nifty.com/tsato/xvkbd/"
-SRC_URI="http://homepage3.nifty.com/tsato/xvkbd/${P}.tar.gz"
+HOMEPAGE="http://t-sato.in.coocan.jp/xvkbd/"
+SRC_URI="${HOMEPAGE}${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-misc/xvkbd/xvkbd-3.8.ebuild b/x11-misc/xvkbd/xvkbd-3.8.ebuild
new file mode 100644
index 000000000000..04a518b10850
--- /dev/null
+++ b/x11-misc/xvkbd/xvkbd-3.8.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit multilib toolchain-funcs
+
+DESCRIPTION="virtual keyboard for X window system"
+HOMEPAGE="http://t-sato.in.coocan.jp/xvkbd/"
+SRC_URI="${HOMEPAGE}${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXaw3d
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXtst
+"
+DEPEND="
+	${RDEPEND}
+	app-text/rman
+	x11-misc/gccmakedep
+	x11-misc/imake
+	x11-proto/inputproto
+	x11-proto/xextproto
+	x11-proto/xproto
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.6-last_altgr_mask.patch
+)
+
+src_configure() {
+	xmkmf -a || die
+}
+
+src_compile() {
+	emake \
+		CC=$(tc-getCC) LD=$(tc-getCC) \
+		XAPPLOADDIR="/usr/share/X11/app-defaults" \
+		LOCAL_LDFLAGS="${LDFLAGS}" \
+		CDEBUGFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	emake \
+		XAPPLOADDIR="/usr/share/X11/app-defaults" \
+		DESTDIR="${D}" \
+		install
+
+	rm -r "${D}"/usr/$(get_libdir) "${D}"/etc || die
+
+	dodoc README
+	newman ${PN}.man ${PN}.1
+}