| 1 |
commit: df2c51a3e2f61c62583d509e84d012b0d49a207e |
| 2 |
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Mar 2 20:39:57 2013 +0000 |
| 4 |
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Mar 2 20:39:57 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=df2c51a3 |
| 7 |
|
| 8 |
move-qt-cat.sh: Last minute fixes in the replacement logic |
| 9 |
|
| 10 |
--- |
| 11 |
Documentation/maintainers/move-qt-cat.sh | 43 ++++++++++++++++++++--------- |
| 12 |
1 files changed, 29 insertions(+), 14 deletions(-) |
| 13 |
|
| 14 |
diff --git a/Documentation/maintainers/move-qt-cat.sh b/Documentation/maintainers/move-qt-cat.sh |
| 15 |
index 6e890ea..d32fa2c 100755 |
| 16 |
--- a/Documentation/maintainers/move-qt-cat.sh |
| 17 |
+++ b/Documentation/maintainers/move-qt-cat.sh |
| 18 |
@@ -28,39 +28,54 @@ if [[ -z ${DEBUG_QT_MOVE} ]]; then |
| 19 |
fi |
| 20 |
|
| 21 |
fix_deps() { |
| 22 |
+ local _found |
| 23 |
for subcat in $(find . -maxdepth 1 -type d \( -name "[a-z0-9]*" -a ! -name "CVS" \)|sort -n); do |
| 24 |
pushd "${subcat}" > /dev/null 2>&1 |
| 25 |
[[ -n ${DEBUG_QT_MOVE} ]] && { echo "Checking package ${subcat} ..."; } |
| 26 |
cvs up |
| 27 |
+ unset _found |
| 28 |
for pkg in $(find . -maxdepth 1 -type f -name "*.ebuild"); do |
| 29 |
if grep -q "x11-libs/qt-assistant" "${pkg}"; then |
| 30 |
[[ -n ${DEBUG_QT_MOVE} ]] && echo "Fixing ${pkg}" |
| 31 |
- sed -i -e "s:x11-libs/qt-assistant:dev-qt/qthelp:" "${pkg}" |
| 32 |
- elif grep -q "x11-libs/qt-qt3support" "${pkg}"; then |
| 33 |
+ sed -i -e "s:x11-libs/qt-assistant:dev-qt/qthelp:g" "${pkg}" |
| 34 |
+ _found=1 |
| 35 |
+ fi |
| 36 |
+ if grep -q "x11-libs/qt-qt3support" "${pkg}"; then |
| 37 |
[[ -n ${DEBUG_QT_MOVE} ]] && echo "Fixing ${pkg}" |
| 38 |
- sed -i -e "s:x11-libs/qt-qt3support:dev-qt/qt3support:" \ |
| 39 |
+ sed -i -e "s:x11-libs/qt-qt3support:dev-qt/qt3support:g" \ |
| 40 |
"${pkg}" |
| 41 |
- elif grep -q "x11-libs/qt-meta" "${pkg}"; then |
| 42 |
+ _found=1 |
| 43 |
+ fi |
| 44 |
+ if grep -q "x11-libs/qt-meta" "${pkg}"; then |
| 45 |
[[ -n ${DEBUG_QT_MOVE} ]] && echo "Fixing ${pkg}" |
| 46 |
- sed -i -e "s:x11-libs/qt-meta:dev-qt/qt-meta:" \ |
| 47 |
+ sed -i -e "s:x11-libs/qt-meta:dev-qt/qt-meta:g" \ |
| 48 |
"${pkg}" |
| 49 |
- elif grep -q "x11-libs/qt-mobility" "${pkg}"; then |
| 50 |
+ _found=1 |
| 51 |
+ fi |
| 52 |
+ if grep -q "x11-libs/qt-mobility" "${pkg}"; then |
| 53 |
[[ -n ${DEBUG_QT_MOVE} ]] && echo "Fixing ${pkg}" |
| 54 |
- sed -i -e "s:x11-libs/qt-mobility:dev-qt/qt-mobility:" \ |
| 55 |
+ sed -i -e "s:x11-libs/qt-mobility:dev-qt/qt-mobility:g" \ |
| 56 |
"${pkg}" |
| 57 |
- elif grep -q "dev-util/qt-creator" "${pkg}"; then |
| 58 |
+ _found=1 |
| 59 |
+ fi |
| 60 |
+ if grep -q "dev-util/qt-creator" "${pkg}"; then |
| 61 |
[[ -n ${DEBUG_QT_MOVE} ]] && echo "Fixing ${pkg}" |
| 62 |
- sed -i -e "s:dev-util/qt-creator:dev-qt/qt-creator;" "${pkg}" |
| 63 |
- elif grep -q "x11-libs/qt-" "${pkg}"; then |
| 64 |
+ sed -i -e "s:dev-util/qt-creator:dev-qt/qt-creator:g" "${pkg}" |
| 65 |
+ _found=1 |
| 66 |
+ fi |
| 67 |
+ if grep -q "x11-libs/qt-" "${pkg}"; then |
| 68 |
[[ -n ${DEBUG_QT_MOVE} ]] && echo "Fixing ${pkg}" |
| 69 |
- sed -i -e "s:x11-libs/qt-:dev-qt/qt:" "${pkg}" |
| 70 |
+ sed -i -e "s:x11-libs/qt-:dev-qt/qt:g" "${pkg}" |
| 71 |
+ _found=1 |
| 72 |
fi |
| 73 |
- # show me what you did |
| 74 |
+ done |
| 75 |
+ # show me what you did |
| 76 |
+ if [[ -n ${_found} ]]; then |
| 77 |
[[ -n ${DEBUG_QT_MOVE} ]] && cvs diff -u |
| 78 |
repoman manifest && repoman full |
| 79 |
[[ -n ${AUTOCOMMIT} ]] && \ |
| 80 |
- repoman commit -m "Move Qt dependencies to new category" |
| 81 |
- done |
| 82 |
+ repoman commit -m "Move Qt dependencies to the new category" |
| 83 |
+ fi |
| 84 |
popd > /dev/null 2>&1 |
| 85 |
done |
| 86 |
} |
Archives