Menu
▾
▴
[Libmage-cvs] SF.net SVN: libmage:[559] gentoo-portage-overlay/trunk
|
From: <za...@us...> - 2009-05-25 17:07:24
|
Revision: 559
http://libmage.svn.sourceforge.net/libmage/?rev=559&view=rev
Author: zaufi
Date: 2009-05-25 17:07:07 +0000 (Mon, 25 May 2009)
Log Message:
-----------
boost 1.39 added. amarok -python compile fixed. kate-ctags plugin added. KDE sets r fixed according current portage state.
Modified Paths:
--------------
gentoo-portage-overlay/trunk/sets/my-kdeartwork-3.conf
gentoo-portage-overlay/trunk/sets/my-kdemultimedia-3.conf
Added Paths:
-----------
gentoo-portage-overlay/trunk/dev-libs/boost/boost-1.39.0.ebuild
gentoo-portage-overlay/trunk/dev-libs/boost/files/remove_toolset_from_targetname.patch
gentoo-portage-overlay/trunk/dev-util/boost-build/boost-build-1.39.0.ebuild
gentoo-portage-overlay/trunk/kde-misc/
gentoo-portage-overlay/trunk/kde-misc/kate-ctags-plugin/
gentoo-portage-overlay/trunk/kde-misc/kate-ctags-plugin/kate-ctags-plugin-0.2.ebuild
gentoo-portage-overlay/trunk/media-sound/
gentoo-portage-overlay/trunk/media-sound/amarok/
gentoo-portage-overlay/trunk/media-sound/amarok/amarok-1.4.10_p20090130-r3.ebuild
gentoo-portage-overlay/trunk/media-sound/amarok/files/
gentoo-portage-overlay/trunk/media-sound/amarok/files/amarok-1.4.10-audibletag.patch
gentoo-portage-overlay/trunk/media-sound/amarok/files/amarok-1.4.10-gcc-4.3.patch
gentoo-portage-overlay/trunk/media-sound/amarok/files/amarok-1.4.10-gcc44.patch
gentoo-portage-overlay/trunk/media-sound/amarok/files/amarok-1.4.9.1-libmtp-0.3.0-API.patch
Removed Paths:
-------------
gentoo-portage-overlay/trunk/dev-libs/boost/boost-1.38.0.ebuild
gentoo-portage-overlay/trunk/dev-libs/boost/files/boost-1.33.1-gcc41_visit_each.patch
gentoo-portage-overlay/trunk/dev-libs/boost/files/boost-alpha-threads.patch
gentoo-portage-overlay/trunk/dev-libs/boost/files/random-Jamfile
gentoo-portage-overlay/trunk/dev-libs/boost/files/remove_toolset_from_targetname.patch
gentoo-portage-overlay/trunk/dev-util/boost-build/boost-build-1.38.0.ebuild
Deleted: gentoo-portage-overlay/trunk/dev-libs/boost/boost-1.38.0.ebuild
===================================================================
--- gentoo-portage-overlay/trunk/dev-libs/boost/boost-1.38.0.ebuild 2009-05-08 11:26:02 UTC (rev 558)
+++ gentoo-portage-overlay/trunk/dev-libs/boost/boost-1.38.0.ebuild 2009-05-25 17:07:07 UTC (rev 559)
@@ -1,292 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.37.0.ebuild,v 1.1 2008/12/16 16:37:27 dev-zero Exp $
-
-EAPI="2"
-
-inherit python flag-o-matic multilib toolchain-funcs versionator check-reqs
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-MY_P=${PN}_$(replace_all_version_separators _)
-PATCHSET_VERSION="${PV}-1"
-
-DESCRIPTION="Boost Libraries for C++"
-HOMEPAGE="http://www.boost.org/"
-SRC_URI="mirror://sourceforge/boost/${MY_P}.tar.bz2"
-LICENSE="freedist Boost-1.0"
-SLOT="1.38"
-IUSE="debug doc expat icu mpi tools"
-
-RDEPEND="icu? ( >=dev-libs/icu-3.3 )
- expat? ( dev-libs/expat )
- mpi? ( || ( sys-cluster/openmpi sys-cluster/mpich2 ) )
- sys-libs/zlib
- virtual/python
- !<=dev-libs/boost-1.35.0-r2"
-DEPEND="${RDEPEND}
- dev-util/boost-build:${SLOT}"
-PDEPEND="app-admin/eselect-boost"
-
-S=${WORKDIR}/${MY_P}
-
-# Maintainer Information
-# ToDo:
-# - write a patch to support /dev/urandom on FreeBSD and OSX (see below)
-
-MAJOR_PV=$(replace_all_version_separators _ ${SLOT})
-BJAM="bjam-${MAJOR_PV}"
-
-pkg_setup() {
- if has test ${FEATURES} ; then
- CHECKREQS_DISK_BUILD="1024"
- check_reqs
-
- ewarn "The tests may take several hours on a recent machine"
- ewarn "but they will not fail (unless something weird happens ;-)"
- ewarn "This is because the tests depend on the used compiler/-version"
- ewarn "and the platform and upstream says that this is normal."
- ewarn "If you are interested in the results, please take a look at the"
- ewarn "generated results page:"
- ewarn " ${ROOT}usr/share/doc/${PF}/status/cs-$(uname).html"
- ebeep 5
-
- fi
-}
-
-src_prepare() {
-# EPATCH_SOURCE="${WORKDIR}/patches"
-# EPATCH_SUFFIX="patch"
-# epatch
-
- epatch "${FILESDIR}/remove_toolset_from_targetname.patch"
-
- # This enables building the boost.random library with /dev/urandom support
- if ! use userland_Darwin ; then
- mkdir -p libs/random/build
- cp "${FILESDIR}/random-Jamfile" libs/random/build/Jamfile.v2
- fi
-}
-
-generate_options() {
- # Maintainer information:
- # The debug-symbols=none and optimization=none
- # are not official upstream flags but a Gentoo
- # specific patch to make sure that all our
- # CXXFLAGS/LDFLAGS are being respected.
- # Using optimization=off would for example add
- # "-O0" and override "-O2" set by the user.
- # Please take a look at the boost-build ebuild
- # for more infomration.
-
- BUILDNAME="gentoorelease"
- use debug && BUILDNAME="gentoodebug"
-
- OPTIONS="${BUILDNAME}"
-
- use icu && OPTIONS="${OPTIONS} -sICU_PATH=/usr"
- if use expat ; then
- OPTIONS="${OPTIONS} -sEXPAT_INCLUDE=/usr/include -sEXPAT_LIBPATH=/usr/$(get_libdir)"
- fi
-
- if ! use mpi ; then
- OPTIONS="${OPTIONS} --without-mpi"
- fi
-
- OPTIONS="${OPTIONS} --user-config=${S}/user-config.jam --boost-build=/usr/share/boost-build-${MAJOR_PV}"
-}
-
-src_configure() {
- einfo "Writing new user-config.jam"
- python_version
-
- local compiler compilerVersion compilerExecutable mpi
- if [[ ${CHOST} == *-darwin* ]] ; then
- compiler=darwin
- compilerVersion=$(gcc-version)
- compilerExecutable=$(tc-getCXX)
- append-ldflags -ldl
- else
- compiler=gcc
- compilerVersion=$(gcc-version)
- compilerExecutable=$(tc-getCXX)
- fi
-
- use mpi && mpi="using mpi ;"
-
- cat > "${S}/user-config.jam" << __EOF__
-
-variant gentoorelease : release : <optimization>none <debug-symbols>none ;
-variant gentoodebug : debug : <optimization>none <debug-symbols>none ;
-
-using ${compiler} : ${compilerVersion} : ${compilerExecutable} : <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
-using python : ${PYVER} : /usr : /usr/include/python${PYVER} : /usr/lib/python${PYVER} ;
-
-${mpi}
-
-__EOF__
-
-}
-
-src_compile() {
-
- NUMJOBS=$(sed -e 's/.*\(\-j[ 0-9]\+\) .*/\1/; s/--jobs=\?/-j/' <<< ${MAKEOPTS})
-
- generate_options
-
- elog "Using the following options to build: "
- elog " ${OPTIONS}"
-
- export BOOST_ROOT="${S}"
-
- ${BJAM} ${NUMJOBS} -q \
- ${OPTIONS} \
- threading=single,multi link=shared,static runtime-link=shared,static \
- --prefix="${D}/usr" \
- --layout=versioned \
- || die "building boost failed"
-
- if use tools; then
- cd "${S}/tools/"
- ${BJAM} ${NUMJOBS} -q \
- ${OPTIONS} \
- --prefix="${D}/usr" \
- --layout=versioned \
- || die "building tools failed"
- fi
-
-}
-
-src_install () {
-
- generate_options
-
- export BOOST_ROOT="${S}"
-
- ${BJAM} -q \
- ${OPTIONS} \
- threading=single,multi link=shared,static runtime-link=shared,static \
- --prefix="${D}/usr" \
- --includedir="${D}/usr/include" \
- --libdir="${D}/usr/$(get_libdir)" \
- --layout=versioned \
- install || die "install failed for options '${OPTIONS}'"
-
- # Move the mpi.so to the right place and make sure it's slotted
- if use mpi; then
- mkdir -p "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/mpi_${MAJOR_PV}"
- mv "${D}/usr/$(get_libdir)/mpi.so" "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/mpi_${MAJOR_PV}/"
- touch "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/mpi_${MAJOR_PV}/__init__.py"
- fi
-
- if use doc ; then
- find libs -iname "test" -or -iname "src" | xargs rm -rf
- dohtml \
- -A pdf,txt,cpp \
- *.{htm,html,png,css} \
- -r doc more people wiki
- insinto /usr/share/doc/${PF}/html
- doins -r libs
-
- # To avoid broken links
- insinto /usr/share/doc/${PF}/html
- doins LICENSE_1_0.txt
-
- dosym /usr/include/boost /usr/share/doc/${PF}/html/boost
- fi
-
- cd "${D}/usr/$(get_libdir)"
-
- # Remove (unversioned) symlinks
- # And check for what we remove to catch bugs
- for f in libboost_*[!$(get_version_component_range 2)].{a,so} ; do
- if [ ! -h "${f}" ] ; then
- eerror "Ups, tried to remove a real file instead of a symlink"
- die "slotting/naming of the libs broken!"
- fi
- rm "${f}"
- done
-
- # If built with debug enabled, all libraries get a 'd' postfix,
- # this breaks linking other apps against boost (bug #181972)
- if use debug ; then
- for lib in libboost_* ; do
- dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-d\././' -e 's/d\././' <<< ${lib})"
- done
- fi
-
- for lib in libboost_thread-mt-{s-${MAJOR_PV}.a,${MAJOR_PV}.a,${MAJOR_PV}.so} ; do
- dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})"
- done
-
- if use tools; then
- cd "${S}/dist/bin"
- # Append version postfix to binaries for slotting
- for b in * ; do
- newbin "${b}" "${b}-${MAJOR_PV}"
- done
-
- cd "${S}/dist"
- insinto /usr/share
- doins -r share/boostbook
- # Append version postfix for slotting
- mv "${D}/usr/share/boostbook" "${D}/usr/share/boostbook-${MAJOR_PV}"
- fi
-
- cd "${S}/status"
- if [ -f regress.log ] ; then
- docinto status
- dohtml *.{html,gif} ../boost.png
- dodoc regress.log
- fi
-
- python_need_rebuild
-}
-
-src_test() {
- generate_options
-
- export BOOST_ROOT=${S}
-
- cd "${S}/tools/regression/build"
- ${BJAM} -q \
- ${OPTIONS} \
- --prefix="${D}/usr" \
- --layout=versioned \
- process_jam_log compiler_status \
- || die "building regression test helpers failed"
-
- cd "${S}/status"
-
- # Some of the test-checks seem to rely on regexps
- export LC_ALL="C"
-
- # The following is largely taken from tools/regression/run_tests.sh,
- # but adapted to our needs.
-
- # Run the tests & write them into a file for postprocessing
- ${BJAM} \
- ${OPTIONS} \
- --dump-tests 2>&1 | tee regress.log
-
- # Postprocessing
- cat regress.log | "${S}/tools/regression/build/bin/gcc-$(gcc-version)/${BUILDNAME}/process_jam_log" --v2
- if test $? != 0 ; then
- die "Postprocessing the build log failed"
- fi
-
- cat > "${S}/status/comment.html" <<- __EOF__
- <p>Tests are run on a <a href="http://www.gentoo.org">Gentoo</a> system.</p>
-__EOF__
-
- # Generate the build log html summary page
- "${S}/tools/regression/build/bin/gcc-$(gcc-version)/${BUILDNAME}/compiler_status" --v2 \
- --comment "${S}/status/comment.html" "${S}" \
- cs-$(uname).html cs-$(uname)-links.html
- if test $? != 0 ; then
- die "Generating the build log html summary page failed"
- fi
-
- # And do some cosmetic fixes :)
- sed -i -e 's|http://www.boost.org/boost.png|boost.png|' *.html
-}
Added: gentoo-portage-overlay/trunk/dev-libs/boost/boost-1.39.0.ebuild
===================================================================
--- gentoo-portage-overlay/trunk/dev-libs/boost/boost-1.39.0.ebuild (rev 0)
+++ gentoo-portage-overlay/trunk/dev-libs/boost/boost-1.39.0.ebuild 2009-05-25 17:07:07 UTC (rev 559)
@@ -0,0 +1,416 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.37.0-r1.ebuild,v 1.6 2009/05/24 05:42:24 dev-zero Exp $
+
+EAPI="2"
+
+inherit python flag-o-matic multilib toolchain-funcs versionator check-reqs
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+MY_P=${PN}_$(replace_all_version_separators _)
+#PATCHSET_VERSION="1.37.0-1"
+
+DESCRIPTION="Boost Libraries for C++"
+HOMEPAGE="http://www.boost.org/"
+SRC_URI="mirror://sourceforge/boost/${MY_P}.tar.bz2"
+# mirror://gentoo/boost-patches-${PATCHSET_VERSION}.tbz2
+# http://www.gentoo.org/~dev-zero/distfiles/boost-patches-${PATCHSET_VERSION}.tbz2"
+LICENSE="freedist Boost-1.0"
+SLOT="1.39"
+IUSE="debug doc +eselect expat icu mpi python tools"
+
+RDEPEND="icu? ( >=dev-libs/icu-3.3 )
+ expat? ( dev-libs/expat )
+ mpi? ( || ( >=sys-cluster/openmpi-1.3[cxx] =sys-cluster/openmpi-1.2*[-nocxx] ) )
+ sys-libs/zlib
+ python? ( virtual/python )
+ !!<=dev-libs/boost-1.35.0-r2
+ >=app-admin/eselect-boost-0.3"
+DEPEND="${RDEPEND}
+ dev-util/boost-build:${SLOT}"
+
+S=${WORKDIR}/${MY_P}
+
+# Maintainer Information
+# ToDo:
+# - write a patch to support /dev/urandom on FreeBSD and OSX (see below)
+
+MAJOR_PV=$(replace_all_version_separators _ ${SLOT})
+BJAM="bjam-${MAJOR_PV}"
+
+# Usage:
+# _add_line <line-to-add> <profile>
+# ... to add to specific profile
+# or
+# _add_line <line-to-add>
+# ... to add to all profiles for which the use flag set
+
+_add_line() {
+ if [ -z "$2" ] ; then
+ echo "${1}" >> "${D}/usr/share/boost-eselect/profiles/${SLOT}/default"
+ use debug && echo "${1}" >> "${D}/usr/share/boost-eselect/profiles/${SLOT}/debug"
+ else
+ echo "${1}" >> "${D}/usr/share/boost-eselect/profiles/${SLOT}/${2}"
+ fi
+}
+
+pkg_setup() {
+ if has test ${FEATURES} ; then
+ CHECKREQS_DISK_BUILD="1024"
+ check_reqs
+
+ ewarn "The tests may take several hours on a recent machine"
+ ewarn "but they will not fail (unless something weird happens ;-)"
+ ewarn "This is because the tests depend on the used compiler/-version"
+ ewarn "and the platform and upstream says that this is normal."
+ ewarn "If you are interested in the results, please take a look at the"
+ ewarn "generated results page:"
+ ewarn " ${ROOT}usr/share/doc/${PF}/status/cs-$(uname).html"
+ ebeep 5
+
+ fi
+
+ if use debug ; then
+ ewarn "The debug USE-flag means that a second set of the boost libraries"
+ ewarn "will be built containing debug-symbols. You'll be able to select them"
+ ewarn "using the boost-eselect module. But even though the optimization flags"
+ ewarn "you might have set are not stripped, there will be a performance"
+ ewarn "penalty and linking other packages against the debug version"
+ ewarn "of boost is _not_ recommended."
+ fi
+}
+
+src_prepare() {
+# EPATCH_SOURCE="${WORKDIR}/patches"
+# EPATCH_SUFFIX="patch"
+# epatch
+
+ epatch "${FILESDIR}/remove_toolset_from_targetname.patch"
+# "${FILESDIR}/buildid-fix.patch"
+
+ # This enables building the boost.random library with /dev/urandom support
+# if ! use userland_Darwin ; then
+# mkdir -p libs/random/build
+# cp "${FILESDIR}/random-Jamfile" libs/random/build/Jamfile.v2
+# fi
+}
+
+src_configure() {
+ einfo "Writing new user-config.jam"
+
+ local compiler compilerVersion compilerExecutable mpi
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ compiler=darwin
+ compilerVersion=$(gcc-version)
+ compilerExecutable=$(tc-getCXX)
+ append-ldflags -ldl
+ else
+ compiler=gcc
+ compilerVersion=$(gcc-version)
+ compilerExecutable=$(tc-getCXX)
+ fi
+
+ use mpi && mpi="using mpi ;"
+
+ if use python ; then
+ python_version
+ pystring="using python : ${PYVER} : /usr : /usr/include/python${PYVER} : /usr/lib/python${PYVER} ;"
+ fi
+
+ cat > "${S}/user-config.jam" << __EOF__
+
+variant gentoorelease : release : <optimization>none <debug-symbols>none ;
+variant gentoodebug : debug : <optimization>none ;
+
+using ${compiler} : ${compilerVersion} : ${compilerExecutable} : <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
+
+${pystring}
+
+${mpi}
+
+__EOF__
+
+ # Maintainer information:
+ # The debug-symbols=none and optimization=none
+ # are not official upstream flags but a Gentoo
+ # specific patch to make sure that all our
+ # CXXFLAGS/LDFLAGS are being respected.
+ # Using optimization=off would for example add
+ # "-O0" and override "-O2" set by the user.
+ # Please take a look at the boost-build ebuild
+ # for more infomration.
+
+ use icu && OPTIONS="-sICU_PATH=/usr"
+ use expat && OPTIONS="${OPTIONS} -sEXPAT_INCLUDE=/usr/include -sEXPAT_LIBPATH=/usr/$(get_libdir)"
+ use mpi || OPTIONS="${OPTIONS} --without-mpi"
+ use python || OPTIONS="${OPTIONS} --without-python"
+
+ OPTIONS="${OPTIONS} --user-config=\"${S}/user-config.jam\" --boost-build=/usr/share/boost-build-${MAJOR_PV} --prefix=\"${D}/usr\" --layout=versioned"
+
+}
+
+src_compile() {
+
+ NUMJOBS=$(sed -e 's/.*\(\-j[ 0-9]\+\) .*/\1/; s/--jobs=\?/-j/' <<< ${MAKEOPTS})
+
+ einfo "Using the following options to build: "
+ einfo " ${OPTIONS}"
+
+ export BOOST_ROOT="${S}"
+
+ ${BJAM} ${NUMJOBS} -q \
+ gentoorelease \
+ ${OPTIONS} \
+ threading=single,multi link=shared runtime-link=shared \
+ || die "building boost failed"
+ ${BJAM} ${NUMJOBS} -q \
+ gentoorelease \
+ ${OPTIONS} \
+ threading=single,multi link=static runtime-link=static \
+ || die "building boost failed"
+
+ # ... and do the whole thing one more time to get the debug libs
+ if use debug ; then
+ ${BJAM} ${NUMJOBS} -q \
+ gentoodebug \
+ ${OPTIONS} \
+ threading=single,multi link=shared runtime-link=shared \
+ --buildid=debug \
+ || die "building boost failed"
+ ${BJAM} ${NUMJOBS} -q \
+ gentoodebug \
+ ${OPTIONS} \
+ threading=single,multi link=static runtime-link=static \
+ --buildid=debug \
+ || die "building boost failed"
+ fi
+
+ if use tools; then
+ cd "${S}/tools/"
+ ${BJAM} ${NUMJOBS} -q \
+ gentoorelease \
+ ${OPTIONS} \
+ || die "building tools failed"
+ fi
+
+}
+
+src_install () {
+ einfo "Using the following options to install: "
+ einfo " ${OPTIONS}"
+
+ export BOOST_ROOT="${S}"
+
+ ${BJAM} -q \
+ gentoorelease \
+ ${OPTIONS} \
+ threading=single,multi link=shared runtime-link=shared \
+ --includedir="${D}/usr/include" \
+ --libdir="${D}/usr/$(get_libdir)" \
+ install || die "install failed for options '${OPTIONS}'"
+
+ ${BJAM} -q \
+ gentoorelease \
+ ${OPTIONS} \
+ threading=single,multi link=static runtime-link=static \
+ --includedir="${D}/usr/include" \
+ --libdir="${D}/usr/$(get_libdir)" \
+ install || die "install failed for options '${OPTIONS}'"
+
+ if use debug ; then
+ ${BJAM} -q \
+ gentoodebug \
+ ${OPTIONS} \
+ threading=single,multi link=shared runtime-link=shared \
+ --includedir="${D}/usr/include" \
+ --libdir="${D}/usr/$(get_libdir)" \
+ --buildid=debug \
+ install || die "install failed for options '${OPTIONS}'"
+ ${BJAM} -q \
+ gentoodebug \
+ ${OPTIONS} \
+ threading=single,multi link=static runtime-link=static \
+ --includedir="${D}/usr/include" \
+ --libdir="${D}/usr/$(get_libdir)" \
+ --buildid=debug \
+ install || die "install failed for options '${OPTIONS}'"
+ fi
+
+ use python || rm -rf "${D}/usr/include/boost-${MAJOR_PV}/boost"/python*
+
+ dodir /usr/share/boost-eselect/profiles/${SLOT}
+ touch "${D}/usr/share/boost-eselect/profiles/${SLOT}/default"
+ use debug && touch "${D}/usr/share/boost-eselect/profiles/${SLOT}/debug"
+
+ # Move the mpi.so to the right place and make sure it's slotted
+ if use mpi && use python; then
+ mkdir -p "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}"
+ mv "${D}/usr/$(get_libdir)/mpi.so" "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}/"
+ touch "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}/__init__.py"
+ _add_line "python=\"/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}/mpi.so\""
+ fi
+
+ if use doc ; then
+ find libs/*/* -iname "test" -or -iname "src" | xargs rm -rf
+ dohtml \
+ -A pdf,txt,cpp,hpp \
+ *.{htm,html,png,css} \
+ -r doc more people wiki
+ dohtml \
+ -A pdf,txt \
+ -r tools
+ insinto /usr/share/doc/${PF}/html
+ doins -r libs
+
+ # To avoid broken links
+ insinto /usr/share/doc/${PF}/html
+ doins LICENSE_1_0.txt
+
+ dosym /usr/include/boost /usr/share/doc/${PF}/html/boost
+ fi
+
+ cd "${D}/usr/$(get_libdir)"
+
+ # Remove (unversioned) symlinks
+ # And check for what we remove to catch bugs
+ # got a better idea how to do it? tell me!
+ for f in $(ls -1 *.{a,so} | grep -v "${MAJOR_PV}") ; do
+ if [ ! -h "${f}" ] ; then
+ eerror "Ups, tried to remove '${f}' which is a a real file instead of a symlink"
+ die "slotting/naming of the libs broken!"
+ fi
+ rm "${f}"
+ done
+
+ # The threading libs obviously always gets the "-mt" (multithreading) tag
+ # some packages seem to have a problem with it. Creating symlinks...
+ for lib in libboost_thread-mt-${MAJOR_PV}{.a,.so} ; do
+ dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})"
+ done
+
+ # The same goes for the mpi libs
+ if use mpi ; then
+ for lib in libboost_mpi-mt-${MAJOR_PV}{.a,.so} ; do
+ dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})"
+ done
+ fi
+
+ if use debug ; then
+ for lib in libboost_thread-mt-${MAJOR_PV}-debug{.a,.so} ; do
+ dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})"
+ done
+
+ if use mpi ; then
+ for lib in libboost_mpi-mt-${MAJOR_PV}-debug{.a,.so} ; do
+ dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})"
+ done
+ fi
+ fi
+
+ # Create a subdirectory with completely unversioned symlinks
+ # and store the names in the profiles-file for eselect
+ dodir /usr/$(get_libdir)/boost-${MAJOR_PV}
+
+ _add_line "libs=\"" default
+ for f in $(ls -1 *.{a,so} | grep -v debug) ; do
+ dosym ../${f} /usr/$(get_libdir)/boost-${MAJOR_PV}/${f/-${MAJOR_PV}}
+ _add_line "/usr/$(get_libdir)/${f}" default
+ done
+ _add_line "\"" default
+
+ if use debug ; then
+ _add_line "libs=\"" debug
+ dodir /usr/$(get_libdir)/boost-${MAJOR_PV}-debug
+ for f in $(ls -1 *.{a,so} | grep debug) ; do
+ dosym ../${f} /usr/$(get_libdir)/boost-${MAJOR_PV}-debug/${f/-${MAJOR_PV}-debug}
+ _add_line "/usr/$(get_libdir)/${f}" debug
+ done
+ _add_line "\"" debug
+
+ _add_line "includes=\"/usr/include/boost-${MAJOR_PV}/boost\"" debug
+ _add_line "suffix=\"-debug\"" debug
+ fi
+
+ _add_line "includes=\"/usr/include/boost-${MAJOR_PV}/boost\"" default
+
+ if use tools; then
+ cd "${S}/dist/bin"
+ # Append version postfix to binaries for slotting
+ _add_line "bins=\""
+ for b in * ; do
+ newbin "${b}" "${b}-${MAJOR_PV}"
+ _add_line "/usr/bin/${b}-${MAJOR_PV}"
+ done
+ _add_line "\""
+
+ cd "${S}/dist"
+ insinto /usr/share
+ doins -r share/boostbook
+ # Append version postfix for slotting
+ mv "${D}/usr/share/boostbook" "${D}/usr/share/boostbook-${MAJOR_PV}"
+ _add_line "dirs=\"/usr/share/boostbook-${MAJOR_PV}\""
+ fi
+
+ cd "${S}/status"
+ if [ -f regress.log ] ; then
+ docinto status
+ dohtml *.{html,gif} ../boost.png
+ dodoc regress.log
+ fi
+
+ use python && python_need_rebuild
+}
+
+src_test() {
+ export BOOST_ROOT=${S}
+
+ cd "${S}/tools/regression/build"
+ ${BJAM} -q \
+ gentoorelease \
+ ${OPTIONS} \
+ process_jam_log compiler_status \
+ || die "building regression test helpers failed"
+
+ cd "${S}/status"
+
+ # Some of the test-checks seem to rely on regexps
+ export LC_ALL="C"
+
+ # The following is largely taken from tools/regression/run_tests.sh,
+ # but adapted to our needs.
+
+ # Run the tests & write them into a file for postprocessing
+ ${BJAM} \
+ ${OPTIONS} \
+ --dump-tests 2>&1 | tee regress.log
+
+ # Postprocessing
+ cat regress.log | "${S}/tools/regression/build/bin/gcc-$(gcc-version)/gentoorelease/process_jam_log" --v2
+ if test $? != 0 ; then
+ die "Postprocessing the build log failed"
+ fi
+
+ cat > "${S}/status/comment.html" <<- __EOF__
+ <p>Tests are run on a <a href="http://www.gentoo.org">Gentoo</a> system.</p>
+__EOF__
+
+ # Generate the build log html summary page
+ "${S}/tools/regression/build/bin/gcc-$(gcc-version)/gentoorelease/compiler_status" --v2 \
+ --comment "${S}/status/comment.html" "${S}" \
+ cs-$(uname).html cs-$(uname)-links.html
+ if test $? != 0 ; then
+ die "Generating the build log html summary page failed"
+ fi
+
+ # And do some cosmetic fixes :)
+ sed -i -e 's|http://www.boost.org/boost.png|boost.png|' *.html
+}
+
+pkg_postinst() {
+ use eselect && eselect boost update
+ if [ ! -h "${ROOT}/etc/eselect/boost/active" ] ; then
+ elog "No active boost version found. Calling eselect to select one..."
+ eselect boost update
+ fi
+}
Deleted: gentoo-portage-overlay/trunk/dev-libs/boost/files/boost-1.33.1-gcc41_visit_each.patch
===================================================================
--- gentoo-portage-overlay/trunk/dev-libs/boost/files/boost-1.33.1-gcc41_visit_each.patch 2009-05-08 11:26:02 UTC (rev 558)
+++ gentoo-portage-overlay/trunk/dev-libs/boost/files/boost-1.33.1-gcc41_visit_each.patch 2009-05-25 17:07:07 UTC (rev 559)
@@ -1,10 +0,0 @@
---- boost/bind.hpp.orig 2006-10-05 21:09:32.000000000 +0200
-+++ boost/bind.hpp 2006-10-05 21:10:10.000000000 +0200
-@@ -27,6 +27,7 @@
- #include <boost/type.hpp>
- #include <boost/bind/arg.hpp>
- #include <boost/detail/workaround.hpp>
-+#include <boost/visit_each.hpp>
-
- // Borland-specific bug, visit_each() silently fails to produce code
-
Deleted: gentoo-portage-overlay/trunk/dev-libs/boost/files/boost-alpha-threads.patch
===================================================================
--- gentoo-portage-overlay/trunk/dev-libs/boost/files/boost-alpha-threads.patch 2009-05-08 11:26:02 UTC (rev 558)
+++ gentoo-portage-overlay/trunk/dev-libs/boost/files/boost-alpha-threads.patch 2009-05-25 17:07:07 UTC (rev 559)
@@ -1,24 +0,0 @@
-diff -urN boost_1_33_0-pristine/tools/build/v1/gcc-tools.jam boost_1_33_0/tools/build/v1/gcc-tools.jam
---- boost_1_33_0-pristine/tools/build/v1/gcc-tools.jam 2005-09-12 00:31:23.000000000 -0400
-+++ boost_1_33_0/tools/build/v1/gcc-tools.jam 2005-09-12 00:32:45.000000000 -0400
-@@ -146,7 +146,7 @@
- }
- case * :
- {
-- flags gcc CFLAGS <threading>multi : -pthread ;
-+ flags gcc CFLAGS <threading>multi : -D_REENTRANT -pthread ;
- flags gcc LINKFLAGS <threading>multi : -pthread ;
- flags gcc FINDLIBS <threading>multi : rt ;
- }
-diff -urN boost_1_33_0-pristine/tools/build/v2/tools/gcc.jam boost_1_33_0/tools/build/v2/tools/gcc.jam
---- boost_1_33_0-pristine/tools/build/v2/tools/gcc.jam 2005-09-12 00:31:23.000000000 -0400
-+++ boost_1_33_0/tools/build/v2/tools/gcc.jam 2005-09-12 00:33:04.000000000 -0400
-@@ -368,7 +368,7 @@
- }
- case * :
- {
-- flags gcc OPTIONS <threading>multi : -pthread ;
-+ flags gcc OPTIONS <threading>multi : -D_REENTRANT -pthread ;
- flags gcc FINDLIBS-SA <threading>multi : rt ;
- }
- }
Deleted: gentoo-portage-overlay/trunk/dev-libs/boost/files/random-Jamfile
===================================================================
--- gentoo-portage-overlay/trunk/dev-libs/boost/files/random-Jamfile 2009-05-08 11:26:02 UTC (rev 558)
+++ gentoo-portage-overlay/trunk/dev-libs/boost/files/random-Jamfile 2009-05-25 17:07:07 UTC (rev 559)
@@ -1,15 +0,0 @@
-# Copyright (c) 2006 Tiziano Mueller
-#
-# Use, modification and distribution of the file is subject to the
-# Boost Software License, Version 1.0.
-# (See at http://www.boost.org/LICENSE_1_0.txt)
-
-
-project boost/random
- : source-location ../ ;
-
-SOURCES = random_device ;
-
-lib boost_random
- : $(SOURCES).cpp
- : <link>shared:<define>BOOST_RANDOM_DYN_LINK=1 ;
Deleted: gentoo-portage-overlay/trunk/dev-libs/boost/files/remove_toolset_from_targetname.patch
===================================================================
--- gentoo-portage-overlay/trunk/dev-libs/boost/files/remove_toolset_from_targetname.patch 2009-05-08 11:26:02 UTC (rev 558)
+++ gentoo-portage-overlay/trunk/dev-libs/boost/files/remove_toolset_from_targetname.patch 2009-05-25 17:07:07 UTC (rev 559)
@@ -1,11 +0,0 @@
---- boost_1_36_0/Jamroot.orig 2008-11-14 16:36:10.000000000 +0100
-+++ boost_1_36_0/Jamroot 2008-11-14 16:36:54.000000000 +0100
-@@ -311,7 +311,7 @@
- if $(layout) = versioned
- {
- local result = [ common.format-name
-- <base> <toolset> <threading> <runtime> -$(BOOST_VERSION_TAG)
-+ <base> <threading> <runtime> -$(BOOST_VERSION_TAG)
- -$(BUILD_ID)
- : $(name) : $(type) : $(property-set) ] ;
-
Added: gentoo-portage-overlay/trunk/dev-libs/boost/files/remove_toolset_from_targetname.patch
===================================================================
--- gentoo-portage-overlay/trunk/dev-libs/boost/files/remove_toolset_from_targetname.patch (rev 0)
+++ gentoo-portage-overlay/trunk/dev-libs/boost/files/remove_toolset_from_targetname.patch 2009-05-25 17:07:07 UTC (rev 559)
@@ -0,0 +1,11 @@
+--- boost_1_36_0/Jamroot.orig 2008-11-14 16:36:10.000000000 +0100
++++ boost_1_36_0/Jamroot 2008-11-14 16:36:54.000000000 +0100
+@@ -311,7 +311,7 @@
+ if $(layout) = versioned
+ {
+ local result = [ common.format-name
+- <base> <toolset> <threading> <runtime> -$(BOOST_VERSION_TAG)
++ <base> <threading> <runtime> -$(BOOST_VERSION_TAG)
+ -$(BUILD_ID)
+ : $(name) : $(type) : $(property-set) ] ;
+
Deleted: gentoo-portage-overlay/trunk/dev-util/boost-build/boost-build-1.38.0.ebuild
===================================================================
--- gentoo-portage-overlay/trunk/dev-util/boost-build/boost-build-1.38.0.ebuild 2009-05-08 11:26:02 UTC (rev 558)
+++ gentoo-portage-overlay/trunk/dev-util/boost-build/boost-build-1.38.0.ebuild 2009-05-25 17:07:07 UTC (rev 559)
@@ -1,104 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.37.0.ebuild,v 1.1 2008/12/16 15:44:42 dev-zero Exp $
-
-EAPI="2"
-
-inherit flag-o-matic toolchain-funcs versionator
-
-MY_PV=$(replace_all_version_separators _)
-MAJOR_PV="$(replace_all_version_separators _ $(get_version_component_range 1-2))"
-
-DESCRIPTION="A system for large project software construction, which is simple to use and powerful."
-HOMEPAGE="http://www.boost.org/tools/build/v2/index.html"
-SRC_URI="mirror://sourceforge/boost/boost_${MY_PV}.tar.bz2"
-LICENSE="Boost-1.0"
-SLOT="1.38"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="examples python"
-
-DEPEND="!<dev-libs/boost-1.34.0
- !<=dev-util/boost-build-1.35.0-r1
- python? ( dev-lang/python )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/boost_${MY_PV}/tools"
-
-src_unpack() {
- tar xjpf "${DISTDIR}/${A}" boost_${MY_PV}/tools/{jam,build/v2}
-}
-
-src_prepare() {
- # Remove stripping option
- cd "${S}/jam/src"
- sed -i -e 's|-s\b||' \
- build.jam || die "sed failed"
-
- # Force regeneration
- rm jambase.c
-
- # This patch allows us to fully control optimization
- # and stripping flags when bjam is used as build-system
- # We simply extend the optimization and debug-symbols feature
- # with empty dummies called 'none'
- cd "${S}/build/v2"
- sed -i \
- -e 's/\(off speed space\)/\1 none/' \
- -e 's/\(debug-symbols : on off\)/\1 none/' \
- tools/builtin.jam || die "sed failed"
-}
-
-src_compile() {
- cd jam/src
- local toolset
-
- if [[ ${CHOST} == *-darwin* ]] ; then
- toolset=darwin
- else
- # Using boost's generic toolset here, which respects CC and CFLAGS
- toolset=cc
- fi
-
- append-flags -fno-strict-aliasing
-
- # For slotting
- sed -i \
- -e "s|/usr/share/boost-build|/usr/share/boost-build-${MAJOR_PV}|" \
- Jambase || die "sed failed"
-
- # The build.jam file for building bjam using a bootstrapped jam0 ignores
- # the LDFLAGS env var (bug #209794). We have now two options:
- # a) change the cc-target definition in build.jam to include separate compile
- # and link targets to make it use the LDFLAGS var, or
- # b) a simple dirty workaround by injecting the LDFLAGS in the LIBS env var
- # (which should not be set by us).
- if [[ -z "${LDFLAGS}" ]] ; then
- CC=$(tc-getCC) ./build.sh ${toolset} $(use_with python) \
- || die "building bjam failed"
- else
- LIBS=${LDFLAGS} CC=$(tc-getCC) ./build.sh ${toolset} \
- $(use_with python) || die "building bjam failed"
- fi
-}
-
-src_install() {
- newbin jam/src/bin.*/bjam bjam-${MAJOR_PV}
-
- cd "${S}/build/v2"
- insinto /usr/share/boost-build-${MAJOR_PV}
- doins -r boost-build.jam bootstrap.jam build-system.jam site-config.jam user-config.jam \
- build kernel options tools util || die
-
- dodoc doc/userman.pdf changes.txt hacking.txt release_procedure.txt \
- notes/build_dir_option.txt notes/relative_source_paths.txt
-
- if use examples ; then
- insinto /usr/share/doc/${PF}
- doins -r example
- fi
-}
-
-src_test() {
- cd jam/test
- ./test.sh || die "tests failed"
-}
Added: gentoo-portage-overlay/trunk/dev-util/boost-build/boost-build-1.39.0.ebuild
===================================================================
--- gentoo-portage-overlay/trunk/dev-util/boost-build/boost-build-1.39.0.ebuild (rev 0)
+++ gentoo-portage-overlay/trunk/dev-util/boost-build/boost-build-1.39.0.ebuild 2009-05-25 17:07:07 UTC (rev 559)
@@ -0,0 +1,104 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.37.0.ebuild,v 1.2 2009/03/24 04:34:42 dirtyepic Exp $
+
+EAPI="2"
+
+inherit flag-o-matic toolchain-funcs versionator
+
+MY_PV=$(replace_all_version_separators _)
+MAJOR_PV="$(replace_all_version_separators _ $(get_version_component_range 1-2))"
+
+DESCRIPTION="A system for large project software construction, which is simple to use and powerful."
+HOMEPAGE="http://www.boost.org/doc/tools/build/index.html"
+SRC_URI="mirror://sourceforge/boost/boost_${MY_PV}.tar.bz2"
+LICENSE="Boost-1.0"
+SLOT="1.39"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="examples python"
+
+DEPEND="!<dev-libs/boost-1.34.0
+ !<=dev-util/boost-build-1.35.0-r1
+ python? ( dev-lang/python )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/boost_${MY_PV}/tools"
+
+src_unpack() {
+ tar xjpf "${DISTDIR}/${A}" boost_${MY_PV}/tools/{jam,build/v2}
+}
+
+src_prepare() {
+ # Remove stripping option
+ cd "${S}/jam/src"
+ sed -i -e 's|-s\b||' \
+ build.jam || die "sed failed"
+
+ # Force regeneration
+ rm jambase.c
+
+ # This patch allows us to fully control optimization
+ # and stripping flags when bjam is used as build-system
+ # We simply extend the optimization and debug-symbols feature
+ # with empty dummies called 'none'
+ cd "${S}/build/v2"
+ sed -i \
+ -e 's/\(off speed space\)/\1 none/' \
+ -e 's/\(debug-symbols : on off\)/\1 none/' \
+ tools/builtin.jam || die "sed failed"
+}
+
+src_compile() {
+ cd jam/src
+ local toolset
+
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ toolset=darwin
+ else
+ # Using boost's generic toolset here, which respects CC and CFLAGS
+ toolset=cc
+ fi
+
+ append-flags -fno-strict-aliasing
+
+ # For slotting
+ sed -i \
+ -e "s|/usr/share/boost-build|/usr/share/boost-build-${MAJOR_PV}|" \
+ Jambase || die "sed failed"
+
+ # The build.jam file for building bjam using a bootstrapped jam0 ignores
+ # the LDFLAGS env var (bug #209794). We have now two options:
+ # a) change the cc-target definition in build.jam to include separate compile
+ # and link targets to make it use the LDFLAGS var, or
+ # b) a simple dirty workaround by injecting the LDFLAGS in the LIBS env var
+ # (which should not be set by us).
+ if [[ -z "${LDFLAGS}" ]] ; then
+ CC=$(tc-getCC) ./build.sh ${toolset} $(use_with python) \
+ || die "building bjam failed"
+ else
+ LIBS=${LDFLAGS} CC=$(tc-getCC) ./build.sh ${toolset} \
+ $(use_with python) || die "building bjam failed"
+ fi
+}
+
+src_install() {
+ newbin jam/src/bin.*/bjam bjam-${MAJOR_PV}
+
+ cd "${S}/build/v2"
+ insinto /usr/share/boost-build-${MAJOR_PV}
+ doins -r boost-build.jam bootstrap.jam build-system.jam site-config.jam user-config.jam \
+ build kernel options tools util || die
+
+ dodoc doc/userman.pdf changes.txt hacking.txt release_procedure.txt \
+ notes/build_dir_option.txt notes/relative_source_paths.txt
+
+ if use examples ; then
+ insinto /usr/share/doc/${PF}
+ doins -r example
+ fi
+}
+
+src_test() {
+ cd jam/test
+ ./test.sh || die "tests failed"
+}
Added: gentoo-portage-overlay/trunk/kde-misc/kate-ctags-plugin/kate-ctags-plugin-0.2.ebuild
===================================================================
--- gentoo-portage-overlay/trunk/kde-misc/kate-ctags-plugin/kate-ctags-plugin-0.2.ebuild (rev 0)
+++ gentoo-portage-overlay/trunk/kde-misc/kate-ctags-plugin/kate-ctags-plugin-0.2.ebuild 2009-05-25 17:07:07 UTC (rev 559)
@@ -0,0 +1,20 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit kde
+
+DESCRIPTION="A ctags plugin for the KDE editor kate."
+HOMEPAGE="http://www.kde-apps.org/content/show.php?content=47743"
+SRC_URI="http://home.freeuk.com/cpdrummond/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+DEPEND="|| ( kde-base/kate kde-base/kdebase )"
+RDEPEND="${DEPEND}
+ dev-util/ctags"
+
+need-kde 3.5
Added: gentoo-portage-overlay/trunk/media-sound/amarok/amarok-1.4.10_p20090130-r3.ebuild
===================================================================
--- gentoo-portage-overlay/trunk/media-sound/amarok/amarok-1.4.10_p20090130-r3.ebuild (rev 0)
+++ gentoo-portage-overlay/trunk/media-sound/amarok/amarok-1.4.10_p20090130-r3.ebuild 2009-05-25 17:07:07 UTC (rev 559)
@@ -0,0 +1,121 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.10_p20090130-r2.ebuild,v 1.1 2009/05/13 12:27:14 tampakrap Exp $
+
+EAPI="2"
+
+ARTS_REQUIRED="never"
+
+LANGS="af ar az be bg bn br ca cs cy da de el en_GB eo es et eu fa fi
+fr ga gl he hi hu id is it ja km ko ku lo lt mk ms nb nds ne nl nn pa
+pl pt pt_BR ro ru rw se sk sl sq sr sr@Latn ss sv ta tg th tr uk uz
+zh_CN zh_TW"
+
+LANGS_DOC="da de es et fr it nl pl pt pt_BR ru sv"
+
+USE_KEG_PACKAGING="1"
+
+inherit kde
+
+PKG_SUFFIX=""
+
+MY_P="${P/_*/}"
+S="${WORKDIR}/${MY_P}"
+
+SRC_URI="mirror://kde/stable/amarok/${PV/_*/}/src/${MY_P}.tar.bz2
+ mirror://gentoo/amarok-1.4.10-post20090130.diff.tar.bz2"
+
+DESCRIPTION="Advanced audio player based on KDE framework."
+HOMEPAGE="http://amarok.kde.org/"
+
+LICENSE="GPL-2"
+
+SLOT="3.5"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="mp4 kde mysql amazon opengl postgres
+visualization ipod ifp real njb mtp musicbrainz daap
+python"
+# kde: enables compilation of the konqueror sidebar plugin
+
+# Blocking previous amarok-1.4:0 versions
+RDEPEND="
+ !<media-sound/amarok-1.4.10_p20090130-r2
+ =dev-lang/ruby-1.8*
+ >=media-libs/taglib-1.4
+ >=media-libs/xine-lib-1.1.2_pre20060328-r8
+ ifp? ( media-libs/libifp )
+ ipod? ( >=media-libs/libgpod-0.5.2 )
+ kde? ( kde-base/konqueror:3.5 )
+ mp4? ( media-libs/libmp4v2 )
+ mtp? ( >=media-libs/libmtp-0.3.0 )
+ musicbrainz? ( media-libs/tunepimp )
+ mysql? ( >=virtual/mysql-4.0 )
+ njb? ( >=media-libs/libnjb-2.2.4 )
+ opengl? ( virtual/opengl )
+ postgres? ( virtual/postgresql-base )
+ real? (
+ media-libs/alsa-lib
+ media-video/realplayer
+ )
+ visualization? (
+ media-libs/libsdl
+ =media-plugins/libvisual-plugins-0.4*
+ )
+"
+
+DEPEND="${RDEPEND}"
+
+RDEPEND="${RDEPEND}
+ app-arch/unzip
+ daap? ( www-servers/mongrel )
+ python? ( dev-python/PyQt )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-1.4.9.1-libmtp-0.3.0-API.patch"
+ "${FILESDIR}/${PN}-1.4.10-gcc-4.3.patch"
+ "${FILESDIR}/${PN}-1.4.10-gcc44.patch"
+ "${WORKDIR}/${PN}-1.4.10-post20090130.diff"
+ "${WORKDIR}/${PN}-1.4.10-desktop-entry.diff" )
+
+need-kde 3.5
+
+src_configure() {
+ # Extra, unsupported engines are forcefully disabled.
+ local myconf="
+ $(use_enable amazon)
+ $(use_enable mysql)
+ $(use_enable postgres postgresql)
+ $(use_with daap)
+ $(use_with ifp)
+ $(use_with ipod libgpod)
+ $(use_with mp4 mp4v2)
+ $(use_with mtp libmtp)
+ $(use_with musicbrainz)
+ $(use_with njb libnjb)
+ $(use_with opengl)
+ $(use_with real helix)
+ $(use_with visualization libvisual)
+ --with-xine
+ --without-nmm
+ "
+
+ kde_src_configure
+}
+
+src_install() {
+ kde_src_install
+
+ # As much as I respect Ian, I'd rather leave Amarok to use mongrel
+ # from Portage, for security and policy reasons.
+ rm -rf "${D}"/usr/share/apps/amarok/ruby_lib/rbconfig \
+ "${D}"/usr/share/apps/amarok/ruby_lib/mongrel* \
+ "${D}"/usr/share/apps/amarok/ruby_lib/rubygems* \
+ "${D}"/usr/share/apps/amarok/ruby_lib/gem* \
+ "${D}"/usr/$(get_libdir)/ruby_lib
+
+ if ! use python; then
+ test -f "${D}"/usr/share/apps/amarok/scripts/webcontrol \
+ && { rm -r "${D}"/usr/share/apps/amarok/scripts/webcontrol \
+ || die "Unable to remove webcontrol."; }
+ fi
+}
Added: gentoo-portage-overlay/trunk/media-sound/amarok/files/amarok-1.4.10-audibletag.patch
===================================================================
--- gentoo-portage-overlay/trunk/media-sound/amarok/files/amarok-1.4.10-audibletag.patch (rev 0)
+++ gentoo-portage-overlay/trunk/media-sound/amarok/files/amarok-1.4.10-audibletag.patch 2009-05-25 17:07:07 UTC (rev 559)
@@ -0,0 +1,85 @@
+--- amarok-1.4.10/amarok/src/metadata/audible/audibletag.cpp 2008-08-14 00:21:51.000000000 +0300
++++ amarok-1.4.10/amarok/src/metadata/audible/audibletag.cpp 2009-03-04 19:55:15.000000000 +0200
+@@ -71,7 +71,8 @@
+ {
+ char buf[1023];
+ fseek(fp, OFF_PRODUCT_ID, SEEK_SET);
+- fread(buf, strlen("product_id"), 1, fp);
++ if (fread(buf, strlen("product_id"), 1, fp) != 1)
++ return;
+ if(memcmp(buf, "product_id", strlen("product_id")))
+ {
+ buf[20]='\0';
+@@ -130,24 +131,65 @@
+
+ bool Audible::Tag::readTag( FILE *fp, char **name, char **value)
+ {
++ // arbitrary value that has to be smaller than 2^32-1 and that should be large enough for all tags
++ const uint32_t maxtaglen = 100000;
++
+ uint32_t nlen;
+- fread(&nlen, sizeof(nlen), 1, fp);
++ if (fread(&nlen, sizeof(nlen), 1, fp) != 1)
++ return false;
+ nlen = ntohl(nlen);
+ //fprintf(stderr, "tagname len=%x\n", (unsigned)nlen);
+- *name = new char[nlen+1];
+- (*name)[nlen] = '\0';
++ if (nlen > maxtaglen)
++ return false;
+
+ uint32_t vlen;
+- fread(&vlen, sizeof(vlen), 1, fp);
++ if (fread(&vlen, sizeof(vlen), 1, fp) != 1)
++ return false;
+ vlen = ntohl(vlen);
+ //fprintf(stderr, "tag len=%x\n", (unsigned)vlen);
++ if (vlen > maxtaglen)
++ return false;
++
++ *name = new char[nlen+1];
++ if (!*name)
++ return false;
++
+ *value = new char[vlen+1];
++ if (!*value)
++ {
++ delete[] *name;
++ *name = 0;
++ return false;
++ }
++
++ (*name)[nlen] = '\0';
+ (*value)[vlen] = '\0';
+
+- fread(*name, nlen, 1, fp);
+- fread(*value, vlen, 1, fp);
++ if (fread(*name, nlen, 1, fp) != 1)
++ {
++ delete[] *name;
++ *name = 0;
++ delete[] *value;
++ *value = 0;
++ return false;
++ }
++ if (fread(*value, vlen, 1, fp) != 1)
++ {
++ delete[] *name;
++ *name = 0;
++ delete[] *value;
++ *value = 0;
++ return false;
++ }
+ char lasttag;
+- fread(&lasttag, 1, 1, fp);
++ if (fread(&lasttag, 1, 1, fp) != 1)
++ {
++ delete[] *name;
++ *name = 0;
++ delete[] *value;
++ *value = 0;
++ return false;
++ }
+ //fprintf(stderr, "%s: \"%s\"\n", *name, *value);
+
+ m_tagsEndOffset += 2 * 4 + nlen + vlen + 1;
Added: gentoo-portage-overlay/trunk/media-sound/amarok/files/amarok-1.4.10-gcc-4.3.patch
===================================================================
--- gentoo-portage-overlay/trunk/media-sound/amarok/files/amarok-1.4.10-gcc-4.3.patch (rev 0)
+++ gentoo-portage-overlay/trunk/media-sound/amarok/files/amarok-1.4.10-gcc-4.3.patch 2009-05-25 17:07:07 UTC (rev 559)
@@ -0,0 +1,10 @@
+--- amarok-1.4.10/amarok/src/engine/helix/hxplayercontrol.cpp
++++ amarok-1.4.10/amarok/src/engine/helix/hxplayercontrol.cpp
+@@ -21,6 +21,7 @@
+ #include <unistd.h>
+ #include <iostream>
+ #include <cstring>
++#include <cstdlib>
+ #include <sys/mman.h>
+
+ using namespace std;
Added: gentoo-portage-overlay/trunk/media-sound/amarok/files/amarok-1.4.10-gcc44.patch
===================================================================
--- gentoo-portage-overlay/trunk/media-sound/amarok/files/amarok-1.4.10-gcc44.patch (rev 0)
+++ gentoo-portage-overlay/trunk/media-sound/amarok/files/amarok-1.4.10-gcc44.patch 2009-05-25 17:07:07 UTC (rev 559)
@@ -0,0 +1,93 @@
+diff -Naur amarok-1.4.10-orig/amarok/src/metadata/audible/audibleproperties.cpp amarok-1.4.10/amarok/src/metadata/audible/audibleproperties.cpp
+--- amarok-1.4.10-orig/amarok/src/metadata/audible/audibleproperties.cpp 2008-08-13 15:21:51.000000000 -0600
++++ amarok-1.4.10/amarok/src/metadata/audible/audibleproperties.cpp 2009-03-31 22:12:29.000000000 -0600
+@@ -31,6 +31,8 @@
+
+ #include <netinet/in.h> // ntohl
+
++#include <stdio.h>
++
+ using namespace TagLib;
+
+
+diff -Naur amarok-1.4.10-orig/amarok/src/metadata/audible/audibletag.cpp amarok-1.4.10/amarok/src/metadata/audible/audibletag.cpp
+--- amarok-1.4.10-orig/amarok/src/metadata/audible/audibletag.cpp 2009-03-31 22:08:16.000000000 -0600
++++ amarok-1.4.10/amarok/src/metadata/audible/audibletag.cpp 2009-03-31 22:11:57.000000000 -0600
+@@ -30,6 +30,7 @@
+ #include <netinet/in.h> // ntohl
+ #include <stdlib.h>
+ #include <string.h>
++#include <stdio.h>
+
+ using namespace TagLib;
+
+diff -Naur amarok-1.4.10-orig/amarok/src/metadata/audible/taglib_audiblefile.cpp amarok-1.4.10/amarok/src/metadata/audible/taglib_audiblefile.cpp
+--- amarok-1.4.10-orig/amarok/src/metadata/audible/taglib_audiblefile.cpp 2008-08-13 15:21:51.000000000 -0600
++++ amarok-1.4.10/amarok/src/metadata/audible/taglib_audiblefile.cpp 2009-03-31 22:13:06.000000000 -0600
+@@ -29,6 +29,8 @@
+ #include <taglib/tfile.h>
+ #include <taglib/audioproperties.h>
+
++#include <stdio.h>
++
+ namespace TagLib {
+ ////////////////////////////////////////////////////////////////////////////////
+ // public members
+diff -Naur amarok-1.4.10-orig/amarok/src/metadata/audible/taglib_audiblefiletyperesolver.cpp amarok-1.4.10/amarok/src/metadata/audible/taglib_audiblefiletyperesolver.cpp
+--- amarok-1.4.10-orig/amarok/src/metadata/audible/taglib_audiblefiletyperesolver.cpp 2008-08-13 15:21:51.000000000 -0600
++++ amarok-1.4.10/amarok/src/metadata/audible/taglib_audiblefiletyperesolver.cpp 2009-03-31 22:16:01.000000000 -0600
+@@ -23,6 +23,7 @@
+ #include "taglib_audiblefile.h"
+
+ #include <string.h>
++#include <stdio.h>
+
+ TagLib::File *AudibleFileTypeResolver::createFile(const char *fileName,
+ bool readProperties,
+diff -Naur amarok-1.4.10-orig/amarok/src/metadata/wav/wavfile.cpp amarok-1.4.10/amarok/src/metadata/wav/wavfile.cpp
+--- amarok-1.4.10-orig/amarok/src/metadata/wav/wavfile.cpp 2008-08-13 15:21:51.000000000 -0600
++++ amarok-1.4.10/amarok/src/metadata/wav/wavfile.cpp 2009-03-31 22:18:22.000000000 -0600
+@@ -29,6 +29,8 @@
+ #include <taglib/audioproperties.h>
+ #include <taglib/tag.h>
+
++#include <stdio.h>
++
+ namespace TagLib {
+ ////////////////////////////////////////////////////////////////////////////////
+ // public members
+diff -Naur amarok-1.4.10-orig/amarok/src/metadata/wav/wavproperties.cpp amarok-1.4.10/amarok/src/metadata/wav/wavproperties.cpp
+--- amarok-1.4.10-orig/amarok/src/metadata/wav/wavproperties.cpp 2008-08-13 15:21:51.000000000 -0600
++++ amarok-1.4.10/amarok/src/metadata/wav/wavproperties.cpp 2009-03-31 22:18:06.000000000 -0600
+@@ -31,6 +31,8 @@
+
+ #include <netinet/in.h> // ntohl
+
++#include <stdio.h>
++
+ using namespace TagLib;
+
+ struct WavHeader
+diff -Naur amarok-1.4.10-orig/amarok/src/metadata/wav/wavfiletyperesolver.cpp amarok-1.4.10/amarok/src/metadata/wav/wavfiletyperesolver.cpp
+--- amarok-1.4.10-orig/amarok/src/metadata/wav/wavfiletyperesolver.cpp 2008-08-13 15:21:51.000000000 -0600
++++ amarok-1.4.10/amarok/src/metadata/wav/wavfiletyperesolver.cpp 2009-03-31 22:19:55.000000000 -0600
+@@ -23,6 +23,7 @@
+ #include "wavfile.h"
+
+ #include <string.h>
++#include <stdio.h>
+
+ TagLib::File *WavFileTypeResolver::createFile(const char *fileName,
+ bool readProperties,
+diff -Naur amarok-1.4.10-orig/amarok/src/metabundlesaver.cpp amarok-1.4.10/amarok/src/metabundlesaver.cpp
+--- amarok-1.4.10-orig/amarok/src/metabundlesaver.cpp 2008-08-13 15:21:51.000000000 -0600
++++ amarok-1.4.10/amarok/src/metabundlesaver.cpp 2009-03-31 22:30:30.000000000 -0600
+@@ -6,7 +6,7 @@
+
+ #include <stdlib.h>
+ #include <unistd.h>
+-#include <stdio.h>
++#include <cstdio>
+ #include <time.h>
+ #include <sys/time.h>
+ #include <sys/types.h>
Added: gentoo-portage-overlay/trunk/media-sound/amarok/files/amarok-1.4.9.1-libmtp-0.3.0-API.patch
===================================================================
--- gentoo-portage-overlay/trunk/media-sound/amarok/files/amarok-1.4.9.1-libmtp-0.3.0-API.patch (rev 0)
+++ gentoo-portage-overlay/trunk/media-sound/amarok/files/amarok-1.4.9.1-libmtp-0.3.0-API.patch 2009-05-25 17:07:07 UTC (rev 559)
@@ -0,0 +1,44 @@
+--- amarok/src/mediadevice/mtp/mtpmediadevice.cpp
++++ amarok/src/mediadevice/mtp/mtpmediadevice.cpp
+@@ -293,12 +293,13 @@
+ parent_id = getDefaultParentId();
+ }
+ debug() << "Parent id : " << parent_id << endl;
++ trackmeta->parent_id = parent_id;
+
+ m_critical_mutex.lock();
+ debug() << "Sending track... " << bundle.url().path().utf8() << endl;
+ int ret = LIBMTP_Send_Track_From_File(
+ m_device, bundle.url().path().utf8(), trackmeta,
+- progressCallback, this, parent_id
++ progressCallback, this
+ );
+ m_critical_mutex.unlock();
+
+@@ -529,7 +530,7 @@
+ for( MtpMediaItem *it = dynamic_cast<MtpMediaItem*>(items->first()); it; it = dynamic_cast<MtpMediaItem*>(items->next()) )
+ album_object->tracks[i++] = it->track()->id();
+ album_object->no_tracks = items->count();
+- ret = LIBMTP_Create_New_Album( m_device, album_object, 0 );
++ ret = LIBMTP_Create_New_Album( m_device, album_object );
+ if( ret != 0 )
+ {
+ debug() << "creating album failed : " << ret << endl;
+@@ -608,7 +609,7 @@
+ {
+ debug() << "Creating new folder '" << name << "' as a child of "<< parent_id << endl;
+ char *name_copy = qstrdup( name );
+- uint32_t new_folder_id = LIBMTP_Create_Folder( m_device, name_copy, parent_id );
++ uint32_t new_folder_id = LIBMTP_Create_Folder( m_device, name_copy, parent_id, 0 );
+ delete(name_copy);
+ debug() << "New folder ID: " << new_folder_id << endl;
+ if( new_folder_id == 0 )
+@@ -913,7 +914,7 @@
+ if( item->playlist()->id() == 0 )
+ {
+ debug() << "creating new playlist : " << metadata->name << endl;
+- int ret = LIBMTP_Create_New_Playlist( m_device, metadata, 0 );
++ int ret = LIBMTP_Create_New_Playlist( m_device, metadata );
+ if( ret == 0 )
+ {
+ item->playlist()->setId( metadata->playlist_id );
Modified: gentoo-portage-overlay/trunk/sets/my-kdeartwork-3.conf
===================================================================
--- gentoo-portage-overlay/trunk/sets/my-kdeartwork-3.conf 2009-05-08 11:26:02 UTC (rev 558)
+++ gentoo-portage-overlay/trunk/sets/my-kdeartwork-3.conf 2009-05-25 17:07:07 UTC (rev 559)
@@ -3,4 +3,4 @@
?: kde-base/kdeartwork-kscreensaver:3.5
# My favorite packages of this category
-?: x11-themes/serenity:0
+#?: x11-themes/serenity:0
Modified: gentoo-portage-overlay/trunk/sets/my-kdemultimedia-3.conf
===================================================================
--- gentoo-portage-overlay/trunk/sets/my-kdemultimedia-3.conf 2009-05-08 11:26:02 UTC (rev 558)
+++ gentoo-portage-overlay/trunk/sets/my-kdemultimedia-3.conf 2009-05-25 17:07:07 UTC (rev 559)
@@ -3,5 +3,5 @@
?: kde-base/kmix:3.5
# My favorite packages of this category
-?: app-cdr/k3b:0
-?: media-sound/amarok:0
+?: app-cdr/k3b:3.5
+?: media-sound/amarok:3.5
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
