diff options
| -rw-r--r-- | app-portage/ufed/ChangeLog | 9 | ||||
| -rw-r--r-- | app-portage/ufed/files/digest-ufed-0.40-r5 | 3 | ||||
| -rw-r--r-- | app-portage/ufed/files/ufed-0.40-packageusemask.patch | 65 | ||||
| -rw-r--r-- | app-portage/ufed/metadata.xml | 2 | ||||
| -rw-r--r-- | app-portage/ufed/ufed-0.40-r5.ebuild | 42 |
5 files changed, 119 insertions, 2 deletions
diff --git a/app-portage/ufed/ChangeLog b/app-portage/ufed/ChangeLog index 1729d6f84620..2adf61c19d29 100644 --- a/app-portage/ufed/ChangeLog +++ b/app-portage/ufed/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-portage/ufed # Copyright 2003-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/ufed/ChangeLog,v 1.46 2006/11/10 22:13:54 truedfx Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/ufed/ChangeLog,v 1.47 2006/11/26 03:27:53 truedfx Exp $ + +*ufed-0.40-r5 (26 Nov 2006) + + 26 Nov 2006; Harald van Dijk <truedfx@gentoo.org> + +files/ufed-0.40-packageusemask.patch, -ufed-0.40-r4.ebuild, + +ufed-0.40-r5.ebuild: + Handle package.use.mask (#154628) and read /etc/portage/profile (#156191) *ufed-0.40-r4 (10 Nov 2006) diff --git a/app-portage/ufed/files/digest-ufed-0.40-r5 b/app-portage/ufed/files/digest-ufed-0.40-r5 new file mode 100644 index 000000000000..7e70efd006a3 --- /dev/null +++ b/app-portage/ufed/files/digest-ufed-0.40-r5 @@ -0,0 +1,3 @@ +MD5 81c6dc3af93d6ab2f592ba2cd7b1ee7f ufed-0.40.tar.bz2 20288 +RMD160 f360eb01f952acb4f52cfa571927a523f1fe3015 ufed-0.40.tar.bz2 20288 +SHA256 85d8894b7d163dacf7dfc94fff4e8c4a9cbb0302a66fc7e545a6d5c1c6c9318c ufed-0.40.tar.bz2 20288 diff --git a/app-portage/ufed/files/ufed-0.40-packageusemask.patch b/app-portage/ufed/files/ufed-0.40-packageusemask.patch new file mode 100644 index 000000000000..13c8c760c2f9 --- /dev/null +++ b/app-portage/ufed/files/ufed-0.40-packageusemask.patch @@ -0,0 +1,65 @@ +--- ufed-0.40/ufed.pl ++++ ufed-0.40/ufed.pl +@@ -25,16 +25,23 @@ + + $Portage::all_flags{'-*'} = 1 if defined $Portage::make_conf_flags{'*'} && !$Portage::make_conf_flags{'*'}; + +-Portage::merge %Portage::use_masked_flags, %Portage::archs; +- + for(keys %Portage::all_flags) { + @{$use_descriptions{$_}} = "(Unknown)" + if not exists $use_descriptions{$_}; + } + @{$use_descriptions{'-*'}} = 'Never enable any flags other than those specified in /etc/make.conf'; + ++for(@Portage::archs) { ++ delete $Portage::default_flags{$_}; ++ delete $Portage::all_flags{$_}; ++ delete $use_descriptions{$_}; ++} + for(keys %Portage::use_masked_flags) { +- if($Portage::use_masked_flags{$_}) { ++ my $masked = 1; ++ for(values %{$Portage::use_masked_flags{$_}}) { ++ last if not($masked &&= $_); ++ } ++ if($masked) { + delete $Portage::default_flags{$_}; + delete $Portage::all_flags{$_}; + delete $use_descriptions{$_}; +--- ufed-0.40/Portage.pm ++++ ufed-0.40/Portage.pm +@@ -60,9 +60,6 @@ + die "Sorry, USE_ORDER without make.conf overriding global USE flags are not currently supported by ufed.\n"; + } + +-for(keys %use_masked_flags) +-{ delete $all_flags{$_} if $use_masked_flags{$_} and exists $all_flags{$_} } +- + sub have_package($) { + my ($cp) = @_; + return $packages{$cp}; +@@ -213,6 +216,7 @@ + redo PARENT; + } + } ++ push @profiles, '/etc/portage/profile'; + } + + sub read_sh($) { +@@ -299,7 +301,14 @@ + for my $dir(@profiles) { + for(noncomments "$dir/use.mask") { + my $off = s/^-//; +- $use_masked_flags{$_} = !$off; ++ $use_masked_flags{$_} = { '' => !$off }; ++ } ++ for(noncomments "$dir/package.use.mask") { ++ my($pkg, @flags) = split; ++ for(@flags) { ++ my $off = s/^-//; ++ $use_masked_flags{$_}{$pkg} = !$off; ++ } + } + } + } diff --git a/app-portage/ufed/metadata.xml b/app-portage/ufed/metadata.xml index ba36e5dd3b72..8ff0f09f5491 100644 --- a/app-portage/ufed/metadata.xml +++ b/app-portage/ufed/metadata.xml @@ -6,4 +6,4 @@ <email>truedfx@gentoo.org</email> <name>Harald van Dijk</name> </maintainer> -</pkgmetadata> +</pkgmetadata> diff --git a/app-portage/ufed/ufed-0.40-r5.ebuild b/app-portage/ufed/ufed-0.40-r5.ebuild new file mode 100644 index 000000000000..c67fdfcc77da --- /dev/null +++ b/app-portage/ufed/ufed-0.40-r5.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-portage/ufed/ufed-0.40-r5.ebuild,v 1.1 2006/11/26 03:27:53 truedfx Exp $ + +inherit eutils + +DESCRIPTION="Gentoo Linux USE flags editor" +HOMEPAGE="http://www.gentoo.org/" +SRC_URI="mirror://gentoo/${P}.tar.bz2 + http://dev.gentoo.org/~truedfx/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="" +DEPEND="sys-libs/ncurses" +RDEPEND="${DEPEND} + dev-lang/perl" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-useorder.patch + epatch "${FILESDIR}"/${P}-source.patch + epatch "${FILESDIR}"/${P}-comments.patch + epatch "${FILESDIR}"/${P}-masked.patch + epatch "${FILESDIR}"/${P}-packageusemask.patch +} + +src_compile() { + ./configure || die "configure failed" + emake || die "make failed" +} + +src_install() { + newsbin ufed.pl ufed + doman ufed.8 + insinto /usr/lib/ufed + doins *.pm + exeinto /usr/lib/ufed + doexe ufed-curses +} |