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 8B846138010 for ; Thu, 13 Sep 2012 12:20:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BA56121C04C; Thu, 13 Sep 2012 12:19:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 86D0621C073 for ; Thu, 13 Sep 2012 12:19:49 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C557533C6EF for ; Thu, 13 Sep 2012 12:19:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 56915E543C for ; Thu, 13 Sep 2012 12:19:47 +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: <1347538770.2f5e96313a427fd7b836c64897d62f14b290c1a6.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: 2f5e96313a427fd7b836c64897d62f14b290c1a6 X-VCS-Branch: master Date: Thu, 13 Sep 2012 12:19:47 +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: a47a764c-f7e2-48ae-af08-ee34c4567b58 X-Archives-Hash: a898eb708b90fba14b3ee6ff59b5a2ba commit: 2f5e96313a427fd7b836c64897d62f14b290c1a6 Author: Alexis Ballier gentoo org> AuthorDate: Thu Sep 13 12:19:30 2012 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Thu Sep 13 12:19:30 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/aballier.git;a=commit;h=2f5e9631 Add GPL-2 to .genoolicense and pass it through a uniq call so that we dont end up with duplicate licenses --- scripts/texlive/tlpsrc/Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/texlive/tlpsrc/Makefile b/scripts/texlive/tlpsrc/Makefile index f40c417..ae585b5 100644 --- a/scripts/texlive/tlpsrc/Makefile +++ b/scripts/texlive/tlpsrc/Makefile @@ -34,7 +34,7 @@ unpacked : $(FULLDESC:%=%.unpacked) ./getlicense.sh $(shell cat $(<:%.tlplic=%.list)) | sort | uniq | tr '\n' ' ' > $@ %.gentoolicense: %.licenselist - ./cataloguelicense2gentoolicense.sh $(shell cat $<) | sort | uniq | tr '\n' ' ' > $@ + (./cataloguelicense2gentoolicense.sh $(shell cat $<) ; printf "\nGPL-2\n") | sort | uniq | tr '\n' ' ' > $@ %.desc: %.base grep "shortdesc " $< | sed -e "s/shortdesc //" | sed -e "s/.*/DESCRIPTION=\"TeXLive \0\"/" > $@ @@ -114,7 +114,7 @@ clean: echo "inherit $(EXTRA_INHERIT) texlive-module" >> $@ cat $< >> $@ echo "" >> $@ - echo -n "LICENSE=\"GPL-2 " >> $@ + echo -n "LICENSE=\"" >> $@ cat $(@:%.ebuild=%.gentoolicense) >> $@ echo "\"" >> $@ echo "SLOT=\"0\"" >> $@