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 326FE1384E0 for ; Wed, 16 Jan 2013 12:56:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3151821C031; Wed, 16 Jan 2013 12:56:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8E06921C001 for ; Wed, 16 Jan 2013 12:56:46 +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 9999833D8CC for ; Wed, 16 Jan 2013 12:56:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 331C2E4073 for ; Wed, 16 Jan 2013 12:56:44 +0000 (UTC) From: "Sven Eden" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sven Eden" Message-ID: <1358144568.d426c8cd669479200d89375ec21966142bcf3b65.yamakuzure@gentoo> Subject: [gentoo-commits] proj/ufed:master commit in: / X-VCS-Repository: proj/ufed X-VCS-Files: Makefile.am Portage.pm ufed.pl.in X-VCS-Directories: / X-VCS-Committer: yamakuzure X-VCS-Committer-Name: Sven Eden X-VCS-Revision: d426c8cd669479200d89375ec21966142bcf3b65 X-VCS-Branch: master Date: Wed, 16 Jan 2013 12:56:44 +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: 38080c5d-078b-4977-b2e6-e431682ab922 X-Archives-Hash: ca5c62699802fe15d6dcc4b4d24482b6 commit: d426c8cd669479200d89375ec21966142bcf3b65 Author: Sven Eden gmx de> AuthorDate: Mon Jan 14 06:22:48 2013 +0000 Commit: Sven Eden gmx de> CommitDate: Mon Jan 14 06:22:48 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/ufed.git;a=commit;h=d426c8cd Changed old style placeholders for 'sed' in Makefile.am to prefix with 'XX_' instead of '@'. The latter is reserved in perl for lists and drives any IDE nuts. --- Makefile.am | 8 ++++---- Portage.pm | 2 ++ ufed.pl.in | 11 +++++++---- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index 630ad2e..df14de5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,10 +15,10 @@ EXTRA_DIST = ufed.pl.in ufed: ufed.pl.in rm -f $@.tmp sed \ - -e 's|@PACKAGE_VERSION[@]|$(PACKAGE_VERSION)|g' \ - -e 's|@PERL[@]|$(PERL)|g' \ - -e 's|@libexecdir[@]|$(libexecdir)|g' \ - -e 's|@perldir[@]|$(perldir)|g' \ + -e 's|XX_PACKAGE_VERSION[@]|$(PACKAGE_VERSION)|g' \ + -e 's|XX_PERL[@]|$(PERL)|g' \ + -e 's|XX_libexecdir[@]|$(libexecdir)|g' \ + -e 's|XX_perldir[@]|$(perldir)|g' \ $< >$@.tmp chmod +x $@.tmp mv $@.tmp $@ diff --git a/Portage.pm b/Portage.pm index c7e236d..5443cf4 100644 --- a/Portage.pm +++ b/Portage.pm @@ -292,6 +292,7 @@ sub read_sh($) { sub read_use_mask() { for my $dir(@profiles) { + -r "$dir/use.mask" or next; for(noncomments "$dir/use.mask") { my $off = s/^-//; $use_masked_flags{$_} = { '' => !$off }; @@ -300,6 +301,7 @@ sub read_use_mask() { my($pkg, @flags) = split; for(@flags) { my $off = s/^-//; + $use_masked_flags{$_}{''} ||= 0; $use_masked_flags{$_}{$pkg} = !$off; } diff --git a/ufed.pl.in b/ufed.pl.in index 3435dae..a66ac52 100644 --- a/ufed.pl.in +++ b/ufed.pl.in @@ -1,4 +1,4 @@ -#!@PERL@ -I@perldir@ +#!XX_PERL@ use strict; use warnings; @@ -6,9 +6,10 @@ use warnings; # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-src/ufed/ufed.pl,v 1.45 2005/10/18 11:14:33 truedfx Exp $ +use lib qw{XX_perldir@}; use Portage; -my $version = '@PACKAGE_VERSION@'; +my $version = 'XX_PACKAGE_VERSION@'; my %use_descriptions; @@ -23,7 +24,9 @@ read_use_descs; delete @use_descriptions{qw(bootstrap build)}; -$Portage::make_conf_flags{'-*'} = 1 if defined $Portage::make_conf_flags{'*'} && !$Portage::make_conf_flags{'*'}; +$Portage::make_conf_flags{'-*'} = 1 + if defined $Portage::make_conf_flags{'*'} + && !$Portage::make_conf_flags{'*'}; for(keys %Portage::all_flags) { @{$use_descriptions{$_}} = "(Unknown)" @@ -76,7 +79,7 @@ sub flags_dialog() { POSIX::dup2 $owrite, 4; POSIX::close $owrite; my $interface = 'ufed-curses'; - exec { "@libexecdir@/$interface" } $interface or + exec { "XX_libexecdir@/$interface" } $interface or do { print STDERR "Couldn't launch $interface\n"; exit 3 } } POSIX::close $iread;