Gentoo Archives: gentoo-commits

From: Jonathan Callen <abcd@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: sets/, Documentation/maintainers/
Date: Sun, 31 Jul 2011 21:56:59
Message-Id: a92a722dd3917171037ac22fa28818e10026dbb2.abcd@gentoo
1 commit: a92a722dd3917171037ac22fa28818e10026dbb2
2 Author: Jonathan Callen <abcd <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 31 20:56:56 2011 +0000
4 Commit: Jonathan Callen <abcd <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 31 20:56:56 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=a92a722d
7
8 Fix regenerate-files to not strip ~ in some cases
9
10 ---
11 Documentation/maintainers/regenerate-files | 2 +-
12 sets/kdedeps | 4 ++--
13 2 files changed, 3 insertions(+), 3 deletions(-)
14
15 diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
16 index feb30f1..67ef1e6 100755
17 --- a/Documentation/maintainers/regenerate-files
18 +++ b/Documentation/maintainers/regenerate-files
19 @@ -83,6 +83,6 @@ pushd ../../sets/ > /dev/null
20 for set in *-${RELEASE}; do
21 newfile=${set/%-${RELEASE}}
22 echo -e "${HEADER}" > "${newfile}"
23 - sed -r "/@/s/-${RELEASE}//g;s/~//;s/>=//;\@kde-base/@s/-(9999|4\..\.50)/:4/" "${set}" >> "${newfile}"
24 + sed -r "/@/s/-${RELEASE}//g;/9999$/s/~//;s/>=//;\@kde-base/@s/-(9999|4\..\.50)/:4/" "${set}" >> "${newfile}"
25 done
26 popd > /dev/null
27
28 diff --git a/sets/kdedeps b/sets/kdedeps
29 index d6e9611..598e005 100644
30 --- a/sets/kdedeps
31 +++ b/sets/kdedeps
32 @@ -1,3 +1,3 @@
33 # Autogenerated by regenerate-files, DO NOT EDIT.
34 -app-office/akonadi-server-1.6.0
35 -dev-libs/shared-desktop-ontologies-0.7.0
36 +~app-office/akonadi-server-1.6.0
37 +~dev-libs/shared-desktop-ontologies-0.7.0