[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Sturmlechner]

commit:     f9ed6b1f47d32fdf31e05b0775d31b3ff52fa03b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  1 12:27:48 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar  1 12:33:35 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f9ed6b1f

Documentation: Update regenerate-files

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 Documentation/maintainers/regenerate-files | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index 7e15b284e0..18334b20d1 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -9,8 +9,8 @@ cd "$(dirname $0)"
 SCRIPT=$(basename $0)
 HEADER="# Autogenerated by ${SCRIPT}, DO NOT EDIT."
 
-KF_RELEASES="5.64 5.67"
-KF_RELEASE=${KF_RELEASE:-5.64}
+KF_RELEASES="5.67"
+KF_RELEASE=${KF_RELEASE:-5.67}
 
 PLASMA_RELEASES="5.17 5.18"
 PLASMA_RELEASE=${PLASMA_RELEASE:-5.17}

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Sturmlechner]

commit:     d2e68ad32c063f50f6177cf5aba3a64e12a7ba73
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  4 22:12:21 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Oct  4 22:12:21 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d2e68ad3

Documentation: regenerate-files: Switch to KF-6.6.0 default

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 Documentation/maintainers/regenerate-files | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index 033d321b13..7e2e5686e6 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -9,8 +9,8 @@ cd "$(dirname $0)"
 SCRIPT=$(basename $0)
 HEADER="# Autogenerated by ${SCRIPT}, DO NOT EDIT."
 
-KF6_RELEASES=( 6.5 6.6 )
-KF6_RELEASE=${KF6_RELEASE:-6.5}
+KF6_RELEASES=( 6.5 6.6 6.7 )
+KF6_RELEASE=${KF6_RELEASE:-6.6}
 
 PLASMA_RELEASES=( 6.1 6.2 )
 PLASMA_RELEASE=${PLASMA_RELEASE:-6.1}

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Sturmlechner]

commit:     cb5a0aa30b2355ba2cfff1a3306283e8ba89eb3d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  4 22:14:27 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Oct  4 22:14:51 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=cb5a0aa3

Documentation: regenerate-files: Fix unversioned KF6 set generation

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 Documentation/maintainers/regenerate-files | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index 7e2e5686e6..4e84a1d6f2 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -176,7 +176,7 @@ pushd ../../sets/ > /dev/null
 for set in *frameworks-*${KF6_RELEASE}; do
 	newfile=${set/%-${KF6_RELEASE}}
 	echo -e "${HEADER}" > "${newfile}"
-	sed -r "/@/s/-${KF6_RELEASE}//g;/9999$/s/~//;s/<//;\@kde-frameworks/@s/-(9999|5\.[0-9]+\.50)//" "${set}" >> "${newfile}"
+	sed -r "/@/s/-${KF6_RELEASE}//g;/9999$/s/~//;s/<//;\@kde-frameworks/@s/-(9999|6\.[0-9]+\.50)//" "${set}" >> "${newfile}"
 done
 
 for set in *plasma-${PLASMA_RELEASE}; do

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Sturmlechner]

commit:     10c3cded929bcf0a310689ef8973166a524af8a7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 28 17:47:02 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep 30 09:17:36 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=10c3cded

Documentation: regenerate-files: use arrays

This simplifies some upcoming work.

Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 Documentation/maintainers/regenerate-files | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index f34b6e2048..84f5fbc376 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -9,19 +9,19 @@ cd "$(dirname $0)"
 SCRIPT=$(basename $0)
 HEADER="# Autogenerated by ${SCRIPT}, DO NOT EDIT."
 
-KF6_RELEASES="6.5 6.6"
+KF6_RELEASES=( 6.5 6.6 )
 KF6_RELEASE=${KF6_RELEASE:-6.5}
 
-PLASMA_RELEASES="6.1 6.2"
+PLASMA_RELEASES=( 6.1 6.2 )
 PLASMA_RELEASE=${PLASMA_RELEASE:-6.1}
 
-GEAR_RELEASES="24.08"
+GEAR_RELEASES=( 24.08 )
 GEAR_RELEASE=${GEAR_RELEASE:-24.05}
 
 # regenerate keywords
 pushd ../package.accept_keywords/ > /dev/null
 if [[ -n ${KF6_RELEASES} ]]; then
-	for release in $KF6_RELEASES; do
+	for release in "${KF6_RELEASES[@]}"; do
 		if [[ -d ".kde-frameworks-${release}" ]]; then
 			echo -e "${HEADER}" > "kde-frameworks-${release}.keywords"
 			cat ".kde-frameworks-${release}/"* | grep -P -v '^>=kde-frameworks/(?!kf-env)' | \
@@ -30,14 +30,14 @@ if [[ -n ${KF6_RELEASES} ]]; then
 	done
 fi
 
-for release in $PLASMA_RELEASES; do
+for release in "${PLASMA_RELEASES[@]}"; do
 	echo -e "${HEADER}" > "kde-plasma-${release}.keywords"
 	if [[ -d ".kde-plasma-${release}" ]]; then
 		cat ".kde-plasma-${release}/"* | sed '/^~.*[.-]9999$/s/$/ **/' >> "kde-plasma-${release}.keywords"
 	fi
 done
 
-for release in $GEAR_RELEASES; do
+for release in "${GEAR_RELEASES[@]}"; do
 	echo -e "${HEADER}" > "kde-gear-${release}.keywords"
 	if [[ -d ".kde-gear-${release}" ]]; then
 		cat ".kde-gear-${release}/"* | \
@@ -46,7 +46,7 @@ for release in $GEAR_RELEASES; do
 done
 
 # ... and for completely unkeyworded packages, add "**"
-for release in $GEAR_RELEASES; do
+for release in "${GEAR_RELEASES[@]}"; do
 	if [[ -d ".kde-gear-${release}" ]]; then
 		rm -rf ".kde-gear-${release}.49.9999"
 		mkdir -p ".kde-gear-${release}.49.9999"
@@ -97,7 +97,7 @@ popd > /dev/null
 
 # regenerate unmask entries (base for package mask)
 pushd ../package.unmask/ > /dev/null
-for release in $KF6_RELEASES live; do
+for release in "${KF6_RELEASES[@]}" live; do
 	if [[ -d ".kde-frameworks-${release}" ]]; then
 		echo -e "${HEADER}" > "kde-frameworks-${release}"
 		cat ".kde-frameworks-${release}/"* | \
@@ -106,14 +106,14 @@ for release in $KF6_RELEASES live; do
 	fi
 done
 
-for release in $PLASMA_RELEASES live; do
+for release in "${PLASMA_RELEASES[@]}" live; do
 	echo -e "${HEADER}" > "kde-plasma-${release}"
 	if [[ -d ".kde-plasma-${release}" ]]; then
 		cat ".kde-plasma-${release}/"* >> "kde-plasma-${release}"
 	fi
 done
 
-for release in $GEAR_RELEASES live; do
+for release in "${GEAR_RELEASES[@]}" live; do
 	echo -e "${HEADER}" > "kde-gear-${release}"
 	if [[ -d ".kde-gear-${release}" ]]; then
 		cat ".kde-gear-${release}/"* >> "kde-gear-${release}"
@@ -124,7 +124,7 @@ popd > /dev/null
 
 # regenerate mask entries (base for package mask)
 pushd ../package.mask/ > /dev/null
-for release in $KF6_RELEASES live; do
+for release in "${KF6_RELEASES[@]}" live; do
 	if [[ -d "../package.unmask/.kde-frameworks-${release}" ]]; then
 		echo -e "${HEADER}" > "kde-frameworks-${release}"
 		cat "../package.unmask/.kde-frameworks-${release}/"* | \
@@ -134,7 +134,7 @@ for release in $KF6_RELEASES live; do
 	fi
 done
 
-for release in $PLASMA_RELEASES live; do
+for release in "${PLASMA_RELEASES[@]}" live; do
 	echo -e "${HEADER}" > "kde-plasma-${release}"
 	if [[ -d "../package.unmask/.kde-plasma-${release}" ]]; then
 		cat "../package.unmask/.kde-plasma-${release}/"* >> "kde-plasma-${release}"
@@ -143,7 +143,7 @@ for release in $PLASMA_RELEASES live; do
 	fi
 done
 
-for release in $GEAR_RELEASES live; do
+for release in "${GEAR_RELEASES[@]}" live; do
 	echo -e "${HEADER}" > "kde-gear-${release}"
 	if [[ -d "../package.unmask/.kde-gear-${release}" ]]; then
 		cat "../package.unmask/.kde-gear-${release}/"* >> "kde-gear-${release}"

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Sturmlechner]

commit:     ea268851497708ad0132af9704b33347cd9e898f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 28 17:54:28 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep 30 09:22:10 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ea268851

Documentation: regenerate-files: create keywords files for Plasma stable branch

When Plasma branches, it's useful to have a keywords file for the
live ebuilds corresponding to the branch. Just use the latest Plasma
release as we don't care about live ebuilds for the older branch.

Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 Documentation/maintainers/regenerate-files | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index 84f5fbc376..033d321b13 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -37,6 +37,24 @@ for release in "${PLASMA_RELEASES[@]}"; do
 	fi
 done
 
+# ... and for completely unkeyworded packages, add "**"
+# for plasma, we just want the latest release, as there won't be a branch
+# for the older version (nor ebuilds for live)
+for release in "${PLASMA_RELEASES[-1]}"; do
+	if [[ -d ".kde-plasma-${release}" ]]; then
+		rm -rf ".kde-plasma-${release}.49.9999"
+		mkdir -p ".kde-plasma-${release}.49.9999"
+		echo -e "${HEADER}" > "kde-plasma-${release}.49.9999.keywords"
+		for file in ".kde-plasma-${release}"/*; do
+			newfile=".kde-plasma-${release}.49.9999"/$(basename "${file}")
+			sed -e "/^<[a-z0-9-]*\/.*\.50$/{s/\.50/.49.9999/;s/^</~/};/^~.*[.-]9999$/s/$/ **/" \
+				-e "/^@/d" "${file}" > "${newfile}"
+			# echo "${newfile}"
+		done
+		cat ".kde-plasma-${release}.49.9999"/* >> "kde-plasma-${release}.49.9999.keywords"
+	fi
+done
+
 for release in "${GEAR_RELEASES[@]}"; do
 	echo -e "${HEADER}" > "kde-gear-${release}.keywords"
 	if [[ -d ".kde-gear-${release}" ]]; then

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Sturmlechner]

commit:     814fbbb57f67a214c75000b1d349795f539f2e0d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  7 11:58:45 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep  7 11:58:45 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=814fbbb5

Documentation: Drop 24.05 from GEAR_RELEASES

Not to constantly regenerate unmask files for unavailable stable branch.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 Documentation/maintainers/regenerate-files | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index 2499047176..ba6ab1576f 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -15,7 +15,7 @@ KF6_RELEASE=${KF6_RELEASE:-6.5}
 PLASMA_RELEASES="5.27 6.1"
 PLASMA_RELEASE=${PLASMA_RELEASE:-6.1}
 
-GEAR_RELEASES="24.05 24.08"
+GEAR_RELEASES="24.08"
 GEAR_RELEASE=${GEAR_RELEASE:-24.05}
 
 # regenerate keywords

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Sturmlechner]

commit:     b61f5143ed732231103f670406680f73a1116826
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  7 09:59:34 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep  7 09:59:34 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b61f5143

Documentation: maintainers/regenerate-files: Drop KF5_RELEASE support

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 Documentation/maintainers/regenerate-files | 44 ++----------------------------
 1 file changed, 3 insertions(+), 41 deletions(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index c328b37519..2499047176 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -9,9 +9,6 @@ cd "$(dirname $0)"
 SCRIPT=$(basename $0)
 HEADER="# Autogenerated by ${SCRIPT}, DO NOT EDIT."
 
-KF5_RELEASES="5.116"
-KF5_RELEASE=${KF5_RELEASE:-5.116}
-
 KF6_RELEASES="6.5 6.6"
 KF6_RELEASE=${KF6_RELEASE:-6.5}
 
@@ -23,14 +20,6 @@ GEAR_RELEASE=${GEAR_RELEASE:-24.05}
 
 # regenerate keywords
 pushd ../package.accept_keywords/ > /dev/null
-for release in $KF5_RELEASES; do
-	if [[ -d ".kde-frameworks-5-${release}" ]]; then
-		echo -e "${HEADER}" > "kde-frameworks-${release}.keywords"
-		cat ".kde-frameworks-5-${release}/"* | grep -P -v '^>=kde-frameworks/(?!kf-env)' | \
-			sed -e '/^~.*[.-]5\.9999$/s/$/ **/' -e '/^@/d' >> "kde-frameworks-${release}.keywords"
-	fi
-done
-
 if [[ -n ${KF6_RELEASES} ]]; then
 	for release in $KF6_RELEASES; do
 		if [[ -d ".kde-frameworks-${release}" ]]; then
@@ -108,15 +97,6 @@ popd > /dev/null
 
 # regenerate unmask entries (base for package mask)
 pushd ../package.unmask/ > /dev/null
-for release in $KF5_RELEASES; do
-	if [[ -d ".kde-frameworks-5-${release}" ]]; then
-		echo -e "${HEADER}" > "kde-frameworks-${release}"
-		cat ".kde-frameworks-5-${release}/"* | \
-			grep -P -v '^>=kde-frameworks/(?!kf-env)' >> "kde-frameworks-${release}"
-		sed -i "kde-frameworks-${release}" -e "/^@/d"
-	fi
-done
-
 for release in $KF6_RELEASES live; do
 	if [[ -d ".kde-frameworks-${release}" ]]; then
 		echo -e "${HEADER}" > "kde-frameworks-${release}"
@@ -144,16 +124,6 @@ popd > /dev/null
 
 # regenerate mask entries (base for package mask)
 pushd ../package.mask/ > /dev/null
-for release in $KF5_RELEASES; do
-	if [[ -d "../package.unmask/.kde-frameworks-5-${release}" ]]; then
-		echo -e "${HEADER}" > "kde-frameworks-${release}"
-		cat "../package.unmask/.kde-frameworks-5-${release}/"* | \
-			grep -P -v '^>=kde-frameworks/(?!kf-env)' >> "kde-frameworks-${release}"
-		sed -i "kde-frameworks-${release}" \
-			-e "/^<kde-frameworks\/.*-5\..\.50:5$/{s/-5\..\.50/-${release}/;s/^</>=/}" -e '/^@/d'
-	fi
-done
-
 for release in $KF6_RELEASES live; do
 	if [[ -d "../package.unmask/.kde-frameworks-${release}" ]]; then
 		echo -e "${HEADER}" > "kde-frameworks-${release}"
@@ -185,20 +155,12 @@ popd > /dev/null
 
 # regenerate unversioned sets
 pushd ../../sets/ > /dev/null
-for set in *frameworks-5*${KF5_RELEASE}; do
-	newfile=${set/%-${KF5_RELEASE}}
+for set in *frameworks-*${KF6_RELEASE}; do
+	newfile=${set/%-${KF6_RELEASE}}
 	echo -e "${HEADER}" > "${newfile}"
-	sed -r "/@/s/-${KF5_RELEASE}//g;/5\.9999$/s/~//;s/<//;\@kde-[a-z]+/@s/-(5\.9999|5\.[0-9]+\.50)/:5/" "${set}" >> "${newfile}"
+	sed -r "/@/s/-${KF6_RELEASE}//g;/9999$/s/~//;s/<//;\@kde-frameworks/@s/-(9999|5\.[0-9]+\.50)//" "${set}" >> "${newfile}"
 done
 
-if [[ -n ${KF6_RELEASE} ]]; then
-	for set in *frameworks-*${KF6_RELEASE}; do
-		newfile=${set/%-${KF6_RELEASE}}
-		echo -e "${HEADER}" > "${newfile}"
-		sed -r "/@/s/-${KF6_RELEASE}//g;/9999$/s/~//;s/<//;\@kde-frameworks/@s/-(9999|5\.[0-9]+\.50)//" "${set}" >> "${newfile}"
-	done
-fi
-
 for set in *plasma-${PLASMA_RELEASE}; do
 	newfile=${set/%-${PLASMA_RELEASE}}
 	echo -e "${HEADER}" > "${newfile}"

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Sturmlechner]

commit:     b86ec81fecc240703df435e1e6ceea198a54556e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  1 21:38:00 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep  2 09:31:20 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b86ec81f

Documentation: regenerate-files: Plasma6.1/Gear24.05/KF-6.5 stable default

... relevant for unversioned sets.

Drop KDE Gear 23.08 which is only available in parts for a long time.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 Documentation/maintainers/regenerate-files | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index 753b8559a7..21e34c1825 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -13,13 +13,13 @@ KF5_RELEASES="5.116"
 KF5_RELEASE=${KF5_RELEASE:-5.116}
 
 KF6_RELEASES="6.5"
-KF6_RELEASE=${KF6_RELEASE:-}
+KF6_RELEASE=${KF6_RELEASE:-6.5}
 
 PLASMA_RELEASES="5.27 6.1"
-PLASMA_RELEASE=${PLASMA_RELEASE:-5.27}
+PLASMA_RELEASE=${PLASMA_RELEASE:-6.1}
 
-GEAR_RELEASES="23.08 24.05 24.08"
-GEAR_RELEASE=${GEAR_RELEASE:-23.08}
+GEAR_RELEASES="24.05 24.08"
+GEAR_RELEASE=${GEAR_RELEASE:-24.05}
 
 # regenerate keywords
 pushd ../package.accept_keywords/ > /dev/null

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Sturmlechner]

commit:     00f006d823215d6d4e25a3e4845959ebaf7f145c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 23 19:24:20 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 23 19:25:24 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=00f006d8

Documentation: maintainers: Drop KF5-live support

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 Documentation/maintainers/regenerate-files | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index 5020b7bab5..753b8559a7 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -72,17 +72,6 @@ for release in $GEAR_RELEASES; do
 	fi
 done
 
-if [[ -d .kde-frameworks-5-live.base ]]; then
-	rm -rf .kde-frameworks-5-live
-	mkdir -p .kde-frameworks-5-live
-	echo -e "${HEADER}" > kde-frameworks-5-live.keywords
-	for file in .kde-frameworks-5-live.base/*; do
-		newfile=.kde-frameworks-5-live/$(basename "${file}")
-		sed -e '/^~.*[.-]5.239.9999$/s/$/ **/'  -e '/^@/d' "${file}" > "${newfile}"
-	done
-	cat .kde-frameworks-5-live/* >> kde-frameworks-5-live.keywords
-fi
-
 if [[ -d .kde-frameworks-live.base ]]; then
 	rm -rf .kde-frameworks-live
 	mkdir -p .kde-frameworks-live
@@ -119,7 +108,7 @@ popd > /dev/null
 
 # regenerate unmask entries (base for package mask)
 pushd ../package.unmask/ > /dev/null
-for release in $KF5_RELEASES 5-live; do
+for release in $KF5_RELEASES; do
 	if [[ -d ".kde-frameworks-5-${release}" ]]; then
 		echo -e "${HEADER}" > "kde-frameworks-${release}"
 		cat ".kde-frameworks-5-${release}/"* | \
@@ -155,7 +144,7 @@ popd > /dev/null
 
 # regenerate mask entries (base for package mask)
 pushd ../package.mask/ > /dev/null
-for release in $KF5_RELEASES 5-live; do
+for release in $KF5_RELEASES; do
 	if [[ -d "../package.unmask/.kde-frameworks-5-${release}" ]]; then
 		echo -e "${HEADER}" > "kde-frameworks-${release}"
 		cat "../package.unmask/.kde-frameworks-5-${release}/"* | \

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Maciej Mrozowski]

commit:     9330eb9f29b5b5e844dbaa641d5543fa273e53a6
Author:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 24 02:27:12 2024 +0000
Commit:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 24 02:27:12 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9330eb9f

Documentation: update dynlink-scanner

Signed-off-by: Maciej Mrozowski <reavertm <AT> gentoo.org>

 Documentation/maintainers/dynlink-scanner | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/Documentation/maintainers/dynlink-scanner b/Documentation/maintainers/dynlink-scanner
index 153edd0e4d..90162c8f83 100755
--- a/Documentation/maintainers/dynlink-scanner
+++ b/Documentation/maintainers/dynlink-scanner
@@ -16,11 +16,6 @@ get_link_deps()
 # Print linking deps for given executable or shared object in alphabetical order.
 # Also try to dlopen shared objects in order to detect missing/broken dependencies.
 if [[ "$1" = --linking-deps ]]; then
-	# Sanity check, file-5.12 is broken, bail out early
-	if [[ `file --version | grep --color=never file- | cut -d'-' -f2` == '5.12' ]]; then
-		echo "file-5.12 is broken, bailing out"
-		exit 1
-	fi
 	mime=`file -b --mime-type "$2"`
 	if [[ "$mime" == 'application/x-pie-executable' ]] || [[ "$mime" == 'application/x-executable' ]] || [[ "${mime}" == 'application/x-sharedlib' ]]; then
 		LINK=`get_link_deps "$2"`
@@ -39,6 +34,12 @@ if ! portageq has_version $ROOT/ $1; then
 	exit 1
 fi
 
+# Sanity check, file-5.12 is broken, bail out early
+if [[ `file --version | grep --color=never file- | cut -d'-' -f2` == '5.12' ]]; then
+	echo "file-5.12 is broken, bailing out"
+	exit 1
+fi
+
 # Compile dlopen test application, we will use it to check for broken linking dependencies
 gcc "`dirname $0`/try_dlopen.c" -o /tmp/try_dlopen -ldl
 
@@ -48,7 +49,7 @@ for cpv in `portageq match $ROOT/ $1`; do
 	# For each file that belongs to package
 	#     run dynlink-scanner --linking-deps <file> to obtain its linking dependencies
 	# Assign all linking deps to packages and print package names
-	qfile -R $ROOT `portageq contents $ROOT/ $cpv | xargs -r -L 1 "$0" --linking-deps` | cut -f1 -d' ' | sort -u
+	qfile -R $ROOT `portageq contents $ROOT/ $cpv | xargs -r -L 1 "$0" --linking-deps` | cut -f1 -d':' | sort -u
 done
 
 # Cleanup

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Sam James]

commit:     41ba2e3ec3ffa4b8e0ad85a51561170e9954fa5c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 13 16:38:11 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 13 16:38:11 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=41ba2e3e

Documentation/maintainers: app-doc/doxygen -> app-text/doxygen

Signed-off-by: Sam James <sam <AT> gentoo.org>

 Documentation/maintainers/cmake_dep_check.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/maintainers/cmake_dep_check.py b/Documentation/maintainers/cmake_dep_check.py
index 960b052d86..edc877626a 100755
--- a/Documentation/maintainers/cmake_dep_check.py
+++ b/Documentation/maintainers/cmake_dep_check.py
@@ -41,7 +41,7 @@ PACKAGE_MAP = {
 	'DBusGLib': 'dev-libs/dbus-glib',
 	'dbusmenu-qt5': 'dev-libs/libdbusmenu-qt',
 	'DDCUtil': 'app-misc/ddcutil',
-	'Doxygen': 'app-doc/doxygen',
+	'Doxygen': 'app-text/doxygen',
 	'DvdRead': 'media-libs/libdvdread',
 	'ECM': 'kde-frameworks/extra-cmake-modules',
 	'EGL': 'media-libs/mesa[egl]',

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Sturmlechner]

commit:     6bb7a3bfa46fa0710a71c727607f71432df6cc21
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  7 19:09:04 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan  7 19:09:04 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6bb7a3bf

Documentation: regenerate-files: Support categories with digits in them

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 Documentation/maintainers/regenerate-files | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index 04f22f6e4a..6591904a35 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -64,7 +64,7 @@ for release in $GEAR_RELEASES; do
 		echo -e "${HEADER}" > "kde-gear-${release}.49.9999.keywords"
 		for file in ".kde-gear-${release}"/*; do
 			newfile=".kde-gear-${release}.49.9999"/$(basename "${file}")
-			sed -e "/^<[a-z-]*\/.*\.50$/{s/\.50/.49.9999/;s/^</~/};/^~.*[.-]9999$/s/$/ **/" \
+			sed -e "/^<[a-z0-9-]*\/.*\.50$/{s/\.50/.49.9999/;s/^</~/};/^~.*[.-]9999$/s/$/ **/" \
 				-e "/^@/d" "${file}" > "${newfile}"
 			# echo "${newfile}"
 		done

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Sturmlechner]

commit:     9c3cc5766cad39da33fe81744dbb9c70abe62723
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  7 17:12:14 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan  7 17:12:14 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9c3cc576

Documentation: regenerate-files: Generate KF6 files w/ SLOT def

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 Documentation/maintainers/regenerate-files | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index 16bd129bbb..04f22f6e4a 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -36,7 +36,7 @@ if [[ -n ${KF6_RELEASES} ]]; then
 		if [[ -d ".kde-frameworks-${release}" ]]; then
 			echo -e "${HEADER}" > "kde-frameworks-${release}.keywords"
 			cat ".kde-frameworks-${release}/"* | grep -P -v '^>=kde-frameworks/(?!kf-env)' | \
-				sed -e '/^~.*[.-]9999$/s/$/ **/' -e '/^@/d' >> "kde-frameworks-${release}.keywords"
+				sed -e '/^~.*[.-]9999\:[0-9]*$/s/$/ **/' -e '/^@/d' >> "kde-frameworks-${release}.keywords"
 		fi
 	done
 fi
@@ -89,7 +89,7 @@ if [[ -d .kde-frameworks-live.base ]]; then
 	echo -e "${HEADER}" > kde-frameworks-live.keywords
 	for file in .kde-frameworks-live.base/*; do
 		newfile=.kde-frameworks-live/$(basename "${file}")
-		sed -e '/^~.*[.-]9999$/s/$/ **/'  -e '/^@/d' "${file}" > "${newfile}"
+		sed -e '/^~.*[.-]9999\:[0-9]*$/s/$/ **/'  -e '/^@/d' "${file}" > "${newfile}"
 	done
 	cat .kde-frameworks-live/* >> kde-frameworks-live.keywords
 fi

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Sturmlechner]

commit:     75d64c7cf399d5d83147a73a768f4d61714c15b5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 16 21:27:47 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 16 21:59:58 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=75d64c7c

Documentation: regenerate-files: Fix it for KDE Frameworks 6 (live)

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 Documentation/maintainers/regenerate-files | 58 ++++++++++++++----------------
 1 file changed, 27 insertions(+), 31 deletions(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index 5daf9a3260..e9140383a9 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -33,9 +33,9 @@ done
 
 if [[ -n ${KF6_RELEASES} ]]; then
 	for release in $KF6_RELEASES; do
-		if [[ -d ".kde-frameworks-6-${release}" ]]; then
+		if [[ -d ".kde-frameworks-${release}" ]]; then
 			echo -e "${HEADER}" > "kde-frameworks-${release}.keywords"
-			cat ".kde-frameworks-6-${release}/"* | grep -P -v '^>=kde-frameworks/(?!kf-env)' | \
+			cat ".kde-frameworks-${release}/"* | grep -P -v '^>=kde-frameworks/(?!kf-env)' | \
 				sed -e '/^~.*[.-]9999$/s/$/ **/' -e '/^@/d' >> "kde-frameworks-${release}.keywords"
 		fi
 	done
@@ -83,15 +83,15 @@ if [[ -d .kde-frameworks-5-live.base ]]; then
 	cat .kde-frameworks-5-live/* >> kde-frameworks-5-live.keywords
 fi
 
-if [[ -d .kde-frameworks-6-live.base ]]; then
-	rm -rf .kde-frameworks-6-live
-	mkdir -p .kde-frameworks-6-live
-	echo -e "${HEADER}" > kde-frameworks-6-live.keywords
-	for file in .kde-frameworks-6-live.base/*; do
-		newfile=.kde-frameworks-6-live/$(basename "${file}")
+if [[ -d .kde-frameworks-live.base ]]; then
+	rm -rf .kde-frameworks-live
+	mkdir -p .kde-frameworks-live
+	echo -e "${HEADER}" > kde-frameworks-live.keywords
+	for file in .kde-frameworks-live.base/*; do
+		newfile=.kde-frameworks-live/$(basename "${file}")
 		sed -e '/^~.*[.-]9999$/s/$/ **/'  -e '/^@/d' "${file}" > "${newfile}"
 	done
-	cat .kde-frameworks-6-live/* >> kde-frameworks-6-live.keywords
+	cat .kde-frameworks-live/* >> kde-frameworks-live.keywords
 fi
 
 if [[ -d .kde-plasma-live.base ]]; then
@@ -128,16 +128,14 @@ for release in $KF5_RELEASES 5-live; do
 	fi
 done
 
-if [[ -n ${KF6_RELEASES} ]]; then
-	for release in $KF6_RELEASES 6-live; do
-		if [[ -d ".kde-frameworks-6-${release}" ]]; then
-			echo -e "${HEADER}" > "kde-frameworks-${release}"
-			cat ".kde-frameworks-6-${release}/"* | \
-				grep -P -v '^>=kde-frameworks/(?!kf-env)' >> "kde-frameworks-${release}"
-			sed -i "kde-frameworks-${release}" -e "/^@/d"
-		fi
-	done
-fi
+for release in $KF6_RELEASES live; do
+	if [[ -d ".kde-frameworks-${release}" ]]; then
+		echo -e "${HEADER}" > "kde-frameworks-${release}"
+		cat ".kde-frameworks-${release}/"* | \
+			grep -P -v '^>=kde-frameworks/(?!kf-env)' >> "kde-frameworks-${release}"
+		sed -i "kde-frameworks-${release}" -e "/^@/d"
+	fi
+done
 
 for release in $PLASMA_RELEASES live; do
 	echo -e "${HEADER}" > "kde-plasma-${release}"
@@ -167,17 +165,15 @@ for release in $KF5_RELEASES 5-live; do
 	fi
 done
 
-if [[ -n ${KF6_RELEASES} ]]; then
-	for release in $KF6_RELEASES 6-live; do
-		if [[ -d "../package.unmask/.kde-frameworks-6-${release}" ]]; then
-			echo -e "${HEADER}" > "kde-frameworks-${release}"
-			cat "../package.unmask/.kde-frameworks-6-${release}/"* | \
-				grep -P -v '^>=kde-frameworks/(?!kf-env)' >> "kde-frameworks-${release}"
-			sed -i "kde-frameworks-${release}" \
-				-e "/^<kde-frameworks\/.*-6\..\.50:6$/{s/-6\..\.50/-${release}/;s/^</>=/}" -e '/^@/d'
-		fi
-	done
-fi
+for release in $KF6_RELEASES live; do
+	if [[ -d "../package.unmask/.kde-frameworks-${release}" ]]; then
+		echo -e "${HEADER}" > "kde-frameworks-${release}"
+		cat "../package.unmask/.kde-frameworks-${release}/"* | \
+			grep -P -v '^>=kde-frameworks/(?!kf-env)' >> "kde-frameworks-${release}"
+		sed -i "kde-frameworks-${release}" \
+			-e "/^<kde-frameworks\/.*-6\..\.50:6$/{s/-6\..\.50/-${release}/;s/^</>=/}" -e '/^@/d'
+	fi
+done
 
 for release in $PLASMA_RELEASES live; do
 	echo -e "${HEADER}" > "kde-plasma-${release}"
@@ -207,7 +203,7 @@ for set in *frameworks-5*${KF5_RELEASE}; do
 done
 
 if [[ -n ${KF6_RELEASE} ]]; then
-	for set in *frameworks-6*${KF6_RELEASE}; do
+	for set in *frameworks-*${KF6_RELEASE}; do
 		newfile=${set/%-${KF6_RELEASE}}
 		echo -e "${HEADER}" > "${newfile}"
 		sed -r "/@/s/-${KF6_RELEASE}//g;/9999$/s/~//;s/<//;\@kde-frameworks/@s/-(9999|5\.[0-9]+\.50)//" "${set}" >> "${newfile}"

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Sturmlechner]

commit:     ba25152c65ff41114125d31cdddbdf888835d813
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 25 23:23:54 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 25 23:24:55 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ba25152c

Documentation: regenerate-files: Support foreign categories in kde-frameworks sets

Also support high KF5/6 version numbers

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 Documentation/maintainers/regenerate-files | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index 1b4b4cdfc6..526428a26e 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -203,14 +203,14 @@ pushd ../../sets/ > /dev/null
 for set in *frameworks-5*${KF5_RELEASE}; do
 	newfile=${set/%-${KF5_RELEASE}}
 	echo -e "${HEADER}" > "${newfile}"
-	sed -r "/@/s/-${KF5_RELEASE}//g;/5\.9999$/s/~//;s/<//;\@kde-frameworks/@s/-(5\.9999|5\...\.50)/:5/" "${set}" >> "${newfile}"
+	sed -r "/@/s/-${KF5_RELEASE}//g;/5\.9999$/s/~//;s/<//;\@kde-[a-z]+/@s/-(5\.9999|5\.[0-9]+\.50)/:5/" "${set}" >> "${newfile}"
 done
 
 if [[ -n ${KF6_RELEASE} ]]; then
 	for set in *frameworks-6*${KF6_RELEASE}; do
 		newfile=${set/%-${KF6_RELEASE}}
 		echo -e "${HEADER}" > "${newfile}"
-		sed -r "/@/s/-${KF6_RELEASE}//g;/9999$/s/~//;s/<//;\@kde-frameworks/@s/-(9999|5\...\.50)//" "${set}" >> "${newfile}"
+		sed -r "/@/s/-${KF6_RELEASE}//g;/9999$/s/~//;s/<//;\@kde-frameworks/@s/-(9999|5\.[0-9]+\.50)//" "${set}" >> "${newfile}"
 	done
 fi
 

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Sturmlechner]

commit:     dca6a5f59f76397b15514aa81b092f1b23ecf6ed
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 24 13:31:00 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jul 24 13:31:32 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=dca6a5f5

Documentation: Drop 22.12 from GEAR_RELEASES, 23.04 new default

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 Documentation/maintainers/regenerate-files | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index 0b6b7a724a..ec521ab6a7 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -18,8 +18,8 @@ KF6_RELEASE=${KF6_RELEASE:-}
 PLASMA_RELEASES="5.27"
 PLASMA_RELEASE=${PLASMA_RELEASE:-5.27}
 
-GEAR_RELEASES="22.12 23.04"
-GEAR_RELEASE=${GEAR_RELEASE:-22.12}
+GEAR_RELEASES="23.04"
+GEAR_RELEASE=${GEAR_RELEASE:-23.04}
 
 # regenerate keywords
 pushd ../package.accept_keywords/ > /dev/null

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Sturmlechner]

commit:     332dfc9e2f9afa3a3fa782ec3a11b2fe79a264e8
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 19 09:29:17 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 25 20:36:30 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=332dfc9e

dynlink-scanner: add pie-executable to emime type detection list

Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 Documentation/maintainers/dynlink-scanner | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/maintainers/dynlink-scanner b/Documentation/maintainers/dynlink-scanner
index a95235c1ee..153edd0e4d 100755
--- a/Documentation/maintainers/dynlink-scanner
+++ b/Documentation/maintainers/dynlink-scanner
@@ -22,7 +22,7 @@ if [[ "$1" = --linking-deps ]]; then
 		exit 1
 	fi
 	mime=`file -b --mime-type "$2"`
-	if [[ "$mime" == 'application/x-executable' ]] || [[ "${mime}" == 'application/x-sharedlib' ]]; then
+	if [[ "$mime" == 'application/x-pie-executable' ]] || [[ "$mime" == 'application/x-executable' ]] || [[ "${mime}" == 'application/x-sharedlib' ]]; then
 		LINK=`get_link_deps "$2"`
 		[[ "$mime" == 'application/x-sharedlib' ]] && /tmp/try_dlopen "$2"
 		[[ -n $LINK ]] && echo -e ${LINK//,/\\n} | sort -u

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Sturmlechner]

commit:     b105809b72ccced81b0653a13285592939b71e28
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 17 22:05:26 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 25 20:36:20 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b105809b

dynlink-scanner: drop the obsolete '-e' option of qfile

Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
Closes: https://github.com/gentoo/kde/pull/916
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 Documentation/maintainers/dynlink-scanner | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/maintainers/dynlink-scanner b/Documentation/maintainers/dynlink-scanner
index 017f929bcb..a95235c1ee 100755
--- a/Documentation/maintainers/dynlink-scanner
+++ b/Documentation/maintainers/dynlink-scanner
@@ -48,7 +48,7 @@ for cpv in `portageq match $ROOT/ $1`; do
 	# For each file that belongs to package
 	#     run dynlink-scanner --linking-deps <file> to obtain its linking dependencies
 	# Assign all linking deps to packages and print package names
-	qfile -eR $ROOT `portageq contents $ROOT/ $cpv | xargs -r -L 1 "$0" --linking-deps` | cut -f1 -d' ' | sort -u
+	qfile -R $ROOT `portageq contents $ROOT/ $cpv | xargs -r -L 1 "$0" --linking-deps` | cut -f1 -d' ' | sort -u
 done
 
 # Cleanup

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Sturmlechner]

commit:     3b857fa50c5b63ecb4ab44d7d94d8de69b2ce2dd
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 23 20:13:21 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 23 20:13:48 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3b857fa5

Documentation: Switch KF5_RELEASE to 5.102

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 Documentation/maintainers/regenerate-files | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index 1f0418214f..74024d72d3 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -10,7 +10,7 @@ SCRIPT=$(basename $0)
 HEADER="# Autogenerated by ${SCRIPT}, DO NOT EDIT."
 
 KF5_RELEASES="5.102 5.104"
-KF5_RELEASE=${KF5_RELEASE:-5.99}
+KF5_RELEASE=${KF5_RELEASE:-5.102}
 
 KF6_RELEASES=""
 KF6_RELEASE=${KF6_RELEASE:-}

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Sturmlechner]

commit:     a68a87ef541f1c3f0e162b49dd4e4a99ef276577
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  7 10:45:17 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb  7 10:45:17 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a68a87ef

Documentation: bump-from-set.sh: Drop ~x86 from "default" KEYWORDS

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 Documentation/maintainers/bump-from-set.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/maintainers/bump-from-set.sh b/Documentation/maintainers/bump-from-set.sh
index 52771f6092..181ceba131 100755
--- a/Documentation/maintainers/bump-from-set.sh
+++ b/Documentation/maintainers/bump-from-set.sh
@@ -28,7 +28,7 @@ get_main_tree_keyword() {
 	if [[ -e ${portdir}/${cp} ]] ; then
 		echo $(sed -ne 's/^\s*KEYWORDS="\(.*\)"/\1/p' "$(ls ${portdir}/${cp}/*.ebuild | sort | tail -n 1)")
 	else
-		echo "~amd64 ~x86"
+		echo "~amd64"
 	fi
 }
 

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Sturmlechner]

commit:     832aea1fee97c4233d0c1e8b72a8a312de1d83af
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 11 10:51:54 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 11 17:24:52 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=832aea1f

Documentation: regenerate-files: Prepare for parallel KF5/KF6 support

- Rename KF_RELEASE(S) to KF5_RELEASE(S)
- Add KF6_RELEASE(S) and initial yet inactive file generation support

- sets:
  - kde-frameworks-*-live will be renamed to kde-frameworks-5-*-live
  - release kde-frameworks-* sets will be renamed to kde-frameworks-5-*
  - version atoms in KF5 sets do need slotting to be future-proof

- Documentation:
  - Prepare for 5.9999 versioned live ebuilds instead of 9999
  - .kde-frameworks-5-live.base is new base for KDE Frameworks 5 file gen
  - .kde-frameworks-6-live.base will be used for KF6 in the future
  - package.{accept_keywords,unmask}/kde-frameworks-live will be renamed
    to kde-frameworks-5-live respectively

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 Documentation/maintainers/regenerate-files | 105 ++++++++++++++++++++++-------
 1 file changed, 80 insertions(+), 25 deletions(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index a558d839df..cec360f2ff 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -9,8 +9,11 @@ cd "$(dirname $0)"
 SCRIPT=$(basename $0)
 HEADER="# Autogenerated by ${SCRIPT}, DO NOT EDIT."
 
-KF_RELEASES="5.99 5.101"
-KF_RELEASE=${KF_RELEASE:-5.99}
+KF5_RELEASES="5.99 5.101"
+KF5_RELEASE=${KF5_RELEASE:-5.99}
+
+KF6_RELEASES=""
+KF6_RELEASE=${KF6_RELEASE:-}
 
 PLASMA_RELEASES="5.25 5.26"
 PLASMA_RELEASE=${PLASMA_RELEASE:-5.25}
@@ -20,14 +23,24 @@ GEAR_RELEASE=${GEAR_RELEASE:-22.08}
 
 # regenerate keywords
 pushd ../package.accept_keywords/ > /dev/null
-for release in $KF_RELEASES; do
-	echo -e "${HEADER}" > "kde-frameworks-${release}.keywords"
-	if [[ -d ".kde-frameworks-${release}" ]]; then
-		cat ".kde-frameworks-${release}/"* | grep -P -v '^>=kde-frameworks/(?!kf-env)' | \
-			sed -e '/^~.*[.-]9999$/s/$/ **/' -e '/^@/d' >> "kde-frameworks-${release}.keywords"
+for release in $KF5_RELEASES; do
+	if [[ -d ".kde-frameworks-5-${release}" ]]; then
+		echo -e "${HEADER}" > "kde-frameworks-${release}.keywords"
+		cat ".kde-frameworks-5-${release}/"* | grep -P -v '^>=kde-frameworks/(?!kf-env)' | \
+			sed -e '/^~.*[.-]5\.9999$/s/$/ **/' -e '/^@/d' >> "kde-frameworks-${release}.keywords"
 	fi
 done
 
