diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2010-07-10 19:27:18 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-07-10 19:27:18 +0000 |
commit | 37434324209b56206dd4fb89fec9cf8062c8a882 (patch) | |
tree | 0a96d467b5f364db7bb0a2e43cebd328caff23fa /x11-misc/xnee | |
parent | Add gtk-doc-am to DEPEND for eautoreconf. Fixes bug 327559 (diff) | |
download | historical-37434324209b56206dd4fb89fec9cf8062c8a882.tar.gz historical-37434324209b56206dd4fb89fec9cf8062c8a882.tar.bz2 historical-37434324209b56206dd4fb89fec9cf8062c8a882.zip |
Fix imagemagick vs. graphicsmagick DEPEND wrt #314403.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'x11-misc/xnee')
-rw-r--r-- | x11-misc/xnee/ChangeLog | 5 | ||||
-rw-r--r-- | x11-misc/xnee/Manifest | 6 | ||||
-rw-r--r-- | x11-misc/xnee/xnee-3.05.ebuild | 66 | ||||
-rw-r--r-- | x11-misc/xnee/xnee-3.06.ebuild | 7 |
4 files changed, 10 insertions, 74 deletions
diff --git a/x11-misc/xnee/ChangeLog b/x11-misc/xnee/ChangeLog index 04b26fbdba97..d65ce7c374e7 100644 --- a/x11-misc/xnee/ChangeLog +++ b/x11-misc/xnee/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-misc/xnee # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xnee/ChangeLog,v 1.9 2010/06/06 14:14:33 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xnee/ChangeLog,v 1.10 2010/07/10 19:27:18 ssuominen Exp $ + + 10 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> xnee-3.06.ebuild: + Fix imagemagick vs. graphicsmagick DEPEND wrt #314403. *xnee-3.06 (06 Jun 2010) diff --git a/x11-misc/xnee/Manifest b/x11-misc/xnee/Manifest index f07f9bd8f367..0aaa2427a5d0 100644 --- a/x11-misc/xnee/Manifest +++ b/x11-misc/xnee/Manifest @@ -1,7 +1,5 @@ AUX xnee-3.05-asneeded.patch 315 RMD160 9a9871531243c747a8d7cd36b89ea50f2fe2be1a SHA1 6c86ee5ac106668b94c12491d909a3a3b6898e2c SHA256 2b6dc3139e68c61236a68ae28d69fced31a9038a2ed2ee1651fae319f32b3871 -DIST xnee-3.05.tar.gz 1666788 RMD160 1a1bcc7b043fd3eb603a7f0c7ed94ccaff70d778 SHA1 0b725c3648670e2f76a16a013707596a4e73a0aa SHA256 a310aeacc7c6a0ee32d91815cc62cbb202a9daaf91399f1c2e902b81018640d1 DIST xnee-3.06.tar.gz 1598910 RMD160 7a8f36094e06ea25962c69975fa56e22b04ae7df SHA1 b04af13735cbc4950d56f89ee701ae9e3b2a482a SHA256 3214f72f9e5f970b6e22339aacbf5793faf0b5b37c58e022942fc71d3d84186e -EBUILD xnee-3.05.ebuild 1574 RMD160 22b42c94633f676665aba034d58004ed00a64c79 SHA1 4292ea49d95a02335a1083de05b8a548e7d98de3 SHA256 ece639f94438ea90bc36e437e30c8415fca3f6aea2b8b17bd732fa351f13f7d2 -EBUILD xnee-3.06.ebuild 1580 RMD160 721dd1a8787bc3b0fb50459f486bd3b660670db3 SHA1 ec754c4bf1ce5147d88f8fd63bc597a7b1ba954d SHA256 50eecdf7281c5fce287efa5f5b50536a49763ae9d90087fec83e1b61cdaba7fd -MISC ChangeLog 1650 RMD160 3db25045a75d2e25425626d362fbd05f70be5967 SHA1 5e2a1e0bf1275bca155b1ecf13aa390de7465311 SHA256 7c986838255a2e6f58926ca0fc47f6c058dac94b8eea48675086c6c5e65a8dc0 +EBUILD xnee-3.06.ebuild 1645 RMD160 3f2bcdbdcdfa591329a72684f1b4c90aaa1e207e SHA1 44b307ff455ee6cbd360261ac656b3ebdccec559 SHA256 0fbb027b30429d83201fa6cabd243b207b9429ae54e216326570d452c56b32df +MISC ChangeLog 1781 RMD160 5532018c04b3639d668b0f308c92af009b4a1a1c SHA1 043189418ed7672223a5cbd80efbd54373f7a335 SHA256 bbfb186c737a8fbfe5618024cd533eea46c112b86855726aaa23b30138fc833f MISC metadata.xml 173 RMD160 f74c5ca8d8aa0d0897c7c107f6eb4424d4f4343e SHA1 ca2ea648208cc74669b8a084f1b74e5cd4415777 SHA256 2f2c48f12680e78f700e809ba6ff98c67b1ea8b707291659c1bfb6b20d28835f diff --git a/x11-misc/xnee/xnee-3.05.ebuild b/x11-misc/xnee/xnee-3.05.ebuild deleted file mode 100644 index 775b636d1386..000000000000 --- a/x11-misc/xnee/xnee-3.05.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xnee/xnee-3.05.ebuild,v 1.4 2010/02/13 21:48:05 ssuominen Exp $ - -EAPI=2 -inherit autotools eutils -# virtualx - -DESCRIPTION="Program suite to record, replay and distribute user actions." -HOMEPAGE="http://www.sandklef.com/xnee/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="gnome xosd" - -RDEPEND="x11-libs/libX11 - x11-libs/libXtst - gnome? ( x11-libs/gtk+:2 - >=gnome-base/libgnomeui-2 - >=gnome-base/gconf-2 - >=gnome-base/gnome-panel-2 )" -DEPEND="${RDEPEND} - x11-proto/inputproto - dev-util/pkgconfig - gnome? ( sys-devel/gettext - media-gfx/imagemagick )" - -# This needs RECORD extension from X.org server which isn't necessarily -# enabled. Xlib: extension "RECORD" missing on display ":0.0". -RESTRICT="test" - -src_prepare() { - epatch "${FILESDIR}"/${P}-asneeded.patch - eautoreconf -} - -src_configure() { - local myconf="" - - if use xosd; then - myconf="--enable-xosd --enable-verbose --enable-buffer_verbose" - else - myconf="--disable-xosd --disable-verbose --disable-buffer_verbose" - fi - - econf \ - --disable-dependency-tracking \ - $(use_enable gnome gui) \ - $(use_enable gnome gnome-applet) \ - --enable-cli \ - --enable-lib \ - --disable-static-programs \ - ${myconf} -} - -src_test() { - Xemake check || die -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc AUTHORS BUGS ChangeLog FAQ NEWS README TODO - use gnome && make_desktop_entry gnee Gnee ${PN} "Utility;GTK" -} diff --git a/x11-misc/xnee/xnee-3.06.ebuild b/x11-misc/xnee/xnee-3.06.ebuild index 8055283692ca..f25b34908bc9 100644 --- a/x11-misc/xnee/xnee-3.06.ebuild +++ b/x11-misc/xnee/xnee-3.06.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xnee/xnee-3.06.ebuild,v 1.1 2010/06/06 14:14:33 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xnee/xnee-3.06.ebuild,v 1.2 2010/07/10 19:27:18 ssuominen Exp $ EAPI=2 inherit autotools eutils @@ -24,8 +24,9 @@ RDEPEND="x11-libs/libX11 DEPEND="${RDEPEND} x11-proto/inputproto dev-util/pkgconfig - gnome? ( sys-devel/gettext - media-gfx/imagemagick )" + sys-devel/gettext + gnome? ( || ( media-gfx/imagemagick[jpeg,png] + media-gfx/graphicsmagick[imagemagick,jpeg,png] ) )" # This needs RECORD extension from X.org server which isn't necessarily # enabled. Xlib: extension "RECORD" missing on display ":0.0". |