# HG changeset patch # User holger # Date 1263736145 -3600 # Node ID 356eee8f5b7820a49cba894404d65a37e36ef675 # Parent 7359d64fc2d25cdb4b4000788d56e7b383d46f58 remove old versions diff -r 7359d64fc2d2 -r 356eee8f5b78 app-admin/collectd/Manifest --- a/app-admin/collectd/Manifest Sat Jan 16 12:00:26 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -AUX collectd-4.4.2-ipvs.patch 1640 RMD160 2b76ac06ba80d3476e58c032afeb43f3693fa559 SHA1 1d122491b04a6711c2af58834ed5b27afee316f8 SHA256 5f5112b30c4209241e71ddcfc0a0781a13a94b5b13475b0898e0e04f65691aa3 -AUX collectd-4.4.2-libtool-compatibility.patch 539 RMD160 51e4fa64bf4e46ec20568c1e4001fad481d8a3d3 SHA1 242304facdd97f450cd5af01b89cbb7d0b2fcecf SHA256 64a08960230691bac9fbd1dc5f71da57e63ffa7a1ad0c4ee9587a675579d38d8 -AUX collectd-4.4.2-localstatedir.patch 326 RMD160 af64ae163399a4378586151a8449a58ea8df921f SHA1 7bbfdb7f1605077232804d255aeeb53aa6349002 SHA256 1129ab4006b900df2d81ace6eddb8e42f2a9eda99cb920fbd7ae7def25bfc730 -AUX collectd-4.4.2.confd 519 RMD160 f4f3a699b9e8ce3e11522a3a521089793824fffd SHA1 2477a4acab05455ea7e1072663dcb5c381f175a6 SHA256 f043ad355fd7f5d2f017207d6cec7be5ac8c27d12aca19f1fd6541ea230d24b6 -AUX collectd-4.4.2.initd 801 RMD160 3e195dba9144906e4a364635eb48236f35e81100 SHA1 b4fdf02ea754c6a6067b895213cb9b8ed4a8bb76 SHA256 edf081f989a38c77ec4f5de3050b8e7ee96a8a420e15ac02d1d0bb8546391c8d -DIST collectd-4.4.2.tar.bz2 931183 RMD160 d75efad3dbc13caeeaf3479764c09f5850e2431b SHA1 13c5658fc8975be4c5d99031999820efa4119eb0 SHA256 d977f58c03d31568a5f5b637cff7399c9be98dea116f0927d4d087350d48838c -EBUILD collectd-4.4.2.ebuild 5897 RMD160 492afe41ca886eb9c32a93eaf1217831459fdc88 SHA1 0926bd8ed372938e51f887442a68f0945316f38e SHA256 866f7de4e0896b580440ac4551a0818e507148f96436c816e982d055ca33f02a diff -r 7359d64fc2d2 -r 356eee8f5b78 app-admin/collectd/collectd-4.4.2.ebuild --- a/app-admin/collectd/collectd-4.4.2.ebuild Sat Jan 16 12:00:26 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,190 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit autotools eutils flag-o-matic linux-info - -DESCRIPTION="A small daemon which collects system performance statistics" -HOMEPAGE="http://collectd.org" - -SRC_URI="${HOMEPAGE}/files/${P}.tar.bz2" -LICENSE="GPL-2" - -SLOT="0" - -KEYWORDS="~amd64 ~x86" -HTTP_FLAGS="apache2 lighttpd nginx" -LIBVIRT_FLAGS="kvm openvz qemu xen" -IUSE="apcups dns email hal hddtemp ipmi ithreads lm_sensors - memcache mysql network nfs ntp nut perl rrdtool snmp - syslog vserver wifi ${HTTP_FLAGS} ${LIBVIRT_FLAGS} -" -HTTP_DEPEND=" - apache2? ( >=net-misc/curl-7.17.0 ) - lighttpd? ( >=net-misc/curl-7.17.0 ) - nginx? ( >=net-misc/curl-7.17.0 ) -" -LIBVIRT_DEPEND=" - kvm? ( >=app-emulation/libvirt-0.3.3 ) - openvz? ( >=app-emulation/libvirt-0.3.3 ) - qemu? ( >=app-emulation/libvirt-0.3.3 ) - xen? ( >=app-emulation/libvirt-0.3.3 ) -" -COMMON_DEPEND="${HTTP_DEPEND} ${LIBVIRT_DEPEND} - dns? ( >=net-libs/libpcap-0.9.8 ) - hal? ( >=sys-apps/hal-0.5.9.1-r3 ) - ipmi? ( >=sys-libs/openipmi-2.0.11 ) - lm_sensors? ( >=sys-apps/lm_sensors-2.10.4 ) - mysql? ( >=virtual/mysql-5.0 ) - perl? ( >=dev-lang/perl-5.8.8-r4 ) - nut? ( >=sys-power/nut-2.2.0 ) - rrdtool? ( >=net-analyzer/rrdtool-1.2.27 ) - snmp? ( >=net-analyzer/net-snmp-5.4.1-r3 ) -" -DEPEND="${COMMON_DEPEND} - sys-devel/libtool - >=dev-libs/libxml2-2.6.31 -" -RDEPEND="${COMMON_DEPEND} - apcups? ( >=sys-power/apcupsd-3.14.2 ) - !hal? ( >=sys-apps/dmidecode-2.9 ) - hddtemp? ( >=app-admin/hddtemp-0.3_beta15-r3 ) - memcache? ( >=net-misc/memcached-1.2.2-r2 ) - ntp? ( >=net-misc/ntp-4.2.4_p4 ) - syslog? ( virtual/logger ) -" - -pkg_setup() -{ - linux-info_pkg_setup - local flag - - (linux_chkconfig_present ACPI_BATTERY) \ - || ewarn "ACPI_BATTERY needs to be enabled in your kernel for the battery plug-in to work correctly" - (linux_chkconfig_present CPU_FREQ) \ - || ewarn "CPU_FREQ needs to be enabled in your kernel for the cpufreq plug-in to work correctly" - (linux_chkconfig_present SERIAL_CORE) \ - || ewarn "SERIAL_CORE needs to be enabled in your kernel for the serial plug-in to work correctly" - (linux_chkconfig_present SWAP) \ - || ewarn "SWAP needs to be enabled in your kernel for the swap plug-in to work correctly" - (use vserver) && !(linux_chkconfig_present IP_VS) \ - && ewarn "IP_VS should to be enabled in your kernel when the USE flag vserver is enabled" - - for flag in "${LIBVIRT_FLAGS}"; do - (use ${flag}) && !(built_with_use app-emulation/libvirt ${flag}) && \ - die "USE flag ${flag} requires that libvirt was compiled with the USE flag ${flag}" - done - - if (use perl); then - if (use ithreads); then - (built_with_use perl ithreads) \ - || die "The perl plug-in requires that libperl was compiled with the USE flag ithreads" - else - ewarn "The perl plug-in requires the ithreads USE flag." - fi - fi - - ((linux_chkconfig_present PROC_FS) && (linux_chkconfig_present SYSFS)) \ - || die "${P} requires that PROC_FS and SYSFS are enabled in your kernel" -} - -src_unpack() -{ - unpack ${A} - cd "${S}" - - ebegin "Applying sed no-automagic-patch" - sed -i -e '/^AC_PLUGIN/ s/\ [[].*[]],/[no],/' \ - configure.in \ - || die "sed no-automagic-patch failed" - eend 0 - - epatch "${FILESDIR}/${PN}-4.4.2-ipvs.patch" - epatch "${FILESDIR}/${PN}-4.4.2-localstatedir.patch" - epatch "${FILESDIR}/${PN}-4.4.2-libtool-compatibility.patch" - - ebegin "Remove provided libtool/libltdl" - rm -R ./libltdl \ - && rm config.guess config.sub install-sh ltmain.sh \ - || die "removing libtool failed" - eend 0 - - eautoreconf || die "eautoreconf failed" -} - -src_compile() -{ - local flag - local myconf - local no_check_plugins="csv df logfile multimeter tail users uuid" - local proc_sys_fs_plugins="battery cpu cpufreq disk entropy irq load memory processes serial swap vmem" - local network_plugins="interface iptables network ping teamspeak2 tcpconns unixsock" - - for flag in ${no_check_plugins} ${proc_sys_fs_plugins}; do - myconf+=" --enable-${flag}" - done - - if (use network); then - for flag in ${network_plugins}; do - myconf+=" --enable-${flag}" - done - fi - - myconf+=" - $(( use apache2 || use lighttpd ) && echo --enable-apache) - $(use_enable apcups) - $(use_enable dns) - $(use_enable hddtemp) - $(use_enable email) - $(use_enable ipmi) - $(use_enable vserver ipvs) - $(( use kvm || use openvz || use qemu || use xen ) && echo --enable-libvirt) - $(use_enable memcache memcached) - $(use_enable mysql) - $(use_enable nfs) - $(use_enable nginx) - $(use_enable ntp ntpd) - $(use_enable nut) - $(use_enable dns powerdns) - $(use_enable snmp) - $(use_enable syslog) - $(use_enable rrdtool) - $(use_enable vserver) - $(use_enable lm_sensors sensors) - $(use_enable wifi wireless)" - - myconf+=" - $(use ithreads && use_enable perl) - $(use_with perl perl-bindings)" - - KERNEL_DIR="${KERNEL_DIR}" econf \ - --localstatedir=/var ${myconf} \ - || die "econf failed" - - emake || die "emake failed" -} - -src_install() -{ - emake DESTDIR="${D}" install || die "emake install failed" - - dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed" - - insinto /usr/share/doc/${PF} - doins -r contrib || die "doins contrib failed" - - keepdir /var/lib/${PN} || die "keepdir failed" - - newinitd "${FILESDIR}/${PN}-4.4.2.initd" ${PN} || die "newinitd failed" - newconfd "${FILESDIR}/${PN}-4.4.2.confd" ${PN} || die "newconfd failed" -} - -pkg_postinst() -{ - einfo - einfo "collectd introduced some changes in the new 4.x series." - einfo "For further information, read ${HOMEPAGE}/migrate-v3-v4.shtml" - einfo "The migration script can be found at:" - einfo "/usr/share/doc/${PF}/contrib/migrate-3-4.px" - einfo -} diff -r 7359d64fc2d2 -r 356eee8f5b78 app-admin/collectd/files/collectd-4.4.2-ipvs.patch --- a/app-admin/collectd/files/collectd-4.4.2-ipvs.patch Sat Jan 16 12:00:26 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,70 +0,0 @@ ---- configure.in.orig 2008-08-05 -+++ configure.in 2008-08-05 -@@ -50,6 +50,18 @@ - esac - AC_MSG_RESULT([$ac_system]) - -+if test "x$ac_system" = "xLinux" -+then -+ AC_ARG_VAR([KERNEL_DIR], [path to Linux kernel sources]) -+ if test -z "$KERNEL_DIR" -+ then -+ KERNEL_DIR="/lib/modules/`uname -r`/source" -+ fi -+ -+ KERNEL_CFLAGS="-I$KERNEL_DIR/include" -+ AC_SUBST(KERNEL_CFLAGS) -+fi -+ - # - # Checks for header files. - # -@@ -278,8 +290,13 @@ - have_ip_vs_h="no" - if test "x$ac_system" = "xLinux" - then -+ SAVE_CFLAGS=$CFLAGS -+ CFLAGS="$CFLAGS $KERNEL_CFLAGS" -+ - AC_CHECK_HEADERS(net/ip_vs.h, [have_net_ip_vs_h="yes"]) - AC_CHECK_HEADERS(ip_vs.h, [have_ip_vs_h="yes"]) -+ -+ CFLAGS=$SAVE_CFLAGS - fi - - # For quota module -@@ -1599,15 +1616,6 @@ - LDFLAGS=$SAVE_LDFLAGS - fi - --if test "x$ac_system" = "xLinux" --then -- AC_ARG_VAR([KERNEL_DIR], [path to Linux kernel sources]) -- if test -z "$KERNEL_DIR" -- then -- KERNEL_DIR="/lib/modules/`uname -r`/source" -- fi --fi -- - with_own_libiptc="no" - AC_ARG_WITH(libiptc, [AS_HELP_STRING([--with-libiptc@<:@=PREFIX@:>@], [Path to libiptc.])], - [ -@@ -1653,7 +1661,7 @@ - if test "x$with_libiptc" = "xyes" - then - SAVE_CFLAGS=$CFLAGS -- CFLAGS="$CFLAGS -I$KERNEL_DIR/include" -+ CFLAGS="$CFLAGS $KERNEL_CFLAGS" - - AC_CHECK_HEADERS(linux/netfilter_ipv4/ip_tables.h linux/netfilter_ipv6/ip6_tables.h, [], - [ ---- src/Makefile.am.orig 2008-08-05 -+++ src/Makefile.am 2008-08-05 -@@ -311,6 +311,7 @@ - if BUILD_PLUGIN_IPVS - pkglib_LTLIBRARIES += ipvs.la - ipvs_la_SOURCES = ipvs.c -+ipvs_la_CFLAGS = $(KERNEL_CFLAGS) - ipvs_la_LDFLAGS = -module -avoid-version - collectd_LDADD += "-dlopen" ipvs.la - collectd_DEPENDENCIES += ipvs.la diff -r 7359d64fc2d2 -r 356eee8f5b78 app-admin/collectd/files/collectd-4.4.2-libtool-compatibility.patch --- a/app-admin/collectd/files/collectd-4.4.2-libtool-compatibility.patch Sat Jan 16 12:00:26 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ ---- configure.in.orig 2008-08-03 -+++ configure.in 2008-08-03 -@@ -22,7 +22,7 @@ - - dnl configure libtool - AC_DISABLE_STATIC --AC_LIBLTDL_CONVENIENCE -+AC_WITH_LTDL - AC_SUBST(LTDLINCL) - AC_SUBST(LIBLTDL) - AC_LIBTOOL_DLOPEN -@@ -30,7 +30,6 @@ - AC_PROG_LEX - AC_PROG_YACC - PKG_PROG_PKG_CONFIG --AC_CONFIG_SUBDIRS(libltdl) - - AC_MSG_CHECKING([for kernel type ($host_os)]) - case $host_os in ---- Makefile.am.orig 2008-08-03 -+++ Makefile.am 2008-08-03 -@@ -1,4 +1,4 @@ --SUBDIRS = libltdl src bindings -+SUBDIRS = src bindings - - INCLUDES = $(LTDLINCL) - diff -r 7359d64fc2d2 -r 356eee8f5b78 app-admin/collectd/files/collectd-4.4.2-localstatedir.patch --- a/app-admin/collectd/files/collectd-4.4.2-localstatedir.patch Sat Jan 16 12:00:26 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ ---- Makefile.am.orig 2008-08-07 -+++ Makefile.am 2008-08-07 -@@ -3,8 +3,3 @@ - INCLUDES = $(LTDLINCL) - - EXTRA_DIST = contrib version-gen.sh -- --install-exec-hook: -- $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run -- $(mkinstalldirs) $(DESTDIR)$(localstatedir)/lib/$(PACKAGE_NAME) -- $(mkinstalldirs) $(DESTDIR)$(localstatedir)/log diff -r 7359d64fc2d2 -r 356eee8f5b78 app-admin/collectd/files/collectd-4.4.2.confd --- a/app-admin/collectd/files/collectd-4.4.2.confd Sat Jan 16 12:00:26 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -# File used to store the PID file. Usually you won't need to touch it. -#COLLECTD_PIDFILE='/var/run/collectd.pid' - -# Nice value used to launch collectd, to change priority of the process. As -# you usually will want to run it in background, a default of 5 is used. -#COLLECTD_NICE='5' - -# Location of configuration file. Modify if you don't like the standard one. -#COLLECTD_CONFIG='/etc/collectd.conf' diff -r 7359d64fc2d2 -r 356eee8f5b78 app-admin/collectd/files/collectd-4.4.2.initd --- a/app-admin/collectd/files/collectd-4.4.2.initd Sat Jan 16 12:00:26 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,31 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -# Assign defaults to parameters from /etc/conf.d/collectd -: ${COLLECTD_PIDFILE:='/var/run/collectd.pid'} -: ${COLLECTD_NICE:='5'} -: ${COLLECTD_CONFIG:='/etc/collectd.conf'} - -depend() -{ - after logger net firewall dns \ - lm_sensors cpufreqd nfs apache lighttpd nginx mysql -} - -start() -{ - ebegin "Starting collectd" - start-stop-daemon --start --pidfile ${COLLECTD_PIDFILE} \ - --nice ${COLLECTD_NICE} --exec /usr/sbin/collectd \ - -- -P ${COLLECTD_PIDFILE} -C ${COLLECTD_CONFIG} - eend $? "Failed to start collectd" -} - -stop() -{ - ebegin "Stopping collectd" - start-stop-daemon --stop --pidfile ${COLLECTD_PIDFILE} - eend $? "Failed to stop collectd" -} diff -r 7359d64fc2d2 -r 356eee8f5b78 app-arch/pigz/Manifest --- a/app-arch/pigz/Manifest Sat Jan 16 12:00:26 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -AUX pigz-2.1.5-decode-symlinks-to-stdout.patch 512 RMD160 115ae0cdc4187b8cbc2282c3b36aca5f0b8ea5b1 SHA1 158f21fa736d9034b608d5b6fd452919f7d73e51 SHA256 067acf2075e80ef083dd730a557bff87efb39a80b49be760c84bfa4cd73047ce -AUX pigz-2.1.5-gunzip-compat.patch 630 RMD160 eb1ac6a99fe17fb6c9d7029912109630e5ec984b SHA1 98c4132001d2ab808e70a728c87c9afe2d549f42 SHA256 4a2b6acde824b15453a0647c7830f7444247606aece3979b6b85b90eeb7adef1 -AUX pigz-2.1.5-respect-flags.patch 404 RMD160 e444679d43a33f44c684d99ec782f825bef66bab SHA1 8557dea8496682fa9525278b314178f5c100c9b2 SHA256 8806680b9d1f4099f7f2caa803957b104f2df24bed49b0a41f696060b43b69c4 -DIST pigz-2.1.5.tar.gz 93788 RMD160 b02f012e9f87f9f69309574ef7000bf6242b2114 SHA1 9e169aa2f1b08be057760c03c480e64651fa3299 SHA256 ae1f16f1f84c963df512a24f5b676a776ffd95f059291547672917b2f818e53b -EBUILD pigz-2.1.5.ebuild 989 RMD160 4305c3bde1dad21490bd29e3513b73e4879e9701 SHA1 4110d612ee09351ba97ba0eefb90f3bde4efa71b SHA256 a79b2b9f18b73138f86de65b368987c7141355b5b1de2dbca6c6e6031a961751 diff -r 7359d64fc2d2 -r 356eee8f5b78 app-arch/pigz/files/pigz-2.1.5-decode-symlinks-to-stdout.patch --- a/app-arch/pigz/files/pigz-2.1.5-decode-symlinks-to-stdout.patch Sat Jan 16 12:00:26 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -diff -u pigz-2.1.5/pigz.c pigz-2.1.5-fix/pigz.c ---- pigz-2.1.5/pigz.c 2009-07-20 04:42:00.000000000 +0200 -+++ pigz-2.1.5-fix/pigz.c 2009-10-25 15:52:22.000000000 +0100 -@@ -2498,7 +2498,7 @@ - in); - return; - } -- if ((st.st_mode & S_IFMT) == S_IFLNK && !force) { -+ if ((st.st_mode & S_IFMT) == S_IFLNK && !force && !pipeout) { - if (verbosity > 0) - fprintf(stderr, "%s is a symbolic link -- skipping\n", in); - return; diff -r 7359d64fc2d2 -r 356eee8f5b78 app-arch/pigz/files/pigz-2.1.5-gunzip-compat.patch --- a/app-arch/pigz/files/pigz-2.1.5-gunzip-compat.patch Sat Jan 16 12:00:26 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ ---- ../pigz-2.1.5/pigz.c 2009-07-20 04:42:00.000000000 +0200 -+++ pigz.c 2009-11-24 10:50:13.000000000 +0100 -@@ -3075,9 +3075,17 @@ - if (argc < 2 && isatty(1)) - help(); - -- /* decompress if named "unpigz" */ -+ /* find program name */ - p = strrchr(argv[0], '/'); -- if (strcmp(p == NULL ? argv[0] : p + 1, "unpigz") == 0) -+ if (p == NULL) { -+ p = argv[0]; -+ } -+ else { -+ ++p; -+ } -+ -+ /* decompress if named "unpigz" or "gunzip" */ -+ if ((strcmp(p, "unpigz") == 0) || (strcmp(p, "gunzip") == 0)) - decode = 1, headis = 0; - - /* process command-line arguments */ diff -r 7359d64fc2d2 -r 356eee8f5b78 app-arch/pigz/files/pigz-2.1.5-respect-flags.patch --- a/app-arch/pigz/files/pigz-2.1.5-respect-flags.patch Sat Jan 16 12:00:26 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ -diff -U5 pigz-2.1.5.original/Makefile pigz-2.1.5/Makefile ---- pigz-2.1.5.original/Makefile 2009-10-27 22:41:31.000000000 -0600 -+++ pigz-2.1.5/Makefile 2009-10-27 22:42:45.000000000 -0600 -@@ -1,9 +1,7 @@ --CFLAGS=-O2 -- - pigz: pigz.o yarn.o -- cc -o pigz pigz.o yarn.o -lpthread -lz -+ $(CC) $(LDFLAGS) -o pigz pigz.o yarn.o -lpthread -lz - ln -f pigz unpigz - - pigz.o: pigz.c yarn.h - - yarn.o: yarn.c yarn.h diff -r 7359d64fc2d2 -r 356eee8f5b78 app-arch/pigz/pigz-2.1.5.ebuild --- a/app-arch/pigz/pigz-2.1.5.ebuild Sat Jan 16 12:00:26 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,41 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/pigz/pigz-2.1.5.ebuild,v 1.2 2009/11/02 17:58:48 vostorga Exp $ - -inherit eutils toolchain-funcs - -DESCRIPTION="A parallel implementation of gzip." -HOMEPAGE="http://www.zlib.net/pigz/" -SRC_URI="http://www.zlib.net/pigz/${P}.tar.gz" - -LICENSE="PIGZ" -SLOT="0" -KEYWORDS="~amd64 ~sparc ~x86" -IUSE="test symlink" - -RDEPEND="sys-libs/zlib" -DEPEND="${RDEPEND} - test? ( app-arch/ncompress )" - -src_unpack() { - unpack ${A} - epatch "${FILESDIR}"/${P}-respect-flags.patch - epatch "${FILESDIR}"/${P}-decode-symlinks-to-stdout.patch - epatch "${FILESDIR}"/${P}-gunzip-compat.patch -} - -src_compile() { - tc-export CC - emake || die "make failed" -} - -src_install() { - dobin ${PN} || die "Failed to install" - dosym /usr/bin/pigz /usr/bin/unpigz - dodoc README - - if use symlink; then - dosym /usr/bin/pigz /usr/bin/gzip - dosym /usr/bin/unpigz /usr/bin/gunzip - fi -} diff -r 7359d64fc2d2 -r 356eee8f5b78 media-gfx/graphicsmagick/Manifest --- a/media-gfx/graphicsmagick/Manifest Sat Jan 16 12:00:26 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -DIST GraphicsMagick-1.3.7.tar.bz2 6581207 RMD160 56a7408d2f3fc15be2859a0d5b3c42e0549faf0c SHA1 e65c4d799704245216821374f66de5796795c263 SHA256 0d2e8f81574efc7e16c05b72fc9a62a2ba333d6fa196bdb72f8fda8ce7a585fc -EBUILD graphicsmagick-1.3.7.ebuild 3000 RMD160 e1e5427162790a7061ca7cdda4a7f76a6a7b60b1 SHA1 4caa266b188ac6e6a393771c6c6eb6097ad074d6 SHA256 95dd7987620ab2b264326e45f810dfdb5144aa6a79ea77f2ab0ccb39a518ede4 diff -r 7359d64fc2d2 -r 356eee8f5b78 media-gfx/graphicsmagick/graphicsmagick-1.3.7.ebuild --- a/media-gfx/graphicsmagick/graphicsmagick-1.3.7.ebuild Sat Jan 16 12:00:26 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,116 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/graphicsmagick-1.3.7.ebuild,v 1.1 2009/11/24 00:20:48 bicatali Exp $ - -EAPI="2" - -inherit toolchain-funcs flag-o-matic perl-app - -MY_P=${P/graphicsm/GraphicsM} - -DESCRIPTION="Collection of tools and libraries for many image formats" -HOMEPAGE="http://www.graphicsmagick.org/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="bzip2 cxx debug fpx -gs imagemagick jbig +jpeg +jpeg2k lcms openmp - perl +png q16 q32 +svg +threads tiff +truetype X wmf zlib" - -RDEPEND="bzip2? ( app-arch/bzip2 ) - fpx? ( media-libs/libfpx ) - gs? ( virtual/ghostscript ) - jbig? ( media-libs/jbigkit ) - jpeg? ( media-libs/jpeg ) - jpeg2k? ( >=media-libs/jasper-1.701.0 ) - lcms? ( media-libs/lcms ) - perl? ( dev-lang/perl ) - png? ( media-libs/libpng ) - svg? ( dev-libs/libxml2 ) - tiff? ( >=media-libs/tiff-3.8.2 ) - truetype? ( >=media-libs/freetype-2.0 ) - wmf? ( media-libs/libwmf ) - X? ( x11-libs/libXext - x11-libs/libSM - x11-libs/libX11 - x11-libs/libICE ) - imagemagick? ( !media-gfx/imagemagick )" - -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if use openmp && - [[ $(tc-getCC)$ == *gcc* ]] && - ( [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] || - ! built_with_use sys-devel/gcc openmp ) - then - ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 " - ewarn "If you want to build fftw with OpenMP, abort now," - ewarn "and switch CC to an OpenMP capable compiler" - epause 5 - fi -} - -src_configure() { - local quantumDepth - if use q16 ; then - quantumDepth="16" - elif use q32 ; then - quantumDepth="32" - else - quantumDepth="8" - fi - - use debug && filter-flags -fomit-frame-pointer - - econf \ - --enable-shared \ - --enable-largefile \ - --without-included-ltdl \ - --without-frozenpaths \ - --with-modules \ - --with-quantum-depth=${quantumDepth} \ - $(use_enable debug ccmalloc) \ - $(use_enable debug prof) \ - $(use_enable debug gcov) \ - $(use_enable imagemagick magick-compat) \ - $(use_enable openmp) \ - $(use_with bzip2 bzlib) \ - $(use_with cxx magick-plus-plus) \ - $(use_with fpx) \ - $(use_with gs gslib) \ - $(use_with jbig) \ - $(use_with jpeg) \ - $(use_with jpeg2k jp2) \ - $(use_with lcms) \ - $(use_with perl) \ - $(use_with png) \ - $(use_with svg xml) \ - $(use_with threads) \ - $(use_with tiff) \ - $(use_with truetype ttf) \ - $(use_with wmf) \ - $(use_with X x) \ - $(use_with zlib) -} - -src_test() { - emake check || die "tests failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "Installation failed" - dodoc README.txt ChangeLog* NEWS.txt TODO.txt - - # Fix perllocal.pod file collision - use perl && fixlocalpod -} - -pkg_postinst() { - elog "For RAW image suport please install media-gfx/dcraw." - elog "For mpeg suport please install media-video/mpeg2vidcodec." - elog "To read gnuplot files please install sci-visualization/gnuplot." -} diff -r 7359d64fc2d2 -r 356eee8f5b78 sys-power/cpufrequtils/Manifest --- a/sys-power/cpufrequtils/Manifest Sat Jan 16 12:00:26 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -AUX cpufrequtils-006-build.patch 844 RMD160 494f3e1c6681ac01e922bf4a527a8b89f878ea4b SHA1 1266a39a756ee9a2972a47d7b5b5833168146428 SHA256 5b33a052abab8cf33913ffbf649707a238ec4c13320985933552c1a8b0761f9a -AUX cpufrequtils-006-nls.patch 1503 RMD160 e9508f2e11e52a8a90cd19dcb46ec8d8caf4d1b4 SHA1 54af00be7991ac4bbd8777254048639b6ab0f398 SHA256 74f01a677e50f0166054f025b595bf4ef82a8eb006713cc5e881b4cf763bb2f4 -AUX cpufrequtils-conf.d-006 277 RMD160 09bdd1c1b218f9aa9ce448b01eb0c9f0dc0613c2 SHA1 2befd01f2d527916eee5429920a083ea9543daa1 SHA256 602b65f6e9927bfb37a26a34c1b44bd4a87cdb2977b5547398e17432afe55727 -AUX cpufrequtils-init.d-006 531 RMD160 4bca2bc3868c3ef73bf53f3bbd83bd4c4a7164f4 SHA1 67d0fc02e59060358f5a82ea314830df19625524 SHA256 af83b2354bd8876efecd85762a61a40a4b498633e186cb85db7a22389936a2e6 -DIST cpufrequtils-006.tar.bz2 52315 RMD160 b60c1c897ca932c6251b1445a170c79da1e259ce SHA1 f6c824e446fd72d69c16867c6c1808d1baf5415e SHA256 b8e77854a1400b0cc73295f3ee5d0a0c3650438e677526a199e08f6680c15aa1 -EBUILD cpufrequtils-006.ebuild 1256 RMD160 f2fb61dda330c2245092d9b316b7861e754b398d SHA1 e8668ce2245795654c4ffc3f317fa0dc4c052180 SHA256 6e45cbc4f63286abc3bfb3e808bcac6a7e13bfd6b303a345cdf470f43186b658 diff -r 7359d64fc2d2 -r 356eee8f5b78 sys-power/cpufrequtils/cpufrequtils-006.ebuild --- a/sys-power/cpufrequtils/cpufrequtils-006.ebuild Sat Jan 16 12:00:26 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,48 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/cpufrequtils-005-r1.ebuild,v 1.5 2009/07/11 23:37:21 josejx Exp $ - -inherit eutils toolchain-funcs multilib - -DESCRIPTION="Userspace utilities for the Linux kernel cpufreq subsystem" -HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html" -SRC_URI="mirror://kernel/linux/utils/kernel/cpufreq/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm ppc ppc64 sparc x86" -IUSE="debug nls" - -DEPEND="sys-fs/sysfsutils" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-build.patch - epatch "${FILESDIR}"/${P}-nls.patch #205576 -} - -ft() { use $1 && echo true || echo false ; } - -src_compile() { - emake \ - OPTIMIZATION= V=true \ - DEBUG=$(ft debug) \ - NLS=$(ft nls) \ - CC=$(tc-getCC) LD=$(tc-getCC) AR=$(tc-getAR) STRIP=echo RANLIB=$(tc-getRANLIB) \ - || die "emake failed" -} - -src_install() { - emake \ - DESTDIR="${D}" \ - NLS=$(ft nls) \ - mandir=/usr/share/man \ - libdir=/usr/$(get_libdir) \ - install || die "make install failed" - - newconfd "${FILESDIR}"/${PN}-conf.d-006 ${PN} - newinitd "${FILESDIR}"/${PN}-init.d-006 ${PN} - - dodoc AUTHORS README -} diff -r 7359d64fc2d2 -r 356eee8f5b78 sys-power/cpufrequtils/files/cpufrequtils-006-build.patch --- a/sys-power/cpufrequtils/files/cpufrequtils-006-build.patch Sat Jan 16 12:00:26 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ ---- Makefile -+++ Makefile -@@ -158,10 +158,10 @@ endif - - # if DEBUG is enabled, then we do not strip or optimize - ifeq ($(strip $(DEBUG)),true) -- CFLAGDEF += -O1 -g -DDEBUG -+ CFLAGDEF += -DDEBUG - STRIPCMD = /bin/true -Since_we_are_debugging - else -- CFLAGDEF += $(OPTIMIZATION) -fomit-frame-pointer -+ CFLAGDEF += $(OPTIMIZATION) - STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment - endif - -@@ -191,7 +191,7 @@ libcpufreq: libcpufreq.la - - cpufreq-%: libcpufreq.la $(UTIL_OBJS) - $(QUIET) $(CC) $(CFLAGDEF) $(CFLAGS) -g -I. -I./lib/ -c -o utils/$@.o utils/$*.c -- $(QUIET) $(CC) $(CFLAGDEF) $(CFLAGS) -g -I./lib/ -L. -L./.libs/ -lcpufreq -o $@ utils/$@.o -+ $(QUIET) $(CC) $(CFLAGDEF) $(CFLAGS) -g $(LDFLAGS) -I./lib/ -L. -L./.libs/ -o $@ utils/$@.o -lcpufreq - $(QUIET) $(STRIPCMD) $@ - - utils: cpufreq-info cpufreq-set diff -r 7359d64fc2d2 -r 356eee8f5b78 sys-power/cpufrequtils/files/cpufrequtils-006-nls.patch --- a/sys-power/cpufrequtils/files/cpufrequtils-006-nls.patch Sat Jan 16 12:00:26 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,67 +0,0 @@ ---- cpufrequtils-006/Makefile -+++ cpufrequtils-006/Makefile -@@ -147,6 +147,7 @@ - ifeq ($(strip $(NLS)),true) - INSTALL_NLS += install-gmo - COMPILE_NLS += update-gmo -+ CFLAGDEF += -DNLS - endif - - ifeq ($(strip $(CPUFRQ_BENCH)),true) ---- cpufrequtils-006/utils/info.c -+++ cpufrequtils-006/utils/info.c -@@ -10,7 +10,6 @@ - #include - #include - #include --#include - #include - - #include -@@ -18,9 +17,18 @@ - #include "cpufreq.h" - - -+#ifdef NLS -+#include - #define _(String) gettext (String) - #define gettext_noop(String) String - #define N_(String) gettext_noop (String) -+#else -+#define gettext_noop(String) String -+#define _(String) gettext_noop (String) -+#define gettext(String) gettext_noop (String) -+#define N_(String) gettext_noop (String) -+#define textdomain(String) -+#endif - - #define LINE_LEN 10 - ---- cpufrequtils-006/utils/set.c -+++ cpufrequtils-006/utils/set.c -@@ -12,16 +12,24 @@ - #include - #include - #include --#include - #include - - #include - - #include "cpufreq.h" - -+#ifdef NLS -+#include - #define _(String) gettext(String) - #define gettext_noop(String) String - #define N_(String) gettext_noop(String) -+#else -+#define gettext_noop(String) String -+#define _(String) gettext_noop (String) -+#define gettext(String) gettext_noop (String) -+#define N_(String) gettext_noop (String) -+#define textdomain(String) -+#endif - - #define NORM_FREQ_LEN 32 - diff -r 7359d64fc2d2 -r 356eee8f5b78 sys-power/cpufrequtils/files/cpufrequtils-conf.d-006 --- a/sys-power/cpufrequtils/files/cpufrequtils-conf.d-006 Sat Jan 16 12:00:26 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -# /etc/conf.d/cpufrequtils: config file for /etc/init.d/cpufrequtils - -# Options when starting cpufreq (given to the `cpufreq-set` program) -START_OPTS="--governor ondemand" - -# Options when stopping cpufreq (given to the `cpufreq-set` program) -STOP_OPTS="--governor performance" diff -r 7359d64fc2d2 -r 356eee8f5b78 sys-power/cpufrequtils/files/cpufrequtils-init.d-006 --- a/sys-power/cpufrequtils/files/cpufrequtils-init.d-006 Sat Jan 16 12:00:26 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/files/cpufrequtils-init.d-005,v 1.2 2008/10/21 21:20:59 vapier Exp $ - -affect_change() { - local c ret=0 - ebegin "Running cpufreq-set $*" - for c in $(cpufreq-info -o | awk '$1 == "CPU" { print $2 }') ; do - cpufreq-set -c ${c} $* - : $((ret+=$?)) - done - eend ${ret} -} - -start() { - affect_change ${START_OPTS} -} - -stop() { - affect_change ${STOP_OPTS} -}