gentoo resync : 04.08.2018

5 files changed, 93 insertions, 4 deletions

diff --git a/x11-terms/lilyterm/Manifest b/x11-terms/lilyterm/Manifest
index b8ec9f96bf1e..867b77b4c9ba 100644
--- a/x11-terms/lilyterm/Manifest
+++ b/x11-terms/lilyterm/Manifest
@@ -1,5 +1,8 @@
+AUX lilyterm-0.9.9.4-autogen.patch 230 BLAKE2B e1fe8cfc6e7efb174910a716043fcb86b4d954114c019e7080f6911a5e3290a44f95cb347ea771f10d45a25e46c06a2eb9bcc4fd163cd3365043ad9e9feff8c0 SHA512 a098b314ead6e60930f7009ba346da026b21c8efcb68c4d0ede57755afd8bd2bab1b2c22ed4f0b65e343e253efc42f3458ebe07d88b4512251db04f759a26164
 AUX lilyterm-0.9.9.4-gettext.patch 246 BLAKE2B 2061244d1e51659e78a55880111463a7fb54b121fca4a32a6e1b56ea2a1a74d8c0c158554a0ef6dea6f4d020cfc584e87b028d09631ec193b58a266583a66cf6 SHA512 94308160a63482d3c07f5baac819111958e7d3e6ddb10318671a30db866a18756b59ccc79e7ea866864c520865c24dd0f3e3920aa3e4259e2accf2dce05219f1
+AUX lilyterm-99999-autogen.patch 927 BLAKE2B 3b057a1b2d0445bba467fb4ef227fc2d9969d82a7e05b64d56a133b5991d78b17d2a2abdac4bd805d85a46aeea534af057daf5293af0f571b26acd543afcf74b SHA512 310de428a085f9307f69ba1f23e4bf0fc72886ff9351527da8bee61293f2cbacd61ce7e866b4fa22b5153e7f13456d597382df66fd66e2b5ca087741da556e29
 DIST lilyterm-0.9.9.4.tar.gz 346180 BLAKE2B 8e9a728760aa1435a3a4247659443e0a29c6ab5f129b2eaeb3c070c4ec8807024f35ee22d028d2400c110143b52ee008496fbd10e67052e73046d6cb6e130b3d SHA512 2fcd9d31a28d6bf9d953cd77b38cb3c67591dd04157f0efd418ce3ac9eab0f8090156435207c8bc18e619dda45e726f3346b1344f2d37fd308fa802476d3b5da
 EBUILD lilyterm-0.9.9.4-r1.ebuild 597 BLAKE2B 8c3a6a5da5fa5fce40ee66c09b54386bfc95c2eb483b6d3bfd997802b228f1fde5bfd48881262fd1a69eac03d2dca27ce9fadc923b5a7a7afb738b0eebbeb56c SHA512 0b1bc581184438ec5bccfd3283f7a4116c17bd096fc290a5226b6338663b99aa64a9004a0fed602daa001e143e501068bfda5d70df73a48bcf265ca305778bbb
-EBUILD lilyterm-0.9.9.4.ebuild 539 BLAKE2B 407fedbfc39f9d156047dec19dd853c20f61107f760ee4f3ec61ead19bfa7927447ea7b8de7929cbee746f1a2a72dfbe5b3a304eb06fa32cf1fb133d4320bae0 SHA512 dfa0f09a396309beaaf731a237ccd8459cd610e355ee591c6071b7dc1a507e27e408870662e2e141312e662c05395e4df7440dc93a2c2f6091296ecd034579f3
+EBUILD lilyterm-0.9.9.4-r2.ebuild 677 BLAKE2B e17e40173218a922c725d6f79d720726db579648db1806fff513aa4e687695d71f96fcc2fec1b65d20efcdbc5f89197bf850c8780116887038e15dd3f39ecbc9 SHA512 a2fb76923975b71e22a911c0fe0bb2f5338745b835131393f9ef9ea35cf039f101d81608abf81f3f520de937c183f1321c8c50ec44b7a19dea023f7e69ff845f
+EBUILD lilyterm-99999.ebuild 631 BLAKE2B 4ec61a17eb74756ae7946fa1d234db20104a8df37cfda6ae7c1f4fffe6f4edbccb72fec8fd969499ad334e83adcafeb2668daf5962a03fcd1bc90fc9866d7213 SHA512 a62bf2229dc006baf17e4da35254224dc6d81a31b7fc386efb73b5a2cd9caae9dae9dd19d51e9881fbb33e51fb7193eeae76c5ccb27168bb2ecfdf619dd4e149
 MISC metadata.xml 341 BLAKE2B 2123a85d5442a8465b393d5f2a2f560359c90023a0c447781ee60b6a28fc3c71c075efe02df7425051fc9f16505a5e2e453ebd9f961eefee8bcc2d8008bd74a5 SHA512 ca3133afa9d86a0fbc7517036679d00bd1b6d657c85e393038ff445c2d4946aa053abbee66f72f35486bf20d5c278782e805a1a7f02318f1d4413f79f942719b
