Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: luksan/luksan-overlay
base: aa02fd17f6
...
head fork: luksan/luksan-overlay
compare: e34b3d9ab2
Checking mergeability… Don't worry, you can still create the pull request.
  • 9 commits
  • 33 files changed
  • 0 commit comments
  • 1 contributor
Showing with 695 additions and 762 deletions.
  1. +0 −5 app-office/openproj-bin/Manifest
  2. +0 −11 app-office/openproj-bin/files/openproj-1.4-fix-launcher.patch
  3. +0 −43 app-office/openproj-bin/openproj-bin-1.4.ebuild
  4. +0 −7 dev-util/kdevelop/Manifest
  5. +0 −15 dev-util/kdevelop/files/kdevelop-3.5-gcc4.4.patch
  6. +0 −14 dev-util/kdevelop/files/kdevelop-3.5-lexer.patch
  7. +0 −11 dev-util/kdevelop/files/kdevelop-3.5-parallel.patch
  8. +0 −33 dev-util/kdevelop/files/kdevelop-3.5.5-libtool.patch
  9. +0 −121 dev-util/kdevelop/kdevelop-3.5.5.ebuild
  10. +0 −9 media-gfx/hugin/Manifest
  11. +0 −31 media-gfx/hugin/files/hugin-0.7.0-gcc44.patch
  12. +0 −34 media-gfx/hugin/files/hugin-0.7.0_rc2-as-needed.patch
  13. +0 −27 media-gfx/hugin/files/hugin-0.8.0_rc3-as-needed.patch
  14. +0 −116 media-gfx/hugin/files/hugin-0.8.0_rc4-use_system_cmake_findboost.patch
  15. +0 −9 media-gfx/hugin/files/hugin-2009.2.0_beta3-asneeded.patch
  16. +0 −65 media-gfx/hugin/hugin-0.8.0-r1.ebuild
  17. +0 −56 media-gfx/hugin/hugin-2009.2.0-r1.ebuild
  18. +0 −3  media-libs/libpano13/Manifest
  19. +0 −39 media-libs/libpano13/files/uchar_define.patch
  20. +0 −33 media-libs/libpano13/libpano13-2.9.12-r1.ebuild
  21. +3 −0  media-sound/amarok/Manifest
  22. +159 −0 media-sound/amarok/amarok-2.4.0-r1.ebuild
  23. +465 −0 media-sound/amarok/files/amarok-2.4.0-make-the-DAAP-parsing-more-robust.patch
  24. +0 −2  media-video/arista/Manifest
  25. +0 −31 media-video/arista/arista-0.9.1.ebuild
  26. +1 −0  net-libs/libbluedevil/Manifest
  27. +24 −0 net-libs/libbluedevil/libbluedevil-9999.ebuild
  28. +0 −2  net-print/poster/Manifest
  29. +0 −25 net-print/poster/poster-20060221.ebuild
  30. +1 −0  net-wireless/bluedevil/Manifest
  31. +30 −0 net-wireless/bluedevil/bluedevil-9999.ebuild
  32. +1 −1  sci-electronics/gnuradio/Manifest
  33. +11 −19 sci-electronics/gnuradio/gnuradio-3.3.0.ebuild
