From 9b86a7933333884a320548a8c3c54f5a2199555b Mon Sep 17 00:00:00 2001 From: Dror Levin Date: Wed, 26 Jan 2011 20:27:36 +0000 Subject: Add hal USE flag, bug 351883. Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64 --- app-cdr/k3b/ChangeLog | 8 ++- app-cdr/k3b/Manifest | 18 ++++++- app-cdr/k3b/k3b-2.0.2-r1.ebuild | 110 ++++++++++++++++++++++++++++++++++++++++ app-cdr/k3b/k3b-2.0.2.ebuild | 108 --------------------------------------- 4 files changed, 133 insertions(+), 111 deletions(-) create mode 100644 app-cdr/k3b/k3b-2.0.2-r1.ebuild delete mode 100644 app-cdr/k3b/k3b-2.0.2.ebuild (limited to 'app-cdr') diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog index 1aa0f3d4cd78..fa8aa72e0e4e 100644 --- a/app-cdr/k3b/ChangeLog +++ b/app-cdr/k3b/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-cdr/k3b # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.258 2011/01/19 12:56:29 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.259 2011/01/26 20:27:36 spatz Exp $ + +*k3b-2.0.2-r1 (26 Jan 2011) + + 26 Jan 2011; Dror Levin -k3b-2.0.2.ebuild, + +k3b-2.0.2-r1.ebuild: + Add hal USE flag, bug 351883. 19 Jan 2011; Tomáš Chvátal -k3b-2.0.0.ebuild, k3b-2.0.1-r1.ebuild, k3b-2.0.2.ebuild: diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest index 9c1dfbde8900..96d2c5d1773b 100644 --- a/app-cdr/k3b/Manifest +++ b/app-cdr/k3b/Manifest @@ -1,7 +1,21 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA512 + AUX 2.0.1-fix-crash-with-qt-4.7.0.patch 1522 RMD160 233a6b498819e749026b5508a63bfaff04556ed6 SHA1 0bd7e4bffca51f6046956141fdd192acf4b65d6c SHA256 5316bdee44a0569b9fd62299268673c77ae7ab4330dde50103f19215b89a76e6 DIST k3b-2.0.1.tar.bz2 12269204 RMD160 8f85510c65a0da305b3a7c06ac0dd88e0631e66f SHA1 44da8d11b36945aeb9495c9150d8227fa906d6c2 SHA256 8631460e617833a1f907145271ae4e3224c53e391339f273d2bd340c451ccdb7 DIST k3b-2.0.2.tar.bz2 12833321 RMD160 a0289eb9ccec9607c2bdac3fc7c69102eec5ee40 SHA1 8b30a4d07942e82559b01bc07dea6bcf2defd532 SHA256 af176f29c1d2339c4648d461476227cb07bcd0c75056f2a4006f253e3ef5b7cd EBUILD k3b-2.0.1-r1.ebuild 3311 RMD160 fd37dc8e6ca26facdad3870a12d37a0d1365cc2d SHA1 7ace1de8d20670c211618edd2d3843eceb4179a0 SHA256 c469665212ad1e0bc43cc3ffbb03a6f99231557f10cda5faeb75a030a5c538bf -EBUILD k3b-2.0.2.ebuild 3233 RMD160 87db728250668f6533dc073ec058aca70f9d96bb SHA1 6ae67f98a95b8aec79e32333b2b0f70cb0e58290 SHA256 e9edda5468bea4d4354e0c55fdcea1e5381af849e2a6effcac74f1e5ea6ea9de -MISC ChangeLog 37492 RMD160 fce1dcdeb4a96dcdf0da6eb382411c20e4089381 SHA1 3ce9e60fce4daa6c841e9b9065c1afc0396d5475 SHA256 f6d47b548c1c0ae115612fb51f2105c0901d1f544e3225120e52ec880590e2e2 +EBUILD k3b-2.0.2-r1.ebuild 3307 RMD160 6de03e823e2637edfed8a7db70db3e1334f2f2e5 SHA1 58e59c3f1815cd9bc64e9fda3e185c25d9c77835 SHA256 97d7345cb56088f649a0d817fde7926d167b48b6164c127e601f81cc8e58a53f +MISC ChangeLog 37638 RMD160 66eea27afa541e70aca8ad52ce83eaaf394d6d4e SHA1 3c04f20abe430a9bbc137f31818987fab59b88be SHA256 a9bc2ccdd72d0109cda06abb80306f59412e48e7eac29e0364694f926f72011e MISC metadata.xml 328 RMD160 5b743e23199d1fe9055c726d7d177ee0e2f7e915 SHA1 73b1368091e675957fe43af4c9ce71b6049def16 SHA256 c7ade5871825684e83ad0a4126a78df11f40cfb6d7ac6578c8b65f3491ef01a0 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iQEcBAEBCgAGBQJNQIPAAAoJEAWF714uGAc6zqwH/isWwhU7mRkvpO0u4O4A13IS +mCzSF3rPzKAWirmW0bKLO2KDIbZEnUvfXwgGk/VyvoZl8AtKaKOjtLIi/gK6Z+bA +KqGlapFiZQYFeQWFb0L+9RLR2yl8x794I44hZuoU1+R4Z6VK0qVxcIYIYgicC1YR +ND5j0ZyCBDKocIW1P9l7DUQ4cc/auK35PGZ+CVnc9ZH9ZH8+7woFrorbBYTjIHF6 +lOK78ROmgiALmFO5sprZ3cmNJ1xFqxH3e3c57PbnnfEZSm++STXLNwuNPuWNLu9j +4jympFvYwg4Z846hbgtfmdQAAzjYPzFFzJ8f7L6+mTzWpNo8in5EVDsEPvQkoT4= +=7GJN +-----END PGP SIGNATURE----- diff --git a/app-cdr/k3b/k3b-2.0.2-r1.ebuild b/app-cdr/k3b/k3b-2.0.2-r1.ebuild new file mode 100644 index 000000000000..f369086cbe3b --- /dev/null +++ b/app-cdr/k3b/k3b-2.0.2-r1.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-2.0.2-r1.ebuild,v 1.1 2011/01/26 20:27:36 spatz Exp $ + +EAPI=3 + +MULTIMEDIA_REQUIRED=always +WEBKIT_REQUIRED=always +KMNAME="extragear/multimedia" + +# Translations are only in the tarballs, not in the svn repo +if [[ ${PV} != *9999* ]]; then + KDE_LINGUAS="ast be bg ca ca@valencia cs csb da de el en_GB eo es et eu fi fr ga + gl he hi hne hr hu is it ja km ko ku lt mai nb nds nl nn oc pa pl pt pt_BR ro ru + se sk sl sv th tr uk zh_CN zh_TW" + + SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.bz2" + + DOCS=( FAQ PERMISSIONS README RELEASE_HOWTO ) + + S=${WORKDIR}/${P/_*} +else + DOCS=( FAQ.txt PERMISSIONS.txt README.txt ) +fi + +inherit kde4-base + +DESCRIPTION="The CD/DVD Kreator for KDE" +HOMEPAGE="http://www.k3b.org/" + +LICENSE="GPL-2 FDL-1.2" +SLOT="4" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="debug dvd emovix encode ffmpeg flac hal lame mad musepack musicbrainz sndfile sox taglib vcd vorbis +wav" + +DEPEND=" + $(add_kdebase_dep libkcddb) + media-libs/libsamplerate + dvd? ( media-libs/libdvdread ) + ffmpeg? ( >=media-video/ffmpeg-0.5 ) + flac? ( >=media-libs/flac-1.2[cxx] ) + encode? ( lame? ( media-sound/lame ) ) + mad? ( media-libs/libmad ) + musepack? ( >=media-sound/musepack-tools-444 ) + musicbrainz? ( media-libs/musicbrainz:1 ) + sndfile? ( media-libs/libsndfile ) + taglib? ( >=media-libs/taglib-1.5 ) + vorbis? ( media-libs/libvorbis ) +" +RDEPEND="${DEPEND} + app-cdr/cdrdao + media-sound/cdparanoia + hal? ( sys-apps/hal ) + virtual/cdrtools + dvd? ( + >=app-cdr/dvd+rw-tools-7 + encode? ( media-video/transcode[dvd] ) + ) + emovix? ( media-video/emovix ) + encode? ( sox? ( media-sound/sox ) ) + vcd? ( media-video/vcdimager ) +" + +DOCS+=( ChangeLog ) + +src_configure() { + mycmakeargs=( + -DK3B_BUILD_K3BSETUP=OFF + $(cmake-utils_use debug K3B_DEBUG) + $(cmake-utils_use hal K3B_ENABLE_HAL_SUPPORT) + $(cmake-utils_use musicbrainz K3B_ENABLE_MUSICBRAINZ) + $(cmake-utils_use dvd K3B_ENABLE_DVD_RIPPING) + $(cmake-utils_use taglib K3B_ENABLE_TAGLIB) + -DK3B_BUILD_API_DOCS=OFF + $(cmake-utils_use ffmpeg K3B_BUILD_FFMPEG_DECODER_PLUGIN) + $(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_DECODER_PLUGIN) + $(cmake-utils_use mad K3B_BUILD_MAD_DECODER_PLUGIN) + $(cmake-utils_use musepack K3B_BUILD_MUSE_DECODER_PLUGIN) + $(cmake-utils_use flac K3B_BUILD_FLAC_DECODER_PLUGIN) + $(cmake-utils_use sndfile K3B_BUILD_SNDFILE_DECODER_PLUGIN) + $(cmake-utils_use wav K3B_BUILD_WAVE_DECODER_PLUGIN) + $(cmake-utils_use encode K3B_BUILD_EXTERNAL_ENCODER_PLUGIN) + ) + + if use encode; then + mycmakeargs+=( + $(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_ENCODER_PLUGIN) + $(cmake-utils_use lame K3B_BUILD_LAME_ENCODER_PLUGIN) + $(cmake-utils_use sox K3B_BUILD_SOX_ENCODER_PLUGIN) + ) + fi + + kde4-base_src_configure +} + +pkg_postinst() { + kde4-base_pkg_postinst + + echo + elog "We don't install k3bsetup anymore because Gentoo doesn't need it." + elog "If you get warnings on start-up, uncheck the \"Check system" + elog "configuration\" option in the \"Misc\" settings window." + echo + + local group=cdrom + use kernel_linux || group=operator + elog "Make sure you have proper read/write permissions on the cdrom device(s)." + elog "Usually, it is sufficient to be in the ${group} group." + echo +} diff --git a/app-cdr/k3b/k3b-2.0.2.ebuild b/app-cdr/k3b/k3b-2.0.2.ebuild deleted file mode 100644 index b79e391235c8..000000000000 --- a/app-cdr/k3b/k3b-2.0.2.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-2.0.2.ebuild,v 1.2 2011/01/19 12:56:29 scarabeus Exp $ - -EAPI=3 - -MULTIMEDIA_REQUIRED=always -WEBKIT_REQUIRED=always -KMNAME="extragear/multimedia" - -# Translations are only in the tarballs, not in the svn repo -if [[ ${PV} != *9999* ]]; then - KDE_LINGUAS="ast be bg ca ca@valencia cs csb da de el en_GB eo es et eu fi fr ga - gl he hi hne hr hu is it ja km ko ku lt mai nb nds nl nn oc pa pl pt pt_BR ro ru - se sk sl sv th tr uk zh_CN zh_TW" - - SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.bz2" - - DOCS=( FAQ PERMISSIONS README RELEASE_HOWTO ) - - S=${WORKDIR}/${P/_*} -else - DOCS=( FAQ.txt PERMISSIONS.txt README.txt ) -fi - -inherit kde4-base - -DESCRIPTION="The CD/DVD Kreator for KDE" -HOMEPAGE="http://www.k3b.org/" - -LICENSE="GPL-2 FDL-1.2" -SLOT="4" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="debug dvd emovix encode ffmpeg flac mad lame musepack musicbrainz sndfile sox taglib vcd vorbis +wav" - -DEPEND=" - $(add_kdebase_dep libkcddb) - media-libs/libsamplerate - dvd? ( media-libs/libdvdread ) - ffmpeg? ( >=media-video/ffmpeg-0.5 ) - flac? ( >=media-libs/flac-1.2[cxx] ) - encode? ( lame? ( media-sound/lame ) ) - mad? ( media-libs/libmad ) - musepack? ( >=media-sound/musepack-tools-444 ) - musicbrainz? ( media-libs/musicbrainz:1 ) - sndfile? ( media-libs/libsndfile ) - taglib? ( >=media-libs/taglib-1.5 ) - vorbis? ( media-libs/libvorbis ) -" -RDEPEND="${DEPEND} - app-cdr/cdrdao - media-sound/cdparanoia - virtual/cdrtools - dvd? ( - >=app-cdr/dvd+rw-tools-7 - encode? ( media-video/transcode[dvd] ) - ) - emovix? ( media-video/emovix ) - encode? ( sox? ( media-sound/sox ) ) - vcd? ( media-video/vcdimager ) -" - -DOCS+=( ChangeLog ) - -src_configure() { - mycmakeargs=( - -DK3B_BUILD_K3BSETUP=OFF - $(cmake-utils_use debug K3B_DEBUG) - $(cmake-utils_use musicbrainz K3B_ENABLE_MUSICBRAINZ) - $(cmake-utils_use dvd K3B_ENABLE_DVD_RIPPING) - $(cmake-utils_use taglib K3B_ENABLE_TAGLIB) - -DK3B_BUILD_API_DOCS=OFF - $(cmake-utils_use ffmpeg K3B_BUILD_FFMPEG_DECODER_PLUGIN) - $(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_DECODER_PLUGIN) - $(cmake-utils_use mad K3B_BUILD_MAD_DECODER_PLUGIN) - $(cmake-utils_use musepack K3B_BUILD_MUSE_DECODER_PLUGIN) - $(cmake-utils_use flac K3B_BUILD_FLAC_DECODER_PLUGIN) - $(cmake-utils_use sndfile K3B_BUILD_SNDFILE_DECODER_PLUGIN) - $(cmake-utils_use wav K3B_BUILD_WAVE_DECODER_PLUGIN) - $(cmake-utils_use encode K3B_BUILD_EXTERNAL_ENCODER_PLUGIN) - ) - - if use encode; then - mycmakeargs+=( - $(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_ENCODER_PLUGIN) - $(cmake-utils_use lame K3B_BUILD_LAME_ENCODER_PLUGIN) - $(cmake-utils_use sox K3B_BUILD_SOX_ENCODER_PLUGIN) - ) - fi - - kde4-base_src_configure -} - -pkg_postinst() { - kde4-base_pkg_postinst - - echo - elog "We don't install k3bsetup anymore because Gentoo doesn't need it." - elog "If you get warnings on start-up, uncheck the \"Check system" - elog "configuration\" option in the \"Misc\" settings window." - echo - - local group=cdrom - use kernel_linux || group=operator - elog "Make sure you have proper read/write permissions on the cdrom device(s)." - elog "Usually, it is sufficient to be in the ${group} group." - echo -} -- cgit v1.2.3-65-gdbad