+if [[ -n ${KF6_RELEASES} ]]; then
+	for release in $KF6_RELEASES; do
+		if [[ -d ".kde-frameworks-6-${release}" ]]; then
+			echo -e "${HEADER}" > "kde-frameworks-${release}.keywords"
+			cat ".kde-frameworks-6-${release}/"* | grep -P -v '^>=kde-frameworks/(?!kf-env)' | \
+				sed -e '/^~.*[.-]9999$/s/$/ **/' -e '/^@/d' >> "kde-frameworks-${release}.keywords"
+		fi
+	done
+fi
+
 for release in $PLASMA_RELEASES; do
 	echo -e "${HEADER}" > "kde-plasma-${release}.keywords"
 	if [[ -d ".kde-plasma-${release}" ]]; then
@@ -59,15 +72,26 @@ for release in $GEAR_RELEASES; do
 	fi
 done
 
-if [[ -d .kde-frameworks-live.base ]]; then
-	rm -rf .kde-frameworks-live
-	mkdir -p .kde-frameworks-live
-	echo -e "${HEADER}" > kde-frameworks-live.keywords
-	for file in .kde-frameworks-live.base/*; do
-		newfile=.kde-frameworks-live/$(basename "${file}")
+if [[ -d .kde-frameworks-5-live.base ]]; then
+	rm -rf .kde-frameworks-5-live
+	mkdir -p .kde-frameworks-5-live
+	echo -e "${HEADER}" > kde-frameworks-5-live.keywords
+	for file in .kde-frameworks-5-live.base/*; do
+		newfile=.kde-frameworks-5-live/$(basename "${file}")
+		sed -e '/^~.*[.-]5.9999$/s/$/ **/'  -e '/^@/d' "${file}" > "${newfile}"
+	done
+	cat .kde-frameworks-5-live/* >> kde-frameworks-5-live.keywords
+fi
+
+if [[ -d .kde-frameworks-6-live.base ]]; then
+	rm -rf .kde-frameworks-6-live
+	mkdir -p .kde-frameworks-6-live
+	echo -e "${HEADER}" > kde-frameworks-6-live.keywords
+	for file in .kde-frameworks-6-live.base/*; do
+		newfile=.kde-frameworks-6-live/$(basename "${file}")
 		sed -e '/^~.*[.-]9999$/s/$/ **/'  -e '/^@/d' "${file}" > "${newfile}"
 	done
-	cat .kde-frameworks-live/* >> kde-frameworks-live.keywords
+	cat .kde-frameworks-6-live/* >> kde-frameworks-6-live.keywords
 fi
 
 if [[ -d .kde-plasma-live.base ]]; then
@@ -95,15 +119,26 @@ popd > /dev/null
 
 # regenerate unmask entries (base for package mask)
 pushd ../package.unmask/ > /dev/null
-for release in $KF_RELEASES live; do
-	echo -e "${HEADER}" > "kde-frameworks-${release}"
-	if [[ -d ".kde-frameworks-${release}" ]]; then
-		cat ".kde-frameworks-${release}/"* | \
+for release in $KF5_RELEASES 5-live; do
+	if [[ -d ".kde-frameworks-5-${release}" ]]; then
+		echo -e "${HEADER}" > "kde-frameworks-${release}"
+		cat ".kde-frameworks-5-${release}/"* | \
 			grep -P -v '^>=kde-frameworks/(?!kf-env)' >> "kde-frameworks-${release}"
 		sed -i "kde-frameworks-${release}" -e "/^@/d"
 	fi
 done
 
+if [[ -n ${KF6_RELEASES} ]]; then
+	for release in $KF6_RELEASES 6-live; do
+		if [[ -d ".kde-frameworks-6-${release}" ]]; then
+			echo -e "${HEADER}" > "kde-frameworks-${release}"
+			cat ".kde-frameworks-6-${release}/"* | \
+				grep -P -v '^>=kde-frameworks/(?!kf-env)' >> "kde-frameworks-${release}"
+			sed -i "kde-frameworks-${release}" -e "/^@/d"
+		fi
+	done
+fi
+
 for release in $PLASMA_RELEASES live; do
 	echo -e "${HEADER}" > "kde-plasma-${release}"
 	if [[ -d ".kde-plasma-${release}" ]]; then
@@ -122,16 +157,28 @@ popd > /dev/null
 
 # regenerate mask entries (base for package mask)
 pushd ../package.mask/ > /dev/null
-for release in $KF_RELEASES live; do
-	echo -e "${HEADER}" > "kde-frameworks-${release}"
-	if [[ -d "../package.unmask/.kde-frameworks-${release}" ]]; then
-		cat "../package.unmask/.kde-frameworks-${release}/"* | \
+for release in $KF5_RELEASES 5-live; do
+	if [[ -d "../package.unmask/.kde-frameworks-5-${release}" ]]; then
+		echo -e "${HEADER}" > "kde-frameworks-${release}"
+		cat "../package.unmask/.kde-frameworks-5-${release}/"* | \
 			grep -P -v '^>=kde-frameworks/(?!kf-env)' >> "kde-frameworks-${release}"
 		sed -i "kde-frameworks-${release}" \
 			-e "/^<kde-frameworks\/.*-5\..\.50:5$/{s/-5\..\.50/-${release}/;s/^</>=/}" -e '/^@/d'
 	fi
 done
 
+if [[ -n ${KF6_RELEASES} ]]; then
+	for release in $KF6_RELEASES 6-live; do
+		if [[ -d "../package.unmask/.kde-frameworks-6-${release}" ]]; then
+			echo -e "${HEADER}" > "kde-frameworks-${release}"
+			cat "../package.unmask/.kde-frameworks-6-${release}/"* | \
+				grep -P -v '^>=kde-frameworks/(?!kf-env)' >> "kde-frameworks-${release}"
+			sed -i "kde-frameworks-${release}" \
+				-e "/^<kde-frameworks\/.*-6\..\.50:6$/{s/-6\..\.50/-${release}/;s/^</>=/}" -e '/^@/d'
+		fi
+	done
+fi
+
 for release in $PLASMA_RELEASES live; do
 	echo -e "${HEADER}" > "kde-plasma-${release}"
 	if [[ -d "../package.unmask/.kde-plasma-${release}" ]]; then
@@ -153,12 +200,20 @@ popd > /dev/null
 
 # regenerate unversioned sets
 pushd ../../sets/ > /dev/null
-for set in *frameworks*${KF_RELEASE}; do
-	newfile=${set/%-${KF_RELEASE}}
+for set in *frameworks-5*${KF5_RELEASE}; do
+	newfile=${set/%-${KF5_RELEASE}}
 	echo -e "${HEADER}" > "${newfile}"
-	sed -r "/@/s/-${KF_RELEASE}//g;/9999$/s/~//;s/<//;\@kde-frameworks/@s/-(9999|5\...\.50)//" "${set}" >> "${newfile}"
+	sed -r "/@/s/-${KF5_RELEASE}//g;/5\.9999$/s/~//;s/<//;\@kde-frameworks/@s/-(5\.9999|5\...\.50)/:5/" "${set}" >> "${newfile}"
 done
 
+if [[ -n ${KF6_RELEASE} ]]; then
+	for set in *frameworks-6*${KF6_RELEASE}; do
+		newfile=${set/%-${KF6_RELEASE}}
+		echo -e "${HEADER}" > "${newfile}"
+		sed -r "/@/s/-${KF6_RELEASE}//g;/9999$/s/~//;s/<//;\@kde-frameworks/@s/-(9999|5\...\.50)//" "${set}" >> "${newfile}"
+	done
+fi
+
 for set in *plasma-${PLASMA_RELEASE}; do
 	newfile=${set/%-${PLASMA_RELEASE}}
 	echo -e "${HEADER}" > "${newfile}"

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Sturmlechner]

commit:     e76607e7622a15e5001f383a926dab3047dd0d11
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 11 17:23:44 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 11 17:23:44 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e76607e7

Documentation: regenerate-files: Drop Plasma-4 debris

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 Documentation/maintainers/regenerate-files | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index e585ee1a16..a558d839df 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -91,14 +91,6 @@ if [[ -d .kde-gear-live.base ]]; then
 	done
 	cat .kde-gear-live/* >> kde-gear-live.keywords
 fi
-
-# keywords for miscellaneous packages from package.unmask/
-for misc in kde-extras-live; do
-	if [[ -f "../package.unmask/${misc}" ]]; then
-		echo -e "${HEADER}" > "${misc}.keywords"
-		sed '/^~.*[.-]9999$/s/$/ **/' "../package.unmask/${misc}" >> "${misc}.keywords"
-	fi
-done
 popd > /dev/null
 
 # regenerate unmask entries (base for package mask)

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Sturmlechner]

commit:     0b38c9fcf84f9bc41c6d31c3c6985dc0dd4ae9f7
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  3 10:40:44 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec  5 18:33:06 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0b38c9fc

Documentation: Switch GEAR_RELEASE to 22.08

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 Documentation/maintainers/regenerate-files | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index 55e60afb26..f35378045e 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -15,8 +15,8 @@ KF_RELEASE=${KF_RELEASE:-5.99}
 PLASMA_RELEASES="5.25 5.26"
 PLASMA_RELEASE=${PLASMA_RELEASE:-5.25}
 
-GEAR_RELEASES="22.04 22.08 22.12"
-GEAR_RELEASE=${GEAR_RELEASE:-22.04}
+GEAR_RELEASES="22.08 22.12"
+GEAR_RELEASE=${GEAR_RELEASE:-22.08}
 
 # regenerate keywords
 pushd ../package.accept_keywords/ > /dev/null

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Sturmlechner]

commit:     fe786916c879882517ce83eed945de3d4c201e5e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  8 18:52:38 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov  8 18:53:58 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=fe786916

Documentation: regenerate-files: Stop appending SLOT 5 to KDE Gear sets

KDE Gear packages no longer consistently use SLOT 5.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 Documentation/maintainers/regenerate-files | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index 2ba7c7d661..cd9ad0680d 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -176,7 +176,7 @@ done
 for set in *-${GEAR_RELEASE}; do
 	newfile=${set/%-${GEAR_RELEASE}}
 	echo -e "${HEADER}" > "${newfile}"
-	sed -r "/@/s/-${GEAR_RELEASE}//g;/9999$/s/~//;s/<//;\@[a-z-]+/@s/-(9999|${GEAR_RELEASE}\.50)/:5/" "${set}" >> "${newfile}"
+	sed -r "/@/s/-${GEAR_RELEASE}//g;/9999$/s/~//;s/<//;\@[a-z-]+/@s/-(9999|${GEAR_RELEASE}\.50)//" "${set}" >> "${newfile}"
 done
 
 popd > /dev/null

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Sturmlechner]

commit:     c24e8a922fd3c214f50cb0cdada4b994b94936c4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  5 11:31:50 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 16 11:02:51 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c24e8a92

Documentation: maintainers: Optimise pkgdev options

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 Documentation/maintainers/bump-from-set.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/maintainers/bump-from-set.sh b/Documentation/maintainers/bump-from-set.sh
index 410d991d27..52771f6092 100755
--- a/Documentation/maintainers/bump-from-set.sh
+++ b/Documentation/maintainers/bump-from-set.sh
@@ -89,7 +89,7 @@ if [[ -d "${PORTDIR}/.git" ]] && hash git 2>/dev/null && hash pkgdev 2>/dev/null
 		pushd "${PORTDIR}/${cp}" > /dev/null
 
 		git add .
-		pkgdev commit . -m "${DESTINATIONVERSION} version bump"
+		pkgdev commit . -m "${DESTINATIONVERSION} version bump" -s false
 
 		popd > /dev/null
 	done

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Sturmlechner]

commit:     2da6f17783498fe4a23388200da221ff0a13bbe5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  3 08:49:38 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct  3 08:50:55 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2da6f177

Documentation: maintainers: Drop KF-5.97, set PLASMA_RELEASE to 5.25

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 Documentation/maintainers/regenerate-files | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index 1aded471cd..b9bdaef964 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -9,11 +9,11 @@ cd "$(dirname $0)"
 SCRIPT=$(basename $0)
 HEADER="# Autogenerated by ${SCRIPT}, DO NOT EDIT."
 
-KF_RELEASES="5.96 5.97 5.98 5.99"
+KF_RELEASES="5.96 5.98 5.99"
 KF_RELEASE=${KF_RELEASE:-5.96}
 
 PLASMA_RELEASES="5.24 5.25 5.26"
-PLASMA_RELEASE=${PLASMA_RELEASE:-5.24}
+PLASMA_RELEASE=${PLASMA_RELEASE:-5.25}
 
 GEAR_RELEASES="22.04 22.08"
 GEAR_RELEASE=${GEAR_RELEASE:-22.04}

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Sturmlechner]

commit:     ee04916dd4d7a2d36f8037e4192a624e9de47935
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 19 14:17:38 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jul 19 14:17:38 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ee04916d

Documentation: maintainers: bump-from-set.sh: Do pkgcommit -> pkgdev here too

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 Documentation/maintainers/bump-from-set.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Documentation/maintainers/bump-from-set.sh b/Documentation/maintainers/bump-from-set.sh
index a1af16541c..410d991d27 100755
--- a/Documentation/maintainers/bump-from-set.sh
+++ b/Documentation/maintainers/bump-from-set.sh
@@ -6,7 +6,6 @@
 # dev-util/pkgdev
 # Optional:
 # dev-vcs/git
-# app-portage/mgorny-dev-scripts
 # dev-util/pkgcheck
 
 : ${PORTDIR:="$(pwd)"}
@@ -85,12 +84,12 @@ for cp in ${packages} ; do
 	popd > /dev/null
 done
 
-if [[ -d "${PORTDIR}/.git" ]] && hash git 2>/dev/null && hash pkgcommit 2>/dev/null; then
+if [[ -d "${PORTDIR}/.git" ]] && hash git 2>/dev/null && hash pkgdev 2>/dev/null; then
 	for cp in ${packages} ; do
 		pushd "${PORTDIR}/${cp}" > /dev/null
 
 		git add .
-		pkgcommit -sS . -m "${DESTINATIONVERSION} version bump"
+		pkgdev commit . -m "${DESTINATIONVERSION} version bump"
 
 		popd > /dev/null
 	done

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Sam James]

commit:     9c0d5b2fbee5650e7c38afe2ca31fffc976fbc48
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May  3 22:18:37 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May  3 22:31:36 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9c0d5b2f

Documentation/maintainers: use #!/usr/bin/env bash shebang

Some rely on Bashisms and let's be consistent.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 Documentation/maintainers/bump-from-set.sh       | 2 +-
 Documentation/maintainers/find_unused_patches.sh | 2 +-
 Documentation/maintainers/kde-l10n-fetch.sh      | 1 +
 Documentation/maintainers/kde-l10n-repack.sh     | 2 +-
 Documentation/maintainers/keywords-bump.sh       | 2 +-
 Documentation/maintainers/repack.sh              | 2 +-
 Documentation/maintainers/set-bump.sh            | 2 +-
 Documentation/maintainers/sync-gentoo-overlay.sh | 2 +-
 Documentation/maintainers/sync-metadata.sh       | 2 +-
 9 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Documentation/maintainers/bump-from-set.sh b/Documentation/maintainers/bump-from-set.sh
index 4d44f42017..f92fa99306 100755
--- a/Documentation/maintainers/bump-from-set.sh
+++ b/Documentation/maintainers/bump-from-set.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Requires:
 # app-portage/portage-utils

diff --git a/Documentation/maintainers/find_unused_patches.sh b/Documentation/maintainers/find_unused_patches.sh
index 34ed762501..42730713c8 100755
--- a/Documentation/maintainers/find_unused_patches.sh
+++ b/Documentation/maintainers/find_unused_patches.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 TMP="/tmp/"
 CATEGORY="kde-apps"
 # we also assume that we are run from the directory where we want to remove patches eg. directory where are categories.

diff --git a/Documentation/maintainers/kde-l10n-fetch.sh b/Documentation/maintainers/kde-l10n-fetch.sh
index 521198fbe7..9cdd8e2b76 100755
--- a/Documentation/maintainers/kde-l10n-fetch.sh
+++ b/Documentation/maintainers/kde-l10n-fetch.sh
@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 LANGS="af ar be bg bn bn_IN br ca cs csb cy da de el en_GB eo es et eu fa fi fr
 	fy ga gl gu he hi hr hsb hu hy is it ja ka kk km kn ko ku lb lt lv mk ml
 	ms mt nb nds ne nl nn nso oc pa pl pt pt_BR ro ru rw se sk sl sr sv ta te tg

diff --git a/Documentation/maintainers/kde-l10n-repack.sh b/Documentation/maintainers/kde-l10n-repack.sh
index 33c126a690..5a0d73c464 100755
--- a/Documentation/maintainers/kde-l10n-repack.sh
+++ b/Documentation/maintainers/kde-l10n-repack.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 KDEVER=$1
 SVNREV=$2
 

diff --git a/Documentation/maintainers/keywords-bump.sh b/Documentation/maintainers/keywords-bump.sh
index 31fd6698c4..0e57a9578b 100755
--- a/Documentation/maintainers/keywords-bump.sh
+++ b/Documentation/maintainers/keywords-bump.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 : ${PORTDIR:="$(pwd)"}
 

diff --git a/Documentation/maintainers/repack.sh b/Documentation/maintainers/repack.sh
index 8a2b4ffa07..066d799ce4 100755
--- a/Documentation/maintainers/repack.sh
+++ b/Documentation/maintainers/repack.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 # Script to repack upstream tarballs
 #
 SVNREV=$2

diff --git a/Documentation/maintainers/set-bump.sh b/Documentation/maintainers/set-bump.sh
index d5a0fd7206..43963efcc8 100755
--- a/Documentation/maintainers/set-bump.sh
+++ b/Documentation/maintainers/set-bump.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 # requires app-portage/portage-utils and app-portage/gentoolkit-dev
 

diff --git a/Documentation/maintainers/sync-gentoo-overlay.sh b/Documentation/maintainers/sync-gentoo-overlay.sh
index 3172dfa203..37fd36fbdc 100755
--- a/Documentation/maintainers/sync-gentoo-overlay.sh
+++ b/Documentation/maintainers/sync-gentoo-overlay.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Run this script via cronjob to update your overlay mirror
 

diff --git a/Documentation/maintainers/sync-metadata.sh b/Documentation/maintainers/sync-metadata.sh
index d02fee4c37..fcc699913b 100755
--- a/Documentation/maintainers/sync-metadata.sh
+++ b/Documentation/maintainers/sync-metadata.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Contact: devurandom
 METADATA_MIRROR=rsync://gentoo.kynes.de:800/gentoo-overlay-kde/metadata/cache/

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Sturmlechner]

commit:     97c63b7d3d04fdbc150499437628992bc0f91686
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  4 10:24:49 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 11 06:06:19 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=97c63b7d

Documentation: Drop KDE Release Service mangling (replaced by KDE Gear)

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 Documentation/maintainers/regenerate-files | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index af5f136512..cd48ef4191 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -18,9 +18,6 @@ PLASMA_RELEASE=${PLASMA_RELEASE:-5.21}
 GEAR_RELEASES="21.04 21.08"
 GEAR_RELEASE=${GEAR_RELEASE:-21.04}
 
-SERVICE_RELEASES="20.12"
-SERVICE_RELEASE=${SERVICE_RELEASE:-20.12}
-
 # regenerate keywords
 pushd ../package.accept_keywords/ > /dev/null
 for release in $KF_RELEASES; do
@@ -62,14 +59,6 @@ for release in $GEAR_RELEASES; do
 	fi
 done
 
-for release in $SERVICE_RELEASES; do
-	echo -e "${HEADER}" > "kde-release-service-${release}.keywords"
-	if [[ -d ".kde-release-service-${release}" ]]; then
-		cat ".kde-release-service-${release}/"* | \
-			sed -e '/^~.*[.-]9999$/s/$/ **/' -e '/^@/d' >> "kde-release-service-${release}.keywords"
-	fi
-done
-
 if [[ -d .kde-frameworks-live.base ]]; then
 	rm -rf .kde-frameworks-live
 	mkdir -p .kde-frameworks-live
@@ -190,11 +179,6 @@ for set in *-${GEAR_RELEASE}; do
 	sed -r "/@/s/-${GEAR_RELEASE}//g;/9999$/s/~//;s/<//;\@[a-z-]+/@s/-(9999|${GEAR_RELEASE}\.50)/:5/" "${set}" >> "${newfile}"
 done
 
-for set in *-${SERVICE_RELEASE}; do
-	newfile=${set/%-${SERVICE_RELEASE}}
-	echo -e "${HEADER}" > "${newfile}"
-	sed -r "/@/s/-${SERVICE_RELEASE}//g;/9999$/s/~//;s/<//;\@[a-z-]+/@s/-(9999|${SERVICE_RELEASE}\.50)/:5/" "${set}" >> "${newfile}"
-done
 popd > /dev/null
 
 # regenerate CONTRIBUTORS file

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Sturmlechner]

commit:     3fa5e4bcf3bb0178ffec0da3c8e197bd1987d779
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 14 08:16:54 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 14 08:17:57 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3fa5e4bc

Documentation: regenerate-files: Update PLASMA_RELEASE, KF_RELEASE

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 Documentation/maintainers/regenerate-files | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index dfc3b42550..647b362fb3 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -9,11 +9,11 @@ cd "$(dirname $0)"
 SCRIPT=$(basename $0)
 HEADER="# Autogenerated by ${SCRIPT}, DO NOT EDIT."
 
-KF_RELEASES="5.80 5.82 5.83"
-KF_RELEASE=${KF_RELEASE:-5.80}
+KF_RELEASES="5.82 5.83"
+KF_RELEASE=${KF_RELEASE:-5.82}
 
-PLASMA_RELEASES="5.20 5.21 5.22"
-PLASMA_RELEASE=${PLASMA_RELEASE:-5.20}
+PLASMA_RELEASES="5.21 5.22"
+PLASMA_RELEASE=${PLASMA_RELEASE:-5.21}
 
 GEAR_RELEASES="21.04"
 GEAR_RELEASE=${GEAR_RELEASE:-21.04}

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Sturmlechner]

commit:     a8c9b534d118acdfc5e5b32946a1d254b01f9349
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 24 19:53:34 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 19:56:50 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a8c9b534

Documentation: Set PLASMA_RELEASE to 5.20

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 Documentation/maintainers/regenerate-files | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index 018f42c183..2b168dc372 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -12,8 +12,8 @@ HEADER="# Autogenerated by ${SCRIPT}, DO NOT EDIT."
 KF_RELEASES="5.77 5.78"
 KF_RELEASE=${KF_RELEASE:-5.77}
 
-PLASMA_RELEASES="5.19 5.20 5.21"
-PLASMA_RELEASE=${PLASMA_RELEASE:-5.19}
+PLASMA_RELEASES="5.20 5.21"
+PLASMA_RELEASE=${PLASMA_RELEASE:-5.20}
 
 SERVICE_RELEASES="20.08 20.12"
 SERVICE_RELEASE=${SERVICE_RELEASE:-20.08}

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Sturmlechner]

commit:     fb2281e6b82d3712e9ed83335298e2eff4fd7ed8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 11 12:31:13 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 11 12:31:42 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=fb2281e6

Documentation: Set KF_RELEASE=5.77

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 Documentation/maintainers/regenerate-files | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index 2c7102eeb8..97fc3bad51 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -9,8 +9,8 @@ cd "$(dirname $0)"
 SCRIPT=$(basename $0)
 HEADER="# Autogenerated by ${SCRIPT}, DO NOT EDIT."
 
-KF_RELEASES="5.74 5.77 5.78"
-KF_RELEASE=${KF_RELEASE:-5.74}
+KF_RELEASES="5.77 5.78"
+KF_RELEASE=${KF_RELEASE:-5.77}
 
 PLASMA_RELEASES="5.19 5.20"
 PLASMA_RELEASE=${PLASMA_RELEASE:-5.19}

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Sturmlechner]

commit:     3e1bb8d7eba2474e31ddccd8f2005179278dd646
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 25 18:20:47 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 18:20:47 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3e1bb8d7

Documentation: Set SERVICE_RELEASE to 20.08

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 Documentation/maintainers/regenerate-files | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index dd7c906b68..41a4253695 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -15,8 +15,8 @@ KF_RELEASE=${KF_RELEASE:-5.74}
 PLASMA_RELEASES="5.19 5.20"
 PLASMA_RELEASE=${PLASMA_RELEASE:-5.19}
 
-SERVICE_RELEASES="20.04 20.08 20.12"
-SERVICE_RELEASE=${SERVICE_RELEASE:-20.04}
+SERVICE_RELEASES="20.08 20.12"
+SERVICE_RELEASE=${SERVICE_RELEASE:-20.08}
 
 # regenerate keywords
 pushd ../package.accept_keywords/ > /dev/null

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Sturmlechner]

commit:     7d700fba8f3fa3cb3d8dd629c2deb121f01ec380
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  5 11:37:42 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Oct  8 18:37:13 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7d700fba

Documentation: Update KF_RELEASE(S), PLASMA_RELEASE(S) and set regeneration

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 Documentation/maintainers/regenerate-files | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index 124444c940..5d1549eb74 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -9,11 +9,11 @@ cd "$(dirname $0)"
 SCRIPT=$(basename $0)
 HEADER="# Autogenerated by ${SCRIPT}, DO NOT EDIT."
 
-KF_RELEASES="5.70 5.74 5.75"
-KF_RELEASE=${KF_RELEASE:-5.70}
+KF_RELEASES="5.74 5.75"
+KF_RELEASE=${KF_RELEASE:-5.74}
 
-PLASMA_RELEASES="5.18 5.19 5.20"
-PLASMA_RELEASE=${PLASMA_RELEASE:-5.18}
+PLASMA_RELEASES="5.19 5.20"
+PLASMA_RELEASE=${PLASMA_RELEASE:-5.19}
 
 SERVICE_RELEASES="20.04 20.08"
 SERVICE_RELEASE=${SERVICE_RELEASE:-20.04}
@@ -161,7 +161,7 @@ popd > /dev/null
 
 # regenerate unversioned sets
 pushd ../../sets/ > /dev/null
-for set in *frameworks-${KF_RELEASE}; do
+for set in *frameworks*${KF_RELEASE}; do
 	newfile=${set/%-${KF_RELEASE}}
 	echo -e "${HEADER}" > "${newfile}"
 	sed -r "/@/s/-${KF_RELEASE}//g;/9999$/s/~//;s/<//;\@kde-frameworks/@s/-(9999|5\...\.50)//" "${set}" >> "${newfile}"

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Sturmlechner]

commit:     fb473ff4157299cc5a9a3f62fdb4dae7b0107c87
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 22 14:56:22 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 22 19:52:24 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=fb473ff4

regenerate-files: Allow Frameworks sets to reference smaller (tier) sets

Same as is already done with Release Service sets.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 Documentation/maintainers/regenerate-files | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index 0c0dbf5785..947fb8daa9 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -23,7 +23,7 @@ pushd ../package.accept_keywords/ > /dev/null
 for release in $KF_RELEASES; do
 	echo -e "${HEADER}" > "kde-frameworks-${release}.keywords"
 	if [[ -d ".kde-frameworks-${release}" ]]; then
-		cat ".kde-frameworks-${release}/"* | grep -P -v '^>=kde-frameworks/(?!kf-env)' |sed '/^~.*[.-]9999$/s/$/ **/' >> "kde-frameworks-${release}.keywords"
+		cat ".kde-frameworks-${release}/"* | grep -P -v '^>=kde-frameworks/(?!kf-env)' | sed -e '/^~.*[.-]9999$/s/$/ **/' -e '/^@/d' >> "kde-frameworks-${release}.keywords"
 	fi
 done
 
