From a875af6b67ccc4e7959af513e54cef8baac29603 Mon Sep 17 00:00:00 2001 From: Sergey Popov Date: Wed, 7 Sep 2011 21:52:54 +0400 Subject: [PATCH] initial commit --- app-emulation/qemu/Manifest | 6 + .../files/qemu-0.11.0-mips64-user-fix.patch | 11 + app-emulation/qemu/files/qemu-ifdown | 20 + app-emulation/qemu/files/qemu-ifup | 22 + app-emulation/qemu/metadata.xml | 19 + app-emulation/qemu/qemu-0.11.1-r9999.ebuild | 155 ++ app-pda/synce-librtfcomp/Manifest | 2 + .../synce-librtfcomp-1.1.ebuild | 23 + app-portage/findcruft/Manifest | 3 + .../findcruft/findcruft-1.0.4-r1.ebuild | 33 + dev-libs/ace/Manifest | 5 + dev-libs/ace/ace-5.7.2-r9999.ebuild | 86 + .../ace-missing-refcountable-header.patch | 26 + games-action/babylon-mediavps/Manifest | 4 + .../babylon-mediavps-3.4.2.ebuild | 67 + games-action/freespace2-data/Manifest | 1 + .../freespace2-data-1.0.ebuild | 73 + games-action/freespace2-mediavps/Manifest | 7 + .../freespace2-mediavps-3.6.10.ebuild | 48 + games-action/fs2_launcher/Manifest | 1 + .../fs2_launcher/fs2_launcher-152.ebuild | 63 + games-action/fs2_open/Manifest | 6 + games-action/fs2_open/fs2_open-3.6.10.ebuild | 108 ++ games-arcade/mars-bin/Manifest | 2 + games-arcade/mars-bin/mars-bin-0.7.1.ebuild | 69 + games-emulation/mednafen/Manifest | 3 + .../mednafen/files/mednafen-ipv6.patch | 55 + .../mednafen/mednafen-0.9.17-r9999.ebuild | 67 + games-emulation/pcsx-r/Manifest | 3 + .../pcsx-r/files/pcsx-r-datadir.patch | 37 + games-emulation/pcsx-r/pcsx-r-1.9.92.ebuild | 67 + games-strategy/hedgewars/Manifest | 2 + .../hedgewars/hedgewars-0.9.15-r9999.ebuild | 60 + kde-base/kdeplasma-addons/Manifest | 6 + .../files/kdeplasma-addons-4.5.56-cmake.patch | 47 + .../files/kdeplasma-addons-semantic-fix.patch | 36 + .../kdeplasma-addons-4.6.0-r9999.ebuild | 80 + .../kdeplasma-addons-4.6.1-r9999.ebuild | 80 + kde-misc/ihatethecashew/Manifest | 3 + .../ihatethecashew/files/kde-4.6-compat.patch | 11 + .../ihatethecashew-0.4-r9999.ebuild | 31 + media-libs/sdl-net/Manifest | 3 + .../files/sdl-net-1.2.7-ipv6-new.patch | 1410 +++++++++++++++++ media-libs/sdl-net/sdl-net-1.2.7-r9999.ebuild | 50 + net-firewall/nuapplet/Manifest | 2 + net-firewall/nuapplet/nuapplet-2.2.ebuild | 11 + net-firewall/nucentral/Manifest | 2 + .../nucentral/nucentral-1.0_beta1.ebuild | 39 + net-firewall/nufw/Manifest | 8 + net-firewall/nufw/files/nuauth-conf.d | 2 + net-firewall/nufw/files/nuauth-init.d | 26 + net-firewall/nufw/files/nufw-conf.d | 2 + net-firewall/nufw/files/nufw-init.d | 17 + net-firewall/nufw/nufw-2.4.0.ebuild | 106 ++ net-firewall/nufw/nufw-2.4.3.ebuild | 106 ++ net-ftp/tftp-hpa/Manifest | 6 + net-ftp/tftp-hpa/files/in.tftpd.confd-0.44 | 15 + net-ftp/tftp-hpa/files/in.tftpd.rc6 | 20 + .../files/tftp-hpa-5.0-filecase.patch | 91 ++ net-ftp/tftp-hpa/files/tftp.xinetd | 10 + net-ftp/tftp-hpa/tftp-hpa-5.0-r1.ebuild | 46 + net-misc/gns3/Manifest | 4 + .../files/gns3-0.7.2_set_dynamips_path.patch | 12 + .../gns3/files/gns3-0.7.2_set_qemu_path.patch | 12 + net-misc/gns3/gns3-0.7.2.ebuild | 54 + net-misc/knemo/ChangeLog | 176 ++ net-misc/knemo/Manifest | 3 + net-misc/knemo/knemo-0.4.8.ebuild | 35 + profiles/repo_name | 1 + sets.conf | 4 + sets/kdebase-apps-fix-konq-plugins | 14 + sets/kdebase-runtime-without-semantic-desktop | 38 + sets/kdebase-without-semantic-desktop | 5 + sys-devel/spl/Manifest | 4 + .../spl/files/spl-0.6.0-includedir.patch | 26 + sys-devel/spl/spl-0.6.0_rc5.ebuild | 46 + sys-devel/spl/spl-9999.ebuild | 43 + sys-fs/zfs/Manifest | 5 + sys-fs/zfs/files/zfs-0.6.0-includedir.patch | 13 + sys-fs/zfs/files/zfs.initd | 98 ++ sys-fs/zfs/zfs-0.6.0_rc5.ebuild | 67 + sys-fs/zfs/zfs-9999.ebuild | 66 + x11-drivers/nvidia-drivers/Manifest | 17 + x11-drivers/nvidia-drivers/files/09nvidia | 2 + .../files/256.35-unified-arch.patch | 31 + .../files/NVIDIA_glx-defines.patch | 11 + .../files/NVIDIA_glx-glheader.patch | 13 + .../files/eblits/donvidia.eblit | 21 + .../files/eblits/mtrr_check.eblit | 19 + .../files/eblits/src_install-libs.eblit | 116 ++ .../files/eblits/want_tls.eblit | 33 + x11-drivers/nvidia-drivers/files/libGL.la-r2 | 32 + x11-drivers/nvidia-drivers/files/nvidia | 40 + .../nvidia-drivers/files/nvidia-169.07 | 14 + .../nvidia-drivers-260.19.44-2.6.39.patch | 14 + .../files/nvidia-drivers-3.0.patch | 27 + .../nvidia-drivers-270.41.19-r9999.ebuild | 545 +++++++ x11-libs/libxcb/Manifest | 3 + x11-libs/libxcb/files/xcb-rebuilder.sh | 68 + x11-libs/libxcb/libxcb-1.7-r9999.ebuild | 33 + x11-misc/cairo-dock-plugins/ChangeLog | 70 + x11-misc/cairo-dock-plugins/Manifest | 7 + .../cairo-dock-plugins-2.1.3.9.ebuild | 83 + .../cairo-dock-plugins-2.2.0.4.ebuild | 90 ++ .../cairo-dock-plugins-9999.ebuild | 73 + x11-misc/cairo-dock-plugins/metadata.xml | 25 + x11-misc/cairo-dock/ChangeLog | 116 ++ x11-misc/cairo-dock/Manifest | 11 + x11-misc/cairo-dock/cairo-dock-2.1.3.9.ebuild | 73 + x11-misc/cairo-dock/cairo-dock-2.2.0.4.ebuild | 75 + x11-misc/cairo-dock/cairo-dock-9999.ebuild | 61 + .../files/cairo-dock-2.2.0.4-rpath.patch | 14 + .../files/cairo-dock-missing-header.patch | 10 + .../cairo-dock/files/cairo-dock-pot-fix.patch | 66 + .../files/cairo-dock-safe-cflags.patch | 12 + x11-misc/cairo-dock/metadata.xml | 11 + x11-misc/gxneur/Manifest | 2 + x11-misc/gxneur/gxneur-0.12.0.ebuild | 43 + x11-misc/gxneur/gxneur-0.13.0.ebuild | 44 + x11-misc/xneur/Manifest | 2 + x11-misc/xneur/xneur-0.12.0.ebuild | 91 ++ x11-misc/xneur/xneur-0.13.0.ebuild | 92 ++ 122 files changed, 6256 insertions(+) create mode 100644 app-emulation/qemu/Manifest create mode 100644 app-emulation/qemu/files/qemu-0.11.0-mips64-user-fix.patch create mode 100644 app-emulation/qemu/files/qemu-ifdown create mode 100644 app-emulation/qemu/files/qemu-ifup create mode 100644 app-emulation/qemu/metadata.xml create mode 100644 app-emulation/qemu/qemu-0.11.1-r9999.ebuild create mode 100644 app-pda/synce-librtfcomp/Manifest create mode 100644 app-pda/synce-librtfcomp/synce-librtfcomp-1.1.ebuild create mode 100644 app-portage/findcruft/Manifest create mode 100644 app-portage/findcruft/findcruft-1.0.4-r1.ebuild create mode 100644 dev-libs/ace/Manifest create mode 100644 dev-libs/ace/ace-5.7.2-r9999.ebuild create mode 100644 dev-libs/ace/files/ace-missing-refcountable-header.patch create mode 100644 games-action/babylon-mediavps/Manifest create mode 100644 games-action/babylon-mediavps/babylon-mediavps-3.4.2.ebuild create mode 100644 games-action/freespace2-data/Manifest create mode 100644 games-action/freespace2-data/freespace2-data-1.0.ebuild create mode 100644 games-action/freespace2-mediavps/Manifest create mode 100644 games-action/freespace2-mediavps/freespace2-mediavps-3.6.10.ebuild create mode 100644 games-action/fs2_launcher/Manifest create mode 100644 games-action/fs2_launcher/fs2_launcher-152.ebuild create mode 100644 games-action/fs2_open/Manifest create mode 100644 games-action/fs2_open/fs2_open-3.6.10.ebuild create mode 100644 games-arcade/mars-bin/Manifest create mode 100644 games-arcade/mars-bin/mars-bin-0.7.1.ebuild create mode 100644 games-emulation/mednafen/Manifest create mode 100644 games-emulation/mednafen/files/mednafen-ipv6.patch create mode 100644 games-emulation/mednafen/mednafen-0.9.17-r9999.ebuild create mode 100644 games-emulation/pcsx-r/Manifest create mode 100644 games-emulation/pcsx-r/files/pcsx-r-datadir.patch create mode 100644 games-emulation/pcsx-r/pcsx-r-1.9.92.ebuild create mode 100644 games-strategy/hedgewars/Manifest create mode 100644 games-strategy/hedgewars/hedgewars-0.9.15-r9999.ebuild create mode 100644 kde-base/kdeplasma-addons/Manifest create mode 100644 kde-base/kdeplasma-addons/files/kdeplasma-addons-4.5.56-cmake.patch create mode 100644 kde-base/kdeplasma-addons/files/kdeplasma-addons-semantic-fix.patch create mode 100644 kde-base/kdeplasma-addons/kdeplasma-addons-4.6.0-r9999.ebuild create mode 100644 kde-base/kdeplasma-addons/kdeplasma-addons-4.6.1-r9999.ebuild create mode 100644 kde-misc/ihatethecashew/Manifest create mode 100644 kde-misc/ihatethecashew/files/kde-4.6-compat.patch create mode 100644 kde-misc/ihatethecashew/ihatethecashew-0.4-r9999.ebuild create mode 100644 media-libs/sdl-net/Manifest create mode 100644 media-libs/sdl-net/files/sdl-net-1.2.7-ipv6-new.patch create mode 100644 media-libs/sdl-net/sdl-net-1.2.7-r9999.ebuild create mode 100644 net-firewall/nuapplet/Manifest create mode 100644 net-firewall/nuapplet/nuapplet-2.2.ebuild create mode 100644 net-firewall/nucentral/Manifest create mode 100644 net-firewall/nucentral/nucentral-1.0_beta1.ebuild create mode 100644 net-firewall/nufw/Manifest create mode 100644 net-firewall/nufw/files/nuauth-conf.d create mode 100644 net-firewall/nufw/files/nuauth-init.d create mode 100644 net-firewall/nufw/files/nufw-conf.d create mode 100644 net-firewall/nufw/files/nufw-init.d create mode 100644 net-firewall/nufw/nufw-2.4.0.ebuild create mode 100644 net-firewall/nufw/nufw-2.4.3.ebuild create mode 100644 net-ftp/tftp-hpa/Manifest create mode 100644 net-ftp/tftp-hpa/files/in.tftpd.confd-0.44 create mode 100644 net-ftp/tftp-hpa/files/in.tftpd.rc6 create mode 100644 net-ftp/tftp-hpa/files/tftp-hpa-5.0-filecase.patch create mode 100644 net-ftp/tftp-hpa/files/tftp.xinetd create mode 100644 net-ftp/tftp-hpa/tftp-hpa-5.0-r1.ebuild create mode 100644 net-misc/gns3/Manifest create mode 100644 net-misc/gns3/files/gns3-0.7.2_set_dynamips_path.patch create mode 100644 net-misc/gns3/files/gns3-0.7.2_set_qemu_path.patch create mode 100644 net-misc/gns3/gns3-0.7.2.ebuild create mode 100644 net-misc/knemo/ChangeLog create mode 100644 net-misc/knemo/Manifest create mode 100644 net-misc/knemo/knemo-0.4.8.ebuild create mode 100644 profiles/repo_name create mode 100644 sets.conf create mode 100644 sets/kdebase-apps-fix-konq-plugins create mode 100644 sets/kdebase-runtime-without-semantic-desktop create mode 100644 sets/kdebase-without-semantic-desktop create mode 100644 sys-devel/spl/Manifest create mode 100644 sys-devel/spl/files/spl-0.6.0-includedir.patch create mode 100644 sys-devel/spl/spl-0.6.0_rc5.ebuild create mode 100644 sys-devel/spl/spl-9999.ebuild create mode 100644 sys-fs/zfs/Manifest create mode 100644 sys-fs/zfs/files/zfs-0.6.0-includedir.patch create mode 100644 sys-fs/zfs/files/zfs.initd create mode 100644 sys-fs/zfs/zfs-0.6.0_rc5.ebuild create mode 100644 sys-fs/zfs/zfs-9999.ebuild create mode 100644 x11-drivers/nvidia-drivers/Manifest create mode 100644 x11-drivers/nvidia-drivers/files/09nvidia create mode 100644 x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch create mode 100644 x11-drivers/nvidia-drivers/files/NVIDIA_glx-defines.patch create mode 100644 x11-drivers/nvidia-drivers/files/NVIDIA_glx-glheader.patch create mode 100644 x11-drivers/nvidia-drivers/files/eblits/donvidia.eblit create mode 100644 x11-drivers/nvidia-drivers/files/eblits/mtrr_check.eblit create mode 100644 x11-drivers/nvidia-drivers/files/eblits/src_install-libs.eblit create mode 100644 x11-drivers/nvidia-drivers/files/eblits/want_tls.eblit create mode 100644 x11-drivers/nvidia-drivers/files/libGL.la-r2 create mode 100644 x11-drivers/nvidia-drivers/files/nvidia create mode 100644 x11-drivers/nvidia-drivers/files/nvidia-169.07 create mode 100644 x11-drivers/nvidia-drivers/files/nvidia-drivers-260.19.44-2.6.39.patch create mode 100644 x11-drivers/nvidia-drivers/files/nvidia-drivers-3.0.patch create mode 100644 x11-drivers/nvidia-drivers/nvidia-drivers-270.41.19-r9999.ebuild create mode 100644 x11-libs/libxcb/Manifest create mode 100755 x11-libs/libxcb/files/xcb-rebuilder.sh create mode 100644 x11-libs/libxcb/libxcb-1.7-r9999.ebuild create mode 100644 x11-misc/cairo-dock-plugins/ChangeLog create mode 100644 x11-misc/cairo-dock-plugins/Manifest create mode 100644 x11-misc/cairo-dock-plugins/cairo-dock-plugins-2.1.3.9.ebuild create mode 100644 x11-misc/cairo-dock-plugins/cairo-dock-plugins-2.2.0.4.ebuild create mode 100644 x11-misc/cairo-dock-plugins/cairo-dock-plugins-9999.ebuild create mode 100644 x11-misc/cairo-dock-plugins/metadata.xml create mode 100644 x11-misc/cairo-dock/ChangeLog create mode 100644 x11-misc/cairo-dock/Manifest create mode 100644 x11-misc/cairo-dock/cairo-dock-2.1.3.9.ebuild create mode 100644 x11-misc/cairo-dock/cairo-dock-2.2.0.4.ebuild create mode 100644 x11-misc/cairo-dock/cairo-dock-9999.ebuild create mode 100644 x11-misc/cairo-dock/files/cairo-dock-2.2.0.4-rpath.patch create mode 100644 x11-misc/cairo-dock/files/cairo-dock-missing-header.patch create mode 100644 x11-misc/cairo-dock/files/cairo-dock-pot-fix.patch create mode 100644 x11-misc/cairo-dock/files/cairo-dock-safe-cflags.patch create mode 100644 x11-misc/cairo-dock/metadata.xml create mode 100644 x11-misc/gxneur/Manifest create mode 100644 x11-misc/gxneur/gxneur-0.12.0.ebuild create mode 100644 x11-misc/gxneur/gxneur-0.13.0.ebuild create mode 100644 x11-misc/xneur/Manifest create mode 100644 x11-misc/xneur/xneur-0.12.0.ebuild create mode 100644 x11-misc/xneur/xneur-0.13.0.ebuild diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest new file mode 100644 index 0000000..9ed501e --- /dev/null +++ b/app-emulation/qemu/Manifest @@ -0,0 +1,6 @@ +AUX qemu-0.11.0-mips64-user-fix.patch 313 RMD160 db016e0a48990a435dd6cf6e807145b33ada4908 SHA1 2ea913b1bcd29734a6d4011794bdb4aa3599a184 SHA256 b4173fc177bd0d0ba67f5551a3512047a19a9b2c0a122f968e32fbd834848d2f +AUX qemu-ifdown 478 RMD160 2187fbf352e6b84686f0cf0e9e9ebe5d26359858 SHA1 1daccb4785fe503687562798f90be1414267e27d SHA256 7d90c39184fd7531d9b8ae787122b68ac768b41afeb0ef2b3baa6461f77af03d +AUX qemu-ifup 554 RMD160 9769d79ab6456bdd7e3e689005f629e2a67b858d SHA1 dde2b27acabe6fe23ca40f90ff6950bb12a4b506 SHA256 eae9b50680442acc29c65a245a2d26a63756ad4cb894e08cb5ea249686801f1d +DIST qemu-0.11.1.tar.gz 3830070 RMD160 4da00fa6c01d7ff6af0ee781bc9260da577ea7d3 SHA1 7b983cd18f44c6e7627532b662f010389d3bcdff SHA256 2ecd2fc0af2ce5d96067ae82cc98a08275c596de53fc929484bedee1d6e7893a +EBUILD qemu-0.11.1-r9999.ebuild 5074 RMD160 a9e12eb15c6d9907443d559df8c41a2bd18c1583 SHA1 9497f91fa8be112fd365ebdc372befe69129a500 SHA256 b9dbcadf87106364e405bc94294d383063b65a2ecee57b42d281ab77a6ca7189 +MISC metadata.xml 910 RMD160 da1d7ba61d401bb22fc22be931b27be432d6d103 SHA1 6ffb7c25e19589933bd016d80a16284ae8df436c SHA256 6a27d48cbcc5a90f1464e302252ea10813317ddcb7bdd2e1e5cb927760a5640d diff --git a/app-emulation/qemu/files/qemu-0.11.0-mips64-user-fix.patch b/app-emulation/qemu/files/qemu-0.11.0-mips64-user-fix.patch new file mode 100644 index 0000000..c069f89 --- /dev/null +++ b/app-emulation/qemu/files/qemu-0.11.0-mips64-user-fix.patch @@ -0,0 +1,11 @@ +--- qemu-0.11.0.orig/linux-user/main.c 2009-10-23 02:19:57.000000000 +0200 ++++ qemu-0.11.0/linux-user/main.c 2009-10-23 02:47:09.000000000 +0200 +@@ -1469,6 +1469,8 @@ + + #ifdef TARGET_MIPS + ++#define TARGET_QEMU_ESIGRETURN 255 ++ + #define MIPS_SYS(name, args) args, + + static const uint8_t mips_syscall_args[] = { diff --git a/app-emulation/qemu/files/qemu-ifdown b/app-emulation/qemu/files/qemu-ifdown new file mode 100644 index 0000000..c173e43 --- /dev/null +++ b/app-emulation/qemu/files/qemu-ifdown @@ -0,0 +1,20 @@ +#!/bin/sh + +if [ -x /sbin/brctl ]; then + BRCTL="/sbin/brctl" +elif [ -x /usr/sbin/brctl ]; then + BRCTL="/usr/sbin/brctl" +else + echo "no bridge utils installed" + exit 1 +fi + +if [ -x /sbin/ip ]; then + switch=( $(/sbin/ip route list | awk '/^default / { sub(/.* dev /, ""); print $1 }') ) + ${BRCTL} delif ${switch} $1 + /sbin/ip link set $1 down +else + switch=( $(/bin/netstat -rn | awk '/^0\.0\.0\.0/ { print $NF }') ) + ${BRCTL} delif ${switch} $1 + /sbin/ifconfig $1 down +fi diff --git a/app-emulation/qemu/files/qemu-ifup b/app-emulation/qemu/files/qemu-ifup new file mode 100644 index 0000000..4a30e7d --- /dev/null +++ b/app-emulation/qemu/files/qemu-ifup @@ -0,0 +1,22 @@ +#!/bin/sh + +if [ -x /sbin/brctl ]; then + BRCTL="/sbin/brctl" +elif [ -x /usr/sbin/brctl ]; then + BRCTL="/usr/sbin/brctl" +else + echo "no bridge utils installed" + exit 1 +fi + +if [ -x /sbin/ip ]; then + switch=( $(/sbin/ip route list | awk '/^default / { sub(/.* dev /, ""); print $1 }') ) + /sbin/ip link set $1 up +else + switch=( $(/bin/netstat -rn | awk '/^0\.0\.0\.0/ { print $NF }') ) + /sbin/ifconfig $1 0.0.0.0 up +fi + +[[ ${switch#} -ne "1" ]] && logger -t qemu "$0 found more than one bridge connecting $1 to ${switch}" +${BRCTL} addif ${switch} $1 + diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml new file mode 100644 index 0000000..75cd191 --- /dev/null +++ b/app-emulation/qemu/metadata.xml @@ -0,0 +1,19 @@ + + + +qemu + + lu_zero@gentoo.org + + + Enables the kernel acceleration module on a x86/x86-64 cpu + Use the KVM (Kernel Virtual Machine) infrastructure on compatible hardware + Enable alsa output for sound emulation + Enable esound output for sound emulation + Enable TLS support for the VNC console server + Enable the ncurses-based console + Enable pulseaudio output for sound emulation + Enable the SDL-based console + Enable Virtual Distributed Ethernet (VDE) based networking + + diff --git a/app-emulation/qemu/qemu-0.11.1-r9999.ebuild b/app-emulation/qemu/qemu-0.11.1-r9999.ebuild new file mode 100644 index 0000000..1e743e7 --- /dev/null +++ b/app-emulation/qemu/qemu-0.11.1-r9999.ebuild @@ -0,0 +1,155 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-0.11.1.ebuild,v 1.3 2010/06/30 21:46:32 truedfx Exp $ + +EAPI="2" + +inherit eutils flag-o-matic toolchain-funcs linux-info + +DESCRIPTION="QEMU emulator and ABI wrapper" +HOMEPAGE="http://www.qemu.org" +SRC_URI="http://download.savannah.gnu.org/releases/qemu/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="alsa bluetooth esd gnutls ncurses pulseaudio sasl +sdl vde kqemu kvm" + +COMMON_TARGETS="i386 x86_64 arm cris m68k mips mipsel mips64 mips64el ppc ppc64 sh4 sh4eb sparc" + +IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} ppcemb" +IUSE_USER_TARGETS="${COMMON_TARGETS} alpha armeb ppc64abi32 sparc64 sparc32plus" + +for target in ${IUSE_SOFTMMU_TARGETS}; do + IUSE="${IUSE} +qemu_softmmu_targets_${target}" +done + +for target in ${IUSE_USER_TARGETS}; do + IUSE="${IUSE} +qemu_user_targets_${target}" +done + +RDEPEND="!app-emulation/qemu-softmmu + !app-emulation/qemu-user + !=media-libs/alsa-lib-1.0.13 ) + esd? ( media-sound/esound ) + pulseaudio? ( media-sound/pulseaudio ) + gnutls? ( net-libs/gnutls ) + ncurses? ( sys-libs/ncurses ) + sasl? ( dev-libs/cyrus-sasl ) + sdl? ( >=media-libs/libsdl-1.2.11 ) + vde? ( net-misc/vde ) + kvm? ( >=sys-kernel/linux-headers-2.6.29 ) + bluetooth? ( net-wireless/bluez ) + kqemu? ( >=app-emulation/kqemu-1.4.0_pre1 )" +# fdt? ( sys-apps/dtc ) + +DEPEND="${RDEPEND} + gnutls? ( dev-util/pkgconfig ) + app-text/texi2html" + +src_prepare() { + # avoid fdt till an updated release appears + sed -i -e 's:fdt="yes":fdt="no":' configure + # prevent docs to get automatically installed + sed -i '/$(DESTDIR)$(docdir)/d' Makefile + # Alter target makefiles to accept CFLAGS set via flag-o + sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \ + Makefile Makefile.target tests/Makefile + [[ -x /sbin/paxctl ]] && \ + sed -i 's/^VL_LDFLAGS=$/VL_LDFLAGS=-Wl,-z,execheap/' \ + Makefile.target + # Append CFLAGS while linking + sed -i 's/$(LDFLAGS)/$(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS)/' rules.mak + epatch "${FILESDIR}/qemu-0.11.0-mips64-user-fix.patch" +} + +src_configure() { + local mycc conf_opts audio_opts softmmu_targets user_targets target_list + + # Pinkbyte: enable support of all types of audio cards! + local audio_cards + audio_cards="ac97 es1370 sb16 cs4231a adlib gus" + + for target in ${IUSE_SOFTMMU_TARGETS} ; do + use "qemu_softmmu_targets_${target}" && \ + softmmu_targets="${softmmu_targets} ${target}-softmmu" + done + + for target in ${IUSE_USER_TARGETS} ; do + use "qemu_user_targets_${target}" && \ + user_targets="${user_targets} ${target}-linux-user" + done + + conf_opts="--disable-darwin-user --disable-bsd-user --disable-strip" + + if test ! -z "${softmmu_targets}" ; then + einfo "Building following softmmu targets: ${softmmu_targets}" + use gnutls || conf_opts="$conf_opts --disable-vnc-tls" + use ncurses || conf_opts="$conf_opts --disable-curses" + use sasl || conf_opts="$conf_opts --disable-vnc-sasl" + use sdl || conf_opts="$conf_opts --disable-sdl" + use vde || conf_opts="$conf_opts --disable-vde" + use bluetooth || conf_opts="$conf_opts --disable-bluez" + use kqemu || conf_opts="$conf_opts --disable-kqemu" + use kvm || conf_opts="$conf_opts --disable-kvm" + + audio_opts="oss" + use alsa && audio_opts="alsa $audio_opts" + use esd && audio_opts="esd $audio_opts" + use pulseaudio && audio_opts="pa $audio_opts" + use sdl && audio_opts="sdl $audio_opts" + else + einfo "Disabling softmmu emulation (no softmmu targets specified)" + conf_opts="$conf_opts --disable-system --disable-vnc-tls \ + --disable-curses --disable-sdl --disable-vde \ + --disable-kqemu --disable-kvm" + fi + + if test ! -z "${user_targets}" ; then + einfo "Building following user targets: ${user_targets}" + conf_opts="$conf_opts --enable-linux-user" + else + einfo "Disabling usermode emulation (no usermode targets specified)" + conf_opts="$conf_opts --disable-linux-user" + fi + +# use fdt || conf_opts="$conf_opts --disable-fdt" + + conf_opts="$conf_opts --prefix=/usr" + + target_list="${softmmu_targets} ${user_targets}" + + filter-flags -fPIE + + ./configure ${conf_opts} \ + --audio-drv-list="$audio_opts" \ + --audio-card-list="$audio_cards" \ + --cc="$(tc-getCC)" --host-cc="$(tc-getCC)" \ + --target-list="${target_list}" \ + || die "configure failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "make install failed" + + exeinto /etc/qemu + doexe \ + "${FILESDIR}/qemu-ifup" \ + "${FILESDIR}/qemu-ifdown" \ + || die "qemu interface scripts failed" + + dodoc Changelog MAINTAINERS TODO pci-ids.txt || die + newdoc pc-bios/README README.pc-bios || die + dohtml qemu-doc.html qemu-tech.html || die +} + +pkg_postinst() { + elog "You will need the Universal TUN/TAP driver compiled into your" + elog "kernel or loaded as a module to use the virtual network device" + elog "if using -net tap. You will also need support for 802.1d" + elog "Ethernet Bridging and a configured bridge if using the provided" + elog "qemu-ifup script from /etc/qemu." + echo +} diff --git a/app-pda/synce-librtfcomp/Manifest b/app-pda/synce-librtfcomp/Manifest new file mode 100644 index 0000000..6e5c7c3 --- /dev/null +++ b/app-pda/synce-librtfcomp/Manifest @@ -0,0 +1,2 @@ +DIST librtfcomp-1.1.tar.gz 334800 RMD160 c75c533e7c501834bc9904e9e8d5bd68b28073b0 SHA1 b21aafb83f8cd718300a06a734d2a5447d8c6596 SHA256 a4bb19cd7a8713d48cbf20161bbe79ff4e79777491d57cb8a48fdb88567ef7a3 +EBUILD synce-librtfcomp-1.1.ebuild 620 RMD160 d40e6c55ef3b35a24814059613c8aacbd7385037 SHA1 8c2867758f339244b3fd8d1a1f4d8d2709ab31ee SHA256 947f827cabb555e9b1117e80bc313a3152441f01190a8a7162efa610426bcb36 diff --git a/app-pda/synce-librtfcomp/synce-librtfcomp-1.1.ebuild b/app-pda/synce-librtfcomp/synce-librtfcomp-1.1.ebuild new file mode 100644 index 0000000..555945b --- /dev/null +++ b/app-pda/synce-librtfcomp/synce-librtfcomp-1.1.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-pda/synce-librtfcomp/synce-librtfcomp-1.1.ebuild,v 1.1 2008/11/13 00:13:30 mescalinum Exp $ + +DESCRIPTION="SynCE - Compressed RTF extensions" +HOMEPAGE="http://sourceforge.net/projects/synce/" +LICENSE="MIT" + +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" +DEPEND="dev-lang/python + dev-python/pyrex" + +MY_P="librtfcomp-${PV}" +SRC_URI="mirror://sourceforge/synce/${MY_P}.tar.gz" + +S="${WORKDIR}/${MY_P}" + +src_install() { + einstall || die + mv "${D}"/usr/bin/test "${D}"/usr/bin/testrtf +} diff --git a/app-portage/findcruft/Manifest b/app-portage/findcruft/Manifest new file mode 100644 index 0000000..b085134 --- /dev/null +++ b/app-portage/findcruft/Manifest @@ -0,0 +1,3 @@ +DIST findcruft-1.0.4.tar.bz2 16636 RMD160 73e0266e9a83bf7aacfd0a3a3659da179d23b040 SHA1 148f39c562cafccbc1d6f6a9ec0f66c811b381fe SHA256 6fde43f77b83f95dba65174de0505b2914f6fdabd583e039d1009902b21aeed7 +DIST findcruft-config-20050807.tar.bz2 8125 RMD160 3caf0db0f7931a72ad8d095bddf7e08fea222c71 SHA1 6dac7604b1029f1dce1777a1af592eda3f373a97 SHA256 12577badc39daa00a34ba9935a0a07371d80376bc3025cf43a46e17f86823b01 +EBUILD findcruft-1.0.4-r1.ebuild 877 RMD160 af4d5358abcdbbbd3fa185e111272c598ee81aa5 SHA1 964c0b9db2d5f59c8fc42dc8225484eac63e4ead SHA256 49979403fbde01db8e62225123b2243b6a4ecf9e231b094c9c0f4d5697636d0f diff --git a/app-portage/findcruft/findcruft-1.0.4-r1.ebuild b/app-portage/findcruft/findcruft-1.0.4-r1.ebuild new file mode 100644 index 0000000..e55c575 --- /dev/null +++ b/app-portage/findcruft/findcruft-1.0.4-r1.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit eutils + +DEPEND="" +DESCRIPTION="Yet another script to find obsolete files" +HOMEPAGE="http://forums.gentoo.org/viewtopic.php?t=254197" +IUSE="" +KEYWORDS="~x86 ~amd64" +LICENSE="GPL-2" +RESTRICT="mirror" +SLOT="0" +SRC_URI="http://user.cs.tu-berlin.de/~sean/${P}.tar.bz2 \ + http://ifp.loeber1.de/findcruft-config-20050807.tar.bz2" + +src_unpack() { + unpack ${A} + sed -i "s#/usr/local#/usr#" ${WORKDIR}/bin/findcruft || die +} + +src_install() { + mkdir -p ${D}/usr/lib && mv ${WORKDIR}/findcruft ${D}/usr/lib || die + insinto /usr + dobin ${WORKDIR}/bin/findcruft + dodoc ${WORKDIR}/lib/findcruft/LICENSE +} + +pkg_postinst() { + einfo "Please check the files findcruft reports as cruft carefully" + einfo "before deleting them! There may be false positives!" +} diff --git a/dev-libs/ace/Manifest b/dev-libs/ace/Manifest new file mode 100644 index 0000000..f75cc50 --- /dev/null +++ b/dev-libs/ace/Manifest @@ -0,0 +1,5 @@ +AUX ace-missing-refcountable-header.patch 658 RMD160 d616b07612bce1aa3a404e363e31012e22c8caab SHA1 9d83df1adc108f05348c65d15bdd3781a07d6d89 SHA256 002c4c9ad8ed363c6e61f6497a91c3a8eaeec3feb24d87d4bc9ac89ac2c72150 +DIST ACE+TAO+CIAO-5.7.2.tar.bz2 49824451 RMD160 b95d235ab5ce73e04296863a41b7f2fd0fcdd561 SHA1 f91012d2ac53a2e7cf0960d72cbb0b1d720b946e SHA256 5290e378c9417892e7e57eef06e74affeb6a93ba3e7c67e24e02e72c282ea37a +DIST ACE+TAO-5.7.2.tar.bz2 26111373 RMD160 b0241c08ecb084d8c25198f7b30d09e408f2042b SHA1 bdeb0de58663f146f6cf8c1fe67507bdfbecfc2c SHA256 95d9bfe506bfe55e489863413d83f214d2f6948a836449ed4dce6cf8c7d05d1d +DIST ACE-5.7.2.tar.bz2 9724175 RMD160 7e6e349dcab5587b85b6c86dda7d602b68e340f7 SHA1 f2d172a589f087be1c6299c714b6d92d9c69f9cb SHA256 e358281a93cbc932351030675fb7956875f996e0dc42cf1f499a2d5bd018e0ad +EBUILD ace-5.7.2-r9999.ebuild 2578 RMD160 721bd609f9470b4bd63025a175cb145ccecee658 SHA1 bae90fd2951e49caa2b7ad85445948860642b3ab SHA256 925d260cd271a1eeca1092046939594cd315b7ee886d9a789d69907f610fa18d diff --git a/dev-libs/ace/ace-5.7.2-r9999.ebuild b/dev-libs/ace/ace-5.7.2-r9999.ebuild new file mode 100644 index 0000000..35cdb90 --- /dev/null +++ b/dev-libs/ace/ace-5.7.2-r9999.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/ace/ace-5.7.2.ebuild,v 1.2 2010/07/13 00:19:11 ssuominen Exp $ + +inherit toolchain-funcs eutils + +DESCRIPTION="The Adaptive Communications Environment" +HOMEPAGE="http://www.cs.wustl.edu/~schmidt/ACE.html" +SRC_URI="!tao? ( http://download.dre.vanderbilt.edu/previous_versions/ACE-${PV}.tar.bz2 ) + tao? ( + !ciao? ( http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-${PV}.tar.bz2 ) + ciao? ( http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-${PV}.tar.bz2 ) + )" +LICENSE="BSD as-is" +SLOT="0" +KEYWORDS="~x86 ~sparc ~ppc ~alpha ~amd64" +IUSE="X ipv6 tao ciao" + +COMMON_DEPEND="dev-libs/openssl" +# TODO probably more +RDEPEND="${COMMON_DEPEND} + X? ( x11-libs/libXt x11-libs/libXaw )" + +DEPEND="${COMMON_DEPEND} + X? ( x11-proto/xproto )" + +S="${WORKDIR}/ACE_wrappers" + +src_unpack() { + unpack ${A} + cd "${S}" + # Let's avoid autotools. http://bugs.gentoo.org/328027. + if has_version ">=dev-libs/openssl-1.0.0"; then + sed -i -e 's:SSL_METHOD:const SSL_METHOD:' configure || die + fi +} + +src_compile() { + export ACE_ROOT="${S}" + mkdir build + cd build + +# Pinkbyte: remove -O3 options, because it is very buggy!!! + sed -i "s/-O3//" ${S}/configure +# + + ECONF_SOURCE="${S}" + econf \ + --enable-lib-all \ + $(use_with X) \ + $(use_enable ipv6) \ + || die "econf died" + # --with-qos needs ACE_HAS_RAPI + emake static_libs=1 || die "emake failed" +} + +src_install() { + cd build + emake ACE_ROOT="${S}" DESTDIR="${D}" install || die "failed to install" + # punt gperf stuff + rm -rf "${D}/usr/bin" "${D}/usr/share" + # remove PACKAGE_* definitions from installed config.h (#192676) + sed -i -e "s:^[ \t]*#define[ \t]\+PACKAGE_.*$:/\* & \*/:g" "${D}/usr/include/ace/config.h" + + # Install some docs + cd "${S}" + dodoc README NEWS ChangeLog AUTHORS VERSION Release || die +} + +src_test() { + cd "${S}/build" + emake ACE_ROOT="${S}" check || die "self test failed" +} + +pkg_postinst() { + + local CC_MACHINE=$($(tc-getCC) -dumpmachine) + if [ -d "/usr/$(get_libdir)/gcc-lib/${CC_MACHINE}/$(gcc-fullversion)/include/ace" ]; then + ewarn "moving /usr/$(get_libdir)/gcc-lib/${CC_MACHINE}/$(gcc-fullversion)/include/ace to" + ewarn "ace.old" + ewarn "This is required, as anything trying to compile against ACE will" + ewarn "have problems with conflicting OS.h files if this is not done." + mv "/usr/$(get_libdir)/gcc-lib/${CC_MACHINE}/$(gcc-fullversion)/include/ace" \ + "/usr/$(get_libdir)/gcc-lib/${CC_MACHINE}/$(gcc-fullversion)/include/ace.old" + fi +} diff --git a/dev-libs/ace/files/ace-missing-refcountable-header.patch b/dev-libs/ace/files/ace-missing-refcountable-header.patch new file mode 100644 index 0000000..df5c407 --- /dev/null +++ b/dev-libs/ace/files/ace-missing-refcountable-header.patch @@ -0,0 +1,26 @@ +--- ace/Makefile.am.orig 2008-10-22 22:28:29.000000000 +0300 ++++ ace/Makefile.am 2008-10-22 22:29:50.000000000 +0300 +@@ -876,6 +876,7 @@ + Recursive_Thread_Mutex.inl \ + Recyclable.h \ + Recyclable.inl \ ++ Refcountable.h \ + Refcountable_T.cpp \ + Refcountable_T.h \ + Refcountable_T.inl \ +@@ -1054,6 +1055,7 @@ + Timeprobe_T.h \ + Timer_Hash_T.cpp \ + Timer_Hash_T.h \ ++ Timer_Heap.h \ + Timer_Heap_T.cpp \ + Timer_Heap_T.h \ + Timer_List_T.cpp \ +@@ -1061,6 +1063,7 @@ + Timer_Queue_Adapters.cpp \ + Timer_Queue_Adapters.h \ + Timer_Queue_Adapters.inl \ ++ Timer_Queue.h \ + Timer_Queue_T.cpp \ + Timer_Queue_T.h \ + Timer_Queue_T.inl \ diff --git a/games-action/babylon-mediavps/Manifest b/games-action/babylon-mediavps/Manifest new file mode 100644 index 0000000..c6f62c3 --- /dev/null +++ b/games-action/babylon-mediavps/Manifest @@ -0,0 +1,4 @@ +DIST 2009_07_31_Zathras.1.rar 81049013 RMD160 9ac2240d6a3d8da197600e475f5c5a527c30f348 SHA1 015c704ed793bbc3e514ecd79abc8033fe17d61d SHA256 71be3537268bcafe7a3f94fcd1a8fc3f4fd4b51c13d310aa993c4b7e26fb01db +DIST TheBabylonProject.7z 724445143 RMD160 737d00c759a25080f59f8caa8ece5d5d76c96115 SHA1 e9c2fab1e52c055fca33892e479cd65df33404b2 SHA256 6a1503142192cf7773d50fa4fdbecce548ecc428900b18ea48115d5057403d35 +DIST tbp-cpack-2.0.7z 780873074 RMD160 d0fefc719c5b81b8623a15d8804c6633e60bcdfe SHA1 786b864a1e08ba02c2d83f02076fabae828b8b85 SHA256 447028ba099aea92b7b6fa0e0d5506e0b7ff4f888454e53bfde2985b8a0ff250 +EBUILD babylon-mediavps-3.4.2.ebuild 1769 RMD160 76afbd7fff599ec66079cafb27bb46e78813bf38 SHA1 dd80ba4dec242908731a20b3addd3be3af6b23bc SHA256 5b2d498ede4ab6a0eb765b8b8ff8fec3b54cb1aebb885758ae67c89e34dcd2c5 diff --git a/games-action/babylon-mediavps/babylon-mediavps-3.4.2.ebuild b/games-action/babylon-mediavps/babylon-mediavps-3.4.2.ebuild new file mode 100644 index 0000000..3b4cd31 --- /dev/null +++ b/games-action/babylon-mediavps/babylon-mediavps-3.4.2.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +inherit games + +DESCRIPTION="The Babylon Project is stand-alone and does not need original Freespace 2 to work" +IUSE="campaigns yal" +KEYWORDS="~amd64 ~x86" +SLOT="0" + +HOMEPAGE="http://babylon.hard-light.net/official_downloads.php" +FSMODS="http://freespacemods.net/e107_files/downloads" +SRC_URI="${FSMODS}/2009_07_31_Zathras.1.rar + ${FSMODS}/TheBabylonProject.7z + campaigns? ( ${FSMODS}/tbp-cpack-2.0.7z )" + +LICENSE="as-is" + +#RDEPEND="games-action/fs2_open[inferno]" +RDEPEND="app-arch/unzip + app-arch/unrar + app-arch/p7zip + yal? ( games-action/fs2_launcher )" + +DEPEND="${RDEPEND}" + +S=${WORKDIR} + +#pkg_setup() { +# if useq cell && useq adveffects ; then +# eerror "Error: 'cell' and 'adveffects' USE flags cannot both be enabled!" +# die +# fi +#} + +src_install() { + fdir=${S}/"The Babylon Project" + insinto "${GAMES_PREFIX_OPT}/babylon" + doins "${fdir}"/{*.vp,*.cfg,*.ogg} || die + insinto "${GAMES_PREFIX_OPT}/babylon/data" + doins -r "${fdir}"/data/{cache,missions,strips,tables} || die + doins "${fdir}"/data/*.cfg || die + + insinto "${GAMES_PREFIX_OPT}/babylon" + fdir=${S}/"Zathras" + doins "${fdir}"/{*.vp,*.bmp,*.ini} || die + + if useq campaigns ; then + fdir=${S}/"tbp" + insinto "${GAMES_PREFIX_OPT}/babylon" + doins "${fdir}"/{*.vp,*.avi,*.ogg} || die + insinto "${GAMES_PREFIX_OPT}/babylon/data" + doins -r "${fdir}"/data/{missions,voice} || die + fi + if useq yal ; then + dosym ${GAMES_DATADIR}/fs2_open/fs2_open ${GAMES_PREFIX_OPT}/babylon/fs2_open + fi + +#falta hacer el parche para que yal pille el directorio correcto en cada mod +#dohtml +#dodoc +#doicon +# doins *.vp *.avi *.ogg || die +# dodoc readme.txt || die + prepgamesdirs +} + diff --git a/games-action/freespace2-data/Manifest b/games-action/freespace2-data/Manifest new file mode 100644 index 0000000..b0b7c8d --- /dev/null +++ b/games-action/freespace2-data/Manifest @@ -0,0 +1 @@ +EBUILD freespace2-data-1.0.ebuild 1655 RMD160 c7415cffda3f576f9f044c9d7a045aebbad58166 SHA1 1900cc0699505f6612c78d7b22d709df4ac18332 SHA256 c7d26984656195c19f7ee1d272be36991fa24f0231138b8140839c0d00cb0cff diff --git a/games-action/freespace2-data/freespace2-data-1.0.ebuild b/games-action/freespace2-data/freespace2-data-1.0.ebuild new file mode 100644 index 0000000..7de40d3 --- /dev/null +++ b/games-action/freespace2-data/freespace2-data-1.0.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +inherit eutils games + +DESCRIPTION="Freespace 2 - This is the data portion of Freespace 2" +HOMEPAGE="http://www.freespace2.com/" +SRC_URI="" + +LICENSE="freespace2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +RESTRICT="strip" +IUSE="" + +DEPEND="app-arch/unshield" + +S=${WORKDIR} + +GAMES_LICENSE_CHECK="yes" +dir=${GAMES_PREFIX_OPT}/freespace2 +Ddir=${D}/${dir} + +pkg_setup() { + games_pkg_setup +} + +src_install() { + cdrom_get_cds data1.cab tangoA_fs2.vp tangoB_fs2.vp + + # Disk 1 + einfo "Copying files from Disk 1..." + for group in "Basic Install Files" "Intel Anims" "Music Compressed" \ + "High Res Files" "Hud Config Files"; + do + unshield -g "$group" -L -j x ${CDROM_ROOT}/data1.cab; + done; + + insinto "${dir}"/data + doins */*.vp + insinto "${dir}"/data/players + doins */*.hcf + + # Disk 2 + cdrom_load_next_cd + einfo "Copying files from Disk 2..." + insinto "${dir}"/data + doins "${CDROM_ROOT}"/tango1_fs2.vp + newins "${CDROM_ROOT}"/tangoA_fs2.vp tangoa_fs2.vp + + # Disk 3 + cdrom_load_next_cd + einfo "Copying files from Disk 3..." + doins "${CDROM_ROOT}"/tango{2,3}_fs2.vp + newins "${CDROM_ROOT}"/tangoB_fs2.vp tangob_fs2.vp + + # Now, since these files are coming off a CD, the times/sizes/md5sums won't + # be different ... that means portage will try to unmerge some files (!) + # We run touch on ${D} so as to make sure portage doesn't do any such thing + find "${Ddir}" -exec touch '{}' \; + + prepgamesdirs +} + +pkg_postinst() { + games_pkg_postinst + + echo + elog "This is only the data portion of the game. You need to merge" + elog "games-action/fs2_open to play." + echo +} + diff --git a/games-action/freespace2-mediavps/Manifest b/games-action/freespace2-mediavps/Manifest new file mode 100644 index 0000000..c4330b6 --- /dev/null +++ b/games-action/freespace2-mediavps/Manifest @@ -0,0 +1,7 @@ +DIST 3610_Patch.zip 3530659 RMD160 9eff853acd66c94cae6e3e3a44dfed8caaf798eb SHA1 ae869e47a6e759cc1e2b78a4e386bd2497d3d841 SHA256 eccc0cda3d43c12c46864db48ca1500dda9d5303ba42f02ae2b63a20e5f5fe23 +DIST MV_Advanced.zip 214178388 RMD160 6845173fdd500555653a4923f597e01b0957e90e SHA1 98d3993e449cd3849095542a66aa35e157ae55a8 SHA256 d9666b6b0d450ff83053bf1fb6c4d586c07c7f8e5d586a2faddc84e149ee9b8f +DIST MV_Assets.zip 215152865 RMD160 443a76a12a01838464b41036a8ad207d7d4ee4b8 SHA1 d07244d79aa27c5eadce65fbdc3a3da90b2b968f SHA256 013b2a300fe8570d816ce532480b885fee1dc762a1bf368e041c420a5aca573e +DIST MV_Core.zip 7136603 RMD160 16b467c0b2abcc7564b05212aae714b7525a1105 SHA1 db2f3da31abe337c65d021d8fda568195fd6d17a SHA256 6a6d9fd1239c67ec62b4fb534f293152954eb924c4f2b06ccbc895a92c378a7b +DIST MV_Effects.zip 77121513 RMD160 b7dbc0867622b43c66b12a66ed33dadd9f7ac61e SHA1 4f769687f3c9407621f9ccd078161d424c68de08 SHA256 30160c3247ca2e3ad861c956910fd11d85c61ae4678e1e26a61ab7378d6c739b +DIST MV_Music.zip 79568809 RMD160 5f57d2fb7f774cc8e0af946c23d64e7d52aff9a0 SHA1 789c3c816fdf946fcc8dc9ff4902eef74331fc71 SHA256 b376323e189a4c87f15a3155f4667aa7f374cc7c976bf4230b8538cc4e2864f7 +EBUILD freespace2-mediavps-3.6.10.ebuild 1205 RMD160 8fa15b456caaf5254279ae78548efdfdee153d65 SHA1 dee475d7fd136387e902a2a4fbe81661f96adc24 SHA256 9a1b50dcd68d311c6223084ea9dc9036e01b43792eff7cd807db1edd42c1a265 diff --git a/games-action/freespace2-mediavps/freespace2-mediavps-3.6.10.ebuild b/games-action/freespace2-mediavps/freespace2-mediavps-3.6.10.ebuild new file mode 100644 index 0000000..dfff2f2 --- /dev/null +++ b/games-action/freespace2-mediavps/freespace2-mediavps-3.6.10.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +inherit games + +DESCRIPTION="Artwork and models that greatly enhance the graphics of Freespace 2" +IUSE="adveffects assets effects music yal" +KEYWORDS="~amd64 ~x86" +SLOT="0" + +HOMEPAGE="http://scp.indiegames.us/" +FSMODS="http://www.freespacemods.net/files/MVP3610" +SRC_URI="${FSMODS}/MV_Core.zip + ${FSMODS}/3610_Patch.zip + music? ( ${FSMODS}/MV_Music.zip ) + assets? ( ${FSMODS}/MV_Assets.zip ) + effects? ( ${FSMODS}/MV_Effects.zip ) + adveffects? ( ${FSMODS}/MV_Advanced.zip )" + +LICENSE="as-is" + +RDEPEND="games-action/freespace2-data + yal? ( games-action/fs2_launcher )" + +DEPEND="app-arch/unzip + app-arch/unrar" + +S=${WORKDIR} + +#pkg_setup() { +# if useq cell && useq adveffects ; then +# eerror "Error: 'cell' and 'adveffects' USE flags cannot both be enabled!" +# die +# fi +#} + +src_install() { + insinto "${GAMES_PREFIX_OPT}/freespace2/mediavps" + doins *.vp || die + doins FSU-MVP.bmp || die + doins mod.ini || die + dodoc readme.txt || die + if useq yal ; then + dosym ${GAMES_DATADIR}/fs2_open/fs2_open ${GAMES_PREFIX_OPT}/freespace2/fs2_open + fi + prepgamesdirs +} + diff --git a/games-action/fs2_launcher/Manifest b/games-action/fs2_launcher/Manifest new file mode 100644 index 0000000..50cb75d --- /dev/null +++ b/games-action/fs2_launcher/Manifest @@ -0,0 +1 @@ +EBUILD fs2_launcher-152.ebuild 1257 RMD160 8e7fc3688cc8dcdafd45f901cc92d9eee98044d3 SHA1 8a59d3da747377f7e8f0779f6e5a0d2ae52d2e56 SHA256 44f6ebe2521530305b2b42f322ce16de5075c225d43ea80a5642de5aa0e2d34f diff --git a/games-action/fs2_launcher/fs2_launcher-152.ebuild b/games-action/fs2_launcher/fs2_launcher-152.ebuild new file mode 100644 index 0000000..283c8e1 --- /dev/null +++ b/games-action/fs2_launcher/fs2_launcher-152.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +inherit games subversion eutils + +DESCRIPTION="Yal fs2_launcher" +HOMEPAGE="http://scp.indiegames.us/" + +ESVN_REPO_URI="svn://vega.livecd.pl/yal/trunk@${PV}" +ESVN_BOOTSTRAP="build-all.sh" + +#SRC_URI="http://swc.fs2downloads.com/builds/${MY_P}.tgz" + +S=${WORKDIR}/${P} + +LICENSE="fs2_open" + +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="babylon freespace2" +RESTRICT="mirror" + +# QT4 >= 4.3 +# SDL >= 1.2.13 +# OpenAL (openal-soft recommended!) + + +RDEPEND="media-libs/openal + >=media-libs/libsdl-1.2.13 + >=x11-libs/qt-core-4.3" + +DEPEND="${RDEPEND}" + +dir=${GAMES_DATADIR}/${PN} +dir=${GAMES_PREFIX_OPT}/freespace2 + +if useq babylon ; then + dir=${GAMES_PREFIX_OPT}/babylon +fi +if useq freespce2 ; then + dir=${GAMES_PREFIX_OPT}/freespace2 +fi + +src_install() { + + #donde se instalara + exeinto "${dir}" + #que instalo + doexe bin/${PN} || die +# newexe bin/${PN} ${PN} || die + dosym ${dir}/${PN} ${GAMES_BINDIR}/${PN} +# games_make_wrapper ${PN} "${dir}"/${PN} "${FS2DATA}" + + dodoc AUTHORS ChangeLog README + + newicon resources/fs2.ico fs2_launcher.ico + make_desktop_entry ${PN} "${DESCRIPTION}" fs2_launcher.ico + + elog "${PN} was placed in ${dir}" + +# prepgamesdirs +} + diff --git a/games-action/fs2_open/Manifest b/games-action/fs2_open/Manifest new file mode 100644 index 0000000..6947445 --- /dev/null +++ b/games-action/fs2_open/Manifest @@ -0,0 +1,6 @@ +AUX fs2_open-3.6.9-bugzilla.patch 842 RMD160 6eb0c58b6ecd36a4a8671bb47f493ad43e6b38b9 SHA1 2be2f5a242f39d2359fef07f70417510e06c0c43 SHA256 51d3c2da8e7324a7540b0a8e0bc30472b4c9d93bfcd54e449d36dc8accd2a154 +AUX s2_open_remove_deprecated_duplicate_attachment_gl_ext.patch 842 RMD160 6eb0c58b6ecd36a4a8671bb47f493ad43e6b38b9 SHA1 2be2f5a242f39d2359fef07f70417510e06c0c43 SHA256 51d3c2da8e7324a7540b0a8e0bc30472b4c9d93bfcd54e449d36dc8accd2a154 +DIST fs2_open-3.6.9.tar.bz2 5192396 RMD160 4f0b22712c8e6c17e75ddd5b5bd3a131d5f74e77 SHA1 01ddb3e8bdc894da037f6c881ff8c15a3676129d SHA256 e4127cb23c88de1b954a81bcce2bb762cd03e9a9ad7a48d3599529ed17e244b4 +DIST fs2_open_3_6_10.tgz 11291429 RMD160 a154571dcfd7e962f94e84c293e43d18181778b3 SHA1 ae54a9f5bf83cd89268f4f9a5e8031d9084cf0d3 SHA256 cf1533c566f4476cb6bfc15d3e657fd29fdb0bbba7423d804d73063d1e9a5248 +EBUILD fs2_open-3.6.10.ebuild 2718 RMD160 3e5498be63c9ef8d89a22fa9fe39a21b0ae755c3 SHA1 40ce535f0302757ade05e514510574d13db409a8 SHA256 356ee452d53ead335cc7c2b4e125b7053377556f241119514d2b667c867b12d3 +EBUILD fs2_open-3.6.9.ebuild 1335 RMD160 ab2d1293aefdff511247424318a4a7aa86817ea6 SHA1 703f2c4d1486011fa642e1186bb26510323f75be SHA256 847d06b650a49ba8d1405c9aee75d36b2a3dfe7fde16e2739b17094998dcc3a2 diff --git a/games-action/fs2_open/fs2_open-3.6.10.ebuild b/games-action/fs2_open/fs2_open-3.6.10.ebuild new file mode 100644 index 0000000..97b0a1d --- /dev/null +++ b/games-action/fs2_open/fs2_open-3.6.10.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +inherit games eutils versionator + +MY_PV=$(replace_all_version_separators '_' ) +#MY_PV=$(replace_version_separator '_' ) +MY_P="${PN}_${MY_PV}" + +DESCRIPTION="Freespace2 SCP" +HOMEPAGE="http://scp.indiegames.us/" + +SRC_URI="http://swc.fs2downloads.com/builds/${MY_P}.tgz" +#http://freespace.pl/hosted/foxer/gtva_ico/gtva.ico + +#iconos: http://www.hard-light.net/forums/index.php?topic=44371.20 + +#SRC_URI="http://swc.fs2downloads.com/builds/${PN}_3_6_10.tgz" +# videos? ( http://fszmirror.com/files/FS2OGGcutscenepack.vp )" + +S=${WORKDIR}/${MY_P} + +LICENSE="fs2_open" + +SLOT="0" +KEYWORDS="~amd64 ~x86" +#IUSE="mediavps speech videos yal" +IUSE="babylon freespace2 inferno speech" +RESTRICT="mirror" + +RDEPEND="media-libs/libogg + >=media-libs/libsdl-1.2 + media-libs/libvorbis + media-libs/libtheora + media-libs/openal + virtual/opengl + || ( + ( media-libs/mesa + x11-libs/libX11 + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libXext ) + virtual/x11 ) + freespace2? ( =games-action/freespace2-mediavps-${PV} + games-action/freespace2-data ) + babylon? ( games-action/babylon-mediavps )" +# yal? ( games-action/fs2_launcher )" + +DEPEND="${RDEPEND}" + +dir=${GAMES_DATADIR}/${PN} + +pkg_setup() { + if useq babylon && useq freespace2 ; then + eerror "Error: 'freespace2' and 'babylon' USE flags cannot both be enabled!" + die + fi +# if use babylon && ! use inferno; then +# elog "Please, for full advantage of TBP mod, enable inferno useflag too!" +# die +# fi +} + +if useq freespace2 ; then + FS2DATA=${GAMES_PREFIX_OPT}/freespace2 +fi +if useq babylon ; then + FS2DATA=${GAMES_PREFIX_OPT}/babylon +fi + +src_compile() { + chmod +x ${S}/autogen.sh + ${S}/autogen.sh 2>&1 > /dev/null + if [ -x ./configure ]; then + econf \ + $(use_enable speech ) \ + $(use_enable inferno ) + fi + if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then + emake || die "emake failed" + fi +} + + +src_install() { + exeinto "${dir}" + newexe code/${PN}_r ${PN} || die + + if useq babylon || useq freespace2; then + games_make_wrapper ${PN} "${dir}"/${PN} "${FS2DATA}" + fi + +# if useq videos ; then +# insinto "${FS2DATA}/data/" +# doins "${DISTDIR}"/FS2OGGcutscenepack.vp || die +# fi + + dodoc AUTHORS ChangeLog COPYING NEWS README FS2OpenSCPReadMe.doc + newicon code/freespace2/app_icon.png fs2_open.png + #newicon /usr/portage/distfiles/gtva.ico fs2_open.ico + make_desktop_entry ${PN} "${DESCRIPTION}" fs2_open + + prepgamesdirs + + if use babylon && ! use inferno; then + elog "Please, for full advantage of TBP mod, enable inferno useflag too and rebuild!" + fi +} diff --git a/games-arcade/mars-bin/Manifest b/games-arcade/mars-bin/Manifest new file mode 100644 index 0000000..1f397bc --- /dev/null +++ b/games-arcade/mars-bin/Manifest @@ -0,0 +1,2 @@ +DIST mars_linux_0.7.1.tar.gz 72604889 RMD160 eac5f48e34e44de60d3a247a47f24a9140b20989 SHA1 875bc11d3119882ffaac61ddaf6dcf08a053b4f5 SHA256 86c4c827c8ec89d557ad6e84ee3ea8d34bc8f8ea13422e6a7e3e4dd16022ba08 +EBUILD mars-bin-0.7.1.ebuild 1500 RMD160 6b33dd24bc4cdfa1ef6629fef8323d8e591e8bf5 SHA1 90e86dfd62af87ab5f99b1c39f011c10b0580681 SHA256 77683f91cb3f8ac998dff47dc59a3a43bdcceee9e436c6ff6ad548fb77e4b152 diff --git a/games-arcade/mars-bin/mars-bin-0.7.1.ebuild b/games-arcade/mars-bin/mars-bin-0.7.1.ebuild new file mode 100644 index 0000000..21ba5c5 --- /dev/null +++ b/games-arcade/mars-bin/mars-bin-0.7.1.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2010 Sabayon Linux +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +# TODO: +# - use games eclass and uniform to that +# - when upstream will grow, use sources (and not precompiled crap) + +EAPI=2 + +inherit eutils + +DESCRIPTION="M.A.R.S. a ridiculous shooter" +HOMEPAGE="http://mars-game.sourceforge.net/" +SRC_URI="mirror://sourceforge/mars-game/mars_linux_${PV}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" +S="${WORKDIR}/mars_linux_${PV}" +RESTRICT="strip" + +DEPEND="" +RDEPEND="virtual/opengl + media-libs/flac + media-libs/freetype + media-libs/glew + media-libs/jpeg:62 + media-libs/openal + media-libs/libogg + media-libs/libsndfile + media-libs/libvorbis" + +src_unpack() { + unpack "${A}" +} + +src_prepare() { + einfo "Nothing to prepare" +} + +src_install() { + + dodir "/usr/share/${PN}" + insinto "/usr/share/${PN}" + doins -r "${S}/data" + exeinto "/usr/share/${PN}" + if use amd64; then + mv "${S}/lib64" "${S}/lib" || die + mv "${S}/marsshooter64" "${S}/${PN}.bin" || die + else + mv "${S}/lib64" "${S}/lib" || die + mv "${S}/marsshooter64" "${S}/${PN}.bin" || die + fi + doexe "${S}/${PN}.bin" || die + doins -r "${S}/lib" + echo "MARS_LIBRARY_PATH=\"/usr/share/${PN}/lib\"" > "${S}/99-mars-bin" + doenvd "${S}/99-mars-bin" + +# exeinto /usr/bin +# doexe "${FILESDIR}/${PN}" || die + + mv "${S}/data/tex/icon.png" "${S}/${PN}.png" || die + doicon "${S}/${PN}.png" || die + + make_desktop_entry "${PN}" "M.A.R.S. is ridiculous" "/usr/share/pixmaps/${PN}.png" "Game" || die + +} diff --git a/games-emulation/mednafen/Manifest b/games-emulation/mednafen/Manifest new file mode 100644 index 0000000..c6f0b65 --- /dev/null +++ b/games-emulation/mednafen/Manifest @@ -0,0 +1,3 @@ +AUX mednafen-ipv6.patch 1899 RMD160 e0b11b9ed892d092812db63414151f2e52960e58 SHA1 da86bfd379ef699492fc24ab69d8f50ada7d5178 SHA256 8676e1855c29382bcd3f9000c93224bbca56cda2ebb4834b2f97220288b1fe4d +DIST mednafen-0.9.17-wip.tar.bz2 3408990 RMD160 c681de86a12d44a4d59a837078b1d14441a46ba0 SHA1 4a002a08ab99fd9526f1fd4490cd3f3cfd7108cf SHA256 391961caa4fba0aa45f73c00bb7b29b636a4ac5394bce2fdcc41d1c5765f3ab8 +EBUILD mednafen-0.9.17-r9999.ebuild 1777 RMD160 349449594d5ee646be55a7673bef0d53b4e19947 SHA1 efed22101692f8a4868385368ead849564aba47d SHA256 60903af1472c7a78da1b14ed8e9ed1b92f40f79111d043b2be404ccf0795dc4b diff --git a/games-emulation/mednafen/files/mednafen-ipv6.patch b/games-emulation/mednafen/files/mednafen-ipv6.patch new file mode 100644 index 0000000..04309f5 --- /dev/null +++ b/games-emulation/mednafen/files/mednafen-ipv6.patch @@ -0,0 +1,55 @@ +--- configure.ac.orig 2011-07-03 01:21:46.937790000 +0400 ++++ configure.ac 2011-07-03 01:24:57.947895000 +0400 +@@ -414,5 +414,27 @@ + CFLAGS="$LIBCDIO_CFLAGS $SNDFILE_CFLAGS $CFLAGS" + CPPFLAGS="$LIBCDIO_CFLAGS $SNDFILE_CFLAGS $CPPFLAGS" + ++dnl ipv6 check ++AC_ARG_ENABLE(ipv6, ++[ --enable-ipv6 Use ipv6, if available. [default=yes]],enable_ipv6=$enableval,enable_ipv6=yes) ++ ++AC_MSG_CHECKING(whether to enable ipv6) ++ ++if test "x$enable_ipv6" = "xyes" ; then ++ AC_TRY_COMPILE([#define INET6 ++#include ++#include ], ++ [int x = IPPROTO_IPV6; struct in6_addr a;], ++ [ts_cv_ipv6="yes"], [ts_cv_ipv6="no"]) ++else ++ ts_cv_ipv6="no" ++fi ++ ++AC_MSG_RESULT($ts_cv_ipv6) ++ ++if test "x$ts_cv_ipv6" = "xyes"; then ++ AC_DEFINE([USE_IPV6], [], [Enable ipv6 support]) ++fi ++ + dnl Output Makefiles + AC_OUTPUT([Makefile src/Makefile src/tremor/Makefile src/mpcdec/Makefile src/trio/Makefile src/gb/Makefile src/gba/Makefile src/lynx/Makefile src/pce/Makefile src/pcfx/Makefile src/sms/Makefile src/wswan/Makefile src/nes/Makefile src/ngp/Makefile po/Makefile.in intl/Makefile]) + +--- src/drivers/netplay.cpp.orig 2010-12-19 01:24:01.000000000 +0300 ++++ src/drivers/netplay.cpp 2011-07-03 02:14:07.513970385 +0400 +@@ -244,13 +244,21 @@ + unsigned int remote_port = MDFN_GetSettingUI("netplay.port"); + std::string game_key = MDFN_GetSettingS("netplay.gamekey"); + ++#ifdef USE_IPV6 ++ if(SDLNet_ResolveHost(SDLNET_ANY, &IPa, remote_host.c_str(), remote_port) == -1) ++#else + if(SDLNet_ResolveHost(&IPa, remote_host.c_str(), remote_port) == -1) ++#endif + { + PrintNetError(_("*** Error resolving host \"%s\"!"), remote_host.c_str()); + return(0); + } + ++#ifdef USE_IPV6 ++ Socket = SDLNet_TCP_Connect(&IPa); ++#else + Socket = SDLNet_TCP_Open(&IPa); ++#endif + if(!Socket) + { + PrintNetError(_("*** Error connecting to remote host \"%s\" on port %u!"), remote_host.c_str(), remote_port); diff --git a/games-emulation/mednafen/mednafen-0.9.17-r9999.ebuild b/games-emulation/mednafen/mednafen-0.9.17-r9999.ebuild new file mode 100644 index 0000000..77fb70e --- /dev/null +++ b/games-emulation/mednafen/mednafen-0.9.17-r9999.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/games-emulation/mednafen/mednafen-0.8.13.3.ebuild,v 1.5 2011/01/15 15:54:40 maekke Exp $ + +EAPI=2 +inherit autotools eutils games + +DESCRIPTION="An advanced NES, GB/GBC/GBA, TurboGrafx 16/CD, NGPC and Lynx emulator" +HOMEPAGE="http://mednafen.sourceforge.net/" +SRC_URI="http://home.pinkbyte.ru/emulators/${P}-wip.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="alsa altivec cjk debug jack nls" + +RDEPEND="virtual/opengl + media-libs/libsndfile + dev-libs/libcdio + media-libs/libsdl[audio,joystick,video] + media-libs/sdl-net + sys-libs/zlib + alsa? ( media-libs/alsa-lib ) + jack? ( media-sound/jack-audio-connection-kit ) + nls? ( virtual/libintl )" +DEPEND="${RDEPEND} + dev-util/pkgconfig + nls? ( sys-devel/gettext )" + +S=${WORKDIR}/${PN} + +src_prepare() { + sed -i \ + -e 's:$(datadir)/locale:/usr/share/locale:' \ + -e 's:$(localedir):/usr/share/locale:' \ + $(find . -name 'Makefile.*') \ + || die 'sed failed' + sed -i \ + -e '/-fomit-frame-pointer/d' \ + -e '/-ffast-math/d' \ + -e '/CPPFLAGS=.*CFLAGS/s/CFLAGS/CXXFLAGS/' \ + -e '/^AX_CFLAGS_GCC_OPTION.*OPTIMIZER_FLAGS/d' \ + configure.ac \ + || die "sed failed" + # Pinkbyte: add ipv6 patch (DEPRECATED) +# use ipv6 && epatch "${FILESDIR}/${PN}-ipv6.patch" + # + eautoreconf +} + +src_configure() { + egamesconf \ + --disable-dependency-tracking \ + $(use_enable alsa) \ + $(use_enable altivec) \ + $(use_enable cjk cjk-fonts) \ + $(use_enable debug debugger) \ + $(use_enable jack) \ + $(use_enable nls) +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc Documentation/cheats.txt AUTHORS ChangeLog TODO + dohtml Documentation/* + prepgamesdirs +} diff --git a/games-emulation/pcsx-r/Manifest b/games-emulation/pcsx-r/Manifest new file mode 100644 index 0000000..67a59b4 --- /dev/null +++ b/games-emulation/pcsx-r/Manifest @@ -0,0 +1,3 @@ +AUX pcsx-r-datadir.patch 1088 RMD160 a21d8ba66e3d316c84511d8c09b6922643013869 SHA1 4f179f9ba29bb8a69d59b803590ae10fcf6d1c20 SHA256 b33931c20630ef7731ff4d0265525ba6fb3fd0597d08a44362fc30f04acc91bb +DIST pcsxr-1.9.92.tar.bz2 1471890 RMD160 18026e1efc348aecf67f271ad97ea70da4bccfc0 SHA1 d0f336f49cdc2edbec23e75a01d10c8d5406ed58 SHA256 fb96dbf17ea2d5215b58338534351143e8ef7316c25504991ba76309fc931611 +EBUILD pcsx-r-1.9.92.ebuild 1480 RMD160 7f808bb316706b70eb3d60f0a82ab3fb18a1afc6 SHA1 bb0207c6c6027b18c41ec71c07b038bb5c798cbc SHA256 87d573bcbfb67d3aed7ca5a62837826dec91b23790d8f0e4e8dd97f87d2e8941 diff --git a/games-emulation/pcsx-r/files/pcsx-r-datadir.patch b/games-emulation/pcsx-r/files/pcsx-r-datadir.patch new file mode 100644 index 0000000..3c047a2 --- /dev/null +++ b/games-emulation/pcsx-r/files/pcsx-r-datadir.patch @@ -0,0 +1,37 @@ +diff --git a/data/Makefile.am b/data/Makefile.am +index 9930320..a507993 100644 +--- a/data/Makefile.am ++++ b/data/Makefile.am +@@ -1,7 +1,7 @@ + glade_DATA = pcsx.glade2 + gladedir = $(datadir)/pcsx + +-desktopdir = $(datadir)/applications ++desktopdir = /usr/share/applications + desktop_DATA = pcsx.desktop + + EXTRA_DIST = $(glade_DATA) pcsx.desktop +diff --git a/gui/Makefile.am b/gui/Makefile.am +index eacfd67..a1e1002 100644 +--- a/gui/Makefile.am ++++ b/gui/Makefile.am +@@ -1,5 +1,5 @@ + INCLUDES = -DPACKAGE_DATA_DIR=\"${datadir}/pcsx/\" \ +- -DPIXMAPDIR=\"${datadir}/pixmaps/\" \ ++ -DPIXMAPDIR=\"/usr/share/pixmaps/\" \ + -DLOCALE_DIR=\"${datadir}/locale/\" \ + $(GTK2_CFLAGS) $(GLADE2_CFLAGS) \ + -I$(top_srcdir)/libpcsxcore -I$(top_srcdir)/include \ +diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am +index ea6e2d2..2f04173 100644 +--- a/pixmaps/Makefile.am ++++ b/pixmaps/Makefile.am +@@ -1,7 +1,7 @@ + pixmapdir = "$(datadir)/pcsx" + pixmap_DATA = pcsx.jpg + +-icondir = "$(datadir)/pixmaps" ++icondir = "/usr/share/pixmaps" + icon_DATA = pcsx-icon.png + + EXTRA_DIST = pcsx.jpg pcsx-icon.png diff --git a/games-emulation/pcsx-r/pcsx-r-1.9.92.ebuild b/games-emulation/pcsx-r/pcsx-r-1.9.92.ebuild new file mode 100644 index 0000000..62aaacc --- /dev/null +++ b/games-emulation/pcsx-r/pcsx-r-1.9.92.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=2 + +inherit eutils autotools games + +MY_PN="${PN/-/}" +DESCRIPTION="PCSX-Reloaded: a fork of PCSX, the discontinued Playstation emulator" +HOMEPAGE="http://pcsxr.codeplex.com" +SRC_URI="http://download.codeplex.com/Project/Download/FileDownload.aspx?ProjectName=pcsxr&DownloadId=140521&FileTime=129254829621800000&Build=17027 -> pcsxr-1.9.92.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~ppc" +IUSE="alsa opengl" + +RDEPEND="x11-libs/gtk+:2 + gnome-base/libglade + media-libs/libsdl + sys-libs/zlib + app-arch/bzip2 + x11-libs/libXv + x11-libs/libXtst + alsa? ( media-libs/alsa-lib ) + opengl? ( virtual/opengl + x11-libs/libXxf86vm )" + +DEPEND="${RDEPEND} + !games-emulation/pcsx + !games-emulation/pcsx-df + x86? ( dev-lang/nasm )" + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_prepare() { + cd "${S}" || die + # fix plugin path + for i in $(grep -irl 'games/psemu' *); + do + einfo "Fixing plugin loading path for ${i}" + sed -i "$i" -e "s:games/psemu:psemu:g" || die "sed failed" + done + + # fix icon and .desktop path + epatch "${FILESDIR}/${PN}-datadir.patch" + + # regenerate for changes to spread + eautoreconf +} + +src_configure() { + egamesconf \ + $(use_enable alsa) \ + $(use_enable opengl) \ + || die "econf failed" +} + +src_install() { + emake DESTDIR="${D}" install \ + || die "emake install failed" + + dodoc README doc/keys.txt doc/tweaks.txt ChangeLog + prepgamesdirs +} + diff --git a/games-strategy/hedgewars/Manifest b/games-strategy/hedgewars/Manifest new file mode 100644 index 0000000..c98d6ed --- /dev/null +++ b/games-strategy/hedgewars/Manifest @@ -0,0 +1,2 @@ +DIST hedgewars-src-0.9.15.tar.bz2 133509451 RMD160 10d86a0f78eae0dd117da7d8c3e84c215eccd3b6 SHA1 c6e8fb136ff450a7f36ad2dca3b0963373dd003b SHA256 b9ebb2e7a55c6d9c9c16f65165d3646262a2e48d1e5c2673fc45eb75fe2fb942 +EBUILD hedgewars-0.9.15-r9999.ebuild 1679 RMD160 6aa30ceb20b85c874086fdd4d203250e2e4a7fd0 SHA1 6c1f295d56c1e7ab9bfdb9aa80e9a8938a467b67 SHA256 fa904c6cee3a6f376fddb4f473df0eed1cab22c5661165e638f907a47a72cdf8 diff --git a/games-strategy/hedgewars/hedgewars-0.9.15-r9999.ebuild b/games-strategy/hedgewars/hedgewars-0.9.15-r9999.ebuild new file mode 100644 index 0000000..1a5e730 --- /dev/null +++ b/games-strategy/hedgewars/hedgewars-0.9.15-r9999.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/games-strategy/hedgewars/hedgewars-0.9.14.1.ebuild,v 1.1 2010/11/15 19:56:46 mr_bones_ Exp $ + +# Pinkbyte: ebuild from bugs.gentoo.org/247114 with full server support + +EAPI=2 +inherit cmake-utils eutils games + +MY_P=${PN}-src-${PV} +DESCRIPTION="Free Worms-like turn based strategy game" +HOMEPAGE="http://hedgewars.org/" +SRC_URI="http://hedgewars.org/download/${MY_P}.tar.bz2" + +LICENSE="GPL-2 Apache-2.0 FDL-1.3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="server" + +RDEPEND="x11-libs/qt-gui:4 + media-libs/libsdl[audio,opengl,video] + media-libs/sdl-ttf + media-libs/sdl-mixer[vorbis] + media-libs/sdl-image[png] + media-libs/sdl-net + dev-lang/lua" +DEPEND="${RDEPEND} + >=dev-lang/fpc-2.4 + server? ( >=dev-lang/ghc-6.10.4-r1 + dev-haskell/stm + dev-haskell/network + dev-haskell/time + dev-haskell/dataenc + dev-haskell/hslogger + dev-haskell/utf8-string + )" +RDEPEND="${RDEPEND} + >=media-fonts/dejavu-2.28" + +S=${WORKDIR}/${MY_P} + +src_configure() { + mycmakeargs="-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX} -DDATA_INSTALL_DIR=${GAMES_DATADIR} -DCMAKE_VERBOSE_MAKEFILE=TRUE $(cmake-utils_use_with server SERVER)" + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile +} + +src_install() { + DOCS="ChangeLog.txt README" cmake-utils_src_install + rm -f "${D}"/usr/share/games/hedgewars/Data/Fonts/DejaVuSans-Bold.ttf + dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf \ + "${GAMES_DATADIR}"/hedgewars/Data/Fonts/DejaVuSans-Bold.ttf + newicon QTfrontend/res/hh25x25.png ${PN}.png + make_desktop_entry ${PN} Hedgewars + doman man/${PN}.6 + prepgamesdirs +} diff --git a/kde-base/kdeplasma-addons/Manifest b/kde-base/kdeplasma-addons/Manifest new file mode 100644 index 0000000..8111c80 --- /dev/null +++ b/kde-base/kdeplasma-addons/Manifest @@ -0,0 +1,6 @@ +AUX kdeplasma-addons-4.5.56-cmake.patch 1187 RMD160 ad64390a6e6849f6aa5bbe7977a00c0fae07d3e8 SHA1 7578d9ac836da26dd2bf5e0cea9b35026d3ba0e3 SHA256 c6f79442c1e3e65b71da6dcc112377461dc3154201a01d506a13020f20428618 +AUX kdeplasma-addons-semantic-fix.patch 1489 RMD160 e9ec2b6ab740495d932aec542c2231c8a7764484 SHA1 8d15704af2c262486b8ac1d518d8a82acfbb426a SHA256 5055d831ceba14984eadb3fb407e6b0c4d7e72a0e94f2f8c16d0c326923223e2 +DIST kdeplasma-addons-4.6.0.tar.bz2 1906209 RMD160 c4b48291797d88ffeadaf8f684a800dcfdf22272 SHA1 d266ca34c293743a64362b063ab58f671e7c1777 SHA256 25988e1f79bee950df8ac20df6a047068eb196e3ca7ab19d4f932ae0ecfe1b5d +DIST kdeplasma-addons-4.6.1.tar.bz2 1933475 RMD160 a152ddf814c29f544e35407e711323e745a98fa5 SHA1 8b959c1e2aa5f00b2f0897c9415ba018b018a3d7 SHA256 e5a3c03f8172b86eb4c56444cf524807207b30c14ab32be96107e16f271352b9 +EBUILD kdeplasma-addons-4.6.0-r9999.ebuild 2203 RMD160 d8ac7b8d837d1a54c627c6ef9b356b48985718af SHA1 1101775028d9680a06740d598b47bb4c093291a4 SHA256 1eca58f4e04fd77eb3346038070f343363d76765060a97b3456d78f315d118b8 +EBUILD kdeplasma-addons-4.6.1-r9999.ebuild 2189 RMD160 9bdb509a4ed078b178b39c2ac5c937c0a1182676 SHA1 7686031a965d1dcce946b31f5a1af082976cd46a SHA256 5969bfc552d8fe6ab04a43972181e1f5368e35fabfd6d5295cffadf17bb44348 diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.5.56-cmake.patch b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.5.56-cmake.patch new file mode 100644 index 0000000..1e326a5 --- /dev/null +++ b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.5.56-cmake.patch @@ -0,0 +1,47 @@ +Index: applets/CMakeLists.txt +=================================================================== +--- applets/CMakeLists.txt (revision 1172136) ++++ applets/CMakeLists.txt (working copy) +@@ -16,6 +16,7 @@ + add_subdirectory(calculator) + add_subdirectory(charselect) + add_subdirectory(comic) ++add_subdirectory(dict) + add_subdirectory(fifteenPuzzle) + add_subdirectory(fileWatcher) + add_subdirectory(frame) +@@ -30,14 +31,21 @@ + add_subdirectory(microblog) + add_subdirectory(notes) + add_subdirectory(nowplaying) ++ + if(LIBATTICA_FOUND) + add_subdirectory(community) + add_subdirectory(social-news) + endif(LIBATTICA_FOUND) ++ + add_subdirectory(pastebin) + add_subdirectory(previewer) + add_subdirectory(rememberthemilk) +-add_subdirectory(rssnow) ++ ++if(KDEPIMLIBS_FOUND) ++ add_subdirectory(news) ++ add_subdirectory(rssnow) ++endif(KDEPIMLIBS_FOUND) ++ + add_subdirectory(spellcheck) + add_subdirectory(showdashboard) + add_subdirectory(timer) +@@ -48,11 +56,6 @@ + add_subdirectory(weatherstation) + add_subdirectory(weather) + +-if(QT_QTWEBKIT_FOUND) +- add_subdirectory(dict) +- add_subdirectory(news) +-endif(QT_QTWEBKIT_FOUND) +- + if(PHONON_FOUND) + add_subdirectory(mediaplayer) + endif(PHONON_FOUND) diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-semantic-fix.patch b/kde-base/kdeplasma-addons/files/kdeplasma-addons-semantic-fix.patch new file mode 100644 index 0000000..00cd1c0 --- /dev/null +++ b/kde-base/kdeplasma-addons/files/kdeplasma-addons-semantic-fix.patch @@ -0,0 +1,36 @@ +diff -purN kdeplasma-addons-4.6.0-orig//applets/CMakeLists.txt kdeplasma-addons-4.6.0/applets/CMakeLists.txt +--- kdeplasma-addons-4.6.0-orig//applets/CMakeLists.txt 2011-02-11 17:25:19.576723309 +0200 ++++ kdeplasma-addons-4.6.0/applets/CMakeLists.txt 2011-02-11 17:25:43.724708635 +0200 +@@ -77,7 +77,6 @@ endif( Qwt5-Qt4_FOUND ) + + if(NOT WIN32) + if(KDE4WORKSPACE_FOUND) +- add_subdirectory(lancelot) + endif(KDE4WORKSPACE_FOUND) + add_subdirectory(incomingmsg) + add_subdirectory(leavenote) +diff -purN kdeplasma-addons-4.6.0-orig//libs/CMakeLists.txt kdeplasma-addons-4.6.0/libs/CMakeLists.txt +--- kdeplasma-addons-4.6.0-orig//libs/CMakeLists.txt 2011-02-11 17:25:19.590725043 +0200 ++++ kdeplasma-addons-4.6.0/libs/CMakeLists.txt 2011-02-11 17:25:33.049389764 +0200 +@@ -1,9 +1,7 @@ + + add_subdirectory(plasmaweather) + add_subdirectory(rtm) +-add_subdirectory(lancelot) + + if(NOT WIN32 AND KDE4WORKSPACE_FOUND) +- add_subdirectory(lancelot-datamodels) + endif(NOT WIN32 AND KDE4WORKSPACE_FOUND) + +diff -purN kdeplasma-addons-4.6.0-orig//runners/CMakeLists.txt kdeplasma-addons-4.6.0/runners/CMakeLists.txt +--- kdeplasma-addons-4.6.0-orig//runners/CMakeLists.txt 2011-02-11 17:25:19.570722582 +0200 ++++ kdeplasma-addons-4.6.0/runners/CMakeLists.txt 2011-02-11 17:26:21.888412339 +0200 +@@ -10,8 +10,6 @@ add_subdirectory(spellchecker) + add_subdirectory(characters) + + if(KDEPIMLIBS_FOUND) +-add_subdirectory(contacts) +-add_subdirectory(events) + endif(KDEPIMLIBS_FOUND) + + if(NOT WIN32) diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.0-r9999.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.0-r9999.ebuild new file mode 100644 index 0000000..e2e71ad --- /dev/null +++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.0-r9999.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.0.ebuild,v 1.1 2011/01/26 20:29:23 alexxy Exp $ + +EAPI="3" + +KMNAME="kdeplasma-addons" +WEBKIT_REQUIRED="always" +inherit kde4-base + +DESCRIPTION="Extra Plasma applets and engines." +HOMEPAGE="http://www.kde.org/" +LICENSE="GPL-2 LGPL-2" + +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="debug desktopglobe exif qalculate qwt scim semantic-desktop" + +# krunner is only needed to generate dbus interface for lancelot +COMMON_DEPEND=" + app-crypt/qca:2 + app-crypt/qca-ossl:2 + dev-libs/libattica + $(add_kdebase_dep kdelibs 'semantic-desktop?') + $(add_kdebase_dep kdepimlibs) + $(add_kdebase_dep krunner) + $(add_kdebase_dep plasma-workspace) + x11-misc/shared-mime-info + desktopglobe? ( $(add_kdebase_dep marble) ) + exif? ( $(add_kdebase_dep libkexiv2) ) + qalculate? ( sci-libs/libqalculate ) + qwt? ( x11-libs/qwt:5 ) + scim? ( app-i18n/scim ) +" +DEPEND="${COMMON_DEPEND} + dev-cpp/eigen:2 +" +# kde-misc/plasmaboard: moved here in 4.3.65 +# kde-misc/qalculate-applet: since 4.4.0 +RDEPEND="${COMMON_DEPEND} + !kdeprefix? ( + !kde-misc/plasmaboard + !kde-misc/qalculate-applet + ) +" + +# kdebase-data: some svg icons moved from data directly here. +add_blocker kdebase-data '<4.2.88' + +PATCHES=( + "${FILESDIR}/${PN}-4.5.56-cmake.patch" +) + +src_prepare() { + find "${S}" -name CMakeLists.txt | \ + xargs sed -i \ + -e 's/${KDE4WORKSPACE_PLASMACLOCK_LIBRARY}/plasmaclock/g' \ + -e 's/${KDE4WORKSPACE_WEATHERION_LIBRARY}/weather_ion/g' \ + -e 's/${KDE4WORKSPACE_TASKMANAGER_LIBRARY}/taskmanager/g' \ + || die "Failed to patch CMake files" + + kde4-base_src_prepare +} + +src_configure() { + if ! use semantic-desktop; then + epatch "${FILESDIR}/kdeplasma-addons-semantic-fix.patch" + fi + + mycmakeargs=( + -DDBUS_INTERFACES_INSTALL_DIR="${EKDEDIR}/share/dbus-1/interfaces/" + $(cmake-utils_use_with desktopglobe Marble) + $(cmake-utils_use_with exif Kexiv2) + $(cmake-utils_use_with qalculate) + $(cmake-utils_use_with qwt) + $(cmake-utils_use_with semantic-desktop Nepomuk) + $(cmake-utils_use_with scim) + ) + + kde4-base_src_configure +} diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.1-r9999.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.1-r9999.ebuild new file mode 100644 index 0000000..36a24a9 --- /dev/null +++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.1-r9999.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.1.ebuild,v 1.1 2011/03/04 18:00:09 alexxy Exp $ + +EAPI=3 + +WEBKIT_REQUIRED="always" +KDE_SCM="git" +inherit kde4-base + +DESCRIPTION="Extra Plasma applets and engines." +HOMEPAGE="http://www.kde.org/" +LICENSE="GPL-2 LGPL-2" + +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="debug desktopglobe exif qalculate qwt scim semantic-desktop" + +# krunner is only needed to generate dbus interface for lancelot +COMMON_DEPEND=" + app-crypt/qca:2 + app-crypt/qca-ossl:2 + dev-libs/libattica + $(add_kdebase_dep kdelibs 'semantic-desktop?') + $(add_kdebase_dep kdepimlibs) + $(add_kdebase_dep krunner) + $(add_kdebase_dep plasma-workspace) + x11-misc/shared-mime-info + desktopglobe? ( $(add_kdebase_dep marble) ) + exif? ( $(add_kdebase_dep libkexiv2) ) + qalculate? ( sci-libs/libqalculate ) + qwt? ( x11-libs/qwt:5 ) + scim? ( app-i18n/scim ) +" +DEPEND="${COMMON_DEPEND} + dev-cpp/eigen:2 +" +# kde-misc/plasmaboard: moved here in 4.3.65 +# kde-misc/qalculate-applet: since 4.4.0 +RDEPEND="${COMMON_DEPEND} + !kdeprefix? ( + !kde-misc/plasmaboard + !kde-misc/qalculate-applet + ) +" + +# kdebase-data: some svg icons moved from data directly here. +add_blocker kdebase-data '<4.2.88' + +PATCHES=( + "${FILESDIR}/${PN}-4.5.56-cmake.patch" +) + +src_prepare() { + find "${S}" -name CMakeLists.txt | \ + xargs sed -i \ + -e 's/${KDE4WORKSPACE_PLASMACLOCK_LIBRARY}/plasmaclock/g' \ + -e 's/${KDE4WORKSPACE_WEATHERION_LIBRARY}/weather_ion/g' \ + -e 's/${KDE4WORKSPACE_TASKMANAGER_LIBRARY}/taskmanager/g' \ + || die "Failed to patch CMake files" + + kde4-base_src_prepare +} + +src_configure() { + if ! use semantic-desktop; then + epatch "${FILESDIR}/kdeplasma-addons-semantic-fix.patch" + fi + + mycmakeargs=( + -DDBUS_INTERFACES_INSTALL_DIR="${EKDEDIR}/share/dbus-1/interfaces/" + $(cmake-utils_use_with desktopglobe Marble) + $(cmake-utils_use_with exif Kexiv2) + $(cmake-utils_use_with qalculate) + $(cmake-utils_use_with qwt) + $(cmake-utils_use_with semantic-desktop Nepomuk) + $(cmake-utils_use_with scim) + ) + + kde4-base_src_configure +} diff --git a/kde-misc/ihatethecashew/Manifest b/kde-misc/ihatethecashew/Manifest new file mode 100644 index 0000000..c851e7a --- /dev/null +++ b/kde-misc/ihatethecashew/Manifest @@ -0,0 +1,3 @@ +AUX kde-4.6-compat.patch 491 RMD160 a30c16a4565037d95c349fb9582fa1907ed9310c SHA1 6960c485c02fa9bf44d2a8e016b85a8f12c73d35 SHA256 e406cfe0b1e0aa555aeb1e570db327672823ddd1bd2d1c61f2064b76b627d30e +DIST 91009-iHateTheCashew-4.4.tbz 8833 RMD160 bdf03c38d7555911067d61830e5bb3676f24e307 SHA1 b91b5e4ab3bd1c8b0d0185c3e852edaf89f06667 SHA256 03b92459abb2707d7effb3be6410eca5cce23b3efd5bbd302764351059c87254 +EBUILD ihatethecashew-0.4-r9999.ebuild 696 RMD160 b847d9996fa6e2b4a9577b37a48a6b2a47a5b05e SHA1 a7493b9594c954b458ee3d4a91404e6de204778c SHA256 b73bc4d588ff22b90c036b9b0ef5924f6da0c16cf688dbf408fe1b496f544537 diff --git a/kde-misc/ihatethecashew/files/kde-4.6-compat.patch b/kde-misc/ihatethecashew/files/kde-4.6-compat.patch new file mode 100644 index 0000000..f9c1087 --- /dev/null +++ b/kde-misc/ihatethecashew/files/kde-4.6-compat.patch @@ -0,0 +1,11 @@ +--- ihtc.cpp.orig 2009-12-17 20:20:27.000000000 +0100 ++++ ihtc.cpp 2011-02-02 11:45:35.567271213 +0100 +@@ -116,7 +116,7 @@ + foreach (QGraphicsItem *kid, desktop->childItems()) + { + o = dynamic_cast(kid); +- if (o && o->inherits("Plasma::ToolBox") || o->inherits("Plasma::DesktopToolBox")) ++ if (o && o->inherits("Plasma::ToolBox") || o->inherits("Plasma::DesktopToolBox") || o->inherits("DesktopToolBox")) + return kid; + } + return 0; diff --git a/kde-misc/ihatethecashew/ihatethecashew-0.4-r9999.ebuild b/kde-misc/ihatethecashew/ihatethecashew-0.4-r9999.ebuild new file mode 100644 index 0000000..f963db4 --- /dev/null +++ b/kde-misc/ihatethecashew/ihatethecashew-0.4-r9999.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=3 + +inherit kde4-base + +MY_PN="iHateTheCashew" + +DESCRIPTION="KDE4 plasmoid. Removes the \"hand\" in upper right corner of the screen" +HOMEPAGE="http://www.kde-look.org/content/show.php/I+HATE+the+Cashew?content=91009" +SRC_URI="http://www.kde-look.org/CONTENT/content-files/91009-${MY_PN}-4.4.tbz" + +LICENSE="GPL-3" +KEYWORDS="~amd64 ~x86" +SLOT="0" +IUSE="debug" + +RDEPEND=" + >=kde-base/plasma-workspace-${KDE_MINIMAL} +" + +S="${WORKDIR}/${MY_PN}" + +src_compile() { + # Pinkbyte: add KDE 4.6 compatibility patch + epatch "$FILESDIR/kde-4.6-compat.patch" + # + kde4-base_src_compile +} diff --git a/media-libs/sdl-net/Manifest b/media-libs/sdl-net/Manifest new file mode 100644 index 0000000..4d83b41 --- /dev/null +++ b/media-libs/sdl-net/Manifest @@ -0,0 +1,3 @@ +AUX sdl-net-1.2.7-ipv6-new.patch 37622 RMD160 46f6051ae637412fbdea404f3f5131ccf7f29f89 SHA1 b2204efb22d22c20d5424b5605199e1e431d124a SHA256 746da9f0aff50dccbae079898693d9835f4ebfd6e2b1bf13fb20b7d3eeb37a9e +DIST SDL_net-1.2.7.tar.gz 373866 RMD160 5c95cf28f35ceb796188323666b92cafa60fba25 SHA1 b46c7e3221621cc34fec1238f1b5f0ce8972274d SHA256 2ce7c84e62ff8117b9f205758bcce68ea603e08bc9d6936ded343735b8b77c53 +EBUILD sdl-net-1.2.7-r9999.ebuild 1434 RMD160 d11f19ab90544f03f0133130d6f6597c3982c4d3 SHA1 16b61c9a1a00b4b0bf861030e70b6be6f7c7c5a0 SHA256 1c60f2b941cffb9031b33ba970dd95972e467bb63a9de750bae7e0d66b7bfba1 diff --git a/media-libs/sdl-net/files/sdl-net-1.2.7-ipv6-new.patch b/media-libs/sdl-net/files/sdl-net-1.2.7-ipv6-new.patch new file mode 100644 index 0000000..cbeff21 --- /dev/null +++ b/media-libs/sdl-net/files/sdl-net-1.2.7-ipv6-new.patch @@ -0,0 +1,1410 @@ +Index: chat.cpp +=================================================================== +--- chat.cpp.orig 2011-07-03 14:22:32.000000000 +0400 ++++ chat.cpp 2011-07-03 14:22:43.138070766 +0400 +@@ -121,10 +121,12 @@ + } + memcpy(packets[0]->data, buf, len); + packets[0]->len = len; ++ + SDLNet_UDP_Send(udpsock, i, packets[0]); + } + } + } ++ + void SendKey(SDLKey key, Uint16 unicode) + { + static char keybuf[80-sizeof(CHAT_PROMPT)+1]; +@@ -175,6 +177,8 @@ + case CHAT_ADD: { + Uint8 which; + IPaddress newip; ++ char *hostname; ++ int port; + + /* Figure out which channel we got */ + which = data[CHAT_ADD_SLOT]; +@@ -183,27 +187,34 @@ + break; + } + /* Get the client IP address */ +- newip.host=SDLNet_Read32(&data[CHAT_ADD_HOST]); +- newip.port=SDLNet_Read16(&data[CHAT_ADD_PORT]); ++ hostname = (char *) &data[CHAT_ADD_HOST]; ++ ++ port = SDLNet_Read16(hostname + strlen(hostname) + 1); + + /* Copy name into channel */ +- memcpy(people[which].name, &data[CHAT_ADD_NAME], 256); ++ /* (this is probably insecure) */ ++ ++ strncpy((char *) people[which].name, ++ hostname + strlen(hostname) + 3, 256); + people[which].name[256] = 0; + people[which].active = 1; + + /* Let the user know what happened */ + termwin->AddText( +- "* New client on %d from %d.%d.%d.%d:%d (%s)\n", which, +- (newip.host>>24)&0xFF, (newip.host>>16)&0xFF, +- (newip.host>>8)&0xFF, newip.host&0xFF, +- newip.port, people[which].name); ++ "* New client on %d from %s:%d (%s)\n", which, ++ hostname, port, people[which].name); + + /* Put the address back in network form */ +- newip.host = SDL_SwapBE32(newip.host); +- newip.port = SDL_SwapBE16(newip.port); + +- /* Bind the address to the UDP socket */ +- SDLNet_UDP_Bind(udpsock, which, &newip); ++ if (SDLNet_ResolveHost_new(SDLNET_ANY, &newip, ++ hostname, port) < 0) { ++ fprintf(stderr, ++ "Cant resolve %s:%i\n", ++ hostname, port); ++ } else { ++ /* Bind the address to the UDP socket */ ++ SDLNet_UDP_Bind(udpsock, which, &newip); ++ } + } + used = CHAT_ADD_NAME+data[CHAT_ADD_NLEN]; + break; +@@ -220,8 +231,7 @@ + people[which].active = 0; + + /* Let the user know what happened */ +- termwin->AddText( +- "* Lost client on %d (%s)\n", which, people[which].name); ++ termwin->AddText("* Lost client on %d (%s)\n", which, people[which].name); + + /* Unbind the address on the UDP socket */ + SDLNet_UDP_Unbind(udpsock, which); +@@ -273,12 +283,12 @@ + void HandleClient(void) + { + int n; +- ++ + n = SDLNet_UDP_RecvV(udpsock, packets); + while ( n-- > 0 ) { + if ( packets[n]->channel >= 0 ) { + termwin->AddText("[%s] ", +- people[packets[n]->channel].name); ++ people[packets[n]->channel].name); + termwin->AddText((char *)packets[n]->data, packets[n]->len); + } + } +@@ -383,6 +393,7 @@ + int i; + char *server; + IPaddress serverIP; ++ SDLNet_AddrType addrtype; + + /* Check command line arguments */ + if ( argv[1] == NULL ) { +@@ -441,33 +452,43 @@ + server = argv[1]; + termwin->AddText("Connecting to %s ... ", server); + gui->Display(); +- SDLNet_ResolveHost(&serverIP, server, CHAT_PORT); +- if ( serverIP.host == INADDR_NONE ) { ++ if (SDLNet_ResolveHost_new(SDLNET_ANY, &serverIP, server, CHAT_PORT) < 0) { + termwin->AddText("Couldn't resolve hostname\n"); + } else { + /* If we fail, it's okay, the GUI shows the problem */ +- tcpsock = SDLNet_TCP_Open(&serverIP); ++ tcpsock = SDLNet_TCP_Open(&serverIP); + if ( tcpsock == NULL ) { + termwin->AddText("Connect failed\n"); + } else { + termwin->AddText("Connected\n"); + } + } +- /* Try ports in the range {CHAT_PORT - CHAT_PORT+10} */ +- for ( i=0; (udpsock == NULL) && i<10; ++i ) { +- udpsock = SDLNet_UDP_Open(CHAT_PORT+i); +- } +- if ( udpsock == NULL ) { +- SDLNet_TCP_Close(tcpsock); +- tcpsock = NULL; +- termwin->AddText("Couldn't create UDP endpoint\n"); ++ ++ if (tcpsock) { ++ SDLNet_AddrType addrtype; ++ ++ /* make udp socket the same type of socket as the tcp socket */ ++ ++ addrtype = SDLNet_TCP_GetPeerAddress(tcpsock)->type; ++ ++ /* Try ports in the range {CHAT_PORT - CHAT_PORT+10} */ ++ ++ for ( i=0; (udpsock == NULL) && i<10; ++i ) { ++ printf("trying port %i\n", CHAT_PORT+i); ++ udpsock = SDLNet_UDP_Open(addrtype, CHAT_PORT+i); ++ } ++ if ( udpsock == NULL ) { ++ SDLNet_TCP_Close(tcpsock); ++ tcpsock = NULL; ++ termwin->AddText("Couldn't create UDP endpoint\n"); ++ } + } + + /* Allocate the socket set for polling the network */ + socketset = SDLNet_AllocSocketSet(2); + if ( socketset == NULL ) { + fprintf(stderr, "Couldn't create socket set: %s\n", +- SDLNet_GetError()); ++ SDLNet_GetError()); + cleanup(2); + } + SDLNet_TCP_AddSocket(socketset, tcpsock); +Index: configure.in +=================================================================== +--- configure.in.orig 2011-07-03 14:22:32.000000000 +0400 ++++ configure.in 2011-07-03 14:22:43.113070766 +0400 +@@ -107,6 +107,28 @@ + CFLAGS="$CFLAGS $SDL_CFLAGS" + LIBS="$LIBS $SDL_LIBS" + ++dnl ipv6 check ++AC_ARG_ENABLE(ipv6, ++[ --enable-ipv6 Use ipv6, if available. [default=yes]],enable_ipv6=$enableval,enable_ipv6=yes) ++ ++AC_MSG_CHECKING(whether to enable ipv6) ++ ++if test "x$enable_ipv6" = "xyes" ; then ++ AC_TRY_COMPILE([#define INET6 ++#include ++#include ], ++ [int x = IPPROTO_IPV6; struct in6_addr a;], ++ [ts_cv_ipv6="yes"], [ts_cv_ipv6="no"]) ++else ++ ts_cv_ipv6="no" ++fi ++ ++AC_MSG_RESULT($ts_cv_ipv6) ++ ++if test "x$ts_cv_ipv6" = "xyes"; then ++ AC_DEFINE(USE_IPV6) ++fi ++ + dnl Check for GUI library for the chat client + have_GUI=no + AC_ARG_ENABLE(gui, +@@ -121,6 +143,7 @@ + ]) + fi + fi ++ + AM_CONDITIONAL(HAVE_GUI_LIB, test x$have_GUI = xyes) + + dnl C++ flags are the same as the C flags +Index: SDLnetTCP.c +=================================================================== +--- SDLnetTCP.c.orig 2011-07-03 14:22:32.000000000 +0400 ++++ SDLnetTCP.c 2011-07-03 14:22:43.127070766 +0400 +@@ -690,16 +690,33 @@ + int sflag; + }; + +-/* Open a TCP network socket +- If 'remote' is NULL, this creates a local server socket on the given port, +- otherwise a TCP connection to the remote host and port is attempted. +- The newly created socket is returned, or NULL if there was an error. +-*/ ++/* Open a TCP connection to a remote machine */ ++ + TCPsocket SDLNet_TCP_Open(IPaddress *ip) + { ++ sockaddr_max sock_addr; ++ int family; + TCPsocket sock; +- struct sockaddr_in sock_addr; + ++#ifdef DEBUG_NET ++ printf("SDLNet_TCP_Open(%s)\n", SDLNet_PresentIP(ip)); ++#endif ++ ++ if (ip->type == SDLNET_ANY) { ++ ++ // try ipv6 first ++ ++ sock = SDLNet_TCP_Open((IPaddress *) &IP_ADDRESS_ANY(ip)->addr6); ++ ++ if (sock) ++ return sock; ++ ++ // try ipv4 ++ ++ return SDLNet_TCP_Open((IPaddress *) &IP_ADDRESS_ANY(ip)->addr4); ++ ++ } ++ + /* Allocate a TCP socket structure */ + sock = (TCPsocket)malloc(sizeof(*sock)); + if ( sock == NULL ) { +@@ -707,100 +724,162 @@ + goto error_return; + } + ++ family = SDLNet_AddrType_to_family(ip->type); ++ + /* Open the socket */ +- sock->channel = socket(AF_INET, SOCK_STREAM, 0); ++ sock->channel = socket(family, SOCK_STREAM, 0); + if ( sock->channel == INVALID_SOCKET ) { + SDLNet_SetError("Couldn't create socket"); + goto error_return; + } + +- /* Connect to remote, or bind locally, as appropriate */ +- if ( (ip->host != INADDR_NONE) && (ip->host != INADDR_ANY) ) { ++ SDLNet_IPaddress_to_sockaddr(ip, ++ (struct sockaddr *) &sock_addr); ++ ++ /* Connect to the remote host */ ++ if ( connect(sock->channel, (struct sockaddr *)&sock_addr, ++ sizeof(sock_addr)) == SOCKET_ERROR ) { ++ SDLNet_SetError("Couldn't connect to remote host"); ++ goto error_return; ++ } ++ ++ sock->sflag = 0; ++ sock->ready = 0; + +- // ######### Connecting to remote ++#ifdef TCP_NODELAY ++ /* Set the nodelay TCP option for real-time games */ ++ { int yes = 1; ++ setsockopt(sock->channel, IPPROTO_TCP, TCP_NODELAY, (char*)&yes, sizeof(yes)); ++ } ++#endif /* TCP_NODELAY */ ++ ++ /* Fill in the channel host address */ ++ SDLNet_CopyIP(&sock->remoteAddress, ip); ++ ++ /* The socket is ready */ ++ return(sock); + +- memset(&sock_addr, 0, sizeof(sock_addr)); +- sock_addr.sin_family = AF_INET; +- sock_addr.sin_addr.s_addr = ip->host; +- sock_addr.sin_port = ip->port; +- +- /* Connect to the remote host */ +- if ( connect(sock->channel, (struct sockaddr *)&sock_addr, +- sizeof(sock_addr)) == SOCKET_ERROR ) { +- SDLNet_SetError("Couldn't connect to remote host"); +- goto error_return; +- } +- sock->sflag = 0; +- } else { + ++error_return: ++ SDLNet_TCP_Close(sock); ++ return(NULL); ++} ++ ++/* Open a TCP network socket */ ++ ++TCPsocket SDLNet_TCP_OpenServer(SDLNet_AddrType type, int port) ++{ ++ sockaddr_max sock_addr; ++ TCPsocket sock; ++ int family; ++ ++ /* Allocate a TCP socket structure */ ++ sock = (TCPsocket)malloc(sizeof(*sock)); ++ if ( sock == NULL ) { ++ SDLNet_SetError("Out of memory"); ++ goto error_return; ++ } ++ ++ family = SDLNet_AddrType_to_family(type); ++ ++ if (family < 0) { ++ SDLNet_SetError("Cannot create a server of type %s", ++ SDLNet_AddrType_to_string(type)); ++ goto error_return; ++ } ++ ++ /* Open the socket */ ++ sock->channel = socket(family, SOCK_STREAM, 0); ++ if ( sock->channel == INVALID_SOCKET ) { ++ SDLNet_SetError("Couldn't create socket"); ++ goto error_return; ++ } ++ + // ########## Binding locally + ++ if (family == AF_INET) { ++ struct sockaddr_in *addr = (struct sockaddr_in *) &sock_addr; ++ + memset(&sock_addr, 0, sizeof(sock_addr)); +- sock_addr.sin_family = AF_INET; +- sock_addr.sin_addr.s_addr = INADDR_ANY; +- sock_addr.sin_port = ip->port; +- +-/* +- * Windows gets bad mojo with SO_REUSEADDR: +- * http://www.devolution.com/pipermail/sdl/2005-September/070491.html +- * --ryan. +- */ +-#ifndef WIN32 +- /* allow local address reuse */ +- { int yes = 1; +- setsockopt(sock->channel, SOL_SOCKET, SO_REUSEADDR, (char*)&yes, sizeof(yes)); +- } +-#endif +- +- /* Bind the socket for listening */ +- if ( bind(sock->channel, (struct sockaddr *)&sock_addr, +- sizeof(sock_addr)) == SOCKET_ERROR ) { +- SDLNet_SetError("Couldn't bind to local port"); +- goto error_return; +- } +- if ( listen(sock->channel, 5) == SOCKET_ERROR ) { +- SDLNet_SetError("Couldn't listen to local port"); +- goto error_return; +- } + +- /* Set the socket to non-blocking mode for accept() */ ++ addr->sin_family = AF_INET; ++ addr->sin_addr.s_addr = INADDR_ANY; ++ addr->sin_port = SDL_SwapBE16(port); ++ } ++#ifdef USE_IPV6 ++ else if (family == AF_INET6) { ++ struct sockaddr_in6 *addr = (struct sockaddr_in6 *) &sock_addr; ++ ++ memset(&sock_addr, 0, sizeof(sock_addr)); ++ addr->sin6_family = AF_INET6; ++ addr->sin6_addr = in6addr_any; ++ addr->sin6_port = SDL_SwapBE16(port); ++ } ++#endif ++ else { ++ SDLNet_SetError("Unsupported address family"); ++ goto error_return; ++ } ++ ++ /* allow local address reuse */ ++ { ++ int yes = 1; ++ setsockopt(sock->channel, SOL_SOCKET, SO_REUSEADDR, ++ (char*)&yes, sizeof(yes)); ++ } ++ ++ /* Bind the socket for listening */ ++ if ( bind(sock->channel, (struct sockaddr *) &sock_addr, ++ sizeof(sock_addr)) == SOCKET_ERROR ) { ++ SDLNet_SetError("Couldn't bind to local port"); ++ goto error_return; ++ } ++ ++ if ( listen(sock->channel, 5) == SOCKET_ERROR ) { ++ SDLNet_SetError("Couldn't listen to local port"); ++ goto error_return; ++ } ++ ++ /* Set the socket to non-blocking mode for accept() */ + #if defined(__BEOS__) && defined(SO_NONBLOCK) +- /* On BeOS r5 there is O_NONBLOCK but it's for files only */ +- { +- long b = 1; +- setsockopt(sock->channel, SOL_SOCKET, SO_NONBLOCK, &b, sizeof(b)); +- } ++ /* On BeOS r5 there is O_NONBLOCK but it's for files only */ ++ { ++ long b = 1; ++ setsockopt(sock->channel, SOL_SOCKET, SO_NONBLOCK, &b, sizeof(b)); ++ } + #elif defined(O_NONBLOCK) +- { +- fcntl(sock->channel, F_SETFL, O_NONBLOCK); +- } ++ { ++ fcntl(sock->channel, F_SETFL, O_NONBLOCK); ++ } + #elif defined(WIN32) +- { +- unsigned long mode = 1; +- ioctlsocket (sock->channel, FIONBIO, &mode); +- } ++ { ++ unsigned long mode = 1; ++ ioctlsocket (sock->channel, FIONBIO, &mode); ++ } + #elif defined(__OS2__) +- { +- int dontblock = 1; +- ioctl(sock->channel, FIONBIO, &dontblock); +- } ++ { ++ int dontblock = 1; ++ ioctl(sock->channel, FIONBIO, &dontblock); ++ } + #else + #warning How do we set non-blocking mode on other operating systems? + #endif +- sock->sflag = 1; +- } ++ sock->sflag = 1; + sock->ready = 0; + + #ifdef TCP_NODELAY + /* Set the nodelay TCP option for real-time games */ +- { int yes = 1; +- setsockopt(sock->channel, IPPROTO_TCP, TCP_NODELAY, (char*)&yes, sizeof(yes)); ++ { ++ int yes = 1; ++ ++ setsockopt(sock->channel, IPPROTO_TCP, TCP_NODELAY, ++ (char*)&yes, sizeof(yes)); + } + #endif /* TCP_NODELAY */ + + /* Fill in the channel host address */ +- sock->remoteAddress.host = sock_addr.sin_addr.s_addr; +- sock->remoteAddress.port = sock_addr.sin_port; ++ SDLNet_sockaddr_to_IPaddress((struct sockaddr *) &sock_addr, ++ &sock->remoteAddress); + + /* The socket is ready */ + return(sock); +@@ -816,7 +895,7 @@ + TCPsocket SDLNet_TCP_Accept(TCPsocket server) + { + TCPsocket sock; +- struct sockaddr_in sock_addr; ++ sockaddr_max sock_addr; + int sock_alen; + + /* Only server sockets can accept */ +@@ -837,10 +916,12 @@ + sock_alen = sizeof(sock_addr); + sock->channel = accept(server->channel, (struct sockaddr *)&sock_addr, + #ifdef USE_GUSI_SOCKETS +- (unsigned int *)&sock_alen); ++ (unsigned int *)&sock_alen + #else +- &sock_alen); ++ &sock_alen + #endif ++ ); ++ + if ( sock->channel == SOCKET_ERROR ) { + SDLNet_SetError("accept() failed"); + goto error_return; +@@ -857,8 +938,9 @@ + fcntl(sock->channel, F_SETFL, flags & ~O_NONBLOCK); + } + #endif /* WIN32 */ +- sock->remoteAddress.host = sock_addr.sin_addr.s_addr; +- sock->remoteAddress.port = sock_addr.sin_port; ++ ++ SDLNet_sockaddr_to_IPaddress((struct sockaddr *) &sock_addr, ++ &sock->remoteAddress); + + sock->sflag = 0; + sock->ready = 0; +Index: SDLnetUDP.c +=================================================================== +--- SDLnetUDP.c.orig 2011-07-03 14:22:32.000000000 +0400 ++++ SDLnetUDP.c 2011-07-03 14:22:43.113070766 +0400 +@@ -24,6 +24,7 @@ + + #include "SDLnetsys.h" + #include "SDL_net.h" ++ + #ifdef MACOS_OPENTRANSPORT + #include + #endif +@@ -31,6 +32,7 @@ + struct _UDPsocket { + int ready; + SOCKET channel; ++ SDLNet_AddrType type; + IPaddress address; + + #ifdef MACOS_OPENTRANSPORT +@@ -272,11 +274,13 @@ + /* Open a UDP network socket + If 'port' is non-zero, the UDP socket is bound to a fixed local port. + */ +-extern UDPsocket SDLNet_UDP_Open(Uint16 port) ++extern UDPsocket SDLNet_UDP_Open(SDLNet_AddrType type, Uint16 port) + { + UDPsocket sock; + #ifdef MACOS_OPENTRANSPORT + EndpointRef dummy = NULL; ++#else ++ int family; + #endif + + /* Allocate a UDP socket structure */ +@@ -308,7 +312,18 @@ + OTSetBlocking( sock->channel ); + } + #else +- sock->channel = socket(AF_INET, SOCK_DGRAM, 0); ++ family = SDLNet_AddrType_to_family(type); ++ ++ // unsupported ? ++ ++ if (family < 0) { ++ SDLNet_SetError("Unsupported address family (%s)", ++ SDLNet_AddrType_to_string(type)); ++ goto error_return; ++ } ++ ++ sock->type = type; ++ sock->channel = socket(family, SOCK_DGRAM, 0); + #endif /* MACOS_OPENTRANSPORT */ + + if ( sock->channel == INVALID_SOCKET ) +@@ -361,31 +376,51 @@ + printf("UDP open host = %d, port = %d\n", assigned.fHost, assigned.fPort ); + #endif + } +-#else ++#else /* MACOS_OPENTRANSPORT */ + /* Bind locally, if appropriate */ + if ( port ) + { +- struct sockaddr_in sock_addr; +- memset(&sock_addr, 0, sizeof(sock_addr)); +- sock_addr.sin_family = AF_INET; +- sock_addr.sin_addr.s_addr = INADDR_ANY; +- sock_addr.sin_port = SDL_SwapBE16(port); ++ sockaddr_max sock_addr; + ++ if (type == SDLNET_IPV4) { ++ struct sockaddr_in *addr ++ = (struct sockaddr_in *) &sock_addr; ++ memset(addr, 0, sizeof(*addr)); ++ addr->sin_family = AF_INET; ++ addr->sin_addr.s_addr = INADDR_ANY; ++ addr->sin_port = SDL_SwapBE16(port); ++ } ++#ifdef USE_IPV6 ++ else if (type == SDLNET_IPV6) { ++ struct sockaddr_in6 *addr ++ = (struct sockaddr_in6 *) &sock_addr; ++ ++ addr->sin6_family = AF_INET6; ++ addr->sin6_addr = in6addr_any; ++ addr->sin6_port = SDL_SwapBE16(port); ++ } ++#endif ++ + /* Bind the socket for listening */ +- if ( bind(sock->channel, (struct sockaddr *)&sock_addr, +- sizeof(sock_addr)) == SOCKET_ERROR ) { ++ if ( bind(sock->channel, ++ (struct sockaddr *)&sock_addr, ++ sizeof(sock_addr)) == SOCKET_ERROR ) { ++ perror("bind"); + SDLNet_SetError("Couldn't bind to local port"); + goto error_return; + } + /* Fill in the channel host address */ +- sock->address.host = sock_addr.sin_addr.s_addr; +- sock->address.port = sock_addr.sin_port; ++ ++ SDLNet_sockaddr_to_IPaddress((struct sockaddr *) &sock_addr, ++ &sock->address); + } + + #ifdef SO_BROADCAST + /* Allow LAN broadcasts with the socket */ +- { int yes = 1; +- setsockopt(sock->channel, SOL_SOCKET, SO_BROADCAST, (char*)&yes, sizeof(yes)); ++ { ++ int yes = 1; ++ setsockopt(sock->channel, SOL_SOCKET, ++ SO_BROADCAST, (char*)&yes, sizeof(yes)); + } + #endif + #endif /* MACOS_OPENTRANSPORT */ +@@ -426,6 +461,17 @@ + int SDLNet_UDP_Bind(UDPsocket sock, int channel, IPaddress *address) + { + struct UDP_channel *binding; ++ IPaddress *expanded_address; ++ ++ expanded_address = SDLNet_ExpandIP(address, sock->type); ++ ++ if (!expanded_address) { ++ SDLNet_SetError("SDLNet_UDP_Bind: Cannot bind a '%s' address " ++ "on a '%s' socket", ++ SDLNet_AddrType_to_string(address->type), ++ SDLNet_AddrType_to_string(sock->type)); ++ return -1; ++ } + + if ( channel == -1 ) { + for ( channel=0; channel < SDLNET_MAX_UDPCHANNELS; ++channel ) { +@@ -444,7 +490,12 @@ + SDLNet_SetError("No room for new addresses"); + return(-1); + } +- binding->address[binding->numbound++] = *address; ++ ++ SDLNet_CopyIP(&binding->address[binding->numbound], ++ expanded_address); ++ ++ ++binding->numbound; ++ + return(channel); + } + +@@ -478,6 +529,7 @@ + } + break; + } ++ + return(address); + } + +@@ -495,7 +547,7 @@ + int status; + #ifndef MACOS_OPENTRANSPORT + int sock_len; +- struct sockaddr_in sock_addr; ++ sockaddr_max sock_addr; + + /* Set up the variables to send packets */ + sock_len = sizeof(sock_addr); +@@ -535,9 +587,21 @@ + ++numsent; + } + #else +- sock_addr.sin_addr.s_addr = packets[i]->address.host; +- sock_addr.sin_port = packets[i]->address.port; +- sock_addr.sin_family = AF_INET; ++ IPaddress *dest; ++ ++ dest = SDLNet_ExpandIP(&packets[i]->address, sock->type); ++ ++ if (!dest) { ++ fprintf(stderr, ++ "SDLNet_UDP_SendV: Cannot to send to " ++ "a '%s' address on a '%s' socket\n", ++ SDLNet_AddrType_to_string(packets[i]->address.type), ++ SDLNet_AddrType_to_string(sock->type)); ++ continue; ++ } ++ ++ SDLNet_IPaddress_to_sockaddr(dest, ++ (struct sockaddr *) &sock_addr); + status = sendto(sock->channel, + packets[i]->data, packets[i]->len, 0, + (struct sockaddr *)&sock_addr,sock_len); +@@ -556,7 +620,7 @@ + #endif + + binding = &sock->binding[packets[i]->channel]; +- ++ + for ( j=binding->numbound-1; j>=0; --j ) + { + #ifdef MACOS_OPENTRANSPORT +@@ -586,9 +650,8 @@ + } + + #else +- sock_addr.sin_addr.s_addr = binding->address[j].host; +- sock_addr.sin_port = binding->address[j].port; +- sock_addr.sin_family = AF_INET; ++ SDLNet_IPaddress_to_sockaddr(&binding->address[j], ++ (struct sockaddr *) &sock_addr); + status = sendto(sock->channel, + packets[i]->data, packets[i]->len, 0, + (struct sockaddr *)&sock_addr,sock_len); +@@ -679,13 +742,13 @@ + InetAddress address; + #else + int sock_len; +- struct sockaddr_in sock_addr; ++ sockaddr_max sock_addr; + #endif + + numrecv = 0; +- while ( packets[numrecv] && SocketReady(sock->channel) ) +- { +- UDPpacket *packet; ++ ++ while ( packets[numrecv] && SocketReady(sock->channel) ) { ++ UDPpacket *packet; + + packet = packets[numrecv]; + +@@ -712,20 +775,25 @@ + } + #else + sock_len = sizeof(sock_addr); ++ + packet->status = recvfrom(sock->channel, +- packet->data, packet->maxlen, 0, +- (struct sockaddr *)&sock_addr, ++ packet->data, packet->maxlen, 0, ++ (struct sockaddr *)&sock_addr, + #ifdef USE_GUSI_SOCKETS +- (unsigned int *)&sock_len); ++ (unsigned int *)&sock_len + #else +- &sock_len); ++ &sock_len + #endif ++ ); ++ + if ( packet->status >= 0 ) { + packet->len = packet->status; +- packet->address.host = sock_addr.sin_addr.s_addr; +- packet->address.port = sock_addr.sin_port; ++ ++ SDLNet_sockaddr_to_IPaddress((struct sockaddr *) &sock_addr, ++ &packet->address); + } + #endif ++ + if (packet->status >= 0) + { + packet->channel = -1; +@@ -736,9 +804,8 @@ + + for ( j=binding->numbound-1; j>=0; --j ) + { +- if ( (packet->address.host == binding->address[j].host) && +- (packet->address.port == binding->address[j].port) ) +- { ++ if (!SDLNet_IPaddress_cmp(&packet->address, ++ &binding->address[j])) { + packet->channel = i; + goto foundit; /* break twice */ + } +Index: chatd.c +=================================================================== +--- chatd.c.orig 2011-07-03 14:22:32.000000000 +0400 ++++ chatd.c 2011-07-03 14:22:43.114070766 +0400 +@@ -1,4 +1,4 @@ +-/* ++ /* + CHATD: A chat server using the SDL example network library + Copyright (C) 1997-2004 Sam Lantinga + +@@ -45,13 +45,13 @@ + } people[CHAT_MAXPEOPLE]; + + +-void HandleServer(void) ++void HandleServer(TCPsocket sock) + { + TCPsocket newsock; + int which; + unsigned char data; + +- newsock = SDLNet_TCP_Accept(servsock); ++ newsock = SDLNet_TCP_Accept(sock); + if ( newsock == NULL ) { + return; + } +@@ -101,17 +101,19 @@ + /* Send a "new client" notification */ + void SendNew(int about, int to) + { +- char data[512]; +- int n; ++ char data[2]; ++ char *hostname; + +- n = strlen((char *)people[about].name)+1; + data[0] = CHAT_ADD; + data[CHAT_ADD_SLOT] = about; +- memcpy(&data[CHAT_ADD_HOST], &people[about].peer.host, 4); +- memcpy(&data[CHAT_ADD_PORT], &people[about].peer.port, 2); +- data[CHAT_ADD_NLEN] = n; +- memcpy(&data[CHAT_ADD_NAME], people[about].name, n); +- SDLNet_TCP_Send(people[to].sock, data, CHAT_ADD_NAME+n); ++ SDLNet_TCP_Send(people[to].sock, data, 2); ++ ++ hostname = (char *) SDLNet_PresentIP(&people[about].peer); ++ ++ SDLNet_TCP_Send(people[to].sock, hostname, strlen(hostname)+1); ++ SDLNet_TCP_Send(people[to].sock, &people[about].peer.port, 2); ++ SDLNet_TCP_Send(people[to].sock, people[about].name, ++ strlen(people[about].name)+1); + } + + void HandleClient(int which) +@@ -178,7 +180,7 @@ + + static void cleanup(int exitcode) + { +- if ( servsock != NULL ) { ++ if (servsock != NULL) { + SDLNet_TCP_Close(servsock); + servsock = NULL; + } +@@ -224,15 +226,28 @@ + cleanup(2); + } + +- /* Create the server socket */ +- SDLNet_ResolveHost(&serverIP, NULL, CHAT_PORT); +-printf("Server IP: %x, %d\n", serverIP.host, serverIP.port); +- servsock = SDLNet_TCP_Open(&serverIP); +- if ( servsock == NULL ) { +- fprintf(stderr, "Couldn't create server socket: %s\n", +- SDLNet_GetError()); +- cleanup(2); ++ /* try to set up listening sockets */ ++ ++ servsock = NULL; // SDLNet_TCP_OpenServer(SDLNET_IPV6, CHAT_PORT); ++ ++ if (!servsock) { ++ fprintf(stderr, "Couldn't create IPv6 server socket: %s\n", ++ SDLNet_GetError()); ++ ++ servsock = SDLNet_TCP_OpenServer(SDLNET_IPV4, CHAT_PORT); ++ ++ if (!servsock) { ++ fprintf(stderr, ++ "Couldn't create IPv4 server socket: %s\n", ++ SDLNet_GetError()); ++ cleanup(2); ++ } ++ ++ printf("Using IPv4\n"); ++ } else { ++ printf("Using IPv6\n"); + } ++ + SDLNet_TCP_AddSocket(socketset, servsock); + + /* Loop, waiting for network events */ +@@ -241,9 +256,8 @@ + SDLNet_CheckSockets(socketset, ~0); + + /* Check for new connections */ +- if ( SDLNet_SocketReady(servsock) ) { +- HandleServer(); +- } ++ if (SDLNet_SocketReady(servsock)) ++ HandleServer(servsock); + + /* Check for events on existing clients */ + for ( i=0; itype == SDLNET_ANY) { ++ if (b->type == SDLNET_ANY) { ++ IPaddress_any *a_any = IP_ADDRESS_ANY(a); ++ IPaddress_any *b_any = IP_ADDRESS_ANY(b); ++ ++ // compare v4 and v6 in each, return 0 if either ++ // are 0 ++ ++ return SDLNet_IPaddress_cmp((IPaddress *) &a_any->addr4, ++ (IPaddress *) &b_any->addr4) ++ && SDLNet_IPaddress_cmp((IPaddress *) &a_any->addr6, ++ (IPaddress *) &b_any->addr6); ++ } else { ++ return SDLNet_IPaddress_cmp(SDLNet_ExpandIP(a, b->type), ++ b); ++ } ++ } else if (b->type == SDLNET_ANY) { ++ return SDLNet_IPaddress_cmp(SDLNet_ExpandIP(b, a->type), ++ a); ++ } ++ ++ if (a->type != b->type || a->port != b->port) ++ return 1; ++ ++ switch (a->type) { ++#ifdef USE_IPV6 ++ case SDLNET_IPV6: ++ return memcmp(&IP_ADDRESS6(a)->host, ++ &IP_ADDRESS6(b)->host, ++ sizeof(IP_ADDRESS6(a)->host)); ++#endif ++ case SDLNET_IPV4: ++ return IP_ADDRESS4(a)->host != IP_ADDRESS4(b)->host; ++ ++ default: ++ return -1; ++ } ++ ++} ++ ++void SDLNet_sockaddr_to_IPaddress(struct sockaddr *in, IPaddress *out) ++{ ++ switch (in->sa_family) { ++ case AF_INET: { ++ struct sockaddr_in *addr = (struct sockaddr_in *) in; ++ ++ out->type = SDLNET_IPV4; ++ out->port = addr->sin_port; ++ IP_ADDRESS4(out)->host = addr->sin_addr.s_addr; ++ ++ break; ++ } ++ ++#ifdef USE_IPV6 ++ case AF_INET6: { ++ struct sockaddr_in6 *addr = (struct sockaddr_in6 *) in; ++ ++ out->type = SDLNET_IPV6; ++ out->port = addr->sin6_port; ++ memcpy(&IP_ADDRESS6(out)->host, &addr->sin6_addr.s6_addr32, ++ sizeof(IP_ADDRESS6(out)->host)); ++ break; ++ } ++#endif ++ default: ++ fprintf(stderr, ++ "SDLNet_sockaddr_to_IPaddress: Warning: unknown " ++ "address family\n"); ++ break; ++ } ++} ++ ++void SDLNet_IPaddress_to_sockaddr(IPaddress *in, struct sockaddr *out) ++{ ++ switch (in->type) { ++ case SDLNET_IPV4: { ++ struct sockaddr_in *addr = (struct sockaddr_in *) out; ++ memset(addr, 0, sizeof(*addr)); ++ addr->sin_family = AF_INET; ++ addr->sin_port = in->port; ++ addr->sin_addr.s_addr = IP_ADDRESS4(in)->host; ++ break; ++ } ++#ifdef USE_IPV6 ++ case SDLNET_IPV6: { ++ struct sockaddr_in6 *addr = (struct sockaddr_in6 *) out; ++ memset(addr, 0, sizeof(*addr)); ++ addr->sin6_family = AF_INET6; ++ addr->sin6_port = in->port; ++ memcpy(&addr->sin6_addr.s6_addr32, &IP_ADDRESS6(in)->host, ++ sizeof(IP_ADDRESS6(in)->host)); ++ break; ++ } ++#endif ++ default: ++ fprintf(stderr, ++ "SDLNet_IPaddress_to_sockaddr: Warning: unknown " ++ "address type (%s)\n", ++ SDLNet_AddrType_to_string(in->type)); ++ break; ++ } ++} ++ + /* Resolve a host name and port to an IP address in network form */ +-int SDLNet_ResolveHost(IPaddress *address, const char *host, Uint16 port) ++ ++int SDLNet_ResolveHost_new(SDLNet_AddrType type, IPaddress *address, ++ const char *host, Uint16 port) + { +- int retval = 0; ++ int retval; + +- /* Perform the actual host resolution */ +- if ( host == NULL ) { +- address->host = INADDR_ANY; +- } else { +- address->host = inet_addr(host); +- if ( address->host == INADDR_NONE ) { +- struct hostent *hp; ++ switch (type) { ++ case SDLNET_ANY: { ++ int have_v4, have_v6; ++ IPaddress4 v4_addr; ++ IPaddress6 v6_addr; ++ ++ have_v4 = !SDLNet_ResolveHost_new(SDLNET_IPV4, ++ (IPaddress *) &v4_addr, ++ host, port); ++ have_v6 = !SDLNet_ResolveHost_new(SDLNET_IPV6, ++ (IPaddress *) &v6_addr, ++ host, port); + ++ if (!have_v4 && !have_v6) { ++ return -1; ++ } else if (!have_v4 && have_v6) { ++ memcpy(address, &v6_addr, sizeof(v6_addr)); ++ } else if (have_v4 && !have_v6) { ++ memcpy(address, &v4_addr, sizeof(v4_addr)); ++ } else { ++ address->type = SDLNET_ANY; ++ address->port = SDL_SwapBE16(port); ++ IP_ADDRESS_ANY(address)->addr4 = v4_addr; ++ IP_ADDRESS_ANY(address)->addr6 = v6_addr; ++ } ++ ++ return 0; ++ } ++ ++ case SDLNET_IPV4: { ++ IPaddress4 *v4_addr = IP_ADDRESS4(address); ++ ++ v4_addr->host = inet_addr(host); ++ ++ if (v4_addr->host == INADDR_NONE) { ++ struct hostent *hp; ++ + hp = gethostbyname(host); +- if ( hp ) { +- memcpy(&address->host,hp->h_addr,hp->h_length); ++ if (hp) { ++ memcpy(&v4_addr->host, ++ hp->h_addr, hp->h_length); + } else { +- retval = -1; ++ return -1; + } + } ++ ++ address->type = SDLNET_IPV4; ++ address->port = SDL_SwapBE16(port); ++ ++ return 0; ++ } ++ ++#ifdef USE_IPV6 ++ case SDLNET_IPV6: { ++ struct addrinfo *addrinfo; ++ struct addrinfo hints; ++ ++ hints.ai_family = PF_INET6; ++ hints.ai_flags = 0; ++ hints.ai_socktype = SOCK_STREAM; ++ hints.ai_protocol = 0; ++ ++ retval = getaddrinfo(host, "0", &hints, &addrinfo); ++ ++ if (retval == 0 && addrinfo) { ++ SDLNet_sockaddr_to_IPaddress(addrinfo->ai_addr, ++ address); ++ address->port = SDL_SwapBE16(port); ++ freeaddrinfo(addrinfo); ++ return 0; ++ } ++ ++ break; + } +- address->port = SDL_SwapBE16(port); ++#endif ++ default: ++ return -1; ++ } ++ ++ return -1; ++} + +- /* Return the status */ +- return(retval); ++/* For backward compatibility */ ++ ++int SDLNet_ResolveHost(IPaddress *address, const char *host, Uint16 port) ++{ ++ return SDLNet_ResolveHost_new(SDLNET_ANY,address,host,port); + } + + /* Resolve an ip address to a host name in canonical form. +@@ -365,17 +553,118 @@ + * Main Programmer of Arianne RPG. + * http://come.to/arianne_rpg + */ ++ + const char *SDLNet_ResolveIP(IPaddress *ip) + { + struct hostent *hp; + +- hp = gethostbyaddr((char *)&ip->host, 4, AF_INET); ++ if (ip->type == SDLNET_IPV4) { ++ hp = gethostbyaddr((char *)&IP_ADDRESS4(ip)->host, ++ sizeof(IP_ADDRESS4(ip)->host), AF_INET); ++#ifdef USE_IPV6 ++ } else if (ip->type == SDLNET_IPV6) { ++ hp = gethostbyaddr((char *) &IP_ADDRESS6(ip)->host, ++ sizeof(IP_ADDRESS6(ip)->host), AF_INET6); ++#endif ++ } else { ++ return NULL; ++ } ++ + if ( hp != NULL ) { + return hp->h_name; + } + return NULL; + } + ++const char *SDLNet_PresentIP(IPaddress *ip) ++{ ++ // static buffer is ok since it is bigger than any ++ // possible IPv6 address ++ ++ static char hostname[128]; ++ ++ switch (ip->type) { ++ case SDLNET_ANY: { ++ char *v4_addr = strdup(SDLNet_PresentIP((IPaddress *) &IP_ADDRESS_ANY(ip)->addr4)); ++ char *v6_addr = strdup(SDLNet_PresentIP((IPaddress *) &IP_ADDRESS_ANY(ip)->addr6)); ++ ++ sprintf(hostname, "v4: %s, v6: %s", v4_addr, v6_addr); ++ free(v4_addr); ++ free(v6_addr); ++ return hostname; ++ } ++ case SDLNET_IPV4: { ++ struct in_addr in; ++ ++ in.s_addr = IP_ADDRESS4(ip)->host; ++ ++ return inet_ntoa(in); ++ } ++#ifdef USE_IPV6 ++ case SDLNET_IPV6: { ++ return inet_ntop(AF_INET6, &IP_ADDRESS6(ip)->host, ++ hostname, sizeof(hostname)-1); ++ } ++#endif ++ } ++} ++ ++// "expand" an address to get the appropriate type ++// ie. if this is a IPaddress_any address type, get the particular ++// type of IP out of the structure that we want. ++ ++IPaddress *SDLNet_ExpandIP(IPaddress *ip, SDLNet_AddrType type) ++{ ++ if (ip->type == type) ++ return ip; ++ ++ if (ip->type == SDLNET_ANY) { ++ IPaddress_any *addr = IP_ADDRESS_ANY(ip); ++ ++ switch (addr->type) { ++ case SDLNET_IPV4: ++ return (IPaddress *) &addr->addr4; ++ case SDLNET_IPV6: ++ return (IPaddress *) &addr->addr6; ++ } ++ } ++ ++ return NULL; ++} ++ ++// this is neccesary as some IPaddress types are not as big as a ++// whole "IPaddress" structure. If we copied them as IPaddresses ++// we could overrun memory. ++ ++void SDLNet_CopyIP(IPaddress *a, IPaddress *b) ++{ ++ switch (b->type) { ++ case SDLNET_ANY: ++ memcpy(a, b, sizeof(IPaddress_any)); ++ break; ++ case SDLNET_IPV4: ++ memcpy(a, b, sizeof(IPaddress4)); ++ break; ++ case SDLNET_IPV6: ++ memcpy(a, b, sizeof(IPaddress6)); ++ break; ++ } ++} ++ ++// convert a socket name to a type ++ ++const char *SDLNet_AddrType_to_string(SDLNet_AddrType type) ++{ ++ switch (type) { ++ case SDLNET_IPV4: ++ return "SDLNET_IPV4"; ++ case SDLNET_IPV6: ++ return "SDLNET_IPV6"; ++ case SDLNET_ANY: ++ return "SDLNET_ANY"; ++ } ++} ++ + #endif /* MACOS_OPENTRANSPORT */ + + #if !SDL_DATA_ALIGNED /* function versions for binary compatibility */ +Index: SDLnetsys.h +=================================================================== +--- SDLnetsys.h.orig 2011-07-03 14:22:32.000000000 +0400 ++++ SDLnetsys.h 2011-07-03 14:22:43.114070766 +0400 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + #ifdef macintosh + #ifndef USE_GUSI_SOCKETS +@@ -79,6 +80,29 @@ + #define SOCKET int + #define INVALID_SOCKET -1 + #define SOCKET_ERROR -1 ++ ++#include "SDL_net.h" ++ ++/* sockaddr_max is a sockaddr structure big enough to hold the largest ++ address we are going to use. If we do not have IPv6 support enabled ++ this is a sockaddr_in. The new IPv6 API defines sockaddr_storage ++ which provides such a structure already. ++ */ ++ ++#ifdef USE_IPV6 ++typedef struct sockaddr_storage sockaddr_max; ++#else ++typedef struct sockaddr_in sockaddr_max; ++#endif ++ ++IPaddress *SDLNet_ExpandIP(IPaddress *ip, SDLNet_AddrType type); ++void SDLNet_sockaddr_to_IPaddress(struct sockaddr *in, IPaddress *out); ++void SDLNet_IPaddress_to_sockaddr(IPaddress *in, struct sockaddr *out); ++int SDLNet_IPaddress_cmp(IPaddress *a, IPaddress *b); ++int SDLNet_AddrType_to_family(SDLNet_AddrType type); ++const char *SDLNet_AddrType_to_string(SDLNet_AddrType type); ++void SDLNet_CopyIP(IPaddress *to, IPaddress *from); ++ + #endif /* __USE_W32_SOCKETS */ + #endif /* Open Transport */ + +Index: SDL_net.h +=================================================================== +--- SDL_net.h.orig 2011-07-03 14:22:32.000000000 +0400 ++++ SDL_net.h 2011-07-03 14:22:43.150070766 +0400 +@@ -70,11 +70,48 @@ + /* IPv4 hostname resolution API */ + /***********************************************************************/ + ++typedef enum { ++ SDLNET_ANY, ++ SDLNET_IPV4, ++ SDLNET_IPV6, ++} SDLNet_AddrType; ++ + typedef struct { +- Uint32 host; /* 32-bit IPv4 host address */ ++ SDLNet_AddrType type; /* should always be SDLNET_IPV4 */ ++ Uint16 port; ++ Uint32 host; ++} IPaddress4; ++ ++typedef struct { ++ SDLNet_AddrType type; /* should always be SDLNET_IPV6 */ ++ Uint16 port; ++ union { ++ Uint8 i8[16]; ++ Uint16 i16[8]; ++ Uint32 i32[4]; ++ } host; ++} IPaddress6; ++ ++// "any" address type holds all other types, so we can try all types ++// when connecting ++ ++typedef struct { ++ SDLNet_AddrType type; ++ Uint16 port; ++ IPaddress4 addr4; ++ IPaddress6 addr6; ++} IPaddress_any; ++ ++typedef struct { ++ SDLNet_AddrType type; + Uint16 port; /* 16-bit protocol port */ ++ Uint8 padding[sizeof(IPaddress_any)]; + } IPaddress; +- ++ ++#define IP_ADDRESS4(x) ((IPaddress4 *) (x)) ++#define IP_ADDRESS6(x) ((IPaddress6 *) (x)) ++#define IP_ADDRESS_ANY(x) ((IPaddress_any *) (x)) ++ + /* Resolve a host name and port to an IP address in network form. + If the function succeeds, it will return 0. + If the host couldn't be resolved, the host portion of the returned +@@ -99,23 +136,38 @@ + */ + extern DECLSPEC const char * SDLCALL SDLNet_ResolveIP(IPaddress *ip); + ++/* Convert an IP to a string for presentation, address family independent */ + ++extern DECLSPEC const char * SDLCALL SDLNet_PresentIP(IPaddress *ip); ++ ++/* Compare two address structures. Returns 0 if the two addresses ++ are the same. ++ */ ++ ++extern DECLSPEC int SDLCALL SDLNet_IPaddress_cmp(IPaddress *a, IPaddress *b); ++ ++ + /***********************************************************************/ + /* TCP network API */ + /***********************************************************************/ + + typedef struct _TCPsocket *TCPsocket; + +-/* Open a TCP network socket +- If ip.host is INADDR_NONE or INADDR_ANY, this creates a local server +- socket on the given port, otherwise a TCP connection to the remote +- host and port is attempted. The address passed in should already be +- swapped to network byte order (addresses returned from +- SDLNet_ResolveHost() are already in the correct form). ++/* Open a TCP network socket connection to a remote host ++ The address passed in should already be swapped to network byte order ++ (addresses returned from SDLNet_ResolveHost() are already in the ++ correct form). + The newly created socket is returned, or NULL if there was an error. + */ + extern DECLSPEC TCPsocket SDLCALL SDLNet_TCP_Open(IPaddress *ip); + ++/* Open a TCP server socket listening on a specified port. The port ++ is given in native byte order. ++ */ ++ ++extern DECLSPEC TCPsocket SDLCALL SDLNet_TCP_OpenServer(SDLNet_AddrType type, ++ int port); ++ + /* Accept an incoming connection on the given server socket. + The newly created socket is returned, or NULL if there was an error. + */ +@@ -187,7 +239,8 @@ + internally in network (big endian) byte order, in addresses, etc. + This allows other systems to send to this socket via a known port. + */ +-extern DECLSPEC UDPsocket SDLCALL SDLNet_UDP_Open(Uint16 port); ++extern DECLSPEC UDPsocket SDLCALL SDLNet_UDP_Open(SDLNet_AddrType type, ++ Uint16 port); + + /* Bind the address 'address' to the requested channel on the UDP socket. + If the channel is -1, then the first unbound channel will be bound with diff --git a/media-libs/sdl-net/sdl-net-1.2.7-r9999.ebuild b/media-libs/sdl-net/sdl-net-1.2.7-r9999.ebuild new file mode 100644 index 0000000..ee1552c --- /dev/null +++ b/media-libs/sdl-net/sdl-net-1.2.7-r9999.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-net/sdl-net-1.2.7.ebuild,v 1.13 2010/07/27 00:52:41 mr_bones_ Exp $ + +# Pinkbyte: needed for eautoreconf, epatch +inherit autotools eutils +# + +EAPI=2 +MY_P=${P/sdl-/SDL_} +DESCRIPTION="Simple Direct Media Layer Network Support Library" +HOMEPAGE="http://www.libsdl.org/projects/SDL_net/index.html" +SRC_URI="http://www.libsdl.org/projects/SDL_net/release/${MY_P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" +IUSE="ipv6 static-libs" + +DEPEND=">=media-libs/libsdl-1.2.5" + +S=${WORKDIR}/${MY_P} + +src_prepare() { +# Pinkbyte: patch for IPv6 + use ipv6 && epatch "${FILESDIR}/${P}-ipv6-new.patch" + +# epatch "${FILESDIR}/1-additional-sdlnet-tcp.patch" +# epatch "${FILESDIR}/2-additional-revert-chat-cpp.patch" +# epatch "${FILESDIR}/3-sdlnet-h.patch" +# epatch "${FILESDIR}/4-sdlnet-c.patch" + + eautoreconf +} + +src_configure() { + econf \ + --disable-dependency-tracking \ + $(use_enable static-libs static) \ + $(use_enable ipv6) +} + +src_install() { + emake DESTDIR="${D}" install || die "make install failed" + dodoc CHANGES README + if ! use static-libs ; then + find "${D}" -type f -name '*.la' -exec rm {} + \ + || die "la removal failed" + fi +} diff --git a/net-firewall/nuapplet/Manifest b/net-firewall/nuapplet/Manifest new file mode 100644 index 0000000..a33bc0a --- /dev/null +++ b/net-firewall/nuapplet/Manifest @@ -0,0 +1,2 @@ +DIST nuapplet-2.2.tar.gz 46782 RMD160 1df94fc2da907579a1f6669b9bb116ed2d687beb SHA1 a962b83e6636bd12bfc8f0b6a4e17900c8a6e326 SHA256 d0b3f3c71c12d5231811ee02d0cc83d989855f1dfc507e0d7a85d45d488a48ca +EBUILD nuapplet-2.2.ebuild 182 RMD160 dc1eeb84c3a0d873ae4b6ba5cea72e963071d0bc SHA1 648f7011d6cbff534ff420920ea6bdac71992351 SHA256 4688345e6ab9c02e9963f93c080240ed33667bd23a2b16a35cf78545806ea689 diff --git a/net-firewall/nuapplet/nuapplet-2.2.ebuild b/net-firewall/nuapplet/nuapplet-2.2.ebuild new file mode 100644 index 0000000..beb1e0c --- /dev/null +++ b/net-firewall/nuapplet/nuapplet-2.2.ebuild @@ -0,0 +1,11 @@ +EAPI="2" + +DESCRIPTION="Frontend for NUFW" +HOMEPAGE="http://NUFW.org/" +SRC_URI="http://nufw.org/nuapplet/${P}.tar.gz" + +LICENSE="GPL-2 LGPL-2" +KEYWORDS="~amd64 ~x86" + +SLOT="0" +IUSE="" diff --git a/net-firewall/nucentral/Manifest b/net-firewall/nucentral/Manifest new file mode 100644 index 0000000..592fbde --- /dev/null +++ b/net-firewall/nucentral/Manifest @@ -0,0 +1,2 @@ +DIST nucentral-1.0beta1.tar.bz2 464972 RMD160 4ad9eb77467cd6828886cff3d1e7b8d6aace41aa SHA1 aa7a3db4fc8e7b698f3e83b87858e3d45d5108b6 SHA256 956c19a87c8ab43fe3dabe840a1c3e893ecb72e15c28608d780589af71a62c9c +EBUILD nucentral-1.0_beta1.ebuild 917 RMD160 6bb9afef0ad1d824378442acc0a1a76dcd746107 SHA1 de5de8a9c3112907aa2a37cf6050271c3ce4ab00 SHA256 125563e16508dbe2a6ea7dc405324d401fa7bd23f5bc24ebdf6a37a8e2d7b1e3 diff --git a/net-firewall/nucentral/nucentral-1.0_beta1.ebuild b/net-firewall/nucentral/nucentral-1.0_beta1.ebuild new file mode 100644 index 0000000..a13eec3 --- /dev/null +++ b/net-firewall/nucentral/nucentral-1.0_beta1.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-firewall/nfas/nfas-1.0_beta1.ebuild,v 1.1 2010/04/30 12:35:01 Pinkbyte Exp $ + +EAPI="2" + +MY_PV="${PV/_beta/beta}" + +DESCRIPTION="NFAS - NuFirewall Administration Suite" +HOMEPAGE="http://www.nufirewall.org/projects/nufirewall/" +LICENSE="GPL-2" + +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" +RDEPEND="dev-python/twisted" +DEPEND="${RDEPEND}" + +SRC_URI="mirror://sourceforge/synce/nucentral-${MY_PV}.tar.bz2" + +#S="${WORKDIR}/eas" + +src_install() { + sed -i -e 's/__import__(module_path)/__import__(name,{},{},"1")/' \ + site-packages/nucentral/core/module_loader.py || die "sed failed" + + insinto /usr + doins -r usr/* + keepdir /var/run/nucentral + + insinto /usr/lib/python2.6/site-packages + doins -r site-packages/* + + insinto /etc + doins -r etc/* + + insinto /var + doins -r var/* +} diff --git a/net-firewall/nufw/Manifest b/net-firewall/nufw/Manifest new file mode 100644 index 0000000..08edccf --- /dev/null +++ b/net-firewall/nufw/Manifest @@ -0,0 +1,8 @@ +AUX nuauth-conf.d 19 RMD160 be74e62976926a6ebe6930a2d2bf2032dd3ae704 SHA1 2ac3ff2ea1b11b6534df2856849904b515119086 SHA256 dc562afba21239a5a30889b04c021b36b9c19ca17a6d8071bb848eab2d70c538 +AUX nuauth-init.d 522 RMD160 89f255a1ebe12ef629ec9963834c445e0df4a6dc SHA1 0d9c6b0d3434da7f29967e9a727c9b6dbe2a8f8e SHA256 18c988dccda3cbbef92d0a218a8eba62694b5a5fc66980a9120bbd146629ccf3 +AUX nufw-conf.d 81 RMD160 7bb1a7172915561570f0839e553e9021144421a8 SHA1 1b75760cb661366c8dc1e4307796e3c7e2c25c8d SHA256 c616bb91451f7bf34cfe3139a972be01a562ece6c372d2ee39c3cd5009d2354d +AUX nufw-init.d 276 RMD160 3aae0f4b5d77f4af5c1966570112fed29dda17a1 SHA1 8154d2a7c2c70077b81ae19cd53e98ae8380774a SHA256 972c3c94a7e290985cc7e8a0ccc40dfa0e10d7eee44e218c70f6fc7f8ed73f9d +DIST nufw-2.4.0.tar.bz2 705564 RMD160 8ec9ec97e554d1068a31e825462d4786d311c6fb SHA1 89d7bc1d6bc45f40505c0bc7c5a9988e6de348b5 SHA256 3f4b256dc5a7a65f2386743d74a31ed5d352804d5effa25246e644066b4308b7 +DIST nufw-2.4.3.tar.bz2 721644 RMD160 aa1d43dd84f732214ca7f350af4a0697b5696771 SHA1 0f33867e74cfe21e4ec3abf4a31a01a086868ee2 SHA256 09d9ff1ee06f68539980604452635b9a94032e0a9eb766d0407ca1c45e6183aa +EBUILD nufw-2.4.0.ebuild 2838 RMD160 47adb41f8a6f6281917931c80dcd0f04e7cd23ad SHA1 400c7b539df119297de128e687645caaa97ae44b SHA256 3cebd4ae05d52b821507d2afa6b80490229beb584a4175638b54b9c9698b19c7 +EBUILD nufw-2.4.3.ebuild 2839 RMD160 7b0bdae1402c55b3121d293dd486bd09941c03e0 SHA1 f25561d69aab848e5e4dd4a7a68d5748d4d7e7d5 SHA256 3e40f78fa6258ffc552d6eefbfdaf034c5d80f0ced4de4ee1931cb523648779f diff --git a/net-firewall/nufw/files/nuauth-conf.d b/net-firewall/nufw/files/nuauth-conf.d new file mode 100644 index 0000000..f7f7401 --- /dev/null +++ b/net-firewall/nufw/files/nuauth-conf.d @@ -0,0 +1,2 @@ + +NUAUTH_OPTIONS="" diff --git a/net-firewall/nufw/files/nuauth-init.d b/net-firewall/nufw/files/nuauth-init.d new file mode 100644 index 0000000..6e27888 --- /dev/null +++ b/net-firewall/nufw/files/nuauth-init.d @@ -0,0 +1,26 @@ +#!/sbin/runscript + +depend() { + before net +} + +checkconfig() { + if [ ! -e /etc/nufw/nuauth.conf ]; then + eerror "You need a /etc/nufw/nuauth.conf file to run nuauth" + eerror "There is sample file in /usr/share/doc/nufw-version/" + return 1 + fi +} + +start() { + checkconfig || return 1 + ebegin "Starting nuauth" + start-stop-daemon --start --quiet --exec /usr/sbin/nuauth -- -D ${NUAUTH_OPTIONS} + eend $? +} + +stop() { + ebegin "Stopping nuauth" + start-stop-daemon --stop --quiet --pidfile /var/run/nuauth/nuauth.pid + eend $? +} diff --git a/net-firewall/nufw/files/nufw-conf.d b/net-firewall/nufw/files/nufw-conf.d new file mode 100644 index 0000000..f6d1d27 --- /dev/null +++ b/net-firewall/nufw/files/nufw-conf.d @@ -0,0 +1,2 @@ + +NUFW_OPTIONS="-k /etc/nufw/nufw.key -c /etc/nufw/nufw.pem -d 127.0.0.1 -p 4129" diff --git a/net-firewall/nufw/files/nufw-init.d b/net-firewall/nufw/files/nufw-init.d new file mode 100644 index 0000000..c83b661 --- /dev/null +++ b/net-firewall/nufw/files/nufw-init.d @@ -0,0 +1,17 @@ +#!/sbin/runscript + +depend() { + before net +} + +start() { + ebegin "Starting nufw" + start-stop-daemon --start --quiet --exec /usr/sbin/nufw -- -D ${NUFW_OPTIONS} + eend $? +} + +stop() { + ebegin "Stopping nufw" + start-stop-daemon --stop --quiet --pidfile /var/run/nufw.pid + eend $? +} diff --git a/net-firewall/nufw/nufw-2.4.0.ebuild b/net-firewall/nufw/nufw-2.4.0.ebuild new file mode 100644 index 0000000..5f2ac33 --- /dev/null +++ b/net-firewall/nufw/nufw-2.4.0.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-firewall/nufw/nufw-2.4.1.ebuild,v 1.1 2010/05/12 17:11:18 cedk Exp $ + +# Pinkbyte: TODO - remove unnecessary 'nfqueue' useflag. It is mandatory NOW! + +inherit ssl-cert eutils pam autotools + +DESCRIPTION="An enterprise grade authenticating firewall based on netfilter" +HOMEPAGE="http://www.nufw.org/" +SRC_URI="http://www.nufw.org/attachments/download/43/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86" +IUSE="debug ldap mysql pam pam_nuauth plaintext postgres prelude \ +unicode nfconntrack nfqueue static syslog test" + +DEPEND=">=dev-libs/glib-2 + dev-libs/libgcrypt + >=dev-libs/cyrus-sasl-2 + net-firewall/iptables + >=net-libs/gnutls-1.1 + ldap? ( >=net-nds/openldap-2 ) + mysql? ( virtual/mysql ) + pam? ( sys-libs/pam ) + pam_nuauth? ( sys-libs/pam ) + postgres? ( virtual/postgresql-server ) + net-libs/libnfnetlink + net-libs/libnetfilter_queue + nfconntrack? ( net-libs/libnetfilter_conntrack ) + prelude? ( dev-libs/libprelude ) + dev-python/ipy + sys-devel/automake" +RDEPEND=${DEPEND} + +src_unpack() { + unpack ${A} + cd "${S}" + sed -i \ + -e 's:^#\(nuauth_tls_key="/etc/nufw/\)nuauth-key.pem:\1nuauth.key:' \ + -e 's:^#\(nuauth_tls_cert="/etc/nufw/\)nuauth-cert.pem:\1nuauth.pem:' \ + conf/nuauth.conf || die "sed failed" + eautoreconf +} + +src_compile() { + econf \ + --with-shared \ + $(use_enable static) \ + $(use_enable pam_nuauth pam-nufw) \ + $(use_with prelude prelude-log) \ + $(use_with mysql mysql-log) \ + $(use_with mysql mysql-auth) \ + $(use_with postgres pgsql-log) \ + $(use_with syslog syslog-log) \ + $(use_with plaintext plaintext-auth) \ + --with-mark-group \ + $(use_with pam system-auth) \ + $(use_with ldap) \ + $(use_with nfqueue) \ + $(use_with nfconntrack) \ + $(use_with unicode utf8) \ + $(use_enable debug) \ + --with-user-mark \ + --sysconfdir="/etc/nufw" \ + --localstatedir="/var" \ + --includedir="/usr/include/nufw" \ + || die "econf failed" + emake || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + + newinitd "${FILESDIR}"/nufw-init.d nufw + newconfd "${FILESDIR}"/nufw-conf.d nufw + + newinitd "${FILESDIR}"/nuauth-init.d nuauth + newconfd "${FILESDIR}"/nuauth-conf.d nuauth + + insinto /etc/nufw + doins conf/nuauth.conf + + keepdir /var/run/nuauth + + dodoc AUTHORS ChangeLog NEWS README TODO + docinto scripts + dodoc scripts/{clean_conntrack.pl,nuaclgen,nutop,README,ulog_rotate_daily.sh,ulog_rotate_weekly.sh} + docinto conf + dodoc conf/*.{nufw,schema,conf,dump,xml} + +# Pinkbyte: install nuauth.d config files + dodir nuauth.d + insinto /etc/nufw/nuauth.d + doins conf/nuauth.d/* +# + + if use pam; then + pamd_mimic system-auth nufw auth account password session + fi +} + +pkg_postinst() { + install_cert /etc/nufw/{nufw,nuauth} +} diff --git a/net-firewall/nufw/nufw-2.4.3.ebuild b/net-firewall/nufw/nufw-2.4.3.ebuild new file mode 100644 index 0000000..fd873a8 --- /dev/null +++ b/net-firewall/nufw/nufw-2.4.3.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-firewall/nufw/nufw-2.4.1.ebuild,v 1.1 2010/05/12 17:11:18 cedk Exp $ + +# Pinkbyte: TODO - remove unnecessary 'nfqueue' useflag. It is mandatory NOW! + +inherit ssl-cert eutils pam autotools + +DESCRIPTION="An enterprise grade authenticating firewall based on netfilter" +HOMEPAGE="http://www.nufw.org/" +SRC_URI="http://www.nufw.org/attachments/download/175/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86" +IUSE="debug ldap mysql pam pam_nuauth plaintext postgres prelude \ +unicode nfconntrack nfqueue static syslog test" + +DEPEND=">=dev-libs/glib-2 + dev-libs/libgcrypt + >=dev-libs/cyrus-sasl-2 + net-firewall/iptables + >=net-libs/gnutls-1.1 + ldap? ( >=net-nds/openldap-2 ) + mysql? ( virtual/mysql ) + pam? ( sys-libs/pam ) + pam_nuauth? ( sys-libs/pam ) + postgres? ( virtual/postgresql-server ) + net-libs/libnfnetlink + net-libs/libnetfilter_queue + nfconntrack? ( net-libs/libnetfilter_conntrack ) + prelude? ( dev-libs/libprelude ) + dev-python/ipy + sys-devel/automake" +RDEPEND=${DEPEND} + +src_unpack() { + unpack ${A} + cd "${S}" + sed -i \ + -e 's:^#\(nuauth_tls_key="/etc/nufw/\)nuauth-key.pem:\1nuauth.key:' \ + -e 's:^#\(nuauth_tls_cert="/etc/nufw/\)nuauth-cert.pem:\1nuauth.pem:' \ + conf/nuauth.conf || die "sed failed" + eautoreconf +} + +src_compile() { + econf \ + --with-shared \ + $(use_enable static) \ + $(use_enable pam_nuauth pam-nufw) \ + $(use_with prelude prelude-log) \ + $(use_with mysql mysql-log) \ + $(use_with mysql mysql-auth) \ + $(use_with postgres pgsql-log) \ + $(use_with syslog syslog-log) \ + $(use_with plaintext plaintext-auth) \ + --with-mark-group \ + $(use_with pam system-auth) \ + $(use_with ldap) \ + $(use_with nfqueue) \ + $(use_with nfconntrack) \ + $(use_with unicode utf8) \ + $(use_enable debug) \ + --with-user-mark \ + --sysconfdir="/etc/nufw" \ + --localstatedir="/var" \ + --includedir="/usr/include/nufw" \ + || die "econf failed" + emake || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + + newinitd "${FILESDIR}"/nufw-init.d nufw + newconfd "${FILESDIR}"/nufw-conf.d nufw + + newinitd "${FILESDIR}"/nuauth-init.d nuauth + newconfd "${FILESDIR}"/nuauth-conf.d nuauth + + insinto /etc/nufw + doins conf/nuauth.conf + + keepdir /var/run/nuauth + + dodoc AUTHORS ChangeLog NEWS README TODO + docinto scripts + dodoc scripts/{clean_conntrack.pl,nuaclgen,nutop,README,ulog_rotate_daily.sh,ulog_rotate_weekly.sh} + docinto conf + dodoc conf/*.{nufw,schema,conf,dump,xml} + +# Pinkbyte: install nuauth.d config files + dodir nuauth.d + insinto /etc/nufw/nuauth.d + doins conf/nuauth.d/* +# + + if use pam; then + pamd_mimic system-auth nufw auth account password session + fi +} + +pkg_postinst() { + install_cert /etc/nufw/{nufw,nuauth} +} diff --git a/net-ftp/tftp-hpa/Manifest b/net-ftp/tftp-hpa/Manifest new file mode 100644 index 0000000..cda8069 --- /dev/null +++ b/net-ftp/tftp-hpa/Manifest @@ -0,0 +1,6 @@ +AUX in.tftpd.confd-0.44 576 RMD160 718a437e2d44c1594ef359784fde89d0367c2a47 SHA1 e4a051f435f56007b9efb4173e2d272b12442436 SHA256 55e67f871f070db2b7fa1428dabf55777ca87fecdbba7fa3b03e63c63734f977 +AUX in.tftpd.rc6 443 RMD160 e4a8d822b24cb9cf73b6e9601fcc58d40a203cb9 SHA1 7929ceb89811558576c7a9a4a4bb6d11bbd3c833 SHA256 3bceb3446bbebfae60d5276a2481c4311270d2e33c46e73a8bea66e330244ae0 +AUX tftp-hpa-5.0-filecase.patch 1980 RMD160 ddd70d8128afbabb9ad60b497c9369ce3efda9ec SHA1 008092e1e7872755709c2d61dd02495d4af512a1 SHA256 23a4da7351540ad7b9c0480e2a2fefe128eb088879907983b6804fc7a93c4047 +AUX tftp.xinetd 219 RMD160 7927ad10668599d03bbbefe55700c9a018033858 SHA1 658125a31f5348d225367441f8f528afa10f2007 SHA256 044c1c262cbeddbcddf449a694c5c472cc236aba87ea89b5a4dc7a76a1bf90a5 +DIST tftp-hpa-5.0.tar.bz2 93039 RMD160 fbafc398b40098343b9e9e82badcfe6bd0eb3932 SHA1 7f541f085a4af5a87bf86a249421b13a30150597 SHA256 96309871519efcab829fdfcc1cca546d772ed6a0e214c9e99e77ca7aea29f734 +EBUILD tftp-hpa-5.0-r1.ebuild 1275 RMD160 20b1fb3fcd69a8b56056a10252e9389cc3659e5f SHA1 4df2d79c4c220769906bb1a1f63bb294de93183e SHA256 9e3c68f2ff4a44643db2ac17e221258020e45615ba5756c97ca78294d8895f0c diff --git a/net-ftp/tftp-hpa/files/in.tftpd.confd-0.44 b/net-ftp/tftp-hpa/files/in.tftpd.confd-0.44 new file mode 100644 index 0000000..14e8d14 --- /dev/null +++ b/net-ftp/tftp-hpa/files/in.tftpd.confd-0.44 @@ -0,0 +1,15 @@ +# /etc/init.d/in.tftpd + +# Path to server files from +# Depending on your application you may have to change this. +# This is commented out to force you to look at the file! +#INTFTPD_PATH="/var/tftp/" +#INTFTPD_PATH="/tftpboot/" +#INTFTPD_PATH="/tftproot/" + +# For more options, see in.tftpd(8) +# -R 4096:32767 solves problems with ARC firmware, and obsoletes +# the /proc/sys/net/ipv4/ip_local_port_range hack. +# -s causes $INTFTPD_PATH to be the root of the TFTP tree. +# -l is passed by the init script in addition to these options. +INTFTPD_OPTS="-R 4096:32767 -s ${INTFTPD_PATH}" diff --git a/net-ftp/tftp-hpa/files/in.tftpd.rc6 b/net-ftp/tftp-hpa/files/in.tftpd.rc6 new file mode 100644 index 0000000..fcf2a4c --- /dev/null +++ b/net-ftp/tftp-hpa/files/in.tftpd.rc6 @@ -0,0 +1,20 @@ +#!/sbin/runscript +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/files/in.tftpd.rc6,v 1.2 2005/07/30 06:29:14 vapier Exp $ + +depend() { + need net +} + +start() { + ebegin "Starting tftpd" + /usr/sbin/in.tftpd -l ${INTFTPD_OPTS} + eend $? +} + +stop() { + ebegin "Stopping tftpd" + start-stop-daemon --stop --exec /usr/sbin/in.tftpd + eend $? +} diff --git a/net-ftp/tftp-hpa/files/tftp-hpa-5.0-filecase.patch b/net-ftp/tftp-hpa/files/tftp-hpa-5.0-filecase.patch new file mode 100644 index 0000000..cf0d4ef --- /dev/null +++ b/net-ftp/tftp-hpa/files/tftp-hpa-5.0-filecase.patch @@ -0,0 +1,91 @@ +--- tftp-hpa-5.0/tftpd/tftpd.c.orig 2009-12-26 13:17:35.000000000 +0300 ++++ tftp-hpa-5.0/tftpd/tftpd.c 2009-12-26 13:19:01.000000000 +0300 +@@ -46,6 +46,7 @@ + #include + #include + #include ++#include + + #include "common/tftpsubs.h" + #include "recvfrom.h" +@@ -975,6 +976,8 @@ + static int validate_access(char *, int, struct formats *, const char **); + static void tftp_sendfile(struct formats *, struct tftphdr *, int); + static void tftp_recvfile(struct formats *, struct tftphdr *, int); ++int lookup_entry(const char *comp, char *dest); ++void lookup_file(char *filename); + + struct formats { + const char *f_mode; +@@ -1353,6 +1356,62 @@ + } + #endif + ++int lookup_entry(const char *comp, char *dest) ++{ ++ DIR *dirp; ++ struct dirent *dptr; ++ dirp = opendir(dest[0] ? dest : "."); ++ if (!dirp) return 0; ++ while ((dptr = readdir(dirp))) ++ { ++ if (!strcasecmp(dptr->d_name, comp)) ++ { ++ if (dest[0]) strcat(dest, "/"); ++ strcat(dest, dptr->d_name); ++ closedir(dirp); ++ return 1; ++ } ++ } ++ closedir(dirp); ++ return 0; ++} ++ ++ ++void lookup_file(char *filename) ++{ ++ int found = 0; ++ int len = 0; ++ char dest[1024]; ++ char comp[1024]; ++ char *check = filename; ++ char *seek = NULL; ++ ++ dest[0] = 0; ++ check++; ++ while (*check) ++ { ++ seek = strchr(check, '\\'); ++ if (!seek) ++ { ++ if ((*check) && (lookup_entry(check, dest))) ++ found = 1; ++ break; ++ } ++ len = seek - check; ++ memcpy(comp, check, len); ++ comp[len]=0; ++ if (!lookup_entry(comp, dest)) ++ break; ++ check += len + 1; ++ } ++ ++ if (found) ++ { ++ filename[0] = 0; ++ strcat(filename, dest); ++ } ++} ++ + static FILE *file; + /* + * Validate file access. Since we +@@ -1378,6 +1437,8 @@ + tsize_ok = 0; + *errmsg = NULL; + ++ if (*filename == '\\') lookup_file(filename); ++ + if (!secure) { + if (*filename != '/') { + *errmsg = "Only absolute filenames allowed"; diff --git a/net-ftp/tftp-hpa/files/tftp.xinetd b/net-ftp/tftp-hpa/files/tftp.xinetd new file mode 100644 index 0000000..c1bf20a --- /dev/null +++ b/net-ftp/tftp-hpa/files/tftp.xinetd @@ -0,0 +1,10 @@ +service tftp +{ + disable = yes + socket_type = dgram + protocol = udp + wait = yes + user = root + server = /usr/sbin/in.tftpd + server_args = -R 4096:32767 -s /tftpboot +} diff --git a/net-ftp/tftp-hpa/tftp-hpa-5.0-r1.ebuild b/net-ftp/tftp-hpa/tftp-hpa-5.0-r1.ebuild new file mode 100644 index 0000000..fc12b26 --- /dev/null +++ b/net-ftp/tftp-hpa/tftp-hpa-5.0-r1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/tftp-hpa-5.0.ebuild,v 1.3 2009/10/20 08:35:19 vapier Exp $ + +inherit eutils + +DESCRIPTION="port of the OpenBSD TFTP server" +HOMEPAGE="http://www.kernel.org/pub/software/network/tftp/" +SRC_URI="mirror://kernel/software/network/tftp/${P}.tar.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="ipv6 readline selinux tcpd" + +RDEPEND="selinux? ( sec-policy/selinux-tftpd ) + !virtual/tftp" +DEPEND="${RDEPEND} + readline? ( sys-libs/readline ) + tcpd? ( sys-apps/tcp-wrappers )" +PROVIDE="virtual/tftp" + +src_compile() { + # additional patch for Windows clients + epatch "${FILESDIR}"/${P}-filecase.patch + # + econf \ + $(use_with ipv6) \ + $(use_with tcpd tcpwrappers) \ + $(use_with readline) \ + || die + emake || die +} + +src_install() { + emake INSTALLROOT="${D}" install || die + dodoc README* CHANGES tftpd/sample.rules + + # iputils installs this + rm "${D}"/usr/share/man/man8/tftpd.8 || die + + newconfd "${FILESDIR}"/in.tftpd.confd-0.44 in.tftpd + newinitd "${FILESDIR}"/in.tftpd.rc6 in.tftpd + insinto /etc/xinetd.d + newins "${FILESDIR}"/tftp.xinetd tftp +} diff --git a/net-misc/gns3/Manifest b/net-misc/gns3/Manifest new file mode 100644 index 0000000..4e816ce --- /dev/null +++ b/net-misc/gns3/Manifest @@ -0,0 +1,4 @@ +AUX gns3-0.7.2_set_dynamips_path.patch 611 RMD160 7543831dc283972e20ddf740e00211facd3f4206 SHA1 403b50b8faea74120608204b440488dee8a911e0 SHA256 6f6b8ab62714d6e34cbbb2d75769ca27184c812d860942e6feecdf5c624e5c5c +AUX gns3-0.7.2_set_qemu_path.patch 732 RMD160 56d06f13ea4468c5515dd41e2c6f8c4ac38440ff SHA1 44d3f8d0da6a372d88fe8430f285f4a95e33c820 SHA256 7bfd5f5283053df09a90423e79aeb5935b9caa5e3490fda4e21043dde078bf90 +DIST GNS3-0.7.2-src.tar.bz2 2947490 RMD160 c3a643f0530215253b40da2c46c3d1f93018451b SHA1 5fa5efeeb4b4a93da6879d020b18fc21c3876eec SHA256 308aa1452721b234136914edce05907bfb0f054f9ec3e6ef653fd29bb785a854 +EBUILD gns3-0.7.2.ebuild 1022 RMD160 5f02a08ef1b5500ea35b8f3b55421c8c58c67caf SHA1 3b2258b635d267c7ffd99d850849546169f01648 SHA256 dd87287ae67b2f2c17d1b1fc882a4055223daf10f2dd1fb9cf048bb93da39f26 diff --git a/net-misc/gns3/files/gns3-0.7.2_set_dynamips_path.patch b/net-misc/gns3/files/gns3-0.7.2_set_dynamips_path.patch new file mode 100644 index 0000000..792aff2 --- /dev/null +++ b/net-misc/gns3/files/gns3-0.7.2_set_dynamips_path.patch @@ -0,0 +1,12 @@ +--- /tmp/GNS3-0.7-src/src/GNS3/Ui/ConfigurationPages/Page_PreferencesDynamips.py.old 2010-04-09 14:58:40.663821065 +0200 ++++ /tmp/GNS3-0.7-src/src/GNS3/Ui/ConfigurationPages/Page_PreferencesDynamips.py 2010-04-09 14:59:24.282849072 +0200 +@@ -55,6 +55,8 @@ + # Default path to dynamips executable + if self.conf.path == '' and sys.platform.startswith('win'): + self.conf.path = unicode('dynamips-wxp.exe') ++ else: ++ self.conf.path = unicode('/usr/bin/dynamips') + + # Default path to working directory + if self.conf.workdir == '': + diff --git a/net-misc/gns3/files/gns3-0.7.2_set_qemu_path.patch b/net-misc/gns3/files/gns3-0.7.2_set_qemu_path.patch new file mode 100644 index 0000000..2eaea48 --- /dev/null +++ b/net-misc/gns3/files/gns3-0.7.2_set_qemu_path.patch @@ -0,0 +1,12 @@ +--- /tmp/GNS3-0.7-src/src/GNS3/Ui/ConfigurationPages/Page_PreferencesQemu.py.old 2010-04-12 11:13:56.594820507 +0200 ++++ /tmp/GNS3-0.7-src/src/GNS3/Ui/ConfigurationPages/Page_PreferencesQemu.py 2010-04-12 11:15:02.599822184 +0200 +@@ -82,8 +82,7 @@ + if sys.platform.startswith('win'): + self.conf.qemuwrapper_path = unicode('qemuwrapper.exe') + else: +- path = os.getcwd() + '/qemuwrapper/qemuwrapper.py' +- self.conf.qemuwrapper_path = unicode(path, errors='replace') ++ self.conf.qemuwrapper_path = unicode('/usr/libexec/gns3/qemuwrapper.py') + + # Default path to working directory + if self.conf.qemuwrapper_workdir == '': diff --git a/net-misc/gns3/gns3-0.7.2.ebuild b/net-misc/gns3/gns3-0.7.2.ebuild new file mode 100644 index 0000000..edd941b --- /dev/null +++ b/net-misc/gns3/gns3-0.7.2.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=2 + +PYTHON_DEPEND="2" + +inherit eutils python distutils + +MY_P=${P/gns/GNS}-src + +DESCRIPTION="Graphical Network Simulator" +HOMEPAGE="http://www.gns3.net/" +SRC_URI="mirror://sourceforge/gns-3/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=">=dev-python/PyQt4-4.6.1 + x11-libs/qt-gui:4 + x11-libs/qt-svg:4" +RDEPEND="${DEPEND} + >=app-emulation/dynamips-0.2.8_rc2" + +S=${WORKDIR}/${MY_P} + +pkg_setup() { + python_set_active_version 2 + python_pkg_setup +} + +src_prepare() { + epatch "${FILESDIR}/${P}_set_dynamips_path.patch" + epatch "${FILESDIR}/${P}_set_qemu_path.patch" + + python_convert_shebangs -r 2 . + + distutils_src_prepare +} + +src_install() { + distutils_src_install + + insinto /usr/libexec/${PN} + doins qemuwrapper/{pemubin,qemuwrapper}.py || die + + doicon "${FILESDIR}"/${PN}.xpm + make_desktop_entry ${PN} "GNS3" ${PN} "Utility;Emulator" + + doman docs/man/${PN}.1 || die +} diff --git a/net-misc/knemo/ChangeLog b/net-misc/knemo/ChangeLog new file mode 100644 index 0000000..ebf423d --- /dev/null +++ b/net-misc/knemo/ChangeLog @@ -0,0 +1,176 @@ +# ChangeLog for net-misc/knemo +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/knemo/ChangeLog,v 1.40 2007/07/30 13:19:16 gustavoz Exp $ + + 30 Jul 2007; Gustavo Zacarias knemo-0.4.8.ebuild: + Stable on sparc wrt #186897 + + 28 Jul 2007; Raúl Porcel knemo-0.4.8.ebuild: + x86 stable wrt #186897 + + 28 Jul 2007; Wulf C. Krueger knemo-0.4.8.ebuild: + Marked stable on amd64 as per bug 186897. + + 28 Jul 2007; nixnut knemo-0.4.8.ebuild: + Stable on ppc wrt bug 186897 + +*knemo-0.4.8 (29 May 2007) + + 29 May 2007; Stefan Schweizer + -files/knemo-0.4.6-sysbackend.patch, -knemo-0.4.0.ebuild, + -knemo-0.4.5.ebuild, -knemo-0.4.6.ebuild, -knemo-0.4.6-r1.ebuild, + +knemo-0.4.8.ebuild: + version bump remove old + + 30 Apr 2007; Gustavo Zacarias knemo-0.4.7.ebuild: + Stable on sparc wrt #176292 + + 29 Apr 2007; Danny van Dyk knemo-0.4.7.ebuild: + Marked stable on amd64. + + 29 Apr 2007; Raúl Porcel knemo-0.4.7.ebuild: + x86 stable wrt #176292 + + 28 Apr 2007; nixnut knemo-0.4.7.ebuild: + Stable on ppc wrt bug 176292 + +*knemo-0.4.7 (01 Apr 2007) + + 01 Apr 2007; Carsten Lohrke +knemo-0.4.7.ebuild: + Version bump. + + 29 Mar 2007; Matteo Azzali + files/knemo-0.4.6-sysbackend.patch: + fixed sysbackend patch. + +*knemo-0.4.6-r1 (28 Mar 2007) + + 28 Mar 2007; Matteo Azzali + +files/knemo-0.4.6-sysbackend.patch, +knemo-0.4.6-r1.ebuild: + Fixed sys-backend as per bug 172450. Thanks to Alberto Zennaro. + +*knemo-0.4.6 (19 Nov 2006) + + 19 Nov 2006; Przemysław Maciąg -knemo-0.4.2.ebuild, + -knemo-0.4.4.ebuild, +knemo-0.4.6.ebuild: + Version bump (0.4.6). Clean up some older ebuilds. + + 13 Oct 2006; Ioannis Aslanidis + knemo-0.4.5.ebuild: + Fixed pkg_postinst message as reported in bug #151229. Thanks to + Wiktor Wandachowicz for reporting the issue. + +*knemo-0.4.5 (27 Aug 2006) + + 27 Aug 2006; Carsten Lohrke +knemo-0.4.5.ebuild: + Version bump. + +*knemo-0.4.4 (12 Aug 2006) + + 12 Aug 2006; Stefan Schweizer + -files/knemo-0.3.1-gcc41.patch, -files/knemo-0.3.1-linkquality.patch, + -knemo-0.3.1-r1.ebuild, +knemo-0.4.4.ebuild: + version bump, remove old + +*knemo-0.4.2 (15 Jun 2006) + + 15 Jun 2006; Diego Pettenò -knemo-0.4.1.ebuild, + +knemo-0.4.2.ebuild: + Version bump with fix for divisions by zero. + +*knemo-0.4.1 (12 Jun 2006) + + 12 Jun 2006; Carsten Lohrke +knemo-0.4.1.ebuild: + Version bump. + + 08 Jun 2006; Jon Hood knemo-0.4.0.ebuild: + Stable on amd64, #135656. + + 07 Jun 2006; Joshua Jackson knemo-0.4.0.ebuild: + Stable x86; bug #135656 + + 04 Apr 2006; Carsten Lohrke files/digest-knemo-0.4.0, + Manifest: + Forgot to recreate digest. + + 03 Apr 2006; Carsten Lohrke knemo-0.4.0.ebuild: + Upstream issued new tarball... + +*knemo-0.4.0 (03 Apr 2006) + + 03 Apr 2006; Carsten Lohrke +knemo-0.4.0.ebuild: + Version bump. + + 06 Mar 2006; Diego Pettenò + +files/knemo-0.3.1-gcc41.patch, knemo-0.3.1-r1.ebuild: + Add patch to fix building with GCC 4.1, thanks to Daniele Gaffuri in bug + #125179 for submitting it. + + 02 Sep 2005; Luis Medinas knemo-0.3.1-r1.ebuild: + Marked Stable on AMD64. + + 13 Aug 2005; Diego Pettenò knemo-0.3.1-r1.ebuild: + Depend on sys-apps/net-tools just on Linux. + + 29 Jun 2005; Carsten Lohrke knemo-0.3.1-r1.ebuild: + stable on x86 + +*knemo-0.3.1-r1 (01 May 2005) + + 01 May 2005; Carsten Lohrke + +files/knemo-0.3.1-linkquality.patch, +knemo-0.3.1-r1.ebuild: + always show link quality, #88653 + + 07 Apr 2005; Marcus D. Hanwell knemo-0.3.1.ebuild: + Marked ~amd64, closes bug 83489. + + 25 Mar 2005; Carsten Lohrke knemo-0.3.1.ebuild: + stable on x86 + + 27 Feb 2005; Jason Wever knemo-0.3.1.ebuild: + Added ~sparc keyword. + +*knemo-0.3.1 (06 Jan 2005) + + 06 Jan 2005; Carsten Lohrke +knemo-0.3.1.ebuild: + version bump + + 12 Oct 2004; Carsten Lohrke -knemo-0.1.10.ebuild, + -knemo-0.1.8.ebuild, -knemo-0.1.9.ebuild, -knemo-0.2.0.ebuild, + -knemo-0.2.2.ebuild, knemo-0.3.0.ebuild: + stable on x86, clean up + +*knemo-0.3.0 (14 Sep 2004) + + 14 Sep 2004; Carsten Lohrke +knemo-0.3.0.ebuild: + version bump + +*knemo-0.2.2 (17 Aug 2004) + + 17 Aug 2004; Dominik Stadler +knemo-0.2.2.ebuild: + Add version 0.2.2, requested in Bug 60637 + +*knemo-0.2.0 (01 Aug 2004) + + 01 Aug 2004; Dominik Stadler +knemo-0.2.0.ebuild: + Add version 0.2.0, requested in Bug 59025 + +*knemo-0.1.10 (12 Jul 2004) + + 12 Jul 2004; Carsten Lohrke +knemo-0.1.10.ebuild: + version bump + +*knemo-0.1.9 (10 Jul 2004) + + 10 Jul 2004; Carsten Lohrke +knemo-0.1.9.ebuild: + version bump + + 29 Jun 2004; David Holm knemo-0.1.8.ebuild: + Added to ~ppc. + +*knemo-0.1.8 (28 Jun 2004) + + 28 Jun 2004; Carsten Lohrke +metadata.xml, + +knemo-0.1.8.ebuild: + Initial ebuild. Thanks to Alberto Garcia Hierro. + diff --git a/net-misc/knemo/Manifest b/net-misc/knemo/Manifest new file mode 100644 index 0000000..05081cb --- /dev/null +++ b/net-misc/knemo/Manifest @@ -0,0 +1,3 @@ +DIST 12956-knemo-0.4.8.tar.bz2 628707 RMD160 bca6f4b1e99728b3f34c7f86dcc21418a73e29ee SHA1 ee6e8f56fe20b81318c60e38584db6fe3a46fd01 SHA256 a5f8c37d9be5c637d0c57f11cf7d918d5d4451fe9c1826d003f85b57852fe380 +EBUILD knemo-0.4.8.ebuild 1120 RMD160 339bd2ba9f4bdb0ee8bd89bc8a4fd6d0c32bb7d3 SHA1 9b3230221629127ca1d049890bb781d1b169a97f SHA256 481ecc960de507c25fd94dfe617a419ccbeabadd8da261c7c2f3026d37a4c145 +MISC ChangeLog 5464 RMD160 04e24837fbc57808b995f04e50ae51e1ce39a4a5 SHA1 2d80127884736cd443485318c30b2ee8473c09a9 SHA256 c2efa277c1cc436315127d85f1cec17ee55d746df69711bc0ec3cbd8f84d2e07 diff --git a/net-misc/knemo/knemo-0.4.8.ebuild b/net-misc/knemo/knemo-0.4.8.ebuild new file mode 100644 index 0000000..1bbe6d7 --- /dev/null +++ b/net-misc/knemo/knemo-0.4.8.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/knemo/knemo-0.4.8.ebuild,v 1.5 2007/07/30 13:19:16 gustavoz Exp $ + +inherit kde eutils + +MY_P="${P}" +S="${WORKDIR}/${MY_P}" + +DESCRIPTION="KNemo - the KDE Network Monitor" +HOMEPAGE="http://kde-apps.org/content/show.php?content=12956" +SRC_URI="http://www.kde-apps.org/CONTENT/content-files/12956-${MY_P}.tar.bz2" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="amd64 ppc sparc x86" +IUSE="wifi" + +RDEPEND="kernel_linux? ( sys-apps/net-tools ) + wifi? ( net-wireless/wireless-tools ) + kde-base/kdebase-startkde:3.5" +DEPEND="${RDEPEND}" + +need-kde 3.5 + +pkg_postinst() { + kde_pkg_postinst + echo + einfo "KNemo is not an executable but a KDED service. Since version 0.4.5" + einfo "KNemo has to be started using KDE Control Center/Internet & Network/" + einfo "Network Monitor. Please do no longer use the KDE Service Manager to" + einfo "start and stop KNemo. This change was necessary to keep KNemo from" + einfo "starting automatically for every user in a multiuser environment." + echo +} diff --git a/profiles/repo_name b/profiles/repo_name new file mode 100644 index 0000000..cdc8dd8 --- /dev/null +++ b/profiles/repo_name @@ -0,0 +1 @@ +pinkbyte_repo diff --git a/sets.conf b/sets.conf new file mode 100644 index 0000000..1aa50c7 --- /dev/null +++ b/sets.conf @@ -0,0 +1,4 @@ +[local sets] +class = portage.sets.files.StaticFileSet +multiset = true +directory = ${repository:pinkbyte-repo}/sets/ diff --git a/sets/kdebase-apps-fix-konq-plugins b/sets/kdebase-apps-fix-konq-plugins new file mode 100644 index 0000000..0c0e907 --- /dev/null +++ b/sets/kdebase-apps-fix-konq-plugins @@ -0,0 +1,14 @@ +# Autogenerated by regenerate-files, DO NOT EDIT. +kde-base/dolphin:4 +kde-base/kdepasswd:4 +kde-base/kdialog:4 +kde-base/keditbookmarks:4 +kde-base/kfind:4 +kde-base/kfmclient:4 +kde-base/konqueror:4 +kde-misc/konq-plugins:4 +kde-base/konsole:4 +kde-base/kwrite:4 +kde-base/libkonq:4 +kde-base/nsplugins:4 +kde-base/plasma-apps:4 diff --git a/sets/kdebase-runtime-without-semantic-desktop b/sets/kdebase-runtime-without-semantic-desktop new file mode 100644 index 0000000..29cb47d --- /dev/null +++ b/sets/kdebase-runtime-without-semantic-desktop @@ -0,0 +1,38 @@ +# Autogenerated by regenerate-files, DO NOT EDIT. +kde-base/activitymanager:4 +kde-base/attica:4 +kde-base/drkonqi:4 +kde-base/kcmshell:4 +kde-base/kcontrol:4 +kde-base/kdebase-data:4 +kde-base/kdebase-desktoptheme:4 +kde-base/kdebase-kioslaves:4 +kde-base/kdebase-menu:4 +kde-base/kdebase-menu-icons:4 +kde-base/kdebase-runtime-meta:4 +kde-base/kdebugdialog:4 +kde-base/kdesu:4 +kde-base/kdontchangethehostname:4 +kde-base/keditfiletype:4 +kde-base/kfile:4 +kde-base/kglobalaccel:4 +kde-base/khelpcenter:4 +kde-base/kiconfinder:4 +kde-base/kioclient:4 +kde-base/kmimetypefinder:4 +kde-base/knetattach:4 +kde-base/knewstuff:4 +kde-base/knotify:4 +kde-base/kpasswdserver:4 +kde-base/kquitapp:4 +kde-base/kreadconfig:4 +kde-base/kstart:4 +kde-base/ktimezoned:4 +kde-base/ktraderclient:4 +kde-base/kuiserver:4 +kde-base/kurifilter-plugins:4 +kde-base/kwalletd:4 +kde-base/phonon-kde:4 +kde-base/plasma-runtime:4 +kde-base/renamedlg-plugins:4 +kde-base/solid-runtime:4 diff --git a/sets/kdebase-without-semantic-desktop b/sets/kdebase-without-semantic-desktop new file mode 100644 index 0000000..f5e3f3b --- /dev/null +++ b/sets/kdebase-without-semantic-desktop @@ -0,0 +1,5 @@ +# Autogenerated by regenerate-files, DO NOT EDIT. +kde-base/kdebase-meta:4 +@kdebase-apps-fix-konq-plugins +@kdebase-runtime-without-semantic-desktop +@kdebase-workspace-4.6 diff --git a/sys-devel/spl/Manifest b/sys-devel/spl/Manifest new file mode 100644 index 0000000..1116f21 --- /dev/null +++ b/sys-devel/spl/Manifest @@ -0,0 +1,4 @@ +AUX spl-0.6.0-includedir.patch 1179 RMD160 cade3b696d6981b2583cc5ae8ecf614d38ef2efc SHA1 2c5ce007df75a7a8425e1a28308eefdcb29446c2 SHA256 8d05fc006348264e1633e14b73e022d482164d6cefc8d2425faffc50d2346150 +DIST spl-0.6.0-rc5.tar.gz 438291 RMD160 c3534f67616c048dbb32696990fda0a3612f96bd SHA1 ae2619216e8cd0dfd1de39806a3c774c3376ec35 SHA256 98da0bf4ac45f281f87a4e0ca58938282d80518b7c6555e4bf0d4775a61dbac7 +EBUILD spl-0.6.0_rc5.ebuild 1007 RMD160 23c0bece949a8ec76a91d37891b49405d7c2b149 SHA1 13b87d1feeed5537e1682d13e407d60fba3d56e1 SHA256 0cffb12b3326db89e53e9a2df8b91a4d1a12e41b59cf2e765eeef1a15809db5e +EBUILD spl-9999.ebuild 959 RMD160 8f041c628117303867bf3761b83c6d79e5144ef1 SHA1 6d6daf8f02664100b6fde7252f295b4f188d523b SHA256 bb075852989c2d9806b54e7c17d09748ecbbe5cf787944b292db9b92b8f52a9e diff --git a/sys-devel/spl/files/spl-0.6.0-includedir.patch b/sys-devel/spl/files/spl-0.6.0-includedir.patch new file mode 100644 index 0000000..37cdbf6 --- /dev/null +++ b/sys-devel/spl/files/spl-0.6.0-includedir.patch @@ -0,0 +1,26 @@ +diff -urN spl-0.6.0-rc3.orig/include/Makefile.am spl-0.6.0-rc3/include/Makefile.am +--- spl-0.6.0-rc3.orig/include/Makefile.am 2011-04-07 22:30:50.000000000 +0400 ++++ spl-0.6.0-rc3/include/Makefile.am 2011-04-12 03:12:40.000000000 +0400 +@@ -15,8 +15,7 @@ + noinst_HEADERS += $(top_srcdir)/include/vm/*.h + + install-data-local: +- destname=spl-$(SPL_META_VERSION)/$(LINUX_VERSION); \ +- instdest=$(DESTDIR)/usr/src/$$destname; \ ++ instdest=$(DESTDIR)/${includedir}/spl; \ + instfiles=`find . -name '*.h'`; \ + for instfile in $$instfiles; do \ + $(INSTALL) -D $$instfile $$instdest/$$instfile; \ +diff -urN spl-0.6.0-rc3.orig/Makefile.am spl-0.6.0-rc3/Makefile.am +--- spl-0.6.0-rc3.orig/Makefile.am 2011-04-07 22:30:50.000000000 +0400 ++++ spl-0.6.0-rc3/Makefile.am 2011-04-12 03:12:22.000000000 +0400 +@@ -29,8 +29,7 @@ + + if CONFIG_KERNEL + install-data-local: +- destname=spl-$(SPL_META_VERSION)/$(LINUX_VERSION); \ +- instdest=$(DESTDIR)/usr/src/$$destname; \ ++ instdest=$(DESTDIR)/${includedir}/spl; \ + echo "$(SPL_META_VERSION)" >$$instdest/spl.release; \ + for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \ + $(INSTALL) -D $$instfile $$instdest/$$instfile; \ diff --git a/sys-devel/spl/spl-0.6.0_rc5.ebuild b/sys-devel/spl/spl-0.6.0_rc5.ebuild new file mode 100644 index 0000000..df6d71c --- /dev/null +++ b/sys-devel/spl/spl-0.6.0_rc5.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +WANT_AUTOMAKE="1.11" +AT_M4DIR=./config # for aclocal called by eautoreconf +inherit linux-info eutils autotools + +DESCRIPTION="Solaris Porting Layer - a Linux kernel module providing some Solaris kernel APIs" +HOMEPAGE="http://zfsonlinux.org" +SRC_URI="http://github.com/downloads/zfsonlinux/${PN}/${P/_/-}.tar.gz" + +LICENSE="|| ( GPL-2 GPL-3 )" +SLOT="0" +KEYWORDS="~amd64 -x86" +IUSE="" + +DEPEND=" + virtual/linux-sources + " +RDEPEND="" + +S="${WORKDIR}/${P/_/-}" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-0.6.0-includedir.patch + eautoreconf +# cd "${WORKDIR}" +# ./autogen.sh +} + +src_configure() { + set_arch_to_kernel + econf \ + --with-config=all \ + --with-linux="${KERNEL_DIR}" \ + --with-linux-obj="${KERNEL_DIR}" +} + +src_install() { + emake DESTDIR="${D}" install || die 'emake install failed' + dosym /usr/include/spl/spl_config.h /usr/include/spl/module/spl_config.h \ + || die +} diff --git a/sys-devel/spl/spl-9999.ebuild b/sys-devel/spl/spl-9999.ebuild new file mode 100644 index 0000000..1d9ffae --- /dev/null +++ b/sys-devel/spl/spl-9999.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +WANT_AUTOMAKE="1.11" +AT_M4DIR=./config # for aclocal called by eautoreconf +inherit git-2 linux-info eutils autotools + +DESCRIPTION="Solaris Porting Layer - a Linux kernel module providing some Solaris kernel APIs" +HOMEPAGE="http://wiki.github.com/behlendorf/spl/" +SRC_URI="" +EGIT_REPO_URI="git://github.com/behlendorf/spl.git" + +LICENSE="|| ( GPL-2 GPL-3 )" +SLOT="0" +KEYWORDS="" +IUSE="" + +DEPEND=" + >=virtual/linux-sources-2.6 + " +RDEPEND="" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-0.6.0-includedir.patch + eautoreconf +} + +src_configure() { + set_arch_to_kernel + econf \ + --with-config=all \ + --with-linux="${KERNEL_DIR}" \ + --with-linux-obj="${KERNEL_DIR}" +} + +src_install() { + emake DESTDIR="${D}" install || die 'emake install failed' + dosym /usr/include/spl/spl_config.h /usr/include/spl/module/spl_config.h \ + || die +} diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest new file mode 100644 index 0000000..e5eb5aa --- /dev/null +++ b/sys-fs/zfs/Manifest @@ -0,0 +1,5 @@ +AUX zfs-0.6.0-includedir.patch 586 RMD160 eb4cc6a9d66721e70c932b1dd640abd852d5470d SHA1 c673e057008b4cb7d4c45b936533e9bceff2443c SHA256 047a0cec35bcc5f8050fa80f8203ea020bf148375297c64300a9607f062cec2d +AUX zfs.initd 2052 RMD160 3636ead94d4b7200cc221b9e9646b85a5c3acc1a SHA1 d59d5b475c3dc335bf70a24a7af80ef7a38df347 SHA256 ad5e5aa282f2942b23364b5dcb43b4edea5c3923559d18d624ca9bcb51218476 +DIST zfs-0.6.0-rc5.tar.gz 1910372 RMD160 29661b7399715409bc695a949fb3081d453bf453 SHA1 bed97f65bd9fb8959e2b1e7da2a0304e9cf25b1d SHA256 7a4bfb7a1d6a9f3e276c7ade366309225be09c3141c4109a14bb1588a7114f19 +EBUILD zfs-0.6.0_rc5.ebuild 1581 RMD160 91fe26950dc63abbc21e264fdebdae0e42c25275 SHA1 89adfc5d3c0056fd6975c4b5ef40469dcdc9696f SHA256 339cea385628c68bdecf1de89052417f68e9fa561cea51b94972f130ddbf0061 +EBUILD zfs-9999.ebuild 1507 RMD160 348d2ff51ad8a3aed6cdd319784e503d4abc2ebb SHA1 be5a7374fa4b22c8f6a8b137960b2242bda99298 SHA256 c42c5cc57c32e698682eaf5cb9502011d770f34611d2933aab75fc7983da3998 diff --git a/sys-fs/zfs/files/zfs-0.6.0-includedir.patch b/sys-fs/zfs/files/zfs-0.6.0-includedir.patch new file mode 100644 index 0000000..fd31ec3 --- /dev/null +++ b/sys-fs/zfs/files/zfs-0.6.0-includedir.patch @@ -0,0 +1,13 @@ +diff -urN zfs-0.6.0-rc3.orig/Makefile.am zfs-0.6.0-rc3/Makefile.am +--- zfs-0.6.0-rc3.orig/Makefile.am 2011-04-07 22:31:01.000000000 +0400 ++++ zfs-0.6.0-rc3/Makefile.am 2011-04-12 03:25:36.000000000 +0400 +@@ -32,8 +32,7 @@ + + if CONFIG_KERNEL + install-data-local: +- destname=zfs-$(ZFS_META_VERSION)/$(LINUX_VERSION); \ +- instdest=$(DESTDIR)/usr/src/$$destname; \ ++ instdest=$(DESTDIR)/${includedir}/zfs-linux; \ + echo "$(ZFS_META_VERSION)" >$$instdest/zfs.release; \ + for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \ + $(INSTALL) -D $$instfile $$instdest/$$instfile; \ diff --git a/sys-fs/zfs/files/zfs.initd b/sys-fs/zfs/files/zfs.initd new file mode 100644 index 0000000..c9c5634 --- /dev/null +++ b/sys-fs/zfs/files/zfs.initd @@ -0,0 +1,98 @@ +#!/sbin/runscript +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/files/zfs,v 0.9 2011/04/30 10:13:43 devsk Exp $ + +depend() +{ + before net + after udev + keyword -lxc -openvz -prefix -vserver +} + +CACHEFILE=/etc/zfs/zpool.cache +ZPOOL=/usr/sbin/zpool +ZFS=/usr/sbin/zfs +ZFS_MODULE=zfs + +checksystem() { + if [ -c /dev/zfs ]; then + einfo "ZFS modules already loaded" + return 0 + else + einfo "Checking if ZFS modules present" + if [ "x$(modprobe -l $ZFS_MODULE | grep $ZFS_MODULE)" == "x" ]; then + eerror "$ZFS_MODULE not found. Is the ZFS package installed?" + return 1 + fi + fi + einfo "Checking if zfs userspace tools present" + if [ ! -x $ZPOOL ]; then + eerror "$ZPOOL binary not found." + return 1 + fi + if [ ! -x $ZFS ]; then + eerror "$ZFS binary not found." + return 1 + fi + return 0 +} + +start() { + ebegin "Starting ZFS" + checksystem || return 1 + if [ ! -c /dev/zfs ]; then + modprobe $ZFS_MODULE + rv=$? + if [ $rv -ne 0 ]; then + eerror "Failed to load the $ZFS_MODULE module, check 'dmesg|tail'." + eend $rv + return $rv + fi + fi + + # Import all pools described by the cache file, and then mount + # all filesystem based on their properties. + if [ -f $CACHEFILE ]; then + einfo "Importing ZFS pools" + # as per fedora script, import can fail if all pools are already imported + # The check for $rv makes no sense...but someday, it will work right. + $ZPOOL import -c $CACHEFILE -aN 2>/dev/null || true + rv=$? + if [ $rv -ne 0 ]; then + eerror "Failed to import not-yet imported pools." + eend $rv + return $rv + fi + fi + + einfo "Mounting ZFS filesystems" + $ZFS mount -a + rv=$? + if [ $rv -ne 0 ]; then + eerror "Failed to mount ZFS filesystems." + eend $rv + return $rv + fi + + eend 0 + return 0 +} + +stop() +{ + ebegin "Unmounting ZFS filesystems" + $ZFS umount -a + rv=$? + if [ $rv -ne 0 ]; then + eerror "Failed to umount ZFS filesystems." + fi + + eend $rv +} + +status() +{ + # show pool status and list + $ZPOOL status && echo && $ZPOOL list +} diff --git a/sys-fs/zfs/zfs-0.6.0_rc5.ebuild b/sys-fs/zfs/zfs-0.6.0_rc5.ebuild new file mode 100644 index 0000000..dd0992e --- /dev/null +++ b/sys-fs/zfs/zfs-0.6.0_rc5.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +WANT_AUTOMAKE="1.11" +AT_M4DIR=./config # for aclocal called by eautoreconf +inherit eutils autotools linux-mod + +DESCRIPTION="Native ZFS for Linux" +HOMEPAGE="http://zfsonlinux.org" +SRC_URI="http://github.com/downloads/zfsonlinux/${PN}/${P/_/-}.tar.gz" + +LICENSE="CDDL GPL-2" +SLOT="0" +KEYWORDS="~amd64 -x86" +IUSE="" + +DEPEND=" + >=sys-devel/spl-${PV} + virtual/linux-sources + " +RDEPEND=" + !sys-fs/zfs-fuse + " + +S="${WORKDIR}/${P/_/-}" + +pkg_setup() { + linux-mod_pkg_setup + kernel_is gt 2 6 32 || die "Your kernel is too old. ${CATEGORY}/${PN} need 2.6.32 or newer." + linux_config_exists || die "Your kernel sources are unconfigured." + if linux_chkconfig_present PREEMPT; then + eerror "${CATEGORY}/${PN} doesn't currently work with PREEMPT kernel." + eerror "Please look at bug https://github.com/behlendorf/zfs/issues/83" + die "PREEMPT kernel" + fi +} + +src_prepare() { + epatch "${FILESDIR}/${PN}-0.6.0-includedir.patch" + eautoreconf +} + +src_configure() { + set_arch_to_kernel + econf \ + --with-config=all \ + --with-linux="${KERNEL_DIR}" \ + --with-linux-obj="${KERNEL_DIR}" \ + --with-spl=/usr/include/spl \ + --with-spl-obj=/usr/include/spl/module +} + +src_compile() { + set_arch_to_kernel + default # _not_ the one from linux-mod +} + +src_install() { + emake DESTDIR="${D}" install || die 'emake install failed' + newinitd "${FILESDIR}/zfs.initd" zfs + keepdir /var/lock/zfs + # Drop unwanted files + rm -rf "${D}/usr/src" || die "removing unwanted files die" +} diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild new file mode 100644 index 0000000..efb5f7c --- /dev/null +++ b/sys-fs/zfs/zfs-9999.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +WANT_AUTOMAKE="1.11" +AT_M4DIR=./config # for aclocal called by eautoreconf + +EGIT_REPO_URI="http://github.com/behlendorf/zfs.git" + +inherit autotools eutils git-2 linux-mod + +DESCRIPTION="Native ZFS for Linux" +HOMEPAGE="http://wiki.github.com/behlendorf/zfs/" +SRC_URI="" + +LICENSE="CDDL GPL-2" +SLOT="0" +KEYWORDS="" +IUSE="" + +DEPEND=" + >=sys-devel/spl-${PV} + >=virtual/linux-sources-2.6 + " +RDEPEND=" + !sys-fs/zfs-fuse + " + +pkg_setup() { + linux-mod_pkg_setup + kernel_is gt 2 6 32 || die "Your kernel is too old. ${CATEGORY}/${PN} need 2.6.32 or newer." + linux_config_exists || die "Your kernel sources are unconfigured." + if linux_chkconfig_present PREEMPT; then + eerror "${CATEGORY}/${PN} doesn't currently work with PREEMPT kernel." + eerror "Please look at bug https://github.com/behlendorf/zfs/issues/83" + die "PREEMPT kernel" + fi +} + +src_prepare() { + epatch "${FILESDIR}"/${PN}-0.6.0-includedir.patch + eautoreconf +} + +src_configure() { + set_arch_to_kernel + econf \ + --with-config=all \ + --with-linux="${KERNEL_DIR}" \ + --with-linux-obj="${KERNEL_DIR}" \ + --with-spl=/usr/include/spl \ + --with-spl-obj=/usr/include/spl/module +} + +src_compile() { + set_arch_to_kernel + default # _not_ the one from linux-mod +} + +src_install() { + emake DESTDIR="${D}" install || die 'emake install failed' + # Drop unwanted files + rm -rf "${D}/usr/src" || die "removing unwanted files die" +} diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest new file mode 100644 index 0000000..aa9aeed --- /dev/null +++ b/x11-drivers/nvidia-drivers/Manifest @@ -0,0 +1,17 @@ +AUX 09nvidia 61 RMD160 b69c3282ba6195112e312fe34bdcb12544aef8ca SHA1 05dd043f66f53409dfe511636d92a339edb4c765 SHA256 14702d6726cc9f0ad832a3cc90059999eb956f9e3a35397cb63cfa6347b33e39 +AUX 256.35-unified-arch.patch 1380 RMD160 2612cad105f442d4232b99e3054124e8037860bb SHA1 d82433c0b3520c87e05f1013a59b243ec65ebe97 SHA256 5e84bb51e0f9b3ceba270d53ad2a739dc534861df9acd6ab6852670f5a1357d7 +AUX NVIDIA_glx-defines.patch 437 RMD160 7cc38de0663c51d9e3718f02035a940a5d31e53c SHA1 eef9bcae32d4e00133b205e27ce766488d5c6cdb SHA256 0007f3d962edb87da4788ce58869679c1b10f28223a6bf1c23696fede57305da +AUX NVIDIA_glx-glheader.patch 380 RMD160 ee9a10cfbed10d5711f58a80553ffebeea5853bf SHA1 72abfedb9dfb7dae7dc23a5701d3e00282fef2c0 SHA256 f630e24067bf6199a64f8fe8c5d6fc158cb4b153bda65ffc3f97b36a9cb08faf +AUX eblits/donvidia.eblit 695 RMD160 e83869944dfce52a62423412e6c22b4e4468bc3c SHA1 0c877bbe4402c2845f8f4353c9f2d8086d364fbc SHA256 d404dd7e5657d83ccf3687720fb978030a3716e47957fb8bb80dea3ed57b3672 +AUX eblits/mtrr_check.eblit 629 RMD160 a7f9090f419faa17e74b81346c4bb019a7700138 SHA1 edb9ba38de929a9a0406408701a454f514fe78ed SHA256 ae1b8fb37985fc3e42a4a776779b3fe3d70be2c826df5c3f99d03ba7209ca0b1 +AUX eblits/src_install-libs.eblit 3472 RMD160 3e00b70ea45c7fdf6ec6a48c121f56b8faae15da SHA1 ec4cb37556284846a24fcdd54cff1a4cd0ccc539 SHA256 6f301de374736cec316794bf1935a15de025b3c505981f24e06e3df75818ad6a +AUX eblits/want_tls.eblit 952 RMD160 4f33e6aef50032665d68654af1cfdbd9abc54195 SHA1 cf96ae8227913439526f0ab2ec984e5be6f3a1fd SHA256 e5ce767a2e9a5c0682e764b9ba42a20e721a093f4c0626605570c8b5e3afecd0 +AUX libGL.la-r2 733 RMD160 479612ab30c04ca0683c7d9edaf9ab3de783e4a9 SHA1 88656b7e7234ade4f5564373fd6eb5c040167655 SHA256 4856e7a2c31763ade41c93a395f3e80a2705ac2ab4dbd73e5161cdba132f407b +AUX nvidia 1510 RMD160 ca0d0e5375109d9edf682d9bdda743b7c693e4d4 SHA1 85cf9bff167dcc063ba61426523973e9598085f7 SHA256 b193cc3f6d6f39138720a2282d9f161fc8f2e8a15bc43d183a30eb879add06c5 +AUX nvidia-169.07 639 RMD160 8baddb6fd1bf7f0e2688870a78e8ace051d62e3f SHA1 b30487ba2a24a6b1359d1fd831eeb1705060953c SHA256 a8c4860f008d53776fda7a17b59524f271236559af688e9a2c9845cbbcba1577 +AUX nvidia-drivers-260.19.44-2.6.39.patch 591 RMD160 8e53d800b86c380da9e9c978957a4d1b7f749fe4 SHA1 39be99b92fb16a71347fb8fb39301241550a1958 SHA256 dc9478bb4ff12d820f82bb13a8d7f956456ea97217ba89e6619f1c8d72127be3 +AUX nvidia-drivers-3.0.patch 1122 RMD160 50c5a920c600a30e6e8f0dea3a4fbd30e59e345b SHA1 49ad140b64e3f8874e2a5682c5c628d57da92b1f SHA256 3fda4e7c39fd10fd9006892b6900af0414095e7c29938fa9a83ff5e6d0be2c1a +DIST NVIDIA-FreeBSD-x86-270.41.19.tar.gz 28488689 RMD160 ec517f435d4b265f4236d680572a43d823be8b33 SHA1 264b8aaa5c9b71b5ea37d4367bae12464bb931e7 SHA256 352b3a666d7b799082896e82da6228eb61158dc1b9722a4f63ffe474b27b4750 +DIST NVIDIA-Linux-x86-270.41.19.run 29652783 RMD160 cf60d4ec6d8134285f97f8a76ebed7dd7e9a3a97 SHA1 5b5eb7b2650059b17537ed4b9d646a6dbd46d6a8 SHA256 a8c4aee97e3cb5bf9cd589b6245eeb633d20bae5420646384d48d568230994b1 +DIST NVIDIA-Linux-x86_64-270.41.19.run 49632218 RMD160 cc0bed4c9196d1ae53a926237a4c1029ce22427a SHA1 ad325e32e51d0f286f084c9b06298ec3aa2864d5 SHA256 4d7131f07e739abc787d69696ca4ac52df2fc0b338405ffd474288c2a4a1e7a6 +EBUILD nvidia-drivers-270.41.19-r9999.ebuild 16669 RMD160 d2ce83c04d0b0e67a0e931edbcaffa564019deeb SHA1 be61f3495ab2d593fddbe82a46f6650f85da877c SHA256 f218ae76e1dea609b854e20b48aae10a2decf5e7c5eb3c8e538d209f579b2593 diff --git a/x11-drivers/nvidia-drivers/files/09nvidia b/x11-drivers/nvidia-drivers/files/09nvidia new file mode 100644 index 0000000..1fcbef4 --- /dev/null +++ b/x11-drivers/nvidia-drivers/files/09nvidia @@ -0,0 +1,2 @@ +# Has to precede X11's own libraries! +LDPATH=/opt/nvidia/lib diff --git a/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch b/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch new file mode 100644 index 0000000..401ce95 --- /dev/null +++ b/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch @@ -0,0 +1,31 @@ +Add support for the 'x86' unified kernel arch in conftest.sh + +--- NVIDIA-Linux-x86-256.25/kernel/conftest.sh ++++ NVIDIA-Linux-x86-256.25/kernel/conftest.sh +@@ -101,7 +101,7 @@ build_cflags() { + + if [ "$OUTPUT" != "$SOURCES" ]; then + MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-default" +- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then ++ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then + MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default" + MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default" + fi +@@ -110,7 +110,7 @@ build_cflags() { + fi + else + MACH_CFLAGS="-I$HEADERS/asm/mach-default" +- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then ++ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then + MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default" + MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default" + fi +@@ -121,7 +121,7 @@ build_cflags() { + + CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS" + +- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then ++ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then + CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include" + fi + if [ -n "$BUILD_PARAMS" ]; then diff --git a/x11-drivers/nvidia-drivers/files/NVIDIA_glx-defines.patch b/x11-drivers/nvidia-drivers/files/NVIDIA_glx-defines.patch new file mode 100644 index 0000000..da9933f --- /dev/null +++ b/x11-drivers/nvidia-drivers/files/NVIDIA_glx-defines.patch @@ -0,0 +1,11 @@ +diff -ur NVIDIA_GLX-1.0-4191/usr/include/GL/glx.h NVIDIA_GLX-1.0-4191.new/usr/include/GL/glx.h +--- NVIDIA_GLX-1.0-4191/usr/include/GL/glx.h 2002-12-09 21:26:55.000000000 +0100 ++++ NVIDIA_GLX-1.0-4191.new/usr/include/GL/glx.h 2003-01-30 18:20:23.000000000 +0100 +@@ -39,6 +39,7 @@ + typedef XID GLXPixmap; + typedef XID GLXDrawable; + typedef XID GLXPbuffer; ++typedef XID GLXPbufferSGIX; + typedef XID GLXWindow; + typedef XID GLXFBConfigID; + diff --git a/x11-drivers/nvidia-drivers/files/NVIDIA_glx-glheader.patch b/x11-drivers/nvidia-drivers/files/NVIDIA_glx-glheader.patch new file mode 100644 index 0000000..e0393e1 --- /dev/null +++ b/x11-drivers/nvidia-drivers/files/NVIDIA_glx-glheader.patch @@ -0,0 +1,13 @@ +--- usr/include/GL/gl.g.orig 2004-07-17 19:56:59.789410584 +1000 ++++ usr/include/GL/gl.h 2004-07-17 19:59:08.844791184 +1000 +@@ -66,6 +66,10 @@ + typedef double GLclampd; + typedef void GLvoid; + ++/* Patching for some better defines in the global system */ ++#ifndef GL_GLEXT_LEGACY ++#include ++#endif + + /*************************************************************/ + diff --git a/x11-drivers/nvidia-drivers/files/eblits/donvidia.eblit b/x11-drivers/nvidia-drivers/files/eblits/donvidia.eblit new file mode 100644 index 0000000..75b39cf --- /dev/null +++ b/x11-drivers/nvidia-drivers/files/eblits/donvidia.eblit @@ -0,0 +1,21 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/files/eblits/donvidia.eblit,v 1.1 2008/12/18 18:27:35 cardoe Exp $ + +# Install nvidia library: +# the first parameter is the place where to install it +# the second parameter is the base name of the library +# the third parameter is the provided soversion +donvidia() { + dodir $1 + exeinto $1 + + libname=$(basename $2) + + # libnvidia-cfg.so is no longer supplied in lib32; step over it gracefully + if [ -e $2.$3 ] ; then + doexe $2.$3 + dosym ${libname}.$3 $1/${libname} + [[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1 + fi +} diff --git a/x11-drivers/nvidia-drivers/files/eblits/mtrr_check.eblit b/x11-drivers/nvidia-drivers/files/eblits/mtrr_check.eblit new file mode 100644 index 0000000..b14df34 --- /dev/null +++ b/x11-drivers/nvidia-drivers/files/eblits/mtrr_check.eblit @@ -0,0 +1,19 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/files/eblits/mtrr_check.eblit,v 1.1 2008/12/18 18:27:35 cardoe Exp $ + +mtrr_check() { + ebegin "Checking for MTRR support" + linux_chkconfig_present MTRR + eend $? + + if [[ $? -ne 0 ]] ; then + eerror "Please enable MTRR support in your kernel config, found at:" + eerror + eerror " Processor type and features" + eerror " [*] MTRR (Memory Type Range Register) support" + eerror + eerror "and recompile your kernel ..." + die "MTRR support not detected!" + fi +} diff --git a/x11-drivers/nvidia-drivers/files/eblits/src_install-libs.eblit b/x11-drivers/nvidia-drivers/files/eblits/src_install-libs.eblit new file mode 100644 index 0000000..e48d11c --- /dev/null +++ b/x11-drivers/nvidia-drivers/files/eblits/src_install-libs.eblit @@ -0,0 +1,116 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distribnuted under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/files/eblits/src_install-libs.eblit,v 1.1 2008/12/18 18:27:35 cardoe Exp $ +# +src_install-libs() { + local pkglibdir=lib + local inslibdir=$(get_libdir) + + if [[ ${#} -eq 2 ]] ; then + pkglibdir=${1} + inslibdir=${2} + elif has_multilib_profile && [[ ${ABI} == "x86" ]] ; then + pkglibdir=lib32 + fi + + local usrpkglibdir=usr/${pkglibdir} + local libdir=usr/X11R6/${pkglibdir} + local drvdir=${libdir}/modules/drivers + local extdir=${libdir}/modules/extensions + local incdir=usr/include/GL + local sover=${PV} + local NV_ROOT="/usr/${inslibdir}/opengl/nvidia" + local NO_TLS_ROOT="${NV_ROOT}/no-tls" + local TLS_ROOT="${NV_ROOT}/tls" + local X11_LIB_DIR="/usr/${inslibdir}/xorg" + + if use x86-fbsd; then + # on FreeBSD everything is on obj/ + pkglibdir=obj + usrpkglibdir=obj + x11pkglibdir=obj + drvdir=obj + extdir=obj + + # don't ask me why the headers are there.. glxext.h is missing + incdir=doc + + # on FreeBSD it has just .1 suffix + sover=1 + fi + + # The GLX libraries + donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGL.so ${sover} + donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGLcore.so ${sover} + + donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libnvidia-cfg.so ${sover} + + dodir ${NO_TLS_ROOT} + donvidia ${NO_TLS_ROOT} ${usrpkglibdir}/libnvidia-tls.so ${sover} + + if ! use x86-fbsd; then + donvidia ${TLS_ROOT} ${usrpkglibdir}/tls/libnvidia-tls.so ${sover} + fi + + if want_tls ; then + dosym ../tls/libnvidia-tls.so ${NV_ROOT}/lib + dosym ../tls/libnvidia-tls.so.1 ${NV_ROOT}/lib + dosym ../tls/libnvidia-tls.so.${sover} ${NV_ROOT}/lib + else + dosym ../no-tls/libnvidia-tls.so ${NV_ROOT}/lib + dosym ../no-tls/libnvidia-tls.so.1 ${NV_ROOT}/lib + dosym ../no-tls/libnvidia-tls.so.${sover} ${NV_ROOT}/lib + fi + + if ! use x86-fbsd; then + # Install the .la file for libtool, to prevent e.g. bug #176423 + [ -f "${FILESDIR}/libGL.la-r2" ] || die "libGL.la-r2 missing in FILESDIR" + local ver1=$(get_version_component_range 1) + local ver2=$(get_version_component_range 2) + local ver3=$(get_version_component_range 3) + sed -e "s:\${PV}:${PV}:" \ + -e "s:\${ver1}:${ver1}:" \ + -e "s:\${ver2}:${ver2}:" \ + -e "s:\${ver3}:${ver3}:" \ + -e "s:\${libdir}:${inslibdir}:" \ + "${FILESDIR}"/libGL.la-r2 > "${D}"/${NV_ROOT}/lib/libGL.la + fi + + exeinto ${X11_LIB_DIR}/modules/drivers + + [[ -f ${drvdir}/nvidia_drv.so ]] && \ + doexe ${drvdir}/nvidia_drv.so + + insinto /usr/${inslibdir} + [[ -f ${libdir}/libXvMCNVIDIA.a ]] && \ + doins ${libdir}/libXvMCNVIDIA.a + exeinto /usr/${inslibdir} + # fix Bug 131315 + [[ -f ${libdir}/libXvMCNVIDIA.so.${PV} ]] && \ + doexe ${libdir}/libXvMCNVIDIA.so.${PV} && \ + dosym libXvMCNVIDIA.so.${PV} \ + /usr/${inslibdir}/libXvMCNVIDIA.so + + exeinto ${NV_ROOT}/extensions + [[ -f ${libdir}/modules/libnvidia-wfb.so.${sover} ]] && \ + newexe ${libdir}/modules/libnvidia-wfb.so.${sover} libwfb.so + [[ -f ${extdir}/libglx.so.${sover} ]] && \ + newexe ${extdir}/libglx.so.${sover} libglx.so + + # Includes + insinto ${NV_ROOT}/include + doins ${incdir}/*.h + + #cuda + if [[ -f usr/include/cuda/cuda.h ]]; then + dodir /usr/include/cuda + insinto /usr/include/cuda + doins usr/include/cuda/*.h + + if [[ -f usr/${pkglibdir}/libcuda.so.${PV} ]]; then + dolib.so usr/${pkglibdir}/libcuda.so.${PV} + dosym libcuda.so.${PV} /usr/${inslibdir}/libcuda.so.1 + dosym libcuda.so.1 /usr/${inslibdir}/libcuda.so + fi + fi +} diff --git a/x11-drivers/nvidia-drivers/files/eblits/want_tls.eblit b/x11-drivers/nvidia-drivers/files/eblits/want_tls.eblit new file mode 100644 index 0000000..4debb85 --- /dev/null +++ b/x11-drivers/nvidia-drivers/files/eblits/want_tls.eblit @@ -0,0 +1,33 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/files/eblits/want_tls.eblit,v 1.1 2008/12/18 18:27:35 cardoe Exp $ + +want_tls() { + # For uclibc or anything non glibc, return false + has_version sys-libs/glibc || return 1 + + # Old versions of glibc were lt/no-tls only + has_version '=sys-libs/glibc-2.3.5' ; then + case ${CHOST/-*} in + i486|i586) return 1 ;; + esac + fi + + # These versions built linuxthreads version to support tls, too + has_version '>=sys-libs/glibc-2.3.4.20040619-r2' && return 0 + + return 1 +} diff --git a/x11-drivers/nvidia-drivers/files/libGL.la-r2 b/x11-drivers/nvidia-drivers/files/libGL.la-r2 new file mode 100644 index 0000000..863d184 --- /dev/null +++ b/x11-drivers/nvidia-drivers/files/libGL.la-r2 @@ -0,0 +1,32 @@ +# libGL.la - a libtool library file +# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18) +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# The name that we can dlopen(3). +dlname='libGL.so.1' + +# Names of this library. +library_names='libGL.so.${PV} libGL.so.1 libGL.so' + +# The name of the static archive. +old_library='' + +# Libraries that this one depends upon. +dependency_libs='-L/usr/${libdir} -lm -lX11 -lXext -ldl' + +# Version information for libGL. +current=${ver1} +age=${ver2} +revision=${ver3} + +# Is this an already installed library? +installed=yes + +# Files to dlopen/dlpreopen +dlopen='' +dlpreopen='' + +# Directory that this library needs to be installed in: +libdir='/usr/${libdir}' diff --git a/x11-drivers/nvidia-drivers/files/nvidia b/x11-drivers/nvidia-drivers/files/nvidia new file mode 100644 index 0000000..7cf0f7c --- /dev/null +++ b/x11-drivers/nvidia-drivers/files/nvidia @@ -0,0 +1,40 @@ +# Nvidia drivers support +alias char-major-195 nvidia +alias /dev/nvidiactl char-major-195 + +# To tweak the driver the following options can be used, note that +# you should be careful, as it could cause instability!! For more +# options see /usr/share/doc/PACKAGE/README +# +# To enable Side Band Adressing: NVreg_EnableAGPSBA=1 +# +# To enable Fast Writes: NVreg_EnableAGPFW=1 +# +# To enable both for instance, uncomment following line: +# +#options nvidia NVreg_EnableAGPSBA=1 NVreg_EnableAGPFW=1 +# If you have a mobile chip, you may need to enable this option +# if you have hard lockups when starting X. +# +# See: Appendix I. Configuring your laptop +# In /usr/share/doc/PACKAGE/README for full details +# +# Choose the appropriate value for NVreg_Mobile from the table: +# Value Meaning +# ---------- -------------------------------------------------- +# 0xFFFFFFFF let the kernel module autodetect the correct value +# 1 Dell laptops +# 2 non-Compal Toshiba laptops +# 3 all other laptops +# 4 Compal Toshiba laptops +# 5 Gateway laptops +# +#options nvidia NVreg_SoftEDIDs=0 NVreg_Mobile=3 + + +# !!! SECURITY WARNING !!! +# DO NOT MODIFY OR REMOVE THE DEVICE FILE RELATED OPTIONS UNLESS YOU KNOW +# WHAT YOU ARE DOING. +# ONLY ADD TRUSTED USERS TO THE VIDEO GROUP, THESE USERS MAY BE ABLE TO CRASH, +# COMPROMISE, OR IRREPARABLY DAMAGE THE MACHINE. +options nvidia NVreg_DeviceFileMode=432 NVreg_DeviceFileUID=0 NVreg_DeviceFileGID=VIDEOGID NVreg_ModifyDeviceFiles=1 diff --git a/x11-drivers/nvidia-drivers/files/nvidia-169.07 b/x11-drivers/nvidia-drivers/files/nvidia-169.07 new file mode 100644 index 0000000..a96b0cd --- /dev/null +++ b/x11-drivers/nvidia-drivers/files/nvidia-169.07 @@ -0,0 +1,14 @@ +# Nvidia drivers support +alias char-major-195 nvidia +alias /dev/nvidiactl char-major-195 + +# To tweak the driver the following options can be used, note that +# you should be careful, as it could cause instability!! For more +# options see /usr/share/doc/PACKAGE/README +# +# !!! SECURITY WARNING !!! +# DO NOT MODIFY OR REMOVE THE DEVICE FILE RELATED OPTIONS UNLESS YOU KNOW +# WHAT YOU ARE DOING. +# ONLY ADD TRUSTED USERS TO THE VIDEO GROUP, THESE USERS MAY BE ABLE TO CRASH, +# COMPROMISE, OR IRREPARABLY DAMAGE THE MACHINE. +options nvidia NVreg_DeviceFileMode=432 NVreg_DeviceFileUID=0 NVreg_DeviceFileGID=VIDEOGID NVreg_ModifyDeviceFiles=1 diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-260.19.44-2.6.39.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-260.19.44-2.6.39.patch new file mode 100644 index 0000000..a1d3eb8 --- /dev/null +++ b/x11-drivers/nvidia-drivers/files/nvidia-drivers-260.19.44-2.6.39.patch @@ -0,0 +1,14 @@ +linux/smp_lock.h no longer exists in linux-2.6.39+ + +--- a/kernel/nv-linux.h ++++ b/kernel/nv-linux.h +@@ -87,7 +87,9 @@ + #if !defined(KERNEL_2_4) + #include /* suser(), capable() replacement */ + #include /* module_param() */ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) + #include /* kernel_locked */ ++#endif + #include /* flush_tlb(), flush_tlb_all() */ + #include /* page table entry lookup */ + #endif diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-3.0.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-3.0.patch new file mode 100644 index 0000000..f086402 --- /dev/null +++ b/x11-drivers/nvidia-drivers/files/nvidia-drivers-3.0.patch @@ -0,0 +1,27 @@ +diff -urN work-OLD/kernel/conftest.sh work-NEW/kernel/conftest.sh +--- work-OLD/kernel/conftest.sh 2011-05-30 19:41:31.000000000 -0700 ++++ work-NEW/kernel/conftest.sh 2011-05-30 19:47:23.000000000 -0700 +@@ -76,7 +76,9 @@ + } + + build_cflags() { +- BASE_CFLAGS="-D__KERNEL__ \ ++ # Adding -Os optimizer option to work around rcupdate.h compiler bug, see here: ++ # http://choon.net/forum/read.php?21,82725 ++ BASE_CFLAGS="-Os -D__KERNEL__ \ + -DKBUILD_BASENAME=\"#conftest$$\" -DKBUILD_MODNAME=\"#conftest$$\" \ + -nostdinc -isystem $ISYSTEM" + +diff -urN work-OLD/kernel/nv-linux.h work-NEW/kernel/nv-linux.h +--- work-OLD/kernel/nv-linux.h 2011-05-16 23:32:19.000000000 -0700 ++++ work-NEW/kernel/nv-linux.h 2011-05-30 19:46:06.000000000 -0700 +@@ -34,6 +34,9 @@ + # error This driver does not support 2.5 kernels! + #elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 7, 0) + # define KERNEL_2_6 ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0) ++/* For compatibility, pretend all kernels 3.0.0 and higher are "2.6" */ ++# define KERNEL_2_6 + #else + # error This driver does not support development kernels! + #endif diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-270.41.19-r9999.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-270.41.19-r9999.ebuild new file mode 100644 index 0000000..c213747 --- /dev/null +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-270.41.19-r9999.ebuild @@ -0,0 +1,545 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-270.41.19.ebuild,v 1.4 2011/07/19 06:47:35 angelos Exp $ + +EAPI="2" + +inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver + +X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}" +AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}" +X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}" + +DESCRIPTION="NVIDIA X11 driver and GLX libraries" +HOMEPAGE="http://www.nvidia.com/" +SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKAGE}.run ) + amd64? ( ftp://download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run ) + x86-fbsd? ( ftp://download.nvidia.com/XFree86/FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )" + +LICENSE="NVIDIA" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" +IUSE="acpi custom-cflags gtk multilib kernel_linux" +RESTRICT="strip" +EMULTILIB_PKG="true" + +COMMON="=sys-libs/glibc-2.6.1 ) + multilib? ( app-emulation/emul-linux-x86-xlibs ) + >=app-admin/eselect-opengl-1.0.9 + !" + eerror " [ ] Lock debugging: detect incorrect freeing of live locks" + eerror " [ ] Lock debugging: prove locking correctness" + eerror " [ ] Lock usage statistics" + eerror "in 'menuconfig'" + die "LOCKDEP enabled" + fi +} + +pkg_setup() { + # try to turn off distcc and ccache for people that have a problem with it + export DISTCC_DISABLE=1 + export CCACHE_DISABLE=1 + + if use amd64 && has_multilib_profile && [ "${DEFAULT_ABI}" != "amd64" ]; then + eerror "This ebuild doesn't currently support changing your default abi." + die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}" + fi + + if use kernel_linux; then + linux-mod_pkg_setup + MODULE_NAMES="nvidia(video:${S}/kernel)" + BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \ + SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)" + mtrr_check + lockdep_check + fi + + # On BSD userland it wants real make command + use userland_BSD && MAKE="$(get_bmake)" + + export _POSIX2_VERSION="199209" + + # Since Nvidia ships 3 different series of drivers, we need to give the user + # some kind of guidance as to what version they should install. This tries + # to point the user in the right direction but can't be perfect. check + # nvidia-driver.eclass + nvidia-driver-check-warning + + # set variables to where files are in the package structure + if use kernel_FreeBSD; then + NV_DOC="${S}/doc" + NV_EXEC="${S}/obj" + NV_LIB="${S}/obj" + NV_SRC="${S}/src" + NV_MAN="${S}/x11/man" + NV_X11="${S}/obj" + NV_X11_DRV="${NV_X11}" + NV_X11_EXT="${NV_X11}" + NV_SOVER=1 + elif use kernel_linux; then + NV_DOC="${S}" + NV_EXEC="${S}" + NV_LIB="${S}" + NV_SRC="${S}/kernel" + NV_MAN="${S}" + NV_X11="${S}" + NV_X11_DRV="${NV_X11}" + NV_X11_EXT="${NV_X11}" + NV_SOVER=${PV} + else + die "Could not determine proper NVIDIA package" + fi +} + +src_unpack() { + if use kernel_linux && kernel_is lt 2 6 7; then + echo + ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}" + ewarn "This is not officially supported for ${P}. It is likely you" + ewarn "will not be able to compile or use the kernel module." + ewarn "It is recommended that you upgrade your kernel to a version >= 2.6.7" + echo + ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored." + fi + + if ! use x86-fbsd; then + cd "${S}" + unpack_makeself + else + unpack ${A} + fi +} + +src_prepare() { + # Please add a brief description for every added patch + use x86-fbsd && cd doc + + if use kernel_linux; then + # Quiet down warnings the user does not need to see + sed -i \ + -e 's:-Wsign-compare::g' \ + "${NV_SRC}"/Makefile.kbuild + + epatch "${FILESDIR}"/256.35-unified-arch.patch + + # NVidia's version check broke for kernel version 3.0.0 + epatch "${FILESDIR}"/${PN}-3.0.patch + + # If you set this then it's your own fault when stuff breaks :) + use custom-cflags && sed -i "s:-O:${CFLAGS}:" "${NV_SRC}"/Makefile.* + + # If greater than 2.6.5 use M= instead of SUBDIR= + convert_to_m "${NV_SRC}"/Makefile.kbuild + fi +} + +src_compile() { + # This is already the default on Linux, as there's no toplevel Makefile, but + # on FreeBSD there's one and triggers the kernel module build, as we install + # it by itself, pass this. + + cd "${NV_SRC}" + if use x86-fbsd; then + MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \ + LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die + elif use kernel_linux; then + linux-mod_src_compile + fi +} + +src_install() { + if use kernel_linux; then + linux-mod_src_install + + VIDEOGROUP="$(egetent group video | cut -d ':' -f 3)" + if [ -z "$VIDEOGROUP" ]; then + eerror "Failed to determine the video group gid." + die "Failed to determine the video group gid." + fi + + # Add the aliases + [ -f "${FILESDIR}/nvidia-169.07" ] || die "nvidia missing in FILESDIR" + sed -e 's:PACKAGE:'${PF}':g' \ + -e 's:VIDEOGID:'${VIDEOGROUP}':' "${FILESDIR}"/nvidia-169.07 > \ + "${WORKDIR}"/nvidia + insinto /etc/modprobe.d + newins "${WORKDIR}"/nvidia nvidia.conf || die + elif use x86-fbsd; then + insinto /boot/modules + doins "${WORKDIR}/${NV_PACKAGE}/src/nvidia.kld" || die + + exeinto /boot/modules + doexe "${WORKDIR}/${NV_PACKAGE}/src/nvidia.ko" || die + fi + + # NVIDIA kernel <-> userspace driver config lib + dolib.so ${NV_LIB}/libnvidia-cfg.so.${NV_SOVER} || \ + die "failed to install libnvidia-cfg" + dosym /usr/$(get_libdir)/libnvidia-cfg.so.${NV_SOVER} \ + /usr/$(get_libdir)/libnvidia-cfg.so || \ + die "failed to create libnvidia-cfg.so symlink" + + # NVIDIA monitoring library + dolib.so ${NV_LIB}/libnvidia-ml.so.${NV_SOVER} || \ + die "failed to install libnvidia-ml" + dosym /usr/$(get_libdir)/libnvidia-ml.so.${NV_SOVER} \ + /usr/$(get_libdir)/libnvidia-ml.so || \ + die "failed to create libnvidia-ml.so symlink" + + # NVIDIA video decode <-> CUDA + dolib.so ${NV_LIB}/libnvcuvid.so.${NV_SOVER} || \ + die "failed to install libnvcuvid.so" + dosym /usr/$(get_libdir)/libnvcuvid.so.${NV_SOVER} \ + /usr/$(get_libdir)/libnvcuvid.so || \ + die "failed to create libnvcuvid.so symlink" + + # Xorg DDX driver + insinto /usr/$(get_libdir)/xorg/modules/drivers + doins ${NV_X11_DRV}/nvidia_drv.so || die "failed to install nvidia_drv.so" + + # Xorg GLX driver + insinto /usr/$(get_libdir)/opengl/nvidia/extensions + doins ${NV_X11_EXT}/libglx.so.${NV_SOVER} || \ + die "failed to install libglx.so" + dosym /usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so.${NV_SOVER} \ + /usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so || \ + die "failed to create libglx.so symlink" + + # XvMC driver + dolib.a ${NV_X11}/libXvMCNVIDIA.a || \ + die "failed to install libXvMCNVIDIA.so" + dolib.so ${NV_X11}/libXvMCNVIDIA.so.${NV_SOVER} || \ + die "failed to install libXvMCNVIDIA.so" + dosym libXvMCNVIDIA.so.${NV_SOVER} /usr/$(get_libdir)/libXvMCNVIDIA.so || \ + die "failed to create libXvMCNVIDIA.so symlink" + + # OpenCL ICD for NVIDIA + if use kernel_linux; then + dodir /etc/OpenCL/vendors + insinto /etc/OpenCL/vendors + doins nvidia.icd + fi + + # Documentation + dohtml ${NV_DOC}/html/* + if use x86-fbsd; then + dodoc "${NV_DOC}/README" + doman "${NV_MAN}/nvidia-xconfig.1" + use gtk && doman "${NV_MAN}/nvidia-settings.1" + else + # Docs + newdoc "${NV_DOC}/README.txt" README + dodoc "${NV_DOC}/NVIDIA_Changelog" + doman "${NV_MAN}/nvidia-smi.1.gz" + doman "${NV_MAN}/nvidia-xconfig.1.gz" + use gtk && doman "${NV_MAN}/nvidia-settings.1.gz" + fi + + # Helper Apps + dobin ${NV_EXEC}/nvidia-xconfig || die + if use gtk; then + dobin ${NV_EXEC}/nvidia-settings || die + fi + dobin ${NV_EXEC}/nvidia-bug-report.sh || die + if use kernel_linux; then + dobin ${NV_EXEC}/nvidia-smi || die + fi + + # Desktop entries for nvidia-settings + if use gtk; then + sed -e 's:__UTILS_PATH__:/usr/bin:' \ + -e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' \ + -i "${NV_EXEC}/nvidia-settings.desktop" + domenu ${NV_EXEC}/nvidia-settings.desktop + + doicon ${NV_EXEC}/nvidia-settings.png + fi + + if has_multilib_profile ; then + local OABI=${ABI} + for ABI in $(get_install_abis) ; do + src_install-libs + done + ABI=${OABI} + unset OABI + else + src_install-libs + fi + + is_final_abi || die "failed to iterate through all ABIs" +} + +# Install nvidia library: +# the first parameter is the place where to install it +# the second parameter is the base name of the library +# the third parameter is the provided soversion +donvidia() { + dodir $1 + exeinto $1 + + libname=$(basename $2) + + doexe $2.$3 || die "failed to install $2" + dosym ${libname}.$3 $1/${libname} || die "failed to symlink $2" + [[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1 +} + +src_install-libs() { + local inslibdir=$(get_libdir) + local NV_ROOT="/usr/${inslibdir}/opengl/nvidia" + local libdir= sover= + + if use kernel_linux; then + if has_multilib_profile && [[ ${ABI} == "x86" ]] ; then + libdir=32 + else + libdir=. + fi + sover=${PV} + else + libdir=obj + # on FreeBSD it has just .1 suffix + sover=1 + fi + + # The GLX libraries + donvidia ${NV_ROOT}/lib ${libdir}/libGL.so ${sover} + donvidia /usr/${inslibdir} ${libdir}/libnvidia-glcore.so ${sover} + if use x86-fbsd; then + donvidia ${NV_ROOT}/lib ${libdir}/libnvidia-tls.so ${sover} + else + donvidia ${NV_ROOT}/lib ${libdir}/tls/libnvidia-tls.so ${sover} + fi + + # VDPAU + donvidia /usr/${inslibdir} ${libdir}/libvdpau_nvidia.so ${sover} + + # CUDA & OpenCL + if use kernel_linux; then + donvidia /usr/${inslibdir} ${libdir}/libcuda.so ${sover} + donvidia /usr/${inslibdir} ${libdir}/libnvidia-compiler.so ${sover} + donvidia /usr/${inslibdir} ${libdir}/libOpenCL.so 1.0.0 + dosym libOpenCL.so.1 /usr/${inslibdir}/libOpenCL.so + fi +} + +pkg_preinst() { + if use kernel_linux; then + linux-mod_pkg_postinst + fi + + # Clean the dynamic libGL stuff's home to ensure + # we dont have stale libs floating around + if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then + rm -rf "${ROOT}"/usr/lib/opengl/nvidia/* + fi + # Make sure we nuke the old nvidia-glx's env.d file + if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then + rm -f "${ROOT}"/etc/env.d/09nvidia + fi +} + +pkg_postinst() { + if use kernel_linux; then + linux-mod_pkg_postinst + fi + + # Switch to the nvidia implementation + eselect opengl set --use-old nvidia + + echo + elog "You must be in the video group to use the NVIDIA device" + elog "For more info, read the docs at" + elog "http://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6" + elog + + elog "This ebuild installs a kernel module and X driver. Both must" + elog "match explicitly in their version. This means, if you restart" + elog "X, you must modprobe -r nvidia before starting it back up" + elog + + elog "To use the NVIDIA GLX, run \"eselect opengl set nvidia\"" + elog + elog "NVIDIA has requested that any bug reports submitted have the" + elog "output of /usr/bin/nvidia-bug-report.sh included." + elog + elog "To work with compiz, you must enable the AddARGBGLXVisuals option." + elog + elog "If you are having resolution problems, try disabling DynamicTwinView." + elog + + if ! use gtk; then + elog "USE=gtk controls whether the nvidia-settings application" + elog "is installed. If you would like to use it, enable that" + elog "flag and re-emerge this ebuild. media-video/nvidia-settings" + elog "no longer installs nvidia-settings but only installs the" + elog "associated user space libraries." + fi +} + +pkg_postrm() { + if use kernel_linux; then + linux-mod_pkg_postrm + fi + eselect opengl set --use-old xorg-x11 +} diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest new file mode 100644 index 0000000..7504e02 --- /dev/null +++ b/x11-libs/libxcb/Manifest @@ -0,0 +1,3 @@ +AUX xcb-rebuilder.sh 1511 RMD160 81acde214faf7b4ed00a378c36ec5c43f19f3bc7 SHA1 7d2ef15c2449cb4c72d89059e063ce8ae228d014 SHA256 37910aacdcd793a22af2eea07741bbdde8c62096c67ab7530e72424fadd14bc7 +DIST libxcb-1.7.tar.bz2 318619 RMD160 f6748b9751e339c2669a6b9322b421abbbff7afb SHA1 7540f0587907bce421914f0ddb813810cb2f36f8 SHA256 e776dc35e2a66094e7308ce2e045fb4e27cf3ca30ab1813a8fc08538140724df +EBUILD libxcb-1.7-r9999.ebuild 815 RMD160 7757405aaff90f9d558bc004b6145273e323ec2d SHA1 b7dfaebfc01b141681c7b65a97384af56c4625ed SHA256 dd43b3f3d79347ba9e1b4cb3239e57780b6eaee0d2f09a7b1c070dd6f9bd05f0 diff --git a/x11-libs/libxcb/files/xcb-rebuilder.sh b/x11-libs/libxcb/files/xcb-rebuilder.sh new file mode 100755 index 0000000..f5be0c1 --- /dev/null +++ b/x11-libs/libxcb/files/xcb-rebuilder.sh @@ -0,0 +1,68 @@ +#!/bin/bash + +# To use something besides `emerge` to install packages, set +# XCB_REBUILDER_INSTALL to that binary. + +. /etc/init.d/functions.sh + +case ${1} in + '') ;; + *) + einfo 'Rebuilds broken packages from the XCB library renaming' + einfo + einfo 'To use something besides `emerge`, set the INSTALL variable to their binary.' + exit 1 + ;; +esac + +if ! type -p qfile >/dev/null; then + einfo "Please install app-portage/portage-utils." + exit 1 +fi + +if ! type -p scanelf >/dev/null; then + einfo "Please install app-misc/pax-utils." + exit 1 +fi + +einfo "Fixing broken libtool archives (.la)" +for i in $(qlist -a | grep "\.la$"); do + sed -i \ + -e "s:[^[:space:]]*xcb-xlib[^[:space:]]*::g" \ + "${i}" 2>/dev/null +done + +einfo "Scanning for libraries requiring libxcb-xlib.so..." +for i in $(qlist -a | grep "\.so$"); do + scanelf -n $i \ + | grep -q xcb-xlib \ + && XCB_LIBS="${XCB_LIBS} ${i}" +done + +if [[ -n ${XCB_LIBS} ]]; then + einfo "Broken libraries:" + for lib in ${XCB_LIBS}; do + echo " ${lib}" + done + ebegin "Scanning for packages installing broken libraries" + XCB_PACKAGES=$(qfile -qC ${XCB_LIBS} | sort | uniq) + eend 0 +else + einfo "No broken libraries detected" + exit 0 +fi + + +einfo "Broken packages:" +for pkg in ${XCB_PACKAGES}; do + echo " ${pkg}" +done + +echo +ewarn "Please read the libxcb upgrade guide for further instructions" +ewarn "http://www.gentoo.org/proj/en/desktop/x/x11/libxcb-1.4-upgrade-guide.xml" + +# +#ebegin "Rebuilding broken packages" +#${XCB_REBUILDER_INSTALL:-emerge -1} ${XCB_PACKAGES} +#eend $? diff --git a/x11-libs/libxcb/libxcb-1.7-r9999.ebuild b/x11-libs/libxcb/libxcb-1.7-r9999.ebuild new file mode 100644 index 0000000..8be63b0 --- /dev/null +++ b/x11-libs/libxcb/libxcb-1.7-r9999.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxcb/libxcb-1.7.ebuild,v 1.11 2011/05/30 20:13:31 scarabeus Exp $ + +EAPI=3 + +inherit python xorg-2 + +DESCRIPTION="X C-language Bindings library" +HOMEPAGE="http://xcb.freedesktop.org/" +EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/libxcb" +[[ ${PV} != 9999* ]] && \ + SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2" + +KEYWORDS="~mips" +IUSE="doc selinux" + +RDEPEND="x11-libs/libXau + x11-libs/libXdmcp + dev-libs/libpthread-stubs + >=x11-proto/xcb-proto-1.6" +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen ) + dev-libs/libxslt" + +pkg_setup() { + xorg-2_pkg_setup + XORG_CONFIGURE_OPTIONS=( + $(use_enable doc build-docs) + $(use_enable selinux) + --enable-xinput + ) +} diff --git a/x11-misc/cairo-dock-plugins/ChangeLog b/x11-misc/cairo-dock-plugins/ChangeLog new file mode 100644 index 0000000..4dba6a3 --- /dev/null +++ b/x11-misc/cairo-dock-plugins/ChangeLog @@ -0,0 +1,70 @@ +# ChangeLog for x11-misc/cairo-dock-plugins +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + +*cairo-dock-plugins-2.2.0.4 (10 Nov 2010) + + 10 Nov 2010; Jorge Manuel B. S. Vicetto + cairo-dock-plugins-2.1.3.9.ebuild, +cairo-dock-plugins-2.2.0.4.ebuild, + cairo-dock-plugins-9999.ebuild, metadata.xml: + Bumped cairo-dock-plugins to the 2.2.0.4 release. + + 03 Feb 2010; Jorge Manuel B. S. Vicetto + cairo-dock-plugins-9999.ebuild: + Updated the homepage for the project. + + 19 Sep 2009; Romain Perier + cairo-dock-plugins-9999.ebuild: + Update to use bzr, thanks to Joe Rusbasan for + his patch. + + 12 Sep 2009; Jorge Manuel B. S. Vicetto + cairo-dock-plugins-9999.ebuild: + Remove an implicit declaration on tomboy-notifications.c. + + 30 Aug 2009; Jorge Manuel B. S. Vicetto + cairo-dock-plugins-9999.ebuild: + [cairo-dock-plugins-9999] Eapi2fyed ebuild and added a sed call to prevent + the build from dying on musicPlayer/po. + +*cairo-dock-plugins-2.0.8.2 (28 Aug 2009) + + 28 Aug 2009; Romain Perier + +cairo-dock-plugins-1.6.3.1.ebuild, +cairo-dock-plugins-2.0.8.2.ebuild, + +cairo-dock-plugins-9999.ebuild, +metadata.xml: + Version bump to 2.0.8.2, new branch, import from my developer overlay, Fix + QA warnings, update metadata.xml to include local USE-flags, + changed category. + +*cairo-dock-plugins-1.6.3.1 (21 Dec 2008) + + 21 Dec 2008; Jorge Manuel B. S. Vicetto + +cairo-dock-plugins-1.6.3.1.ebuild: + Added cairo-dock-plugins-1.6.3.1 - thanks to Bill Smith + for the ebuild. + + 21 Oct 2008; Jorge Manuel B. S. Vicetto + cairo-dock-plugins-9999.ebuild: + Removed the call to glib-gettextize to prevent the compilation issues with + intltool-0.4.5. + + 13 Sep 2008; Jorge Manuel B. S. Vicetto + cairo-dock-plugins-9999.ebuild: + Call eautoreconf after intltoolize. + + 03 Aug 2008; Jorge Manuel B. S. Vicetto + cairo-dock-plugins-9999.ebuild: + Dropped keywords. + + 02 Aug 2008; Jorge Manuel B. S. Vicetto + metadata.xml: + Added use flag description to metadata.xml. + +*cairo-dock-plugins-9999 (30 Jul 2008) + + 30 Jul 2008; Jorge Manuel B. S. Vicetto + +metadata.xml, +cairo-dock-plugins-9999.ebuild: + Initial import of cairo-dock-plugins. Many thanks to Bill Smith (Sememmon) + for the initial ebuild, the continued "pestering", testing and updates to + the ebuild. + diff --git a/x11-misc/cairo-dock-plugins/Manifest b/x11-misc/cairo-dock-plugins/Manifest new file mode 100644 index 0000000..ec953ad --- /dev/null +++ b/x11-misc/cairo-dock-plugins/Manifest @@ -0,0 +1,7 @@ +DIST cairo-dock-plugins-2.1.3-9.tar.gz 6003152 RMD160 903d2c53b99c4de8f315de436cfd19d0f3629cd7 SHA1 6b6615eccb8cca2c1dd8e382ac45ade2bc57802a SHA256 3f0ea85dbeef7fe817439ed77a4bd19a435f6e1ed7207688f0d699e77a801b7a +DIST cairo-dock-plugins-2.2.0-4.tar.gz 5533523 RMD160 33e6ad6831e66d9da5ad313210913f9d81138502 SHA1 1873ae26a1d90f8ac3cfde665536eca5dab7645f SHA256 e8905dc6f397c89b53b6e6a15489bf4d78e19427bd95e01f7c1b3df21a564ce2 +EBUILD cairo-dock-plugins-2.1.3.9.ebuild 2319 RMD160 3075e96780ed021afd741d6731b04f91c443f4b2 SHA1 00897fe194e64a7994ddf8370861b5f0bef843c2 SHA256 b5c69792a64c97ceef77330fa6ed7f9767b7e0f25220d6f9edaf8626dcc00f10 +EBUILD cairo-dock-plugins-2.2.0.4.ebuild 2440 RMD160 02c78725056ae8bb2080d4422e885df712a41e11 SHA1 62ffbf7beb76849915d915093341805e5d2227e9 SHA256 23d647594c00682c352fbcb8ebcd7a3e553218a89cdf4f1bd1c28164e8f6cad1 +EBUILD cairo-dock-plugins-9999.ebuild 1987 RMD160 a202b469f0df4e1a6ba76e44ee227af42c2b99d5 SHA1 a35dbfec9dbd7cd0295250035d8aba04e9e51727 SHA256 9be366cd9393d7572eef5c7571ecd66cd247d4d94a6239a61bab0c1f1473cddb +MISC ChangeLog 2649 RMD160 d2cc8ab344b96e4ccb52a8e14047f32f9cc31c25 SHA1 3d351899a46c079db067a86895e804b1b8922a32 SHA256 0aa76c459dc662507e8188ebef4b56c9a8a873dc68661df70df8c7e0bd6d8769 +MISC metadata.xml 1088 RMD160 345898b6ca7581faea923ee090ed1aea85f264db SHA1 9380e6ce398fabf1ad18ab9a9701b4068f03c436 SHA256 a32b52fd7e7e6ca43e8a7a135b8c457f8d46b5ce76cdfa47acf33c98c077b390 diff --git a/x11-misc/cairo-dock-plugins/cairo-dock-plugins-2.1.3.9.ebuild b/x11-misc/cairo-dock-plugins/cairo-dock-plugins-2.1.3.9.ebuild new file mode 100644 index 0000000..7e5d9fe --- /dev/null +++ b/x11-misc/cairo-dock-plugins/cairo-dock-plugins-2.1.3.9.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +inherit eutils versionator + +MY_PN="${PN/plugins/plug-ins}" +MY_PV=$(replace_version_separator 3 '-') +MM_PV=$(get_version_component_range '1-2') +MMD_PV=$(get_version_component_range '1-3') + +DESCRIPTION="Official plugins for cairo-dock" +HOMEPAGE="https://launchpad.net/cairo-dock-plug-ins/" +SRC_URI="http://launchpad.net/${MY_PN}/${MM_PV}/${MMD_PV}/+download/${PN}-${MY_PV}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" +IUSE="alsa compiz exif gio gmenu gnome kde mail musicplayer network-monitor powermanager terminal tomboy webkit wifi xfce xgamma xklavier" + +RDEPEND=" + ~x11-misc/cairo-dock-${PV} + alsa? ( media-libs/alsa-lib ) + exif? ( media-libs/libexif ) + gmenu? ( gnome-base/gnome-menus ) + kde? ( kde-base/kdelibs ) + terminal? ( x11-libs/vte ) + webkit? ( >=net-libs/webkit-gtk-1.0 ) + xfce? ( xfce-base/thunar ) + xgamma? ( x11-libs/libXxf86vm ) + xklavier? ( x11-libs/libxklavier ) +" + +DEPEND="${RDEPEND} + dev-util/intltool + sys-devel/gettext + dev-util/pkgconfig +" + +S="${WORKDIR}/${PN}-${MY_PV}" + +pkg_setup() { + if use gio; then + if ! use gmenu; then + ewarn "gio requires gmenu, implicitly added" + fi + fi +} + +# Additional config options +#dnd2share +#rssreader +#xrandr-in-show-desktop +#scooby-do +src_configure() { + econf --disable-dependency-tracking \ + --disable-old-gnome-integration \ + $(use_enable alsa alsa-mixer) \ + $(use_enable compiz compiz-icon) \ + $(use_enable exif) \ + $(use_enable gio gio-in-gmenu) \ + $(use_enable gio gmenu) \ + $(use_enable gmenu) \ + $(use_enable gnome gnome-integration) \ + $(use_enable kde kde-integration) \ + $(use_enable mail) \ + $(use_enable musicplayer) \ + $(use_enable network-monitor) \ + $(use_enable powermanager) \ + $(use_enable terminal) \ + $(use_enable tomboy) \ + $(use_enable webkit weblets) \ + $(use_enable wifi) \ + $(use_enable xfce xfce-integration) \ + $(use_enable xgamma) \ + $(use_enable xklavier keyboard-indicator) +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" +} diff --git a/x11-misc/cairo-dock-plugins/cairo-dock-plugins-2.2.0.4.ebuild b/x11-misc/cairo-dock-plugins/cairo-dock-plugins-2.2.0.4.ebuild new file mode 100644 index 0000000..070d49b --- /dev/null +++ b/x11-misc/cairo-dock-plugins/cairo-dock-plugins-2.2.0.4.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +inherit cmake-utils eutils versionator + +MY_PN="${PN/plugins/plug-ins}" +MY_PV=$(replace_version_separator 3 '-') +MM_PV=$(get_version_component_range '1-2') +MMD_PV=$(get_version_component_range '1-3') + +DESCRIPTION="Official plugins for cairo-dock" +HOMEPAGE="https://launchpad.net/cairo-dock-plug-ins/" +SRC_URI="http://launchpad.net/${MY_PN}/${MM_PV}/${MMD_PV}/+download/${PN}-${MY_PV}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" +IUSE="alsa compiz exif gio gmenu gnome kde mail musicplayer network-monitor powermanager terminal tomboy webkit wifi xfce xgamma xklavier" + +# "dbus-glib-1" +# "gthread-2.0" - glib +# "libxml-2.0" +# "librsvg-2.0" +# "dbus-1" +# "cairo" +# "gtk+-2.0" +# "gtkglext-1.0" +# "cairo-dock" + +RDEPEND=" + dev-libs/dbus-glib + dev-libs/glib:2 + dev-libs/libxml2 + gnome-base/librsvg + sys-apps/dbus + x11-libs/cairo + x11-libs/gtk+:2 + x11-libs/gtkglext + ~x11-misc/cairo-dock-${PV} + + alsa? ( media-libs/alsa-lib ) + exif? ( media-libs/libexif ) + gmenu? ( gnome-base/gnome-menus ) + kde? ( kde-base/kdelibs ) + terminal? ( x11-libs/vte ) + webkit? ( >=net-libs/webkit-gtk-1.0 ) + xfce? ( xfce-base/thunar ) + xgamma? ( x11-libs/libXxf86vm ) + xklavier? ( x11-libs/libxklavier ) +" + +DEPEND="${RDEPEND} + dev-util/intltool + sys-devel/gettext + dev-util/pkgconfig +" + +S="${WORKDIR}/${PN}-${MY_PV}" + +# Additional config options +#dnd2share +#rssreader +#xrandr-in-show-desktop +#scooby-do +#src_configure() { +# econf --disable-dependency-tracking \ +# --disable-old-gnome-integration \ +# $(use_enable alsa alsa-mixer) \ +# $(use_enable compiz compiz-icon) \ +# $(use_enable exif) \ +# $(use_enable gio gio-in-gmenu) \ +# $(use_enable gio gmenu) \ +# $(use_enable gmenu) \ +# $(use_enable gnome gnome-integration) \ +# $(use_enable kde kde-integration) \ +# $(use_enable mail) \ +# $(use_enable musicplayer) \ +# $(use_enable network-monitor) \ +# $(use_enable powermanager) \ +# $(use_enable terminal) \ +# $(use_enable tomboy) \ +# $(use_enable webkit weblets) \ +# $(use_enable wifi) \ +# $(use_enable xfce xfce-integration) \ +# $(use_enable xgamma) \ +# $(use_enable xklavier keyboard-indicator) +#} diff --git a/x11-misc/cairo-dock-plugins/cairo-dock-plugins-9999.ebuild b/x11-misc/cairo-dock-plugins/cairo-dock-plugins-9999.ebuild new file mode 100644 index 0000000..aca7617 --- /dev/null +++ b/x11-misc/cairo-dock-plugins/cairo-dock-plugins-9999.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" +EBZR_REPO_URI="lp:cairo-dock-plug-ins" + +inherit bzr + +DESCRIPTION="Official plugins for cairo-dock" +HOMEPAGE="https://launchpad.net/cairo-dock-plug-ins/" +SRC_URI="" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="" +IUSE="alsa compiz exif gio gmenu gnome kde mail musicplayer network-monitor powermanager terminal tomboy webkit wifi xfce xgamma xklavier" + +RDEPEND=" + ~x11-misc/cairo-dock-${PV} + alsa? ( media-libs/alsa-lib ) + exif? ( media-libs/libexif ) + gmenu? ( gnome-base/gnome-menus ) + kde? ( kde-base/kdelibs ) + terminal? ( x11-libs/vte ) + webkit? ( >=net-libs/webkit-gtk-1.0 ) + xfce? ( xfce-base/thunar ) + xgamma? ( x11-libs/libXxf86vm ) + xklavier? ( x11-libs/libxklavier ) +" + +DEPEND="${RDEPEND} + dev-util/intltool + sys-devel/gettext + dev-util/pkgconfig +" + +pkg_setup() { + if use gio; then + if ! use gmenu; then + ewarn "gio requires gmenu, implicitly added" + fi + fi +} + +# Additional config options +#dnd2share +#rssreader +#xrandr-in-show-desktop +#scooby-do +src_configure() { + econf --disable-dependency-tracking \ + --disable-old-gnome-integration \ + $(use_enable alsa alsa-mixer) \ + $(use_enable compiz compiz-icon) \ + $(use_enable exif) \ + $(use_enable gio gio-in-gmenu) \ + $(use_enable gio gmenu) \ + $(use_enable gmenu) \ + $(use_enable gnome gnome-integration) \ + $(use_enable kde kde-integration) \ + $(use_enable mail) \ + $(use_enable musicplayer) \ + $(use_enable network-monitor) \ + $(use_enable powermanager) \ + $(use_enable terminal) \ + $(use_enable tomboy) \ + $(use_enable webkit weblets) \ + $(use_enable wifi) \ + $(use_enable xfce xfce-integration) \ + $(use_enable xgamma) \ + $(use_enable xklavier keyboard-indicator) +} diff --git a/x11-misc/cairo-dock-plugins/metadata.xml b/x11-misc/cairo-dock-plugins/metadata.xml new file mode 100644 index 0000000..e41060a --- /dev/null +++ b/x11-misc/cairo-dock-plugins/metadata.xml @@ -0,0 +1,25 @@ + + + + + Enables the integration in xfce-base/xfce4 desktop. + Enables compiz applet + Enables gio in gmenu + Enables gmenu applet + Enables mail checker applet + Enables nvidia applet + Enables PowerManager applet + Enables RhythmBox applet + Enables terminal applet + Enables TomBoy applet + Enables Weblet applet + Enables XGamma applet + Enables keyboard-indicator applet + +no-herd + + jmbsvicetto@gentoo.org + Jorge Manuel B. S. Vicetto + +Cairo-dock-plugins offers plugins for cairo-dock. + diff --git a/x11-misc/cairo-dock/ChangeLog b/x11-misc/cairo-dock/ChangeLog new file mode 100644 index 0000000..6f238d8 --- /dev/null +++ b/x11-misc/cairo-dock/ChangeLog @@ -0,0 +1,116 @@ +# ChangeLog for x11-misc/cairo-dock +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + +*cairo-dock-2.2.0.4 (30 Oct 2010) + + 30 Oct 2010; Jorge Manuel B. S. Vicetto + +cairo-dock-2.2.0.4.ebuild, +files/cairo-dock-2.2.0.4-rpath.patch, + metadata.xml: + Added cairo-dock-2.2.0.4 and dropped the glitz use flag from metadata.xml. + +*cairo-dock-2.1.3.9 (30 Apr 2010) + + 30 Apr 2010; Jorge Manuel B. S. Vicetto + -cairo-dock-1.6.3.1.ebuild, -cairo-dock-2.0.8.2.ebuild, + -files/cairo-dock-2.0.8.2-safe-cflags.patch, +cairo-dock-2.1.3.9.ebuild, + cairo-dock-9999.ebuild, files/cairo-dock-missing-header.patch, + +files/cairo-dock-pot-fix.patch, +files/cairo-dock-safe-cflags.patch: + Dropped old versions. Updated SRC_URI and HOMEPAGE. + Added initial ebuilds for 2.1.3.9 release and live (9999) version. Thanks + to maksbotan in #gentoo-desktop-effects, + Dustin Polke and Doktor + Notor in bug 295287. + + 03 Feb 2010; Jorge Manuel B. S. Vicetto + cairo-dock-9999.ebuild: + Updated the homepage for the project. + + 03 Feb 2010; Jorge Manuel B. S. Vicetto + cairo-dock-9999.ebuild, metadata.xml: + Dropped the glitz use flag as it has been deprecated by upstream - thanks + to matttbe. + Updated maintainers. + + 14 Sep 2009; Romain Perier + cairo-dock-9999.ebuild: + Port live ebuild to bazar repository (see upstream) many thanks to Joe R + for his work. + + 30 Aug 2009; Jorge Manuel B. S. Vicetto + cairo-dock-2.0.8.2.ebuild: + Use alphabetical order and whitespace. + + 30 Aug 2009; Jorge Manuel B. S. Vicetto + cairo-dock-9999.ebuild: + Added missing depend on x11-libs/glext. + +*cairo-dock-2.0.8.2 (28 Aug 2009) + + 28 Aug 2009; Romain Perier + +cairo-dock-1.6.3.1.ebuild, +cairo-dock-2.0.8.2.ebuild, + +files/cairo-dock-2.0.8.2-safe-cflags.patch, +cairo-dock-9999.ebuild, + +files/cairo-dock-missing-header.patch, +metadata.xml: + Version bump to 2.0.8.2, new branch, import from my developer overlay. + Clean-up some QA warnings in 1.6.3.1 ebuild, catogory changed. + + 08 Mar 2009; Jorge Manuel B. S. Vicetto + cairo-dock-1.6.3.1.ebuild, cairo-dock-9999.ebuild: + To build cairo-dock with glitz, we need cairo built with glitz. + + 21 Dec 2008; Jorge Manuel B. S. Vicetto + cairo-dock-1.6.3.1.ebuild: + Added ~amd64 keywords. + +*cairo-dock-1.6.3.1 (20 Dec 2008) + + 20 Dec 2008; Jorge Manuel B. S. Vicetto + +files/cairo-dock-missing-header.patch, metadata.xml, + +cairo-dock-1.6.3.1.ebuild: + Added cairo-dock-1.6.3.1 - thanks to Bill Smith for + the ebuild. + + 01 Nov 2008; Jorge Manuel B. S. Vicetto + cairo-dock-9999.ebuild: + Added a local src_compile until the gnome team can fix the gnome2 eclass. + + 20 Oct 2008; Jorge Manuel B. S. Vicetto + cairo-dock-9999.ebuild: + Removed the call to glib-gettextize to prevent the compilation issues with + intltool-0.4.5. + + 26 Sep 2008; Jorge Manuel B. S. Vicetto + -cairo-dock-9999-r1.ebuild, cairo-dock-9999.ebuild: + Bumped to EAPI-2. + + 13 Sep 2008; Jorge Manuel B. S. Vicetto + cairo-dock-9999.ebuild: + Call eautoreconf after intltoolize and removed double pkg_setup. + +*cairo-dock-9999-r1 (18 Aug 2008) + + 18 Aug 2008; Jorge Manuel B. S. Vicetto + +cairo-dock-9999-r1.ebuild, cairo-dock-9999.ebuild: + Move EAPI-2_pre1 support to a new masked 9999-r1 ebuild. Converted 9999 to + EAPI-1. + + 03 Aug 2008; Jorge Manuel B. S. Vicetto + cairo-dock-9999.ebuild: + Dropped keywords. + + 03 Aug 2008; Jorge Manuel B. S. Vicetto + metadata.xml: + Added glitz use flag description to metadata.xml. + + 30 Jul 2008; Jorge Manuel B. S. Vicetto + cairo-dock-9999.ebuild: + Updated EAPI to 2_pre1 as a result of the update in portage-2.2_rc5. + +*cairo-dock-9999 (30 Jul 2008) + + 30 Jul 2008; Jorge Manuel B. S. Vicetto + +metadata.xml, +cairo-dock-9999.ebuild: + Initial import of cairo-dock. Many thanks to Jupiter for the initial + ebuild and Bill Smith (Sememmon) for the continued "pestering", testing + and updates to the ebuild. + diff --git a/x11-misc/cairo-dock/Manifest b/x11-misc/cairo-dock/Manifest new file mode 100644 index 0000000..3c002ba --- /dev/null +++ b/x11-misc/cairo-dock/Manifest @@ -0,0 +1,11 @@ +AUX cairo-dock-2.2.0.4-rpath.patch 553 RMD160 3d22935978ea90b8629a9527cf55861e6bf1b9e7 SHA1 9682d118974e06b0f2754b797b5a84e525f257c3 SHA256 4f80c8aabd51c5ad67353676baaced276e5350cc2b97a601a22675a0b1edd467 +AUX cairo-dock-missing-header.patch 422 RMD160 3e6946b27778ba93d394d339e0c42885b5b22f5f SHA1 c09eb199c672a4bfd70001b0e48280a728e36c10 SHA256 58e64cb5453264c3481dd4d618e0c500a4e9fc0526cd242c889e2f12bf5e9286 +AUX cairo-dock-pot-fix.patch 2169 RMD160 f6ec6fd7b8511730cce715361fe0e01c41ae532b SHA1 d570f261557ae6a37badbe997ce8a95b1bd30c04 SHA256 25e441568677cf291f1f711454f57a3d43eb63877025bcfe179a032a17df0c84 +AUX cairo-dock-safe-cflags.patch 377 RMD160 4a604e51f18cf3909fb2091705fc84e092fadcf4 SHA1 bcaedeaca6938f3965bd0f9e328255c3d5d88b4b SHA256 78dfa72f3edee57448f3cf966fb6b2c8476f8ef4201ffcaccac37c3cc59b04ba +DIST cairo-dock-2.1.3-9.tar.gz 2480328 RMD160 09091b84b229b157d94c91abf9898735871e3c8d SHA1 5253dec08f6db90f46df8b84e4d31fba8697d37f SHA256 0629ffc55a5c075daa74908627ad5a69315c3af22051458ec9489ed64d382ae5 +DIST cairo-dock-2.2.0-4.tar.gz 2335519 RMD160 23d0917e5b0c49790b7b5f266d40b837af555bd2 SHA1 4edc1d4f71d71b5c7cf295bdcc4b40bc016bc54e SHA256 dc2de939e8fe8bb2b020d7c12c106114f321a104ea41d3538fbc1fce2fadff95 +EBUILD cairo-dock-2.1.3.9.ebuild 1804 RMD160 8062a528dd7509e2a0d3491291c3b05c86b6ce66 SHA1 136c64765b0c33fdd7bb521f037d706d102f90e0 SHA256 0558f61adeb59eca41c4d8337d929b55347d9058a4e80e03e8b7a40f7873fc84 +EBUILD cairo-dock-2.2.0.4.ebuild 1708 RMD160 d7c55b03ab87bb560a676f7ee09036ec47dbbbe3 SHA1 f05f441ee356d7e49351eccb8ecde0e5193731e8 SHA256 208769e6bf9d3fadf4041a20f074aca38dd608d0b5a13fdc1762b803a4c32b93 +EBUILD cairo-dock-9999.ebuild 1219 RMD160 014f9cbd9b785331a462c8487eedcf1c2f53329e SHA1 8164803677b6af20b42a80d76da9f8adb89657d3 SHA256 bd53d9d037725a6ec54f69f32e24759dd0d1eee82c27059ee266868547b82daa +MISC ChangeLog 4522 RMD160 7060d46f8833d9203c89f116407f2b65046db54d SHA1 0d984bb620d7653e8a064d0771f7d4d8f70f501b SHA256 79c1a7630a6827ffc478294f22a00ff25f8b95e17cb0c4958ccd576287c5158b +MISC metadata.xml 383 RMD160 36fd7289a2b48df4b2057cbc4525820fce715aac SHA1 e9fe1a55d4b487a8f36fdba4c8984c68c73d7144 SHA256 bc2585d364bc6e72791626da3868643589a3103a4a38d164d77b0d2998b0336c diff --git a/x11-misc/cairo-dock/cairo-dock-2.1.3.9.ebuild b/x11-misc/cairo-dock/cairo-dock-2.1.3.9.ebuild new file mode 100644 index 0000000..1534b04 --- /dev/null +++ b/x11-misc/cairo-dock/cairo-dock-2.1.3.9.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +inherit autotools eutils versionator + +MY_PN="${PN}-core" +MY_PV=$(replace_version_separator 3 '-') +MM_PV=$(get_version_component_range '1-2') +MMD_PV=$(get_version_component_range '1-3') + +DESCRIPTION="Cairo-dock is a fast, responsive, Mac OS X-like dock." +HOMEPAGE="https://launchpad.net/cairo-dock-core/" +SRC_URI="http://launchpad.net/${MY_PN}/${MM_PV}/${MMD_PV}/+download/${PN}-${MY_PV}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="xcomposite" + +RDEPEND=" + dev-libs/dbus-glib + dev-libs/glib:2 + dev-libs/libxml2 + gnome-base/librsvg + sys-apps/dbus + x11-libs/cairo + x11-libs/gtk+:2 + x11-libs/gtkglext + x11-libs/libXrender + xcomposite? ( + x11-libs/libXcomposite + x11-libs/libXinerama + x11-libs/libXtst + ) +" +DEPEND="${RDEPEND} + dev-util/intltool + dev-util/pkgconfig + sys-devel/gettext +" + +S="${WORKDIR}/${PN}-${MY_PV}" + +src_prepare() { + # Ensure user CFLAGS are used + epatch "${FILESDIR}/${PN}-safe-cflags.patch" + + # List the files in the POTFILES and remove the glob reference + epatch "${FILESDIR}/${PN}-pot-fix.patch" + + eautoreconf +} + +src_configure() { + econf $(use_enable xcomposite xextend) +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" +} + +pkg_postinst() { + elog "Cairo-Dock is an app that draws on a RGBA GLX visual." + elog "Some users have noticed that if the dock is launched," + elog "severals qt4-based applications could crash, like skype or vlc." + elog "If you have this problem, add the following line into your bashrc :" + echo + elog "alias vlc='export XLIB_SKIP_ARGB_VISUALS=1; vlc; unset XLIB_SKIP_ARGB_VISUALS'" + elog "see http://www.qtforum.org/article/26669/qt4-mess-up-the-opengl-context.html for more details." +} diff --git a/x11-misc/cairo-dock/cairo-dock-2.2.0.4.ebuild b/x11-misc/cairo-dock/cairo-dock-2.2.0.4.ebuild new file mode 100644 index 0000000..b71e9f9 --- /dev/null +++ b/x11-misc/cairo-dock/cairo-dock-2.2.0.4.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +inherit cmake-utils eutils versionator + +MY_PN="${PN}-core" +MY_PV=$(replace_version_separator 3 '-') +MM_PV=$(get_version_component_range '1-2') +MMD_PV=$(get_version_component_range '1-3') + +DESCRIPTION="Cairo-dock is a fast, responsive, Mac OS X-like dock." +HOMEPAGE="https://launchpad.net/cairo-dock-core/" +SRC_URI="http://launchpad.net/${MY_PN}/${MM_PV}/${MMD_PV}/+download/${PN}-${MY_PV}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="xcomposite" + +#"libcurl" +#"gthread-2.0" + +#"dbus-glib-1" +#"libxml-2.0" +#"librsvg-2.0" +#"dbus-1" +#"cairo" +#"gtk+-2.0" +#"gtkglext-1.0" +#"xrender" + +RDEPEND=" + dev-libs/dbus-glib + dev-libs/glib:2 + dev-libs/libxml2 + gnome-base/librsvg + sys-apps/dbus + x11-libs/cairo + x11-libs/gtk+:2 + x11-libs/gtkglext + x11-libs/libXrender + xcomposite? ( + x11-libs/libXcomposite + x11-libs/libXinerama + x11-libs/libXtst + ) +" +DEPEND="${RDEPEND} + dev-util/intltool + dev-util/pkgconfig + sys-devel/gettext +" + +S="${WORKDIR}/${PN}-${MY_PV}" + +src_prepare() { + epatch "${FILESDIR}/${P}-rpath.patch" || die +} + +#src_configure() { +# econf $(use_enable xcomposite xextend) +#} + +pkg_postinst() { + elog "Cairo-Dock is an app that draws on a RGBA GLX visual." + elog "Some users have noticed that if the dock is launched," + elog "severals qt4-based applications could crash, like skype or vlc." + elog "If you have this problem, add the following line into your bashrc :" + echo + elog "alias vlc='export XLIB_SKIP_ARGB_VISUALS=1; vlc; unset XLIB_SKIP_ARGB_VISUALS'" + elog "see http://www.qtforum.org/article/26669/qt4-mess-up-the-opengl-context.html for more details." +} diff --git a/x11-misc/cairo-dock/cairo-dock-9999.ebuild b/x11-misc/cairo-dock/cairo-dock-9999.ebuild new file mode 100644 index 0000000..a45c0ca --- /dev/null +++ b/x11-misc/cairo-dock/cairo-dock-9999.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +inherit autotools bzr + +EBZR_REPO_URI="lp:cairo-dock-core" + +DESCRIPTION="Cairo-dock is a fast, responsive, Mac OS X-like dock." +HOMEPAGE="https://launchpad.net/cairo-dock-core/" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="" +IUSE="xcomposite" + +RDEPEND=" + dev-libs/dbus-glib + dev-libs/glib:2 + dev-libs/libxml2 + gnome-base/librsvg + sys-apps/dbus + x11-libs/cairo + x11-libs/gtk+:2 + x11-libs/gtkglext + x11-libs/libXrender + xcomposite? ( + x11-libs/libXcomposite + x11-libs/libXinerama + x11-libs/libXtst + ) +" +DEPEND="${RDEPEND} + dev-util/intltool + dev-util/pkgconfig + sys-devel/gettext +" + +src_prepare() { + bzr_src_prepare + intltoolize --automake --copy --force || die "intltoolize failed" + eautoreconf +} + +src_configure() { + econf $(use_enable xcomposite xextend) +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" +} + +pkg_postinst() { + ewarn "THIS IS A LIVE EBUILD, SO YOU KNOW THE RISKS !" + ewarn "DO NOT report bugs to Gentoo's bugzilla" + ewarn "Please report all bugs to #gentoo-desktop-effects" + einfo "Thank you on behalf of the Gentoo Desktop-Effects team" +} diff --git a/x11-misc/cairo-dock/files/cairo-dock-2.2.0.4-rpath.patch b/x11-misc/cairo-dock/files/cairo-dock-2.2.0.4-rpath.patch new file mode 100644 index 0000000..a2552f5 --- /dev/null +++ b/x11-misc/cairo-dock/files/cairo-dock-2.2.0.4-rpath.patch @@ -0,0 +1,14 @@ +diff -urN cairo-dock-2.2.0-4/src/gldit/CMakeLists.txt cairo-dock-2.2.0-4-new//src/gldit/CMakeLists.txt +--- cairo-dock-2.2.0-4/src/gldit/CMakeLists.txt 2010-10-30 19:13:36.000000000 +0000 ++++ cairo-dock-2.2.0-4-new//src/gldit/CMakeLists.txt 2010-10-30 19:27:45.000000000 +0000 +@@ -84,9 +84,7 @@ + link_directories( + ${PACKAGE_LIBRARY_DIRS} + ${XEXTEND_LIBRARY_DIRS} +- ${CMAKE_SOURCE_DIR}/src/gldit +- ${CMAKE_SOURCE_DIR}/src/icon-factory +- ${CMAKE_SOURCE_DIR}/src/implementations) ++ ) + + # Define the library + add_library ("gldi" SHARED ${core_lib_SRCS}) diff --git a/x11-misc/cairo-dock/files/cairo-dock-missing-header.patch b/x11-misc/cairo-dock/files/cairo-dock-missing-header.patch new file mode 100644 index 0000000..59a4061 --- /dev/null +++ b/x11-misc/cairo-dock/files/cairo-dock-missing-header.patch @@ -0,0 +1,10 @@ +--- cairo-dock-1.6.3.1-old/src/cairo-dock-flying-container.c 2008-12-20 13:15:30.000000000 -0100 ++++ cairo-dock-1.6.3.1/src/cairo-dock-flying-container.c 2008-12-20 13:15:53.000000000 -0100 +@@ -26,6 +26,7 @@ + #include "cairo-dock-desklet.h" + #include "cairo-dock-dock-factory.h" + #include "cairo-dock-surface-factory.h" ++#include "cairo-dock-callbacks.h" + #include "cairo-dock-flying-container.h" + + #define HAND_WIDTH 76 diff --git a/x11-misc/cairo-dock/files/cairo-dock-pot-fix.patch b/x11-misc/cairo-dock/files/cairo-dock-pot-fix.patch new file mode 100644 index 0000000..7ccb169 --- /dev/null +++ b/x11-misc/cairo-dock/files/cairo-dock-pot-fix.patch @@ -0,0 +1,66 @@ +--- po/POTFILES.in 2010-02-13 09:55:14.000000000 -0100 ++++ po/POTFILES.in.new 2010-04-30 13:25:21.000000000 +0000 +@@ -1 +1,62 @@ +-src/*.c ++./src/cairo-dock-opengl.c ++./src/cairo-dock-menu.c ++./src/cairo-dock-dialogs.c ++./src/cairo-dock-dock-facility.c ++./src/cairo-dock-graph.c ++./src/cairo-dock-flying-container.c ++./src/cairo-dock-gui-factory.c ++./src/cairo-dock-load.c ++./src/cairo-dock-internal-system.c ++./src/cairo-dock-gui-main.c ++./src/cairo-dock-keybinder.c ++./src/cairo-dock-internal-background.c ++./src/cairo-dock-internal-labels.c ++./src/cairo-dock-internal-desklets.c ++./src/cairo-dock-draw.c ++./src/cairo-dock-application-facility.c ++./src/cairo-dock-file-manager.c ++./src/cairo-dock-desktop-file-factory.c ++./src/cairo-dock-dbus.c ++./src/cairo-dock-separator-factory.c ++./src/cairo-dock-applications-manager.c ++./src/cairo-dock-X-utilities.c ++./src/cairo-dock.c ++./src/cairo-dock-draw-opengl.c ++./src/cairo-dock-dock-manager.c ++./src/cairo-dock-renderer-manager.c ++./src/cairo-dock-internal-hidden-dock.c ++./src/cairo-dock-particle-system.c ++./src/cairo-dock-gui-launcher.c ++./src/cairo-dock-notifications.c ++./src/cairo-dock-internal-dialogs.c ++./src/cairo-dock-desklet.c ++./src/cairo-dock-class-manager.c ++./src/cairo-dock-log.c ++./src/cairo-dock-keyfile-utilities.c ++./src/cairo-dock-internal-icons.c ++./src/cairo-dock-internal-accessibility.c ++./src/cairo-dock-applet-facility.c ++./src/eggaccelerators.c ++./src/cairo-dock-icons.c ++./src/cairo-dock-gauge.c ++./src/cairo-dock-data-renderer.c ++./src/cairo-dock-applet-factory.c ++./src/cairo-dock-themes-manager.c ++./src/cairo-dock-internal-indicators.c ++./src/cairo-dock-application-factory.c ++./src/cairo-dock-container.c ++./src/cairo-dock-config.c ++./src/cairo-dock-default-view.c ++./src/cairo-dock-gui-manager.c ++./src/cairo-dock-emblem.c ++./src/cairo-dock-internal-views.c ++./src/cairo-dock-gui-simple.c ++./src/cairo-dock-internal-position.c ++./src/cairo-dock-modules.c ++./src/cairo-dock-launcher-factory.c ++./src/cairo-dock-animations.c ++./src/cairo-dock-dock-factory.c ++./src/cairo-dock-callbacks.c ++./src/cairo-dock-surface-factory.c ++./src/cairo-dock-internal-taskbar.c ++./src/cairo-dock-task.c diff --git a/x11-misc/cairo-dock/files/cairo-dock-safe-cflags.patch b/x11-misc/cairo-dock/files/cairo-dock-safe-cflags.patch new file mode 100644 index 0000000..0e0a3fe --- /dev/null +++ b/x11-misc/cairo-dock/files/cairo-dock-safe-cflags.patch @@ -0,0 +1,12 @@ +diff a/src/Makefile.am b/src/Makefile.am +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -46,8 +46,6 @@ + -DCAIRO_DOCK_THEMES_DIR=\""$(CAIRO_DOCK_THEMES_DIR)"\"\ + -DGL_GLEXT_PROTOTYPES=\""1"\"\ + -std=c99\ +- -O3\ +- -g -ggdb\ + -Wstrict-prototypes -Wextra -Wwrite-strings -Wuninitialized -Werror-implicit-function-declaration + #-Wunreachable-code -Wno-unused-parameter -Wall + diff --git a/x11-misc/cairo-dock/metadata.xml b/x11-misc/cairo-dock/metadata.xml new file mode 100644 index 0000000..d948055 --- /dev/null +++ b/x11-misc/cairo-dock/metadata.xml @@ -0,0 +1,11 @@ + + + +no-herd + + jmbsvicetto@gentoo.org + Jorge Manuel B. S. Vicetto + +Cairo-dock is a kind of dock applet, which doesn't depend on any gnome package. + + diff --git a/x11-misc/gxneur/Manifest b/x11-misc/gxneur/Manifest new file mode 100644 index 0000000..3f4565e --- /dev/null +++ b/x11-misc/gxneur/Manifest @@ -0,0 +1,2 @@ +DIST gxneur-0.12.0.tar.bz2 397357 RMD160 c0b60c9ebc9be2c12dd24165bc1c893f828eac08 SHA1 281b52dae303035f5fc8bb808c38d7fa97545f4f SHA256 ef5d337cd9a79ccb07a0d84248ba6088608642978897484b547065bac9d344d2 +EBUILD gxneur-0.12.0.ebuild 991 RMD160 590fccc74f1a896338b979e89e7aa2cba10dddee SHA1 a2f81d87129c4dedceed4c270c55a279a8bf4b5d SHA256 565fffa58a578a09becc00b46ba2dc2aa5f9a06373da3fe80ad7fb60c6f1a55e diff --git a/x11-misc/gxneur/gxneur-0.12.0.ebuild b/x11-misc/gxneur/gxneur-0.12.0.ebuild new file mode 100644 index 0000000..a6967cf --- /dev/null +++ b/x11-misc/gxneur/gxneur-0.12.0.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=2 + +inherit autotools eutils versionator + +DESCRIPTION="GTK+ based GUI for xneur" +HOMEPAGE="http://www.xneur.ru/" +SRC_URI="http://dists.xneur.ru/release-${PV}/tgz/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="nls" + +COMMON_DEPEND=">=gnome-base/libglade-2.6.0 + >=sys-devel/gettext-0.16.1 + >=x11-libs/gtk+-2.18:2 + >=x11-misc/xneur-$(get_version_component_range 1-2)" +RDEPEND="${COMMON_DEPEND} + nls? ( virtual/libintl )" +DEPEND="${COMMON_DEPEND} + nls? ( sys-devel/gettext ) + >=dev-util/pkgconfig-0.20" + +src_prepare() { + rm -f m4/{lt~obsolete,ltoptions,ltsugar,ltversion,libtool}.m4 \ + ltmain.sh aclocal.m4 || die + sed -i "s/-Werror -g0//" configure.in || die + eautoreconf +} + +src_configure() { + econf $(use_enable nls) +} + +src_install() { + emake DESTDIR="${D}" install || die + dodoc AUTHORS ChangeLog NEWS || die + doicon pixmaps/gxneur.png || die +} diff --git a/x11-misc/gxneur/gxneur-0.13.0.ebuild b/x11-misc/gxneur/gxneur-0.13.0.ebuild new file mode 100644 index 0000000..03b9399 --- /dev/null +++ b/x11-misc/gxneur/gxneur-0.13.0.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=2 + +inherit autotools eutils versionator + +DESCRIPTION="GTK+ based GUI for xneur" +HOMEPAGE="http://www.xneur.ru/" +SRC_URI="http://dists.xneur.ru/release-${PV}/tgz/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="nls" + +COMMON_DEPEND=">=gnome-base/libglade-2.6.0 + >=sys-devel/gettext-0.16.1 + >=x11-libs/gtk+-2.18:2 + >=x11-misc/xneur-$(get_version_component_range 1-2) + >=gnome-base/gconf-2.0" +RDEPEND="${COMMON_DEPEND} + nls? ( virtual/libintl )" +DEPEND="${COMMON_DEPEND} + nls? ( sys-devel/gettext ) + >=dev-util/pkgconfig-0.20" + +src_prepare() { + rm -f m4/{lt~obsolete,ltoptions,ltsugar,ltversion,libtool}.m4 \ + ltmain.sh aclocal.m4 || die + sed -i "s/-Werror -g0//" configure.in || die + eautoreconf +} + +src_configure() { + econf $(use_enable nls) +} + +src_install() { + emake DESTDIR="${D}" install || die + dodoc AUTHORS ChangeLog NEWS || die + doicon pixmaps/gxneur.png || die +} diff --git a/x11-misc/xneur/Manifest b/x11-misc/xneur/Manifest new file mode 100644 index 0000000..17ebbaa --- /dev/null +++ b/x11-misc/xneur/Manifest @@ -0,0 +1,2 @@ +DIST xneur-0.12.0.tar.bz2 1088554 RMD160 0e5fa4012b69c4e82f7bcefe3e3c478f5500487a SHA1 aff607938f1cc1f7bd38b41b53ea8bf70a4db376 SHA256 962660306f138de44fbfcb458fffac59ce32000a49e2314e4f0460a98ac93327 +EBUILD xneur-0.12.0.ebuild 2466 RMD160 37750ba095ad31569af17da895cf482813bbf93a SHA1 1c90aba7bf1db75c99324fd1ff313e21530f6688 SHA256 a95ab84241b35a4dce7ffa08de093225b8b5e0e4ca9f3794374a88fd266840d8 diff --git a/x11-misc/xneur/xneur-0.12.0.ebuild b/x11-misc/xneur/xneur-0.12.0.ebuild new file mode 100644 index 0000000..6923561 --- /dev/null +++ b/x11-misc/xneur/xneur-0.12.0.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=2 + +inherit autotools + +DESCRIPTION="In-place conversion of text typed in with a wrong keyboard layout (Punto Switcher replacement)" +HOMEPAGE="http://www.xneur.ru/" +SRC_URI="http://dists.xneur.ru/release-${PV}/tgz/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="aplay debug gstreamer keylogger libnotify nls openal openmp xosd +spell" + +COMMON_DEPEND=">=dev-libs/libpcre-5.0 + sys-libs/zlib + >=x11-libs/libX11-1.1 + x11-libs/libXtst + gstreamer? ( >=media-libs/gstreamer-0.10.6 ) + !gstreamer? ( + openal? ( >=media-libs/freealut-1.0.1 ) + !openal? ( + aplay? ( >=media-sound/alsa-utils-1.0.17 ) ) ) + libnotify? ( >=x11-libs/libnotify-0.4.0 ) + spell? ( app-text/enchant ) + xosd? ( x11-libs/xosd )" +RDEPEND="${COMMON_DEPEND} + gstreamer? ( media-libs/gst-plugins-good + media-plugins/gst-plugins-alsa ) + nls? ( virtual/libintl )" +DEPEND="${COMMON_DEPEND} + >=dev-util/pkgconfig-0.20 + openmp? ( sys-devel/gcc[openmp] ) + nls? ( sys-devel/gettext )" + +src_prepare() { + # Fixes error/warning: no newline at end of file + find -name '*.c' -exec sed -i -e '${/[^ ]/s:$:\n:}' {} + || die + rm -f m4/{lt~obsolete,ltoptions,ltsugar,ltversion,libtool}.m4 \ + ltmain.sh aclocal.m4 || die + + sed -i -e "s/-Werror -g0//" configure.in + eautoreconf +} + +src_configure() { + local myconf + + if use gstreamer; then + elog "Using gstreamer for sound output." + myconf="--with-sound=gstreamer" + elif use openal; then + elog "Using openal for sound output." + myconf="--with-sound=openal" + elif use aplay; then + elog "Using aplay for sound output." + myconf="--with-sound=aplay" + else + elog "Sound support disabled." + myconf="--with-sound=no" + fi + + econf ${myconf} \ + $(use_with debug) \ + $(use_enable openmp) \ + $(use_enable nls) \ + $(use_with spell) \ + $(use_with xosd) \ + $(use_with libnotify) \ + $(use_with keylogger) +} + +src_install() { + emake DESTDIR="${D}" install || die + dodoc AUTHORS ChangeLog README NEWS TODO || die +} + +pkg_postinst() { + elog "This is command line tool. If you are looking for GUI frontend just" + elog "emerge gxneur, which uses xneur transparently as backend." + + ewarn "If you upgraded from <=xneur-0.9.3, you need to remove" + ewarn "dictionary files in the home directory:" + ewarn " $ rm ~/.xneur/{ru,en,be,etc.}/dict" + + ewarn + ewarn "Note: if xneur became slow, try to comment out AddBind options in config file." +} diff --git a/x11-misc/xneur/xneur-0.13.0.ebuild b/x11-misc/xneur/xneur-0.13.0.ebuild new file mode 100644 index 0000000..ef85bc4 --- /dev/null +++ b/x11-misc/xneur/xneur-0.13.0.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=2 + +inherit autotools eutils + +DESCRIPTION="In-place conversion of text typed in with a wrong keyboard layout (Punto Switcher replacement)" +HOMEPAGE="http://www.xneur.ru/" +SRC_URI="http://dists.xneur.ru/release-${PV}/tgz/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="aplay debug gstreamer keylogger libnotify nls openal openmp xosd +spell" + +COMMON_DEPEND=">=dev-libs/libpcre-5.0 + sys-libs/zlib + >=x11-libs/libX11-1.1 + x11-libs/libXtst + gstreamer? ( >=media-libs/gstreamer-0.10.6 ) + !gstreamer? ( + openal? ( >=media-libs/freealut-1.0.1 ) + !openal? ( + aplay? ( >=media-sound/alsa-utils-1.0.17 ) ) ) + libnotify? ( >=x11-libs/libnotify-0.4.0 ) + spell? ( app-text/enchant ) + xosd? ( x11-libs/xosd )" +RDEPEND="${COMMON_DEPEND} + gstreamer? ( media-libs/gst-plugins-good + media-plugins/gst-plugins-alsa ) + nls? ( virtual/libintl )" +DEPEND="${COMMON_DEPEND} + >=dev-util/pkgconfig-0.20 + openmp? ( sys-devel/gcc[openmp] ) + nls? ( sys-devel/gettext )" + +src_prepare() { + # Fixes error/warning: no newline at end of file + find -name '*.c' -exec sed -i -e '${/[^ ]/s:$:\n:}' {} + || die + rm -f m4/{lt~obsolete,ltoptions,ltsugar,ltversion,libtool}.m4 \ + ltmain.sh aclocal.m4 || die + + sed -i -e "s/-Werror -g0//" configure.in +# epatch "${FILESDIR}/${P}-libnotify-0.7.patch" + eautoreconf +} + +src_configure() { + local myconf + + if use gstreamer; then + elog "Using gstreamer for sound output." + myconf="--with-sound=gstreamer" + elif use openal; then + elog "Using openal for sound output." + myconf="--with-sound=openal" + elif use aplay; then + elog "Using aplay for sound output." + myconf="--with-sound=aplay" + else + elog "Sound support disabled." + myconf="--with-sound=no" + fi + + econf ${myconf} \ + $(use_with debug) \ + $(use_enable openmp) \ + $(use_enable nls) \ + $(use_with spell) \ + $(use_with xosd) \ + $(use_with libnotify) \ + $(use_with keylogger) +} + +src_install() { + emake DESTDIR="${D}" install || die + dodoc AUTHORS ChangeLog README NEWS TODO || die +} + +pkg_postinst() { + elog "This is command line tool. If you are looking for GUI frontend just" + elog "emerge gxneur, which uses xneur transparently as backend." + + ewarn "If you upgraded from <=xneur-0.9.3, you need to remove" + ewarn "dictionary files in the home directory:" + ewarn " $ rm ~/.xneur/{ru,en,be,etc.}/dict" + + ewarn + ewarn "Note: if xneur became slow, try to comment out AddBind options in config file." +}