From 0aa78de71f6fdd27be2a8471960cad6c0c7fc5cc Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 8 Sep 2005 23:58:12 +0000 Subject: path fix as per bug #105311. x86 stable on 2.3 and removed old versions (Portage version: 2.0.51.22-r2) --- x11-misc/electricsheep/ChangeLog | 10 ++- x11-misc/electricsheep/Manifest | 21 +---- x11-misc/electricsheep/electricsheep-2.5.ebuild | 83 ------------------- x11-misc/electricsheep/electricsheep-2.6.2.ebuild | 94 ---------------------- .../electricsheep/electricsheep-2.6.3-r1.ebuild | 73 +++++++++++++++++ x11-misc/electricsheep/electricsheep-2.6.3.ebuild | 86 -------------------- .../electricsheep/files/digest-electricsheep-2.5 | 1 - .../electricsheep/files/digest-electricsheep-2.6.2 | 1 - .../electricsheep/files/digest-electricsheep-2.6.3 | 1 - .../files/digest-electricsheep-2.6.3-r1 | 1 + x11-misc/electricsheep/files/nice.patch | 50 ------------ 11 files changed, 86 insertions(+), 335 deletions(-) delete mode 100644 x11-misc/electricsheep/electricsheep-2.5.ebuild delete mode 100644 x11-misc/electricsheep/electricsheep-2.6.2.ebuild create mode 100644 x11-misc/electricsheep/electricsheep-2.6.3-r1.ebuild delete mode 100644 x11-misc/electricsheep/electricsheep-2.6.3.ebuild delete mode 100644 x11-misc/electricsheep/files/digest-electricsheep-2.5 delete mode 100644 x11-misc/electricsheep/files/digest-electricsheep-2.6.2 delete mode 100644 x11-misc/electricsheep/files/digest-electricsheep-2.6.3 create mode 100644 x11-misc/electricsheep/files/digest-electricsheep-2.6.3-r1 delete mode 100644 x11-misc/electricsheep/files/nice.patch (limited to 'x11-misc/electricsheep') diff --git a/x11-misc/electricsheep/ChangeLog b/x11-misc/electricsheep/ChangeLog index ae2758bd6777..96dcac75f921 100644 --- a/x11-misc/electricsheep/ChangeLog +++ b/x11-misc/electricsheep/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for x11-misc/electricsheep # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/ChangeLog,v 1.26 2005/08/20 08:06:06 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/ChangeLog,v 1.27 2005/09/08 23:58:12 dragonheart Exp $ + +*electricsheep-2.6.3-r1 (08 Sep 2005) + + 08 Sep 2005; Daniel Black -files/nice.patch, + -electricsheep-2.5.ebuild, -electricsheep-2.6.2.ebuild, + -electricsheep-2.6.3.ebuild, +electricsheep-2.6.3-r1.ebuild: + path fix as per bug #105311 thanks to Ed Catmur. x86 stable on 2.3 and + removed old versions *electricsheep-2.6.3 (20 Aug 2005) diff --git a/x11-misc/electricsheep/Manifest b/x11-misc/electricsheep/Manifest index ea2f0c9239dc..6eaaf49daac4 100644 --- a/x11-misc/electricsheep/Manifest +++ b/x11-misc/electricsheep/Manifest @@ -1,20 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 93dc6d935c18fa8086faeccbdf7f1961 ChangeLog 3906 -MD5 8d586f168c0d7e4c5f148fa26eb082bd electricsheep-2.5.ebuild 2415 +MD5 c2111290ea04e03085d0130efa2d0b84 ChangeLog 4235 MD5 f84d0865990260d30b1b5180364dd6a8 metadata.xml 319 -MD5 70393a4ae0e2efc3c6549728cdd22157 electricsheep-2.6.2.ebuild 2644 -MD5 6c9520806c46d645b0d6c7cf9dd1501c electricsheep-2.6.3.ebuild 2187 -MD5 6dd13bc63ef06db5fa52858aa0cd527e files/digest-electricsheep-2.6.2 72 -MD5 87239588d30aa9a05e38a9bd73e53476 files/nice.patch 1442 -MD5 03246081d78231c42811d7e25601da7a files/digest-electricsheep-2.5 69 +MD5 ac16fd5c9f6718a6f4456328b14ef978 electricsheep-2.6.3-r1.ebuild 1879 MD5 cf3d6d65b467f83063fea471d22e2f37 files/electricsheep.desktop 3973 -MD5 d74dadadc142bec28238e9e3994fc179 files/digest-electricsheep-2.6.3 72 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDBuSCmdTrptrqvGERAmVUAJoDdafkGqXclwJQLCkatC9ZtXv7gwCfYTAV -Gvor9A6mMExXilDxbzPq5yM= -=MUPk ------END PGP SIGNATURE----- +MD5 d74dadadc142bec28238e9e3994fc179 files/digest-electricsheep-2.6.3-r1 72 diff --git a/x11-misc/electricsheep/electricsheep-2.5.ebuild b/x11-misc/electricsheep/electricsheep-2.5.ebuild deleted file mode 100644 index 37f7a98fe380..000000000000 --- a/x11-misc/electricsheep/electricsheep-2.5.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/electricsheep-2.5.ebuild,v 1.9 2005/03/05 14:54:07 luckyduck Exp $ - -inherit eutils flag-o-matic - -DESCRIPTION="realize the collective dream of sleeping computers from all over the internet" -HOMEPAGE="http://electricsheep.org/" -SRC_URI="http://electricsheep.org/${P}.tar.gz" -IUSE="" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86 ~sparc ~amd64" - -DEPEND="virtual/x11 - dev-libs/expat - sys-apps/groff - dev-lang/perl - >=sys-apps/sed-4 - media-libs/libmpeg2 - sys-apps/gawk - sys-apps/grep - sys-devel/libtool - media-libs/jpeg - media-libs/libpng - media-libs/libsdl - virtual/libc - sys-libs/zlib - !sparc? ( media-libs/alsa-lib )" - -# -# I did a ldd /usr/bin/anim-flame /usr/bin/hqi-flame /usr/bin/pick-flame /usr/bin/convert-flame \ -# /usr/bin/mpeg2dec_onroot /usr/bin/electricsheep | cut -f3 -d ' ' | xargs -n 1 qpkg -f -v | sort | uniq -# -# on an x86 platform and it listed media-libs/svgalib as a dependancy (hard masked on sparc). -# I'm removing the dependancy on sparc as hopefully it will work without it. - - -RDEPEND="virtual/x11 - dev-libs/expat - net-misc/curl - media-gfx/xloadimage - media-libs/jpeg - media-libs/libpng - media-libs/libsdl - !sparc? ( media-libs/alsa-lib ) - virtual/libc - sys-libs/zlib" - -# Also detects and ties in sys-libs/slang, media-libs/aalib media-libs/svgalib and nas -# if they exist on the user machine although these aren't deps. - -src_unpack() { - unpack ${A} - cd ${S} - sed -i "s:/usr/local/share:/usr/share/${PN}:" \ - electricsheep.c \ - || die "sed electricsheep.c failed" - sed -i '/OPT_CFLAGS=/s:=".*":="$CFLAGS":' \ - mpeg2dec/configure \ - || die "sed mpeg2dec failed" - epatch ${FILESDIR}/nice.patch - filter-flags -fPIC -} - -src_install() { - # prevent writing for xscreensaver - sed -i "s/^install-data-local:$/install-data-local:\nmy-install-data-local:/" \ - Makefile || die "sed Makefile failed" - - # install the xscreensaver config file - insinto /usr/share/control-center/screensavers - doins electricsheep.xml - - # install the main stuff ... flame doesn't create /usr/bin so we have to. - dodir /usr/bin - make install DESTDIR=${D} || die "make install failed" - dodir /usr/share/electricsheep - mv ${D}/usr/share/electricsheep-* ${D}/usr/share/electricsheep/ - - # remove header files that are installed over libmpeg2 - rm -rf ${D}/usr/include -} diff --git a/x11-misc/electricsheep/electricsheep-2.6.2.ebuild b/x11-misc/electricsheep/electricsheep-2.6.2.ebuild deleted file mode 100644 index 514c42f07304..000000000000 --- a/x11-misc/electricsheep/electricsheep-2.6.2.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/electricsheep-2.6.2.ebuild,v 1.4 2005/08/20 08:06:06 dragonheart Exp $ - -inherit eutils flag-o-matic kde-functions - -DESCRIPTION="realize the collective dream of sleeping computers from all over the internet" -HOMEPAGE="http://electricsheep.org/" -SRC_URI="http://electricsheep.org/${P}.tar.gz" -IUSE="kde" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~sparc x86" - -DEPEND="virtual/x11 - dev-libs/expat - sys-apps/groff - dev-lang/perl - >=sys-apps/sed-4 - media-libs/libmpeg2 - sys-apps/gawk - sys-apps/grep - sys-devel/libtool - media-libs/jpeg - media-libs/libpng - media-libs/libsdl - virtual/libc - sys-libs/zlib - !sparc? ( media-libs/alsa-lib )" - -# -# I did a ldd /usr/bin/anim-flame /usr/bin/hqi-flame /usr/bin/pick-flame /usr/bin/convert-flame \ -# /usr/bin/mpeg2dec_onroot /usr/bin/electricsheep | cut -f3 -d ' ' | xargs -n 1 qpkg -f -v | sort | uniq -# -# on an x86 platform and it listed media-libs/svgalib as a dependancy (hard masked on sparc). -# I'm removing the dependancy on sparc as hopefully it will work without it. - - -RDEPEND="virtual/x11 - dev-libs/expat - net-misc/curl - media-gfx/xloadimage - media-libs/jpeg - media-libs/libpng - media-libs/libsdl - !sparc? ( media-libs/alsa-lib ) - virtual/libc - sys-libs/zlib" - -# Also detects and ties in sys-libs/slang, media-libs/aalib media-libs/svgalib and nas -# if they exist on the user machine although these aren't deps. - -src_unpack() { - unpack ${A} - cd ${S} - sed -i "s:/usr/local/share:/usr/share/${PN}:" \ - electricsheep.c \ - || die "sed electricsheep.c failed" - sed -i '/OPT_CFLAGS=/s:=".*":="$CFLAGS":' \ - mpeg2dec/configure \ - || die "sed mpeg2dec failed" -# epatch ${FILESDIR}/nice.patch - filter-flags -fPIC -} - -src_install() { - - ${D}/usr/bin/uniqueid > ${D}/usr/share/electricsheep/electricsheep-uniqueid - - # prevent writing for xscreensaver - sed -i "s/^install-data-local:$/install-data-local:\nmy-install-data-local:/" \ - Makefile || die "sed Makefile failed" - - # install the xscreensaver config file - insinto /usr/share/control-center/screensavers - doins electricsheep.xml - - # install the main stuff ... flame doesn't create /usr/bin so we have to. - dodir /usr/bin - make install DESTDIR=${D} || die "make install failed" - dodir /usr/share/electricsheep - - if use kde; - then - set-kdedir - insinto /usr/share/applications - doins ${FILESDIR}/${PN}.desktop - insinto ${KDEDIR}//share/applnk/System/ScreenSavers - doins ${FILESDIR}/${PN}.desktop - fi - - # remove header files that are installed over libmpeg2 - rm -rf ${D}/usr/include -} diff --git a/x11-misc/electricsheep/electricsheep-2.6.3-r1.ebuild b/x11-misc/electricsheep/electricsheep-2.6.3-r1.ebuild new file mode 100644 index 000000000000..40a54c212fd2 --- /dev/null +++ b/x11-misc/electricsheep/electricsheep-2.6.3-r1.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/electricsheep-2.6.3-r1.ebuild,v 1.1 2005/09/08 23:58:12 dragonheart Exp $ + +inherit eutils flag-o-matic kde-functions + +DESCRIPTION="realize the collective dream of sleeping computers from all over the internet" +HOMEPAGE="http://electricsheep.org/" +SRC_URI="http://electricsheep.org/${P}.tar.gz" +IUSE="kde" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~sparc x86" + +DEPEND="virtual/x11 + dev-libs/expat + sys-apps/groff + dev-lang/perl + >=sys-apps/sed-4 + media-libs/libmpeg2 + sys-apps/gawk + sys-apps/grep + sys-devel/libtool + media-libs/jpeg + media-libs/libpng + media-libs/libsdl + virtual/libc + sys-libs/zlib" + +RDEPEND="virtual/x11 + dev-libs/expat + net-misc/curl + media-gfx/xloadimage + media-libs/jpeg + media-libs/libpng + media-libs/libsdl + virtual/libc + sys-libs/zlib" + +# Also detects and ties in sys-libs/slang, media-libs/aalib media-libs/svgalib and nas +# if they exist on the user machine although these aren't deps. + +src_install() { + + + # prevent writing for xscreensaver + sed -i "s/^install-data-local:$/install-data-local:\nmy-install-data-local:/" \ + Makefile || die "sed Makefile failed" + + # install the xscreensaver config file + insinto /usr/share/xscreensaver/config + doins electricsheep.xml + + make install DESTDIR=${D} || die "make install failed" + + dodir /usr/share/electricsheep + if [ ! -f ${ROOT}/usr/share/electricsheep/electricsheep-uniqueid ] + then + ${D}/usr/bin/uniqueid > ${D}/usr/share/electricsheep/electricsheep-uniqueid + fi + + if use kde; + then + set-kdedir + insinto /usr/share/applications + doins ${FILESDIR}/${PN}.desktop + insinto ${KDEDIR}//share/applnk/System/ScreenSavers + doins ${FILESDIR}/${PN}.desktop + fi + + # remove header files that are installed over libmpeg2 + rm -rf ${D}/usr/include +} diff --git a/x11-misc/electricsheep/electricsheep-2.6.3.ebuild b/x11-misc/electricsheep/electricsheep-2.6.3.ebuild deleted file mode 100644 index b039cd9ba6b8..000000000000 --- a/x11-misc/electricsheep/electricsheep-2.6.3.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/electricsheep-2.6.3.ebuild,v 1.1 2005/08/20 08:06:06 dragonheart Exp $ - -inherit eutils flag-o-matic kde-functions - -DESCRIPTION="realize the collective dream of sleeping computers from all over the internet" -HOMEPAGE="http://electricsheep.org/" -SRC_URI="http://electricsheep.org/${P}.tar.gz" -IUSE="kde" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~sparc ~x86" - -DEPEND="virtual/x11 - dev-libs/expat - sys-apps/groff - dev-lang/perl - >=sys-apps/sed-4 - media-libs/libmpeg2 - sys-apps/gawk - sys-apps/grep - sys-devel/libtool - media-libs/jpeg - media-libs/libpng - media-libs/libsdl - virtual/libc - sys-libs/zlib" - -RDEPEND="virtual/x11 - dev-libs/expat - net-misc/curl - media-gfx/xloadimage - media-libs/jpeg - media-libs/libpng - media-libs/libsdl - virtual/libc - sys-libs/zlib" - -# Also detects and ties in sys-libs/slang, media-libs/aalib media-libs/svgalib and nas -# if they exist on the user machine although these aren't deps. - -src_unpack1() { - unpack ${A} - cd ${S} - sed -i "s:/usr/local/share:/usr/share/${PN}:" \ - electricsheep.c \ - || die "sed electricsheep.c failed" - sed -i '/OPT_CFLAGS=/s:=".*":="$CFLAGS":' \ - mpeg2dec/configure \ - || die "sed mpeg2dec failed" -# epatch ${FILESDIR}/nice.patch - filter-flags -fPIC -} - -src_install() { - - - # prevent writing for xscreensaver - sed -i "s/^install-data-local:$/install-data-local:\nmy-install-data-local:/" \ - Makefile || die "sed Makefile failed" - - # install the xscreensaver config file - insinto /usr/share/control-center/screensavers - doins electricsheep.xml - - make install DESTDIR=${D} || die "make install failed" - - dodir /usr/share/electricsheep - if [ ! -f ${ROOT}/usr/share/electricsheep/electricsheep-uniqueid ] - then - ${D}/usr/bin/uniqueid > ${D}/usr/share/electricsheep/electricsheep-uniqueid - fi - - if use kde; - then - set-kdedir - insinto /usr/share/applications - doins ${FILESDIR}/${PN}.desktop - insinto ${KDEDIR}//share/applnk/System/ScreenSavers - doins ${FILESDIR}/${PN}.desktop - fi - - # remove header files that are installed over libmpeg2 - rm -rf ${D}/usr/include -} diff --git a/x11-misc/electricsheep/files/digest-electricsheep-2.5 b/x11-misc/electricsheep/files/digest-electricsheep-2.5 deleted file mode 100644 index d78860848c04..000000000000 --- a/x11-misc/electricsheep/files/digest-electricsheep-2.5 +++ /dev/null @@ -1 +0,0 @@ -MD5 310aad5d3e4d58e823b24a28791aa553 electricsheep-2.5.tar.gz 618906 diff --git a/x11-misc/electricsheep/files/digest-electricsheep-2.6.2 b/x11-misc/electricsheep/files/digest-electricsheep-2.6.2 deleted file mode 100644 index cb1d0ae66d36..000000000000 --- a/x11-misc/electricsheep/files/digest-electricsheep-2.6.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 8a9f914e1dbf03d750d5b279f01e6c46 electricsheep-2.6.2.tar.gz 1498167 diff --git a/x11-misc/electricsheep/files/digest-electricsheep-2.6.3 b/x11-misc/electricsheep/files/digest-electricsheep-2.6.3 deleted file mode 100644 index 6b459cf6101e..000000000000 --- a/x11-misc/electricsheep/files/digest-electricsheep-2.6.3 +++ /dev/null @@ -1 +0,0 @@ -MD5 ef3eec7b07313928ff253562e1994820 electricsheep-2.6.3.tar.gz 1438987 diff --git a/x11-misc/electricsheep/files/digest-electricsheep-2.6.3-r1 b/x11-misc/electricsheep/files/digest-electricsheep-2.6.3-r1 new file mode 100644 index 000000000000..6b459cf6101e --- /dev/null +++ b/x11-misc/electricsheep/files/digest-electricsheep-2.6.3-r1 @@ -0,0 +1 @@ +MD5 ef3eec7b07313928ff253562e1994820 electricsheep-2.6.3.tar.gz 1438987 diff --git a/x11-misc/electricsheep/files/nice.patch b/x11-misc/electricsheep/files/nice.patch deleted file mode 100644 index b7afbe56c28a..000000000000 --- a/x11-misc/electricsheep/files/nice.patch +++ /dev/null @@ -1,50 +0,0 @@ -*** electricsheep.c.bak 2003-11-14 00:02:30.000000000 -0800 ---- electricsheep.c 2003-11-14 00:03:27.000000000 -0800 -*************** -*** 1007,1013 **** - { - char b[MAXBUF]; - char strips[MAXBUF]; -! sprintf(b, "nice -%d env in=%s time=%d out=%s quality=%d anim-flame", - nice_level, cps_name, get_frame, jpg_name, jpeg_quality); - if (debug) printf("about to render %s\n", b); - if (mysystem(b, "render")) { ---- 1007,1013 ---- - { - char b[MAXBUF]; - char strips[MAXBUF]; -! sprintf(b, "nice -n %d env in=%s time=%d out=%s quality=%d anim-flame", - nice_level, cps_name, get_frame, jpg_name, jpeg_quality); - if (debug) printf("about to render %s\n", b); - if (mysystem(b, "render")) { -*************** -*** 1745,1758 **** - reset_fuse = reset_fuse_length; - - if (proxy_name) { -! sprintf(curl_cmd, "nice -%d curl --proxy %s", - nice_level, proxy_name); - if (proxy_user) { - strcat(curl_cmd, " --proxy-user "); - strcat(curl_cmd, proxy_user); - } - } else -! sprintf(curl_cmd, "nice -%d curl", nice_level); - - srandom(time(0)); - ---- 1745,1758 ---- - reset_fuse = reset_fuse_length; - - if (proxy_name) { -! sprintf(curl_cmd, "nice -n %d curl --proxy %s", - nice_level, proxy_name); - if (proxy_user) { - strcat(curl_cmd, " --proxy-user "); - strcat(curl_cmd, proxy_user); - } - } else -! sprintf(curl_cmd, "nice -n %d curl", nice_level); - - srandom(time(0)); - -- cgit v1.2.3-65-gdbad