diff --git a/x11-terms/lilyterm/files/lilyterm-0.9.9.4-autogen.patch b/x11-terms/lilyterm/files/lilyterm-0.9.9.4-autogen.patch
new file mode 100644
index 000000000000..a4f367484171
--- /dev/null
+++ b/x11-terms/lilyterm/files/lilyterm-0.9.9.4-autogen.patch
@@ -0,0 +1,15 @@
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -43,12 +43,3 @@
+ AC_FILE='src/Makefile.am'
+ Replace_Parameter BINARY
+ echo ""
+-
+-set -x
+-
+-aclocal
+-autoheader
+-intltoolize --automake --copy --force
+-automake --add-missing --copy
+-autoconf
+-
diff --git a/x11-terms/lilyterm/files/lilyterm-99999-autogen.patch b/x11-terms/lilyterm/files/lilyterm-99999-autogen.patch
new file mode 100644
index 000000000000..8485d56ed75c
--- /dev/null
+++ b/x11-terms/lilyterm/files/lilyterm-99999-autogen.patch
@@ -0,0 +1,29 @@
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -44,11 +44,10 @@
+ Replace_Parameter BINARY
+ echo ""
+ 
+-# for GTK3+
+-pkg-config --cflags gtk+-2.0 > /dev/null 2>&1
++false
+ if [ $? != 0 ]; then
+   sed -i 's/^AM_PATH_GTK_2_0.*/PKG_CHECK_MODULES([GTK], [gtk+-3.0])/g' configure.ac
+-  pkg-config --cflags vte-2.91 > /dev/null 2>&1
++true
+   if [ $? = 0 ]; then
+     sed -i 's/^PKG_CHECK_MODULES(vte, \[vte >= .*/PKG_CHECK_MODULES(vte, [vte-2.91 >= 0.38.0],, AC_MSG_ERROR([You need libvte-2.91 >= 0.38.0 to build $_PACKAGE]))/g' configure.ac
+     sed -i 's/^lilyterm_LDADD\(.*\)$/lilyterm_LDADD\1 -lX11/g' src/Makefile.am
+@@ -56,12 +55,3 @@
+     sed -i 's/^PKG_CHECK_MODULES(vte, \[vte >= .*/PKG_CHECK_MODULES(vte, [vte-2.90 >= 0.30.0],, AC_MSG_ERROR([You need libvte-2.90 >= 0.30.0 to build $_PACKAGE]))/g' configure.ac
+   fi
+ fi
+-
+-set -x
+-
+-aclocal
+-autoheader
+-intltoolize --automake --copy --force
+-automake --add-missing --copy
+-autoconf
+-
diff --git a/x11-terms/lilyterm/lilyterm-0.9.9.4.ebuild b/x11-terms/lilyterm/lilyterm-0.9.9.4-r2.ebuild
index 1cf81a312581..8221d88b0e3c 100644
--- a/x11-terms/lilyterm/lilyterm-0.9.9.4.ebuild
+++ b/x11-terms/lilyterm/lilyterm-0.9.9.4-r2.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+inherit autotools
 
 DESCRIPTION="a terminal emulator based off of libvte that aims to be fast and lightweight"
 HOMEPAGE="https://lilyterm.luna.com.tw"
@@ -10,7 +11,6 @@ SRC_URI="https://${PN}.luna.com.tw/file/${P}.tar.gz"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
 	x11-libs/vte:0
@@ -23,7 +23,14 @@ DEPEND="
 "
 
 DOCS=( AUTHORS ChangeLog README TODO )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.9.4-autogen.patch
+	"${FILESDIR}"/${PN}-0.9.9.4-gettext.patch
+)
 
 src_prepare() {
-	./autogen.sh
+	default
+
+	./autogen.sh || die
+	eautoreconf
 }
diff --git a/x11-terms/lilyterm/lilyterm-99999.ebuild b/x11-terms/lilyterm/lilyterm-99999.ebuild
new file mode 100644
index 000000000000..21280cce5b43
--- /dev/null
+++ b/x11-terms/lilyterm/lilyterm-99999.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools git-r3
+
+DESCRIPTION="a terminal emulator based off of libvte that aims to be fast and lightweight"
+HOMEPAGE="https://lilyterm.luna.com.tw"
+EGIT_REPO_URI="https://github.com/Tetralet/LilyTerm"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS=""
+
+RDEPEND="
+	x11-libs/vte:2.91
+"
+DEPEND="
+	${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS ChangeLog README TODO )
+PATCHES=(
+	"${FILESDIR}"/${PN}-99999-autogen.patch
+)
+
+src_prepare() {
+	default
+
+	./autogen.sh || die
+	eautoreconf
+}