[gentoo-commits] proj/kde:master commit in: kde-base/kde-meta/, kde-base/kdepim-meta/, Documentation/maintainers/

[gentoo-commits] proj/kde:master commit in: kde-base/kde-meta/, kde-base/kdepim-meta/, Documentation/maintainers/

[Alexey Shvetsov]

commit:     35315bc5e2238e91d11d5fe2d74b88ab877774d6
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 17 08:17:09 2012 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sat Nov 17 08:17:09 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=35315bc5

[kde-base] there is no l10n packages for beta
Signed-off-by: Alexey Shvetsov <alexxy <AT> gentoo.org>

---
 Documentation/maintainers/git-hooks-commit-msg |    2 +-
 kde-base/kde-meta/kde-meta-4.9.80.ebuild       |    3 +--
 kde-base/kdepim-meta/kdepim-meta-4.9.80.ebuild |    6 +-----
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/Documentation/maintainers/git-hooks-commit-msg b/Documentation/maintainers/git-hooks-commit-msg
index f659c61..09f9664 100755
--- a/Documentation/maintainers/git-hooks-commit-msg
+++ b/Documentation/maintainers/git-hooks-commit-msg
@@ -38,7 +38,7 @@ elif grep '^NO_REPOMAN' "$FILE" >& /dev/null ; then
 	# Allow i-know-what-i-am-doing override
 	sed -i -e '/^NO_REPOMAN/d' "$FILE"
 	exit 0
-elif ! grep '^(Portage version' "$FILE" >& /dev/null ; then
+elif ! grep '^Package-Manager' "$FILE" >& /dev/null ; then
 	die 'Please use repoman to commit'
 fi
 

diff --git a/kde-base/kde-meta/kde-meta-4.9.80.ebuild b/kde-base/kde-meta/kde-meta-4.9.80.ebuild
index e2cf085..9e102ba 100644
--- a/kde-base/kde-meta/kde-meta-4.9.80.ebuild
+++ b/kde-base/kde-meta/kde-meta-4.9.80.ebuild
@@ -7,7 +7,7 @@ inherit kde4-meta-pkg
 
 DESCRIPTION="KDE - merge this to pull in all split kde-base/* packages"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="accessibility nls sdk semantic-desktop"
+IUSE="accessibility sdk semantic-desktop"
 
 RDEPEND="
 	$(add_kdebase_dep kate)
@@ -23,7 +23,6 @@ RDEPEND="
 	$(add_kdebase_dep kdetoys-meta)
 	$(add_kdebase_dep kdeutils-meta)
 	accessibility? ( $(add_kdebase_dep kdeaccessibility-meta) )
-	nls? ( $(add_kdebase_dep kde-l10n) )
 	sdk? (
 		$(add_kdebase_dep kdebindings-meta)
 		$(add_kdebase_dep kdesdk-meta)

diff --git a/kde-base/kdepim-meta/kdepim-meta-4.9.80.ebuild b/kde-base/kdepim-meta/kdepim-meta-4.9.80.ebuild
index f9cf84a..a0c06c4 100644
--- a/kde-base/kdepim-meta/kdepim-meta-4.9.80.ebuild
+++ b/kde-base/kdepim-meta/kdepim-meta-4.9.80.ebuild
@@ -7,7 +7,7 @@ inherit kde4-meta-pkg
 
 DESCRIPTION="kdepim - merge this to pull in all kdepim-derived packages"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="nls"
+IUSE=""
 
 RDEPEND="
 	$(add_kdebase_dep akonadiconsole)
@@ -29,8 +29,4 @@ RDEPEND="
 	$(add_kdebase_dep kontact)
 	$(add_kdebase_dep korganizer)
 	$(add_kdebase_dep ktimetracker)
-	nls? (
-		$(add_kdebase_dep kde-l10n)
-		$(add_kdebase_dep kdepim-l10n)
-	)
 "

[gentoo-commits] proj/kde:master commit in: kde-base/kde-meta/, kde-base/kdepim-meta/, Documentation/maintainers/

[Alexey Shvetsov]

commit:     a0e8f20d10802e839f58bce48d2e001faa2cadb8
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 17 12:20:48 2012 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sat Nov 17 12:20:48 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=a0e8f20d

Revert "[kde-base] there is no l10n packages for beta"

This reverts commit 35315bc5e2238e91d11d5fe2d74b88ab877774d6.

---
 Documentation/maintainers/git-hooks-commit-msg |    2 +-
 kde-base/kde-meta/kde-meta-4.9.80.ebuild       |    3 ++-
 kde-base/kdepim-meta/kdepim-meta-4.9.80.ebuild |    6 +++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Documentation/maintainers/git-hooks-commit-msg b/Documentation/maintainers/git-hooks-commit-msg
index 09f9664..f659c61 100755
--- a/Documentation/maintainers/git-hooks-commit-msg
+++ b/Documentation/maintainers/git-hooks-commit-msg
@@ -38,7 +38,7 @@ elif grep '^NO_REPOMAN' "$FILE" >& /dev/null ; then
 	# Allow i-know-what-i-am-doing override
 	sed -i -e '/^NO_REPOMAN/d' "$FILE"
 	exit 0
-elif ! grep '^Package-Manager' "$FILE" >& /dev/null ; then
+elif ! grep '^(Portage version' "$FILE" >& /dev/null ; then
 	die 'Please use repoman to commit'
 fi
 

diff --git a/kde-base/kde-meta/kde-meta-4.9.80.ebuild b/kde-base/kde-meta/kde-meta-4.9.80.ebuild
index 9e102ba..e2cf085 100644
--- a/kde-base/kde-meta/kde-meta-4.9.80.ebuild
+++ b/kde-base/kde-meta/kde-meta-4.9.80.ebuild
@@ -7,7 +7,7 @@ inherit kde4-meta-pkg
 
 DESCRIPTION="KDE - merge this to pull in all split kde-base/* packages"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="accessibility sdk semantic-desktop"
+IUSE="accessibility nls sdk semantic-desktop"
 
 RDEPEND="
 	$(add_kdebase_dep kate)
@@ -23,6 +23,7 @@ RDEPEND="
 	$(add_kdebase_dep kdetoys-meta)
 	$(add_kdebase_dep kdeutils-meta)
 	accessibility? ( $(add_kdebase_dep kdeaccessibility-meta) )
+	nls? ( $(add_kdebase_dep kde-l10n) )
 	sdk? (
 		$(add_kdebase_dep kdebindings-meta)
 		$(add_kdebase_dep kdesdk-meta)

diff --git a/kde-base/kdepim-meta/kdepim-meta-4.9.80.ebuild b/kde-base/kdepim-meta/kdepim-meta-4.9.80.ebuild
index a0c06c4..f9cf84a 100644
--- a/kde-base/kdepim-meta/kdepim-meta-4.9.80.ebuild
+++ b/kde-base/kdepim-meta/kdepim-meta-4.9.80.ebuild
@@ -7,7 +7,7 @@ inherit kde4-meta-pkg
 
 DESCRIPTION="kdepim - merge this to pull in all kdepim-derived packages"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
+IUSE="nls"
 
 RDEPEND="
 	$(add_kdebase_dep akonadiconsole)
@@ -29,4 +29,8 @@ RDEPEND="
 	$(add_kdebase_dep kontact)
 	$(add_kdebase_dep korganizer)
 	$(add_kdebase_dep ktimetracker)
+	nls? (
+		$(add_kdebase_dep kde-l10n)
+		$(add_kdebase_dep kdepim-l10n)
+	)
 "