@@ -62,7 +62,7 @@ if [[ -d .kde-frameworks-live.base ]]; then
 	echo -e "${HEADER}" > kde-frameworks-live.keywords
 	for file in .kde-frameworks-live.base/*; do
 		newfile=.kde-frameworks-live/$(basename "${file}")
-		sed '/^~.*[.-]9999$/s/$/ **/' "${file}" > "${newfile}"
+		sed -e '/^~.*[.-]9999$/s/$/ **/'  -e '/^@/d' "${file}" > "${newfile}"
 	done
 	cat .kde-frameworks-live/* >> kde-frameworks-live.keywords
 fi
@@ -104,6 +104,7 @@ for release in $KF_RELEASES live; do
 	echo -e "${HEADER}" > "kde-frameworks-${release}"
 	if [[ -d ".kde-frameworks-${release}" ]]; then
 		cat ".kde-frameworks-${release}/"* | grep -P -v '^>=kde-frameworks/(?!kf-env)' >> "kde-frameworks-${release}"
+		sed -i "kde-frameworks-${release}" -e "/^@/d"
 	fi
 done
 
@@ -129,7 +130,7 @@ for release in $KF_RELEASES live; do
 	echo -e "${HEADER}" > "kde-frameworks-${release}"
 	if [[ -d "../package.unmask/.kde-frameworks-${release}" ]]; then
 		cat "../package.unmask/.kde-frameworks-${release}/"* | grep -P -v '^>=kde-frameworks/(?!kf-env)' >> "kde-frameworks-${release}"
-		sed -i "kde-frameworks-${release}" -e "/^<kde-frameworks\/.*-5\..\.50:5$/{s/-5\..\.50/-${release}/;s/^</>=/}"
+		sed -i "kde-frameworks-${release}" -e "/^<kde-frameworks\/.*-5\..\.50:5$/{s/-5\..\.50/-${release}/;s/^</>=/}" -e '/^@/d'
 	fi
 done
 

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Sturmlechner]

commit:     a9ca853e0d0ef629bf8fe8dd8c37698e86969c40
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 22 15:18:42 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 22 19:52:41 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a9ca853e

regenerate-files: Break up some of the longer lines

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 Documentation/maintainers/regenerate-files | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index 947fb8daa9..94f3a20cee 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -23,7 +23,8 @@ pushd ../package.accept_keywords/ > /dev/null
 for release in $KF_RELEASES; do
 	echo -e "${HEADER}" > "kde-frameworks-${release}.keywords"
 	if [[ -d ".kde-frameworks-${release}" ]]; then
-		cat ".kde-frameworks-${release}/"* | grep -P -v '^>=kde-frameworks/(?!kf-env)' | sed -e '/^~.*[.-]9999$/s/$/ **/' -e '/^@/d' >> "kde-frameworks-${release}.keywords"
+		cat ".kde-frameworks-${release}/"* | grep -P -v '^>=kde-frameworks/(?!kf-env)' | \
+			sed -e '/^~.*[.-]9999$/s/$/ **/' -e '/^@/d' >> "kde-frameworks-${release}.keywords"
 	fi
 done
 
@@ -37,7 +38,8 @@ done
 for release in $SERVICE_RELEASES; do
 	echo -e "${HEADER}" > "kde-release-service-${release}.keywords"
 	if [[ -d ".kde-release-service-${release}" ]]; then
-		cat ".kde-release-service-${release}/"* | sed -e '/^~.*[.-]9999$/s/$/ **/' -e '/^@/d' >> "kde-release-service-${release}.keywords"
+		cat ".kde-release-service-${release}/"* | \
+			sed -e '/^~.*[.-]9999$/s/$/ **/' -e '/^@/d' >> "kde-release-service-${release}.keywords"
 	fi
 done
 
@@ -49,7 +51,8 @@ for release in $SERVICE_RELEASES; do
 		echo -e "${HEADER}" > "kde-release-service-${release}.49.9999.keywords"
 		for file in ".kde-release-service-${release}"/*; do
 			newfile=".kde-release-service-${release}.49.9999"/$(basename "${file}")
-			sed -e "/^<[a-z-]*\/.*\.50$/{s/\.50/.49.9999/;s/^</~/};/^~.*[.-]9999$/s/$/ **/" -e "/^@/d" "${file}" > "${newfile}"
+			sed -e "/^<[a-z-]*\/.*\.50$/{s/\.50/.49.9999/;s/^</~/};/^~.*[.-]9999$/s/$/ **/" \
+				-e "/^@/d" "${file}" > "${newfile}"
 			# echo "${newfile}"
 		done
 		cat ".kde-release-service-${release}.49.9999"/* >> "kde-release-service-${release}.49.9999.keywords"
@@ -103,7 +106,8 @@ pushd ../package.unmask/ > /dev/null
 for release in $KF_RELEASES live; do
 	echo -e "${HEADER}" > "kde-frameworks-${release}"
 	if [[ -d ".kde-frameworks-${release}" ]]; then
-		cat ".kde-frameworks-${release}/"* | grep -P -v '^>=kde-frameworks/(?!kf-env)' >> "kde-frameworks-${release}"
+		cat ".kde-frameworks-${release}/"* | \
+			grep -P -v '^>=kde-frameworks/(?!kf-env)' >> "kde-frameworks-${release}"
 		sed -i "kde-frameworks-${release}" -e "/^@/d"
 	fi
 done
@@ -129,8 +133,10 @@ pushd ../package.mask/ > /dev/null
 for release in $KF_RELEASES live; do
 	echo -e "${HEADER}" > "kde-frameworks-${release}"
 	if [[ -d "../package.unmask/.kde-frameworks-${release}" ]]; then
-		cat "../package.unmask/.kde-frameworks-${release}/"* | grep -P -v '^>=kde-frameworks/(?!kf-env)' >> "kde-frameworks-${release}"
-		sed -i "kde-frameworks-${release}" -e "/^<kde-frameworks\/.*-5\..\.50:5$/{s/-5\..\.50/-${release}/;s/^</>=/}" -e '/^@/d'
+		cat "../package.unmask/.kde-frameworks-${release}/"* | \
+			grep -P -v '^>=kde-frameworks/(?!kf-env)' >> "kde-frameworks-${release}"
+		sed -i "kde-frameworks-${release}" \
+			-e "/^<kde-frameworks\/.*-5\..\.50:5$/{s/-5\..\.50/-${release}/;s/^</>=/}" -e '/^@/d'
 	fi
 done
 
@@ -138,7 +144,8 @@ for release in $PLASMA_RELEASES live; do
 	echo -e "${HEADER}" > "kde-plasma-${release}"
 	if [[ -d "../package.unmask/.kde-plasma-${release}" ]]; then
 		cat "../package.unmask/.kde-plasma-${release}/"* >> "kde-plasma-${release}"
-		sed -i "kde-plasma-${release}" -e "/^<kde-plasma\/.*-5\..\.50:5$/{s/-5\..\.50/-${release}/;s/^</>=/}"
+		sed -i "kde-plasma-${release}" \
+			-e "/^<kde-plasma\/.*-5\..\.50:5$/{s/-5\..\.50/-${release}/;s/^</>=/}"
 	fi
 done
 
@@ -146,7 +153,8 @@ for release in $SERVICE_RELEASES live; do
 	echo -e "${HEADER}" > "kde-release-service-${release}"
 	if [[ -d "../package.unmask/.kde-release-service-${release}" ]]; then
 		cat "../package.unmask/.kde-release-service-${release}/"* >> "kde-release-service-${release}"
-		sed -i "kde-release-service-${release}" -e "/^<kde-release-service\/.*-14\..\.50:5$/{s/-14\..\.50/-${release}/;s/^</>=/}" -e '/^@/d'
+		sed -i "kde-release-service-${release}" \
+			-e "/^<kde-release-service\/.*-14\..\.50:5$/{s/-14\..\.50/-${release}/;s/^</>=/}" -e '/^@/d'
 	fi
 done
 popd > /dev/null

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Sturmlechner]

commit:     43514180101ad6267a7c514ff925af9023b3cd1a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 22 16:48:13 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 22 18:01:31 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=43514180

Documentation: bump-from-set.sh: Add pkgcheck support

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 Documentation/maintainers/bump-from-set.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Documentation/maintainers/bump-from-set.sh b/Documentation/maintainers/bump-from-set.sh
index 3ee29bdc4b..b849c11dfa 100755
--- a/Documentation/maintainers/bump-from-set.sh
+++ b/Documentation/maintainers/bump-from-set.sh
@@ -7,6 +7,7 @@
 # Optional:
 # dev-vcs/git
 # app-portage/mgorny-dev-scripts
+# dev-util/pkgcheck
 
 : ${PORTDIR:="$(pwd)"}
 
@@ -93,4 +94,10 @@ if [[ -d "${PORTDIR}/.git" ]] && hash git 2>/dev/null && hash pkgcommit 2>/dev/n
 
 		popd > /dev/null
 	done
+
+	if hash pkgcheck 2>/dev/null; then
+		pushd "${PORTDIR}" > /dev/null
+			pkgcheck scan --commits
+		popd > /dev/null
+	fi
 fi

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Sturmlechner]

commit:     a1ce579d0b4cc0921a25b0e0a84100a8f7c45b27
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 22 16:13:46 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 22 18:01:30 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a1ce579d

Documentation: bump-from-set.sh: Commit using pkgcommit

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 Documentation/maintainers/bump-from-set.sh | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/Documentation/maintainers/bump-from-set.sh b/Documentation/maintainers/bump-from-set.sh
index ecc3b3bdc3..3ee29bdc4b 100755
--- a/Documentation/maintainers/bump-from-set.sh
+++ b/Documentation/maintainers/bump-from-set.sh
@@ -4,6 +4,9 @@
 # app-portage/portage-utils
 # app-portage/gentoolkit-dev
 # app-portage/repoman
+# Optional:
+# dev-vcs/git
+# app-portage/mgorny-dev-scripts
 
 : ${PORTDIR:="$(pwd)"}
 
@@ -33,13 +36,14 @@ help() {
 	echo Simple set-based version bumper.
 	echo
 	echo Given a set file, bumps all packages in the given set given source
-	echo and destination versions. Designed for workflows where ebuilds are
-	echo bumped from up-to-date live versions.
+	echo and destination versions. Optionally, if destination is a git repository,
+	echo each ebuild will be committed as \"cat/pn: DESTINATIONVERSION version bump\".
+	echo Designed for workflows where ebuilds are bumped from up-to-date live versions.
 	echo
 	echo Reads PORTDIR from your enviroment, defaulting to the current directory.
 	echo
 	echo Usage: bump-from-set.sh SETNAME SOURCEVERSION DESTINATIONVERSION
-	echo Example: bump-from-set.sh kde-plasma-5.7 5.7.49.9999 5.7.1
+	echo Example: bump-from-set.sh kde-plasma-5.19 5.19.49.9999 5.19.2
 	exit 0
 }
 
@@ -79,3 +83,14 @@ for cp in ${packages} ; do
 
 	popd > /dev/null
 done
+
+if [[ -d "${PORTDIR}/.git" ]] && hash git 2>/dev/null && hash pkgcommit 2>/dev/null; then
+	for cp in ${packages} ; do
+		pushd "${PORTDIR}/${cp}" > /dev/null
+
+		git add .
+		pkgcommit -sS . -m "${DESTINATIONVERSION} version bump"
+
+		popd > /dev/null
+	done
+fi

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Sturmlechner]

commit:     f4a5563c2bcc5b9cfa1f18d17e62bcca843320f0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  1 10:00:00 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jun  1 10:00:00 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f4a5563c

Documentation: regenerate-files: Update Releases

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 Documentation/maintainers/regenerate-files | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index e495645a5c..895bf86fb3 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -9,11 +9,11 @@ cd "$(dirname $0)"
 SCRIPT=$(basename $0)
 HEADER="# Autogenerated by ${SCRIPT}, DO NOT EDIT."
 
-KF_RELEASES="5.67 5.70"
-KF_RELEASE=${KF_RELEASE:-5.67}
+KF_RELEASES="5.70"
+KF_RELEASE=${KF_RELEASE:-5.70}
 
-PLASMA_RELEASES="5.17 5.18 5.19"
-PLASMA_RELEASE=${PLASMA_RELEASE:-5.17}
+PLASMA_RELEASES="5.18 5.19"
+PLASMA_RELEASE=${PLASMA_RELEASE:-5.18}
 
 SERVICE_RELEASES="19.12 20.04"
 SERVICE_RELEASE=${SERVICE_RELEASE:-19.12}

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Sturmlechner]

commit:     c3d4a3e764061ebbf9d8bab2c3e54444f00e8c40
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 19 00:41:59 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 19 00:41:59 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c3d4a3e7

Documentation: regenerate-files: Drop KDE Applications support

Replaced by Release Service.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 Documentation/maintainers/regenerate-files | 67 ++----------------------------
 1 file changed, 4 insertions(+), 63 deletions(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index 73da6f241a..2bde4b5694 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -15,11 +15,8 @@ KF_RELEASE=${KF_RELEASE:-5.67}
 PLASMA_RELEASES="5.17 5.18"
 PLASMA_RELEASE=${PLASMA_RELEASE:-5.17}
 
-APPS_RELEASES="19.08"
-APPS_RELEASE=${APPS_RELEASE:-19.08}
-
 SERVICE_RELEASES="19.12 20.04"
-# SERVICE_RELEASE=${SERVICE_RELEASE:-19.12}
+SERVICE_RELEASE=${SERVICE_RELEASE:-19.12}
 
 # regenerate keywords
 pushd ../package.accept_keywords/ > /dev/null
@@ -37,13 +34,6 @@ for release in $PLASMA_RELEASES; do
 	fi
 done
 
-for release in $APPS_RELEASES; do
-	echo -e "${HEADER}" > "kde-applications-${release}.keywords"
-	if [[ -d ".kde-applications-${release}" ]]; then
-		cat ".kde-applications-${release}/"* | sed -e '/^~.*[.-]9999$/s/$/ **/' -e '/^@/d' >> "kde-applications-${release}.keywords"
-	fi
-done
-
 for release in $SERVICE_RELEASES; do
 	echo -e "${HEADER}" > "kde-release-service-${release}.keywords"
 	if [[ -d ".kde-release-service-${release}" ]]; then
@@ -51,21 +41,6 @@ for release in $SERVICE_RELEASES; do
 	fi
 done
 
-# ... and for completely unkeyworded packages, add "**"
-for release in $APP_RELEASES; do
-	if [[ -d ".kde-applications-${release}" ]]; then
-		rm -rf ".kde-applications-${release}.49.9999"
-		mkdir -p ".kde-applications-${release}.49.9999"
-		echo -e "${HEADER}" > "kde-applications-${release}.49.9999.keywords"
-		for file in ".kde-applications-${release}"/*; do
-			newfile=".kde-applications-${release}.49.9999"/$(basename "${file}")
-			sed "/^<kde-apps\/.*\.50$/{s/\.50/.49.9999/;s/^</~/};/^~.*[.-]9999$/s/$/ **/" "${file}" > "${newfile}"
-			# echo "${newfile}"
-		done
-		cat ".kde-applications-${release}.49.9999"/* >> "kde-applications-${release}.49.9999.keywords"
-	fi
-done
-
 # ... and for completely unkeyworded packages, add "**"
 for release in $SERVICE_RELEASES; do
 	if [[ -d ".kde-release-service-${release}" ]]; then
@@ -103,17 +78,6 @@ if [[ -d .kde-plasma-live.base ]]; then
 	cat .kde-plasma-live/* >> kde-plasma-live.keywords
 fi
 
-if [[ -d .kde-applications-live.base ]]; then
-	rm -rf .kde-applications-live
-	mkdir -p .kde-applications-live
-	echo -e "${HEADER}" > kde-applications-live.keywords
-	for file in .kde-applications-live.base/*; do
-		newfile=.kde-applications-live/$(basename "${file}")
-		sed -e '/^~.*[.-]9999$/s/$/ **/' -e '/^@/d' "${file}" > "${newfile}"
-	done
-	cat .kde-applications-live/* >> kde-applications-live.keywords
-fi
-
 if [[ -d .kde-release-service-live.base ]]; then
 	rm -rf .kde-release-service-live
 	mkdir -p .kde-release-service-live
@@ -150,14 +114,6 @@ for release in $PLASMA_RELEASES live; do
 	fi
 done
 
-for release in $APPS_RELEASES live; do
-	echo -e "${HEADER}" > "kde-applications-${release}"
-	if [[ -d ".kde-applications-${release}" ]]; then
-		cat ".kde-applications-${release}/"* >> "kde-applications-${release}"
-		sed -i "kde-applications-${release}" -e "/^@/d"
-	fi
-done
-
 for release in $SERVICE_RELEASES live; do
 	echo -e "${HEADER}" > "kde-release-service-${release}"
 	if [[ -d ".kde-release-service-${release}" ]]; then
@@ -185,14 +141,6 @@ for release in $PLASMA_RELEASES live; do
 	fi
 done
 
-for release in $APPS_RELEASES live; do
-	echo -e "${HEADER}" > "kde-applications-${release}"
-	if [[ -d "../package.unmask/.kde-applications-${release}" ]]; then
-		cat "../package.unmask/.kde-applications-${release}/"* >> "kde-applications-${release}"
-		sed -i "kde-applications-${release}" -e "/^<kde-applications\/.*-14\..\.50:5$/{s/-14\..\.50/-${release}/;s/^</>=/}" -e '/^@/d'
-	fi
-done
-
 for release in $SERVICE_RELEASES live; do
 	echo -e "${HEADER}" > "kde-release-service-${release}"
 	if [[ -d "../package.unmask/.kde-release-service-${release}" ]]; then
@@ -216,18 +164,11 @@ for set in *plasma-${PLASMA_RELEASE}; do
 	sed -r "/@/s/-${PLASMA_RELEASE}//g;/9999$/s/~//;s/<//;\@kde-plasma/@s/-(9999|${PLASMA_RELEASE}\.50)//" "${set}" >> "${newfile}"
 done
 
-for set in *-${APPS_RELEASE}; do
-	newfile=${set/%-${APPS_RELEASE}}
+for set in *-${SERVICE_RELEASE}; do
+	newfile=${set/%-${SERVICE_RELEASE}}
 	echo -e "${HEADER}" > "${newfile}"
-	# TODO bring back slots when KDE Application is fully migrated
-	sed -r "/@/s/-${APPS_RELEASE}//g;/9999$/s/~//;s/<//;\@kde-apps/@s/-(9999|${APPS_RELEASE}\.50)//" "${set}" >> "${newfile}"
+	sed -r "/@/s/-${SERVICE_RELEASE}//g;/9999$/s/~//;s/<//;\@[a-z-]+/@s/-(9999|${SERVICE_RELEASE}\.50)/:5/" "${set}" >> "${newfile}"
 done
-
-# for set in *-${SERVICE_RELEASE}; do
-# 	newfile=${set/%-${SERVICE_RELEASE}}
-# 	echo -e "${HEADER}" > "${newfile}"
-# 	sed -r "/@/s/-${SERVICE_RELEASE}//g;/9999$/s/~//;s/<//;\@[a-z-]+/@s/-(9999|${SERVICE_RELEASE}\.50)/:5/" "${set}" >> "${newfile}"
-# done
 popd > /dev/null
 
 # regenerate CONTRIBUTORS file

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Sturmlechner]

commit:     e82315ea44184ebdcbfa07c8f9d12e053b136ada
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 15 20:33:10 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 15 22:26:50 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e82315ea

Documentation: regenerate-files: Add Release Service support

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 Documentation/maintainers/regenerate-files | 58 ++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index 3adb6a7dfb..78b7fd9858 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -18,6 +18,9 @@ PLASMA_RELEASE=${PLASMA_RELEASE:-5.17}
 APPS_RELEASES="19.08 19.12"
 APPS_RELEASE=${APPS_RELEASE:-19.08}
 
+SERVICE_RELEASES="20.04"
+# SERVICE_RELEASE=${SERVICE_RELEASE:-20.04}
+
 # regenerate keywords
 pushd ../package.accept_keywords/ > /dev/null
 for release in $KF_RELEASES; do
@@ -41,6 +44,13 @@ for release in $APPS_RELEASES; do
 	fi
 done
 
+for release in $SERVICE_RELEASES; do
+	echo -e "${HEADER}" > "kde-release-service-${release}.keywords"
+	if [[ -d ".kde-release-service-${release}" ]]; then
+		cat ".kde-release-service-${release}/"* | sed -e '/^~.*[.-]9999$/s/$/ **/' -e '/^@/d' >> "kde-release-service-${release}.keywords"
+	fi
+done
+
 # ... and for completely unkeyworded packages, add "**"
 for release in $APP_RELEASES; do
 	if [[ -d ".kde-applications-${release}" ]]; then
@@ -56,6 +66,21 @@ for release in $APP_RELEASES; do
 	fi
 done
 
