diff options
| author |   Martin von Gagern <Martin.vGagern@gmx.net> | 2011-04-08 08:10:56 +0200 |
|---|---|---|
| committer | Martin von Gagern <Martin.vGagern@gmx.net> | 2011-04-08 08:22:45 +0200 |
| commit | a878919cae22fc49963d474e52ec168fbd9cd589 (patch) | |
| tree | 7914b49b3b55db7649009732b38e123ed14752cb /Documentation | |
| parent | [app-text/poppler] Update from main portage tree (diff) | |
| download | kde-sunset-a878919cae22fc49963d474e52ec168fbd9cd589.tar.gz kde-sunset-a878919cae22fc49963d474e52ec168fbd9cd589.tar.bz2 kde-sunset-a878919cae22fc49963d474e52ec168fbd9cd589.zip | |
move x11-libs/qt x11-libs/qt-meta
This commit honours the package move from r1.2 of 2Q-2011:
http://sources.gentoo.org/profiles/updates/2Q-2011?revision=1.2&view=markup
It renames the qt:3 ebuild to qt-meta and adjusts all deps.
Of course, our qt-meta:3 is not really a meta ebuild, but who cares?
Diffstat (limited to 'Documentation')
| -rwxr-xr-x | Documentation/maintainers/import_avahi | 2 | ||||
| -rwxr-xr-x | Documentation/maintainers/import_poppler | 2 | ||||
| -rw-r--r-- | Documentation/package.unmask/kde-3.5 | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/maintainers/import_avahi b/Documentation/maintainers/import_avahi index 7d3746c1..5c73ed3f 100755 --- a/Documentation/maintainers/import_avahi +++ b/Documentation/maintainers/import_avahi @@ -14,7 +14,7 @@ cp -r "${PORTDIR:-/usr/portage}/net-dns/avahi" net-dns/ sed -i \ -e 's/^\(IUSE=.*\) qt4/\1 qt3 qt4/' \ -e 's/--disable-qt3/$(use_enable qt3)/' \ - -e 's/^\([ \t]*\)\(qt4? ( x11-libs\/qt-core:4\)/\1qt3? ( x11-libs\/qt:3 )\n\1\2/' \ + -e 's/^\([ \t]*\)\(qt4? ( x11-libs\/qt-core:4\)/\1qt3? ( x11-libs\/qt-meta:3 )\n\1\2/' \ net-dns/avahi/*.ebuild # Drop all unmodified ebuilds, e.g. for older versions without qt4 USE flag diff --git a/Documentation/maintainers/import_poppler b/Documentation/maintainers/import_poppler index f9c98961..8610110e 100755 --- a/Documentation/maintainers/import_poppler +++ b/Documentation/maintainers/import_poppler @@ -12,7 +12,7 @@ sed -i \ -e '/^IUSE/N' \ -e 's/^\(IUSE=.*\) qt4/\1 qt3 qt4/' \ -e 's/-DWITH_Qt3=OFF/$(cmake-utils_use_with qt3)/' \ - -e 's/^\([ \t]*\)\(qt4? (\)/\1qt3? ( >=x11-libs\/qt-3.3:3 )\n\1\2/' \ + -e 's/^\([ \t]*\)\(qt4? (\)/\1qt3? ( >=x11-libs\/qt-meta-3.3:3 )\n\1\2/' \ -e 's/^\(inherit.*\)/\1 qt3/' \ app-text/poppler/*.ebuild diff --git a/Documentation/package.unmask/kde-3.5 b/Documentation/package.unmask/kde-3.5 index b9431a68..32de361b 100644 --- a/Documentation/package.unmask/kde-3.5 +++ b/Documentation/package.unmask/kde-3.5 @@ -663,8 +663,8 @@ =x11-libs/qscintilla-1.7.1 =x11-libs/qscintilla-2.3.2 =x11-libs/qscintilla-2.4 -=x11-libs/qt-3.3.8b-r1 -=x11-libs/qt-3.3.8b-r2 +=x11-libs/qt-meta-3.3.8b-r1 +=x11-libs/qt-meta-3.3.8b-r2 =x11-misc/dekorator-0.3 =x11-misc/icecursorscfg-0.6 =x11-misc/iceiconcvt-1.0 |