summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-02-13 11:53:02 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2009-02-13 11:53:02 +0000
commit4b1867b82c85286cfb424435c36434e314f27fa7 (patch)
tree076a8eee37b898568b5a5083e2e2e34ecbd9d692 /media-video
parentRe-add ~arm/~s390/~sh (diff)
downloadgentoo-2-4b1867b82c85286cfb424435c36434e314f27fa7.tar.gz
gentoo-2-4b1867b82c85286cfb424435c36434e314f27fa7.tar.bz2
gentoo-2-4b1867b82c85286cfb424435c36434e314f27fa7.zip
Version bump. Fix deps. Fix doc install. Per bugs #256770 #257142 #258208 #258799.
(Portage version: 2.2_rc23/cvs/Linux i686)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/kmplayer/ChangeLog9
-rw-r--r--media-video/kmplayer/kmplayer-0.11.0a.ebuild (renamed from media-video/kmplayer/kmplayer-0.11.0.ebuild)19
2 files changed, 22 insertions, 6 deletions
diff --git a/media-video/kmplayer/ChangeLog b/media-video/kmplayer/ChangeLog
index 13defa71a625..ae454fab7852 100644
--- a/media-video/kmplayer/ChangeLog
+++ b/media-video/kmplayer/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for media-video/kmplayer
# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/ChangeLog,v 1.117 2009/01/04 15:00:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/ChangeLog,v 1.118 2009/02/13 11:53:02 scarabeus Exp $
+
+*kmplayer-0.11.0a (13 Feb 2009)
+
+ 13 Feb 2009; Tomas Chvatal <scarabeus@gentoo.org> -kmplayer-0.11.0.ebuild,
+ +kmplayer-0.11.0a.ebuild:
+ Version bump. Fix deps. Fix doc install. Per bugs #256770 #257142 #258208
+ #258799.
*kmplayer-0.11.0 (04 Jan 2009)
diff --git a/media-video/kmplayer/kmplayer-0.11.0.ebuild b/media-video/kmplayer/kmplayer-0.11.0a.ebuild
index 085126550e2a..bb41a2c7b542 100644
--- a/media-video/kmplayer/kmplayer-0.11.0.ebuild
+++ b/media-video/kmplayer/kmplayer-0.11.0a.ebuild
@@ -1,10 +1,9 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.11.0.ebuild,v 1.1 2009/01/04 15:00:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.11.0a.ebuild,v 1.1 2009/02/13 11:53:02 scarabeus Exp $
EAPI="2"
-NEED_KDE="4.1"
inherit kde4-base
MY_P="${P/_/-}"
@@ -15,7 +14,7 @@ SRC_URI="http://${PN}.kde.org/pkgs/${MY_P}.tar.bz2"
LICENSE="GPL-2"
KEYWORDS="~amd64 ~x86"
SLOT="4.1"
-IUSE="cairo npp"
+IUSE="cairo htmlhandbook npp"
DEPEND="
>=dev-libs/expat-2.0.1
@@ -34,14 +33,24 @@ S="${WORKDIR}/${MY_P}"
src_prepare() {
# fixup icon install
sed -i \
- -e "s:add_subdirectory(icons):#add_subdirectory(icons):g"\
+ -e "s:add_subdirectory(icons):#add_subdirectory(icons):g" \
CMakeLists.txt || die "removing icons failed"
+ # fixup htmlhandbook
+ if ! use htmlhandbook; then
+ sed -i \
+ -e "s:add_subdirectory(doc):#add_subdirectory(doc):g" \
+ CMakeLists.txt || die "removing docs failed"
+ else
+ # fix the install dir for docs
+ sed -i \
+ -e "s:\${HTML_INSTALL_DIR}:\${HTML_INSTALL_DIR}/${PF}:g" \
+ doc/CMakeLists.txt || die "fixing target dir failed"
+ fi
kde4-base_src_prepare
}
src_configure() {
mycmakeargs="${mycmakeargs}
- -DCMAKE_INSTALL_PREFIX=${KDEDIR}
$(cmake-utils_use_with cairo CAIRO)
$(cmake-utils_use_with npp NPP)"
kde4-base_src_configure