+# ... and for completely unkeyworded packages, add "**"
+for release in $SERVICE_RELEASES; do
+	if [[ -d ".kde-release-service-${release}" ]]; then
+		rm -rf ".kde-release-service-${release}.49.9999"
+		mkdir -p ".kde-release-service-${release}.49.9999"
+		echo -e "${HEADER}" > "kde-release-service-${release}.49.9999.keywords"
+		for file in ".kde-release-service-${release}"/*; do
+			newfile=".kde-release-service-${release}.49.9999"/$(basename "${file}")
+			sed -e "/^<[a-z-]*\/.*\.50$/{s/\.50/.49.9999/;s/^</~/};/^~.*[.-]9999$/s/$/ **/" -e "/^@/d" "${file}" > "${newfile}"
+			# echo "${newfile}"
+		done
+		cat ".kde-release-service-${release}.49.9999"/* >> "kde-release-service-${release}.49.9999.keywords"
+	fi
+done
+
 if [[ -d .kde-frameworks-live.base ]]; then
 	rm -rf .kde-frameworks-live
 	mkdir -p .kde-frameworks-live
@@ -89,6 +114,17 @@ if [[ -d .kde-applications-live.base ]]; then
 	cat .kde-applications-live/* >> kde-applications-live.keywords
 fi
 
+if [[ -d .kde-release-service-live.base ]]; then
+	rm -rf .kde-release-service-live
+	mkdir -p .kde-release-service-live
+	echo -e "${HEADER}" > kde-release-service-live.keywords
+	for file in .kde-release-service-live.base/*; do
+		newfile=.kde-release-service-live/$(basename "${file}")
+		sed -e '/^~.*[.-]9999$/s/$/ **/' -e '/^@/d' "${file}" > "${newfile}"
+	done
+	cat .kde-release-service-live/* >> kde-release-service-live.keywords
+fi
+
 # keywords for miscleanous packages from package.unmask/
 for misc in kde-extras-live; do
 	if [[ -f "../package.unmask/${misc}" ]]; then
@@ -121,6 +157,14 @@ for release in $APPS_RELEASES live; do
 		sed -i "kde-applications-${release}" -e "/^@/d"
 	fi
 done
+
+for release in $SERVICE_RELEASES live; do
+	echo -e "${HEADER}" > "kde-release-service-${release}"
+	if [[ -d ".kde-release-service-${release}" ]]; then
+		cat ".kde-release-service-${release}/"* >> "kde-release-service-${release}"
+		sed -i "kde-release-service-${release}" -e "/^@/d"
+	fi
+done
 popd > /dev/null
 
 # regenerate mask entries (base for package mask)
@@ -148,6 +192,14 @@ for release in $APPS_RELEASES live; do
 		sed -i "kde-applications-${release}" -e "/^<kde-applications\/.*-14\..\.50:5$/{s/-14\..\.50/-${release}/;s/^</>=/}" -e '/^@/d'
 	fi
 done
+
+for release in $SERVICE_RELEASES live; do
+	echo -e "${HEADER}" > "kde-release-service-${release}"
+	if [[ -d "../package.unmask/.kde-release-service-${release}" ]]; then
+		cat "../package.unmask/.kde-release-service-${release}/"* >> "kde-release-service-${release}"
+		sed -i "kde-release-service-${release}" -e "/^<kde-release-service\/.*-14\..\.50:5$/{s/-14\..\.50/-${release}/;s/^</>=/}" -e '/^@/d'
+	fi
+done
 popd > /dev/null
 
 # regenerate unversioned sets
@@ -170,6 +222,12 @@ for set in *-${APPS_RELEASE}; do
 	# TODO bring back slots when KDE Application is fully migrated
 	sed -r "/@/s/-${APPS_RELEASE}//g;/9999$/s/~//;s/<//;\@kde-apps/@s/-(9999|${APPS_RELEASE}\.50)//" "${set}" >> "${newfile}"
 done
+
+# for set in *-${SERVICE_RELEASE}; do
+# 	newfile=${set/%-${SERVICE_RELEASE}}
+# 	echo -e "${HEADER}" > "${newfile}"
+# 	sed -r "/@/s/-${SERVICE_RELEASE}//g;/9999$/s/~//;s/<//;\@[a-z-]+/@s/-(9999|${SERVICE_RELEASE}\.50)/:5/" "${set}" >> "${newfile}"
+# done
 popd > /dev/null
 
 # regenerate CONTRIBUTORS file

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Sturmlechner]

commit:     c667ebf850d5bb8b9a093c74f105fcbf237762a5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 23 20:51:04 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 23 20:51:26 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c667ebf8

Documentation: Set PLASMA_RELEASE to 5.17

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 Documentation/maintainers/regenerate-files | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index 8791fa753d..94fd82553f 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -13,7 +13,7 @@ KF_RELEASES="5.64 5.65"
 KF_RELEASE=${KF_RELEASE:-5.64}
 
 PLASMA_RELEASES="5.16 5.17"
-PLASMA_RELEASE=${PLASMA_RELEASE:-5.16}
+PLASMA_RELEASE=${PLASMA_RELEASE:-5.17}
 
 APPS_RELEASES="19.08 19.12"
 APPS_RELEASE=${APPS_RELEASE:-19.08}

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Sturmlechner]

commit:     f70f58609d74b019e7cb65866b672d025d3e41d1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  8 01:01:44 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec  8 01:02:38 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f70f5860

Documentation: Update regenerate-files KF_RELEASE, APPS_RELEASE

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 Documentation/maintainers/regenerate-files | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index a8ef0306ac..c6d6164380 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -9,14 +9,14 @@ cd "$(dirname $0)"
 SCRIPT=$(basename $0)
 HEADER="# Autogenerated by ${SCRIPT}, DO NOT EDIT."
 
-KF_RELEASES="5.60 5.64"
-KF_RELEASE=${KF_RELEASE:-5.60}
+KF_RELEASES="5.64"
+KF_RELEASE=${KF_RELEASE:-5.64}
 
 PLASMA_RELEASES="5.16 5.17"
 PLASMA_RELEASE=${PLASMA_RELEASE:-5.16}
 
-APPS_RELEASES="19.04 19.08 19.12"
-APPS_RELEASE=${APPS_RELEASE:-19.04}
+APPS_RELEASES="19.08 19.12"
+APPS_RELEASE=${APPS_RELEASE:-19.08}
 
 # regenerate keywords
 pushd ../package.accept_keywords/ > /dev/null

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Sturmlechner]

commit:     f0b9b7c046c4b681353bacfeed8b943680892468
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 17 18:11:55 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Oct 17 18:11:55 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f0b9b7c0

Documentation: Switch PLASMA_RELEASE to 5.13

 Documentation/maintainers/regenerate-files | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index 07cda522bd..ea6c0b86d0 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -13,7 +13,7 @@ KF_RELEASES="5.50 5.51"
 KF_RELEASE=${KF_RELEASE:-5.50}
 
 PLASMA_RELEASES="5.12 5.13 5.14"
-PLASMA_RELEASE=${PLASMA_RELEASE:-5.12}
+PLASMA_RELEASE=${PLASMA_RELEASE:-5.13}
 
 APPS_RELEASES="18.04 18.08"
 APPS_RELEASE=${APPS_RELEASE:-18.04}

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Sturmlechner]

commit:     17f9913a21659f4f6172d04c8f489057ddef6e3b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 22 19:13:43 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 22 19:13:43 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=17f9913a

Documentation: Fix copyright

Follup-up to commit d057ce3c3a19c2416761f395eb726e76f2f7f7fb

 Documentation/maintainers/cmake_dep_check.py    | 2 +-
 Documentation/maintainers/cmake_ebuild_check.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/maintainers/cmake_dep_check.py b/Documentation/maintainers/cmake_dep_check.py
index 6eb3437159..960b052d86 100755
--- a/Documentation/maintainers/cmake_dep_check.py
+++ b/Documentation/maintainers/cmake_dep_check.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) 2018 Michael Palimaka <kensington@gentoo.org>
+# Copyright (c) 2017-2018 Michael Palimaka <kensington@gentoo.org>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

diff --git a/Documentation/maintainers/cmake_ebuild_check.py b/Documentation/maintainers/cmake_ebuild_check.py
index e4cd8f541c..9ee4da0b43 100755
--- a/Documentation/maintainers/cmake_ebuild_check.py
+++ b/Documentation/maintainers/cmake_ebuild_check.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) 2018 Michael Palimaka <kensington@gentoo.org>
+# Copyright (c) 2017-2018 Michael Palimaka <kensington@gentoo.org>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Sturmlechner]

commit:     cb90c0b4f2b13fe8d5dab2493ff688bc2f4f1054
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 31 19:36:25 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb  6 01:28:24 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=cb90c0b4

Documentation: Update cmake_dep_check.py w/ kholidays and purpose

 Documentation/maintainers/cmake_dep_check.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Documentation/maintainers/cmake_dep_check.py b/Documentation/maintainers/cmake_dep_check.py
index 516ae36059..6eb3437159 100755
--- a/Documentation/maintainers/cmake_dep_check.py
+++ b/Documentation/maintainers/cmake_dep_check.py
@@ -70,7 +70,7 @@ PACKAGE_MAP = {
 	'KDb': 'dev-db/kdb',
 	'KDecoration2': 'kde-plasma/kdecoration',
 	'KDED': 'kde-frameworks/kded',
-	'KDEExperimentalPurpose': 'dev-libs/purpose',
+	'KDEExperimentalPurpose': 'kde-frameworks/purpose',
 	'KF5Akonadi': 'kde-apps/akonadi',
 	'KF5AkonadiMime': 'kde-apps/akonadi-mime',
 	'KF5Attica': 'kde-frameworks/attica',
@@ -105,7 +105,7 @@ PACKAGE_MAP = {
 	'KF5GlobalAccel': 'kde-frameworks/kglobalaccel',
 	'KF5GuiAddons': 'kde-frameworks/kguiaddons',
 	'KF5KHtml': 'kde-frameworks/khtml',
-	'KF5Holidays': 'kde-apps/kholidays',
+	'KF5Holidays': 'kde-frameworks/kholidays',
 	'KF5I18n': 'kde-frameworks/ki18n',
 	'KF5IconThemes': 'kde-frameworks/kiconthemes',
 	'KF5IdleTime': 'kde-frameworks/kidletime',
@@ -132,6 +132,7 @@ PACKAGE_MAP = {
 	'KF5Plotting': 'kde-frameworks/kplotting',
 	'KF5Prison': 'kde-frameworks/prison',
 	'KF5Pty': 'kde-frameworks/kpty',
+	'KF5Purpose': 'kde-frameworks/purpose',
 	'KF5Kross': 'kde-frameworks/kross',
 	'KF5Runner': 'kde-frameworks/krunner',
 	'KF5Service': 'kde-frameworks/kservice',

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Michael Palimaka]

commit:     625e074aaefea951864d94a2150278af0677b5e0
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 28 13:25:14 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Dec 28 13:43:34 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=625e074a

Documentation: be more pythonic

 .../maintainers/{cmake-dep-check.py => cmake_dep_check.py}       | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Documentation/maintainers/cmake-dep-check.py b/Documentation/maintainers/cmake_dep_check.py
similarity index 99%
rename from Documentation/maintainers/cmake-dep-check.py
rename to Documentation/maintainers/cmake_dep_check.py
index 09ba701756..074c06e8be 100755
--- a/Documentation/maintainers/cmake-dep-check.py
+++ b/Documentation/maintainers/cmake_dep_check.py
@@ -324,8 +324,8 @@ def getMapping(package):
 		return 'ERROR: could not find a mapping for ' + package
 
 
-def main():
-	cmakeFiles = findCmakeFiles('.')
+def getDeps(path):
+	cmakeFiles = findCmakeFiles(path)
 
 	mappings = {}
 	for file in cmakeFiles:
@@ -338,6 +338,11 @@ def main():
 					mappings[file].append(getMapping(package[0] + component))
 			else:
 				mappings[file].append(getMapping(package[0]))
+
+	return mappings
+
+def main():
+	mappings = getDeps('.')
 	for key, value in mappings.items():
 		if len(value) >= 1:
 			for package in sorted(set(value)):

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Michael Palimaka]

commit:     a050ce84b3cf99236a8d452c4688d5d5b69bc1ea
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 28 13:42:59 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Dec 28 13:43:38 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a050ce84

Documentation: add script to compare CMakeLists and ebuild dependencies

 Documentation/maintainers/cmake_ebuild_check.py | 146 ++++++++++++++++++++++++
 1 file changed, 146 insertions(+)

diff --git a/Documentation/maintainers/cmake_ebuild_check.py b/Documentation/maintainers/cmake_ebuild_check.py
new file mode 100755
index 0000000000..27786cf4cb
--- /dev/null
+++ b/Documentation/maintainers/cmake_ebuild_check.py
@@ -0,0 +1,146 @@
+#!/usr/bin/env python3
+#
+# Copyright (c) 2017 Michael Palimaka <kensington@gentoo.org>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+import argparse
+import os
+import sys
+import subprocess
+import cmake_dep_check as cdc
+import portage
+
+
+def qatom(atom):
+	output = subprocess.check_output(['qatom', '--format', '%{CATEGORY}|%{PN}|%{PV}|%[PR]|%[SLOT]|%[pfx]|%[sfx]', atom])
+	return output.decode('utf-8').split('|')
+
+
+def get_cmake_deps(ebuild, repo):
+	cpv = qatom(ebuild)
+	settings = portage.config(config_root='/')
+
+	tmpdir = os.path.join(settings.get('PORTAGE_TMPDIR'), 'portage')
+	tmp_path = os.path.join(tmpdir, cpv[0], cpv[1] + '-' + cpv[2])
+	repo_path = portage.db['/']["vartree"].settings.repositories.treemap.get(repo)
+	ebuild_path = os.path.join(repo_path, cpv[0], cpv[1], cpv[1] + '-' + cpv[2] + '.ebuild')
+
+	subprocess.call(['ebuild', ebuild_path, 'clean', 'prepare'], stdout=subprocess.DEVNULL)
+
+	deps = cdc.getDeps(os.path.join(tmp_path))
+
+	subprocess.call(['ebuild', ebuild_path, 'clean'])
+
+	return deps
+
+
+def get_ebuild_deps(ebuild):
+	porttree = portage.db[portage.root]['porttree']
+	depstr = porttree.dbapi.aux_get(ebuild, ['DEPEND', 'RDEPEND', 'PDEPEND'])
+
+	depend = portage.dep.use_reduce(depstr[0], matchall=True, flat=True)
+	rdepend = portage.dep.use_reduce(depstr[1], matchall=True, flat=True)
+	pdepend = portage.dep.use_reduce(depstr[2], matchall=True, flat=True)
+
+	all_depend = set(depend + rdepend + pdepend)
+
+	return(all_depend)
+
+
+def get_ebuild_repo(ebuild):
+	porttree = portage.db[portage.root]['porttree']
+	repo = porttree.dbapi.aux_get(ebuild, ['repository'])
+
+	return repo[0]
+
+
+def clean_dep(dep):
+	if dep.startswith('!') or dep == '||':
+		return False
+
+	parts = qatom(dep)
+	cp = parts[0] + '/' + parts[1]
+
+	return cp
+
+
+def main():
+	parser = argparse.ArgumentParser(description='Compare CMakeLists.txt and ebuild dependencies')
+	parser.add_argument('ebuild', help='app-foo/bar-1.2.3', nargs=1)
+	parser.add_argument('--possible-bogus-ebuild', dest='bogusebuild', action='store_const', const=True, help='Show dependencies that appear in CMakeLists.txt but not the ebuild')
+
+	args = parser.parse_args()
+
+	ebuild = args.ebuild[0]
+
+	ebuild_deps = get_ebuild_deps(ebuild)
+	cmake_deps = get_cmake_deps(ebuild, get_ebuild_repo(ebuild))
+
+	cmake_deps_merged = []
+
+	for cmake, deps in cmake_deps.items():
+		for dep in deps:
+			if dep.startswith('ERROR'):
+				print(dep)
+				continue
+			if len(dep) == 0:
+				continue
+			clean = clean_dep(dep)
+			if clean:
+				cmake_deps_merged.append(clean)
+
+	ebuild_deps_clean = []
+
+	for dep in ebuild_deps:
+		clean = clean_dep(dep)
+		if clean:
+			ebuild_deps_clean.append(clean)
+
+	missing_cmake = []
+	missing_ebuild = []
+
+	for dep in cmake_deps_merged:
+		if dep not in ebuild_deps_clean:
+			missing_ebuild.append(dep)
+
+	for dep in ebuild_deps_clean:
+		if dep not in cmake_deps_merged:
+			missing_cmake.append(dep)
+
+	missing_cmake = sorted(set(missing_cmake))
+	missing_ebuild = sorted(set(missing_ebuild))
+
+	if len(missing_ebuild) > 0:
+		print('DEPENDENCIES IN CMAKELISTS BUT NOT EBUILD:')
+		print('==========================================')
+		for dep in missing_ebuild:
+			print(dep)
+	else:
+		print('Did not find any dependencies in CMakeLists that do not appear in the ebuild')
+
+	if len(missing_cmake) > 0 and args.bogusebuild is True:
+		print('DEPENDENCIES IN EBUILD BUT NOT IN CMAKELISTS:')
+		print('=============================================')
+		for dep in missing_cmake:
+			print(dep)
+
+
+if __name__ == '__main__':
+	sys.exit(main())

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Michael Palimaka]

commit:     a1653a76ea0e27dc05a9b0e7c55fe6d8e813f86e
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 26 03:27:01 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Dec 26 03:27:30 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a1653a76

Documentation: add script to map find_package calls to Gentoo packages

 Documentation/maintainers/cmake-dep-check.py | 349 +++++++++++++++++++++++++++
 1 file changed, 349 insertions(+)

diff --git a/Documentation/maintainers/cmake-dep-check.py b/Documentation/maintainers/cmake-dep-check.py
new file mode 100755
index 0000000000..09ba701756
--- /dev/null
+++ b/Documentation/maintainers/cmake-dep-check.py
@@ -0,0 +1,349 @@
+#!/usr/bin/env python3
+#
+# Copyright (c) 2017 Michael Palimaka <kensington@gentoo.org>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+import os
+import sys
+
+import parse_cmake.parsing as cmp
+
+IGNORE_ARGS = ['COMPONENTS', 'CONFIG', 'MODULE', 'NO_MODULE', 'OPTIONAL_COMPONENTS', 'REQUIRED', 'QUIET']
+COMPONENT_PACKAGES = ['KF5', 'Poppler', 'Qt5', 'XCB']
+PACKAGE_MAP = {
+	'AccountsQt5': 'net-libs/accounts-qt',
+	'ACL': 'virtual/acl',
+	'Analitza5': 'kde-apps/analitza',
+	'AppStreamQt': 'dev-libs/appstream[qt5]',
+	'AvogadroLibs': 'sci-chemistry/avogadro',
+	'Boost': 'dev-libs/boost',
+	'Breeze': 'kde-plasma/breeze',
+	'Canberra': 'media-libs/libcanberra',
+	'CatDoc': 'app-text/catdoc',
+	'DBus': 'sys-apps/dbus',
+	'DBusGLib': 'dev-libs/dbus-glib',
+	'dbusmenu-qt5': 'dev-libs/libdbusmenu-qt',
+	'DDCUtil': 'app-misc/ddcutil',
+	'Doxygen': 'app-doc/doxygen',
+	'DvdRead': 'media-libs/libdvdread',
+	'ECM': 'kde-frameworks/extra-cmake-modules',
+	'EGL': 'media-libs/mesa[egl]',
+	'Eigen3': 'dev-cpp/eigen:3',
+	'epoxy': 'media-libs/libepoxy',
+	'EPub': 'app-text/ebook-tools',
+	'Exiv2': 'media-gfx/exiv2',
+	'FFmpeg': 'media-video/ffmpeg',
+	'Flac': 'media-libs/flac',
+	'Flac++': 'media-libs/flac[cxx]',
+	'Fontconfig': 'media-libs/fontconfig',
+	'FontHack': 'media-fonts/hack',
+	'FontNotoSans': 'media-fonts/noto',
+	'Freetype': 'media-libs/freetype',
+	'GIO': 'dev-libs/glib',
+	'GLEW': 'media-libs/glew:0',
+	'GLIB2': 'dev-libs/glib',
+	'GObject': 'dev-libs/glib',
+	'Gpgmepp': 'app-crypt/gpgme[cxx]',
+	'GSL': 'sci-libs/gsl',
+	'GSSAPI': 'virtual/krb5',
+	'IBus': 'app-i18n/ibus',
+	'Iconv': 'virtual/libiconv',
+	'IsoCodes': 'app-text/iso-codes',
+	'Julia': 'dev-lang/julia',
+	'KDb': 'dev-db/kdb',
+	'KDecoration2': 'kde-plasma/kdecoration',
+	'KDED': 'kde-frameworks/kded',
+	'KDEExperimentalPurpose': 'dev-libs/purpose',
+	'KF5Akonadi': 'kde-apps/akonadi',
+	'KF5AkonadiMime': 'kde-apps/akonadi-mime',
+	'KF5Attica': 'kde-frameworks/attica',
+	'KF5Baloo': 'kde-frameworks/baloo',
+	'KF5BluezQt': 'kde-frameworks/bluez-qt',
+	'KF5Cddb': 'kde-apps/libkcddb',
+	'KF5Contacts': 'kde-apps/kcontacts',
+	'KF5FrameworkIntegration': 'kde-frameworks/frameworkintegration',
+	'KF5Activities': 'kde-frameworks/kactivities',
+	'KF5ActivitiesStats': 'kde-frameworks/kactivities-stats',
+	'KF5Archive': 'kde-frameworks/karchive',
+	'KF5Auth': 'kde-frameworks/kauth',
+	'KF5Bookmarks': 'kde-frameworks/kbookmarks',
+	'KF5KCMUtils': 'kde-frameworks/kcmutils',
+	'KF5Codecs': 'kde-frameworks/kcodecs',
+	'KF5Completion': 'kde-frameworks/kcompletion',
+	'KF5Config': 'kde-frameworks/kconfig',
+	'KF5ConfigWidgets': 'kde-frameworks/kconfigwidgets',
+	'KF5CoreAddons': 'kde-frameworks/kcoreaddons',
+	'KF5Crash': 'kde-frameworks/kcrash',
+	'KF5DBusAddons': 'kde-frameworks/kdbusaddons',
+	'KF5Declarative': 'kde-frameworks/kdeclarative',
+	'KF5KDE4Support': 'kde-frameworks/kdelibs4support',
+	'KF5KDELibs4Support': 'kde-frameworks/kdelibs4support',
+	'KF5DesignerPlugin': 'kde-frameworks/kdesignerplugin',
+	'KF5Su': 'kde-frameworks/kdesu',
+	'KF5WebKit': 'kde-frameworks/kdewebkit',
+	'KF5DNSSD': 'kde-frameworks/kdnssd',
+	'KF5DocTools': 'kde-frameworks/kdoctools',
+	'KF5Emoticons': 'kde-frameworks/kemoticons',
+	'KF5FileMetaData': 'kde-frameworks/kfilemetadata',
+	'KF5GlobalAccel': 'kde-frameworks/kglobalaccel',
+	'KF5GuiAddons': 'kde-frameworks/kguiaddons',
+	'KF5KHtml': 'kde-frameworks/khtml',
+	'KF5Holidays': 'kde-apps/kholidays',
+	'KF5I18n': 'kde-frameworks/ki18n',
+	'KF5IconThemes': 'kde-frameworks/kiconthemes',
+	'KF5IdleTime': 'kde-frameworks/kidletime',
+	'KF5Init': 'kde-frameworks/kinit',
+	'KF5KDEGames': 'kde-apps/libkdegames',
+	'KF5KIO': 'kde-frameworks/kio',
+	'KF5Kirigami2': 'kde-frameworks/kirigami',
+	'KF5ItemModels': 'kde-frameworks/kitemmodels',
+	'KF5ItemViews': 'kde-frameworks/kitemviews',
+	'KF5JobWidgets': 'kde-frameworks/kjobwidgets',
+	'KF5JS': 'kde-frameworks/kjs',
+	'KF5JsEmbed': 'kde-frameworks/kjsembed',
+	'KF5MediaWiki': 'net-libs/libmediawiki',
+	'KF5Mime': 'kde-apps/kmime',
+	'KF5ModemManagerQt': 'kde-frameworks/modemmanager-qt',
+	'KF5NewStuff': 'kde-frameworks/knewstuff',
+	'KF5NewStuffCore': 'kde-frameworks/knewstuff',
+	'KF5NewStuffQuick': 'kde-frameworks/knewstuff',
+	'KF5Notifications': 'kde-frameworks/knotifications',
+	'KF5NotifyConfig': 'kde-frameworks/knotifyconfig',
+	'KF5Package': 'kde-frameworks/kpackage',
+	'KF5Parts': 'kde-frameworks/kparts',
+	'KF5People': 'kde-frameworks/kpeople',
+	'KF5Plotting': 'kde-frameworks/kplotting',
+	'KF5Prison': 'kde-frameworks/prison',
+	'KF5Pty': 'kde-frameworks/kpty',
+	'KF5Kross': 'kde-frameworks/kross',
+	'KF5Runner': 'kde-frameworks/krunner',
+	'KF5Service': 'kde-frameworks/kservice',
+	'KF5SysGuard': 'kde-plasma/libksysguard',
+	'KF5TextEditor': 'kde-frameworks/ktexteditor',
+	'KF5TextWidgets': 'kde-frameworks/ktextwidgets',
+	'KF5Torrent': 'net-libs/libktorrent',
+	'KF5UnitConversion': 'kde-frameworks/kunitconversion',
+	'KF5Wallet': 'kde-frameworks/kwallet',
+	'KF5Wayland': 'kde-frameworks/kwayland',
+	'KF5WidgetsAddons': 'kde-frameworks/kwidgetsaddons',
+	'KF5WindowSystem': 'kde-frameworks/kwindowsystem',
+	'KF5XmlGui': 'kde-frameworks/kxmlgui',
+	'KF5XmlRpcClient': 'kde-frameworks/kxmlrpcclient',
+	'KF5NetworkManagerQt': 'kde-frameworks/networkmanager-qt',
+	'KF5Plasma': 'kde-frameworks/plasma',
+	'KF5PlasmaQuick': 'kde-frameworks/plasma',
+	'KF5Screen': 'kde-plasma/libkscreen',
+	'KF5Solid': 'kde-frameworks/solid',
+	'KF5Sonnet': 'kde-frameworks/sonnet',
+	'KF5SyntaxHighlighting': 'kde-frameworks/syntax-highlighting',
+	'KF5ThreadWeaver': 'kde-frameworks/threadweaver',
+	'KPropertyCore': 'dev-libs/kproperty',
+	'KPropertyWidgets': 'dev-libs/kproperty',
+	'KReport': 'dev-libs/kreport',
+	'KScreenLocker': 'kde-plasma/kscreenlocker',
+	'KWinDBusInterface': 'kde-plasma/kwin',
+	'Lame': 'media-sound/lame',
+	'LibAccountsGlib': 'net-libs/libaccounts-glib',
+	'Libcap': 'sys-libs/libcap',
+	'Libdrm': 'x11-libs/libdrm',
+	'Libfacile': 'dev-ml/facile',
+	'LibGcrypt': 'dev-libs/libgcrypt:0=',
+	'libgps': 'sci-geosciences/gpsd',
+	'Libinput': 'dev-libs/libinput',
+	'LibKWorkspace': 'kde-plasma/plasma-workspace',
+	'LibSpectre': 'app-text/libspectre',
+	'LibTaskManager': 'kde-plasma/plasma-workspace',
+	'LibTidy': 'app-text/htmltidy',
+	'LibXml2': 'dev-libs/libxml2',
+	'LibXslt': 'dev-libs/libxslt',
+	'loginctl': '|| ( sys-auth/elogind sys-apps/systemd )',
+	'LuaJIT': 'dev-lang/luajit',
+	'Mad': 'media-libs/libmad',
+	'MobileBroadbandProviderInfo': 'net-misc/mobile-broadband-provider-info',
+	'MusicBrainz': 'media-libs/musicbrainz',
+	'MySQL': 'dev-db/mysql',
+	'NetworkManager': 'net-misc/networkmanager',
+	'OpenBabel2': 'sci-chemistry/openbabel',
+	'OpenConnect': 'net-vpn/openconnect:=',
+	'OpenGL': 'virtual/opengl',
+	'OpenSSL': 'dev-libs/openssl:0=',
+	'Phonon4Qt5': 'media-libs/phonon',
+	'PkgConfig': 'virtual/pkgconfig',
+	'Polkit': 'sys-auth/polkit',
+	'PopplerQt5': 'app-text/poppler[qt5]',
+	'PostgreSQL': 'dev-db/postgresql',
+	'PulseAudio': 'media-sound/pulseaudio',
+	'PWQuality': 'dev-libs/libpwquality',
+	'PythonInterp': 'dev-lang/python',
+	'PythonLibrary': 'dev-lang/python',
+	'PythonLibs': 'dev-lang/python',
+	'PythonLibs3': 'dev-lang/python',
+	'R': 'dev-lang/R',
+	'Ruby': 'dev-lang/ruby',
+	'SharedMimeInfo': 'x11-misc/shared-mime-info',
+	'Samplerate': 'media-libs/libsamplerate',
+	'SCIM': 'app-i18n/scim',
+	'ScreenSaverDBusInterface': 'kde-plasma/kscreenlocker',
+	'Seccomp': 'sys-libs/libseccomp',
+	'SignOnQt5': 'net-libs/signond',
+	'Sndfile': 'media-libs/libsndfile',
+	'Synaptics': 'x11-drivers/xf86-input-synaptics',
+	'Taglib': 'media-libs/taglib',
+	'TelepathyGlib': 'net-libs/telepathy-glib',
+	'TelepathyLogger': 'net-im/telepathy-logger',
+	'TelepathyQt5': 'net-libs/telepathy-qt',
+	'Threads': '',
+	'Qalculate': 'sci-libs/libqalculate',
+	'Qca-qt5': 'app-crypt/qca[qt5]',
+	'Qt5Bluetooth': 'dev-qt/qtbluetooth',
+	'Qt5Concurrent': 'dev-qt/qtconcurrent',
+	'Qt5Core': 'dev-qt/qtcore',
+	'Qt5DBus': 'dev-qt/qtdbus',
+	'Qt5Designer': 'dev-qt/designer',
+	'Qt5GStreamer': 'media-libs/qt-gstreamer',
+	'Qt5Gui': 'dev-qt/qtgui',
+	'Qt5Help': 'dev-qt/qthelp',
+	'Qt5LinguistTools': 'dev-qt/linguist-tools',
+	'Qt5Location': 'dev-qt/qtlocation',
+	'Qt5Multimedia': 'dev-qt/qtmultimedia',
+	'Qt5MultimediaWidgets': 'dev-qt/qtmultimedia',
+	'Qt5Network': 'dev-qt/qtnetwork',
+	'Qt5OpenGL': 'dev-qt/qtopengl',
+	'Qt5OpenGLExtensions': 'dev-qt/qtgui',
+	'Qt5Positioning': 'dev-qt/qtpositioning',
+	'Qt5PrintSupport': 'dev-qt/qtprintsupport',
+	'Qt5Qml': 'dev-qt/qtdeclarative',
+	'Qt5QuickControls2': 'dev-qt/qtquickcontrols2',
+	'Qt5QuickControls': 'dev-qt/qtquickcontrols',
+	'Qt5Quick': 'dev-qt/qtdeclarative',
+	'Qt5QuickTest': 'dev-qt/qtdeclarative',
+	'Qt5QuickWidgets': 'dev-qt/qtdeclarative',
+	'Qt5Script': 'dev-qt/qtscript',
+	'Qt5ScriptTools': 'dev-qt/qtscript',
+	'Qt5Scxml': 'dev-qt/qtscxml',
+	'Qt5Sensors': 'dev-qt/qtsensors',
+	'Qt5SerialPort': 'dev-qt/qtserialport',
+	'Qt5Sql': 'dev-qt/qtsql',
+	'Qt5Svg': 'dev-qt/qtsvg',
+	'Qt5Test': 'dev-qt/qttest',
+	'Qt5TextToSpeech': 'dev-qt/qtspeech',
+	'Qt5UiPlugin': 'dev-qt/designer',
+	'Qt5UiTools': 'dev-qt/designer',
+	'Qt5WaylandClient': 'dev-qt/qtwayland',
+	'Qt5WaylandCompositor': 'dev-qt/qtwayland',
+	'Qt5WebChannel': 'dev-qt/qtwebchannel',
+	'Qt5WebEngineCore': 'dev-qt/qtwebengine',
+	'Qt5WebEngine': 'dev-qt/qtwebengine',
+	'Qt5WebEngineWidgets': 'dev-qt/qtwebengine',
+	'Qt5WebKit': 'dev-qt/qtwebkit',
+	'Qt5WebKitWidgets': 'dev-qt/qtwebkit',
+	'Qt5WebSockets': 'dev-qt/qtwebsockets',
+	'Qt5WebView': 'dev-qt/qtwebview',
+	'Qt5Widgets': 'dev-qt/qtwidgets',
+	'Qt5X11Extras': 'dev-qt/qtx11extras',
+	'Qt5Xml': 'dev-qt/qtxml',
+	'Qt5XmlPatterns': 'dev-qt/qtxmlpatterns',
+	'UDev': 'virtual/udev',
+	'Wayland': 'dev-libs/wayland',
+	'WaylandScanner': 'dev-libs/wayland',
+	'X11': 'x11-libs/libX11',
+	'Xattr': 'sys-apps/attr',
+	'XCBCOMPOSITE': 'x11-libs/libxcb',
+	'XCBDAMAGE': 'x11-libs/libxcb',
+	'XCBDPMS': 'x11-libs/libxcb',
+	'XCBIMAGE': 'x11-libs/xcb-util-image',
+	'XCBKEYSYMS': 'x11-libs/xcb-util-keysyms',
+	'XCBMODULE': 'x11-libs/libxcb',
+	'XCBRANDR': 'x11-libs/libxcb',
+	'XCBRENDER': 'x11-libs/libxcb',
+	'XCBSHAPE': 'x11-libs/libxcb',
+	'XCBSHM': 'x11-libs/libxcb',
+	'XCBUTIL': 'x11-libs/xcb-util',
+	'XCBXCB': 'x11-libs/libxcb',
+	'XCBXFIXES': 'x11-libs/libxcb',
+	'XCBXTEST': 'x11-libs/libxcb',
+	'ZLIB': 'sys-libs/zlib',
+}
+
+
+def findCmakeFiles(path):
+	cmakeFiles = []
+	for root, dirs, files in os.walk(path):
+		for file in files:
+			if file == 'CMakeLists.txt':
+				cmakeFiles.append(os.path.join(root, file))
+
+	return cmakeFiles
+
+
+def parseCmakeFile(file):
+	with open(file) as f:
+		contents = f.read()
+
+	parsed = cmp.parse(contents)
+
+	packages = []
+
+	for x in parsed:
+		if x.__class__.__name__ == 'Command' and x.name == 'find_package':
+			package = []
+			for arg in x.body:
+				if arg.contents in IGNORE_ARGS or arg.contents.startswith('$') or arg.contents[0].isdigit():
+					continue
+				package.append(arg.contents)
+
+			packages.append(package)
+
+	return packages
+
+
+def getMapping(package):
+	if package in PACKAGE_MAP:
+		if len(PACKAGE_MAP[package]) >= 1:
+			return PACKAGE_MAP[package]
+		else:
+			return ''
+	else:
+		return 'ERROR: could not find a mapping for ' + package
+
+
+def main():
+	cmakeFiles = findCmakeFiles('.')
+
+	mappings = {}
+	for file in cmakeFiles:
+		find_packages = parseCmakeFile(file)
+		mappings[file] = []
+
+		for package in find_packages:
+			if package[0] in COMPONENT_PACKAGES:
+				for component in package[1:]:
+					mappings[file].append(getMapping(package[0] + component))
+			else:
+				mappings[file].append(getMapping(package[0]))
+	for key, value in mappings.items():
+		if len(value) >= 1:
+			for package in sorted(set(value)):
+				if package:
+					print('	' + package)
+
+
+if __name__ == '__main__':
+	sys.exit(main())

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Sturmlechner]

commit:     35ab9dcc073a74dad43fb2bb8fe824c054adc4e8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 14 18:52:12 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Aug 14 18:54:55 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=35ab9dcc

Documentation: regenerate-files: Fix sets/kde-plasma generation

 Documentation/maintainers/regenerate-files | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index 3180f968c8..dac8015b40 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -161,7 +161,7 @@ done
 for set in *plasma-${PLASMA_RELEASE}; do
 	newfile=${set/%-${PLASMA_RELEASE}}
 	echo -e "${HEADER}" > "${newfile}"
-	sed -r "/@/s/-${PLASMA_RELEASE}//g;/9999$/s/~//;s/<//;\@kde-plasma/@s/-(9999|5\..\.50)//" "${set}" >> "${newfile}"
+	sed -r "/@/s/-${PLASMA_RELEASE}//g;/9999$/s/~//;s/<//;\@kde-plasma/@s/-(9999|${PLASMA_RELEASE}\.50)//" "${set}" >> "${newfile}"
 done
 
 for set in *-${APPS_RELEASE}; do

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Johannes Huber]

commit:     90916265d03648d05c9a7d29862c528ae4f7b127
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 14 19:36:27 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jun 14 19:36:27 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=90916265

Documentation: Reduce minimal keywords

 Documentation/maintainers/bump_new_revision.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/maintainers/bump_new_revision.sh b/Documentation/maintainers/bump_new_revision.sh
index dee70c6e67..08e0e3cc9e 100755
--- a/Documentation/maintainers/bump_new_revision.sh
+++ b/Documentation/maintainers/bump_new_revision.sh
@@ -100,7 +100,7 @@ check_cmakelists() {
 # - for live ebuilds - don't use any keywords
 # - in either of the first two cases, drop arch to testing
 update_keywords() {
-	local MINIMAL_KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" KEYWORDS
+	local MINIMAL_KEYWORDS="~amd64 ~x86" KEYWORDS
 	# Initially strip all keywords
 	ekeyword ^all ${1} > /dev/null
 	if [[ ${BUMP_VERSION} =~ ([4-9]+)\.?([0-9]*)\.?([0-9]*) ]]; then

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Sturmlechner]

commit:     a33bbce33dcced5af33f5626e3eb8711e0d7a013
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed May 24 20:36:35 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May 24 20:36:35 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a33bbce3

Documentation: Update regenerate-files

 Documentation/maintainers/regenerate-files | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index 3bcff69746..254eea1274 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -9,7 +9,7 @@ cd "$(dirname $0)"
 SCRIPT=$(basename $0)
 HEADER="# Autogenerated by ${SCRIPT}, DO NOT EDIT."
 
-KF_RELEASES="5.29 5.33 5.34"
+KF_RELEASES="5.29 5.34"
 KF_RELEASE=${KF_RELEASE:-5.29}
 
 PLASMA_RELEASES="5.8 5.9 5.10"

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Johannes Huber]

commit:     a81ded81bad0b16d80d10df0146269553ca43b9c
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  4 19:56:43 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Dec  4 19:56:43 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a81ded81

Documentation: Add KDE Frameworks 5.28 to regenerate

 Documentation/maintainers/regenerate-files | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index 05d7e88..e1c31e8 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -9,7 +9,7 @@ cd "$(dirname $0)"
 SCRIPT=$(basename $0)
 HEADER="# Autogenerated by ${SCRIPT}, DO NOT EDIT."
 
-KF_RELEASES="5.26"
+KF_RELEASES="5.26 5.28"
 KF_RELEASE=${KF_RELEASE:-5.26}
 
 PLASMA_RELEASES="5.7 5.8"

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Michael Palimaka]

commit:     8c85629e0501e1c451a8f8981c9a84e705b0b735
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Nov 12 22:30:50 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Nov 12 23:29:54 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=8c85629e

Documentation: bump-from-set.sh: Trace sets recursively

 Documentation/maintainers/bump-from-set.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Documentation/maintainers/bump-from-set.sh b/Documentation/maintainers/bump-from-set.sh
index 199af2a..f109233 100755
--- a/Documentation/maintainers/bump-from-set.sh
+++ b/Documentation/maintainers/bump-from-set.sh
@@ -10,6 +10,10 @@ get_package_list_from_set() {
 	for entry in $(grep -v ^[#@] "${PORTDIR}/sets/${set}") ; do
 		echo $(qatom ${entry} | cut -d " " -f 1-2 | tr " " "/")
 	done
+
+	for entry in $(grep ^@ "${PORTDIR}/sets/${set}") ; do
+		get_package_list_from_set ${entry/@/}
+	done
 }
 
 get_main_tree_keyword() {

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Michael Palimaka]

commit:     3fa086f713544d1ae9dc601548e308f51da5d1a2
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 31 19:47:47 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jul 31 19:48:01 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3fa086f7

Documentation: remove @set atoms from package.unmask files

 Documentation/maintainers/regenerate-files | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index 8096334..8d36956 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -118,6 +118,7 @@ for release in $APPS_RELEASES live; do
 	echo -e "${HEADER}" > "kde-applications-${release}"
 	if [[ -d ".kde-applications-${release}" ]]; then
 		cat ".kde-applications-${release}/"* >> "kde-applications-${release}"
+		sed -i "kde-applications-${release}" -e "/^@/d"
 	fi
 done
 popd > /dev/null

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Johannes Huber]

commit:     c61f2dd66393d5bd1dc86eb8ec286a3b0a499944
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 23 10:15:34 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Jul 23 10:15:34 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c61f2dd6

Documentation: Fix bump-from-set KEYWORDS generation

If package doesn't exist in gentoo main tree use minimal ~amd64 ~x86
KEYWORDS. Otherwise KEYWORDS are empty.

 Documentation/maintainers/bump-from-set.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Documentation/maintainers/bump-from-set.sh b/Documentation/maintainers/bump-from-set.sh
index ff32141..199af2a 100755
--- a/Documentation/maintainers/bump-from-set.sh
+++ b/Documentation/maintainers/bump-from-set.sh
@@ -15,8 +15,11 @@ get_package_list_from_set() {
 get_main_tree_keyword() {
 	local portdir="$(portageq get_repo_path / gentoo)"
 	local cp="${1}"
-
-	echo $(sed -ne 's/^KEYWORDS="\(.*\)"/\1/p' "$(ls ${portdir}/${cp}/*.ebuild | sort | tail -n 1)")
+	if [[ -e ${portdir}/${cp} ]] ; then
+		echo $(sed -ne 's/^KEYWORDS="\(.*\)"/\1/p' "$(ls ${portdir}/${cp}/*.ebuild | sort | tail -n 1)")
+	else
+		echo "~amd64 ~x86"
+	fi
 }
 
 help() {
@@ -28,8 +31,6 @@ help() {
 	echo
 	echo Reads PORTDIR from your enviroment, defaulting to the current directory.
 	echo
-	echo Reads KEYWORDS for the new ebuild from your environment, defaulting to ~amd64.
-	echo
 	echo Usage: bump-from-set.sh SETNAME SOURCEVERSION DESTINATIONVERSION
 	echo Example: bump-from-set.sh kde-plasma-5.7 5.7.49.9999 5.7.1
 	exit 0

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Johannes Huber]

commit:     e4535516658a770c221626bfbb7f99e08ffb6283
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 13 06:09:03 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 06:09:03 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e4535516

Documentation: Update example for bump-from-set script

Example pointed to old stable branch scheme.

 Documentation/maintainers/bump-from-set.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/maintainers/bump-from-set.sh b/Documentation/maintainers/bump-from-set.sh
index 6316227..ff32141 100755
--- a/Documentation/maintainers/bump-from-set.sh
+++ b/Documentation/maintainers/bump-from-set.sh
@@ -31,7 +31,7 @@ help() {
 	echo Reads KEYWORDS for the new ebuild from your environment, defaulting to ~amd64.
 	echo
 	echo Usage: bump-from-set.sh SETNAME SOURCEVERSION DESTINATIONVERSION
-	echo Example: bump-from-set.sh kde-plasma-5.0 5.0.9999 5.0.1
+	echo Example: bump-from-set.sh kde-plasma-5.7 5.7.49.9999 5.7.1
 	exit 0
 }
 

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Johannes Huber]

commit:     b5c340c793a6f8bbb7ad415043f4f89cceff3311
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 20:37:53 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 20:37:53 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b5c340c7

Documentation: Drop ancient forum posts file

 Documentation/maintainers/forum-post.txt | 148 -------------------------------
 1 file changed, 148 deletions(-)

diff --git a/Documentation/maintainers/forum-post.txt b/Documentation/maintainers/forum-post.txt
deleted file mode 100644
index 66f5297..0000000
--- a/Documentation/maintainers/forum-post.txt
+++ /dev/null
@@ -1,148 +0,0 @@
-This is the official guide for KDE 4 related threads.
-
-KDE 4 for Gentoo is delivered in several ways:
-[list]
-[*][b][url=http://en.gentoo-wiki.com/wiki/Portage]Portage repository[/url][/b]
-The only officially supported and recommended way to get
-[url=http://www.kde.org/announcements/announce-4.4.4.php]KDE4 (4.4.4 recently)[/url].
-If you haven't used any [url=http://en.gentoo-wiki.com/wiki/Portage_Overlay]overlay[/url]
-nor compiled KDE 4 from source manually - this is probably what you're looking for.
-KDE 4 portage guide can be found
-[url=http://www.gentoo.org/proj/en/desktop/kde/kde4-guide.xml]here[/url] - read it please
-to avoid problems in a future, it's is advised that you checked FAQ below as well.
-You've found a bug? Visit this [url=http://tinyurl.com/3bpdlv]page[/url] - it may have
-been reported already.
-Support thread for KDE 4 in Portage can be found here: 
-[topic=707986]http://forums.gentoo.org/viewtopic-t-707986.html[/topic]
-
-[*][b]Official Gentoo KDE team testing overlay
-[[url=http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git]kde[/url]][/b]
-This is overlay used by [url=http://www.gentoo.org/proj/en/desktop/kde/]Gentoo KDE
-team[/url], it's official but unsupported.
-It contains:[list]
-[*]KDE releases that will later appear in the Portage repository (-4.4.x)
-[*]live KDE ebuilds tracking main development tree (-9999)
-[*]periodically updated main development tree snapshots, beta or pre-release (-4.4.xx)
-[*]live KDE ebuilds tracking 4.4.x development branch (-4.4.9999)
-[*]live KDE ebuilds tracking 4.5.x development branch (-4.5.9999)
-[*]3rd party KDE packages that are not in Portage repository for various reasons[/list]
-If you have some suggestions or you would like to contribute, contact Gentoo KDE team on
-[url=irc://irc.freenode.net/gentoo-kde]#gentoo-kde.[/url]
-Please DON'T report any [url=https://bugs.gentoo.org/]bugs[/url] regarding live packages
-in this overlay. For bugs related KDE release candidates you should add [kde-testing] to
-description, but it's [b]always[/b] better to ask on forum or IRC channel first.
-Support thread for official KDE4 testing overlay is here: 
-[url]http://forums.gentoo.org/viewtopic-t-722264.html[/url]
-
-Qt4 live ebuilds can be found in Qt-exclusive experimental overlay now.
-To make use of them, choose the
-[url=http://gitorious.org/gentoo-qt/qting-edge]qting-edge[/url] overlay in [i]layman[/i].
-
-[*][b]Official Gentoo user-maintained Qt3/KDE3 overlay
-[[url=http://git.overlays.gentoo.org/gitweb/?p=proj/kde-sunset.git]kde-sunset[/url]][/b]
-This overlay contains Qt3 and KDE3 packages removed from main repository. It is maintaned
-by community. If you're interested in contributing, please let us know.
-Gentoo KDE team can be found on [url=irc://irc.freenode.net/gentoo-kde]#gentoo-kde[/url].
-[/list]
-
-[size=18]KDE in Portage - FAQ[/size]
-
-[color=orange]Q:[/color] What's the deal with [b]kdeprefix[/b] USE flag and why is it
-masked?
-
-[b]A:[/b] [b]kdeprefix[/b] USE flag allows installing KDE4 in alternate location, thus
-making it possible to have multiple KDE4 releases side by side. Note that this is not
-needed to have KDE3 installed as well. Because having multiple KDE4 installations has
-known issues like bugs [bug=258027]258027[/bug] or [bug=267793]267793[/bug], it's not
-ready for public consumption hence it's been disabled by default.
-
-
-[color=orange]Q:[/color] I want to run amarok, but all I get is "symbol lookup error:
-/usr/kde/live/lib64/kde4/plugins/styles/oxygen.so: undefined symbol". What should I do?
-
-[b]A:[/b] It's a Qt bug that appears when using [b]kdeprefix[/b] USE flag. Qt plugin
-loader appends "qtplugins" path from currently running KDE4 session, causing oxygen.so
-from wrong KDE prefix to be dlopen'ed. Unfortunately it as well cashes plugin locations in
-[color=blue]~/.config/Trolltech.conf[/color], making it permanently broken unless the file
-is removed. It usually happens with amarok or any other KDE4 applications installed in no
-prefix ([color=blue]/usr[/color]), that are built against existing KDE4 in one prefix (for
-example [color=blue]/usr/kde/4.2[/color]), but run from the other (for example in Gnome,
-KDE3 or [color=blue]/usr/kde/live[/color]). For now there's no known solution.
-
-
-[color=orange]Q:[/color] Why there are no sets for KDE4?
-
-[b]A:[/b] KDE4 so far is NOT making use of sets but sets are expected to arrive in near
-future - the reason is - the naming convention for sets is not yet established. Although
-KDE4 Gentoo team prepared some sets for you
-[url=http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=tree;f=sets;h=
-829bc933b1e43e13133dcd6f9c2c2c5566569315;hb=master]here[/url] (click 'raw' to download
-file and place in [color=blue]/etc/portage/sets/[/color]). An archive with all sets can be
-downloaded from
-[url=http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=snapshot;h=
-829bc933b1e43e13133dcd6f9c2c2c5566569315;sf=tgz]here[/url]. Remember that you are using
-them at your own risk.
-
-
-[color=orange]Q:[/color] When I start KDE 3, Plasma is being executed and my KDE 3
-applications are either crashing or just not working. Konqueror refuses to start,
-complaining about default stylesheet version mismatch. What's going on?
-
-[b]A:[/b] This is the conflict related to mixed KDE3/KDE4 sessions. To fix this issue you
-need to [url=http://www.gentoo.org/proj/en/desktop/kde/kde-split-ebuilds.xml]upgrade[/url]
-your existing KDE 3.5.x installations to 3.5.10 or newer. Note that the 3.5.10 series has
-not been given stable keywords yet and that the monolithic packages have been
-discontinued.
-
-
-[color=orange]Q:[/color] I installed KDE4, I can start my desktop using startx but KDM is
-not working. Please help.
-
-[b]A:[/b] First, ensure that [color=blue]kdm[/color] executable is in your [i]PATH[/i]. To
-check that, run:
-[code]which kdm[/code]
-If it's not found, then probably your environment is not up to date. To update it, run:
-[code]env-update && source /etc/profile[/code]
-When [color=blue]kdm[/color] is found, set [i]DISPLAYMANAGER="kdm"[/i] variable in
-[color=blue]/etc/conf.d/xdm[/color]. From now on, KDM should be working.
-
-
-[color=orange]Q:[/color] I just found this neat KDE4 application, can you make an ebuild
-for it?
-
-[b]A:[/b] In short, no. To be more precise, it is possible but it would be better if you
-[url=http://devmanual.gentoo.org/ebuild-writing]created ebuild[/url] for it and send it
-Gentoo KDE team for review - it's more likely it will be added to overlay. The best
-procedure would be to create [url=https://bugs.gentoo.org]bug[/url] with ebuild proposal
-(if it's not there already) and inform the developers on
-[url=irc://irc.freenode.net/gentoo-kde]#gentoo-kde[/url] about it:
-[quote]Hi, i found this nice app blablu v 14.2 i opened bug 234556 for it. Please could
-you consider adding it to kde-testing?[/quote]
-
-If you have any suggestions for improvements regarding this guide, feel free to post them
-[topic=708322]here[/topic]. Please refrain from general discussion and do not post
-ebuild/installation questions there.
-
-[i]Stuck by NeddySeagoon[/i]
-
-[i]Locked and split off the other posts as a feedback [topic=708322]topic[/topic]. --
-desultory[/i]
-[i]Made some minor grammatical corrections at the request of reavertm. -- desultory[/i]
-[i]Continued updates. -- desultory[/i]
-[i]Updated link -- Jorge (jmbsvicetto)[/i]
-[i]Update kde-guide link -- Jorge (jmbsvicetto)[/i]
-[i]Removed arrival progress estimation link. -- desultory[/i]
-[i]Applied changes asked
-[url=https://forums.gentoo.org/viewtopic-p-5237336.html#5237336]here[/url] -- Jorge
-(jmbsvicetto)[/i]
-[i]Applied more [post=5245444]updates[/post]. -- desultory[/i]
-[i]Applied even more [post=5255329]updates[/post] -- Jorge (jmbsvicetto).[/i]
-[i]Applied [post=5262576]updates[/post], [post=5276245]updates[/post] and more updates.
-Updated links.
-[post=5368691]A[/post][post=5401451]p[/post][post=5423969]p[/post][post=5552930]l[/post][
-post=5669087]i[/post][post=5734682]e[/post][post=5786336]d[/post]
-[post=5811962]updates[/post]. -- desultory[/i]
-[i]Applied [post=5847443]update[/post].  --kallamej[/i]
-[i]Applied [post=5956057]updates[/post]. -- desultory[/i]
-[i]Updates, removed info about genkdesvn (offline) and replaced kde-crazy with kde-sunset.
--- reavertm[/i]

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Johannes Huber]

commit:     936515c47bf9caf234f8aacfb9ae86783373f0e8
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 20:22:52 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 20:28:46 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=936515c4

Documentation: Rename find unused patches script

 .../maintainers/{remove_unwanted_patches.sh => find_unused_patches.sh}    | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/Documentation/maintainers/remove_unwanted_patches.sh b/Documentation/maintainers/find_unused_patches.sh
similarity index 100%
rename from Documentation/maintainers/remove_unwanted_patches.sh
rename to Documentation/maintainers/find_unused_patches.sh

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Johannes Huber]

commit:     824b80d5bd47747e1b5dad5fbe63468a789c45e8
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 20:26:53 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 20:29:06 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=824b80d5

Documentation: Update default category in bump script

 Documentation/maintainers/bump_new_revision.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/maintainers/bump_new_revision.sh b/Documentation/maintainers/bump_new_revision.sh
index 0b6434f..dee70c6 100755
--- a/Documentation/maintainers/bump_new_revision.sh
+++ b/Documentation/maintainers/bump_new_revision.sh
@@ -198,7 +198,7 @@ BUMP_VERSION=
 SET=
 DIR=
 OUTPUT_DIR=
-CATEGORY="kde-base"
+CATEGORY="kde-apps"
 while getopts a:s:v:b:l:p:o:c: arg ; do
 	case ${arg} in
 		a) OPERATION=${OPTARG} ;;

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Johannes Huber]

commit:     6bf0f5eddfa6220e9b3ac368b87262f64693f35e
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 19:57:14 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 19:57:14 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6bf0f5ed

Documentation: Drop obsolete file

 Documentation/maintainers/inherit_fu_pkgs | 46 -------------------------------
 1 file changed, 46 deletions(-)

diff --git a/Documentation/maintainers/inherit_fu_pkgs b/Documentation/maintainers/inherit_fu_pkgs
deleted file mode 100644
index 9b16e74..0000000
--- a/Documentation/maintainers/inherit_fu_pkgs
+++ /dev/null
@@ -1,46 +0,0 @@
-The listed packages have moved out of their module into standalone git repos
-and now need to inherit from kde4-base instead of -meta in the live version.
-For now, we use a conditional inherit until we know in which tarballs they're
-going to end up in stable releases.
-
-kde-base/kate
-kde-base/konsole
-kde-base/kwrite
-kde-base/katepart
-
-kde-base/gwenview
-kde-base/kamera
-kde-base/kcolorchooser
-kde-base/kgamma
-kde-base/koulorpaint
-kde-base/kruler
-kde-base/ksaneplugin
-kde-base/ksnapshot
-kde-base/libkdcraw
-kde-base/libkexiv2
-kde-base/libkipi
-kde-base/libksane
-kde-base/svgpart
-kde-base/thumbnailers
-kde-base/blinken
-kde-base/cantor
-kde-base/kalgebra
-kde-base/kalzium
-kde-base/kanagram
-kde-base/kbruch
-kde-base/kgeography
-kde-base/khangman
-kde-base/kig
-kde-base/kiten
-kde-base/klettres
-kde-base/kmplot
-kde-base/kstars
-kde-base/ktouch
-kde-base/kturtle
-kde-base/kwordquiz
-kde-base/libkdeedu
-kde-base/marble
-kde-base/parley
-kde-base/rocs
-kde-base/step
-

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Johannes Huber]

commit:     474a120b9b011a2b0d78b603947ce644ddbe0a89
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 20:21:33 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 20:28:03 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=474a120b

Documentation: Update find unused patches script

 Documentation/maintainers/remove_unwanted_patches.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Documentation/maintainers/remove_unwanted_patches.sh b/Documentation/maintainers/remove_unwanted_patches.sh
index fe0dc5f..34ed762 100755
--- a/Documentation/maintainers/remove_unwanted_patches.sh
+++ b/Documentation/maintainers/remove_unwanted_patches.sh
@@ -1,12 +1,13 @@
 #!/bin/bash
 TMP="/tmp/"
+CATEGORY="kde-apps"
 # we also assume that we are run from the directory where we want to remove patches eg. directory where are categories.
-find -mindepth 2 -maxdepth 3 -type d -name files -print | sort -u |sed -e "s:/files::g" -e "s:\./::g" |grep kde-base > ${TMP}/packages-with-patches.txt
+find -mindepth 2 -maxdepth 3 -type d -name files -print | sort -u |sed -e "s:/files::g" -e "s:\./::g" |grep ${CATEGORY} > ${TMP}/packages-with-patches.txt
 EBUILD_BASEDIRS="`cat ${TMP}/packages-with-patches.txt`"
 for EBBD in ${EBUILD_BASEDIRS}; do
 	pushd $EBBD >> /dev/null
-	# now we are in ebuild directory (eg. kde-base/kdelibs)
-	find ./files/ -type f |grep -v "CVS/" |sort -u |sed -e "s:\./files/::g" > ${TMP}/patches-per-package.txt # d. generated on the fly per package.
+	# now we are in ebuild directory (eg. kde-apps/dolphin)
+	find ./files/ -type f |sort -u |sed -e "s:\./files/::g" > ${TMP}/patches-per-package.txt # d. generated on the fly per package.
 	PATCHES="`cat ${TMP}/patches-per-package.txt`"
 	for PATCH in ${PATCHES}; do
 		PATCH_IN_USE="false"
@@ -31,7 +32,7 @@ for EBBD in ${EBUILD_BASEDIRS}; do
 		done
 		if [[ ${PATCH_IN_USE} == "false" ]]; then
 			# for now just write out.
-			echo "NOT IN USE!: \"${EBBD}/files/${PATCH}\"" >> ${TMP}/cleaner-output.txt
+			echo "NOT IN USE!: \"${EBBD}/files/${PATCH}\"" >> ${TMP}/${CATEGORY}-unused-patches.txt
 		fi
 	done
 	popd >> /dev/null

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Johannes Huber]

commit:     f8c30a0be3ae8ea200ac46c0f7c85571b328d72f
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  6 21:42:58 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Jun  6 21:42:58 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f8c30a0b

Documentation: Drop keywords to testing on bump

If latest ebuild from gentoo main tree has stable keywords there are
added on bump. Call ekeyword with test marker again to prevent stable
keywords in bumped version.

 Documentation/maintainers/bump-from-set.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/maintainers/bump-from-set.sh b/Documentation/maintainers/bump-from-set.sh
index c9ddaa7..6316227 100755
--- a/Documentation/maintainers/bump-from-set.sh
+++ b/Documentation/maintainers/bump-from-set.sh
@@ -64,6 +64,7 @@ for cp in ${packages} ; do
 
 	if [[ ${destination} != *9999* ]] ; then
 		ekeyword $(get_main_tree_keyword ${cp}) ${destination} > /dev/null
+		ekeyword ~all ${destination} > /dev/null
 	fi
 
 	repoman manifest

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Johannes Huber]

commit:     bf4d0885a67ecc77ec4b4eef0e9647c56b4ab4d9
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 24 12:46:22 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Apr 24 12:46:22 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=bf4d0885

Documentation: Re-enable default set generation

 Documentation/maintainers/regenerate-files | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index 6656562..0621a6b 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -163,11 +163,12 @@ for set in *plasma-${PLASMA_RELEASE}; do
 	sed -r "/@/s/-${PLASMA_RELEASE}//g;/9999$/s/~//;s/<//;\@kde-plasma/@s/-(9999|5\..\.50)//" "${set}" >> "${newfile}"
 done
 
-#for set in *-${APPS_RELEASE}; do
-#	newfile=${set/%-${APPS_RELEASE}}
-#	echo -e "${HEADER}" > "${newfile}"
-#	sed -r "/@/s/-${RELEASE}//g;/9999$/s/~//;s/<//;\@kde-apps/@s/-(9999|4\...\.50)/:4/" "${set}" >> "${newfile}"
-#done
+for set in *-${APPS_RELEASE}; do
+	newfile=${set/%-${APPS_RELEASE}}
+	echo -e "${HEADER}" > "${newfile}"
+	# TODO bring back slots when KDE Application is fully migrated
+	sed -r "/@/s/-${APPS_RELEASE}//g;/9999$/s/~//;s/<//;\@kde-apps/@s/-(9999|${APPS_RELEASE}\.50)//" "${set}" >> "${newfile}"
+done
 popd > /dev/null
 
 # regenerate CONTRIBUTORS file

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Michael Palimaka]

commit:     d8c56d01e2cf6ccbb5ddaef898bf8b3228bbd507
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 20 14:46:52 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Apr 20 14:48:00 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d8c56d01

Documentation: drop set references when generating files

 Documentation/maintainers/regenerate-files | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index d2495cc..ac9e103 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -84,7 +84,7 @@ if [[ -d .kde-applications-live.base ]]; then
 	echo -e "${HEADER}" > kde-applications-live.keywords
 	for file in .kde-applications-live.base/*; do
 		newfile=.kde-applications-live/$(basename "${file}")
-		sed '/^~.*[.-]9999$/s/$/ **/' "${file}" > "${newfile}"
+		sed -e '/^~.*[.-]9999$/s/$/ **/' -e '/^@/d' "${file}" > "${newfile}"
 	done
 	cat .kde-applications-live/* >> kde-applications-live.keywords
 fi

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Johannes Huber]

commit:     6771a4862b5c1859bb117ee31e30a89c76f82c78
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  8 15:57:36 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Mar  8 15:57:36 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6771a486

Documentation: Make Frameworks 5.18 default

 Documentation/maintainers/regenerate-files | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index acb99f8..6679087 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -9,8 +9,8 @@ cd "$(dirname $0)"
 SCRIPT=$(basename $0)
 HEADER="# Autogenerated by ${SCRIPT}, DO NOT EDIT."
 
-KF_RELEASES="5.17 5.18 5.19 5.20"
-KF_RELEASE=${KF_RELEASE:-5.17}
+KF_RELEASES="5.18 5.19 5.20"
+KF_RELEASE=${KF_RELEASE:-5.18}
 
 PLASMA_RELEASES="5.4 5.5 5.6"
 PLASMA_RELEASE=${PLASMA_RELEASE:-5.4}

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Johannes Huber]

commit:     d8c4d10b47e16995b677fcc015dd65ddb3139623
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  9 08:58:53 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Aug  9 08:58:53 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d8c4d10b

[Documentation] Update copy-keywords script

- drops obsolete cvs check
- indent
- make ebuild category configurable

 Documentation/maintainers/copy-keywords | 68 ++++++++++++---------------------
 1 file changed, 25 insertions(+), 43 deletions(-)

diff --git a/Documentation/maintainers/copy-keywords b/Documentation/maintainers/copy-keywords
index c75ae41..d88b16e 100755
--- a/Documentation/maintainers/copy-keywords
+++ b/Documentation/maintainers/copy-keywords
@@ -1,48 +1,30 @@
 #!/bin/bash
 
-SOURCE=${1:-~/Gentoo/gentoo-x86}
-SOURCEVER=${2:-4.11.2}
+SOURCE=${1:-~/Gentoo/gentoo}
+SOURCEVER=${2:-15.08.0}
 
 DEST=${3:-~/Gentoo/kde}
-DESTVER=${4:-4.12.1}
-
-TESTING=${5:-yes}
-
-for pd in ${SOURCE}/kde-base/* ; do 
-
-  if [ "`basename ${pd}`x" == 'CVSx' ]; then 
-
-     true
-
-  else
-
-     p="`basename $pd`"
-     kw=`cat ${pd}/${p}-${SOURCEVER}*ebuild | grep "^KEYWORDS" | head -n 1 | sed -e 's:^KEYWORDS="::' -e 's:".*$::'`
-
-     if [ "${kw}x" == x ]; then 
-
-       echo "error: $p ebuild not found"
-     
-     else
-
-       if [ -f "${DEST}/kde-base/${p}/${p}-${DESTVER}.ebuild" ]; then 
-
-         echo "processing $p"
-
-         sed -i "${DEST}/kde-base/${p}/${p}-${DESTVER}.ebuild" -e "/^KEYWORDS/cKEYWORDS=\"${kw}\""
-
-         if [ ${TESTING} == yes ]; then 
-           ekeyword ~all "${DEST}/kde-base/${p}/${p}-${DESTVER}.ebuild"
-         fi
-
-       else 
-
-         echo "error: no file ${DEST}/kde-base/${p}/${p}-${DESTVER}.ebuild"
-
-       fi
-
-     fi
-
-  fi
-
+DESTVER=${4:-15.12.0}
+
+CATEGORY=${5:-kde-apps}
+TESTING=${6:-yes}
+
+for pd in ${SOURCE}/${CATEGORY}/* ; do
+    p="`basename $pd`"
+    kw=`cat ${pd}/${p}-${SOURCEVER}*ebuild | grep "^KEYWORDS" | head -n 1 | sed -e 's:^KEYWORDS="::' -e 's:".*$::'`
+
+    if [ "${kw}x" == x ]; then
+        echo "error: $p ebuild not found"
+    else
+        if [ -f "${DEST}/${CATEGORY}/${p}/${p}-${DESTVER}.ebuild" ]; then
+            echo "processing $p"
+            sed -i "${DEST}/${CATEGORY}/${p}/${p}-${DESTVER}.ebuild" -e "/^KEYWORDS/cKEYWORDS=\"${kw}\""
+
+            if [ ${TESTING} == yes ]; then
+                ekeyword ~all "${DEST}/${CATEGORY}/${p}/${p}-${DESTVER}.ebuild"
+            fi
+        else
+            echo "error: no file ${DEST}/${CATEGORY}/${p}/${p}-${DESTVER}.ebuild"
+        fi
+    fi
 done

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Johannes Huber]

commit:     a0ee40c583d09829b61ba4fcb55356656fc757b4
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  9 08:37:28 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Aug  9 08:37:28 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a0ee40c5

[Documentation] Update bump script

As the main repo is now based on git, drop cvs functions.

 Documentation/maintainers/bump_new_revision.sh | 39 +++++++++-----------------
 1 file changed, 13 insertions(+), 26 deletions(-)

diff --git a/Documentation/maintainers/bump_new_revision.sh b/Documentation/maintainers/bump_new_revision.sh
index e5e1147..0b6434f 100755
--- a/Documentation/maintainers/bump_new_revision.sh
+++ b/Documentation/maintainers/bump_new_revision.sh
@@ -3,7 +3,7 @@
 # KDE Version bumper
 # Created by Gentoo kde-herd
 # This tool is meant to be used for ease of version bumping for KDE ebuilds
-# v 0.22
+# v 0.23
 ###############################################################################
 # functions
 ###############################################################################
@@ -157,19 +157,14 @@ help() {
 	echo
 	echo "When moving kde from overlay to the main tree"
 	echo "-v VERSION"
-	echo "$0 -a cvsmove -v 4.4.4"
+	echo "$0 -a repomove -v 4.4.4"
 	exit 0
 }
 
-_cvsupdate() {
-	pushd "${1}" &> /dev/null
-	#cvs up
-	popd &> /dev/null
-}
-_addcvsfile() {
+_addgitfile() {
 	pushd "${1}" &> /dev/null
 	echo "${1}/${2}"
-	cvs add ${2}
+	git add ${2}
 	popd &> /dev/null
 }
 _check_patches() {
@@ -232,7 +227,7 @@ case ${OPERATION} in
 		[[ -z "${VERSION}" || -z "${BUMP_VERSION}" || -z "${DIR}" || -z "${OUTPUT_DIR}" ]] && \
 			help
 		;;
-	cvsmove)
+	repomove)
 		[[ -z "${VERSION}" ]] && help
 		;;
 	*)
@@ -303,9 +298,6 @@ case ${OPERATION} in
 			if [[ -d "${PORTDIR_BUMPING}/.git" ]]; then
 				EBUILD=`find ./ -name \*.ebuild | grep "${VERSION}\(\-r[0-9]\+\)\?\\." | sort |tail -n 1`
 				git rm "${EBUILD}"
-			elif [[ -d CVS ]]; then
-				cvs remove -f "${EBUILD_BASENAME}-${VERSION}"*.ebuild
-				echangelog "Remove KDE SC ${VERSION}"
 			fi
 #			if [[ -d files/ ]]; then
 #				# generate list of patches.
@@ -340,15 +332,11 @@ case ${OPERATION} in
 		;;
 	slot) add_new_sloted_version ;;
 	diff) check_cmakelists ;;
-	cvsmove)
+	repomove)
 		MAINTREE="$(portageq get_repo_path / gentoo)"
 		OVERLAY="`pwd`"
 		BUMP_VERSION=${VERSION}
-		# course of action we are doing here
-		# cvs up whole tree, then kde-base
-		# then start going per each dir
-		# cvs up, move the ebuild, its patches if needed, run echangelog, run keywords check, manifest
-		#_cvsupdate "${MAINTREE}"
+		# move the ebuild, its patches if needed, run keywords check, manifest
 		find ./${CATEGORY}/ -mindepth 1 -maxdepth 1 -type d |sed -e "s:./::" | sort |while read dir; do
 			# we also have to check if directory contains our version if not, we dont copy it
 			pushd "${OVERLAY}/${dir}" &> /dev/null
@@ -358,9 +346,8 @@ case ${OPERATION} in
 				if [[ ! -d "${WRKDIR}" ]]; then
 					# we need to add the directory to scm tracking
 					mkdir -p "${WRKDIR}"
-					_addcvsfile "${MAINTREE}/${dir/\/*/}" ${dir/*\//}
+					_addgitfile "${MAINTREE}/${dir/\/*/}" ${dir/*\//}
 				fi
-				_cvsupdate "${WRKDIR}"
 				# we need to copy the file we want to play with
 				## first generate the correct filename, we expect that if someone added -rX to the package it has reason.
 				pushd "${OVERLAY}/${dir}" &> /dev/null
@@ -368,7 +355,7 @@ case ${OPERATION} in
 				echo ${EBUILD}
 				cp -f ${EBUILD} "${WRKDIR}"
 				popd &> /dev/null
-				_addcvsfile "${WRKDIR}" ${EBUILD/*\//}
+				_addgitfile "${WRKDIR}" ${EBUILD/*\//}
 				# now we need to search up all patches ebuild is containing and move them along if they are needed.
 				_check_patches "${OVERLAY}/${dir}" "${WRKDIR}" ${EBUILD/*\//}
 				if [[ `cat ${TMPFILE} |wc -l` -gt 0 ]]; then
@@ -377,7 +364,7 @@ case ${OPERATION} in
 						if [[ ! -d "${WRKDIR}/files" ]]; then
 							# create files dir
 							mkdir -p "${WRKDIR}/files"
-							_addcvsfile "${WRKDIR}" files/
+							_addgitfile "${WRKDIR}" files/
 						fi
 						pushd "${OVERLAY}/${dir}" &> /dev/null
 						PTH=`find ./ -name ${file/*\//} |sed -e "s:./::" -e "s:${file/*\//}::"`
@@ -387,11 +374,11 @@ case ${OPERATION} in
 							# anyway no kde package don't use more than one so i wont bother for now
 							PDIR=${PTH/files\//}
 							mkdir -p "${PDIR}"
-							_addcvsfile "${WRKDIR}/files/" "${PDIR}"
+							_addgitfile "${WRKDIR}/files/" "${PDIR}"
 						fi
 						# note that we always replace the patches, no warnings we just poke ourselves over them :]
 						cp -f "files/${PDIR}${file}" "${WRKDIR}/files/${PDIR}"
-						_addcvsfile "${WRKDIR}/files/${PDIR}" ${file}
+						_addgitfile "${WRKDIR}/files/${PDIR}" ${file}
 						popd &> /dev/null
 					done
 				fi
@@ -399,7 +386,7 @@ case ${OPERATION} in
 				pushd "${WRKDIR}" &> /dev/null
 				# update_keywords "${EBUILD/*\//}" ${dir}
 				# ^for unknown reason this is broken, but the keywords are already correct from the initial bump
-				echangelog "Version bump KDE SC ${VERSION}"
+				# echangelog "Version bump KDE SC ${VERSION}"
 				repoman manifest
 				popd &> /dev/null
 			else

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Manuel Rüger]

commit:     5aef5b8f16a3cf7b84029e0933d6a681538cf9bc
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  8 10:20:05 2015 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Mon Jun  8 10:20:05 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=5aef5b8f

[Documentation] Fix deprecated portdir command.

 Documentation/maintainers/bump_new_revision.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/maintainers/bump_new_revision.sh b/Documentation/maintainers/bump_new_revision.sh
index bdbf257..3de45c0 100755
--- a/Documentation/maintainers/bump_new_revision.sh
+++ b/Documentation/maintainers/bump_new_revision.sh
@@ -116,7 +116,7 @@ update_keywords() {
 				KEYWORDS=
 			elif (( version_patch < 50 )); then
 				# Patch version is < 50 - stable release, try to obtain keywords from tree
-				if pushd "$(portageq portdir)/${2}" &> /dev/null; then
+				if pushd "$(portageq get_repo_path / gentoo)/${2}" &> /dev/null; then
 					KEYWORDS=$(ls -1r *-4*.ebuild | grep -v ${BUMP_VERSION} | grep -v 4\\.4\\.11 | grep ${SLOT} | head -n 1 | xargs sed -ne 's/^KEYWORDS="\(.*\)"/\1/p')
 					[[ -z ${KEYWORDS} ]] && KEYWORDS=${MINIMAL_KEYWORDS}
 				else
@@ -258,7 +258,7 @@ case ${OPERATION} in
 		INFO_LIST=
 		for EBUILD_BASEDIR in ${EBUILD_BASEDIR_LIST}; do
 			EBUILD_BASENAME=${EBUILD_BASEDIR/*\//}
-			#OLD_BASE="$(portageq portdir)"/"${EBUILD_BASEDIR}"/
+			#OLD_BASE="$(portageq get_repo_path / gentoo)"/"${EBUILD_BASEDIR}"/
 			OLD_BASE="${PORTDIR_BUMPING}"/"${EBUILD_BASEDIR}"/ # uncoment if you work in overlay only
 			# by default we should pick-up live stable or live ebuilds. But we need to restore the keywords from the previous version of kde
 			# ie. bumping 4.4.92 you set keywords to "~amd64 ~x86" but ebuilds from 9999 (before tagging) or 4.5.9999 (after tagging).

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Manuel Rüger]

commit:     60567674db0951c898800efd902e887130181737
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  8 10:21:04 2015 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Mon Jun  8 10:21:04 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=60567674

[Documentation] Fix deprecated portdir command.

 Documentation/maintainers/bump_new_revision.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/maintainers/bump_new_revision.sh b/Documentation/maintainers/bump_new_revision.sh
index 3de45c0..e5e1147 100755
--- a/Documentation/maintainers/bump_new_revision.sh
+++ b/Documentation/maintainers/bump_new_revision.sh
@@ -341,7 +341,7 @@ case ${OPERATION} in
 	slot) add_new_sloted_version ;;
 	diff) check_cmakelists ;;
 	cvsmove)
-		MAINTREE="$(portageq portdir)"
+		MAINTREE="$(portageq get_repo_path / gentoo)"
 		OVERLAY="`pwd`"
 		BUMP_VERSION=${VERSION}
 		# course of action we are doing here

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Manuel Rüger]

commit:     a5484a5e4e004af9e9ff0ed606299356dd92aa35
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  8 10:03:29 2015 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Mon Jun  8 10:03:29 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a5484a5e

[Documentation] Fix deprecated portdir command.

 Documentation/maintainers/bump-from-set.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/maintainers/bump-from-set.sh b/Documentation/maintainers/bump-from-set.sh
index a9b266d..c9ddaa7 100755
--- a/Documentation/maintainers/bump-from-set.sh
+++ b/Documentation/maintainers/bump-from-set.sh
@@ -13,7 +13,7 @@ get_package_list_from_set() {
 }
 
 get_main_tree_keyword() {
-	local portdir="$(portageq portdir)"
+	local portdir="$(portageq get_repo_path / gentoo)"
 	local cp="${1}"
 
 	echo $(sed -ne 's/^KEYWORDS="\(.*\)"/\1/p' "$(ls ${portdir}/${cp}/*.ebuild | sort | tail -n 1)")

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Michael Palimaka]

commit:     056be8673dbaed3cd4cd3a7637a637ad000035d6
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  5 19:41:05 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Apr  5 19:41:05 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=056be867

[Documentation] Add KDE Frameworks 5.9

 Documentation/maintainers/regenerate-files | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index 2c53e75..4c006cc 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -12,7 +12,7 @@ HEADER="# Autogenerated by ${SCRIPT}, DO NOT EDIT."
 KDE_RELEASES="4.11 4.14"
 RELEASE=${RELEASE:-4.14} # current stable
 
-KF_RELEASES="5.8"
+KF_RELEASES="5.8 5.9"
 KF_RELEASE=${KF_RELEASE:-5.8}
 
 PLASMA_RELEASES="5.2"

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Michael Palimaka]

commit:     1f39958e185f4901e2307063047611667be5016b
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  5 19:38:29 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Apr  5 19:38:29 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1f39958e

[Documentation] Add script to create package.* files.

 Documentation/maintainers/keywords-bump.sh | 59 ++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/Documentation/maintainers/keywords-bump.sh b/Documentation/maintainers/keywords-bump.sh
new file mode 100755
index 0000000..31fd669
--- /dev/null
+++ b/Documentation/maintainers/keywords-bump.sh
@@ -0,0 +1,59 @@
+#!/bin/sh
+
+: ${PORTDIR:="$(pwd)"}
+
+help() {
+	echo Simple tool to bump KDE package.* files.
+	echo
+	echo Given a set name, copies the live package.* files to the new
+	echo version and updates appropriate.
+	echo
+	echo Reads PORTDIR from your enviroment, defaulting to the current directory.
+	echo
+	echo Usage: keyword-bump.sh SETNAME DESTINATIONVERSION
+	echo Example: keyword-bump.sh kde-plasma 5.1
+	exit 0
+}
+
+pretty_setname() {
+	local set="${1}"
+	echo ${set} | tr "-" " " | sed -e "s/\b\(.\)/\u\1/g" -e "s/kde/KDE/i"
+}
+
+SETNAME="$1"
+DESTINATIONVERSION="$2"
+TARGET="${SETNAME}-${DESTINATIONVERSION}"
+
+if [[ $1 == "--help" ]] ; then
+	help
+fi
+
+if [[ -z "${SETNAME}" || -z "${DESTINATIONVERSION}" ]] ; then
+	echo ERROR: Not enough arguments
+	echo
+	help
+fi
+
+pushd "${PORTDIR}/Documentation" > /dev/null
+
+pushd package.unmask > /dev/null
+cp -r .${SETNAME}-live .${TARGET}
+pushd .${TARGET} > /dev/null
+rm ${SETNAME}-live
+ln -s  ../../../sets/${TARGET} ${TARGET}
+echo "# You can use this file to mask/unmask the $(pretty_setname ${TARGET}) release." > _HEADER_
+echo "# Edit Documentation/package.unmask/.${TARGET}/ files instead." >> _HEADER_
+popd > /dev/null
+popd > /dev/null
+
+pushd package.accept_keywords > /dev/null
+cp -r .${SETNAME}-live.base .${TARGET}
+pushd .${TARGET} > /dev/null
+rm ${SETNAME}-live
+ln -s  ../../../sets/${TARGET} ${TARGET}
+echo "# You can use this file to keyword/unkeyword the $(pretty_setname ${TARGET}) release." > _HEADER_
+echo "# Edit Documentation/package.accept_keywords/.${TARGET}/ files instead." >> _HEADER_
+popd > /dev/null
+popd > /dev/null
+
+popd > /dev/null

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Michael Palimaka]

commit:     e93b26313e0a61fb077f510cfcd1f03ef56e5e0f
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  5 19:04:10 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Apr  5 19:04:10 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e93b2631

[Documentation] Use keywords from main tree.

 Documentation/maintainers/bump-from-set.sh | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/Documentation/maintainers/bump-from-set.sh b/Documentation/maintainers/bump-from-set.sh
index 65c2e5b..a9b266d 100755
--- a/Documentation/maintainers/bump-from-set.sh
+++ b/Documentation/maintainers/bump-from-set.sh
@@ -2,7 +2,6 @@
 
 # requires app-portage/portage-utils and app-portage/gentoolkit-dev
 
-: ${KEYWORDS:="~amd64"}
 : ${PORTDIR:="$(pwd)"}
 
 get_package_list_from_set() {
@@ -13,6 +12,13 @@ get_package_list_from_set() {
 	done
 }
 
+get_main_tree_keyword() {
+	local portdir="$(portageq portdir)"
+	local cp="${1}"
+
+	echo $(sed -ne 's/^KEYWORDS="\(.*\)"/\1/p' "$(ls ${portdir}/${cp}/*.ebuild | sort | tail -n 1)")
+}
+
 help() {
 	echo Simple set-based version bumper.
 	echo
@@ -46,8 +52,8 @@ fi
 
 packages=$(get_package_list_from_set ${SETNAME})
 
-for package in ${packages} ; do
-	pushd "${PORTDIR}/${package}" > /dev/null
+for cp in ${packages} ; do
+	pushd "${PORTDIR}/${cp}" > /dev/null
 
 	pn=$(basename $(pwd))
 	source=${pn}-${SOURCEVERSION}.ebuild
@@ -57,7 +63,7 @@ for package in ${packages} ; do
 	ekeyword ^all ${destination} > /dev/null
 
 	if [[ ${destination} != *9999* ]] ; then
-		ekeyword ${KEYWORDS} ${destination} > /dev/null
+		ekeyword $(get_main_tree_keyword ${cp}) ${destination} > /dev/null
 	fi
 
 	repoman manifest

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Michael Palimaka]

commit:     6954b81d0dc53e42497627c5768f564d40d938df
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  5 18:32:29 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Apr  5 18:32:29 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6954b81d

[Documentation] Cosmetics.

 Documentation/maintainers/bump-from-set.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Documentation/maintainers/bump-from-set.sh b/Documentation/maintainers/bump-from-set.sh
index 0745930..65c2e5b 100755
--- a/Documentation/maintainers/bump-from-set.sh
+++ b/Documentation/maintainers/bump-from-set.sh
@@ -6,13 +6,11 @@
 : ${PORTDIR:="$(pwd)"}
 
 get_package_list_from_set() {
+	local set="${1}"
 
-	local SET="${1}"
-
-	for entry in $(grep -v ^[#@] "${PORTDIR}/sets/${SET}") ; do
+	for entry in $(grep -v ^[#@] "${PORTDIR}/sets/${set}") ; do
 		echo $(qatom ${entry} | cut -d " " -f 1-2 | tr " " "/")
 	done
-
 }
 
 help() {

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Michael Palimaka]

commit:     6ca8a5d120990d49e7f033742411f546d5d5ce94
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 14 15:20:26 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Dec 14 15:20:26 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=6ca8a5d1

[Documentation] Update regenerate-files for kde-plasma move.

---
 Documentation/maintainers/regenerate-files | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index 48fb648..96988d9 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -133,7 +133,7 @@ for release in $PLASMA_RELEASES live; do
 	echo -e "${HEADER}" > "kde-plasma-${release}"
 	if [[ -d "../package.unmask/.kde-plasma-${release}" ]]; then
 		cat "../package.unmask/.kde-plasma-${release}/"* >> "kde-plasma-${release}"
-		sed -i "kde-plasma-${release}" -e "/^<kde-base\/.*-5\..\.50:5$/{s/-5\..\.50/-${release}/;s/^</>=/}"
+		sed -i "kde-plasma-${release}" -e "/^<kde-plasma\/.*-5\..\.50:5$/{s/-5\..\.50/-${release}/;s/^</>=/}"
 	fi
 done
 popd > /dev/null
@@ -155,7 +155,7 @@ done
 for set in *plasma-${PLASMA_RELEASE}; do
 	newfile=${set/%-${PLASMA_RELEASE}}
 	echo -e "${HEADER}" > "${newfile}"
-	sed -r "/@/s/-${PLASMA_RELEASE}//g;/9999$/s/~//;s/<//;\@kde-base/@s/-(9999|5\..\.50)//" "${set}" >> "${newfile}"
+	sed -r "/@/s/-${PLASMA_RELEASE}//g;/9999$/s/~//;s/<//;\@kde-plasma/@s/-(9999|5\..\.50)//" "${set}" >> "${newfile}"
 done
 popd > /dev/null
 

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Manuel Rüger]

commit:     b181d64ccd7035f4348f4df4de238fa80db8c87f
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  7 11:22:49 2014 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Fri Nov  7 11:22:49 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b181d64c

[Documentation] Fix keyword generation for sets.

---
 Documentation/maintainers/regenerate-files | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index f19716c..a3e6f93 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -30,7 +30,7 @@ done
 for release in $KF_RELEASES; do
 	echo -e "${HEADER}" > "kde-frameworks-${release}.keywords"
 	if [[ -d ".kde-frameworks-${release}" ]]; then
-		cat ".kde-frameworks-${release}/"* | sed '/^~.*[.-]9999$/s/$/ **/' >> "kde-frameworks-${release}.keywords"
+		cat ".kde-frameworks-${release}/"* | grep -P -v '^>=kde-frameworks/(?!kf-env)' |sed '/^~.*[.-]9999$/s/$/ **/' >> "kde-frameworks-${release}.keywords"
 	fi
 done
 
@@ -99,7 +99,7 @@ done
 for release in $KF_RELEASES live; do
 	echo -e "${HEADER}" > "kde-frameworks-${release}"
 	if [[ -d ".kde-frameworks-${release}" ]]; then
-		cat ".kde-frameworks-${release}/"* >> "kde-frameworks-${release}"
+		cat ".kde-frameworks-${release}/"* | grep -P -v '^>=kde-frameworks/(?!kf-env)' >> "kde-frameworks-${release}"
 	fi
 done
 
@@ -124,7 +124,7 @@ done
 for release in $KF_RELEASES live; do
 	echo -e "${HEADER}" > "kde-frameworks-${release}"
 	if [[ -d "../package.unmask/.kde-frameworks-${release}" ]]; then
-		cat "../package.unmask/.kde-frameworks-${release}/"* >> "kde-frameworks-${release}"
+		cat "../package.unmask/.kde-frameworks-${release}/"* | grep -P -v '^>=kde-frameworks/(?!kf-env)' >> "kde-frameworks-${release}"
 		sed -i "kde-frameworks-${release}" -e "/^<kde-frameworks\/.*-5\..\.50:5$/{s/-5\..\.50/-${release}/;s/^</>=/}"
 	fi
 done

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Michael Palimaka]

