From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1S7nDy-000675-5D for garchives@archives.gentoo.org; Wed, 14 Mar 2012 12:22:38 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 53370E085C; Wed, 14 Mar 2012 12:22:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1184DE085C for ; Wed, 14 Mar 2012 12:22:30 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 12F611B41D5 for ; Wed, 14 Mar 2012 12:22:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id CAF9CE5402 for ; Wed, 14 Mar 2012 12:22:28 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1331727567.dee162f9d57aed80534d3b18682fa1e03df26634.kensington@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: media-sound/kajammer/, media-sound/kajammer/files/ X-VCS-Repository: proj/qt X-VCS-Files: media-sound/kajammer/Manifest media-sound/kajammer/files/kajammer-0.9.3-desktopfile.patch media-sound/kajammer/files/kajammer-0.9.3-gentoo.patch media-sound/kajammer/files/kajammer-0.9.3-underlinking.patch media-sound/kajammer/kajammer-0.9.2.2.ebuild media-sound/kajammer/kajammer-0.9.3.ebuild X-VCS-Directories: media-sound/kajammer/ media-sound/kajammer/files/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: dee162f9d57aed80534d3b18682fa1e03df26634 X-VCS-Branch: master Date: Wed, 14 Mar 2012 12:22:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 9a58d6ad-7ea7-4c81-8f59-83ea12647df0 X-Archives-Hash: 3b4c92bdf963fc63c8f559b68b6dd78b commit: dee162f9d57aed80534d3b18682fa1e03df26634 Author: Michael Palimaka astralcloak net> AuthorDate: Wed Mar 14 12:19:27 2012 +0000 Commit: Michael Palimaka astralcloak net> CommitDate: Wed Mar 14 12:19:27 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/qt.git;a=3Dco= mmit;h=3Ddee162f9 [media-sound/kajammer] Version bump for bug #403125 (Portage version: 2.1.10.49/git/Linux x86_64, unsigned Manifest commit) --- media-sound/kajammer/Manifest | 2 +- .../files/kajammer-0.9.3-desktopfile.patch | 18 +++++++++++++ .../kajammer/files/kajammer-0.9.3-gentoo.patch | 19 ++++++++++++++ .../files/kajammer-0.9.3-underlinking.patch | 10 +++++++ ...jammer-0.9.2.2.ebuild =3D> kajammer-0.9.3.ebuild} | 27 +++++++++---= ------- 5 files changed, 61 insertions(+), 15 deletions(-) diff --git a/media-sound/kajammer/Manifest b/media-sound/kajammer/Manifes= t index 5eb435a..86cfcc3 100644 --- a/media-sound/kajammer/Manifest +++ b/media-sound/kajammer/Manifest @@ -1 +1 @@ -DIST kajammer-0.9.2.2-1.tar.gz 57244 RMD160 84c769beb0367804b140ca879d77= a3a3ada32be5 SHA1 73bc164e6d45d32039d5cb414a1a0c4a132a7e74 SHA256 351e7c9= 701f1a810ae3515b38ef061599563f7ff4b6dd8308e0832add4599117 +DIST kajammer-0.9.3.tar.gz 59734 SHA256 33e1fb968ce92ae4da3d274a43f5af22= a96cca49b7589deb8235fb2b15d71584 SHA512 ec4eee34b005734ee681893df10a4cd3b= fae0182659296544a29d947a422005c9a6c2078ba490bb9ba1c81ccee5721de1326a061ad= abe6760dffeac78488a12e WHIRLPOOL 0e8a03fa1dd2e50105ddf4913bae9499bff7f1a2= 4e2a97a343b833f3ae497b91edd0046e52a3e240f5a2050ead650e9812cd6c6d926de110e= dbfbb6d4feebe76 diff --git a/media-sound/kajammer/files/kajammer-0.9.3-desktopfile.patch = b/media-sound/kajammer/files/kajammer-0.9.3-desktopfile.patch new file mode 100644 index 0000000..d3f3671 --- /dev/null +++ b/media-sound/kajammer/files/kajammer-0.9.3-desktopfile.patch @@ -0,0 +1,18 @@ +--- res/kajammer.desktop ++++ res/kajammer.desktop +@@ -1,12 +1,11 @@ + [Desktop Entry] + Type=3DApplication + Version=3D1.0 +-Encoding=3DUTF-8 + Name=3DKajammer +-Generic Name=3DAudio Player ++GenericName=3DAudio Player + Comment=3DMusic Player + Icon=3D/usr/share/icons/kajammer.png + Exec=3Dkajammer + Terminal=3Dfalse +-MimeType=3Dapplication/ogg;application/x-ogg;audio/aac;audio/x-aac;audi= o/m4a;audio/x-m4a;audio/mp3;audio/x-mp3;audio/wav;audio/x-wav;audio/x-vor= bis+ogg;application/ogg;audio/ogg; +-Categories=3DQt;KDE;AudioVideo;Audio;Player ++MimeType=3Dapplication/ogg;application/x-ogg;audio/aac;audio/x-aac;audi= o/m4a;audio/x-m4a;audio/mp3;audio/x-mp3;audio/wav;audio/x-wav;audio/x-vor= bis+ogg;audio/ogg; ++Categories=3DQt;KDE;AudioVideo;Audio;Player; diff --git a/media-sound/kajammer/files/kajammer-0.9.3-gentoo.patch b/med= ia-sound/kajammer/files/kajammer-0.9.3-gentoo.patch new file mode 100644 index 0000000..74cc688 --- /dev/null +++ b/media-sound/kajammer/files/kajammer-0.9.3-gentoo.patch @@ -0,0 +1,19 @@ +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -2,7 +2,7 @@ + PROJECT( kajammer ) +=20 + SET( CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMake ) +-SET(CMAKE_CXX_FLAGS "-g -Wall") ++SET(CMAKE_CXX_FLAGS "-Wall") +=20 + FIND_PACKAGE( Qt4 REQUIRED ) + FIND_PACKAGE( Phonon REQUIRED ) +@@ -90,6 +90,6 @@ + ) +=20 + INSTALL(TARGETS kajammer DESTINATION /usr/bin) +-INSTALL(FILES res/kajammer.png DESTINATION /usr/share/icons) ++INSTALL(FILES res/kajammer.png DESTINATION /usr/share/pixmaps) + INSTALL(FILES res/kajammer.desktop DESTINATION /usr/share/applications) +=20 diff --git a/media-sound/kajammer/files/kajammer-0.9.3-underlinking.patch= b/media-sound/kajammer/files/kajammer-0.9.3-underlinking.patch new file mode 100644 index 0000000..a8d2a9b --- /dev/null +++ b/media-sound/kajammer/files/kajammer-0.9.3-underlinking.patch @@ -0,0 +1,10 @@ +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -82,6 +83,7 @@ + kajammer + ${QT_LIBRARIES} + ${QT_GUI_LIBRARIES} ++ ${QT_QTNETWORK_LIBRARY} + ${Phonon_LIBRARY} + ${Kajamtag_LIB} + ${LastFM_LIB} diff --git a/media-sound/kajammer/kajammer-0.9.2.2.ebuild b/media-sound/k= ajammer/kajammer-0.9.3.ebuild similarity index 51% rename from media-sound/kajammer/kajammer-0.9.2.2.ebuild rename to media-sound/kajammer/kajammer-0.9.3.ebuild index 4809d9b..e51a41c 100644 --- a/media-sound/kajammer/kajammer-0.9.2.2.ebuild +++ b/media-sound/kajammer/kajammer-0.9.3.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ =20 -EAPI=3D"2" +EAPI=3D4 =20 -inherit cmake-utils +inherit eutils cmake-utils =20 DESCRIPTION=3D"Simple Qt audio player" HOMEPAGE=3D"http://sourceforge.net/projects/kajammer/" -SRC_URI=3D"mirror://sourceforge/${PN}/${P}-1.tar.gz" +SRC_URI=3D"mirror://sourceforge/${PN}/${P}.tar.gz" =20 LICENSE=3D"GPL-3" SLOT=3D"0" @@ -22,18 +22,17 @@ DEPEND=3D"x11-libs/qt-core:4 lastfm? ( media-libs/liblastfm )" RDEPEND=3D"${DEPEND}" =20 +DOCS=3D"Changelog README" + src_prepare() { - sed -i -e 's:/usr/share/icons:/usr/share/pixmaps:' \ - CMakeLists.txt || die "sed failed" + epatch "${FILESDIR}"/${P}-underlinking.patch + epatch "${FILESDIR}"/${P}-desktopfile.patch + epatch "${FILESDIR}"/${P}-gentoo.patch =20 - if ! use lastfm; then + if ! use lastfm ; then # avoid automagic dep - sed -i -e '/FIND_PACKAGE( LastFM )/d' CMakeLists.txt || die "sed faile= d" + sed -i -e '/FIND_PACKAGE( LastFM )/d' \ + -e '/^FIND_PATH( HAVE_LASTFM_H/d' \ + CMakeLists.txt || die "sed failed" fi } - -src_install() { - cmake-utils_src_install - - dodoc Changelog README || die -}