summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-11-07 16:33:31 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-11-07 16:33:31 +0000
commitc02257d971fa2d2386caae176ef93c4c3f501502 (patch)
treeae199c80fc0e9bc7d6f00b87d2fabd3f1198f936 /app-cdr/k3b
parentVersion bumped, bug #290757. (diff)
downloadhistorical-c02257d971fa2d2386caae176ef93c4c3f501502.tar.gz
historical-c02257d971fa2d2386caae176ef93c4c3f501502.tar.bz2
historical-c02257d971fa2d2386caae176ef93c4c3f501502.zip
Missing sys-apps/hal runtime depend wrt #292281, thanks to Alex Efros for reporting.
Package-Manager: portage-2.2_rc48/cvs/Linux x86_64
Diffstat (limited to 'app-cdr/k3b')
-rw-r--r--app-cdr/k3b/ChangeLog7
-rw-r--r--app-cdr/k3b/Manifest17
-rw-r--r--app-cdr/k3b/files/k3b-1.66.0_alpha2-fix-musepack-lib-detection.patch13
-rw-r--r--app-cdr/k3b/k3b-1.66.0_alpha2-r1.ebuild104
-rw-r--r--app-cdr/k3b/k3b-1.68.0_alpha3.ebuild3
5 files changed, 10 insertions, 134 deletions
diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index a05f30c0324c..ce17a4d16bba 100644
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-cdr/k3b
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.234 2009/11/04 13:58:24 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.235 2009/11/07 16:33:29 ssuominen Exp $
+
+ 07 Nov 2009; Samuli Suominen <ssuominen@gentoo.org>
+ k3b-1.68.0_alpha3.ebuild:
+ Missing sys-apps/hal runtime depend wrt #292281, thanks to Alex Efros for
+ reporting.
04 Nov 2009; Markus Meier <maekke@gentoo.org> k3b-1.68.0_alpha3.ebuild:
amd64/x86 stable, bug #291606
diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest
index 32e70ecce22b..65a63f4e4d2a 100644
--- a/app-cdr/k3b/Manifest
+++ b/app-cdr/k3b/Manifest
@@ -1,26 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX k3b-1.0.5-desktop-entry.diff 1756 RMD160 540b5336fde1206eba74ac25a4fd0276978ad9c6 SHA1 d817a1da34cc6207a1d5fcac0d5ba67a3964afc0 SHA256 3d89ee4194abe8312e7373161bac8b9134850906be9c6e738571f9de7adfb34b
AUX k3b-1.0.5-ffmpeg-0.4.9_p20080326-API.patch 2991 RMD160 8d0204a12cfe1eabe03e66b6201e2164f01cd80d SHA1 6bab88b9e4619a7f61b82c6e59af9a7ef784f71b SHA256 e2db198914acbda0c33c20537449cf7b729345f9d8af0052701259de0b27ff21
AUX k3b-1.0.5-ffmpeg-0.4.9_p20081014-API.patch 1049 RMD160 022fecbc707775adc782b828bfdd571eccb95936 SHA1 270f19b05ce7ca35aee0dd7009556fec9b66f90c SHA256 e99f6b309e6c20d085860c495c2aa9d34d6d69a864e0be11aac01e0b3a6ac67d
AUX k3b-1.0.5-libmpcdecsv7.patch 1452 RMD160 a471ea325226e5ced0c84d6a9ea1f27dcbc21e17 SHA1 6f09c5a943416d1652f6a5ffa7bb99d3ee576dba SHA256 7c9061027d7c49f637d768b4a45039f0a653895929e35c16ea04a5da936f75a7
AUX k3b-1.0.5-transcode-1.1.patch 1097 RMD160 08fcc3769803a400bc5d00be223b9f37fdc7e7d0 SHA1 68547f4e312dc30c6440bed126a4408716b78e13 SHA256 8317afcf5e26dd5195065f2eb3b062e41804c46afe9d3c906012dee6249290f4
-AUX k3b-1.66.0_alpha2-fix-musepack-lib-detection.patch 493 RMD160 146162f40fffe127ae29ce215aa15d0fc76eed16 SHA1 307d466477ab0a367322ebd7f3592de6b9815e76 SHA256 b99be0f50afcf779b46af5b5e17f9716fb1e61127b42eb5cebd022921a2342b0
AUX k3b-1.68.0_alpha3-missing_ifdef.patch 422 RMD160 6f56c7aea78c3d4484238cfd8332af1a24660f3c SHA1 10a969b93ec053c89b9f30c139fcb8c1a69bf2d3 SHA256 f871eee6c54e5bae3d7e62cfb8dd65ac6f6b3c5f4427465beacb96afd4182692
DIST k3b-1.0.5.tar.bz2 5113060 RMD160 b562746015cc2e4226652402725b4e69eb846822 SHA1 c45d6f2a36b1bc7ea14101d444149c40fd4b700e SHA256 d4f9799f234ade98b7e417d1493de3bd4a44fd937e813c2beb29eba02cda50df
-DIST k3b-1.66.0alpha2.tar.bz2 3865548 RMD160 dd1a11bb91a3af1138d74728decbf638401bd884 SHA1 d17ec5743a6f913b7a5cf14b08593844d858fc7e SHA256 2f66ccae344d832c8522a88d6aede2b73e694c9fe1fe87610c0ff0a76f08671d
DIST k3b-1.68.0alpha3.tar.bz2 3899288 RMD160 a2c3d6e45834f8403236ac857920f60973e07a1f SHA1 014d7de53d497a8cd6068f42bd2cccf23a36ad9a SHA256 6fd3b3b25c89236001b30609777007517a6e4c67c8ccded71373a3165e770629
DIST k3b-i18n-1.0.5.tar.bz2 7732137 RMD160 6f08c6851da5d25ed4b2ead4ad0c4073ba94e246 SHA1 8697c0f0a9fa458895519a5d94c50120333a71c8 SHA256 068b170cd63c97263d21165b7b5106a8176f2499a1ebcec9baa68b7628395767
EBUILD k3b-1.0.5-r6.ebuild 3877 RMD160 eda4811891f7619cfad475607f7c1f0e9c299618 SHA1 58516242c2d108de9467b85b5160c54cbda9f83d SHA256 0915c4678cf844438d11b70ff86664dc488bba966c93345364bc855554c086f2
-EBUILD k3b-1.66.0_alpha2-r1.ebuild 3072 RMD160 60154c9c1c3565e0f4b9e75741747f5175c9887c SHA1 74ae95bacdadd74e17e8ea6ef47564227b7cb79d SHA256 b70d1e34d8329f1cee517ed26054d39b862d2cfc998daa128eff61cea63bb3eb
-EBUILD k3b-1.68.0_alpha3.ebuild 2847 RMD160 d6ffe173a4c47e5d1ea5ec4fc883f69889cacf80 SHA1 ff6a6aa561bd290456d34d593bc77743d8b1a0d6 SHA256 20c31c255094837bac126d12cfd82331139b176e4f64ccdc02cfeed335cbd06f
-MISC ChangeLog 34220 RMD160 45cc61f6ab91fc157181208a554d447e0abfbbd4 SHA1 f9ed53048ffd443062a41d0b37700e4f62ca5751 SHA256 19faa6f095306f6ec15b6ec27e45c2a148a75db57487d7db0cb6df35d17a82fd
+EBUILD k3b-1.68.0_alpha3.ebuild 2864 RMD160 f3d9d9def0bd668487ab4208f63847ac74bc3297 SHA1 54d75af965a4b56e571d7b3fd430b2d8952e0da5 SHA256 cf97aa1855c2effaf288b19a1595df85ac7bc6f9870c368e5d30d8d0ab0feade
+MISC ChangeLog 34395 RMD160 58233d8841a6d2d3470b986310b61dd8335553b2 SHA1 4736b228723458426cf6d8a6c8770fcf0fec4be3 SHA256 fa56bf2c91080aa8a22d8f9976a1f9f9cf87328444f1f1efc18ff1d97ef3174d
MISC metadata.xml 328 RMD160 5b743e23199d1fe9055c726d7d177ee0e2f7e915 SHA1 73b1368091e675957fe43af4c9ce71b6049def16 SHA256 c7ade5871825684e83ad0a4126a78df11f40cfb6d7ac6578c8b65f3491ef01a0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrxiJUACgkQkKaRLQcq0GIYUwCdEo8NPognQ9jgFpzR5HA0O4px
-S6kAmwcukeXuo8Cktou7eSVAMacsdQrY
-=dJrC
------END PGP SIGNATURE-----
diff --git a/app-cdr/k3b/files/k3b-1.66.0_alpha2-fix-musepack-lib-detection.patch b/app-cdr/k3b/files/k3b-1.66.0_alpha2-fix-musepack-lib-detection.patch
deleted file mode 100644
index ba10ae272501..000000000000
--- a/app-cdr/k3b/files/k3b-1.66.0_alpha2-fix-musepack-lib-detection.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- k3b-1.66.0.orig/cmake/modules/FindMuse.cmake
-+++ k3b-1.66.0/cmake/modules/FindMuse.cmake
-@@ -20,8 +20,8 @@ FIND_PATH(MUSE_INCLUDE_DIR NAMES mpcdec/
- )
-
- if(MUSE_INCLUDE_DIR)
-- FIND_LIBRARY(MUSE_LIBRARIES NAMES mpcdec)
-- set(MPC_HEADER_FILE "<mpcdec/mpcdec.h>")
-+ FIND_LIBRARY(MUSE_LIBRARIES NAMES mpcdecsv7 )
-+ set(MPC_HEADER_FILE "<mpcdecsv7/mpcdec.h>")
- else(MUSE_INCLUDE_DIR)
- FIND_PATH(MUSE_INCLUDE_DIR NAMES musepack/musepack.h)
- set(MPC_HEADER_FILE "<musepack/musepack.h>")
diff --git a/app-cdr/k3b/k3b-1.66.0_alpha2-r1.ebuild b/app-cdr/k3b/k3b-1.66.0_alpha2-r1.ebuild
deleted file mode 100644
index 1bccedc0cd66..000000000000
--- a/app-cdr/k3b/k3b-1.66.0_alpha2-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.66.0_alpha2-r1.ebuild,v 1.2 2009/08/26 07:14:57 wired Exp $
-
-EAPI="2"
-
-WEBKIT_REQUIRED="always"
-inherit kde4-base
-
-MY_P="${P/_/}"
-DESCRIPTION="K3b, KDE CD Writing Software"
-HOMEPAGE="http://www.k3b.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug dvd emovix encode ffmpeg flac mad lame musicbrainz musepack sndfile sox taglib vcd vorbis +wav"
-
-DEPEND="
- >=kde-base/libkcddb-${KDE_MINIMAL}
- media-libs/libsamplerate
- >=x11-libs/qt-gui-4.5.0
- dvd? ( media-libs/libdvdread )
- ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080206 )
- flac? ( >=media-libs/flac-1.2.1-r2[cxx] )
- encode? (
- lame? ( media-sound/lame )
- )
- mad? ( media-libs/libmad )
- musepack? ( media-libs/libmpcdecsv7 )
- musicbrainz? ( media-libs/musicbrainz:1 )
- sndfile? ( media-libs/libsndfile )
- taglib? ( >=media-libs/taglib-1.5 )
- vorbis? ( media-libs/libvorbis )
-"
-RDEPEND="${DEPEND}
- >=app-cdr/cdrdao-1.1.7-r3
- >=media-sound/cdparanoia-3.9.8
- virtual/cdrtools
- dvd? (
- >=app-cdr/dvd+rw-tools-7.0
- encode? ( media-video/transcode[dvd] )
- )
- emovix? ( media-video/emovix )
- encode? (
- sox? ( media-sound/sox )
- )
- vcd? ( media-video/vcdimager )
- !app-cdr/k3b:0
- !app-cdr/k3b:2
-"
-
-DOCS="FAQ KNOWNBUGS PERMISSIONS"
-
-S="${WORKDIR}"/"${P/_*/}"
-
-# Fix musepack support, libmpcsv7 needed
-PATCHES=( "${FILESDIR}/${P}-fix-musepack-lib-detection.patch" )
-
-src_configure() {
- # Common settings
- mycmakeargs="${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)"
-
- # Encoder settings
- if use encode; then
- mycmakeargs="${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-1.68.0_alpha3.ebuild b/app-cdr/k3b/k3b-1.68.0_alpha3.ebuild
index 7571211226cd..9eae06df6e70 100644
--- a/app-cdr/k3b/k3b-1.68.0_alpha3.ebuild
+++ b/app-cdr/k3b/k3b-1.68.0_alpha3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.68.0_alpha3.ebuild,v 1.4 2009/11/04 13:58:24 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.68.0_alpha3.ebuild,v 1.5 2009/11/07 16:33:30 ssuominen Exp $
EAPI=2
WEBKIT_REQUIRED=always
@@ -29,6 +29,7 @@ DEPEND=">=kde-base/libkcddb-${KDE_MINIMAL}
taglib? ( >=media-libs/taglib-1.5 )
vorbis? ( media-libs/libvorbis )"
RDEPEND="${DEPEND}
+ sys-apps/hal
app-cdr/cdrdao
media-sound/cdparanoia
virtual/cdrtools