commit:     0007bb51630cb4b42a98edb19f174c2b81f70730
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 26 17:25:08 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Sep 26 17:25:08 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0007bb51

[Documentation/maintainers] Add tool to quickly add new versioned sets.

---
 Documentation/maintainers/set-bump.sh | 49 +++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/Documentation/maintainers/set-bump.sh b/Documentation/maintainers/set-bump.sh
new file mode 100755
index 0000000..d5a0fd7
--- /dev/null
+++ b/Documentation/maintainers/set-bump.sh
@@ -0,0 +1,49 @@
+#!/bin/sh
+
+# requires app-portage/portage-utils and app-portage/gentoolkit-dev
+
+: ${PORTDIR:="$(pwd)"}
+
+get_package_list_from_set() {
+
+	local SET="${1}"
+
+	for entry in $(grep -v ^[#@] "${PORTDIR}/sets/${SET}") ; do
+		echo $(qatom ${entry} | cut -d " " -f 1-2 | tr " " "/")
+	done
+
+}
+
+help() {
+	echo Simple tool to bump a KDE set.
+	echo
+	echo Given a set name, copies the live set to the new set version
+	echo and updates the package versions appropriately.
+	echo
+	echo Reads PORTDIR from your enviroment, defaulting to the current directory.
+	echo
+	echo Usage: set-bump.sh SETNAME DESTINATIONVERSION
+	echo Example: set-bump.sh kde-plasma 5.1
+	exit 0
+}
+
+
+SETNAME="$1"
+DESTINATIONVERSION="$2"
+
+if [[ $1 == "--help" ]] ; then
+	help
+fi
+
+if [[ -z "${SETNAME}" || -z "${DESTINATIONVERSION}" ]] ; then
+	echo ERROR: Not enough arguments
+	echo
+	help
+fi
+
+pushd "${PORTDIR}/sets" > /dev/null
+
+cp ${SETNAME}-live ${SETNAME}-${DESTINATIONVERSION}
+sed -e "s/~/</" -e "s/9999/${DESTINATIONVERSION}.50:5/" -i ${SETNAME}-${DESTINATIONVERSION}
+
+popd > /dev/null

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Michael Palimaka]

commit:     bb51963e6876cd3be95e938b867e1cf197138fc9
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 26 16:59:26 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Sep 26 16:59:26 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=bb51963e

[Documentation/maintainers] Simplify set reading function.

---
 Documentation/maintainers/bump-from-set.sh | 6 +-----
 Documentation/maintainers/drop-from-set.sh | 3 ---
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/Documentation/maintainers/bump-from-set.sh b/Documentation/maintainers/bump-from-set.sh
index 8758a5c..0745930 100755
--- a/Documentation/maintainers/bump-from-set.sh
+++ b/Documentation/maintainers/bump-from-set.sh
@@ -9,11 +9,7 @@ get_package_list_from_set() {
 
 	local SET="${1}"
 
-	IFS=$'\n'
-	for entry in $(cat "${PORTDIR}/sets/${SET}") ; do
-		if [[ ${entry} == \#*  || ${entry} == @* ]] ; then
-			continue
-		fi
+	for entry in $(grep -v ^[#@] "${PORTDIR}/sets/${SET}") ; do
 		echo $(qatom ${entry} | cut -d " " -f 1-2 | tr " " "/")
 	done
 

diff --git a/Documentation/maintainers/drop-from-set.sh b/Documentation/maintainers/drop-from-set.sh
index 5645c78..3267811 100755
--- a/Documentation/maintainers/drop-from-set.sh
+++ b/Documentation/maintainers/drop-from-set.sh
@@ -9,9 +9,6 @@ get_package_list_from_set() {
 	local SET="${1}"
 
 	for entry in $(grep -v ^[#@] "${PORTDIR}/sets/${SET}") ; do
-		if [[ ${entry} == \#*  || ${entry} == @* ]] ; then
-			continue
-		fi
 		echo $(qatom ${entry} | cut -d " " -f 1-2 | tr " " "/")
 	done
 

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Michael Palimaka]

commit:     1ddceba6207e11eb2e90931a74705c124327cf8e
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 26 16:00:52 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Sep 26 16:01:03 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=1ddceba6

[Documentation/maintainers] Fix iterating over lines with whitespace.

By default, for will iterate over various types of whitespace, so explicitly
define that we want newlines.

---
 Documentation/maintainers/bump-from-set.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/maintainers/bump-from-set.sh b/Documentation/maintainers/bump-from-set.sh
index 741f199..8758a5c 100755
--- a/Documentation/maintainers/bump-from-set.sh
+++ b/Documentation/maintainers/bump-from-set.sh
@@ -9,6 +9,7 @@ get_package_list_from_set() {
 
 	local SET="${1}"
 
+	IFS=$'\n'
 	for entry in $(cat "${PORTDIR}/sets/${SET}") ; do
 		if [[ ${entry} == \#*  || ${entry} == @* ]] ; then
 			continue

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Michael Palimaka]

commit:     2d9cdec94fb16809f228929351419f125a137af3
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 17 16:33:02 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Sep 17 16:35:46 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=2d9cdec9

[Documentation/maintainers] Add simple tool to drop versions based on a set.

---
 Documentation/maintainers/drop-from-set.sh | 58 ++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/Documentation/maintainers/drop-from-set.sh b/Documentation/maintainers/drop-from-set.sh
new file mode 100755
index 0000000..5645c78
--- /dev/null
+++ b/Documentation/maintainers/drop-from-set.sh
@@ -0,0 +1,58 @@
+#!/bin/sh
+
+# requires app-portage/portage-utils and app-portage/gentoolkit-dev
+
+: ${PORTDIR:="$(pwd)"}
+
+get_package_list_from_set() {
+
+	local SET="${1}"
+
+	for entry in $(grep -v ^[#@] "${PORTDIR}/sets/${SET}") ; do
+		if [[ ${entry} == \#*  || ${entry} == @* ]] ; then
+			continue
+		fi
+		echo $(qatom ${entry} | cut -d " " -f 1-2 | tr " " "/")
+	done
+
+}
+
+help() {
+	echo Simple set-based version removed.
+	echo
+	echo Given a set file, removes all packages of a specified version.
+	echo
+	echo Reads PORTDIR from your environment, defaulting to the current directory.
+	echo
+	echo Usage: drop-from-set.sh SETNAME VERSION
+	echo Example: drop-from-set.sh kde-plasma-5.0 5.0.1
+	exit 0
+}
+
+
+SETNAME="$1"
+VERSION="$2"
+
+if [[ $1 == "--help" ]] ; then
+	help
+fi
+
+if [[ -z "${SETNAME}" || -z "${VERSION}" ]] ; then
+	echo ERROR: Not enough arguments
+	echo
+	help
+fi
+
+packages=$(get_package_list_from_set ${SETNAME})
+
+for package in ${packages} ; do
+	pushd "${PORTDIR}/${package}" > /dev/null
+
+	pn=$(basename $(pwd))
+
+	rm -f ${pn}-${VERSION}.ebuild
+	rm -f ${pn}-${VERSION}-r*.ebuild
+
+	repoman manifest
+
+done

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Michael Palimaka]

commit:     45feac25873cee600284bcdd3582a2b6be911ea0
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 24 09:47:30 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Aug 24 09:47:30 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=45feac25

Revert "[Documentation/maintainers] Use 4.14 as basis for sets."

This reverts commit d6c0f4480aa10cbd12b3222417da0282e30a02e6.

---
 Documentation/maintainers/regenerate-files | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index 24d0d20..09e3be7 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -10,7 +10,7 @@ SCRIPT=$(basename $0)
 HEADER="# Autogenerated by ${SCRIPT}, DO NOT EDIT."
 
 KDE_RELEASES="4.11 4.12 4.13 4.14"
-RELEASE=${RELEASE:-4.14}
+RELEASE=${RELEASE:-4.12}
 
 KF_RELEASES="5.1"
 KF_RELEASE=${KF_RELEASE:-5.1}

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Michael Palimaka]

commit:     0031b7b261fafba5e8f3becf53797dc8b4625140
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 24 09:48:00 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Aug 24 09:48:00 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0031b7b2

[Documentation/maintainers] Add comment to clarify purpose of variable.

---
 Documentation/maintainers/regenerate-files | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index 09e3be7..e04b213 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -10,7 +10,7 @@ SCRIPT=$(basename $0)
 HEADER="# Autogenerated by ${SCRIPT}, DO NOT EDIT."
 
 KDE_RELEASES="4.11 4.12 4.13 4.14"
-RELEASE=${RELEASE:-4.12}
+RELEASE=${RELEASE:-4.12} # current stable
 
 KF_RELEASES="5.1"
 KF_RELEASE=${KF_RELEASE:-5.1}

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Michael Palimaka]

commit:     d6c0f4480aa10cbd12b3222417da0282e30a02e6
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 24 08:43:24 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Aug 24 08:43:24 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d6c0f448

[Documentation/maintainers] Use 4.14 as basis for sets.

---
 Documentation/maintainers/regenerate-files | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index 09e3be7..24d0d20 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -10,7 +10,7 @@ SCRIPT=$(basename $0)
 HEADER="# Autogenerated by ${SCRIPT}, DO NOT EDIT."
 
 KDE_RELEASES="4.11 4.12 4.13 4.14"
-RELEASE=${RELEASE:-4.12}
+RELEASE=${RELEASE:-4.14}
 
 KF_RELEASES="5.1"
 KF_RELEASE=${KF_RELEASE:-5.1}

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Michael Palimaka]

commit:     dddd95da392dc0e44cfff488be6432645df1a31f
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 12 11:05:18 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Aug 12 11:05:18 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=dddd95da

[Documentation/maintainers] Add new simple script for set-based 9999 -> release bumps.

---
 Documentation/maintainers/bump-from-set.sh | 71 ++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)

diff --git a/Documentation/maintainers/bump-from-set.sh b/Documentation/maintainers/bump-from-set.sh
new file mode 100755
index 0000000..741f199
--- /dev/null
+++ b/Documentation/maintainers/bump-from-set.sh
@@ -0,0 +1,71 @@
+#!/bin/sh
+
+# requires app-portage/portage-utils and app-portage/gentoolkit-dev
+
+: ${KEYWORDS:="~amd64"}
+: ${PORTDIR:="$(pwd)"}
+
+get_package_list_from_set() {
+
+	local SET="${1}"
+
+	for entry in $(cat "${PORTDIR}/sets/${SET}") ; do
+		if [[ ${entry} == \#*  || ${entry} == @* ]] ; then
+			continue
+		fi
+		echo $(qatom ${entry} | cut -d " " -f 1-2 | tr " " "/")
+	done
+
+}
+
+help() {
+	echo Simple set-based version bumper.
+	echo
+	echo Given a set file, bumps all packages in the given set given source
+	echo and destination versions. Designed for workflows where ebuilds are
+	echo bumped from up-to-date live versions.
+	echo
+	echo Reads PORTDIR from your enviroment, defaulting to the current directory.
+	echo
+	echo Reads KEYWORDS for the new ebuild from your environment, defaulting to ~amd64.
+	echo
+	echo Usage: bump-from-set.sh SETNAME SOURCEVERSION DESTINATIONVERSION
+	echo Example: bump-from-set.sh kde-plasma-5.0 5.0.9999 5.0.1
+	exit 0
+}
+
+
+SETNAME="$1"
+SOURCEVERSION="$2"
+DESTINATIONVERSION="$3"
+
+if [[ $1 == "--help" ]] ; then
+	help
+fi
+
+if [[ -z "${SETNAME}" || -z "${SOURCEVERSION}" || -z "${DESTINATIONVERSION}" ]] ; then
+	echo ERROR: Not enough arguments
+	echo
+	help
+fi
+
+packages=$(get_package_list_from_set ${SETNAME})
+
+for package in ${packages} ; do
+	pushd "${PORTDIR}/${package}" > /dev/null
+
+	pn=$(basename $(pwd))
+	source=${pn}-${SOURCEVERSION}.ebuild
+	destination=${pn}-${DESTINATIONVERSION}.ebuild
+
+	cp ${source} ${destination}
+	ekeyword ^all ${destination} > /dev/null
+
+	if [[ ${destination} != *9999* ]] ; then
+		ekeyword ${KEYWORDS} ${destination} > /dev/null
+	fi
+
+	repoman manifest
+
+	popd > /dev/null
+done

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Michael Palimaka]

commit:     6d8bdac80192fba96275e8071266637e8b4cb70d
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 22 17:42:57 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Jul 22 17:51:26 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=6d8bdac8

[Documentation] Don't automatically pin Plasma 5 packages to a SLOT.

In order to avoid keywords/mask files accidentally applying to KDE 4 stuff, we
will specify the SLOT manually in the versioned set which will then carry over
automatically to the unversioned, generated set.

---
 Documentation/maintainers/regenerate-files | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index 500d79a..9cde9c1 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -144,7 +144,7 @@ for release in $PLASMA_RELEASES live; do
 	echo -e "${HEADER}" > "kde-plasma-${release}"
 	if [[ -d "../package.unmask/.kde-plasma-${release}" ]]; then
 		cat "../package.unmask/.kde-plasma-${release}/"* >> "kde-plasma-${release}"
-		sed -i "kde-plasma-${release}" -e "/^<kde-base\/.*-5\..\.50$/{s/-5\..\.50/-${release}/;s/^</>=/}"
+		sed -i "kde-plasma-${release}" -e "/^<kde-base\/.*-5\..\.50:5$/{s/-5\..\.50/-${release}/;s/^</>=/}"
 	fi
 done
 popd > /dev/null
@@ -166,7 +166,7 @@ done
 for set in *plasma-${PLASMA_RELEASE}; do
 	newfile=${set/%-${PLASMA_RELEASE}}
 	echo -e "${HEADER}" > "${newfile}"
-	sed -r "/@/s/-${PLASMA_RELEASE}//g;/9999$/s/~//;s/<//;\@kde-base/@s/-(9999|5\..\.50)/:5/" "${set}" >> "${newfile}"
+	sed -r "/@/s/-${PLASMA_RELEASE}//g;/9999$/s/~//;s/<//;\@kde-base/@s/-(9999|5\..\.50)//" "${set}" >> "${newfile}"
 done
 popd > /dev/null
 

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Michael Palimaka]

commit:     22457d13383d6fcd8aa4f64f9009f8931e676584
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri May  9 17:25:54 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri May  9 17:25:54 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=22457d13

[Documentation] Stop generating package.mask

Since we set profile-formats = portage, we can use package.mask
as a directory so we don't need to regenerate it every time.

---
 Documentation/maintainers/regenerate-files | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index eba9f57..d877373 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -113,19 +113,6 @@ for release in $KF_RELEASES live; do
 done
 popd > /dev/null
 
-# regenerate package mask
-pushd ../../profiles/ > /dev/null
-echo -e "\
-${HEADER}
-# Edit profiles/package.mask.d/ files instead." > package.mask
-if [[ -d package.mask.d ]]; then
-	for masks in package.mask.d/*; do
-		echo >> package.mask
-		cat ${masks} >> package.mask
-	done
-fi
-popd > /dev/null
-
 # regenerate unversioned sets
 pushd ../../sets/ > /dev/null
 for set in *-${RELEASE}; do

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Michael Palimaka]

commit:     ce594b4897d2f6b89d6faa210686d884a78867b2
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 12 14:18:34 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Feb 12 14:18:34 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ce594b48

[Documentation/maintainers] Add to support non-kde-base categories.

---
 Documentation/maintainers/bump_new_revision.sh | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/Documentation/maintainers/bump_new_revision.sh b/Documentation/maintainers/bump_new_revision.sh
index 9158622..bdbf257 100755
--- a/Documentation/maintainers/bump_new_revision.sh
+++ b/Documentation/maintainers/bump_new_revision.sh
@@ -19,7 +19,7 @@ get_packages_from_slot() {
 		# version.ebuild
 		sed -e '/^[@#]/d' \
 		    -e '/^$/d' \
-		    -e '\@kde-base/@!d' \
+		    -e "\@${CATEGORY}/@!d" \
 		    -e 's/^>=//g' \
 		    -e 's/^~//g' \
 		    -e 's/^<//g' \
@@ -45,7 +45,7 @@ add_new_sloted_version() {
 		cp ${SLOTFILE} ${NEWSLOTFILE}
 		# fix versioning
 		sed -r -i \
-			-e "\@kde-base/@{s:~:>=:;s:-(9999|4\..\.50)$:-${PREVVER}.50:};/@kde/s:${SLOT}:${BUMP_VERSION}:" \
+			-e "\@${CATEGORY}/@{s:~:>=:;s:-(9999|4\..\.50)$:-${PREVVER}.50:};/@kde/s:${SLOT}:${BUMP_VERSION}:" \
 			${NEWSLOTFILE} || die "unable to update slotfile versioning"
 		# add to git
 		git add ${NEWSLOTFILE}
@@ -54,9 +54,9 @@ add_new_sloted_version() {
 
 # write ebuild directories in which i will work to file.
 find_packagedirs_for_removal() {
-	find ${PORTDIR_BUMPING}/kde-base/ -name \*${VERSION}\*.ebuild -print |while read FILE; do
-		echo ${FILE} |sed -e "s:${PORTDIR_BUMPING}/kde-base/::" \
-			|awk -F'/' '{print "kde-base/"$1}' \
+	find ${PORTDIR_BUMPING}/${CATEGORY}/ -name \*${VERSION}\*.ebuild -print |while read FILE; do
+		echo ${FILE} |sed -e "s:${PORTDIR_BUMPING}/${CATEGORY}/::" \
+			|awk -F'/' '{print "'${CATEGORY}'/"$1}' \
 			>> ${TMPFILE}
 	done
 }
@@ -203,7 +203,8 @@ BUMP_VERSION=
 SET=
 DIR=
 OUTPUT_DIR=
-while getopts a:s:v:b:l:p:o: arg ; do
+CATEGORY="kde-base"
+while getopts a:s:v:b:l:p:o:c: arg ; do
 	case ${arg} in
 		a) OPERATION=${OPTARG} ;;
 		s) SLOT=${OPTARG} ;;
@@ -212,6 +213,7 @@ while getopts a:s:v:b:l:p:o: arg ; do
 		l) SET="${OPTARG}" ;;
 		p) DIR="${OPTARG}" ;;
 		o) OUTPUT_DIR="${OPTARG}" ;;
+		c) CATEGORY="${OPTARG}" ;;
 		*) help ;;
 		?) help ;;
 	esac
@@ -347,7 +349,7 @@ case ${OPERATION} in
 		# then start going per each dir
 		# cvs up, move the ebuild, its patches if needed, run echangelog, run keywords check, manifest
 		#_cvsupdate "${MAINTREE}"
-		find ./kde-base/ -mindepth 1 -maxdepth 1 -type d |sed -e "s:./::" | sort |while read dir; do
+		find ./${CATEGORY}/ -mindepth 1 -maxdepth 1 -type d |sed -e "s:./::" | sort |while read dir; do
 			# we also have to check if directory contains our version if not, we dont copy it
 			pushd "${OVERLAY}/${dir}" &> /dev/null
 			if [[ `find ./ -name \*.ebuild|grep ${VERSION} |wc -l` -gt 0 ]]; then

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Hüttel]

commit:     8fbe45bbab74c3ab37dba2b8fce29f75179f4110
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  6 23:27:21 2014 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Feb  6 23:27:21 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=8fbe45bb

[bumpscript] dont update the keywords again on cvsmove

---
 Documentation/maintainers/bump_new_revision.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Documentation/maintainers/bump_new_revision.sh b/Documentation/maintainers/bump_new_revision.sh
index c273b6b..9158622 100755
--- a/Documentation/maintainers/bump_new_revision.sh
+++ b/Documentation/maintainers/bump_new_revision.sh
@@ -395,7 +395,8 @@ case ${OPERATION} in
 				fi
 				# now we have to check up the keywords
 				pushd "${WRKDIR}" &> /dev/null
-				update_keywords "${EBUILD/*\//}" ${dir}
+				# update_keywords "${EBUILD/*\//}" ${dir}
+				# ^for unknown reason this is broken, but the keywords are already correct from the initial bump
 				echangelog "Version bump KDE SC ${VERSION}"
 				repoman manifest
 				popd &> /dev/null

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Robin H. Johnson]

commit:     ddc25d3c35c2b37f29333800db76446756c9e1a7
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 17 23:04:20 2014 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Jan 17 23:04:20 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ddc25d3c

[maint] experimental bash script to copy keywords

---
 Documentation/maintainers/copy-keywords | 48 +++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/Documentation/maintainers/copy-keywords b/Documentation/maintainers/copy-keywords
new file mode 100755
index 0000000..c75ae41
--- /dev/null
+++ b/Documentation/maintainers/copy-keywords
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+SOURCE=${1:-~/Gentoo/gentoo-x86}
+SOURCEVER=${2:-4.11.2}
+
+DEST=${3:-~/Gentoo/kde}
+DESTVER=${4:-4.12.1}
+
+TESTING=${5:-yes}
+
+for pd in ${SOURCE}/kde-base/* ; do 
+
+  if [ "`basename ${pd}`x" == 'CVSx' ]; then 
+
+     true
+
+  else
+
+     p="`basename $pd`"
+     kw=`cat ${pd}/${p}-${SOURCEVER}*ebuild | grep "^KEYWORDS" | head -n 1 | sed -e 's:^KEYWORDS="::' -e 's:".*$::'`
+
+     if [ "${kw}x" == x ]; then 
+
+       echo "error: $p ebuild not found"
+     
+     else
+
+       if [ -f "${DEST}/kde-base/${p}/${p}-${DESTVER}.ebuild" ]; then 
+
+         echo "processing $p"
+
+         sed -i "${DEST}/kde-base/${p}/${p}-${DESTVER}.ebuild" -e "/^KEYWORDS/cKEYWORDS=\"${kw}\""
+
+         if [ ${TESTING} == yes ]; then 
+           ekeyword ~all "${DEST}/kde-base/${p}/${p}-${DESTVER}.ebuild"
+         fi
+
+       else 
+
+         echo "error: no file ${DEST}/kde-base/${p}/${p}-${DESTVER}.ebuild"
+
+       fi
+
+     fi
+
+  fi
+
+done

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Chris Reffett]

commit:     393c2c22c44470fd351a19569b4e86206cdfeafe
Author:     Chris Reffett <creffett <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  5 22:01:36 2014 +0000
Commit:     Chris Reffett <creffett <AT> gentoo <DOT> org>
CommitDate: Mon Jan  6 01:23:52 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=393c2c22

[Documentation/maintainers/bump_new_revision.sh] Add workaround (grep
for ${SLOT} to prevent picking up keywords for the wrong slot, add hack
(grep -v 4.4.11) to prevent it from picking up keywords from oldpim

---
 Documentation/maintainers/bump_new_revision.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/maintainers/bump_new_revision.sh b/Documentation/maintainers/bump_new_revision.sh
index 01210d0..4da839b 100755
--- a/Documentation/maintainers/bump_new_revision.sh
+++ b/Documentation/maintainers/bump_new_revision.sh
@@ -117,7 +117,7 @@ update_keywords() {
 			elif (( version_patch < 50 )); then
 				# Patch version is < 50 - stable release, try to obtain keywords from tree
 				if pushd "$(portageq portdir)/${2}" &> /dev/null; then
-					KEYWORDS=$(ls -1r *-4*.ebuild | grep -v ${BUMP_VERSION} | head -n 1 | xargs sed -ne 's/^KEYWORDS="\(.*\)"/\1/p')
+					KEYWORDS=$(ls -1r *-4*.ebuild | grep -v ${BUMP_VERSION} | grep -v 4.4.11 | grep ${SLOT} | head -n 1 | xargs sed -ne 's/^KEYWORDS="\(.*\)"/\1/p')
 					[[ -z ${KEYWORDS} ]] && KEYWORDS=${MINIMAL_KEYWORDS}
 				else
 					KEYWORDS=${MINIMAL_KEYWORDS}

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Chris Reffett]

commit:     8d033c72b0a1687134d1089a44cb22a7109094d6
Author:     Chris Reffett <creffett <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  5 23:20:18 2014 +0000
Commit:     Chris Reffett <creffett <AT> gentoo <DOT> org>
CommitDate: Mon Jan  6 01:23:52 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=8d033c72

[Documentation/maintainers/bump_new_revision.sh] Make it not match
4.4.11 == pykde4-4.11 by escaping the .

---
 Documentation/maintainers/bump_new_revision.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/maintainers/bump_new_revision.sh b/Documentation/maintainers/bump_new_revision.sh
index 4da839b..c273b6b 100755
--- a/Documentation/maintainers/bump_new_revision.sh
+++ b/Documentation/maintainers/bump_new_revision.sh
@@ -117,7 +117,7 @@ update_keywords() {
 			elif (( version_patch < 50 )); then
 				# Patch version is < 50 - stable release, try to obtain keywords from tree
 				if pushd "$(portageq portdir)/${2}" &> /dev/null; then
-					KEYWORDS=$(ls -1r *-4*.ebuild | grep -v ${BUMP_VERSION} | grep -v 4.4.11 | grep ${SLOT} | head -n 1 | xargs sed -ne 's/^KEYWORDS="\(.*\)"/\1/p')
+					KEYWORDS=$(ls -1r *-4*.ebuild | grep -v ${BUMP_VERSION} | grep -v 4\\.4\\.11 | grep ${SLOT} | head -n 1 | xargs sed -ne 's/^KEYWORDS="\(.*\)"/\1/p')
 					[[ -z ${KEYWORDS} ]] && KEYWORDS=${MINIMAL_KEYWORDS}
 				else
 					KEYWORDS=${MINIMAL_KEYWORDS}

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Johannes Huber]

commit:     efa970b4d1cfabadacbf108453745ec85c36fcee
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  3 23:08:20 2013 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Dec  3 23:08:20 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=efa970b4

[Documentation] Fix bumptool git version removal

---
 Documentation/maintainers/bump_new_revision.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Documentation/maintainers/bump_new_revision.sh b/Documentation/maintainers/bump_new_revision.sh
index 0c8bb16..01210d0 100755
--- a/Documentation/maintainers/bump_new_revision.sh
+++ b/Documentation/maintainers/bump_new_revision.sh
@@ -299,7 +299,8 @@ case ${OPERATION} in
 			EBUILD_BASENAME=${EBUILD_BASEDIR/*\//}
 			pushd "${PORTDIR_BUMPING}"/"${EBUILD_BASEDIR}" > /dev/null
 			if [[ -d "${PORTDIR_BUMPING}/.git" ]]; then
-				git rm "${EBUILD_BASENAME}-${VERSION}"*.ebuild
+				EBUILD=`find ./ -name \*.ebuild | grep "${VERSION}\(\-r[0-9]\+\)\?\\." | sort |tail -n 1`
+				git rm "${EBUILD}"
 			elif [[ -d CVS ]]; then
 				cvs remove -f "${EBUILD_BASENAME}-${VERSION}"*.ebuild
 				echangelog "Remove KDE SC ${VERSION}"
@@ -330,7 +331,7 @@ case ${OPERATION} in
 #			fi
 			repoman manifest
 			if [[ -d "${PORTDIR_BUMPING}/.git" ]]; then
-				git add .
+				git add --all .
 			fi
 			popd &> /dev/null #go back to workdir
 		done

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Maciej Mrozowski]

commit:     4e81ea0e963c31b13fe8a6386f6ac90f32606bd5
Author:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 23 01:54:05 2013 +0000
Commit:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 23 02:04:43 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=4e81ea0e

[Documentation] Fix dynlink-scanner (make scanelf resolve full library paths, detect broken file utility, add some comments for easier maintenace in a future)

---
 Documentation/maintainers/dynlink-scanner | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/Documentation/maintainers/dynlink-scanner b/Documentation/maintainers/dynlink-scanner
index 07f4fff..017f929 100755
--- a/Documentation/maintainers/dynlink-scanner
+++ b/Documentation/maintainers/dynlink-scanner
@@ -1,9 +1,10 @@
 #!/bin/bash
 
-run_scanelf()
+# Returns colon separated list of linking dependencies
+get_link_deps()
 {
 	KEY=
-	for dep in `scanelf -yBF '%f %n' "$1"`; do
+	for dep in `scanelf --use-ldpath -yBF '%f %n' "$1"`; do
 		if [[ -z $KEY ]]; then
 			KEY="$dep"
 			continue
@@ -12,12 +13,19 @@ run_scanelf()
 	done
 }
 
-if [[ "$1" = --internal ]]; then
+# Print linking deps for given executable or shared object in alphabetical order.
+# Also try to dlopen shared objects in order to detect missing/broken dependencies.
+if [[ "$1" = --linking-deps ]]; then
+	# Sanity check, file-5.12 is broken, bail out early
+	if [[ `file --version | grep --color=never file- | cut -d'-' -f2` == '5.12' ]]; then
+		echo "file-5.12 is broken, bailing out"
+		exit 1
+	fi
 	mime=`file -b --mime-type "$2"`
 	if [[ "$mime" == 'application/x-executable' ]] || [[ "${mime}" == 'application/x-sharedlib' ]]; then
-		LINK=`run_scanelf "$2"`
+		LINK=`get_link_deps "$2"`
 		[[ "$mime" == 'application/x-sharedlib' ]] && /tmp/try_dlopen "$2"
-		[[ -n $LINK ]] && echo -e ${LINK//,/\\n}
+		[[ -n $LINK ]] && echo -e ${LINK//,/\\n} | sort -u
 		exit 0
 	fi
 	exit 1
@@ -25,17 +33,23 @@ fi
 
 [[ -z $* ]] && echo "usage: `basename $0` <package>" && exit 0
 
+# Check whether package is installed
 if ! portageq has_version $ROOT/ $1; then
 	echo "$1 is not installed"
 	exit 1
 fi
 
-LDLIBS=`/sbin/ldconfig -p`
+# Compile dlopen test application, we will use it to check for broken linking dependencies
 gcc "`dirname $0`/try_dlopen.c" -o /tmp/try_dlopen -ldl
 
+# For each installed slot
 for cpv in `portageq match $ROOT/ $1`; do
 	echo "Processing $cpv"
-	qfile -eR $ROOT `portageq contents $ROOT/ $cpv | xargs -r -L 1 "$0" --internal | sort -u` | cut -f1 -d' ' | sort -u
+	# For each file that belongs to package
+	#     run dynlink-scanner --linking-deps <file> to obtain its linking dependencies
+	# Assign all linking deps to packages and print package names
+	qfile -eR $ROOT `portageq contents $ROOT/ $cpv | xargs -r -L 1 "$0" --linking-deps` | cut -f1 -d' ' | sort -u
 done
 
+# Cleanup
 rm -f /tmp/try_dlopen

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Chris Reffett]

commit:     0888ef0e5b21ad0adf56678604304ff000c5bd19
Author:     Chris Reffett <creffett <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  9 03:50:49 2013 +0000
Commit:     Chris Reffett <creffett <AT> gentoo <DOT> org>
CommitDate: Wed Oct  9 03:50:49 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0888ef0e

[bump_new_revision.sh] Make script properly handle revbumped packages in
overlay

---
 Documentation/maintainers/bump_new_revision.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Documentation/maintainers/bump_new_revision.sh b/Documentation/maintainers/bump_new_revision.sh
index 18b9ea0..0c8bb16 100755
--- a/Documentation/maintainers/bump_new_revision.sh
+++ b/Documentation/maintainers/bump_new_revision.sh
@@ -361,7 +361,8 @@ case ${OPERATION} in
 				# we need to copy the file we want to play with
 				## first generate the correct filename, we expect that if someone added -rX to the package it has reason.
 				pushd "${OVERLAY}/${dir}" &> /dev/null
-				EBUILD=`find ./ -name \*.ebuild |grep "${VERSION}\\." | sort |tail -n 1`
+				EBUILD=`find ./ -name \*.ebuild | grep "${VERSION}\(\-r[0-9]\+\)\?\\." | sort |tail -n 1`
+				echo ${EBUILD}
 				cp -f ${EBUILD} "${WRKDIR}"
 				popd &> /dev/null
 				_addcvsfile "${WRKDIR}" ${EBUILD/*\//}

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Marc Schiffbauer]

commit:     4d154972415a028912fbb578e6024b3c37320217
Author:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 25 16:21:06 2013 +0000
Commit:     Marc Schiffbauer <marc <AT> schiffbauer <DOT> net>
CommitDate: Tue Jun 25 16:21:06 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=4d154972

[Documentation] Drop requirement to cd to scriptdir in regenerate_files

---
 Documentation/maintainers/regenerate-files | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index f7f34ec..6dd39af 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -3,12 +3,10 @@
 # Make sure that all systems have the same sort order and date format
 export LC_ALL=C
 
-SCRIPT=`basename $0`
-if [[ ! -f "${PWD}/${SCRIPT}" ]]; then
-	echo "You need to be in '"`dirname $0`"' dir to run this script."
-	exit -1
-fi
+# change directory to script location
+cd "$(dirname $0)"
 
+SCRIPT=$(basename $0)
 HEADER="# Autogenerated by ${SCRIPT}, DO NOT EDIT."
 
 KDE_RELEASES="4.10 4.11"

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Michael Palimaka]

commit:     90a1d9d61499f6a8666209083a7823a4c4465c31
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 15 09:47:37 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Apr 15 09:47:37 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=90a1d9d6

[Documentation] Fix set generation for 4.10.

---
 Documentation/maintainers/regenerate-files |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index ddbcd47..a368292 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -11,8 +11,8 @@ fi
 
 HEADER="# Autogenerated by ${SCRIPT}, DO NOT EDIT."
 
-KDE_RELEASES="4.9 4.10"
-RELEASE=${RELEASE:-4.9}
+KDE_RELEASES="4.10"
+RELEASE=${RELEASE:-4.10}
 
 # regenerate keywords
 pushd ../package.keywords/ > /dev/null
@@ -97,6 +97,6 @@ pushd ../../sets/ > /dev/null
 for set in *-${RELEASE}; do
 	newfile=${set/%-${RELEASE}}
 	echo -e "${HEADER}" > "${newfile}"
-	sed -r "/@/s/-${RELEASE}//g;/9999$/s/~//;s/<//;\@kde-base/@s/-(9999|4\..\.50)/:4/" "${set}" >> "${newfile}"
+	sed -r "/@/s/-${RELEASE}//g;/9999$/s/~//;s/<//;\@kde-base/@s/-(9999|4\...\.50)/:4/" "${set}" >> "${newfile}"
 done
 popd > /dev/null

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Marc Schiffbauer]

commit:     4ee3f345a573e06d4e42cc99ab077d9e64243b04
Author:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 19 22:11:23 2012 +0000
Commit:     Marc Schiffbauer <marc <AT> schiffbauer <DOT> net>
CommitDate: Wed Dec 19 22:11:23 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=4ee3f345

[Documentation] some fixes and cleanups for regenerate-files

* fix generation of 4.*.49.9999 keyword file
* added variable for KDE_RELEASES

---
 Documentation/maintainers/regenerate-files |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index 90a55d2..9e84d0f 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -11,9 +11,12 @@ fi
 
 HEADER="# Autogenerated by ${SCRIPT}, DO NOT EDIT."
 
+KDE_RELEASES="4.9 4.10"
+RELEASE=${RELEASE:-4.8}
+
 # regenerate keywords
 pushd ../package.keywords/ > /dev/null
-for release in 4.8 4.9 4.10; do
+for release in $KDE_RELEASES; do
 	echo -e "${HEADER}" > "kde-${release}.keywords"
 	if [[ -d ".kde-${release}" ]]; then
 		cat ".kde-${release}/"* | sed '/^~.*[.-]9999$/s/$/ **/' >> "kde-${release}.keywords"
@@ -21,14 +24,15 @@ for release in 4.8 4.9 4.10; do
 done
 
 # ... and for completely unkeyworded packages, add "**"
-for release in 4.9; do
+for release in $KDE_RELEASES; do
 	if [[ -d ".kde-${release}" ]]; then
 		rm -rf ".kde-${release}.49.9999"
 		mkdir -p ".kde-${release}.49.9999"
 		echo -e "${HEADER}" > "kde-${release}.49.9999.keywords"
 		for file in ".kde-${release}"/*; do
 			newfile=".kde-${release}.49.9999"/$(basename "${file}")
-			sed "/^<kde-base\/.*-4\..\.50$/{s/-4\..\.50/-${release}.49.9999/;s/^</~/};/^~.*[.-]9999$/s/$/ **/" "${file}" > "${newfile}"
+			sed "/^<kde-base\/.*-${release/./\.}\.50$/{s/-${release/./\.}\.50/-${release}.49.9999/;s/^</~/};/^~.*[.-]9999$/s/$/ **/" "${file}" > "${newfile}"
+			echo "${newfile}"
 		done
 		cat ".kde-${release}.49.9999"/* >> "kde-${release}.49.9999.keywords"
 	fi
@@ -56,7 +60,7 @@ popd > /dev/null
 
 # regenerate unmask entries (base for package mask)
 pushd ../package.unmask/ > /dev/null
-for release in 4.8 4.9 4.10 live; do
+for release in $KDE_RELEASES live; do
 	echo -e "${HEADER}" > "kde-${release}"
 	if [[ -d ".kde-${release}" ]]; then
 		cat ".kde-${release}/"* >> "kde-${release}"
@@ -66,7 +70,7 @@ popd > /dev/null
 
 # regenerate mask entries (base for package mask)
 pushd ../package.mask/ > /dev/null
-for release in 4.8 4.9 4.10 live; do
+for release in $KDE_RELEASES live; do
 	echo -e "${HEADER}" > "kde-${release}"
 	if [[ -d "../package.unmask/.kde-${release}" ]]; then
 		cat "../package.unmask/.kde-${release}/"* >> "kde-${release}"
@@ -89,7 +93,6 @@ fi
 popd > /dev/null
 
 # regenerate unversioned sets
-RELEASE=${RELEASE:-4.8}
 pushd ../../sets/ > /dev/null
 for set in *-${RELEASE}; do
 	newfile=${set/%-${RELEASE}}

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Alexey Shvetsov]

commit:     8c3346b35567d9c56377b0f4df4c122a673353db
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 16 16:51:50 2012 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Fri Nov 16 16:51:50 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=8c3346b3

[Documentation] Fix bumptool

Signed-off-by: Alexey Shvetsov <alexxy <AT> gentoo.org>

---
 Documentation/maintainers/bump_new_revision.sh |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/Documentation/maintainers/bump_new_revision.sh b/Documentation/maintainers/bump_new_revision.sh
index ca07b12..18b9ea0 100755
--- a/Documentation/maintainers/bump_new_revision.sh
+++ b/Documentation/maintainers/bump_new_revision.sh
@@ -17,7 +17,15 @@ get_packages_from_slot() {
 		echo ${SLOTFILE} # debug
 		# remove empty lines, another slots and comments, replace slot by
 		# version.ebuild
-		sed -e '/^[@#]/d;/^$/d;\@kde-base/@!d;s/^>=//g;s/^~//g;s/-4\..\.50$//g;s/-9999$//g' \
+		sed -e '/^[@#]/d' \
+		    -e '/^$/d' \
+		    -e '\@kde-base/@!d' \
+		    -e 's/^>=//g' \
+		    -e 's/^~//g' \
+		    -e 's/^<//g' \
+		    -e 's/-4\..\.50$//g' \
+		    -e 's/-4\.1.\.50$//g' \
+		    -e 's/-9999$//g' \
 			${SLOTFILE} >> ${TMPFILE}
 	done
 }

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Michael Palimaka]

commit:     5821a4d63b4048fba040515c7cfcd7606cf89be8
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 11 20:20:25 2012 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Sep 11 20:20:25 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5821a4d6

[maintainers] Remove unused movedtotree file.

---
 Documentation/maintainers/movetotree |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/Documentation/maintainers/movetotree b/Documentation/maintainers/movetotree
deleted file mode 100644
index 034cb44..0000000
--- a/Documentation/maintainers/movetotree
+++ /dev/null
@@ -1,5 +0,0 @@
-# Gentoo developers, please move the following into Getnoo mainline:
-
-# Dennis Schridde <devurandom@gmx.net> (13 Feb 2011)
-# Fixes bugs #201948, #226823 and #256574.
-sys-auth/nss-mdns-0.10-r1

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Johannes Huber]

commit:     5c16bc7b8221a498e95652946cbadac2210c0666
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  7 13:20:08 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Aug  7 13:20:08 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5c16bc7b

[scripts] Remove KDE 4.8 stable branch (4.8.49.9999).

---
 Documentation/maintainers/regenerate-files |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index e539586..06083d6 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -21,7 +21,7 @@ for release in 4.7 4.8 4.9; do
 done
 
 # ... and for completely unkeyworded packages, add "**"
-for release in 4.8 4.9; do
+for release in 4.9; do
 	if [[ -d ".kde-${release}" ]]; then
 		rm -rf ".kde-${release}.49.9999"
 		mkdir -p ".kde-${release}.49.9999"

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Johannes Huber]

commit:     7a66f010f211769aa4349071bdc4b69f24805e56
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  2 10:27:06 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Aug  2 10:27:06 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=7a66f010

[scripts] Remove obsolete koffice handling.

---
 Documentation/maintainers/bump_new_revision.sh |    4 ++--
 Documentation/maintainers/kde-l10n-repack.sh   |    2 +-
 Documentation/maintainers/regenerate-files     |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Documentation/maintainers/bump_new_revision.sh b/Documentation/maintainers/bump_new_revision.sh
index afdec02..ca07b12 100755
--- a/Documentation/maintainers/bump_new_revision.sh
+++ b/Documentation/maintainers/bump_new_revision.sh
@@ -3,7 +3,7 @@
 # KDE Version bumper
 # Created by Gentoo kde-herd
 # This tool is meant to be used for ease of version bumping for KDE ebuilds
-# v 0.21
+# v 0.22
 ###############################################################################
 # functions
 ###############################################################################
@@ -13,7 +13,7 @@ get_packages_from_slot() {
 
 	# if user specify set then use desired one only
 	find ${PORTDIR_BUMPING}/sets/ -maxdepth 1 -type f -name ${SET}\*-${SLOT} -print \
-			| grep -v kdedeps | grep -v koffice | while read SLOTFILE; do
+			| grep -v kdedeps | while read SLOTFILE; do
 		echo ${SLOTFILE} # debug
 		# remove empty lines, another slots and comments, replace slot by
 		# version.ebuild

diff --git a/Documentation/maintainers/kde-l10n-repack.sh b/Documentation/maintainers/kde-l10n-repack.sh
index aa1112e..33c126a 100755
--- a/Documentation/maintainers/kde-l10n-repack.sh
+++ b/Documentation/maintainers/kde-l10n-repack.sh
@@ -10,7 +10,7 @@ svn up -r ${SVNREV} kde-l10n
 cp -r kde-l10n kde-l10n_packages
 cd kde-l10n_packages
 for L in ${LANGS}; do
-	rm -rf ./${L}/messages/{extragear-*,koffice,playground-*,qt,kdevelop,kdereview}
+	rm -rf ./${L}/messages/{extragear-*,playground-*,qt,kdevelop,kdereview}
 	./scripts/autogen.sh ${L}
 	mv ${L} kde-l10n-${L}-${KDEVER}
 	cd kde-l10n-${L}-${KDEVER}

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index d4feec8..e539586 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -46,7 +46,7 @@ if [[ -d .kde-live.base ]]; then
 fi
 
 # keywords for miscleanous packages from package.unmask/
-for misc in kde-extras-live koffice-live; do
+for misc in kde-extras-live; do
 	if [[ -f "../package.unmask/${misc}" ]]; then
 		echo -e "${HEADER}" > "${misc}.keywords"
 		sed '/^~.*[.-]9999$/s/$/ **/' "../package.unmask/${misc}" >> "${misc}.keywords"

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Hüttel]

commit:     74e196a2c3278e3c6a793f9c79323906c75ccb41
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Thu Jun 21 22:01:47 2012 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Jun 21 22:01:47 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=74e196a2

[bumptool] make sure we dont bump 4.8.49.9999 instead of 4.8.4

---
 Documentation/maintainers/bump_new_revision.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Documentation/maintainers/bump_new_revision.sh b/Documentation/maintainers/bump_new_revision.sh
index 5af1ddb..afdec02 100755
--- a/Documentation/maintainers/bump_new_revision.sh
+++ b/Documentation/maintainers/bump_new_revision.sh
@@ -353,7 +353,7 @@ case ${OPERATION} in
 				# we need to copy the file we want to play with
 				## first generate the correct filename, we expect that if someone added -rX to the package it has reason.
 				pushd "${OVERLAY}/${dir}" &> /dev/null
-				EBUILD=`find ./ -name \*.ebuild |grep ${VERSION} | sort |tail -n 1`
+				EBUILD=`find ./ -name \*.ebuild |grep "${VERSION}\\." | sort |tail -n 1`
 				cp -f ${EBUILD} "${WRKDIR}"
 				popd &> /dev/null
 				_addcvsfile "${WRKDIR}" ${EBUILD/*\//}

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Hüttel]

commit:     c6619752e3a67887ed731501a65654585a6d87c9
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sat Jun  2 22:08:52 2012 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jun  2 22:09:24 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c6619752

[doc] Added raw file of official forum topic

---
 Documentation/maintainers/forum-post.txt |   87 ++++++++++++++++++++++++++++++
 1 files changed, 87 insertions(+), 0 deletions(-)

diff --git a/Documentation/maintainers/forum-post.txt b/Documentation/maintainers/forum-post.txt
new file mode 100644
index 0000000..9fd3889
--- /dev/null
+++ b/Documentation/maintainers/forum-post.txt
@@ -0,0 +1,87 @@
+This is the official guide for KDE 4 related threads.
+
+KDE 4 for Gentoo is delivered in several ways:
+[list]
+[*][b][url=http://en.gentoo-wiki.com/wiki/Portage]Portage repository[/url][/b]
+The only officially supported and recommended way to get [url=http://www.kde.org/announcements/announce-4.4.4.php]KDE4 (4.4.4 recently)[/url].
+If you haven't used any [url=http://en.gentoo-wiki.com/wiki/Portage_Overlay]overlay[/url] nor compiled KDE 4 from source manually - this is probably what you're looking for.
+KDE 4 portage guide can be found [url=http://www.gentoo.org/proj/en/desktop/kde/kde4-guide.xml]here[/url] - read it please to avoid problems in a future, it's is advised that you checked FAQ below as well.
+You've found a bug? Visit this [url=http://tinyurl.com/3bpdlv]page[/url] - it may have been reported already.
+Support thread for KDE 4 in Portage can be found here: 
+[topic=707986]http://forums.gentoo.org/viewtopic-t-707986.html[/topic]
+
+[*][b]Official Gentoo KDE team testing overlay [[url=http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git]kde[/url]][/b]
+This is overlay used by [url=http://www.gentoo.org/proj/en/desktop/kde/]Gentoo KDE team[/url], it's official but unsupported.
+It contains:[list]
+[*]KDE releases that will later appear in the Portage repository (-4.4.x)
+[*]live KDE ebuilds tracking main development tree (-9999)
+[*]periodically updated main development tree snapshots, beta or pre-release (-4.4.xx)
+[*]live KDE ebuilds tracking 4.4.x development branch (-4.4.9999)
+[*]live KDE ebuilds tracking 4.5.x development branch (-4.5.9999)
+[*]3rd party KDE packages that are not in Portage repository for various reasons[/list]
+If you have some suggestions or you would like to contribute, contact Gentoo KDE team on [url=irc://irc.freenode.net/gentoo-kde]#gentoo-kde.[/url]
+Please DON'T report any [url=https://bugs.gentoo.org/]bugs[/url] regarding live packages in this overlay. For bugs related KDE release candidates you should add [kde-testing] to description, but it's [b]always[/b] better to ask on forum or IRC channel first.
+Support thread for official KDE4 testing overlay is here: 
+[url]http://forums.gentoo.org/viewtopic-t-722264.html[/url]
+
+Qt4 live ebuilds can be found in Qt-exclusive experimental overlay now.
+To make use of them, choose the [url=http://gitorious.org/gentoo-qt/qting-edge]qting-edge[/url] overlay in [i]layman[/i].
+
+[*][b]Official Gentoo user-maintained Qt3/KDE3 overlay [[url=http://git.overlays.gentoo.org/gitweb/?p=proj/kde-sunset.git]kde-sunset[/url]][/b]
+This overlay contains Qt3 and KDE3 packages removed from main repository. It is maintaned by community. If you're interested in contributing, please let us know.
+Gentoo KDE team can be found on [url=irc://irc.freenode.net/gentoo-kde]#gentoo-kde[/url].
+[/list]
+
+[size=18]KDE in Portage - FAQ[/size]
+
+[color=orange]Q:[/color] What's the deal with [b]kdeprefix[/b] USE flag and why is it masked?
+
+[b]A:[/b] [b]kdeprefix[/b] USE flag allows installing KDE4 in alternate location, thus making it possible to have multiple KDE4 releases side by side. Note that this is not needed to have KDE3 installed as well. Because having multiple KDE4 installations has known issues like bugs [bug=258027]258027[/bug] or [bug=267793]267793[/bug], it's not ready for public consumption hence it's been disabled by default.
+
+
+[color=orange]Q:[/color] I want to run amarok, but all I get is "symbol lookup error: /usr/kde/live/lib64/kde4/plugins/styles/oxygen.so: undefined symbol". What should I do?
+
+[b]A:[/b] It's a Qt bug that appears when using [b]kdeprefix[/b] USE flag. Qt plugin loader appends "qtplugins" path from currently running KDE4 session, causing oxygen.so from wrong KDE prefix to be dlopen'ed. Unfortunately it as well cashes plugin locations in [color=blue]~/.config/Trolltech.conf[/color], making it permanently broken unless the file is removed. It usually happens with amarok or any other KDE4 applications installed in no prefix ([color=blue]/usr[/color]), that are built against existing KDE4 in one prefix (for example [color=blue]/usr/kde/4.2[/color]), but run from the other (for example in Gnome, KDE3 or [color=blue]/usr/kde/live[/color]). For now there's no known solution.
+
+
+[color=orange]Q:[/color] Why there are no sets for KDE4?
+
+[b]A:[/b] KDE4 so far is NOT making use of sets but sets are expected to arrive in near future - the reason is - the naming convention for sets is not yet established. Although KDE4 Gentoo team prepared some sets for you [url=http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=tree;f=sets;h=829bc933b1e43e13133dcd6f9c2c2c5566569315;hb=master]here[/url] (click 'raw' to download file and place in [color=blue]/etc/portage/sets/[/color]). An archive with all sets can be downloaded from [url=http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=snapshot;h=829bc933b1e43e13133dcd6f9c2c2c5566569315;sf=tgz]here[/url]. Remember that you are using them at your own risk.
+
+
+[color=orange]Q:[/color] When I start KDE 3, Plasma is being executed and my KDE 3 applications are either crashing or just not working. Konqueror refuses to start, complaining about default stylesheet version mismatch. What's going on?
+
+[b]A:[/b] This is the conflict related to mixed KDE3/KDE4 sessions. To fix this issue you need to [url=http://www.gentoo.org/proj/en/desktop/kde/kde-split-ebuilds.xml]upgrade[/url] your existing KDE 3.5.x installations to 3.5.10 or newer. Note that the 3.5.10 series has not been given stable keywords yet and that the monolithic packages have been discontinued.
+
+
+[color=orange]Q:[/color] I installed KDE4, I can start my desktop using startx but KDM is not working. Please help.
+
+[b]A:[/b] First, ensure that [color=blue]kdm[/color] executable is in your [i]PATH[/i]. To check that, run:
+[code]which kdm[/code]
+If it's not found, then probably your environment is not up to date. To update it, run:
+[code]env-update && source /etc/profile[/code]
+When [color=blue]kdm[/color] is found, set [i]DISPLAYMANAGER="kdm"[/i] variable in [color=blue]/etc/conf.d/xdm[/color]. From now on, KDM should be working.
+
+
+[color=orange]Q:[/color] I just found this neat KDE4 application, can you make an ebuild for it?
+
+[b]A:[/b] In short, no. To be more precise, it is possible but it would be better if you [url=http://devmanual.gentoo.org/ebuild-writing]created ebuild[/url] for it and send it Gentoo KDE team for review - it's more likely it will be added to overlay. The best procedure would be to create [url=https://bugs.gentoo.org]bug[/url] with ebuild proposal (if it's not there already) and inform the developers on [url=irc://irc.freenode.net/gentoo-kde]#gentoo-kde[/url] about it:
+[quote]Hi, i found this nice app blablu v 14.2 i opened bug 234556 for it. Please could you consider adding it to kde-testing?[/quote]
+
+If you have any suggestions for improvements regarding this guide, feel free to post them [topic=708322]here[/topic]. Please refrain from general discussion and do not post ebuild/installation questions there.
+
+[i]Stuck by NeddySeagoon[/i]
+
+[i]Locked and split off the other posts as a feedback [topic=708322]topic[/topic]. -- desultory[/i]
+[i]Made some minor grammatical corrections at the request of reavertm. -- desultory[/i]
+[i]Continued updates. -- desultory[/i]
+[i]Updated link -- Jorge (jmbsvicetto)[/i]
+[i]Update kde-guide link -- Jorge (jmbsvicetto)[/i]
+[i]Removed arrival progress estimation link. -- desultory[/i]
+[i]Applied changes asked [url=https://forums.gentoo.org/viewtopic-p-5237336.html#5237336]here[/url] -- Jorge (jmbsvicetto)[/i]
+[i]Applied more [post=5245444]updates[/post]. -- desultory[/i]
+[i]Applied even more [post=5255329]updates[/post] -- Jorge (jmbsvicetto).[/i]
+[i]Applied [post=5262576]updates[/post], [post=5276245]updates[/post] and more updates. Updated links. [post=5368691]A[/post][post=5401451]p[/post][post=5423969]p[/post][post=5552930]l[/post][post=5669087]i[/post][post=5734682]e[/post][post=5786336]d[/post] [post=5811962]updates[/post]. -- desultory[/i]
+[i]Applied [post=5847443]update[/post].  --kallamej[/i]
+[i]Applied [post=5956057]updates[/post]. -- desultory[/i]
+[i]Updates, removed info about genkdesvn (offline) and replaced kde-crazy with kde-sunset. -- reavertm[/i]

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas Hüttel]

commit:     393cd4f7f9310a30a90d536c6b66351dff1ac46d
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sat Jun  2 22:11:04 2012 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jun  2 22:11:04 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=393cd4f7

[doc] Line breaks

---
 Documentation/maintainers/forum-post.txt |  119 ++++++++++++++++++++++-------
 1 files changed, 90 insertions(+), 29 deletions(-)

diff --git a/Documentation/maintainers/forum-post.txt b/Documentation/maintainers/forum-post.txt
index 9fd3889..66f5297 100644
--- a/Documentation/maintainers/forum-post.txt
+++ b/Documentation/maintainers/forum-post.txt
@@ -3,15 +3,22 @@ This is the official guide for KDE 4 related threads.
 KDE 4 for Gentoo is delivered in several ways:
 [list]
 [*][b][url=http://en.gentoo-wiki.com/wiki/Portage]Portage repository[/url][/b]
-The only officially supported and recommended way to get [url=http://www.kde.org/announcements/announce-4.4.4.php]KDE4 (4.4.4 recently)[/url].
-If you haven't used any [url=http://en.gentoo-wiki.com/wiki/Portage_Overlay]overlay[/url] nor compiled KDE 4 from source manually - this is probably what you're looking for.
-KDE 4 portage guide can be found [url=http://www.gentoo.org/proj/en/desktop/kde/kde4-guide.xml]here[/url] - read it please to avoid problems in a future, it's is advised that you checked FAQ below as well.
-You've found a bug? Visit this [url=http://tinyurl.com/3bpdlv]page[/url] - it may have been reported already.
+The only officially supported and recommended way to get
+[url=http://www.kde.org/announcements/announce-4.4.4.php]KDE4 (4.4.4 recently)[/url].
+If you haven't used any [url=http://en.gentoo-wiki.com/wiki/Portage_Overlay]overlay[/url]
+nor compiled KDE 4 from source manually - this is probably what you're looking for.
+KDE 4 portage guide can be found
+[url=http://www.gentoo.org/proj/en/desktop/kde/kde4-guide.xml]here[/url] - read it please
+to avoid problems in a future, it's is advised that you checked FAQ below as well.
+You've found a bug? Visit this [url=http://tinyurl.com/3bpdlv]page[/url] - it may have
+been reported already.
 Support thread for KDE 4 in Portage can be found here: 
 [topic=707986]http://forums.gentoo.org/viewtopic-t-707986.html[/topic]
 
-[*][b]Official Gentoo KDE team testing overlay [[url=http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git]kde[/url]][/b]
-This is overlay used by [url=http://www.gentoo.org/proj/en/desktop/kde/]Gentoo KDE team[/url], it's official but unsupported.
+[*][b]Official Gentoo KDE team testing overlay
+[[url=http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git]kde[/url]][/b]
+This is overlay used by [url=http://www.gentoo.org/proj/en/desktop/kde/]Gentoo KDE
+team[/url], it's official but unsupported.
 It contains:[list]
 [*]KDE releases that will later appear in the Portage repository (-4.4.x)
 [*]live KDE ebuilds tracking main development tree (-9999)
@@ -19,69 +26,123 @@ It contains:[list]
 [*]live KDE ebuilds tracking 4.4.x development branch (-4.4.9999)
 [*]live KDE ebuilds tracking 4.5.x development branch (-4.5.9999)
 [*]3rd party KDE packages that are not in Portage repository for various reasons[/list]
-If you have some suggestions or you would like to contribute, contact Gentoo KDE team on [url=irc://irc.freenode.net/gentoo-kde]#gentoo-kde.[/url]
-Please DON'T report any [url=https://bugs.gentoo.org/]bugs[/url] regarding live packages in this overlay. For bugs related KDE release candidates you should add [kde-testing] to description, but it's [b]always[/b] better to ask on forum or IRC channel first.
+If you have some suggestions or you would like to contribute, contact Gentoo KDE team on
+[url=irc://irc.freenode.net/gentoo-kde]#gentoo-kde.[/url]
+Please DON'T report any [url=https://bugs.gentoo.org/]bugs[/url] regarding live packages
+in this overlay. For bugs related KDE release candidates you should add [kde-testing] to
+description, but it's [b]always[/b] better to ask on forum or IRC channel first.
 Support thread for official KDE4 testing overlay is here: 
 [url]http://forums.gentoo.org/viewtopic-t-722264.html[/url]
 
 Qt4 live ebuilds can be found in Qt-exclusive experimental overlay now.
-To make use of them, choose the [url=http://gitorious.org/gentoo-qt/qting-edge]qting-edge[/url] overlay in [i]layman[/i].
+To make use of them, choose the
+[url=http://gitorious.org/gentoo-qt/qting-edge]qting-edge[/url] overlay in [i]layman[/i].
 
-[*][b]Official Gentoo user-maintained Qt3/KDE3 overlay [[url=http://git.overlays.gentoo.org/gitweb/?p=proj/kde-sunset.git]kde-sunset[/url]][/b]
-This overlay contains Qt3 and KDE3 packages removed from main repository. It is maintaned by community. If you're interested in contributing, please let us know.
+[*][b]Official Gentoo user-maintained Qt3/KDE3 overlay
+[[url=http://git.overlays.gentoo.org/gitweb/?p=proj/kde-sunset.git]kde-sunset[/url]][/b]
+This overlay contains Qt3 and KDE3 packages removed from main repository. It is maintaned
+by community. If you're interested in contributing, please let us know.
 Gentoo KDE team can be found on [url=irc://irc.freenode.net/gentoo-kde]#gentoo-kde[/url].
 [/list]
 
 [size=18]KDE in Portage - FAQ[/size]
 
-[color=orange]Q:[/color] What's the deal with [b]kdeprefix[/b] USE flag and why is it masked?
+[color=orange]Q:[/color] What's the deal with [b]kdeprefix[/b] USE flag and why is it
+masked?
 
-[b]A:[/b] [b]kdeprefix[/b] USE flag allows installing KDE4 in alternate location, thus making it possible to have multiple KDE4 releases side by side. Note that this is not needed to have KDE3 installed as well. Because having multiple KDE4 installations has known issues like bugs [bug=258027]258027[/bug] or [bug=267793]267793[/bug], it's not ready for public consumption hence it's been disabled by default.
+[b]A:[/b] [b]kdeprefix[/b] USE flag allows installing KDE4 in alternate location, thus
+making it possible to have multiple KDE4 releases side by side. Note that this is not
+needed to have KDE3 installed as well. Because having multiple KDE4 installations has
+known issues like bugs [bug=258027]258027[/bug] or [bug=267793]267793[/bug], it's not
+ready for public consumption hence it's been disabled by default.
 
 
-[color=orange]Q:[/color] I want to run amarok, but all I get is "symbol lookup error: /usr/kde/live/lib64/kde4/plugins/styles/oxygen.so: undefined symbol". What should I do?
+[color=orange]Q:[/color] I want to run amarok, but all I get is "symbol lookup error:
+/usr/kde/live/lib64/kde4/plugins/styles/oxygen.so: undefined symbol". What should I do?
 
-[b]A:[/b] It's a Qt bug that appears when using [b]kdeprefix[/b] USE flag. Qt plugin loader appends "qtplugins" path from currently running KDE4 session, causing oxygen.so from wrong KDE prefix to be dlopen'ed. Unfortunately it as well cashes plugin locations in [color=blue]~/.config/Trolltech.conf[/color], making it permanently broken unless the file is removed. It usually happens with amarok or any other KDE4 applications installed in no prefix ([color=blue]/usr[/color]), that are built against existing KDE4 in one prefix (for example [color=blue]/usr/kde/4.2[/color]), but run from the other (for example in Gnome, KDE3 or [color=blue]/usr/kde/live[/color]). For now there's no known solution.
+[b]A:[/b] It's a Qt bug that appears when using [b]kdeprefix[/b] USE flag. Qt plugin
+loader appends "qtplugins" path from currently running KDE4 session, causing oxygen.so
+from wrong KDE prefix to be dlopen'ed. Unfortunately it as well cashes plugin locations in
+[color=blue]~/.config/Trolltech.conf[/color], making it permanently broken unless the file
+is removed. It usually happens with amarok or any other KDE4 applications installed in no
+prefix ([color=blue]/usr[/color]), that are built against existing KDE4 in one prefix (for
+example [color=blue]/usr/kde/4.2[/color]), but run from the other (for example in Gnome,
+KDE3 or [color=blue]/usr/kde/live[/color]). For now there's no known solution.
 
 
 [color=orange]Q:[/color] Why there are no sets for KDE4?
 
-[b]A:[/b] KDE4 so far is NOT making use of sets but sets are expected to arrive in near future - the reason is - the naming convention for sets is not yet established. Although KDE4 Gentoo team prepared some sets for you [url=http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=tree;f=sets;h=829bc933b1e43e13133dcd6f9c2c2c5566569315;hb=master]here[/url] (click 'raw' to download file and place in [color=blue]/etc/portage/sets/[/color]). An archive with all sets can be downloaded from [url=http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=snapshot;h=829bc933b1e43e13133dcd6f9c2c2c5566569315;sf=tgz]here[/url]. Remember that you are using them at your own risk.
+[b]A:[/b] KDE4 so far is NOT making use of sets but sets are expected to arrive in near
+future - the reason is - the naming convention for sets is not yet established. Although
+KDE4 Gentoo team prepared some sets for you
+[url=http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=tree;f=sets;h=
+829bc933b1e43e13133dcd6f9c2c2c5566569315;hb=master]here[/url] (click 'raw' to download
+file and place in [color=blue]/etc/portage/sets/[/color]). An archive with all sets can be
+downloaded from
+[url=http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=snapshot;h=
+829bc933b1e43e13133dcd6f9c2c2c5566569315;sf=tgz]here[/url]. Remember that you are using
+them at your own risk.
 
 
-[color=orange]Q:[/color] When I start KDE 3, Plasma is being executed and my KDE 3 applications are either crashing or just not working. Konqueror refuses to start, complaining about default stylesheet version mismatch. What's going on?
+[color=orange]Q:[/color] When I start KDE 3, Plasma is being executed and my KDE 3
+applications are either crashing or just not working. Konqueror refuses to start,
+complaining about default stylesheet version mismatch. What's going on?
 
-[b]A:[/b] This is the conflict related to mixed KDE3/KDE4 sessions. To fix this issue you need to [url=http://www.gentoo.org/proj/en/desktop/kde/kde-split-ebuilds.xml]upgrade[/url] your existing KDE 3.5.x installations to 3.5.10 or newer. Note that the 3.5.10 series has not been given stable keywords yet and that the monolithic packages have been discontinued.
+[b]A:[/b] This is the conflict related to mixed KDE3/KDE4 sessions. To fix this issue you
+need to [url=http://www.gentoo.org/proj/en/desktop/kde/kde-split-ebuilds.xml]upgrade[/url]
+your existing KDE 3.5.x installations to 3.5.10 or newer. Note that the 3.5.10 series has
+not been given stable keywords yet and that the monolithic packages have been
+discontinued.
 
 
-[color=orange]Q:[/color] I installed KDE4, I can start my desktop using startx but KDM is not working. Please help.
+[color=orange]Q:[/color] I installed KDE4, I can start my desktop using startx but KDM is
+not working. Please help.
 
-[b]A:[/b] First, ensure that [color=blue]kdm[/color] executable is in your [i]PATH[/i]. To check that, run:
+[b]A:[/b] First, ensure that [color=blue]kdm[/color] executable is in your [i]PATH[/i]. To
+check that, run:
 [code]which kdm[/code]
 If it's not found, then probably your environment is not up to date. To update it, run:
 [code]env-update && source /etc/profile[/code]
-When [color=blue]kdm[/color] is found, set [i]DISPLAYMANAGER="kdm"[/i] variable in [color=blue]/etc/conf.d/xdm[/color]. From now on, KDM should be working.
+When [color=blue]kdm[/color] is found, set [i]DISPLAYMANAGER="kdm"[/i] variable in
+[color=blue]/etc/conf.d/xdm[/color]. From now on, KDM should be working.
 
 
-[color=orange]Q:[/color] I just found this neat KDE4 application, can you make an ebuild for it?
+[color=orange]Q:[/color] I just found this neat KDE4 application, can you make an ebuild
+for it?
 
-[b]A:[/b] In short, no. To be more precise, it is possible but it would be better if you [url=http://devmanual.gentoo.org/ebuild-writing]created ebuild[/url] for it and send it Gentoo KDE team for review - it's more likely it will be added to overlay. The best procedure would be to create [url=https://bugs.gentoo.org]bug[/url] with ebuild proposal (if it's not there already) and inform the developers on [url=irc://irc.freenode.net/gentoo-kde]#gentoo-kde[/url] about it:
-[quote]Hi, i found this nice app blablu v 14.2 i opened bug 234556 for it. Please could you consider adding it to kde-testing?[/quote]
+[b]A:[/b] In short, no. To be more precise, it is possible but it would be better if you
+[url=http://devmanual.gentoo.org/ebuild-writing]created ebuild[/url] for it and send it
+Gentoo KDE team for review - it's more likely it will be added to overlay. The best
+procedure would be to create [url=https://bugs.gentoo.org]bug[/url] with ebuild proposal
+(if it's not there already) and inform the developers on
+[url=irc://irc.freenode.net/gentoo-kde]#gentoo-kde[/url] about it:
+[quote]Hi, i found this nice app blablu v 14.2 i opened bug 234556 for it. Please could
+you consider adding it to kde-testing?[/quote]
 
-If you have any suggestions for improvements regarding this guide, feel free to post them [topic=708322]here[/topic]. Please refrain from general discussion and do not post ebuild/installation questions there.
+If you have any suggestions for improvements regarding this guide, feel free to post them
+[topic=708322]here[/topic]. Please refrain from general discussion and do not post
+ebuild/installation questions there.
 
 [i]Stuck by NeddySeagoon[/i]
 
-[i]Locked and split off the other posts as a feedback [topic=708322]topic[/topic]. -- desultory[/i]
+[i]Locked and split off the other posts as a feedback [topic=708322]topic[/topic]. --
+desultory[/i]
 [i]Made some minor grammatical corrections at the request of reavertm. -- desultory[/i]
 [i]Continued updates. -- desultory[/i]
 [i]Updated link -- Jorge (jmbsvicetto)[/i]
 [i]Update kde-guide link -- Jorge (jmbsvicetto)[/i]
 [i]Removed arrival progress estimation link. -- desultory[/i]
-[i]Applied changes asked [url=https://forums.gentoo.org/viewtopic-p-5237336.html#5237336]here[/url] -- Jorge (jmbsvicetto)[/i]
+[i]Applied changes asked
+[url=https://forums.gentoo.org/viewtopic-p-5237336.html#5237336]here[/url] -- Jorge
+(jmbsvicetto)[/i]
 [i]Applied more [post=5245444]updates[/post]. -- desultory[/i]
 [i]Applied even more [post=5255329]updates[/post] -- Jorge (jmbsvicetto).[/i]
-[i]Applied [post=5262576]updates[/post], [post=5276245]updates[/post] and more updates. Updated links. [post=5368691]A[/post][post=5401451]p[/post][post=5423969]p[/post][post=5552930]l[/post][post=5669087]i[/post][post=5734682]e[/post][post=5786336]d[/post] [post=5811962]updates[/post]. -- desultory[/i]
+[i]Applied [post=5262576]updates[/post], [post=5276245]updates[/post] and more updates.
+Updated links.
+[post=5368691]A[/post][post=5401451]p[/post][post=5423969]p[/post][post=5552930]l[/post][
+post=5669087]i[/post][post=5734682]e[/post][post=5786336]d[/post]
+[post=5811962]updates[/post]. -- desultory[/i]
 [i]Applied [post=5847443]update[/post].  --kallamej[/i]
 [i]Applied [post=5956057]updates[/post]. -- desultory[/i]
-[i]Updates, removed info about genkdesvn (offline) and replaced kde-crazy with kde-sunset. -- reavertm[/i]
+[i]Updates, removed info about genkdesvn (offline) and replaced kde-crazy with kde-sunset.
+-- reavertm[/i]

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Dennis Schridde]

commit:     8a3b621be420a888eb33355482aa54ab6088d504
Author:     Dennis Schridde <devurandom <AT> gmx <DOT> net>
AuthorDate: Tue Apr 10 12:56:36 2012 +0000
Commit:     Dennis Schridde <devurandom <AT> gmx <DOT> net>
CommitDate: Tue Apr 10 12:59:37 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=8a3b621b

[Documentation/maintainers/sync-gentoo-overlay.sh] Bump to a new version

* Be much more automatic (i.e. user friendly)
* Use atomic moves to ensure the rsync dir does not change during a sync
* Ensure the rsync dir does not contain .svn folders and the like

---
 Documentation/maintainers/sync-gentoo-overlay.sh |  116 +++++++++++++++++-----
 1 files changed, 90 insertions(+), 26 deletions(-)

diff --git a/Documentation/maintainers/sync-gentoo-overlay.sh b/Documentation/maintainers/sync-gentoo-overlay.sh
index ea28c8e..3172dfa 100755
--- a/Documentation/maintainers/sync-gentoo-overlay.sh
+++ b/Documentation/maintainers/sync-gentoo-overlay.sh
@@ -2,20 +2,31 @@
 
 # Run this script via cronjob to update your overlay mirror
 
-OVERLAY_MIRROR_DIR=/var/gentoo/overlays
+GENTOO_MIRROR_DIR=/var/gentoo
+GENTOO_PORTAGE_DIR=/var/gentoo/portage
 
-# OVERLAY_MIRROR_DIR must contain:
-#  * a folder $overlay/ for each overlay you intent to mirror.
-#  * a folder cache/ to store the cache of all overlays.
+# GENTOO_MIRROR_DIR must contain:
+#  * a directory overlay-repos/$overlay for each overlay you intend to mirror:
+#    It shall contain the checked out overlay repository.
+#    Git repositories must be named "overlay-repos/${overlay}.git".
+#    SVN repositories must contain a directory "overlay-repos/${overlay}/.svn".
+# Directories and files within OVERLAY_MIRROR_DIR that will be created by this script:
+#  * overlays/$overlay/ contains the overlays suitable to sync with rsync.
+#  * overlay-etc/$overlay/ contains a portage config necessary to generate the caches.
+#  * cache/ to store the intermediate cache of all overlays.
 #    (so it is not mixed with the cache of your system portage-trees)
-# OVERLAY_MIRROR_DIR/$overlay/ must contain:
-#  * a file etc/make.conf with following contents:
-#    PORTDIR=/your/portage/directory
-#    PORTDIR_OVERLAY=/path/to/your/mirror/dir/$overlay/repo
-#    FEATURES="${FEATURES} userpriv userfetch usersandbox usersync metadata-transfer"
-#  * a directory repo/ containing the checked out overlay repository
-# For speed reasons it is advisable to have a file etc/portage/modules containing:
-#    portdbapi.auxdbmodule = portage.cache.sqlite.database
+#  * etc/portage/ containing following files:
+#     * etc/portage/make.conf:
+#       PORTDIR=/your/portage/directory
+#       FEATURES="${FEATURES} userpriv userfetch usersandbox usersync metadata-transfer"
+#       NOCOLOR=true
+#     * etc/portage/modules:
+#       portdbapi.auxdbmodule = portage.cache.sqlite.database
+#       (for speed reasons)
+#    (files in this directory are not changed if they exist)
+
+PORTAGE_CONFIGROOT="${GENTOO_MIRROR_DIR}"
+PORTAGE_DEPCACHEDIR="${GENTOO_MIRROR_DIR}/cache"
 
 die() {
 	echo "USAGE: $0 <overlay>" 1>&2
@@ -26,36 +37,84 @@ die() {
 [[ "$1" ]] || die 'overlay'
 overlay="$1" ; shift
 
-overlay_name="$(< $OVERLAY_MIRROR_DIR/$overlay/repo/profiles/repo_name)"
-[[ "$overlay_name" ]] || die 'overlay_name'
+overlay_dir="${GENTOO_MIRROR_DIR}/overlays/${overlay}"
+overlay_repo_dir="${GENTOO_MIRROR_DIR}/overlay-repos/${overlay}"
 
-if [ -e "$OVERLAY_MIRROR_DIR/$overlay/repo/.svn" ] ; then
+if [ -e "${overlay_repo_dir}/.svn" ] ; then
 	type=svn
-elif [ -e "$OVERLAY_MIRROR_DIR/$overlay/repo/.git" ] ; then
+elif [ -e "${overlay_repo_dir}.git" ] ; then
 	type=git
+	overlay_repo_dir="${overlay_repo_dir}.git"
 else
 	die "Unable to determine overlay type for $overlay"
 fi
 
-cd $OVERLAY_MIRROR_DIR/$overlay/repo || cd "failed to cd to $OVERLAY_MIRROR_DIR/$overlay/repo"
-
 echo 'Updating overlay ...'
 case "$type" in
 	svn)
-		[ -e metadata/layout.conf ] && svn revert metadata/layout.conf
-		svn cleanup || die 'svn cleanup failed'
-		svn update --force --config-option=config:miscellany:use-commit-times=yes || die 'svn update failed'
+		svn cleanup "${overlay_repo_dir}" || die 'svn cleanup failed'
+		svn update --force "${overlay_repo_dir}" || die 'svn update failed'
+		;;
+	git)
+		git --git-dir="${overlay_repo_dir}" fetch || die 'git update failed'
+		;;
+	*)
+		die "Unsupported overlay type '$type' for $overlay"
+		;;
+esac
+
+mkdir -p "${GENTOO_MIRROR_DIR}/overlays" || die 'failed to create overlays/ dir'
+mkdir -p "${GENTOO_MIRROR_DIR}/etc/portage/" || die 'failed to create etc/portage/ dir'
+
+if [ -! -e "${GENTOO_MIRROR_DIR}/etc/portage/make.conf" ] ; then
+	cat <<- EOF > "${GENTOO_MIRROR_DIR}/etc/portage/make.conf"
+		PORTDIR=${GENTOO_PORTAGE_DIR}
+		FEATURES="\${FEATURES} userpriv userfetch usersandbox usersync metadata-transfer"
+		NOCOLOR=true
+	EOF
+fi
+if [ -! -e "${GENTOO_MIRROR_DIR}/etc/portage/modules" ] ; then
+	cat <<- EOF > "${GENTOO_MIRROR_DIR}/etc/portage/modules"
+		portdbapi.auxdbmodule = portage.cache.sqlite.database
+	EOF
+fi
+
+if [ -e "${overlay_dir}.tmp" ] ; then
+	echo 'Removing old export ...'
+	rm -fr "${overlay_dir}.tmp"
+fi
+
+echo 'Exporting overlay ...'
+case "$type" in
+	svn)
+		svn export --force --config-option=config:miscellany:use-commit-times=yes "${overlay_repo_dir}" "${overlay_dir}.tmp" || die 'svn export failed'
 		;;
 	git)
-		[ -e metadata/layout.conf ] && git checkout metadata/layout.conf
-		git pull || die 'git update failed'
-		/usr/local/bin/git-set-file-times || die 'setting file times failed'
+		mkdir -p "${overlay_dir}.tmp" || die 'creating export dir failed'
+		git --git-dir="${overlay_repo_dir}" archive master | tar -x -C "${overlay_dir}.tmp" || die 'git export failed'
 		;;
 	*)
 		die "Unsupported overlay type '$type' for $overlay"
+		;;
 esac
 
-export PORTAGE_CONFIGROOT=$OVERLAY_MIRROR_DIR/$overlay PORTAGE_DEPCACHEDIR=$OVERLAY_MIRROR_DIR/cache
+cd "${overlay_dir}.tmp" || die "failed to cd to ${overlay_dir}.tmp"
+
+overlay_name="$(< profiles/repo_name)"
+[[ "$overlay_name" ]] || die 'overlay_name'
+
+overlay_configroot="${GENTOO_MIRROR_DIR}/overlay-etc/${overlay}"
+mkdir -p "${overlay_configroot}/etc/portage" || die 'creating overlay configroot failed'
+cat <<- EOF > "${overlay_configroot}/etc/portage/make.conf" || die 'creating overlay make.conf failed'
+	source ${PORTAGE_CONFIGROOT}/etc/portage/make.conf
+	PORTDIR_OVERLAY=${overlay_dir}.tmp
+EOF
+ln -sfn "${PORTAGE_CONFIGROOT}/etc/portage/modules" "${overlay_configroot}/etc/portage/" || die 'creating overlay modules symlink failed'
+
+PORTAGE_CONFIGROOT="${overlay_configroot}"
+PORTDIR_OVERLAY="${overlay_dir}.tmp"
+
+export PORTAGE_CONFIGROOT PORTAGE_DEPCACHEDIR PORTDIR_OVERLAY
 
 echo 'Enforcing full manifests ...'
 #sed -e 's/^thin-manifests.*/thin-manifests = false/' -i metadata/layout.conf || die 'patching layout.conf failed'
@@ -64,4 +123,9 @@ echo 'Generating manifests ...'
 #repoman manifest || die 'generating manifests failed'
 
 echo 'Generating metadata caches ...'
-egencache  --config-root=$PORTAGE_CONFIGROOT --cache-dir=$PORTAGE_DEPCACHEDIR --repo=$overlay_name --update
+egencache --config-root="${PORTAGE_CONFIGROOT}" --cache-dir="${PORTAGE_DEPCACHEDIR}" --portdir-overlay="${PORTDIR_OVERLAY}" --repo=$overlay_name --update || die 'generating metadata caches failed'
+
+echo 'Moving export into place ...'
+mv -T "${overlay_dir}" "${overlay_dir}.old"
+mv -T "${overlay_dir}.tmp" "${overlay_dir}" || die 'moving export failed'
+rm -fr "${overlay_dir}.old"

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Dennis Schridde]

commit:     e9c06ede98ea694f1271599b63cc2c5844e26e53
Author:     Dennis Schridde <devurandom <AT> gmx <DOT> net>
AuthorDate: Sun Mar 25 12:41:28 2012 +0000
Commit:     Dennis Schridde <devurandom <AT> gmx <DOT> net>
CommitDate: Sun Mar 25 12:41:28 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e9c06ede

[Documentation/maintainers] New versions of my metadata mirror scripts

sync-gentoo-overlay.sh supports mirroring a complete overlay via rsync,
  which helps in keeping the metadata-cache and the ebuilds in sync.

---
 .../maintainers/metadata-mirror-update.sh          |   51 ---------------
 Documentation/maintainers/metadata-sync            |   12 ----
 Documentation/maintainers/sync-gentoo-overlay.sh   |   67 ++++++++++++++++++++
 Documentation/maintainers/sync-metadata.sh         |   12 ++++
 4 files changed, 79 insertions(+), 63 deletions(-)

diff --git a/Documentation/maintainers/metadata-mirror-update.sh b/Documentation/maintainers/metadata-mirror-update.sh
deleted file mode 100755
index fc2b7b7..0000000
--- a/Documentation/maintainers/metadata-mirror-update.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-
-# Run this script via cronjob to update your metadata mirror
-
-METADATA_MIRROR_DIR=/path/to/your/mirror/dir
-
-# METADATA_MIRROR_DIR must contain:
-#  * a folder $overlay/ for each overlay you intent to mirror.
-#  * a folder cache/ to store the cache of all overlays.
-#    (so it is not mixed with the cache of your system portage-trees)
-# METADATA_MIRROR_DIR/$overlay/ must contain:
-#  * a file etc/make.conf with following contents:
-#    PORTDIR=/your/portage/directory
-#    PORTDIR_OVERLAY=/path/to/your/mirror/dir/$overlay/repo
-#    FEATURES="${FEATURES} userpriv userfetch usersandbox usersync metadata-transfer"
-#  * a directory repo/ containing the checked out repository you want to create metadata from.
-# For speed reasons it is advisable to have a file etc/portage/modules containing:
-#    portdbapi.auxdbmodule = portage.cache.sqlite.database
-
-die() {
-	echo "USAGE: $0 <overlay>" 1>&2
-	echo "ERROR: $@" 1>&2
-	exit 255
-}
-
-[[ "$1" ]] || die 'overlay'
-overlay="$1" ; shift
-
-if [ -e "$METADATA_MIRROR_DIR/$overlay/repo/.svn" ] ; then
-	type=svn
-elif [ -e "$METADATA_MIRROR_DIR/$overlay/repo/.git" ] ; then
-	type=git
-else
-	die "Unable to determine overlay type for $overlay"
-fi
-
-cd $METADATA_MIRROR_DIR/$overlay/repo || cd "failed to cd to $METADATA_MIRROR_DIR/$overlay/repo"
-
-case "$type" in
-	svn)
-		svn cleanup && svn update --force --config-option=config:miscellany:use-commit-times=yes || die 'svn update failed'
-		;;
-	git)
-		git pull || die 'git update failed'
-		/usr/local/bin/git-set-file-times || die 'setting file times failed'
-		;;
-	*)
-		die "Unsupported overlay type '$type' for $overlay"
-esac
-
-exec egencache --config-root=$METADATA_MIRROR_DIR/$overlay/ --cache-dir=$METADATA_MIRROR_DIR/cache/ --repo=$overlay --update

diff --git a/Documentation/maintainers/metadata-sync b/Documentation/maintainers/metadata-sync
deleted file mode 100755
index cd0c0fe..0000000
--- a/Documentation/maintainers/metadata-sync
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-# Contact: devurandom
-METADATA_MIRROR=rsync://gentoo.kynes.de:800/gentoo-metadata-kde/
-
-if [[ "$(basename $(pwd))" == "Documentation" ]] ; then
-	echo "Syncing KDE overlay metadata ..."
-	exec rsync --quiet --recursive --times --compress --delete-delay $METADATA_MIRROR ../metadata/cache/
-else
-	echo "ERROR: This script is meant to be run from within Documentation/ !"
-	exit 255
-fi

diff --git a/Documentation/maintainers/sync-gentoo-overlay.sh b/Documentation/maintainers/sync-gentoo-overlay.sh
new file mode 100755
index 0000000..ea28c8e
--- /dev/null
+++ b/Documentation/maintainers/sync-gentoo-overlay.sh
@@ -0,0 +1,67 @@
+#!/bin/bash
+
+# Run this script via cronjob to update your overlay mirror
+
+OVERLAY_MIRROR_DIR=/var/gentoo/overlays
+
+# OVERLAY_MIRROR_DIR must contain:
+#  * a folder $overlay/ for each overlay you intent to mirror.
+#  * a folder cache/ to store the cache of all overlays.
+#    (so it is not mixed with the cache of your system portage-trees)
+# OVERLAY_MIRROR_DIR/$overlay/ must contain:
+#  * a file etc/make.conf with following contents:
+#    PORTDIR=/your/portage/directory
+#    PORTDIR_OVERLAY=/path/to/your/mirror/dir/$overlay/repo
+#    FEATURES="${FEATURES} userpriv userfetch usersandbox usersync metadata-transfer"
+#  * a directory repo/ containing the checked out overlay repository
+# For speed reasons it is advisable to have a file etc/portage/modules containing:
+#    portdbapi.auxdbmodule = portage.cache.sqlite.database
+
+die() {
+	echo "USAGE: $0 <overlay>" 1>&2
+	echo "ERROR: $@" 1>&2
+	exit 1
+}
+
+[[ "$1" ]] || die 'overlay'
+overlay="$1" ; shift
+
+overlay_name="$(< $OVERLAY_MIRROR_DIR/$overlay/repo/profiles/repo_name)"
+[[ "$overlay_name" ]] || die 'overlay_name'
+
+if [ -e "$OVERLAY_MIRROR_DIR/$overlay/repo/.svn" ] ; then
+	type=svn
+elif [ -e "$OVERLAY_MIRROR_DIR/$overlay/repo/.git" ] ; then
+	type=git
+else
+	die "Unable to determine overlay type for $overlay"
+fi
+
+cd $OVERLAY_MIRROR_DIR/$overlay/repo || cd "failed to cd to $OVERLAY_MIRROR_DIR/$overlay/repo"
+
+echo 'Updating overlay ...'
+case "$type" in
+	svn)
+		[ -e metadata/layout.conf ] && svn revert metadata/layout.conf
+		svn cleanup || die 'svn cleanup failed'
+		svn update --force --config-option=config:miscellany:use-commit-times=yes || die 'svn update failed'
+		;;
+	git)
+		[ -e metadata/layout.conf ] && git checkout metadata/layout.conf
+		git pull || die 'git update failed'
+		/usr/local/bin/git-set-file-times || die 'setting file times failed'
+		;;
+	*)
+		die "Unsupported overlay type '$type' for $overlay"
+esac
+
+export PORTAGE_CONFIGROOT=$OVERLAY_MIRROR_DIR/$overlay PORTAGE_DEPCACHEDIR=$OVERLAY_MIRROR_DIR/cache
+
+echo 'Enforcing full manifests ...'
+#sed -e 's/^thin-manifests.*/thin-manifests = false/' -i metadata/layout.conf || die 'patching layout.conf failed'
+
+echo 'Generating manifests ...'
+#repoman manifest || die 'generating manifests failed'
+
+echo 'Generating metadata caches ...'
+egencache  --config-root=$PORTAGE_CONFIGROOT --cache-dir=$PORTAGE_DEPCACHEDIR --repo=$overlay_name --update

diff --git a/Documentation/maintainers/sync-metadata.sh b/Documentation/maintainers/sync-metadata.sh
new file mode 100755
index 0000000..d02fee4
--- /dev/null
+++ b/Documentation/maintainers/sync-metadata.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# Contact: devurandom
+METADATA_MIRROR=rsync://gentoo.kynes.de:800/gentoo-overlay-kde/metadata/cache/
+
+if [[ "$(basename $(pwd))" != "Documentation" ]] ; then
+	echo "ERROR: This script is meant to be run from within Documentation/ !"
+	exit 1
+fi
+
+echo "Syncing KDE overlay metadata ..."
+exec rsync --quiet --recursive --times --compress --delete-delay $METADATA_MIRROR ../metadata/cache/

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Johannes Huber]

commit:     ed3723b81835773e201ed1b18f9300c17c7c9003
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 20 11:05:14 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Jan 20 11:05:14 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ed3723b8

[Documentation] Use minimum keywords for major version bump.

---
 Documentation/maintainers/bump_new_revision.sh |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/Documentation/maintainers/bump_new_revision.sh b/Documentation/maintainers/bump_new_revision.sh
index 07bf1c5..5af1ddb 100755
--- a/Documentation/maintainers/bump_new_revision.sh
+++ b/Documentation/maintainers/bump_new_revision.sh
@@ -100,7 +100,10 @@ update_keywords() {
 		local version_minor=${BASH_REMATCH[2]}
 		local version_patch=${BASH_REMATCH[3]}
 		if [[ -n ${version_patch} ]]; then
-			if (( version_patch == 49 )); then
+			if (( version_patch == 0 )); then
+				# Major release we want minimum keywords
+				KEYWORDS=${MINIMAL_KEYWORDS}
+			elif (( version_patch == 49 )); then
 				# We don't want any keywords for live ebuilds
 				KEYWORDS=
 			elif (( version_patch < 50 )); then

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Johannes Huber]

commit:     3b2956e33efaadd0f7f2547a1406ddeb4bf5e4ab
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  9 14:28:28 2011 +0000
Commit:     Johannes Huber <johu <AT> gmx <DOT> de>
CommitDate: Fri Dec  9 14:28:28 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3b2956e3

[Documentation] Update example path in git hook

---
 Documentation/maintainers/git-hooks-commit-msg |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Documentation/maintainers/git-hooks-commit-msg b/Documentation/maintainers/git-hooks-commit-msg
index be2d403..6906cea 100755
--- a/Documentation/maintainers/git-hooks-commit-msg
+++ b/Documentation/maintainers/git-hooks-commit-msg
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 # To enable this hook, link it into .git/hooks/commit-msg like this:
-# ln -s ../../Documentation/git-hooks-commit-msg .git/hooks/commit-msg
+# ln -s ../../Documentation/maintainers/git-hooks-commit-msg .git/hooks/commit-msg
 
 FILE=$1
 

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Alexey Shvetsov]

commit:     c211a5ac856358c7e7fb25f3e83ce65c8080892d
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 19 23:28:20 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sat Nov 19 23:28:48 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c211a5ac

[Documentation] Fix hook

Signed-off-by: Alexey Shvetsov <alexxy <AT> gentoo.org>

---
 Documentation/maintainers/git-hooks-commit-msg |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/Documentation/maintainers/git-hooks-commit-msg b/Documentation/maintainers/git-hooks-commit-msg
index d1e5fed..be2d403 100755
--- a/Documentation/maintainers/git-hooks-commit-msg
+++ b/Documentation/maintainers/git-hooks-commit-msg
@@ -28,6 +28,9 @@ elif [[ -n `grep -e '^\[sets' <<< "$summary"` ]] ; then
 elif [[ -n `grep -e '^\[profiles' <<< "$summary"` ]] ; then
 	# Do not enforce usage of repoman where it makes no sense
 	exit 0
+elif [[ -n `grep -e '^\[eclass' <<< "$summary"` ]] ; then
+	# Do not enforce usage of repoman where it makes no sense
+	exit 0
 elif grep '^NO_REPOMAN' "$FILE" >& /dev/null ; then
 	# Allow i-know-what-i-am-doing override
 	sed -i -e '/^NO_REPOMAN/d' "$FILE"

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Alexey Shvetsov]

commit:     e7d3496677b69460844d60811ac4afe4dd3d2ae6
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  2 22:29:27 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Wed Nov  2 22:29:27 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e7d34966

[Documentation] Update hook

Signed-off-by: Alexey Shvetsov <alexxy <AT> gentoo.org>

---
 Documentation/maintainers/git-hooks-commit-msg |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/Documentation/maintainers/git-hooks-commit-msg b/Documentation/maintainers/git-hooks-commit-msg
index 80e95f4..d1e5fed 100755
--- a/Documentation/maintainers/git-hooks-commit-msg
+++ b/Documentation/maintainers/git-hooks-commit-msg
@@ -25,6 +25,9 @@ if [[ -n `grep -e '^\[Documentation' <<< "$summary"` ]] ; then
 elif [[ -n `grep -e '^\[sets' <<< "$summary"` ]] ; then
 	# Do not enforce usage of repoman where it makes no sense
 	exit 0
+elif [[ -n `grep -e '^\[profiles' <<< "$summary"` ]] ; then
+	# Do not enforce usage of repoman where it makes no sense
+	exit 0
 elif grep '^NO_REPOMAN' "$FILE" >& /dev/null ; then
 	# Allow i-know-what-i-am-doing override
 	sed -i -e '/^NO_REPOMAN/d' "$FILE"

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Jorge Manuel B. S. Vicetto]

