summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2005-12-12 02:57:31 +0000
committerDonnie Berkholz <dberkholz@gentoo.org>2005-12-12 02:57:31 +0000
commit49d34f9d178ba50a3dc119472d4743327bb8f7a0 (patch)
tree49369ca7979f048a2cf366550341633cb97e9282
parentcut out USE=pic cruft (diff)
downloadhistorical-49d34f9d178ba50a3dc119472d4743327bb8f7a0.tar.gz
historical-49d34f9d178ba50a3dc119472d4743327bb8f7a0.tar.bz2
historical-49d34f9d178ba50a3dc119472d4743327bb8f7a0.zip
Add modular X dependencies.
Package-Manager: portage-2.0.53
-rw-r--r--app-office/magicpoint/ChangeLog6
-rw-r--r--app-office/magicpoint/Manifest8
-rw-r--r--app-office/magicpoint/magicpoint-1.11b.ebuild17
3 files changed, 23 insertions, 8 deletions
diff --git a/app-office/magicpoint/ChangeLog b/app-office/magicpoint/ChangeLog
index 53d3f558e60e..574521501ec8 100644
--- a/app-office/magicpoint/ChangeLog
+++ b/app-office/magicpoint/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-office/magicpoint
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/magicpoint/ChangeLog,v 1.19 2005/09/29 08:30:40 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/magicpoint/ChangeLog,v 1.20 2005/12/12 02:57:31 spyderous Exp $
+
+ 12 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
+ magicpoint-1.11b.ebuild:
+ Add modular X dependencies.
29 Sep 2005; Mamoru KOMACHI <usata@gentoo.org>
-files/magicpoint-1.10a-r1-gentoo.diff, -magicpoint-1.10a-r1.ebuild,
diff --git a/app-office/magicpoint/Manifest b/app-office/magicpoint/Manifest
index 71cf133b6b00..5e5778824317 100644
--- a/app-office/magicpoint/Manifest
+++ b/app-office/magicpoint/Manifest
@@ -1,7 +1,7 @@
-MD5 573654ef9de75c1540561e8bce48858b ChangeLog 5680
-MD5 5d3d26a4ffdc4a76caefc88561b4e202 magicpoint-1.11b.ebuild 2705
-MD5 cca347d4b0e88766d322951ccf1e97e7 metadata.xml 570
+MD5 5839c379efe4f01627477d75062c394e ChangeLog 5797
MD5 63a502fcee80a92007cd49e113116b04 files/50mgp-mode-gentoo.el 167
-MD5 b274f550ccb53c3e1057c561dcfaa2a7 files/magicpoint-1.11b-mng_optional.patch 1670
MD5 02b686f1f35a47738d8938fb0151d3d0 files/digest-magicpoint-1.11b 68
MD5 fb8540abfe6224103b5d68b722e78119 files/magicpoint-1.11b-gentoo.diff 1412
+MD5 b274f550ccb53c3e1057c561dcfaa2a7 files/magicpoint-1.11b-mng_optional.patch 1670
+MD5 089e86ecae6131749b8f790e42d54218 magicpoint-1.11b.ebuild 2873
+MD5 cca347d4b0e88766d322951ccf1e97e7 metadata.xml 570
diff --git a/app-office/magicpoint/magicpoint-1.11b.ebuild b/app-office/magicpoint/magicpoint-1.11b.ebuild
index b52905e40289..554c32a462e7 100644
--- a/app-office/magicpoint/magicpoint-1.11b.ebuild
+++ b/app-office/magicpoint/magicpoint-1.11b.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/magicpoint/magicpoint-1.11b.ebuild,v 1.10 2005/09/29 08:30:40 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/magicpoint/magicpoint-1.11b.ebuild,v 1.11 2005/12/12 02:57:31 spyderous Exp $
inherit elisp-common eutils fixheadtails
@@ -14,7 +14,13 @@ SLOT="0"
KEYWORDS="x86 alpha sparc ppc amd64"
IUSE="cjk nls m17n-lib emacs truetype gif imlib mng"
-MY_DEPEND="virtual/x11
+MY_DEPEND="|| ( ( x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libXrender
+ x11-libs/libXmu
+ )
+ virtual/x11
+ )
gif? ( >=media-libs/giflib-4.0.1 )
imlib? ( media-libs/imlib )
truetype? ( virtual/xft )
@@ -22,7 +28,12 @@ MY_DEPEND="virtual/x11
m17n-lib? ( dev-libs/m17n-lib )
mng? ( media-libs/libmng )"
DEPEND="${MY_DEPEND}
- sys-devel/autoconf"
+ sys-devel/autoconf
+ || ( ( x11-proto/xextproto
+ x11-libs/libxkbfile
+ )
+ virtual/x11
+ )"
RDEPEND="${MY_DEPEND}
nls? ( sys-devel/gettext )
truetype? ( cjk? ( media-fonts/sazanami ) )"