diff options
| -rwxr-xr-x | Documentation/maintainers/git-hooks-commit-msg | 2 | ||||
| -rw-r--r-- | kde-base/kde-meta/kde-meta-4.9.80.ebuild | 3 | ||||
| -rw-r--r-- | 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 f659c61667c..09f96644625 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 e2cf0855cba..9e102ba48a5 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 f9cf84afe63..a0c06c4dc55 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) - ) " |