summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Eden <sven.eden@gmx.de>2016-08-16 15:50:50 +0200
committerSven Eden <sven.eden@gmx.de>2016-08-16 15:50:50 +0200
commit7f566f5ca77a123b1cc6066d34df3e0b77d48716 (patch)
tree063012eed87022ce88c800b835f4d87e1b2797ad
parentperl-gcpan/DBD-Oracle-9999.ebuild : New Live Ebuild (diff)
downloadseden-7f566f5ca77a123b1cc6066d34df3e0b77d48716.tar.gz
seden-7f566f5ca77a123b1cc6066d34df3e0b77d48716.tar.bz2
seden-7f566f5ca77a123b1cc6066d34df3e0b77d48716.zip
Big cleanup_ Removed a lot of old versions, which have equal or better in the portage tree. Further Kicked out some stuff with long dead upstream.
-rw-r--r--app-emulation/playonlinux/ChangeLog9
-rw-r--r--app-emulation/playonlinux/Manifest4
-rw-r--r--app-emulation/playonlinux/metadata.xml13
-rw-r--r--app-emulation/playonlinux/playonlinux-4.2.2.ebuild120
-rw-r--r--app-emulation/wine/Manifest18
-rw-r--r--app-emulation/wine/files/wine-1.4_rc2-multilib-portage.patch40
-rw-r--r--app-emulation/wine/files/wine-1.5.26-winegcc.patch59
-rw-r--r--app-emulation/wine/files/wine-1.6-memset-O3.patch21
-rw-r--r--app-emulation/wine/files/wine-1.7.12-osmesa-check.patch38
-rw-r--r--app-emulation/wine/files/wine-1.7.39-gstreamer-v5-staging-post.patch38
-rw-r--r--app-emulation/wine/files/wine-1.7.39-gstreamer-v5-staging-pre.patch40
-rw-r--r--app-emulation/wine/metadata.xml35
-rw-r--r--app-emulation/wine/wine-1.7.50-r1.ebuild448
-rw-r--r--app-emulation/wine/wine-1.7.51-r1.ebuild448
-rw-r--r--app-mobilephone/gnokii/ChangeLog9
-rw-r--r--app-mobilephone/gnokii/Manifest5
-rw-r--r--app-mobilephone/gnokii/files/0.6.31-fix_xgnokii_inclusion.patch11
-rw-r--r--app-mobilephone/gnokii/gnokii-0.6.31.ebuild128
-rw-r--r--app-mobilephone/gnokii/metadata.xml16
-rw-r--r--app-text/unrtf/ChangeLog154
-rw-r--r--app-text/unrtf/Manifest5
-rw-r--r--app-text/unrtf/files/unrtf-0.21.3-iconv-detection.patch10
-rw-r--r--app-text/unrtf/metadata.xml7
-rw-r--r--app-text/unrtf/unrtf-0.21.3.ebuild30
-rw-r--r--dev-games/cel/ChangeLog47
-rw-r--r--dev-games/cel/Manifest10
-rw-r--r--dev-games/cel/cel-2.0.ebuild78
-rw-r--r--dev-games/cel/files/cel-2.0-remove_ode_stepfast_01.patch11
-rw-r--r--dev-games/cel/files/cel-2.0-remove_ode_stepfast_02.patch28
-rw-r--r--dev-games/cel/files/cel-2.0-remove_ode_stepfast_03.patch60
-rw-r--r--dev-games/cel/files/cel-2.0-remove_ode_stepfast_04.patch58
-rw-r--r--dev-games/cel/files/cel-2.0-remove_ode_stepfast_05.patch20
-rw-r--r--dev-games/cel/files/cel-2.0-remove_ode_stepfast_06.patch15
-rw-r--r--dev-games/cel/metadata.xml14
-rw-r--r--dev-games/crystalspace/ChangeLog161
-rw-r--r--dev-games/crystalspace/Manifest22
-rw-r--r--dev-games/crystalspace/crystalspace-2.0-r3.ebuild169
-rw-r--r--dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_01.patch26
-rw-r--r--dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_02.patch53
-rw-r--r--dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_03.patch11
-rw-r--r--dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_04.patch42
-rw-r--r--dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_05.patch66
-rw-r--r--dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_06.patch32
-rw-r--r--dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_07.patch24
-rw-r--r--dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_08.patch298
-rw-r--r--dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_09.patch113
-rw-r--r--dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_10.patch14
-rw-r--r--dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_11.patch113
-rw-r--r--dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_12.patch24
-rw-r--r--dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_13.patch24
-rw-r--r--dev-games/crystalspace/files/crystalspace-2.0-fix_unqualified_calls_01.patch11
-rw-r--r--dev-games/crystalspace/files/crystalspace-2.0-fix_unqualified_calls_02.patch29
-rw-r--r--dev-games/crystalspace/files/crystalspace-2.0-fix_unqualified_calls_03.patch11
-rw-r--r--dev-games/crystalspace/files/crystalspace-2.0-fix_unqualified_calls_04.patch20
-rw-r--r--dev-games/crystalspace/files/crystalspace-2.0-fix_unqualified_calls_05.patch29
-rw-r--r--dev-games/crystalspace/metadata.xml20
-rw-r--r--dev-games/gigi-fo/ChangeLog38
-rw-r--r--dev-games/gigi-fo/Manifest4
-rw-r--r--dev-games/gigi-fo/files/unbundle-ltdl.patch69
-rw-r--r--dev-games/gigi-fo/gigi-fo-9999.ebuild96
-rw-r--r--dev-games/gigi-fo/metadata.xml15
-rw-r--r--dev-libs/ustr/ChangeLog73
-rw-r--r--dev-libs/ustr/Manifest6
-rw-r--r--dev-libs/ustr/files/fix_gcc_5_c99_inline.patch28
-rw-r--r--dev-libs/ustr/metadata.xml10
-rw-r--r--dev-libs/ustr/ustr-1.0.4-r4.ebuild63
-rw-r--r--dev-libs/ustr/ustr-1.0.4-r6.ebuild62
-rw-r--r--games-action/atanks_aiu/ChangeLog95
-rw-r--r--games-action/atanks_aiu/Manifest6
-rw-r--r--games-action/atanks_aiu/atanks_aiu-6.1.3.ebuild66
-rw-r--r--games-action/atanks_aiu/atanks_aiu-6.2.1.ebuild66
-rw-r--r--games-action/atanks_aiu/metadata.xml9
-rw-r--r--games-roguelike/tomenet/ChangeLog9
-rw-r--r--games-roguelike/tomenet/Manifest4
-rw-r--r--games-roguelike/tomenet/metadata.xml14
-rw-r--r--games-roguelike/tomenet/tomenet-100908.ebuild61
-rw-r--r--java-virtuals/jetty-server/ChangeLog42
-rw-r--r--java-virtuals/jetty-server/Manifest2
-rw-r--r--java-virtuals/jetty-server/jetty-server-6-r4.ebuild24
-rw-r--r--kde-misc/smooth-tasks-flupp/Manifest2
-rw-r--r--kde-misc/smooth-tasks-flupp/metadata.xml10
-rw-r--r--kde-misc/smooth-tasks-flupp/smooth-tasks-flupp-9999-r4.ebuild29
-rw-r--r--media-libs/libsfml/ChangeLog9
-rw-r--r--media-libs/libsfml/Manifest6
-rw-r--r--media-libs/libsfml/files/libsfml-2.0_pre20121126-no-docs.patch13
-rw-r--r--media-libs/libsfml/files/libsfml-2.0_pre20121126-shared-glew.patch11
-rw-r--r--media-libs/libsfml/libsfml-2.1.ebuild60
-rw-r--r--media-libs/libsfml/metadata.xml16
-rw-r--r--media-libs/mesa/Manifest19
-rw-r--r--media-libs/mesa/files/eselect-mesa.conf.9.239
-rw-r--r--media-libs/mesa/files/glx_ro_text_segm.patch28
-rw-r--r--media-libs/mesa/files/mesa-10.2-dont-require-llvm-for-r300.patch11
-rw-r--r--media-libs/mesa/files/mesa-10.3.7-dont-use-clrsb.patch36
-rw-r--r--media-libs/mesa/files/mesa-10.3.7-format_utils.c.patch1089
-rw-r--r--media-libs/mesa/files/mesa-10.5.1-fstat-include.patch37
-rw-r--r--media-libs/mesa/files/mesa-11.1.2-i965-fix-use-after-free.patch47
-rw-r--r--media-libs/mesa/mesa-10.3.7-r2.ebuild534
-rw-r--r--media-libs/mesa/mesa-11.0.6-r1.ebuild466
-rw-r--r--media-libs/mesa/mesa-11.0.9-r1.ebuild464
-rw-r--r--media-libs/mesa/mesa-11.1.2-r2.ebuild466
-rw-r--r--media-libs/mesa/mesa-11.2.0-r1.ebuild469
-rw-r--r--media-libs/mesa/mesa-9999-r1.ebuild469
-rw-r--r--media-libs/mesa/metadata.xml35
-rw-r--r--media-libs/oyranos/ChangeLog9
-rw-r--r--media-libs/oyranos/Manifest15
-rw-r--r--media-libs/oyranos/files/oyranos-0.9.4-be-more-verbose.patch51
-rw-r--r--media-libs/oyranos/files/oyranos-0.9.4-buildsystem-r1.patch162
-rw-r--r--media-libs/oyranos/files/oyranos-0.9.4-fix-array-access.patch27
-rw-r--r--media-libs/oyranos/files/oyranos-0.9.4-fix-double-object-release.patch35
-rw-r--r--media-libs/oyranos/files/oyranos-0.9.4-fix-oyRankMap-helper-functions-crashes.patch53
-rw-r--r--media-libs/oyranos/files/oyranos-0.9.4-fix-oyStringSegment-crash.patch25
-rw-r--r--media-libs/oyranos/files/oyranos-0.9.4-fix-runpaths.patch121
-rw-r--r--media-libs/oyranos/files/oyranos-0.9.4-fix-typos-and-grammar.patch968
-rw-r--r--media-libs/oyranos/files/oyranos-0.9.4-omit-profile-with-error.patch54
-rw-r--r--media-libs/oyranos/files/oyranos-0.9.4-set-xcalib-to-screen-if-ge-xrandr-12.patch131
-rw-r--r--media-libs/oyranos/files/oyranos-0.9.4-use-more-internal-xrandr-info.patch35
-rw-r--r--media-libs/oyranos/metadata.xml10
-rw-r--r--media-libs/oyranos/oyranos-0.9.4-r2.ebuild130
-rw-r--r--sys-libs/libsemanage/ChangeLog287
-rw-r--r--sys-libs/libsemanage/Manifest4
-rw-r--r--sys-libs/libsemanage/libsemanage-2.2-r3.ebuild109
-rw-r--r--sys-libs/libsemanage/metadata.xml6
-rw-r--r--www-apps/dotproject/ChangeLog18
-rw-r--r--www-apps/dotproject/Manifest6
-rw-r--r--www-apps/dotproject/dotproject-2.1.5-r2.ebuild60
-rw-r--r--www-apps/dotproject/dotproject-2.1.5-r3.ebuild60
-rw-r--r--www-apps/dotproject/files/install-en.txt23
-rw-r--r--www-apps/dotproject/metadata.xml5
-rw-r--r--www-servers/jetty-bin/ChangeLog48
-rw-r--r--www-servers/jetty-bin/Manifest8
-rw-r--r--www-servers/jetty-bin/files/conf.d/jetty-624
-rw-r--r--www-servers/jetty-bin/files/conf.d/jetty-724
-rw-r--r--www-servers/jetty-bin/files/init.d/jetty-651
-rw-r--r--www-servers/jetty-bin/files/init.d/jetty-751
-rw-r--r--www-servers/jetty-bin/jetty-bin-6.1.26-r4.ebuild147
135 files changed, 0 insertions, 11343 deletions
diff --git a/app-emulation/playonlinux/ChangeLog b/app-emulation/playonlinux/ChangeLog
deleted file mode 100644
index dce1e9a..0000000
--- a/app-emulation/playonlinux/ChangeLog
+++ /dev/null
@@ -1,9 +0,0 @@
-# ChangeLog for app-emulation/playonlinux
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*playonlinux-4.2.2 (09 Feb 2014)
-
- 09 Feb 2014; Sven Eden <yamakuzure@gmx.org> +playonlinux-4.2.2.ebuild:
- Version bump
-
diff --git a/app-emulation/playonlinux/Manifest b/app-emulation/playonlinux/Manifest
deleted file mode 100644
index 9275a4c..0000000
--- a/app-emulation/playonlinux/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST PlayOnLinux_4.2.2.tar.gz 4555320 SHA256 5d2df78dcaa9635722880561874521b107eb7730379b3dcadbf18f1bff13663f SHA512 0cbccadaba8bb64fa7642e2e9bcb1ed9a422f6636d382b29366d04ff24f529d2594ca5671044f0e613d3962b69ca319e397586d11d6228ab0cae6bc8e952a92d WHIRLPOOL fffe8137aca74499598415b7d37e40189e662dc05d032b5460b97b58765e2d2b9bd0acef96f12313c3c8b5566736bb01fab56551760c333cfe051d228bf5643b
-EBUILD playonlinux-4.2.2.ebuild 3017 SHA256 3884b9ca151a520658da3c8152debebd964fa78a4c5d4bef82a95f3287a6c809 SHA512 e7b64e2ef16c901e5a99b0a5b3ab8e85036f789731d43f5ad21ebbec256739b14b905b4746351be11ef7d30526c5553467d20e261851056eecd3a9bc7c05573e WHIRLPOOL 56e022a9c562f8f09a6913db3f926f8b1721096157483fb36ccffddd18bf51a7386c834f0ec31c106b74ec55e0b8e6ca8477a579e41d48e0bbe975c336a4c8b4
-MISC ChangeLog 249 SHA256 d92fdfa609f46eab23c0799defc67f0d59b67d28a6b264f2d24a3bedfe7e6f6d SHA512 a3a3e8874c8893fb402f7932b5c281b8757d60024c8c6d094cefb2cae34ca17ff84e5c65c7c1ca689b872d582e55a6f5f6a81e23afc1d87154bad12dca509ceb WHIRLPOOL 12e33f8452a7d0f878644a5947b662d201f648cf8ff9a831c10e5bede9a4ba3a86805b19d183fb924d2e02c0c16e52ef398c27f608a194da435ab384f6033b71
-MISC metadata.xml 349 SHA256 533abdc56b3ce793ec1cd836a87f45fbc3f4b90202618e4bae3887ea6d2cc00b SHA512 3280af5d9614fd76deb16ab50b6afc6d08020c17d997df16780850b2d21fcc1f04ddf72849c4e58f6f10163647dcfffc664d489b601aaa4e797021d7d5db12a7 WHIRLPOOL 05d6e6f7e7e60de7cee3b1d6456a2b2bab6193e557dc202b161ac340970d745fe670ce50ffa1f6b1e12498ae1374a554285b231e8fec21347894491a136a2b62
diff --git a/app-emulation/playonlinux/metadata.xml b/app-emulation/playonlinux/metadata.xml
deleted file mode 100644
index 598cfa2..0000000
--- a/app-emulation/playonlinux/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>proxy-maintainers</herd>
- <maintainer>
- <email>mikemol@gmail.com</email>
- <name>Michael Mol</name>
- </maintainer>
-<use>
- <flag name="winbind">Enables support for the winbind auth daemon</flag>
-</use>
-</pkgmetadata>
-
diff --git a/app-emulation/playonlinux/playonlinux-4.2.2.ebuild b/app-emulation/playonlinux/playonlinux-4.2.2.ebuild
deleted file mode 100644
index 8146a48..0000000
--- a/app-emulation/playonlinux/playonlinux-4.2.2.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-PYTHON_DEPEND="2"
-
-inherit eutils python games gnome2-utils
-
-MY_PN="PlayOnLinux"
-
-DESCRIPTION="Set of scripts to easily install and use Windows games and software"
-HOMEPAGE="http://playonlinux.com/"
-SRC_URI="http://www.playonlinux.com/script_files/${MY_PN}/${PV}/${MY_PN}_${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="winbind"
-
-DEPEND=""
-RDEPEND="app-emulation/wine
- app-arch/cabextract
- app-arch/p7zip
- app-arch/unzip
- app-crypt/gnupg
- dev-python/wxpython:2.8
- || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
- net-misc/wget
- x11-apps/mesa-progs
- x11-terms/xterm
- media-gfx/icoutils
- || ( net-analyzer/netcat net-analyzer/netcat6 )
- winbind? ( net-fs/samba[winbind] ) "
-
-S=${WORKDIR}/${PN}
-
-# TODO:
-# Having a real install script and let playonlinux use standard filesystem
-# architecture to prevent having everything installed into GAMES_DATADIR
-# It will let using LANGUAGES easily
-# How to deal with Microsoft Fonts installation asked every time ?
-# How to deal with wine version installed ? (have a better mgmt of system one)
-# Look at debian pkg: http://packages.debian.org/sid/playonlinux
-
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
- games_pkg_setup
-}
-
-src_prepare() {
- sed -e 's/PYTHON="python"/PYTHON="python2"/' -i playonlinux || die
- python_convert_shebangs -r 2 .
-
- # remove playonmac
- rm etc/{playonmac.icns,terminal.applescript} || die
-
- # remove desktop integration
- rm etc/{PlayOnLinux.desktop,PlayOnLinux.directory,playonlinux-Programmes.menu} || die
-}
-
-src_install() {
- # all things without exec permissions
- insinto "${GAMES_DATADIR}/${PN}"
- doins -r resources lang lib etc plugins
-
- # bash/ install
- exeinto "${GAMES_DATADIR}/${PN}/bash"
- doexe bash/*
- exeinto "${GAMES_DATADIR}/${PN}/bash/expert"
- doexe bash/expert/*
-
- # python/ install
- exeinto "${GAMES_DATADIR}/${PN}/python"
- doexe python/*
- # sub dir without exec permissions
- insinto "${GAMES_DATADIR}/${PN}/python"
- doins -r python/lib
-
- # main executable files
- exeinto "${GAMES_DATADIR}/${PN}"
- doexe ${PN}{,-pkg,-bash,-shell,-url_handler}
-
- # icons
- doicon -s 128 etc/${PN}.png
- for size in 16 22 32; do
- newicon -s $size etc/${PN}$size.png ${PN}.png
- done
-
- dodoc CHANGELOG.md
-
- games_make_wrapper ${PN} "./${PN}" "${GAMES_DATADIR}/${PN}"
- make_desktop_entry ${PN} ${MY_PN} ${PN} Game
-
- prepgamesdirs
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- games_pkg_postinst
- python_mod_optimize "${GAMES_DATADIR}/${PN}"
- gnome2_icon_cache_update
-}
-
-pkg_prerm() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- elog "Installed softwares and games with playonlinux have not been removed."
- elog "To remove them, you can re-install playonlinux and remove them using it"
- elog "or do it manually by removing .PlayOnLinux/ in your home directory."
- fi
-}
-
-pkg_postrm() {
- python_mod_cleanup "${GAMES_DATADIR}/${PN}"
- gnome2_icon_cache_update
-}
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
deleted file mode 100644
index 388156d..0000000
--- a/app-emulation/wine/Manifest
+++ /dev/null
@@ -1,18 +0,0 @@
-AUX wine-1.4_rc2-multilib-portage.patch 1256 SHA256 9d0acd304d11d1bf73f56699754aaa1bfe1facba90648ee330fdbe08d9ff4938 SHA512 ac0b29e2b4c9b04bb6694a4e4da654446f68efbf90cda6809b45dad51e6679ac5410398763fde7e9505ef959493a037aa588cee58d14906563a4746702d2b0e9 WHIRLPOOL 8ea26266c327bc8313eca9b5d39c9741b226037750ca2d1d33262420093e05c306e7f004656c362c3c50b330d050cf9e5fceaa2b024a82809aae8b3617b0ae18
-AUX wine-1.5.26-winegcc.patch 1808 SHA256 91c1012059b93a421b2eae9f2ea46b7b327d6d3d58ba0cb47021c8a57f6d8228 SHA512 fce9daf40a96f4a7502c249a30107c8dfc5d8edd4a171b863d2bf14c3ad46d18e4c29932ab4a6ede7da5d589d777b962d2f577f5360ee4db8019d71362c51d47 WHIRLPOOL 71cbe36c6bac87071472541b7f5cd3ed1b08f05479bc0016262b3f86e75738e467dad197563b4898f2b24fd0ab4e27c40dce04f244a3e7f5ea1582b4db1c5cc2
-AUX wine-1.6-memset-O3.patch 695 SHA256 1f04496713e8a401ba068702c5c3e104b18635bfb54808e5641a3c48a9b9bad4 SHA512 ad7231f8dedf98f9e9b91fcb8bbe72a716d78285127b0c33396de0b1e17a191f91f9a4a377c0e90671bb5f4e57bfb087ef7e80c9537c6c73b3c9bb90b3885968 WHIRLPOOL 91689c31054b896609493e2b0b4fe67e3d752d889f4ccae9c3e15229543341998809fd19a2040457e04fbdbd45505f0f2b49052844004193872713053d7239f8
-AUX wine-1.7.12-osmesa-check.patch 1722 SHA256 42648efa15040011ef868f92fd615924a83b5a30dab25505928226d8bc48159d SHA512 faca80f9747f3d7bfd05c3410bcccfaf17b3f397e30dd9ec382eccc326de346d195d6a184ec78e44b26d5e5e4b2af749ce58a0e6bad0b15a4fd1f2ea610d3124 WHIRLPOOL c5314849d15a53dc00af80f44249c10107b17825c4a2ab4510a5799b154bb1cdb516b3b632e1e959802588f673b9eac8ed6de2dfb59bde34acdd5b752115f695
-AUX wine-1.7.39-gstreamer-v5-staging-post.patch 1175 SHA256 034dc11ef6ecb9d4d8a9734266f612e9154f155f80085d05ab0d45e9b237d386 SHA512 c8e64722a8be5725515a568534fe052c8714859d030be102b823588c117ae9649c3637fe905a8c52c8df676d6a1f7cc22dd3d25a1dd397edef516eb07906c776 WHIRLPOOL 9bd0dd5d38b3ebd03f2115f505266baa96b95de9764c57596366ea935f2bca570f9b896de3ce1af53f6d80557a537a8a2630654e1b788b588f335625e63aa4ac
-AUX wine-1.7.39-gstreamer-v5-staging-pre.patch 1237 SHA256 2d5ba5b40d4e6ea48906f48d098fca05ad98ad75bf58f3b5a86f1dbf8353e7bf SHA512 4e0b0a64ae591307569db840968059dd22d3e06fbc766b7215d3b7b6ec01f989bf25a95c3674263b669fa142c2a0736a71cba2de5a57becef0eab40df480fe39 WHIRLPOOL 83f20e69af5f4c17e7fd7c3a3befa9517b4e021d3a5acc6854648647a503cbfafee82a959f67e38e4b5fafc52088f6b94d9f451793ebe88bee937b80c1ab15f6
-DIST wine-1.7.34-gstreamer-v5.patch.bz2 5703 SHA256 c3bb6f669f46d9f2d7ba494a2264cee457349f559d4b0758db80e39eb22f2aee SHA512 e780394e8739a58593d264322c462bfe9040c1cabce93b84d24f09040026368efb4ac34a6a302beb6048d14b4ac835b87a0c515b52c1a0c143aa4e15691eb01b WHIRLPOOL 1befbb0fbd026d6e833c5d72341064dd6e12157e1b7df58e349b9985648bfbc63f70e9cab45b61155515ac65057968e30ba313e71e183b8027153c9392d89192
-DIST wine-1.7.50.tar.bz2 22586575 SHA256 7c5410fab820281f337d478c18305027363c9012f30f742339ef1eb0f9dd711e SHA512 b79f0391ef147a9ac8f60079e9068435a25552ad2e133b7d84443978f3b0034c17d8e6edee717fbdbc117021ebe22892957923edbba5e8528d6abb21116b9006 WHIRLPOOL 7a4502b088f259153904a80bc8aa81ebe5cb1e27fc4905b8a0fa84beb2e7904b382473a46d472a9b8a11845ab2eda42965f64bead5379995112c6e5f335c756c
-DIST wine-1.7.51.tar.bz2 22639053 SHA256 397fc95b463d6ae1b65ab0477d9fe5d0871e8e2a3322bc9d984e438f2c4d0f52 SHA512 d23b2a37f82c26b4a2b339711a9eb6d6819c8c4def27c65cb7b8bb917aa660f51b3190b35493246d0bc2eea1ffd47529c4ed18a75ee64654b5f40970eefe277a WHIRLPOOL ec4aec57c1623cf1c5bd91f654cff4a23f5ec4010c33217d2e46f25f6322aa8707797368b428561fee6252849bf09abb25e01524d0ff41ebf440ca7914dd9464
-DIST wine-gentoo-2015.03.07.tar.bz2 85419 SHA256 f13f93dc49bbc33a294c4d511b6e01aec2d38bff77a1e44d07668291add1ab04 SHA512 bae1d2d5575d340d01f44008104f0e5ec0c4a4982995dec37d501594cd21d07a2b4ad4465c4273646d5bf6521996b4b82471097864be75342abe3e7d478a56bd WHIRLPOOL 0f254dd692e87a1f71dd19f6c1c8c59b8a91b994e75912a2e6e3ba5e875b85119fe497a331a95c2ce33bbf5f064143d23ee00275da92c494227de0807c9abb06
-DIST wine-mono-4.5.6.msi 53705216 SHA256 ac681f737f83742d786706529eb85f4bc8d6bdddd8dcdfa9e2e336b71973bc25 SHA512 4d8df04c1d0da09d1abe423dd271e5dd14a193d607fb54e214d2e340827f7c33829342d1580b6907d7cf466e70993d743c6e1ca9a026d4b6225dd7c1fc8b1386 WHIRLPOOL 9a68e502da0be6768e92d88f2ccace607300f3a331e0f9e1b6d60e9c6c2d4eb635b902f03e13aad73461dd5f0c2691c7b41958356ebb7f445e8def4282c675d3
-DIST wine-staging-1.7.50.tar.gz 9239831 SHA256 04803fe71edc5d5149624946ffd89de1ddadcd151a47e25cd7e0290b31c1f395 SHA512 7866762cd9ddeeba48167c44df0d186e238f61ffb1412315b3ec466b2a99a01c1cb55816998218aba8a14294302c7d98874144f5f456e341bf506b2b09da0d28 WHIRLPOOL f01192fed42532639afb6b5f4905ec77aeb105a4c33000ec624e87aa792ad4194253d793461a2e5d18051d1b0c2a7438e5745447fa616d34759a12dec3cc80bb
-DIST wine-staging-1.7.51.tar.gz 9628831 SHA256 662cbfcca95405045ba063f312fa4f605d8c48b7b0930c951e2ebac817f3b763 SHA512 f9d2388d63af3aa6ccdc7b66f9d767c19c1577acb84eb3ac03f9b4e07b3ff76906875998fdb42baae3768202129d270b1a1b15fd6bfb20fa33e3bc70559bdf45 WHIRLPOOL f606b6cb2f9a2ece0ce411423df8db1a95217341c2dc6720f748ba8df71758e0a099afc7679fc37fb6621ba1f2fcd5bb505a85cdde797adb45d093836e001441
-DIST wine_gecko-2.40-x86.msi 31741440 SHA256 1a29d17435a52b7663cea6f30a0771f74097962b07031947719bb7b46057d302 SHA512 2f203852afede3f6b0899a54ad6eaa27c972a84df51de1632cb21af0c322e369a13150a5f19f68d7c4fcb0610b65e9244658e622c7e6b14c93ae6b7372bb184f WHIRLPOOL 461358782c8aa21be5bf934bdb7b7397717add883036a773dad20d2ba5169a5229c211781c60fb4df46057b476765c6541340f5764a5a7362daf357ab60877b6
-DIST wine_gecko-2.40-x86_64.msi 33056768 SHA256 c3e28988e7d92221596fc4c569d10eb4dd2ca64b9f4970bf77e791f5dd8c9230 SHA512 af171193f221f2cd51f6dc3382a9b1c658ef2553213be32f201c05f7122eb6883838be97c3ec66177b1e3922df64c409745c3223acb01910680a5476c3f01478 WHIRLPOOL d11234b593f4190ae8fa99bec8363c0047f6de08b186752b9f49764519ee9f4aafd017a16c0496581a0f4791e1109273846cec0314d9e320423d51723cd2083a
-EBUILD wine-1.7.50-r1.ebuild 14911 SHA256 0c79d7b5ba6581b7647129fac8c58e27becb4d953adc7f11e9d133b17389e161 SHA512 5584b8eb97cf662a7413c061c372341d237f80008264fac745de9f38917fd729d14bd0f43f25924b9e1d2209058dae5815bd6b4fb375afcb9381ff246781b3fe WHIRLPOOL 67df74f9bd625cabe369111eac8e4e342ba88bfe99dd869cf7983be786438eaf95d46ad03b43db23287f6c8586d097cabf178d80f062e518c1aea1ca4fd1a310
-EBUILD wine-1.7.51-r1.ebuild 14911 SHA256 0c79d7b5ba6581b7647129fac8c58e27becb4d953adc7f11e9d133b17389e161 SHA512 5584b8eb97cf662a7413c061c372341d237f80008264fac745de9f38917fd729d14bd0f43f25924b9e1d2209058dae5815bd6b4fb375afcb9381ff246781b3fe WHIRLPOOL 67df74f9bd625cabe369111eac8e4e342ba88bfe99dd869cf7983be786438eaf95d46ad03b43db23287f6c8586d097cabf178d80f062e518c1aea1ca4fd1a310
-MISC metadata.xml 2577 SHA256 40ebe80bba6339b3423ed249363e53c2e00e8b7be29837a8f5986943af713b9e SHA512 f8740a0d5b40b85aaac8898239960417b6f8258f2323426e1209293cd88ecadb87268806ad77db06a399400ee60e67fd8bbca35e0327d10688c7e058cce48c9f WHIRLPOOL 9ff7462d95295cecd2c33047bcf70caf482a7329babf605294a2beb0c25dab467345ef952b22e99888ce17a22b4691b540f63261041d1431465b51cd290b0eca
diff --git a/app-emulation/wine/files/wine-1.4_rc2-multilib-portage.patch b/app-emulation/wine/files/wine-1.4_rc2-multilib-portage.patch
deleted file mode 100644
index be6ffc5..0000000
--- a/app-emulation/wine/files/wine-1.4_rc2-multilib-portage.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=395615
-
-Explicitly add the required -m32/m64 to *FLAGS; this overrides any
-arch-specific -m* flags that may have been appended by multilib-portage.
-
-Even though -m32/m64 is now added to *FLAGS, -m32/m64 still has to be
-explicitly added to CC and CXX due to wine's build system. For example,
-winegcc saves the build-time value of CC and uses it at runtime.
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -133,12 +133,18 @@
- then
- CC="$CC -m64"
- CXX="$CXX -m64"
-+ CFLAGS="$CFLAGS -m64"
-+ LDFLAGS="$LDFLAGS -m64"
-+ CXXFLAGS="$CXXFLAGS -m64"
- host_cpu="x86_64"
- notice_platform="64-bit "
- AC_SUBST(TARGETFLAGS,"-m64")
- else
- CC="$CC -m32"
- CXX="$CXX -m32"
-+ CFLAGS="$CFLAGS -m32"
-+ LDFLAGS="$LDFLAGS -m32"
-+ CXXFLAGS="$CXXFLAGS -m32"
- host_cpu="i386"
- notice_platform="32-bit "
- AC_SUBST(TARGETFLAGS,"-m32")
-@@ -150,6 +156,9 @@
- then
- CC="$CC -m32"
- CXX="$CXX -m32"
-+ CFLAGS="$CFLAGS -m32"
-+ LDFLAGS="$LDFLAGS -m32"
-+ CXXFLAGS="$CXXFLAGS -m32"
- AC_MSG_CHECKING([whether $CC works])
- AC_LINK_IFELSE([AC_LANG_PROGRAM()],AC_MSG_RESULT([yes]),
- [AC_MSG_RESULT([no])
diff --git a/app-emulation/wine/files/wine-1.5.26-winegcc.patch b/app-emulation/wine/files/wine-1.5.26-winegcc.patch
deleted file mode 100644
index 2045e34..0000000
--- a/app-emulation/wine/files/wine-1.5.26-winegcc.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-http://bugs.gentoo.org/260726
-
-diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c
-index 16b4165..5c77267 100644
---- a/tools/winebuild/main.c
-+++ b/tools/winebuild/main.c
-@@ -48,10 +48,13 @@ int link_ext_symbols = 0;
- int force_pointer_size = 0;
- int unwind_tables = 0;
-
-+#undef FORCE_POINTER_SIZE
- #ifdef __i386__
- enum target_cpu target_cpu = CPU_x86;
-+#define FORCE_POINTER_SIZE
- #elif defined(__x86_64__)
- enum target_cpu target_cpu = CPU_x86_64;
-+#define FORCE_POINTER_SIZE
- #elif defined(__powerpc__)
- enum target_cpu target_cpu = CPU_POWERPC;
- #elif defined(__arm__)
-@@ -611,6 +614,10 @@ int main(int argc, char **argv)
- signal( SIGTERM, exit_on_signal );
- signal( SIGINT, exit_on_signal );
-
-+#ifdef FORCE_POINTER_SIZE
-+ force_pointer_size = sizeof(size_t);
-+#endif
-+
- output_file = stdout;
- argv = parse_options( argc, argv, spec );
-
-diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c
-index 06aa200..c44d2e3 100644
---- a/tools/winegcc/winegcc.c
-+++ b/tools/winegcc/winegcc.c
-@@ -213,10 +213,13 @@ struct options
- strarray* files;
- };
-
-+#undef FORCE_POINTER_SIZE
- #ifdef __i386__
- static const enum target_cpu build_cpu = CPU_x86;
-+#define FORCE_POINTER_SIZE
- #elif defined(__x86_64__)
- static const enum target_cpu build_cpu = CPU_x86_64;
-+#define FORCE_POINTER_SIZE
- #elif defined(__powerpc__)
- static const enum target_cpu build_cpu = CPU_POWERPC;
- #elif defined(__arm__)
-@@ -1258,6 +1261,9 @@ int main(int argc, char **argv)
- opts.linker_args = strarray_alloc();
- opts.compiler_args = strarray_alloc();
- opts.winebuild_args = strarray_alloc();
-+#ifdef FORCE_POINTER_SIZE
-+ opts.force_pointer_size = sizeof(size_t);
-+#endif
-
- /* determine the processor type */
- if (strendswith(argv[0], "winecpp")) opts.processor = proc_cpp;
diff --git a/app-emulation/wine/files/wine-1.6-memset-O3.patch b/app-emulation/wine/files/wine-1.6-memset-O3.patch
deleted file mode 100644
index 75372f8..0000000
--- a/app-emulation/wine/files/wine-1.6-memset-O3.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Avoid "undefined reference to `memset'" error when building with
-USE=custom-cflags and -O3 in CFLAGS with gcc-4.8.
-
-See:
-
-http://gcc.gnu.org/bugzilla/show_bug.cgi?id=56888
-http://bugs.winehq.org/show_bug.cgi?id=33521
-https://bugs.gentoo.org/show_bug.cgi?id=480508
-
-diff --git a/configure.ac b/configure.ac
-index d8033cf..fe7cc7d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1767,6 +1767,7 @@ then
-
- dnl Check for some compiler flags
- WINE_TRY_CFLAGS([-fno-builtin],[AC_SUBST(BUILTINFLAG,"-fno-builtin")])
-+ WINE_TRY_CFLAGS([-fno-tree-loop-distribute-patterns])
- WINE_TRY_CFLAGS([-fno-strict-aliasing])
- dnl clang needs to be told to fail on unknown options
- saved_CFLAGS=$CFLAGS
diff --git a/app-emulation/wine/files/wine-1.7.12-osmesa-check.patch b/app-emulation/wine/files/wine-1.7.12-osmesa-check.patch
deleted file mode 100644
index 7cafcd4..0000000
--- a/app-emulation/wine/files/wine-1.7.12-osmesa-check.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 6932b9a17c4f64c13f7060895d46334bc7022430 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Tue, 7 Aug 2012 01:29:01 -0400
-Subject: [PATCH] Do not check for libGL symbols when checking libOSMesa
-
-If mesa had been built with shared glapi, glAccum is not available in
-libOSMesa without explicitly linking to libGL. In addition, in
-mesa-8.0.x and earlier, libOSMesa needs to be explicitly linked to
-libglapi if mesa was built with shared glapi, see
-https://bugs.gentoo.org/show_bug.cgi?id=399813
-And in mesa-8.1.x, libOSMesa in addition needs libdl, libpthread, and
-libstdc++, see https://bugs.gentoo.org/show_bug.cgi?id=431832
----
- configure.ac | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index de807d2..a2e8684 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1233,7 +1233,13 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c
-
- if test "x$with_osmesa" != "xno"
- then
-- WINE_CHECK_SONAME(OSMesa,glAccum,,,[$X_LIBS -lm $X_EXTRA_LIBS])
-+ WINE_CHECK_SONAME(OSMesa,OSMesaCreateContext,,,[$X_LIBS -lm $X_EXTRA_LIBS])
-+ if test "x$ac_cv_lib_soname_OSMesa" = "x"; then
-+ osmesa_save_CC=$CC
-+ CC=$CXX
-+ WINE_CHECK_SONAME(OSMesa,OSMesaCreateContext,,,[-lglapi -lpthread -ldl $X_LIBS -lm $X_EXTRA_LIBS])
-+ CC=$osmesa_save_CC
-+ fi
- WINE_NOTICE_WITH(osmesa,[test "x$ac_cv_lib_soname_OSMesa" = "x"],
- [libOSMesa ${notice_platform}development files not found (or too old), OpenGL rendering in bitmaps won't be supported.])
- fi
---
-1.8.5.3
-
diff --git a/app-emulation/wine/files/wine-1.7.39-gstreamer-v5-staging-post.patch b/app-emulation/wine/files/wine-1.7.39-gstreamer-v5-staging-post.patch
deleted file mode 100644
index 25eb235..0000000
--- a/app-emulation/wine/files/wine-1.7.39-gstreamer-v5-staging-post.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From b97783fd33b4d9897c149d7a14747aa4969bd9e9 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Thu, 19 Mar 2015 07:56:04 +0100
-Subject: Reapply various changes conflicting with Maarten Lankhorst's
- gstreamer hack v5.
-
----
- dlls/ntdll/thread.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
-index 1e7f231..cf0461d 100644
---- a/dlls/ntdll/thread.c
-+++ b/dlls/ntdll/thread.c
-@@ -461,6 +461,8 @@ static void exit_thread_common( int status )
- static void *prev_teb;
- TEB *teb;
- #endif
-+ shmlocal_t *shmlocal;
-+ sigset_t sigset;
-
- if (status) /* send the exit code to the server (0 is already the default) */
- {
-@@ -502,6 +504,11 @@ static void exit_thread_common( int status )
- reap_thread(NtCurrentTeb());
- #endif
-
-+ sigemptyset( &sigset );
-+ sigaddset( &sigset, SIGQUIT );
-+ pthread_sigmask( SIG_BLOCK, &sigset, NULL );
-+ if (interlocked_xchg_add( &nb_threads, -1 ) <= 1) _exit( status );
-+
- close( ntdll_get_thread_data()->wait_fd[0] );
- close( ntdll_get_thread_data()->wait_fd[1] );
- close( ntdll_get_thread_data()->reply_fd );
---
-2.3.2
-
diff --git a/app-emulation/wine/files/wine-1.7.39-gstreamer-v5-staging-pre.patch b/app-emulation/wine/files/wine-1.7.39-gstreamer-v5-staging-pre.patch
deleted file mode 100644
index 81aa699..0000000
--- a/app-emulation/wine/files/wine-1.7.39-gstreamer-v5-staging-pre.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 1527fb44c331f2c61224514beb758895a5f85c8d Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Thu, 19 Mar 2015 07:51:48 +0100
-Subject: Revert various changes conflicting with Maarten Lankhorst's gstreamer
- hack v5.
-
-Note: These changes have to be reapplied with the corresponding -post patchset
-afterwards.
----
- dlls/ntdll/thread.c | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
-index 30a4720..843be0f 100644
---- a/dlls/ntdll/thread.c
-+++ b/dlls/ntdll/thread.c
-@@ -385,8 +385,6 @@ void terminate_thread( int status )
- void exit_thread( int status )
- {
- static void *prev_teb;
-- shmlocal_t *shmlocal;
-- sigset_t sigset;
- TEB *teb;
-
- if (status) /* send the exit code to the server (0 is already the default) */
-@@ -425,11 +423,6 @@ void exit_thread( int status )
- }
- }
-
-- sigemptyset( &sigset );
-- sigaddset( &sigset, SIGQUIT );
-- pthread_sigmask( SIG_BLOCK, &sigset, NULL );
-- if (interlocked_xchg_add( &nb_threads, -1 ) <= 1) _exit( status );
--
- close( ntdll_get_thread_data()->wait_fd[0] );
- close( ntdll_get_thread_data()->wait_fd[1] );
- close( ntdll_get_thread_data()->reply_fd );
---
-2.3.2
-
diff --git a/app-emulation/wine/metadata.xml b/app-emulation/wine/metadata.xml
deleted file mode 100644
index fbf2c5b..0000000
--- a/app-emulation/wine/metadata.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>wine</herd>
- <longdescription>
-Wine is an Open Source implementation of the Windows API on top of X and Unix.
-
-Think of Wine as a compatibility layer for running Windows programs. Wine does not require Microsoft Windows, as it is a completely free alternative implementation of the Windows API consisting of 100% non-Microsoft code, however Wine can optionally use native Windows DLLs if they are available. Wine provides both a development toolkit for porting Windows source code to Unix as well as a program loader, allowing many unmodified Windows programs to run on x86-based Unixes, including Linux, FreeBSD, and Solaris.
- </longdescription>
- <use>
- <flag name="capi">Enable ISDN support via CAPI</flag>
- <flag name="custom-cflags">Bypass strip-flags; use at your own peril</flag>
- <flag name="dos">Pull in <pkg>games-emulation/dosbox</pkg> to run DOS applications</flag>
- <flag name="gecko">Add support for the Gecko engine when using iexplore</flag>
- <flag name="mono">Add support for .NET using Wine's Mono add-on</flag>
- <flag name="netapi">Use libnetapi from <pkg>net-fs/samba</pkg> to support Windows networks in netapi32.dll</flag>
- <flag name="opencl">Enable OpenCL support</flag>
- <flag name="osmesa">Add support for OpenGL in bitmaps using libOSMesa</flag>
- <flag name="pcap">Support packet capture software (e.g. wireshark)</flag>
- <flag name="perl">Install helpers written in perl (winedump/winemaker)</flag>
- <flag name="pipelight">Apply unofficial Wine-Staging patches for Pipelight/Silverlight support</flag>
- <flag name="prelink">Run prelink on DLLs during build -- do not disable if you do not know what this means as it can break things at runtime</flag>
- <flag name="realtime">Pull in <pkg>sys-auth/rtkit</pkg> for low-latency pulseaudio support</flag>
- <flag name="run-exes">Use Wine to open and run .EXE and .MSI files</flag>
- <flag name="s3tc">Pull in <pkg>media-libs/libtxc_dxtn</pkg> for DXTn texture compression, needed for many games</flag>
- <flag name="samba">Add support for NTLM auth. see
- http://wiki.winehq.org/NtlmAuthSetupGuide and
- http://wiki.winehq.org/NtlmSigningAndSealing</flag>
- <flag name="staging">Apply unofficial Wine-Staging patches for advanced feature support that haven't made it into upstream Wine yet</flag>
- </use>
- <upstream>
- <remote-id type="github">wine-compholio/wine-staging</remote-id>
- <remote-id type="sourceforge">wine</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-emulation/wine/wine-1.7.50-r1.ebuild b/app-emulation/wine/wine-1.7.50-r1.ebuild
deleted file mode 100644
index c4d1615..0000000
--- a/app-emulation/wine/wine-1.7.50-r1.ebuild
+++ /dev/null
@@ -1,448 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF=1
-PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools-utils eutils fdo-mime flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"
- EGIT_BRANCH="master"
- inherit git-r3
- SRC_URI=""
- #KEYWORDS=""
-else
- MY_P="${PN}-${PV/_/-}"
- SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2"
- KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
- S=${WORKDIR}/${MY_P}
-fi
-
-GV="2.40"
-MV="4.5.6"
-STAGING_P="wine-staging-${PV}"
-STAGING_DIR="${WORKDIR}/${STAGING_P}"
-WINE_GENTOO="wine-gentoo-2015.03.07"
-GST_P="wine-1.7.34-gstreamer-v5"
-DESCRIPTION="Free implementation of Windows(tm) on Unix"
-HOMEPAGE="http://www.winehq.org/"
-SRC_URI="${SRC_URI}
- gecko? (
- abi_x86_32? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi )
- abi_x86_64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
- )
- mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
- gstreamer? ( https://dev.gentoo.org/~tetromino/distfiles/${PN}/${GST_P}.patch.bz2 )
- https://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
-
-if [[ ${PV} == "9999" ]] ; then
- STAGING_EGIT_REPO_URI="git://github.com/wine-compholio/wine-staging.git"
-else
- SRC_URI="${SRC_URI}
- staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )
- pulseaudio? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png +prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
- test? ( abi_x86_32 )
- elibc_glibc? ( threads )
- mono? ( abi_x86_32 )
- pipelight? ( staging )
- s3tc? ( staging )
- vaapi? ( staging )
- ?? ( gstreamer staging )
- osmesa? ( opengl )" #286560
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
- truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
- capi? ( net-dialup/capi4k-utils )
- ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
- udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
- fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
- gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
- openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
- gstreamer? (
- media-libs/gstreamer:0.10[${MULTILIB_USEDEP}]
- media-libs/gst-plugins-base:0.10[${MULTILIB_USEDEP}]
- )
- X? (
- x11-libs/libXcursor[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
- x11-libs/libXrandr[${MULTILIB_USEDEP}]
- x11-libs/libXi[${MULTILIB_USEDEP}]
- x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
- )
- xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
- alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
- cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
- opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
- opengl? (
- virtual/glu[${MULTILIB_USEDEP}]
- virtual/opengl[${MULTILIB_USEDEP}]
- )
- gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
- jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
- ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
- lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
- mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
- netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
- nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
- odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
- osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
- pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
- pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
- staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
- xml? (
- dev-libs/libxml2[${MULTILIB_USEDEP}]
- dev-libs/libxslt[${MULTILIB_USEDEP}]
- )
- scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
- ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
- png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
- v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
- vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
- xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
- abi_x86_32? (
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- !<app-emulation/emul-linux-x86-baselibs-20140508-r14
- !app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
- !<app-emulation/emul-linux-x86-db-20140508-r3
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
- !<app-emulation/emul-linux-x86-medialibs-20140508-r6
- !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
- !<app-emulation/emul-linux-x86-opengl-20140508-r1
- !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
- !<app-emulation/emul-linux-x86-sdl-20140508-r1
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
- !<app-emulation/emul-linux-x86-soundlibs-20140508
- !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
- !<app-emulation/emul-linux-x86-xlibs-20140508
- )"
-
-RDEPEND="${COMMON_DEPEND}
- dos? ( games-emulation/dosbox )
- perl? ( dev-lang/perl dev-perl/XML-Simple )
- s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] )
- samba? ( >=net-fs/samba-3.0.25 )
- selinux? ( sec-policy/selinux-wine )
- udisks? ( sys-fs/udisks:2 )
- pulseaudio? ( realtime? ( sys-auth/rtkit ) )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
- staging? ( dev-lang/perl dev-perl/XML-Simple )
- X? (
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xf86vidmodeproto
- )
- xinerama? ( x11-proto/xineramaproto )
- prelink? ( sys-devel/prelink )
- >=sys-kernel/linux-headers-2.6
- virtual/pkgconfig
- virtual/yacc
- sys-devel/flex"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-wine_build_environment_check() {
- [[ ${MERGE_TYPE} = "binary" ]] && return 0
-
- # bug #549768
- # If GCC is patched, the patch is no longer needed:
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
- ewarn "You need to add the following patch to"
- ewarn " /etc/portage/patches/sys-devel/gcc-5.2.0"
- ewarn "and rebuild your gcc with this patch"
- ewarn "applied, or 64-bit wine will not work."
- ewarn
- ewarn "https://gcc.gnu.org/viewcvs/gcc/branches/gcc-5-branch/gcc/postreload.c?view=patch&r1=225935&r2=225934&pathrev=225935"
- ewarn
- ewarn "See https://bugs.gentoo.org/549768"
- ewarn
- ewarn "Waiting 10 seconds for you to press CTRL+C"
- ewarn
- sleep 10s
- fi
-
- if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
- eerror "You need gcc-4.4+ to build 64-bit wine"
- eerror
- return 1
- fi
-
- if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; then
- eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
- eerror "See https://bugs.gentoo.org/487864 for more details."
- eerror
- return 1
- fi
-}
-
-pkg_pretend() {
- wine_build_environment_check || die
-}
-
-# Not really needed, get the check and message out early.
-#pkg_setup() {
-# wine_build_environment_check || die
-#}
-
-src_unpack() {
- if [[ ${PV} == "9999" ]] ; then
- git-r3_src_unpack
- if use staging || use pulseaudio; then
- EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
- unset ${PN}_LIVE_REPO;
- EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
- fi
- else
- unpack ${MY_P}.tar.bz2
- use staging || use pulseaudio && unpack "${STAGING_P}.tar.gz"
- fi
-
- unpack "${WINE_GENTOO}.tar.bz2"
- use gstreamer && unpack "${GST_P}.patch.bz2"
-
- l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
- local md5="$(md5sum server/protocol.def)"
- local PATCHES=(
- "${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726
- "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
- "${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
- "${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
- )
- if use gstreamer; then
- # See http://bugs.winehq.org/show_bug.cgi?id=30557
- ewarn "Applying experimental patch to fix GStreamer support. Note that"
- ewarn "this patch has been reported to cause crashes in certain games."
-
- # Wine-Staging 1.7.38 "ntdll: Fix race-condition when threads are killed
- # during shutdown" patch and "Added patch to implement shared memory
- # wineserver communication for various user32 functions" prevents the
- # gstreamer patch from applying cleanly.
- # So undo the staging patch, apply gstreamer, then re-apply rebased staging
- # patch on top.
- if use staging; then
- PATCHES+=(
- "${FILESDIR}/${PN}-1.7.39-gstreamer-v5-staging-pre.patch"
- "${WORKDIR}/${GST_P}.patch"
- "${FILESDIR}/${PN}-1.7.39-gstreamer-v5-staging-post.patch" )
- else
- PATCHES+=( "${WORKDIR}/${GST_P}.patch" )
- fi
- fi
- if use staging; then
- ewarn "Applying the unofficial Wine-Staging patchset which is unsupported"
- ewarn "by Wine developers. Please don't report bugs to Wine bugzilla"
- ewarn "unless you can reproduce them with USE=-staging"
-
- local STAGING_EXCLUDE=""
- use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
-
- # Launch wine-staging patcher in a subshell, using epatch as a backend, and gitapply.sh as a backend for binary patches
- ebegin "Running Wine-Staging patch installer"
- (
- set -- DESTDIR="${S}" --backend=epatch --no-autoconf --all ${STAGING_EXCLUDE}
- cd "${STAGING_DIR}/patches"
- source "${STAGING_DIR}/patches/patchinstall.sh"
- )
- eend $?
- elif use pulseaudio; then
- PATCHES+=( "${STAGING_DIR}/patches/winepulse-PulseAudio_Support"/*.patch )
- fi
- autotools-utils_src_prepare
-
- # Modification of the server protocol requires regenerating the server requests
- if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
- einfo "server/protocol.def was patched; running tools/make_requests"
- tools/make_requests || die #432348
- fi
- sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
- if ! use run-exes; then
- sed -i '/^MimeType/d' tools/wine.desktop || die #117785
- fi
-
- # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
- cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
-
- l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
-}
-
-src_configure() {
- export LDCONFIG=/bin/true
- use custom-cflags || strip-flags
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- local myconf=(
- --sysconfdir=/etc/wine
- $(use_with alsa)
- $(use_with capi)
- $(use_with lcms cms)
- $(use_with cups)
- $(use_with ncurses curses)
- $(use_with udisks dbus)
- $(use_with fontconfig)
- $(use_with ssl gnutls)
- $(use_enable gecko mshtml)
- $(use_with gphoto2 gphoto)
- $(use_with gsm)
- $(use_with gstreamer)
- --without-hal
- $(use_with jpeg)
- $(use_with ldap)
- $(use_enable mono mscoree)
- $(use_with mp3 mpg123)
- $(use_with netapi)
- $(use_with nls gettext)
- $(use_with openal)
- $(use_with opencl)
- $(use_with opengl)
- $(use_with osmesa)
- $(use_with oss)
- $(use_with pcap)
- $(use_with png)
- $(use_with threads pthread)
- $(use_with scanner sane)
- $(use_enable test tests)
- $(use_with truetype freetype)
- $(use_with v4l)
- $(use_with X x)
- $(use_with xcomposite)
- $(use_with xinerama)
- $(use_with xml)
- $(use_with xml xslt)
- )
-
- if use pulseaudio || use staging; then
- myconf+=( $(use_with pulseaudio pulse) )
- fi
- use staging && myconf+=(
- --with-xattr
- $(use_with vaapi va)
- )
-
- local PKG_CONFIG AR RANLIB
- # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
- # set AR and RANLIB to make QA scripts happy; #483342
- tc-export PKG_CONFIG AR RANLIB
-
- if use amd64; then
- if [[ ${ABI} == amd64 ]]; then
- myconf+=( --enable-win64 )
- else
- myconf+=( --disable-win64 )
- fi
-
- # Note: using --with-wine64 results in problems with multilib.eclass
- # CC/LD hackery. We're using separate tools instead.
- fi
-
- ECONF_SOURCE=${S} \
- econf "${myconf[@]}"
- emake depend
-}
-
-multilib_src_test() {
- # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
- if [[ ${ABI} == x86 ]]; then
- if [[ $(id -u) == 0 ]]; then
- ewarn "Skipping tests since they cannot be run under the root user."
- ewarn "To run the test ${PN} suite, add userpriv to FEATURES in make.conf"
- return
- fi
-
- WINEPREFIX="${T}/.wine-${ABI}" \
- Xemake test
- fi
-}
-
-multilib_src_install_all() {
- local DOCS=( ANNOUNCE AUTHORS README )
- local l
- add_locale_docs() {
- local locale_doc="documentation/README.$1"
- [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
- }
- l10n_for_each_locale_do add_locale_docs
-
- einstalldocs
- prune_libtool_files --all
-
- emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}"
- if use gecko ; then
- insinto /usr/share/wine/gecko
- use abi_x86_32 && doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
- use abi_x86_64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
- fi
- if use mono ; then
- insinto /usr/share/wine/mono
- doins "${DISTDIR}"/wine-mono-${MV}.msi
- fi
- if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
- rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
- fi
-
- use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
- use abi_x86_64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
-
- if use abi_x86_64 && ! use abi_x86_32; then
- dosym /usr/bin/wine{64,} # 404331
- dosym /usr/bin/wine{64,}-preloader
- fi
-
- # respect LINGUAS when installing man pages, #469418
- for l in de fr pl; do
- use linguas_${l} || rm -r "${D}"usr/share/man/${l}*
- done
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- fdo-mime_desktop_database_update
-
- if ! use gecko; then
- ewarn "Without Wine Gecko, wine prefixes will not have a default"
- ewarn "implementation of iexplore. Many older windows applications"
- ewarn "rely upon the existence of an iexplore implementation, so"
- ewarn "you will likely need to install an external one, like via winetricks"
- fi
- if ! use mono; then
- ewarn "Without Wine Mono, wine prefixes will not have a default"
- ewarn "implementation of .NET. Many windows applications rely upon"
- ewarn "the existence of a .NET implementation, so you will likely need"
- ewarn "to install an external one, like via winetricks"
- fi
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- fdo-mime_desktop_database_update
-}
diff --git a/app-emulation/wine/wine-1.7.51-r1.ebuild b/app-emulation/wine/wine-1.7.51-r1.ebuild
deleted file mode 100644
index c4d1615..0000000
--- a/app-emulation/wine/wine-1.7.51-r1.ebuild
+++ /dev/null
@@ -1,448 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF=1
-PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools-utils eutils fdo-mime flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"
- EGIT_BRANCH="master"
- inherit git-r3
- SRC_URI=""
- #KEYWORDS=""
-else
- MY_P="${PN}-${PV/_/-}"
- SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2"
- KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
- S=${WORKDIR}/${MY_P}
-fi
-
-GV="2.40"
-MV="4.5.6"
-STAGING_P="wine-staging-${PV}"
-STAGING_DIR="${WORKDIR}/${STAGING_P}"
-WINE_GENTOO="wine-gentoo-2015.03.07"
-GST_P="wine-1.7.34-gstreamer-v5"
-DESCRIPTION="Free implementation of Windows(tm) on Unix"
-HOMEPAGE="http://www.winehq.org/"
-SRC_URI="${SRC_URI}
- gecko? (
- abi_x86_32? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi )
- abi_x86_64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
- )
- mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
- gstreamer? ( https://dev.gentoo.org/~tetromino/distfiles/${PN}/${GST_P}.patch.bz2 )
- https://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
-
-if [[ ${PV} == "9999" ]] ; then
- STAGING_EGIT_REPO_URI="git://github.com/wine-compholio/wine-staging.git"
-else
- SRC_URI="${SRC_URI}
- staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )
- pulseaudio? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png +prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
- test? ( abi_x86_32 )
- elibc_glibc? ( threads )
- mono? ( abi_x86_32 )
- pipelight? ( staging )
- s3tc? ( staging )
- vaapi? ( staging )
- ?? ( gstreamer staging )
- osmesa? ( opengl )" #286560
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
- truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
- capi? ( net-dialup/capi4k-utils )
- ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
- udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
- fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
- gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
- openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
- gstreamer? (
- media-libs/gstreamer:0.10[${MULTILIB_USEDEP}]
- media-libs/gst-plugins-base:0.10[${MULTILIB_USEDEP}]
- )
- X? (
- x11-libs/libXcursor[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
- x11-libs/libXrandr[${MULTILIB_USEDEP}]
- x11-libs/libXi[${MULTILIB_USEDEP}]
- x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
- )
- xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
- alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
- cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
- opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
- opengl? (
- virtual/glu[${MULTILIB_USEDEP}]
- virtual/opengl[${MULTILIB_USEDEP}]
- )
- gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
- jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
- ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
- lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
- mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
- netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
- nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
- odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
- osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
- pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
- pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
- staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
- xml? (
- dev-libs/libxml2[${MULTILIB_USEDEP}]
- dev-libs/libxslt[${MULTILIB_USEDEP}]
- )
- scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
- ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
- png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
- v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
- vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
- xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
- abi_x86_32? (
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- !<app-emulation/emul-linux-x86-baselibs-20140508-r14
- !app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
- !<app-emulation/emul-linux-x86-db-20140508-r3
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
- !<app-emulation/emul-linux-x86-medialibs-20140508-r6
- !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
- !<app-emulation/emul-linux-x86-opengl-20140508-r1
- !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
- !<app-emulation/emul-linux-x86-sdl-20140508-r1
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
- !<app-emulation/emul-linux-x86-soundlibs-20140508
- !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
- !<app-emulation/emul-linux-x86-xlibs-20140508
- )"
-
-RDEPEND="${COMMON_DEPEND}
- dos? ( games-emulation/dosbox )
- perl? ( dev-lang/perl dev-perl/XML-Simple )
- s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] )
- samba? ( >=net-fs/samba-3.0.25 )
- selinux? ( sec-policy/selinux-wine )
- udisks? ( sys-fs/udisks:2 )
- pulseaudio? ( realtime? ( sys-auth/rtkit ) )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
- staging? ( dev-lang/perl dev-perl/XML-Simple )
- X? (
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xf86vidmodeproto
- )
- xinerama? ( x11-proto/xineramaproto )
- prelink? ( sys-devel/prelink )
- >=sys-kernel/linux-headers-2.6
- virtual/pkgconfig
- virtual/yacc
- sys-devel/flex"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-wine_build_environment_check() {
- [[ ${MERGE_TYPE} = "binary" ]] && return 0
-
- # bug #549768
- # If GCC is patched, the patch is no longer needed:
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
- ewarn "You need to add the following patch to"
- ewarn " /etc/portage/patches/sys-devel/gcc-5.2.0"
- ewarn "and rebuild your gcc with this patch"
- ewarn "applied, or 64-bit wine will not work."
- ewarn
- ewarn "https://gcc.gnu.org/viewcvs/gcc/branches/gcc-5-branch/gcc/postreload.c?view=patch&r1=225935&r2=225934&pathrev=225935"
- ewarn
- ewarn "See https://bugs.gentoo.org/549768"
- ewarn
- ewarn "Waiting 10 seconds for you to press CTRL+C"
- ewarn
- sleep 10s
- fi
-
- if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
- eerror "You need gcc-4.4+ to build 64-bit wine"
- eerror
- return 1
- fi
-
- if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; then
- eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
- eerror "See https://bugs.gentoo.org/487864 for more details."
- eerror
- return 1
- fi
-}
-
-pkg_pretend() {
- wine_build_environment_check || die
-}
-
-# Not really needed, get the check and message out early.
-#pkg_setup() {
-# wine_build_environment_check || die
-#}
-
-src_unpack() {
- if [[ ${PV} == "9999" ]] ; then
- git-r3_src_unpack
- if use staging || use pulseaudio; then
- EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
- unset ${PN}_LIVE_REPO;
- EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
- fi
- else
- unpack ${MY_P}.tar.bz2
- use staging || use pulseaudio && unpack "${STAGING_P}.tar.gz"
- fi
-
- unpack "${WINE_GENTOO}.tar.bz2"
- use gstreamer && unpack "${GST_P}.patch.bz2"
-
- l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
- local md5="$(md5sum server/protocol.def)"
- local PATCHES=(
- "${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726
- "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
- "${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
- "${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
- )
- if use gstreamer; then
- # See http://bugs.winehq.org/show_bug.cgi?id=30557
- ewarn "Applying experimental patch to fix GStreamer support. Note that"
- ewarn "this patch has been reported to cause crashes in certain games."
-
- # Wine-Staging 1.7.38 "ntdll: Fix race-condition when threads are killed
- # during shutdown" patch and "Added patch to implement shared memory
- # wineserver communication for various user32 functions" prevents the
- # gstreamer patch from applying cleanly.
- # So undo the staging patch, apply gstreamer, then re-apply rebased staging
- # patch on top.
- if use staging; then
- PATCHES+=(
- "${FILESDIR}/${PN}-1.7.39-gstreamer-v5-staging-pre.patch"
- "${WORKDIR}/${GST_P}.patch"
- "${FILESDIR}/${PN}-1.7.39-gstreamer-v5-staging-post.patch" )
- else
- PATCHES+=( "${WORKDIR}/${GST_P}.patch" )
- fi
- fi
- if use staging; then
- ewarn "Applying the unofficial Wine-Staging patchset which is unsupported"
- ewarn "by Wine developers. Please don't report bugs to Wine bugzilla"
- ewarn "unless you can reproduce them with USE=-staging"
-
- local STAGING_EXCLUDE=""
- use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
-
- # Launch wine-staging patcher in a subshell, using epatch as a backend, and gitapply.sh as a backend for binary patches
- ebegin "Running Wine-Staging patch installer"
- (
- set -- DESTDIR="${S}" --backend=epatch --no-autoconf --all ${STAGING_EXCLUDE}
- cd "${STAGING_DIR}/patches"
- source "${STAGING_DIR}/patches/patchinstall.sh"
- )
- eend $?
- elif use pulseaudio; then
- PATCHES+=( "${STAGING_DIR}/patches/winepulse-PulseAudio_Support"/*.patch )
- fi
- autotools-utils_src_prepare
-
- # Modification of the server protocol requires regenerating the server requests
- if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
- einfo "server/protocol.def was patched; running tools/make_requests"
- tools/make_requests || die #432348
- fi
- sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
- if ! use run-exes; then
- sed -i '/^MimeType/d' tools/wine.desktop || die #117785
- fi
-
- # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
- cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
-
- l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
-}
-
-src_configure() {
- export LDCONFIG=/bin/true
- use custom-cflags || strip-flags
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- local myconf=(
- --sysconfdir=/etc/wine
- $(use_with alsa)
- $(use_with capi)
- $(use_with lcms cms)
- $(use_with cups)
- $(use_with ncurses curses)
- $(use_with udisks dbus)
- $(use_with fontconfig)
- $(use_with ssl gnutls)
- $(use_enable gecko mshtml)
- $(use_with gphoto2 gphoto)
- $(use_with gsm)
- $(use_with gstreamer)
- --without-hal
- $(use_with jpeg)
- $(use_with ldap)
- $(use_enable mono mscoree)
- $(use_with mp3 mpg123)
- $(use_with netapi)
- $(use_with nls gettext)
- $(use_with openal)
- $(use_with opencl)
- $(use_with opengl)
- $(use_with osmesa)
- $(use_with oss)
- $(use_with pcap)
- $(use_with png)
- $(use_with threads pthread)
- $(use_with scanner sane)
- $(use_enable test tests)
- $(use_with truetype freetype)
- $(use_with v4l)
- $(use_with X x)
- $(use_with xcomposite)
- $(use_with xinerama)
- $(use_with xml)
- $(use_with xml xslt)
- )
-
- if use pulseaudio || use staging; then
- myconf+=( $(use_with pulseaudio pulse) )
- fi
- use staging && myconf+=(
- --with-xattr
- $(use_with vaapi va)
- )
-
- local PKG_CONFIG AR RANLIB
- # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
- # set AR and RANLIB to make QA scripts happy; #483342
- tc-export PKG_CONFIG AR RANLIB
-
- if use amd64; then
- if [[ ${ABI} == amd64 ]]; then
- myconf+=( --enable-win64 )
- else
- myconf+=( --disable-win64 )
- fi
-
- # Note: using --with-wine64 results in problems with multilib.eclass
- # CC/LD hackery. We're using separate tools instead.
- fi
-
- ECONF_SOURCE=${S} \
- econf "${myconf[@]}"
- emake depend
-}
-
-multilib_src_test() {
- # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
- if [[ ${ABI} == x86 ]]; then
- if [[ $(id -u) == 0 ]]; then
- ewarn "Skipping tests since they cannot be run under the root user."
- ewarn "To run the test ${PN} suite, add userpriv to FEATURES in make.conf"
- return
- fi
-
- WINEPREFIX="${T}/.wine-${ABI}" \
- Xemake test
- fi
-}
-
-multilib_src_install_all() {
- local DOCS=( ANNOUNCE AUTHORS README )
- local l
- add_locale_docs() {
- local locale_doc="documentation/README.$1"
- [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
- }
- l10n_for_each_locale_do add_locale_docs
-
- einstalldocs
- prune_libtool_files --all
-
- emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}"
- if use gecko ; then
- insinto /usr/share/wine/gecko
- use abi_x86_32 && doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
- use abi_x86_64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
- fi
- if use mono ; then
- insinto /usr/share/wine/mono
- doins "${DISTDIR}"/wine-mono-${MV}.msi
- fi
- if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
- rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
- fi
-
- use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
- use abi_x86_64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
-
- if use abi_x86_64 && ! use abi_x86_32; then
- dosym /usr/bin/wine{64,} # 404331
- dosym /usr/bin/wine{64,}-preloader
- fi
-
- # respect LINGUAS when installing man pages, #469418
- for l in de fr pl; do
- use linguas_${l} || rm -r "${D}"usr/share/man/${l}*
- done
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- fdo-mime_desktop_database_update
-
- if ! use gecko; then
- ewarn "Without Wine Gecko, wine prefixes will not have a default"
- ewarn "implementation of iexplore. Many older windows applications"
- ewarn "rely upon the existence of an iexplore implementation, so"
- ewarn "you will likely need to install an external one, like via winetricks"
- fi
- if ! use mono; then
- ewarn "Without Wine Mono, wine prefixes will not have a default"
- ewarn "implementation of .NET. Many windows applications rely upon"
- ewarn "the existence of a .NET implementation, so you will likely need"
- ewarn "to install an external one, like via winetricks"
- fi
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- fdo-mime_desktop_database_update
-}
diff --git a/app-mobilephone/gnokii/ChangeLog b/app-mobilephone/gnokii/ChangeLog
deleted file mode 100644
index 7a31c57..0000000
--- a/app-mobilephone/gnokii/ChangeLog
+++ /dev/null
@@ -1,9 +0,0 @@
-# ChangeLog for app-mobilephone/gnokii
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*gnokii-0.6.31 (03 Apr 2012)
-
- 03 Apr 2012; Sven Eden <sven.eden@gmx.de>
- +gnokii-0.6.31.ebuild:
- version bump.
diff --git a/app-mobilephone/gnokii/Manifest b/app-mobilephone/gnokii/Manifest
deleted file mode 100644
index 0123592..0000000
--- a/app-mobilephone/gnokii/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 0.6.31-fix_xgnokii_inclusion.patch 332 SHA256 8ea0da2819813955016e9b4cfa788b71166b89d98fa15dd875037cc7fa0074a9 SHA512 216c9ce88d63b899958e9556e8ec7df118943b7f7b1310233797b4586bd51aa37541a95572c39fbcbc28c1ba6de87e03571f730284ef27f309d19e0197c96f2b WHIRLPOOL 96d40389fa9004d8e3c1f00242d9af00957988051abd2c223b42f04cb920a73f4fa4530a4c01d67ba65edcdaaaffdfdee50ac3abe890d998377d1b0acf33ee25
-DIST gnokii-0.6.31.tar.bz2 1237865 SHA256 8f5a083b05c1a66a3402ca5cd80084e14c2c0632c991bb53b03c78e9adb02501
-EBUILD gnokii-0.6.31.ebuild 3415 SHA256 b26dc71ecddec6a55c9a948e0ab33545a4686031780669c7ebe3ba256b7e32c7 SHA512 ec2647b8700fc753a556335a27c0fa745b460280f262521e20a85c97a828f8e03011d707f0b6416fff6aa9313e3fa0ef75e48f5d4e1e7ba26bd1f83beaea2ade WHIRLPOOL cfb568dad87788dc458354e14c87bdafd4e6aba9b9592d15958b4c543afd0e9e0a516efb50b642f0fadb3da2d4353f785bfa768fcc679c1575a59ebfe37eccb8
-MISC ChangeLog 238 SHA256 b42f2e20efffd66b237fad6347b59566785c6ef106ebf18e9581f4fd60a44d95 SHA512 b88cbe78557b5f93677eba16108465ad79d4b2092916a51e94f2beca9df1e1fea7d1f62d106e6408f01a81dfd5a6e98cde23539066a1c6c3dc52c6988334929f WHIRLPOOL c405d2f1a5a03252e934b5bce2f74b332363fbb6663b240bf630a9a8da3d6ead1ad201f550f0ef69642949291fedfe2cb18533492850fd0e57b181640d206248
-MISC metadata.xml 663 SHA256 8275ef9e2f500c48cc7c6620246bfafdf15e0bbd62bbe5f7fe286ebf5650a5ca SHA512 cb7da8890e6ae7031e0273627b8e67e7e1e61e20b8f31d73ecfdfc8ddda2bea8f729e4752536219d5d38ab1848f1662fa2dc8c29926028582df06b62c9e85c2a WHIRLPOOL 865875995c85c51db972601633125e47abb3090a64f27788febf670e6fa4b6538cb957b30bc2faad0b8f03b30fd2a0984a08a028f1ba268e65c21669ce9f37b8
diff --git a/app-mobilephone/gnokii/files/0.6.31-fix_xgnokii_inclusion.patch b/app-mobilephone/gnokii/files/0.6.31-fix_xgnokii_inclusion.patch
deleted file mode 100644
index 849ca1c..0000000
--- a/app-mobilephone/gnokii/files/0.6.31-fix_xgnokii_inclusion.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.ori 2012-04-03 13:06:36.452630827 +0200
-+++ configure.in 2012-04-03 13:07:19.139299726 +0200
-@@ -689,7 +689,7 @@
- fi
- fi
-
--AM_CONDITIONAL(XGNOKII, test "x$_support" = "xyes")
-+AM_CONDITIONAL(XGNOKII, test "x$x_support" = "xyes")
-
- dnl ======================== Check for libsocket
- AC_CHECK_LIB(socket, socket)
diff --git a/app-mobilephone/gnokii/gnokii-0.6.31.ebuild b/app-mobilephone/gnokii/gnokii-0.6.31.ebuild
deleted file mode 100644
index 735da2d..0000000
--- a/app-mobilephone/gnokii/gnokii-0.6.31.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit eutils linux-info autotools
-
-DESCRIPTION="user space driver and tools for use with mobile phones"
-HOMEPAGE="http://www.gnokii.org/"
-if [ "$PV" != "9999" ]; then
- SRC_URI="http://www.gnokii.org/download/${PN}/${P}.tar.bz2"
- KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-else
- SRC_URI=""
- KEYWORDS=""
- EGIT_REPO_URI="git://git.savannah.nongnu.org/gnokii.git"
- inherit git
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="nls bluetooth ical irda sms postgres mysql usb X debug +pcsc-lite"
-
-RDEPEND="!app-mobilephone/smstools
- pcsc-lite? ( >=sys-apps/pcsc-lite-1.8.3 )
- X? ( x11-libs/gtk+:2 )
- bluetooth? ( >=net-wireless/bluez-4.99 )
- sms? (
- !app-mobilephone/smstools
- dev-libs/glib:2
- postgres? ( >=dev-db/postgresql-base-8.0 )
- mysql? ( >=virtual/mysql-4.1 )
- )
- ical? ( dev-libs/libical )
- usb? ( =virtual/libusb-0* )"
-DEPEND="${RDEPEND}
- irda? ( virtual/os-headers )
- nls? ( sys-devel/gettext )
- dev-util/intltool"
-
-CONFIG_CHECK="~UNIX98_PTYS"
-
-S="${WORKDIR}/${PN}-${PV%.1}"
-
-# Supported languages and translated documentation
-# Be sure all languages are prefixed with a single space!
-MY_AVAILABLE_LINGUAS=" cs de et fi fr it nl pl pt sk sl sv zh_CN"
-IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}"
-
-src_prepare() {
- if [ "$PV" != "9999" ]; then
- epatch "${FILESDIR}"/0.6.31-fix_xgnokii_inclusion.patch
- else
- epatch "${FILESDIR}"/${P}-icon.patch
- epatch "${FILESDIR}"/${P}-translations.patch
- intltoolize --force --copy --automake || die "intltoolize error"
- fi
-
- eautoreconf
-}
-
-src_configure() {
- strip-linguas ${MY_AVAILABLE_LINGUAS}
-
- local config_xdebug="--disable-xdebug"
- use X && use debug && config_xdebug="--enable-xdebug"
-
- econf \
- $(use_enable nls) \
- $(use_enable ical libical) \
- $(use_enable usb libusb) \
- $(use_enable irda) \
- $(use_enable bluetooth) \
- $(use_with X x) \
- $(use_enable sms smsd) \
- $(use_enable mysql) \
- $(use_enable postgres) \
- $(use_enable debug fulldebug) \
- ${config_xdebug} \
- $(use_enable debug rlpdebug) \
- --enable-security \
- --disable-unix98test \
- $(use_enable pcsc-lite libpcsclite) \
- || die "configure failed"
-}
-
-src_install() {
- einstall || die "make install failed"
-
- insinto /etc
- doins Docs/sample/gnokiirc
- sed -i -e 's:/usr/local:/usr:' "${D}/etc/gnokiirc"
-
- # only one file needs suid root to make a pseudo device
- fperms 4755 /usr/sbin/mgnokiidev
-
- if use X; then
- insinto /usr/share/pixmaps
- newins Docs/sample/logo/gnokii.xpm xgnokii.xpm
- fi
-
- if use sms; then
- pushd "${S}/smsd"
- insinto /usr/share/doc/${PN}/smsd
- use mysql && doins sms.tables.mysql.sql README.MySQL
- use postgres && doins sms.tables.pq.sql
- doins README ChangeLog README.Tru64 action
- popd
- fi
-}
-
-src_test() {
- echo common/phones/fake.c >> "${S}"/po/POTFILES.in
- default
-}
-
-pkg_postinst() {
- elog "Make sure the user that runs gnokii has read/write access to the device"
- elog "which your phone is connected to."
- elog "The simple way of doing that is to add your user to the uucp group."
- if [ "$PV" == "9999" ]; then
- elog "This is the GIT version of ${PN}. It is experimental but may have important bug fixes."
- elog "You can keep track of the most recent commits at:"
- elog " http://git.savannah.gnu.org/cgit/gnokii.git/"
- elog "Whenever there is a change you are interested in, you can re-emerge ${P}."
- fi
-}
diff --git a/app-mobilephone/gnokii/metadata.xml b/app-mobilephone/gnokii/metadata.xml
deleted file mode 100644
index 38d8aa6..0000000
--- a/app-mobilephone/gnokii/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>mobile-phone</herd>
-<longdescription>
-gnokii provides tools and a user space driver for use with mobile phones.
-With gnokii you can do such things as make data calls, update your address book,
-change calendar entires, send and receive SMS messages and load ring tones
-depending on the phone you have.
-</longdescription>
-<use>
- <flag name='ical'>Enable support for <pkg>dev-libs/libical</pkg></flag>
- <flag name='irda'>Enable infrared support</flag>
- <flag name='sms'>Enable SMS support (build smsd)</flag>
-</use>
-</pkgmetadata>
diff --git a/app-text/unrtf/ChangeLog b/app-text/unrtf/ChangeLog
deleted file mode 100644
index 4690cce..0000000
--- a/app-text/unrtf/ChangeLog
+++ /dev/null
@@ -1,154 +0,0 @@
-# ChangeLog for app-text/unrtf
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/unrtf/ChangeLog,v 1.42 2013/06/15 11:59:13 grobian Exp $
-
-*unrtf-0.21.3 (17 Jun 2013)
-
- 17 Jun 2013; Sven Eden <yamakuzure@gmx.net> +unrtf-021.3.ebuild:
- Version bump, based on unrtf-2.21.2-r1.ebuild.
-
-*unrtf-0.21.2-r1 (15 Jun 2013)
-
- 15 Jun 2013; Fabian Groffen <grobian@gentoo.org> +unrtf-0.21.2-r1.ebuild:
- Fix for Prefix, bug #470064
-
-*unrtf-0.21.2 (20 Dec 2011)
-
- 20 Dec 2011; Robin H. Johnson <robbat2@gentoo.org> +unrtf-0.21.2.ebuild,
- +files/unrtf-0.21.2-iconv-detection.patch:
- Bug #370551: version bump.
-
- 09 Mar 2010; Fabian Groffen <grobian@gentoo.org> unrtf-0.21.1.ebuild,
- +files/unrtf-0.21.1-iconv-detection.patch:
- Add semi-optimal patch to solve linking issues with libiconv
-
-*unrtf-0.21.1 (01 Feb 2010)
-
- 01 Feb 2010; Robin H. Johnson <robbat2@gentoo.org> +unrtf-0.21.1.ebuild,
- +files/unrtf-0.21.1-automake-fix.patch:
- Bug #302284 version bump. Include patch to fix upstream putting config
- files in /usr/local/lib, and fix the testsuite to use the non-installed
- copy of them as well.
-
- 02 Jan 2010; Christian Faulhammer <fauli@gentoo.org> unrtf-0.20.5.ebuild:
- Transfer Prefix keywords
-
- 23 Sep 2009; Patrick Lauer <patrick@gentoo.org> unrtf-0.19.9.ebuild:
- Remove virtual/libc
-
- 06 Sep 2009; Brent Baude <ranger@gentoo.org> unrtf-0.20.1.ebuild:
- Marking unrtf-0.20.1 ppc64 stable for bug 276990
-
- 09 Aug 2009; Jeroen Roovers <jer@gentoo.org> unrtf-0.20.1.ebuild:
- Stable for HPPA (bug #276990).
-
- 02 Aug 2009; Raúl Porcel <armin76@gentoo.org> unrtf-0.20.1.ebuild:
- alpha/ia64 stable wrt #276990
-
-*unrtf-0.20.5 (05 Jul 2008)
-
- 05 Jul 2008; Robin H. Johnson <robbat2@gentoo.org> +unrtf-0.20.5.ebuild:
- Bug #228741, version bump, thanks to david5002@milwpc.com.
-
- 16 Jun 2008; Brent Baude <ranger@gentoo.org> unrtf-0.20.1.ebuild:
- Marking unrtf-0.20.1 ~ppc64 for bug 225877
-
- 16 Jun 2008; Raúl Porcel <armin76@gentoo.org> unrtf-0.20.1.ebuild:
- Add ~alpha/~ia64 wrt #225877
-
- 16 Jun 2008; Jeroen Roovers <jer@gentoo.org> unrtf-0.20.1.ebuild:
- Marked ~hppa (bug #225877).
-
- 10 Apr 2007; Gustavo Zacarias <gustavoz@gentoo.org> unrtf-0.20.1.ebuild:
- Stable on sparc wrt #173847
-
- 09 Apr 2007; nixnut <nixnut@gentoo.org> unrtf-0.20.1.ebuild:
- Stable on ppc wrt bug 173847
-
- 09 Apr 2007; Peter Weller <welp@gentoo.org> unrtf-0.20.1.ebuild:
- Stable on amd64 wrt bug 173847
-
- 09 Apr 2007; Raúl Porcel <armin76@gentoo.org> unrtf-0.20.1.ebuild:
- x86 stable wrt bug 173847
-
- 28 May 2006; Robin H. Johnson <robbat2@gentoo.org> -unrtf-0.19.0.ebuild,
- -unrtf-0.19.3.ebuild:
- Cleanup of old versions.
-
-*unrtf-0.20.1 (25 May 2006)
-
- 25 May 2006; Robin H. Johnson <robbat2@gentoo.org> +unrtf-0.20.1.ebuild:
- Bug #133968, version bump.
-
-*unrtf-0.19.9 (17 Feb 2006)
-
- 17 Feb 2006; Robin H. Johnson <robbat2@gentoo.org> +unrtf-0.19.9.ebuild:
- Version bump, bug #123093. Note that security fix in upstream 0.19.5 is
- contained in 0.19.3-r1 already.
-
- 12 Dec 2005; Robin H. Johnson <robbat2@gentoo.org> +metadata.xml:
- Add metadata.xml.
-
- 31 May 2005; Robin H. Johnson <robbat2@gentoo.org> unrtf-0.19.0.ebuild,
- unrtf-0.19.3.ebuild, unrtf-0.19.3-r1.ebuild:
- Bug #93909 - GNU mirrors seem weird lately, go to gentoo mirrors instead.
-
- 21 Apr 2005; Simon Stelling <blubb@gentoo.org> unrtf-0.19.3-r1.ebuild:
- stable on amd64
-
- 19 Mar 2005; Jason Wever <weeve@gentoo.org> unrtf-0.19.3-r1.ebuild:
- Added ~sparc keyword wrt bug #84791.
-
- 08 Jan 2005; Lars Weiler <pylon@gentoo.org> unrtf-0.19.3-r1.ebuild:
- Stable on ppc; bug #74480.
-
- 08 Jan 2005; Daniel Ahlberg <aliz@gentoo.org> unrtf-0.19.3-r1.ebuild:
- Fixes from Stefan Briesenick <sbriesen@gmx.de> in #77082.
-
- 07 Jan 2005; Robin H. Johnson <robbat2@gentoo.org> unrtf-0.19.3-r1.ebuild:
- Stable on x86 for security fix.
-
-*unrtf-0.19.3-r1 (07 Jan 2005)
-
- 07 Jan 2005; Robin H. Johnson <robbat2@gentoo.org>
- +files/unrtf-0.19.3-final.patch, +unrtf-0.19.3-r1.ebuild:
- Bug #74480, security fix.
-
- 24 Sep 2004; Jodok Batlogg <batlogg@gentoo.org>; unrtf-0.19.3.ebuild:
- marked as stable on ppc
-
- 16 Apr 2004; Michael McCabe <randy@gentoo.org> unrtf-0.19.3.ebuild:
- adding s390 keywords
-
- 27 Mar 2004; David Holm <dholm@gentoo.org> unrtf-0.19.3.ebuild:
- Added to ~ppc.
-
- 12 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> :
- Don't assign default to S; header fix
-
- 12 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> unrtf-0.19.0.ebuild,
- unrtf-0.19.3.ebuild:
- Don't assign default to S; header fix
-
- 11 Mar 2004; Hanno Boeck <hanno@gentoo.org> unrtf-0.19.3.ebuild:
- Marked stable on x86.
-
-*unrtf-0.19.3 (22 Feb 2004)
-
- 22 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> unrtf-0.19.3.ebuild:
- Version bump. Found by Michaelian Ennis <mennis@corvus.net> in #42323.
-
-*unrtf-0.19.0 (12 Jan 2004)
-
- 12 Jan 2004; Hanno Boeck <hanno@gentoo.org> unrtf-0.19.0.ebuild:
- Version bump.
-
- 20 Oct 2003; Hanno Boeck <hanno@gentoo.org> unrtf-0.18.1.ebuild:
- Ebuild was completely broken (src_uri wrong, no description, patch failed),
- fixed.
-
-*unrtf-0.18.1 (11 Oct 2003)
-
- 11 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> unrtf-0.18.1.ebuild:
- initial commit. ebuild and gcc3.3 patch written by robbat2@gentoo.org. patch
- passed upstream.
diff --git a/app-text/unrtf/Manifest b/app-text/unrtf/Manifest
deleted file mode 100644
index 7f12926..0000000
--- a/app-text/unrtf/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX unrtf-0.21.3-iconv-detection.patch 351 SHA256 dca73948bdf86d3602aa45214862b8a60976dca34427cc6067102cc464e65fdf SHA512 1f49b277656d0094d0a33da5b090aacc70c36ae7ed3a7c51e0d85854aaf446a621bb008bfc8486b421d199b4cd2335f5ddcc0f67872fc3dd2f664e2575a845d6 WHIRLPOOL 79ddd5aa79063fe049daab46b55d9e4b3406e8b4f17f16ec85bdfa185b244298c1f435d5d2d1277b62a791754d163c11b187f4fbf35efb5b65367a7d0f44ffc0
-DIST unrtf-0.21.3.tar.gz 657647 SHA256 8aec68a5583fea8ac575cdb6bbd111ecc6700054127ab12023ac94729da77536 SHA512 9675994c2ea9d1d5bf009d759b3165d85ce07c8f68d1bdc405fe9c5e786786a9583416f366dd62d46cd65d882cfb2d447a42bbea7d8e55ce7b64afd1558afba4 WHIRLPOOL 0ecb421bf8ace2afdc26514f5dbd30de1c256674c5d28eefa46807c702941fe7cdd8e81916748989f042b6e482a44019c9a026faa7699398ef036030bb2b9e05
-EBUILD unrtf-0.21.3.ebuild 749 SHA256 532c5636927ccf8e2bb54c019618d54511c8c1e90626747b67defe2555335e8d SHA512 78ee99520831d8a9cf887d86bfedc89e4d278d22a1c1666dd0ed87a0be0077e58e8ad0c1dfddca5c34983acca12b4ef340aa7c1bba70ecc28de5846dc5b3e71d WHIRLPOOL 31a4648a715bc95e17c8b03632d04af76667cf6a5ee596ae393edf81796eca3264194d7c3d503153deaf83984cd0ebf63ca0f685bb207d1deecd3bb92a586f41
-MISC ChangeLog 5301 SHA256 d9335aaae46350a0da5423070c7af27b6198569e993c40fc2efacd52a6917fd3 SHA512 09816a607a8a983d91e3f937ea14ff896ddd55b326117bfecf6bff6ac5fd3961bd76d0bd08e90e81874a3080ca35631921b746f3ec3ca04a423eb69f8965cf43 WHIRLPOOL b3bcc4f7ac10e9530139e823ebe0404a37e130482ec6da9121cbc1e8c8d4c5cebcb3fbe78325819b715c6ede0ecf012b8b4d57082f61dec1db641a598da0fd2c
-MISC metadata.xml 202 SHA256 76dbb4a720140d78f0ddfb2b2782c03852169c201c1f507eb17ef4d2a82f212a SHA512 bd1c14da72bdd52e3bea3056f5b9f908c31d6915b651d15d80a0a7d26778c97cde493ae9ca4352bd313eb16ddbed9b169c6b620c7f4a9b77973f7077fa8d997c WHIRLPOOL c073cc4c903e3377c7aee652c5661a1657cc5ba70c3deb4b2d7b2d0e31a78fb8b362b2f255de3faddbf4c46250d14d2d5d39a6a13b910ad18f8d53df362163a0
diff --git a/app-text/unrtf/files/unrtf-0.21.3-iconv-detection.patch b/app-text/unrtf/files/unrtf-0.21.3-iconv-detection.patch
deleted file mode 100644
index ee1f702..0000000
--- a/app-text/unrtf/files/unrtf-0.21.3-iconv-detection.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/configure.ac 2013-01-01 02:05:20.000000000 +0100
-+++ b/configure.ac 2013-06-17 13:08:34.686437316 +0200
-@@ -46,6 +46,7 @@
- *-*-cygwin*) AC_SUBST(LIBS, ["-liconv"]);;
- *aix*) AC_SUBST(LIBS, ["-liconv"]);;
- *-*-darwin*) AC_SUBST(LIBS, ["-liconv"]);;
-+ *-*-solaris*) AC_SUBST(LIBS, ["-liconv"]);;
- esac
-
- AC_CONFIG_FILES([Makefile
diff --git a/app-text/unrtf/metadata.xml b/app-text/unrtf/metadata.xml
deleted file mode 100644
index c6d8628..0000000
--- a/app-text/unrtf/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer>
- <email>robbat2@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/app-text/unrtf/unrtf-0.21.3.ebuild b/app-text/unrtf/unrtf-0.21.3.ebuild
deleted file mode 100644
index d26d474..0000000
--- a/app-text/unrtf/unrtf-0.21.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-
-inherit autotools eutils
-
-DESCRIPTION="Converts RTF files to various formats"
-HOMEPAGE="http://www.gnu.org/software/unrtf/unrtf.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
-IUSE=""
-
-src_prepare() {
- sed -i \
- -e "s,/usr/local/lib/,${EPREFIX}/usr/share/,g" \
- "${S}"/src/*.h "${S}"/doc/${PN}.1 || die "failed to sed"
- cd "${S}"
- epatch "${FILESDIR}"/${PN}-0.21.3-iconv-detection.patch
- eautoreconf
-}
-
-src_install() {
- default
- dodoc ChangeLog NEWS README AUTHORS
-}
diff --git a/dev-games/cel/ChangeLog b/dev-games/cel/ChangeLog
deleted file mode 100644
index 970494d..0000000
--- a/dev-games/cel/ChangeLog
+++ /dev/null
@@ -1,47 +0,0 @@
-# ChangeLog for dev-games/cel
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-
-*cel-2.0 (13 Jul 2012)
-
- 13 Jul 2012; Sven Eden <sven.eden@gmx.de>
- +cel-2.0.ebuild, -cel-1.4.0.ebuild, -cel-2.1_pre9999-r1.ebuild,
- +cel-2.0-remove_ode_stepfast_01.patch
- +cel-2.0-remove_ode_stepfast_02.patch
- +cel-2.0-remove_ode_stepfast_03.patch
- +cel-2.0-remove_ode_stepfast_04.patch
- +cel-2.0-remove_ode_stepfast_05.patch
- +cel-2.0-remove_ode_stepfast_06.patch
- Version bump to Crystal Space 2.0, removed obsolete ebuilds,
- added patches to remove obsolete ode StepFast API.
-
-*cel-2.0_beta3 (16 Feb 2012)
-
- 16 Feb 2012; Sven Eden <sven.eden@gmx.de>
- +cel-2.0_beta3.ebuild
- -cel-1.9_pre9999.ebuild
- -cel-2.1_pre9999.ebuild
- Added ebuild for official beta of the upcoming stable release, removed
- obsolete ebuilds
-
-*cel-2.1_pre9999-r1 (17 May 2011)
-
- 17 May 2011; Sven Eden <sven.eden@gmx.de> +cel-2.1_pre9999-r1.ebuild : Added
- Added --with-cs-prefix=/usr to circumvent the problems that arise by
- the now used CRYSTAL environment var.
-
-*cel-2.1_pre9999 (18 Apr 2011)
-
- 18 Apr 2011; Sven Eden <sven.eden@gmx.de> +cel-2.1_pre9999.ebuild : Added
- ebuild for new versioning, upstream went to 2.1.
-
-*cel-1.4.0 (27 Mar 2011)
-
- 27 Mar 2011; Sven Eden <sven.eden@gmx.de> +cel-1.4.0.ebuild : Initial
- commit of the ebuild.
-
-*cel-1.9_pre9999 (27 Mar 2011)
-
- 27 Mar 2011; Sven Eden <sven.eden@gmx.de> +cel-1.9_pre9999.ebuild : Initial
- commit of the ebuild.
diff --git a/dev-games/cel/Manifest b/dev-games/cel/Manifest
deleted file mode 100644
index 94c4f83..0000000
--- a/dev-games/cel/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX cel-2.0-remove_ode_stepfast_01.patch 1031 SHA256 958cc61ec5c45ee93e384bd737026f31a0345fec3f3e63aa3b7811d943906fae SHA512 c2df0e4b1c430c8be61ffaea082ddf77aa433fafb9fc051da3948c1cc6d4ac658fe126340fb84b6d405bdb405b8ba6b295209dd00c89386a0e3a830fdbc68e8d WHIRLPOOL 02931484cec1b9fa3e8f1c47e60e899d4ecf37c80ce35979b7225155efabb298ba551ce51f4f71fb33a2398b7b0d8c6f826aed921cfccbb368ae0b5dc891b689
-AUX cel-2.0-remove_ode_stepfast_02.patch 870 SHA256 e5b62819781cfc4feffe193f0baccf7a50ae2f375e0471c9e58bb02776b8d236 SHA512 52500ab6a34238389d8f9f946bf2096ea7d0c6bf94aad74fa8e4ac361077dc391edf08ad3d8d6b9490acd7df1244887ab7c083e3f5f385ec7d96ccef3dd7a5a8 WHIRLPOOL b6f37fbabcaee8a71655bdfab3d4fa9d006a3749704b71b9d48abaedd35cdec29658822948fb4d10c32fb69732a2f047e1199d964f5ec0f68880691e720f2ae8
-AUX cel-2.0-remove_ode_stepfast_03.patch 2914 SHA256 d7fd8b056210c494a442e3b1f1876b0ce7afd73e8d18f274be9b8d9c3d86fd08 SHA512 df45ff53d8299ec14ff2165a5d1bf00c35704479a863317ce1f0f7d64892709c881bc69708fd1e2ccf1541e02daa6869733f026d6602408bfcb7a2f70bef8e39 WHIRLPOOL 2bddb68de5d96d30d3e7158a6086e04785c7e2585f622418ee947863cb3962c5a03f5d4c356fb9cf86e01ab026cfb8d0d2bdc557c76a92065d899170a6c3a1b1
-AUX cel-2.0-remove_ode_stepfast_04.patch 1726 SHA256 69a1fe8b2f489c16c0b8da1d2fee89601f84f33ff4fc7f5d51633ed6915527bb SHA512 9e8d654787a11037a2cd23610176acd40b38315faf38b9c0d65fa59e5a976eef4f37a5712c9103a2fce6cb2ae3f50e80a08754705a05dcdf05d059088fc4115b WHIRLPOOL ce36a442c2260dcbc638a961f190ba2e979e42d8d68f908e7fa0f8c6bb18ef9a151d1399e7815a5c82d40bfa6254cf860abae8c54fdfc22d7d9c2a02294c98dc
-AUX cel-2.0-remove_ode_stepfast_05.patch 661 SHA256 b58232957d823a5f476f28e82f80e126e2df5bbf7ee1acd93838ab16c173a7b2 SHA512 388f301018a2825a56e3dacafcf68602644497cfc273aab7454e39b25342e67d9c72a934a5f2d84c6ad434727e7404928a07018c12d0248d9de13489b830d178 WHIRLPOOL a05d1a61ffb3579f3f6f351627425331ddb8cc6764971a5e8ad52a31259cf2ac209b64858fd65a265affb57c36ab0f571e28dba3b2944a15d9fa3ef9f07eebfb
-AUX cel-2.0-remove_ode_stepfast_06.patch 484 SHA256 3c3d732f9a73801512cea7b2a2ad5564f6d11c3ebcbf3a25e27013e2e032b518 SHA512 38d6219d2d9b94d3ccd7aeb7c4cc11415f6a1355d5d09aec582358eb10389e7bd2ca8337bc4042f255bf62988a0fe6033b86775cf156cb31c16a367e75a0cc3f WHIRLPOOL a648398480380caf497e72588d6d94e8523dd425eb1d63f3fbe1c12139eb6481cf903f261104c6cd99028553f785d9034f285eb792786ea4b4e0a1650a862548
-DIST cel-src-2.0.tar.bz2 8157258 SHA256 dae05d69f1d95da2690e7925b002fcc764da0f1008c037f4918d02f151dfb9de SHA512 a04759ec318fe6b92a430b0aec52e78ec033df5691c54c7222d1b565cf9f8a706e129cc9e9420061b672e15f25a8472c4152ed777de6b6cf76a4c084008a7083 WHIRLPOOL e88b02a181844fce8ce06abbef1978cf8c6ecf1366359e6f0a0faacc793cabc69bb3815cdebaec7844f4c78e19da245f5b28bec920305d7bc2ff118027f54c63
-EBUILD cel-2.0.ebuild 2184 SHA256 6db00c074725ca95d36fb4187348cd55df0da8ba5e8382e2df9bc5dd0d0402f7 SHA512 2a9a898b853c49d3d00ea3c91e052f724268bf2ade5453e9015e11e821171997f7458ddfe50a21659995df6c096b78e7e02f5d68447601443720d461608af510 WHIRLPOOL be25cd6ebb163c7c3c275c3055170fffe6f5008548ec0ca2d346d9988e799691a1667fece16861b5e0d9a5b67c2465a43a23724751dee766377fa914d328d625
-MISC ChangeLog 1488 SHA256 c52fa9690a86fc94d0788e7342eed6175b45c84dc89eeca34dc5ee6bd5b7cd53 SHA512 916703943726c6caf755ea36199afbebfc150eec86bc34b1f95c39939efe7637785462b7f18aeb0a0bb6d82136d0c8f2c0268e536d8928e9c95557b153705a0f WHIRLPOOL d197773892930a147e278540c45514efbc849718bea1093967415289ee8653b8112c4271ee05e10aae8e17a7768e7355db73a7cfe1697376da71378822432f68
-MISC metadata.xml 744 SHA256 30617bedd2a8c7aed2b365fb6482cf29fd96dfa2b29586dbf8bc6327ca1d78cc SHA512 f117b89f62fe572c1122f726eea4e5e7c6a0bf8762cfa715e7e2b8e868e1207c5b5108af9ab31ac5a68a2b9dbc4bbe23404d11ad7b535ba290fcfd2df07da18c WHIRLPOOL 165f5606f1eb1b5183195e17e18aa4c38c46f9f9c50c44dccf929b29b8bb7541bbc5cff62003cc3bad4b4817f80495953cfcc4583a83607b086216d434990b80
diff --git a/dev-games/cel/cel-2.0.ebuild b/dev-games/cel/cel-2.0.ebuild
deleted file mode 100644
index d1ab0d4..0000000
--- a/dev-games/cel/cel-2.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit autotools eutils versionator
-
-MY_PV=$(get_version_component_range 1-2)
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="A game entity layer based on Crystal Space"
-HOMEPAGE="http://www.crystalspace3d.org/"
-SRC_URI="http://www.crystalspace3d.org/downloads/release/${PN}-src-${MY_PV}.tar.bz2"
-RESTRICT="mirror"
-
-LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-SLOT="0"
-
-RDEPEND="
- =dev-games/crystalspace-${MY_PV}*
- dev-games/hawknl"
-DEPEND="${RDEPEND}
- dev-util/ftjam"
-
-S=${WORKDIR}/${PN}-src-${MY_PV}
-
-src_prepare() {
- # InstallDoc conflicts with dodoc
- sed -i -e "/^InstallDoc/d" docs/Jamfile \
- || die "sed on docs/Jamfile failed"
-
- # remove old references to StepFast, an experimental system in ode <0.12
- epatch "${FILESDIR}"/${MY_P}-remove_ode_stepfast_01.patch
- epatch "${FILESDIR}"/${MY_P}-remove_ode_stepfast_02.patch
- epatch "${FILESDIR}"/${MY_P}-remove_ode_stepfast_03.patch
- epatch "${FILESDIR}"/${MY_P}-remove_ode_stepfast_04.patch
- epatch "${FILESDIR}"/${MY_P}-remove_ode_stepfast_05.patch
- epatch "${FILESDIR}"/${MY_P}-remove_ode_stepfast_06.patch
-
- AT_M4DIR=mk/autoconf
- eautoreconf
-}
-
-src_configure() {
- econf \
- --disable-separate-debug-info \
- --disable-optimize-mode-debug-info \
- --with-cs-prefix=/usr \
- $(use_enable debug) \
- || die "configure failed"
-}
-
-src_compile() {
- local jamopts=$(echo "${MAKEOPTS}" | sed -ne "/-j/ { s/.*\(-j[[:space:]]*[0-9]\+\).*/\1/; p }")
- jam -q ${jamopts} || die "compile failed (jam -q ${jamopts})"
-}
-
-src_install() {
- jam -q -s DESTDIR="${D}" install || die "jam install failed"
-
- # Fill cache directory for the examples
- cp "${D}"/usr/share/${MY_P}/data/{basic_,}world
- lighter2 --simpletui "${D}"/usr/share/${MY_P}/data
- cp "${D}"/usr/share/${MY_P}/data/{walktut_,}world
- lighter2 --simpletui "${D}"/usr/share/${MY_P}/data
- rm "${D}"/usr/share/${MY_P}/data/world
-
- # As the target install_doc uses cel-2.0 as target, but dodoc
- # uses ${PF}, this said var has to be manipulated first.
- local oldPF=${PF}
- PF=${MY_P}
- dodoc COPYING README docs/history*.txt docs/todo.txt
- PF=${oldPF}
-}
diff --git a/dev-games/cel/files/cel-2.0-remove_ode_stepfast_01.patch b/dev-games/cel/files/cel-2.0-remove_ode_stepfast_01.patch
deleted file mode 100644
index c8953e6..0000000
--- a/dev-games/cel/files/cel-2.0-remove_ode_stepfast_01.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- scripts/blcelc.py~ 2012-07-02 12:55:28.000000000 +0200
-+++ scripts/blcelc.py 2012-07-13 16:42:50.255047828 +0200
-@@ -1256,8 +1256,6 @@
- def RemoveBodyFromGroup(*args): return _blcelc.iPcMechanicsSystem_RemoveBodyFromGroup(*args)
- def CreateJoint(*args): return _blcelc.iPcMechanicsSystem_CreateJoint(*args)
- def RemoveJoint(*args): return _blcelc.iPcMechanicsSystem_RemoveJoint(*args)
-- def DisableStepFast(*args): return _blcelc.iPcMechanicsSystem_DisableStepFast(*args)
-- def EnableStepFast(*args): return _blcelc.iPcMechanicsSystem_EnableStepFast(*args)
- def EnableQuickStep(*args): return _blcelc.iPcMechanicsSystem_EnableQuickStep(*args)
- DynamicSystem = _swig_property(_blcelc.iPcMechanicsSystem_GetDynamicSystem, fix_args(_blcelc.iPcMechanicsSystem_SetDynamicSystem), None,
- "iPcMechanicsSystem.DynamicSystem -> type\n\nThis is equivalent to calling the C++ cs methods:\n\tget: iPcMechanicsSystem::GetDynamicSystem()\n\tset: void iPcMechanicsSystem::SetDynamicSystem(...)")
diff --git a/dev-games/cel/files/cel-2.0-remove_ode_stepfast_02.patch b/dev-games/cel/files/cel-2.0-remove_ode_stepfast_02.patch
deleted file mode 100644
index 7d103d1..0000000
--- a/dev-games/cel/files/cel-2.0-remove_ode_stepfast_02.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- include/propclass/mechsys.h~ 2012-07-02 12:55:26.000000000 +0200
-+++ include/propclass/mechsys.h 2012-07-13 16:44:03.228384979 +0200
-@@ -46,8 +46,6 @@
- * - SetGravity: parameters 'gravity' (float).
- * - SetStepTime: parameters 'time' (float).
- * - QuickStep: no parameters.
-- * - EnableStepFast: no parameters.
-- * - DisableStepFast: no parameters.
- */
- struct iPcMechanicsSystem : public virtual iBase
- {
-@@ -212,16 +210,6 @@
- virtual void RemoveJoint (iJoint* joint) = 0;
-
- /**
-- * Disable fast stepping. This is very accurate but can quickly
-- * break with lots of objects.
-- */
-- virtual void DisableStepFast () = 0;
-- /**
-- * Enable fast stepping. This is a lot faster then DisableStepFast().
-- * Default.
-- */
-- virtual void EnableStepFast () = 0;
-- /**
- * Very fast but not accurate.
- */
- virtual void EnableQuickStep () = 0;
diff --git a/dev-games/cel/files/cel-2.0-remove_ode_stepfast_03.patch b/dev-games/cel/files/cel-2.0-remove_ode_stepfast_03.patch
deleted file mode 100644
index b1757d5..0000000
--- a/dev-games/cel/files/cel-2.0-remove_ode_stepfast_03.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- plugins/behaviourlayer/python/blcel.cpp.ori 2012-07-02 12:55:26.000000000 +0200
-+++ plugins/behaviourlayer/python/blcel.cpp 2012-07-13 16:45:54.491724132 +0200
-@@ -34883,48 +34883,6 @@
- }
-
-
--SWIGINTERN PyObject *_wrap_iPcMechanicsSystem_DisableStepFast(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-- PyObject *resultobj = 0;
-- iPcMechanicsSystem *arg1 = (iPcMechanicsSystem *) 0 ;
-- void *argp1 = 0 ;
-- int res1 = 0 ;
-- PyObject * obj0 = 0 ;
--
-- if(!PyArg_UnpackTuple(args,(char *)"iPcMechanicsSystem_DisableStepFast",1,1,&obj0)) SWIG_fail;
-- res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_iPcMechanicsSystem, 0 | 0 );
-- if (!SWIG_IsOK(res1)) {
-- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "iPcMechanicsSystem_DisableStepFast" "', argument " "1"" of type '" "iPcMechanicsSystem *""'");
-- }
-- arg1 = reinterpret_cast< iPcMechanicsSystem * >(argp1);
-- (arg1)->DisableStepFast();
-- resultobj = SWIG_Py_Void();
-- return resultobj;
--fail:
-- return NULL;
--}
--
--
--SWIGINTERN PyObject *_wrap_iPcMechanicsSystem_EnableStepFast(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-- PyObject *resultobj = 0;
-- iPcMechanicsSystem *arg1 = (iPcMechanicsSystem *) 0 ;
-- void *argp1 = 0 ;
-- int res1 = 0 ;
-- PyObject * obj0 = 0 ;
--
-- if(!PyArg_UnpackTuple(args,(char *)"iPcMechanicsSystem_EnableStepFast",1,1,&obj0)) SWIG_fail;
-- res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_iPcMechanicsSystem, 0 | 0 );
-- if (!SWIG_IsOK(res1)) {
-- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "iPcMechanicsSystem_EnableStepFast" "', argument " "1"" of type '" "iPcMechanicsSystem *""'");
-- }
-- arg1 = reinterpret_cast< iPcMechanicsSystem * >(argp1);
-- (arg1)->EnableStepFast();
-- resultobj = SWIG_Py_Void();
-- return resultobj;
--fail:
-- return NULL;
--}
--
--
- SWIGINTERN PyObject *_wrap_iPcMechanicsSystem_EnableQuickStep(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- iPcMechanicsSystem *arg1 = (iPcMechanicsSystem *) 0 ;
-@@ -118380,8 +118338,6 @@
- { (char *)"iPcMechanicsSystem_RemoveBodyFromGroup", _wrap_iPcMechanicsSystem_RemoveBodyFromGroup, METH_VARARGS, NULL},
- { (char *)"iPcMechanicsSystem_CreateJoint", _wrap_iPcMechanicsSystem_CreateJoint, METH_VARARGS, NULL},
- { (char *)"iPcMechanicsSystem_RemoveJoint", _wrap_iPcMechanicsSystem_RemoveJoint, METH_VARARGS, NULL},
-- { (char *)"iPcMechanicsSystem_DisableStepFast", _wrap_iPcMechanicsSystem_DisableStepFast, METH_VARARGS, NULL},
-- { (char *)"iPcMechanicsSystem_EnableStepFast", _wrap_iPcMechanicsSystem_EnableStepFast, METH_VARARGS, NULL},
- { (char *)"iPcMechanicsSystem_EnableQuickStep", _wrap_iPcMechanicsSystem_EnableQuickStep, METH_VARARGS, NULL},
- { (char *)"iPcMechanicsSystem_StepTime_set", _wrap_iPcMechanicsSystem_StepTime_set, METH_VARARGS, NULL},
- { (char *)"iPcMechanicsSystem_StepTime_get", _wrap_iPcMechanicsSystem_StepTime_get, METH_VARARGS, NULL},
diff --git a/dev-games/cel/files/cel-2.0-remove_ode_stepfast_04.patch b/dev-games/cel/files/cel-2.0-remove_ode_stepfast_04.patch
deleted file mode 100644
index ab9679b..0000000
--- a/dev-games/cel/files/cel-2.0-remove_ode_stepfast_04.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- plugins/propclass/mechanics/mechanics.cpp~ 2012-07-02 12:55:27.000000000 +0200
-+++ plugins/propclass/mechanics/mechanics.cpp 2012-07-13 16:48:39.875066116 +0200
-@@ -89,8 +89,6 @@
- AddAction (action_setsystem, "SetSystem");
- AddAction (action_setgravity, "SetGravity");
- AddAction (action_quickstep, "QuickStep");
-- AddAction (action_enablestepfast, "EnableStepFast");
-- AddAction (action_disablestepfast, "DisableStepFast");
- AddAction (action_setsteptime, "SetStepTime");
- AddAction (action_setsimulationspeed, "SetSimulationSpeed");
- }
-@@ -246,29 +244,11 @@
- dynsystem->QueryObject ()->SetName ("cel.mechanics.system");
- dynsystem->SetGravity (csVector3 (0, -9.8f, 0));
-
-- EnableStepFast ();
-+ EnableQuickStep ();
- }
- return dynsystem;
- }
-
--void celPcMechanicsSystem::DisableStepFast ()
--{
-- GetDynamicSystem ();
-- if (!dynsystem) return;
-- csRef<iODEDynamicSystemState> osys= scfQueryInterface<iODEDynamicSystemState> (dynsystem);
-- if (osys)
-- osys->EnableStepFast (0);
--}
--
--void celPcMechanicsSystem::EnableStepFast ()
--{
-- GetDynamicSystem ();
-- if (!dynsystem) return;
-- csRef<iODEDynamicSystemState> osys= scfQueryInterface<iODEDynamicSystemState> (dynsystem);
-- if (osys)
-- osys->EnableStepFast (1);
--}
--
- void celPcMechanicsSystem::EnableQuickStep ()
- {
- GetDynamicSystem ();
-@@ -323,14 +303,11 @@
- }
- return true;
- }
-+ case action_enablestepfast:
- case action_quickstep:
- EnableQuickStep ();
- return true;
-- case action_enablestepfast:
-- EnableStepFast ();
-- return true;
- case action_disablestepfast:
-- DisableStepFast ();
- return true;
- case action_setsteptime:
- {
diff --git a/dev-games/cel/files/cel-2.0-remove_ode_stepfast_05.patch b/dev-games/cel/files/cel-2.0-remove_ode_stepfast_05.patch
deleted file mode 100644
index a88877f..0000000
--- a/dev-games/cel/files/cel-2.0-remove_ode_stepfast_05.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- plugins/propclass/mechanics/mechanics.h~ 2012-07-02 12:55:27.000000000 +0200
-+++ plugins/propclass/mechanics/mechanics.h 2012-07-13 16:49:11.611734439 +0200
-@@ -80,8 +80,6 @@
- action_setsystem = 0,
- action_setgravity,
- action_quickstep,
-- action_enablestepfast,
-- action_disablestepfast,
- action_setsteptime,
- action_setsimulationspeed
- };
-@@ -150,8 +148,6 @@
- virtual iJoint* CreateJoint (iRigidBody* body1, iRigidBody* body2);
- virtual void RemoveJoint (iJoint* joint);
-
-- virtual void DisableStepFast ();
-- virtual void EnableStepFast ();
- virtual void EnableQuickStep ();
-
- virtual csPtr<iCelDataBuffer> Save ();
diff --git a/dev-games/cel/files/cel-2.0-remove_ode_stepfast_06.patch b/dev-games/cel/files/cel-2.0-remove_ode_stepfast_06.patch
deleted file mode 100644
index 81b5768..0000000
--- a/dev-games/cel/files/cel-2.0-remove_ode_stepfast_06.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- plugins/propclass/mechanics/mechanics.cpp~ 2012-07-13 16:53:30.000000000 +0200
-+++ plugins/propclass/mechanics/mechanics.cpp 2012-07-13 16:57:44.595094604 +0200
-@@ -303,12 +303,9 @@
- }
- return true;
- }
-- case action_enablestepfast:
- case action_quickstep:
- EnableQuickStep ();
- return true;
-- case action_disablestepfast:
-- return true;
- case action_setsteptime:
- {
- CEL_FETCH_FLOAT_PAR (time,params,param_time);
diff --git a/dev-games/cel/metadata.xml b/dev-games/cel/metadata.xml
deleted file mode 100644
index 7660422..0000000
--- a/dev-games/cel/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
- <email>yamakuzure@gmx.net</email>
- <description>The creator of this ebuild, but not the official maintainer</description>
-</maintainer>
-<longdescription>Entity system supporting higher-level functionality, such as runtime package environment (CELstart), generic event system, avatar and camera management, artificial intelligence (behavior trees, path finding, neural networks and genetic algorithms), vehicles, and more. </longdescription>
-<use>
- <flag name='python'>Add Python bindings</flag>
- <flag name='debug'>Build debug versions of the libraries</flag>
-</use>
-</pkgmetadata>
diff --git a/dev-games/crystalspace/ChangeLog b/dev-games/crystalspace/ChangeLog
deleted file mode 100644
index 5928304..0000000
--- a/dev-games/crystalspace/ChangeLog
+++ /dev/null
@@ -1,161 +0,0 @@
-# ChangeLog for dev-games/crystalspace
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*crystalspace-2.0-r3 (27 Jul 2012)
-
- 27 Jul 2012; Sven Eden <sven.eden@gmx.de>
- +crystalspace-2.0-r3.ebuild,
- -crystalspace-2.0-r2.ebuild:
- Fixed a type that caused patches to be invisible aborting prepare
- stage.
-
-*crystalspace-2.0-r2 (19 Jul 2012)
-
- 19 Jul 2012; Sven Eden <sven.eden@gmx.de>
- +crystalspace-2.0-r2.ebuild,
- -crystalspace-2.0-r1.ebuild,
- +files/crystalspace-2.0-fix_unqualified_calls_01.patch,
- +files/crystalspace-2.0-fix_unqualified_calls_02.patch,
- +files/crystalspace-2.0-fix_unqualified_calls_03.patch,
- +files/crystalspace-2.0-fix_unqualified_calls_04.patch,
- +files/crystalspace-2.0-fix_unqualified_calls_05.patch:
- Eventually found time to fix unqualified calls to class methods
- that require -fpermissive flag with gcc-4.7+.
-
-*crystalspace-2.0-r1 (18 Jul 2012)
-
- 18 Jul 2012; Sven Eden <sven.eden@gmx.de>
- +crystalspace-2.0-r1.ebuild,
- -crystalspace-2.0.ebuild,
- -files/crystalspace-2.0-01-remove_hardcoded_libpath.patch,
- -files/crystalspace-2.0-02-add_custom_mode.patch,
- -files/crystalspace-2.0-03-add_custom_variant.patch,
- -files/crystalspace-2.0-04-add_var_trimmer.patch,
- -files/crystalspace-2.0-05-remove_emit_from_configure_ac_01.patch,
- -files/crystalspace-2.0-06-remove_emit_from_configure_ac_02.patch,
- -files/crystalspace-2.0-07-remove_emit_from_configure_ac_03.patch,
- -files/crystalspace-2.0-08-remove_emit_from_configure_ac_04.patch,
- -files/crystalspace-2.0-09-remove_emit_from_configure_ac_05.patch,
- -files/crystalspace-2.0-10-remove_emit_from_compiler_funcs.patch:
- Removed build system patches, as the discussion with upstream about user
- decidable build flags is an ongoing process.
-
-*crystalspace-2.0 (13 Jul 2012)
-
- 13 Jul 2012; Sven Eden <sven.eden@gmx.de>
- +crystalspace-2.0.ebuild,
- -crystalspace-2.0_beta3-r5.ebuild,
- -files/crystalspace-2.0-11-data_add_missing.patch,
- -files/crystalspace-2.0-12-data_sky_add_missing.patch,
- -files/crystalspace-2.0-13-maps_flarge_add_missing.patch,
- -files/crystalspace-2.0-14-fix_vfs_template.patch,
- -files/crystalspace-2.0-15-add_usr_lib_to_cs-config.patch:
- Version bump to latest stable.
- Removed old ebuild and accepted patches.
-
-
-*crystalspace-2.0_beta3-r6 (13 Jul 2012)
-
- 13 Jul 2012; Sven Eden <sven.eden@gmx.de>
- +crystalspace-2.0_beta3-r6.ebuild,
- -crystalspace-2.0_beta3-r5.ebuild,
- +files/crystalspace-2.0-fix_ode_update_02.patch
- +files/crystalspace-2.0-fix_ode_update_03.patch
- +files/crystalspace-2.0-fix_ode_update_04.patch
- +files/crystalspace-2.0-fix_ode_update_05.patch
- +files/crystalspace-2.0-fix_ode_update_06.patch
- +files/crystalspace-2.0-fix_ode_update_07.patch
- +files/crystalspace-2.0-fix_ode_update_08.patch
- +files/crystalspace-2.0-fix_ode_update_09.patch
- +files/crystalspace-2.0-fix_ode_update_10.patch
- +files/crystalspace-2.0-fix_ode_update_11.patch
- +files/crystalspace-2.0-fix_ode_update_12.patch
- +files/crystalspace-2.0-fix_ode_update_13.patch
- New ebuild using 13 patches for the new stable ode-0.12 engine.
- Removed old ebuild.
-
-
-*crystalspace-2.0_beta3-r5 (28 Apr 2012)
-
- 28 Apr 2012; Sven Eden <sven.eden@gmx.de>
- +crystalspace-2.0_beta3-r5.ebuild,
- -crystalspace-2.0_beta3-r4.ebuild,
- +files/crystalspace-2.0-01-remove_hardcoded_libpath.patch,
- +files/crystalspace-2.0-02-add_custom_mode.patch,
- +files/crystalspace-2.0-03-add_custom_variant.patch,
- +files/crystalspace-2.0-04-add_var_trimmer.patch,
- +files/crystalspace-2.0-05-remove_emit_from_configure_ac_01.patch,
- +files/crystalspace-2.0-06-remove_emit_from_configure_ac_02.patch,
- +files/crystalspace-2.0-07-remove_emit_from_configure_ac_03.patch,
- +files/crystalspace-2.0-08-remove_emit_from_configure_ac_04.patch,
- +files/crystalspace-2.0-09-remove_emit_from_configure_ac_05.patch,
- +files/crystalspace-2.0-10-remove_emit_from_compiler_funcs.patch,
- +files/crystalspace-2.0-11-data_add_missing.patch,
- +files/crystalspace-2.0-12-data_sky_add_missing.patch,
- +files/crystalspace-2.0-13-maps_flarge_add_missing.patch,
- +files/crystalspace-2.0-14-fix_vfs_template.patch,
- +files/crystalspace-2.0-15-add_usr_lib_to_cs-config.patch:
- New ebuild using 15 Patches to sort various issues with the build system out.
- Removed old ebuild.
-
-*crystalspace-2.0_beta3-r4 (27 Apr 2012)
-
- 27 Apr 2012; Sven Eden <sven.eden@gmx.de>
- +crystalspace-2.0_beta3-r4.ebuild,
- -crystalspace-2.0_beta3-r3.ebuild,
- -crystalspace-2.1_pre9999-r1.ebuild,
- -crystalspace-1.4.0-r2.ebuild:
- Some minor fixes on the 2.0 ebuild, removed obsolete 1.4 ebuild and gave up
- on the live part. Let's concentrate on the next stable release.
-
-*crystalspace-2.0_beta3-r3 (20 Apr 2012)
-
- 20 Apr 2012; Sven Eden <sven.eden@gmx.de>
- +crystalspace-2.0_beta3-r3.ebuild
- -crystalspace-2.0_beta3-r2.ebuild
- Instead of symlinking everything together, a new patch now fixes
- the borked cs-config-2.0 script.
-
-*crystalspace-2.0_beta3-r2 (20 Apr 2012)
-
- 20 Apr 2012; Sven Eden <sven.eden@gmx.de>
- +crystalspace-2.0_beta3-r2.ebuild
- -crystalspace-2.0_beta3-r1.ebuild
- Removed the notification about the light calculation. It is not advisable
- to do that being root in this version.
-
-*crystalspace-2.0_beta3-r1 (19 Apr 2012)
-
- 19 Apr 2012; Sven Eden <sven.eden@gmx.de>
- +crystalspace-2.0_beta3-r1.ebuild
- -crystalspace-2.0_beta3.ebuild
- Some urgent corrections regarding where to put what.
-
-*crystalspace-2.0_beta3 (16 Feb 2012)
-
- 16 Feb 2012; Sven Eden <sven.eden@gmx.de>
- +crystalspace-2.0_beta3.ebuild
- -crystalspace-1.9_pre9999-r5.ebuild
- -crystalspace-2.1_pre9999.ebuild
- Added new ebuild for the published official beta and removed obsolete ebuilds.
-
-*crystalspace-2.1_pre9999-r1 (11 May 2011)
-
- 11 May 2011; Sven Eden <sven.eden@gmx.de> +crystalspace-2.1_pre9999-r1.ebuild :
- Added ebuild fixing some details of how CS-2.1 seems to work now.
-
-*crystalspace-2.1_pre9999 (18 Apr 2011)
-
- 18 Apr 2011; Sven Eden <sven.eden@gmx.de> +crystalspace-2.1_pre9999.ebuild :
- Added ebuild for new versioning, upstream went to 2.1.
-
-*crystalspace-1.4.0-r2 (27 Mar 2011)
-
- 27 Mar 2011; Sven Eden <sven.eden@gmx.de> +crystalspace-1.4.0-r2.ebuild :
- Initial commit of the ebuild.
-
-*crystalspace-1.9_pre9999-r5 (27 Mar 2011)
-
- 27 Mar 2011; Sven Eden <sven.eden@gmx.de> +crystalspace-1.9_pre9999-r5.ebuild :
- Initial commit of the ebuild.
diff --git a/dev-games/crystalspace/Manifest b/dev-games/crystalspace/Manifest
deleted file mode 100644
index 68a9c36..0000000
--- a/dev-games/crystalspace/Manifest
+++ /dev/null
@@ -1,22 +0,0 @@
-AUX crystalspace-2.0-fix_ode_update_01.patch 683 SHA256 a6bcde1c687b53d7325edd3b60cc62bc078565702264cda2b2c235d2e3d6b7fc SHA512 43597469808195d096b3babb286d104dae44a37cd34549482076c84882f7665d6b6ef10931d07bb93201d174aca9830eb57f9e6439534a3f876e9ee2f50a0f16 WHIRLPOOL cdbd132c78a08b5d667d7c853300a3a3e533905f30b917d426257b96b3cbf6422a9fe17cebcc1a8b5df1548d66ac255043ac764b57c875eb093abfafb1d69ad7
-AUX crystalspace-2.0-fix_ode_update_02.patch 2126 SHA256 f7def2666181dd4e872993220905e4986e4943f427c3b88a14be96068685edd0 SHA512 a5d0e3e6a0ee03dbcf589e8375491eeffb1d0ee75f6e8811447283934f610b7c33a4ebec75a07ed4311588c347f5f370f2dbe304f115e5d7cb576776390c3297 WHIRLPOOL bbb51882547f3ea7156e6ce6826d91d882e0e7a221a97bc49cb489ff47338142d6b8bb9bebef260dfc08b93b69cd43e2a7085b77b9e7d2202b214361174cb845
-AUX crystalspace-2.0-fix_ode_update_03.patch 378 SHA256 a314def6c6b6c44e3f251c97b161e8251e7cd90c72a9715fa9c6bd399125cbf7 SHA512 60f983f963527497088095009a0470a959884d4ea31a68e606efe10d9b8872a7a8d1caeb5e9276a335ad2a8982585788711ab20e10b934e0960650b08855f795 WHIRLPOOL 45d563bc94364113c4fc9773c9883aaef9e80a6bf848a34462cd53e93c12b826d3baf0005b65d7f8566fe1e7d62b9fd3b8bec60663f570001515b927c8a9ef1d
-AUX crystalspace-2.0-fix_ode_update_04.patch 1592 SHA256 bb63ef180ea8fae6b5cc8fffde28b71093014198819c098483206642e6039d90 SHA512 d350f1ad4da6e199a2d61962cc9e63f591dba3203beeb8b0ff9336d5da9dc9b5752655f7fe5a094f88cfa1ea9e69421f87ce9526f2d13607e2624feb53e57a9d WHIRLPOOL 9f0883aee5dc73e4a140d015d4ae1203a30a0aa55d8edaa6d615cc62e04c32b183d77a1637da3aed91c1809f35b76bf4a775a78e30f3676dbd44afc28c9d3107
-AUX crystalspace-2.0-fix_ode_update_05.patch 1615 SHA256 9d1d440c222aad0fb4d6d08f1af428ba097c7dbbe07d6de80c92a14c3ee6a12c SHA512 3ddb0562698d5dde993b413641b40138441737a3e3cdde88acbb2f8a5f4ee2ced7ddc47448f075a9cac9043c092bad8117db1e18806bfb53e1642b8cc204fd72 WHIRLPOOL 73ff9db12a2865697677084a6b98e9e14643169412315fce3c0ce4ab4fdcd989a9d7c7176f04a25d061d771adc444c8606f0726d111c238a79188799d2641136
-AUX crystalspace-2.0-fix_ode_update_06.patch 1229 SHA256 af6457abf14e616c75902c982df53ae75b3f7e8c8bab67de8c8974460e97d663 SHA512 f8e580d6c4d95cf88645d11a596ab30be3fc5ddc31b7d30b9f0192ec163a8830bf86009ff0572cd1cd62093e0d748b4bde29ad24d91ac9bb57fae55a141df4e3 WHIRLPOOL 7798229e700cbbb0ebf099390c079357bb0cb2bcf8432f05a4a78b1500cfabe41237e680467c3e613808f0cf8d730258a075ea959a8bf46bf9aedd82f5af7dcd
-AUX crystalspace-2.0-fix_ode_update_07.patch 1482 SHA256 46d0293d648ce3243a873995423d6209c6957ab06a62ce6a6bcf3f4ad88ad751 SHA512 2e9f726a4690e533f1ef61d3d66a8118d47f0156411cf2340450bd90907016f87b8c7e9c22827d805ec4e7e443f5f781c974ffa78d155e26f0b262ecbde33973 WHIRLPOOL 6df7cb273515cbcfd4957df7d4036b9630e74905de53532d62de238c1843aab66018e432183408111017a62d488fcf9aaf87f5a65adbc91dd322ed9e01a18270
-AUX crystalspace-2.0-fix_ode_update_08.patch 10560 SHA256 24b28426024a96f71d873918d71dd45f4c9d719ab95899eec3aece89ee565fde SHA512 fd52afda96a0e7e0c98b741782421eb696e78d903051c98fd581837735af9232751fd83e9ac1952605d02a28a2c175d431fd9710273297f8f800a2d1bd0a8b92 WHIRLPOOL b3489677f7232917cad0a3cc669eb7d7c27781030b080e056260cc5fa9ea5e524762ce9de075726bf823b90f09fe3c0c7ca06d7599f42c35a41a2180b57d4c72
-AUX crystalspace-2.0-fix_ode_update_09.patch 4361 SHA256 8c0210f90e5b9055d6b21e7e470d46bb21181e7f68bfc283abf88e6ce33606d1 SHA512 66dad7c309299d22fa7a8fb0207fa2b7768a741505e19b2490199af31aa0a70b032f19366b1c2446bf0ff7a5ec3a1854bf58d2ba484124ab129b5bc99d9084be WHIRLPOOL 9e58c528ea6cbdfc28ad58ac2ce5912a6248301a993c3260016acc8e478db39d4585cafb1a3982c2a728807b36322a9ec55bf5fe0e18b18bea3b7bdeb2a6d766
-AUX crystalspace-2.0-fix_ode_update_10.patch 428 SHA256 06e52aeeca805dec8c1f1baae228679f06764ca6be1271b8b8db505a39b48af4 SHA512 f64198b77723ce8db11dd815ed1f39ec98ce7a9863157f7b290c55a315a3ceb11e9234bfddd2f4f25560faf93d4e04ec2bfec510ac22fac5316a0160c6f71edd WHIRLPOOL 11a90dbbcfc65a415ee3ba66c4bb387f03119f637c5e5598e559f45e3ceeaa8e3f9d602840f33b812561db1c5897393906d528bd458a7bef68678ef5ec8141ed
-AUX crystalspace-2.0-fix_ode_update_11.patch 4583 SHA256 d1c2f7ebf40aa9ed821cb6584cd8e95397c73713ef7241ac99eab80c529503ac SHA512 eb5a6d4de3e8c7bcf8ae8f2e81528d880669aa3a78a4a6c1583b1542994fe49b3d744512720be1a02ba44df87f8141d5e07746bd318948a06a61219d6980d0ce WHIRLPOOL 127711f6a54e4ff7a4d3c088df08e8e4569efa5543554d02e81a8d43977e4b464159c1bc62ae53cd2c48b6316b88e4477483715c23a99ddf4924ec7f2265f87d
-AUX crystalspace-2.0-fix_ode_update_12.patch 2496 SHA256 e98092ca53a28fdd02d15fcb54d305378ed21af1ea4d8c57bca5fc5231916e78 SHA512 ed5d7f2b7a23336864f598d51f34403afbd9fb2d615e9f35fd7fe44464f68e169aadb9f39e83aaf7dd47bb3e62f1c6df0b104ca7ec8762ecda4d4dde7bc92703 WHIRLPOOL 291e26b58c8c8f787814fab98be42d9ad862176b5e6cbaf06208535a8ec45d9188841a3703bbdc7c436c011e0278b2ba11b7bda8ca04d2dc0b54e49cabe1cc2d
-AUX crystalspace-2.0-fix_ode_update_13.patch 1988 SHA256 e865e1616bc4ac4728066bc58686f8ef7aad3764db0867b6aaf31aec52ad6aa7 SHA512 cd88a5a479944b7969ff738208b720a4f283dbeecee7573bcc2d767a0a91c7d8085e0ba806c819c4afb6fce2ecbe0b1839d5e6207466950b3eaa42034c4655de WHIRLPOOL 27cd936d02942d278ca62e7f6e8d85480f079c2d50e1c4d48950311632771383e78ff10cc11dea8587fcc2d8c12646124e702195827287a79c3581806e3a946a
-AUX crystalspace-2.0-fix_unqualified_calls_01.patch 367 SHA256 5750d296437282df3d8bed735f2495148583da659d6801a97a89d8ada99e8000 SHA512 672f503bef9bc8919453ccb86e04874d5d4bbd7a9502cf773b2313bd3ae3e778e60f90ff0358b9561759f9abe2a01eb4aefa6cc3ffa26c1dfd15e7d91a4fe83d WHIRLPOOL d32b3562a573c0ccad71b179b4f58aa7b69cd49e34d6af34232d0adc8a73fa541f767ac268f260274321e554856d852a7749fc10e5a113fbf2365bfe0a251868
-AUX crystalspace-2.0-fix_unqualified_calls_02.patch 627 SHA256 af9e24971436b5ee0976c7635f857b57b65901efb1cb783e942a8380e0207974 SHA512 94d4a5b8105b914dd76bb7d237746a244461f81c39fc4ce3fd2c8d2123c53e1fd554fd888599732885205fde35bb73c00394c3afb2adb4f9da79b3176ae84ba2 WHIRLPOOL 273a6fd0e35cdbcd441a6b329d8e21e80e33bf4993217021f7f303f199fa79e72ff7707f135ae4b2e0fd9e1934bd011961f5a426161827caaec11904d6eef4c4
-AUX crystalspace-2.0-fix_unqualified_calls_03.patch 363 SHA256 0f5e3fdbb9935614da834be6910ee86afdc387a5d11c793918d04e7bed579b63 SHA512 186dddbcb56e0d6ff5f75695f5dfb3340c8e966e351d1a452a1fc110908622a68f497b82a54cb8ba7baf98015ead413b5f51a9b7d9e51a65f59824d83d5251b3 WHIRLPOOL 7ca3a0e0697ead4679733543b96ffba0065b842ecd500d126c537b5a7bc4ab653e7ed5591c1f46ef9eded697ff53c7540d87d258cf0bdf9ee30b60a913c7771e
-AUX crystalspace-2.0-fix_unqualified_calls_04.patch 773 SHA256 f766f1679da0e01bbc964acaf927a9443d4b46fc4e12e0a2d181b19a73aa9aad SHA512 a1cab0dd2f5ba5c280272b324363f8ebb0c87d1afbb70d180cfc54d970c3252be8c0c27bae29a45e8643528249ae40d6e6ee6e1e0b792eb3d19f062f6b12bf7b WHIRLPOOL d96bf5f3400a4d288429a0199ac293937a1c5862cd7595e4dda621b82479c480367f5458d4786f4c0582acde21a70de3393b97179d4aa5ebc9d3d3b06cbcad10
-AUX crystalspace-2.0-fix_unqualified_calls_05.patch 1195 SHA256 df6093e6150e8285ce56bf8107dc5d696e1fd954a4065fa76b3e1a152fe274dd SHA512 0f11df14cc44207d6fd042dc472eb1f846885f893c72c28cdaa11ff4891b37249c4837c58b9105adbee7147f31d7763c75f8774ab683a99f6296f633d27bf53b WHIRLPOOL 3aa49c5898d0fe507c8332e833d4fddd2e2e67a2891ad675ee79a19d763914ef2acf6bf9fe81d0339990526c05a80d2c981d1e1980f20cdac68dfd4cd202fa8b
-DIST crystalspace-src-2.0.tar.bz2 185925180 SHA256 f1cda74fd998e44088746803209b1ea6625e80e3d4fb72023d8bed6b677b7b6a SHA512 f09d40669268e26542a2854560ac5033e7f89d0bd5def870e5062e08611c36a0875666abe0c705bb5f9f37dafa619f33f900e358d5fe255746a86127a3899f97 WHIRLPOOL a1705cb88b64eb0e8f6a146c2a75baab01aa598d07b8d36ab0671a47d4092b5c9b53c13f46bb1e56663b2b228c4b95cee3a355554c1de92c3d931187e97c4ca1
-EBUILD crystalspace-2.0-r3.ebuild 5178 SHA256 fe5e0a4279bf9c6be3a41a19046c3a51a0391b4b27c7010d093ef39745848485 SHA512 cad94f9563655f817d20aab88f0b031b8a5dde53f74a629b63ebb8edd8c241015619a75310b14bae12097dbfbb9b552451522900b90ae7b22f34c224972d0691 WHIRLPOOL 64d87c20cb4440b401e2e3acf1acdce0d8bb5b46ae1ac7efa64f01fba0b602e362b5166ba61e51d9b9653c9bfba835d42049adf531e828b87d203f0d3fc400e7
-MISC ChangeLog 6377 SHA256 66ec00eacac342ad41cbb95d94ae09808b6b76359f3c9836fb083a56c74844ca SHA512 b8ce790771a4c30ed0d1e184d94b37c059426c981cc1b9c04d8f5786bcbd292717a3741b196d63d4fff67ba07408de8dd96f6eb11bcb98a44bb21254a302511b WHIRLPOOL b77dd667dedc53f5ee42fb73fe8e0a35b1b263299fd3f0f299dc03392ae8c898ca221aa81988475ca6555a6ee04e1ecf3ce55ff5941f48f3068ba55c3b927552
-MISC metadata.xml 899 SHA256 86458140e4cc5d3848946e4bb432fc22f18f09b23fe6e0b952932a18d4c6dd3f SHA512 0e0f2b794d8194b21c2fa170e54fa6b8a4231a2f7def1b66f995e238b787db07b4702d9aae913c8695d57c7f6325adccbcd1caddd4298e9c70f678e763a3c5e3 WHIRLPOOL 990560e3932f43871364a0cef5fd7bb449dbb3963dfbac2c701ed2af67ad41f548fe1c429966a7132cf668fb1cdadd0dca6f231ccb6502b8bff7b2926b4d42f1
diff --git a/dev-games/crystalspace/crystalspace-2.0-r3.ebuild b/dev-games/crystalspace/crystalspace-2.0-r3.ebuild
deleted file mode 100644
index d3c8971..0000000
--- a/dev-games/crystalspace/crystalspace-2.0-r3.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit autotools eutils flag-o-matic multilib java-pkg-opt-2 wxwidgets versionator
-
-MY_PV=$(get_version_component_range 1-2)
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Portable 3D Game Development Kit written in C++"
-HOMEPAGE="http://www.crystalspace3d.org/"
-SRC_URI="http://www.crystalspace3d.org/downloads/release/${PN}-src-${MY_PV}.tar.bz2"
-RESTRICT="mirror"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
-IUSE="3ds alsa bullet cal3d cegui cg debug doc java jpeg lcms mng ode \
- perl png +python static-plugins speex truetype vorbis wxwidgets +X"
-
-SLOT="0"
-
-COMMON_DEP="virtual/opengl
- media-libs/openal
- x11-libs/libXt
- x11-libs/libXxf86vm
- cg? ( media-gfx/nvidia-cg-toolkit )
- ode? ( >=dev-games/ode-0.12 )
- cal3d? ( >=media-libs/cal3d-0.11 )
- jpeg? ( media-libs/jpeg )
- bullet? ( sci-physics/bullet )
- vorbis? ( media-libs/libvorbis )
- speex? ( media-libs/libogg
- media-libs/speex )
- truetype? ( >=media-libs/freetype-2.1 )
- alsa? ( media-libs/alsa-lib )
- mng? ( media-libs/libmng )
- png? ( media-libs/libpng )
- wxwidgets? ( x11-libs/wxGTK:2.8[X,opengl] )
- cegui? ( >=dev-games/cegui-0.5.0 )
- 3ds? ( media-libs/lib3ds )"
-
-RDEPEND="${COMMON_DEP}
- java? ( >=virtual/jre-1.5 )"
-
-DEPEND="${COMMON_DEP}
- java? ( >=virtual/jdk-1.5
- dev-java/ant-core )
- dev-lang/swig
- dev-util/pkgconfig
- dev-util/ftjam"
-
-S=${WORKDIR}/${PN}-src-${MY_PV}
-
-src_prepare() {
- # The new ode version no longer has the StepFast API, so patch this
- # code (experimental anyway) out:
- epatch "${FILESDIR}"/${MY_P}-fix_ode_update_01.patch
- epatch "${FILESDIR}"/${MY_P}-fix_ode_update_02.patch
- epatch "${FILESDIR}"/${MY_P}-fix_ode_update_03.patch
- epatch "${FILESDIR}"/${MY_P}-fix_ode_update_04.patch
- epatch "${FILESDIR}"/${MY_P}-fix_ode_update_05.patch
- epatch "${FILESDIR}"/${MY_P}-fix_ode_update_06.patch
- epatch "${FILESDIR}"/${MY_P}-fix_ode_update_07.patch
- epatch "${FILESDIR}"/${MY_P}-fix_ode_update_08.patch
- epatch "${FILESDIR}"/${MY_P}-fix_ode_update_09.patch
- epatch "${FILESDIR}"/${MY_P}-fix_ode_update_10.patch
- epatch "${FILESDIR}"/${MY_P}-fix_ode_update_11.patch
- epatch "${FILESDIR}"/${MY_P}-fix_ode_update_12.patch
- epatch "${FILESDIR}"/${MY_P}-fix_ode_update_13.patch
-
- # Some calls to class methods are unqualified from their
- # scope. gcc-4.7+ would need -fpermissive flag to allow
- # this, so repair the calls:
- epatch "${FILESDIR}"/${MY_P}-fix_unqualified_calls_01.patch
- epatch "${FILESDIR}"/${MY_P}-fix_unqualified_calls_02.patch
- epatch "${FILESDIR}"/${MY_P}-fix_unqualified_calls_03.patch
- epatch "${FILESDIR}"/${MY_P}-fix_unqualified_calls_04.patch
- epatch "${FILESDIR}"/${MY_P}-fix_unqualified_calls_05.patch
-
- # Installing doc conflict with dodoc on src_install
- # Removing conflicting target
- sed -i \
- -e "/^InstallDoc/d" \
- Jamfile.in \
- docs/Jamfile \
- || die "sed failed"
-
- AT_M4DIR=mk/autoconf
- eautoreconf
-}
-
-src_configure() {
- local myconf
-
- if use wxwidgets ; then
- WX_GTK_VER="2.8"
- need-wxwidgets gtk2
- fi
-
- # debug profile and optimize are mutually exclusive
- if use debug ; then
- myconf="--enable-debug"
- else
- myconf="--enable-optimize --enable-cpu-specific-optimizations=native"
- fi
-
- myconf="${myconf} --without-jackasyn --disable-make-emulation \
- $(use_with truetype freetype2) \
- $(use_with wxwidgets wx) \
- $(use_with wxwidgets GTK) \
- $(use_with cegui CEGUI) \
- $(use_with cg Cg) \
- $(use_with cg CgGL) \
- $(use_with alsa asound) \
- $(use_with X x)"
- for myuse in java bullet lcms png jpeg mng perl python vorbis speex 3ds ode cal3d; do
- myconf="${myconf} $(use_with ${myuse})"
- done
- econf ${myconf} || die "configure failed."
-}
-
-src_compile() {
- local jamopts=$(echo "${MAKEOPTS}" | sed -ne "/-j/ { s/.*\(-j[[:space:]]*[0-9]\+\).*/\1/; p }")
- jam -q ${jamopts} || die "compile failed (jam -q ${jamopts})"
-
- if use static-plugins; then
- jam -q ${jamopts} staticplugins \
- || die "staticplugins compile failed (jam -q ${jamopts})"
- fi
-}
-
-src_install() {
- for installTarget in bin bindings config data include lib plugin
- do
- jam -q -s DESTDIR="${D}" install_${installTarget} \
- || die "jam install_${installTarget} failed"
- done
-
- # install static-plugins if wanted
- if use static-plugins; then
- jam -q -s DESTDIR="${D}" install_staticplugins \
- || die "jam install_staticplugins failed"
- fi
-
- # install documentation if wanted
- if use doc; then
- jam -q -s DESTDIR="${D}" install_doc || die "jam install_doc failed"
- fi
-
- # As the target install_doc uses crystalspace-${MY_PV} as target, but dodoc
- # uses ${PF}, this said var has to be manipulated first.
- local oldPF=${PF}
- PF=${MY_P}
- dodoc README docs/history*
- PF=${oldPF}
-
- echo "CRYSTAL=/usr/share/${MY_P}" > 90crystalspace
- echo "CRYSTAL_PLUGIN=/usr/$(get_libdir)/${MY_P}" >> 90crystalspace
- echo "CRYSTAL_CONFIG=/etc/${MY_P}" >> 90crystalspace
- doenvd 90crystalspace
-
- # Applications that do not read CRYSTAL_CONFIG need vfs.cfg in $CRYSTAL:
- dosym /etc/${MY_P}/vfs.cfg /usr/share/${MY_P}/vfs.cfg
-
- # Applications that do not read CRYSTAL_PLUGIN need the libdir in $CRYSTAL:
- dosym /usr/$(get_libdir)/${MY_P} /usr/share/${MY_P}/libs
-}
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_01.patch b/dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_01.patch
deleted file mode 100644
index 2e80054..0000000
--- a/dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_01.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- plugins/physics/odedynam/odedynam.cpp 2012-01-14 04:39:50.000000000 +0100
-+++ plugins/physics/odedynam/odedynam.cpp 2012-07-13 09:38:15.254617788 +0200
-@@ -798,20 +798,13 @@
- while (total_elapsed > stepsize)
- {
- total_elapsed -= stepsize;
-- if (!stepfast)
-+ if (!quickstep)
- {
-- if (!quickstep)
-- {
-- dWorldStep (worldID, stepsize);
-- }
-- else
-- {
-- dWorldQuickStep (worldID, stepsize);
-- }
-+ dWorldStep (worldID, stepsize);
- }
- else
- {
-- dWorldStepFast1 (worldID, stepsize, sfiter);
-+ dWorldQuickStep (worldID, stepsize);
- }
- for (size_t i = 0; i < bodies.GetSize (); i ++)
- {
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_02.patch b/dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_02.patch
deleted file mode 100644
index 15c93a7..0000000
--- a/dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_02.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- apps/tutorial/phystut/phystut.cpp 2012-01-14 04:39:47.000000000 +0100
-+++ apps/tutorial/phystut/phystut.cpp 2012-07-13 09:50:04.941321137 +0200
-@@ -204,7 +204,7 @@
- if (solver==0)
- hudManager->GetStateDescriptions ()->Push (csString ("Solver: WorldStep"));
- else if (solver==1)
-- hudManager->GetStateDescriptions ()->Push (csString ("Solver: StepFast"));
-+ hudManager->GetStateDescriptions ()->Push (csString ("Solver: QuickStep"));
- else if (solver==2)
- hudManager->GetStateDescriptions ()->Push (csString ("Solver: QuickStep"));
- }
-@@ -471,27 +471,9 @@
- return true;
- }
-
-- else if (csKeyEventHelper::GetCookedCode (&ev) == '1'
-- && phys_engine_id == ODE_ID)
-- {
-- // Toggle stepfast.
-- csRef<iODEDynamicSystemState> osys =
-- scfQueryInterface<iODEDynamicSystemState> (dynamicSystem);
-- osys->EnableStepFast (0);
-- solver=0;
-- return true;
-- }
-- else if (csKeyEventHelper::GetCookedCode (&ev) == '2'
-- && phys_engine_id == ODE_ID)
-- {
-- // Toggle stepfast.
-- csRef<iODEDynamicSystemState> osys =
-- scfQueryInterface<iODEDynamicSystemState> (dynamicSystem);
-- osys->EnableStepFast (1);
-- solver=1;
-- return true;
-- }
-- else if (csKeyEventHelper::GetCookedCode (&ev) == '3'
-+ else if ( ( (csKeyEventHelper::GetCookedCode (&ev) == '1')
-+ || (csKeyEventHelper::GetCookedCode (&ev) == '2')
-+ || (csKeyEventHelper::GetCookedCode (&ev) == '3') )
- && phys_engine_id == ODE_ID)
- {
- // Toggle quickstep.
-@@ -992,8 +974,8 @@
- hudManager->GetKeyDescriptions ()->Push ("I: toggle autodisable");
- if (phys_engine_id == ODE_ID)
- {
-- hudManager->GetKeyDescriptions ()->Push ("1: enable StepFast solver");
-- hudManager->GetKeyDescriptions ()->Push ("2: disable StepFast solver");
-+ hudManager->GetKeyDescriptions ()->Push ("1: enable QuickStep solver");
-+ hudManager->GetKeyDescriptions ()->Push ("2: enable QuickStep solver");
- hudManager->GetKeyDescriptions ()->Push ("3: enable QuickStep solver");
- }
- #ifdef CS_HAVE_BULLET_SERIALIZER
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_03.patch b/dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_03.patch
deleted file mode 100644
index e88cacd..0000000
--- a/dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_03.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/physics/loader/physldr.cpp 2012-01-14 04:39:50.000000000 +0100
-+++ plugins/physics/loader/physldr.cpp 2012-07-13 09:52:14.424661375 +0200
-@@ -341,7 +341,7 @@
- osys->EnableStepFast(false);
- break;
- case XMLTOKEN_STEPFAST:
-- osys->EnableStepFast(true);
-+ osys->EnableQuickStep(true);
- break;
- case XMLTOKEN_QUICKSTEP:
- osys->EnableQuickStep(true);
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_04.patch b/dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_04.patch
deleted file mode 100644
index 8d65011..0000000
--- a/dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_04.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- plugins/physics/odedynam/odedynam.h 2012-01-14 04:39:50.000000000 +0100
-+++ plugins/physics/odedynam/odedynam.h 2012-07-13 09:54:04.331333777 +0200
-@@ -142,7 +142,6 @@
-
- csRefArray<iDynamicsStepCallback> step_callbacks;
-
-- bool stepfast;
- int sfiter;
- bool quickstep;
- int qsiter;
-@@ -189,10 +188,6 @@
- void SetGlobalCFM (float cfm);
- float GlobalCFM () { return cfm; }
-
-- void EnableStepFast (bool enable);
-- bool StepFastEnabled () { return stepfast; }
-- void SetStepFastIterations (int iter);
-- int StepFastIterations () { return sfiter; }
- void EnableQuickStep (bool enable);
- bool QuickStepEnabled () { return quickstep; };
- void SetQuickStepIterations (int iter);
-@@ -275,7 +270,6 @@
- float total_elapsed;
- csRefArrayObject<iODEFrameUpdateCallback> updates;
-
-- bool stepfast;
- int sfiter;
- bool quickstep;
- int qsiter;
-@@ -291,11 +285,7 @@
- float ERP () { return dWorldGetERP (worldID); }
- void SetCFM (float cfm) { dWorldSetCFM (worldID, cfm); }
- float CFM () { return dWorldGetCFM (worldID); }
-- void EnableStepFast (bool enable) { stepfast = enable; quickstep = false; };
-- bool StepFastEnabled () { return stepfast; }
-- void SetStepFastIterations (int iter) { sfiter = iter; }
-- int StepFastIterations () { return sfiter; }
-- void EnableQuickStep (bool enable) { quickstep = enable; stepfast = false; };
-+ void EnableQuickStep (bool enable) { quickstep = enable; };
- bool QuickStepEnabled () { return quickstep; };
- void SetQuickStepIterations (int iter) { qsiter = iter; };
- int QuickStepIterations () { return qsiter; }
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_05.patch b/dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_05.patch
deleted file mode 100644
index d8c6a81..0000000
--- a/dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_05.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- plugins/physics/odedynam/odedynam.cpp 2012-07-13 09:38:15.000000000 +0200
-+++ plugins/physics/odedynam/odedynam.cpp 2012-07-13 09:55:26.401338100 +0200
-@@ -206,8 +206,6 @@
- limittime = 1.0f;
- total_elapsed = 0.0f;
-
-- stepfast = false;
-- sfiter = 10;
- quickstep = false;
- qsiter = 10;
- fastobjects = false;
-@@ -285,8 +283,7 @@
- csRef<csODEDynamicSystem> system;
- system.AttachNew (new csODEDynamicSystem (object_reg, erp, cfm));
- systems.Push (system);
-- if(stepfast) system->EnableStepFast(true);
-- else if(quickstep) system->EnableQuickStep(true);
-+ if(quickstep) system->EnableQuickStep(true);
- return csPtr<iDynamicSystem> (system);
- }
-
-@@ -494,35 +491,9 @@
- }
- }
-
--void csODEDynamics::EnableStepFast (bool enable)
--{
-- stepfast = enable;
-- quickstep = false;
--
-- for (size_t i = 0; i < systems.GetSize (); i ++)
-- {
-- csRef<iODEDynamicSystemState> sys =
-- scfQueryInterface<iODEDynamicSystemState> (systems[i]);
-- sys->EnableStepFast (enable);
-- }
--}
--
--void csODEDynamics::SetStepFastIterations (int iter)
--{
-- sfiter = iter;
--
-- for (size_t i = 0; i < systems.GetSize (); i ++)
-- {
-- csRef<iODEDynamicSystemState> sys =
-- scfQueryInterface<iODEDynamicSystemState> (systems[i]);
-- sys->SetStepFastIterations (iter);
-- }
--}
--
- void csODEDynamics::EnableQuickStep (bool enable)
- {
- quickstep = enable;
-- stepfast = false;
-
- for (size_t i = 0; i < systems.GetSize (); i ++)
- {
-@@ -621,8 +592,6 @@
- steptime = 0.01f;
- limittime = 1.0f;
-
-- stepfast = false;
-- sfiter = 10;
- quickstep = false;
- qsiter = 10;
- fastobjects = false;
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_06.patch b/dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_06.patch
deleted file mode 100644
index 0a4c8f2..0000000
--- a/dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_06.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- include/ivaria/ode.h 2012-01-14 04:41:01.000000000 +0100
-+++ include/ivaria/ode.h 2012-07-13 09:57:20.284677366 +0200
-@@ -56,12 +56,6 @@
- virtual void SetGlobalCFM (float cfm) = 0;
- virtual float GlobalCFM () = 0;
-
-- /// Enables the experimental StepFast code in ode
-- virtual void EnableStepFast (bool enable) = 0;
-- virtual bool StepFastEnabled () = 0;
-- virtual void SetStepFastIterations (int iter) = 0;
-- virtual int StepFastIterations () = 0;
--
- virtual void EnableQuickStep (bool enable) = 0;
- virtual bool QuickStepEnabled () = 0;
- virtual void SetQuickStepIterations (int iter) = 0;
-@@ -151,16 +145,6 @@
- virtual void SetCFM (float cfm) = 0;
- virtual float CFM () = 0;
-
-- /**
-- * Enables the experimental StepFast code in ode
-- * Setting this in ODEDynamicState sets it here
-- * Only modify it if you want a specific system to behave differently
-- */
-- virtual void EnableStepFast (bool enable) = 0;
-- virtual bool StepFastEnabled () = 0;
-- virtual void SetStepFastIterations (int iter) = 0;
-- virtual int StepFastIterations () = 0;
--
- virtual void EnableQuickStep (bool enable) = 0;
- virtual bool QuickStepEnabled () = 0;
- virtual void SetQuickStepIterations (int iter) = 0;
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_07.patch b/dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_07.patch
deleted file mode 100644
index 4d5fe38..0000000
--- a/dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_07.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- scripts/perl5/cspace.pm 2012-01-14 04:39:45.000000000 +0100
-+++ scripts/perl5/cspace.pm 2012-07-13 09:58:28.784680943 +0200
-@@ -7615,10 +7615,6 @@
- *GlobalERP = *cspacec::iODEDynamicState_GlobalERP;
- *SetGlobalCFM = *cspacec::iODEDynamicState_SetGlobalCFM;
- *GlobalCFM = *cspacec::iODEDynamicState_GlobalCFM;
--*EnableStepFast = *cspacec::iODEDynamicState_EnableStepFast;
--*StepFastEnabled = *cspacec::iODEDynamicState_StepFastEnabled;
--*SetStepFastIterations = *cspacec::iODEDynamicState_SetStepFastIterations;
--*StepFastIterations = *cspacec::iODEDynamicState_StepFastIterations;
- *EnableQuickStep = *cspacec::iODEDynamicState_EnableQuickStep;
- *QuickStepEnabled = *cspacec::iODEDynamicState_QuickStepEnabled;
- *SetQuickStepIterations = *cspacec::iODEDynamicState_SetQuickStepIterations;
-@@ -7671,10 +7667,6 @@
- *ERP = *cspacec::iODEDynamicSystemState_ERP;
- *SetCFM = *cspacec::iODEDynamicSystemState_SetCFM;
- *CFM = *cspacec::iODEDynamicSystemState_CFM;
--*EnableStepFast = *cspacec::iODEDynamicSystemState_EnableStepFast;
--*StepFastEnabled = *cspacec::iODEDynamicSystemState_StepFastEnabled;
--*SetStepFastIterations = *cspacec::iODEDynamicSystemState_SetStepFastIterations;
--*StepFastIterations = *cspacec::iODEDynamicSystemState_StepFastIterations;
- *EnableQuickStep = *cspacec::iODEDynamicSystemState_EnableQuickStep;
- *QuickStepEnabled = *cspacec::iODEDynamicSystemState_QuickStepEnabled;
- *SetQuickStepIterations = *cspacec::iODEDynamicSystemState_SetQuickStepIterations;
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_08.patch b/dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_08.patch
deleted file mode 100644
index 4d4a405..0000000
--- a/dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_08.patch
+++ /dev/null
@@ -1,298 +0,0 @@
---- scripts/perl5/cswigpl5.inc 2012-01-14 04:39:44.000000000 +0100
-+++ scripts/perl5/cswigpl5.inc 2012-07-13 10:01:29.328023720 +0200
-@@ -151643,136 +151643,6 @@
- }
-
-
--XS(_wrap_iODEDynamicState_EnableStepFast) {
-- {
-- iODEDynamicState *arg1 = (iODEDynamicState *) 0 ;
-- bool arg2 ;
-- void *argp1 = 0 ;
-- int res1 = 0 ;
-- bool val2 ;
-- int ecode2 = 0 ;
-- int argvi = 0;
-- dXSARGS;
--
-- if ((items < 2) || (items > 2)) {
-- SWIG_croak("Usage: iODEDynamicState_EnableStepFast(self,enable);");
-- }
-- res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_iODEDynamicState, 0 | 0 );
-- if (!SWIG_IsOK(res1)) {
-- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "iODEDynamicState_EnableStepFast" "', argument " "1"" of type '" "iODEDynamicState *""'");
-- }
-- arg1 = reinterpret_cast< iODEDynamicState * >(argp1);
-- ecode2 = SWIG_AsVal_bool SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
-- if (!SWIG_IsOK(ecode2)) {
-- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "iODEDynamicState_EnableStepFast" "', argument " "2"" of type '" "bool""'");
-- }
-- arg2 = static_cast< bool >(val2);
-- (arg1)->EnableStepFast(arg2);
--
--
--
-- XSRETURN(argvi);
-- fail:
--
--
-- SWIG_croak_null();
-- }
--}
--
--
--XS(_wrap_iODEDynamicState_StepFastEnabled) {
-- {
-- iODEDynamicState *arg1 = (iODEDynamicState *) 0 ;
-- void *argp1 = 0 ;
-- int res1 = 0 ;
-- int argvi = 0;
-- bool result;
-- dXSARGS;
--
-- if ((items < 1) || (items > 1)) {
-- SWIG_croak("Usage: iODEDynamicState_StepFastEnabled(self);");
-- }
-- res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_iODEDynamicState, 0 | 0 );
-- if (!SWIG_IsOK(res1)) {
-- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "iODEDynamicState_StepFastEnabled" "', argument " "1"" of type '" "iODEDynamicState *""'");
-- }
-- arg1 = reinterpret_cast< iODEDynamicState * >(argp1);
-- result = (bool)(arg1)->StepFastEnabled();
-- ST(argvi) = SWIG_From_bool SWIG_PERL_CALL_ARGS_1(static_cast< bool >(result)); argvi++ ;
--
-- XSRETURN(argvi);
-- fail:
--
-- SWIG_croak_null();
-- }
--}
--
--
--XS(_wrap_iODEDynamicState_SetStepFastIterations) {
-- {
-- iODEDynamicState *arg1 = (iODEDynamicState *) 0 ;
-- int arg2 ;
-- void *argp1 = 0 ;
-- int res1 = 0 ;
-- int val2 ;
-- int ecode2 = 0 ;
-- int argvi = 0;
-- dXSARGS;
--
-- if ((items < 2) || (items > 2)) {
-- SWIG_croak("Usage: iODEDynamicState_SetStepFastIterations(self,iter);");
-- }
-- res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_iODEDynamicState, 0 | 0 );
-- if (!SWIG_IsOK(res1)) {
-- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "iODEDynamicState_SetStepFastIterations" "', argument " "1"" of type '" "iODEDynamicState *""'");
-- }
-- arg1 = reinterpret_cast< iODEDynamicState * >(argp1);
-- ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
-- if (!SWIG_IsOK(ecode2)) {
-- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "iODEDynamicState_SetStepFastIterations" "', argument " "2"" of type '" "int""'");
-- }
-- arg2 = static_cast< int >(val2);
-- (arg1)->SetStepFastIterations(arg2);
--
--
--
-- XSRETURN(argvi);
-- fail:
--
--
-- SWIG_croak_null();
-- }
--}
--
--
--XS(_wrap_iODEDynamicState_StepFastIterations) {
-- {
-- iODEDynamicState *arg1 = (iODEDynamicState *) 0 ;
-- void *argp1 = 0 ;
-- int res1 = 0 ;
-- int argvi = 0;
-- int result;
-- dXSARGS;
--
-- if ((items < 1) || (items > 1)) {
-- SWIG_croak("Usage: iODEDynamicState_StepFastIterations(self);");
-- }
-- res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_iODEDynamicState, 0 | 0 );
-- if (!SWIG_IsOK(res1)) {
-- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "iODEDynamicState_StepFastIterations" "', argument " "1"" of type '" "iODEDynamicState *""'");
-- }
-- arg1 = reinterpret_cast< iODEDynamicState * >(argp1);
-- result = (int)(arg1)->StepFastIterations();
-- ST(argvi) = SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(result)); argvi++ ;
--
-- XSRETURN(argvi);
-- fail:
--
-- SWIG_croak_null();
-- }
--}
--
--
- XS(_wrap_iODEDynamicState_EnableQuickStep) {
- {
- iODEDynamicState *arg1 = (iODEDynamicState *) 0 ;
-@@ -152477,136 +152347,6 @@
- }
-
-
--XS(_wrap_iODEDynamicSystemState_EnableStepFast) {
-- {
-- iODEDynamicSystemState *arg1 = (iODEDynamicSystemState *) 0 ;
-- bool arg2 ;
-- void *argp1 = 0 ;
-- int res1 = 0 ;
-- bool val2 ;
-- int ecode2 = 0 ;
-- int argvi = 0;
-- dXSARGS;
--
-- if ((items < 2) || (items > 2)) {
-- SWIG_croak("Usage: iODEDynamicSystemState_EnableStepFast(self,enable);");
-- }
-- res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_iODEDynamicSystemState, 0 | 0 );
-- if (!SWIG_IsOK(res1)) {
-- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "iODEDynamicSystemState_EnableStepFast" "', argument " "1"" of type '" "iODEDynamicSystemState *""'");
-- }
-- arg1 = reinterpret_cast< iODEDynamicSystemState * >(argp1);
-- ecode2 = SWIG_AsVal_bool SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
-- if (!SWIG_IsOK(ecode2)) {
-- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "iODEDynamicSystemState_EnableStepFast" "', argument " "2"" of type '" "bool""'");
-- }
-- arg2 = static_cast< bool >(val2);
-- (arg1)->EnableStepFast(arg2);
--
--
--
-- XSRETURN(argvi);
-- fail:
--
--
-- SWIG_croak_null();
-- }
--}
--
--
--XS(_wrap_iODEDynamicSystemState_StepFastEnabled) {
-- {
-- iODEDynamicSystemState *arg1 = (iODEDynamicSystemState *) 0 ;
-- void *argp1 = 0 ;
-- int res1 = 0 ;
-- int argvi = 0;
-- bool result;
-- dXSARGS;
--
-- if ((items < 1) || (items > 1)) {
-- SWIG_croak("Usage: iODEDynamicSystemState_StepFastEnabled(self);");
-- }
-- res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_iODEDynamicSystemState, 0 | 0 );
-- if (!SWIG_IsOK(res1)) {
-- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "iODEDynamicSystemState_StepFastEnabled" "', argument " "1"" of type '" "iODEDynamicSystemState *""'");
-- }
-- arg1 = reinterpret_cast< iODEDynamicSystemState * >(argp1);
-- result = (bool)(arg1)->StepFastEnabled();
-- ST(argvi) = SWIG_From_bool SWIG_PERL_CALL_ARGS_1(static_cast< bool >(result)); argvi++ ;
--
-- XSRETURN(argvi);
-- fail:
--
-- SWIG_croak_null();
-- }
--}
--
--
--XS(_wrap_iODEDynamicSystemState_SetStepFastIterations) {
-- {
-- iODEDynamicSystemState *arg1 = (iODEDynamicSystemState *) 0 ;
-- int arg2 ;
-- void *argp1 = 0 ;
-- int res1 = 0 ;
-- int val2 ;
-- int ecode2 = 0 ;
-- int argvi = 0;
-- dXSARGS;
--
-- if ((items < 2) || (items > 2)) {
-- SWIG_croak("Usage: iODEDynamicSystemState_SetStepFastIterations(self,iter);");
-- }
-- res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_iODEDynamicSystemState, 0 | 0 );
-- if (!SWIG_IsOK(res1)) {
-- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "iODEDynamicSystemState_SetStepFastIterations" "', argument " "1"" of type '" "iODEDynamicSystemState *""'");
-- }
-- arg1 = reinterpret_cast< iODEDynamicSystemState * >(argp1);
-- ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
-- if (!SWIG_IsOK(ecode2)) {
-- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "iODEDynamicSystemState_SetStepFastIterations" "', argument " "2"" of type '" "int""'");
-- }
-- arg2 = static_cast< int >(val2);
-- (arg1)->SetStepFastIterations(arg2);
--
--
--
-- XSRETURN(argvi);
-- fail:
--
--
-- SWIG_croak_null();
-- }
--}
--
--
--XS(_wrap_iODEDynamicSystemState_StepFastIterations) {
-- {
-- iODEDynamicSystemState *arg1 = (iODEDynamicSystemState *) 0 ;
-- void *argp1 = 0 ;
-- int res1 = 0 ;
-- int argvi = 0;
-- int result;
-- dXSARGS;
--
-- if ((items < 1) || (items > 1)) {
-- SWIG_croak("Usage: iODEDynamicSystemState_StepFastIterations(self);");
-- }
-- res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_iODEDynamicSystemState, 0 | 0 );
-- if (!SWIG_IsOK(res1)) {
-- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "iODEDynamicSystemState_StepFastIterations" "', argument " "1"" of type '" "iODEDynamicSystemState *""'");
-- }
-- arg1 = reinterpret_cast< iODEDynamicSystemState * >(argp1);
-- result = (int)(arg1)->StepFastIterations();
-- ST(argvi) = SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(result)); argvi++ ;
--
-- XSRETURN(argvi);
-- fail:
--
-- SWIG_croak_null();
-- }
--}
--
--
- XS(_wrap_iODEDynamicSystemState_EnableQuickStep) {
- {
- iODEDynamicSystemState *arg1 = (iODEDynamicSystemState *) 0 ;
-@@ -399406,10 +399146,6 @@
- {"cspacec::iODEDynamicState_GlobalERP", _wrap_iODEDynamicState_GlobalERP},
- {"cspacec::iODEDynamicState_SetGlobalCFM", _wrap_iODEDynamicState_SetGlobalCFM},
- {"cspacec::iODEDynamicState_GlobalCFM", _wrap_iODEDynamicState_GlobalCFM},
--{"cspacec::iODEDynamicState_EnableStepFast", _wrap_iODEDynamicState_EnableStepFast},
--{"cspacec::iODEDynamicState_StepFastEnabled", _wrap_iODEDynamicState_StepFastEnabled},
--{"cspacec::iODEDynamicState_SetStepFastIterations", _wrap_iODEDynamicState_SetStepFastIterations},
--{"cspacec::iODEDynamicState_StepFastIterations", _wrap_iODEDynamicState_StepFastIterations},
- {"cspacec::iODEDynamicState_EnableQuickStep", _wrap_iODEDynamicState_EnableQuickStep},
- {"cspacec::iODEDynamicState_QuickStepEnabled", _wrap_iODEDynamicState_QuickStepEnabled},
- {"cspacec::iODEDynamicState_SetQuickStepIterations", _wrap_iODEDynamicState_SetQuickStepIterations},
-@@ -399432,10 +399168,6 @@
- {"cspacec::iODEDynamicSystemState_ERP", _wrap_iODEDynamicSystemState_ERP},
- {"cspacec::iODEDynamicSystemState_SetCFM", _wrap_iODEDynamicSystemState_SetCFM},
- {"cspacec::iODEDynamicSystemState_CFM", _wrap_iODEDynamicSystemState_CFM},
--{"cspacec::iODEDynamicSystemState_EnableStepFast", _wrap_iODEDynamicSystemState_EnableStepFast},
--{"cspacec::iODEDynamicSystemState_StepFastEnabled", _wrap_iODEDynamicSystemState_StepFastEnabled},
--{"cspacec::iODEDynamicSystemState_SetStepFastIterations", _wrap_iODEDynamicSystemState_SetStepFastIterations},
--{"cspacec::iODEDynamicSystemState_StepFastIterations", _wrap_iODEDynamicSystemState_StepFastIterations},
- {"cspacec::iODEDynamicSystemState_EnableQuickStep", _wrap_iODEDynamicSystemState_EnableQuickStep},
- {"cspacec::iODEDynamicSystemState_QuickStepEnabled", _wrap_iODEDynamicSystemState_QuickStepEnabled},
- {"cspacec::iODEDynamicSystemState_SetQuickStepIterations", _wrap_iODEDynamicSystemState_SetQuickStepIterations},
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_09.patch b/dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_09.patch
deleted file mode 100644
index d785629..0000000
--- a/dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_09.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- plugins/cscript/pyivaria/cs_ivaria.cpp 2012-01-14 04:39:52.000000000 +0100
-+++ plugins/cscript/pyivaria/cs_ivaria.cpp 2012-07-13 10:05:19.908035782 +0200
-@@ -23871,110 +23871,6 @@
- }
-
-
--SWIGINTERN PyObject *_wrap_iODEDynamicState_EnableStepFast(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-- PyObject *resultobj = 0;
-- iODEDynamicState *arg1 = (iODEDynamicState *) 0 ;
-- bool arg2 ;
-- void *argp1 = 0 ;
-- int res1 = 0 ;
-- bool val2 ;
-- int ecode2 = 0 ;
-- PyObject * obj0 = 0 ;
-- PyObject * obj1 = 0 ;
--
-- if(!PyArg_UnpackTuple(args,(char *)"iODEDynamicState_EnableStepFast",2,2,&obj0,&obj1)) SWIG_fail;
-- res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_iODEDynamicState, 0 | 0 );
-- if (!SWIG_IsOK(res1)) {
-- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "iODEDynamicState_EnableStepFast" "', argument " "1"" of type '" "iODEDynamicState *""'");
-- }
-- arg1 = reinterpret_cast< iODEDynamicState * >(argp1);
-- ecode2 = SWIG_AsVal_bool(obj1, &val2);
-- if (!SWIG_IsOK(ecode2)) {
-- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "iODEDynamicState_EnableStepFast" "', argument " "2"" of type '" "bool""'");
-- }
-- arg2 = static_cast< bool >(val2);
-- (arg1)->EnableStepFast(arg2);
-- resultobj = SWIG_Py_Void();
-- return resultobj;
--fail:
-- return NULL;
--}
--
--
--SWIGINTERN PyObject *_wrap_iODEDynamicState_StepFastEnabled(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-- PyObject *resultobj = 0;
-- iODEDynamicState *arg1 = (iODEDynamicState *) 0 ;
-- void *argp1 = 0 ;
-- int res1 = 0 ;
-- PyObject * obj0 = 0 ;
-- bool result;
--
-- if(!PyArg_UnpackTuple(args,(char *)"iODEDynamicState_StepFastEnabled",1,1,&obj0)) SWIG_fail;
-- res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_iODEDynamicState, 0 | 0 );
-- if (!SWIG_IsOK(res1)) {
-- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "iODEDynamicState_StepFastEnabled" "', argument " "1"" of type '" "iODEDynamicState *""'");
-- }
-- arg1 = reinterpret_cast< iODEDynamicState * >(argp1);
-- result = (bool)(arg1)->StepFastEnabled();
-- resultobj = SWIG_From_bool(static_cast< bool >(result));
-- return resultobj;
--fail:
-- return NULL;
--}
--
--
--SWIGINTERN PyObject *_wrap_iODEDynamicState_SetStepFastIterations(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-- PyObject *resultobj = 0;
-- iODEDynamicState *arg1 = (iODEDynamicState *) 0 ;
-- int arg2 ;
-- void *argp1 = 0 ;
-- int res1 = 0 ;
-- int val2 ;
-- int ecode2 = 0 ;
-- PyObject * obj0 = 0 ;
-- PyObject * obj1 = 0 ;
--
-- if(!PyArg_UnpackTuple(args,(char *)"iODEDynamicState_SetStepFastIterations",2,2,&obj0,&obj1)) SWIG_fail;
-- res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_iODEDynamicState, 0 | 0 );
-- if (!SWIG_IsOK(res1)) {
-- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "iODEDynamicState_SetStepFastIterations" "', argument " "1"" of type '" "iODEDynamicState *""'");
-- }
-- arg1 = reinterpret_cast< iODEDynamicState * >(argp1);
-- ecode2 = SWIG_AsVal_int(obj1, &val2);
-- if (!SWIG_IsOK(ecode2)) {
-- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "iODEDynamicState_SetStepFastIterations" "', argument " "2"" of type '" "int""'");
-- }
-- arg2 = static_cast< int >(val2);
-- (arg1)->SetStepFastIterations(arg2);
-- resultobj = SWIG_Py_Void();
-- return resultobj;
--fail:
-- return NULL;
--}
--
--
--SWIGINTERN PyObject *_wrap_iODEDynamicState_StepFastIterations(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-- PyObject *resultobj = 0;
-- iODEDynamicState *arg1 = (iODEDynamicState *) 0 ;
-- void *argp1 = 0 ;
-- int res1 = 0 ;
-- PyObject * obj0 = 0 ;
-- int result;
--
-- if(!PyArg_UnpackTuple(args,(char *)"iODEDynamicState_StepFastIterations",1,1,&obj0)) SWIG_fail;
-- res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_iODEDynamicState, 0 | 0 );
-- if (!SWIG_IsOK(res1)) {
-- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "iODEDynamicState_StepFastIterations" "', argument " "1"" of type '" "iODEDynamicState *""'");
-- }
-- arg1 = reinterpret_cast< iODEDynamicState * >(argp1);
-- result = (int)(arg1)->StepFastIterations();
-- resultobj = SWIG_From_int(static_cast< int >(result));
-- return resultobj;
--fail:
-- return NULL;
--}
--
--
- SWIGINTERN PyObject *_wrap_iODEDynamicState_EnableQuickStep(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- iODEDynamicState *arg1 = (iODEDynamicState *) 0 ;
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_10.patch b/dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_10.patch
deleted file mode 100644
index 0c89f9a..0000000
--- a/dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_10.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- plugins/physics/loader/physldr.cpp 2012-07-13 09:52:14.000000000 +0200
-+++ plugins/physics/loader/physldr.cpp 2012-07-13 10:07:22.788041998 +0200
-@@ -338,11 +338,8 @@
- {
- case XMLTOKEN_WORLDSTEP:
- osys->EnableQuickStep(false);
-- osys->EnableStepFast(false);
- break;
- case XMLTOKEN_STEPFAST:
-- osys->EnableQuickStep(true);
-- break;
- case XMLTOKEN_QUICKSTEP:
- osys->EnableQuickStep(true);
- break;
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_11.patch b/dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_11.patch
deleted file mode 100644
index ccd626e..0000000
--- a/dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_11.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- plugins/cscript/pyivaria/cs_ivaria.cpp 2012-07-13 10:05:19.000000000 +0200
-+++ plugins/cscript/pyivaria/cs_ivaria.cpp 2012-07-13 10:09:06.278047627 +0200
-@@ -24440,110 +24440,6 @@
- }
-
-
--SWIGINTERN PyObject *_wrap_iODEDynamicSystemState_EnableStepFast(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-- PyObject *resultobj = 0;
-- iODEDynamicSystemState *arg1 = (iODEDynamicSystemState *) 0 ;
-- bool arg2 ;
-- void *argp1 = 0 ;
-- int res1 = 0 ;
-- bool val2 ;
-- int ecode2 = 0 ;
-- PyObject * obj0 = 0 ;
-- PyObject * obj1 = 0 ;
--
-- if(!PyArg_UnpackTuple(args,(char *)"iODEDynamicSystemState_EnableStepFast",2,2,&obj0,&obj1)) SWIG_fail;
-- res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_iODEDynamicSystemState, 0 | 0 );
-- if (!SWIG_IsOK(res1)) {
-- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "iODEDynamicSystemState_EnableStepFast" "', argument " "1"" of type '" "iODEDynamicSystemState *""'");
-- }
-- arg1 = reinterpret_cast< iODEDynamicSystemState * >(argp1);
-- ecode2 = SWIG_AsVal_bool(obj1, &val2);
-- if (!SWIG_IsOK(ecode2)) {
-- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "iODEDynamicSystemState_EnableStepFast" "', argument " "2"" of type '" "bool""'");
-- }
-- arg2 = static_cast< bool >(val2);
-- (arg1)->EnableStepFast(arg2);
-- resultobj = SWIG_Py_Void();
-- return resultobj;
--fail:
-- return NULL;
--}
--
--
--SWIGINTERN PyObject *_wrap_iODEDynamicSystemState_StepFastEnabled(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-- PyObject *resultobj = 0;
-- iODEDynamicSystemState *arg1 = (iODEDynamicSystemState *) 0 ;
-- void *argp1 = 0 ;
-- int res1 = 0 ;
-- PyObject * obj0 = 0 ;
-- bool result;
--
-- if(!PyArg_UnpackTuple(args,(char *)"iODEDynamicSystemState_StepFastEnabled",1,1,&obj0)) SWIG_fail;
-- res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_iODEDynamicSystemState, 0 | 0 );
-- if (!SWIG_IsOK(res1)) {
-- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "iODEDynamicSystemState_StepFastEnabled" "', argument " "1"" of type '" "iODEDynamicSystemState *""'");
-- }
-- arg1 = reinterpret_cast< iODEDynamicSystemState * >(argp1);
-- result = (bool)(arg1)->StepFastEnabled();
-- resultobj = SWIG_From_bool(static_cast< bool >(result));
-- return resultobj;
--fail:
-- return NULL;
--}
--
--
--SWIGINTERN PyObject *_wrap_iODEDynamicSystemState_SetStepFastIterations(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-- PyObject *resultobj = 0;
-- iODEDynamicSystemState *arg1 = (iODEDynamicSystemState *) 0 ;
-- int arg2 ;
-- void *argp1 = 0 ;
-- int res1 = 0 ;
-- int val2 ;
-- int ecode2 = 0 ;
-- PyObject * obj0 = 0 ;
-- PyObject * obj1 = 0 ;
--
-- if(!PyArg_UnpackTuple(args,(char *)"iODEDynamicSystemState_SetStepFastIterations",2,2,&obj0,&obj1)) SWIG_fail;
-- res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_iODEDynamicSystemState, 0 | 0 );
-- if (!SWIG_IsOK(res1)) {
-- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "iODEDynamicSystemState_SetStepFastIterations" "', argument " "1"" of type '" "iODEDynamicSystemState *""'");
-- }
-- arg1 = reinterpret_cast< iODEDynamicSystemState * >(argp1);
-- ecode2 = SWIG_AsVal_int(obj1, &val2);
-- if (!SWIG_IsOK(ecode2)) {
-- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "iODEDynamicSystemState_SetStepFastIterations" "', argument " "2"" of type '" "int""'");
-- }
-- arg2 = static_cast< int >(val2);
-- (arg1)->SetStepFastIterations(arg2);
-- resultobj = SWIG_Py_Void();
-- return resultobj;
--fail:
-- return NULL;
--}
--
--
--SWIGINTERN PyObject *_wrap_iODEDynamicSystemState_StepFastIterations(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-- PyObject *resultobj = 0;
-- iODEDynamicSystemState *arg1 = (iODEDynamicSystemState *) 0 ;
-- void *argp1 = 0 ;
-- int res1 = 0 ;
-- PyObject * obj0 = 0 ;
-- int result;
--
-- if(!PyArg_UnpackTuple(args,(char *)"iODEDynamicSystemState_StepFastIterations",1,1,&obj0)) SWIG_fail;
-- res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_iODEDynamicSystemState, 0 | 0 );
-- if (!SWIG_IsOK(res1)) {
-- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "iODEDynamicSystemState_StepFastIterations" "', argument " "1"" of type '" "iODEDynamicSystemState *""'");
-- }
-- arg1 = reinterpret_cast< iODEDynamicSystemState * >(argp1);
-- result = (int)(arg1)->StepFastIterations();
-- resultobj = SWIG_From_int(static_cast< int >(result));
-- return resultobj;
--fail:
-- return NULL;
--}
--
--
- SWIGINTERN PyObject *_wrap_iODEDynamicSystemState_EnableQuickStep(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- iODEDynamicSystemState *arg1 = (iODEDynamicSystemState *) 0 ;
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_12.patch b/dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_12.patch
deleted file mode 100644
index 2dfc740..0000000
--- a/dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_12.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- plugins/cscript/pyivaria/cs_ivaria.cpp 2012-07-13 10:09:06.000000000 +0200
-+++ plugins/cscript/pyivaria/cs_ivaria.cpp 2012-07-13 10:10:54.418053299 +0200
-@@ -40980,10 +40980,6 @@
- { (char *)"iODEDynamicState_GlobalERP", _wrap_iODEDynamicState_GlobalERP, METH_VARARGS, NULL},
- { (char *)"iODEDynamicState_SetGlobalCFM", _wrap_iODEDynamicState_SetGlobalCFM, METH_VARARGS, NULL},
- { (char *)"iODEDynamicState_GlobalCFM", _wrap_iODEDynamicState_GlobalCFM, METH_VARARGS, NULL},
-- { (char *)"iODEDynamicState_EnableStepFast", _wrap_iODEDynamicState_EnableStepFast, METH_VARARGS, NULL},
-- { (char *)"iODEDynamicState_StepFastEnabled", _wrap_iODEDynamicState_StepFastEnabled, METH_VARARGS, NULL},
-- { (char *)"iODEDynamicState_SetStepFastIterations", _wrap_iODEDynamicState_SetStepFastIterations, METH_VARARGS, NULL},
-- { (char *)"iODEDynamicState_StepFastIterations", _wrap_iODEDynamicState_StepFastIterations, METH_VARARGS, NULL},
- { (char *)"iODEDynamicState_EnableQuickStep", _wrap_iODEDynamicState_EnableQuickStep, METH_VARARGS, NULL},
- { (char *)"iODEDynamicState_QuickStepEnabled", _wrap_iODEDynamicState_QuickStepEnabled, METH_VARARGS, NULL},
- { (char *)"iODEDynamicState_SetQuickStepIterations", _wrap_iODEDynamicState_SetQuickStepIterations, METH_VARARGS, NULL},
-@@ -41007,10 +41003,6 @@
- { (char *)"iODEDynamicSystemState_ERP", _wrap_iODEDynamicSystemState_ERP, METH_VARARGS, NULL},
- { (char *)"iODEDynamicSystemState_SetCFM", _wrap_iODEDynamicSystemState_SetCFM, METH_VARARGS, NULL},
- { (char *)"iODEDynamicSystemState_CFM", _wrap_iODEDynamicSystemState_CFM, METH_VARARGS, NULL},
-- { (char *)"iODEDynamicSystemState_EnableStepFast", _wrap_iODEDynamicSystemState_EnableStepFast, METH_VARARGS, NULL},
-- { (char *)"iODEDynamicSystemState_StepFastEnabled", _wrap_iODEDynamicSystemState_StepFastEnabled, METH_VARARGS, NULL},
-- { (char *)"iODEDynamicSystemState_SetStepFastIterations", _wrap_iODEDynamicSystemState_SetStepFastIterations, METH_VARARGS, NULL},
-- { (char *)"iODEDynamicSystemState_StepFastIterations", _wrap_iODEDynamicSystemState_StepFastIterations, METH_VARARGS, NULL},
- { (char *)"iODEDynamicSystemState_EnableQuickStep", _wrap_iODEDynamicSystemState_EnableQuickStep, METH_VARARGS, NULL},
- { (char *)"iODEDynamicSystemState_QuickStepEnabled", _wrap_iODEDynamicSystemState_QuickStepEnabled, METH_VARARGS, NULL},
- { (char *)"iODEDynamicSystemState_SetQuickStepIterations", _wrap_iODEDynamicSystemState_SetQuickStepIterations, METH_VARARGS, NULL},
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_13.patch b/dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_13.patch
deleted file mode 100644
index 2cea944..0000000
--- a/dev-games/crystalspace/files/crystalspace-2.0-fix_ode_update_13.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- scripts/python/frozen/cspace/ivaria.py 2012-01-14 04:39:47.000000000 +0100
-+++ scripts/python/frozen/cspace/ivaria.py 2012-07-13 10:11:57.391389919 +0200
-@@ -774,10 +774,6 @@
- def GlobalERP(*args): return _ivaria.iODEDynamicState_GlobalERP(*args)
- def SetGlobalCFM(*args): return _ivaria.iODEDynamicState_SetGlobalCFM(*args)
- def GlobalCFM(*args): return _ivaria.iODEDynamicState_GlobalCFM(*args)
-- def EnableStepFast(*args): return _ivaria.iODEDynamicState_EnableStepFast(*args)
-- def StepFastEnabled(*args): return _ivaria.iODEDynamicState_StepFastEnabled(*args)
-- def SetStepFastIterations(*args): return _ivaria.iODEDynamicState_SetStepFastIterations(*args)
-- def StepFastIterations(*args): return _ivaria.iODEDynamicState_StepFastIterations(*args)
- def EnableQuickStep(*args): return _ivaria.iODEDynamicState_EnableQuickStep(*args)
- def QuickStepEnabled(*args): return _ivaria.iODEDynamicState_QuickStepEnabled(*args)
- def SetQuickStepIterations(*args): return _ivaria.iODEDynamicState_SetQuickStepIterations(*args)
-@@ -809,10 +805,6 @@
- def ERP(*args): return _ivaria.iODEDynamicSystemState_ERP(*args)
- def SetCFM(*args): return _ivaria.iODEDynamicSystemState_SetCFM(*args)
- def CFM(*args): return _ivaria.iODEDynamicSystemState_CFM(*args)
-- def EnableStepFast(*args): return _ivaria.iODEDynamicSystemState_EnableStepFast(*args)
-- def StepFastEnabled(*args): return _ivaria.iODEDynamicSystemState_StepFastEnabled(*args)
-- def SetStepFastIterations(*args): return _ivaria.iODEDynamicSystemState_SetStepFastIterations(*args)
-- def StepFastIterations(*args): return _ivaria.iODEDynamicSystemState_StepFastIterations(*args)
- def EnableQuickStep(*args): return _ivaria.iODEDynamicSystemState_EnableQuickStep(*args)
- def QuickStepEnabled(*args): return _ivaria.iODEDynamicSystemState_QuickStepEnabled(*args)
- def SetQuickStepIterations(*args): return _ivaria.iODEDynamicSystemState_SetQuickStepIterations(*args)
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-fix_unqualified_calls_01.patch b/dev-games/crystalspace/files/crystalspace-2.0-fix_unqualified_calls_01.patch
deleted file mode 100644
index 4f1504e..0000000
--- a/dev-games/crystalspace/files/crystalspace-2.0-fix_unqualified_calls_01.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/csutil/refarr.h.ori 2012-07-18 16:17:45.460834864 +0200
-+++ include/csutil/refarr.h 2012-07-18 16:18:11.580836231 +0200
-@@ -111,7 +111,7 @@
- {
- CS_ASSERT (this->GetSize () > 0);
- csRef<T> ret = this->Get (this->GetSize () - 1); // see *1*
-- SetSize (this->GetSize () - 1);
-+ this->SetSize (this->GetSize () - 1);
- return ret;
- }
- };
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-fix_unqualified_calls_02.patch b/dev-games/crystalspace/files/crystalspace-2.0-fix_unqualified_calls_02.patch
deleted file mode 100644
index 9a371a7..0000000
--- a/dev-games/crystalspace/files/crystalspace-2.0-fix_unqualified_calls_02.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- include/csutil/blockallocator.h.ori 2012-07-18 16:20:00.460841926 +0200
-+++ include/csutil/blockallocator.h 2012-07-18 17:02:35.940975474 +0200
-@@ -193,7 +193,7 @@
- ~csBlockAllocator()
- {
- ObjectDispose dispose (*this, false);
-- DisposeAll (dispose);
-+ this->DisposeAll (dispose);
- }
-
- /**
-@@ -204,7 +204,7 @@
- void Empty ()
- {
- ObjectDispose dispose (*this, true);
-- FreeAll (dispose);
-+ this->FreeAll (dispose);
- }
-
- /**
-@@ -215,7 +215,7 @@
- void DeleteAll ()
- {
- ObjectDispose dispose (*this, true);
-- DisposeAll (dispose);
-+ this->DisposeAll (dispose);
- }
-
- /**
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-fix_unqualified_calls_03.patch b/dev-games/crystalspace/files/crystalspace-2.0-fix_unqualified_calls_03.patch
deleted file mode 100644
index 28c9b5a..0000000
--- a/dev-games/crystalspace/files/crystalspace-2.0-fix_unqualified_calls_03.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/csutil/parray.h.ori 2012-07-18 16:50:17.604270426 +0200
-+++ include/csutil/parray.h 2012-07-18 16:50:52.484272185 +0200
-@@ -112,7 +112,7 @@
- {
- CS_ASSERT (this->GetSize () > 0);
- T* ret = GetAndClear (this->GetSize () - 1); // see *1*
-- Truncate (this->GetSize () - 1);
-+ this->Truncate (this->GetSize () - 1);
- return ret;
- }
-
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-fix_unqualified_calls_04.patch b/dev-games/crystalspace/files/crystalspace-2.0-fix_unqualified_calls_04.patch
deleted file mode 100644
index bc76e0c..0000000
--- a/dev-games/crystalspace/files/crystalspace-2.0-fix_unqualified_calls_04.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- include/csutil/redblacktree.h.ori 2012-07-18 17:23:56.847708962 +0200
-+++ include/csutil/redblacktree.h 2012-07-18 17:26:29.221050599 +0200
-@@ -1155,7 +1155,7 @@
- T* Put (const K& key, const T &value)
- {
- csRedBlackTreePayload<K, T>* payload = (csRedBlackTreePayload<K, T>*)
-- Insert (csRedBlackTreePayload<K, T>(key, value));
-+ this->Insert (csRedBlackTreePayload<K, T>(key, value));
- return (payload != 0) ? &payload->GetValue() : 0;
- }
- /**
-@@ -1194,7 +1194,7 @@
- */
- const T& Get (const K& key, const T& fallback) const
- {
-- const csRedBlackTreePayload<K, T>* payload = Find (key);
-+ const csRedBlackTreePayload<K, T>* payload = this->Find (key);
- if (payload == 0) return fallback;
- return payload->GetValue();
- }
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-fix_unqualified_calls_05.patch b/dev-games/crystalspace/files/crystalspace-2.0-fix_unqualified_calls_05.patch
deleted file mode 100644
index 01a1097..0000000
--- a/dev-games/crystalspace/files/crystalspace-2.0-fix_unqualified_calls_05.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- include/csplugincommon/rendermanager/render.h.ori 2012-07-18 17:26:53.654385262 +0200
-+++ include/csplugincommon/rendermanager/render.h 2012-07-18 17:27:46.111054919 +0200
-@@ -194,7 +194,7 @@
- || (mesh.preCopyNum != 0))
- {
- // Render the latest batch of meshes
-- RenderMeshes (context, node->meshes, lastShader, lastTicket, lastRenderedMesh, m);
-+ this->RenderMeshes (context, node->meshes, lastShader, lastTicket, lastRenderedMesh, m);
- lastRenderedMesh = m;
-
- lastShader = shader;
-@@ -208,7 +208,7 @@
- }
- }
-
-- RenderMeshes (context, node->meshes, lastShader, lastTicket, lastRenderedMesh, node->meshes.GetSize ());
-+ this->RenderMeshes (context, node->meshes, lastShader, lastTicket, lastRenderedMesh, node->meshes.GetSize ());
- }
- };
-
-@@ -242,7 +242,7 @@
- iShader* shader = context.shaderArray[mesh.contextLocalId+layerOffset];
-
- size_t ticket = context.ticketArray[mesh.contextLocalId+layerOffset];
-- RenderMeshes (context, node->meshes, shader, ticket, m, m+1);
-+ this->RenderMeshes (context, node->meshes, shader, ticket, m, m+1);
- }
- }
- }
diff --git a/dev-games/crystalspace/metadata.xml b/dev-games/crystalspace/metadata.xml
deleted file mode 100644
index b46e95d..0000000
--- a/dev-games/crystalspace/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
- <email>yamakuzure@gmx.net</email>
- <description>The creator of this ebuild, but not the official
-maintainer</description>
-</maintainer>
-<longdescription>Crystal Space - A modular, configurable, and extensible
-rendering engine supporting OpenGL and advanced features such as shaders and
-lighting systems, physics, 3D sounds, animation blending, foliage, terrain,
-virtual file system, physical peripherals, and more.</longdescription>
-<use>
- <flag name='python'>Add Python bindings</flag>
- <flag name='optimized'>Build optimized versions of the libraries (default)</flag>
- <flag name='debug'>Build debug versions of the libraries</flag>
- <flag name='profile'>Build profiling versions of the libraries (slow)</flag>
-</use>
-</pkgmetadata>
diff --git a/dev-games/gigi-fo/ChangeLog b/dev-games/gigi-fo/ChangeLog
deleted file mode 100644
index c81c8fc..0000000
--- a/dev-games/gigi-fo/ChangeLog
+++ /dev/null
@@ -1,38 +0,0 @@
-# ChangeLog for dev-games/gigi
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*gigi-fo-9999 (14 Nov 2012)
-
- 14 Nov 2012; Sven Eden <sven.eden@gmx.de>
- +gigi-fo-9999.ebuild,
- -gigi-9999-r6.ebuild,
- -files/fix_adobe_cmath_gcc_test.patch,
- -files/fix_adobe_vector.patch:
- Converted old (dead) dev-games/gigi to dev-games/gigi-fo, a forked
- variant in the FreeOrion project.
- Here the previously needed patches are no longer required.
-
-
-*gigi-9999-r6 (05 Jul 2012)
-
- 05 Jul 2012; Sven Eden <sven.eden@gmx.de> +gigi-9999-r6.ebuild :
- Added two patches to allow GiGi to be compiled using gcc-4.7.1
-
- 05 Jul 2012; Sven Eden <sven.eden@gmx.de> -gigi-9999-r5.ebuild :
- Removed obsolete version
-
-
-*gigi-9999-r5 (19 Dec 2011)
-
- 19 Dec 2011; Sven Eden <sven.eden@gmx.de> +gigi-9999-r5.ebuild :
- GiGi now depends on >=dev-libs/boost-1.47
-
- 19 Dec 2011; Sven Eden <sven.eden@gmx.de> -gigi-9999-r4.ebuild :
- Removed obsolete version
-
-
-*gigi-9999-r4 (27 Mar 2011)
-
- 27 Mar 2011; Sven Eden <sven.eden@gmx.de> +gigi-9999-r4.ebuild :
- Initial commit of the ebuild.
diff --git a/dev-games/gigi-fo/Manifest b/dev-games/gigi-fo/Manifest
deleted file mode 100644
index ba015e8..0000000
--- a/dev-games/gigi-fo/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX unbundle-ltdl.patch 2512 SHA256 17dfd37046ea8ada7c2f72ac38284ad44e71a8e6bcfe625d3d65b32934b69612 SHA512 4bc38354dcaed8eb057f148e804f34b45f0d53af1ec04f93405e24f3c2e23d61f6657e602d279d90fc99cb571cbd148d4f7cf19308a9fa79b09cb683e9ba30d8 WHIRLPOOL 26408265972ffb9450f0c2918f68a584705a278574f65a2566126a08c4cbe612b731c33cf7212c6c534c4dc3c00832b732e65f497d74e4729fd375f3d6fb841d
-EBUILD gigi-fo-9999.ebuild 2318 SHA256 9e4325bccd91e69b0ca605a73de5035eab685a8d4dd1ee6b39a47d5da0910d7a SHA512 d4c8e5291202c0e595debf21a10518412c73baa3cf9e9a64f383e0e058baeb9f398eaa663e99b06222de2304d77f8fa39e25c5863ba11039420c1f1635bb3f2c WHIRLPOOL 4240042f2ef86740af427e7cdadde1858f48ab5f996b9312693d56574d01eb70aded75b6353f8ed256097a0562b1b0b171bc65b53a939aa2ca36c013cfd69e2e
-MISC ChangeLog 1101 SHA256 1a89d50be9bc61dcbd896b7c4519bda7ff73d9faa0d936bfe5727d7a8885a497 SHA512 6fdf5828fddb86b5a584cbf2dcef474ccff6a5fe20ac08fca0ff8d217e4c3af5cc6ecebf66cf7ab36494f9619384b10e7b4dfc06719d11d4342718b855818fbd WHIRLPOOL 1c9b4cc75b3be851a146fa2851257b7156ddc33e3a77cc28439dcb348b5c8490a797b2e24279b6b89589700901cd3e512c3d26ad554a12367fa5c259222e7ece
-MISC metadata.xml 908 SHA256 7b363044a925a61f04669a0de6af4c0b4d1deb7bb4655d0e0aea6796735df8e1 SHA512 1b2607f7755dbd1be78ce53bb76c942d5f809a9550c0e1b431bbb287db683c85602a4329cca87dc07032a639fa89f9a4e3d9aa5d89c249eef209a24f24522029 WHIRLPOOL ff1a0fd9603228128910b8cd8c57fbfc2057d462f6af1a2edd784a6f1c230517d819a41987e35fd5485f3377e8cd7b018e86f57fefb967ecd6c0b45deff9c080
diff --git a/dev-games/gigi-fo/files/unbundle-ltdl.patch b/dev-games/gigi-fo/files/unbundle-ltdl.patch
deleted file mode 100644
index c2ebdb9..0000000
--- a/dev-games/gigi-fo/files/unbundle-ltdl.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Index: src/CMakeLists.txt
-===================================================================
---- src/CMakeLists.txt (revision 812)
-+++ src/CMakeLists.txt (working copy)
-@@ -43,8 +43,6 @@
- dialogs/FileDlg.cpp
- dialogs/ThreeButtonDlg.cpp
-
-- ../libltdl/ltdl.c
--
- adobe/adam.cpp
- adobe/adam_evaluate.cpp
- adobe/adam_parser.cpp
-@@ -157,13 +155,6 @@
- )
- endif ()
-
--set_source_files_properties(${CMAKE_HOME_DIRECTORY}/libltdl/ltdl.c PROPERTIES COMPILE_DEFINITIONS HAVE_CONFIG_H=1)
--execute_process(
-- COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_HOME_DIRECTORY}/libltdl/ltdl.h ${CMAKE_HOME_DIRECTORY}/GG/ltdl.h
-- COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_HOME_DIRECTORY}/libltdl/config.h ${CMAKE_HOME_DIRECTORY}/GG/ltdl_config.h
--)
--set_source_files_properties(${CMAKE_HOME_DIRECTORY}/GG/ltdl.h ${CMAKE_HOME_DIRECTORY}/GG/ltdl_config.h PROPERTIES GENERATED true)
--
--set(THIS_LIB_LINK_LIBS ${Boost_LIBRARIES} ${OPENGL_LIBRARIES} ${FREETYPE_LIBRARIES})
-+set(THIS_LIB_LINK_LIBS ${Boost_LIBRARIES} ${OPENGL_LIBRARIES} ${FREETYPE_LIBRARIES} /usr/lib/libltdl.so)
- if (USE_DEVIL)
- list(APPEND THIS_LIB_LINK_LIBS ${IL_LIBRARY} ${ILUT_LIBRARY})
-Index: CMakeLists.txt
-===================================================================
---- CMakeLists.txt (revision 812)
-+++ CMakeLists.txt (working copy)
-@@ -224,36 +224,6 @@
- ########################################
- # Header Generation #
- ########################################
--if (NOT EXISTS ${CMAKE_HOME_DIRECTORY}/libltdl/config.h)
-- if (UNIX)
-- message("-- Configuring libltdl using \"libltdl/configure\" ...")
-- execute_process(
-- COMMAND ${CMAKE_HOME_DIRECTORY}/libltdl/configure
-- WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/libltdl
-- OUTPUT_QUIET
-- )
-- else ()
-- file(WRITE ${CMAKE_HOME_DIRECTORY}/libltdl/config.h
-- "/* WARNING: Generated by GG's build system. All local changes will be lost! */
--#define error_t int
--#define HAVE_STDIO_H 1
--#define HAVE_STDLIB_H 1
--#define HAVE_STRING_H 1
--#define HAVE_CTYPE_H 1
--#define HAVE_MEMORY_H 1
--#define HAVE_ERRNO_H 1
--#define __WIN32__
--#define HAVE_MEMCPY 1
--#define HAVE_MEMMOVE 1
--#define LTDL_OBJDIR \".libs\"
--#define LTDL_DLOPEN_DEPLIBS 1
--#define LTDL_SHLIBPATH_VAR \"PATH\"
--#define LTDL_SHLIB_EXT \".dll\"
--"
-- )
-- endif ()
--endif ()
--
- configure_file(
- ${CMAKE_HOME_DIRECTORY}/cmake/Config.h.in
- ${CMAKE_HOME_DIRECTORY}/GG/Config.h
diff --git a/dev-games/gigi-fo/gigi-fo-9999.ebuild b/dev-games/gigi-fo/gigi-fo-9999.ebuild
deleted file mode 100644
index 42d1dcc..0000000
--- a/dev-games/gigi-fo/gigi-fo-9999.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit cmake-utils subversion
-
-DESCRIPTION="FreeOrion fork of the GiGi OpenGL interface library"
-HOMEPAGE="http://www.freeorion.org"
-ESVN_REPO_URI="https://freeorion.svn.sourceforge.net/svnroot/freeorion/trunk/FreeOrion/GG"
-ESVN_PROJECT="GG"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug devil doc ogre ois +sdl static-libs +threads"
-
-SLOT="0"
-
-RDEPEND="
- !dev-games/gigi
- >=dev-libs/boost-1.50[threads=]
- media-libs/freetype:2
- x11-libs/libX11
- virtual/opengl
- devil? ( >=media-libs/devil-1.6.1 )
- !devil? (
- virtual/jpeg
- media-libs/tiff
- media-libs/libpng:1.2
- )
- ogre? ( >=dev-games/ogre-1.8.0[threads=] )
- ois? ( dev-games/ois )
- sdl? ( >=media-libs/libsdl-1.2 )
-"
-
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- sys-devel/libtool:2
- doc? ( app-doc/doxygen )
-"
-
-CMAKE_USE_DIR="${S}"
-
-src_unpack() {
- subversion_src_unpack
-}
-
-src_prepare() {
- # remove libtool
- cd "${CMAKE_USE_DIR}"
- rm -rf libltdl || die "Removing libltdl directory failed"
-
- # remove cmake calls to libtool
- epatch "${FILESDIR}/unbundle-ltdl.patch"
-
- # use system headers
- sed -i \
- -e "s:GG/ltdl.h:ltdl.h:" \
- GG/PluginInterface.h || die "switching to system ltdl.h in GG/PluginInterface.h failed"
-
- # Change deprecated /usr/doc/GG to /usr/share/doc/${P}
- sed -i \
- -e "s:doc/GG:doc/${P}:" \
- CMakeLists.txt || die "changing doc/GG to doc/${P} failed"
- sed -i \
- -e "s:DESTINATION doc:DESTINATION share/doc:" \
- CMakeLists.txt || die "changing /usr/doc to /usr/share/doc failed"
- sed -i \
- -e "s:HTML_OUTPUT\(.*\)= GG:HTML_OUTPUT\1= ${P}:" \
- doc/Doxyfile || die "changing doxygen output from GG to ${P} failed"
-}
-
-src_configure() {
- use ogre && use ois && mycmakeargs=( "-DBUILD_OGRE_OIS_PLUGIN=ON" ) || mycmakeargs=( "-DBUILD_OGRE_OIS_PLUGIN=OFF" )
- mycmakeargs+=(
- "-DBUILD_TUTORIALS=OFF"
- $(cmake-utils_use_build debug)
- $(cmake-utils_use devil)
- $(cmake-utils_use_build doc DOCUMENTATION)
- $(cmake-utils_use_build ogre OGRE_DRIVER)
- $(cmake-utils_use_build sdl SDL_DRIVER)
- $(cmake-utils_use_build static-libs STATIC)
- $(cmake-utils_use_build threads MULTI_THREADED)
- )
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-}
-
-src_install() {
- cmake-utils_src_install
-}
diff --git a/dev-games/gigi-fo/metadata.xml b/dev-games/gigi-fo/metadata.xml
deleted file mode 100644
index f5c9a4f..0000000
--- a/dev-games/gigi-fo/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
- <email>yamakuzure@gmx.net</email>
- <description>The creator of this ebuild, but not the official maintainer</description>
-</maintainer>
-<longdescription>GiGi (aka GG) is a GUI library for OpenGL. It is platform-independent (it runs at least on Linux and Windows, and probably more), compiler-independent (it compiles under at GCC 3.4 or higher and MSVC++ 8.0 SP1 or higher, and probably more), and driver-independent. Reference drivers for SDL and Ogre are provided, and it is straightforward to write one for yourself should you decide to do so.</longdescription>
-<use>
- <flag name='devil'>Enable image loading via DevIL.</flag>
- <flag name='ois'>Enable OIS support.</flag>
- <flag name='ogre'>Enable OGRE support.</flag>
-</use>
-</pkgmetadata>
diff --git a/dev-libs/ustr/ChangeLog b/dev-libs/ustr/ChangeLog
deleted file mode 100644
index 72ff3ff..0000000
--- a/dev-libs/ustr/ChangeLog
+++ /dev/null
@@ -1,73 +0,0 @@
-# ChangeLog for dev-libs/ustr
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ustr/ChangeLog,v 1.13 2014/01/14 13:58:01 ago Exp $
-
-*ustr-1.0.4-r6 (10 Sep 2015)
-
- 10 Sep 2015; Sven Eden <yamakuzure@gmx.net> +ustr-1.0.4-r6.ebuild,
- +files/fix_gcc_5_c99_inline.patch :
- Patch in a check whether gcc-5 is used with the C standard set to
- C99 or above, and change the behaviour of the inline keyword back
- to how it worked for C89.
- This fixes bug #556452
-
- Note: ustr-1.0.4-r5 was already taken by the in-tree version.
-
-
-*ustr-1.0.4-r4 (09 May 2014)
-
- 09 May 2014; Sven Eden <yamakuzure@gmx.net> +ustr-1.0.4-r4.ebuild:
- Enabled building with multilib support for ABI_X86="32"
-
- 14 Jan 2014; Agostino Sarubbo <ago@gentoo.org> ustr-1.0.4-r3.ebuild:
- Stable for x86, wrt bug #495414
-
- 12 Jan 2014; Pacho Ramos <pacho@gentoo.org> ustr-1.0.4-r3.ebuild:
- amd64 stable, bug #495414
-
- 07 Jan 2014; Sergey Popov <pinkbyte@gentoo.org> ustr-1.0.4-r3.ebuild:
- Add ~arm and ~mips keywords
-
-*ustr-1.0.4-r3 (09 Nov 2013)
-
- 09 Nov 2013; Markos Chandras <hwoarang@gentoo.org> +ustr-1.0.4-r3.ebuild,
- metadata.xml:
- Fix installation path. Patch by Sven Eden <Yamakuzure@gmx.net> who will also
- be the maintainer
-
-*ustr-1.0.4-r2 (13 Oct 2013)
-
- 13 Oct 2013; Jeroen Roovers <jer@gentoo.org> +ustr-1.0.4-r2.ebuild:
- Respect AR/CC/CFLAGS, build verbosely (in src_test() as well). Remove
- unneeded die().
-
- 12 Oct 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
- Cleanup due #237340
-
- 12 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
- -ustr-1.0.4.ebuild:
- Delete.
-
- 12 Feb 2011; Markos Chandras <hwoarang@gentoo.org> ustr-1.0.4-r1.ebuild:
- Stable on amd64 wrt bug #353781
-
- 10 Feb 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> ustr-1.0.4-r1.ebuild:
- x86 stable wrt bug #353781
-
- 05 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
- ustr-1.0.4-r1.ebuild:
- Fix installation with FEATURES="multilib-strict".
-
-*ustr-1.0.4-r1 (02 Aug 2009)
-
- 02 Aug 2009; Chris PeBenito <pebenito@gentoo.org> +ustr-1.0.4-r1.ebuild:
- Fix bugs #240230, #241280, and #243954.
-
- 22 Jul 2009; Chris PeBenito <pebenito@gentoo.org> ustr-1.0.4.ebuild:
- Mark stable. Remove old ebuilds.
-
-*ustr-1.0.4 (03 Oct 2008)
-
- 03 Oct 2008; Chris PeBenito <pebenito@gentoo.org> +metadata.xml,
- +ustr-1.0.4.ebuild:
- Initial commit.
diff --git a/dev-libs/ustr/Manifest b/dev-libs/ustr/Manifest
deleted file mode 100644
index d6dabca..0000000
--- a/dev-libs/ustr/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX fix_gcc_5_c99_inline.patch 1087 SHA256 e68b420be7595f99ac48379bf645bad3e939f1d842435e3931b503873f3c54ab SHA512 b669a40929cf45cb83aa5c738cb58676cc9c08ee6c84dd7c79352c6aaa7aa36526a0878e98d78b45cfe3c7f62e9b014fe9eaf01fb1b4b460658cfcb1e77d7dab WHIRLPOOL cee638bac514d57de6a492791a54b56372d84ab66e52ebb2b2877f3d64b2f73bfbde0e4eed4954563439cb1d2ae34accfd539eedbdd27c2b781aafed73251260
-DIST ustr-1.0.4.tar.bz2 233723 SHA256 3daf6eae9f78de1e872c0b2b83cce35515b94d4bb8a074e48f331fd99e1fc2c4 SHA512 b7df6ca3a9f25ee6f5c9ab4325732d348de27c5e02ebff36a7d5706f56b2df994df35bd652825a28e27bbde731c6a5933248d99c670d192b1952e7534eec1510 WHIRLPOOL b37783d844e85c3bd7725ac92ca2c84f27f03914d5cf79da2a1c2e48f737d869c49763d1c1ed799cc117d7b414aa8792e6d5833e028521ffaf500735ad4084c2
-EBUILD ustr-1.0.4-r4.ebuild 1344 SHA256 cb3e36bf810a3b9af0d34800228f7e2122de8a79dc3b86cbb41738321ffebf2c SHA512 39463e3f163de9a7d90638510c78de8a96bd6586480d7337aa69bfcc201c7f3a10ba2482e494ed3b15945ba2f2529c23a40b6802fa96008f268f4df05fcdcd28 WHIRLPOOL 58cfb1247b08319f8a5e43deefdb62768109cce2c0ea281ca414a18439733c85fe2783c0d9585323d063de9609bd448a2ebd101945dd8677a0e1093cec0a2cad
-EBUILD ustr-1.0.4-r6.ebuild 1336 SHA256 6fde20808c33bb2a514e537905ef4af42bd4578214305b9032af9b2475d4c961 SHA512 98120724fb986550286c17b1b0f60827f392b7086fa18e880437acdea514a322e2805b53a7d7e1c834815e27e04ab31444f6d32a50c6771074cf1753792eb738 WHIRLPOOL ecd5c241c54a1692eff2cc340b80b3e8558f3ffeed073bb196c97de7f59fe0b3356876ddd6e1cdf337426283601e5255c1e3dafa2f0f2d53122c797c230e37d7
-MISC ChangeLog 2412 SHA256 35f2efdb6e8797208cd10114780811f2ff43087f0d90d3b3f08a55609f0f6652 SHA512 df3a9218da95b605b1d37678ee42d7c8e102a56ae50158ba482cb72400a4f13c49a7a272fbee707a620463bb23d9e0cd07875ac834f7cbd857e9e0ce767904b9 WHIRLPOOL 2c10f4029290b1d8d9a21f5b6e53ba261aba9f30e5b2687ae61da6cd4e942d2a6b3752b49f867be6db154a030e62c9025e6b52773e8d491e8c92f36645816bc3
-MISC metadata.xml 315 SHA256 9e0543fd808dc0851421c81c0d96fed13d97cfc067448b003355d0c19d847824 SHA512 37bd08e283d18e0483e2591172657995369bcfe1b3d92e3973f67242f14d048ca0b078c9eec940457eda2f70c6cc3bfd4c3f23faa1cc7338eb5734ac7af7e3ca WHIRLPOOL b98db3a4028e05c0f48c216db94efe7794bd28d3d1634f292b2bdf8efef85ccf6dca7df91eef90aea608e3f07f2712355d33ab742af1d8b58ba5821276134fc3
diff --git a/dev-libs/ustr/files/fix_gcc_5_c99_inline.patch b/dev-libs/ustr/files/fix_gcc_5_c99_inline.patch
deleted file mode 100644
index aaed150..0000000
--- a/dev-libs/ustr/files/fix_gcc_5_c99_inline.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/ustr-conf.h.in 2007-10-22 08:00:55.000000000 +0200
-+++ b/ustr-conf.h.in 2015-09-10 12:24:34.998796842 +0200
-@@ -4,13 +4,24 @@
- /* this is the custom version for the library itself, for everyone else
- * ustr-import generates one depending on the options. */
-
-+/* If this is GCC with major version 5 and up, the default C standard
-+ * has changed from C89 to C99 so the old inline behaviour must be
-+ * restored:
-+ */
-+#if defined(__GNUC__) \
-+ && (__GNUC__ > 4) \
-+ && defined(__STDC_VERSION__) \
-+ && (__STDC_VERSION__ >= 199901L)
-+# define inline inline __attribute__ ((gnu_inline))
-+#endif /* GCC greater than major version 4 and not -std=c89 set */
-+
- /* The default is now to link against libc. */
- #ifndef USTR_CONF_INCLUDE_CODEONLY_HEADERS
- #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 0
- #endif
-
- /* We can't: if defined(__GLIBC__) && (!defined(_GNU_SOURCE) || !_GNU_SOURCE)
-- * because by the time we've included a libc header it's too late. */
-+ * because by the time we've included a libc header it's too late. */
- #ifndef _GNU_SOURCE
- #define _GNU_SOURCE 1
- #endif
diff --git a/dev-libs/ustr/metadata.xml b/dev-libs/ustr/metadata.xml
deleted file mode 100644
index 3e931e3..0000000
--- a/dev-libs/ustr/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>proxy-maintainers</herd>
-<maintainer>
- <email>Yamakuzure@gmx.net</email>
- <name>Sven Eden</name>
- <description>Maintainer. Assign bugs to him</description>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-libs/ustr/ustr-1.0.4-r4.ebuild b/dev-libs/ustr/ustr-1.0.4-r4.ebuild
deleted file mode 100644
index 72c9522..0000000
--- a/dev-libs/ustr/ustr-1.0.4-r4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ustr/ustr-1.0.4-r3.ebuild,v 1.4 2014/01/14 13:58:01 ago Exp $
-
-EAPI=5
-
-inherit multilib-build toolchain-funcs
-
-DESCRIPTION="Low-overhead managed string library for C"
-HOMEPAGE="http://www.and.org/ustr"
-SRC_URI="ftp://ftp.and.org/pub/james/ustr/${PV}/${P}.tar.bz2"
-
-LICENSE="|| ( BSD-2 MIT LGPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
- multilib_copy_sources
-}
-
-ustr_make() {
- cd "${BUILD_DIR}" || die
- [ -e ustr-conf.h ] && rm ustr-conf.h
- emake "$@" \
- AR="$(tc-getAR)" \
- CC="$(tc-getCC)" \
- CFLAGS="${CFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
- prefix="${EPREFIX}/usr" \
- SHRDIR="/usr/share/${P}" \
- HIDE= || die
-}
-
-ustr_install() {
- cd "${BUILD_DIR}" || die
-
- emake "$@" \
- DESTDIR="${D}" \
- prefix="${EPREFIX}/usr" \
- libdir="${EPREFIX}/usr/$(get_libdir)" \
- mandir="/usr/share/man" \
- SHRDIR="/usr/share/${P}" \
- DOCSHRDIR="/usr/share/doc/${PF}" \
- HIDE= || die
-}
-
-
-src_compile() {
- multilib_foreach_abi ustr_make all-shared
-}
-
-multilib_src_test() {
- multilib_foreach_abi ustr_make check
-}
-
-src_install() {
- multilib_foreach_abi ustr_install install-multilib-linux
- dodoc ChangeLog README README-DEVELOPERS AUTHORS NEWS TODO
-}
diff --git a/dev-libs/ustr/ustr-1.0.4-r6.ebuild b/dev-libs/ustr/ustr-1.0.4-r6.ebuild
deleted file mode 100644
index aeccb51..0000000
--- a/dev-libs/ustr/ustr-1.0.4-r6.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ustr/ustr-1.0.4-r3.ebuild,v 1.4 2014/01/14 13:58:01 ago Exp $
-
-EAPI=5
-
-inherit multilib-build toolchain-funcs eutils
-
-DESCRIPTION="Low-overhead managed string library for C"
-HOMEPAGE="http://www.and.org/ustr"
-SRC_URI="ftp://ftp.and.org/pub/james/ustr/${PV}/${P}.tar.bz2"
-
-LICENSE="|| ( BSD-2 MIT LGPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
- epatch "${FILESDIR}/fix_gcc_5_c99_inline.patch"
- multilib_copy_sources
-}
-
-ustr_make() {
- emake "$@" \
- AR="$(tc-getAR)" \
- CC="$(tc-getCC)" \
- CFLAGS="${CFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
- prefix="${EPREFIX}/usr" \
- SHRDIR="/usr/share/${P}" \
- HIDE= || die
-}
-
-ustr_install() {
- cd "${BUILD_DIR}" || die
-
- emake "$@" \
- DESTDIR="${D}" \
- prefix="${EPREFIX}/usr" \
- libdir="${EPREFIX}/usr/$(get_libdir)" \
- mandir="/usr/share/man" \
- SHRDIR="/usr/share/${P}" \
- DOCSHRDIR="/usr/share/doc/${PF}" \
- HIDE= || die
-}
-
-
-src_compile() {
- multilib_foreach_abi ustr_make all-shared
-}
-
-multilib_src_test() {
- multilib_foreach_abi ustr_make check
-}
-
-src_install() {
- multilib_foreach_abi ustr_install install-multilib-linux
- dodoc ChangeLog README README-DEVELOPERS AUTHORS NEWS TODO
-}
diff --git a/games-action/atanks_aiu/ChangeLog b/games-action/atanks_aiu/ChangeLog
deleted file mode 100644
index dfdccd5..0000000
--- a/games-action/atanks_aiu/ChangeLog
+++ /dev/null
@@ -1,95 +0,0 @@
-# ChangeLog for games-action/atanks
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-
-*atanks_aiu-6.2.1 (10 Apr 2015)
-
- 09 Feb 2015; Sven Eden <yamakuzure@gmx.net>
- +atanks_aiu-6.2.1.ebuild,
- -atanks_aiu-6.1.2.ebuild:
- Version bump, removed old ebuild.
-
-*atanks_aiu-6.1.3 (09 Feb 2015)
-
- 09 Feb 2015; Sven Eden <yamakuzure@gmx.net>
- +atanks_aiu-6.1.3.ebuild,
- -atanks_aiu-6.1.1.ebuild:
- Version bump, removed old ebuild.
-
-*atanks_aiu-6.1.2 (25 Jan 2015)
-
- 25 Jan 2015; Sven Eden <yamakuzure@gmx.net>
- +atanks_aiu-6.1.2.ebuild,
- -atanks_aiu-6.0.8.ebuild:
- Version bump, removed old ebuild.
-
-*atanks_aiu-6.0.8 (19 Dec 2014)
-*atanks_aiu-6.1.1 (19 Dec 2014)
-
- 19 Dec 2014; Sven Eden <yamakuzure@gmx.net>
- +atanks_aiu-6.0.8.ebuild:
- +atanks_aiu-6.1.1.ebuild:
- -atanks_aiu-6.0.6.ebuild:
- -atanks_aiu-6.0.7.ebuild:
- Removed old ebuilds, added missing version 6.0.8 and new 6.1.1.
-
-*atanks_aiu-6.0.7 (13 Aug 2014)
-
- 13 Aug 2014; Sven Eden <yamakuzure@gmx.net>
- +atanks_aiu-6.0.7.ebuild:
- -atanks_aiu-6.0.5.ebuild:
- version bump to atanks-6.0-aiu7, removed old 6.0-aiu5 ebuild.
-
-*atanks_aiu-6.0.6 (23 Jul 2014)
-
- 23 Jul 2014; Sven Eden <yamakuzure@gmx.net>
- +atanks_aiu-6.0.6.ebuild:
- -atanks_aiu-6.0.4.ebuild:
- version bump to atanks-6.0-aiu6, removed old 6.0-aiu4 ebuild.
-
-*atanks_aiu-6.0.5 (07 Jul 2014)
-
- 07 Jul 2014; Sven Eden <yamakuzure@gmx.net>
- +atanks_aiu-6.0.5.ebuild:
- -atanks_aiu-6.0.3.ebuild:
- version bump to atanks-6.0-aiu5, removed old 6.0-aiu3 ebuild.
-
-*atanks_aiu-6.0.4 (23 Jun 2014)
-
- 23 Jun 2014; Sven Eden <yamakuzure@gmx.net>
- +atanks_aiu-6.0.4.ebuild:
- -atanks_aiu-6.0.2.ebuild:
- version bump to atanks-6.0-aiu4, removed old 6.0-aiu2 ebuild.
-
-*atanks_aiu-6.0.3 (11 Jun 2014)
-
- 11 Jun 2014; Sven Eden <yamakuzure@gmx.net>
- +atanks_aiu-6.0.3.ebuild:
- -atanks_aiu-6.0.1.ebuild:
- version bump to atanks-6.0-aiu3, removed old 6.0-aiu1 ebuild.
-
-*atanks_aiu-6.0.2 (05 Jun 2014)
-
- 05 Jun 2014; Sven Eden <yamakuzure@gmx.net>
- +atanks_aiu-6.0.2.ebuild:
- -atanks_aiu-5.9.2.ebuild:
- version bump to atanks-6.0-aiu2, removed old 5.9-aiu2 ebuild.
-
-*atanks_aiu-6.0.1 (04 Jun 2014)
-
- 04 Jun 2014; Sven Eden <yamakuzure@gmx.net>
- +atanks_aiu-6.0.1.ebuild:
- -atanks_aiu-5.9.1.ebuild:
- version bump to atanks-6.0-aiu1, removed old 5.9-aiu1 ebuild.
-
-*atanks_aiu-5.9.2 (03 Jun 2014)
-
- 03 Jun 2014; Sven Eden <yamakuzure@gmx.net> +atanks_aiu-5.9.2.ebuild:
- Version bum to atanks-5.9-aiu2.
-
-*atanks_aiu-5.9.1 (30 May 2014)
-
- 30 May 2014; Sven Eden <yamakuzure@gmx.net> +atanks_aiu-5.9.1.ebuild:
- First ebuild for the Atanks AI Upgrade project (atanks-5.9-aiu1)
-
diff --git a/games-action/atanks_aiu/Manifest b/games-action/atanks_aiu/Manifest
deleted file mode 100644
index 48aff13..0000000
--- a/games-action/atanks_aiu/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST atanks-6.1-aiu3.tar.bz2 5476295 SHA256 c25279e15d967bac0b60bae83fa06769c044071b18be3121fbb5ead4fca1a2ff SHA512 8f5263c3322da77ef69db21d22567d5a01b94ffa32d5084e9297462d25c8c9341a865595d2d73963a70803e79c7a69e8d98574e3c01d8cb7e916a69aeaf78f9a WHIRLPOOL 54c332655fe31688e83dd947c81d856df738638cfef10d28a81893ddd52b78d3fff53406004fb6561e5a19d4c05e94128ccff7d1d074ec6f6250dfeb9456d0a0
-DIST atanks-6.2-aiu1.tar.bz2 5450490 SHA256 c89e652555f7da6fae43c15d142aadcc386b8457c3a5c0e970aaac7ecc7588ff SHA512 2acd9ad9265fde45710e5cac3f75a1ed05f6df5cc3afc9c8151732cca21ab575fa618bdc144709db799dba5ca7f23a99c571a7ace667da160f0cbf2041c9b0c3 WHIRLPOOL cc40d304819cb6f93b347c0821fb60d8652b521f1eda1ec7b1702dffb32058400b2bce2a00c6c34866c2a21aedbcaeb963225f20901c49952221d7240160f79e
-EBUILD atanks_aiu-6.1.3.ebuild 1349 SHA256 7cb1335331fbf51428992bdbcb4719806ee70f3ffa1999bd5a83f8500ecc283e SHA512 ccc312830b5020a67dace27029f4589abafd8bd2f4503842236739c778283e9d4d0e2edce25019599783a7b8321abe32cce7c577def353bc3cdd6b72a1be5414 WHIRLPOOL 7193e00f668918605936ab248370f9d25a589289fd32dc72e921fdad7fccafee0747ce47a04b4242a4f993d2ef6a26a22daed61495468019926e2e2cdbd8ab4f
-EBUILD atanks_aiu-6.2.1.ebuild 1349 SHA256 7cb1335331fbf51428992bdbcb4719806ee70f3ffa1999bd5a83f8500ecc283e SHA512 ccc312830b5020a67dace27029f4589abafd8bd2f4503842236739c778283e9d4d0e2edce25019599783a7b8321abe32cce7c577def353bc3cdd6b72a1be5414 WHIRLPOOL 7193e00f668918605936ab248370f9d25a589289fd32dc72e921fdad7fccafee0747ce47a04b4242a4f993d2ef6a26a22daed61495468019926e2e2cdbd8ab4f
-MISC ChangeLog 2640 SHA256 1b70cfa383ee8351daeff46d5ba8a851eafb4bfab65fe2b3f8e27dd6be93986e SHA512 1aa01389029876645c878c2553316e98949e20a9c970677c09f4a1b451c129ca015534911acf36ba948ed60051af51631055cab1ec83b434693a0844b77c213c WHIRLPOOL d3dc0ff12b4011a2fa574ad566473a9452c833bc837123033d498849c2c220bc42d392fbfba86d0d135823be3d105658e50e204c47f62a764637c92e9f2fbab7
-MISC metadata.xml 312 SHA256 9149f1c15b89bb35a6218e2e48717652d479d94fb6152cdfe64a46c69746c5dc SHA512 c78fa29dff46359f704f5e084e7b7f35ee5a6ee6e78143ea41aa6ade80c9d9e14113a4944c6d693e8497f561f3229cd487d043527ff91674c4739bade79c7e5b WHIRLPOOL 2dfcb7b9ac6412c56fda0d6e7f38a3160f3e3417bf249a4acb92e5b5bdb9329be596ee6d4a09a114e8b1d19ab31ad7fb043da01203c19cf083844520370d8476
diff --git a/games-action/atanks_aiu/atanks_aiu-6.1.3.ebuild b/games-action/atanks_aiu/atanks_aiu-6.1.3.ebuild
deleted file mode 100644
index b4f71ad..0000000
--- a/games-action/atanks_aiu/atanks_aiu-6.1.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit eutils gnome2-utils games versionator
-
-MY_PV=$(get_version_component_range 1-2)-aiu$(get_version_component_range 3)
-MY_PN=atanks
-MY_P=${MY_PN}-${MY_PV}
-
-DESCRIPTION="Worms and Scorched Earth-like game (AI Upgrade project)"
-HOMEPAGE="http://atanksaiupgrade.sourceforge.net/"
-SRC_URI="mirror://sourceforge/atanksaiupgrade/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug"
-
-DEPEND="
- media-libs/allegro:0[X]
- !games-action/atanks"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- find . -type f -name ".directory" -exec rm -vf '{}' +
-}
-
-src_compile() {
- xDebug="NO"
- if use debug; then
- xDebug="YES"
- fi
-
- emake \
- BINDIR="${GAMES_BINDIR}" \
- INSTALLDIR="${GAMES_DATADIR}/${MY_PN}" \
- DEBUG=$xDebug
-}
-
-src_install() {
- dogamesbin ${MY_PN}
- insinto "${GAMES_DATADIR}"/${MY_PN}
- doins -r button misc missile sound stock tank tankgun text title unicode.dat *.txt
- doicon -s 48 ${MY_PN}.png
- make_desktop_entry atanks "Atomic Tanks (AI Upgrade)"
- dodoc Changelog README TODO
- prepgamesdirs
-}
-
-pkg_preinst() {
- games_pkg_preinst
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- games_pkg_postinst
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/games-action/atanks_aiu/atanks_aiu-6.2.1.ebuild b/games-action/atanks_aiu/atanks_aiu-6.2.1.ebuild
deleted file mode 100644
index b4f71ad..0000000
--- a/games-action/atanks_aiu/atanks_aiu-6.2.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit eutils gnome2-utils games versionator
-
-MY_PV=$(get_version_component_range 1-2)-aiu$(get_version_component_range 3)
-MY_PN=atanks
-MY_P=${MY_PN}-${MY_PV}
-
-DESCRIPTION="Worms and Scorched Earth-like game (AI Upgrade project)"
-HOMEPAGE="http://atanksaiupgrade.sourceforge.net/"
-SRC_URI="mirror://sourceforge/atanksaiupgrade/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug"
-
-DEPEND="
- media-libs/allegro:0[X]
- !games-action/atanks"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- find . -type f -name ".directory" -exec rm -vf '{}' +
-}
-
-src_compile() {
- xDebug="NO"
- if use debug; then
- xDebug="YES"
- fi
-
- emake \
- BINDIR="${GAMES_BINDIR}" \
- INSTALLDIR="${GAMES_DATADIR}/${MY_PN}" \
- DEBUG=$xDebug
-}
-
-src_install() {
- dogamesbin ${MY_PN}
- insinto "${GAMES_DATADIR}"/${MY_PN}
- doins -r button misc missile sound stock tank tankgun text title unicode.dat *.txt
- doicon -s 48 ${MY_PN}.png
- make_desktop_entry atanks "Atomic Tanks (AI Upgrade)"
- dodoc Changelog README TODO
- prepgamesdirs
-}
-
-pkg_preinst() {
- games_pkg_preinst
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- games_pkg_postinst
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/games-action/atanks_aiu/metadata.xml b/games-action/atanks_aiu/metadata.xml
deleted file mode 100644
index 47c06ea..0000000
--- a/games-action/atanks_aiu/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
- <email>yamakuzure@gmx.net</email>
- <description>The creator of this ebuild, but not the official maintainer</description>
-</maintainer>
-</pkgmetadata>
diff --git a/games-roguelike/tomenet/ChangeLog b/games-roguelike/tomenet/ChangeLog
deleted file mode 100644
index d412416..0000000
--- a/games-roguelike/tomenet/ChangeLog
+++ /dev/null
@@ -1,9 +0,0 @@
-# ChangeLog for games-roguelike/tomenet
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*tomenet-100908 (27 Mar 2011)
-
- 27 Mar 2011; Sven Eden <sven.eden@gmx.de> +tomenet-100908.ebuild : Initial
- commit of the ebuild.
-
diff --git a/games-roguelike/tomenet/Manifest b/games-roguelike/tomenet/Manifest
deleted file mode 100644
index 868677e..0000000
--- a/games-roguelike/tomenet/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST tomenet-cvs-snapshot-100908.tar.bz2 2330681 SHA256 7910820058fe9d7caf2b3722972212c174c42489e5873bb72ff62b478dac1008
-EBUILD tomenet-100908.ebuild 1285 SHA256 d950e3076b0b7aedba7118ce80728f46e88c0a475c5a900ff71ae768fba82a44 SHA512 740dffa42629b885b6af1bde84b69c129e127257aa5c65b4a28a2e181609b571d4a1b67fbf467c46fef2e86c8c40fe473414516dc02e46a7ee2b44410623ce81 WHIRLPOOL b2be3dfd0649f41ae163a09a6f39eecec68a610a20538b908b8e8e8d3e8e8645aa679ff207ccaa43f5ab10dfc642e765d617ba021ca4ee76dc983c02b64dbbbd
-MISC ChangeLog 257 SHA256 fd7674788b68576feeef35d8a8cbb6529cd95d78e8dca190f2ca06ff3a1b0d29 SHA512 1ef3692028c804da7dea429568a461a503512d3901edd45c24bde4b3bbbb284601b8a0b67624a0b49c4a11e45166924757c0cef8a48f6eb4edbde38f2c18a9c5 WHIRLPOOL 3961d0e9790a9523bd29f1cc996e06bdf1ade546fd7fb3519d700d64ba5d043f3fe680bb0b2ff05a736a1dd53fca8713373812a47fad8aa0538dea72e20d9172
-MISC metadata.xml 863 SHA256 5d2bb65513e07243f93f9fcb1fb9144004926b5abb87665c7130a35e232ba018 SHA512 e75a22fd6952de33bcbcbff6dcacd38774ce890da26804d469130efd7aadab2a24afa63533a05ab2c9ecb92f19f8bfdc88a4377fdb6ce302ffcbe960999e3bf0 WHIRLPOOL 52f09e02178d6db8ffb47ccea617dc550a56454398c73a35fe8abee5917687b2e69775fffc84d59b92c21a25bbf0cd5b07e4ab55483c01fc0106d66f39dc6d55
diff --git a/games-roguelike/tomenet/metadata.xml b/games-roguelike/tomenet/metadata.xml
deleted file mode 100644
index 26120e7..0000000
--- a/games-roguelike/tomenet/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
- <email>yamakuzure@gmx.net</email>
- <description>The creator of this ebuild, but not the official maintainer</description>
-</maintainer>
-<longdescription>TomeNET is a multiplayer fantasy dungeon exploration game based on the works of J.R.R. Tolkien. It is a game that emphasizes intricate, challenging, and varied gameplay over graphics. Hundreds of different monsters in randomly-generated, unpredictable dungeons will strive to slay you by various means, and you counter - if you survive - by developing the skills of your choice and wielding mighty artifacts.</longdescription>
-<use>
- <flag name='X'>Enable libX11 display</flag>
- <flag name='Xaw3d'>Enable Xaw3d display</flag>
-</use>
-</pkgmetadata>
diff --git a/games-roguelike/tomenet/tomenet-100908.ebuild b/games-roguelike/tomenet/tomenet-100908.ebuild
deleted file mode 100644
index b6bd981..0000000
--- a/games-roguelike/tomenet/tomenet-100908.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-inherit games
-
-DESCRIPTION="A MMORPG based on the works of J.R.R. Tolkien"
-HOMEPAGE="http://www.tomenet.net/"
-SRC_URI="http://angband.oook.cz/${PN}-nightly/${PN}-cvs-snapshot-${PV}.tar.bz2"
-
-LICENSE="Moria"
-KEYWORDS="x86 amd64"
-IUSE="X Xaw3d"
-
-SLOT="0"
-
-DEPEND="sys-libs/ncurses
- X? ( x11-libs/libX11 )
- Xaw3d? ( x11-libs/libXaw )"
-
-S=${WORKDIR}/${PN}/src
-
-src_prepare() {
- sed -i \
- -e '/^CC =/d' \
- makefile \
- || die "sed failed"
-}
-
-src_compile() {
- local GENTOO_DEFINES="-DUSE_GCU "
- local GENTOO_LIBS="-lncurses -lcrypt -lm"
-
- if use Xaw3d; then
- GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_XAW"
- elif use X; then
- GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_X11"
- fi
- if use X; then
- GENTOO_LIBS="${GENTOO_LIBS} -lX11"
- fi
- if use Xaw3d; then
- GENTOO_LIBS="${GENTOO_LIBS} -lXaw"
- fi
- emake CFLAGS="${CFLAGS} ${GENTOO_DEFINES} -Iserver -Iserver/lua" \
- LIBS="${GENTOO_LIBS}" tomenet \
- || die "emake failed"
-}
-
-src_install() {
- dogamesbin ${PN} || die "dogamesbin failed"
- dodoc ../{ChangeLog,TomeNET-Guide.txt,changes.txt}
- prepgamesdirs
-}
-
-pkg_postinst() {
- games_pkg_postinst
- elog "To start playing right away:"
- elog "$ tomenet totem.ielf.org"
-}
diff --git a/java-virtuals/jetty-server/ChangeLog b/java-virtuals/jetty-server/ChangeLog
deleted file mode 100644
index 5bc4b9a..0000000
--- a/java-virtuals/jetty-server/ChangeLog
+++ /dev/null
@@ -1,42 +0,0 @@
-# ChangeLog for java-virtuals/jetty-server
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
- 02 Feb 2012; Sven Eden <sven.eden@gmx.de>
- -jetty-server-7-r2.ebuild :
- Eclipse won't accept jetty-7, so drop it.
-
-*jetty-server-7-r2.ebuild (02 Feb 2012)
-*jetty-server-6-r4.ebuild (02 Feb 2012)
-
- 02 Feb 2012; Sven Eden <sven.eden@gmx.de>
- +jetty-server-7-r2.ebuild
- +jetty-server-6-r4.ebuild
- -jetty-server-7.ebuild :
- -jetty-server-6-r2.ebuild :
- Hotfix for a wrong list of provided packages by the ebuilds, causing
- packages like eclipse-sdk to fix with no useful error message
-
-*jetty-server-7.ebuild (02 Feb 2012)
-*jetty-server-6-r2.ebuild (02 Feb 2012)
-
- 02 Feb 2012; Sven Eden <sven.eden@gmx.de>
- +jetty-server-7.ebuild
- +jetty-server-6-r2.ebuild
- -jetty-server-6-r1.ebuild :
- Added virtual for jetty 7, fixed an issue with the slot 6 ebuild and
- cleaned up old ebuilds
-
-*jetty-server-6-r1.ebuild (01 Feb 2012)
-
- 01 Feb 2012; Sven Eden <sven.eden@gmx.de>
- -jetty-server-6.ebuild
- +jetty-server-6-r1.ebuild :
- Removed all dependencies that are neither present in the portage tree
- nor in my own overlay.
-
-*jetty-server-6.ebuild (15 Aug 2011)
-
- 15 Aug 2011; Sven Eden <sven.eden@gmx.de> +jetty-server-6.ebuild :
- Initial commit of the ebuild. Ebuild taken from Bug #328747, written
- by John J. Aylward (johnjaylward@yahoo.com)
diff --git a/java-virtuals/jetty-server/Manifest b/java-virtuals/jetty-server/Manifest
deleted file mode 100644
index 8c08c48..0000000
--- a/java-virtuals/jetty-server/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD jetty-server-6-r4.ebuild 552 RMD160 01020e00631435a620c9a32785bf8ee7286c3b6c SHA1 52bc823a72be34031b69ae4a401be4340e4765fa SHA256 dc0027bcb6c9f3098b8c7b6e7d8969bea1d6f557f19c28517399bec2cbf675ac
-MISC ChangeLog 1384 RMD160 9eb4bb903748c87a7c890e36170636f8415ee2c0 SHA1 f2be268bdd0b7e3762b4e3109ad52ef0f1c12572 SHA256 c62b79bf19e41a260840c232cdb01e90dd57bf88eea84dc50c2280559f59e819
diff --git a/java-virtuals/jetty-server/jetty-server-6-r4.ebuild b/java-virtuals/jetty-server/jetty-server-6-r4.ebuild
deleted file mode 100644
index e378b68..0000000
--- a/java-virtuals/jetty-server/jetty-server-6-r4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/ssh/ssh-0.ebuild,v 1.1 2011/04/16 19:27:07 ulm Exp $
-
-EAPI=4
-
-inherit java-virtuals-2
-
-DESCRIPTION="Virtual for Jetty www server"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="|| (
- www-servers/jetty-bin:${SLOT}
- )
- >=dev-java/java-config-2.1.8"
-
-JAVA_VIRTUAL_PROVIDES="jetty-${SLOT} jetty-bin-${SLOT} jetty-eclipse-${SLOT} jetty-eclipse-bin-${SLOT}"
diff --git a/kde-misc/smooth-tasks-flupp/Manifest b/kde-misc/smooth-tasks-flupp/Manifest
deleted file mode 100644
index 599006a..0000000
--- a/kde-misc/smooth-tasks-flupp/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD smooth-tasks-flupp-9999-r4.ebuild 646 SHA256 568a609f4802ec7136e5c09530debb7fa161cfe11338d0e9f6e27babecce848a SHA512 c8981a7281fbae9fe1c0582b77a9c8b3cf54bf1b07a88e9519caeea9dbe0bfa780c4ff56f05bd62a9d28d66f570a7fafc799f67cf38c345bad70bdbffbdc5cb6 WHIRLPOOL ea9ad8453228fa8bf1e821af6f5fc85d6587a7058a8f1c3ef6c6d58e0a7dca9443bbf30180e1da00a2c8875c4c589f16d6dde2d7e8c01cf19422bbe035bb2df7
-MISC metadata.xml 329 SHA256 306c7b617bcfc71869cdce80d4ed1bdaeea017d82df02b7a8a8380dcb13fc95e SHA512 44a2b309483485d09df40a2bb78ed2fff9fad1b544def5d2b7cb20b67184330ae7f4474cfd1dc7ebd5b25da5015fdde3b8d7b4cfd443ead82943a78b36fa7a94 WHIRLPOOL 94a24c9853f230adf5b683fa553dcdb35508a2646c1b45458ab07efbb323e7f260dc8615eb6a5312a2b3e3181db2ae3a5ec0f099cca5ad71974556cde8518ee7
diff --git a/kde-misc/smooth-tasks-flupp/metadata.xml b/kde-misc/smooth-tasks-flupp/metadata.xml
deleted file mode 100644
index e85bab3..0000000
--- a/kde-misc/smooth-tasks-flupp/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
- <email>yamakuzure@gmx.net</email>
- <description>Overlay-only maintainership as long as the ebuild is not in the tree</description>
-</maintainer>
-<use />
-</pkgmetadata>
diff --git a/kde-misc/smooth-tasks-flupp/smooth-tasks-flupp-9999-r4.ebuild b/kde-misc/smooth-tasks-flupp/smooth-tasks-flupp-9999-r4.ebuild
deleted file mode 100644
index e7c8b47..0000000
--- a/kde-misc/smooth-tasks-flupp/smooth-tasks-flupp-9999-r4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-KDE_LINGUAS="cs de fr hu pl ru zh_CN"
-KDE_MINIMAL="4.8"
-KDE_SCM=""
-
-inherit kde4-base mercurial
-
-DESCRIPTION="Alternate taskbar KDE plasmoid, similar to Windows 7 - Flupp Fork"
-HOMEPAGE="https://bitbucket.org/flupp/smooth-tasks-fork"
-EHG_REPO_URI="https://bitbucket.org/flupp/smooth-tasks-fork"
-EHG_PROJECT="smooth-tasks-fork"
-EHG_REVISION="kde-4.8"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="
- $(add_kdebase_dep libtaskmanager)
-"
-RDEPEND="${DEPEND}
- $(add_kdebase_dep plasma-workspace)
-"
diff --git a/media-libs/libsfml/ChangeLog b/media-libs/libsfml/ChangeLog
deleted file mode 100644
index 9356323..0000000
--- a/media-libs/libsfml/ChangeLog
+++ /dev/null
@@ -1,9 +0,0 @@
-# ChangeLog for media-libs/libsfml
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*libsfml-2.0 (12 Apr 2013)
-
- 02 Sep 2013; Sven Eden <yamakuzure@gmx.net> +libsfml-2.1.ebuild:
- Version bump.
-
diff --git a/media-libs/libsfml/Manifest b/media-libs/libsfml/Manifest
deleted file mode 100644
index d8e374d..0000000
--- a/media-libs/libsfml/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX libsfml-2.0_pre20121126-no-docs.patch 481 SHA256 6cd7d7d8e41fea4090acf81b89b1a2422b314c226e57e85d228062c43b4478f3 SHA512 a798d94bff096c0cffb4d532c5aec16e76a9bec46ef9ef48ecd81c2bdccd505058d0f13676ec573024553d06c251b0d2d762c2183c81c79320054ce5508bb4f9 WHIRLPOOL f4ec37c84a09c788406d58da97427dfc14e417fb2113fb5a6f9c2a9556812c222d43313fec1669d884ede3b473b16bc26036ae7635d24e42d47021eb9e1dc1e2
-AUX libsfml-2.0_pre20121126-shared-glew.patch 429 SHA256 c6dd068621dc74795410e374311d9b124c1db47b004647729a93a49759b6e34b SHA512 2bf0d80becd4ed9e4e5311406ed78eddc5af52f7045b9070618be1799e9d2e784a0867dbd2dd804740e91e5bec5a596bced59866845383a930dadea668142205 WHIRLPOOL b65cb7dcd69badf623e5cb457ddc85056e7b4e67c9815545f8edae956dc2d767af842c39452d4b38dc28d81d7c6c2fc71764259a36c789bc046ebae305496094
-DIST libsfml-2.1.tar.gz 9436816 SHA256 4849e2b1bd362949e25a7c4f3fc58001f09a1a2e2999ef7c6c7a69a168518727 SHA512 5a06b34ebaeae15126aa8b8d4a84776cda75482d67161d8d0a2e5d292cc2590e2f3543f98713b3b139a4bd77518b42b3ad8f72b9b90374fac8c2370bf3619b27 WHIRLPOOL 4a978a11db6f9412b56c572649320a7bef47a75f16bdb411378cd4cd9845334d8321d02249551a0963feb55b1246f248d6397da062dd45b47f3ceb905e05fb27
-EBUILD libsfml-2.1.ebuild 1305 SHA256 edceb672ee9f38646e59f44f7794423312446a759b4fd31b194baa92d1f83c8f SHA512 bfdef27866d294d904045317c78b29e5240aa3694e2cefde7380ce61d6d32deb02a6b00b379a151d5be3ecac7ce724072c69f035627d94271e909f19cf43fb38 WHIRLPOOL 3c0e9f5d3083a031614053976416b05e1009f52ea18fae7245f8b5370c9cd52f6f5fbc36a66a0abe08a4c55d9c9958bdb23f2b0230b35fbdc438d103658f8caf
-MISC ChangeLog 231 SHA256 037bdc14314f720a87a549ab3e528bcc0c88ec485caff220f6dc6fa977fce400 SHA512 6a95e20b5b0910edd5b2f83e7cf91a33ad775803853751cce68eaa45b904228d77750024c92d81b32d9eb445b546aa61e33a1e90d0cbf4620446b65acd057f9b WHIRLPOOL 62db8c39eba12b175307bb9be9df9346b795d4b921dce8e728ce3d932a23984ffa9065b8d3512ce0aad51b0403da532cdc413a6fa11b0689d1fc00a32f57330d
-MISC metadata.xml 678 SHA256 56befeaa2bad0d2139834c1a193f107392c208448fdeafd55c65c32a02d620b6 SHA512 f61667e935bd59b88f89fd986584c4b6cf493d1d51dff142b8accedde539599ee65f1bc845e442d62a58bddbf507aaf4bd722146f076ff14e5dadbe333dbe2c0 WHIRLPOOL aaac8afa58426ce082da3b6ec23a10c36a9c650b8bb975d0ca330905c28d1dd91d45f2e11bb218c319a165fc824d9a61a143f6fa3741ff2f8ce1055b1f8d32ab
diff --git a/media-libs/libsfml/files/libsfml-2.0_pre20121126-no-docs.patch b/media-libs/libsfml/files/libsfml-2.0_pre20121126-no-docs.patch
deleted file mode 100644
index c37520c..0000000
--- a/media-libs/libsfml/files/libsfml-2.0_pre20121126-no-docs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- libsfml-2.0.0_pre20121126/CMakeLists.txt
-+++ libsfml-2.0.0_pre20121126/CMakeLists.txt
-@@ -211,10 +211,6 @@
- COMPONENT devel)
- endif()
-
--install(FILES cmake/Modules/FindSFML.cmake DESTINATION ${INSTALL_MISC_DIR}/cmake/Modules)
--install(FILES license.txt DESTINATION ${INSTALL_MISC_DIR})
--install(FILES readme.txt DESTINATION ${INSTALL_MISC_DIR})
--
- if(WINDOWS)
- if(ARCH_32BITS)
- install(FILES extlibs/bin/x86/libsndfile-1.dll DESTINATION bin)
diff --git a/media-libs/libsfml/files/libsfml-2.0_pre20121126-shared-glew.patch b/media-libs/libsfml/files/libsfml-2.0_pre20121126-shared-glew.patch
deleted file mode 100644
index 9f4baf8..0000000
--- a/media-libs/libsfml/files/libsfml-2.0_pre20121126-shared-glew.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libsfml-2.0.0_pre20121126/src/SFML/Graphics/CMakeLists.txt
-+++ libsfml-2.0.0_pre20121126/src/SFML/Graphics/CMakeLists.txt
-@@ -102,7 +102,7 @@
- endif()
-
- # add preprocessor symbols
--add_definitions(-DGLEW_STATIC -DSTBI_FAILURE_USERMSG)
-+add_definitions(-DSTBI_FAILURE_USERMSG)
-
- # ImageLoader.cpp must be compiled with the -fno-strict-aliasing
- # when gcc is used; otherwise saving PNGs may crash in stb_image_write
diff --git a/media-libs/libsfml/libsfml-2.1.ebuild b/media-libs/libsfml/libsfml-2.1.ebuild
deleted file mode 100644
index 1730b61..0000000
--- a/media-libs/libsfml/libsfml-2.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit cmake-utils eutils
-
-MY_P=SFML-${PV}
-
-DESCRIPTION="Simple and Fast Multimedia Library (SFML)"
-HOMEPAGE="http://sfml.sourceforge.net/ https://github.com/LaurentGomila/SFML"
-SRC_URI="https://github.com/LaurentGomila/SFML/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc examples"
-
-RDEPEND="media-libs/freetype:2
- media-libs/glew
- media-libs/libpng:0=
- media-libs/libsndfile
- media-libs/mesa
- media-libs/openal
- sys-libs/zlib
- virtual/jpeg
- x11-libs/libX11
- x11-libs/libXrandr"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )"
-
-DOCS="readme.txt"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.0_pre20121126-no-docs.patch
- epatch "${FILESDIR}"/${PN}-2.0_pre20121126-shared-glew.patch
-
- sed -i "s:DESTINATION .*:DESTINATION /usr/share/doc/${PF}:" \
- doc/CMakeLists.txt || die
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use doc SFML_BUILD_DOC)
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use examples ; then
- docompress -x /usr/share/doc/${PF}/examples
- dodoc -r examples
- find "${ED}"/usr/share/doc/${PF}/examples -name CMakeLists.txt -delete
- fi
-}
diff --git a/media-libs/libsfml/metadata.xml b/media-libs/libsfml/metadata.xml
deleted file mode 100644
index c1fe12d..0000000
--- a/media-libs/libsfml/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer>
- <email>radhermit@gentoo.org</email>
- <name>Tim Harder</name>
- </maintainer>
- <longdescription lang="en">
- The Simple and Fast Multimedia Library (SFML) is a portable and easy to use
- multimedia API written in C++. You can see it as a modern, object-oriented
- alternative to SDL. SFML is composed of several packages to suit your needs.
- You can use SFML as a minimal windowing system to interface with OpenGL, or
- as a fully-featured multimedia library for building games or interactive
- programs.
- </longdescription>
-</pkgmetadata>
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
deleted file mode 100644
index 6d09e0a..0000000
--- a/media-libs/mesa/Manifest
+++ /dev/null
@@ -1,19 +0,0 @@
-AUX eselect-mesa.conf.9.2 1676 SHA256 bcf5f77140b4695f147d4cd3c2db4b954fb57eccfd4475c7f7c4866edda8436e SHA512 d0061359638c0d9729ba1035fd7740c84d59f538adc11af2ee671b5ddbc83c420159efbefcc39ea680f06d20507f1e1d76b528712a07baeca901a413ba7b55df WHIRLPOOL 0fc650223a1910305bb2c4b7b946ac8b83b5b1ba0b79b586a96303a369b30c9c03dc658a6e8e9a29c5c4605f3865e245be0a0e6a27c40ac37402e8a2616b3ace
-AUX glx_ro_text_segm.patch 731 SHA256 e36af5b530fdbe2b0e62a035bf4bf4baef267c3dc56133d1a58e56899ebffc5c SHA512 90d04d1268cc90e1c5596b49b143895eba99d4e7f7d9bb5f699725c1308e3995edac44e3f61536c7ce70ebf5df84a5a22c18fa84fb54fbddb339f908975bb43c WHIRLPOOL 42171ef67930bebdcfdfcb0c9370234791c6125be760b6419abfff44bd65899982167d6da4d6eb4198383438e6376b4b695109af158083b903071c545160d883
-AUX mesa-10.2-dont-require-llvm-for-r300.patch 547 SHA256 83cfeae33b1e8c84b37ed59c353000eb775978ae3d9035ba8ce4f63a167756fc SHA512 d1cb5a989aa001c99f353d27ab5b28ac05d60050614bbfd76ca5d312e00efcc2b1a2459d30d697b68119310c69512b4195afce6c0ed7f31fb9cf14689a740e27 WHIRLPOOL c06669942d275a9d9f132ec8f51d3ecf23d33cb89cb607ba3a7861f209f283b39a9568513b07e22f0dfcc99339a307d7b2a6b03f261ed583fd4518d3b4d0b464
-AUX mesa-10.3.7-dont-use-clrsb.patch 1140 SHA256 23626c6bf1e502f17f4b9236b512063b41bf52be64f56252f0fc5ce456824d58 SHA512 2d9dd9a56c3bab02e8ec1a1ab4d88c2855746d8243548f197cb43de6e980554447c75e53c07dcd270de7e1c282cf7fdf996e5102a24e47b75e484a18f99092e0 WHIRLPOOL 47b222fb61427bbe2a63ac4b738608e9c3491e6373c33e1d68c79198a111d7668b4cafbac9e58820e8cefae55dffca46ab57dbe91ad819feeb734c32f01020f0
-AUX mesa-10.3.7-format_utils.c.patch 34839 SHA256 81ec8d547d798aa5ef5dfc9f0685291af04f95882608f8e9db39a867f44ab431 SHA512 777597b41c37ced0fb375048cc30c4cac701c6020c70bd0f6fbbc2d6f2c1ac9ece0f6d411d81dd042be7f2fbc17e0536176d8230b93f9eed7d7ddf205ac98bb8 WHIRLPOOL 51a213c415d81250a2bc3ad117581b62c4eed13152a9550b2214a9c63f85a6559b1504e013ae0d8e56d5adcaff053c753aa833d7acbe10185d468fdfed5e1b72
-AUX mesa-10.5.1-fstat-include.patch 1008 SHA256 4d44da3882ae9ae7c5d255189e5ca86569337a53d6aece4c65344c753aa588d3 SHA512 6df3167efe198955198b4eb3e1c883f307ebbeb5ebaa63836f8bddf70173382454de6b0d9cb626bb20a5a649fe355a7d25ed5ce27348d5234df27fb9c920b4b4 WHIRLPOOL b05dee0366e35105a7eac143bd4b59e146b0ca369b522e58d2e9a08c8c35b79e929edeacf90154d826dc7ff40ebc7161cc3a6b663e0418388b8f5f5254747066
-AUX mesa-11.1.2-i965-fix-use-after-free.patch 1874 SHA256 f6c29deb28bf33857b7e9889a199d5373db634d26d5c09bfd6faa7d33df828c1 SHA512 9f4dd00ec9bcab2575957a12f0ca06a7ac3a8edbeefee24a3848013d41886da6697aa1da133efe2437d9ac52e1eb347fc0898fd7ad154336a8d962d3b5cdc6e7 WHIRLPOOL efa644560c5778fd37abdc803e88c9375a131f1c874197cf8115fbdcc8c2ed7ef07c549d810daad13e12b984fb1b40ebae969916d40d4cacc4e006b0ef2163d4
-DIST MesaLib-10.3.7.tar.bz2 7287153 SHA256 43c6ced15e237cbb21b3082d7c0b42777c50c1f731d0d4b5efb5231063fb6a5b SHA512 bbc027c4146c42aaa160990f5281c71a342d32c10ba56f91da1a60dd4cb7d620ff49b72553d24bc1d87470e2baf9be81b5bdee9abe49d6acc57902fccb9e2e5f WHIRLPOOL 7fa32e70c6aabb84a06f2f852f77eac839aea08726c442742b3d3abdb94a0fd9f033439ab0cb16865f4ee14e1538cb86937856bbdfd1f9090e8e7c43eac52e03
-DIST mesa-11.0.6.tar.xz 7272972 SHA256 8340e64cdc91999840404c211496f3de38e7b4cb38db34e2f72f1642c5134760 SHA512 946a66803395ef0f4d3b328e981e03a87bb5173a523be5da1dd3363002fceacd8dcbfdbf9716e31bb4247b23cc5ef112b24bb4ef0709b514bc8160c6cbf1dbf3 WHIRLPOOL 19729acb5fbbcff3a99b4d7644750dff4a7a2d41c3f25f2e004938faf0c72abd33e97f5d23d2804f84b957824757b5f64f3a7f54a2dd8999b2a71eb9b1976e0b
-DIST mesa-11.0.9.tar.xz 7282648 SHA256 a1262ff1c66a16ccf341186cf0e57b306b8589eb2cc5ce92ffb6788ab01d2b01 SHA512 8bf9c3bfe61f5d22182b9611d66051d83dfb302cc349921bc1d895acc8681b3e22e77cb360e2f12383fd928793b306f8f98998caa457dc04e3ff4e5561ea78f7 WHIRLPOOL a3477542b5ebfed9b69bd29e7f58a01b02c70d49399afb873744de08e776d712eaca3443f88dbdee25b1d3d35a4eb9dae75a3b9d7d6d652d41cded763836c59a
-DIST mesa-11.1.2.tar.xz 7561920 SHA256 8f72aead896b340ba0f7a4a474bfaf71681f5d675592aec1cb7ba698e319148b SHA512 4037728cbe7c5c492cf1e6d20c61250c0ff4fe82cf89ba1cd6ff029776220160359dce197582d2c3f3f7ba5d76fe6b055515210fc46b59f821fc66f453cb77ae WHIRLPOOL e7a848f542c13eae1a79c89a6bff3fbc0c82041924f1cbecac7eaba6363edebfce568353829c41eb38c0c309e0aa35f36027b0dca262ed54d6627542d74f6bca
-DIST mesa-11.2.0.tar.xz 7856132 SHA256 1c1fed2674abf3f16ed2623e9a5694d6752c293194e18462ebc644a19cfaafb2 SHA512 ce56d9669cb31f465b67fa056428f59c89b60480da1e0b3e293dc740a12ed2ead0574c356017c13dfb4666616843808b9a1b7501eac14fb774981739c7d363b7 WHIRLPOOL 7c2439e836072d7a046605f068c0a50414ac742df622a8a538eb910293e029d84a161531c9b1cf5ecb230c619547cf10cda7eb12e0744903b22c8e813f8b53eb
-EBUILD mesa-10.3.7-r2.ebuild 14754 SHA256 83a79c384fb68cba52d248c8206364e2d80b8a3f241999033b72ea90ceb57d68 SHA512 c76f2fa6e50f40503c3edcd0b914e6b40395c38124cb8ab1627d03466c812669fb5e1998a7b7902cf31dd08b56fe4d04f4f084814c4afbc3b440b24a2ce75b89 WHIRLPOOL d8ea02374f2049e4d6084ea797c21427e832ceeebf1389ed2ee83e65eefd2df0d00cbe0a1dd190d531eb8a1cba7af1bcb2be73badee789ca3d02cb6b452449ef
-EBUILD mesa-11.0.6-r1.ebuild 12794 SHA256 be260268f7fe067e9fe53bb3cc8be53fa3f164ed9e6ee6fd3a1e27902c80f9db SHA512 cd881dcb3562d25f170ff2d71cef73247607decbdac31a8fa5c03de2f5316995d803cbd2816be27865f16e7e3f6d8de027cd868b3002aa065578b567092a107f WHIRLPOOL 9aee7703149a4e31aeec5a01a90eea5dfe9347279f481c442725c21916170530ef58e44eb2004b0eb5e843405a2a4c26a975ff8642679e071605fb64e9cfe867
-EBUILD mesa-11.0.9-r1.ebuild 12677 SHA256 c382e9539ec4bf4e794f574ceae6fba9cf992599b6d385b36ac05a2994ef97fa SHA512 b86e42fe3ce6c650952f497bd6681d29bc9ff199a2fd05ed5591550d30626ea3fe30aad237ae5f3e67c1c570a79c01dcd344c10ff3d6fceb375730c82e3b5b62 WHIRLPOOL 6e7382849661417e28ebe06f2e0eba22f52f4e774a486e142ccded6d279dc071036a5b2b1b923d636bb0aa6a03770681c9f5aa23aa133896752b5261d8ceea70
-EBUILD mesa-11.1.2-r2.ebuild 12742 SHA256 aa09c598c808f6dbc8c69181d8e53b1d10b1d49f3c7af32a5c6a16c370343094 SHA512 30ec7921694ee073bb00d1434bf592d9b5b61ea9ef8da72efd1b7d0fbe2fe0d42acc95d9d0ffb5cd3468ec139b66ef47e0125649e949446079e5f2f4ed91806f WHIRLPOOL db9d8e25552b9dc369fde87dcf4e370c2bafb4a5dc26e910b751af31b5761de6ca695f40f4ceeb0986eb9bf44bebf9acfc2aabcecea2f3967f63442cad100383
-EBUILD mesa-11.2.0-r1.ebuild 12761 SHA256 4a6c29e6c335fe1d402c86bab24c5777b7e5b06ba2786c249b50ee2e2a443e84 SHA512 2fe8560ea682588e965f237ac1e223178d91313fbf9fd6102434512328bd809aabe914cfd43c0555a72b6be7f375e63d867c2e97a6641286c96a342b73d8cbef WHIRLPOOL 9858be3b855bcad6b4f3eaab9b4a7c6814d0428a0ad053f669e9513e131e61fecc1dc7bbd262a57dde1f54e6082e4579606f780d1bfea4ffeb2ea9b85a4b62d8
-EBUILD mesa-9999-r1.ebuild 12761 SHA256 4a6c29e6c335fe1d402c86bab24c5777b7e5b06ba2786c249b50ee2e2a443e84 SHA512 2fe8560ea682588e965f237ac1e223178d91313fbf9fd6102434512328bd809aabe914cfd43c0555a72b6be7f375e63d867c2e97a6641286c96a342b73d8cbef WHIRLPOOL 9858be3b855bcad6b4f3eaab9b4a7c6814d0428a0ad053f669e9513e131e61fecc1dc7bbd262a57dde1f54e6082e4579606f780d1bfea4ffeb2ea9b85a4b62d8
-MISC metadata.xml 2119 SHA256 d8d4890f21345584ed206257047651bd020cfe34e762e63e5be9d3ac883680fe SHA512 9726a4bfc69e16da0ae8bb947a91e6e6ce046afa836a861fa381a41cc7f4ffbcfb7fb1262c1d06a55750b1d6c3fd09860b25e0696d74467fa2134811c268553a WHIRLPOOL fb4a2c866f6e027e3ab4f3262b8fb2b7eb37dd094713015a6163c1f9579df49cec6e51a2a4f2ac6265fb89d9f733ce0ccb1c0c4f168a87e40446baa4c3500dfd
diff --git a/media-libs/mesa/files/eselect-mesa.conf.9.2 b/media-libs/mesa/files/eselect-mesa.conf.9.2
deleted file mode 100644
index ff590f5..0000000
--- a/media-libs/mesa/files/eselect-mesa.conf.9.2
+++ /dev/null
@@ -1,39 +0,0 @@
-# mesa classic/gallium implementations in this release
-
-# Syntax description:
-# * MESA_IMPLEMENTATIONS contains a space-delimited list of switchable
-# classic/gallium implementations.
-# * MESA_DRIVERS is an associative array, for each member "foo" of
-# MESA_IMPLEMENTATIONS it contains the following elements:
-# foo,description - Human-readable description of the driver
-# foo,classicdriver - Filename of the classic driver
-# foo,galliumdriver - Filename of the gallium driver
-# foo,default - which of classic or gallium is chosen by default
-
-MESA_IMPLEMENTATIONS="i915 i965 r300 r600 sw"
-declare -A MESA_DRIVERS || die "MESA_DRIVERS already in environment and not associative."
-
-MESA_DRIVERS[i915,description]="i915 (Intel 915, 945)"
-MESA_DRIVERS[i915,classicdriver]="i915_dri.so"
-MESA_DRIVERS[i915,galliumdriver]="i915g_dri.so"
-MESA_DRIVERS[i915,default]="gallium"
-
-MESA_DRIVERS[i965,description]="i965 (Intel GMA 965, G/Q3x, G/Q4x, HD)"
-MESA_DRIVERS[i965,classicdriver]="i965_dri.so"
-MESA_DRIVERS[i965,galliumdriver]="ilo_dri.so"
-MESA_DRIVERS[i965,default]="classic"
-
-MESA_DRIVERS[r300,description]="r300 (Radeon R300-R500)"
-MESA_DRIVERS[r300,classicdriver]="r300_dri.so"
-MESA_DRIVERS[r300,galliumdriver]="r300g_dri.so"
-MESA_DRIVERS[r300,default]="gallium"
-
-MESA_DRIVERS[r600,description]="r600 (Radeon R600-R700, Evergreen, Northern Islands)"
-MESA_DRIVERS[r600,classicdriver]="r600_dri.so"
-MESA_DRIVERS[r600,galliumdriver]="r600g_dri.so"
-MESA_DRIVERS[r600,default]="gallium"
-
-MESA_DRIVERS[sw,description]="sw (Software renderer)"
-MESA_DRIVERS[sw,classicdriver]="swrast_dri.so"
-MESA_DRIVERS[sw,galliumdriver]="swrastg_dri.so"
-MESA_DRIVERS[sw,default]="gallium"
diff --git a/media-libs/mesa/files/glx_ro_text_segm.patch b/media-libs/mesa/files/glx_ro_text_segm.patch
deleted file mode 100644
index 495b7dc..0000000
--- a/media-libs/mesa/files/glx_ro_text_segm.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-2011-02-09 Jeremy Huddleston <jeremyhu@freedesktop.org
-
- #240956
- * configure.ac add support to enable readonly test segment on x86
-
---- configure.ac.orig 2008-11-17 23:19:38.000000000 +0100
-+++ configure.ac 2008-11-17 23:20:17.000000000 +0100
-@@ -499,6 +499,20 @@
- enable_xcb=no
- fi
-
-+
-+dnl readonly text segment on x86 hardened platforms
-+AC_ARG_ENABLE([glx_rts],
-+ [AS_HELP_STRING([--enable-glx-rts],
-+ [on x86, use a readonly text segment for libGL @<:@default=disabled@:>@])],
-+ [enable_glx_rts="$enableval"],
-+ [enable_glx_rts=no])
-+if test "x$enable_glx_rts" = xyes; then
-+ DEFINES="$DEFINES -DGLX_X86_READONLY_TEXT"
-+else
-+ enable_glx_rts=no
-+fi
-+
-+
- dnl
- dnl libGL configuration per driver
- dnl
diff --git a/media-libs/mesa/files/mesa-10.2-dont-require-llvm-for-r300.patch b/media-libs/mesa/files/mesa-10.2-dont-require-llvm-for-r300.patch
deleted file mode 100644
index a85a3c1..0000000
--- a/media-libs/mesa/files/mesa-10.2-dont-require-llvm-for-r300.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur a/configure.ac b/configure.ac
---- a/configure.ac 2014-03-03 04:05:33.110522943 +0100
-+++ b/configure.ac 2014-03-03 04:06:44.165518094 +0100
-@@ -1774,7 +1774,6 @@
- HAVE_GALLIUM_R300=yes
- PKG_CHECK_MODULES([RADEON], [libdrm_radeon >= $LIBDRM_RADEON_REQUIRED])
- gallium_require_drm_loader
-- gallium_require_llvm "Gallium R300"
- GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"
- gallium_check_st "radeon/drm" "r300/dri" "" "" ""
- DRICOMMON_NEED_LIBDRM=yes
diff --git a/media-libs/mesa/files/mesa-10.3.7-dont-use-clrsb.patch b/media-libs/mesa/files/mesa-10.3.7-dont-use-clrsb.patch
deleted file mode 100644
index c38757d..0000000
--- a/media-libs/mesa/files/mesa-10.3.7-dont-use-clrsb.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 32e98e8ef06f0bb6ad55f9fb5858be77c03367b0 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Mon, 2 Feb 2015 17:26:49 -0800
-Subject: [PATCH] gallium/util: Don't use __builtin_clrsb in util_last_bit().
-
-Unclear circumstances lead to undefined symbols on x86.
-
-Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=536916
-Cc: mesa-stable@lists.freedesktop.org
-Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
----
- src/gallium/auxiliary/util/u_math.h | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/src/gallium/auxiliary/util/u_math.h b/src/gallium/auxiliary/util/u_math.h
-index 19c7343..ca6d0f1 100644
---- a/src/gallium/auxiliary/util/u_math.h
-+++ b/src/gallium/auxiliary/util/u_math.h
-@@ -561,14 +561,10 @@ util_last_bit(unsigned u)
- static INLINE unsigned
- util_last_bit_signed(int i)
- {
--#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 407) && !defined(__INTEL_COMPILER)
-- return 31 - __builtin_clrsb(i);
--#else
- if (i >= 0)
- return util_last_bit(i);
- else
- return util_last_bit(~(unsigned)i);
--#endif
- }
-
- /* Destructively loop over all of the bits in a mask as in:
---
-2.0.4
-
diff --git a/media-libs/mesa/files/mesa-10.3.7-format_utils.c.patch b/media-libs/mesa/files/mesa-10.3.7-format_utils.c.patch
deleted file mode 100644
index e1fba03..0000000
--- a/media-libs/mesa/files/mesa-10.3.7-format_utils.c.patch
+++ /dev/null
@@ -1,1089 +0,0 @@
-From cfeb394224f2daeb2139cf4ec489a4dd8297a44d Mon Sep 17 00:00:00 2001
-From: Brian Paul <brianp@vmware.com>
-Date: Fri, 12 Sep 2014 08:31:15 -0600
-Subject: [PATCH] mesa: break up _mesa_swizzle_and_convert() to reduce compile
- time
-
-This reduces gcc -O3 compile time to 1/4 of what it was on my system.
-Reduces MSVC release build time too.
-
-Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>
----
- src/mesa/main/format_utils.c | 1030 ++++++++++++++++++++++--------------------
- 1 file changed, 550 insertions(+), 480 deletions(-)
-
-diff --git a/src/mesa/main/format_utils.c b/src/mesa/main/format_utils.c
-index 240e3bc..29d779a 100644
---- a/src/mesa/main/format_utils.c
-+++ b/src/mesa/main/format_utils.c
-@@ -352,9 +352,14 @@ swizzle_convert_try_memcpy(void *dst, GLenum dst_type, int num_dst_channels,
- */
- #define SWIZZLE_CONVERT(DST_TYPE, SRC_TYPE, CONV) \
- do { \
-+ const uint8_t swizzle_x = swizzle[0]; \
-+ const uint8_t swizzle_y = swizzle[1]; \
-+ const uint8_t swizzle_z = swizzle[2]; \
-+ const uint8_t swizzle_w = swizzle[3]; \
- const SRC_TYPE *typed_src = void_src; \
- DST_TYPE *typed_dst = void_dst; \
- DST_TYPE tmp[7]; \
-+ int s, j; \
- tmp[4] = 0; \
- tmp[5] = one; \
- switch (num_dst_channels) { \
-@@ -423,7 +428,527 @@ swizzle_convert_try_memcpy(void *dst, GLenum dst_type, int num_dst_channels,
- } \
- break; \
- } \
-- } while (0);
-+ } while (0)
-+
-+
-+static void
-+convert_float(void *void_dst, int num_dst_channels,
-+ const void *void_src, GLenum src_type, int num_src_channels,
-+ const uint8_t swizzle[4], bool normalized, int count)
-+{
-+ const float one = 1.0f;
-+
-+ switch (src_type) {
-+ case GL_FLOAT:
-+ SWIZZLE_CONVERT(float, float, src);
-+ break;
-+ case GL_HALF_FLOAT:
-+ SWIZZLE_CONVERT(float, uint16_t, _mesa_half_to_float(src));
-+ break;
-+ case GL_UNSIGNED_BYTE:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(float, uint8_t, unorm_to_float(src, 8));
-+ } else {
-+ SWIZZLE_CONVERT(float, uint8_t, src);
-+ }
-+ break;
-+ case GL_BYTE:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(float, int8_t, snorm_to_float(src, 8));
-+ } else {
-+ SWIZZLE_CONVERT(float, int8_t, src);
-+ }
-+ break;
-+ case GL_UNSIGNED_SHORT:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(float, uint16_t, unorm_to_float(src, 16));
-+ } else {
-+ SWIZZLE_CONVERT(float, uint16_t, src);
-+ }
-+ break;
-+ case GL_SHORT:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(float, int16_t, snorm_to_float(src, 16));
-+ } else {
-+ SWIZZLE_CONVERT(float, int16_t, src);
-+ }
-+ break;
-+ case GL_UNSIGNED_INT:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(float, uint32_t, unorm_to_float(src, 32));
-+ } else {
-+ SWIZZLE_CONVERT(float, uint32_t, src);
-+ }
-+ break;
-+ case GL_INT:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(float, int32_t, snorm_to_float(src, 32));
-+ } else {
-+ SWIZZLE_CONVERT(float, int32_t, src);
-+ }
-+ break;
-+ default:
-+ assert(!"Invalid channel type combination");
-+ }
-+}
-+
-+
-+static void
-+convert_half_float(void *void_dst, int num_dst_channels,
-+ const void *void_src, GLenum src_type, int num_src_channels,
-+ const uint8_t swizzle[4], bool normalized, int count)
-+{
-+ const uint16_t one = _mesa_float_to_half(1.0f);
-+
-+ switch (src_type) {
-+ case GL_FLOAT:
-+ SWIZZLE_CONVERT(uint16_t, float, _mesa_float_to_half(src));
-+ break;
-+ case GL_HALF_FLOAT:
-+ SWIZZLE_CONVERT(uint16_t, uint16_t, src);
-+ break;
-+ case GL_UNSIGNED_BYTE:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(uint16_t, uint8_t, unorm_to_half(src, 8));
-+ } else {
-+ SWIZZLE_CONVERT(uint16_t, uint8_t, _mesa_float_to_half(src));
-+ }
-+ break;
-+ case GL_BYTE:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(uint16_t, int8_t, snorm_to_half(src, 8));
-+ } else {
-+ SWIZZLE_CONVERT(uint16_t, int8_t, _mesa_float_to_half(src));
-+ }
-+ break;
-+ case GL_UNSIGNED_SHORT:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(uint16_t, uint16_t, unorm_to_half(src, 16));
-+ } else {
-+ SWIZZLE_CONVERT(uint16_t, uint16_t, _mesa_float_to_half(src));
-+ }
-+ break;
-+ case GL_SHORT:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(uint16_t, int16_t, snorm_to_half(src, 16));
-+ } else {
-+ SWIZZLE_CONVERT(uint16_t, int16_t, _mesa_float_to_half(src));
-+ }
-+ break;
-+ case GL_UNSIGNED_INT:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(uint16_t, uint32_t, unorm_to_half(src, 32));
-+ } else {
-+ SWIZZLE_CONVERT(uint16_t, uint32_t, _mesa_float_to_half(src));
-+ }
-+ break;
-+ case GL_INT:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(uint16_t, int32_t, snorm_to_half(src, 32));
-+ } else {
-+ SWIZZLE_CONVERT(uint16_t, int32_t, _mesa_float_to_half(src));
-+ }
-+ break;
-+ default:
-+ assert(!"Invalid channel type combination");
-+ }
-+}
-+
-+
-+static void
-+convert_ubyte(void *void_dst, int num_dst_channels,
-+ const void *void_src, GLenum src_type, int num_src_channels,
-+ const uint8_t swizzle[4], bool normalized, int count)
-+{
-+ const uint8_t one = normalized ? UINT8_MAX : 1;
-+
-+ switch (src_type) {
-+ case GL_FLOAT:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(uint8_t, float, float_to_unorm(src, 8));
-+ } else {
-+ SWIZZLE_CONVERT(uint8_t, float, (src < 0) ? 0 : src);
-+ }
-+ break;
-+ case GL_HALF_FLOAT:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(uint8_t, uint16_t, half_to_unorm(src, 8));
-+ } else {
-+ SWIZZLE_CONVERT(uint8_t, uint16_t, half_to_uint(src));
-+ }
-+ break;
-+ case GL_UNSIGNED_BYTE:
-+ SWIZZLE_CONVERT(uint8_t, uint8_t, src);
-+ break;
-+ case GL_BYTE:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(uint8_t, int8_t, snorm_to_unorm(src, 8, 8));
-+ } else {
-+ SWIZZLE_CONVERT(uint8_t, int8_t, (src < 0) ? 0 : src);
-+ }
-+ break;
-+ case GL_UNSIGNED_SHORT:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(uint8_t, uint16_t, unorm_to_unorm(src, 16, 8));
-+ } else {
-+ SWIZZLE_CONVERT(uint8_t, uint16_t, src);
-+ }
-+ break;
-+ case GL_SHORT:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(uint8_t, int16_t, snorm_to_unorm(src, 16, 8));
-+ } else {
-+ SWIZZLE_CONVERT(uint8_t, int16_t, (src < 0) ? 0 : src);
-+ }
-+ break;
-+ case GL_UNSIGNED_INT:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(uint8_t, uint32_t, unorm_to_unorm(src, 32, 8));
-+ } else {
-+ SWIZZLE_CONVERT(uint8_t, uint32_t, src);
-+ }
-+ break;
-+ case GL_INT:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(uint8_t, int32_t, snorm_to_unorm(src, 32, 8));
-+ } else {
-+ SWIZZLE_CONVERT(uint8_t, int32_t, (src < 0) ? 0 : src);
-+ }
-+ break;
-+ default:
-+ assert(!"Invalid channel type combination");
-+ }
-+}
-+
-+
-+static void
-+convert_byte(void *void_dst, int num_dst_channels,
-+ const void *void_src, GLenum src_type, int num_src_channels,
-+ const uint8_t swizzle[4], bool normalized, int count)
-+{
-+ const int8_t one = normalized ? INT8_MAX : 1;
-+
-+ switch (src_type) {
-+ case GL_FLOAT:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(uint8_t, float, float_to_snorm(src, 8));
-+ } else {
-+ SWIZZLE_CONVERT(uint8_t, float, src);
-+ }
-+ break;
-+ case GL_HALF_FLOAT:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(uint8_t, uint16_t, half_to_snorm(src, 8));
-+ } else {
-+ SWIZZLE_CONVERT(uint8_t, uint16_t, _mesa_half_to_float(src));
-+ }
-+ break;
-+ case GL_UNSIGNED_BYTE:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(int8_t, uint8_t, unorm_to_snorm(src, 8, 8));
-+ } else {
-+ SWIZZLE_CONVERT(int8_t, uint8_t, src);
-+ }
-+ break;
-+ case GL_BYTE:
-+ SWIZZLE_CONVERT(int8_t, int8_t, src);
-+ break;
-+ case GL_UNSIGNED_SHORT:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(int8_t, uint16_t, unorm_to_snorm(src, 16, 8));
-+ } else {
-+ SWIZZLE_CONVERT(int8_t, uint16_t, src);
-+ }
-+ break;
-+ case GL_SHORT:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(int8_t, int16_t, snorm_to_snorm(src, 16, 8));
-+ } else {
-+ SWIZZLE_CONVERT(int8_t, int16_t, src);
-+ }
-+ break;
-+ case GL_UNSIGNED_INT:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(int8_t, uint32_t, unorm_to_snorm(src, 32, 8));
-+ } else {
-+ SWIZZLE_CONVERT(int8_t, uint32_t, src);
-+ }
-+ break;
-+ case GL_INT:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(int8_t, int32_t, snorm_to_snorm(src, 32, 8));
-+ } else {
-+ SWIZZLE_CONVERT(int8_t, int32_t, src);
-+ }
-+ break;
-+ default:
-+ assert(!"Invalid channel type combination");
-+ }
-+}
-+
-+
-+static void
-+convert_ushort(void *void_dst, int num_dst_channels,
-+ const void *void_src, GLenum src_type, int num_src_channels,
-+ const uint8_t swizzle[4], bool normalized, int count)
-+{
-+ const uint16_t one = normalized ? UINT16_MAX : 1;
-+
-+ switch (src_type) {
-+ case GL_FLOAT:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(uint16_t, float, float_to_unorm(src, 16));
-+ } else {
-+ SWIZZLE_CONVERT(uint16_t, float, (src < 0) ? 0 : src);
-+ }
-+ break;
-+ case GL_HALF_FLOAT:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(uint16_t, uint16_t, half_to_unorm(src, 16));
-+ } else {
-+ SWIZZLE_CONVERT(uint16_t, uint16_t, half_to_uint(src));
-+ }
-+ break;
-+ case GL_UNSIGNED_BYTE:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(uint16_t, uint8_t, unorm_to_unorm(src, 8, 16));
-+ } else {
-+ SWIZZLE_CONVERT(uint16_t, uint8_t, src);
-+ }
-+ break;
-+ case GL_BYTE:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(uint16_t, int8_t, snorm_to_unorm(src, 8, 16));
-+ } else {
-+ SWIZZLE_CONVERT(uint16_t, int8_t, (src < 0) ? 0 : src);
-+ }
-+ break;
-+ case GL_UNSIGNED_SHORT:
-+ SWIZZLE_CONVERT(uint16_t, uint16_t, src);
-+ break;
-+ case GL_SHORT:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(uint16_t, int16_t, snorm_to_unorm(src, 16, 16));
-+ } else {
-+ SWIZZLE_CONVERT(uint16_t, int16_t, (src < 0) ? 0 : src);
-+ }
-+ break;
-+ case GL_UNSIGNED_INT:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(uint16_t, uint32_t, unorm_to_unorm(src, 32, 16));
-+ } else {
-+ SWIZZLE_CONVERT(uint16_t, uint32_t, src);
-+ }
-+ break;
-+ case GL_INT:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(uint16_t, int32_t, snorm_to_unorm(src, 32, 16));
-+ } else {
-+ SWIZZLE_CONVERT(uint16_t, int32_t, (src < 0) ? 0 : src);
-+ }
-+ break;
-+ default:
-+ assert(!"Invalid channel type combination");
-+ }
-+}
-+
-+
-+static void
-+convert_short(void *void_dst, int num_dst_channels,
-+ const void *void_src, GLenum src_type, int num_src_channels,
-+ const uint8_t swizzle[4], bool normalized, int count)
-+{
-+ const int16_t one = normalized ? INT16_MAX : 1;
-+
-+ switch (src_type) {
-+ case GL_FLOAT:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(uint16_t, float, float_to_snorm(src, 16));
-+ } else {
-+ SWIZZLE_CONVERT(uint16_t, float, src);
-+ }
-+ break;
-+ case GL_HALF_FLOAT:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(uint16_t, uint16_t, half_to_snorm(src, 16));
-+ } else {
-+ SWIZZLE_CONVERT(uint16_t, uint16_t, _mesa_half_to_float(src));
-+ }
-+ break;
-+ case GL_UNSIGNED_BYTE:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(int16_t, uint8_t, unorm_to_snorm(src, 8, 16));
-+ } else {
-+ SWIZZLE_CONVERT(int16_t, uint8_t, src);
-+ }
-+ break;
-+ case GL_BYTE:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(int16_t, int8_t, snorm_to_snorm(src, 8, 16));
-+ } else {
-+ SWIZZLE_CONVERT(int16_t, int8_t, src);
-+ }
-+ break;
-+ case GL_UNSIGNED_SHORT:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(int16_t, uint16_t, unorm_to_snorm(src, 16, 16));
-+ } else {
-+ SWIZZLE_CONVERT(int16_t, uint16_t, src);
-+ }
-+ break;
-+ case GL_SHORT:
-+ SWIZZLE_CONVERT(int16_t, int16_t, src);
-+ break;
-+ case GL_UNSIGNED_INT:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(int16_t, uint32_t, unorm_to_snorm(src, 32, 16));
-+ } else {
-+ SWIZZLE_CONVERT(int16_t, uint32_t, src);
-+ }
-+ break;
-+ case GL_INT:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(int16_t, int32_t, snorm_to_snorm(src, 32, 16));
-+ } else {
-+ SWIZZLE_CONVERT(int16_t, int32_t, src);
-+ }
-+ break;
-+ default:
-+ assert(!"Invalid channel type combination");
-+ }
-+}
-+
-+static void
-+convert_uint(void *void_dst, int num_dst_channels,
-+ const void *void_src, GLenum src_type, int num_src_channels,
-+ const uint8_t swizzle[4], bool normalized, int count)
-+{
-+ const uint32_t one = normalized ? UINT32_MAX : 1;
-+
-+ switch (src_type) {
-+ case GL_FLOAT:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(uint32_t, float, float_to_unorm(src, 32));
-+ } else {
-+ SWIZZLE_CONVERT(uint32_t, float, (src < 0) ? 0 : src);
-+ }
-+ break;
-+ case GL_HALF_FLOAT:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(uint32_t, uint16_t, half_to_unorm(src, 32));
-+ } else {
-+ SWIZZLE_CONVERT(uint32_t, uint16_t, half_to_uint(src));
-+ }
-+ break;
-+ case GL_UNSIGNED_BYTE:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(uint32_t, uint8_t, unorm_to_unorm(src, 8, 32));
-+ } else {
-+ SWIZZLE_CONVERT(uint32_t, uint8_t, src);
-+ }
-+ break;
-+ case GL_BYTE:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(uint32_t, int8_t, snorm_to_unorm(src, 8, 32));
-+ } else {
-+ SWIZZLE_CONVERT(uint32_t, int8_t, (src < 0) ? 0 : src);
-+ }
-+ break;
-+ case GL_UNSIGNED_SHORT:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(uint32_t, uint16_t, unorm_to_unorm(src, 16, 32));
-+ } else {
-+ SWIZZLE_CONVERT(uint32_t, uint16_t, src);
-+ }
-+ break;
-+ case GL_SHORT:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(uint32_t, int16_t, snorm_to_unorm(src, 16, 32));
-+ } else {
-+ SWIZZLE_CONVERT(uint32_t, int16_t, (src < 0) ? 0 : src);
-+ }
-+ break;
-+ case GL_UNSIGNED_INT:
-+ SWIZZLE_CONVERT(uint32_t, uint32_t, src);
-+ break;
-+ case GL_INT:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(uint32_t, int32_t, snorm_to_unorm(src, 32, 32));
-+ } else {
-+ SWIZZLE_CONVERT(uint32_t, int32_t, (src < 0) ? 0 : src);
-+ }
-+ break;
-+ default:
-+ assert(!"Invalid channel type combination");
-+ }
-+}
-+
-+
-+static void
-+convert_int(void *void_dst, int num_dst_channels,
-+ const void *void_src, GLenum src_type, int num_src_channels,
-+ const uint8_t swizzle[4], bool normalized, int count)
-+{
-+ const int32_t one = normalized ? INT32_MAX : 12;
-+
-+ switch (src_type) {
-+ case GL_FLOAT:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(uint32_t, float, float_to_snorm(src, 32));
-+ } else {
-+ SWIZZLE_CONVERT(uint32_t, float, src);
-+ }
-+ break;
-+ case GL_HALF_FLOAT:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(uint32_t, uint16_t, half_to_snorm(src, 32));
-+ } else {
-+ SWIZZLE_CONVERT(uint32_t, uint16_t, _mesa_half_to_float(src));
-+ }
-+ break;
-+ case GL_UNSIGNED_BYTE:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(int32_t, uint8_t, unorm_to_snorm(src, 8, 32));
-+ } else {
-+ SWIZZLE_CONVERT(int32_t, uint8_t, src);
-+ }
-+ break;
-+ case GL_BYTE:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(int32_t, int8_t, snorm_to_snorm(src, 8, 32));
-+ } else {
-+ SWIZZLE_CONVERT(int32_t, int8_t, src);
-+ }
-+ break;
-+ case GL_UNSIGNED_SHORT:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(int32_t, uint16_t, unorm_to_snorm(src, 16, 32));
-+ } else {
-+ SWIZZLE_CONVERT(int32_t, uint16_t, src);
-+ }
-+ break;
-+ case GL_SHORT:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(int32_t, int16_t, snorm_to_snorm(src, 16, 32));
-+ } else {
-+ SWIZZLE_CONVERT(int32_t, int16_t, src);
-+ }
-+ break;
-+ case GL_UNSIGNED_INT:
-+ if (normalized) {
-+ SWIZZLE_CONVERT(int32_t, uint32_t, unorm_to_snorm(src, 32, 32));
-+ } else {
-+ SWIZZLE_CONVERT(int32_t, uint32_t, src);
-+ }
-+ break;
-+ case GL_INT:
-+ SWIZZLE_CONVERT(int32_t, int32_t, src);
-+ break;
-+ default:
-+ assert(!"Invalid channel type combination");
-+ }
-+}
-+
-
- /**
- * Convert between array-based color formats.
-@@ -478,499 +1003,44 @@ _mesa_swizzle_and_convert(void *void_dst, GLenum dst_type, int num_dst_channels,
- const void *void_src, GLenum src_type, int num_src_channels,
- const uint8_t swizzle[4], bool normalized, int count)
- {
-- int s, j;
-- register uint8_t swizzle_x, swizzle_y, swizzle_z, swizzle_w;
--
- if (swizzle_convert_try_memcpy(void_dst, dst_type, num_dst_channels,
- void_src, src_type, num_src_channels,
- swizzle, normalized, count))
- return;
-
-- swizzle_x = swizzle[0];
-- swizzle_y = swizzle[1];
-- swizzle_z = swizzle[2];
-- swizzle_w = swizzle[3];
--
- switch (dst_type) {
- case GL_FLOAT:
-- {
-- const float one = 1.0f;
-- switch (src_type) {
-- case GL_FLOAT:
-- SWIZZLE_CONVERT(float, float, src)
-- break;
-- case GL_HALF_FLOAT:
-- SWIZZLE_CONVERT(float, uint16_t, _mesa_half_to_float(src))
-- break;
-- case GL_UNSIGNED_BYTE:
-- if (normalized) {
-- SWIZZLE_CONVERT(float, uint8_t, unorm_to_float(src, 8))
-- } else {
-- SWIZZLE_CONVERT(float, uint8_t, src)
-- }
-- break;
-- case GL_BYTE:
-- if (normalized) {
-- SWIZZLE_CONVERT(float, int8_t, snorm_to_float(src, 8))
-- } else {
-- SWIZZLE_CONVERT(float, int8_t, src)
-- }
-- break;
-- case GL_UNSIGNED_SHORT:
-- if (normalized) {
-- SWIZZLE_CONVERT(float, uint16_t, unorm_to_float(src, 16))
-- } else {
-- SWIZZLE_CONVERT(float, uint16_t, src)
-- }
-- break;
-- case GL_SHORT:
-- if (normalized) {
-- SWIZZLE_CONVERT(float, int16_t, snorm_to_float(src, 16))
-- } else {
-- SWIZZLE_CONVERT(float, int16_t, src)
-- }
-- break;
-- case GL_UNSIGNED_INT:
-- if (normalized) {
-- SWIZZLE_CONVERT(float, uint32_t, unorm_to_float(src, 32))
-- } else {
-- SWIZZLE_CONVERT(float, uint32_t, src)
-- }
-- break;
-- case GL_INT:
-- if (normalized) {
-- SWIZZLE_CONVERT(float, int32_t, snorm_to_float(src, 32))
-- } else {
-- SWIZZLE_CONVERT(float, int32_t, src)
-- }
-- break;
-- default:
-- assert(!"Invalid channel type combination");
-- }
-- }
-- break;
-+ convert_float(void_dst, num_dst_channels, void_src, src_type,
-+ num_src_channels, swizzle, normalized, count);
-+ break;
- case GL_HALF_FLOAT:
-- {
-- const uint16_t one = _mesa_float_to_half(1.0f);
-- switch (src_type) {
-- case GL_FLOAT:
-- SWIZZLE_CONVERT(uint16_t, float, _mesa_float_to_half(src))
-- break;
-- case GL_HALF_FLOAT:
-- SWIZZLE_CONVERT(uint16_t, uint16_t, src)
-- break;
-- case GL_UNSIGNED_BYTE:
-- if (normalized) {
-- SWIZZLE_CONVERT(uint16_t, uint8_t, unorm_to_half(src, 8))
-- } else {
-- SWIZZLE_CONVERT(uint16_t, uint8_t, _mesa_float_to_half(src))
-- }
-- break;
-- case GL_BYTE:
-- if (normalized) {
-- SWIZZLE_CONVERT(uint16_t, int8_t, snorm_to_half(src, 8))
-- } else {
-- SWIZZLE_CONVERT(uint16_t, int8_t, _mesa_float_to_half(src))
-- }
-- break;
-- case GL_UNSIGNED_SHORT:
-- if (normalized) {
-- SWIZZLE_CONVERT(uint16_t, uint16_t, unorm_to_half(src, 16))
-- } else {
-- SWIZZLE_CONVERT(uint16_t, uint16_t, _mesa_float_to_half(src))
-- }
-- break;
-- case GL_SHORT:
-- if (normalized) {
-- SWIZZLE_CONVERT(uint16_t, int16_t, snorm_to_half(src, 16))
-- } else {
-- SWIZZLE_CONVERT(uint16_t, int16_t, _mesa_float_to_half(src))
-- }
-- break;
-- case GL_UNSIGNED_INT:
-- if (normalized) {
-- SWIZZLE_CONVERT(uint16_t, uint32_t, unorm_to_half(src, 32))
-- } else {
-- SWIZZLE_CONVERT(uint16_t, uint32_t, _mesa_float_to_half(src))
-- }
-- break;
-- case GL_INT:
-- if (normalized) {
-- SWIZZLE_CONVERT(uint16_t, int32_t, snorm_to_half(src, 32))
-- } else {
-- SWIZZLE_CONVERT(uint16_t, int32_t, _mesa_float_to_half(src))
-- }
-- break;
-- default:
-- assert(!"Invalid channel type combination");
-- }
-- }
-- break;
-+ convert_half_float(void_dst, num_dst_channels, void_src, src_type,
-+ num_src_channels, swizzle, normalized, count);
-+ break;
- case GL_UNSIGNED_BYTE:
-- {
-- const uint8_t one = normalized ? UINT8_MAX : 1;
-- switch (src_type) {
-- case GL_FLOAT:
-- if (normalized) {
-- SWIZZLE_CONVERT(uint8_t, float, float_to_unorm(src, 8))
-- } else {
-- SWIZZLE_CONVERT(uint8_t, float, (src < 0) ? 0 : src)
-- }
-- break;
-- case GL_HALF_FLOAT:
-- if (normalized) {
-- SWIZZLE_CONVERT(uint8_t, uint16_t, half_to_unorm(src, 8))
-- } else {
-- SWIZZLE_CONVERT(uint8_t, uint16_t, half_to_uint(src))
-- }
-- break;
-- case GL_UNSIGNED_BYTE:
-- SWIZZLE_CONVERT(uint8_t, uint8_t, src)
-- break;
-- case GL_BYTE:
-- if (normalized) {
-- SWIZZLE_CONVERT(uint8_t, int8_t, snorm_to_unorm(src, 8, 8))
-- } else {
-- SWIZZLE_CONVERT(uint8_t, int8_t, (src < 0) ? 0 : src)
-- }
-- break;
-- case GL_UNSIGNED_SHORT:
-- if (normalized) {
-- SWIZZLE_CONVERT(uint8_t, uint16_t, unorm_to_unorm(src, 16, 8))
-- } else {
-- SWIZZLE_CONVERT(uint8_t, uint16_t, src)
-- }
-- break;
-- case GL_SHORT:
-- if (normalized) {
-- SWIZZLE_CONVERT(uint8_t, int16_t, snorm_to_unorm(src, 16, 8))
-- } else {
-- SWIZZLE_CONVERT(uint8_t, int16_t, (src < 0) ? 0 : src)
-- }
-- break;
-- case GL_UNSIGNED_INT:
-- if (normalized) {
-- SWIZZLE_CONVERT(uint8_t, uint32_t, unorm_to_unorm(src, 32, 8))
-- } else {
-- SWIZZLE_CONVERT(uint8_t, uint32_t, src)
-- }
-- break;
-- case GL_INT:
-- if (normalized) {
-- SWIZZLE_CONVERT(uint8_t, int32_t, snorm_to_unorm(src, 32, 8))
-- } else {
-- SWIZZLE_CONVERT(uint8_t, int32_t, (src < 0) ? 0 : src)
-- }
-- break;
-- default:
-- assert(!"Invalid channel type combination");
-- }
-- }
-- break;
-+ convert_ubyte(void_dst, num_dst_channels, void_src, src_type,
-+ num_src_channels, swizzle, normalized, count);
-+ break;
- case GL_BYTE:
-- {
-- const int8_t one = normalized ? INT8_MAX : 1;
-- switch (src_type) {
-- case GL_FLOAT:
-- if (normalized) {
-- SWIZZLE_CONVERT(uint8_t, float, float_to_snorm(src, 8))
-- } else {
-- SWIZZLE_CONVERT(uint8_t, float, src)
-- }
-- break;
-- case GL_HALF_FLOAT:
-- if (normalized) {
-- SWIZZLE_CONVERT(uint8_t, uint16_t, half_to_snorm(src, 8))
-- } else {
-- SWIZZLE_CONVERT(uint8_t, uint16_t, _mesa_half_to_float(src))
-- }
-- break;
-- case GL_UNSIGNED_BYTE:
-- if (normalized) {
-- SWIZZLE_CONVERT(int8_t, uint8_t, unorm_to_snorm(src, 8, 8))
-- } else {
-- SWIZZLE_CONVERT(int8_t, uint8_t, src)
-- }
-- break;
-- case GL_BYTE:
-- SWIZZLE_CONVERT(int8_t, int8_t, src)
-- break;
-- case GL_UNSIGNED_SHORT:
-- if (normalized) {
-- SWIZZLE_CONVERT(int8_t, uint16_t, unorm_to_snorm(src, 16, 8))
-- } else {
-- SWIZZLE_CONVERT(int8_t, uint16_t, src)
-- }
-- break;
-- case GL_SHORT:
-- if (normalized) {
-- SWIZZLE_CONVERT(int8_t, int16_t, snorm_to_snorm(src, 16, 8))
-- } else {
-- SWIZZLE_CONVERT(int8_t, int16_t, src)
-- }
-- break;
-- case GL_UNSIGNED_INT:
-- if (normalized) {
-- SWIZZLE_CONVERT(int8_t, uint32_t, unorm_to_snorm(src, 32, 8))
-- } else {
-- SWIZZLE_CONVERT(int8_t, uint32_t, src)
-- }
-- break;
-- case GL_INT:
-- if (normalized) {
-- SWIZZLE_CONVERT(int8_t, int32_t, snorm_to_snorm(src, 32, 8))
-- } else {
-- SWIZZLE_CONVERT(int8_t, int32_t, src)
-- }
-- break;
-- default:
-- assert(!"Invalid channel type combination");
-- }
-- }
-- break;
-+ convert_byte(void_dst, num_dst_channels, void_src, src_type,
-+ num_src_channels, swizzle, normalized, count);
-+ break;
- case GL_UNSIGNED_SHORT:
-- {
-- const uint16_t one = normalized ? UINT16_MAX : 1;
-- switch (src_type) {
-- case GL_FLOAT:
-- if (normalized) {
-- SWIZZLE_CONVERT(uint16_t, float, float_to_unorm(src, 16))
-- } else {
-- SWIZZLE_CONVERT(uint16_t, float, (src < 0) ? 0 : src)
-- }
-- break;
-- case GL_HALF_FLOAT:
-- if (normalized) {
-- SWIZZLE_CONVERT(uint16_t, uint16_t, half_to_unorm(src, 16))
-- } else {
-- SWIZZLE_CONVERT(uint16_t, uint16_t, half_to_uint(src))
-- }
-- break;
-- case GL_UNSIGNED_BYTE:
-- if (normalized) {
-- SWIZZLE_CONVERT(uint16_t, uint8_t, unorm_to_unorm(src, 8, 16))
-- } else {
-- SWIZZLE_CONVERT(uint16_t, uint8_t, src)
-- }
-- break;
-- case GL_BYTE:
-- if (normalized) {
-- SWIZZLE_CONVERT(uint16_t, int8_t, snorm_to_unorm(src, 8, 16))
-- } else {
-- SWIZZLE_CONVERT(uint16_t, int8_t, (src < 0) ? 0 : src)
-- }
-- break;
-- case GL_UNSIGNED_SHORT:
-- SWIZZLE_CONVERT(uint16_t, uint16_t, src)
-- break;
-- case GL_SHORT:
-- if (normalized) {
-- SWIZZLE_CONVERT(uint16_t, int16_t, snorm_to_unorm(src, 16, 16))
-- } else {
-- SWIZZLE_CONVERT(uint16_t, int16_t, (src < 0) ? 0 : src)
-- }
-- break;
-- case GL_UNSIGNED_INT:
-- if (normalized) {
-- SWIZZLE_CONVERT(uint16_t, uint32_t, unorm_to_unorm(src, 32, 16))
-- } else {
-- SWIZZLE_CONVERT(uint16_t, uint32_t, src)
-- }
-- break;
-- case GL_INT:
-- if (normalized) {
-- SWIZZLE_CONVERT(uint16_t, int32_t, snorm_to_unorm(src, 32, 16))
-- } else {
-- SWIZZLE_CONVERT(uint16_t, int32_t, (src < 0) ? 0 : src)
-- }
-- break;
-- default:
-- assert(!"Invalid channel type combination");
-- }
-- }
-- break;
-+ convert_ushort(void_dst, num_dst_channels, void_src, src_type,
-+ num_src_channels, swizzle, normalized, count);
-+ break;
- case GL_SHORT:
-- {
-- const int16_t one = normalized ? INT16_MAX : 1;
-- switch (src_type) {
-- case GL_FLOAT:
-- if (normalized) {
-- SWIZZLE_CONVERT(uint16_t, float, float_to_snorm(src, 16))
-- } else {
-- SWIZZLE_CONVERT(uint16_t, float, src)
-- }
-- break;
-- case GL_HALF_FLOAT:
-- if (normalized) {
-- SWIZZLE_CONVERT(uint16_t, uint16_t, half_to_snorm(src, 16))
-- } else {
-- SWIZZLE_CONVERT(uint16_t, uint16_t, _mesa_half_to_float(src))
-- }
-- break;
-- case GL_UNSIGNED_BYTE:
-- if (normalized) {
-- SWIZZLE_CONVERT(int16_t, uint8_t, unorm_to_snorm(src, 8, 16))
-- } else {
-- SWIZZLE_CONVERT(int16_t, uint8_t, src)
-- }
-- break;
-- case GL_BYTE:
-- if (normalized) {
-- SWIZZLE_CONVERT(int16_t, int8_t, snorm_to_snorm(src, 8, 16))
-- } else {
-- SWIZZLE_CONVERT(int16_t, int8_t, src)
-- }
-- break;
-- case GL_UNSIGNED_SHORT:
-- if (normalized) {
-- SWIZZLE_CONVERT(int16_t, uint16_t, unorm_to_snorm(src, 16, 16))
-- } else {
-- SWIZZLE_CONVERT(int16_t, uint16_t, src)
-- }
-- break;
-- case GL_SHORT:
-- SWIZZLE_CONVERT(int16_t, int16_t, src)
-- break;
-- case GL_UNSIGNED_INT:
-- if (normalized) {
-- SWIZZLE_CONVERT(int16_t, uint32_t, unorm_to_snorm(src, 32, 16))
-- } else {
-- SWIZZLE_CONVERT(int16_t, uint32_t, src)
-- }
-- break;
-- case GL_INT:
-- if (normalized) {
-- SWIZZLE_CONVERT(int16_t, int32_t, snorm_to_snorm(src, 32, 16))
-- } else {
-- SWIZZLE_CONVERT(int16_t, int32_t, src)
-- }
-- break;
-- default:
-- assert(!"Invalid channel type combination");
-- }
-- }
-- break;
-+ convert_short(void_dst, num_dst_channels, void_src, src_type,
-+ num_src_channels, swizzle, normalized, count);
-+ break;
- case GL_UNSIGNED_INT:
-- {
-- const uint32_t one = normalized ? UINT32_MAX : 1;
-- switch (src_type) { case GL_FLOAT:
-- if (normalized) {
-- SWIZZLE_CONVERT(uint32_t, float, float_to_unorm(src, 32))
-- } else {
-- SWIZZLE_CONVERT(uint32_t, float, (src < 0) ? 0 : src)
-- }
-- break;
-- case GL_HALF_FLOAT:
-- if (normalized) {
-- SWIZZLE_CONVERT(uint32_t, uint16_t, half_to_unorm(src, 32))
-- } else {
-- SWIZZLE_CONVERT(uint32_t, uint16_t, half_to_uint(src))
-- }
-- break;
-- case GL_UNSIGNED_BYTE:
-- if (normalized) {
-- SWIZZLE_CONVERT(uint32_t, uint8_t, unorm_to_unorm(src, 8, 32))
-- } else {
-- SWIZZLE_CONVERT(uint32_t, uint8_t, src)
-- }
-- break;
-- case GL_BYTE:
-- if (normalized) {
-- SWIZZLE_CONVERT(uint32_t, int8_t, snorm_to_unorm(src, 8, 32))
-- } else {
-- SWIZZLE_CONVERT(uint32_t, int8_t, (src < 0) ? 0 : src)
-- }
-- break;
-- case GL_UNSIGNED_SHORT:
-- if (normalized) {
-- SWIZZLE_CONVERT(uint32_t, uint16_t, unorm_to_unorm(src, 16, 32))
-- } else {
-- SWIZZLE_CONVERT(uint32_t, uint16_t, src)
-- }
-- break;
-- case GL_SHORT:
-- if (normalized) {
-- SWIZZLE_CONVERT(uint32_t, int16_t, snorm_to_unorm(src, 16, 32))
-- } else {
-- SWIZZLE_CONVERT(uint32_t, int16_t, (src < 0) ? 0 : src)
-- }
-- break;
-- case GL_UNSIGNED_INT:
-- SWIZZLE_CONVERT(uint32_t, uint32_t, src)
-- break;
-- case GL_INT:
-- if (normalized) {
-- SWIZZLE_CONVERT(uint32_t, int32_t, snorm_to_unorm(src, 32, 32))
-- } else {
-- SWIZZLE_CONVERT(uint32_t, int32_t, (src < 0) ? 0 : src)
-- }
-- break;
-- default:
-- assert(!"Invalid channel type combination");
-- }
-- }
-- break;
-+ convert_uint(void_dst, num_dst_channels, void_src, src_type,
-+ num_src_channels, swizzle, normalized, count);
-+ break;
- case GL_INT:
-- {
-- const int32_t one = normalized ? INT32_MAX : 1;
-- switch (src_type) {
-- case GL_FLOAT:
-- if (normalized) {
-- SWIZZLE_CONVERT(uint32_t, float, float_to_snorm(src, 32))
-- } else {
-- SWIZZLE_CONVERT(uint32_t, float, src)
-- }
-- break;
-- case GL_HALF_FLOAT:
-- if (normalized) {
-- SWIZZLE_CONVERT(uint32_t, uint16_t, half_to_snorm(src, 32))
-- } else {
-- SWIZZLE_CONVERT(uint32_t, uint16_t, _mesa_half_to_float(src))
-- }
-- break;
-- case GL_UNSIGNED_BYTE:
-- if (normalized) {
-- SWIZZLE_CONVERT(int32_t, uint8_t, unorm_to_snorm(src, 8, 32))
-- } else {
-- SWIZZLE_CONVERT(int32_t, uint8_t, src)
-- }
-- break;
-- case GL_BYTE:
-- if (normalized) {
-- SWIZZLE_CONVERT(int32_t, int8_t, snorm_to_snorm(src, 8, 32))
-- } else {
-- SWIZZLE_CONVERT(int32_t, int8_t, src)
-- }
-- break;
-- case GL_UNSIGNED_SHORT:
-- if (normalized) {
-- SWIZZLE_CONVERT(int32_t, uint16_t, unorm_to_snorm(src, 16, 32))
-- } else {
-- SWIZZLE_CONVERT(int32_t, uint16_t, src)
-- }
-- break;
-- case GL_SHORT:
-- if (normalized) {
-- SWIZZLE_CONVERT(int32_t, int16_t, snorm_to_snorm(src, 16, 32))
-- } else {
-- SWIZZLE_CONVERT(int32_t, int16_t, src)
-- }
-- break;
-- case GL_UNSIGNED_INT:
-- if (normalized) {
-- SWIZZLE_CONVERT(int32_t, uint32_t, unorm_to_snorm(src, 32, 32))
-- } else {
-- SWIZZLE_CONVERT(int32_t, uint32_t, src)
-- }
-- break;
-- case GL_INT:
-- SWIZZLE_CONVERT(int32_t, int32_t, src)
-- break;
-- default:
-- assert(!"Invalid channel type combination");
-- }
-- }
-- break;
-+ convert_int(void_dst, num_dst_channels, void_src, src_type,
-+ num_src_channels, swizzle, normalized, count);
-+ break;
- default:
- assert(!"Invalid channel type");
- }
---
-2.0.5
-
diff --git a/media-libs/mesa/files/mesa-10.5.1-fstat-include.patch b/media-libs/mesa/files/mesa-10.5.1-fstat-include.patch
deleted file mode 100644
index 212d00d..0000000
--- a/media-libs/mesa/files/mesa-10.5.1-fstat-include.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 771cd266b9d00bdcf2cf7acaa3c8363c358d7478 Mon Sep 17 00:00:00 2001
-From: Emil Velikov <emil.l.velikov@gmail.com>
-Date: Wed, 11 Mar 2015 19:12:35 +0000
-Subject: loader: include <sys/stat.h> for non-sysfs builds
-
-Required by fstat(), otherwise we'll error out due to implicit function
-declaration.
-
-Cc: "10.4 10.5" <mesa-stable@lists.freedesktop.org>
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89530
-Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
-Reported-by: Vadim Rutkovsky <vrutkovs@redhat.com>
-Tested-by: Vadim Rutkovsky <vrutkovs@redhat.com>
-
-diff --git a/src/loader/loader.c b/src/loader/loader.c
-index 9ff5115..17bf133 100644
---- a/src/loader/loader.c
-+++ b/src/loader/loader.c
-@@ -64,6 +64,7 @@
- * Rob Clark <robclark@freedesktop.org>
- */
-
-+#include <sys/stat.h>
- #include <stdarg.h>
- #include <stdio.h>
- #include <string.h>
-@@ -80,7 +81,6 @@
- #endif
- #endif
- #ifdef HAVE_SYSFS
--#include <sys/stat.h>
- #include <sys/types.h>
- #endif
- #include "loader.h"
---
-cgit v0.10.2
-
diff --git a/media-libs/mesa/files/mesa-11.1.2-i965-fix-use-after-free.patch b/media-libs/mesa/files/mesa-11.1.2-i965-fix-use-after-free.patch
deleted file mode 100644
index 87ad498..0000000
--- a/media-libs/mesa/files/mesa-11.1.2-i965-fix-use-after-free.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 1c145df858ba5ab539386692d9350909fb8f8c82 Mon Sep 17 00:00:00 2001
-From: Jason Ekstrand <jason.ekstrand@intel.com>
-Date: Wed, 10 Feb 2016 12:07:49 -0800
-Subject: [PATCH] nir/lower_vec_to_movs: Better report channels handled by
- insert_mov
-
-This fixes two issues. First, we had a use-after-free in the case where
-the instruction got deleted and we tried to return mov->dest.write_mask.
-Second, in the case where we are doing a self-mov of a register, we delete
-those channels that are moved to themselves from the write-mask. This
-means that those channels aren't reported as being handled even though they
-are. We now stash off the write-mask before remove unneeded channels so
-that they still get reported as handled.
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94073
-Reviewed-by: Matt Turner <mattst88@gmail.com>
-Cc: "11.0 11.1" <mesa-stable@lists.freedesktop.org>
-(cherry picked from commit 70dff4a55e767de8b9ce10f055b94ebb1f6a9755)
----
- src/glsl/nir/nir_lower_vec_to_movs.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/glsl/nir/nir_lower_vec_to_movs.c b/src/glsl/nir/nir_lower_vec_to_movs.c
-index 736a66c..0783596 100644
---- a/src/glsl/nir/nir_lower_vec_to_movs.c
-+++ b/src/glsl/nir/nir_lower_vec_to_movs.c
-@@ -83,6 +83,8 @@ insert_mov(nir_alu_instr *vec, unsigned start_idx, nir_shader *shader)
- }
- }
-
-+ unsigned channels_handled = mov->dest.write_mask;
-+
- /* In some situations (if the vecN is involved in a phi-web), we can end
- * up with a mov from a register to itself. Some of those channels may end
- * up doing nothing and there's no reason to have them as part of the mov.
-@@ -103,7 +105,7 @@ insert_mov(nir_alu_instr *vec, unsigned start_idx, nir_shader *shader)
- ralloc_free(mov);
- }
-
-- return mov->dest.write_mask;
-+ return channels_handled;
- }
-
- static bool
---
-2.4.10
-
diff --git a/media-libs/mesa/mesa-10.3.7-r2.ebuild b/media-libs/mesa/mesa-10.3.7-r2.ebuild
deleted file mode 100644
index b1b6c98..0000000
--- a/media-libs/mesa/mesa-10.3.7-r2.ebuild
+++ /dev/null
@@ -1,534 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
-
-if [[ ${PV} = 9999* ]]; then
- GIT_ECLASS="git-r3"
- EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit base autotools multilib multilib-minimal flag-o-matic \
- python-any-r1 toolchain-funcs pax-utils ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_PN="${PN/m/M}"
-MY_P="${MY_PN}-${PV/_/-}"
-MY_SRC_P="${MY_PN}Lib-${PV/_/-}"
-
-FOLDER="${PV/.0/}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="http://mesa3d.sourceforge.net/"
-
-#SRC_PATCHES="mirror://gentoo/${P}-gentoo-patches-01.tar.bz2"
-if [[ $PV = 9999* ]]; then
- SRC_URI="${SRC_PATCHES}"
-else
- SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_SRC_P}.tar.bz2
- ${SRC_PATCHES}"
-fi
-
-# The code is MIT/X11.
-# GLES[2]/gl[2]{,ext,platform}.h are SGI-B-2.0
-LICENSE="MIT SGI-B-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-RESTRICT="!bindist? ( bindist )"
-
-INTEL_CARDS="i915 i965 ilo intel"
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vc4 vmware"
-for card in ${VIDEO_CARDS}; do
- IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
- bindist +classic debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm +nptl
- opencl openvg osmesa pax_kernel openmax pic selinux
- +udev vdpau wayland xvmc xa kernel_FreeBSD kernel_linux"
-
-REQUIRED_USE="
- llvm? ( gallium )
- openvg? ( egl gallium )
- opencl? (
- gallium
- llvm
- )
- openmax? ( gallium )
- gles1? ( egl )
- gles2? ( egl )
- wayland? ( egl gbm )
- xa? ( gallium )
- video_cards_freedreno? ( gallium )
- video_cards_intel? ( || ( classic gallium ) )
- video_cards_i915? ( || ( classic gallium ) )
- video_cards_i965? ( classic )
- video_cards_ilo? ( gallium )
- video_cards_nouveau? ( || ( classic gallium ) )
- video_cards_radeon? ( || ( classic gallium ) )
- video_cards_r100? ( classic )
- video_cards_r200? ( classic )
- video_cards_r300? ( gallium )
- video_cards_r600? ( gallium )
- video_cards_radeonsi? ( gallium llvm )
- video_cards_vc4? ( gallium gbm egl )
- video_cards_vmware? ( gallium )
- ${PYTHON_REQUIRED_USE}
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.56"
-# keep correct libdrm and dri2proto dep
-# keep blocks in rdepend for binpkg
-RDEPEND="
- !<x11-base/xorg-server-1.7
- !<=x11-proto/xf86driproto-2.0.3
- abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
- classic? ( app-eselect/eselect-mesa )
- gallium? ( app-eselect/eselect-mesa )
- >=app-eselect/eselect-opengl-1.2.7
- udev? ( kernel_linux? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) )
- >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
- >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
- llvm? (
- video_cards_radeonsi? ( || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
- video_cards_r600? ( || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
- !video_cards_r600? (
- video_cards_radeon? ( || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
- )
- >=sys-devel/llvm-3.3-r3:=[${MULTILIB_USEDEP}]
- <sys-devel/llvm-3.6
- video_cards_radeonsi? ( >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}] )
- )
- opencl? (
- app-eselect/eselect-opencl
- dev-libs/libclc
- )
- openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
- vdpau? ( >=x11-libs/libvdpau-0.7:=[${MULTILIB_USEDEP}] )
- wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] )
- xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
- ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}]
-"
-for card in ${INTEL_CARDS}; do
- RDEPEND="${RDEPEND}
- video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
- "
-done
-
-for card in ${RADEON_CARDS}; do
- RDEPEND="${RDEPEND}
- video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
- "
-done
-
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- llvm? (
- video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
- )
- opencl? (
- >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
- >=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}]
- >=sys-devel/gcc-4.6
- )
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- >=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
- dri3? (
- >=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
- >=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
- )
- >=x11-proto/glproto-1.4.16-r1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-# It is slow without texrels, if someone wants slow
-# mesa without texrels +pic use is worth the shot
-QA_EXECSTACK="usr/lib*/opengl/xorg-x11/lib/libGL.so*"
-QA_WX_LOAD="usr/lib*/opengl/xorg-x11/lib/libGL.so*"
-
-# Think about: ggi, fbcon, no-X configs
-
-pkg_setup() {
- # workaround toc-issue wrt #386545
- use ppc64 && append-flags -mminimal-toc
-
- # warning message for bug 459306
- if use llvm && has_version sys-devel/llvm[!debug=]; then
- ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
- ewarn "detected! This can cause problems. For details, see bug 459306."
- fi
-
- python-any-r1_pkg_setup
-}
-
-src_unpack() {
- default
- [[ $PV = 9999* ]] && git-r3_src_unpack
-}
-
-src_prepare() {
- # apply patches
- if [[ ${PV} != 9999* && -n ${SRC_PATCHES} ]]; then
- EPATCH_FORCE="yes" \
- EPATCH_SOURCE="${WORKDIR}/patches" \
- EPATCH_SUFFIX="patch" \
- epatch
- fi
-
- epatch "${FILESDIR}"/${PN}-10.3.7-dont-use-clrsb.patch
- epatch "${FILESDIR}"/${PN}-10.3.7-format_utils.c.patch
- epatch "${FILESDIR}"/${PN}-10.5.1-fstat-include.patch
-
- # relax the requirement that r300 must have llvm, bug 380303
- epatch "${FILESDIR}"/${PN}-10.2-dont-require-llvm-for-r300.patch
-
- # fix for hardened pax_kernel, bug 240956
- [[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
-
- # Solaris needs some recent POSIX stuff in our case
- if [[ ${CHOST} == *-solaris* ]] ; then
- sed -i -e "s/-DSVR4/-D_POSIX_C_SOURCE=200112L/" configure.ac || die
- fi
-
- base_src_prepare
-
- eautoreconf
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- local myconf
-
- if use classic; then
- # Configurable DRI drivers
- driver_enable swrast
-
- # Intel code
- driver_enable video_cards_i915 i915
- driver_enable video_cards_i965 i965
- if ! use video_cards_i915 && \
- ! use video_cards_i965; then
- driver_enable video_cards_intel i915 i965
- fi
-
- # Nouveau code
- driver_enable video_cards_nouveau nouveau
-
- # ATI code
- driver_enable video_cards_r100 radeon
- driver_enable video_cards_r200 r200
- if ! use video_cards_r100 && \
- ! use video_cards_r200; then
- driver_enable video_cards_radeon radeon r200
- fi
- fi
-
- if use egl; then
- myconf+="--with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm") "
- fi
-
- if use gallium; then
- myconf+="
- $(use_enable llvm gallium-llvm)
- $(use_enable openvg)
- $(use_enable openvg gallium-egl)
- $(use_enable openmax omx)
- $(use_enable vdpau)
- $(use_enable xa)
- $(use_enable xvmc)
- "
- gallium_enable swrast
- gallium_enable video_cards_vmware svga
- gallium_enable video_cards_nouveau nouveau
- gallium_enable video_cards_i915 i915
- gallium_enable video_cards_ilo ilo
- if ! use video_cards_i915 && \
- ! use video_cards_i965; then
- gallium_enable video_cards_intel i915
- fi
-
- gallium_enable video_cards_r300 r300
- gallium_enable video_cards_r600 r600
- gallium_enable video_cards_radeonsi radeonsi
- if ! use video_cards_r300 && \
- ! use video_cards_r600; then
- gallium_enable video_cards_radeon r300 r600
- fi
-
- gallium_enable video_cards_freedreno freedreno
- gallium_enable video_cards_vc4 vc4
- # opencl stuff
- if use opencl; then
- myconf+="
- $(use_enable opencl)
- --with-opencl-libdir="${EPREFIX}/usr/$(get_libdir)/OpenCL/vendors/mesa"
- --with-clang-libdir="${EPREFIX}/usr/lib"
- "
- fi
- fi
-
- # x86 hardened pax_kernel needs glx-rts, bug 240956
- if use pax_kernel; then
- myconf+="
- $(use_enable x86 glx-rts)
- "
- fi
-
- # on abi_x86_32 hardened we need to have asm disable
- if [[ ${ABI} == x86* ]] && use pic; then
- myconf+=" --disable-asm"
- fi
-
- # build fails with BSD indent, bug #428112
- use userland_GNU || export INDENT=cat
-
- econf \
- --enable-dri \
- --enable-glx \
- --enable-shared-glapi \
- $(use_enable !bindist texture-float) \
- $(use_enable debug) \
- $(use_enable dri3) \
- $(use_enable egl) \
- $(use_enable gbm) \
- $(use_enable gles1) \
- $(use_enable gles2) \
- $(use_enable nptl glx-tls) \
- $(use_enable osmesa) \
- $(use_enable !udev sysfs) \
- --enable-llvm-shared-libs \
- --with-dri-drivers=${DRI_DRIVERS} \
- --with-gallium-drivers=${GALLIUM_DRIVERS} \
- PYTHON2="${PYTHON}" \
- ${myconf}
-}
-
-multilib_src_install() {
- emake install DESTDIR="${D}"
-
- # Move libGL and others from /usr/lib to /usr/lib/opengl/blah/lib
- # because user can eselect desired GL provider.
- ebegin "Moving libGL and friends for dynamic switching"
- local x
- local gl_dir="/usr/$(get_libdir)/opengl/${OPENGL_DIR}/"
- dodir ${gl_dir}/{lib,extensions,include/GL}
- for x in "${ED}"/usr/$(get_libdir)/lib{EGL,GL*,OpenVG}.{la,a,so*}; do
- if [ -f ${x} -o -L ${x} ]; then
- mv -f "${x}" "${ED}${gl_dir}"/lib \
- || die "Failed to move ${x}"
- fi
- done
- for x in "${ED}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
- if [ -f ${x} -o -L ${x} ]; then
- mv -f "${x}" "${ED}${gl_dir}"/include/GL \
- || die "Failed to move ${x}"
- fi
- done
- for x in "${ED}"/usr/include/{EGL,GLES*,VG,KHR}; do
- if [ -d ${x} ]; then
- mv -f "${x}" "${ED}${gl_dir}"/include \
- || die "Failed to move ${x}"
- fi
- done
- eend $?
-
- if use classic || use gallium; then
- ebegin "Moving DRI/Gallium drivers for dynamic switching"
- local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so vc4_dri.so )
- keepdir /usr/$(get_libdir)/dri
- dodir /usr/$(get_libdir)/mesa
- for x in ${gallium_drivers[@]}; do
- if [ -f "$(get_libdir)/gallium/${x}" ]; then
- mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
- || die "Failed to move ${x}"
- fi
- done
- if use classic; then
- emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
- fi
- for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
- if [ -f ${x} -o -L ${x} ]; then
- mv -f "${x}" "${x/dri/mesa}" \
- || die "Failed to move ${x}"
- fi
- done
- pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
- ln -s ../mesa/*.so . || die "Creating symlink failed"
- # remove symlinks to drivers known to eselect
- for x in ${gallium_drivers[@]}; do
- if [ -f ${x} -o -L ${x} ]; then
- rm "${x}" || die "Failed to remove ${x}"
- fi
- done
- popd
- eend $?
- fi
- if use opencl; then
- ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
- local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
- dodir ${cl_dir}/{lib,include}
- if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
- mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
- "${ED}"${cl_dir}
- fi
- if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
- mv -f "${ED}"/usr/include/CL \
- "${ED}"${cl_dir}/include
- fi
- eend $?
- fi
-
- if use openmax; then
- echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
- doenvd "${T}"/99mesaxdgomx
- keepdir /usr/share/mesa/xdg
- fi
-}
-
-multilib_src_install_all() {
- prune_libtool_files --all
- einstalldocs
-
- if use !bindist; then
- dodoc docs/patents.txt
- fi
-
- # Install config file for eselect mesa
- insinto /usr/share/mesa
- newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
-}
-
-multilib_src_test() {
- if use llvm; then
- local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
- pushd src/gallium/drivers/llvmpipe >/dev/null || die
- emake ${llvm_tests}
- pax-mark m ${llvm_tests}
- popd >/dev/null || die
- fi
- emake check
-}
-
-pkg_postinst() {
- # Switch to the xorg implementation.
- echo
- eselect opengl set --use-old ${OPENGL_DIR}
-
- # switch to xorg-x11 and back if necessary, bug #374647 comment 11
- OLD_IMPLEM="$(eselect opengl show)"
- if [[ ${OPENGL_DIR}x != ${OLD_IMPLEM}x ]]; then
- eselect opengl set ${OPENGL_DIR}
- eselect opengl set ${OLD_IMPLEM}
- fi
-
- # Select classic/gallium drivers
- if use classic || use gallium; then
- eselect mesa set --auto
- fi
-
- # Switch to mesa opencl
- if use opencl; then
- eselect opencl set --use-old ${PN}
- fi
-
- # run omxregister-bellagio to make the OpenMAX drivers known system-wide
- if use openmax; then
- ebegin "Registering OpenMAX drivers"
- BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
- OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
- omxregister-bellagio
- eend $?
- fi
-
- # warn about patent encumbered texture-float
- if use !bindist; then
- elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
- elog "enabled. Please see patents.txt for an explanation."
- fi
-
- local using_radeon r_flag
- for r_flag in ${RADEON_CARDS}; do
- if use video_cards_${r_flag}; then
- using_radeon=1
- break
- fi
- done
-
- if [[ ${using_radeon} = 1 ]] && ! has_version media-libs/libtxc_dxtn; then
- elog "Note that in order to have full S3TC support, it is necessary to install"
- elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice"
- elog "textures in some apps, and some others even require this to run."
- fi
-}
-
-pkg_prerm() {
- if use openmax; then
- rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
- fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
- case $# in
- # for enabling unconditionally
- 1)
- DRI_DRIVERS+=",$1"
- ;;
- *)
- if use $1; then
- shift
- for i in $@; do
- DRI_DRIVERS+=",${i}"
- done
- fi
- ;;
- esac
-}
-
-gallium_enable() {
- case $# in
- # for enabling unconditionally
- 1)
- GALLIUM_DRIVERS+=",$1"
- ;;
- *)
- if use $1; then
- shift
- for i in $@; do
- GALLIUM_DRIVERS+=",${i}"
- done
- fi
- ;;
- esac
-}
diff --git a/media-libs/mesa/mesa-11.0.6-r1.ebuild b/media-libs/mesa/mesa-11.0.6-r1.ebuild
deleted file mode 100644
index 91ddc3b..0000000
--- a/media-libs/mesa/mesa-11.0.6-r1.ebuild
+++ /dev/null
@@ -1,466 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
-
-if [[ ${PV} = 9999 ]]; then
- GIT_ECLASS="git-r3"
- EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-FOLDER="${PV/_rc*/}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="http://mesa3d.sourceforge.net/"
-
-if [[ $PV == 9999 ]]; then
- SRC_URI=""
- KEYWORDS="arm hppa ppc64"
-else
- SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz"
- KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="!bindist? ( bindist )"
-
-INTEL_CARDS="i915 i965 ilo intel"
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vc4 vmware"
-for card in ${VIDEO_CARDS}; do
- IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
- bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
- +nptl opencl osmesa pax_kernel openmax pic selinux +udev vaapi vdpau
- wayland xvmc xa kernel_FreeBSD"
-
-REQUIRED_USE="
- d3d9? ( dri3 gallium )
- llvm? ( gallium )
- opencl? ( gallium llvm )
- openmax? ( gallium )
- gles1? ( egl )
- gles2? ( egl )
- vaapi? ( gallium )
- vdpau? ( gallium )
- wayland? ( egl gbm )
- xa? ( gallium )
- video_cards_freedreno? ( gallium )
- video_cards_intel? ( classic )
- video_cards_i915? ( || ( classic gallium ) )
- video_cards_i965? ( classic )
- video_cards_ilo? ( gallium )
- video_cards_nouveau? ( || ( classic gallium ) )
- video_cards_radeon? ( || ( classic gallium )
- gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
- video_cards_r100? ( classic )
- video_cards_r200? ( classic )
- video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) )
- video_cards_r600? ( gallium )
- video_cards_radeonsi? ( gallium llvm )
- video_cards_vc4? ( gallium gbm egl )
- video_cards_vmware? ( gallium )
- ${PYTHON_REQUIRED_USE}
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.64"
-# keep correct libdrm and dri2proto dep
-# keep blocks in rdepend for binpkg
-RDEPEND="
- !<x11-base/xorg-server-1.7
- !<=x11-proto/xf86driproto-2.0.3
- abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
- classic? ( app-eselect/eselect-mesa )
- gallium? ( app-eselect/eselect-mesa )
- >=app-eselect/eselect-opengl-1.3.0
- udev? ( kernel_linux? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) )
- >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
- gbm? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] )
- dri3? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] )
- >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
- >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
- x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
- llvm? ( !kernel_FreeBSD? (
- video_cards_radeonsi? ( || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
- !video_cards_r600? (
- video_cards_radeon? ( || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
- ) )
- >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
- <sys-devel/llvm-3.8
- )
- opencl? (
- app-eselect/eselect-opencl
- dev-libs/libclc
- !kernel_FreeBSD? ( || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
- )
- openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
- vaapi? ( >=x11-libs/libva-0.35.0:=[${MULTILIB_USEDEP}] )
- vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
- wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] )
- xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
- ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}]
-"
-for card in ${INTEL_CARDS}; do
- RDEPEND="${RDEPEND}
- video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
- "
-done
-
-for card in ${RADEON_CARDS}; do
- RDEPEND="${RDEPEND}
- video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
- "
-done
-RDEPEND="${RDEPEND}
- video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-DEPEND="${RDEPEND}
- llvm? (
- video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
- )
- opencl? (
- >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
- >=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}]
- >=sys-devel/gcc-4.6
- )
- sys-devel/gettext
- virtual/pkgconfig
- >=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
- dri3? (
- >=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
- >=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
- )
- >=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
-"
-[[ ${PV} == 9999 ]] && DEPEND+="
- sys-devel/bison
- sys-devel/flex
- ${PYTHON_DEPS}
- $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
- !pic? (
- usr/lib*/libglapi.so.0.0.0
- usr/lib*/libGLESv1_CM.so.1.1.0
- usr/lib*/libGLESv2.so.2.0.0
- usr/lib*/libGL.so.1.2.0
- usr/lib*/libOSMesa.so.8.0.0
- )
-)"
-
-pkg_setup() {
- # warning message for bug 459306
- if use llvm && has_version sys-devel/llvm[!debug=]; then
- ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
- ewarn "detected! This can cause problems. For details, see bug 459306."
- fi
-
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- [[ ${PV} == 9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
- local myconf
-
- if use classic; then
- # Configurable DRI drivers
- driver_enable swrast
-
- # Intel code
- driver_enable video_cards_i915 i915
- driver_enable video_cards_i965 i965
- if ! use video_cards_i915 && \
- ! use video_cards_i965; then
- driver_enable video_cards_intel i915 i965
- fi
-
- # Nouveau code
- driver_enable video_cards_nouveau nouveau
-
- # ATI code
- driver_enable video_cards_r100 radeon
- driver_enable video_cards_r200 r200
- if ! use video_cards_r100 && \
- ! use video_cards_r200; then
- driver_enable video_cards_radeon radeon r200
- fi
- fi
-
- if use egl; then
- myconf+=" --with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
- fi
-
- if use gallium; then
- myconf+="
- $(use_enable d3d9 nine)
- $(use_enable llvm gallium-llvm)
- $(use_enable openmax omx)
- $(use_enable vaapi va)
- $(use_enable vdpau)
- $(use_enable xa)
- $(use_enable xvmc)
- "
- use vaapi && myconf+=" --with-va-libdir=/usr/$(get_libdir)/va/drivers"
-
- gallium_enable swrast
- gallium_enable video_cards_vmware svga
- gallium_enable video_cards_nouveau nouveau
- gallium_enable video_cards_i915 i915
- gallium_enable video_cards_ilo ilo
- if ! use video_cards_i915 && \
- ! use video_cards_i965; then
- gallium_enable video_cards_intel i915
- fi
-
- gallium_enable video_cards_r300 r300
- gallium_enable video_cards_r600 r600
- gallium_enable video_cards_radeonsi radeonsi
- if ! use video_cards_r300 && \
- ! use video_cards_r600; then
- gallium_enable video_cards_radeon r300 r600
- fi
-
- gallium_enable video_cards_freedreno freedreno
- gallium_enable video_cards_vc4 vc4
- # opencl stuff
- if use opencl; then
- myconf+="
- $(use_enable opencl)
- --with-clang-libdir="${EPREFIX}/usr/lib"
- "
- fi
- fi
-
- # x86 hardened pax_kernel needs glx-read-only-text, bug 240956
- if [[ ${ABI} == x86 ]]; then
- myconf+=" $(use_enable pax_kernel glx-read-only-text)"
- fi
-
- # on abi_x86_32 hardened we need to have asm disable
- if [[ ${ABI} == x86* ]] && use pic; then
- myconf+=" --disable-asm"
- fi
-
- # build fails with BSD indent, bug #428112
- use userland_GNU || export INDENT=cat
-
- ECONF_SOURCE="${S}" \
- econf \
- --enable-dri \
- --enable-glx \
- --enable-shared-glapi \
- $(use_enable !bindist texture-float) \
- $(use_enable d3d9 nine) \
- $(use_enable debug) \
- $(use_enable dri3) \
- $(use_enable egl) \
- $(use_enable gbm) \
- $(use_enable gles1) \
- $(use_enable gles2) \
- $(use_enable nptl glx-tls) \
- $(use_enable osmesa) \
- $(use_enable !udev sysfs) \
- --enable-llvm-shared-libs \
- --with-dri-drivers=${DRI_DRIVERS} \
- --with-gallium-drivers=${GALLIUM_DRIVERS} \
- PYTHON2="${PYTHON}" \
- ${myconf}
-}
-
-multilib_src_install() {
- emake install DESTDIR="${D}"
-
- if use classic || use gallium; then
- ebegin "Moving DRI/Gallium drivers for dynamic switching"
- local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so vc4_dri.so )
- keepdir /usr/$(get_libdir)/dri
- dodir /usr/$(get_libdir)/mesa
- for x in ${gallium_drivers[@]}; do
- if [ -f "$(get_libdir)/gallium/${x}" ]; then
- mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
- || die "Failed to move ${x}"
- fi
- done
- if use classic; then
- emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
- fi
- for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
- if [ -f ${x} -o -L ${x} ]; then
- mv -f "${x}" "${x/dri/mesa}" \
- || die "Failed to move ${x}"
- fi
- done
- pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
- ln -s ../mesa/*.so . || die "Creating symlink failed"
- # remove symlinks to drivers known to eselect
- for x in ${gallium_drivers[@]}; do
- if [ -f ${x} -o -L ${x} ]; then
- rm "${x}" || die "Failed to remove ${x}"
- fi
- done
- popd
- eend $?
- fi
- if use opencl; then
- ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
- local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
- dodir ${cl_dir}/{lib,include}
- if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
- mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
- "${ED}"${cl_dir}
- fi
- if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
- mv -f "${ED}"/usr/include/CL \
- "${ED}"${cl_dir}/include
- fi
- eend $?
- fi
-
- if use openmax; then
- echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
- doenvd "${T}"/99mesaxdgomx
- keepdir /usr/share/mesa/xdg
- fi
-}
-
-multilib_src_install_all() {
- prune_libtool_files --all
- einstalldocs
-
- if use !bindist; then
- dodoc docs/patents.txt
- fi
-
- # Install config file for eselect mesa
- insinto /usr/share/mesa
- newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
-}
-
-multilib_src_test() {
- if use llvm; then
- local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
- pushd src/gallium/drivers/llvmpipe >/dev/null || die
- emake ${llvm_tests}
- pax-mark m ${llvm_tests}
- popd >/dev/null || die
- fi
- emake check
-}
-
-pkg_postinst() {
- # Switch to the xorg implementation.
- echo
- eselect opengl set --use-old ${OPENGL_DIR}
-
- # Select classic/gallium drivers
- if use classic || use gallium; then
- eselect mesa set --auto
- fi
-
- # Switch to mesa opencl
- if use opencl; then
- eselect opencl set --use-old ${PN}
- fi
-
- # run omxregister-bellagio to make the OpenMAX drivers known system-wide
- if use openmax; then
- ebegin "Registering OpenMAX drivers"
- BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
- OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
- omxregister-bellagio
- eend $?
- fi
-
- # warn about patent encumbered texture-float
- if use !bindist; then
- elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
- elog "enabled. Please see patents.txt for an explanation."
- fi
-
- if ! has_version media-libs/libtxc_dxtn; then
- elog "Note that in order to have full S3TC support, it is necessary to install"
- elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice"
- elog "textures in some apps, and some others even require this to run."
- fi
-}
-
-pkg_prerm() {
- if use openmax; then
- rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
- fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
- case $# in
- # for enabling unconditionally
- 1)
- DRI_DRIVERS+=",$1"
- ;;
- *)
- if use $1; then
- shift
- for i in $@; do
- DRI_DRIVERS+=",${i}"
- done
- fi
- ;;
- esac
-}
-
-gallium_enable() {
- case $# in
- # for enabling unconditionally
- 1)
- GALLIUM_DRIVERS+=",$1"
- ;;
- *)
- if use $1; then
- shift
- for i in $@; do
- GALLIUM_DRIVERS+=",${i}"
- done
- fi
- ;;
- esac
-}
diff --git a/media-libs/mesa/mesa-11.0.9-r1.ebuild b/media-libs/mesa/mesa-11.0.9-r1.ebuild
deleted file mode 100644
index eb8ba3b..0000000
--- a/media-libs/mesa/mesa-11.0.9-r1.ebuild
+++ /dev/null
@@ -1,464 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
-
-if [[ ${PV} = 9999 ]]; then
- GIT_ECLASS="git-r3"
- EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-FOLDER="${PV/_rc*/}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="http://mesa3d.sourceforge.net/"
-
-if [[ $PV == 9999 ]]; then
- SRC_URI=""
- KEYWORDS=""
-else
- SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="!bindist? ( bindist )"
-
-INTEL_CARDS="i915 i965 ilo intel"
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vc4 vmware"
-for card in ${VIDEO_CARDS}; do
- IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
- bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
- +nptl opencl osmesa pax_kernel openmax pic selinux +udev vaapi vdpau
- wayland xvmc xa kernel_FreeBSD"
-
-REQUIRED_USE="
- d3d9? ( dri3 gallium )
- llvm? ( gallium )
- opencl? ( gallium llvm )
- openmax? ( gallium )
- gles1? ( egl )
- gles2? ( egl )
- vaapi? ( gallium )
- vdpau? ( gallium )
- wayland? ( egl gbm )
- xa? ( gallium )
- video_cards_freedreno? ( gallium )
- video_cards_intel? ( classic )
- video_cards_i915? ( || ( classic gallium ) )
- video_cards_i965? ( classic )
- video_cards_ilo? ( gallium )
- video_cards_nouveau? ( || ( classic gallium ) )
- video_cards_radeon? ( || ( classic gallium )
- gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
- video_cards_r100? ( classic )
- video_cards_r200? ( classic )
- video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) )
- video_cards_r600? ( gallium )
- video_cards_radeonsi? ( gallium llvm )
- video_cards_vc4? ( gallium gbm egl )
- video_cards_vmware? ( gallium )
- ${PYTHON_REQUIRED_USE}
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.64"
-# keep correct libdrm and dri2proto dep
-# keep blocks in rdepend for binpkg
-RDEPEND="
- !<x11-base/xorg-server-1.7
- !<=x11-proto/xf86driproto-2.0.3
- abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
- classic? ( app-eselect/eselect-mesa )
- gallium? ( app-eselect/eselect-mesa )
- >=app-eselect/eselect-opengl-1.3.0
- udev? ( kernel_linux? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) )
- >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
- >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
- x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
- llvm? ( !kernel_FreeBSD? (
- video_cards_radeonsi? ( || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
- !video_cards_r600? (
- video_cards_radeon? ( || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
- ) )
- >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
- <sys-devel/llvm-3.8
- )
- opencl? (
- app-eselect/eselect-opencl
- dev-libs/libclc
- !kernel_FreeBSD? ( || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
- )
- openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
- vaapi? ( >=x11-libs/libva-0.35.0:=[${MULTILIB_USEDEP}] )
- vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
- wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] )
- xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
- ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}]
-"
-for card in ${INTEL_CARDS}; do
- RDEPEND="${RDEPEND}
- video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
- "
-done
-
-for card in ${RADEON_CARDS}; do
- RDEPEND="${RDEPEND}
- video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
- "
-done
-RDEPEND="${RDEPEND}
- video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-DEPEND="${RDEPEND}
- llvm? (
- video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
- )
- opencl? (
- >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
- >=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}]
- >=sys-devel/gcc-4.6
- )
- sys-devel/gettext
- virtual/pkgconfig
- >=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
- dri3? (
- >=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
- >=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
- )
- >=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
-"
-[[ ${PV} == 9999 ]] && DEPEND+="
- sys-devel/bison
- sys-devel/flex
- ${PYTHON_DEPS}
- $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
- !pic? (
- usr/lib*/libglapi.so.0.0.0
- usr/lib*/libGLESv1_CM.so.1.1.0
- usr/lib*/libGLESv2.so.2.0.0
- usr/lib*/libGL.so.1.2.0
- usr/lib*/libOSMesa.so.8.0.0
- )
-)"
-
-pkg_setup() {
- # warning message for bug 459306
- if use llvm && has_version sys-devel/llvm[!debug=]; then
- ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
- ewarn "detected! This can cause problems. For details, see bug 459306."
- fi
-
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- [[ ${PV} == 9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
- local myconf
-
- if use classic; then
- # Configurable DRI drivers
- driver_enable swrast
-
- # Intel code
- driver_enable video_cards_i915 i915
- driver_enable video_cards_i965 i965
- if ! use video_cards_i915 && \
- ! use video_cards_i965; then
- driver_enable video_cards_intel i915 i965
- fi
-
- # Nouveau code
- driver_enable video_cards_nouveau nouveau
-
- # ATI code
- driver_enable video_cards_r100 radeon
- driver_enable video_cards_r200 r200
- if ! use video_cards_r100 && \
- ! use video_cards_r200; then
- driver_enable video_cards_radeon radeon r200
- fi
- fi
-
- if use egl; then
- myconf+=" --with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
- fi
-
- if use gallium; then
- myconf+="
- $(use_enable d3d9 nine)
- $(use_enable llvm gallium-llvm)
- $(use_enable openmax omx)
- $(use_enable vaapi va)
- $(use_enable vdpau)
- $(use_enable xa)
- $(use_enable xvmc)
- "
- use vaapi && myconf+=" --with-va-libdir=/usr/$(get_libdir)/va/drivers"
-
- gallium_enable swrast
- gallium_enable video_cards_vmware svga
- gallium_enable video_cards_nouveau nouveau
- gallium_enable video_cards_i915 i915
- gallium_enable video_cards_ilo ilo
- if ! use video_cards_i915 && \
- ! use video_cards_i965; then
- gallium_enable video_cards_intel i915
- fi
-
- gallium_enable video_cards_r300 r300
- gallium_enable video_cards_r600 r600
- gallium_enable video_cards_radeonsi radeonsi
- if ! use video_cards_r300 && \
- ! use video_cards_r600; then
- gallium_enable video_cards_radeon r300 r600
- fi
-
- gallium_enable video_cards_freedreno freedreno
- gallium_enable video_cards_vc4 vc4
- # opencl stuff
- if use opencl; then
- myconf+="
- $(use_enable opencl)
- --with-clang-libdir="${EPREFIX}/usr/lib"
- "
- fi
- fi
-
- # x86 hardened pax_kernel needs glx-read-only-text, bug 240956
- if [[ ${ABI} == x86 ]]; then
- myconf+=" $(use_enable pax_kernel glx-read-only-text)"
- fi
-
- # on abi_x86_32 hardened we need to have asm disable
- if [[ ${ABI} == x86* ]] && use pic; then
- myconf+=" --disable-asm"
- fi
-
- # build fails with BSD indent, bug #428112
- use userland_GNU || export INDENT=cat
-
- ECONF_SOURCE="${S}" \
- econf \
- --enable-dri \
- --enable-glx \
- --enable-shared-glapi \
- $(use_enable !bindist texture-float) \
- $(use_enable d3d9 nine) \
- $(use_enable debug) \
- $(use_enable dri3) \
- $(use_enable egl) \
- $(use_enable gbm) \
- $(use_enable gles1) \
- $(use_enable gles2) \
- $(use_enable nptl glx-tls) \
- $(use_enable osmesa) \
- $(use_enable !udev sysfs) \
- --enable-llvm-shared-libs \
- --with-dri-drivers=${DRI_DRIVERS} \
- --with-gallium-drivers=${GALLIUM_DRIVERS} \
- PYTHON2="${PYTHON}" \
- ${myconf}
-}
-
-multilib_src_install() {
- emake install DESTDIR="${D}"
-
- if use classic || use gallium; then
- ebegin "Moving DRI/Gallium drivers for dynamic switching"
- local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so vc4_dri.so )
- keepdir /usr/$(get_libdir)/dri
- dodir /usr/$(get_libdir)/mesa
- for x in ${gallium_drivers[@]}; do
- if [ -f "$(get_libdir)/gallium/${x}" ]; then
- mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
- || die "Failed to move ${x}"
- fi
- done
- if use classic; then
- emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
- fi
- for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
- if [ -f ${x} -o -L ${x} ]; then
- mv -f "${x}" "${x/dri/mesa}" \
- || die "Failed to move ${x}"
- fi
- done
- pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
- ln -s ../mesa/*.so . || die "Creating symlink failed"
- # remove symlinks to drivers known to eselect
- for x in ${gallium_drivers[@]}; do
- if [ -f ${x} -o -L ${x} ]; then
- rm "${x}" || die "Failed to remove ${x}"
- fi
- done
- popd
- eend $?
- fi
- if use opencl; then
- ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
- local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
- dodir ${cl_dir}/{lib,include}
- if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
- mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
- "${ED}"${cl_dir}
- fi
- if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
- mv -f "${ED}"/usr/include/CL \
- "${ED}"${cl_dir}/include
- fi
- eend $?
- fi
-
- if use openmax; then
- echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
- doenvd "${T}"/99mesaxdgomx
- keepdir /usr/share/mesa/xdg
- fi
-}
-
-multilib_src_install_all() {
- prune_libtool_files --all
- einstalldocs
-
- if use !bindist; then
- dodoc docs/patents.txt
- fi
-
- # Install config file for eselect mesa
- insinto /usr/share/mesa
- newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
-}
-
-multilib_src_test() {
- if use llvm; then
- local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
- pushd src/gallium/drivers/llvmpipe >/dev/null || die
- emake ${llvm_tests}
- pax-mark m ${llvm_tests}
- popd >/dev/null || die
- fi
- emake check
-}
-
-pkg_postinst() {
- # Switch to the xorg implementation.
- echo
- eselect opengl set --use-old ${OPENGL_DIR}
-
- # Select classic/gallium drivers
- if use classic || use gallium; then
- eselect mesa set --auto
- fi
-
- # Switch to mesa opencl
- if use opencl; then
- eselect opencl set --use-old ${PN}
- fi
-
- # run omxregister-bellagio to make the OpenMAX drivers known system-wide
- if use openmax; then
- ebegin "Registering OpenMAX drivers"
- BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
- OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
- omxregister-bellagio
- eend $?
- fi
-
- # warn about patent encumbered texture-float
- if use !bindist; then
- elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
- elog "enabled. Please see patents.txt for an explanation."
- fi
-
- if ! has_version media-libs/libtxc_dxtn; then
- elog "Note that in order to have full S3TC support, it is necessary to install"
- elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice"
- elog "textures in some apps, and some others even require this to run."
- fi
-}
-
-pkg_prerm() {
- if use openmax; then
- rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
- fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
- case $# in
- # for enabling unconditionally
- 1)
- DRI_DRIVERS+=",$1"
- ;;
- *)
- if use $1; then
- shift
- for i in $@; do
- DRI_DRIVERS+=",${i}"
- done
- fi
- ;;
- esac
-}
-
-gallium_enable() {
- case $# in
- # for enabling unconditionally
- 1)
- GALLIUM_DRIVERS+=",$1"
- ;;
- *)
- if use $1; then
- shift
- for i in $@; do
- GALLIUM_DRIVERS+=",${i}"
- done
- fi
- ;;
- esac
-}
diff --git a/media-libs/mesa/mesa-11.1.2-r2.ebuild b/media-libs/mesa/mesa-11.1.2-r2.ebuild
deleted file mode 100644
index a69a960..0000000
--- a/media-libs/mesa/mesa-11.1.2-r2.ebuild
+++ /dev/null
@@ -1,466 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
-
-if [[ ${PV} = 9999 ]]; then
- GIT_ECLASS="git-r3"
- EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-FOLDER="${PV/_rc*/}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="http://mesa3d.sourceforge.net/"
-
-if [[ $PV == 9999 ]]; then
- SRC_URI=""
- KEYWORDS=""
-else
- SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="!bindist? ( bindist )"
-
-INTEL_CARDS="i915 i965 ilo intel"
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vc4 vmware"
-for card in ${VIDEO_CARDS}; do
- IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
- bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
- +nptl opencl osmesa pax_kernel openmax pic selinux +udev vaapi vdpau
- wayland xvmc xa kernel_FreeBSD"
-
-REQUIRED_USE="
- d3d9? ( dri3 gallium )
- llvm? ( gallium )
- opencl? ( gallium llvm )
- openmax? ( gallium )
- gles1? ( egl )
- gles2? ( egl )
- vaapi? ( gallium )
- vdpau? ( gallium )
- wayland? ( egl gbm )
- xa? ( gallium )
- video_cards_freedreno? ( gallium )
- video_cards_intel? ( classic )
- video_cards_i915? ( || ( classic gallium ) )
- video_cards_i965? ( classic )
- video_cards_ilo? ( gallium )
- video_cards_nouveau? ( || ( classic gallium ) )
- video_cards_radeon? ( || ( classic gallium )
- gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
- video_cards_r100? ( classic )
- video_cards_r200? ( classic )
- video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) )
- video_cards_r600? ( gallium )
- video_cards_radeonsi? ( gallium llvm )
- video_cards_vc4? ( gallium gbm egl )
- video_cards_vmware? ( gallium )
- ${PYTHON_REQUIRED_USE}
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.64"
-# keep correct libdrm and dri2proto dep
-# keep blocks in rdepend for binpkg
-RDEPEND="
- !<x11-base/xorg-server-1.7
- !<=x11-proto/xf86driproto-2.0.3
- abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
- classic? ( app-eselect/eselect-mesa )
- gallium? ( app-eselect/eselect-mesa )
- >=app-eselect/eselect-opengl-1.3.0
- udev? ( kernel_linux? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) )
- >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
- >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
- x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
- llvm? ( !kernel_FreeBSD? (
- video_cards_radeonsi? ( || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
- !video_cards_r600? (
- video_cards_radeon? ( || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
- ) )
- >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
- <sys-devel/llvm-3.8
- )
- opencl? (
- app-eselect/eselect-opencl
- dev-libs/libclc
- !kernel_FreeBSD? ( || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
- )
- openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
- vaapi? ( >=x11-libs/libva-1.6.0:=[${MULTILIB_USEDEP}] )
- vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
- wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] )
- xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
- ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}]
-"
-for card in ${INTEL_CARDS}; do
- RDEPEND="${RDEPEND}
- video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
- "
-done
-
-for card in ${RADEON_CARDS}; do
- RDEPEND="${RDEPEND}
- video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
- "
-done
-RDEPEND="${RDEPEND}
- video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-DEPEND="${RDEPEND}
- llvm? (
- video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
- )
- opencl? (
- >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
- >=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}]
- >=sys-devel/gcc-4.6
- )
- sys-devel/gettext
- virtual/pkgconfig
- >=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
- dri3? (
- >=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
- >=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
- )
- >=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
-"
-[[ ${PV} == 9999 ]] && DEPEND+="
- sys-devel/bison
- sys-devel/flex
- ${PYTHON_DEPS}
- $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
- !pic? (
- usr/lib*/libglapi.so.0.0.0
- usr/lib*/libGLESv1_CM.so.1.1.0
- usr/lib*/libGLESv2.so.2.0.0
- usr/lib*/libGL.so.1.2.0
- usr/lib*/libOSMesa.so.8.0.0
- )
-)"
-
-pkg_setup() {
- # warning message for bug 459306
- if use llvm && has_version sys-devel/llvm[!debug=]; then
- ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
- ewarn "detected! This can cause problems. For details, see bug 459306."
- fi
-
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-11.1.2-i965-fix-use-after-free.patch
-
- [[ ${PV} == 9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
- local myconf
-
- if use classic; then
- # Configurable DRI drivers
- driver_enable swrast
-
- # Intel code
- driver_enable video_cards_i915 i915
- driver_enable video_cards_i965 i965
- if ! use video_cards_i915 && \
- ! use video_cards_i965; then
- driver_enable video_cards_intel i915 i965
- fi
-
- # Nouveau code
- driver_enable video_cards_nouveau nouveau
-
- # ATI code
- driver_enable video_cards_r100 radeon
- driver_enable video_cards_r200 r200
- if ! use video_cards_r100 && \
- ! use video_cards_r200; then
- driver_enable video_cards_radeon radeon r200
- fi
- fi
-
- if use egl; then
- myconf+=" --with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
- fi
-
- if use gallium; then
- myconf+="
- $(use_enable d3d9 nine)
- $(use_enable llvm gallium-llvm)
- $(use_enable openmax omx)
- $(use_enable vaapi va)
- $(use_enable vdpau)
- $(use_enable xa)
- $(use_enable xvmc)
- "
- use vaapi && myconf+=" --with-va-libdir=/usr/$(get_libdir)/va/drivers"
-
- gallium_enable swrast
- gallium_enable video_cards_vmware svga
- gallium_enable video_cards_nouveau nouveau
- gallium_enable video_cards_i915 i915
- gallium_enable video_cards_ilo ilo
- if ! use video_cards_i915 && \
- ! use video_cards_i965; then
- gallium_enable video_cards_intel i915
- fi
-
- gallium_enable video_cards_r300 r300
- gallium_enable video_cards_r600 r600
- gallium_enable video_cards_radeonsi radeonsi
- if ! use video_cards_r300 && \
- ! use video_cards_r600; then
- gallium_enable video_cards_radeon r300 r600
- fi
-
- gallium_enable video_cards_freedreno freedreno
- gallium_enable video_cards_vc4 vc4
- # opencl stuff
- if use opencl; then
- myconf+="
- $(use_enable opencl)
- --with-clang-libdir="${EPREFIX}/usr/lib"
- "
- fi
- fi
-
- # x86 hardened pax_kernel needs glx-read-only-text, bug 240956
- if [[ ${ABI} == x86 ]]; then
- myconf+=" $(use_enable pax_kernel glx-read-only-text)"
- fi
-
- # on abi_x86_32 hardened we need to have asm disable
- if [[ ${ABI} == x86* ]] && use pic; then
- myconf+=" --disable-asm"
- fi
-
- # build fails with BSD indent, bug #428112
- use userland_GNU || export INDENT=cat
-
- ECONF_SOURCE="${S}" \
- econf \
- --enable-dri \
- --enable-glx \
- --enable-shared-glapi \
- $(use_enable !bindist texture-float) \
- $(use_enable d3d9 nine) \
- $(use_enable debug) \
- $(use_enable dri3) \
- $(use_enable egl) \
- $(use_enable gbm) \
- $(use_enable gles1) \
- $(use_enable gles2) \
- $(use_enable nptl glx-tls) \
- $(use_enable osmesa) \
- $(use_enable !udev sysfs) \
- --enable-llvm-shared-libs \
- --with-dri-drivers=${DRI_DRIVERS} \
- --with-gallium-drivers=${GALLIUM_DRIVERS} \
- PYTHON2="${PYTHON}" \
- ${myconf}
-}
-
-multilib_src_install() {
- emake install DESTDIR="${D}"
-
- if use classic || use gallium; then
- ebegin "Moving DRI/Gallium drivers for dynamic switching"
- local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so vc4_dri.so )
- keepdir /usr/$(get_libdir)/dri
- dodir /usr/$(get_libdir)/mesa
- for x in ${gallium_drivers[@]}; do
- if [ -f "$(get_libdir)/gallium/${x}" ]; then
- mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
- || die "Failed to move ${x}"
- fi
- done
- if use classic; then
- emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
- fi
- for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
- if [ -f ${x} -o -L ${x} ]; then
- mv -f "${x}" "${x/dri/mesa}" \
- || die "Failed to move ${x}"
- fi
- done
- pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
- ln -s ../mesa/*.so . || die "Creating symlink failed"
- # remove symlinks to drivers known to eselect
- for x in ${gallium_drivers[@]}; do
- if [ -f ${x} -o -L ${x} ]; then
- rm "${x}" || die "Failed to remove ${x}"
- fi
- done
- popd
- eend $?
- fi
- if use opencl; then
- ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
- local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
- dodir ${cl_dir}/{lib,include}
- if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
- mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
- "${ED}"${cl_dir}
- fi
- if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
- mv -f "${ED}"/usr/include/CL \
- "${ED}"${cl_dir}/include
- fi
- eend $?
- fi
-
- if use openmax; then
- echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
- doenvd "${T}"/99mesaxdgomx
- keepdir /usr/share/mesa/xdg
- fi
-}
-
-multilib_src_install_all() {
- prune_libtool_files --all
- einstalldocs
-
- if use !bindist; then
- dodoc docs/patents.txt
- fi
-
- # Install config file for eselect mesa
- insinto /usr/share/mesa
- newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
-}
-
-multilib_src_test() {
- if use llvm; then
- local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
- pushd src/gallium/drivers/llvmpipe >/dev/null || die
- emake ${llvm_tests}
- pax-mark m ${llvm_tests}
- popd >/dev/null || die
- fi
- emake check
-}
-
-pkg_postinst() {
- # Switch to the xorg implementation.
- echo
- eselect opengl set --use-old ${OPENGL_DIR}
-
- # Select classic/gallium drivers
- if use classic || use gallium; then
- eselect mesa set --auto
- fi
-
- # Switch to mesa opencl
- if use opencl; then
- eselect opencl set --use-old ${PN}
- fi
-
- # run omxregister-bellagio to make the OpenMAX drivers known system-wide
- if use openmax; then
- ebegin "Registering OpenMAX drivers"
- BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
- OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
- omxregister-bellagio
- eend $?
- fi
-
- # warn about patent encumbered texture-float
- if use !bindist; then
- elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
- elog "enabled. Please see patents.txt for an explanation."
- fi
-
- if ! has_version media-libs/libtxc_dxtn; then
- elog "Note that in order to have full S3TC support, it is necessary to install"
- elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice"
- elog "textures in some apps, and some others even require this to run."
- fi
-}
-
-pkg_prerm() {
- if use openmax; then
- rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
- fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
- case $# in
- # for enabling unconditionally
- 1)
- DRI_DRIVERS+=",$1"
- ;;
- *)
- if use $1; then
- shift
- for i in $@; do
- DRI_DRIVERS+=",${i}"
- done
- fi
- ;;
- esac
-}
-
-gallium_enable() {
- case $# in
- # for enabling unconditionally
- 1)
- GALLIUM_DRIVERS+=",$1"
- ;;
- *)
- if use $1; then
- shift
- for i in $@; do
- GALLIUM_DRIVERS+=",${i}"
- done
- fi
- ;;
- esac
-}
diff --git a/media-libs/mesa/mesa-11.2.0-r1.ebuild b/media-libs/mesa/mesa-11.2.0-r1.ebuild
deleted file mode 100644
index d7a4498..0000000
--- a/media-libs/mesa/mesa-11.2.0-r1.ebuild
+++ /dev/null
@@ -1,469 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
-
-if [[ ${PV} = 9999 ]]; then
- GIT_ECLASS="git-r3"
- EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-FOLDER="${PV/_rc*/}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="http://mesa3d.sourceforge.net/"
-
-if [[ $PV == 9999 ]]; then
- SRC_URI=""
- KEYWORDS=""
-else
- SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="!bindist? ( bindist )"
-
-INTEL_CARDS="i915 i965 ilo intel"
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vc4 vmware"
-for card in ${VIDEO_CARDS}; do
- IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
- bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
- +nptl opencl osmesa pax_kernel openmax pic selinux +udev vaapi vdpau
- wayland xvmc xa kernel_FreeBSD"
-
-REQUIRED_USE="
- d3d9? ( dri3 gallium )
- llvm? ( gallium )
- opencl? ( gallium llvm )
- openmax? ( gallium )
- gles1? ( egl )
- gles2? ( egl )
- vaapi? ( gallium )
- vdpau? ( gallium )
- wayland? ( egl gbm )
- xa? ( gallium )
- video_cards_freedreno? ( gallium )
- video_cards_intel? ( classic )
- video_cards_i915? ( || ( classic gallium ) )
- video_cards_i965? ( classic )
- video_cards_ilo? ( gallium )
- video_cards_nouveau? ( || ( classic gallium ) )
- video_cards_radeon? ( || ( classic gallium )
- gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
- video_cards_r100? ( classic )
- video_cards_r200? ( classic )
- video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) )
- video_cards_r600? ( gallium )
- video_cards_radeonsi? ( gallium llvm )
- video_cards_vc4? ( gallium gbm egl )
- video_cards_vmware? ( gallium )
- ${PYTHON_REQUIRED_USE}
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.67"
-# keep correct libdrm and dri2proto dep
-# keep blocks in rdepend for binpkg
-RDEPEND="
- !<x11-base/xorg-server-1.7
- !<=x11-proto/xf86driproto-2.0.3
- abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
- classic? ( app-eselect/eselect-mesa )
- gallium? ( app-eselect/eselect-mesa )
- >=app-eselect/eselect-opengl-1.3.0
- udev? ( kernel_linux? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) )
- >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
- >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
- x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
- llvm? ( !kernel_FreeBSD? (
- video_cards_radeonsi? ( || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
- !video_cards_r600? (
- video_cards_radeon? ( || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
- ) )
- >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}]
- )
- opencl? (
- app-eselect/eselect-opencl
- dev-libs/libclc
- !kernel_FreeBSD? ( || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
- )
- openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
- vaapi? ( >=x11-libs/libva-1.6.0:=[${MULTILIB_USEDEP}] )
- vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
- wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] )
- xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
- ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}]
-"
-for card in ${INTEL_CARDS}; do
- RDEPEND="${RDEPEND}
- video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
- "
-done
-
-for card in ${RADEON_CARDS}; do
- RDEPEND="${RDEPEND}
- video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
- "
-done
-RDEPEND="${RDEPEND}
- video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-DEPEND="${RDEPEND}
- llvm? (
- video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
- )
- opencl? (
- >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
- >=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}]
- >=sys-devel/gcc-4.6
- )
- sys-devel/gettext
- virtual/pkgconfig
- >=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
- dri3? (
- >=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
- >=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
- )
- >=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
-"
-[[ ${PV} == 9999 ]] && DEPEND+="
- sys-devel/bison
- sys-devel/flex
- ${PYTHON_DEPS}
- $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
- !pic? (
- usr/lib*/libglapi.so.0.0.0
- usr/lib*/libGLESv1_CM.so.1.1.0
- usr/lib*/libGLESv2.so.2.0.0
- usr/lib*/libGL.so.1.2.0
- usr/lib*/libOSMesa.so.8.0.0
- )
-)"
-
-pkg_setup() {
- # warning message for bug 459306
- if use llvm && has_version sys-devel/llvm[!debug=]; then
- ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
- ewarn "detected! This can cause problems. For details, see bug 459306."
- fi
-
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- [[ ${PV} == 9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
- local myconf
-
- if use classic; then
- # Configurable DRI drivers
- driver_enable swrast
-
- # Intel code
- driver_enable video_cards_i915 i915
- driver_enable video_cards_i965 i965
- if ! use video_cards_i915 && \
- ! use video_cards_i965; then
- driver_enable video_cards_intel i915 i965
- fi
-
- # Nouveau code
- driver_enable video_cards_nouveau nouveau
-
- # ATI code
- driver_enable video_cards_r100 radeon
- driver_enable video_cards_r200 r200
- if ! use video_cards_r100 && \
- ! use video_cards_r200; then
- driver_enable video_cards_radeon radeon r200
- fi
- fi
-
- if use egl; then
- myconf+=" --with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
- fi
-
- if use gallium; then
- myconf+="
- $(use_enable d3d9 nine)
- $(use_enable llvm gallium-llvm)
- $(use_enable openmax omx)
- $(use_enable vaapi va)
- $(use_enable vdpau)
- $(use_enable xa)
- $(use_enable xvmc)
- "
- use vaapi && myconf+=" --with-va-libdir=/usr/$(get_libdir)/va/drivers"
-
- gallium_enable swrast
- gallium_enable video_cards_vmware svga
- gallium_enable video_cards_nouveau nouveau
- gallium_enable video_cards_i915 i915
- gallium_enable video_cards_ilo ilo
- if ! use video_cards_i915 && \
- ! use video_cards_i965; then
- gallium_enable video_cards_intel i915
- fi
-
- gallium_enable video_cards_r300 r300
- gallium_enable video_cards_r600 r600
- gallium_enable video_cards_radeonsi radeonsi
- if ! use video_cards_r300 && \
- ! use video_cards_r600; then
- gallium_enable video_cards_radeon r300 r600
- fi
-
- gallium_enable video_cards_freedreno freedreno
- gallium_enable video_cards_vc4 vc4
- # opencl stuff
- if use opencl; then
- myconf+="
- $(use_enable opencl)
- --with-clang-libdir="${EPREFIX}/usr/lib"
- "
- fi
- fi
-
- # x86 hardened pax_kernel needs glx-rts, bug 240956
- if [[ ${ABI} == x86 ]]; then
- myconf+=" $(use_enable pax_kernel glx-read-only-text)"
- fi
-
- # on abi_x86_32 hardened we need to have asm disable
- if [[ ${ABI} == x86* ]] && use pic; then
- myconf+=" --disable-asm"
- fi
-
- if use gallium; then
- myconf+=" $(use_enable osmesa gallium-osmesa)"
- else
- myconf+=" $(use_enable osmesa)"
- fi
-
- # build fails with BSD indent, bug #428112
- use userland_GNU || export INDENT=cat
-
- ECONF_SOURCE="${S}" \
- econf \
- --enable-dri \
- --enable-glx \
- --enable-shared-glapi \
- --disable-shader-cache \
- $(use_enable !bindist texture-float) \
- $(use_enable d3d9 nine) \
- $(use_enable debug) \
- $(use_enable dri3) \
- $(use_enable egl) \
- $(use_enable gbm) \
- $(use_enable gles1) \
- $(use_enable gles2) \
- $(use_enable nptl glx-tls) \
- $(use_enable !udev sysfs) \
- --enable-llvm-shared-libs \
- --with-dri-drivers=${DRI_DRIVERS} \
- --with-gallium-drivers=${GALLIUM_DRIVERS} \
- PYTHON2="${PYTHON}" \
- ${myconf}
-}
-
-multilib_src_install() {
- emake install DESTDIR="${D}"
-
- if use classic || use gallium; then
- ebegin "Moving DRI/Gallium drivers for dynamic switching"
- local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so vc4_dri.so )
- keepdir /usr/$(get_libdir)/dri
- dodir /usr/$(get_libdir)/mesa
- for x in ${gallium_drivers[@]}; do
- if [ -f "$(get_libdir)/gallium/${x}" ]; then
- mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
- || die "Failed to move ${x}"
- fi
- done
- if use classic; then
- emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
- fi
- for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
- if [ -f ${x} -o -L ${x} ]; then
- mv -f "${x}" "${x/dri/mesa}" \
- || die "Failed to move ${x}"
- fi
- done
- pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
- ln -s ../mesa/*.so . || die "Creating symlink failed"
- # remove symlinks to drivers known to eselect
- for x in ${gallium_drivers[@]}; do
- if [ -f ${x} -o -L ${x} ]; then
- rm "${x}" || die "Failed to remove ${x}"
- fi
- done
- popd
- eend $?
- fi
- if use opencl; then
- ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
- local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
- dodir ${cl_dir}/{lib,include}
- if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
- mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
- "${ED}"${cl_dir}
- fi
- if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
- mv -f "${ED}"/usr/include/CL \
- "${ED}"${cl_dir}/include
- fi
- eend $?
- fi
-
- if use openmax; then
- echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
- doenvd "${T}"/99mesaxdgomx
- keepdir /usr/share/mesa/xdg
- fi
-}
-
-multilib_src_install_all() {
- prune_libtool_files --all
- einstalldocs
-
- if use !bindist; then
- dodoc docs/patents.txt
- fi
-
- # Install config file for eselect mesa
- insinto /usr/share/mesa
- newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
-}
-
-multilib_src_test() {
- if use llvm; then
- local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
- pushd src/gallium/drivers/llvmpipe >/dev/null || die
- emake ${llvm_tests}
- pax-mark m ${llvm_tests}
- popd >/dev/null || die
- fi
- emake check
-}
-
-pkg_postinst() {
- # Switch to the xorg implementation.
- echo
- eselect opengl set --use-old ${OPENGL_DIR}
-
- # Select classic/gallium drivers
- if use classic || use gallium; then
- eselect mesa set --auto
- fi
-
- # Switch to mesa opencl
- if use opencl; then
- eselect opencl set --use-old ${PN}
- fi
-
- # run omxregister-bellagio to make the OpenMAX drivers known system-wide
- if use openmax; then
- ebegin "Registering OpenMAX drivers"
- BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
- OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
- omxregister-bellagio
- eend $?
- fi
-
- # warn about patent encumbered texture-float
- if use !bindist; then
- elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
- elog "enabled. Please see patents.txt for an explanation."
- fi
-
- if ! has_version media-libs/libtxc_dxtn; then
- elog "Note that in order to have full S3TC support, it is necessary to install"
- elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice"
- elog "textures in some apps, and some others even require this to run."
- fi
-}
-
-pkg_prerm() {
- if use openmax; then
- rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
- fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
- case $# in
- # for enabling unconditionally
- 1)
- DRI_DRIVERS+=",$1"
- ;;
- *)
- if use $1; then
- shift
- for i in $@; do
- DRI_DRIVERS+=",${i}"
- done
- fi
- ;;
- esac
-}
-
-gallium_enable() {
- case $# in
- # for enabling unconditionally
- 1)
- GALLIUM_DRIVERS+=",$1"
- ;;
- *)
- if use $1; then
- shift
- for i in $@; do
- GALLIUM_DRIVERS+=",${i}"
- done
- fi
- ;;
- esac
-}
diff --git a/media-libs/mesa/mesa-9999-r1.ebuild b/media-libs/mesa/mesa-9999-r1.ebuild
deleted file mode 100644
index d7a4498..0000000
--- a/media-libs/mesa/mesa-9999-r1.ebuild
+++ /dev/null
@@ -1,469 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
-
-if [[ ${PV} = 9999 ]]; then
- GIT_ECLASS="git-r3"
- EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-FOLDER="${PV/_rc*/}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="http://mesa3d.sourceforge.net/"
-
-if [[ $PV == 9999 ]]; then
- SRC_URI=""
- KEYWORDS=""
-else
- SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="!bindist? ( bindist )"
-
-INTEL_CARDS="i915 i965 ilo intel"
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vc4 vmware"
-for card in ${VIDEO_CARDS}; do
- IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
- bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
- +nptl opencl osmesa pax_kernel openmax pic selinux +udev vaapi vdpau
- wayland xvmc xa kernel_FreeBSD"
-
-REQUIRED_USE="
- d3d9? ( dri3 gallium )
- llvm? ( gallium )
- opencl? ( gallium llvm )
- openmax? ( gallium )
- gles1? ( egl )
- gles2? ( egl )
- vaapi? ( gallium )
- vdpau? ( gallium )
- wayland? ( egl gbm )
- xa? ( gallium )
- video_cards_freedreno? ( gallium )
- video_cards_intel? ( classic )
- video_cards_i915? ( || ( classic gallium ) )
- video_cards_i965? ( classic )
- video_cards_ilo? ( gallium )
- video_cards_nouveau? ( || ( classic gallium ) )
- video_cards_radeon? ( || ( classic gallium )
- gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
- video_cards_r100? ( classic )
- video_cards_r200? ( classic )
- video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) )
- video_cards_r600? ( gallium )
- video_cards_radeonsi? ( gallium llvm )
- video_cards_vc4? ( gallium gbm egl )
- video_cards_vmware? ( gallium )
- ${PYTHON_REQUIRED_USE}
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.67"
-# keep correct libdrm and dri2proto dep
-# keep blocks in rdepend for binpkg
-RDEPEND="
- !<x11-base/xorg-server-1.7
- !<=x11-proto/xf86driproto-2.0.3
- abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
- classic? ( app-eselect/eselect-mesa )
- gallium? ( app-eselect/eselect-mesa )
- >=app-eselect/eselect-opengl-1.3.0
- udev? ( kernel_linux? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) )
- >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
- >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
- x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
- llvm? ( !kernel_FreeBSD? (
- video_cards_radeonsi? ( || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
- !video_cards_r600? (
- video_cards_radeon? ( || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
- ) )
- >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}]
- )
- opencl? (
- app-eselect/eselect-opencl
- dev-libs/libclc
- !kernel_FreeBSD? ( || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
- )
- openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
- vaapi? ( >=x11-libs/libva-1.6.0:=[${MULTILIB_USEDEP}] )
- vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
- wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] )
- xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
- ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}]
-"
-for card in ${INTEL_CARDS}; do
- RDEPEND="${RDEPEND}
- video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
- "
-done
-
-for card in ${RADEON_CARDS}; do
- RDEPEND="${RDEPEND}
- video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
- "
-done
-RDEPEND="${RDEPEND}
- video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-DEPEND="${RDEPEND}
- llvm? (
- video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
- )
- opencl? (
- >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
- >=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}]
- >=sys-devel/gcc-4.6
- )
- sys-devel/gettext
- virtual/pkgconfig
- >=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
- dri3? (
- >=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
- >=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
- )
- >=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
-"
-[[ ${PV} == 9999 ]] && DEPEND+="
- sys-devel/bison
- sys-devel/flex
- ${PYTHON_DEPS}
- $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
- !pic? (
- usr/lib*/libglapi.so.0.0.0
- usr/lib*/libGLESv1_CM.so.1.1.0
- usr/lib*/libGLESv2.so.2.0.0
- usr/lib*/libGL.so.1.2.0
- usr/lib*/libOSMesa.so.8.0.0
- )
-)"
-
-pkg_setup() {
- # warning message for bug 459306
- if use llvm && has_version sys-devel/llvm[!debug=]; then
- ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
- ewarn "detected! This can cause problems. For details, see bug 459306."
- fi
-
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- [[ ${PV} == 9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
- local myconf
-
- if use classic; then
- # Configurable DRI drivers
- driver_enable swrast
-
- # Intel code
- driver_enable video_cards_i915 i915
- driver_enable video_cards_i965 i965
- if ! use video_cards_i915 && \
- ! use video_cards_i965; then
- driver_enable video_cards_intel i915 i965
- fi
-
- # Nouveau code
- driver_enable video_cards_nouveau nouveau
-
- # ATI code
- driver_enable video_cards_r100 radeon
- driver_enable video_cards_r200 r200
- if ! use video_cards_r100 && \
- ! use video_cards_r200; then
- driver_enable video_cards_radeon radeon r200
- fi
- fi
-
- if use egl; then
- myconf+=" --with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
- fi
-
- if use gallium; then
- myconf+="
- $(use_enable d3d9 nine)
- $(use_enable llvm gallium-llvm)
- $(use_enable openmax omx)
- $(use_enable vaapi va)
- $(use_enable vdpau)
- $(use_enable xa)
- $(use_enable xvmc)
- "
- use vaapi && myconf+=" --with-va-libdir=/usr/$(get_libdir)/va/drivers"
-
- gallium_enable swrast
- gallium_enable video_cards_vmware svga
- gallium_enable video_cards_nouveau nouveau
- gallium_enable video_cards_i915 i915
- gallium_enable video_cards_ilo ilo
- if ! use video_cards_i915 && \
- ! use video_cards_i965; then
- gallium_enable video_cards_intel i915
- fi
-
- gallium_enable video_cards_r300 r300
- gallium_enable video_cards_r600 r600
- gallium_enable video_cards_radeonsi radeonsi
- if ! use video_cards_r300 && \
- ! use video_cards_r600; then
- gallium_enable video_cards_radeon r300 r600
- fi
-
- gallium_enable video_cards_freedreno freedreno
- gallium_enable video_cards_vc4 vc4
- # opencl stuff
- if use opencl; then
- myconf+="
- $(use_enable opencl)
- --with-clang-libdir="${EPREFIX}/usr/lib"
- "
- fi
- fi
-
- # x86 hardened pax_kernel needs glx-rts, bug 240956
- if [[ ${ABI} == x86 ]]; then
- myconf+=" $(use_enable pax_kernel glx-read-only-text)"
- fi
-
- # on abi_x86_32 hardened we need to have asm disable
- if [[ ${ABI} == x86* ]] && use pic; then
- myconf+=" --disable-asm"
- fi
-
- if use gallium; then
- myconf+=" $(use_enable osmesa gallium-osmesa)"
- else
- myconf+=" $(use_enable osmesa)"
- fi
-
- # build fails with BSD indent, bug #428112
- use userland_GNU || export INDENT=cat
-
- ECONF_SOURCE="${S}" \
- econf \
- --enable-dri \
- --enable-glx \
- --enable-shared-glapi \
- --disable-shader-cache \
- $(use_enable !bindist texture-float) \
- $(use_enable d3d9 nine) \
- $(use_enable debug) \
- $(use_enable dri3) \
- $(use_enable egl) \
- $(use_enable gbm) \
- $(use_enable gles1) \
- $(use_enable gles2) \
- $(use_enable nptl glx-tls) \
- $(use_enable !udev sysfs) \
- --enable-llvm-shared-libs \
- --with-dri-drivers=${DRI_DRIVERS} \
- --with-gallium-drivers=${GALLIUM_DRIVERS} \
- PYTHON2="${PYTHON}" \
- ${myconf}
-}
-
-multilib_src_install() {
- emake install DESTDIR="${D}"
-
- if use classic || use gallium; then
- ebegin "Moving DRI/Gallium drivers for dynamic switching"
- local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so vc4_dri.so )
- keepdir /usr/$(get_libdir)/dri
- dodir /usr/$(get_libdir)/mesa
- for x in ${gallium_drivers[@]}; do
- if [ -f "$(get_libdir)/gallium/${x}" ]; then
- mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
- || die "Failed to move ${x}"
- fi
- done
- if use classic; then
- emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
- fi
- for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
- if [ -f ${x} -o -L ${x} ]; then
- mv -f "${x}" "${x/dri/mesa}" \
- || die "Failed to move ${x}"
- fi
- done
- pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
- ln -s ../mesa/*.so . || die "Creating symlink failed"
- # remove symlinks to drivers known to eselect
- for x in ${gallium_drivers[@]}; do
- if [ -f ${x} -o -L ${x} ]; then
- rm "${x}" || die "Failed to remove ${x}"
- fi
- done
- popd
- eend $?
- fi
- if use opencl; then
- ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
- local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
- dodir ${cl_dir}/{lib,include}
- if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
- mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
- "${ED}"${cl_dir}
- fi
- if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
- mv -f "${ED}"/usr/include/CL \
- "${ED}"${cl_dir}/include
- fi
- eend $?
- fi
-
- if use openmax; then
- echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
- doenvd "${T}"/99mesaxdgomx
- keepdir /usr/share/mesa/xdg
- fi
-}
-
-multilib_src_install_all() {
- prune_libtool_files --all
- einstalldocs
-
- if use !bindist; then
- dodoc docs/patents.txt
- fi
-
- # Install config file for eselect mesa
- insinto /usr/share/mesa
- newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
-}
-
-multilib_src_test() {
- if use llvm; then
- local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
- pushd src/gallium/drivers/llvmpipe >/dev/null || die
- emake ${llvm_tests}
- pax-mark m ${llvm_tests}
- popd >/dev/null || die
- fi
- emake check
-}
-
-pkg_postinst() {
- # Switch to the xorg implementation.
- echo
- eselect opengl set --use-old ${OPENGL_DIR}
-
- # Select classic/gallium drivers
- if use classic || use gallium; then
- eselect mesa set --auto
- fi
-
- # Switch to mesa opencl
- if use opencl; then
- eselect opencl set --use-old ${PN}
- fi
-
- # run omxregister-bellagio to make the OpenMAX drivers known system-wide
- if use openmax; then
- ebegin "Registering OpenMAX drivers"
- BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
- OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
- omxregister-bellagio
- eend $?
- fi
-
- # warn about patent encumbered texture-float
- if use !bindist; then
- elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
- elog "enabled. Please see patents.txt for an explanation."
- fi
-
- if ! has_version media-libs/libtxc_dxtn; then
- elog "Note that in order to have full S3TC support, it is necessary to install"
- elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice"
- elog "textures in some apps, and some others even require this to run."
- fi
-}
-
-pkg_prerm() {
- if use openmax; then
- rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
- fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
- case $# in
- # for enabling unconditionally
- 1)
- DRI_DRIVERS+=",$1"
- ;;
- *)
- if use $1; then
- shift
- for i in $@; do
- DRI_DRIVERS+=",${i}"
- done
- fi
- ;;
- esac
-}
-
-gallium_enable() {
- case $# in
- # for enabling unconditionally
- 1)
- GALLIUM_DRIVERS+=",$1"
- ;;
- *)
- if use $1; then
- shift
- for i in $@; do
- GALLIUM_DRIVERS+=",${i}"
- done
- fi
- ;;
- esac
-}
diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
deleted file mode 100644
index 36afb87..0000000
--- a/media-libs/mesa/metadata.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>x11@gentoo.org</email>
- <name>X11</name>
- </maintainer>
- <use>
- <flag name="bindist">Disable patent-encumbered ARB_texture_float, EXT_texture_shared_exponent, and EXT_packed_float extensions.</flag>
- <flag name="classic">Build drivers based on the classic architecture.</flag>
- <flag name="d3d9">Enable Direct 3D9 API through Nine state tracker. Can be used together with patched wine.</flag>
- <flag name="dri3">Enable DRI3 support.</flag>
- <flag name="egl">Enable EGL support.</flag>
- <flag name="gallium">Build drivers based on Gallium3D, the new architecture for 3D graphics drivers.</flag>
- <flag name="gbm">Enable the Graphics Buffer Manager for EGL on KMS.</flag>
- <flag name="gles">Enable GLES (both v1 and v2) support.</flag>
- <flag name="gles1">Enable GLESv1 support.</flag>
- <flag name="gles2">Enable GLESv2 support.</flag>
- <flag name="llvm">Enable LLVM backend for Gallium3D.</flag>
- <flag name="opencl">Enable the Clover Gallium OpenCL state tracker.</flag>
- <flag name="openmax">Enable OpenMAX video decode/encode acceleration for Gallium3D.</flag>
- <flag name="openvg">Enable the OpenVG 2D acceleration API for Gallium3D.</flag>
- <flag name="osmesa">Build the Mesa library for off-screen rendering.</flag>
- <flag name="pax_kernel">Enable if the user plans to run the package under a pax enabled hardened kernel</flag>
- <flag name="pic">disable optimized assembly code that is not PIC friendly</flag>
- <flag name="vdpau">Enable the VDPAU acceleration interface for the Gallium3D Video Layer.</flag>
- <flag name="wayland">Enable support for dev-libs/wayland</flag>
- <flag name="xa">Enable the XA (X Acceleration) API for Gallium3D.</flag>
- <flag name="xvmc">Enable the XvMC acceleration interface for the Gallium3D Video Layer.</flag>
- <flag name="video_cards_vc4">Enable the Raspberry PI VC4 driver for Gallium3D.</flag>
- </use>
- <upstream>
- <remote-id type="sourceforge">mesa3d</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/media-libs/oyranos/ChangeLog b/media-libs/oyranos/ChangeLog
deleted file mode 100644
index 7f806c3..0000000
--- a/media-libs/oyranos/ChangeLog
+++ /dev/null
@@ -1,9 +0,0 @@
-# ChangeLog for media-libs/oyranos
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*oyranos-0.9.4-r2.ebuild (28 Mar 2014)
-
- 28 Mar 2014; Sven Eden <yamakuzure@gmx.net> +oyranos-0.9.4-r2.ebuild :
- Fixed install bug.
-
diff --git a/media-libs/oyranos/Manifest b/media-libs/oyranos/Manifest
deleted file mode 100644
index 09fee72..0000000
--- a/media-libs/oyranos/Manifest
+++ /dev/null
@@ -1,15 +0,0 @@
-AUX oyranos-0.9.4-be-more-verbose.patch 1370 SHA256 6ac0800ce76a0ced9fdd895ec348408064c43299f2718d0571c9f28d71df1f43 SHA512 0e4170fee30865b7e9b2b1ac35df27cdaa3e67f7df9abffe9d8eb437a85461e32f77baba3daa498c6afc83d390d945e1ee7e49722dbbe89de971f3ca79260010 WHIRLPOOL 3d887ca62b4e0d0bc75a706e6b6b1ecfb615ac652e8a4d63544e5118d31ec07fe5b59cf9cca3de5ce1ffd1bc844f655620ee8d75d48717e9c4f465c9dac215db
-AUX oyranos-0.9.4-buildsystem-r1.patch 6065 SHA256 b64462269c67b8791f786cbd4b8037a54571c4dff85650256558a0d988819029 SHA512 50d810da9c1dc2f5487ea96a8acf03845c45824d6bab2c90631f60b542edf9d68be547e08c8203ffba2cd31cc56815606f194574b36e0ee0812886a180cf1408 WHIRLPOOL 45b32d38c72db66904ccf794679fb3410f88ab88d6b1962f6a0764b374d5cd9813ce130520d67c9afa3557681290846c6630064d1c55cb492a0bf5579cde8021
-AUX oyranos-0.9.4-fix-array-access.patch 1082 SHA256 541475585dad65a2d30f7d306d9ca4b8a310615e3e60a4909d2686c8716a3bb0 SHA512 64870430eb014d759daf3e0c7e0ada13bf39a874efac9072ce49f409d747b13820f869320e9eb6be97435335b22741f2c43b849d493d50dd1cc2386a85597161 WHIRLPOOL 35f06ded0df8e481e9802b08eb91bf8a61bf3c2571729ef3c1cff6900b9477e7463b21968cd54352c09a00a6536e18009993483d98a6fb5f38e24cf2b162e651
-AUX oyranos-0.9.4-fix-double-object-release.patch 1183 SHA256 29bc34e193b21265bb07cc1b4296bbb6ed03d25b55f20f9a943e0f0554d3623d SHA512 9f61d1d41dcad0e6fbda2385c934f942f76c74bc93f2ceb1dee91a0346cff498e6db4ffd15a00e40a6468ff3bd528964326da99dbc73524f6f04738a9adeda10 WHIRLPOOL bd655a8edb011075359abe9f1246331d004a37eed9f1424bd21535f24b92058ec87c033052e1e04d6f5083132acbc3e2753e28918e5570526996dda8579c2fac
-AUX oyranos-0.9.4-fix-oyRankMap-helper-functions-crashes.patch 1589 SHA256 041acaa59ef572b7a2604ffbde235ea52bbbe7b11949fa3661d1e00c92441529 SHA512 304a7ec1adf7be2cd18b1e33a52da8ef1153e68078a20bf4d5d2a5be9a98cda756061dd00a675f1b9eedee90b2e753a8583e2c6aacb6309fa647bf2ccebeae13 WHIRLPOOL 3f07dbf78d7513280947870d09e315d8100dbf066a54d60fec73289f5dc2585fcbc7125b6a51e7cd0a8bc451baf192db425c6000c1a571effb014d421faf7199
-AUX oyranos-0.9.4-fix-oyStringSegment-crash.patch 822 SHA256 f12a80e4959759b187847a6ed573bf8972fe098cf3c84e6a0416478d5602efde SHA512 482c8157608c6f9032a3642756155bc495fa3b75586a06ff34377c01fbf5bceb4e5761783d86a1b189bd2d879df6811ed420c58d902dc369ddc8546520f09de3 WHIRLPOOL 80f2e4e07797fd6b28ec0586cc2b1ff9796b858ce932c6853d2efdd27a8da7439f34b84c6b928fbd95dbad9ae0bb79e942abdebf08df63d922c28ddb0d02edfd
-AUX oyranos-0.9.4-fix-runpaths.patch 5200 SHA256 03e1591c85cf59c272b0a415b6c33d4f3fe3f0f7cfb507cad9ec40cd51ee9e16 SHA512 770d8ebeaa2eadf7420ddbd2625a24b80766f5d2d472ad51a3d8736620b16d71033f680ce7d0ac356eea82734dac35a2b124c114b3350c3761d4777356b7f091 WHIRLPOOL 5bd64bcc4e4e192a65193f70b82a9bcc50b8ec50d7f05f1429e5a8f7844a476c507d98460fc220bb6f1bbf3749b7142aa5b3d9be2195a826687446428553c2e3
-AUX oyranos-0.9.4-fix-typos-and-grammar.patch 43847 SHA256 cea8976e827b168bb474a66692351bd9cb346b97c5fc3675bce9a8337c5c7db9 SHA512 06b17498ff4c4cac7b906af8fa912f25e36f294c143dbd3db9ba0ae7ee665af9cf6e1f4fa41b198a284a722962da2ae177cfcc66353030c9ab0ba9ac76c3ef4d WHIRLPOOL afeeb29fe45f1003c076b8f5ad32244b4924e2c709e6c87581b51f51eadd5a43174639b8d50022b7eca12c9d70b983b866d74120d618f1f950846e009de821bb
-AUX oyranos-0.9.4-omit-profile-with-error.patch 1606 SHA256 06ce34d10e2cb9ca5722cb58f624b7041a8f388b53f9298200ae5a9845b7c825 SHA512 594923ae6dcac9aa8430ea3ccb9c7662c421eb2a99a27cfbf46a1083a0217a0c45aae663a1fc30fc6cf13cd2d7f0e4d63e7456180f623c19487b383f0c5a0c2f WHIRLPOOL 94675dd721df309cc10ace447b613b5eae05c8b2e5242f3443c2dd922d62dd253e308bd72e7eac03b735358b47a5c053f142ce9ac75392be99cd981a024f858a
-AUX oyranos-0.9.4-set-xcalib-to-screen-if-ge-xrandr-12.patch 5370 SHA256 3d2f260eb37bee4bbcd65677099076626147f22f17fdc938d26a3b86ceb986b4 SHA512 da7a3c05e161945bab4b8336e6848d06353482351aed45febedcd66f0f1b70276ab42f4a6cbcaff7708fc9ef42d135ec2110550ca66f94aef5c3915a7cf5e176 WHIRLPOOL 89b8264aab7026718694a8f84dfefe5b49af1a912c720165305b6d2d483943c83f5c43d109ffddb90ebfe2133731b87a6fc71ec2f6f4b02c4f705785d68bc2a7
-AUX oyranos-0.9.4-use-more-internal-xrandr-info.patch 1615 SHA256 78d1c45cc18ad555a97d2a6cd50c9ad40cd12c02048f351afc0a3893772c309a SHA512 cf4b42b8e794d19dbbbeab12c97fc80b897bcda26271c943c537f827946ca4a021e818c9fa6971b101aecc10d63e4d12b5781a549b6db62977884fa67134ecbc WHIRLPOOL af3992853631a3464b3ac625628031f63c80cc2da6b0d9b0cbd9f75bc460c4213f6fef5485e55eda8784d1b74c5cc9e7722ed07db10a175654df2b85cabd86ac
-DIST oyranos-0.9.4.tar.bz2 1632276 SHA256 6dcf7f8bef0720077ee55484a5b507ba5f049094f21fbbd2752f2ed120c0768a SHA512 23ded5bac4c16aba8a2d4266981e6ad53cfa2ce720d03751625552a873de8311dda721eb8dd732860ae0a0fcdfc7346f92aaeb8bde281ceeb4895f154d6e6c59 WHIRLPOOL 7ec535e326bf102eb0d154ac995b42b4a8b23a606c35417727b54653424807c47c5a4cf7ece6411627dcffd7ca5d8b1ddc588d97d1a02fb079d27d3d20efd2a5
-EBUILD oyranos-0.9.4-r2.ebuild 3885 SHA256 76da4fb50eca0615df1c42f00c6d3cce7c9494ec1957cc69277073217891b5fe SHA512 875573725b1a789edd4ea3e80800373d7bca494b88490c16356d4d16164d989799164e7e5b904d3394b4ad1a1d56d1d6837299a599b9cbdc506badc2bb398e31 WHIRLPOOL 49cc7d4ca928a6fda3135e3f195e88fb79b9d6836b483b98aaf41c9c1daa463a061d3c4021f711ce08472c613bfd45444dcfaecc52a20875d7e6bdba6f5bdf7b
-MISC ChangeLog 254 SHA256 2eab75d62692c6e9fb09a7eac36cc5dcb4b71b1b4773256f1ba6dc78d7cc0994 SHA512 f2c4717362cfc61f994f8428439261a5b1912d23790617a29b3325de32556e0c530355905da7b44ca16cc6c32451240beece3be21f4bc820861c22a0b74cdf86 WHIRLPOOL d0786925d9e5b38ea2a94d2e116e874bde3a3b330142cd2c4e57651ac7df95ec7d3addf547aed8527dca2b7cce494f4f2a88cda68efea530b2601b2f6842a459
-MISC metadata.xml 298 SHA256 3a28ce89dfc48817905b249d8984974bc6ead41dc6f4982005417d68b9760af7 SHA512 fab9927a1eb83cc6dc719846ad7824c7003e9c1d8deef44fe343856d6b5b4e7e036f2d069fc3044507a289b014be3b67ebc2f5bebccefa1dbaf4995144d58ae2 WHIRLPOOL 2c1ebf12df5203e1b7dd18f5da116ba3f8095787c3036573b8a30b6c6d95ca41c38f220077935c1715c48acd76aac0a62dcae30a2544373b1881b17363325de0
diff --git a/media-libs/oyranos/files/oyranos-0.9.4-be-more-verbose.patch b/media-libs/oyranos/files/oyranos-0.9.4-be-more-verbose.patch
deleted file mode 100644
index 66ed023..0000000
--- a/media-libs/oyranos/files/oyranos-0.9.4-be-more-verbose.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 80fd8efab3f56c698b4182846d8707916849cad9 Mon Sep 17 00:00:00 2001
-From: Kai-Uwe Behrmann <ku.b@gmx.de>
-Date: Sat, 9 Feb 2013 18:21:47 +0100
-Subject: [PATCH] * [tools]: add more verbosity to oy-monitor -v
-
-Here to the profile assignment part.
----
- src/tools/oyranos_gamma.c | 16 ++++++++++++++++
- 1 files changed, 16 insertions(+), 0 deletions(-)
-
-diff --git a/src/tools/oyranos_gamma.c b/src/tools/oyranos_gamma.c
-index f2206a5..005bdd2 100644
---- a/src/tools/oyranos_gamma.c
-+++ b/src/tools/oyranos_gamma.c
-@@ -747,16 +747,32 @@ int main( int argc , char** argv )
-
- if(monitor_profile)
- {
-+ if(verbose)
-+ fprintf( stdout, "oyDeviceSetProfile()\n" );
- oyDeviceSetProfile( device, monitor_profile );
-+ if(verbose)
-+ fprintf( stdout, "oyDeviceUnset()\n" );
- oyDeviceUnset( device );
- } else
- if(erase || unset)
-+ {
-+ if(verbose)
-+ fprintf( stdout, "oyDeviceUnset()\n" );
- oyDeviceUnset( device );
-+ }
- if(erase)
-+ {
-+ if(verbose)
-+ fprintf( stdout, "oyConfig_EraseFromDB()\n" );
- oyConfig_EraseFromDB( device );
-+ }
-
- if(setup)
-+ {
-+ if(verbose)
-+ fprintf( stdout, "oyDeviceSetup()\n" );
- oyDeviceSetup( device );
-+ }
-
- oyConfig_Release( &device );
- }
---
-1.5.6.5
-
-
diff --git a/media-libs/oyranos/files/oyranos-0.9.4-buildsystem-r1.patch b/media-libs/oyranos/files/oyranos-0.9.4-buildsystem-r1.patch
deleted file mode 100644
index a4516a2..0000000
--- a/media-libs/oyranos/files/oyranos-0.9.4-buildsystem-r1.patch
+++ /dev/null
@@ -1,162 +0,0 @@
---- oyranos-0.9.4/src/CMakeLists.txt
-+++ oyranos-0.9.4/src/CMakeLists.txt
-@@ -100,7 +100,9 @@
- INCLUDE_DIRECTORIES( ${XCM_INCLUDE_DIRS} )
- LINK_DIRECTORIES( ${XCM_LIBRARY_DIRS} )
-
--FIND_PACKAGE( X11 )
-+IF(WANT_X11)
-+FIND_PACKAGE( X11 REQUIRED )
-+ENDIF(WANT_X11)
- IF(X11_FOUND)
- INCLUDE_DIRECTORIES( ${X11_INCLUDE_DIRS} )
- LINK_DIRECTORIES( ${X11_LIBRARY_DIRS} )
-@@ -123,27 +125,35 @@
- LINK_DIRECTORIES( ${XXF86VM_LIBRARY_DIRS} )
- ENDIF(X11_FOUND)
-
--FIND_PACKAGE( CUPS )
-+IF(WANT_CUPS)
-+FIND_PACKAGE( Cups REQUIRED )
-+SET( HAVE_CUPS 1 )
-+ENDIF(WANT_CUPS)
- IF(HAVE_CUPS)
-- INCLUDE_DIRECTORIES( ${CUPS_INCLUDE_DIRS} )
-- LINK_DIRECTORIES( ${CUPS_LIBRARY_DIRS} )
-+ INCLUDE_DIRECTORIES( ${CUPS_INCLUDE_DIR} )
- ENDIF(HAVE_CUPS)
-
--FIND_PACKAGE( Cairo )
-+IF(WANT_CAIRO)
-+FIND_PACKAGE( Cairo REQUIRED)
-+ENDIF(WANT_CAIRO)
- IF(HAVE_CAIRO)
- INCLUDE_DIRECTORIES( ${CAIRO_INCLUDE_DIR}/cairo )
- INCLUDE_DIRECTORIES( ${CAIRO_INCLUDE_DIR} )
- LINK_DIRECTORIES( ${CAIRO_LIBRARY_DIRS} )
- ENDIF(HAVE_CAIRO)
-
--FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui)
-+IF(WANT_QT4)
-+FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui REQUIRED)
-+ENDIF(WANT_QT4)
- IF(QT_FOUND)
- SET( HAVE_QT 1 )
- INCLUDE_DIRECTORIES( ${QT_INCLUDE_DIRS} )
- LINK_DIRECTORIES( ${QT_LIBRARY_DIRS} )
- ENDIF(QT_FOUND)
-
--FIND_PACKAGE( Fltk )
-+IF(WANT_FLTK)
-+FIND_PACKAGE( FLTK REQUIRED)
-+ENDIF(WANT_FLTK)
- IF(FLTK_FOUND)
- SET( HAVE_FLTK 1 )
- INCLUDE_DIRECTORIES( ${FLTK_INCLUDE_DIRS} )
-@@ -159,7 +169,9 @@
- SET( LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} PARENT_SCOPE)
- ENDIF(LIBXML2_FOUND)
-
--FIND_PACKAGE( LibRaw )
-+IF(WANT_LIBRAW)
-+FIND_PACKAGE( LibRaw REQUIRED )
-+ENDIF(WANT_LIBRAW)
- IF( HAVE_LIBRAW )
- # TRY_COMPILE(
- # HAVE_LIBRAW_REALLY
-@@ -182,7 +194,9 @@
- MESSAGE( "HAVE_LIBRAW_PLUGIN: ${HAVE_LIBRAW_PLUGIN}" )
- ENDIF()
-
--FIND_PACKAGE( Exif2 )
-+IF(WANT_EXIV2)
-+FIND_PACKAGE( Exif2 REQUIRED )
-+ENDIF(WANT_EXIV2)
- IF(HAVE_EXIV2)
- INCLUDE_DIRECTORIES( ${EXIV2_INCLUDE_DIRS} )
- LINK_DIRECTORIES( ${EXIV2_LIBRARY_DIRS} )
---- oyranos-0.9.4/CMakeLists.txt
-+++ oyranos-0.9.4/CMakeLists.txt
-@@ -41,7 +41,7 @@
-
-
- # detect top level projects
--FIND_PACKAGE( Yajl )
-+FIND_PACKAGE( Yajl REQUIRED )
- IF( HAVE_YAJL )
- INCLUDE_DIRECTORIES( ${YAJL_INCLUDE_DIRS} )
- LINK_DIRECTORIES( ${YAJL_LIBRARY_DIRS} )
-@@ -51,71 +51,15 @@
- IF( NOT HAVE_YAJL_VERSION_H )
- INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/yajl/ )
- ENDIF( NOT HAVE_YAJL_VERSION_H )
--ELSE( HAVE_YAJL )
-- IF(CMAKE_VERSION VERSION_GREATER 2.8.0)
-- include(ExternalProject)
-- ExternalProject_Add( yajl
-- SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/yajl
-- CONFIGURE_COMMAND cmake ${CMAKE_CURRENT_SOURCE_DIR}/yajl
-- BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/yajl
-- BUILD_COMMAND ${MAKE}
-- # skip installation
-- INSTALL_COMMAND echo )
-- INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/yajl )
-- LINK_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR}/yajl )
-- SET( YAJL_LIBRARIES yajl-static )
-- ENDIF()
--
- ENDIF( HAVE_YAJL )
-
--FIND_PACKAGE( Elektra )
-+FIND_PACKAGE( Elektra REQUIRED )
-+SET( HAVE_ELEKTRA 1 )
- IF(HAVE_ELEKTRA)
- SET( ELEKTRA_SPEC "Requires: elektra 0.7
- BuildRequires: elektra-devel" )
- INCLUDE_DIRECTORIES( ${ELEKTRA_INCLUDE_DIRS} )
- LINK_DIRECTORIES( ${ELEKTRA_LIBRARY_DIRS} )
--ELSE(HAVE_ELEKTRA)
-- SET( ELEKTRA_VERSION elektra-0.7.1 )
-- MESSAGE( "-- Using internal Elektra: ${ELEKTRA_VERSION}" )
-- INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/${ELEKTRA_VERSION}/src/include
-- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/include )
-- SET( ELEKTRA_LIBRARIES_STATIC
-- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-kdb.o
-- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-kdbhandle.o
-- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-key.o
-- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-keyset.o
-- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-trie.o
-- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-kdbhighlevel.o
-- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-kdbcapability.o
-- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-keyhelpers.o
-- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-keymeta.o
-- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-keyname.o
-- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-keytest.o
-- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-keyvalue.o
-- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-serialize.o
-- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-split.o
-- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-exported_symbols.o
-- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libloader/libloader_static_a-kdbLibLoader.o
-- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libhelper/libhelper_static_a-internal.o
-- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libhelper/libhelper_static_a-helper.o
-- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/backends/filesys/libelektra_filesys_a-filesys.o
-- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektratools/libelektratools_a-kdbtools.o
-- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektratools/libelektratools_a-stream.o
-- )
-- SET( ELEKTRA_LIBRARIES
-- ${LIBXML2_LIBRARIES}
-- )
-- IF(CMAKE_VERSION VERSION_GREATER 2.8.0)
-- include(ExternalProject)
-- ExternalProject_Add( ${ELEKTRA_VERSION}
-- SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/${ELEKTRA_VERSION}
-- # GCC flags (-fPIC) will fail on Windows, without we get relocation R_X86_64_32 errors
-- CONFIGURE_COMMAND CFLAGS=-fPIC ${CMAKE_CURRENT_SOURCE_DIR}/${ELEKTRA_VERSION}/configure --enable-static --enable-shared=false
-- BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${ELEKTRA_VERSION}
-- BUILD_COMMAND ${MAKE}
-- # skip installation
-- INSTALL_COMMAND echo )
-- ENDIF()
- ENDIF(HAVE_ELEKTRA)
-
- #now add all directories
diff --git a/media-libs/oyranos/files/oyranos-0.9.4-fix-array-access.patch b/media-libs/oyranos/files/oyranos-0.9.4-fix-array-access.patch
deleted file mode 100644
index 0c5ca3c..0000000
--- a/media-libs/oyranos/files/oyranos-0.9.4-fix-array-access.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Kai-Uwe Behrmann <ku.b@gmx.de>
-Date: Mon, 18 Mar 2013 18:07:16 +0000 (+0100)
-Subject: * [oyX1]: fix array access
-X-Git-Url: http://www.oyranos.org/scm?p=oyranos.git;a=commitdiff_plain;h=11d848a38608deeeca61288d46cfca55c6916788
-
-* [oyX1]: fix array access
----
-
-diff --git a/src/modules/devices/oyranos_monitor_x11.c b/src/modules/devices/oyranos_monitor_x11.c
-index a530a81..bac09c1 100644
---- a/src/modules/devices/oyranos_monitor_x11.c
-+++ b/src/modules/devices/oyranos_monitor_x11.c
-@@ -1329,6 +1329,13 @@ oyX1Monitor_s* oyX1Monitor_newFrom_ ( const char * display_name,
- int n_scr_info = 0;
- XineramaScreenInfo *scr_info = XineramaQueryScreens( display,
- &n_scr_info );
-+ if(n_scr_info <= selected_screen)
-+ {
-+ XFree( scr_info );
-+ oyX1Monitor_release_( &disp );
-+ return 0;
-+ }
-+
- geo[0] = scr_info[selected_screen].x_org;
- geo[1] = scr_info[selected_screen].y_org;
- geo[2] = scr_info[selected_screen].width;
-
diff --git a/media-libs/oyranos/files/oyranos-0.9.4-fix-double-object-release.patch b/media-libs/oyranos/files/oyranos-0.9.4-fix-double-object-release.patch
deleted file mode 100644
index 1cbdf47..0000000
--- a/media-libs/oyranos/files/oyranos-0.9.4-fix-double-object-release.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Kai-Uwe Behrmann <ku.b@gmx.de>
-Date: Wed, 20 Mar 2013 17:15:17 +0000 (+0100)
-Subject: * [core]: fix double object release
-X-Git-Url: http://www.oyranos.org/scm?p=oyranos.git;a=commitdiff_plain;h=6214cf15fafae52d67233d27462488487091d8d6
-
-* [core]: fix double object release
-
-... which was revealed by valgrind
----
-
-diff --git a/src/API_generated/oyranos_devices.c b/src/API_generated/oyranos_devices.c
-index 4ed5138..8cee0c8 100644
---- a/src/API_generated/oyranos_devices.c
-+++ b/src/API_generated/oyranos_devices.c
-@@ -1896,7 +1896,6 @@ OYAPI int OYEXPORT
- oyConfigs_MoveIn( taxi_devices, &taxi_dev, -1 );
- }
- oyConfigs_Release( &configs_ );
-- oyOptions_Release( &options );
- oyFree_m_(ranks);
- }
-
-diff --git a/src/templates/oyranos_devices.template.c b/src/templates/oyranos_devices.template.c
-index 586ba36..ff555e3 100644
---- a/src/templates/oyranos_devices.template.c
-+++ b/src/templates/oyranos_devices.template.c
-@@ -1881,7 +1881,6 @@ OYAPI int OYEXPORT
- oyConfigs_MoveIn( taxi_devices, &taxi_dev, -1 );
- }
- oyConfigs_Release( &configs_ );
-- oyOptions_Release( &options );
- oyFree_m_(ranks);
- }
-
-
diff --git a/media-libs/oyranos/files/oyranos-0.9.4-fix-oyRankMap-helper-functions-crashes.patch b/media-libs/oyranos/files/oyranos-0.9.4-fix-oyRankMap-helper-functions-crashes.patch
deleted file mode 100644
index 27c06cd..0000000
--- a/media-libs/oyranos/files/oyranos-0.9.4-fix-oyRankMap-helper-functions-crashes.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From: Kai-Uwe Behrmann <ku.b@gmx.de>
-Date: Fri, 22 Feb 2013 18:42:23 +0000 (+0100)
-Subject: * [sources]: fix counting in oyRankMap data
-X-Git-Url: http://www.oyranos.org/scm?p=oyranos.git;a=commitdiff_plain;h=c2feb3e1f1ab45702f98c8728898eab1ee849cd4
-
-* [sources]: fix counting in oyRankMap data
-
-2013-04-21: backport to oyranos-0.9.4, remove (duplicate) patch for nonexistent file
-
-This fixes crashes in several oyRankMap helper functions.
----
-
-diff --git a/src/API_generated/oyConfig_s.c b/src/API_generated/oyConfig_s.c
-index 8ec0ff6..7ea1f3b 100644
---- a/src/API_generated/oyConfig_s.c
-+++ b/src/API_generated/oyConfig_s.c
-@@ -983,14 +983,14 @@ oyRankMap * oyRankMapCopy ( const oyRankMap * rank_map,
- {
- oyRankMap * map = 0;
- int error = !rank_map;
-- int n = 0, i;
-+ int n = 0, i = 0;
-
- if(!allocateFunc)
- allocateFunc = oyAllocateFunc_;
-
- if(error <= 0)
- {
-- while( rank_map[n++].key ) {}
-+ while( rank_map[i++].key ) ++n;
-
- oyAllocHelper_m_( map, oyRankMap, n + 1, allocateFunc, error = 1 );
- }
-@@ -1025,7 +1025,7 @@ OYAPI void OYEXPORT
- oyDeAlloc_f deAllocateFunc )
- {
- int error = !rank_map || !*rank_map;
-- int n = 0, i;
-+ int n = 0, i = 0;
-
- if(!deAllocateFunc)
- deAllocateFunc = oyDeAllocateFunc_;
-@@ -1033,7 +1033,7 @@ OYAPI void OYEXPORT
- if(error <= 0)
- {
- oyRankMap * map = *rank_map;
-- while( (*rank_map)[n++].key ) {}
-+ while( (*rank_map)[i++].key ) ++n;
- for(i = 0; i < n; ++i)
- {
- deAllocateFunc( map[i].key ); map[i].key = 0;
---
-1.5.6.5
diff --git a/media-libs/oyranos/files/oyranos-0.9.4-fix-oyStringSegment-crash.patch b/media-libs/oyranos/files/oyranos-0.9.4-fix-oyStringSegment-crash.patch
deleted file mode 100644
index 7de609b..0000000
--- a/media-libs/oyranos/files/oyranos-0.9.4-fix-oyStringSegment-crash.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Kai-Uwe Behrmann <ku.b@gmx.de>
-Date: Wed, 13 Mar 2013 13:59:19 +0000 (+0100)
-Subject: * [core]: fix oyStringSegment_() crash
-X-Git-Url: http://www.oyranos.org/scm?p=oyranos.git;a=commitdiff_plain;h=cf495d5ede29f7211e498217c4d06428f944bac3
-
-2013-04-21: backport to oyranos-0.9.1, remove unrelated oyStringReplace_ hunk
-
-* [core]: fix oyStringSegment_() crash
----
-
-diff --git a/src/liboyranos_core/oyranos_string.c b/src/liboyranos_core/oyranos_string.c
-index 525ce7e..1d214c0 100644
---- a/src/liboyranos_core/oyranos_string.c
-+++ b/src/liboyranos_core/oyranos_string.c
-@@ -499,7 +499,7 @@ char * oyStringSegment_ ( char * text,
- for(; i < segment; ++i)
- {
- t = oyStrchr_( t, delimiter );
-- ++t;
-+ if(t) ++t;
- }
-
- end_pos = (uintptr_t) oyStrchr_(t, delimiter);
---
-1.5.6.5
diff --git a/media-libs/oyranos/files/oyranos-0.9.4-fix-runpaths.patch b/media-libs/oyranos/files/oyranos-0.9.4-fix-runpaths.patch
deleted file mode 100644
index 0287c11..0000000
--- a/media-libs/oyranos/files/oyranos-0.9.4-fix-runpaths.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From b8f4a5fe0cea02878de106f5d02751e922438275 Mon Sep 17 00:00:00 2001
-From: Kai-Uwe Behrmann <ku.b@gmx.de>
-Date: Wed, 3 Apr 2013 10:01:04 +0200
-Subject: [PATCH 1/1] * [build]: fix has insecure RUNPATHs
-
-https://sourceforge.net/tracker/?func=detail&atid=879553&aid=3609840&group_id=177017
-
-2013-04-03: backport to oyranos-0.9.4:
- merged 1-line change from commit 5b63d318e53ae8b8f3a0ccb166c97acf6103caac
-
----
- CMakeLists.txt | 2 +-
- src/examples/CMakeLists.txt | 26 ++++++++++++++++++++++++++
- src/examples/oforms/CMakeLists.txt | 28 ++++------------------------
- src/tools/CMakeLists.txt | 2 +-
- 4 files changed, 32 insertions(+), 26 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f24965c..6e9c8fb 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -10,7 +10,7 @@ SET (OYRANOS_DEVEL_MONTH 01)
- SET (OYRANOS_DEVEL_YEAR 2013)
-
- SET (PACKAGE_NAME "oyranos")
--set (PACKAGE_DESCRIPTION "Oyranos is a Colour Management System (CMS) on operating system level. It allows to match predictably input device colours to output device colours across supporting applications. One goal is to make colour management useful for all users in a automated fashion and regardless of any technical knowledge.")
-+SET (PACKAGE_DESCRIPTION "Oyranos is a Colour Management System (CMS) on operating system level. It allows to match predictably input device colours to output device colours across supporting applications. One goal is to make colour management useful for all users in a automated fashion and regardless of any technical knowledge.")
-
- SET( OY_CMMSUBPATH "colour/modules" )
- SET( OY_METASUBPATH "${PACKAGE_NAME}" )
-diff --git a/src/examples/CMakeLists.txt b/src/examples/CMakeLists.txt
-index dfe807c..4adfdc9 100644
---- a/src/examples/CMakeLists.txt
-+++ b/src/examples/CMakeLists.txt
-@@ -60,4 +60,30 @@ IF( FLTK_FOUND )
- INSTALL (TARGETS oyranos-config-fltk DESTINATION bin)
- ENDIF()
-
-+
- ADD_SUBDIRECTORY( oforms )
-+
-+# oFORMS for a Oyranos CLI renderer and parser
-+ADD_EXECUTABLE( oyranos-xforms oforms/oyranos_xforms.c )
-+TARGET_LINK_LIBRARIES( oyranos-xforms
-+ ${OY_OFORMS_LIB} oyranos ${EXTRA_LIBS} )
-+#INSTALL (TARGETS oyranos-xforms DESTINATION bin)
-+
-+# oFORMS for a Oyranos FLTK renderer and parser
-+IF( FLTK_FOUND )
-+ ADD_EXECUTABLE( oyranos-xforms-fltk
-+ oforms/oyranos_forms_fltk.cxx
-+ oforms/oyranos_widgets_fltk.cxx
-+ oforms/oyranos_xforms_fltk.cxx
-+ )
-+ TARGET_LINK_LIBRARIES ( oyranos-xforms-fltk oyranos ${EXTRA_LIBS}
-+ ${OY_OFORMS_LIB} ${FLTK_LIBRARIES} )
-+ #INSTALL (TARGETS oyranos-xforms-fltk DESTINATION bin)
-+ENDIF()
-+
-+# oFORMS for a Oyranos module generation
-+ADD_EXECUTABLE( oyranos-xforms-modules oforms/oyranos_xforms_modules.c )
-+TARGET_LINK_LIBRARIES( oyranos-xforms-modules
-+ oyranos ${OY_OFORMS_LIB} ${EXTRA_LIBS} )
-+INSTALL (TARGETS oyranos-xforms-modules DESTINATION bin)
-+
-diff --git a/src/examples/oforms/CMakeLists.txt b/src/examples/oforms/CMakeLists.txt
-index 4d248ec..c0ff965 100644
---- a/src/examples/oforms/CMakeLists.txt
-+++ b/src/examples/oforms/CMakeLists.txt
-@@ -1,31 +1,11 @@
- #oFORMS basics
--SET( OY_OFORMS_LIB ${PACKAGE_NAME}_forms_cmd_line )
-+SET( OY_OFORMS_LIB ${PACKAGE_NAME}_forms_cmd_line-static )
-+SET( OY_OFORMS_LIB ${OY_OFORMS_LIB} PARENT_SCOPE )
- ADD_LIBRARY( ${OY_OFORMS_LIB}
-- STATIC ${OY_OFORMS_LIB}.c )
-+ STATIC ${PACKAGE_NAME}_forms_cmd_line.c )
- TARGET_LINK_LIBRARIES ( ${OY_OFORMS_LIB} oyranos ${EXTRA_LIBS} )
-
--# oFORMS for a Oyranos CML renderer and parser
--ADD_EXECUTABLE( ../oyranos-xforms oyranos_xforms.c )
--TARGET_LINK_LIBRARIES( ../oyranos-xforms
-- oyranos ${OY_OFORMS_LIB} ${EXTRA_LIBS} )
--#INSTALL (TARGETS oyranos-xforms DESTINATION bin)
-+MESSAGE( "-- OY_OFORMS_LIB: ${OY_OFORMS_LIB}" )
-
--# oFORMS for a Oyranos FLTK renderer and parser
--IF( FLTK_FOUND )
-- ADD_EXECUTABLE( ../oyranos-xforms-fltk
-- oyranos_forms_fltk.cxx
-- oyranos_widgets_fltk.cxx
-- oyranos_xforms_fltk.cxx
-- )
-- TARGET_LINK_LIBRARIES ( ../oyranos-xforms-fltk oyranos ${EXTRA_LIBS}
-- ${FLTK_LIBRARIES} )
-- #INSTALL (TARGETS oyranos-xforms-fltk DESTINATION bin)
--ENDIF()
--
--# oFORMS for a Oyranos module generation
--ADD_EXECUTABLE( ../oyranos-xforms-modules oyranos_xforms_modules.c )
--TARGET_LINK_LIBRARIES( ../oyranos-xforms-modules
-- oyranos ${OY_OFORMS_LIB} ${EXTRA_LIBS} )
--INSTALL (TARGETS ../oyranos-xforms-modules DESTINATION bin)
- INSTALL (FILES ./oyranos-xforms-modules.1 DESTINATION share/man/man1 )
-
-diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
-index cb23ace..3b2572a 100644
---- a/src/tools/CMakeLists.txt
-+++ b/src/tools/CMakeLists.txt
-@@ -30,7 +30,7 @@ ENDIF()
-
- # colour conversion
- ADD_EXECUTABLE( oyranos-icc "${CMAKE_CURRENT_SOURCE_DIR}/oyranos_convert.c" )
--TARGET_LINK_LIBRARIES( oyranos-icc oyranos ${EXTRA_LIBS} )
-+TARGET_LINK_LIBRARIES( oyranos-icc oyranos ${EXTRA_LIBS} oyranos_forms_cmd_line-static )
- INSTALL (TARGETS oyranos-icc DESTINATION bin)
-
- ADD_SUBDIRECTORY (qcmsevents)
---
-1.5.6.5
-
diff --git a/media-libs/oyranos/files/oyranos-0.9.4-fix-typos-and-grammar.patch b/media-libs/oyranos/files/oyranos-0.9.4-fix-typos-and-grammar.patch
deleted file mode 100644
index 790c424..0000000
--- a/media-libs/oyranos/files/oyranos-0.9.4-fix-typos-and-grammar.patch
+++ /dev/null
@@ -1,968 +0,0 @@
-commit bf50dbd47ddef1ccb49bb44cbf893ae7844240d6
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Wed Apr 3 02:14:21 2013 +0200
-
- more typo and grammar fixes
-
-diff --git a/po/cs.po b/po/cs.po
-index 9440519..a99974e 100644
---- a/po/cs.po
-+++ b/po/cs.po
-@@ -290,7 +290,7 @@ msgstr "Již aktivováno"
-
- #: liboyranos_config/oyranos_texts.c:273
- #, fuzzy
--msgid "Anylyze ICC profile information on your system."
-+msgid "Analyze ICC profile information on your system."
- msgstr "umí zobrazit informace o profilu ICC"
-
- #: modules/oyranos_cmm_oyra_image.c:1065
-@@ -417,7 +417,7 @@ msgid ""
- "Behaviour of color space transformation for proofing. Most people want a "
- "preview on screen only. The Relative Colorimetric intent is right for that. "
- "The Absolute Colorimetric intent needs a very careful profiling and non-"
--"trivial setup, but allowes for side-by-side comparisions."
-+"trivial setup, but allows for side-by-side comparisons."
- msgstr ""
- "Způsob transformace barev pro simulaci. Většina uživatelů použije funkci "
- "simulace pouze na obrazovce, pro což se hodí relativní kolorimetrický záměr. "
-@@ -670,7 +670,7 @@ msgstr "Transformace barev mohou být interně uloženy různými způsoby"
- #: liboyranos_config/oyranos_texts.c:174
- msgid ""
- "Color content can sometimes have no ICC profile assigned. This is a critical "
--"situation as the system can not properly convert these colors. Therefor the "
-+"situation as the system can not properly convert these colors. Therefore the "
- "color processing parts need to pick some profile as a guess. These settings "
- "allow to change the picked ICC profile to guide the processing components "
- "and allow proper conversion and compositing."
-@@ -1024,7 +1024,7 @@ msgstr ""
-
- #: liboyranos_config/oyranos_texts.c:236
- msgid ""
--"Decide what to do when the default color spaces dont match the current ones."
-+"Decide what to do when the default color spaces don't match the current ones."
- msgstr ""
- "Rozhodnout co dělat, když se výchozí barvový prostor nerovná aktuálnímu."
-
-@@ -2179,7 +2179,7 @@ msgstr "Oyranos X11"
- #. HTML
- #: liboyranos_config/oyranos_xml.c:1036
- msgid ""
--"Oyranos allowes detailed settings like preferred editing color spaces and "
-+"Oyranos allows detailed settings like preferred editing color spaces and "
- "the behaviour of color conversions or simulation. Oyranos reduces the work "
- "involved in all color management related decisions through automation, "
- "useful defaults and grouping of settings in selectable policies."
-@@ -2372,27 +2372,27 @@ msgid "Postscript CRD Information"
- msgstr "Náhled, saturace"
-
- #: liboyranos_config/oyranos_texts.c:336
--msgid "Prefered CIE*Lab Editing Color Space"
-+msgid "Preferred CIE*Lab Editing Color Space"
- msgstr "Preferovaný CIE*Lab barvový prostor pro editaci"
-
- #: API_generated/oyranos_profile.c:66
--msgid "Prefered CMM"
-+msgid "Preferred CMM"
- msgstr ""
-
- #: liboyranos_config/oyranos_texts.c:316
--msgid "Prefered Cmyk Editing Color Space"
-+msgid "Preferred Cmyk Editing Color Space"
- msgstr "Preferovaný barvový prostor CMYK pro editaci"
-
- #: liboyranos_config/oyranos_texts.c:346
--msgid "Prefered Gray Editing Color Space"
-+msgid "Preferred Gray Editing Color Space"
- msgstr "Preferovaný barvový prostor pro editaci v šedi."
-
- #: liboyranos_config/oyranos_texts.c:306
--msgid "Prefered Rgb Editing Color Space"
-+msgid "Preferred Rgb Editing Color Space"
- msgstr "Preferovaný barvový prostor RGB pro editaci"
-
- #: liboyranos_config/oyranos_texts.c:326
--msgid "Prefered XYZ Editing Color Space"
-+msgid "Preferred XYZ Editing Color Space"
- msgstr "Preferovaný barvový prostor XYZ pro editaci"
-
- #. choices
-@@ -2622,7 +2622,7 @@ msgstr "Záměr transformace"
-
- #: liboyranos_config/oyranos_texts.c:479
- msgid ""
--"Rendering intent for color space transformations is typical the Relative "
-+"Rendering intent for color space transformations is typically the Relative "
- "Colorimetric intent plus Black Point Compensation or the Perceptual intent."
- msgstr ""
- "Záměr pro transformace mezi různými barvovými prostory se obvykle volí "
-@@ -2932,7 +2932,7 @@ msgstr "The client side window data handler of Oyranos."
- #: liboyranos_config/oyranos_texts.c:219
- msgid ""
- "The conversion between color spaces of different shape and size can happen "
--"in various ways. The Perceptual rendering intent is usual the best choice "
-+"in various ways. The Perceptual rendering intent is usually the best choice "
- "for photographs and artistic imagery. It is used in many automatic systems. "
- "The Relative Colorimetric rendering intent provides a well-defined standard, "
- "one-to-one color mapping, but without applying white point adaption. This "
-@@ -3268,7 +3268,7 @@ msgstr ""
-
- #: liboyranos_config/oyranos_texts.c:347
- msgid ""
--"The preferred Gray Editing Color Space shall describe a single lighness "
-+"The preferred Gray Editing Color Space shall describe a single lightness "
- "channel color space for grayscale images."
- msgstr ""
- "Preferovaný barvový prostor editace v šedi by měl popisovat barvový prostor "
-@@ -3283,13 +3283,13 @@ msgstr ""
- "barvový prostor jako např. sRGB."
-
- #: liboyranos_config/oyranos_texts.c:327
--msgid "The preferred XYZ Editing Color Space shall decribe CIE*XYZ."
-+msgid "The preferred XYZ Editing Color Space shall describe CIE*XYZ."
- msgstr "Preferovaný barvový prostor editace XYZ by měl popisovat CIE*XYZ."
-
- #: liboyranos_config/oyranos_texts.c:183
- msgid ""
- "The proofing color space represents a real color device for simulation. "
--"Possible uses cases are to simulate a print machine, a viewing environment "
-+"Possible use cases are to simulate a print machine, a viewing environment "
- "in a theater or a expected small monitor gamut."
- msgstr ""
- "Barvový prostor pro simulaci zastupuje skutečné zařízení, jež má být "
-@@ -3387,7 +3387,7 @@ msgstr "Tepelná vosková tiskárna"
- #: liboyranos_config/oyranos_texts.c:429
- msgid ""
- "This setting decides what to do in the case that colors have no color space "
--"assigned. Typical the according assumed ICC profile should be assigned."
-+"assigned. Typically the according assumed ICC profile should be assigned."
- msgstr ""
- "Toto nastavení rozhoduje, co se má dělat v případě, že barvy nemají přiřazen "
- "žádný barvový prostor. Obvykle by měl být přiřazen příslušný předpokládaný "
-diff --git a/po/de.po b/po/de.po
-index 80a106a..80869df 100644
---- a/po/de.po
-+++ b/po/de.po
-@@ -292,7 +292,7 @@ msgid "Already enabled"
- msgstr "Bereits eingeschalten"
-
- #: liboyranos_config/oyranos_texts.c:273
--msgid "Anylyze ICC profile information on your system."
-+msgid "Analyze ICC profile information on your system."
- msgstr "Details zu ICC Profilen in Ihrem System"
-
- #: modules/oyranos_cmm_oyra_image.c:1065
-@@ -415,7 +415,7 @@ msgid ""
- "Behaviour of color space transformation for proofing. Most people want a "
- "preview on screen only. The Relative Colorimetric intent is right for that. "
- "The Absolute Colorimetric intent needs a very careful profiling and non-"
--"trivial setup, but allowes for side-by-side comparisions."
-+"trivial setup, but allows for side-by-side comparisons."
- msgstr ""
- "Verhalten der Farbübertragung bei der Simulation. Die meisten Nutzer "
- "wünschen eine Simulation nur an einem Bildschirm. Die relativ farbmetrische "
-@@ -652,7 +652,7 @@ msgstr "Farbumwandlung können intern unterschiedlich gespeichert werden"
- #: liboyranos_config/oyranos_texts.c:174
- msgid ""
- "Color content can sometimes have no ICC profile assigned. This is a critical "
--"situation as the system can not properly convert these colors. Therefor the "
-+"situation as the system can not properly convert these colors. Therefore the "
- "color processing parts need to pick some profile as a guess. These settings "
- "allow to change the picked ICC profile to guide the processing components "
- "and allow proper conversion and compositing."
-@@ -1000,7 +1000,7 @@ msgstr ""
-
- #: liboyranos_config/oyranos_texts.c:236
- msgid ""
--"Decide what to do when the default color spaces dont match the current ones."
-+"Decide what to do when the default color spaces don't match the current ones."
- msgstr ""
- "Was ist zu tuen falls Standardfarbräume nicht mit den Eingestellten "
- "übereinstimmen."
-@@ -2100,7 +2100,7 @@ msgstr "Oyranos X11"
- #. HTML
- #: liboyranos_config/oyranos_xml.c:1036
- msgid ""
--"Oyranos allowes detailed settings like preferred editing color spaces and "
-+"Oyranos allows detailed settings like preferred editing color spaces and "
- "the behaviour of color conversions or simulation. Oyranos reduces the work "
- "involved in all color management related decisions through automation, "
- "useful defaults and grouping of settings in selectable policies."
-@@ -2283,27 +2283,27 @@ msgid "Postscript CRD Information"
- msgstr "Postscript CRD Information"
-
- #: liboyranos_config/oyranos_texts.c:336
--msgid "Prefered CIE*Lab Editing Color Space"
-+msgid "Preferred CIE*Lab Editing Color Space"
- msgstr "Bevorzugter CIE*Lab Editierfarbraum"
-
- #: API_generated/oyranos_profile.c:66
--msgid "Prefered CMM"
-+msgid "Preferred CMM"
- msgstr "Bevorzugte CMM"
-
- #: liboyranos_config/oyranos_texts.c:316
--msgid "Prefered Cmyk Editing Color Space"
-+msgid "Preferred Cmyk Editing Color Space"
- msgstr "Bevorzugter Cmyk Editierfarbraum"
-
- #: liboyranos_config/oyranos_texts.c:346
--msgid "Prefered Gray Editing Color Space"
-+msgid "Preferred Gray Editing Color Space"
- msgstr "Bevorzugter Grau Editierfarbraum"
-
- #: liboyranos_config/oyranos_texts.c:306
--msgid "Prefered Rgb Editing Color Space"
-+msgid "Preferred Rgb Editing Color Space"
- msgstr "Bevorzugter Rgb Editierfarbraum"
-
- #: liboyranos_config/oyranos_texts.c:326
--msgid "Prefered XYZ Editing Color Space"
-+msgid "Preferred XYZ Editing Color Space"
- msgstr "Bevorzugter XYZ Editierfarbraum"
-
- #. choices
-@@ -2520,7 +2520,7 @@ msgstr "Übertragungsart: "
-
- #: liboyranos_config/oyranos_texts.c:479
- msgid ""
--"Rendering intent for color space transformations is typical the Relative "
-+"Rendering intent for color space transformations is typically the Relative "
- "Colorimetric intent plus Black Point Compensation or the Perceptual intent."
- msgstr ""
-
-@@ -2817,7 +2817,7 @@ msgstr "Die benutzerseitige Fensterdatenagent von Oyranos."
- #: liboyranos_config/oyranos_texts.c:219
- msgid ""
- "The conversion between color spaces of different shape and size can happen "
--"in various ways. The Perceptual rendering intent is usual the best choice "
-+"in various ways. The Perceptual rendering intent is usually the best choice "
- "for photographs and artistic imagery. It is used in many automatic systems. "
- "The Relative Colorimetric rendering intent provides a well-defined standard, "
- "one-to-one color mapping, but without applying white point adaption. This "
-@@ -3146,7 +3146,7 @@ msgstr ""
-
- #: liboyranos_config/oyranos_texts.c:347
- msgid ""
--"The preferred Gray Editing Color Space shall describe a single lighness "
-+"The preferred Gray Editing Color Space shall describe a single lightness "
- "channel color space for grayscale images."
- msgstr ""
- "Der bevorzugte Grautonfarbraum soll Farben mit einem einzigen "
-@@ -3159,13 +3159,13 @@ msgid ""
- msgstr "Der bevorzugte Rgb Editierfarbraum sollte wohlgeformt sein."
-
- #: liboyranos_config/oyranos_texts.c:327
--msgid "The preferred XYZ Editing Color Space shall decribe CIE*XYZ."
-+msgid "The preferred XYZ Editing Color Space shall describe CIE*XYZ."
- msgstr "Der bevorzugter XYZ Editierfarbraum soll CIE*XYZ definieren."
-
- #: liboyranos_config/oyranos_texts.c:183
- msgid ""
- "The proofing color space represents a real color device for simulation. "
--"Possible uses cases are to simulate a print machine, a viewing environment "
-+"Possible use cases are to simulate a print machine, a viewing environment "
- "in a theater or a expected small monitor gamut."
- msgstr ""
- "Der Simulationsfarbraum stellt das Farbverhalten eines realen Gerätes dar. "
-@@ -3257,7 +3257,7 @@ msgstr "Thermischer Wachsdrucker"
- #: liboyranos_config/oyranos_texts.c:429
- msgid ""
- "This setting decides what to do in the case that colors have no color space "
--"assigned. Typical the according assumed ICC profile should be assigned."
-+"assigned. Typically the according assumed ICC profile should be assigned."
- msgstr ""
- "Die Einstellung entscheidet was mit Farben ohne Farbprofil geschehen soll. "
- "Typischerweise wird das vermutete Farbprofil automatisch zugewiesen."
-diff --git a/po/eo.po b/po/eo.po
-index 787905a..bcf0dfc 100644
---- a/po/eo.po
-+++ b/po/eo.po
-@@ -308,7 +308,7 @@ msgid "Already enabled"
- msgstr ""
-
- #: liboyranos_config/oyranos_texts.c:273
--msgid "Anylyze ICC profile information on your system."
-+msgid "Analyze ICC profile information on your system."
- msgstr ""
-
- #: modules/oyranos_cmm_oyra_image.c:1065
-@@ -435,7 +435,7 @@ msgid ""
- "Behaviour of color space transformation for proofing. Most people want a "
- "preview on screen only. The Relative Colorimetric intent is right for that. "
- "The Absolute Colorimetric intent needs a very careful profiling and non-"
--"trivial setup, but allowes for side-by-side comparisions."
-+"trivial setup, but allows for side-by-side comparisons."
- msgstr ""
-
- #: modules/oyranos_cmm_lraw.cpp:1041
-@@ -665,7 +665,7 @@ msgstr ""
- #: liboyranos_config/oyranos_texts.c:174
- msgid ""
- "Color content can sometimes have no ICC profile assigned. This is a critical "
--"situation as the system can not properly convert these colors. Therefor the "
-+"situation as the system can not properly convert these colors. Therefore the "
- "color processing parts need to pick some profile as a guess. These settings "
- "allow to change the picked ICC profile to guide the processing components "
- "and allow proper conversion and compositing."
-@@ -992,7 +992,7 @@ msgstr ""
-
- #: liboyranos_config/oyranos_texts.c:236
- msgid ""
--"Decide what to do when the default color spaces dont match the current ones."
-+"Decide what to do when the default color spaces don't match the current ones."
- msgstr ""
-
- #: liboyranos_config/oyranos_texts.c:154
-@@ -2067,7 +2067,7 @@ msgstr ""
- #. HTML
- #: liboyranos_config/oyranos_xml.c:1036
- msgid ""
--"Oyranos allowes detailed settings like preferred editing color spaces and "
-+"Oyranos allows detailed settings like preferred editing color spaces and "
- "the behaviour of color conversions or simulation. Oyranos reduces the work "
- "involved in all color management related decisions through automation, "
- "useful defaults and grouping of settings in selectable policies."
-@@ -2235,31 +2235,31 @@ msgstr "kolora"
-
- #: liboyranos_config/oyranos_texts.c:336
- #, fuzzy
--msgid "Prefered CIE*Lab Editing Color Space"
-+msgid "Preferred CIE*Lab Editing Color Space"
- msgstr "kolora"
-
- #: API_generated/oyranos_profile.c:66
--msgid "Prefered CMM"
-+msgid "Preferred CMM"
- msgstr ""
-
- #: liboyranos_config/oyranos_texts.c:316
- #, fuzzy
--msgid "Prefered Cmyk Editing Color Space"
-+msgid "Preferred Cmyk Editing Color Space"
- msgstr "kolora"
-
- #: liboyranos_config/oyranos_texts.c:346
- #, fuzzy
--msgid "Prefered Gray Editing Color Space"
-+msgid "Preferred Gray Editing Color Space"
- msgstr "kolora"
-
- #: liboyranos_config/oyranos_texts.c:306
- #, fuzzy
--msgid "Prefered Rgb Editing Color Space"
-+msgid "Preferred Rgb Editing Color Space"
- msgstr "kolora"
-
- #: liboyranos_config/oyranos_texts.c:326
- #, fuzzy
--msgid "Prefered XYZ Editing Color Space"
-+msgid "Preferred XYZ Editing Color Space"
- msgstr "kolora"
-
- #. choices
-@@ -2478,7 +2478,7 @@ msgstr ""
-
- #: liboyranos_config/oyranos_texts.c:479
- msgid ""
--"Rendering intent for color space transformations is typical the Relative "
-+"Rendering intent for color space transformations is typically the Relative "
- "Colorimetric intent plus Black Point Compensation or the Perceptual intent."
- msgstr ""
-
-@@ -2748,7 +2748,7 @@ msgstr ""
- #: liboyranos_config/oyranos_texts.c:219
- msgid ""
- "The conversion between color spaces of different shape and size can happen "
--"in various ways. The Perceptual rendering intent is usual the best choice "
-+"in various ways. The Perceptual rendering intent is usually the best choice "
- "for photographs and artistic imagery. It is used in many automatic systems. "
- "The Relative Colorimetric rendering intent provides a well-defined standard, "
- "one-to-one color mapping, but without applying white point adaption. This "
-@@ -2962,7 +2962,7 @@ msgstr ""
-
- #: liboyranos_config/oyranos_texts.c:347
- msgid ""
--"The preferred Gray Editing Color Space shall describe a single lighness "
-+"The preferred Gray Editing Color Space shall describe a single lightness "
- "channel color space for grayscale images."
- msgstr ""
-
-@@ -2973,13 +2973,13 @@ msgid ""
- msgstr ""
-
- #: liboyranos_config/oyranos_texts.c:327
--msgid "The preferred XYZ Editing Color Space shall decribe CIE*XYZ."
-+msgid "The preferred XYZ Editing Color Space shall describe CIE*XYZ."
- msgstr ""
-
- #: liboyranos_config/oyranos_texts.c:183
- msgid ""
- "The proofing color space represents a real color device for simulation. "
--"Possible uses cases are to simulate a print machine, a viewing environment "
-+"Possible use cases are to simulate a print machine, a viewing environment "
- "in a theater or a expected small monitor gamut."
- msgstr ""
-
-@@ -3055,7 +3055,7 @@ msgstr ""
- #: liboyranos_config/oyranos_texts.c:429
- msgid ""
- "This setting decides what to do in the case that colors have no color space "
--"assigned. Typical the according assumed ICC profile should be assigned."
-+"assigned. Typically the according assumed ICC profile should be assigned."
- msgstr ""
-
- #: modules/oyranos_cmm_oyIM_profile.c:1167
-diff --git a/po/eu.po b/po/eu.po
-index f86f417..277b42d 100644
---- a/po/eu.po
-+++ b/po/eu.po
-@@ -315,7 +315,7 @@ msgstr ""
-
- #: liboyranos_config/oyranos_texts.c:273
- #, fuzzy
--msgid "Anylyze ICC profile information on your system."
-+msgid "Analyze ICC profile information on your system."
- msgstr "Oyranos-en ezarpenak"
-
- #: modules/oyranos_cmm_oyra_image.c:1065
-@@ -447,7 +447,7 @@ msgid ""
- "Behaviour of color space transformation for proofing. Most people want a "
- "preview on screen only. The Relative Colorimetric intent is right for that. "
- "The Absolute Colorimetric intent needs a very careful profiling and non-"
--"trivial setup, but allowes for side-by-side comparisions."
-+"trivial setup, but allows for side-by-side comparisons."
- msgstr ""
-
- #: modules/oyranos_cmm_lraw.cpp:1041
-@@ -679,7 +679,7 @@ msgstr ""
- #: liboyranos_config/oyranos_texts.c:174
- msgid ""
- "Color content can sometimes have no ICC profile assigned. This is a critical "
--"situation as the system can not properly convert these colors. Therefor the "
-+"situation as the system can not properly convert these colors. Therefore the "
- "color processing parts need to pick some profile as a guess. These settings "
- "allow to change the picked ICC profile to guide the processing components "
- "and allow proper conversion and compositing."
-@@ -1031,7 +1031,7 @@ msgstr ""
-
- #: liboyranos_config/oyranos_texts.c:236
- msgid ""
--"Decide what to do when the default color spaces dont match the current ones."
-+"Decide what to do when the default color spaces don't match the current ones."
- msgstr ""
-
- #: liboyranos_config/oyranos_texts.c:154
-@@ -2167,7 +2167,7 @@ msgstr "Oyranos-en ezarpenak"
- #. HTML
- #: liboyranos_config/oyranos_xml.c:1036
- msgid ""
--"Oyranos allowes detailed settings like preferred editing color spaces and "
-+"Oyranos allows detailed settings like preferred editing color spaces and "
- "the behaviour of color conversions or simulation. Oyranos reduces the work "
- "involved in all color management related decisions through automation, "
- "useful defaults and grouping of settings in selectable policies."
-@@ -2349,31 +2349,31 @@ msgstr "Aurrebista, saturatua"
-
- #: liboyranos_config/oyranos_texts.c:336
- #, fuzzy
--msgid "Prefered CIE*Lab Editing Color Space"
-+msgid "Preferred CIE*Lab Editing Color Space"
- msgstr "Kolore-espazioa"
-
- #: API_generated/oyranos_profile.c:66
--msgid "Prefered CMM"
-+msgid "Preferred CMM"
- msgstr ""
-
- #: liboyranos_config/oyranos_texts.c:316
- #, fuzzy
--msgid "Prefered Cmyk Editing Color Space"
-+msgid "Preferred Cmyk Editing Color Space"
- msgstr "Kolore-espazioa"
-
- #: liboyranos_config/oyranos_texts.c:346
- #, fuzzy
--msgid "Prefered Gray Editing Color Space"
-+msgid "Preferred Gray Editing Color Space"
- msgstr "Kolore-espazioa"
-
- #: liboyranos_config/oyranos_texts.c:306
- #, fuzzy
--msgid "Prefered Rgb Editing Color Space"
-+msgid "Preferred Rgb Editing Color Space"
- msgstr "Kolore-espazioa"
-
- #: liboyranos_config/oyranos_texts.c:326
- #, fuzzy
--msgid "Prefered XYZ Editing Color Space"
-+msgid "Preferred XYZ Editing Color Space"
- msgstr "Kolore-espazioa"
-
- #. choices
-@@ -2610,7 +2610,7 @@ msgstr "Oyranos-en ezarpenak"
-
- #: liboyranos_config/oyranos_texts.c:479
- msgid ""
--"Rendering intent for color space transformations is typical the Relative "
-+"Rendering intent for color space transformations is typically the Relative "
- "Colorimetric intent plus Black Point Compensation or the Perceptual intent."
- msgstr ""
-
-@@ -2896,7 +2896,7 @@ msgstr ""
- #: liboyranos_config/oyranos_texts.c:219
- msgid ""
- "The conversion between color spaces of different shape and size can happen "
--"in various ways. The Perceptual rendering intent is usual the best choice "
-+"in various ways. The Perceptual rendering intent is usually the best choice "
- "for photographs and artistic imagery. It is used in many automatic systems. "
- "The Relative Colorimetric rendering intent provides a well-defined standard, "
- "one-to-one color mapping, but without applying white point adaption. This "
-@@ -3113,7 +3113,7 @@ msgstr "Kolore-espazioa"
- #: liboyranos_config/oyranos_texts.c:347
- #, fuzzy
- msgid ""
--"The preferred Gray Editing Color Space shall describe a single lighness "
-+"The preferred Gray Editing Color Space shall describe a single lightness "
- "channel color space for grayscale images."
- msgstr "Kolore-espazioa"
-
-@@ -3126,13 +3126,13 @@ msgstr "Kolore-espazioa"
-
- #: liboyranos_config/oyranos_texts.c:327
- #, fuzzy
--msgid "The preferred XYZ Editing Color Space shall decribe CIE*XYZ."
-+msgid "The preferred XYZ Editing Color Space shall describe CIE*XYZ."
- msgstr "Kolore-espazioa"
-
- #: liboyranos_config/oyranos_texts.c:183
- msgid ""
- "The proofing color space represents a real color device for simulation. "
--"Possible uses cases are to simulate a print machine, a viewing environment "
-+"Possible use cases are to simulate a print machine, a viewing environment "
- "in a theater or a expected small monitor gamut."
- msgstr ""
-
-@@ -3208,7 +3208,7 @@ msgstr "Inprimagailu ezko-termala"
- #: liboyranos_config/oyranos_texts.c:429
- msgid ""
- "This setting decides what to do in the case that colors have no color space "
--"assigned. Typical the according assumed ICC profile should be assigned."
-+"assigned. Typically the according assumed ICC profile should be assigned."
- msgstr ""
-
- #: modules/oyranos_cmm_oyIM_profile.c:1167
-diff --git a/po/fr.po b/po/fr.po
-index f02e45c..737dc28 100644
---- a/po/fr.po
-+++ b/po/fr.po
-@@ -309,7 +309,7 @@ msgstr ""
-
- #: liboyranos_config/oyranos_texts.c:273
- #, fuzzy
--msgid "Anylyze ICC profile information on your system."
-+msgid "Analyze ICC profile information on your system."
- msgstr "Oyranos Préférences"
-
- #: modules/oyranos_cmm_oyra_image.c:1065
-@@ -441,7 +441,7 @@ msgid ""
- "Behaviour of color space transformation for proofing. Most people want a "
- "preview on screen only. The Relative Colorimetric intent is right for that. "
- "The Absolute Colorimetric intent needs a very careful profiling and non-"
--"trivial setup, but allowes for side-by-side comparisions."
-+"trivial setup, but allows for side-by-side comparisons."
- msgstr ""
-
- #: modules/oyranos_cmm_lraw.cpp:1041
-@@ -673,7 +673,7 @@ msgstr ""
- #: liboyranos_config/oyranos_texts.c:174
- msgid ""
- "Color content can sometimes have no ICC profile assigned. This is a critical "
--"situation as the system can not properly convert these colors. Therefor the "
-+"situation as the system can not properly convert these colors. Therefore the "
- "color processing parts need to pick some profile as a guess. These settings "
- "allow to change the picked ICC profile to guide the processing components "
- "and allow proper conversion and compositing."
-@@ -1020,7 +1020,7 @@ msgstr ""
-
- #: liboyranos_config/oyranos_texts.c:236
- msgid ""
--"Decide what to do when the default color spaces dont match the current ones."
-+"Decide what to do when the default color spaces don't match the current ones."
- msgstr ""
-
- #: liboyranos_config/oyranos_texts.c:154
-@@ -2156,7 +2156,7 @@ msgstr "Oyranos Préférences"
- #. HTML
- #: liboyranos_config/oyranos_xml.c:1036
- msgid ""
--"Oyranos allowes detailed settings like preferred editing color spaces and "
-+"Oyranos allows detailed settings like preferred editing color spaces and "
- "the behaviour of color conversions or simulation. Oyranos reduces the work "
- "involved in all color management related decisions through automation, "
- "useful defaults and grouping of settings in selectable policies."
-@@ -2335,31 +2335,31 @@ msgstr "Aperçu, saturation"
-
- #: liboyranos_config/oyranos_texts.c:336
- #, fuzzy
--msgid "Prefered CIE*Lab Editing Color Space"
-+msgid "Preferred CIE*Lab Editing Color Space"
- msgstr "Espace colorimétrique"
-
- #: API_generated/oyranos_profile.c:66
--msgid "Prefered CMM"
-+msgid "Preferred CMM"
- msgstr ""
-
- #: liboyranos_config/oyranos_texts.c:316
- #, fuzzy
--msgid "Prefered Cmyk Editing Color Space"
-+msgid "Preferred Cmyk Editing Color Space"
- msgstr "Espace colorimétrique"
-
- #: liboyranos_config/oyranos_texts.c:346
- #, fuzzy
--msgid "Prefered Gray Editing Color Space"
-+msgid "Preferred Gray Editing Color Space"
- msgstr "Espace colorimétrique"
-
- #: liboyranos_config/oyranos_texts.c:306
- #, fuzzy
--msgid "Prefered Rgb Editing Color Space"
-+msgid "Preferred Rgb Editing Color Space"
- msgstr "Espace colorimétrique"
-
- #: liboyranos_config/oyranos_texts.c:326
- #, fuzzy
--msgid "Prefered XYZ Editing Color Space"
-+msgid "Preferred XYZ Editing Color Space"
- msgstr "Espace colorimétrique"
-
- #. choices
-@@ -2589,7 +2589,7 @@ msgstr "Oyranos Préférences"
-
- #: liboyranos_config/oyranos_texts.c:479
- msgid ""
--"Rendering intent for color space transformations is typical the Relative "
-+"Rendering intent for color space transformations is typically the Relative "
- "Colorimetric intent plus Black Point Compensation or the Perceptual intent."
- msgstr ""
-
-@@ -2870,7 +2870,7 @@ msgstr ""
- #: liboyranos_config/oyranos_texts.c:219
- msgid ""
- "The conversion between color spaces of different shape and size can happen "
--"in various ways. The Perceptual rendering intent is usual the best choice "
-+"in various ways. The Perceptual rendering intent is usually the best choice "
- "for photographs and artistic imagery. It is used in many automatic systems. "
- "The Relative Colorimetric rendering intent provides a well-defined standard, "
- "one-to-one color mapping, but without applying white point adaption. This "
-@@ -3087,7 +3087,7 @@ msgstr "Espace colorimétrique"
- #: liboyranos_config/oyranos_texts.c:347
- #, fuzzy
- msgid ""
--"The preferred Gray Editing Color Space shall describe a single lighness "
-+"The preferred Gray Editing Color Space shall describe a single lightness "
- "channel color space for grayscale images."
- msgstr "Espace colorimétrique"
-
-@@ -3100,13 +3100,13 @@ msgstr "Espace colorimétrique"
-
- #: liboyranos_config/oyranos_texts.c:327
- #, fuzzy
--msgid "The preferred XYZ Editing Color Space shall decribe CIE*XYZ."
-+msgid "The preferred XYZ Editing Color Space shall describe CIE*XYZ."
- msgstr "Espace colorimétrique"
-
- #: liboyranos_config/oyranos_texts.c:183
- msgid ""
- "The proofing color space represents a real color device for simulation. "
--"Possible uses cases are to simulate a print machine, a viewing environment "
-+"Possible use cases are to simulate a print machine, a viewing environment "
- "in a theater or a expected small monitor gamut."
- msgstr ""
-
-@@ -3182,7 +3182,7 @@ msgstr ""
- #: liboyranos_config/oyranos_texts.c:429
- msgid ""
- "This setting decides what to do in the case that colors have no color space "
--"assigned. Typical the according assumed ICC profile should be assigned."
-+"assigned. Typically the according assumed ICC profile should be assigned."
- msgstr ""
-
- #: modules/oyranos_cmm_oyIM_profile.c:1167
-diff --git a/po/oyranos.pot b/po/oyranos.pot
-index c5f064d..d4eb1f8 100644
---- a/po/oyranos.pot
-+++ b/po/oyranos.pot
-@@ -139,7 +139,7 @@ msgid "Internal stored Size"
- msgstr ""
-
- #: API_generated/oyranos_profile.c:66
--msgid "Prefered CMM"
-+msgid "Preferred CMM"
- msgstr ""
-
- #: API_generated/oyranos_profile.c:67
-@@ -552,7 +552,7 @@ msgstr ""
- #: liboyranos_config/oyranos_texts.c:174
- msgid ""
- "Color content can sometimes have no ICC profile assigned. This is a critical "
--"situation as the system can not properly convert these colors. Therefor the "
-+"situation as the system can not properly convert these colors. Therefore the "
- "color processing parts need to pick some profile as a guess. These settings "
- "allow to change the picked ICC profile to guide the processing components "
- "and allow proper conversion and compositing."
-@@ -569,7 +569,7 @@ msgstr ""
- #: liboyranos_config/oyranos_texts.c:183
- msgid ""
- "The proofing color space represents a real color device for simulation. "
--"Possible uses cases are to simulate a print machine, a viewing environment "
-+"Possible use cases are to simulate a print machine, a viewing environment "
- "in a theater or a expected small monitor gamut."
- msgstr ""
-
-@@ -631,7 +631,7 @@ msgstr ""
- #: liboyranos_config/oyranos_texts.c:219
- msgid ""
- "The conversion between color spaces of different shape and size can happen "
--"in various ways. The Perceptual rendering intent is usual the best choice "
-+"in various ways. The Perceptual rendering intent is usually the best choice "
- "for photographs and artistic imagery. It is used in many automatic systems. "
- "The Relative Colorimetric rendering intent provides a well-defined standard, "
- "one-to-one color mapping, but without applying white point adaption. This "
-@@ -666,7 +666,7 @@ msgstr ""
-
- #: liboyranos_config/oyranos_texts.c:236
- msgid ""
--"Decide what to do when the default color spaces dont match the current ones."
-+"Decide what to do when the default color spaces don't match the current ones."
- msgstr ""
-
- #: liboyranos_config/oyranos_texts.c:237
-@@ -720,7 +720,7 @@ msgid "Profile Information"
- msgstr ""
-
- #: liboyranos_config/oyranos_texts.c:273
--msgid "Anylyze ICC profile information on your system."
-+msgid "Analyze ICC profile information on your system."
- msgstr ""
-
- #: liboyranos_config/oyranos_texts.c:284
-@@ -743,7 +743,7 @@ msgid "Editing Rgb"
- msgstr ""
-
- #: liboyranos_config/oyranos_texts.c:306
--msgid "Prefered Rgb Editing Color Space"
-+msgid "Preferred Rgb Editing Color Space"
- msgstr ""
-
- #: liboyranos_config/oyranos_texts.c:307
-@@ -757,7 +757,7 @@ msgid "Editing Cmyk"
- msgstr ""
-
- #: liboyranos_config/oyranos_texts.c:316
--msgid "Prefered Cmyk Editing Color Space"
-+msgid "Preferred Cmyk Editing Color Space"
- msgstr ""
-
- #: liboyranos_config/oyranos_texts.c:317
-@@ -771,11 +771,11 @@ msgid "Editing XYZ"
- msgstr ""
-
- #: liboyranos_config/oyranos_texts.c:326
--msgid "Prefered XYZ Editing Color Space"
-+msgid "Preferred XYZ Editing Color Space"
- msgstr ""
-
- #: liboyranos_config/oyranos_texts.c:327
--msgid "The preferred XYZ Editing Color Space shall decribe CIE*XYZ."
-+msgid "The preferred XYZ Editing Color Space shall describe CIE*XYZ."
- msgstr ""
-
- #: liboyranos_config/oyranos_texts.c:335
-@@ -783,7 +783,7 @@ msgid "Editing Lab"
- msgstr ""
-
- #: liboyranos_config/oyranos_texts.c:336
--msgid "Prefered CIE*Lab Editing Color Space"
-+msgid "Preferred CIE*Lab Editing Color Space"
- msgstr ""
-
- #: liboyranos_config/oyranos_texts.c:337
-@@ -795,12 +795,12 @@ msgid "Editing Gray"
- msgstr ""
-
- #: liboyranos_config/oyranos_texts.c:346
--msgid "Prefered Gray Editing Color Space"
-+msgid "Preferred Gray Editing Color Space"
- msgstr ""
-
- #: liboyranos_config/oyranos_texts.c:347
- msgid ""
--"The preferred Gray Editing Color Space shall describe a single lighness "
-+"The preferred Gray Editing Color Space shall describe a single lightness "
- "channel color space for grayscale images."
- msgstr ""
-
-@@ -910,7 +910,7 @@ msgstr ""
- #: liboyranos_config/oyranos_texts.c:429
- msgid ""
- "This setting decides what to do in the case that colors have no color space "
--"assigned. Typical the according assumed ICC profile should be assigned."
-+"assigned. Typically the according assumed ICC profile should be assigned."
- msgstr ""
-
- #. choices
-@@ -1012,7 +1012,7 @@ msgstr ""
-
- #: liboyranos_config/oyranos_texts.c:479
- msgid ""
--"Rendering intent for color space transformations is typical the Relative "
-+"Rendering intent for color space transformations is typically the Relative "
- "Colorimetric intent plus Black Point Compensation or the Perceptual intent."
- msgstr ""
-
-@@ -1067,7 +1067,7 @@ msgid ""
- "Behaviour of color space transformation for proofing. Most people want a "
- "preview on screen only. The Relative Colorimetric intent is right for that. "
- "The Absolute Colorimetric intent needs a very careful profiling and non-"
--"trivial setup, but allowes for side-by-side comparisions."
-+"trivial setup, but allows for side-by-side comparisons."
- msgstr ""
-
- #: liboyranos_config/oyranos_texts.c:507
-@@ -1168,7 +1168,7 @@ msgstr ""
- #. HTML
- #: liboyranos_config/oyranos_xml.c:1036
- msgid ""
--"Oyranos allowes detailed settings like preferred editing color spaces and "
-+"Oyranos allows detailed settings like preferred editing color spaces and "
- "the behaviour of color conversions or simulation. Oyranos reduces the work "
- "involved in all color management related decisions through automation, "
- "useful defaults and grouping of settings in selectable policies."
-diff --git a/src/liboyranos_config/oyranos_texts.c b/src/liboyranos_config/oyranos_texts.c
-index f7a7244..7a86a42 100644
---- a/src/liboyranos_config/oyranos_texts.c
-+++ b/src/liboyranos_config/oyranos_texts.c
-@@ -171,7 +171,7 @@ oyOptionStringsTranslate_ ()
- oyGROUP_DEFAULT_PROFILES, 0, 0,
- _("Assumed Color Space"),
- _("Assumed Color Space for untagged colors"),
-- _("Color content can sometimes have no ICC profile assigned. This is a critical situation as the system can not properly convert these colors. Therefor the color processing parts need to pick some profile as a guess. These settings allow to change the picked ICC profile to guide the processing components and allow proper conversion and compositing."),
-+ _("Color content can sometimes have no ICC profile assigned. This is a critical situation as the system can not properly convert these colors. Therefore the color processing parts need to pick some profile as a guess. These settings allow to change the picked ICC profile to guide the processing components and allow proper conversion and compositing."),
- 0, /* choices */
- NULL, NULL, NULL, NULL,
- NULL,
-@@ -180,7 +180,7 @@ oyOptionStringsTranslate_ ()
- 0, 0, 0,
- _("Proofing Color Space"),
- _("Color Space for Simulating real devices"),
-- _("The proofing color space represents a real color device for simulation. Possible uses cases are to simulate a print machine, a viewing environment in a theater or a expected small monitor gamut."),
-+ _("The proofing color space represents a real color device for simulation. Possible use cases are to simulate a print machine, a viewing environment in a theater or a expected small monitor gamut."),
- 0, /* choices */
- NULL, NULL, NULL, NULL,
- NULL,
-@@ -216,7 +216,7 @@ oyOptionStringsTranslate_ ()
- oyGROUP_BEHAVIOUR, 0, 0,
- _("Rendering"),
- _("The kind of ICC gamut mapping for transforming colors between differently sized color spaces"),
-- _("The conversion between color spaces of different shape and size can happen in various ways. The Perceptual rendering intent is usual the best choice for photographs and artistic imagery. It is used in many automatic systems. The Relative Colorimetric rendering intent provides a well-defined standard, one-to-one color mapping, but without applying white point adaption. This can lead to color clipping in case of colors falling outside the target gamut as a price for the otherwise colorimetric correctness. The Relative Colorimetric intent is often used in combination with Black Point Compensation. The Saturation rendering intent shall provide an optimal use of saturated device colors. The Absolute Colorimetric rendering intent works like the relative colorimetric one except the white point is adapted. All rendering intents beside the colorimetric ones rely on the color tables designed by the profile vendor."),
-+ _("The conversion between color spaces of different shape and size can happen in various ways. The Perceptual rendering intent is usually the best choice for photographs and artistic imagery. It is used in many automatic systems. The Relative Colorimetric rendering intent provides a well-defined standard, one-to-one color mapping, but without applying white point adaption. This can lead to color clipping in case of colors falling outside the target gamut as a price for the otherwise colorimetric correctness. The Relative Colorimetric intent is often used in combination with Black Point Compensation. The Saturation rendering intent shall provide an optimal use of saturated device colors. The Absolute Colorimetric rendering intent works like the relative colorimetric one except the white point is adapted. All rendering intents beside the colorimetric ones rely on the color tables designed by the profile vendor."),
- 0, /* choices */
- NULL, NULL, NULL, NULL,
- NULL,
-@@ -233,7 +233,7 @@ oyOptionStringsTranslate_ ()
- oySET_OPTIONS_M_( oyWIDGETTYPE_GROUP_TREE, oyWIDGET_GROUP_BEHAVIOUR_MISSMATCH, 1,
- oyGROUP_BEHAVIOUR, 0, 0,
- _("Mismatching"),
-- _("Decide what to do when the default color spaces dont match the current ones."),
-+ _("Decide what to do when the default color spaces don't match the current ones."),
- _("Decide how to resolve conflicts with input color spaces and current settings."),
- 0, /* choices */
- NULL, NULL, NULL, NULL,
-@@ -270,7 +270,7 @@ oyOptionStringsTranslate_ ()
- 0, 0, 0,
- _("Information"),
- _("Profile Information"),
-- _("Anylyze ICC profile information on your system."),
-+ _("Analyze ICC profile information on your system."),
- 0, /* choices */
- NULL, NULL, NULL, NULL,
- NULL,
-@@ -303,7 +303,7 @@ oyOptionStringsTranslate_ ()
- oySET_OPTIONS_M_( oyWIDGETTYPE_DEFAULT_PROFILE, oyWIDGET_EDITING_RGB, 2,
- oyGROUP_DEFAULT_PROFILES, oyGROUP_DEFAULT_PROFILES_EDIT, 0,
- _("Editing Rgb"),
-- _("Prefered Rgb Editing Color Space"),
-+ _("Preferred Rgb Editing Color Space"),
- _("The preferred Rgb Editing Color Space should represent a well behaving color space like sRGB."),
- 0, /* choices */
- NULL, NULL, NULL, NULL,
-@@ -313,7 +313,7 @@ oyOptionStringsTranslate_ ()
- oySET_OPTIONS_M_( oyWIDGETTYPE_DEFAULT_PROFILE, oyWIDGET_EDITING_CMYK, 2,
- oyGROUP_DEFAULT_PROFILES, oyGROUP_DEFAULT_PROFILES_EDIT, 0,
- _("Editing Cmyk"),
-- _("Prefered Cmyk Editing Color Space"),
-+ _("Preferred Cmyk Editing Color Space"),
- _("The preferred Cmyk Editing Color Space should represent a color space that complies to well defined printing conditions like FOGRA or SWOP."),
- 0, /* choices */
- NULL, NULL, NULL, NULL,
-@@ -323,8 +323,8 @@ oyOptionStringsTranslate_ ()
- oySET_OPTIONS_M_( oyWIDGETTYPE_DEFAULT_PROFILE, oyWIDGET_EDITING_XYZ, 2,
- oyGROUP_DEFAULT_PROFILES, oyGROUP_DEFAULT_PROFILES_EDIT, 0,
- _("Editing XYZ"),
-- _("Prefered XYZ Editing Color Space"),
-- _("The preferred XYZ Editing Color Space shall decribe CIE*XYZ."),
-+ _("Preferred XYZ Editing Color Space"),
-+ _("The preferred XYZ Editing Color Space shall describe CIE*XYZ."),
- 0, /* choices */
- NULL, NULL, NULL, NULL,
- OY_DEFAULT_EDITING_XYZ_PROFILE,
-@@ -333,7 +333,7 @@ oyOptionStringsTranslate_ ()
- oySET_OPTIONS_M_( oyWIDGETTYPE_DEFAULT_PROFILE, oyWIDGET_EDITING_LAB, 2,
- oyGROUP_DEFAULT_PROFILES, oyGROUP_DEFAULT_PROFILES_EDIT, 0,
- _("Editing Lab"),
-- _("Prefered CIE*Lab Editing Color Space"),
-+ _("Preferred CIE*Lab Editing Color Space"),
- _("The preferred CIE*Lab Editing Color Space shall describe the CIE*Lab."),
- 0, /* choices */
- NULL, NULL, NULL, NULL,
-@@ -343,8 +343,8 @@ oyOptionStringsTranslate_ ()
- oySET_OPTIONS_M_( oyWIDGETTYPE_DEFAULT_PROFILE, oyWIDGET_EDITING_GRAY, 2,
- oyGROUP_DEFAULT_PROFILES, oyGROUP_DEFAULT_PROFILES_EDIT, 0,
- _("Editing Gray"),
-- _("Prefered Gray Editing Color Space"),
-- _("The preferred Gray Editing Color Space shall describe a single lighness channel color space for grayscale images."),
-+ _("Preferred Gray Editing Color Space"),
-+ _("The preferred Gray Editing Color Space shall describe a single lightness channel color space for grayscale images."),
- 0, /* choices */
- NULL, NULL, NULL, NULL,
- OY_DEFAULT_EDITING_GRAY_PROFILE,
-@@ -426,7 +426,7 @@ oyOptionStringsTranslate_ ()
- oyGROUP_BEHAVIOUR, oyGROUP_BEHAVIOUR_MISSMATCH, 0,
- _("No Image profile"),
- _("Image has no color space embedded. What default action shall be performed?"),
-- _("This setting decides what to do in the case that colors have no color space assigned. Typical the according assumed ICC profile should be assigned."),
-+ _("This setting decides what to do in the case that colors have no color space assigned. Typically the according assumed ICC profile should be assigned."),
- 3, /* choices */
- _("Assign No Profile"),_("Assign Assumed Profile"),_("Prompt"), NULL,
- OY_ACTION_UNTAGGED_ASSIGN,
-@@ -476,7 +476,7 @@ oyOptionStringsTranslate_ ()
- oyGROUP_BEHAVIOUR, oyGROUP_BEHAVIOUR_RENDERING, 0,
- _("Rendering Intent"),
- _("Rendering intent for color space transformations."),
-- _("Rendering intent for color space transformations is typical the Relative Colorimetric intent plus Black Point Compensation or the Perceptual intent."),
-+ _("Rendering intent for color space transformations is typically the Relative Colorimetric intent plus Black Point Compensation or the Perceptual intent."),
- 4, /* choices */
- _("Perceptual"),_("Relative Colorimetric"),_("Saturation"),_("Absolute Colorimetric"),
- OY_DEFAULT_RENDERING_INTENT,
-@@ -496,7 +496,7 @@ oyOptionStringsTranslate_ ()
- oyGROUP_BEHAVIOUR, oyGROUP_BEHAVIOUR_PROOF, 0,
- _("Proofing Rendering Intent"),
- _("Behaviour of color space transformation for proofing"),
-- _("Behaviour of color space transformation for proofing. Most people want a preview on screen only. The Relative Colorimetric intent is right for that. The Absolute Colorimetric intent needs a very careful profiling and non-trivial setup, but allowes for side-by-side comparisions."),
-+ _("Behaviour of color space transformation for proofing. Most people want a preview on screen only. The Relative Colorimetric intent is right for that. The Absolute Colorimetric intent needs a very careful profiling and non-trivial setup, but allows for side-by-side comparisons."),
- 2, /* choices */
- _("Relative Colorimetric"),_("Absolute Colorimetric"),NULL,NULL,
- OY_DEFAULT_RENDERING_INTENT_PROOF,
diff --git a/media-libs/oyranos/files/oyranos-0.9.4-omit-profile-with-error.patch b/media-libs/oyranos/files/oyranos-0.9.4-omit-profile-with-error.patch
deleted file mode 100644
index f87f004..0000000
--- a/media-libs/oyranos/files/oyranos-0.9.4-omit-profile-with-error.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From: Kai-Uwe Behrmann <ku.b@gmx.de>
-Date: Tue, 26 Mar 2013 11:09:01 +0000 (+0100)
-Subject: * [source]: omit profile with error
-X-Git-Url: http://www.oyranos.org/scm?p=oyranos.git;a=commitdiff_plain;h=ecbfe88cf77863c7c925f61d0e69d11474059cb8
-
-* [source]: omit profile with error
-
-a proper return value would be more helpful
----
-
-diff --git a/src/API_generated/oyProfile_s_.c b/src/API_generated/oyProfile_s_.c
-index 83629fe..338ed08 100644
---- a/src/API_generated/oyProfile_s_.c
-+++ b/src/API_generated/oyProfile_s_.c
-@@ -8,12 +8,12 @@
- * Oyranos is an open source Colour Management System
- *
- * @par Copyright:
-- * 2004-2012 (C) Kai-Uwe Behrmann
-+ * 2004-2013 (C) Kai-Uwe Behrmann
- *
- * @author Kai-Uwe Behrmann <ku.b@gmx.de>
- * @par License:
- * new BSD - see: http://www.opensource.org/licenses/bsd-license.php
-- * @date 2012/10/31
-+ * @date 2013/03/26
- */
-
-
-@@ -724,6 +724,9 @@ oyProfile_s_ * oyProfile_FromFile_ ( const char * name,
- }
- }
-
-+ if(error >= 1 && s)
-+ oyProfile_Release( (oyProfile_s**)&s );
-+
- oyHash_Release_( &entry );
-
- return s;
-diff --git a/src/sources/Profile.private_methods_definitions.c b/src/sources/Profile.private_methods_definitions.c
-index 7b49ca6..e131893 100644
---- a/src/sources/Profile.private_methods_definitions.c
-+++ b/src/sources/Profile.private_methods_definitions.c
-@@ -311,6 +311,9 @@ oyProfile_s_ * oyProfile_FromFile_ ( const char * name,
- }
- }
-
-+ if(error >= 1 && s)
-+ oyProfile_Release( (oyProfile_s**)&s );
-+
- oyHash_Release_( &entry );
-
- return s;
-
diff --git a/media-libs/oyranos/files/oyranos-0.9.4-set-xcalib-to-screen-if-ge-xrandr-12.patch b/media-libs/oyranos/files/oyranos-0.9.4-set-xcalib-to-screen-if-ge-xrandr-12.patch
deleted file mode 100644
index 6acfcdd..0000000
--- a/media-libs/oyranos/files/oyranos-0.9.4-set-xcalib-to-screen-if-ge-xrandr-12.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From: Kai-Uwe Behrmann <ku.b@gmx.de>
-Date: Sun, 17 Feb 2013 19:28:06 +0000 (+0100)
-Subject: * [oyX1]: set xcalib to screen if XRandR >= 1.2
-X-Git-Url: http://www.oyranos.org/scm?p=oyranos.git;a=commitdiff_plain;h=505b3931d9de6c667566278c5b3a1713d43212a8
-
-* [oyX1]: set xcalib to screen if XRandR >= 1.2
----
-
-diff --git a/src/modules/devices/oyranos_monitor_x11.c b/src/modules/devices/oyranos_monitor_x11.c
-index a090b14..a530a81 100644
---- a/src/modules/devices/oyranos_monitor_x11.c
-+++ b/src/modules/devices/oyranos_monitor_x11.c
-@@ -90,6 +90,8 @@ RROutput
- XRROutputInfo *
- oyX1Monitor_xrrOutputInfo_( oyX1Monitor_s * disp ) { return disp->output_info; }
- int oyX1Monitor_activeOutputs_( oyX1Monitor_s * disp ) { return disp->active_outputs; }
-+int oyX1Monitor_rrVersion_ ( oyX1Monitor_s * disp ) { return disp->rr_version; }
-+int oyX1Monitor_rrScreen_ ( oyX1Monitor_s * disp ) { return disp->rr_screen; }
-
-
- #endif
-@@ -680,7 +682,8 @@ int oyX1MonitorProfileSetup ( const char * display_name,
- char *text = 0;
-
- DBG_PROG_START
-- disp = oyX1Monitor_newFrom_( display_name, 0 );
-+ /* XRandR needs a expensive initialisation */
-+ disp = oyX1Monitor_newFrom_( display_name, 1 );
- if(!disp)
- return 1;
-
-@@ -721,6 +724,13 @@ int oyX1MonitorProfileSetup ( const char * display_name,
- */
- sprintf(text,"xcalib -d %s -s %d %s \'%s\'", dpy_name, disp->geo[1],
- oy_debug?"-v":"", profile_fullname);
-+ if(oyX1Monitor_infoSource_( disp ) == oyX11INFO_SOURCE_XRANDR)
-+ sprintf(text,"xcalib -d %s -s %d %s \'%s\'", dpy_name, oyX1Monitor_rrScreen_(disp),
-+ oy_debug?"-v":"", profile_fullname);
-+ else
-+ sprintf(text,"xcalib -d %s -s %d %s \'%s\'", dpy_name, disp->geo[1],
-+ oy_debug?"-v":"", profile_fullname);
-+
- {
- Display * display = oyX1Monitor_device_( disp );
- int effective_screen = oyX1Monitor_screen_( disp );
-@@ -751,17 +761,21 @@ int oyX1MonitorProfileSetup ( const char * display_name,
- #endif
-
- /* Check for incapabilities of X gamma table access */
-- if(can_gamma || oyX1Monitor_screen_( disp ) == 0)
-+ if(can_gamma || oyX1Monitor_screen_( disp ) == 0 || oyX1Monitor_infoSource_( disp ) == oyX11INFO_SOURCE_XRANDR )
- error = system(text);
- if(error &&
- error != 65280)
- { /* hack */
-- WARNc2_S("%s %s", _("No monitor gamma curves by profile:"),
-- oyNoEmptyName_m_(profil_basename) )
-+ WARNc3_S("%s %s %d", _("No monitor gamma curves by profile:"),
-+ oyNoEmptyName_m_(profil_basename), error )
- error = -1;
- } else
-+ {
- /* take xcalib error not serious, turn into a issue */
-+ if(oy_debug)
-+ DBG1_S("xcalib returned %d", error)
- error = -1;
-+ }
- }
-
- if(oy_debug)
-@@ -873,7 +887,8 @@ int oyX1MonitorProfileUnset ( const char * display_name )
-
- DBG_PROG_START
-
-- disp = oyX1Monitor_newFrom_( display_name, 0 );
-+ /* XRandR needs a expensive initialisation */
-+ disp = oyX1Monitor_newFrom_( display_name, 1 );
- if(!disp)
- {
- DBG_PROG_ENDE
-@@ -926,10 +941,16 @@ int oyX1MonitorProfileUnset ( const char * display_name )
- if( (ptr = strchr(ptr,'.')) != 0 )
- ptr[0] = '\000';
-
-- oySnprintf2_(command, 1024, "xgamma -gamma 1.0 -screen %d -display %s",
-+ if(oyX1Monitor_infoSource_( disp ) == oyX11INFO_SOURCE_XRANDR)
-+ oySnprintf2_(command, 1024, "xrandr -display %s --output %s --gamma .999999:.999999:.999999",
-+ dpy_name, oyX1Monitor_systemPort_(disp));
-+ else
-+ oySnprintf2_(command, 1024, "xgamma -gamma 1.0 -screen %d -display %s",
- disp->geo[1], dpy_name);
-
-- if(screen == disp->geo[1])
-+ if(oy_debug)
-+ DBG3_S( "%d %d system: %s", screen, disp->geo[1], command )
-+ if(screen == disp->geo[1] || oyX1Monitor_infoSource_( disp ) == oyX11INFO_SOURCE_XRANDR)
- r = system( command );
- if(r) WARNc2_S("%s %d", _("found issues"),r);
-
-@@ -1347,17 +1368,16 @@ oyX1Monitor_s* oyX1Monitor_newFrom_ ( const char * display_name,
-
- if(monitors == 0)
- {
-- if(strcmp("default", output_info->name) != 0)
-- {
-- disp->info_source = oyX11INFO_SOURCE_XRANDR;
--
-- } else
-+ if(!XRRGetCrtcGammaSize( display, output_info->crtc ))
- {
- XRRFreeOutputInfo( output_info );
- break;
- }
- }
-
-+ if(XRRGetCrtcGammaSize( display, output_info->crtc ))
-+ disp->info_source = oyX11INFO_SOURCE_XRANDR;
-+
- crtc_info = XRRGetCrtcInfo( disp->display, res_temp,
- output_info->crtc );
- if(crtc_info)
-@@ -1390,6 +1410,8 @@ oyX1Monitor_s* oyX1Monitor_newFrom_ ( const char * display_name,
- if(disp->output_info->name && oyStrlen_(disp->output_info->name))
- disp->system_port = oyStringCopy_( disp->output_info->name,
- oyAllocateFunc_ );
-+ disp->rr_version = major_versionp*100 + minor_versionp;
-+ disp->rr_screen = xrand_screen;
- }
-
- ++ monitors;
-
diff --git a/media-libs/oyranos/files/oyranos-0.9.4-use-more-internal-xrandr-info.patch b/media-libs/oyranos/files/oyranos-0.9.4-use-more-internal-xrandr-info.patch
deleted file mode 100644
index d2a58ea..0000000
--- a/media-libs/oyranos/files/oyranos-0.9.4-use-more-internal-xrandr-info.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 5c9b4a85213e5f63d716655b6c61a7efce07223c Mon Sep 17 00:00:00 2001
-From: Kai-Uwe Behrmann <ku.b@gmx.de>
-Date: Sun, 17 Feb 2013 20:27:04 +0100
-Subject: [PATCH] * [oyX1]: use more internal XRandR information
-
----
- src/include_private/oyranos_monitor_internal_x11.h | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/src/include_private/oyranos_monitor_internal_x11.h b/src/include_private/oyranos_monitor_internal_x11.h
-index c41aa3a..363b759 100644
---- a/src/include_private/oyranos_monitor_internal_x11.h
-+++ b/src/include_private/oyranos_monitor_internal_x11.h
-@@ -60,6 +60,8 @@ typedef struct {
- RROutput output; /**< XRandR output */
- XRROutputInfo * output_info; /**< XRandR output info */
- int active_outputs; /**< outputs with crtc and gamma size */
-+ int rr_version; /**< XRandR version */
-+ int rr_screen; /**< nth XRandR output */
- # endif
- char * system_port; /**< the operating systems port name */
- oyBlob_s * edid; /**< edid for the device */
-@@ -95,6 +97,8 @@ RROutput oyX1Monitor_xrrOutput_ ( oyX1Monitor_s * disp );
- XRROutputInfo *
- oyX1Monitor_xrrOutputInfo_( oyX1Monitor_s * disp );
- int oyX1Monitor_activeOutputs_( oyX1Monitor_s * disp );
-+int oyX1Monitor_rrVersion_ ( oyX1Monitor_s * disp );
-+int oyX1Monitor_rrScreen_ ( oyX1Monitor_s * disp );
- # endif
-
- int oyX1MonitorProfileSetup ( const char * display_name,
---
-1.5.6.5
-
-
diff --git a/media-libs/oyranos/metadata.xml b/media-libs/oyranos/metadata.xml
deleted file mode 100644
index 07777d5..0000000
--- a/media-libs/oyranos/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd />
-<maintainer>
- <email>yamakuzure@gmx.net</email>
- <description>Only through my private overlay - STRICTLY EXPERIMENTAL!</description>
-</maintainer>
-</pkgmetadata>
-
diff --git a/media-libs/oyranos/oyranos-0.9.4-r2.ebuild b/media-libs/oyranos/oyranos-0.9.4-r2.ebuild
deleted file mode 100644
index 51de1bb..0000000
--- a/media-libs/oyranos/oyranos-0.9.4-r2.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-0.9.4-r1.ebuild,v 1.5 2013/08/15 03:38:17 patrick Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic cmake-utils cmake-multilib versionator
-
-DESCRIPTION="colour management system allowing to share various settings across applications and services"
-HOMEPAGE="http://www.oyranos.org/"
-SRC_URI="mirror://sourceforge/oyranos/Oyranos/Oyranos%200.4/${P}.tar.bz2"
-
-MY_PV=$(get_version_component_range 1-3)
-MY_P=${PN}-${MY_PV}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X cairo cups doc exif fltk qt4 raw test"
-
-RDEPEND="=app-admin/elektra-0.7*[${MULTILIB_USEDEP}]
- dev-libs/yajl[${MULTILIB_USEDEP}]
- media-libs/icc-profiles-basiccolor-printing2009
- media-libs/icc-profiles-basiccolor-printing2009
- >=media-libs/libXcm-0.5.2[${MULTILIB_USEDEP}]
- X? ( x11-libs/libXfixes[${MULTILIB_USEDEP}]
- x11-libs/libXrandr[${MULTILIB_USEDEP}]
- x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
- x11-libs/libXinerama[${MULTILIB_USEDEP}] )
- !amd64? (
- dev-libs/libxml2
- cairo? ( x11-libs/cairo )
- cups? ( net-print/cups )
- qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 )
- raw? ( media-libs/libraw )
- )
- amd64? (
- abi_x86_64? (
- dev-libs/libxml2
- || ( media-libs/lcms:0 media-libs/lcms:2 )
- media-libs/libpng:0
- cairo? ( x11-libs/cairo )
- cups? ( net-print/cups )
- qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 )
- raw? ( media-libs/libraw )
- )
- abi_x86_32? (
- app-emulation/emul-linux-x86-baselibs
- cairo? ( app-emulation/emul-linux-x86-gtklibs )
- cups? ( app-emulation/emul-linux-x86-baselibs )
- qt4? ( app-emulation/emul-linux-x86-qtlibs )
- )
- )
- media-gfx/graphviz
- exif? ( media-gfx/exiv2 )
- fltk? ( x11-libs/fltk:1 )"
-DEPEND="${RDEPEND}
- app-doc/doxygen"
-
-RESTRICT="test"
-REQUIRED_USE="amd64? ( exif? ( !abi_x86_32 )
- raw? ( !abi_x86_32 ) )"
-CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindFltk FindXcm FindCUPS"
-
-src_prepare() {
- einfo remove bundled libs
- rm -rf elektra* yajl || die
-
- epatch "${FILESDIR}/${P}"-buildsystem-r1.patch
-
- #upstream(ed) fixes, be more verbose, better xrandr handling
- epatch "${FILESDIR}/${P}"-fix-array-access.patch \
- "${FILESDIR}/${P}"-fix-oyRankMap-helper-functions-crashes.patch \
- "${FILESDIR}/${P}"-fix-oyStringSegment-crash.patch \
- "${FILESDIR}/${P}"-be-more-verbose.patch \
- "${FILESDIR}/${P}"-use-more-internal-xrandr-info.patch \
- "${FILESDIR}/${P}"-set-xcalib-to-screen-if-ge-xrandr-12.patch \
- "${FILESDIR}/${P}"-fix-double-object-release.patch \
- "${FILESDIR}/${P}"-omit-profile-with-error.patch \
- "${FILESDIR}/${P}"-fix-typos-and-grammar.patch
-
- #upstream fix for QA notice, gentoo bug 464254
- epatch "${FILESDIR}/${P}"-fix-runpaths.patch
-
- #fix really ugly and prominently visible typo (solved in 0.9.5)
- sed -e 's/Promt/Prompt/' \
- -i src/liboyranos_config/oyranos_texts.c po/*.{po,pot} settings/*xml || die
-
- if use fltk ; then
- #src/examples does not include fltk flags
- append-cflags $(fltk-config --cflags)
- append-cxxflags $(fltk-confiag --cxxflags)
- fi
-
- cmake-utils_src_prepare
-
- mycmakeargs=(
- $(usex X -DWANT_X11=1 "")
- $(usex cairo -DWANT_CAIRO=1 "")
- $(usex cups -DWANT_CUPS=1 "")
- $(usex exif -DWANT_EXIV2=1 "")
- $(usex fltk -DWANT_FLTK=1 "")
- $(usex qt4 -DWANT_QT4=1 "")
- $(usex raw -DWANT_LIBRAW=1 "")
- )
-}
-
-src_configure() {
- cmake-multilib_src_configure
-
- if use abi_x86_32 && use abi_x86_64 ; then
- sed -e 's:lib64:lib32:g' \
- -i "${S}"-x86/CMakeCache.txt || die
- fi
-}
-
-src_install() {
- if use abi_x86_32 && use abi_x86_64 ; then
- sed -e '/OY_LIBDIR/s:lib32:lib64:'\
- -i "${S}"-x86/src/include/oyranos_version.h || die
- fi
-
- cmake-multilib_src_install
-
- dodoc AUTHORS ChangeLog README
- if use doc ; then
- mv "${D}usr/share/doc/${PN}/html" "${D}usr/share/doc/${PF}" || die
- fi
- rm -rf "${D}usr/share/doc/${PN}" || die
-}
diff --git a/sys-libs/libsemanage/ChangeLog b/sys-libs/libsemanage/ChangeLog
deleted file mode 100644
index 3b7c159..0000000
--- a/sys-libs/libsemanage/ChangeLog
+++ /dev/null
@@ -1,287 +0,0 @@
-# ChangeLog for sys-libs/libsemanage
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsemanage/ChangeLog,v 1.66 2014/04/28 19:39:37 swift Exp $
-
-*libsemanage-2.2-r3 (09 May 2014)
-
- 09 May 2014; Sven Eden <yamakuzure@gmx.net> +libsemanage-2.2-r3.ebuild:
- Change dependency to ustr to use proper abi_x86_32 USE flag depend.
- Changed building and installing to use correct ABI lib directories.
-
-*libsemanage-2.3_rc1 (28 Apr 2014)
-
- 28 Apr 2014; Sven Vermeulen <swift@gentoo.org> +libsemanage-2.3_rc1.ebuild:
- 2.3-rc1 release
-
-*libsemanage-2.2-r2 (23 Mar 2014)
-
- 23 Mar 2014; Sven Vermeulen <swift@gentoo.org> +libsemanage-2.2-r2.ebuild:
- Fix bug #502078 - have SHLIBS use PREFIX, not DESTDIR
-
- 02 Feb 2014; Sven Vermeulen <swift@gentoo.org> +libsemanage-2.2-r1.ebuild:
- Support multilib
-
-*libsemanage-2.2-r1 (02 Feb 2014)
-
- 02 Feb 2014; Sven Vermeulen <swift@gentoo.org> +libsemanage-2.2-r1.ebuild:
- Removing ruby support for libsemanage for now (libselinux has it removed as
- we)
-
- 01 Feb 2014; Sven Vermeulen <swift@gentoo.org> libsemanage-2.2.ebuild:
- Adding python3_3 to supported Pythons, see bug #499606
-
- 20 Jan 2014; Sven Vermeulen <swift@gentoo.org> libsemanage-2.2.ebuild:
- Fix bug #497754 - Add in dep on virtual/pgkconfig
-
- 20 Jan 2014; Sven Vermeulen <swift@gentoo.org> libsemanage-2.2.ebuild:
- Stabilize for amd64 and x86
-
- 23 Dec 2013; Sven Vermeulen <swift@gentoo.org> -libsemanage-2.1.9.ebuild:
- Cleanup old version
-
- 10 Nov 2013; Sven Vermeulen <swift@gentoo.org> libsemanage-2.2.ebuild:
- Adding dependency to audit (bug #490488)
-
-*libsemanage-2.2 (04 Nov 2013)
-
- 04 Nov 2013; Sven Vermeulen <swift@gentoo.org> +libsemanage-2.2.ebuild:
- New libsemanage release
-
- 07 Jul 2013; Sven Vermeulen <swift@gentoo.org> -libsemanage-2.1.6.ebuild,
- -libsemanage-2.1.6-r2.ebuild:
- Summer cleaning
-
- 16 Jun 2013; Sven Vermeulen <swift@gentoo.org> libsemanage-2.1.10.ebuild:
- Stabilization
-
-*libsemanage-2.1.10 (25 Apr 2013)
-
- 25 Apr 2013; Sven Vermeulen <swift@gentoo.org> +libsemanage-2.1.10.ebuild:
- New upstream release
-
- 07 Feb 2013; Sven Vermeulen <swift@gentoo.org> libsemanage-2.1.9.ebuild:
- Python 2.6 is not supported with libsemanage, see bug #445216
-
- 17 Nov 2012; <swift@gentoo.org> libsemanage-2.1.9.ebuild:
- Stabilization
-
- 13 Oct 2012; <swift@gentoo.org> libsemanage-2.1.9.ebuild:
- Supporting user-provided patches using epatch_user
-
-*libsemanage-2.1.9 (09 Oct 2012)
-
- 09 Oct 2012; <swift@gentoo.org> +libsemanage-2.1.9.ebuild:
- Introduce new upstream version
-
- 26 Jun 2012; Mike Gilbert <floppym@gentoo.org> libsemanage-2.1.6-r2.ebuild,
- libsemanage-2.1.6.ebuild:
- Restrict pypy per Arfrever.
-
-*libsemanage-2.1.6-r2 (25 Jun 2012)
-
- 25 Jun 2012; <swift@gentoo.org> +libsemanage-2.1.6-r2.ebuild:
- Fix python3 support
-
- 13 May 2012; <swift@gentoo.org> -libsemanage-2.1.0.ebuild:
- Removing obsoleted ebuild
-
- 29 Apr 2012; <swift@gentoo.org> libsemanage-2.1.6.ebuild:
- Stabilization
-
- 05 Apr 2012; <swift@gentoo.org> libsemanage-2.1.0.ebuild,
- libsemanage-2.1.6.ebuild:
- Depending on swig-2.0.4-r1 to fix build failures as per bug #409959
-
-*libsemanage-2.1.6 (31 Mar 2012)
-
- 31 Mar 2012; <swift@gentoo.org> +libsemanage-2.1.6.ebuild:
- Bump to version 2.1.6
-
- 12 Nov 2011; <swift@gentoo.org> -libsemanage-2.0.45.ebuild,
- -libsemanage-2.0.46.ebuild:
- Remove deprecated ebuilds
-
- 23 Oct 2011; <swift@gentoo.org> libsemanage-2.1.0.ebuild:
- Stabilization (tracker #384231)
-
- 17 Sep 2011; <swift@gentoo.org> libsemanage-2.0.45.ebuild,
- libsemanage-2.0.46.ebuild:
- Adding dependencies on bison and flex as per bug #382583
-
- 17 Sep 2011; <swift@gentoo.org> libsemanage-2.1.0.ebuild:
- Add dependency for flex and bison
-
- 12 Aug 2011; Anthony G. Basile <blueness@gentoo.org> ChangeLog:
- Fix failed gpg signing of Manifest
-
- 12 Aug 2011; Anthony G. Basile <blueness@gentoo.org>
- -libsemanage-2.0.27.ebuild, -libsemanage-2.0.33.ebuild,
- -libsemanage-2.0.33-r1.ebuild, -files/libsemanage-2.0.33-bzip.diff:
- Removed deprecated versions
-
-*libsemanage-2.1.0 (03 Aug 2011)
-
- 03 Aug 2011; Anthony G. Basile <blueness@gentoo.org>
- +libsemanage-2.1.0.ebuild:
- Bump to 20110727 SELinux userspace release
-
-*libsemanage-2.0.46 (15 Jul 2011)
-
- 15 Jul 2011; Anthony G. Basile <blueness@gentoo.org>
- +libsemanage-2.0.46.ebuild:
- Bump to 2.0.46 - proxy for SwifT
-
- 30 Jun 2011; Anthony G. Basile <blueness@gentoo.org>
- libsemanage-2.0.45.ebuild:
- Only build libsemanage for python-2, fixes bug #369089
-
- 28 May 2011; Anthony G. Basile <blueness@gentoo.org>
- libsemanage-2.0.27.ebuild, libsemanage-2.0.33.ebuild:
- Make RDEPEND explicit
-
- 28 May 2011; Anthony G. Basile <blueness@gentoo.org>
- libsemanage-2.0.45.ebuild:
- Stable amd64 x86
-
- 13 Feb 2011; Anthony G. Basile <blueness@gentoo.org> metadata.xml:
- Updated metadata.xml to reflect new selinux herd.
-
- 06 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
- libsemanage-2.0.45.ebuild:
- Add "python" and "ruby" USE flags.
-
- 05 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
- libsemanage-2.0.45.ebuild:
- Set SUPPORT_PYTHON_ABIS (bug #353764). Respect AR and CC.
-
-*libsemanage-2.0.45 (05 Feb 2011)
-
- 05 Feb 2011; Anthony G. Basile <blueness@gentoo.org>
- +libsemanage-2.0.45.ebuild:
- New upstream release.
-
- 16 Apr 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
- libsemanage-2.0.27.ebuild, libsemanage-2.0.33.ebuild,
- libsemanage-2.0.33-r1.ebuild:
- Delete calls to deprecated python_version().
-
-*libsemanage-2.0.33-r1 (24 Aug 2009)
-
- 24 Aug 2009; Chris PeBenito <pebenito@gentoo.org>
- +libsemanage-2.0.33-r1.ebuild, +files/libsemanage-2.0.33-bzip.diff:
- Add patch to make bzip2 compression configurable.
-
- 03 Aug 2009; Chris PeBenito <pebenito@gentoo.org>
- libsemanage-2.0.33.ebuild:
- Fix libsepol dependency.
-
- 02 Aug 2009; Chris PeBenito <pebenito@gentoo.org>
- libsemanage-2.0.27.ebuild, libsemanage-2.0.33.ebuild:
- Add python_need_rebuild to libsemanage.
-
-*libsemanage-2.0.33 (02 Aug 2009)
-
- 02 Aug 2009; Chris PeBenito <pebenito@gentoo.org>
- +libsemanage-2.0.33.ebuild:
- New upstream release.
-
- 18 Jul 2009; Chris PeBenito <pebenito@gentoo.org>
- -libsemanage-1.10.9.ebuild, libsemanage-2.0.27.ebuild:
- Mark stable. Remove old ebuilds.
-
-*libsemanage-2.0.27 (03 Oct 2008)
-
- 03 Oct 2008; Chris PeBenito <pebenito@gentoo.org>
- +libsemanage-2.0.27.ebuild:
- Initial commit of 2.0 libsemanage.
-
- 10 Sep 2008; Chris PeBenito <pebenito@gentoo.org>
- libsemanage-1.10.9.ebuild:
- Tests cannot be run in the ebuild, they are supposed to be ran on the full
- SELinux userland repo.
-
- 29 May 2008; Ali Polatel <hawking@gentoo.org> libsemanage-1.10.9.ebuild:
- python_mod_optimize is ROOT aware. Fixed python_mod_cleanup.
-
- 26 May 2008; Chris PeBenito <pebenito@gentoo.org>
- libsemanage-1.10.9.ebuild:
- Fix libsepol dependency.
-
- 13 May 2008; Chris PeBenito <pebenito@gentoo.org> -libsemanage-1.4.ebuild,
- -libsemanage-1.6.ebuild, -libsemanage-1.10.0.ebuild,
- -libsemanage-1.10.5.ebuild, libsemanage-1.10.9.ebuild:
- Mark 1.10.9 stable, clear old ebuilds.
-
-*libsemanage-1.10.9 (29 Jan 2008)
-
- 29 Jan 2008; Chris PeBenito <pebenito@gentoo.org>
- +libsemanage-1.10.9.ebuild:
- New upstream bugfix release.
-
-*libsemanage-1.10.5 (18 Oct 2007)
-
- 18 Oct 2007; Chris PeBenito <pebenito@gentoo.org>
- +libsemanage-1.10.5.ebuild:
- New upstream release.
-
- 04 Jun 2007; Chris PeBenito <pebenito@gentoo.org>
- libsemanage-1.10.0.ebuild:
- Mark stable.
-
-*libsemanage-1.10.0 (15 Feb 2007)
-
- 15 Feb 2007; Chris PeBenito <pebenito@gentoo.org>
- +libsemanage-1.10.0.ebuild:
- New upstream release.
-
- 09 Oct 2006; Chris PeBenito <pebenito@gentoo.org>
- libsemanage-1.6.17-r1.ebuild:
- Stable to make repoman happy.
-
-*libsemanage-1.6.17-r1 (08 Oct 2006)
-
- 08 Oct 2006; Chris PeBenito <pebenito@gentoo.org>
- -libsemanage-1.6.17.ebuild, +libsemanage-1.6.17-r1.ebuild:
- Install semanage.conf since this is masked on example policy-based profiles.
-
-*libsemanage-1.6.17 (05 Oct 2006)
-
- 05 Oct 2006; Chris PeBenito <pebenito@gentoo.org>
- +libsemanage-1.6.17.ebuild:
- Add SVN snapshot.
-
- 31 Jul 2006; Chris PeBenito <pebenito@gentoo.org> libsemanage-1.6.ebuild:
- Mark stable, long overdue.
-
- 27 Apr 2006; Alec Warner <antarus@gentoo.org>
- files/digest-libsemanage-1.4, Manifest:
- Fixing SHA256 digest, pass four
-
-*libsemanage-1.6 (18 Mar 2006)
-
- 18 Mar 2006; Chris PeBenito <pebenito@gentoo.org> +libsemanage-1.6.ebuild:
- New upstream release.
-
- 22 Feb 2006; Stephen Bennett <spb@gentoo.org> libsemanage-1.4.ebuild:
- Alpha stable
-
- 19 Feb 2006; Joshua Kinard <kumba@gentoo.org> libsemanage-1.4.ebuild:
- Marked stable on mips.
-
- 09 Feb 2006; Chris PeBenito <pebenito@gentoo.org> libsemanage-1.4.ebuild:
- Set python version to fix compiles on non 2.4 pythons.
-
- 17 Jan 2006; Chris PeBenito <pebenito@gentoo.org> libsemanage-1.4.ebuild:
- Mark stable, x86, amd64, ppc, sparc.
-
- 14 Jan 2006; Stephen Bennett <spb@gentoo.org> libsemanage-1.4.ebuild:
- Added ~alpha
-
- 15 Dec 2005; Chris PeBenito <pebenito@gentoo.org> libsemanage-1.4.ebuild:
- Tighten up versioning to try to prevent mismatch problems as seen in #112348.
-
-*libsemanage-1.4 (09 Dec 2005)
-
- 09 Dec 2005; Chris PeBenito <pebenito@gentoo.org> +metadata.xml,
- +libsemanage-1.4.ebuild:
- Initial commit.
diff --git a/sys-libs/libsemanage/Manifest b/sys-libs/libsemanage/Manifest
deleted file mode 100644
index 14500d0..0000000
--- a/sys-libs/libsemanage/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST libsemanage-2.2.tar.gz 138208 SHA256 11f60bfa0f1c6063cd9bd99ce0cb4acc9d6d9e9b8d7743d39e847bcd7803bd75 SHA512 09032b1b322fec7346164939ade118034812cb538ebc72121640d4ac5c89d2a66b59caa465027cfbebb590dee039a26d4345eafedf365d7f6ad0b5e90377d50f WHIRLPOOL 49170c5ee9ff57dcc4a15aa72386f37993f76436f0da25808c60dab2d03ba52932d0d4fa753c326900d83d2fae30f8bcf659251f17327783f2e2be3deb4842f4
-EBUILD libsemanage-2.2-r3.ebuild 3534 SHA256 344970500d8ada036de41c470c1509c960eb4f04348dd180dd50fa6e75e127c8 SHA512 817260ebfb2e2f49998227e2abc013bd0af8a355e0a0de3f9550492f25e7d077bf15192e75e33cc8b0ffdb046f5f8fd92be3b8fcd0cfaa9d1227835bafe28dd5 WHIRLPOOL eb80a26e3258c868d84f4db59c33231c98259296d1514eae4977bdcb93f0a531a750001c24a862a3d65123390472772d15787853350f4ecbf2b4396edab843a0
-MISC ChangeLog 9338 SHA256 c2bfd1b84a4b06a39d958a46922fb44a19eeddb06cbc2c39c64aa039c7828015 SHA512 0a09e351a1b53f826284d457ccd0eb4010dd3c48f9a19a80d7fb544ac355e00de99909a8e1acea1aa456b7c15c2a25e5236df2790e4a59766da67a79627ebda4 WHIRLPOOL a893d0524f90c0abe374dc88c62e0dc8e6c0679d1c72b39821c8e1d4ae78b2f7c09d375ecda06c49b4949c727ad19bd60bbaf8589520c73a2fa778d2db64d907
-MISC metadata.xml 233 SHA256 c5a240155da9b7588e31ff668d3656486a16868654c076f7e1aea823a6b85ae9 SHA512 96a2805dfeebf2e9458e4b602da2cff381f9a3a2e05feb0b36d22b25cac15417e54c8f0572f14f3f944ca7d20377f20ef217ad51105e273a40525b1174df714a WHIRLPOOL 1e68c6d8f1f0446a8be9a001f4c89d641a2055fc9d440be286f753fbf8a216f9d0ed530694f1ff5859a1604eff125316fdcf9593cb91113e4735cc3fa8e8b9a3
diff --git a/sys-libs/libsemanage/libsemanage-2.2-r3.ebuild b/sys-libs/libsemanage/libsemanage-2.2-r3.ebuild
deleted file mode 100644
index 94ab598..0000000
--- a/sys-libs/libsemanage/libsemanage-2.2-r3.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsemanage/libsemanage-2.2-r2.ebuild,v 1.1 2014/03/23 19:29:35 swift Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 python3_2 python3_3 )
-
-inherit multilib python-r1 toolchain-funcs eutils multilib-minimal
-
-SEPOL_VER="2.2"
-SELNX_VER="2.2.2-r1"
-
-DESCRIPTION="SELinux kernel and policy management library"
-HOMEPAGE="http://userspace.selinuxproject.org"
-SRC_URI="http://userspace.selinuxproject.org/releases/20131030/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="python"
-
-RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}
- >=sys-libs/libselinux-${SELNX_VER}
- abi_x86_32? (
- !<dev-libs/ustr-1.0.4-r4
- !dev-libs/ustr[-abi_x86_32(-)]
- )
- sys-process/audit"
-DEPEND="${RDEPEND}
- sys-devel/bison
- sys-devel/flex
- python? (
- >=dev-lang/swig-2.0.4-r1
- virtual/pkgconfig
- ${PYTHON_DEPS}
- )"
-
-# tests are not meant to be run outside of the
-# full SELinux userland repo
-RESTRICT="test"
-
-src_prepare() {
- echo "# Set this to true to save the linked policy." >> "${S}/src/semanage.conf"
- echo "# This is normally only useful for analysis" >> "${S}/src/semanage.conf"
- echo "# or debugging of policy." >> "${S}/src/semanage.conf"
- echo "save-linked=false" >> "${S}/src/semanage.conf"
- echo >> "${S}/src/semanage.conf"
- echo "# Set this to 0 to disable assertion checking." >> "${S}/src/semanage.conf"
- echo "# This should speed up building the kernel policy" >> "${S}/src/semanage.conf"
- echo "# from policy modules, but may leave you open to" >> "${S}/src/semanage.conf"
- echo "# dangerous rules which assertion checking" >> "${S}/src/semanage.conf"
- echo "# would catch." >> "${S}/src/semanage.conf"
- echo "expand-check=1" >> "${S}/src/semanage.conf"
- echo >> "${S}/src/semanage.conf"
- echo "# Modules in the module store can be compressed" >> "${S}/src/semanage.conf"
- echo "# with bzip2. Set this to the bzip2 blocksize" >> "${S}/src/semanage.conf"
- echo "# 1-9 when compressing. The higher the number," >> "${S}/src/semanage.conf"
- echo "# the more memory is traded off for disk space." >> "${S}/src/semanage.conf"
- echo "# Set to 0 to disable bzip2 compression." >> "${S}/src/semanage.conf"
- echo "bzip-blocksize=0" >> "${S}/src/semanage.conf"
- echo >> "${S}/src/semanage.conf"
- echo "# Reduce memory usage for bzip2 compression and" >> "${S}/src/semanage.conf"
- echo "# decompression of modules in the module store." >> "${S}/src/semanage.conf"
- echo "bzip-small=true" >> "${S}/src/semanage.conf"
-
- epatch_user
-
- multilib_copy_sources
-}
-
-multilib_src_compile() {
- building() {
- emake \
- AR="$(tc-getAR)" \
- CC="$(tc-getCC)" \
- LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
- SHLIBDIR="${EPREFIX}/usr/$(get_libdir)" \
- "$@" || die
- }
-
- multilib_foreach_abi building all
-
- if multilib_is_native_abi && use python; then
- building_py() {
- python_export PYTHON_INCLUDEDIR PYTHON_LIBPATH
- emake CC="$(tc-getCC)" PYINC="-I${PYTHON_INCLUDEDIR}" PYTHONLBIDIR="${PYTHON_LIBPATH}" PYPREFIX="${EPYTHON##*/}" "$@"
- }
- python_foreach_impl building_py swigify
- python_foreach_impl building_py pywrap
- fi
-}
-
-multilib_src_install() {
- installation() {
- emake \
- LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
- SHLIBDIR="${EPREFIX}/usr/$(get_libdir)" \
- DESTDIR="${D}" "$@"
- }
-
- multilib_foreach_abi installation install
-
- if multilib_is_native_abi && use python; then
- installation_py() {
- emake DESTDIR="${D}" install-pywrap
- }
- python_foreach_impl installation_py
- fi
-}
diff --git a/sys-libs/libsemanage/metadata.xml b/sys-libs/libsemanage/metadata.xml
deleted file mode 100644
index ebc32c0..0000000
--- a/sys-libs/libsemanage/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>selinux</herd>
- <longdescription>SELinux policy management libraries</longdescription>
-</pkgmetadata>
diff --git a/www-apps/dotproject/ChangeLog b/www-apps/dotproject/ChangeLog
deleted file mode 100644
index 00fd1d2..0000000
--- a/www-apps/dotproject/ChangeLog
+++ /dev/null
@@ -1,18 +0,0 @@
-# ChangeLog for www-apps/dotproject
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*dotproject-2.1.5-r2 (29 Mar 2011)
-
- 29 Mar 2011; Sven Eden <sven.eden@gmx.de> +dotproject-2.1.5-r2.ebuild :
- WEBAPP_MANUAL_SLOT="yes" was missing which is neccessary for manual
- slotting which itself is neccessary for -r* ebuilds.
-
- 29 Mar 2011; Sven Eden <sven.eden@gmx.de> -dotproject-2.1.5-r1.ebuild :
- Removed obsolete ebuild.
-
-*dotproject-2.1.5-r1 (27 Mar 2011)
-
- 27 Mar 2011; Sven Eden <sven.eden@gmx.de> +dotproject-2.1.5-r1.ebuild :
- Initial commit of the ebuild. Simple version bump until the tree is
- updated.
diff --git a/www-apps/dotproject/Manifest b/www-apps/dotproject/Manifest
deleted file mode 100644
index e26c5e2..0000000
--- a/www-apps/dotproject/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX install-en.txt 793 SHA256 3745e3a4d5b9a642c9f409a8c09dc072787b687531f9adcfe31ea317bd3f7889 SHA512 699e065283f8a737afe49beadc635a13e5f7f65b1d6583ace984964cb292f1972a768ac52421e0237eb930c2bafe724dd53461f0b098ae50c2a4b60576e91e2e WHIRLPOOL 042e3e53895ebfbfbfec15290b20b4015739dfffc202e4bfb062f0a04344034d0ca1ee7b7fed0bebb5349c308d5aaa34f5491032d505d74cbcbc8c106e94b3bf
-DIST dotproject-2.1.5.tar.gz 4524714 SHA256 86beef3a1280c3c2eccde6abe8ea0570e348fdecf756b581382fa8ad9aa331bf
-EBUILD dotproject-2.1.5-r2.ebuild 1341 SHA256 2c3eea5e13c940b827caebf4a08f6e1631d00e65c9130d1cf8e3c1d3719e3084 SHA512 177e9c29b97be64f59d7ef5c520bbb7c2c9cd873ddc7d7c6c124c213a08a6af730f1dad8ee7bdd5ecfcf66c71e8d17fb2f0e86032e806bae5715be8b259e79a5 WHIRLPOOL 184e9cc84aad6589057537002add9f8f3228da55c06a958d0012c369a239e9e15d3e3dfa0bbf944fc994d45b83cc4dbd8e49aa169a458042a2be162693918132
-EBUILD dotproject-2.1.5-r3.ebuild 1340 SHA256 ecec553189f8c3a64c0ca29dc5f65de32cfb839f2da8db0bc0f9ee7faa4283c8 SHA512 fa18fe1866728926c4f54ea7304c9ade01a5cb60983631ec97fd599778c0f490a7a3654610cb9b23172e801990ba6312d4182cbc369ee65373d7fd726339a96c WHIRLPOOL 8b329c9c795a4590946f5be762ba8054227b3cda8492f316fbac73498595374613a24fc295b80b72e97a626346dc7b2b79b07f3a117b5a478616c567f22b8cd5
-MISC ChangeLog 649 SHA256 7b1c1a5bf1e3ac4dad12f38298654e1e29e613b730afb11a714c9fa2c5b9820d SHA512 1c95e696035f32799d94e8ec5c1dc4f5f3b9ca8d20199d66998014f51b729775b2f2433a3988fb7a933fe3d8600c5d5337d97db2c183fe00c09fee0109004d0a WHIRLPOOL 1a1f447a70ae89c0226b532e65e17a319dcfac799691a94e309a17266edb9d743aca849af0959df83f03fe8a259420714d5b4c9fe170fc4b7c5e27e9ca4ea3cd
-MISC metadata.xml 162 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0 SHA512 550d0f517601255e5c9b120a03f1dad37a1a75bdaadad486ddbd2380a7f0dd884970400574455d34d3ba6e800d9fd21467dfb7f89ba27a0aa8a65e7a265534e3 WHIRLPOOL d50adcb067d0290aa7dfe5aebd0e8abf4939ece7afbf284920d08f2bf04f9306f0062a78cacb7572a12735ac41545440fcf138beda81cc53774950bdde495dcb
diff --git a/www-apps/dotproject/dotproject-2.1.5-r2.ebuild b/www-apps/dotproject/dotproject-2.1.5-r2.ebuild
deleted file mode 100644
index dd2a782..0000000
--- a/www-apps/dotproject/dotproject-2.1.5-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-inherit eutils webapp depend.php
-
-DESCRIPTION="dotProject is a PHP web-based project management framework"
-HOMEPAGE="http://www.dotproject.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-RESTRICT="mirror"
-
-WEBAPP_MANUAL_SLOT="yes"
-SLOT="2.1.5"
-
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-LICENSE="GPL-2"
-IUSE="sendmail unicode"
-
-DEPEND=""
-RDEPEND="
- >=app-text/poppler-0.12.3-r3[utils]
- >=www-servers/apache-2.0.49
- unicode? ( >=dev-lang/php-5.0[gd,unicode,xml] )
- !unicode? ( >=dev-lang/php-5.0[gd,xml] )
- >=dev-db/mysql-5.1
- >=dev-php5/jpgraph-2.3
- sendmail? ( mail-mta/sendmail )
-"
-
-need_httpd_cgi
-need_php_httpd
-
-S=${WORKDIR}/${PN}
-
-src_install () {
- # remove dead links from the archive
- rm -rf ${S}/locales/es
- rm -rf ${S}/locales/pt_br
-
- # and add the missing temp directory
- [ -e ${S}/files/temp ] || mkdir -p ${S}/files/temp
-
- webapp_src_preinst
-
- dodoc ChangeLog README
- rm -f ChangeLog README
-
- mv includes/config{-dist,}.php
-
- insinto "${MY_HTDOCSDIR}"
- doins -r .
-
- webapp_serverowned "${MY_HTDOCSDIR}"/includes/config.php
- webapp_serverowned "${MY_HTDOCSDIR}"/files{,/temp}
- webapp_serverowned "${MY_HTDOCSDIR}"/locales/en
-
- webapp_postinst_txt en "${FILESDIR}"/install-en.txt
- webapp_src_install
-}
diff --git a/www-apps/dotproject/dotproject-2.1.5-r3.ebuild b/www-apps/dotproject/dotproject-2.1.5-r3.ebuild
deleted file mode 100644
index a8ec795..0000000
--- a/www-apps/dotproject/dotproject-2.1.5-r3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-inherit eutils webapp depend.php
-
-DESCRIPTION="dotProject is a PHP web-based project management framework"
-HOMEPAGE="http://www.dotproject.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-RESTRICT="mirror"
-
-WEBAPP_MANUAL_SLOT="yes"
-SLOT="2.1.5"
-
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-LICENSE="GPL-2"
-IUSE="sendmail unicode"
-
-DEPEND=""
-RDEPEND="
- >=app-text/poppler-0.12.3-r3[utils]
- >=www-servers/apache-2.0.49
- unicode? ( >=dev-lang/php-5.0[gd,unicode,xml] )
- !unicode? ( >=dev-lang/php-5.0[gd,xml] )
- >=dev-db/mysql-5.1
- >=dev-php/jpgraph-2.3
- sendmail? ( mail-mta/sendmail )
-"
-
-need_httpd_cgi
-need_php_httpd
-
-S=${WORKDIR}/${PN}
-
-src_install () {
- # remove dead links from the archive
- rm -rf ${S}/locales/es
- rm -rf ${S}/locales/pt_br
-
- # and add the missing temp directory
- [ -e ${S}/files/temp ] || mkdir -p ${S}/files/temp
-
- webapp_src_preinst
-
- dodoc ChangeLog README
- rm -f ChangeLog README
-
- mv includes/config{-dist,}.php
-
- insinto "${MY_HTDOCSDIR}"
- doins -r .
-
- webapp_serverowned "${MY_HTDOCSDIR}"/includes/config.php
- webapp_serverowned "${MY_HTDOCSDIR}"/files{,/temp}
- webapp_serverowned "${MY_HTDOCSDIR}"/locales/en
-
- webapp_postinst_txt en "${FILESDIR}"/install-en.txt
- webapp_src_install
-}
diff --git a/www-apps/dotproject/files/install-en.txt b/www-apps/dotproject/files/install-en.txt
deleted file mode 100644
index edda11c..0000000
--- a/www-apps/dotproject/files/install-en.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-You will need to provide a database for your dotproject installation.
-
-This assumes you have some knowledge of MySQL, and already have it
-installed and configured. If not, please refer to the Gentoo MySQL
-guide at the following URL:
-
-http://www.gentoo.org/doc/en/mysql-howto.xml
-
-Once you have a database ready all you need to do is to go to this
-location
-
-http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/install
-
-and provide the credentials required for the database access.
-
-Note the administrator password dotproject will provide and after
-logging in with these credentials you can start to use the application.
-
-
-If you get many warnings about date() being unreliable when using the
-servers timezone, please set "date.timezone" in
-/etc/php/apache2-php${PHP_PKG}/php.ini to your local timezone.
-
diff --git a/www-apps/dotproject/metadata.xml b/www-apps/dotproject/metadata.xml
deleted file mode 100644
index 6632069..0000000
--- a/www-apps/dotproject/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>web-apps</herd>
-</pkgmetadata>
diff --git a/www-servers/jetty-bin/ChangeLog b/www-servers/jetty-bin/ChangeLog
deleted file mode 100644
index b81456f..0000000
--- a/www-servers/jetty-bin/ChangeLog
+++ /dev/null
@@ -1,48 +0,0 @@
-# ChangeLog for www-servers/jetty-bin
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*jetty-bin-6.1.26-r4.ebuild (14 Jan 2013)
-
- 14 Jan 2013; Sven Eden <sven.eden@gmx.de>
- +jetty-bin-6.1.26-r4.ebuild,
- -jetty-bin-6.1.26-r3.ebuild:
- Changed jetty to depend on >=jre-1.6 instead of 1.5. This allows
- eclipse-sdk to depend on virtual/jdk-7
-
-
- 02 Feb 2012; Sven Eden <sven.eden@gmx.de>
- -jetty-bin-7.5.4.ebuild :
- It is not possible to make Eclipse be happy with jetty-7, so
- drop it.
-
-*jetty-bin-7.5.4.ebuild (02 Feb 2012)
-*jetty-bin-6.1.26-r3.ebuild (02 Feb 2012)
-
- 02 Feb 2012; Sven Eden <sven.eden@gmx.de>
- +jetty-bin-7.5.4.ebuild :
- First Ebuild for Jetty-7
- +jetty-bin-6.1.26-r3.ebuild :
- Cleaned up some issues
-
- - jetty-bin-6.1.26.ebuild
- - jetty-bin-6.1.26-r1.ebuild
- - jetty-bin-6.1.26-r2.ebuild
- Removed old ebuilds
-
-*jetty-bin-6.1.26-r2.ebuild (22 Nov 2011)
-
- 15 Aug 2011; Sven Eden <sven.eden@gmx.de> +jetty-bin-6.1.26-r2.ebuild :
- Added USE_Flag "tomcat7" to depend on tomcat:3.0 instead of 2.5.
-
-*jetty-bin-6.1.26-r1.ebuild (16 Aug 2011)
-
- 15 Aug 2011; Sven Eden <sven.eden@gmx.de> +jetty-bin-6.1.26-r1.ebuild :
- Changed the ebuild to install as "jetty" and not "jetty-bin". Eclipse
- 3.7 now merges fine with it.
-
-*jetty-bin-6.1.26.ebuild (15 Aug 2011)
-
- 15 Aug 2011; Sven Eden <sven.eden@gmx.de> +jetty-bin-6.1.26.ebuild :
- Initial commit of the ebuild. Ebuild taken from Bug #328747, written
- by John J. Aylward (johnjaylward@yahoo.com)
diff --git a/www-servers/jetty-bin/Manifest b/www-servers/jetty-bin/Manifest
deleted file mode 100644
index 16c1d49..0000000
--- a/www-servers/jetty-bin/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX conf.d/jetty-6 676 SHA256 19ea54fbf09fab5b3ccaf819ae872935d6d3718ce6e753dc834302a6be4d199f SHA512 a0ccdfcc3b6c306c7bb436457203ef76d860633f239e24a072355725532a913dcf98d687c847cfa63c2d9b4e2d1dcd1030bba81fec43142225a1991d241cfb8d WHIRLPOOL 4fc6f73f546b6e89000dec085f3341bdc82b8039e782f2b491b4c69e18b2bcbf4ddd893a01b79d07eec185d62a105b18ef411ea894c80f6ff50415b5650acb6c
-AUX conf.d/jetty-7 638 SHA256 5e15c5283ac1177d42e209f1838b34d50c8c687befb3978f31072c16b8cdc0f5 SHA512 454b4f70680d5025a69f6c7689bc35b5c8d886d652990c97ba07ae10ccd7c4ce8cb263d1379efe9f8a6137cec0e1d16cee173b99d467284f0abd04f49f0b9e9f WHIRLPOOL ef89f40dda209076991fc0fb85f0d7b35b13fc85e691c9291d96a96ec6cd23ea4a006e9604d598e55b2a0ddcfc7d58cca2db5560a3194af48b077174274ceb2f
-AUX init.d/jetty-6 1542 SHA256 76872ed861876492cbf1915cb3bbb4fdc36996446744f816a78fbe0b321f8720 SHA512 b5888892c331ba7d8bee78f867270f0cb2a02d4886513984a7b63102f0c7353a865ed5f7983c4ee834478fe2014e7a004177377fd015331396c3b13cedfb5274 WHIRLPOOL ed819e38eec262b9081760b4ffbbf8bba9e44eef16cbe4fd17a5fd86523c7e2391d0e822f66ebd00386f79e8521b2397c5153d032aa27bdd21a922a3120f621d
-AUX init.d/jetty-7 1542 SHA256 76872ed861876492cbf1915cb3bbb4fdc36996446744f816a78fbe0b321f8720 SHA512 b5888892c331ba7d8bee78f867270f0cb2a02d4886513984a7b63102f0c7353a865ed5f7983c4ee834478fe2014e7a004177377fd015331396c3b13cedfb5274 WHIRLPOOL ed819e38eec262b9081760b4ffbbf8bba9e44eef16cbe4fd17a5fd86523c7e2391d0e822f66ebd00386f79e8521b2397c5153d032aa27bdd21a922a3120f621d
-DIST jetty-6.1.26.zip 25894195 SHA256 96c08eb87ec3772dccc2b3dba54fea85ccc3f804faf7429eecfba3ed55648187 SHA512 53ff50f5c2d8d8118886516b0b356520b8228e78a7ed53943a8e0fc6e63ddeef154c54cede744d35f458d3d20dfaab585ff40fcd8b83fc00902c3561c8e462de WHIRLPOOL 3318e1d834a37231384ea4aca17913312471970681906506e238f5dfc5f3fc000c57e0fd78e12c102d6f512dd977f911bdc9d5f3edc9ea0ff10c5c29c1312337
-DIST jetty-ant-6.1.26.jar 22961 SHA256 b82f643508d0fbcac5f92e3ecd7271684be098a97bd1304345c00c98a4d95f4c SHA512 9c8c587a70885e9f7f66e4ca4620aae5fc74fbf13dd0d2d8f4e34cd7f8f0bf4efed49da107a74f30864961f7a926275b12e07acc04cef3a8273ea84658cca781 WHIRLPOOL 7b16e7b8d323713a2455f2986608e99eb749a2688234707d0b10c4961c845345a68bb780e62a43753114d2e7879a59b5dd5513e73340b90a62be08d51256d43a
-EBUILD jetty-bin-6.1.26-r4.ebuild 5185 SHA256 56aecee52ff16a77bd7c7c678d017a0e9745bdceda4b089f8b51883eb0c19f10 SHA512 5f1d6f6e52dc3e57091e076fe8a89eb2ae8752782b7ea0413cda34114eec909667f633943a2796c47658f7e79a5fdde7137c0529099825c4231f996360e8c14c WHIRLPOOL 6cf058f279f410536cd6e313b5b4c553f7e735824e990933a6da6671c24931ceffe7ee08e485f9d38815ffd140259c124d852407758edd3b61479f625e428632
-MISC ChangeLog 1513 SHA256 6ab702f1db3101c3760c1dba9ae87c47212cd2ca02624226b8f5512065048ec1 SHA512 8b48c4b37b82264c0913e22da851f8da0d9bf124aac699bf6cea928cc9b7197fbc4f955cefe261d64696ae39938642892b24f89acb005ec3dfbd36ad26066117 WHIRLPOOL daedc9f609f47b2f53627171cc1be19b0ef1e596b75ec9d1b33fe2a816ba34490cd6664e02e3565ef0d3cc74b79eb621a686a126b79ff17929cc7dc27b371725
diff --git a/www-servers/jetty-bin/files/conf.d/jetty-6 b/www-servers/jetty-bin/files/conf.d/jetty-6
deleted file mode 100644
index 730ac76..0000000
--- a/www-servers/jetty-bin/files/conf.d/jetty-6
+++ /dev/null
@@ -1,24 +0,0 @@
-#Configuration options for jetty server
-
-#JETTY_HOST=localhost
-#JETTY_PORT=8080
-
-# port to listen on to stop the server
-#STOP_PORT=8079
-
-# "password" used on the stop port to verify that the server should be stopped
-STOP_KEY=secret
-
-# Set this value to 1 and configure the jetty-setuid.xml to have the server run as an unprivilaged user
-#USE_SETUID=1
-
-# jetty 6 has a bug that only lets it connect to ipv6 or ipv4, not both
-#USE_IPV6=1
-
-# Use the SSL config jetty-ssl.xml
-#USE_SSL=1
-
-# Set this to a space delimited list of extra conf files you want loaded
-# The files are relative to ${JETTY_HOME} so
-# ex. JETTY_CONF="etc/jetty-ajp.xml etc/jetty-logging.xml"
-#JETTY_CONF=""
diff --git a/www-servers/jetty-bin/files/conf.d/jetty-7 b/www-servers/jetty-bin/files/conf.d/jetty-7
deleted file mode 100644
index 43c75e0..0000000
--- a/www-servers/jetty-bin/files/conf.d/jetty-7
+++ /dev/null
@@ -1,24 +0,0 @@
-#Configuration options for jetty server
-
-#JETTY_HOST=localhost
-#JETTY_PORT=8080
-
-# port to listen on to stop the server
-#STOP_PORT=8079
-
-# "password" used on the stop port to verify that the server should be stopped
-STOP_KEY=secret
-
-# Set this value to 1 and configure the jetty-setuid.xml to have the server run as an unprivilaged user
-#USE_SETUID=1
-
-# Set this value to 1 to use ipv6
-#USE_IPV6=1
-
-# Use the SSL config jetty-ssl.xml
-#USE_SSL=1
-
-# Set this to a space delimited list of extra conf files you want loaded
-# The files are relative to ${JETTY_HOME} so
-# ex. JETTY_CONF="etc/jetty-ajp.xml etc/jetty-logging.xml"
-#JETTY_CONF=""
diff --git a/www-servers/jetty-bin/files/init.d/jetty-6 b/www-servers/jetty-bin/files/init.d/jetty-6
deleted file mode 100644
index 1e54649..0000000
--- a/www-servers/jetty-bin/files/init.d/jetty-6
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/sbin/runscript
-
-depend() {
- need net
-}
-
-start() {
- ebegin "Starting ${SVCNAME}"
-
- JETTY_HOME="/var/lib/${SVCNAME}"
- CONF_FILES="${JETTY_HOME}/etc/jetty.xml"
- JETTY_OPTS="-DSTART=${JETTY_HOME}/start.config"
-
- if [[ -n ${JETTY_HOST} ]]; then
- JETTY_OPTS="${JETTY_OPTS} -Djetty.host=${JETTY_HOST}"
- fi
- if [[ -n ${JETTY_PORT} ]]; then
- JETTY_OPTS="${JETTY_OPTS} -Djetty.port=${JETTY_PORT}"
- fi
- if [[ -n ${STOP_PORT} ]]; then
- JETTY_OPTS="${JETTY_OPTS} -DSTOP.PORT=${STOP_PORT}"
- fi
- if [[ -n ${STOP_KEY} ]]; then
- JETTY_OPTS="${JETTY_OPTS} -DSTOP.KEY=${STOP_KEY}"
- fi
- if [[ ${USE_SETUID} -eq 1 ]]; then
- # Setuid configuration file needs to be the first one in the list
- CONF_FILES="${JETTY_HOME}/etc/jetty-setuid.xml ${CONF_FILES}"
- JETTY_OPTS="${JETTY_OPTS} -Djava.library.path=/usr/lib64/${SVCNAME}/"
- fi
- if [[ ${USE_IPV6} -ne 1 ]]; then
- JETTY_OPTS="${JETTY_OPTS} -Djava.net.preferIPv4Stack=true"
- fi
- if [[ ${USE_SSL} -eq 1 ]]; then
- # Setuid configuration file needs to be the first one in the list
- CONF_FILES="${CONF_FILES} ${JETTY_HOME}/etc/jetty-ssl.xml"
- fi
-
- cd "${JETTY_HOME}"
-
- start-stop-daemon --start --background --make-pidfile \
- --pidfile /var/run/${SVCNAME}.pid \
- --startas java -- ${JETTY_OPTS} -jar ${JETTY_HOME}/start.jar ${CONF_FILES} ${JETTY_CONF}
- eend $?
-}
-
-stop() {
- ebegin "Stopping ${SVCNAME}"
- start-stop-daemon --stop --quiet --pidfile /var/run/${SVCNAME}.pid
- eend $?
-}
diff --git a/www-servers/jetty-bin/files/init.d/jetty-7 b/www-servers/jetty-bin/files/init.d/jetty-7
deleted file mode 100644
index 1e54649..0000000
--- a/www-servers/jetty-bin/files/init.d/jetty-7
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/sbin/runscript
-
-depend() {
- need net
-}
-
-start() {
- ebegin "Starting ${SVCNAME}"
-
- JETTY_HOME="/var/lib/${SVCNAME}"
- CONF_FILES="${JETTY_HOME}/etc/jetty.xml"
- JETTY_OPTS="-DSTART=${JETTY_HOME}/start.config"
-
- if [[ -n ${JETTY_HOST} ]]; then
- JETTY_OPTS="${JETTY_OPTS} -Djetty.host=${JETTY_HOST}"
- fi
- if [[ -n ${JETTY_PORT} ]]; then
- JETTY_OPTS="${JETTY_OPTS} -Djetty.port=${JETTY_PORT}"
- fi
- if [[ -n ${STOP_PORT} ]]; then
- JETTY_OPTS="${JETTY_OPTS} -DSTOP.PORT=${STOP_PORT}"
- fi
- if [[ -n ${STOP_KEY} ]]; then
- JETTY_OPTS="${JETTY_OPTS} -DSTOP.KEY=${STOP_KEY}"
- fi
- if [[ ${USE_SETUID} -eq 1 ]]; then
- # Setuid configuration file needs to be the first one in the list
- CONF_FILES="${JETTY_HOME}/etc/jetty-setuid.xml ${CONF_FILES}"
- JETTY_OPTS="${JETTY_OPTS} -Djava.library.path=/usr/lib64/${SVCNAME}/"
- fi
- if [[ ${USE_IPV6} -ne 1 ]]; then
- JETTY_OPTS="${JETTY_OPTS} -Djava.net.preferIPv4Stack=true"
- fi
- if [[ ${USE_SSL} -eq 1 ]]; then
- # Setuid configuration file needs to be the first one in the list
- CONF_FILES="${CONF_FILES} ${JETTY_HOME}/etc/jetty-ssl.xml"
- fi
-
- cd "${JETTY_HOME}"
-
- start-stop-daemon --start --background --make-pidfile \
- --pidfile /var/run/${SVCNAME}.pid \
- --startas java -- ${JETTY_OPTS} -jar ${JETTY_HOME}/start.jar ${CONF_FILES} ${JETTY_CONF}
- eend $?
-}
-
-stop() {
- ebegin "Stopping ${SVCNAME}"
- start-stop-daemon --stop --quiet --pidfile /var/run/${SVCNAME}.pid
- eend $?
-}
diff --git a/www-servers/jetty-bin/jetty-bin-6.1.26-r4.ebuild b/www-servers/jetty-bin/jetty-bin-6.1.26-r4.ebuild
deleted file mode 100644
index b8f274f..0000000
--- a/www-servers/jetty-bin/jetty-bin-6.1.26-r4.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit eutils java-pkg-2
-
-DESCRIPTION="Jetty Web Server; Java Servlet container"
-
-SLOT="6"
-HOMEPAGE="http://jetty.codehaus.org/"
-KEYWORDS="~amd64 ~x86"
-LICENSE="Apache-2.0"
-
-MY_PN="jetty"
-#MY_JETTY="${PN}-${SLOT}"
-MY_JETTY="${MY_PN}-${SLOT}"
-
-IUSE="anttasks client ldap ssl stats tomcat7"
-
-SRC_URI="http://dist.codehaus.org/jetty/jetty-${PV}/jetty-${PV}.zip
- anttasks? ( http://dist.codehaus.org/jetty/jetty-${PV}/jetty-ant-${PV}.jar )"
-RESTRICT="mirror"
-
-DEPEND="
- tomcat7? ( dev-java/tomcat-servlet-api:3.0 )
- !tomcat7? ( dev-java/tomcat-servlet-api:2.5 )
- !www-servers/jetty:${SLOT}
- !www-servers/jetty-eclipse:${SLOT}
- !www-servers/jetty-eclipse-bin:${SLOT}"
-
-RDEPEND="${DEPEND}
- anttasks? ( dev-java/ant )
- >=dev-java/slf4j-api-1.3.1
- >=dev-java/sun-javamail-1.4
- >=dev-java/jta-1.0.1
- >=java-virtuals/jaf-1.1
- || ( virtual/jre:1.6
- virtual/jre:1.7
- )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_install() {
- cd "${S}"
- rm -f etc/jetty-sslengine.xml
-
- java-pkg_jarinto "/usr/share/${MY_JETTY}/lib/"
- java-pkg_sointo "/usr/lib/${MY_JETTY}"
-
- java-pkg_dojar start.jar
- java-pkg_newjar lib/${MY_PN}-${PV}.jar ${MY_PN}.jar
- java-pkg_newjar lib/${MY_PN}-util-${PV}.jar ${MY_PN}-util.jar
- java-pkg_newjar lib/jre1.5/${MY_PN}-util5-${PV}.jar ${MY_PN}-util5.jar
- java-pkg_newjar lib/annotations/${MY_PN}-annotations-${PV}.jar ${MY_PN}-annotations.jar
- java-pkg_newjar lib/ext/${MY_PN}-rewrite-handler-${PV}.jar ${MY_PN}-rewrite-handler.jar
- java-pkg_newjar lib/ext/${MY_PN}-html-${PV}.jar ${MY_PN}-html.jar
- java-pkg_newjar lib/ext/${MY_PN}-java5-threadpool-${PV}.jar ${MY_PN}-java5-threadpool.jar
- java-pkg_newjar lib/ext/${MY_PN}-ajp-${PV}.jar ${MY_PN}-ajp.jar
- java-pkg_newjar lib/ext/${MY_PN}-servlet-tester-${PV}.jar ${MY_PN}-servlet-tester.jar
- java-pkg_newjar lib/ext/${MY_PN}-setuid-${PV}.jar ${MY_PN}-setuid.jar
- java-pkg_doso lib/ext/libsetuid.so
- java-pkg_newjar lib/jsp-2.1/jsp-2.1-${MY_PN}-${PV}.jar jsp-2.1-${MY_PN}.jar
- java-pkg_newjar lib/management/${MY_PN}-management-${PV}.jar ${MY_PN}-management.jar
- java-pkg_newjar lib/naming/${MY_PN}-naming-${PV}.jar ${MY_PN}-naming.jar
- java-pkg_newjar lib/plus/${MY_PN}-plus-${PV}.jar ${MY_PN}-plus.jar
- java-pkg_newjar lib/terracotta/${MY_PN}-terracotta-sessions-${PV}.jar ${MY_PN}-terracotta-sessions.jar
- java-pkg_newjar lib/xbean/${MY_PN}-xbean-${PV}.jar ${MY_PN}-xbean.jar
-
- use client && java-pkg_newjar lib/ext/${MY_PN}-client-${PV}.jar ${MY_PN}-client.jar
- if use ldap ; then
- java-pkg_newjar lib/ext/${MY_PN}-ldap-jaas-${PV}.jar ${MY_PN}-ldap-jaas.jar
- else
- rm -f etc/jetty-jaas.xml
- fi
- if use ssl ; then
- java-pkg_newjar lib/ext/${MY_PN}-sslengine-${PV}.jar ${MY_PN}-sslengine.jar
- else
- rm -f etc/jetty-ssl.xml
- fi
- if use stats ; then
- java-pkg_newjar lib/ext/${MY_PN}-java5-stats-${PV}.jar ${MY_PN}-java5-stats.jar
- else
- rm -f etc/jetty-stats.xml
- fi
-
- if use anttasks ; then
- java-pkg_dojar bin/jetty-tasks.xml
- cd ${DISTDIR}
- java-pkg_newjar ${MY_PN}-ant-${PV}.jar ${MY_PN}-ant.jar
- cd ${S}
- fi
-
-
- dodir /etc/${MY_JETTY}
- insinto /etc/${MY_JETTY}
- doins etc/*
-
- dodir /etc/conf.d
- insinto /etc/conf.d
- newins ${FILESDIR}/conf.d/${MY_JETTY} ${MY_JETTY}
-
- dodir /etc/init.d
- exeinto /etc/init.d
- newexe ${FILESDIR}/init.d/${MY_JETTY} ${MY_JETTY}
-
- dodir /var/log/${MY_JETTY}
-
- JETTY_HOME=/var/lib/${MY_JETTY}
- dodir ${JETTY_HOME}/webapps
- dodir ${JETTY_HOME}/contexts
- dodir ${JETTY_HOME}/resources
- dosym ${JAVA_PKG_JARDEST} ${JETTY_HOME}/lib
- dosym ${JAVA_PKG_JARDEST}/start.jar ${JETTY_HOME}/start.jar
- dosym /etc/${MY_JETTY} ${JETTY_HOME}/etc
- dosym /var/log/${MY_JETTY} ${JETTY_HOME}/logs
-
- START_CONFIG=${D}/${JETTY_HOME}/start.config
- echo "\$(jetty.class.path).path always" > ${START_CONFIG}
- echo "\$(jetty.lib)/** exists \$(jetty.lib)" >> ${START_CONFIG}
- echo "jetty.home=${JETTY_HOME}" >> ${START_CONFIG}
- echo "org.mortbay.xml.XmlConfiguration.class" >> ${START_CONFIG}
- echo "\$(start.class).class" >> ${START_CONFIG}
- echo "\$(jetty.home)/etc/jetty.xml" >> ${START_CONFIG}
- echo "\$(jetty.home)/lib/*" >> ${START_CONFIG}
- echo "/usr/share/sun-javamail/lib/*" >> ${START_CONFIG}
- echo "/usr/share/ant/lib/*" >> ${START_CONFIG}
- echo "/usr/share/slf4j-api/lib/*" >> ${START_CONFIG}
- echo "/usr/share/jta/lib/*" >> ${START_CONFIG}
- if use tomcat7 ; then
- echo "/usr/share/tomcat-servlet-api-3.0/lib/*" >> ${START_CONFIG}
- else
- echo "/usr/share/tomcat-servlet-api-2.5/lib/*" >> ${START_CONFIG}
- fi
- echo "" >> ${START_CONFIG}
- echo "\$(jetty.home)/resources/" >> ${START_CONFIG}
-}
-
-pkg_preinst () {
- enewuser jetty
- fowners jetty:jetty /var/log/${MY_JETTY}
- fperms g+w /var/log/${MY_JETTY}
- mv ${D}/usr/share/${PN}-${SLOT}/package.env ${D}/usr/share/${MY_JETTY}/package.env
- rm -rf ${D}/usr/share/${PN}-${SLOT}
-}
-