From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 9D1F21384B2 for ; Thu, 30 Jul 2015 15:52:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 038C2E07C9; Thu, 30 Jul 2015 15:52:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A035DE07C9 for ; Thu, 30 Jul 2015 15:52:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B866E340873 for ; Thu, 30 Jul 2015 15:52:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 631C2BF for ; Thu, 30 Jul 2015 15:52:04 +0000 (UTC) From: "Alexis Ballier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexis Ballier" Message-ID: <1438271517.2726f222411f7647064a2406fb47e5aaed4cf6f9.aballier@gentoo> Subject: [gentoo-commits] dev/aballier:master commit in: scripts/texlive/tlpsrc/ X-VCS-Repository: dev/aballier X-VCS-Files: scripts/texlive/tlpsrc/Makefile scripts/texlive/tlpsrc/texlive-basic-preinherit.ebuild scripts/texlive/tlpsrc/texlive-basic.extradeps X-VCS-Directories: scripts/texlive/tlpsrc/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: 2726f222411f7647064a2406fb47e5aaed4cf6f9 X-VCS-Branch: master Date: Thu, 30 Jul 2015 15:52:04 +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: 4ae204df-0b14-40b9-84e1-f2e18e748826 X-Archives-Hash: 5ee212502aba55952e251854a0ddca27 commit: 2726f222411f7647064a2406fb47e5aaed4cf6f9 Author: Alexis Ballier gentoo org> AuthorDate: Thu Jul 30 15:51:57 2015 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Thu Jul 30 15:51:57 2015 +0000 URL: https://gitweb.gentoo.org/dev/aballier.git/commit/?id=2726f222 add support for -preinherit.ebuild and make luajittex optional in texlive-basic, bug #542620 scripts/texlive/tlpsrc/Makefile | 4 ++++ scripts/texlive/tlpsrc/texlive-basic-preinherit.ebuild | 1 + scripts/texlive/tlpsrc/texlive-basic.extradeps | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/texlive/tlpsrc/Makefile b/scripts/texlive/tlpsrc/Makefile index 80b335a..1918297 100644 --- a/scripts/texlive/tlpsrc/Makefile +++ b/scripts/texlive/tlpsrc/Makefile @@ -110,6 +110,9 @@ clean: %.extrardepend: touch $@ +%-preinherit.ebuild: + touch $@ + %.ebuild: %.desc %.deps %.list %.doclist %.srclist %.gentoolicense %-post.ebuild %.extrardepend cat $(PORTDIR)/header.txt > $@ printf "EAPI=\"5\"\n\n" >> $@ @@ -122,6 +125,7 @@ clean: echo -n "TEXLIVE_MODULE_SRC_CONTENTS=\"" >> $@ cat $(@:%.ebuild=%.srclist) >> $@ echo "\"" >> $@ + cat $(@:%.ebuild=%-preinherit.ebuild) >> $@ echo "inherit $(EXTRA_INHERIT) texlive-module" >> $@ cat $< >> $@ echo "" >> $@ diff --git a/scripts/texlive/tlpsrc/texlive-basic-preinherit.ebuild b/scripts/texlive/tlpsrc/texlive-basic-preinherit.ebuild new file mode 100644 index 0000000..b718b89 --- /dev/null +++ b/scripts/texlive/tlpsrc/texlive-basic-preinherit.ebuild @@ -0,0 +1 @@ +TEXLIVE_MODULE_OPTIONAL_ENGINE="luajittex" diff --git a/scripts/texlive/tlpsrc/texlive-basic.extradeps b/scripts/texlive/tlpsrc/texlive-basic.extradeps index c6dc694..0cb4e70 100644 --- a/scripts/texlive/tlpsrc/texlive-basic.extradeps +++ b/scripts/texlive/tlpsrc/texlive-basic.extradeps @@ -1,4 +1,4 @@ -!=app-text/texlive-core-2015[luajittex?]