commit:     05d5fdfa977a3b2ea405e741bea2b940f2b9184a
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  6 09:27:07 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Mon Jun  6 09:27:07 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=05d5fdfa

[bump_new_revision.sh] Update script to get output_dir from the arguments.

---
 Documentation/maintainers/bump_new_revision.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Documentation/maintainers/bump_new_revision.sh b/Documentation/maintainers/bump_new_revision.sh
index b5ffad0..9316685 100755
--- a/Documentation/maintainers/bump_new_revision.sh
+++ b/Documentation/maintainers/bump_new_revision.sh
@@ -187,7 +187,7 @@ BUMP_VERSION=
 SET=
 DIR=
 OUTPUT_DIR=
-while getopts a:s:v:b:l:p:o arg ; do
+while getopts a:s:v:b:l:p:o: arg ; do
 	case ${arg} in
 		a) OPERATION=${OPTARG} ;;
 		s) SLOT=${OPTARG} ;;

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas K. Huettel]

commit:     77b6f0d39446dbe747fd69e47c1023a61866e7cc
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Thu Apr 28 08:15:47 2011 +0000
Commit:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Apr 28 08:16:17 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=77b6f0d3

[maintainers] minichange

---
 Documentation/maintainers/gen-keywordlist |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Documentation/maintainers/gen-keywordlist b/Documentation/maintainers/gen-keywordlist
