From 5db2d0f9e9c5b1fe9b6b3dcd9d1ca1dc945669d8 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 8 Nov 2004 05:24:53 +0000 Subject: Version bump to add fix for compmgr #68057. --- x11-plugins/epplets/ChangeLog | 8 +++++- x11-plugins/epplets/Manifest | 17 +++-------- x11-plugins/epplets/epplets-0.7-r1.ebuild | 38 +++++++++++++++++++++++++ x11-plugins/epplets/epplets-0.7.ebuild | 30 ------------------- x11-plugins/epplets/files/0.7-compmgr-fix.patch | 35 +++++++++++++++++++++++ x11-plugins/epplets/files/digest-epplets-0.7 | 1 - x11-plugins/epplets/files/digest-epplets-0.7-r1 | 1 + 7 files changed, 85 insertions(+), 45 deletions(-) create mode 100644 x11-plugins/epplets/epplets-0.7-r1.ebuild delete mode 100644 x11-plugins/epplets/epplets-0.7.ebuild create mode 100644 x11-plugins/epplets/files/0.7-compmgr-fix.patch delete mode 100644 x11-plugins/epplets/files/digest-epplets-0.7 create mode 100644 x11-plugins/epplets/files/digest-epplets-0.7-r1 (limited to 'x11-plugins/epplets') diff --git a/x11-plugins/epplets/ChangeLog b/x11-plugins/epplets/ChangeLog index 5b20c0cc7a71..70f5b45a3e05 100644 --- a/x11-plugins/epplets/ChangeLog +++ b/x11-plugins/epplets/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-plugins/epplets # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/epplets/ChangeLog,v 1.5 2004/06/24 22:51:51 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/epplets/ChangeLog,v 1.6 2004/11/08 05:24:53 vapier Exp $ + +*epplets-0.7-r1 (08 Nov 2004) + + 08 Nov 2004; Mike Frysinger + +files/0.7-compmgr-fix.patch, +epplets-0.7-r1.ebuild, -epplets-0.7.ebuild: + Version bump to add fix for compmgr #68057. 27 May 2004; Danny van Dyk epplets-0.7.ebuild: Marked ~amd64. diff --git a/x11-plugins/epplets/Manifest b/x11-plugins/epplets/Manifest index 1800ac0e6b87..67fcbacf5e6c 100644 --- a/x11-plugins/epplets/Manifest +++ b/x11-plugins/epplets/Manifest @@ -1,14 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 8ead40a27137cee90798df794e6862f6 ChangeLog 659 -MD5 9422bf35dfa42fd10f6ce6fb93a4d6ea epplets-0.7.ebuild 734 +MD5 da8e54800bf03660841176d5d83ecf5e ChangeLog 862 MD5 03bdbcabbe6a151da9ce0e537e916b2c metadata.xml 618 -MD5 106830bd4b3cfc951a50a5498e925346 files/digest-epplets-0.7 64 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.9.8 (GNU/Linux) - -iD8DBQFA9LQkHTu7gpaalycRAmIOAKDJ2T9ajeu8N4G56HXsNwSGYaYOQgCfezcn -isv+f4bGoT44+gJzCG5BIqU= -=iFKU ------END PGP SIGNATURE----- +MD5 f1e7be9943f76be4ab45412aeff284ae epplets-0.7-r1.ebuild 843 +MD5 106830bd4b3cfc951a50a5498e925346 files/digest-epplets-0.7-r1 64 +MD5 5b32a2cbac5456c47ed90d9f55ab0a1c files/0.7-compmgr-fix.patch 1134 diff --git a/x11-plugins/epplets/epplets-0.7-r1.ebuild b/x11-plugins/epplets/epplets-0.7-r1.ebuild new file mode 100644 index 000000000000..6f3326950dfc --- /dev/null +++ b/x11-plugins/epplets/epplets-0.7-r1.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/epplets/epplets-0.7-r1.ebuild,v 1.1 2004/11/08 05:24:53 vapier Exp $ + +inherit eutils + +DESCRIPTION="Base files for Enlightenment epplets and some epplets" +HOMEPAGE="http://www.enlightenment.org/" +SRC_URI="mirror://sourceforge/enlightenment/epplets-${PV}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ppc sparc x86" +IUSE="" + +DEPEND="virtual/x11 + virtual/glut + >=media-libs/imlib-1.9.10 + >=x11-wm/enlightenment-0.16.6 + media-sound/esound" + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/${PV}-compmgr-fix.patch #68057 +} + +src_compile() { + export EROOT=/usr + export EBIN=/usr/bin + econf || die + emake || die +} + +src_install() { + make DESTDIR=${D} install || die + dodoc ChangeLog +} diff --git a/x11-plugins/epplets/epplets-0.7.ebuild b/x11-plugins/epplets/epplets-0.7.ebuild deleted file mode 100644 index c5546a8e3f13..000000000000 --- a/x11-plugins/epplets/epplets-0.7.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/epplets/epplets-0.7.ebuild,v 1.10 2004/07/14 04:18:38 vapier Exp $ - -DESCRIPTION="Base files for Enlightenment epplets and some epplets" -HOMEPAGE="http://www.enlightenment.org/" -SRC_URI="mirror://sourceforge/enlightenment/epplets-${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86 ppc sparc amd64" -IUSE="" - -DEPEND="virtual/x11 - virtual/glut - >=media-libs/imlib-1.9.10 - >=x11-wm/enlightenment-0.16.6 - media-sound/esound" - -src_compile() { - export EROOT=/usr - export EBIN=/usr/bin - econf || die - emake || die -} - -src_install() { - make DESTDIR=${D} install || die - dodoc ChangeLog -} diff --git a/x11-plugins/epplets/files/0.7-compmgr-fix.patch b/x11-plugins/epplets/files/0.7-compmgr-fix.patch new file mode 100644 index 000000000000..97161af84125 --- /dev/null +++ b/x11-plugins/epplets/files/0.7-compmgr-fix.patch @@ -0,0 +1,35 @@ +Index: epplet.c +=================================================================== +RCS file: /cvsroot/enlightenment/e16/epplets/api/epplet.c,v +retrieving revision 1.129 +retrieving revision 1.130 +diff -u -r1.129 -r1.130 +--- epplets/api/epplet.c 24 Nov 2003 14:59:02 -0000 1.129 ++++ epplets/api/epplet.c 30 Oct 2004 15:36:00 -0000 1.130 +@@ -429,13 +429,16 @@ + Atom atom_list[8]; + int atom_count; + #endif ++ ImlibInitParams iip; + + mainwin = malloc(sizeof(EppWindow)); + mainwin->win_vert = vertical; + w *= 16; + h *= 16; + disp = XOpenDisplay(NULL); +- id = Imlib_init(disp); ++ iip.flags = PARAMS_VISUALID; ++ iip.visualid = XVisualIDFromVisual(DefaultVisual(disp, DefaultScreen(disp))); ++ id = Imlib_init_with_params(disp, &iip); + if (!disp) + { + fprintf(stderr, "Epplet Error: Cannot open display\n"); +@@ -5472,7 +5475,7 @@ + { + char s[1024]; + +- Esnprintf(s, sizeof(s), EBIN "/dox " EROOT "/epplet_data/%s/%s.ABOUT", ++ Esnprintf(s, sizeof(s), EBIN "/edox " EROOT "/epplet_data/%s/%s.ABOUT", + name, name); + Epplet_spawn_command(s); + } diff --git a/x11-plugins/epplets/files/digest-epplets-0.7 b/x11-plugins/epplets/files/digest-epplets-0.7 deleted file mode 100644 index 8823d338c627..000000000000 --- a/x11-plugins/epplets/files/digest-epplets-0.7 +++ /dev/null @@ -1 +0,0 @@ -MD5 b28331134d22ba5305c48dc0948f9e95 epplets-0.7.tar.gz 1001282 diff --git a/x11-plugins/epplets/files/digest-epplets-0.7-r1 b/x11-plugins/epplets/files/digest-epplets-0.7-r1 new file mode 100644 index 000000000000..8823d338c627 --- /dev/null +++ b/x11-plugins/epplets/files/digest-epplets-0.7-r1 @@ -0,0 +1 @@ +MD5 b28331134d22ba5305c48dc0948f9e95 epplets-0.7.tar.gz 1001282 -- cgit v1.2.3-65-gdbad