From 88ee93ecd73eaf649271de8639798e6938a26c2b Mon Sep 17 00:00:00 2001 From: root Date: Tue, 2 Jun 2009 20:37:12 +0200 Subject: [PATCH] updated amuleadu ebuilds and deleted lm_sensors-3.1.0 (it kills my x61 ;) ) --- net-p2p/amuleadu/Manifest | 2 +- net-p2p/amuleadu/amuleadu-9999.ebuild | 57 ++++------ sys-apps/lm_sensors/Manifest | 3 - .../lm_sensors-3.1.0-sensors-detect-gentoo.patch | 115 -------------------- sys-apps/lm_sensors/lm_sensors-3.1.0.ebuild | 121 --------------------- 5 files changed, 24 insertions(+), 274 deletions(-) delete mode 100644 sys-apps/lm_sensors/Manifest delete mode 100644 sys-apps/lm_sensors/files/lm_sensors-3.1.0-sensors-detect-gentoo.patch delete mode 100644 sys-apps/lm_sensors/lm_sensors-3.1.0.ebuild diff --git a/net-p2p/amuleadu/Manifest b/net-p2p/amuleadu/Manifest index 7fab7e0..f6ba776 100644 --- a/net-p2p/amuleadu/Manifest +++ b/net-p2p/amuleadu/Manifest @@ -6,4 +6,4 @@ AUX gcc-4.3.patch 295 RMD160 35b9e3ea142b8397c55dc8fdb1e211133795af3c SHA1 3ce00 AUX gcc-4.4.patch 250 RMD160 8c22b77f97ee22947f530a153cbfc394ab13b3fc SHA1 0c5658bb98f9e90068db6fc58f44a69a48d95e25 SHA256 f17da6498d69b4339594674dcf3090a0d615d265613d586e364874be57fe80eb DIST amule-adunanza-3.14-r222.tar.bz2 4784594 RMD160 ea1865492bf384a81868f640c07baa263b485d6e SHA1 d872df89aeb0717650718b03c0b4ca86f22e219d SHA256 b45de68776f75cd48febfce2b4a3b82fe61073f193b82660f42c8417741e8813 EBUILD amuleadu-3.14-r222.ebuild 4097 RMD160 02f702362b693d857abcf96186983a8aed4a8760 SHA1 3f6bd203339ebbe0ba1feaabc087ab33a39f53c1 SHA256 5b3c005b8abdf43edb6fb0c8297068133a55ded2db5a0c3b9ecb789912c48056 -EBUILD amuleadu-9999.ebuild 4408 RMD160 6fc6f93652634867a76f3b4151c3a972420832ae SHA1 bfc07daabdd8a8db01259836a94500a89bbc7e8c SHA256 f5a7af9fe545854d8a83962ce3f0cfcf6c6fbdcd74c9de2bb37463d5331f2b9b +EBUILD amuleadu-9999.ebuild 4232 RMD160 98caf9bf46eec9969eb3b975868431593b70c20b SHA1 21b39b9e9a0ebc4c0ff3cc421ae01bb91160fad7 SHA256 f70e89a638006e7960ec194afb5741f48b8645a7ec11f040cab94c09633b84af diff --git a/net-p2p/amuleadu/amuleadu-9999.ebuild b/net-p2p/amuleadu/amuleadu-9999.ebuild index c073ff2..577250b 100644 --- a/net-p2p/amuleadu/amuleadu-9999.ebuild +++ b/net-p2p/amuleadu/amuleadu-9999.ebuild @@ -14,18 +14,17 @@ HOMEPAGE="http://www.adunanza.net/" LICENSE="GPL-2" SLOT="0" KEYWORDS="~x86" -IUSE="debug gtk nls remote stats unicode geoip optimize upnp" - -DEPEND="dev-util/subversion - !net-p2p/amule - dev-libs/crypto++ - =x11-libs/wxGTK-2.8* - >=sys-libs/zlib-1.2.1 - stats? ( >=media-libs/gd-2.0.26 ) - geoip? ( dev-libs/geoip ) - upnp? ( >=net-libs/libupnp-1.4.6 ) - remote? ( >=media-libs/libpng-1.2.0 - unicode? ( >=media-libs/gd-2.0.26 ) )" +IUSE="daemon debug geoip gtk nls remote stats unicode upnp" + +DEPEND="=x11-libs/wxGTK-2.8* + >=dev-libs/crypto++-5.5.2 + >=sys-libs/zlib-1.2.1 + stats? ( >=media-libs/gd-2.0.26[jpeg] ) + geoip? ( dev-libs/geoip ) + upnp? ( >=net-libs/libupnp-1.6.6 ) + remote? ( >=media-libs/libpng-1.2.0 + unicode? ( >=media-libs/gd-2.0.26 ) )" + pkg_setup() { ewarn "" @@ -34,23 +33,19 @@ pkg_setup() { ewarn "instabile e non vi e' garanzia di corretto funzionamento " ewarn "" - if ! use gtk && ! use remote && ! use amuled; then - eerror "" - eerror "You have to specify at least one of gtk, remote or amuled" - eerror "USE flag to build amule." - eerror "" - die "Invalid USE flag set" - fi - - if use stats && ! use gtk; then - einfo "Note: You would need both the gtk and stats USE flags" - einfo "to compile aMule Statistics GUI." - einfo "I will now compile console versions only." - fi + if ! use gtk && ! use remote && ! use daemon; then + eerror "" + eerror "You have to specify at least one of gtk, remote or daemon" + eerror "USE flag to build amule." + eerror "" + die "Invalid USE flag set" + fi - if use stats && ! built_with_use media-libs/gd jpeg; then - die "media-libs/gd should be compiled with the jpeg use flag when you have the stats use flag set" - fi + if use stats && ! use gtk; then + einfo "Note: You would need both the gtk and stats USE flags" + einfo "to compile aMule Statistics GUI." + einfo "I will now compile console versions only." + fi } @@ -67,12 +62,6 @@ pkg_preinst() { fi } - -src_prepare() { - epatch "${FILESDIR}"/gcc-4.3.patch - epatch "${FILESDIR}"/gcc-4.4.patch -} - src_compile() { local myconf WX_GTK_VER="2.8" diff --git a/sys-apps/lm_sensors/Manifest b/sys-apps/lm_sensors/Manifest deleted file mode 100644 index dd448c0..0000000 --- a/sys-apps/lm_sensors/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -AUX lm_sensors-3.1.0-sensors-detect-gentoo.patch 4399 RMD160 8c0d34578663f98da15aac713e9a684bc68f454f SHA1 2349b70d2b6da6ed001380d94278dd8f8334ed81 SHA256 05d9fec27bc4f46207abdb519a49a4a4e66ba692e772dd5d4991d438086057f9 -DIST lm_sensors-3.1.0.tar.bz2 153816 RMD160 70484386f4af520ff99acf2c0ed7feda9fea52d8 SHA1 b36577ca07d3028910a93958e5809ba7b85e0bf8 SHA256 45e1a684af40b674453f92c8c193a89cd6d689306ec9ae3a6b2575c0b6a5e412 -EBUILD lm_sensors-3.1.0.ebuild 3261 RMD160 67720eab0808bbe2b3f0c8881f6ea9a89d0e2e50 SHA1 666b821e52f228145fcfab1261366a71ca120d97 SHA256 4710ba708ee58ea627094f62af0a2ac556e9947ffa47d4990aecfe035bbd6598 diff --git a/sys-apps/lm_sensors/files/lm_sensors-3.1.0-sensors-detect-gentoo.patch b/sys-apps/lm_sensors/files/lm_sensors-3.1.0-sensors-detect-gentoo.patch deleted file mode 100644 index 69754f8..0000000 --- a/sys-apps/lm_sensors/files/lm_sensors-3.1.0-sensors-detect-gentoo.patch +++ /dev/null @@ -1,115 +0,0 @@ ---- lm_sensors-3.1.0.orig/prog/detect/sensors-detect 2009-03-04 15:18:39.000000000 +0100 -+++ lm_sensors-3.1.0/prog/detect/sensors-detect 2009-03-04 15:21:26.000000000 +0100 -@@ -20,6 +20,9 @@ - # MA 02110-1301 USA. - # - -+# Gentoo specific modifications based on a patch from Rudo Thomas -+# -+ - require 5.004; - - use strict; -@@ -5274,26 +5277,33 @@ - print MODPROBE_D $configfile; - close(MODPROBE_D); - } else { -+ print "\nIf you want to load the modules at startup, generate a config file\n", -+ "below and make sure lm_sensors gets started at boot time; e.g\n", -+ "\$ rc-update add lm_sensors default\n"; - print "To make the sensors modules behave correctly, add these lines to\n". -- "/etc/modprobe.conf:\n\n"; -+ "/etc/modules.d/lm_sensors and run modules-update:\n\n"; - print "#----cut here----\n". - $configfile. - "#----cut here----\n\n"; - } - } - -- my $have_sysconfig = -d '/etc/sysconfig'; -- printf "Do you want to \%s /etc/sysconfig/lm_sensors? (\%s): ", -- (-e '/etc/sysconfig/lm_sensors' ? 'overwrite' : 'generate'), -- ($have_sysconfig ? 'YES/no' : 'yes/NO'); -- $_ = ; -- if (($have_sysconfig and not m/^\s*n/i) or m/^\s*y/i) { -- unless ($have_sysconfig) { -- mkdir('/etc/sysconfig', 0777) -- or die "Sorry, can't create /etc/sysconfig ($!)"; -+ my $have_config = -f '/etc/conf.d/lm_sensors'; -+ print "\nDo you want to ".($have_config?"overwrite":"generate"). -+ " /etc/conf.d/lm_sensors? Enter s to specify other file name?\n", -+ " (".($have_config?"yes/NO":"YES/no")."/s): "; -+ my $reply = ; -+ -+ if (($have_config and $reply =~ /^\s*[Yy]/) or -+ (not $have_config and not $reply =~ /^\s*[Nn]/) or -+ $reply =~ /^\s*[Ss]/) { -+ my $filename = "/etc/conf.d/lm_sensors"; -+ if ($reply =~ /^\s*[Ss]/) { -+ print "Specify the file to store the configuration to: "; -+ $filename = ; - } -- open(local *SYSCONFIG, ">/etc/sysconfig/lm_sensors") -- or die "Sorry, can't create /etc/sysconfig/lm_sensors ($!)"; -+ open(SYSCONFIG, ">".$filename) -+ or die "Sorry, can't create $filename ($!)."; - print SYSCONFIG "# Generated by sensors-detect on " . scalar localtime() . "\n"; - print SYSCONFIG <<'EOT'; - # This file is sourced by /etc/init.d/lm_sensors and defines the modules to -@@ -5304,6 +5314,11 @@ - # BUS_MODULES for any required bus driver module (for example for I2C or SPI). - - EOT -+ print SYSCONFIG -+ "# Load modules at startup\n". -+ "LOADMODULES=yes\n\n". -+ "# Initialize sensors at startup\n". -+ "INITSENSORS=yes\n\n"; - print SYSCONFIG "BUS_MODULES=\"", join(" ", @{$bus_modules}), "\"\n" - if @{$bus_modules}; - print SYSCONFIG "HWMON_MODULES=\"", join(" ", @{$hwmon_modules}), "\"\n"; -@@ -5312,6 +5327,10 @@ - - # For compatibility reasons, modules are also listed individually as variables - # MODULE_0, MODULE_1, MODULE_2, etc. -+# Please note that the numbers in MODULE_X must start at 0 and increase in -+# steps of 1. Any number that is missing will make the init script skip the -+# rest of the modules. Use MODULE_X_ARGS for arguments. -+# - # You should use BUS_MODULES and HWMON_MODULES instead if possible. - - EOT -@@ -5321,10 +5340,7 @@ - $i++; - } - close(SYSCONFIG); -- -- print "Copy prog/init/lm_sensors.init to /etc/init.d/lm_sensors\n". -- "for initialization at boot time.\n" -- unless -f "/etc/init.d/lm_sensors"; -+ print "Done.\n"; - - if (-x "/sbin/insserv" && -f "/etc/init.d/lm_sensors") { - system("/sbin/insserv", "/etc/init.d/lm_sensors"); -@@ -5338,20 +5354,6 @@ - "kernel modules.\n\n"; - } - } else { -- print "To load everything that is needed, add this to one of the system\n". -- "initialization scripts (e.g. /etc/rc.d/rc.local):\n\n"; -- print "#----cut here----\n"; -- if (@{$bus_modules}) { -- print "# Adapter drivers\n"; -- print "modprobe $_\n" foreach (@{$bus_modules}); -- } -- print "# Chip drivers\n"; -- print "modprobe $_\n" foreach (@{$hwmon_modules}); -- print((-e '/usr/bin/sensors' ? -- "/usr/bin/sensors -s\n" : -- "/usr/local/bin/sensors -s\n"). -- "#----cut here----\n\n"); -- - print "If you have some drivers built into your kernel, the list above will\n". - "contain too many modules. Skip the appropriate ones! You really\n". - "should try these commands right now to make sure everything is\n". - diff --git a/sys-apps/lm_sensors/lm_sensors-3.1.0.ebuild b/sys-apps/lm_sensors/lm_sensors-3.1.0.ebuild deleted file mode 100644 index 2c12d9d..0000000 --- a/sys-apps/lm_sensors/lm_sensors-3.1.0.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-3.0.2.ebuild,v 1.2 2008/08/13 16:13:57 armin76 Exp $ - -inherit eutils flag-o-matic linux-info toolchain-funcs multilib - -DESCRIPTION="Hardware Monitoring user-space utilities" - -HOMEPAGE="http://www.lm-sensors.org/" -SRC_URI="http://dl.lm-sensors.org/lm-sensors/releases/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" - -IUSE="sensord" - -COMMON="sensord? ( net-analyzer/rrdtool )" -DEPEND="${COMMON} - sys-apps/sed" -RDEPEND="${COMMON} - dev-lang/perl - virtual/logger" - -pkg_setup() { - linux-info_pkg_setup - - if ! linux_chkconfig_present HWMON; then - eerror - eerror "${P} requires CONFIG_HWMON to be enabled." - eerror - die "CONFIG_HWMON not detected" - fi - if ! linux_chkconfig_present I2C_CHARDEV; then - ewarn - ewarn "sensors-detect requires CONFIG_I2C_CHARDEV to be enabled." - ewarn - fi - if ! linux_chkconfig_present I2C; then - ewarn - ewarn "${P} requires CONFIG_I2C to be enabled for most sensors." - ewarn - fi -} - -src_unpack() { - unpack ${A} - - cd "${S}" - epatch "${FILESDIR}"/${PN}-${PV}-sensors-detect-gentoo.patch - - if use sensord; then - sed -i -e 's:^# \(PROG_EXTRA\):\1:' "${S}"/Makefile - fi - - # Respect LDFLAGS - sed -i -e 's/\$(LIBDIR)$/\$(LIBDIR) \$(LDFLAGS)/g' Makefile - sed -i -e 's/\$(LIBSHSONAME) -o/$(LIBSHSONAME) \$(LDFLAGS) -o/g' lib/Module.mk -} - -src_compile() { - einfo - einfo "You may safely ignore any errors from compilation" - einfo "that contain \"No such file or directory\" references." - einfo - - filter-flags -fstack-protector - - emake CC=$(tc-getCC) \ - || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" PREFIX=/usr MANDIR=/usr/share/man LIBDIR=/usr/$(get_libdir) \ - install || die "emake install failed" - - newinitd "${FILESDIR}"/lm_sensors-3-init.d lm_sensors - newinitd "${FILESDIR}"/fancontrol-init.d fancontrol - - if use sensord; then - newconfd "${FILESDIR}"/sensord-conf.d sensord - newinitd "${FILESDIR}"/sensord-init.d sensord - fi - - dodoc CHANGES CONTRIBUTORS INSTALL README* - - dodoc doc/donations doc/fancontrol.txt doc/fan-divisors \ - doc/progs doc/temperature-sensors doc/vid - - dohtml doc/lm_sensors-FAQ.html doc/useful_addresses.html - - docinto chips - dodoc doc/chips/* - - docinto developers - dodoc doc/developers/applications -} - -pkg_postinst() { - elog - elog "Please run \`/usr/sbin/sensors-detect' in order to setup" - elog "/etc/conf.d/lm_sensors." - elog - elog "/etc/conf.d/lm_sensors is vital to the init-script." - elog "Please make sure you also add lm_sensors to the desired" - elog "runlevel. Otherwise your I2C modules won't get loaded" - elog "on the next startup." - elog - elog "You will also need to run the above command if you're upgrading from" - elog "<=${PN}-2, as the needed entries in /etc/conf.d/lm_sensors has" - elog "changed." - elog - elog "Be warned, the probing of hardware in your system performed by" - elog "sensors-detect could freeze your system. Also make sure you read" - elog "the documentation before running lm_sensors on IBM ThinkPads." - elog - elog "Please refer to the lm_sensors documentation for more information." - elog "(http://www.lm-sensors.org/wiki/Documentation)" - elog -} - -- 2.11.4.GIT