diff options
| -rw-r--r-- | Documentation/test | 6 | ||||
| -rw-r--r-- | eclass/kde4-base.eclass | 17 | ||||
| -rw-r--r-- | kde-base/kdelibs/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/kdelibs/Manifest | 8 | ||||
| -rw-r--r-- | kde-base/kdelibs/kdelibs-4.0.85.ebuild | 207 | ||||
| -rw-r--r-- | kde-base/kdelibs/kdelibs-4.1.0.ebuild (renamed from kde-base/kdelibs/kdelibs-4.0.98.ebuild) | 32 | ||||
| -rw-r--r-- | profiles/categories | 4 | ||||
| -rw-r--r-- | sets.conf | 2 | ||||
| -rw-r--r-- | sets/qt-split | 1 |
9 files changed, 25 insertions, 258 deletions
diff --git a/Documentation/test b/Documentation/test deleted file mode 100644 index 7f75579..0000000 --- a/Documentation/test +++ /dev/null @@ -1,6 +0,0 @@ -#/bin/bash - -test1=9999 -test2=9999.1 - -case diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 60fdeb5..92333bc 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -50,7 +50,7 @@ kde4-base_set_qt_dependencies() { # allow monolithic qt for PV < 4.1 case "${PV}" in - scm|9999*|4.1*|4.0.8*) : ;; + scm|9999*|4.1*|4.0.8*|4.0.9*) : ;; *) qtdepend="|| ( ( ${qtdepend} ) >=x11-libs/qt-4.3.3:4${qt} )" qtopengldepend="|| ( ${qtopengldepend} >=x11-libs/qt-4.3.3:4 )" @@ -196,12 +196,7 @@ case ${NEED_KDE} in _operator=">=" _pv="-${NEED_KDE}" ;; - 3.9*) - _kdedir="3.9" - _operator=">=" - _pv="-${NEED_KDE}:kde-4" - ;; - 4.0.8* | 4.0.9*) + 4.0.8* | 4.0.9* | 4.1*) _kdedir="4.1" _operator=">=" _pv="-${NEED_KDE}:4.1" @@ -211,10 +206,10 @@ case ${NEED_KDE} in _operator=">=" _pv="-${NEED_KDE}:kde-4" ;; - 4.1*) - _kdedir="4.1" + 3.9*) + _kdedir="3.9" _operator=">=" - _pv="${NEED_KDE}" + _pv="-${NEED_KDE}:kde-4" ;; *) die "NEED_KDE=${NEED_KDE} currently not supported." ;; @@ -265,7 +260,7 @@ if [[ -n ${KDEBASE} ]]; then case ${KDEBASE} in kde-base) case ${PV} in - 4.0.8* | 4.1*) + 4.0.8* | 4.0.9*) SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.bz2" ;; *) SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.bz2";; esac diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog index 1f1f809..dac3065 100644 --- a/kde-base/kdelibs/ChangeLog +++ b/kde-base/kdelibs/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*kdelibs-4.1.0 (03 Aug 2008) + + 03 Aug 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> + -kdelibs-4.0.85.ebuild, -kdelibs-4.0.98.ebuild, +kdelibs-4.1.0.ebuild: + Bumped kdelibs to 4.1.0. + 13 Jul 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> kdelibs-4.0.98.ebuild: Fixed the license as it's LGPL-2.1 diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest index e451312..29048a9 100644 --- a/kde-base/kdelibs/Manifest +++ b/kde-base/kdelibs/Manifest @@ -3,9 +3,7 @@ AUX e-tempdir.patch 1427 RMD160 fc9393c50dbacf04b5d4fc1a4f7c9e994f87f446 SHA1 30 AUX kdelibs-4.0.2-X11-optional.patch 6103 RMD160 ff7c315d65204253cc3ed2fa90e45b5dbef709d8 SHA1 2093a73b17246d39b0518a8ccb1162caed263aee SHA256 398bde6b24e7fb3bf7325ef1f4409f02839baee52ac20bb041f623acd1900b5e AUX kdelibs-4.0.2-alsa-optional.patch 1742 RMD160 ea660d1148488fdac27970587535ec29acd3878f SHA1 53a3d7658ca700a7e8b642e7f66b69b8d25774c8 SHA256 b9107dd43916c015a9392ada81bdfebeff91d2c136eeaa01fb1c89ddd89fd914 AUX kdelibs-4.0.3-CVS-2008-1670.patch 739 RMD160 348782a28e75435c4b36548879d2d8d243fc0436 SHA1 c08f374abc2f44cd1ece01881b510ef83241f186 SHA256 41e219e50b652800a2ca892e70baeb40ee6e7cf0f981d098dbdf2ca0926ddf5f -DIST kdelibs-4.0.85.tar.bz2 9095426 RMD160 85b72a4cb599c8618484d56cd4f9d08c0d4ededb SHA1 47939c35b21793486874909e29c3dd7cad705dda SHA256 3fc171952b2ce6e633fd713a5dca275706eb7b99f29c21974ae3280cdd306d76 -DIST kdelibs-4.0.98.tar.bz2 9107056 RMD160 7aa0124d6e42a9dea2a9b1739864890c86f63c99 SHA1 94f0ebe11f7f9cbbeef756a9f853e0b9979613e9 SHA256 9b3b94426c07fcdbadbb02af784c1fe25e96f03fcf72a3ee3e3c10aa4b18aa2b -EBUILD kdelibs-4.0.85.ebuild 6040 RMD160 1e1938af9f70f59f5b7126974e9126d40818e02a SHA1 2dfe66fa3d7dd2b2fde4a890067258ae07466f09 SHA256 bf4448e61fbdde477b30ba67ca1616b325e10bae55c609679c4acee537f4bf27 -EBUILD kdelibs-4.0.98.ebuild 6036 RMD160 5b7fb6d82f6282f940f3e4f4a6080f614252276c SHA1 5c1509348fde05a0cfb5bcf51b6e63ac5d5e8e55 SHA256 3ea8c588e6eb94d767cf6f40096ce7acccd6394d74dd8db81740e2a122bf77e2 -MISC ChangeLog 917 RMD160 f0a69654ceb27165a4c5615aed1451123b23419f SHA1 e6c7769fe612ad83867784dd14b544a8fae4340d SHA256 4e2bdce936215b4bd85c2a84196bb59c580f9d1b732f5946968fe42a3aba558d +DIST kdelibs-4.1.0.tar.bz2 9108493 RMD160 2c96b7f6bfd2a33406d847837f8c95a6ed99895b SHA1 98a726f1e1419fa3e28b56278e46b12cdf5a8c13 SHA256 df59ab19cf8468ada40f6bfc7b687edd8cbea92ed6dfd8db06793602c0d6ae50 +EBUILD kdelibs-4.1.0.ebuild 5296 RMD160 649c1041ba12072a108bc3a7473a607dd989ee0e SHA1 17b0431cbafd2729f79210e96ac9a04e7212b17c SHA256 46c479d36fc40acf536a00cfdf6832abe00f1f014408a59091dcb094dd432445 +MISC ChangeLog 1115 RMD160 86d17c7a9d20c191e4102ac45f05cb3e68fe94e2 SHA1 f1a28f148325d8bdcc3e2b8f423e524822a63a30 SHA256 da316acedae3fee75a2c00c0fa394247ceb5de41855ea76786a9c6a6ea7c2c30 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/kde-base/kdelibs/kdelibs-4.0.85.ebuild b/kde-base/kdelibs/kdelibs-4.0.85.ebuild deleted file mode 100644 index 3d35bf8..0000000 --- a/kde-base/kdelibs/kdelibs-4.0.85.ebuild +++ /dev/null @@ -1,207 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="1" - -CPPUNIT_REQUIRED="optional" -OPENGL_REQUIRED="optional" -inherit kde4-base - -DESCRIPTION="KDE libraries needed by all KDE programs." -HOMEPAGE="http://www.kde.org/" - -KEYWORDS="~amd64 ~x86" -IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam htmlhandbook jpeg2k -kerberos mmx nls openexr +semantic-desktop spell sse sse2 ssl zeroconf" -LICENSE="GPL-2 LGPL-2" -RESTRICT="test" - -COMMONDEPEND=" - !<kde-base/kdebase-3.5.7-r6 - !<kde-base/kdebase-startkde-3.5.7-r1 - !=kde-base/kdebase-3.5.8 - !=kde-base/kdebase-3.5.8-r1 - !=kde-base/kdebase-3.5.8-r2 - !=kde-base/kdebase-startkde-3.5.8 - >=app-misc/strigi-0.5.7 - >=dev-libs/libxml2-2.6.6 - >=dev-libs/libxslt-1.1.17 - media-libs/fontconfig - >=media-libs/freetype-2 - media-libs/giflib - media-libs/jpeg - media-libs/libpng - media-sound/phonon - >=sys-apps/dbus-0.91 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXcursor - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXft - x11-libs/libXpm - x11-libs/libXrender - x11-libs/libXtst - >=x11-misc/shared-mime-info-0.20 - acl? ( kernel_linux? ( sys-apps/acl ) ) - alsa? ( >=media-libs/alsa-lib-1.0.14a ) - fam? ( virtual/fam ) - jpeg2k? ( media-libs/jasper ) - kerberos? ( virtual/krb5 ) - nls? ( virtual/libintl ) - openexr? ( >=media-libs/openexr-1.2.2-r2 media-libs/ilmbase ) - opengl? ( virtual/opengl ) - >=dev-libs/libpcre-4.5 - semantic-desktop? ( >=dev-libs/soprano-2.0.0 ) - spell? ( app-text/aspell app-dicts/aspell-en app-text/enchant ) - ssl? ( >=dev-libs/openssl-0.9.7d ) - zeroconf? ( || ( net-dns/avahi - !bindist? ( net-misc/mDNSResponder ) ) ) -" - -DEPEND="${COMMONDEPEND} - doc? ( app-doc/doxygen ) - sys-devel/gettext" - -RDEPEND="${COMMONDEPEND} - x11-apps/rgb - x11-apps/iceauth" - -# Patch to respect the sandbox when cmake tries to create symlinks, -# or executes an external program that tries to write files. -#PATCHES=("${FILESDIR}/e-tempdir.patch" -PATCHES=( -"${FILESDIR}/${PN}-4.0.2-X11-optional.patch" -"${FILESDIR}/${PN}-4.0.2-alsa-optional.patch") -# Create CMake switches to make Xcomposite, Xinerama & Xscreensaver optional. - -pkg_setup() { - KDE4_BUILT_WITH_USE_CHECK=("--missing true sys-apps/dbus X") - if use alsa; then - KDE4_BUILT_WITH_USE_CHECK+=("--missing true media-libs/alsa-lib midi") - fi - if use zeroconf && has_version net-dns/avahi; then - KDE4_BUILT_WITH_USE_CHECK+=("net-dns/avahi mdnsresponder-compat") - fi - - kde4-base_pkg_setup -} - -src_compile() { - if use zeroconf; then - if has_version net-dns/avahi; then - mycmakeargs="${mycmakeargs} -DWITH_Avahi=ON -DWITH_DNSSD=OFF" - elif has_version net-misc/mDNSResponder; then - mycmakeargs="${mycmakeargs} -DWITH_Avahi=OFF -DWITH_DNSSD=ON" - else - die "USE=\"zeroconf\" enabled but neither net-dns/avahi nor net-misc/mDNSResponder were found." - fi - fi - - mycmakeargs="${mycmakeargs} - -DWITH_HSPELL=OFF - $(cmake-utils_has 3dnow X86_3DNOW) - $(cmake-utils_has altivec PPC_ALTIVEC) - $(cmake-utils_has mmx X86_MMX) - $(cmake-utils_has sse X86_SSE) - $(cmake-utils_has sse2 X86_SSE2) - $(cmake-utils_use_with acl ACL) - $(cmake-utils_use_with alsa Alsa) - $(cmake-utils_use_with bzip2 BZip2) - $(cmake-utils_use_with fam FAM) - $(cmake-utils_use_with jpeg2k Jasper) - $(cmake-utils_use_with kerberos GSSAPI) - $(cmake-utils_use_with nls Libintl) - $(cmake-utils_use_with openexr OpenEXR) - $(cmake-utils_use_with opengl OpenGL) - $(cmake-utils_use_with semantic-desktop Soprano) - $(cmake-utils_use_with spell ASPELL) - $(cmake-utils_use_with spell ENCHANT) - $(cmake-utils_use_with ssl OpenSSL) - " - - kde4-base_src_compile - - # The building of apidox is not managed anymore by the build system - if use doc; then - einfo "Building API documentation" - cd "${S}"/doc/api/ - ./doxygen.sh "${S}" || die "APIDOX generation failed" - fi -} - -src_install() { - kde4-base_src_install - - # Some external applications need FindXine.cmake. Therefore upstream moved it - # to kdelibs in trunk. Doing the same for :kde-4. See bug #209701. - insinto ${KDEDIR}/share/apps/cmake/modules/ - doins "${FILESDIR}"/FindXine.cmake || die "doins FindXine failed." - - if use doc; then - einfo "Installing API documentation. This could take a bit of time." - cd "${S}"/doc/api/ - docinto /HTML/en/kdelibs-apidox - dohtml -r ${P}-apidocs/* || die "Install phase of KDE4 API Documentation failed" - fi - - dodir /etc/env.d - dodir /etc/revdep-rebuild - - # List all the multilib libdirs - local _libdir _libdirs - for _libdir in $(get_all_libdirs); do - _libdirs="${_libdirs}:${PREFIX}/${_libdir}" - done - _libdirs=${_libdirs#:} - - cat <<-EOF > "${T}"/43kdepaths-${SLOT} # number goes down with version bump - PATH="${PREFIX}/bin" - ROOTPATH="${PREFIX}/sbin:${PREFIX}/bin" - LDPATH="${_libdirs}" - MANPATH="${PREFIX}/share/man" - CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config" - KDEDIRS="/usr:/usr/local:${PREFIX}" - #KDE_IS_PRELINKED=1 - XDG_DATA_DIRS="/usr/share:${PREFIX}/share:/usr/local/share" - COLON_SEPARATED="XDG_DATA_DIRS" - EOF - doenvd "${T}"/43kdepaths-${SLOT} - - # make sure 'source /etc/profile' doesn't hose the PATH - dodir /etc/profile.d - cat <<-'EOF' > "${D}"/etc/profile.d/44kdereorderpaths-${SLOT}.sh - if [ -n "${KDEDIR}" ]; then - export PATH=${KDEDIR}/bin:$(echo ${PATH} | sed "s#${KDEDIR}/s\?bin:##g") - export ROOTPATH=${KDEDIR}/sbin:${KDEDIR}/bin:$(echo ${PATH} | sed "s#${KDEDIR}/s\?bin:##g") - fi - EOF - - cat <<-EOF > "${D}/etc/revdep-rebuild/50-kde-${SLOT}" - SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*" - EOF -} - -src_test() { - # FIXME: Disable kate tests - mycmakeargs="${mycmakeargs} - -DKHTML_BUILD_TESTREGRESSION=ON" - kde4-base_src_test -} - -pkg_postinst() { - if use zeroconf; then - echo - elog "To make zeroconf support available in KDE make sure that the 'mdnsd' daemon" - elog "is running. Make sure also that multicast dns lookups are enabled by editing" - elog "the 'hosts:' line in /etc/nsswitch.conf to include 'mdns', e.g.:" - elog " hosts: files mdns dns" - echo - fi - - kde4-base_pkg_postinst -} diff --git a/kde-base/kdelibs/kdelibs-4.0.98.ebuild b/kde-base/kdelibs/kdelibs-4.1.0.ebuild index e79084b..f581b16 100644 --- a/kde-base/kdelibs/kdelibs-4.0.98.ebuild +++ b/kde-base/kdelibs/kdelibs-4.1.0.ebuild @@ -2,8 +2,6 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="1" - CPPUNIT_REQUIRED="optional" OPENGL_REQUIRED="optional" inherit kde4-base @@ -12,7 +10,7 @@ DESCRIPTION="KDE libraries needed by all KDE programs." HOMEPAGE="http://www.kde.org/" KEYWORDS="~amd64 ~x86" -IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam htmlhandbook jpeg2k +IUSE="${IUSE} 3dnow acl alsa altivec bindist +bzip2 debug doc fam htmlhandbook jpeg2k kerberos mmx nls openexr +semantic-desktop spell sse sse2 ssl zeroconf" LICENSE="LGPL-2.1" RESTRICT="test" @@ -24,7 +22,7 @@ COMMONDEPEND=" !=kde-base/kdebase-3.5.8-r1 !=kde-base/kdebase-3.5.8-r2 !=kde-base/kdebase-startkde-3.5.8 - >=app-misc/strigi-0.5.7 + >=app-misc/strigi-0.5.9 >=dev-libs/libxml2-2.6.6 >=dev-libs/libxslt-1.1.17 media-libs/fontconfig @@ -65,19 +63,13 @@ COMMONDEPEND=" DEPEND="${COMMONDEPEND} doc? ( app-doc/doxygen ) - sys-devel/gettext" + sys-devel/gettext +" RDEPEND="${COMMONDEPEND} x11-apps/rgb - x11-apps/iceauth" - -# Patch to respect the sandbox when cmake tries to create symlinks, -# or executes an external program that tries to write files. -#PATCHES=("${FILESDIR}/e-tempdir.patch" -PATCHES=( -"${FILESDIR}/${PN}-4.0.2-X11-optional.patch" -"${FILESDIR}/${PN}-4.0.2-alsa-optional.patch") -# Create CMake switches to make Xcomposite, Xinerama & Xscreensaver optional. + x11-apps/iceauth +" pkg_setup() { KDE4_BUILT_WITH_USE_CHECK=("--missing true sys-apps/dbus X") @@ -137,11 +129,6 @@ src_compile() { src_install() { kde4-base_src_install - # Some external applications need FindXine.cmake. Therefore upstream moved it - # to kdelibs in trunk. Doing the same for :kde-4. See bug #209701. - insinto ${KDEDIR}/share/apps/cmake/modules/ - doins "${FILESDIR}"/FindXine.cmake || die "doins FindXine failed." - if use doc; then einfo "Installing API documentation. This could take a bit of time." cd "${S}"/doc/api/ @@ -186,13 +173,6 @@ src_install() { EOF } -src_test() { - # FIXME: Disable kate tests - mycmakeargs="${mycmakeargs} - -DKHTML_BUILD_TESTREGRESSION=ON" - kde4-base_src_test -} - pkg_postinst() { if use zeroconf; then echo diff --git a/profiles/categories b/profiles/categories new file mode 100644 index 0000000..9750f30 --- /dev/null +++ b/profiles/categories @@ -0,0 +1,4 @@ +app-office +dev-libs +kde-base +media-sound @@ -2,5 +2,3 @@ class = portage.sets.files.StaticFileSet multiset = true directory = ${repository:jmbsvicetto}/sets/ -#directory = /home/overlays/jmbsvicetto/sets/ - diff --git a/sets/qt-split b/sets/qt-split index f7d5ca3..35d1b1e 100644 --- a/sets/qt-split +++ b/sets/qt-split @@ -1,5 +1,4 @@ # This file contains everything the split Qt ebuilds provide: -x11-libs/qt:4 x11-libs/qt-assistant x11-libs/qt-core x11-libs/qt-dbus |