diff options
| author |   Sébastien Fabbro <sebfabbro@gmail.com> | 2012-01-22 22:16:00 +0000 |
|---|---|---|
| committer | Sébastien Fabbro <sebfabbro@gmail.com> | 2012-01-22 22:16:00 +0000 |
| commit | 44bb7330d5a883f895e18f54ab4cd9a6677bcea4 (patch) | |
| tree | df262e9c7cd48a65c6f6e29ece08fc2a894813a4 /app-admin/eselect/files | |
| parent | [sci-visualization/labplot] Add live ebuild (diff) | |
| download | sci-44bb7330d5a883f895e18f54ab4cd9a6677bcea4.tar.gz sci-44bb7330d5a883f895e18f54ab4cd9a6677bcea4.tar.bz2 sci-44bb7330d5a883f895e18f54ab4cd9a6677bcea4.zip | |
app-admin/eselect: merge with main tree
(Portage version: 2.1.10.41/git/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'app-admin/eselect/files')
| -rw-r--r-- | app-admin/eselect/files/eselect-alternatives.patch | 86 |
1 files changed, 43 insertions, 43 deletions
diff --git a/app-admin/eselect/files/eselect-alternatives.patch b/app-admin/eselect/files/eselect-alternatives.patch index a21632bc7..1aafdb052 100644 --- a/app-admin/eselect/files/eselect-alternatives.patch +++ b/app-admin/eselect/files/eselect-alternatives.patch @@ -1,48 +1,6 @@ -Index: libs/Makefile.am -=================================================================== ---- libs/Makefile.am (revision 837) -+++ libs/Makefile.am (working copy) -@@ -1,6 +1,7 @@ - eselectlibsdir = $(datadir)/$(PACKAGE_NAME)/libs/ - - eselectlibs_DATA = \ -+ alternatives.bash \ - config.bash \ - core.bash \ - default.eselect \ -@@ -14,6 +15,7 @@ - tests.bash - - EXTRA_DIST = \ -+ alternatives.bash.in \ - config.bash.in \ - core.bash.in \ - default.eselect.in \ -@@ -30,7 +32,8 @@ - -e 's,\@SED\@,@SED@,g' \ - -e 's,\@PORTAGEQ\@,@PORTAGEQ@,g' \ - -e 's,\@ENV_UPDATE\@,@ENV_UPDATE@,g' \ -- -e 's,\@CANONICALISE\@,@CANONICALISE@,g' -+ -e 's,\@CANONICALISE\@,@CANONICALISE@,g' \ -+ -e 's,\@sysconfdir\@,@sysconfdir@,g' - - %.bash : %.bash.in - @$(dosed) $< > $@ -Index: bin/Makefile.am -=================================================================== ---- bin/Makefile.am (revision 837) -+++ bin/Makefile.am (working copy) -@@ -4,6 +4,7 @@ - dosed = @SED@ -e 's,\@BASH\@,$(BASH),g' \ - -e 's,\@DATADIR\@,$(datadir),g' \ - -e 's,\@EPREFIX\@,$(EPREFIX),g' \ -+ -e 's,\@LIBEXECDIR\@,$(datadir),g' \ - -e 's,\@VERSION\@,$(VERSION),g' - - % : %.in Index: bin/eselect.in =================================================================== ---- bin/eselect.in (revision 837) +--- bin/eselect.in (revision 863) +++ bin/eselect.in (working copy) @@ -22,10 +22,15 @@ # Where are modules installed by default? @@ -63,6 +21,48 @@ Index: bin/eselect.in # Look in this place for libraries ESELECT_CORE_PATH="${ESELECT_DATA_PATH}/libs" +Index: bin/Makefile.am +=================================================================== +--- bin/Makefile.am (revision 863) ++++ bin/Makefile.am (working copy) +@@ -4,6 +4,7 @@ + dosed = @SED@ -e 's,\@BASH\@,$(BASH),g' \ + -e 's,\@DATADIR\@,$(datadir),g' \ + -e 's,\@EPREFIX\@,$(EPREFIX),g' \ ++ -e 's,\@LIBEXECDIR\@,$(datadir),g' \ + -e 's,\@VERSION\@,$(VERSION),g' + + % : %.in +Index: libs/Makefile.am +=================================================================== +--- libs/Makefile.am (revision 863) ++++ libs/Makefile.am (working copy) +@@ -1,6 +1,7 @@ + eselectlibsdir = $(datadir)/$(PACKAGE_NAME)/libs/ + + eselectlibs_DATA = \ ++ alternatives.bash \ + config.bash \ + core.bash \ + default.eselect \ +@@ -14,6 +15,7 @@ + tests.bash + + EXTRA_DIST = \ ++ alternatives.bash.in \ + config.bash.in \ + core.bash.in \ + default.eselect.in \ +@@ -30,7 +32,8 @@ + -e 's,\@SED\@,@SED@,g' \ + -e 's,\@PORTAGEQ\@,@PORTAGEQ@,g' \ + -e 's,\@ENV_UPDATE\@,@ENV_UPDATE@,g' \ +- -e 's,\@CANONICALISE\@,@CANONICALISE@,g' ++ -e 's,\@CANONICALISE\@,@CANONICALISE@,g' \ ++ -e 's,\@sysconfdir\@,@sysconfdir@,g' + + %.bash : %.bash.in + @$(dosed) $< > $@ --- libs/alternatives.bash.in.orig 1970-01-01 01:00:00.000000000 +0100 +++ libs/alternatives.bash.in 2011-09-06 18:55:43.000000000 +0100 @@ -0,0 +1,550 @@ |