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 24B471384A7 for ; Thu, 30 Jul 2015 13:35:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1C81C14014; Thu, 30 Jul 2015 13:35:08 +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 C04E414014 for ; Thu, 30 Jul 2015 13:35:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9101C3406F2 for ; Thu, 30 Jul 2015 13:35:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3D276BD for ; Thu, 30 Jul 2015 13:35:03 +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: <1438263062.4ea5cb935d21c3575995b69d838ca884f2f6d63f.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 X-VCS-Directories: scripts/texlive/tlpsrc/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: 4ea5cb935d21c3575995b69d838ca884f2f6d63f X-VCS-Branch: master Date: Thu, 30 Jul 2015 13:35:03 +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: 9f2fb39f-3519-48c0-a904-a61001a0e780 X-Archives-Hash: 7d2f29323472894329bf95f749d9044c commit: 4ea5cb935d21c3575995b69d838ca884f2f6d63f Author: Alexis Ballier gentoo org> AuthorDate: Thu Jul 30 13:30:57 2015 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Thu Jul 30 13:31:02 2015 +0000 URL: https://gitweb.gentoo.org/dev/aballier.git/commit/?id=4ea5cb93 Make .extraebuild mandatory to take advantage of make dependencies Remove trailing whitespaces. scripts/texlive/tlpsrc/Makefile | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/scripts/texlive/tlpsrc/Makefile b/scripts/texlive/tlpsrc/Makefile index 16bee61..f4b6957 100644 --- a/scripts/texlive/tlpsrc/Makefile +++ b/scripts/texlive/tlpsrc/Makefile @@ -15,7 +15,7 @@ lists : $(FULLDESC:%=%.list) $(FULLDESC:%=%.base) unpacked : $(FULLDESC:%=%.unpacked) -%.base: +%.base: $(CPF) $(@:texlive-%.base=$(TL_TRUNK)/Master/tlpkg/tlpsrc/collection-%.tlpsrc) $@ -sh $(@:%.base=%.baseexec) $@ @@ -104,7 +104,10 @@ clean: $(MAKE) CONTENTS="$(shell cat $<)" -f Makefile-dist cataloguehtml touch $@ -%.ebuild: %.desc %.deps %.list %.doclist %.srclist %.gentoolicense +%.extraebuild: + touch $@ + +%.ebuild: %.desc %.deps %.list %.doclist %.srclist %.gentoolicense %.extraebuild cat $(PORTDIR)/header.txt > $@ printf "EAPI=\"5\"\n\n" >> $@ echo -n "TEXLIVE_MODULE_CONTENTS=\"" >> $@ @@ -129,9 +132,9 @@ clean: cat $(@:%.ebuild=%.deps) >> $@ echo "\"" >> $@ echo -n 'RDEPEND="$${DEPEND} ' >> $@ - -cat $(@:%.ebuild=%.extrardepend) >> $@ + -cat $(@:%.ebuild=%.extrardepend) >> $@ echo '"' >> $@ - -cat $(@:%.ebuild=%.extraebuild) >> $@ + cat $(@:%.ebuild=%.extraebuild) >> $@ dist: lists $(VERSIONNED_ZIPS) $(EXTRA_DIST:%=%.doclist) $(EXTRA_DIST:%=%.srclist) $(MAKE) CONTENTS="$(EXTRA_ZIP)" -f Makefile-dist versionnedzips @@ -143,9 +146,9 @@ ebuildsdir: ebuilds: dist $(DESC:%=%.desc) $(DESC:%=%.ebuild) $(DESC:%=%.deps) -tlpobj: $(DESC:%=%.tlpobj) +tlpobj: $(DESC:%=%.tlpobj) -tlpobj: $(DESC:%=%.tlplic) +tlpobj: $(DESC:%=%.tlplic) licenselist: $(DESC:%=%.licenselist) $(EXTRA_DIST:%=%.licenselist)