View
5 app-office/openproj-bin/Manifest
@@ -1,5 +0,0 @@
-AUX openproj-1.4-fix-launcher.patch 351 RMD160 128d5165fb2e9f59571afb0caf279e6377223a22 SHA1 9f409b5b783a36165406219393f01c0f5ecf59df SHA256 ff2ab5b9ea1aeb021cc372661ee278166cdb3e2daece00794c55d188765f944b
-DIST openproj-1.4.tar.gz 6539523 RMD160 ca22ea0bee5b3f56d85c96d2e6a591fa59407007 SHA1 7fec6907a0c73ddec9e6417548ba43494650046c SHA256 f8c04ab8ace53d42fe3d66b706a0399aed7832a784d14161cc44f427fe5a05b6
-DIST openproj.desktop 251 RMD160 aefd4e6e57b771a4cdcf01d7fa7a313183efcdae SHA1 a4fca20ce50d83f99ed42817605c1ed2368a521a SHA256 b1b07811abb6ad848a7a14a064587b52da9340cc77d52d01d4b09508020b16c5
-DIST openproj.png 1140 RMD160 3d3652a4207d2a4bb5c7a9c65e0d99e5c9b235d7 SHA1 a896091c4015bcc469d8c1d84c399e59a30f3f4a SHA256 f81cd9b0a331869e2de9bf3907bd12e6b31cea26c80f4eeaff4627e309507e51
-EBUILD openproj-bin-1.4.ebuild 1217 RMD160 2091da3f4a74aaac9cc0cb8ef7c4fe6b14d2794e SHA1 810152153778e2dd3d397968b37e4cf4b81c7786 SHA256 2d1c5992c561629ed4dd1a850ab6050f30a1ccaee03b0e9cdf84c683be6df7ac
View
11 app-office/openproj-bin/files/openproj-1.4-fix-launcher.patch
@@ -1,11 +0,0 @@
---- openproj.sh.orig 2008-04-23 22:51:32.000000000 +0200
-+++ openproj.sh 2008-06-06 10:39:58.455855893 +0200
-@@ -64,7 +64,7 @@
- JAVA_EXE="java"
- JAVA_OPTS="-Xms128m -Xmx768m"
- #OPENPROJ_HOME0="/usr/share/openproj"
--OPENPROJ_HOME0=`(dirname $0)`
-+OPENPROJ_HOME0="/opt/openproj"
- OPENPROJ_HOME="$OPENPROJ_HOME0"
- LOG_LEVEL="DEBUG"
- LOG_FILE="/dev/null"
View
43 app-office/openproj-bin/openproj-bin-1.4.ebuild
@@ -1,43 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils
-
-DESCRIPTION="OpenProj is a free, open source desktop alternative to Microsoft Project"
-HOMEPAGE="http://openproj.org/openproj"
-SRC_URI="mirror://sourceforge/openproj/openproj-${PV}.tar.gz
-http://openproj.cvs.sourceforge.net/*checkout*/openproj/openproj_build/resources/openproj.desktop
-http://openproj.cvs.sourceforge.net/*checkout*/openproj/openproj_build/resources/openproj.png"
-
-
-LICENSE="CPLA"
-SLOT="0"
-KEYWORDS="~x86 amd64"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND="${DEPEND}"
-
-S="${WORKDIR}/openproj-${PV}"
-
-src_unpack() {
- unpack openproj-${PV}.tar.gz
- cd "${S}"
- epatch "${FILESDIR}/openproj-${PV}-fix-launcher.patch"
-}
-
-src_install() {
- local installDir=/opt/openproj-${PV}
- insinto /opt
- doins -r "${S}"
- fperms a+rx ${installDir}/openproj.sh
- # Symlink the laucher script
- dosym ${installDir}/openproj.sh /usr/bin/openproj
- # Symlink the directory and the jar to have them without version number
- dosym ${installDir} /opt/openproj
-
- # Install the desktop menu entry and the corresponding icon
- domenu ${DISTDIR}/openproj.desktop
- doicon ${DISTDIR}/openproj.png
-}
View
7 dev-util/kdevelop/Manifest
@@ -1,7 +0,0 @@
-AUX kdevelop-3.5-gcc4.4.patch 458 RMD160 6da289856eeb528fddbfa48cac5629689e6a97c1 SHA1 23f591b79982ce31a1974b6c11e346e5522da9de SHA256 9038e8a693c5ae684b2d3ed564bcecb913cabe25811ce64fd34e854274642a1e
-AUX kdevelop-3.5-lexer.patch 510 RMD160 e113f4e01c05704fd06870139e66729bfcd6601c SHA1 baeef6d2af05c2f45d1b0c840c8a3b878a500e3b SHA256 00e723b0c6a9a615b75dde6bf26b78c6200e855c1b51ad0fc5548b0704585c59
-AUX kdevelop-3.5-parallel.patch 603 RMD160 138fb288a2c0c157f5be2760319449f8c6bcc576 SHA1 816250066e394c9a77c451dc64450cfc052dda69 SHA256 0a54a7e23db4c447d65082055c9bd198828bf1f792b02d63185df829bae40198
-AUX kdevelop-3.5.5-libtool.patch 1262 RMD160 2b27a84ab1124c4257567d1dbef4b1ac6a161837 SHA1 c3860a116ca56140fd491641764cd015e63eaba3 SHA256 cc1d9f1aae4e95e55adba37283c5398067a7b9ce36e927a42059eb3fa6f25a05
-DIST kdevelop-3.5-patchset-01.tar.bz2 28386 RMD160 4f7fd0317f1ce6f9e44bcdb20768473ee7b9a9cb SHA1 66e29714f6cc09293c8ad20e875df50c28657001 SHA256 b226bbd5d8f5aa22b9afdebd50befcc95df7e09868be7158d4c735df16306d7f
-DIST kdevelop_3.5.5.orig.tar.gz 11886928 RMD160 5426fdff33ce32908141c098c8dfd5e4223c928a SHA1 a28c7e4e9b5a7244a5a7063593c9713178a54bcd SHA256 89b8cf5caf66adcbfb6819ccd0f430b4a99e2eb284104c2114a0aaf6dd6742df
-EBUILD kdevelop-3.5.5.ebuild 4048 RMD160 d1aae8e5fb51ac69477913bdcb1bfc73bbb49873 SHA1 bccbe4f5e523d97a909ad2b0c17bfff4fb68f3a9 SHA256 f12440577a3889818a634a36ddf2bfd438cf12c0450f1a354c894f174159f88e
View
15 dev-util/kdevelop/files/kdevelop-3.5-gcc4.4.patch
@@ -1,15 +0,0 @@
---- kdevelop-3.5.4/lib/antlr/antlr/CharScanner.hpp 2007-11-30 23:36:49.000000000 +0100
-+++ kdevelop-3.5.4/lib/antlr/antlr/CharScanner.hpp 2009-06-04 17:16:55.000000000 +0200
-@@ -19,11 +19,7 @@
- #endif
- #include <cstring>
-
--#if ( _MSC_VER == 1200 )
--// VC6 seems to need this
--// note that this is not a standard C++ include file.
--# include <stdio.h>
--#endif
-+#include <cstdio>
-
- #include <antlr/TokenStream.hpp>
- #include <antlr/RecognitionException.hpp>
View
14 dev-util/kdevelop/files/kdevelop-3.5-lexer.patch
@@ -1,14 +0,0 @@
-Index: lib/cppparser/lexer.cpp
-===================================================================
---- lib/cppparser/lexer.cpp (revision 926528)
-+++ lib/cppparser/lexer.cpp (working copy)
-@@ -241,7 +241,7 @@
- m_startLine = false;
- int ppe = preprocessorEnabled();
- setPreprocessorEnabled( false );
-- while( currentChar() && currentChar() != '\n' ){
-+ while( !currentChar().isNull() && currentChar() != '\n' ){
- Token tok(m_source);
- nextToken( tok, true );
- }
-
View
11 dev-util/kdevelop/files/kdevelop-3.5-parallel.patch
@@ -1,11 +0,0 @@
---- src/profileengine/editor/Makefile.am 2007-12-01 00:34:47.000000000 +0200
-+++ src/profileengine/editor/Makefile.am 2009-05-02 20:26:30.000000000 +0300
-@@ -6,7 +6,7 @@
- libprofileeditor_la_LDFLAGS = $(all_libraries)
- libprofileeditor_la_LIBADD = $(top_builddir)/src/profileengine/lib/libprofileengine.la
- noinst_LTLIBRARIES = libprofileeditor.la
--libprofileeditor_COMPILE_FIRST = profileeditorbase.h
-+libprofileeditor_COMPILE_FIRST = profileeditorbase.h addprofilewidget.h
- libprofileeditor_la_SOURCES = profileeditorbase.ui profileeditor.cpp \
- addprofilewidget.ui
- noinst_HEADERS = profileeditor.h
View
33 dev-util/kdevelop/files/kdevelop-3.5.5-libtool.patch
@@ -1,33 +0,0 @@
---- parts/appwizard/common/admin/libtool.m4.in 2009-07-26 16:25:43.000000000 +0200
-+++ parts/appwizard/common/admin/libtool.m4.in 2007-11-30 23:39:28.000000000 +0100
-@@ -284,10 +284,10 @@
- # Check that we are running under the correct shell.
- SHELL=${CONFIG_SHELL-/bin/sh}
-
--case X$echo in
-+case X$ECHO in
- X*--fallback-echo)
- # Remove one level of quotation (which was required for Make).
-- ECHO=`echo "$echo" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
-+ ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
- ;;
- esac
-
-@@ -319,7 +319,7 @@
- # if CDPATH is set.
- if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-
--if test -z "$echo"; then
-+if test -z "$ECHO"; then
- if test "X${echo_test_string+set}" != Xset; then
- # find a string as large as possible, as long as the shell can cope with it
- for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
-@@ -423,7 +423,7 @@
- # Copy echo and quote the copy suitably for passing to libtool from
- # the Makefile, instead of quoting the original, which is used later.
- ECHO=$echo
--if test "X$echo" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
-+if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
- ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
- fi
-
View
121 dev-util/kdevelop/kdevelop-3.5.5.ebuild
@@ -1,121 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Copyright 2009 Marcin Baczyński
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.5.4-r1.ebuild,v 1.8 2009/07/21 01:33:46 tcunha Exp $
-
-EAPI="2"
-
-ARTS_REQUIRED="never"
-
-inherit kde eutils db-use
-
-DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages."
-HOMEPAGE="http://www.kdevelop.org"
-#SRC_URI="mirror://kde/stable/3.5.10/src/${P}.tar.gz
-SRC_URI="http://download.opensuse.org/repositories/home:/amilcarlucas/xUbuntu_9.04/kdevelop_3.5.5.orig.tar.gz
- mirror://gentoo/kdevelop-3.5-patchset-01.tar.bz2"
-
-LICENSE="GPL-2"
-
-SLOT="3.5"
-KEYWORDS="amd64 hppa ppc ~ppc64 sparc x86"
-IUSE="ada clearcase cvs fortran haskell java pascal perforce perl php python ruby sql subversion"
-
-DEPEND="!<dev-util/kdevelop-3.5.5
- sys-devel/gdb
- >=sys-libs/db-4.1
- cvs? ( || ( kde-base/cervisia:3.5 kde-base/kdesdk:3.5 ) )"
-
-RDEPEND="${DEPEND}
- subversion? ( || ( kde-base/kdesdk-kioslaves:3.5 kde-base/kdesdk:3.5[subversion] ) )"
-DEPEND="${DEPEND}
- >=sys-devel/flex-2.5.33"
-
-need-kde 3.5
-
-PATCHES=( "${FILESDIR}/kdevelop-3.5-gcc4.4.patch"
- "${FILESDIR}/kdevelop-3.5-parallel.patch"
- "${FILESDIR}/kdevelop-3.5.5-libtool.patch"
- "${WORKDIR}/kdevelop-3.5-libtool.m4.in.patch"
- "${WORKDIR}/kdevelop-3.5-ltmain.sh.patch" )
-
-pkg_setup() {
- elog
- elog "If you get build failure similar as bug 237304"
- elog "please build with MAKEOPTS=\"-j1\""
- elog
-}
-
-src_prepare() {
- # Update the admin dir used in KDE template projects.
- # See also kde bug 104386.
- for i in "${S}"/admin/*; do
- cp "${i}" "${S}/parts/appwizard/common/admin/"
- done
-
- rm -f "${S}/configure"
-
- kde_src_prepare
-}
-
-src_configure() {
- local myconf
- myconf="--with-kdelibsdoxy-dir=${KDEDIR}/share/doc/HTML/en/kdelibs-apidocs"
-
- # languages
- myconf="${myconf} $(use_enable java) $(use_enable python)
- $(use_enable ruby) $(use_enable ada) $(use_enable fortran)
- $(use_enable haskell) $(use_enable pascal) $(use_enable perl)
- $(use_enable php) $(use_enable sql)"
-
- # build tools
- myconf="${myconf} $(use_enable java antproject)"
-
- # version control systems
- myconf="${myconf} $(use_enable cvs) $(use_enable clearcase)
- $(use_enable perforce) $(use_enable subversion)"
-
- # Explicitly set db include directory (bug 128897)
- myconf="${myconf} --with-db-includedir=$(db_includedir)
- --with-db-lib=$(db_libname)"
-
- kde_src_configure
-}
-
-src_install() {
- kde_src_install
-
- # Default to exuberant-ctags so that we don't end up trying to run emacs's
- # ctags.
- cat <<-EOF >> "${D}${KDEDIR}/share/config/kdeveloprc"
-
- [CTAGS]
- ctags binary=/usr/bin/exuberant-ctags
-
- EOF
-}
-
-pkg_postinst() {
- elog "kdevelop can use a wide range of apps for extra functionality. This is an"
- elog "almost complete list. All these packages can be emerged after kdevelop."
- elog
- elog "kde-base/konsole:3.5: (RECOMMENDED) embed konsole kpart in kdevelop ide"
- elog "dev-util/kdbg: (RECOMMENDED) kde frontend to gdb"
- elog "dev-util/valgrind: (RECOMMENDED) integrates valgrind (memory debugger) commands"
- elog "kde-base/kompare:3.5: (RECOMMENDED) show differences between files"
- elog "media-gfx/graphviz: (RECOMMENDED) support the new graphical classbrowser"
- elog "dev-java/ant: support projects using the ant build tool"
- elog "dev-util/ctags: faster and more powerful code browsing logic"
- elog "app-doc/doxygen: generate KDE-style documentation for your project"
- elog "www-misc/htdig: index and search your project's documentation"
- elog "app-arch/rpm: support creating RPMs of your project"
- elog "app-emulation/visualboyadvance: create and run projects for this gameboy"
- elog
- elog "Support for GNU-style make, tmake, qmake is included."
- elog "Support for using clearcase, perforce and subversion"
- elog "as version control systems is optional."
- elog
- elog "If you get build failure similar as bug 237304"
- elog "please build with MAKEOPTS=\"-j1\""
- elog
-}
View
9 media-gfx/hugin/Manifest
@@ -1,9 +0,0 @@
-AUX hugin-0.7.0-gcc44.patch 1037 RMD160 3c5d67abfd507199db909de33368f487cea47c4f SHA1 1d2091be6006bb088b20f7e3aa119521b47cab32 SHA256 622513fc0280498006c3978a06cadced9085a3adadc0720b33cbbafc62d7575c
-AUX hugin-0.7.0_rc2-as-needed.patch 1522 RMD160 fe9cad07ed8426d8b435ab5ef1f06a2b689cb544 SHA1 961d26b6000da8e297620acb759f6495183cb031 SHA256 f7f8d8f177f5edf8654f1769bc51155ccc5e2bd5b8ab6664f265eff9b6588077
-AUX hugin-0.8.0_rc3-as-needed.patch 1523 RMD160 0d64c91f887f701d6f8ba65cb825031bf628c9e6 SHA1 eb4be65d07fc5c6d99aa70a3e9b4c8f561507105 SHA256 e1241263ca0cbbf62bc6103c96f26bccd3d1febbefb1827dd3c173109a037a72
-AUX hugin-0.8.0_rc4-use_system_cmake_findboost.patch 4712 RMD160 4c33e7980ff1a9f49af2d73348c09e88bc671af5 SHA1 a4ab66c9e805be2e47a959a128e097a0e4a00aac SHA256 825aa017e4ca080de4d8d9c899aca78d9f0f089377d0b74b5d43e69e2c71fd66
-AUX hugin-2009.2.0_beta3-asneeded.patch 675 RMD160 8f1aa5953702270ee5163e07228ab35434f38e78 SHA1 a6d43666a77b17db1508fed703a0dc89acfa8945 SHA256 bd3a88510b7426e72b6682a7d47a4ea52308f17d109f134bb97effc151432e84
-DIST hugin-0.8.0.tar.gz 12077874 RMD160 c98ff8558e8094b50aa8ed6b556f72bb0be8da40 SHA1 698f0a7c4bb25efdf06313d05e3980f20d088ce5 SHA256 cf0a138aa19f179c3d5a459dfc1217789e963e3f815fde3fdb46ea913310bf4a
-DIST hugin-2009.2.0.tar.gz 11159002 RMD160 78626de90a1fe77c55509a40722a94dcb61789fa SHA1 aaf41867a7face95ec0b8ae753299da75448ed5c SHA256 620e8ea2e3a65b0e51fad7a450b474d01d9d8ddf08e26f7b6866dee97458b0fc
-EBUILD hugin-0.8.0-r1.ebuild 1624 RMD160 8b7933933a09a56db470a78e0450caf0ca861007 SHA1 4244bdeeeccbd7840ac1e2b15d1543d7dee3eaec SHA256 854ca155f55631cf518a4ece4e97f972352824785e5c789cee2697386189c5e7
-EBUILD hugin-2009.2.0-r1.ebuild 1382 RMD160 d9aaeff63207f182cd724f4109cea48830ccb488 SHA1 f4f75f970201155ae9cb7c1645024722b5dc0b48 SHA256 6a9b12fd90b0e839c38102df65046c10bcfa59f053302369cafde924bcd98748
View
31 media-gfx/hugin/files/hugin-0.7.0-gcc44.patch
@@ -1,31 +0,0 @@
---- src/hugin_base/appbase/ProgressDisplayOld.h~ 2009-05-20 17:37:43.003423691 +0200
-+++ src/hugin_base/appbase/ProgressDisplayOld.h 2009-05-20 17:38:01.960420437 +0200
-@@ -26,6 +26,7 @@
- #ifndef _APPBASE_POGRESSDISPLAYOLD_H
- #define _APPBASE_POGRESSDISPLAYOLD_H
-
-+#include <cstdio>
- #include <string>
- #include <vector>
- #include <iostream>
---- src/hugin_base/hugin_utils/utils.cpp~ 2009-05-20 17:40:01.592423706 +0200
-+++ src/hugin_base/hugin_utils/utils.cpp 2009-05-20 17:40:09.448420660 +0200
-@@ -171,7 +171,7 @@
- if (digits < 0) {
- strcpy(fmt,"%f");
- } else {
-- std::sprintf(fmt,"%%.%df",digits);
-+ sprintf(fmt,"%%.%df",digits);
- }
- char c[1024];
- c[1023] = 0;
---- src/hugin_base/panodata/PTScriptParsing.h~ 2009-05-20 17:45:42.491422105 +0200
-+++ src/hugin_base/panodata/PTScriptParsing.h 2009-05-20 17:45:56.836420882 +0200
-@@ -25,6 +25,7 @@
- #ifndef _PANODATA_PTSCRIPTPARSING_H
- #define _PANODATA_PTSCRIPTPARSING_H
-
-+#include <cstdio>
- #include <string>
- #include <vigra/diff2d.hxx>
-
View
34 media-gfx/hugin/files/hugin-0.7.0_rc2-as-needed.patch
@@ -1,34 +0,0 @@
-patch from http://sourceforge.net/tracker/index.php?func=detail&aid=1979840&group_id=77506&atid=550443
-
---- a/src/hugin_base/CMakeLists.txt 2008-01-27 22:07:36.000000000 +0000
-+++ b/src/hugin_base/CMakeLists.txt 2008-01-27 22:07:36.000000000 +0000
-@@ -64,3 +64,5 @@
- ENDIF (${HUGIN_SHARED_LIBS})
-
- add_subdirectory(test)
-+
-+TARGET_LINK_LIBRARIES(huginbase huginlevmar huginvigraimpex ${Boost_thread_LIBRARIES} ${EXIV2_LIBRARIES} ${PANO_LIBRARIES} ${TIFF_LIBRARIES})
---- a/src/foreign/vigra/vigra_impex/CMakeLists.txt 2008-01-27 22:07:35.000000000 +0000
-+++ b/src/foreign/vigra/vigra_impex/CMakeLists.txt 2008-01-27 22:07:36.000000000 +0000
-@@ -9,3 +9,5 @@
- ELSE (${HUGIN_SHARED_LIBS})
- add_library(huginvigraimpex STATIC ${VIGRA_IMPEX_SRC})
- ENDIF (${HUGIN_SHARED_LIBS})
-+
-+TARGET_LINK_LIBRARIES(huginvigraimpex ${JPEG_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${TIFF_LIBRARIES})
---- a/src/foreign/jhead/CMakeLists.txt 2008-01-27 22:07:36.000000000 +0000
-+++ b/src/foreign/jhead/CMakeLists.txt 2008-01-27 22:07:36.000000000 +0000
-@@ -7,3 +7,5 @@
- ELSE (${HUGIN_SHARED_LIBS})
- add_library(huginjhead STATIC ${HUGIN_JHEAD_SRC})
- ENDIF (${HUGIN_SHARED_LIBS})
-+
-+TARGET_LINK_LIBRARIES(huginjhead huginbase)
---- a/src/foreign/levmar/CMakeLists.txt 2008-01-27 22:18:25.000000000 +0000
-+++ b/src/foreign/levmar/CMakeLists.txt 2008-01-27 22:21:28.000000000 +0000
-@@ -1,3 +1,5 @@
-
- add_library(huginlevmar STATIC lm.c Axb.c misc.c lmlec.c lmbc.c)
-
-+SET_TARGET_PROPERTIES(huginlevmar PROPERTIES COMPILE_FLAGS -fPIC)
-+
View
27 media-gfx/hugin/files/hugin-0.8.0_rc3-as-needed.patch
@@ -1,27 +0,0 @@
-diff -ru hugin-0.8.0.orig/src/foreign/levmar/CMakeLists.txt hugin-0.8.0/src/foreign/levmar/CMakeLists.txt
---- hugin-0.8.0.orig/src/foreign/levmar/CMakeLists.txt 2009-06-09 07:38:10.000000000 +0200
-+++ hugin-0.8.0/src/foreign/levmar/CMakeLists.txt 2009-06-09 07:38:33.000000000 +0200
-@@ -6,3 +6,5 @@
- IF(LAPACK_FOUND)
- ADD_DEFINITIONS(-DHAVE_LAPACK)
- ENDIF(LAPACK_FOUND)
-+
-+SET_TARGET_PROPERTIES(huginlevmar PROPERTIES COMPILE_FLAGS -fPIC)
-diff -ru hugin-0.8.0.orig/src/foreign/vigra/vigra_impex/CMakeLists.txt hugin-0.8.0/src/foreign/vigra/vigra_impex/CMakeLists.txt
---- hugin-0.8.0.orig/src/foreign/vigra/vigra_impex/CMakeLists.txt 2009-06-09 07:38:10.000000000 +0200
-+++ hugin-0.8.0/src/foreign/vigra/vigra_impex/CMakeLists.txt 2009-06-09 07:38:33.000000000 +0200
-@@ -9,3 +9,5 @@
- ELSE (${HUGIN_SHARED_LIBS})
- add_library(huginvigraimpex STATIC ${VIGRA_IMPEX_SRC})
- ENDIF (${HUGIN_SHARED_LIBS})
-+
-+TARGET_LINK_LIBRARIES(huginvigraimpex ${JPEG_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${TIFF_LIBRARIES})
-diff -ru hugin-0.8.0.orig/src/hugin_base/CMakeLists.txt hugin-0.8.0/src/hugin_base/CMakeLists.txt
---- hugin-0.8.0.orig/src/hugin_base/CMakeLists.txt 2009-06-09 07:38:09.000000000 +0200
-+++ hugin-0.8.0/src/hugin_base/CMakeLists.txt 2009-06-09 07:41:05.000000000 +0200
-@@ -65,3 +65,5 @@
- ENDIF (${HUGIN_SHARED_LIBS})
-
- add_subdirectory(test)
-+
-+TARGET_LINK_LIBRARIES(huginbase huginlevmar huginvigraimpex ${Boost_thread_LIBRARIES} ${EXIV2_LIBRARIES} ${PANO_LIBRARIES} ${TIFF_LIBRARIES} ${LAPACK_LIBRARIES})
View
116 media-gfx/hugin/files/hugin-0.8.0_rc4-use_system_cmake_findboost.patch
@@ -1,116 +0,0 @@
-diff -Naur hugin-0.8.0.orig/CMakeLists.txt hugin-0.8.0/CMakeLists.txt
---- hugin-0.8.0.orig/CMakeLists.txt 2009-06-29 00:09:44.091649435 +0200
-+++ hugin-0.8.0/CMakeLists.txt 2009-06-29 00:10:23.898439132 +0200
-@@ -89,8 +89,6 @@
- # create the cache entry
- SET( SOURCE_BASE_DIR ${work} CACHE FILEPATH "parent dir of hugin source root" )
-
-- # search boost there
-- SET(BOOST_DIR_SEARCH_USER ${SOURCE_BASE_DIR})
- # wxWidgets
- SET(wxWidgets_ROOT_DIR ${SOURCE_BASE_DIR}/wxWidgets-2.8.10)
- # GLEW moved to FildGLEW.cmake module
-@@ -179,11 +177,10 @@
- ## Boost
- ##
-
--SET(Boost_LIB_SUFFIX_DEBUG gd)
--FIND_PACKAGE(Boost REQUIRED thread)
--IF (NOT Boost_thread_FOUND)
-- MESSAGE(FATAL_ERROR "boost thread library not found. If it is installed with a\nunrecognized suffix, specify it with -DBoost_LIB_SUFFIX=<suffix>")
--ENDIF (NOT Boost_thread_FOUND)
-+FIND_PACKAGE(Boost COMPONENTS thread)
-+IF (NOT Boost_FOUND)
-+ MESSAGE(FATAL_ERROR "boost thread library not found. If it is installed with a\nunrecognized suffix, specify it with -DBOOST_LIBRARYDIR=<librarydir> and -DBOOST_INCLUDEDIR=<includedir>")
-+ENDIF (NOT Boost_FOUND)
-
- INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
- LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
-diff -Naur hugin-0.8.0.orig/src/CMakeLists.txt hugin-0.8.0/src/CMakeLists.txt
---- hugin-0.8.0.orig/src/CMakeLists.txt 2009-06-29 00:09:44.024975006 +0200
-+++ hugin-0.8.0/src/CMakeLists.txt 2009-06-29 00:11:03.751660063 +0200
-@@ -15,11 +15,11 @@
- IF(LAPACK_FOUND)
- # need to specify boost thread library
- set(common_libs huginbase
-- ${Boost_thread_LIBRARIES} ${PANO_LIBRARIES} ${LAPACK_LIBRARIES} huginlevmar)
-+ ${Boost_LIBRARIES} ${PANO_LIBRARIES} ${LAPACK_LIBRARIES} huginlevmar)
- ELSE(LAPACK_FOUND)
- # need to specify boost thread library
- set(common_libs huginbase
-- ${Boost_thread_LIBRARIES} ${PANO_LIBRARIES} huginlevmar)
-+ ${Boost_LIBRARIES} ${PANO_LIBRARIES} huginlevmar)
- ENDIF(LAPACK_FOUND)
- ENDIF (MSVC)
-
-diff -Naur hugin-0.8.0.orig/src/CMakeLists.txt.orig hugin-0.8.0/src/CMakeLists.txt.orig
---- hugin-0.8.0.orig/src/CMakeLists.txt.orig 1970-01-01 01:00:00.000000000 +0100
-+++ hugin-0.8.0/src/CMakeLists.txt.orig 2009-06-17 19:48:37.000000000 +0200
-@@ -0,0 +1,56 @@
-+
-+# define common sets of libraries, used by different subdirectories
-+IF (MSVC)
-+ IF(LAPACK_FOUND)
-+ # boost_thread is linked automatically
-+ # additionally link to our getopt
-+ set(common_libs huginbase hugingetopt
-+ ${PANO_LIBRARIES} ${LAPACK_LIBRARIES} huginlevmar)
-+ ELSE(LAPACK_FOUND)
-+ set(common_libs huginbase hugingetopt
-+ ${PANO_LIBRARIES} huginlevmar)
-+ ENDIF(LAPACK_FOUND)
-+ include_directories( ${CMAKE_SOURCE_DIR}/src/foreign/getopt/include )
-+ELSE (MSVC)
-+ IF(LAPACK_FOUND)
-+ # need to specify boost thread library
-+ set(common_libs huginbase
-+ ${Boost_thread_LIBRARIES} ${PANO_LIBRARIES} ${LAPACK_LIBRARIES} huginlevmar)
-+ ELSE(LAPACK_FOUND)
-+ # need to specify boost thread library
-+ set(common_libs huginbase
-+ ${Boost_thread_LIBRARIES} ${PANO_LIBRARIES} huginlevmar)
-+ ENDIF(LAPACK_FOUND)
-+ENDIF (MSVC)
-+
-+set(image_libs huginvigraimpex ${OPENEXR_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARIES}
-+ ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${EXIV2_LIBRARIES})
-+
-+add_subdirectory(celeste)
-+add_subdirectory(foreign)
-+add_subdirectory(hugin_base)
-+add_subdirectory(tools)
-+add_subdirectory(matchpoint)
-+add_subdirectory(deghosting)
-+
-+# build vips stuff, only if vips was found
-+# not ready for the general public yet
-+IF(VIPS_FOUND)
-+# add_subdirectory(vips)
-+ENDIF(VIPS_FOUND)
-+
-+# build gui only if wxWidgets was found
-+IF(wxWidgets_FOUND)
-+ INCLUDE(${wxWidgets_USE_FILE})
-+ add_subdirectory(hugin1)
-+
-+ include_directories( ${CMAKE_SOURCE_DIR}/src/hugin1 )
-+ # do we need to define _UNICODE on windows?
-+ IF(WIN32)
-+ IF ("${wxWidgets_CONFIGURATION}" STREQUAL "mswu")
-+ ADD_DEFINITIONS("-D_UNICODE")
-+ ENDIF("${wxWidgets_CONFIGURATION}" STREQUAL "mswu")
-+ ENDIF(WIN32)
-+ENDIF(wxWidgets_FOUND)
-+
-+add_subdirectory(translations)
-diff -Naur hugin-0.8.0.orig/src/hugin_base/CMakeLists.txt hugin-0.8.0/src/hugin_base/CMakeLists.txt
---- hugin-0.8.0.orig/src/hugin_base/CMakeLists.txt 2009-06-29 00:13:41.115785087 +0200
-+++ hugin-0.8.0/src/hugin_base/CMakeLists.txt 2009-06-29 00:10:23.901636391 +0200
-@@ -58,6 +58,7 @@
-
- IF (${HUGIN_SHARED_LIBS})
- add_library(huginbase SHARED ${HUGIN_BASE_SRC})
-+ target_link_libraries(huginbase ${Boost_LIBRARIES})
- set_target_properties(huginbase PROPERTIES VERSION ${HUGIN_LIB_VERSION})
- install(TARGETS huginbase DESTINATION ${LIBDIR})
- ELSE (${HUGIN_SHARED_LIBS})
View
9 media-gfx/hugin/files/hugin-2009.2.0_beta3-asneeded.patch
@@ -1,9 +0,0 @@
-diff -ru hugin-2009.2.0.orig/src/hugin_base/CMakeLists.txt hugin-2009.2.0/src/hugin_base/CMakeLists.txt
---- hugin-2009.2.0.orig/src/hugin_base/CMakeLists.txt 2009-09-12 17:08:56.000000000 +0200
-+++ hugin-2009.2.0/src/hugin_base/CMakeLists.txt 2009-09-12 17:10:22.000000000 +0200
-@@ -69,4 +69,4 @@
-
- add_subdirectory(test)
-
--TARGET_LINK_LIBRARIES(huginbase huginlevmar huginvigraimpex ${Boost_LIBRARIES} ${EXIV2_LIBRARIES} ${PANO_LIBRARIES} ${TIFF_LIBRARIES} ${LAPACK_LIBRARIES})
-+TARGET_LINK_LIBRARIES(huginbase huginlevmar huginvigraimpex ${Boost_LIBRARIES} ${EXIV2_LIBRARIES} ${PANO_LIBRARIES} ${TIFF_LIBRARIES} ${LAPACK_LIBRARIES} ${GLEW_LIBRARIES} ${OPENGL_LIBRARIES})
View
65 media-gfx/hugin/hugin-0.8.0-r1.ebuild
@@ -1,65 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-0.8.0.ebuild,v 1.2 2009/08/01 09:49:21 maekke Exp $
-
-EAPI="2"
-WX_GTK_VER="2.8"
-
-inherit base cmake-utils wxwidgets versionator
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2 SIFT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-LANGS=" bg ca cs de en_GB es fr hu it ja ko nl pl pt_BR ru sk sl sv uk zh_CN zh_TW"
-IUSE="lapack +sift $(echo ${LANGS//\ /\ linguas_})"
-
-DEPEND="app-arch/zip
- >=dev-libs/boost-1.35.0-r2
- >=media-gfx/enblend-3.0_p20080807
- media-gfx/exiv2
- media-libs/jpeg
- >=media-libs/libpano13-2.9.12
- media-libs/libpng
- media-libs/openexr
- media-libs/tiff
- sys-libs/zlib
- x11-libs/wxGTK:2.8[opengl]
- lapack? ( virtual/lapack )
- sift? ( media-gfx/autopano-sift-C )"
-RDEPEND="${DEPEND}
- media-libs/exiftool"
-
-S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
-PATCHES=(
- "${FILESDIR}"/${PN}-0.8.0_rc3-as-needed.patch
- "${FILESDIR}"/${PN}-0.8.0_rc4-use_system_cmake_findboost.patch
-)
-
-src_prepare() {
- base_src_prepare
-
- # Remove faulty module and force usage of system cmake FindBoost
- rm CMakeModules/FindBoost.cmake
-}
-
-pkg_setup() {
- DOCS="AUTHORS README TODO"
- mycmakeargs="$(cmake-utils_use_enable lapack)"
-}
-
-src_install() {
- cmake-utils_src_install
-
- for lang in ${LANGS} ; do
- case ${lang} in
- ca) dir=ca_ES;;
- cs) dir=cs_CZ;;
- *) dir=${lang};;
- esac
- use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
- done
-}
View
56 media-gfx/hugin/hugin-2009.2.0-r1.ebuild
@@ -1,56 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2009.2.0.ebuild,v 1.1 2009/09/30 05:52:58 maekke Exp $
-
-EAPI="2"
-WX_GTK_VER="2.8"
-
-inherit cmake-utils wxwidgets versionator
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2 SIFT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-LANGS=" bg ca cs de en_GB es fr hu it ja ko nl pl pt_BR ru sk sl sv uk zh_CN zh_TW"
-IUSE="lapack +sift $(echo ${LANGS//\ /\ linguas_})"
-
-DEPEND="
- !!dev-util/cocom
- app-arch/zip
- >=dev-libs/boost-1.35.0-r2
- >=media-gfx/enblend-3.0_p20080807
- media-gfx/exiv2
- media-libs/jpeg
- >=media-libs/libpano13-2.9.12
- media-libs/libpng
- media-libs/openexr
- media-libs/tiff
- sys-libs/zlib
- x11-libs/wxGTK:2.8[opengl]
- lapack? ( virtual/lapack )
- sift? ( media-gfx/autopano-sift-C )"
-RDEPEND="${DEPEND}
- media-libs/exiftool"
-
-S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
-
-pkg_setup() {
- DOCS="AUTHORS README TODO"
- mycmakeargs="$(cmake-utils_use_enable lapack)"
-}
-
-src_install() {
- cmake-utils_src_install
-
- for lang in ${LANGS} ; do
- case ${lang} in
- ca) dir=ca_ES;;
- cs) dir=cs_CZ;;
- *) dir=${lang};;
- esac
- use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
- done
-}
View
3  media-libs/libpano13/Manifest
@@ -1,3 +0,0 @@
-AUX uchar_define.patch 999 RMD160 99a187f366d2ce2a1b7cd956dd65494405e3f7d8 SHA1 77d26b83536d3b48c9f1e14866fb15852302e818 SHA256 f9c5dfc2a9923df3fc9685b4cbcaf55f311d1807c13ba87e1d7c6d98339c4eb2
-DIST libpano13-2.9.12.tar.gz 3617850 RMD160 04f491e17c09d86bf99dc1b03810a31bae965527 SHA1 6848d4c127b77fd59a1787806e36d24a9403fc59 SHA256 2ab248c0681d05e9f02ddbe5e89d3fa398fff3b5fd02f01e640c97be02c99f2a
-EBUILD libpano13-2.9.12-r1.ebuild 905 RMD160 9fa6882c2e21f445538e950625c7ba88236fbec5 SHA1 32c7468e54939ec87e8e073822a4927f661b39f5 SHA256 d93f7acfe2de7d0547db6a787ce5d77902bc833b184855e3ea738465bfaa8a98
View
39 media-libs/libpano13/files/uchar_define.patch
@@ -1,39 +0,0 @@
-From 8b02b357e9f90d3dc415ca52047d4ad8bf6dcce4 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Lukas=20Sandstr=C3=B6m?= <luksan@gmail.com>
-Date: Tue, 22 Sep 2009 16:34:07 +0200
-Subject: [PATCH] Fix the define UCHAR problem.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
-
-Use typedef instead of #define, and make it match
-sqltypes.h from unixODBC.
-
-Signed-off-by: Lukas Sandström <luksan@gmail.com>
----
- filter.h | 9 ++++++---
- 1 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/filter.h b/filter.h
-index 3c26333..dd39e2f 100644
---- a/filter.h
-+++ b/filter.h
-@@ -47,9 +47,12 @@
-
- //---------------------- Types ---------------------------------------------
-
--#define UCHAR unsigned char
--#define USHORT unsigned short
--#define ULONG unsigned long
-+#undef UCHAR
-+#undef USHORT
-+#undef ULONG
-+typedef unsigned char UCHAR;
-+typedef unsigned short USHORT;
-+typedef unsigned long ULONG;
-
- enum{
- _UCHAR,
---
-1.6.3.3
-
View
33 media-libs/libpano13/libpano13-2.9.12-r1.ebuild
@@ -1,33 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpano13/libpano13-2.9.12.ebuild,v 1.5 2009/04/20 20:59:25 maekke Exp $
-
-inherit eutils
-
-DESCRIPTION="Helmut Dersch's panorama toolbox library"
-HOMEPAGE="http://panotools.sf.net"
-SRC_URI="mirror://sourceforge/panotools/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="java"
-DEPEND="
- media-libs/jpeg
- media-libs/libpng
- media-libs/tiff
- sys-libs/zlib
- java? ( virtual/jdk )"
-
-src_compile() {
- epatch "${FILESDIR}/uchar_define.patch"
- local myconf=""
- use java && myconf="--with-java=${JAVA_HOME}"
- use java || myconf="--without-java"
- econf ${myconf} || die "Configure failed"
- emake || die "Build failed"
-}
-
-src_install() {
- make DESTDIR="${D}" install || die "Install failed"
- dodoc README README.linux AUTHORS NEWS doc/*.txt
-}
View
3  media-sound/amarok/Manifest
@@ -0,0 +1,3 @@
+AUX amarok-2.4.0-make-the-DAAP-parsing-more-robust.patch 17057 RMD160 e93e40f3f1acdcd1352ecfed22bbd4e95140ec36 SHA1 f9810467b0e9e99acaf18a7263bbf93e475edcd9 SHA256 65d85bd07fe10b9a3605ab7b8c83454b93ce0ef658cff8e8da83768c7ad7f364
+DIST amarok-2.4.0.tar.bz2 15219572 RMD160 f32a664521b9827ef8e7d49100e39b69fa87dd29 SHA1 d37ecda0fecdba88bb239f11c6d4ff885d7ac23f SHA256 52be0e926d1362828a4bf64e2a174dc009c85f6f33da4ca589f0f09ab9b7085c
+EBUILD amarok-2.4.0-r1.ebuild 4157 RMD160 cf4eafbe7bfc6ff10333bdf66b43bc43fafaaa11 SHA1 f23dd7d4564f83276c5ca7d34b1d25ee7c0852a4 SHA256 607c3475852d4a267d7d9b8e7f57fdd3081edc43f7a52b7fd7c04f60633487fd
View
159 media-sound/amarok/amarok-2.4.0-r1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.4.0.ebuild,v 1.3 2011/02/02 04:11:38 tampakrap Exp $
+
+EAPI=3
+
+# Translations are only in the tarballs, not the git repo
+if [[ ${PV} != *9999* ]]; then
+ KDE_LINGUAS="bg ca cs da de en_GB es et eu fi fr it ja km nb nds nl
+ pa pl pt pt_BR ru sl sr sr@latin sv th tr uk wa zh_TW"
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+else
+ KDE_SCM="git"
+ KEYWORDS=""
+fi
+
+KDE_REQUIRED="never"
+inherit flag-o-matic kde4-base
+
+DESCRIPTION="Advanced audio player based on KDE framework."
+HOMEPAGE="http://amarok.kde.org/"
+
+LICENSE="GPL-2"
+SLOT="4"
+IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp opengl +player semantic-desktop +utils"
+
+# Tests require gmock - http://code.google.com/p/gmock/
+# It's not in the tree yet
+RESTRICT="test"
+
+PATCHES=(
+ "${FILESDIR}/amarok-2.4.0-make-the-DAAP-parsing-more-robust.patch"
+)
+
+# ipod requires gdk enabled and also gtk compiled in libgpod
+COMMONDEPEND="
+ >=media-libs/taglib-1.6.1[asf,mp4]
+ >=media-libs/taglib-extras-1.0.1
+ player? (
+ app-crypt/qca:2
+ >=app-misc/strigi-0.5.7[dbus,qt4]
+ $(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?')
+ sys-libs/zlib
+ >=virtual/mysql-5.1
+ x11-libs/qt-script
+ >=x11-libs/qtscriptgenerator-0.1.0
+ cdda? (
+ $(add_kdebase_dep libkcddb)
+ $(add_kdebase_dep libkcompactdisc)
+ $(add_kdebase_dep kdemultimedia-kioslaves)
+ )
+ embedded? (
+ || (
+ >=dev-db/mysql-5.1.50-r3[embedded]
+ >=dev-db/mariadb-5.1.50[embedded]
+ )
+ )
+ ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
+ lastfm? ( >=media-libs/liblastfm-0.3.0 )
+ mp3tunes? (
+ dev-libs/glib:2
+ dev-libs/libxml2
+ dev-libs/openssl
+ net-libs/loudmouth
+ net-misc/curl
+ x11-libs/qt-core[glib]
+ )
+ mtp? ( >=media-libs/libmtp-1.0.0 )
+ opengl? ( virtual/opengl )
+ )
+ utils? (
+ x11-libs/qt-core
+ x11-libs/qt-dbus
+ )
+ !player? ( !utils? ( media-sound/amarok[player] ) )
+"
+DEPEND="${COMMONDEPEND}
+ dev-util/automoc
+ dev-util/pkgconfig
+"
+RDEPEND="${COMMONDEPEND}
+ !media-sound/amarok-utils
+ player? ( $(add_kdebase_dep phonon-kde) )
+"
+
+src_prepare() {
+ if ! use player; then
+ # Disable po processing
+ sed -e "s:include(MacroOptionalAddSubdirectory)::" \
+ -i "${S}/CMakeLists.txt" \
+ || die "Removing include of MacroOptionalAddSubdirectory failed."
+ sed -e "s:macro_optional_add_subdirectory( po )::" \
+ -i "${S}/CMakeLists.txt" \
+ || die "Removing include of MacroOptionalAddSubdirectory failed."
+ fi
+
+ kde4-base_src_prepare
+}
+
+src_configure() {
+ # Append minimal-toc cflag for ppc64, see bug 280552 and 292707
+ use ppc64 && append-flags -mminimal-toc
+
+ if use player; then
+ mycmakeargs=(
+ -DWITH_PLAYER=ON
+ -DWITH_Libgcrypt=OFF
+ $(cmake-utils_use embedded WITH_MYSQL_EMBEDDED)
+ $(cmake-utils_use_with ipod)
+ $(cmake-utils_use_with ipod Gdk)
+ $(cmake-utils_use_with lastfm LibLastFm)
+ $(cmake-utils_use_with mtp)
+ $(cmake-utils_use_with mp3tunes MP3Tunes)
+ )
+ else
+ mycmakeargs=(
+ -DWITH_PLAYER=OFF
+ )
+ fi
+
+ mycmakeargs+=(
+ $(cmake-utils_use_with utils UTILITIES)
+ )
+ # $(cmake-utils_use_with semantic-desktop Nepomuk)
+ # $(cmake-utils_use_with semantic-desktop Soprano)
+
+ kde4-base_src_configure
+}
+
+pkg_postinst() {
+ kde4-base_pkg_postinst
+
+ if use player; then
+
+ if use daap; then
+ echo
+ elog "You have installed amarok with daap support."
+ elog "You may be interested in installing www-servers/mongrel as well."
+ echo
+ fi
+
+ if ! use embedded; then
+ echo
+ elog "You've disabled the amarok support for embedded mysql DBs."
+ elog "You'll have to configure amarok to use an external db server."
+ echo
+ elog "Please read http://amaroklive.com/wiki/MySQL_Server for details on how"
+ elog "to configure the external db and migrate your data from the embedded database."
+ echo
+
+ if has_version "dev-db/mysql[minimal]"; then
+ elog "You built mysql with the minimal use flag, so it doesn't include the server."
+ elog "You won't be able to use the local mysql installation to store your amarok collection."
+ echo
+ fi
+ fi
+ fi
+}
View
465 media-sound/amarok/files/amarok-2.4.0-make-the-DAAP-parsing-more-robust.patch
@@ -0,0 +1,465 @@
+From 12e77596eec590224cbf75deaa9472d1bba545a8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lukas=20Sandstr=C3=B6m?= <luksan@gmail.com>
+Date: Sat, 19 Feb 2011 17:41:18 +0100
+Subject: [PATCH 1/2] daapreader: make the DAAP parsing more robust
+
+---
+ .../collections/daap/daapreader/Reader.cpp | 345 ++++++++++----------
+ src/core-impl/collections/daap/daapreader/Reader.h | 5 +-
+ 2 files changed, 167 insertions(+), 183 deletions(-)
+
+diff --git a/src/core-impl/collections/daap/daapreader/Reader.cpp b/src/core-impl/collections/daap/daapreader/Reader.cpp
+index 744c6a2..e4c6b64 100644
+--- a/src/core-impl/collections/daap/daapreader/Reader.cpp
++++ b/src/core-impl/collections/daap/daapreader/Reader.cpp
+@@ -231,7 +231,7 @@ Reader::loginFinished( int /* id */, bool error )
+ return;
+ }
+ QDataStream raw( http->results() );
+- Map loginResults = parse( raw, 0, true );
++ Map loginResults = parse( raw );
+ debug() << "list size is " << loginResults["mlog"].toList().size();
+ if( loginResults["mlog"].toList().size() == 0 )
+ return;
+@@ -258,7 +258,7 @@ Reader::updateFinished( int /*id*/, bool error )
+ }
+
+ QDataStream raw( http->results() );
+- Map updateResults = parse( raw, 0, true );
++ Map updateResults = parse( raw );
+ if( updateResults["mupd"].toList().isEmpty() )
+ return; //error
+ if( updateResults["mupd"].toList()[0].toMap()["musr"].toList().isEmpty() )
+@@ -282,7 +282,7 @@ Reader::databaseIdFinished( int /*id*/, bool error )
+ }
+
+ QDataStream raw( http->results() );
+- Map dbIdResults = parse( raw, 0, true );
++ Map dbIdResults = parse( raw );
+ m_databaseId = QString::number( dbIdResults["avdb"].toList()[0].toMap()["mlcl"].toList()[0].toMap()["mlit"].toList()[0].toMap()["miid"].toList()[0].toInt() );
+ connect( http, SIGNAL( requestFinished( int, bool ) ), this, SLOT( songListFinished( int, bool ) ) );
+ http->getDaap( QString("/databases/%1/items?type=music&meta=dmap.itemid,dmap.itemname,daap.songformat,daap.songartist,daap.songalbum,daap.songtime,daap.songtracknumber,daap.songcomment,daap.songyear,daap.songgenre&%2")
+@@ -308,7 +308,7 @@ Reader::songListFinished( int /*id*/, bool error )
+ }
+
+ bool
+-Reader::parseSongList( const QByteArray &data )
++Reader::parseSongList( const QByteArray &data, bool set_collection )
+ {
+ // The original implementation used parse(), which uses addElement() and
+ // makes heavy usage of QMaps and QList which hurts performance very badly.
+@@ -322,7 +322,6 @@ Reader::parseSongList( const QByteArray &data )
+ QDataStream raw( data );
+
+ // Cache for music data
+- uint index = 0;
+ QString itemId;
+ QString format;
+ QString title;
+@@ -337,115 +336,69 @@ Reader::parseSongList( const QByteArray &data )
+
+ while( !raw.atEnd() )
+ {
+- char tag[5];
+- quint32 tagLength = getTagAndLength( raw, tag );
++ char rawTag[5];
++ quint32 tagLength = getTagAndLength( raw, rawTag );
++
+ if( tagLength == 0 )
+- {
+- index += 8;
+ continue;
+- }
+- switch( s_codes[tag].type )
++
++ QVariant tagData = readTagData( raw, rawTag, tagLength );
++
++ if( !tagData.isValid() )
++ continue;
++
++ QString tag = QString( rawTag );
++
++ if( s_codes[tag].type == CONTAINER )
+ {
+- case CHAR:
+- {
+- qint8 charData;
+- raw >> charData; DEBUGTAG( charData )
+- break;
+- }
+- case SHORT:
+- {
+- qint16 shortData;
+- raw >> shortData; DEBUGTAG( shortData )
+- if ( QString( tag ) == "astn" )
+- trackNumber = shortData;
+- else if ( QString( tag ) == "asyr" )
+- year = shortData;
+- break;
+- }
+- case LONG:
+- {
+- qint32 longData;
+- raw >> longData; DEBUGTAG( longData )
+- if ( QString( tag ) == "miid" )
+- itemId = QString::number( longData );
+- if ( QString( tag ) == "astm" )
+- songTime = longData;
+- break;
+- }
+- case LONGLONG:
+- {
+- qint64 longlongData;
+- raw >> longlongData; DEBUGTAG( longlongData )
+- break;
+- }
+- case STRING:
+- {
+- QByteArray stringData(tagLength, ' ');
+- raw.readRawData( stringData.data(), tagLength ); DEBUGTAG( QString::fromUtf8( stringData, tagLength ) )
+- if ( QString( tag ) == "asfm" )
+- format = QString::fromUtf8( stringData, tagLength );
+- else if ( QString( tag ) == "minm" )
+- title = QString::fromUtf8( stringData, tagLength );
+- else if ( QString( tag ) == "asal" )
+- album = QString::fromUtf8( stringData, tagLength );
+- else if ( QString( tag ) == "asar" )
+- artist = QString::fromUtf8( stringData, tagLength );
+- else if ( QString( tag ) == "ascp" )
+- composer = QString::fromUtf8( stringData, tagLength );
+- else if ( QString( tag ) == "ascm" )
+- comment = QString::fromUtf8( stringData, tagLength );
+- else if ( QString( tag ) == "asgn" )
+- genre = QString::fromUtf8( stringData, tagLength );
+- break;
+- }
+- case DATE:
+- {
+- qint64 dateData;
+- QDateTime date;
+- raw >> dateData; DEBUGTAG( dateData )
+- date.setTime_t(dateData);
+- break;
+- }
+- case DVERSION:
+- {
+- qint16 major;
+- qint8 minor;
+- qint8 patchLevel;
+- raw >> major >> minor >> patchLevel; DEBUGTAG( patchLevel )
+- break;
+- }
+- case CONTAINER:
+- {
+- if ( QString( tag ) == "mlit" )
+- addTrack( itemId, title, artist, composer, comment, album, genre, year, format, trackNumber, songTime );
+- break;
+- }
+- default:
+- {
+- warning() << tag << " does not work";
+- break;
+- }
++ parseSongList( tagData.toByteArray() );
++ continue;
+ }
+- index += tagLength + 8;
++
++ if( tag == "astn" )
++ trackNumber = tagData.toInt();
++ else if( tag == "asyr" )
++ year = tagData.toInt();
++ else if( tag == "miid" )
++ itemId = tagData.toString();
++ else if(tag == "astm" )
++ songTime = tagData.toInt();
++ else if( tag== "asfm" )
++ format = tagData.toString();
++ else if( tag == "minm" )
++ title = tagData.toString();
++ else if( tag == "asal" )
++ album = tagData.toString();
++ else if( tag == "asar" )
++ artist = tagData.toString();
++ else if( tag == "ascp" )
++ composer = tagData.toString();
++ else if( tag == "ascm" )
++ comment = tagData.toString();
++ else if( tag == "asgn" )
++ genre = tagData.toString();
+ }
+
+- addTrack( itemId, title, artist, composer, comment, album, genre, year, format, trackNumber, songTime );
+-
+- m_memColl->memoryCollection()->acquireWriteLock();
+- m_memColl->memoryCollection()->setTrackMap( m_trackMap );
+- m_memColl->memoryCollection()->setArtistMap( m_artistMap );
+- m_memColl->memoryCollection()->setAlbumMap( m_albumMap );
+- m_memColl->memoryCollection()->setGenreMap( m_genreMap );
+- m_memColl->memoryCollection()->setComposerMap( m_composerMap );
+- m_memColl->memoryCollection()->setYearMap( m_yearMap );
+- m_memColl->memoryCollection()->releaseLock();
+- m_trackMap.clear();
+- m_artistMap.clear();
+- m_albumMap.clear();
+- m_genreMap.clear();
+- m_composerMap.clear();
+- m_yearMap.clear();
++ if( !itemId.isEmpty() )
++ addTrack( itemId, title, artist, composer, comment, album, genre, year, format, trackNumber, songTime );
+
++ if( set_collection )
++ {
++ m_memColl->memoryCollection()->acquireWriteLock();
++ m_memColl->memoryCollection()->setTrackMap( m_trackMap );
++ m_memColl->memoryCollection()->setArtistMap( m_artistMap );
++ m_memColl->memoryCollection()->setAlbumMap( m_albumMap );
++ m_memColl->memoryCollection()->setGenreMap( m_genreMap );
++ m_memColl->memoryCollection()->setComposerMap( m_composerMap );
++ m_memColl->memoryCollection()->setYearMap( m_yearMap );
++ m_memColl->memoryCollection()->releaseLock();
++ m_trackMap.clear();
++ m_artistMap.clear();
++ m_albumMap.clear();
++ m_genreMap.clear();
++ m_composerMap.clear();
++ m_yearMap.clear();
++ }
+ return true;
+ }
+
+@@ -529,8 +482,99 @@ Reader::getTagAndLength( QDataStream &raw, char tag[5] )
+ return tagLength;
+ }
+
++QVariant
++Reader::readTagData( QDataStream &raw, char *tag, quint32 tagLength)
++{
++ /**
++ * Consume tagLength bytes of data from the stream and convert it to the
++ * proper type, while making sure that datalength/datatype mismatches are handled properly
++ */
++
++ QVariant ret = QVariant();
++
++ if ( tagLength == 0 )
++ return ret;
++
++#define READ_DATA(var) \
++ DEBUGTAG( var ) \
++ if( sizeof(var) != tagLength ) { \
++ warning() << "Bad tag data length: " << tag << ":" << tagLength; \
++ raw.skipRawData(tagLength); \
++ break; \
++ } else { \
++ raw >> var ; \
++ ret = QVariant(var); \
++ }
++ switch( s_codes[tag].type )
++ {
++ case CHAR:
++ {
++ qint8 charData;
++ READ_DATA( charData )
++ break;
++ }
++ case SHORT:
++ {
++ qint16 shortData;
++ READ_DATA( shortData )
++ break;
++ }
++ case LONG:
++ {
++ qint32 longData;
++ READ_DATA( longData );
++ break;
++ }
++ case LONGLONG:
++ {
++ qint64 longlongData;
++ READ_DATA( longlongData );
++ break;
++ }
++ case STRING:
++ {
++ QByteArray stringData( tagLength, ' ' );
++ raw.readRawData( stringData.data(), tagLength );
++ ret = QVariant(QString::fromUtf8( stringData, tagLength ));
++ DEBUGTAG( QString::fromUtf8( stringData, tagLength ) )
++ break;
++ }
++ case DATE:
++ {
++ qint64 dateData;
++ READ_DATA( dateData )
++ QDateTime date;
++ date.setTime_t( dateData );
++ ret = QVariant( date );
++ break;
++ }
++ case DVERSION:
++ {
++ qint32 verData;
++ READ_DATA( verData )
++ QString version( "%1.%2.%3" );
++ version.arg( verData >> 16, (verData >> 8) & 0xFF, verData & 0xFF);
++ ret = QVariant( version );
++ break;
++ }
++ case CONTAINER:
++ {
++ QByteArray containerData( tagLength, ' ' );
++ raw.readRawData( containerData.data(), tagLength );
++ ret = QVariant( containerData );
++ break;
++ }
++ default:
++ warning() << "Tag " << tag << " has unhandled type." << endl;
++ raw.skipRawData(tagLength);
++ break;
++ }
++#undef READ_DATA
++ return ret;
++}
++
+ Map
+-Reader::parse( QDataStream &raw, uint containerLength, bool first )
++Reader::parse( QDataStream &raw )
+ {
+ DEBUG_BLOCK
+ /**
+@@ -540,85 +584,24 @@ Reader::parse( QDataStream &raw, uint containerLength, bool first )
+ * 8- Data The data contained within the chunk
+ **/
+ Map childMap;
+- uint index = 0;
+- while( (first ? !raw.atEnd() : ( index < containerLength ) ) )
++ while( !raw.atEnd() )
+ {
+ char tag[5];
+ quint32 tagLength = getTagAndLength( raw, tag );
+ if( tagLength == 0 )
+- {
+- index += 8;
+ continue;
+- }
+- switch( s_codes[tag].type )
++
++ QVariant tagData = readTagData(raw, tag, tagLength);
++ if( !tagData.isValid() )
++ continue;
++
++ if( s_codes[tag].type == CONTAINER )
+ {
+- case CHAR:
+- {
+- qint8 charData;
+- raw >> charData; DEBUGTAG( charData )
+- addElement( childMap, tag, QVariant( static_cast<int>(charData) ) );
+- break;
+- }
+- case SHORT:
+- {
+- qint16 shortData;
+- raw >> shortData; DEBUGTAG( shortData )
+- addElement( childMap, tag, QVariant( static_cast<int>(shortData) ) );
+- break;
+- }
+- case LONG:
+- {
+- qint32 longData;
+- raw >> longData; DEBUGTAG( longData )
+- addElement( childMap, tag, QVariant( longData ) );
+- break;
+- }
+- case LONGLONG:
+- {
+- qint64 longlongData;
+- raw >> longlongData; DEBUGTAG( longlongData )
+- addElement( childMap, tag, QVariant( longlongData ) );
+- break;
+- }
+- case STRING:
+- {
+- QByteArray stringData(tagLength, ' ');
+- raw.readRawData( stringData.data(), tagLength ); DEBUGTAG( QString::fromUtf8( stringData, tagLength ) )
+- addElement( childMap, tag, QVariant( QString::fromUtf8( stringData, tagLength ) ) );
+- break;
+- }
+- case DATE:
+- {
+- qint64 dateData;
+- QDateTime date;
+- raw >> dateData; DEBUGTAG( dateData )
+- date.setTime_t(dateData);
+- addElement( childMap, tag, QVariant( date ) );
+- break;
+- }
+- case DVERSION:
+- {
+- qint16 major;
+- qint8 minor;
+- qint8 patchLevel;
+- raw >> major >> minor >> patchLevel; DEBUGTAG( patchLevel )
+- QString version("%1.%2.%3");
+- version.arg(major, minor, patchLevel);
+- addElement( childMap, tag, QVariant(version) );
+- }
+- case CONTAINER:
+- {
+- DEBUGTAG( 11 )
+- addElement( childMap, tag, QVariant( parse( raw, tagLength ) ) );
+- break;
+- }
+- default:
+- {
+- warning() << tag << " does not work";
+- break;
+- }
++ QDataStream substream( tagData.toByteArray() );
++ addElement( childMap, tag, QVariant( parse( substream ) ) );
+ }
+- index += tagLength + 8;
++ else
++ addElement( childMap, tag, tagData );
+ }
+ return childMap;
+ }
+@@ -671,7 +654,7 @@ WorkerThread::success() const
+ void
+ WorkerThread::run()
+ {
+- m_success = m_reader->parseSongList( m_data );
++ m_success = m_reader->parseSongList( m_data, true );
+ }
+
+ #include "Reader.moc"
+diff --git a/src/core-impl/collections/daap/daapreader/Reader.h b/src/core-impl/collections/daap/daapreader/Reader.h
+index 8f882b8..882d6d2 100644
+--- a/src/core-impl/collections/daap/daapreader/Reader.h
++++ b/src/core-impl/collections/daap/daapreader/Reader.h
+@@ -72,7 +72,7 @@ namespace Daap
+ QString host() const { return m_host; }
+ quint16 port() const { return m_port; }
+
+- bool parseSongList( const QByteArray &data );
++ bool parseSongList( const QByteArray &data, bool set_collection = false);
+ public slots:
+ void logoutRequest(int, bool );
+ void loginHeaderReceived( const QHttpResponseHeader& resp );
+@@ -93,9 +93,10 @@ namespace Daap
+ * @param raw stream of DAAP reply
+ * @param containerLength length of the container (or entire result) being analyzed
+ */
+- static Map parse( QDataStream &raw, uint containerLength, bool first = false );
++ static Map parse( QDataStream &raw);
+ static void addElement( Map &parentMap, char* tag, QVariant element ); //!< supporter function for parse
+ static quint32 getTagAndLength( QDataStream &raw, char tag[5] );
++ static QVariant readTagData(QDataStream &, char[5], quint32);
+ void addTrack( const QString& itemId, const QString& title, const QString& artist, const QString& composer,
+ const QString& commment, const QString& album, const QString& genre, int year,
+ const QString& format, qint32 trackNumber, qint32 songTime );
+--
+1.7.3.4
+
View
2  media-video/arista/Manifest
@@ -1,2 +0,0 @@
-DIST arista-0.9.1.tar.gz 157743 RMD160 c4006dec4a9e6f438fce461c296b766f9b151df0 SHA1 09970b48aba225a2c3f9f49f979d2ed912c87114 SHA256 7c0f3cd39f8d7b3ba28c99b3273a795c4845ac7625fd8e8f00a3e668c11fd166
-EBUILD arista-0.9.1.ebuild 887 RMD160 94933c34028cbff8759ab1a3f1ad9626ce68f88a SHA1 23092b5779c7aaefc33558e55fd1e6c7e3759bcf SHA256 b635f1ca0147ee4f2585ec1dd98d10b651995dac2fe12321481a450d53d27536
View
31 media-video/arista/arista-0.9.1.ebuild
@@ -1,31 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/demjson/demjson-1.1.ebuild,v 1.2 2009/02/15 22:10:38 patrick Exp $
-
-NEED_PYTHON=2.3
-
-inherit distutils
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Userfriendly video transcoding frontend for GStreamer."
-HOMEPAGE="http://programmer-art.org/projects/arista-transcoder"
-SRC_URI="http://launchpad.net/arista/stable/${PV}/+download/${PN}-${PV}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="test"
-
-DEPEND="dev-python/setuptools"
-RDEPEND="dev-python/gconf-python
- dev-python/gst-python
- >=x11-libs/gtk+-2.16
- dev-python/dbus-python
- >=dev-python/pycairo-1.8.2
- dev-python/pygobject
- dev-python/pygtk
- media-plugins/gst-plugins-ffmpeg
- media-libs/gst-plugins-base
- media-libs/gst-plugins-good
- media-libs/gst-plugins-bad
- media-libs/gst-plugins-ugly"
-
View
1  net-libs/libbluedevil/Manifest
@@ -0,0 +1 @@
+EBUILD libbluedevil-9999.ebuild 452 RMD160 27de20f83443c5648811ce3ae61d94bb4d01fe0a SHA1 22e5409466050c4a5bc9be1437822dd26e966ba5 SHA256 1c7bad6f67ff3d1d984f5a22db8c4be1220a069245b980541c4f89854432225f
View
24 net-libs/libbluedevil/libbluedevil-9999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit git kde4-base
+
+DESCRIPTION="A Qt wrapper for bluez used in the KDE bluetooth stack"
+HOMEPAGE="http://gitorious.org/libbluedevil"
+EGIT_REPO_URI="git://gitorious.org/libbluedevil/libbluedevil.git"
+
+LICENSE="GPL-2"
+KEYWORDS=""
+SLOT="4"
+IUSE="debug"
+
+RDEPEND="
+ net-wireless/bluez
+"
+
+src_unpack() {
+ git_src_unpack
+}
View
2  net-print/poster/Manifest
@@ -1,2 +0,0 @@
-DIST poster.tar.bz2 33770 RMD160 f5ba5a4ebeacd04051a682b9285c33f54e311da0 SHA1 cde5d3ba28d444e68cc30573eaa660ea8ef7f16b SHA256 63bd6f01e40e68dda0ac11a4f416c70457bc6bbd254af720b7ea2874875fa4ba
-EBUILD poster-20060221.ebuild 674 RMD160 67978f46e1d6d94e8923f1c14c086ef307d177ac SHA1 d3eb945ac69a83b8053df392c4676df95340201e SHA256 34219d815ac1c38314d6d04b2bd309d0865c7845b4a6baf6767e2d0a50d98d08
View
25 net-print/poster/poster-20060221.ebuild
@@ -1,25 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/poster/poster-20050907.ebuild,v 1.1 2006/08/31 01:20:48 genstef Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="small utility for making a poster from an EPS file or a one-page PS document"
-SRC_URI="ftp://ftp.kde.org/pub/kde/printing/poster.tar.bz2"
-
-HOMEPAGE="http://printing.kde.org/downloads"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~x86"
-SLOT="0"
-IUSE=""
-
-src_compile(){
- $(tc-getCC) ${CFLAGS} ${LDFLAGS} ${PN}.c -lm -o ${PN} || die "compile failed"
-}
-
-src_install() {
- dobin ${PN}
- doman ${PN}.1
- dodoc README ChangeLog
-}
View
1  net-wireless/bluedevil/Manifest
@@ -0,0 +1 @@
+EBUILD bluedevil-9999.ebuild 545 RMD160 3bea75830f37810d018e3b5a6587bf18c277921c SHA1 f6b45e8cc090abe99c9b9e5455cf0dbb24ecf29a SHA256 195031df5eedc693f52d2b68f60f2b3bb60aada0c5656711fbdac28f72725d6f
View
30 net-wireless/bluedevil/bluedevil-9999.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit git kde4-base
+
+DESCRIPTION="Bluetooth stack for KDE"
+HOMEPAGE="http://gitorious.org/bluedevil"
+EGIT_REPO_URI="git://gitorious.org/bluedevil/bluedevil.git"
+
+LICENSE="GPL-3"
+KEYWORDS=""
+SLOT="4"
+IUSE="debug"
+
+DEPEND="
+ net-libs/libbluedevil
+ x11-misc/shared-mime-info
+"
+RDEPEND="${DEPEND}
+ !net-wireless/kbluetooth
+ app-mobilephone/obexd
+ app-mobilephone/obex-data-server
+"
+
+src_unpack() {
+ git_src_unpack
+}
View
2  sci-electronics/gnuradio/Manifest
@@ -3,4 +3,4 @@ DIST gnuradio-3.2.2.tar.gz 6799384 RMD160 42d1a496400ebc77e054f59d9f33cc8ba24a42
DIST gnuradio-3.3.0.tar.gz 6997955 RMD160 ae83bd8a93deaf73d730e2af0d05c9ffc4c98520 SHA1 41d5c177b173ce73404f5fe539b013c82600f73f SHA256 362c939c3225a759f25f5a46eae4e8e3980f1a6f34e5413f3bca8b8719d7b062
EBUILD gnuradio-3.1.3.ebuild 1994 RMD160 d9b9e054424df60296ac106f58430e47e67af9d8 SHA1 d4302b453b371429c87453b03d771198ce3d3892 SHA256 e526ba21431fab36ad02c12486c4f7e5dd3cb6212d526638df4c25333dc3331f
EBUILD gnuradio-3.2.2.ebuild 2574 RMD160 4031a77bfe7369ee4fc0b05c12bd4078ffaccc28 SHA1 afd816b8d75d273ca12e0364b5696b8efe1a6f5c SHA256 b60e6d9b0f755ec0c4b802a1c526d43b0ae2116ebdd2e8c441e2a1ee5ff0ee7f
-EBUILD gnuradio-3.3.0.ebuild 6044 RMD160 4753b8095001f58aad0ed61958b4478ec1216cb3 SHA1 9a22187daa9a9013e0dcac71c2471ceb4e4bf960 SHA256 317f98ffabc32b4ae857b9937fbc40a2fc8b110c43f932c2330d95fb2df97d76
+EBUILD gnuradio-3.3.0.ebuild 6005 RMD160 149304ba295b67fe044d9c46fb3e9e961c01f5df SHA1 57bb2b962e9a3541a1d321266c72e85f0e5c0f38 SHA256 40c1b5b1348ede4a85b503f3783055ea763d9800032570bee6d713c2a5c483ca
View
30 sci-electronics/gnuradio/gnuradio-3.3.0.ebuild
@@ -34,13 +34,11 @@ DEPEND=">=dev-lang/python-2.5
>=app-text/xmlto-0.0.22 )
grc? ( >=dev-python/cheetah-2.0
>=dev-python/lxml-2.0
- >=dev-python/pygtk-2.10 )
+ >=dev-python/pygtk-2.10
+ x11-misc/xdg-utils )
jack? ( media-sound/jack-audio-connection-kit )
portaudio? ( >=media-libs/portaudio-19 )
- qt4? ( dev-python/PyQt4
- x11-libs/qt-core
- x11-libs/qt-gui
- x11-libs/qt-opengl
+ qt4? ( dev-python/PyQt4[opengl,X]
x11-libs/qwt:5
>=x11-libs/qwtplot3d-0.2.6-r2 )
sdl? ( media-libs/libsdl )
@@ -63,12 +61,6 @@ src_prepare() {
}
src_configure() {
- local myconf=""
-
- if ! use sdl ; then
- myconf="$myconf --disable-sdltest"
- fi
-
local boost_ver=$(best_version ">=dev-libs/boost-1.35")
boost_ver=${boost_ver/*boost-/}
@@ -80,11 +72,11 @@ src_configure() {
# PS3 cell support is disabled, change the ebuild if you want it
# usrp2 firmware requires a gcc toolchain for the MicroBlaze arch
econf \
+ --enable-all-components \
--with-boost=/usr/include/boost-${boost_ver} \
--with-boost-libdir=/usr/$(get_libdir)/boost-${boost_ver} \
--enable-gnuradio-core \
- --enable-all-components \
- --disable-option-checking \
+ --enable-gruel \
--disable-gr-audio-windows \
--disable-gr-audio-osx \
--disable-gcell \
@@ -102,7 +94,7 @@ src_configure() {
$(use_enable usrp gr-gpio) \
$(use_enable usrp gr-radar-mono) \
$(use_enable usrp gr-sounder) \
- $(use_enable usrp gr-utils) \
+ $(use usrp && use wxwidgets && echo "--enable-gr-utils" || echo "--disable-gr-utils") \
$(use_enable usrp2) \
$(use_enable usrp2 gr-usrp2) \
$(use_enable jack gr-audio-jack) \
@@ -110,9 +102,9 @@ src_configure() {
$(use_enable portaudio gr-audio-portaudio) \
$(use_enable wxwidgets gr-wxgui) \
$(use_enable sdl gr-video-sdl) \
+ $(use sdl || echo "--disable-sdltest") \
$(use_enable qt4 gr-qtgui) \
- $(use_with qt4 "qwt-incdir=/usr/include/qwt5") \
- $myconf \
+ $(use_with qt4 qwt-incdir /usr/include/qwt5) \
|| die "econf failed"
}
@@ -133,7 +125,7 @@ src_install() {
# *** Post-Install Message ***
# Warning: python could not find the gnuradio module.
# Make sure that /usr/lib64/python2.6/site-packages is in your PYTHONPATH
- export PYTHONPATH="${D}/usr/lib64/python2.6/site-packages:$PYTHONPATH"
+ export PYTHONPATH="${D}/$(python_get_sitedir -b):$PYTHONPATH"
# linking failure without -j1
emake -j1 DESTDIR="${D}" install || die "emake install failed"
@@ -199,9 +191,9 @@ pkg_postrm()
fdo-mime_mime_database_update
for size in ${GRC_ICON_SIZES} ; do
xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
- application-gnuradio-grc || die "icon uninstall failed"
+ application-gnuradio-grc || ewarn "icon uninstall failed"
xdg-icon-resource uninstall --noupdate --context apps --size ${size} \
- gnuradio-grc || die "icon uninstall failed"
+ gnuradio-grc || ewarn "icon uninstall failed"
done
xdg-icon-resource forceupdate

No commit comments for this range

Something went wrong with that request. Please try again.