summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2013-06-16 09:05:33 +0000
committerPacho Ramos <pacho@gentoo.org>2013-06-16 09:05:33 +0000
commitd589d4fcbfe0bdaefd3a1bca012eef934b4e97bb (patch)
tree1f03f365907ad40681370451ad0d4809ee2b0925 /app-office/multitalk
parentppc ppc64 stable : bug #471912 (diff)
downloadgentoo-2-d589d4fcbfe0bdaefd3a1bca012eef934b4e97bb.tar.gz
gentoo-2-d589d4fcbfe0bdaefd3a1bca012eef934b4e97bb.tar.bz2
gentoo-2-d589d4fcbfe0bdaefd3a1bca012eef934b4e97bb.zip
Allow media-gfx/graphicsmagick[imagemagick] (#314225 by Wojciech Porczyk)
(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'app-office/multitalk')
-rw-r--r--app-office/multitalk/ChangeLog5
-rw-r--r--app-office/multitalk/multitalk-1.4.ebuild24
2 files changed, 16 insertions, 13 deletions
diff --git a/app-office/multitalk/ChangeLog b/app-office/multitalk/ChangeLog
index 9392f2bd5429..c6076c1b5f27 100644
--- a/app-office/multitalk/ChangeLog
+++ b/app-office/multitalk/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-office/multitalk
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/multitalk/ChangeLog,v 1.3 2013/02/03 12:06:59 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/multitalk/ChangeLog,v 1.4 2013/06/16 09:05:33 pacho Exp $
+
+ 16 Jun 2013; Pacho Ramos <pacho@gentoo.org> multitalk-1.4.ebuild:
+ Allow media-gfx/graphicsmagick[imagemagick] (#314225 by Wojciech Porczyk)
03 Feb 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
Cleanup due #22900
diff --git a/app-office/multitalk/multitalk-1.4.ebuild b/app-office/multitalk/multitalk-1.4.ebuild
index 6eed38bc67af..2e739e94fb64 100644
--- a/app-office/multitalk/multitalk-1.4.ebuild
+++ b/app-office/multitalk/multitalk-1.4.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/multitalk/multitalk-1.4.ebuild,v 1.3 2009/12/17 10:56:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/multitalk/multitalk-1.4.ebuild,v 1.4 2013/06/16 09:05:33 pacho Exp $
-inherit eutils toolchain-funcs
+EAPI=5
+inherit eutils toolchain-funcs readme.gentoo
DESCRIPTION="A new type of presentation program"
HOMEPAGE="http://www.srcf.ucam.org/~dmi1000/multitalk/"
@@ -19,14 +20,16 @@ DEPEND=">=media-libs/libsdl-1.2.7
>=media-libs/sdl-gfx-2.0.13"
RDEPEND="${DEPEND}
- latex? ( virtual/latex-base media-gfx/imagemagick )"
+ latex? ( virtual/latex-base
+ || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) )"
S="${WORKDIR}/${PN}"
-src_unpack() {
- unpack ${A}
+DOC_CONTENTS="
+ You will have to source /etc/profile (or logout and back in).
+ See also /usr/share/doc/${PF}/${PN}.pdf."
- cd "${S}"
+src_prepare() {
sed -i \
-e "s:g++:$(tc-getCXX) ${CXXFLAGS}:" \
-e "s:-L\${HOME}/lib:${LDFLAGS}:" \
@@ -35,7 +38,7 @@ src_unpack() {
src_install() {
dodir /usr/bin
- emake SYSPREFIX="${D}usr" install || die
+ emake SYSPREFIX="${D}usr" install
insinto /usr/share/${PN}/examples
doins examples/about.{graph,talk}
@@ -43,9 +46,6 @@ src_install() {
doenvd "${FILESDIR}/99multitalk"
dodoc README docs/Changelog docs/multitalk.pdf
-}
-pkg_postinst() {
- elog "You will have to source /etc/profile (or logout and back in)."
- elog "See also /usr/share/doc/${PF}/${PN}.pdf."
+ readme.gentoo_create_doc
}