From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CE84A138334 for ; Sat, 28 Jul 2018 11:38:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C190FE07C7; Sat, 28 Jul 2018 11:38:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7E792E07C7 for ; Sat, 28 Jul 2018 11:38:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 621B9335CC7 for ; Sat, 28 Jul 2018 11:38:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8E6CE38C for ; Sat, 28 Jul 2018 11:38:50 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1532777924.8695ebc0efe991b5860d1b788ed4fe8f3e377ffd.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-terms/lilyterm/, x11-terms/lilyterm/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-terms/lilyterm/files/lilyterm-99999-autogen.patch x11-terms/lilyterm/lilyterm-99999.ebuild X-VCS-Directories: x11-terms/lilyterm/ x11-terms/lilyterm/files/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 8695ebc0efe991b5860d1b788ed4fe8f3e377ffd X-VCS-Branch: master Date: Sat, 28 Jul 2018 11:38:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0aacdb7c-1847-427a-a2bd-f69dca96abc5 X-Archives-Hash: afa333b6a1122cbac15a1a25cd370fb1 commit: 8695ebc0efe991b5860d1b788ed4fe8f3e377ffd Author: Jeroen Roovers gentoo org> AuthorDate: Sat Jul 28 11:34:57 2018 +0000 Commit: Jeroen Roovers gentoo 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 }