index 3a8175f..ebc3d8d 100755
--- a/Documentation/maintainers/gen-keywordlist
+++ b/Documentation/maintainers/gen-keywordlist
@@ -9,6 +9,6 @@ for pkg in $(cat $1 |grep -v "^#"|sed -e 's:^=::'); do
 
   kw="$(grep KEYWORDS ${ebuild} | sed -e 's:^.*KEYWORDS="::' -e 's:".*$::')"
 
-  echo "$pkg	$kw"
+  echo "=$pkg $kw"
 
 done

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Maciej Mrozowski]

commit:     ccdee8c2cde5b03ca222605e8ec84d6d6cd727e8
Author:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 27 18:08:38 2011 +0000
Commit:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Wed Apr 27 18:08:38 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ccdee8c2

[regenerate-files] Do not generate 4.5 keyword/unmask anymore

---
 Documentation/maintainers/regenerate-files |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files
index f64117c..0dfe460 100755
--- a/Documentation/maintainers/regenerate-files
+++ b/Documentation/maintainers/regenerate-files
@@ -13,7 +13,7 @@ HEADER="# Autogenerated by ${SCRIPT}, DO NOT EDIT."
 
 # regenerate keywords
 pushd ../package.keywords/ > /dev/null
-for release in 4.4 4.5 4.6; do
+for release in 4.4 4.6; do
 	echo -e "${HEADER}" > "kde-${release}.keywords"
 	if [[ -d ".kde-${release}" ]]; then
 		cat ".kde-${release}/"* | sed '/^~.*[.-]9999$/s/$/ **/' >> "kde-${release}.keywords"
