commit: 8695ebc0efe991b5860d1b788ed4fe8f3e377ffd Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Sat Jul 28 11:34:57 2018 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Sat Jul 28 11:38:44 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8695ebc0
x11-terms/lilyterm: Use x11-libs/vte:2.91. Package-Manager: Portage-2.3.43, Repoman-2.3.10 .../lilyterm/files/lilyterm-99999-autogen.patch | 29 ++++++++++++++++++++++ x11-terms/lilyterm/lilyterm-99999.ebuild | 8 ++++-- 2 files changed, 35 insertions(+), 2 deletions(-) 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 00000000000..8485d56ed75 --- /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-99999.ebuild b/x11-terms/lilyterm/lilyterm-99999.ebuild index 402106af665..21280cce5b4 100644 --- a/x11-terms/lilyterm/lilyterm-99999.ebuild +++ b/x11-terms/lilyterm/lilyterm-99999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit git-r3 +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"; @@ -13,7 +13,7 @@ LICENSE="GPL-3" KEYWORDS="" RDEPEND=" - x11-libs/vte:0 + x11-libs/vte:2.91 " DEPEND=" ${RDEPEND} @@ -23,9 +23,13 @@ DEPEND=" " DOCS=( AUTHORS ChangeLog README TODO ) +PATCHES=( + "${FILESDIR}"/${PN}-99999-autogen.patch +) src_prepare() { default ./autogen.sh || die + eautoreconf }