@@ -21,7 +21,7 @@ for release in 4.4 4.5 4.6; do
 done
 
 # ... and for completely unkeyworded packages, add "**"
-for release in 4.4 4.5 4.6; do
+for release in 4.4 4.6; do
 	if [[ -d ".kde-${release}" ]]; then
 		rm -rf ".kde-${release}.9999"
 		mkdir -p ".kde-${release}.9999"
@@ -56,7 +56,7 @@ popd > /dev/null
 
 # regenerate unmask entries (base for package mask)
 pushd ../package.unmask/ > /dev/null
-for release in 4.4 4.5 4.6 live; do
+for release in 4.4 4.6 live; do
 	echo -e "${HEADER}" > "kde-${release}"
 	if [[ -d ".kde-${release}" ]]; then
 		cat ".kde-${release}/"* >> "kde-${release}"

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Andreas K. Huettel]

commit:     6d3ccf3ecb265b4afa17666aa2dd27c02ed101bb
Author:     Andreas K. Huettel <andreas.huettel <AT> physik <DOT> uni-r <DOT> de>
AuthorDate: Wed Apr 27 15:47:22 2011 +0000
Commit:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Apr 27 15:47:22 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=6d3ccf3e

[maintainers] added helper script

---
 Documentation/maintainers/gen-keywordlist |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/Documentation/maintainers/gen-keywordlist b/Documentation/maintainers/gen-keywordlist
new file mode 100755
index 0000000..3a8175f
--- /dev/null
+++ b/Documentation/maintainers/gen-keywordlist
@@ -0,0 +1,14 @@
+for pkg in $(cat $1 |grep -v "^#"|sed -e 's:^=::'); do 
+
+  category=$(echo $pkg|sed -e 's:/.*$::')
+  p=$(echo $pkg|sed -e 's:.*/::')
+
+  ebuild=$(find /usr/portage/${category} -name ${p}.ebuild)
+
+  # echo Cat ${category}, P ${p}, ebuild ${ebuild}
+
+  kw="$(grep KEYWORDS ${ebuild} | sed -e 's:^.*KEYWORDS="::' -e 's:".*$::')"
+
+  echo "$pkg	$kw"
+
+done

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Jonathan Callen]

commit:     8fc3c913ed09072b127679ea7f26ee43ba3f265a
Author:     abcd <abcd <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  5 19:58:43 2011 +0000
Commit:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
CommitDate: Sat Mar  5 19:58:43 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=8fc3c913

[Documentation] Auto-keyword for ~x86-linux and ~amd64-linux

---
 Documentation/maintainers/bump_new_revision.sh |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/Documentation/maintainers/bump_new_revision.sh b/Documentation/maintainers/bump_new_revision.sh
index d14de0a..1af095e 100755
--- a/Documentation/maintainers/bump_new_revision.sh
+++ b/Documentation/maintainers/bump_new_revision.sh
@@ -87,18 +87,18 @@ check_cmakelists() {
 
 # Updates keywords:
 # - for stable releases - use latest keywords from tree
-# - for snapshot/alpha/beta/rc releases - use fixed ~amd64 and ~x86 keywords
+# - for snapshot/alpha/beta/rc releases - use fixed ~amd64, ~x86 and ~{amd64,x86}-linux keywords
 # - in either case drop arch to testing
 update_keywords() {
-	local MINIMAL_KEYWORDS="~amd64 ~x86"
+	local MINIMAL_KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" KEYWORDS
 	# Initially strip all keywords
 	ekeyword ^all ${1} > /dev/null
 	if [[ ${BUMP_VERSION} =~ ([4-9]+)\.?([0-9]*)\.?([0-9]*) ]]; then
 		local version_major=${BASH_REMATCH[1]}
 		local version_minor=${BASH_REMATCH[2]}
 		local version_patch=${BASH_REMATCH[3]}
-		if [[ -n {version_patch} ]]; then
-			if [[ ${version_patch} -lt 50 ]]; then
+		if [[ -n ${version_patch} ]]; then
+			if (( version_patch < 50 )); then
 				# Patch version is < 50 - stable release, try to obtain keywords from tree
 				if pushd "$(portageq portdir)/${2}" &> /dev/null; then
 					KEYWORDS=$(ls -1r *-4*.ebuild | grep -v ${BUMP_VERSION} | head -n 1 | xargs sed -ne 's/^KEYWORDS="\(.*\)"/\1/p')
@@ -107,7 +107,7 @@ update_keywords() {
 					KEYWORDS=${MINIMAL_KEYWORDS}
 				fi
 				popd &> /dev/null
-			elif [[ ${version_patch} -le 99 ]]; then
+			elif (( version_patch <= 99 )); then
 				# Patch version >= 50 and <= 99 - snapshot/alpha/beta/rc release, ~amd64 ~x86 keywords
 				KEYWORDS=${MINIMAL_KEYWORDS}
 			fi
@@ -184,11 +184,10 @@ SLOT=
 VERSION=
 OPERATION=
 BUMP_VERSION=
-KEYWORDS=
 SET=
 DIR=
 OUTPUT_DIR=
-while getopts a:s:v:b:l:p:o:n arg ; do
+while getopts a:s:v:b:l:p:o arg ; do
 	case ${arg} in
 		a) OPERATION=${OPTARG} ;;
 		s) SLOT=${OPTARG} ;;
@@ -197,7 +196,6 @@ while getopts a:s:v:b:l:p:o:n arg ; do
 		l) SET="${OPTARG}" ;;
 		p) DIR="${OPTARG}" ;;
 		o) OUTPUT_DIR="${OPTARG}" ;;
-		n) KEYWORDS="no" ;;
 		*) help ;;
 		?) help ;;
 	esac

[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

[Dennis Schridde]

commit:     1762c42fcff740a745f047a04d55a536233597c6
Author:     Dennis Schridde <devurandom <AT> gmx <DOT> net>
AuthorDate: Sun Feb 13 17:30:39 2011 +0000
Commit:     Dennis Schridde <devurandom <AT> gmx <DOT> net>
CommitDate: Sun Feb 13 17:30:39 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=1762c42f

[Documentation/maintainers/movetotree] Add move-to-tree file with move requests to Gentoo developers

Idea by Theo Chatzimichos / tampakrap

---
 Documentation/maintainers/movetotree |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/Documentation/maintainers/movetotree b/Documentation/maintainers/movetotree
new file mode 100644
index 0000000..034cb44
--- /dev/null
+++ b/Documentation/maintainers/movetotree
@@ -0,0 +1,5 @@
+# Gentoo developers, please move the following into Getnoo mainline:
+
+# Dennis Schridde <devurandom@gmx.net> (13 Feb 2011)
+# Fixes bugs #201948, #226823 and #256574.
+sys-auth/nss-mdns-0.10-r1