diff options
138 files changed, 0 insertions, 24939 deletions
diff --git a/app-emulation/playonlinux/Manifest b/app-emulation/playonlinux/Manifest deleted file mode 100644 index 5698820c..00000000 --- a/app-emulation/playonlinux/Manifest +++ /dev/null @@ -1,10 +0,0 @@ -DIST PlayOnLinux_4.1.0.tar.gz 4010023 SHA256 d4131068ff86342b3fdd3a9e0613aef80500a103f6c5c4f5f4eb7393931e36e5 SHA512 b01cbf25bbb59f606dff7fd5ced5b5f96bf0d856f23353987e667fe2cc168909683cb819b4d8789f2b7561f608dad888f495b7cd679d3c826549871f8fbe673d WHIRLPOOL a19e083a8086203ca18791524a309d63c52910e21afcf06c36b3c7f170f6437550c4ca70900ed1f457bf82d58b26eb04a67a906c4b79261b77cfdcd0f9df1da3 -DIST PlayOnLinux_4.1.1.tar.gz 4010031 SHA256 eb314836ac798c7cbafdc76dc0660b2178610d3dc557d97aa7c72dfc0dee8e63 SHA512 4062f6a507e613bc46a118571fc0c6560b20adf3dd4707f581730bf1877a1fbbb234558bedd2b3be81c5ff8f9429dbc6c2030f9ad5b3b5174ff3908c3d0c43fd WHIRLPOOL 87270a50bc356cccd7347aca78d2fd63812701c8cc407b33b94636e11601d5d1bf9e7fefbf4c86195e1e4fd62506ba8c1a0e4107e93185552410ae6ec5004011 -DIST PlayOnLinux_4.1.3.tar.gz 4191726 SHA256 499bb79067237c238115fb3225d9bcc3b2d2fc62b6b9e2455feeac7a2c783ecd SHA512 0c67241ba659246ffd6b18421e482e028b4871ba0da98ec329599a81587ad18dbd983e3ea419a0c983a330771c78b3c28b76177f67bae530954f8f6419a86439 WHIRLPOOL ac596572aadf7e5a9fbbad3ddf5eec739af1555032e7d60a27840204cf201799684a38cc3d9761fae3f240d92fd886cab5d3d72e19a458c1b378111c0785568e -DIST PlayOnLinux_4.1.4.tar.gz 3999026 SHA256 304b2bb3431bc3d516976938bc633d4bbe2327e04c869f3bdfba05e232edab53 SHA512 f330602116efa25910f9e459a07ec59938fbc85e8d400fd6def7b48cac525ebd187b19eb9202f1801b56cd9d3dd8e6a5f8d664840afb973774ed540953705204 WHIRLPOOL d8bd7ad3e9b7b9ca27799fbfa7a651458e6569688c1d828c36e530c3119304d4f2331fb69f762e31285e5f5f35a8a37c5faf2bed05cf4fbed16d9dc642ce521f -DIST PlayOnLinux_4.1.5.tar.gz 3994564 SHA256 8a01cbb39bf6bae6d763bcf561bd8231eb462a85c73b804b599aab9561f8a981 SHA512 ae9e906a19a0daf26dee5656eb758f8fc6b864ca5a8fb88281b3b2c9543a06b352df72428e7028ec77cb1656aae01bc62ce443f45e62177c3a80e45d813e6de0 WHIRLPOOL 83137f970375ad9d061d741048ba928e6fd4ae489a3ef90aac57e16d00403f367925fc5ccb23fa5f11aa07503288a0097b77516196722245e5385b2b89c23774 -DIST PlayOnLinux_4.1.6.tar.gz 3994906 SHA256 e245d7b2f8255df21c3866cab45d2445b5759da6066e9c29b6b92cb4b0d2997c SHA512 a8a150d80b0c4eeb56809286b9f71360aaebca9a7ce7ad5d81fb4cd47e8c889dcdfaaa4d9b3fd0448541248e53b7c9103c49f2cf71346cd9ad2b3a054fac1983 WHIRLPOOL aa7977224ad3a55da79f4a0054c716b8916c5b76ab005341519021ea6d498857fc5a501f9a54309ee84ef7f47acc63a6de0801e415e61dcc870da7c3a2cf1bfe -DIST PlayOnLinux_4.1.8.tar.gz 4001263 SHA256 da7c5a92f19e3d72f393979a37b8c7ac7104765081c092ffeb855190742b2ec3 SHA512 027ff8adfc7bc9392c4353fbbf36f3b7adb2e0d64f550abca00d3f77d5b8fa387fce4965aa48f147b0492ba07a79f2271a5ab4b05f501752f9d8b94e3016ce43 WHIRLPOOL 1abe6b84da2455f06706f41bcd4e6c3f6f504a26e8eb8891d876fcb118825e51ee0fcf4043c63248869c78875e79f8732f38bd7a7c581d1d3ca7465dc7f0d56b -DIST PlayOnLinux_4.2.1.tar.gz 4308243 SHA256 c6e6622afc502cbd89f0d274055282c6a4d696273f167a76acba76a04e9cb0bb SHA512 ece0987275862530665eaeaa37b20ea3a14e367c19399c6024c55130dd7bc29200c5459ab72b42d2f410355793bf2166348aecb691f8179191ccac57217f9ba7 WHIRLPOOL 834f375aa1b8daf2e738368c48bd75d9a78931f6379c5184632061a8f50a1d89c91d69f317b51856489621ca14701ce38a32a3631737cb2b33453e001d2ea9e8 -DIST PlayOnLinux_4.2.5.tar.gz 4690660 SHA256 9fa13e5aa56a5327b1b8ce1bfe77147814a052ac762fbaa9d27c51616db4b097 SHA512 5773ec5a915e4ab968f261a17b0c9cc2e452c244f0e8137fc219e3b4d5e37f0f4e2709888870f786a9adc8647bd939da2f17977aebe1d455e0fdac3aaa73eca1 WHIRLPOOL 51adbc5aa1e2234d4be40742cf2161d4cfe6fdfe9f79f7aae03d74ba6f84ccad9a178ae7c77315ba84963fe7e7cbce0dfa34a512b96c99cbef260d2832d43989 -DIST PlayOnLinux_4.2.6.tar.gz 3202517 SHA256 34fc06ce55f889673529a405d17ffc045a68cc998a679377056ed63988dd64e2 SHA512 41c4af5335874020f6405f460a0b9787f7dcfb77790661ff254d2af7ff107a94020b75a8b4f1856f1e4b866e63dee49d5823edf4867d64cd20c41b17387f5490 WHIRLPOOL 4278cc00c76abfeecb87d125046a977c69d5e62b751481ffa5ed4ca4a911507bc6b650bd8648cc7b4cd794e7f0c9e91197adc3854c963770bd87a535d83ab562 diff --git a/app-emulation/playonlinux/playonlinux-4.1.0.ebuild b/app-emulation/playonlinux/playonlinux-4.1.0.ebuild deleted file mode 100644 index a8ef12cf..00000000 --- a/app-emulation/playonlinux/playonlinux-4.1.0.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="3" -PYTHON_DEPEND="2" - -inherit eutils python games - -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="" - -DEPEND="" -RDEPEND="app-emulation/wine - app-arch/cabextract - app-arch/unzip - dev-python/wxpython:2.8 - || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) - net-misc/wget - x11-apps/mesa-progs - x11-terms/xterm" - -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 -i -e "s/\(Categories=\).*/\1Game;Emulator;/" etc/PlayOnLinux.desktop \ - || die "sed failed" - sed -e 's/PYTHON="python"/PYTHON="python2"/' -i lib/variables || die "sed failed" - python_convert_shebangs -r 2 . -} - -src_install() { - # all things without exec permissions - insinto "${GAMES_DATADIR}/${PN}" - doins -r resources lang lib etc plugins || die "doins failed" - - # bash/ install - exeinto "${GAMES_DATADIR}/${PN}/bash" - doexe bash/* || die "doexe failed" - exeinto "${GAMES_DATADIR}/${PN}/bash/terminals" - doexe bash/terminals/* || die "doexe failed" - exeinto "${GAMES_DATADIR}/${PN}/bash/expert" - doexe bash/expert/* || die "doexe failed" - - # python/ install - exeinto "${GAMES_DATADIR}/${PN}/python" - doexe python/* || die "doexe failed" - # sub dir without exec permissions - insinto "${GAMES_DATADIR}/${PN}/python" - doins -r python/lib || die "doins failed" - - # main executable files - exeinto "${GAMES_DATADIR}/${PN}" - doexe ${PN}{,-pkg,-bash,-shell,-url_handler} || die "doexe failed" - - # making a script to run playonlinux from ${GAMES_BINDIR} - echo "#!/bin/bash" > ${PN}_launcher - echo "cd \"${GAMES_DATADIR}/${PN}\" && ./${PN} \$*" >> ${PN}_launcher - newgamesbin playonlinux_launcher playonlinux || die "newgamesbin failed" - - # making a script to run playonlinux-cmd from ${GAMES_BINDIR} - echo "#!/bin/bash" > ${PN}_cmd_launcher - echo "cd \"${GAMES_DATADIR}/${PN}\" && ./${PN}-cmd \$*" >> ${PN}_cmd_launcher - newgamesbin playonlinux_cmd_launcher playonlinux-cmd || die "newgamesbin failed" - - dodoc CHANGELOG || die "dodoc failed" - - doicon etc/${PN}.png || die "doicon failed" - domenu etc/${MY_PN}.desktop || die "domenu failed" - prepgamesdirs -} - -pkg_postinst() { - games_pkg_postinst - python_mod_optimize "${GAMES_DATADIR}/${PN}" -} - -pkg_postrm() { - python_mod_cleanup "${GAMES_DATADIR}/${PN}" - - ewarn "Installed softwares and games with playonlinux have not been removed." - ewarn "To remove them, you can re-install playonlinux and remove them using it" - ewarn "or do it manually by removing .PlayOnLinux/ in your home directory." -} diff --git a/app-emulation/playonlinux/playonlinux-4.1.1.ebuild b/app-emulation/playonlinux/playonlinux-4.1.1.ebuild deleted file mode 100644 index a8ef12cf..00000000 --- a/app-emulation/playonlinux/playonlinux-4.1.1.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="3" -PYTHON_DEPEND="2" - -inherit eutils python games - -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="" - -DEPEND="" -RDEPEND="app-emulation/wine - app-arch/cabextract - app-arch/unzip - dev-python/wxpython:2.8 - || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) - net-misc/wget - x11-apps/mesa-progs - x11-terms/xterm" - -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 -i -e "s/\(Categories=\).*/\1Game;Emulator;/" etc/PlayOnLinux.desktop \ - || die "sed failed" - sed -e 's/PYTHON="python"/PYTHON="python2"/' -i lib/variables || die "sed failed" - python_convert_shebangs -r 2 . -} - -src_install() { - # all things without exec permissions - insinto "${GAMES_DATADIR}/${PN}" - doins -r resources lang lib etc plugins || die "doins failed" - - # bash/ install - exeinto "${GAMES_DATADIR}/${PN}/bash" - doexe bash/* || die "doexe failed" - exeinto "${GAMES_DATADIR}/${PN}/bash/terminals" - doexe bash/terminals/* || die "doexe failed" - exeinto "${GAMES_DATADIR}/${PN}/bash/expert" - doexe bash/expert/* || die "doexe failed" - - # python/ install - exeinto "${GAMES_DATADIR}/${PN}/python" - doexe python/* || die "doexe failed" - # sub dir without exec permissions - insinto "${GAMES_DATADIR}/${PN}/python" - doins -r python/lib || die "doins failed" - - # main executable files - exeinto "${GAMES_DATADIR}/${PN}" - doexe ${PN}{,-pkg,-bash,-shell,-url_handler} || die "doexe failed" - - # making a script to run playonlinux from ${GAMES_BINDIR} - echo "#!/bin/bash" > ${PN}_launcher - echo "cd \"${GAMES_DATADIR}/${PN}\" && ./${PN} \$*" >> ${PN}_launcher - newgamesbin playonlinux_launcher playonlinux || die "newgamesbin failed" - - # making a script to run playonlinux-cmd from ${GAMES_BINDIR} - echo "#!/bin/bash" > ${PN}_cmd_launcher - echo "cd \"${GAMES_DATADIR}/${PN}\" && ./${PN}-cmd \$*" >> ${PN}_cmd_launcher - newgamesbin playonlinux_cmd_launcher playonlinux-cmd || die "newgamesbin failed" - - dodoc CHANGELOG || die "dodoc failed" - - doicon etc/${PN}.png || die "doicon failed" - domenu etc/${MY_PN}.desktop || die "domenu failed" - prepgamesdirs -} - -pkg_postinst() { - games_pkg_postinst - python_mod_optimize "${GAMES_DATADIR}/${PN}" -} - -pkg_postrm() { - python_mod_cleanup "${GAMES_DATADIR}/${PN}" - - ewarn "Installed softwares and games with playonlinux have not been removed." - ewarn "To remove them, you can re-install playonlinux and remove them using it" - ewarn "or do it manually by removing .PlayOnLinux/ in your home directory." -} diff --git a/app-emulation/playonlinux/playonlinux-4.1.3.ebuild b/app-emulation/playonlinux/playonlinux-4.1.3.ebuild deleted file mode 100644 index 0fdcc7e6..00000000 --- a/app-emulation/playonlinux/playonlinux-4.1.3.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/playonlinux/playonlinux-4.1.1.ebuild,v 1.1 2012/06/16 19:12:24 pacho Exp $ - -EAPI="4" -PYTHON_DEPEND="2" - -inherit eutils python games - -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 - 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 -i -e "s/\(Categories=\).*/\1Game;Emulator;/" etc/PlayOnLinux.desktop \ - || die - sed -e 's/PYTHON="python"/PYTHON="python2"/' -i lib/variables playonlinux || die - python_convert_shebangs -r 2 . -} - -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/terminals" - #doexe bash/terminals/* - 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} - - # making a script to run playonlinux from ${GAMES_BINDIR} - echo "#!/bin/bash" > ${PN}_launcher - echo "cd \"${GAMES_DATADIR}/${PN}\" && ./${PN} \$*" >> ${PN}_launcher - newgamesbin playonlinux_launcher playonlinux - - # making a script to run playonlinux-cmd from ${GAMES_BINDIR} - echo "#!/bin/bash" > ${PN}_cmd_launcher - echo "cd \"${GAMES_DATADIR}/${PN}\" && ./${PN}-cmd \$*" >> ${PN}_cmd_launcher - newgamesbin playonlinux_cmd_launcher playonlinux-cmd - - dodoc CHANGELOG - - doicon etc/${PN}.png - domenu etc/${MY_PN}.desktop - prepgamesdirs -} - -pkg_postinst() { - games_pkg_postinst - python_mod_optimize "${GAMES_DATADIR}/${PN}" -} - -pkg_postrm() { - python_mod_cleanup "${GAMES_DATADIR}/${PN}" - - 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." -} diff --git a/app-emulation/playonlinux/playonlinux-4.1.4.ebuild b/app-emulation/playonlinux/playonlinux-4.1.4.ebuild deleted file mode 100644 index 0fdcc7e6..00000000 --- a/app-emulation/playonlinux/playonlinux-4.1.4.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/playonlinux/playonlinux-4.1.1.ebuild,v 1.1 2012/06/16 19:12:24 pacho Exp $ - -EAPI="4" -PYTHON_DEPEND="2" - -inherit eutils python games - -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 - 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 -i -e "s/\(Categories=\).*/\1Game;Emulator;/" etc/PlayOnLinux.desktop \ - || die - sed -e 's/PYTHON="python"/PYTHON="python2"/' -i lib/variables playonlinux || die - python_convert_shebangs -r 2 . -} - -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/terminals" - #doexe bash/terminals/* - 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} - - # making a script to run playonlinux from ${GAMES_BINDIR} - echo "#!/bin/bash" > ${PN}_launcher - echo "cd \"${GAMES_DATADIR}/${PN}\" && ./${PN} \$*" >> ${PN}_launcher - newgamesbin playonlinux_launcher playonlinux - - # making a script to run playonlinux-cmd from ${GAMES_BINDIR} - echo "#!/bin/bash" > ${PN}_cmd_launcher - echo "cd \"${GAMES_DATADIR}/${PN}\" && ./${PN}-cmd \$*" >> ${PN}_cmd_launcher - newgamesbin playonlinux_cmd_launcher playonlinux-cmd - - dodoc CHANGELOG - - doicon etc/${PN}.png - domenu etc/${MY_PN}.desktop - prepgamesdirs -} - -pkg_postinst() { - games_pkg_postinst - python_mod_optimize "${GAMES_DATADIR}/${PN}" -} - -pkg_postrm() { - python_mod_cleanup "${GAMES_DATADIR}/${PN}" - - 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." -} diff --git a/app-emulation/playonlinux/playonlinux-4.1.5.ebuild b/app-emulation/playonlinux/playonlinux-4.1.5.ebuild deleted file mode 100644 index 0fdcc7e6..00000000 --- a/app-emulation/playonlinux/playonlinux-4.1.5.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/playonlinux/playonlinux-4.1.1.ebuild,v 1.1 2012/06/16 19:12:24 pacho Exp $ - -EAPI="4" -PYTHON_DEPEND="2" - -inherit eutils python games - -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 - 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 -i -e "s/\(Categories=\).*/\1Game;Emulator;/" etc/PlayOnLinux.desktop \ - || die - sed -e 's/PYTHON="python"/PYTHON="python2"/' -i lib/variables playonlinux || die - python_convert_shebangs -r 2 . -} - -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/terminals" - #doexe bash/terminals/* - 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} - - # making a script to run playonlinux from ${GAMES_BINDIR} - echo "#!/bin/bash" > ${PN}_launcher - echo "cd \"${GAMES_DATADIR}/${PN}\" && ./${PN} \$*" >> ${PN}_launcher - newgamesbin playonlinux_launcher playonlinux - - # making a script to run playonlinux-cmd from ${GAMES_BINDIR} - echo "#!/bin/bash" > ${PN}_cmd_launcher - echo "cd \"${GAMES_DATADIR}/${PN}\" && ./${PN}-cmd \$*" >> ${PN}_cmd_launcher - newgamesbin playonlinux_cmd_launcher playonlinux-cmd - - dodoc CHANGELOG - - doicon etc/${PN}.png - domenu etc/${MY_PN}.desktop - prepgamesdirs -} - -pkg_postinst() { - games_pkg_postinst - python_mod_optimize "${GAMES_DATADIR}/${PN}" -} - -pkg_postrm() { - python_mod_cleanup "${GAMES_DATADIR}/${PN}" - - 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." -} diff --git a/app-emulation/playonlinux/playonlinux-4.1.6.ebuild b/app-emulation/playonlinux/playonlinux-4.1.6.ebuild deleted file mode 100644 index 241edd16..00000000 --- a/app-emulation/playonlinux/playonlinux-4.1.6.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/playonlinux/playonlinux-4.1.1.ebuild,v 1.1 2012/06/16 19:12:24 pacho Exp $ - -EAPI="4" -PYTHON_DEPEND="2" - -inherit eutils python games - -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 - 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 -i -e "s/\(Categories=\).*/\1Game;Emulator;/" etc/PlayOnLinux.desktop \ - || die - sed -e 's/PYTHON="python"/PYTHON="python2"/' -i lib/variables playonlinux || die - python_convert_shebangs -r 2 . -} - -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/terminals" - #doexe bash/terminals/* - 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} - - # making a script to run playonlinux from ${GAMES_BINDIR} - echo "#!/bin/bash" > ${PN}_launcher - echo "cd \"${GAMES_DATADIR}/${PN}\" && ./${PN} \$*" >> ${PN}_launcher - newgamesbin playonlinux_launcher playonlinux - - # making a script to run playonlinux-cmd from ${GAMES_BINDIR} - echo "#!/bin/bash" > ${PN}_cmd_launcher - echo "cd \"${GAMES_DATADIR}/${PN}\" && ./${PN}-cmd \$*" >> ${PN}_cmd_launcher - newgamesbin playonlinux_cmd_launcher playonlinux-cmd - - dodoc CHANGELOG - - doicon etc/${PN}.png - domenu etc/${MY_PN}.desktop - prepgamesdirs - - if [ -f "/usr/bin/python2.6" ]; then - addwrite /usr/local/bin/ - if [ ! -f "/usr/local/bin/python2.6" ]; then - dosym /usr/bin/python2.6 /usr/local/bin/ || die - else - echo "The file already existed" - rm /usr/local/bin/python2.6 || die - dosym /usr/bin/python2.6 /usr/local/bin/ || die - echo "Replaced it" - fi - if [ ! -f "/usr/local/bin/python2.6-config" ]; then - dosym /usr/bin/python-config-2.6 /usr/local/bin/python2.6-config || die - else - echo "The file already existed" - rm /usr/local/bin/python2.6-config || die - dosym /usr/bin/python-config-2.6 /usr/local/bin/python2.6-config || die - echo "Replaced it" - fi - else - ewarn "There is no python2.6, you should emerge python2.6" - fi -} - -pkg_postinst() { - games_pkg_postinst - python_mod_optimize "${GAMES_DATADIR}/${PN}" -} - -pkg_postrm() { - python_mod_cleanup "${GAMES_DATADIR}/${PN}" - - 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." -} diff --git a/app-emulation/playonlinux/playonlinux-4.1.8.ebuild b/app-emulation/playonlinux/playonlinux-4.1.8.ebuild deleted file mode 100644 index 8b22bda7..00000000 --- a/app-emulation/playonlinux/playonlinux-4.1.8.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/playonlinux/playonlinux-4.1.1.ebuild,v 1.1 2012/06/16 19:12:24 pacho Exp $ - -EAPI="4" -PYTHON_DEPEND="2" - -inherit eutils python games - -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 - net-analyzer/netcat6 - 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 - 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 -i -e "s/\(Categories=\).*/\1Game;Emulator;/" etc/PlayOnLinux.desktop \ - || die - sed -e 's/PYTHON="python"/PYTHON="python2"/' -i lib/variables playonlinux || die - python_convert_shebangs -r 2 . -} - -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/terminals" - #doexe bash/terminals/* - 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} - - # making a script to run playonlinux from ${GAMES_BINDIR} - echo "#!/bin/bash" > ${PN}_launcher - echo "cd \"${GAMES_DATADIR}/${PN}\" && ./${PN} \$*" >> ${PN}_launcher - newgamesbin playonlinux_launcher playonlinux - - # making a script to run playonlinux-cmd from ${GAMES_BINDIR} - echo "#!/bin/bash" > ${PN}_cmd_launcher - echo "cd \"${GAMES_DATADIR}/${PN}\" && ./${PN}-cmd \$*" >> ${PN}_cmd_launcher - newgamesbin playonlinux_cmd_launcher playonlinux-cmd - - dodoc CHANGELOG - - doicon etc/${PN}.png - domenu etc/${MY_PN}.desktop - prepgamesdirs - - if [ -f "/usr/bin/python2.6" ]; then - addwrite /usr/local/bin/ - if [ ! -f "/usr/local/bin/python2.6" ]; then - dosym /usr/bin/python2.6 /usr/local/bin/ || die - else - echo "The file already existed" - rm /usr/local/bin/python2.6 || die - dosym /usr/bin/python2.6 /usr/local/bin/ || die - echo "Replaced it" - fi - if [ ! -f "/usr/local/bin/python2.6-config" ]; then - dosym /usr/bin/python-config-2.6 /usr/local/bin/python2.6-config || die - else - echo "The file already existed" - rm /usr/local/bin/python2.6-config || die - dosym /usr/bin/python-config-2.6 /usr/local/bin/python2.6-config || die - echo "Replaced it" - fi - else - ewarn "There is no python2.6, you should emerge python2.6" - fi -} - -pkg_postinst() { - games_pkg_postinst - python_mod_optimize "${GAMES_DATADIR}/${PN}" -} - -pkg_postrm() { - python_mod_cleanup "${GAMES_DATADIR}/${PN}" - - 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." -} diff --git a/app-emulation/playonlinux/playonlinux-4.2.1.ebuild b/app-emulation/playonlinux/playonlinux-4.2.1.ebuild deleted file mode 100644 index 8b22bda7..00000000 --- a/app-emulation/playonlinux/playonlinux-4.2.1.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/playonlinux/playonlinux-4.1.1.ebuild,v 1.1 2012/06/16 19:12:24 pacho Exp $ - -EAPI="4" -PYTHON_DEPEND="2" - -inherit eutils python games - -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 - net-analyzer/netcat6 - 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 - 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 -i -e "s/\(Categories=\).*/\1Game;Emulator;/" etc/PlayOnLinux.desktop \ - || die - sed -e 's/PYTHON="python"/PYTHON="python2"/' -i lib/variables playonlinux || die - python_convert_shebangs -r 2 . -} - -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/terminals" - #doexe bash/terminals/* - 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} - - # making a script to run playonlinux from ${GAMES_BINDIR} - echo "#!/bin/bash" > ${PN}_launcher - echo "cd \"${GAMES_DATADIR}/${PN}\" && ./${PN} \$*" >> ${PN}_launcher - newgamesbin playonlinux_launcher playonlinux - - # making a script to run playonlinux-cmd from ${GAMES_BINDIR} - echo "#!/bin/bash" > ${PN}_cmd_launcher - echo "cd \"${GAMES_DATADIR}/${PN}\" && ./${PN}-cmd \$*" >> ${PN}_cmd_launcher - newgamesbin playonlinux_cmd_launcher playonlinux-cmd - - dodoc CHANGELOG - - doicon etc/${PN}.png - domenu etc/${MY_PN}.desktop - prepgamesdirs - - if [ -f "/usr/bin/python2.6" ]; then - addwrite /usr/local/bin/ - if [ ! -f "/usr/local/bin/python2.6" ]; then - dosym /usr/bin/python2.6 /usr/local/bin/ || die - else - echo "The file already existed" - rm /usr/local/bin/python2.6 || die - dosym /usr/bin/python2.6 /usr/local/bin/ || die - echo "Replaced it" - fi - if [ ! -f "/usr/local/bin/python2.6-config" ]; then - dosym /usr/bin/python-config-2.6 /usr/local/bin/python2.6-config || die - else - echo "The file already existed" - rm /usr/local/bin/python2.6-config || die - dosym /usr/bin/python-config-2.6 /usr/local/bin/python2.6-config || die - echo "Replaced it" - fi - else - ewarn "There is no python2.6, you should emerge python2.6" - fi -} - -pkg_postinst() { - games_pkg_postinst - python_mod_optimize "${GAMES_DATADIR}/${PN}" -} - -pkg_postrm() { - python_mod_cleanup "${GAMES_DATADIR}/${PN}" - - 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." -} diff --git a/app-emulation/playonlinux/playonlinux-4.2.5.ebuild b/app-emulation/playonlinux/playonlinux-4.2.5.ebuild deleted file mode 100644 index abb687f7..00000000 --- a/app-emulation/playonlinux/playonlinux-4.2.5.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/playonlinux/playonlinux-4.1.1.ebuild,v 1.1 2012/06/16 19:12:24 pacho Exp $ - -EAPI="4" -PYTHON_DEPEND="2" - -inherit eutils python games - -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 - net-analyzer/netcat6 - 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 - 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 -i -e "s/\(Categories=\).*/\1Game;Emulator;/" etc/PlayOnLinux.desktop \ - || die - sed -e 's/PYTHON="python"/PYTHON="python2"/' -i lib/variables playonlinux || die - python_convert_shebangs -r 2 . -} - -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/terminals" - #doexe bash/terminals/* - 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} - - # making a script to run playonlinux from ${GAMES_BINDIR} - echo "#!/bin/bash" > ${PN}_launcher - echo "cd \"${GAMES_DATADIR}/${PN}\" && ./${PN} \$*" >> ${PN}_launcher - newgamesbin playonlinux_launcher playonlinux - - # making a script to run playonlinux-cmd from ${GAMES_BINDIR} - echo "#!/bin/bash" > ${PN}_cmd_launcher - echo "cd \"${GAMES_DATADIR}/${PN}\" && ./${PN}-cmd \$*" >> ${PN}_cmd_launcher - newgamesbin playonlinux_cmd_launcher playonlinux-cmd - - #dodoc CHANGELOG - - doicon etc/${PN}.png - domenu etc/${MY_PN}.desktop - prepgamesdirs - - if [ -f "/usr/bin/python2.6" ]; then - addwrite /usr/local/bin/ - if [ ! -f "/usr/local/bin/python2.6" ]; then - dosym /usr/bin/python2.6 /usr/local/bin/ || die - else - echo "The file already existed" - rm /usr/local/bin/python2.6 || die - dosym /usr/bin/python2.6 /usr/local/bin/ || die - echo "Replaced it" - fi - if [ ! -f "/usr/local/bin/python2.6-config" ]; then - dosym /usr/bin/python-config-2.6 /usr/local/bin/python2.6-config || die - else - echo "The file already existed" - rm /usr/local/bin/python2.6-config || die - dosym /usr/bin/python-config-2.6 /usr/local/bin/python2.6-config || die - echo "Replaced it" - fi - else - ewarn "There is no python2.6, you should emerge python2.6" - fi -} - -pkg_postinst() { - games_pkg_postinst - python_mod_optimize "${GAMES_DATADIR}/${PN}" -} - -pkg_postrm() { - python_mod_cleanup "${GAMES_DATADIR}/${PN}" - - 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." -} diff --git a/app-emulation/playonlinux/playonlinux-4.2.6.ebuild b/app-emulation/playonlinux/playonlinux-4.2.6.ebuild deleted file mode 100644 index abb687f7..00000000 --- a/app-emulation/playonlinux/playonlinux-4.2.6.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/playonlinux/playonlinux-4.1.1.ebuild,v 1.1 2012/06/16 19:12:24 pacho Exp $ - -EAPI="4" -PYTHON_DEPEND="2" - -inherit eutils python games - -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 - net-analyzer/netcat6 - 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 - 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 -i -e "s/\(Categories=\).*/\1Game;Emulator;/" etc/PlayOnLinux.desktop \ - || die - sed -e 's/PYTHON="python"/PYTHON="python2"/' -i lib/variables playonlinux || die - python_convert_shebangs -r 2 . -} - -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/terminals" - #doexe bash/terminals/* - 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} - - # making a script to run playonlinux from ${GAMES_BINDIR} - echo "#!/bin/bash" > ${PN}_launcher - echo "cd \"${GAMES_DATADIR}/${PN}\" && ./${PN} \$*" >> ${PN}_launcher - newgamesbin playonlinux_launcher playonlinux - - # making a script to run playonlinux-cmd from ${GAMES_BINDIR} - echo "#!/bin/bash" > ${PN}_cmd_launcher - echo "cd \"${GAMES_DATADIR}/${PN}\" && ./${PN}-cmd \$*" >> ${PN}_cmd_launcher - newgamesbin playonlinux_cmd_launcher playonlinux-cmd - - #dodoc CHANGELOG - - doicon etc/${PN}.png - domenu etc/${MY_PN}.desktop - prepgamesdirs - - if [ -f "/usr/bin/python2.6" ]; then - addwrite /usr/local/bin/ - if [ ! -f "/usr/local/bin/python2.6" ]; then - dosym /usr/bin/python2.6 /usr/local/bin/ || die - else - echo "The file already existed" - rm /usr/local/bin/python2.6 || die - dosym /usr/bin/python2.6 /usr/local/bin/ || die - echo "Replaced it" - fi - if [ ! -f "/usr/local/bin/python2.6-config" ]; then - dosym /usr/bin/python-config-2.6 /usr/local/bin/python2.6-config || die - else - echo "The file already existed" - rm /usr/local/bin/python2.6-config || die - dosym /usr/bin/python-config-2.6 /usr/local/bin/python2.6-config || die - echo "Replaced it" - fi - else - ewarn "There is no python2.6, you should emerge python2.6" - fi -} - -pkg_postinst() { - games_pkg_postinst - python_mod_optimize "${GAMES_DATADIR}/${PN}" -} - -pkg_postrm() { - python_mod_cleanup "${GAMES_DATADIR}/${PN}" - - 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." -} diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest deleted file mode 100644 index d2ad20d1..00000000 --- a/app-emulation/wine/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -DIST wine-1.7.34-gstreamer-v5.patch.bz2 5703 SHA256 c3bb6f669f46d9f2d7ba494a2264cee457349f559d4b0758db80e39eb22f2aee SHA512 e780394e8739a58593d264322c462bfe9040c1cabce93b84d24f09040026368efb4ac34a6a302beb6048d14b4ac835b87a0c515b52c1a0c143aa4e15691eb01b WHIRLPOOL 1befbb0fbd026d6e833c5d72341064dd6e12157e1b7df58e349b9985648bfbc63f70e9cab45b61155515ac65057968e30ba313e71e183b8027153c9392d89192 -DIST wine-1.7.55.tar.bz2 22814631 SHA256 a148f6c9cb45a75ef1a15e60a7db9c22fce985e0e58fe1350e7931dfe5d36119 SHA512 f47025017836ce1bbf2ed69c7d7421bd8a2f33ff94ced4a5caf92f4fabdf336119c80a28aeb8ba1ebe0239871a6ac62d8af8435d220c317624c17aabc2100dd7 WHIRLPOOL c5575d2ef687caccbdb5cc09a0c6a4ba9f65ec9674cbe3f23ecfced62710dcb0019a11ff66f2ec4c2eafdb30d9891abad158ac4f865cc580a2878067de7304d7 -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.55.tar.gz 9604441 SHA256 856b630fe95250e3d2dfc80588529e42e92e37f2e974ce8d3da37b39bf5cc3c3 SHA512 a6fbfa01b6d6efc75f79235aea86091c32ddf91ca300c73325c8347949c627f53ceb0fe085d6c212602797b0496d36c0a79f08eae4644a17774e95906332032d WHIRLPOOL ad232568c9df5d436a79a3557c82e231eed121356d8db1f5a3c0e7249b6c2760d87bb433ff30d6db53ce190b2d49401aa387b06f0c3f74925aefea7b1d73f112 -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 diff --git a/app-emulation/wine/files/pr66838.c b/app-emulation/wine/files/pr66838.c deleted file mode 100644 index cd616859..00000000 --- a/app-emulation/wine/files/pr66838.c +++ /dev/null @@ -1,36 +0,0 @@ -/* From gcc svn, /branches/gcc-5-branch/gcc/testsuite/gcc.target/i386/pr66838.c */ -/* Copyrighted and distributed under the same terms as gcc */ - -void abort (void); - -char global; - -__attribute__((sysv_abi, noinline, noclone)) -void sysv_abi_func(char const *desc, void *local) -{ - register int esi asm ("esi"); - register int edi asm ("edi"); - - if (local != &global) - abort (); - - /* Clobber some of the extra SYSV ABI registers. */ - asm volatile ("movl\t%2, %0\n\tmovl\t%2, %1" - : "=r" (esi), "=r" (edi) - : "i" (0xdeadbeef)); -} - -__attribute__((ms_abi, noinline, noclone)) -void ms_abi_func () -{ - sysv_abi_func ("1st call", &global); - sysv_abi_func ("2nd call", &global); - sysv_abi_func ("3rd call", &global); -} - -int -main(void) -{ - ms_abi_func(); - return 0; -} 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 be6ffc56..00000000 --- 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.17-osmesa-check.patch b/app-emulation/wine/files/wine-1.5.17-osmesa-check.patch deleted file mode 100644 index 82361927..00000000 --- a/app-emulation/wine/files/wine-1.5.17-osmesa-check.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 1ede664b18bd8a88359a3cebb291ad49833ee033 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 cc32c24..275b792 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1128,7 +1128,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 $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS]) -+ WINE_CHECK_SONAME(OSMesa,OSMesaCreateContext,,,[$X_LIBS $X_PRE_LIBS $XLIB -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 $X_PRE_LIBS $XLIB -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.0 - 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 2045e343..00000000 --- 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 75372f86..00000000 --- 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.0-freetype-header-location.patch b/app-emulation/wine/files/wine-1.7.0-freetype-header-location.patch deleted file mode 100644 index aba4b898..00000000 --- a/app-emulation/wine/files/wine-1.7.0-freetype-header-location.patch +++ /dev/null @@ -1,351 +0,0 @@ -From 67f9b6e3c5d2397446d39ab454f691c1ee46d2c0 Mon Sep 17 00:00:00 2001 -From: Alexandre Julliard <julliard@winehq.org> -Date: Sat, 30 Nov 2013 11:22:25 +0100 -Subject: [PATCH] configure: Update FreeType configure checks for the changed - headers location. - ---- - configure | 78 +++++++++++++++------------------------------------ - configure.ac | 40 +++++++------------------- - dlls/gdi32/freetype.c | 62 ++++++++++++++-------------------------- - include/config.h.in | 33 ---------------------- - 4 files changed, 54 insertions(+), 159 deletions(-) - -diff --git a/configure b/configure -index 80348f3..9b2f2c2 100755 ---- a/configure -+++ b/configure -@@ -11419,7 +11419,21 @@ test "$cross_compiling" = yes || FREETYPE_LIBS=${FREETYPE_LIBS:-`(freetype-confi - FREETYPE_LIBS=${FREETYPE_LIBS:-"-lfreetype"} - ac_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS" --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lfreetype" >&5 -+for ac_header in ft2build.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "ft2build.h" "ac_cv_header_ft2build_h" "$ac_includes_default" -+if test "x$ac_cv_header_ft2build_h" = xyes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_FT2BUILD_H 1 -+_ACEOF -+ -+fi -+ -+done -+ -+ if test "$ac_cv_header_ft2build_h" = "yes" -+ then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lfreetype" >&5 - $as_echo_n "checking for -lfreetype... " >&6; } - if ${ac_cv_lib_soname_freetype+:} false; then : - $as_echo_n "(cached) " >&6 -@@ -11461,7 +11475,7 @@ fi - if test "x$ac_cv_lib_soname_freetype" = "x"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 - $as_echo "not found" >&6; } -- ft_lib=no -+ FREETYPE_LIBS="" - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_freetype" >&5 - $as_echo "$ac_cv_lib_soname_freetype" >&6; } -@@ -11470,51 +11484,11 @@ cat >>confdefs.h <<_ACEOF - #define SONAME_LIBFREETYPE "$ac_cv_lib_soname_freetype" - _ACEOF - -- ft_lib=yes --fi -- if test "$ft_lib" = "yes" -- then -- for ac_header in ft2build.h \ -- freetype/freetype.h \ -- freetype/ftglyph.h \ -- freetype/fttypes.h \ -- freetype/tttables.h \ -- freetype/ftsnames.h \ -- freetype/ttnameid.h \ -- freetype/ftoutln.h \ -- freetype/ftwinfnt.h \ -- freetype/ftmodapi.h \ -- freetype/ftlcdfil.h --do : -- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` --ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#ifdef HAVE_FT2BUILD_H --# include <ft2build.h> --#endif --" --if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 --_ACEOF -- --fi -- --done -- -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#include <ft2build.h> --#include <freetype/fttrigon.h> --_ACEOF --if ac_fn_c_try_cpp "$LINENO"; then : - --$as_echo "#define HAVE_FREETYPE_FTTRIGON_H 1" >>confdefs.h -+$as_echo "#define HAVE_FREETYPE 1" >>confdefs.h - -- wine_cv_fttrigon=yes --else -- wine_cv_fttrigon=no --fi --rm -f conftest.err conftest.i conftest.$ac_ext -- ac_fn_c_check_type "$LINENO" "FT_TrueTypeEngineType" "ac_cv_type_FT_TrueTypeEngineType" "#include <freetype/ftmodapi.h> -+ ac_fn_c_check_type "$LINENO" "FT_TrueTypeEngineType" "ac_cv_type_FT_TrueTypeEngineType" "#include <ft2build.h> -+#include FT_MODULE_H - " - if test "x$ac_cv_type_FT_TrueTypeEngineType" = xyes; then : - -@@ -11525,15 +11499,9 @@ _ACEOF - - fi - -- if test "$ac_cv_header_freetype_freetype_h" = "yes" -a "$wine_cv_fttrigon" = "yes" -- then -- --$as_echo "#define HAVE_FREETYPE 1" >>confdefs.h -- -- else -- FREETYPE_LIBS="" -- fi -+fi - else -+ FREETYPE_CFLAGS="" - FREETYPE_LIBS="" - fi - CPPFLAGS=$ac_save_CPPFLAGS -@@ -11541,14 +11509,14 @@ test -z "$FREETYPE_CFLAGS" || FREETYPE_CFLAGS=`echo " $FREETYPE_CFLAGS" | sed 's - test -z "$FREETYPE_LIBS" || FREETYPE_LIBS=`echo " $FREETYPE_LIBS" | sed 's/ -L\([^/]\)/ -L\$(top_builddir)\/\1/g'` - - fi --if test "x$ac_cv_header_freetype_freetype_h" != xyes -o "x$wine_cv_fttrigon" != xyes; then : -+if test "x$ac_cv_lib_soname_freetype" = x; then : - case "x$with_freetype" in - xno) ;; - *) as_fn_error $? "FreeType ${notice_platform}development files not found. Fonts will not be built. - Use the --without-freetype option if you really want this." "$LINENO" 5 ;; - esac - fi --test "x$ac_cv_header_freetype_freetype_h" = xyes -a "x$wine_cv_fttrigon" = xyes || enable_fonts=${enable_fonts:-no} -+test "x$ac_cv_lib_soname_freetype" = x && enable_fonts=${enable_fonts:-no} - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for parport header/ppdev.h" >&5 - $as_echo_n "checking for parport header/ppdev.h... " >&6; } -diff --git a/configure.ac b/configure.ac -index 81b7027..c4021b4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1463,42 +1463,22 @@ then - WINE_PACKAGE_FLAGS(FREETYPE,[freetype2],[-lfreetype], - [`(freetype-config --cflags || freetype2-config --cflags) 2>/dev/null`], - [`(freetype-config --libs || freetype2-config --libs) 2>/dev/null`], -- [WINE_CHECK_SONAME(freetype,FT_Init_FreeType,[ft_lib=yes],[ft_lib=no],[$FREETYPE_LIBS]) -- if test "$ft_lib" = "yes" -+ [AC_CHECK_HEADERS([ft2build.h]) -+ if test "$ac_cv_header_ft2build_h" = "yes" - then -- AC_CHECK_HEADERS(ft2build.h \ -- freetype/freetype.h \ -- freetype/ftglyph.h \ -- freetype/fttypes.h \ -- freetype/tttables.h \ -- freetype/ftsnames.h \ -- freetype/ttnameid.h \ -- freetype/ftoutln.h \ -- freetype/ftwinfnt.h \ -- freetype/ftmodapi.h \ -- freetype/ftlcdfil.h,,, -- [#ifdef HAVE_FT2BUILD_H --# include <ft2build.h> --#endif]) -- AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <ft2build.h> --#include <freetype/fttrigon.h>]])],[AC_DEFINE(HAVE_FREETYPE_FTTRIGON_H, 1, -- [Define if you have the <freetype/fttrigon.h> header file.]) -- wine_cv_fttrigon=yes],[wine_cv_fttrigon=no]) -- AC_CHECK_TYPES(FT_TrueTypeEngineType,,,[#include <freetype/ftmodapi.h>]) -- dnl Check that we have at least freetype/freetype.h -- if test "$ac_cv_header_freetype_freetype_h" = "yes" -a "$wine_cv_fttrigon" = "yes" -- then -- AC_DEFINE(HAVE_FREETYPE, 1, [Define if FreeType 2 is installed]) -- else -- FREETYPE_LIBS="" -- fi -+ WINE_CHECK_SONAME(freetype,FT_Init_FreeType, -+ [AC_DEFINE(HAVE_FREETYPE, 1, [Define if FreeType 2 is installed]) -+ AC_CHECK_TYPES(FT_TrueTypeEngineType,,,[#include <ft2build.h> -+#include FT_MODULE_H])], -+ [FREETYPE_LIBS=""],[$FREETYPE_LIBS]) - else -+ FREETYPE_CFLAGS="" - FREETYPE_LIBS="" - fi]) - fi --WINE_ERROR_WITH(freetype,[test "x$ac_cv_header_freetype_freetype_h" != xyes -o "x$wine_cv_fttrigon" != xyes], -+WINE_ERROR_WITH(freetype,[test "x$ac_cv_lib_soname_freetype" = x], - [FreeType ${notice_platform}development files not found. Fonts will not be built.]) --test "x$ac_cv_header_freetype_freetype_h" = xyes -a "x$wine_cv_fttrigon" = xyes || enable_fonts=${enable_fonts:-no} -+test "x$ac_cv_lib_soname_freetype" = x && enable_fonts=${enable_fonts:-no} - - dnl **** Check for parport (currently Linux only) **** - AC_CACHE_CHECK([for parport header/ppdev.h], ac_cv_c_ppdev, -diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c -index fb4f2af..e230299 100644 ---- a/dlls/gdi32/freetype.c -+++ b/dlls/gdi32/freetype.c -@@ -77,6 +77,23 @@ - #undef SetRectRgn - #endif /* HAVE_CARBON_CARBON_H */ - -+#ifdef HAVE_FT2BUILD_H -+#include <ft2build.h> -+#include FT_FREETYPE_H -+#include FT_GLYPH_H -+#include FT_TYPES_H -+#include FT_TRUETYPE_TABLES_H -+#include FT_SFNT_NAMES_H -+#include FT_TRUETYPE_IDS_H -+#include FT_OUTLINE_H -+#include FT_TRIGONOMETRY_H -+#include FT_MODULE_H -+#include FT_WINFONTS_H -+#ifdef FT_LCD_FILTER_H -+#include FT_LCD_FILTER_H -+#endif -+#endif /* HAVE_FT2BUILD_H */ -+ - #include "windef.h" - #include "winbase.h" - #include "winternl.h" -@@ -95,43 +112,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(font); - - #ifdef HAVE_FREETYPE - --#ifdef HAVE_FT2BUILD_H --#include <ft2build.h> --#endif --#ifdef HAVE_FREETYPE_FREETYPE_H --#include <freetype/freetype.h> --#endif --#ifdef HAVE_FREETYPE_FTGLYPH_H --#include <freetype/ftglyph.h> --#endif --#ifdef HAVE_FREETYPE_TTTABLES_H --#include <freetype/tttables.h> --#endif --#ifdef HAVE_FREETYPE_FTTYPES_H --#include <freetype/fttypes.h> --#endif --#ifdef HAVE_FREETYPE_FTSNAMES_H --#include <freetype/ftsnames.h> --#endif --#ifdef HAVE_FREETYPE_TTNAMEID_H --#include <freetype/ttnameid.h> --#endif --#ifdef HAVE_FREETYPE_FTOUTLN_H --#include <freetype/ftoutln.h> --#endif --#ifdef HAVE_FREETYPE_FTTRIGON_H --#include <freetype/fttrigon.h> --#endif --#ifdef HAVE_FREETYPE_FTWINFNT_H --#include <freetype/ftwinfnt.h> --#endif --#ifdef HAVE_FREETYPE_FTMODAPI_H --#include <freetype/ftmodapi.h> --#endif --#ifdef HAVE_FREETYPE_FTLCDFIL_H --#include <freetype/ftlcdfil.h> --#endif -- - #ifndef HAVE_FT_TRUETYPEENGINETYPE - typedef enum - { -@@ -186,7 +166,7 @@ MAKE_FUNCPTR(FT_Vector_Transform); - MAKE_FUNCPTR(FT_Vector_Unit); - static FT_Error (*pFT_Outline_Embolden)(FT_Outline *, FT_Pos); - static FT_TrueTypeEngineType (*pFT_Get_TrueType_Engine_Type)(FT_Library); --#ifdef HAVE_FREETYPE_FTLCDFIL_H -+#ifdef FT_LCD_FILTER_H - static FT_Error (*pFT_Library_SetLcdFilter)(FT_Library, FT_LcdFilter); - #endif - -@@ -924,7 +904,7 @@ static BOOL is_hinting_enabled(void) - - static BOOL is_subpixel_rendering_enabled( void ) - { --#ifdef HAVE_FREETYPE_FTLCDFIL_H -+#ifdef FT_LCD_FILTER_H - static int enabled = -1; - if (enabled == -1) - { -@@ -3918,7 +3898,7 @@ static BOOL init_freetype(void) - /* Don't warn if these ones are missing */ - pFT_Outline_Embolden = wine_dlsym(ft_handle, "FT_Outline_Embolden", NULL, 0); - pFT_Get_TrueType_Engine_Type = wine_dlsym(ft_handle, "FT_Get_TrueType_Engine_Type", NULL, 0); --#ifdef HAVE_FREETYPE_FTLCDFIL_H -+#ifdef FT_LCD_FILTER_H - pFT_Library_SetLcdFilter = wine_dlsym(ft_handle, "FT_Library_SetLcdFilter", NULL, 0); - #endif - -@@ -6706,7 +6686,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, - case WINE_GGO_HBGR_BITMAP: - case WINE_GGO_VRGB_BITMAP: - case WINE_GGO_VBGR_BITMAP: --#ifdef HAVE_FREETYPE_FTLCDFIL_H -+#ifdef FT_LCD_FILTER_H - { - switch (ft_face->glyph->format) - { -diff --git a/include/config.h.in b/include/config.h.in -index a14db5b..79f8b45 100644 ---- a/include/config.h.in -+++ b/include/config.h.in -@@ -132,39 +132,6 @@ - /* Define if FreeType 2 is installed */ - #undef HAVE_FREETYPE - --/* Define to 1 if you have the <freetype/freetype.h> header file. */ --#undef HAVE_FREETYPE_FREETYPE_H -- --/* Define to 1 if you have the <freetype/ftglyph.h> header file. */ --#undef HAVE_FREETYPE_FTGLYPH_H -- --/* Define to 1 if you have the <freetype/ftlcdfil.h> header file. */ --#undef HAVE_FREETYPE_FTLCDFIL_H -- --/* Define to 1 if you have the <freetype/ftmodapi.h> header file. */ --#undef HAVE_FREETYPE_FTMODAPI_H -- --/* Define to 1 if you have the <freetype/ftoutln.h> header file. */ --#undef HAVE_FREETYPE_FTOUTLN_H -- --/* Define to 1 if you have the <freetype/ftsnames.h> header file. */ --#undef HAVE_FREETYPE_FTSNAMES_H -- --/* Define if you have the <freetype/fttrigon.h> header file. */ --#undef HAVE_FREETYPE_FTTRIGON_H -- --/* Define to 1 if you have the <freetype/fttypes.h> header file. */ --#undef HAVE_FREETYPE_FTTYPES_H -- --/* Define to 1 if you have the <freetype/ftwinfnt.h> header file. */ --#undef HAVE_FREETYPE_FTWINFNT_H -- --/* Define to 1 if you have the <freetype/ttnameid.h> header file. */ --#undef HAVE_FREETYPE_TTNAMEID_H -- --/* Define to 1 if you have the <freetype/tttables.h> header file. */ --#undef HAVE_FREETYPE_TTTABLES_H -- - /* Define to 1 if the system has the type `fsblkcnt_t'. */ - #undef HAVE_FSBLKCNT_T - --- -1.9.1 - 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 7cafcd4e..00000000 --- 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.19-makefile-race-cond.patch b/app-emulation/wine/files/wine-1.7.19-makefile-race-cond.patch deleted file mode 100644 index 294b5ae9..00000000 --- a/app-emulation/wine/files/wine-1.7.19-makefile-race-cond.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index 5c163b8..b600cf7 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -52,7 +52,8 @@ __tooldeps__: libs/port libs/wine libs/wpp - __builddeps__: __tooldeps__ include - .PHONY: depend check test testclean crosstest __tooldeps__ __builddeps__ - --loader server: libs/port libs/wine tools -+loader: libs/port libs/wine tools -+server: libs/port libs/wine tools include - fonts: tools/sfnt2fon - include: tools tools/widl - libs/wine tools: libs/port - diff --git a/app-emulation/wine/files/wine-1.7.2-osmesa-check.patch b/app-emulation/wine/files/wine-1.7.2-osmesa-check.patch deleted file mode 100644 index e20ea2c2..00000000 --- a/app-emulation/wine/files/wine-1.7.2-osmesa-check.patch +++ /dev/null @@ -1,38 +0,0 @@ -From b7eb1ff48dd1210aa3e1002afc503d5df75d50b9 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 66b4dd6..0303d87 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1213,7 +1213,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 $XLIB -lm $X_EXTRA_LIBS]) -+ WINE_CHECK_SONAME(OSMesa,OSMesaCreateContext,,,[$X_LIBS $XLIB -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 $XLIB -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.3.2 - diff --git a/app-emulation/wine/files/wine-1.7.38-gstreamer-v5-staging-post.patch b/app-emulation/wine/files/wine-1.7.38-gstreamer-v5-staging-post.patch deleted file mode 100644 index 3d653993..00000000 --- a/app-emulation/wine/files/wine-1.7.38-gstreamer-v5-staging-post.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 695c19cdd2fc24aaa7ed89976c4965b376707131 Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner <sebastian@fds-team.de> -Date: Wed, 25 Feb 2015 22:45:42 +0100 -Subject: ntdll: Fix race-condition when threads are killed during shutdown. - -When exit_thread is executed, nb_threads is decremented before the thread is -fully shutdown. When another thread runs ExitProcess() this will cause a SIGQUIT -signal to all threads, effectively decrementing nb_threads twice. The process -will terminate with a wrong exitcode then because the refcount reaches zero too -early. - -Currently Wine has no locking protection of LdrShutdownProcess(), so it can -only be executed safely when all other threads have terminated before. Most -likely there are more Wine bugs in this area, but the attached patch should -fix the most critical one (messed up refcounting of threads) for now. - -[Alexandre Rostovtsev <tetromino@gentoo.org> : rebase to be applied after - Maarten Lankhorst's "override pthreads to fix gstreamer v5" patch.] ---- - dlls/ntdll/thread.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c -index 4f181dc..1bdbcbf 100755 ---- a/dlls/ntdll/thread.c -+++ b/dlls/ntdll/thread.c -@@ -461,6 +461,7 @@ static void exit_thread_common( int status ) - static void *prev_teb; - TEB *teb; - #endif -+ sigset_t sigset; - - if (status) /* send the exit code to the server (0 is already the default) */ - { -@@ -473,7 +474,7 @@ static void exit_thread_common( int status ) - SERVER_END_REQ; - } - -- if (interlocked_xchg_add( &nb_threads, -1 ) <= 1) -+ if (interlocked_xchg_add( &nb_threads, 0 ) <= 1) - { - LdrShutdownProcess(); - exit( status ); -@@ -499,6 +500,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.1 - diff --git a/app-emulation/wine/files/wine-1.7.38-gstreamer-v5-staging-pre.patch b/app-emulation/wine/files/wine-1.7.38-gstreamer-v5-staging-pre.patch deleted file mode 100644 index eee42ff9..00000000 --- a/app-emulation/wine/files/wine-1.7.38-gstreamer-v5-staging-pre.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 0d92921d264d5d0d1041c66353f022f1bc88577f Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <tetromino@gentoo.org> -Date: Sun, 8 Mar 2015 00:10:31 -0500 -Subject: [PATCH] Revert "ntdll: Fix race-condition when threads are killed - during shutdown." - -This reverts Sebastian Lackner's Wine-Staging patch to allow Maarten -Lankhorst's "override pthreads to fix gstreamer v5" to apply ---- - dlls/ntdll/thread.c | 8 +------- - 1 file changed, 1 insertion(+), 7 deletions(-) - -diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c -index 74e64c9..3696c8e 100644 ---- a/dlls/ntdll/thread.c -+++ b/dlls/ntdll/thread.c -@@ -370,7 +370,6 @@ void terminate_thread( int status ) - void exit_thread( int status ) - { - static void *prev_teb; -- sigset_t sigset; - TEB *teb; - - if (status) /* send the exit code to the server (0 is already the default) */ -@@ -384,7 +383,7 @@ void exit_thread( int status ) - SERVER_END_REQ; - } - -- if (interlocked_xchg_add( &nb_threads, 0 ) <= 1) -+ if (interlocked_xchg_add( &nb_threads, -1 ) <= 1) - { - LdrShutdownProcess(); - exit( status ); -@@ -406,11 +405,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.1 - 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 25eb2357..00000000 --- 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 81aa699b..00000000 --- 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/files/wine-1.7.45-libunwind-osx-only.patch b/app-emulation/wine/files/wine-1.7.45-libunwind-osx-only.patch deleted file mode 100644 index e7a79055..00000000 --- a/app-emulation/wine/files/wine-1.7.45-libunwind-osx-only.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 36a9f9dd05c3b9df77c44c91663e9bd6cae1c848 Mon Sep 17 00:00:00 2001 -From: Ken Thomases <ken@codeweavers.com> -Date: Mon, 15 Jun 2015 20:42:33 -0500 -Subject: [PATCH 1/1] configure: Only check for libunwind.h on OS X. - ---- - configure | 13 ++++++++++++- - configure.ac | 2 +- - 2 files changed, 13 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index a104097..c0951db 100755 ---- a/configure -+++ b/configure -@@ -6626,7 +6626,6 @@ for ac_header in \ - lber.h \ - ldap.h \ - libproc.h \ -- libunwind.h \ - link.h \ - linux/cdrom.h \ - linux/compiler.h \ -@@ -7849,6 +7848,18 @@ uninstall:: - ;; - - darwin*|macosx*) -+ for ac_header in libunwind.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "libunwind.h" "ac_cv_header_libunwind_h" "$ac_includes_default" -+if test "x$ac_cv_header_libunwind_h" = xyes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_LIBUNWIND_H 1 -+_ACEOF -+ -+fi -+ -+done -+ - LIBEXT="dylib" - DLLFLAGS="$DLLFLAGS -fPIC" - LIBWINE_LDFLAGS="-multiply_defined suppress" -diff --git a/configure.ac b/configure.ac -index df28b27..f9df3f0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -424,7 +424,6 @@ AC_CHECK_HEADERS(\ - lber.h \ - ldap.h \ - libproc.h \ -- libunwind.h \ - link.h \ - linux/cdrom.h \ - linux/compiler.h \ -@@ -751,6 +750,7 @@ uninstall:: - ;; - - darwin*|macosx*) -+ AC_CHECK_HEADERS(libunwind.h) - LIBEXT="dylib" - DLLFLAGS="$DLLFLAGS -fPIC" - LIBWINE_LDFLAGS="-multiply_defined suppress" --- -1.9.1 - diff --git a/app-emulation/wine/files/wine-1.7.47-critical-security-cookie-fix.patch b/app-emulation/wine/files/wine-1.7.47-critical-security-cookie-fix.patch deleted file mode 100644 index 9168654a..00000000 --- a/app-emulation/wine/files/wine-1.7.47-critical-security-cookie-fix.patch +++ /dev/null @@ -1,82 +0,0 @@ -From: Erich E. Hoover <erich.e.hoover@wine-staging.com> -Date: Fri, 10 Jul 2015 20:52:33 +0000 (-0600) -Subject: ntdll: Only set the security cookie if it has not already been set. -X-Git-Url: http://source.winehq.org/git/wine.git/commitdiff_plain/e9d7cf99ada80ea8345c301481c63a24780f2b63 - -ntdll: Only set the security cookie if it has not already been set. ---- - -diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c -index 410e060..ff947da 100644 ---- a/dlls/ntdll/virtual.c -+++ b/dlls/ntdll/virtual.c -@@ -61,6 +61,12 @@ WINE_DECLARE_DEBUG_CHANNEL(module); - #define MAP_NORESERVE 0 - #endif - -+#ifdef _WIN64 -+#define DEFAULT_SECURITY_COOKIE_64 (((ULONGLONG)0x00002b99 << 32) | 0x2ddfa232) -+#endif -+#define DEFAULT_SECURITY_COOKIE_32 0xbb40e64e -+#define DEFAULT_SECURITY_COOKIE_16 (DEFAULT_SECURITY_COOKIE_32 >> 16) -+ - /* File view */ - struct file_view - { -@@ -1053,6 +1059,36 @@ static NTSTATUS stat_mapping_file( struct file_view *view, struct stat *st ) - return status; - } - -+/*********************************************************************** -+ * set_security_cookie -+ * -+ * Create a random security cookie for buffer overflow protection. Make -+ * sure it does not accidentally match the default cookie value. -+ */ -+static void set_security_cookie(ULONG_PTR *cookie) -+{ -+ static ULONG seed; -+ -+ if (!cookie) return; -+ if (!seed) seed = NtGetTickCount() ^ GetCurrentProcessId(); -+ while (1) -+ { -+ if (*cookie == DEFAULT_SECURITY_COOKIE_16) -+ *cookie = RtlRandom( &seed ) >> 16; /* leave the high word clear */ -+ else if (*cookie == DEFAULT_SECURITY_COOKIE_32) -+ *cookie = RtlRandom( &seed ); -+#ifdef DEFAULT_SECURITY_COOKIE_64 -+ else if (*cookie == DEFAULT_SECURITY_COOKIE_64) -+ { -+ *cookie = RtlRandom( &seed ); -+ /* fill up, but keep the highest word clear */ -+ *cookie ^= (ULONG_PTR)RtlRandom( &seed ) << 16; -+ } -+#endif -+ else -+ break; -+ } -+} - - /*********************************************************************** - * map_image -@@ -1285,18 +1321,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz - loadcfg = RtlImageDirectoryEntryToData( (HMODULE)ptr, TRUE, - IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG, &loadcfg_size ); - if (loadcfg && loadcfg_size >= sizeof(*loadcfg)) -- { -- static ULONG seed; -- ULONG_PTR *cookie = (ULONG_PTR *)loadcfg->SecurityCookie; -- -- if (!seed) seed = NtGetTickCount() ^ GetCurrentProcessId(); -- if (cookie) -- { -- *cookie = RtlRandom( &seed ); -- if (sizeof(ULONG_PTR) > sizeof(ULONG)) /* fill up, but keep the highest word clear */ -- *cookie ^= (ULONG_PTR)RtlRandom( &seed ) << 16; -- } -- } -+ set_security_cookie((ULONG_PTR *)loadcfg->SecurityCookie); - - /* set the image protections */ - diff --git a/app-emulation/wine/files/wine-1.7.55-d3d9.patch b/app-emulation/wine/files/wine-1.7.55-d3d9.patch deleted file mode 100644 index 7497964b..00000000 --- a/app-emulation/wine/files/wine-1.7.55-d3d9.patch +++ /dev/null @@ -1,5366 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 2d2a168..5f75a99 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -65,6 +65,8 @@ AC_ARG_WITH(openal, AS_HELP_STRING([--without-openal],[do not use OpenAL]), - AC_ARG_WITH(opencl, AS_HELP_STRING([--without-opencl],[do not use OpenCL]), - [if test "x$withval" = "xno"; then ac_cv_header_CL_cl_h=no; ac_cv_header_OpenCL_opencl_h=no; fi]) - AC_ARG_WITH(opengl, AS_HELP_STRING([--without-opengl],[do not use OpenGL])) -+AC_ARG_WITH(d3dadapter,AS_HELP_STRING([--without-d3dadapter],[do not use native Direct3D])) -+AC_ARG_WITH(d3dadapter-dri2-fallback, AS_HELP_STRING([--without-d3dadapter-dri2-fallback],[add a DRI2 fallback to d3dadapter DRI3 code])) - AC_ARG_WITH(osmesa, AS_HELP_STRING([--without-osmesa],[do not use the OSMesa library])) - AC_ARG_WITH(oss, AS_HELP_STRING([--without-oss],[do not use the OSS sound support])) - AC_ARG_WITH(pcap, AS_HELP_STRING([--without-pcap],[do not use the Packet Capture library]), -@@ -381,6 +383,8 @@ AC_CHECK_LIB(ossaudio,_oss_ioctl) - - AC_SUBST(OPENGL_LIBS,"") - -+AC_SUBST(D3DADAPTER9_LIBS,"") -+ - dnl **** Check for header files **** - - AC_SYS_LARGEFILE() -@@ -1156,6 +1160,45 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c - WINE_WARNING_WITH(opengl,[test -n "$opengl_msg"],[$opengl_msg - OpenGL and Direct3D won't be supported.]) - -+ -+ -+ dnl Check for d3dadapter -+ if test "x$with_d3dadapter" != "xno" -+ then -+ D3D_CFLAGS=`pkg-config --cflags d3d` -+ D3D_LIBS=`pkg-config --libs d3d` -+ AC_SUBST(D3D_CFLAGS) -+ AC_SUBST(D3D_LIBS) -+ AC_DEFINE(SONAME_D3DADAPTER9, ["d3dadapter9.so.1"], ["temporary hack"]) -+ AC_DEFINE_UNQUOTED(D3D_MODULE_DIR, ["`pkg-config --variable=moduledir d3d`"], ["module dir"]) -+ D3DADAPTER9_LIBS="" -+ WINE_CHECK_SONAME(xcb,xcb_request_check, [D3DADAPTER9_LIBS="-lxcb $D3DADAPTER9_LIBS"]) -+ WINE_ERROR_WITH(d3dadapter,[test "x$D3DADAPTER9_LIBS" != "x-lxcb "],[D3Dadapter9 requires libxcb]) -+ WINE_CHECK_SONAME(xcb-dri3,xcb_dri3_open, [D3DADAPTER9_LIBS="-lxcb-dri3 $D3DADAPTER9_LIBS"]) -+ WINE_ERROR_WITH(d3dadapter,[test "x$D3DADAPTER9_LIBS" != "x-lxcb-dri3 -lxcb "],[D3Dadapter9 requires libxcb-dri3]) -+ WINE_CHECK_SONAME(xcb-present,xcb_present_notify_msc, [D3DADAPTER9_LIBS="-lxcb-present $D3DADAPTER9_LIBS"]) -+ WINE_ERROR_WITH(d3dadapter,[test "x$D3DADAPTER9_LIBS" != "x-lxcb-present -lxcb-dri3 -lxcb "],[D3Dadapter9 requires libxcb-present]) -+ WINE_CHECK_SONAME(X11-xcb,XGetXCBConnection, [D3DADAPTER9_LIBS="-lX11-xcb $D3DADAPTER9_LIBS"]) -+ WINE_ERROR_WITH(d3dadapter,[test "x$D3DADAPTER9_LIBS" != "x-lX11-xcb -lxcb-present -lxcb-dri3 -lxcb "],[D3Dadapter9 requires libX11-xcb]) -+ WINE_CHECK_SONAME(xcb-xfixes,xcb_xfixes_create_region, [D3DADAPTER9_LIBS="-lxcb-xfixes $D3DADAPTER9_LIBS"]) -+ WINE_ERROR_WITH(d3dadapter,[test "x$D3DADAPTER9_LIBS" != "x-lxcb-xfixes -lX11-xcb -lxcb-present -lxcb-dri3 -lxcb "],[D3Dadapter9 requires libxcb-xfixes]) -+ WINE_CHECK_SONAME(X11,XOpenDisplay, [D3DADAPTER9_LIBS="-lX11 $D3DADAPTER9_LIBS"]) -+ WINE_ERROR_WITH(d3dadapter,[test "x$D3DADAPTER9_LIBS" != "x-lX11 -lxcb-xfixes -lX11-xcb -lxcb-present -lxcb-dri3 -lxcb "],[D3Dadapter9 requires libX11]) -+ WINE_CHECK_SONAME(Xext,XextRemoveDisplay, [D3DADAPTER9_LIBS="-lXext $D3DADAPTER9_LIBS"]) -+ WINE_ERROR_WITH(d3dadapter,[test "x$D3DADAPTER9_LIBS" != "x-lXext -lX11 -lxcb-xfixes -lX11-xcb -lxcb-present -lxcb-dri3 -lxcb "],[D3Dadapter9 requires libXext]) -+ WINE_CHECK_SONAME(pthread,pthread_mutex_lock, [D3DADAPTER9_LIBS="-lpthread $D3DADAPTER9_LIBS"]) -+ WINE_ERROR_WITH(d3dadapter,[test "x$D3DADAPTER9_LIBS" != "x-lpthread -lXext -lX11 -lxcb-xfixes -lX11-xcb -lxcb-present -lxcb-dri3 -lxcb "],[D3Dadapter9 requires libpthread]) -+ -+ if test "x$with_d3dadapter_dri2_fallback" != "xno" -+ then -+ AC_DEFINE(D3DADAPTER9_DRI2, 1, [Whether d3dadapter9 DRI2 fallback is compiled]) -+ WINE_CHECK_SONAME(GL,glGenFramebuffers, [D3DADAPTER9_LIBS="-lGL $D3DADAPTER9_LIBS"]) -+ WINE_ERROR_WITH(d3dadapter,[test "x$D3DADAPTER9_LIBS" != "x-lGL -lpthread -lXext -lX11 -lxcb-xfixes -lX11-xcb -lxcb-present -lxcb-dri3 -lxcb "],[D3Dadapter9 DRI2 fallback requires libGL]) -+ WINE_CHECK_SONAME(EGL,eglCreateContext, [D3DADAPTER9_LIBS="-lEGL $D3DADAPTER9_LIBS"]) -+ WINE_ERROR_WITH(d3dadapter,[test "x$D3DADAPTER9_LIBS" != "x-lEGL -lGL -lpthread -lXext -lX11 -lxcb-xfixes -lX11-xcb -lxcb-present -lxcb-dri3 -lxcb "],[D3Dadapter9 DRI2 fallback requires libEGL]) -+ fi -+ fi -+ - CPPFLAGS="$ac_save_CPPFLAGS" - else - X_CFLAGS="" -@@ -2764,6 +2807,7 @@ WINE_CONFIG_DLL(d3d8,,[implib]) - WINE_CONFIG_TEST(dlls/d3d8/tests) - WINE_CONFIG_DLL(d3d9,,[implib]) - WINE_CONFIG_TEST(dlls/d3d9/tests) -+WINE_CONFIG_DLL(d3d9-nine,,[implib]) - WINE_CONFIG_DLL(d3dcompiler_33) - WINE_CONFIG_DLL(d3dcompiler_34) - WINE_CONFIG_DLL(d3dcompiler_35) -diff --git a/dlls/d3d9-nine/Makefile.in b/dlls/d3d9-nine/Makefile.in -new file mode 100644 -index 0000000..a761cd7 ---- /dev/null -+++ b/dlls/d3d9-nine/Makefile.in -@@ -0,0 +1,12 @@ -+MODULE = d3d9-nine.dll -+IMPORTS = dxguid uuid advapi32 gdi32 user32 -+EXTRAINCL = $(X_CFLAGS) -+EXTRALIBS = $(D3DADAPTER9_LIBS) -+ -+C_SRCS = \ -+ d3d9_main.c \ -+ d3dadapter9.c \ -+ present.c \ -+ dri3.c -+ -+RC_SRCS = version.rc -diff --git a/dlls/d3d9-nine/d3d9-nine.spec b/dlls/d3d9-nine/d3d9-nine.spec -new file mode 100644 -index 0000000..a33cba5 ---- /dev/null -+++ b/dlls/d3d9-nine/d3d9-nine.spec -@@ -0,0 +1,14 @@ -+@ stdcall Direct3DShaderValidatorCreate9() -+@ stub PSGPError -+@ stub PSGPSampleTexture -+@ stdcall D3DPERF_BeginEvent(long wstr) -+@ stdcall D3DPERF_EndEvent() -+@ stdcall D3DPERF_GetStatus() -+@ stdcall D3DPERF_QueryRepeatFrame() -+@ stdcall D3DPERF_SetMarker(long wstr) -+@ stdcall D3DPERF_SetOptions(long) -+@ stdcall D3DPERF_SetRegion(long wstr) -+@ stub DebugSetLevel -+@ stdcall DebugSetMute() -+@ stdcall Direct3DCreate9(long) -+@ stdcall Direct3DCreate9Ex(long ptr) -diff --git a/dlls/d3d9-nine/d3d9_main.c b/dlls/d3d9-nine/d3d9_main.c -new file mode 100644 -index 0000000..de20475 ---- /dev/null -+++ b/dlls/d3d9-nine/d3d9_main.c -@@ -0,0 +1,163 @@ -+/* -+ * Direct3D 9 -+ * -+ * Copyright 2002-2003 Jason Edmeades -+ * Copyright 2002-2003 Raphael Junqueira -+ * Copyright 2005 Oliver Stieber -+ * Copyright 2015 Patrick Rudolph -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA -+ * -+ */ -+ -+#include "config.h" -+#include "initguid.h" -+#include "wine/debug.h" -+ -+#include <dlfcn.h> -+#include <fcntl.h> -+#include <stdarg.h> -+#include <stdio.h> -+#include <stdlib.h> -+ -+#include <d3dadapter/d3dadapter9.h> -+ -+#include "d3dadapter9.h" -+ -+#include "wine/library.h" -+ -+WINE_DEFAULT_DEBUG_CHANNEL(d3dadapter); -+ -+static int D3DPERF_event_level = 0; -+static Display *gdi_display; -+ -+void WINAPI DebugSetMute(void) { -+ /* nothing to do */ -+} -+ -+IDirect3D9 * WINAPI DECLSPEC_HOTPATCH Direct3DCreate9(UINT sdk_version) -+{ -+ IDirect3D9 *native; -+ TRACE("sdk_version %#x.\n", sdk_version); -+ -+ if (SUCCEEDED(d3dadapter9_new(gdi_display, FALSE, (IDirect3D9Ex **)&native))) { -+ return native; -+ } -+ -+ return NULL; -+} -+ -+HRESULT WINAPI DECLSPEC_HOTPATCH Direct3DCreate9Ex(UINT sdk_version, IDirect3D9Ex **d3d9ex) -+{ -+ TRACE("sdk_version %#x, d3d9ex %p.\n", sdk_version, d3d9ex); -+ -+ return d3dadapter9_new(gdi_display, TRUE, d3d9ex); -+} -+ -+/******************************************************************* -+ * Direct3DShaderValidatorCreate9 (D3D9.@) -+ * -+ * No documentation available for this function. -+ * SDK only says it is internal and shouldn't be used. -+ */ -+void* WINAPI Direct3DShaderValidatorCreate9(void) -+{ -+ static int once; -+ -+ if (!once++) FIXME("stub\n"); -+ return NULL; -+} -+ -+/******************************************************************* -+ * DllMain -+ */ -+BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) -+{ -+ switch (reason) -+ { -+ case DLL_PROCESS_ATTACH: -+ if (!(gdi_display = XOpenDisplay( NULL ))) { -+ ERR("Failed to open display\n"); -+ return FALSE; -+ } -+ -+ fcntl( ConnectionNumber(gdi_display), F_SETFD, 1 ); /* set close on exec flag */ -+ break; -+ } -+ -+ return TRUE; -+} -+ -+/*********************************************************************** -+ * D3DPERF_BeginEvent (D3D9.@) -+ */ -+int WINAPI D3DPERF_BeginEvent(D3DCOLOR color, const WCHAR *name) -+{ -+ TRACE("color 0x%08x, name %s.\n", color, debugstr_w(name)); -+ -+ return D3DPERF_event_level++; -+} -+ -+/*********************************************************************** -+ * D3DPERF_EndEvent (D3D9.@) -+ */ -+int WINAPI D3DPERF_EndEvent(void) { -+ TRACE("(void) : stub\n"); -+ -+ return --D3DPERF_event_level; -+} -+ -+/*********************************************************************** -+ * D3DPERF_GetStatus (D3D9.@) -+ */ -+DWORD WINAPI D3DPERF_GetStatus(void) { -+ FIXME("(void) : stub\n"); -+ -+ return 0; -+} -+ -+/*********************************************************************** -+ * D3DPERF_SetOptions (D3D9.@) -+ * -+ */ -+void WINAPI D3DPERF_SetOptions(DWORD options) -+{ -+ FIXME("(%#x) : stub\n", options); -+} -+ -+/*********************************************************************** -+ * D3DPERF_QueryRepeatFrame (D3D9.@) -+ */ -+BOOL WINAPI D3DPERF_QueryRepeatFrame(void) { -+ FIXME("(void) : stub\n"); -+ -+ return FALSE; -+} -+ -+/*********************************************************************** -+ * D3DPERF_SetMarker (D3D9.@) -+ */ -+void WINAPI D3DPERF_SetMarker(D3DCOLOR color, const WCHAR *name) -+{ -+ FIXME("color 0x%08x, name %s stub!\n", color, debugstr_w(name)); -+} -+ -+/*********************************************************************** -+ * D3DPERF_SetRegion (D3D9.@) -+ */ -+void WINAPI D3DPERF_SetRegion(D3DCOLOR color, const WCHAR *name) -+{ -+ FIXME("color 0x%08x, name %s stub!\n", color, debugstr_w(name)); -+} -diff --git a/dlls/d3d9-nine/d3dadapter9.c b/dlls/d3d9-nine/d3dadapter9.c -new file mode 100644 -index 0000000..f15e44f ---- /dev/null -+++ b/dlls/d3d9-nine/d3dadapter9.c -@@ -0,0 +1,865 @@ -+/* -+ * Wine IDirect3D9 interface using ID3DAdapter9 -+ * -+ * Copyright 2013 Joakim Sindholt -+ * Christoph Bumiller -+ * Copyright 2014 David Heidelberger -+ * Copyright 2014-2015 Axel Davy -+ * Copyright 2015 Nick Sarnie -+ * Patrick Rudolph -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA -+ */ -+ -+#include "config.h" -+#include "wine/debug.h" -+ -+WINE_DEFAULT_DEBUG_CHANNEL(d3dadapter); -+ -+#include <d3dadapter/d3dadapter9.h> -+#include "present.h" -+ -+/* this represents a snapshot taken at the moment of creation */ -+struct output -+{ -+ D3DDISPLAYROTATION rotation; /* current rotation */ -+ D3DDISPLAYMODEEX *modes; -+ unsigned nmodes; -+ unsigned nmodesalloc; -+ unsigned current; /* current mode num */ -+ -+ HMONITOR monitor; -+}; -+ -+struct adapter_group -+{ -+ struct output *outputs; -+ unsigned noutputs; -+ unsigned noutputsalloc; -+ -+ /* override driver provided DeviceName with this to homogenize device names -+ * with wine */ -+ WCHAR devname[32]; -+ -+ /* driver stuff */ -+ ID3DAdapter9 *adapter; -+}; -+ -+struct adapter_map -+{ -+ unsigned group; -+ unsigned master; -+}; -+ -+struct d3dadapter9 -+{ -+ /* COM vtable */ -+ void *vtable; -+ /* IUnknown reference count */ -+ LONG refs; -+ -+ /* adapter groups and mappings */ -+ struct adapter_group *groups; -+ struct adapter_map *map; -+ unsigned nadapters; -+ unsigned ngroups; -+ unsigned ngroupsalloc; -+ -+ /* true if it implements IDirect3D9Ex */ -+ boolean ex; -+ Display *gdi_display; -+}; -+ -+/* convenience wrapper for calls into ID3D9Adapter */ -+#define ADAPTER_GROUP \ -+ This->groups[This->map[Adapter].group] -+ -+#define ADAPTER_PROC(name, ...) \ -+ ID3DAdapter9_##name(ADAPTER_GROUP.adapter, ## __VA_ARGS__) -+ -+#define ADAPTER_OUTPUT \ -+ ADAPTER_GROUP.outputs[Adapter-This->map[Adapter].master] -+ -+static HRESULT WINAPI -+d3dadapter9_CheckDeviceFormat( struct d3dadapter9 *This, -+ UINT Adapter, -+ D3DDEVTYPE DeviceType, -+ D3DFORMAT AdapterFormat, -+ DWORD Usage, -+ D3DRESOURCETYPE RType, -+ D3DFORMAT CheckFormat ); -+ -+static ULONG WINAPI -+d3dadapter9_AddRef( struct d3dadapter9 *This ) -+{ -+ ULONG refs = InterlockedIncrement(&This->refs); -+ TRACE("%p increasing refcount to %u.\n", This, refs); -+ return refs; -+} -+ -+static ULONG WINAPI -+d3dadapter9_Release( struct d3dadapter9 *This ) -+{ -+ ULONG refs = InterlockedDecrement(&This->refs); -+ TRACE("%p decreasing refcount to %u.\n", This, refs); -+ if (refs == 0) { -+ /* dtor */ -+ if (This->map) { -+ HeapFree(GetProcessHeap(), 0, This->map); -+ } -+ -+ if (This->groups) { -+ int i, j; -+ for (i = 0; i < This->ngroups; ++i) { -+ if (This->groups[i].outputs) { -+ for (j = 0; j < This->groups[i].noutputs; ++j) { -+ if (This->groups[i].outputs[j].modes) { -+ HeapFree(GetProcessHeap(), 0, -+ This->groups[i].outputs[j].modes); -+ } -+ } -+ HeapFree(GetProcessHeap(), 0, This->groups[i].outputs); -+ } -+ -+ if (This->groups[i].adapter) { -+ ID3DAdapter9_Release(This->groups[i].adapter); -+ } -+ } -+ HeapFree(GetProcessHeap(), 0, This->groups); -+ } -+ -+ HeapFree(GetProcessHeap(), 0, This); -+ } -+ return refs; -+} -+ -+static HRESULT WINAPI -+d3dadapter9_QueryInterface( struct d3dadapter9 *This, -+ REFIID riid, -+ void **ppvObject ) -+{ -+ if (!ppvObject) { return E_POINTER; } -+ if ((IsEqualGUID(&IID_IDirect3D9Ex, riid) && This->ex) || -+ IsEqualGUID(&IID_IDirect3D9, riid) || -+ IsEqualGUID(&IID_IUnknown, riid)) { -+ *ppvObject = This; -+ d3dadapter9_AddRef(This); -+ return S_OK; -+ } -+ -+ WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); -+ *ppvObject = NULL; -+ -+ return E_NOINTERFACE; -+} -+ -+static HRESULT WINAPI -+d3dadapter9_RegisterSoftwareDevice( struct d3dadapter9 *This, -+ void *pInitializeFunction ) -+{ -+ FIXME("(%p, %p), stub!\n", This, pInitializeFunction); -+ return D3DERR_INVALIDCALL; -+} -+ -+static UINT WINAPI -+d3dadapter9_GetAdapterCount( struct d3dadapter9 *This ) -+{ -+ return This->nadapters; -+} -+ -+static HRESULT WINAPI -+d3dadapter9_GetAdapterIdentifier( struct d3dadapter9 *This, -+ UINT Adapter, -+ DWORD Flags, -+ D3DADAPTER_IDENTIFIER9 *pIdentifier ) -+{ -+ HRESULT hr; -+ HKEY regkey; -+ -+ if (Adapter >= d3dadapter9_GetAdapterCount(This)) { return D3DERR_INVALIDCALL; } -+ -+ hr = ADAPTER_PROC(GetAdapterIdentifier, Flags, pIdentifier); -+ if (SUCCEEDED(hr)) { -+ /* Override the driver provided DeviceName with what Wine provided */ -+ ZeroMemory(pIdentifier->DeviceName, sizeof(pIdentifier->DeviceName)); -+ if (!WideCharToMultiByte(CP_ACP, 0, ADAPTER_GROUP.devname, -1, -+ pIdentifier->DeviceName, -+ sizeof(pIdentifier->DeviceName), -+ NULL, NULL)) { -+ /* Wine does it */ -+ return D3DERR_INVALIDCALL; -+ } -+ TRACE("DeviceName overriden: %s\n", pIdentifier->DeviceName); -+ -+ /* Override PCI IDs when wined3d registry keys are set */ -+ if (!RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Direct3D", ®key)) { -+ DWORD type, data; -+ DWORD size = sizeof(DWORD); -+ -+ if (!RegQueryValueExA(regkey, "VideoPciDeviceID", 0, &type, (BYTE *)&data, &size) && (type == REG_DWORD) && (size == sizeof(DWORD))) -+ pIdentifier->DeviceId = data; -+ if(size != sizeof(DWORD)) { -+ ERR("VideoPciDeviceID is not a DWORD\n"); -+ size = sizeof(DWORD); -+ } -+ if (!RegQueryValueExA(regkey, "VideoPciVendorID", 0, &type, (BYTE *)&data, &size) && (type == REG_DWORD) && (size == sizeof(DWORD))) -+ pIdentifier->VendorId = data; -+ if(size != sizeof(DWORD)) -+ ERR("VideoPciVendorID is not a DWORD\n"); -+ RegCloseKey(regkey); -+ -+ TRACE("DeviceId:VendorId overridden: %04X:%04X\n", pIdentifier->DeviceId, pIdentifier->VendorId); -+ } -+ } -+ return hr; -+} -+ -+static UINT WINAPI -+d3dadapter9_GetAdapterModeCount( struct d3dadapter9 *This, -+ UINT Adapter, -+ D3DFORMAT Format ) -+{ -+ if (Adapter >= d3dadapter9_GetAdapterCount(This)) { -+ WARN("Adapter %u does not exist.\n", Adapter); -+ return 0; -+ } -+ if (FAILED(d3dadapter9_CheckDeviceFormat(This, Adapter, D3DDEVTYPE_HAL, -+ Format, D3DUSAGE_RENDERTARGET, -+ D3DRTYPE_SURFACE, Format))) { -+ WARN("DeviceFormat not available.\n"); -+ return 0; -+ } -+ -+ TRACE("%u modes.\n", ADAPTER_OUTPUT.nmodes); -+ return ADAPTER_OUTPUT.nmodes; -+} -+ -+static HRESULT WINAPI -+d3dadapter9_EnumAdapterModes( struct d3dadapter9 *This, -+ UINT Adapter, -+ D3DFORMAT Format, -+ UINT Mode, -+ D3DDISPLAYMODE *pMode ) -+{ -+ HRESULT hr; -+ -+ if (Adapter >= d3dadapter9_GetAdapterCount(This)) { -+ WARN("Adapter %u does not exist.\n", Adapter); -+ return D3DERR_INVALIDCALL; -+ } -+ -+ hr = d3dadapter9_CheckDeviceFormat(This, Adapter, D3DDEVTYPE_HAL, -+ Format, D3DUSAGE_RENDERTARGET, -+ D3DRTYPE_SURFACE, Format); -+ if (FAILED(hr)) { -+ TRACE("DeviceFormat not available.\n"); -+ return hr; -+ } -+ -+ if (Mode >= ADAPTER_OUTPUT.nmodes) { -+ WARN("Mode %u does not exist.\n", Mode); -+ return D3DERR_INVALIDCALL; -+ } -+ -+ pMode->Width = ADAPTER_OUTPUT.modes[Mode].Width; -+ pMode->Height = ADAPTER_OUTPUT.modes[Mode].Height; -+ pMode->RefreshRate = ADAPTER_OUTPUT.modes[Mode].RefreshRate; -+ pMode->Format = Format; -+ -+ return D3D_OK; -+} -+ -+static HRESULT WINAPI -+d3dadapter9_GetAdapterDisplayMode( struct d3dadapter9 *This, -+ UINT Adapter, -+ D3DDISPLAYMODE *pMode ) -+{ -+ UINT Mode; -+ -+ if (Adapter >= d3dadapter9_GetAdapterCount(This)) { -+ WARN("Adapter %u does not exist.\n", Adapter); -+ return D3DERR_INVALIDCALL; -+ } -+ -+ Mode = ADAPTER_OUTPUT.current; -+ pMode->Width = ADAPTER_OUTPUT.modes[Mode].Width; -+ pMode->Height = ADAPTER_OUTPUT.modes[Mode].Height; -+ pMode->RefreshRate = ADAPTER_OUTPUT.modes[Mode].RefreshRate; -+ pMode->Format = ADAPTER_OUTPUT.modes[Mode].Format; -+ -+ return D3D_OK; -+} -+ -+static HRESULT WINAPI -+d3dadapter9_CheckDeviceType( struct d3dadapter9 *This, -+ UINT Adapter, -+ D3DDEVTYPE DevType, -+ D3DFORMAT AdapterFormat, -+ D3DFORMAT BackBufferFormat, -+ BOOL bWindowed ) -+{ -+ if (Adapter >= d3dadapter9_GetAdapterCount(This)) { return D3DERR_INVALIDCALL; } -+ return ADAPTER_PROC(CheckDeviceType, -+ DevType, AdapterFormat, BackBufferFormat, bWindowed); -+} -+ -+static HRESULT WINAPI -+d3dadapter9_CheckDeviceFormat( struct d3dadapter9 *This, -+ UINT Adapter, -+ D3DDEVTYPE DeviceType, -+ D3DFORMAT AdapterFormat, -+ DWORD Usage, -+ D3DRESOURCETYPE RType, -+ D3DFORMAT CheckFormat ) -+{ -+ if (Adapter >= d3dadapter9_GetAdapterCount(This)) { return D3DERR_INVALIDCALL; } -+ return ADAPTER_PROC(CheckDeviceFormat, -+ DeviceType, AdapterFormat, Usage, RType, CheckFormat); -+} -+ -+static HRESULT WINAPI -+d3dadapter9_CheckDeviceMultiSampleType( struct d3dadapter9 *This, -+ UINT Adapter, -+ D3DDEVTYPE DeviceType, -+ D3DFORMAT SurfaceFormat, -+ BOOL Windowed, -+ D3DMULTISAMPLE_TYPE MultiSampleType, -+ DWORD *pQualityLevels ) -+{ -+ if (Adapter >= d3dadapter9_GetAdapterCount(This)) { return D3DERR_INVALIDCALL; } -+ return ADAPTER_PROC(CheckDeviceMultiSampleType, DeviceType, SurfaceFormat, -+ Windowed, MultiSampleType, pQualityLevels); -+} -+ -+static HRESULT WINAPI -+d3dadapter9_CheckDepthStencilMatch( struct d3dadapter9 *This, -+ UINT Adapter, -+ D3DDEVTYPE DeviceType, -+ D3DFORMAT AdapterFormat, -+ D3DFORMAT RenderTargetFormat, -+ D3DFORMAT DepthStencilFormat ) -+{ -+ if (Adapter >= d3dadapter9_GetAdapterCount(This)) { return D3DERR_INVALIDCALL; } -+ return ADAPTER_PROC(CheckDepthStencilMatch, DeviceType, AdapterFormat, -+ RenderTargetFormat, DepthStencilFormat); -+} -+ -+static HRESULT WINAPI -+d3dadapter9_CheckDeviceFormatConversion( struct d3dadapter9 *This, -+ UINT Adapter, -+ D3DDEVTYPE DeviceType, -+ D3DFORMAT SourceFormat, -+ D3DFORMAT TargetFormat ) -+{ -+ if (Adapter >= d3dadapter9_GetAdapterCount(This)) { return D3DERR_INVALIDCALL; } -+ return ADAPTER_PROC(CheckDeviceFormatConversion, -+ DeviceType, SourceFormat, TargetFormat); -+} -+ -+static HRESULT WINAPI -+d3dadapter9_GetDeviceCaps( struct d3dadapter9 *This, -+ UINT Adapter, -+ D3DDEVTYPE DeviceType, -+ D3DCAPS9 *pCaps ) -+{ -+ HRESULT hr; -+ -+ if (Adapter >= d3dadapter9_GetAdapterCount(This)) { return D3DERR_INVALIDCALL; } -+ -+ hr = ADAPTER_PROC(GetDeviceCaps, DeviceType, pCaps); -+ if (FAILED(hr)) { return hr; } -+ -+ pCaps->MasterAdapterOrdinal = This->map[Adapter].master; -+ pCaps->AdapterOrdinalInGroup = Adapter-This->map[Adapter].master; -+ pCaps->NumberOfAdaptersInGroup = ADAPTER_GROUP.noutputs; -+ -+ return hr; -+} -+ -+static HMONITOR WINAPI -+d3dadapter9_GetAdapterMonitor( struct d3dadapter9 *This, -+ UINT Adapter ) -+{ -+ if (Adapter >= d3dadapter9_GetAdapterCount(This)) { return (HMONITOR)0; } -+ return (HMONITOR)ADAPTER_OUTPUT.monitor; -+} -+ -+static HRESULT WINAPI -+d3dadapter9_CreateDeviceEx( struct d3dadapter9 *This, -+ UINT Adapter, -+ D3DDEVTYPE DeviceType, -+ HWND hFocusWindow, -+ DWORD BehaviorFlags, -+ D3DPRESENT_PARAMETERS *pPresentationParameters, -+ D3DDISPLAYMODEEX *pFullscreenDisplayMode, -+ IDirect3DDevice9Ex **ppReturnedDeviceInterface ); -+ -+static HRESULT WINAPI -+d3dadapter9_CreateDevice( struct d3dadapter9 *This, -+ UINT Adapter, -+ D3DDEVTYPE DeviceType, -+ HWND hFocusWindow, -+ DWORD BehaviorFlags, -+ D3DPRESENT_PARAMETERS *pPresentationParameters, -+ IDirect3DDevice9 **ppReturnedDeviceInterface ) -+{ -+ HRESULT hr; -+ hr = d3dadapter9_CreateDeviceEx(This, Adapter, DeviceType, hFocusWindow, -+ BehaviorFlags, pPresentationParameters, -+ NULL, -+ (IDirect3DDevice9Ex **)ppReturnedDeviceInterface); -+ if (FAILED(hr)) -+ return hr; -+ return D3D_OK; -+} -+ -+static UINT WINAPI -+d3dadapter9_GetAdapterModeCountEx( struct d3dadapter9 *This, -+ UINT Adapter, -+ const D3DDISPLAYMODEFILTER *pFilter ) -+{ -+ return 1; -+} -+ -+static HRESULT WINAPI -+d3dadapter9_EnumAdapterModesEx( struct d3dadapter9 *This, -+ UINT Adapter, -+ const D3DDISPLAYMODEFILTER *pFilter, -+ UINT Mode, -+ D3DDISPLAYMODEEX *pMode ) -+{ -+ FIXME("(%p, %u, %p, %u, %p), stub!\n", This, Adapter, pFilter, Mode, pMode); -+ return D3DERR_INVALIDCALL; -+} -+ -+static HRESULT WINAPI -+d3dadapter9_GetAdapterDisplayModeEx( struct d3dadapter9 *This, -+ UINT Adapter, -+ D3DDISPLAYMODEEX *pMode, -+ D3DDISPLAYROTATION *pRotation ) -+{ -+ FIXME("(%p, %u, %p, %p), stub!\n", This, Adapter, pMode, pRotation); -+ return D3DERR_INVALIDCALL; -+} -+ -+static HRESULT WINAPI -+d3dadapter9_CreateDeviceEx( struct d3dadapter9 *This, -+ UINT Adapter, -+ D3DDEVTYPE DeviceType, -+ HWND hFocusWindow, -+ DWORD BehaviorFlags, -+ D3DPRESENT_PARAMETERS *pPresentationParameters, -+ D3DDISPLAYMODEEX *pFullscreenDisplayMode, -+ IDirect3DDevice9Ex **ppReturnedDeviceInterface ) -+{ -+ ID3DPresentGroup *present; -+ HRESULT hr; -+ boolean no_window_changes; -+ -+ if (Adapter >= d3dadapter9_GetAdapterCount(This)) { -+ WARN("Adapter %u does not exist.\n", Adapter); -+ return D3DERR_INVALIDCALL; -+ } -+ -+ { -+ struct adapter_group *group = &ADAPTER_GROUP; -+ unsigned nparams, ordinal; -+ -+ if (BehaviorFlags & D3DCREATE_ADAPTERGROUP_DEVICE) { -+ nparams = group->noutputs; -+ ordinal = 0; -+ } else { -+ nparams = 1; -+ ordinal = Adapter - This->map[Adapter].master; -+ } -+ no_window_changes = !!(BehaviorFlags & D3DCREATE_NOWINDOWCHANGES); -+ -+ hr = present_create_present_group(This->gdi_display, group->devname, ordinal, -+ hFocusWindow, -+ pPresentationParameters, -+ nparams, &present, This->ex, no_window_changes); -+ } -+ -+ if (FAILED(hr)) { -+ WARN("Failed to create PresentGroup.\n"); -+ return hr; -+ } -+ -+ if (This->ex) { -+ hr = ADAPTER_PROC(CreateDeviceEx, Adapter, DeviceType, hFocusWindow, -+ BehaviorFlags, pPresentationParameters, -+ pFullscreenDisplayMode, -+ (IDirect3D9Ex *)This, present, -+ ppReturnedDeviceInterface); -+ } else { /* CreateDevice on non-ex */ -+ hr = ADAPTER_PROC(CreateDevice, Adapter, DeviceType, hFocusWindow, -+ BehaviorFlags, pPresentationParameters, -+ (IDirect3D9 *)This, present, -+ (IDirect3DDevice9 **)ppReturnedDeviceInterface); -+ } -+ if (FAILED(hr)) { -+ WARN("ADAPTER_PROC failed.\n"); -+ ID3DPresentGroup_Release(present); -+ } -+ -+ return hr; -+} -+ -+static HRESULT WINAPI -+d3dadapter9_GetAdapterLUID( struct d3dadapter9 *This, -+ UINT Adapter, -+ LUID *pLUID ) -+{ -+ FIXME("(%p, %u, %p), stub!\n", This, Adapter, pLUID); -+ return D3DERR_INVALIDCALL; -+} -+ -+static struct adapter_group * -+add_group( struct d3dadapter9 *This ) -+{ -+ if (This->ngroups >= This->ngroupsalloc) { -+ void *r; -+ -+ if (This->ngroupsalloc == 0) { -+ This->ngroupsalloc = 2; -+ r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, -+ This->ngroupsalloc*sizeof(struct adapter_group)); -+ } else { -+ This->ngroupsalloc <<= 1; -+ r = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->groups, -+ This->ngroupsalloc*sizeof(struct adapter_group)); -+ } -+ -+ if (!r) { return NULL; } -+ This->groups = r; -+ } -+ -+ return &This->groups[This->ngroups++]; -+} -+ -+static void -+remove_group( struct d3dadapter9 *This ) -+{ -+ struct adapter_group *group = &This->groups[This->ngroups-1]; -+ int i; -+ -+ for (i = 0; i < group->noutputs; ++i) { -+ HeapFree(GetProcessHeap(), 0, group->outputs[i].modes); -+ } -+ HeapFree(GetProcessHeap(), 0, group->outputs); -+ -+ ZeroMemory(group, sizeof(struct adapter_group)); -+ This->ngroups--; -+} -+ -+static struct output * -+add_output( struct d3dadapter9 *This ) -+{ -+ struct adapter_group *group = &This->groups[This->ngroups-1]; -+ -+ if (group->noutputs >= group->noutputsalloc) { -+ void *r; -+ -+ if (group->noutputsalloc == 0) { -+ group->noutputsalloc = 2; -+ r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, -+ group->noutputsalloc*sizeof(struct output)); -+ } else { -+ group->noutputsalloc <<= 1; -+ r = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, group->outputs, -+ group->noutputsalloc*sizeof(struct output)); -+ } -+ -+ if (!r) { return NULL; } -+ group->outputs = r; -+ } -+ -+ return &group->outputs[group->noutputs++]; -+} -+ -+static void -+remove_output( struct d3dadapter9 *This ) -+{ -+ struct adapter_group *group = &This->groups[This->ngroups-1]; -+ struct output *out = &group->outputs[group->noutputs-1]; -+ -+ HeapFree(GetProcessHeap(), 0, out->modes); -+ -+ ZeroMemory(out, sizeof(struct output)); -+ group->noutputs--; -+} -+ -+static D3DDISPLAYMODEEX * -+add_mode( struct d3dadapter9 *This ) -+{ -+ struct adapter_group *group = &This->groups[This->ngroups-1]; -+ struct output *out = &group->outputs[group->noutputs-1]; -+ -+ if (out->nmodes >= out->nmodesalloc) { -+ void *r; -+ -+ if (out->nmodesalloc == 0) { -+ out->nmodesalloc = 8; -+ r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, -+ out->nmodesalloc*sizeof(struct D3DDISPLAYMODEEX)); -+ } else { -+ out->nmodesalloc <<= 1; -+ r = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, out->modes, -+ out->nmodesalloc*sizeof(struct D3DDISPLAYMODEEX)); -+ } -+ -+ if (!r) { return NULL; } -+ out->modes = r; -+ } -+ -+ return &out->modes[out->nmodes++]; -+} -+ -+static void -+remove_mode( struct d3dadapter9 *This ) -+{ -+ struct adapter_group *group = &This->groups[This->ngroups-1]; -+ struct output *out = &group->outputs[group->noutputs-1]; -+ out->nmodes--; -+} -+ -+#ifndef DM_INTERLACED -+#define DM_INTERLACED 2 -+#endif /* DM_INTERLACED */ -+ -+static HRESULT -+fill_groups( struct d3dadapter9 *This ) -+{ -+ DISPLAY_DEVICEW dd; -+ DEVMODEW dm; -+ POINT pt; -+ HDC hdc; -+ HRESULT hr; -+ int i, j, k; -+ -+ WCHAR wdisp[] = {'D','I','S','P','L','A','Y',0}; -+ -+ ZeroMemory(&dd, sizeof(dd)); -+ ZeroMemory(&dm, sizeof(dm)); -+ dd.cb = sizeof(dd); -+ dm.dmSize = sizeof(dm); -+ -+ for (i = 0; EnumDisplayDevicesW(NULL, i, &dd, 0); ++i) { -+ struct adapter_group *group = add_group(This); -+ if (!group) { -+ ERR("Out of memory.\n"); -+ return E_OUTOFMEMORY; -+ } -+ -+ hdc = CreateDCW(wdisp, dd.DeviceName, NULL, NULL); -+ if (!hdc) { -+ remove_group(This); -+ WARN("Unable to create DC for display %d.\n", i); -+ goto end_group; -+ } -+ -+ hr = present_create_adapter9(This->gdi_display, hdc, &group->adapter); -+ DeleteDC(hdc); -+ if (FAILED(hr)) { -+ remove_group(This); -+ goto end_group; -+ } -+ -+ CopyMemory(group->devname, dd.DeviceName, sizeof(group->devname)); -+ for (j = 0; EnumDisplayDevicesW(group->devname, j, &dd, 0); ++j) { -+ struct output *out = add_output(This); -+ boolean orient = FALSE, monit = FALSE; -+ if (!out) { -+ ERR("Out of memory.\n"); -+ return E_OUTOFMEMORY; -+ } -+ -+ for (k = 0; EnumDisplaySettingsExW(dd.DeviceName, k, &dm, 0); ++k) { -+ D3DDISPLAYMODEEX *mode = add_mode(This); -+ if (!out) { -+ ERR("Out of memory.\n"); -+ return E_OUTOFMEMORY; -+ } -+ -+ mode->Size = sizeof(D3DDISPLAYMODEEX); -+ mode->Width = dm.dmPelsWidth; -+ mode->Height = dm.dmPelsHeight; -+ mode->RefreshRate = dm.dmDisplayFrequency; -+ mode->ScanLineOrdering = -+ (dm.dmDisplayFlags & DM_INTERLACED) ? -+ D3DSCANLINEORDERING_INTERLACED : -+ D3DSCANLINEORDERING_PROGRESSIVE; -+ -+ switch (dm.dmBitsPerPel) { -+ case 32: mode->Format = D3DFMT_X8R8G8B8; break; -+ case 24: mode->Format = D3DFMT_R8G8B8; break; -+ case 16: mode->Format = D3DFMT_R5G6B5; break; -+ case 8: -+ remove_mode(This); -+ goto end_mode; -+ -+ default: -+ remove_mode(This); -+ WARN("Unknown format (%u bpp) in display %d, monitor " -+ "%d, mode %d.\n", dm.dmBitsPerPel, i, j, k); -+ goto end_mode; -+ } -+ -+ if (!orient) { -+ switch (dm.dmDisplayOrientation) { -+ case DMDO_DEFAULT: -+ out->rotation = D3DDISPLAYROTATION_IDENTITY; -+ break; -+ -+ case DMDO_90: -+ out->rotation = D3DDISPLAYROTATION_90; -+ break; -+ -+ case DMDO_180: -+ out->rotation = D3DDISPLAYROTATION_180; -+ break; -+ -+ case DMDO_270: -+ out->rotation = D3DDISPLAYROTATION_270; -+ break; -+ -+ default: -+ remove_output(This); -+ WARN("Unknown display rotation in display %d, " -+ "monitor %d\n", i, j); -+ goto end_output; -+ } -+ orient = TRUE; -+ } -+ -+ if (!monit) { -+ pt.x = dm.dmPosition.x; -+ pt.y = dm.dmPosition.y; -+ out->monitor = MonitorFromPoint(pt, 0); -+ if (!out->monitor) { -+ remove_output(This); -+ WARN("Unable to get monitor handle for display %d, " -+ "monitor %d.\n", i, j); -+ goto end_output; -+ } -+ monit = TRUE; -+ } -+ -+end_mode: -+ ZeroMemory(&dm, sizeof(dm)); -+ dm.dmSize = sizeof(dm); -+ } -+ -+end_output: -+ ZeroMemory(&dd, sizeof(dd)); -+ dd.cb = sizeof(dd); -+ } -+ -+end_group: -+ ZeroMemory(&dd, sizeof(dd)); -+ dd.cb = sizeof(dd); -+ } -+ -+ return D3D_OK; -+} -+ -+static IDirect3D9ExVtbl d3dadapter9_vtable = { -+ (void *)d3dadapter9_QueryInterface, -+ (void *)d3dadapter9_AddRef, -+ (void *)d3dadapter9_Release, -+ (void *)d3dadapter9_RegisterSoftwareDevice, -+ (void *)d3dadapter9_GetAdapterCount, -+ (void *)d3dadapter9_GetAdapterIdentifier, -+ (void *)d3dadapter9_GetAdapterModeCount, -+ (void *)d3dadapter9_EnumAdapterModes, -+ (void *)d3dadapter9_GetAdapterDisplayMode, -+ (void *)d3dadapter9_CheckDeviceType, -+ (void *)d3dadapter9_CheckDeviceFormat, -+ (void *)d3dadapter9_CheckDeviceMultiSampleType, -+ (void *)d3dadapter9_CheckDepthStencilMatch, -+ (void *)d3dadapter9_CheckDeviceFormatConversion, -+ (void *)d3dadapter9_GetDeviceCaps, -+ (void *)d3dadapter9_GetAdapterMonitor, -+ (void *)d3dadapter9_CreateDevice, -+ (void *)d3dadapter9_GetAdapterModeCountEx, -+ (void *)d3dadapter9_EnumAdapterModesEx, -+ (void *)d3dadapter9_GetAdapterDisplayModeEx, -+ (void *)d3dadapter9_CreateDeviceEx, -+ (void *)d3dadapter9_GetAdapterLUID -+}; -+ -+HRESULT -+d3dadapter9_new( Display *gdi_display, -+ boolean ex, -+ IDirect3D9Ex **ppOut ) -+{ -+ struct d3dadapter9 *This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, -+ sizeof(struct d3dadapter9)); -+ HRESULT hr; -+ unsigned i, j, k; -+ -+ if (!This) { -+ ERR("Out of memory.\n"); -+ return E_OUTOFMEMORY; -+ } -+ -+ This->vtable = &d3dadapter9_vtable; -+ This->refs = 1; -+ This->ex = ex; -+ This->gdi_display = gdi_display; -+ -+ if (!has_d3dadapter(gdi_display)) { -+ ERR("Your display driver doesn't support native D3D9 adapters.\n"); -+ d3dadapter9_Release(This); -+ return D3DERR_NOTAVAILABLE; -+ } -+ -+ hr = fill_groups(This); -+ if (FAILED(hr)) { -+ d3dadapter9_Release(This); -+ return hr; -+ } -+ -+ /* map absolute adapter IDs with internal adapters */ -+ for (i = 0; i < This->ngroups; ++i) { -+ for (j = 0; j < This->groups[i].noutputs; ++j) { -+ This->nadapters++; -+ } -+ } -+ if (This->nadapters == 0) { -+ ERR("No available native adapters in system.\n"); -+ d3dadapter9_Release(This); -+ return D3DERR_NOTAVAILABLE; -+ } -+ -+ This->map = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, -+ This->nadapters*sizeof(struct adapter_map)); -+ if (!This->map) { -+ d3dadapter9_Release(This); -+ ERR("Out of memory.\n"); -+ return E_OUTOFMEMORY; -+ } -+ for (i = k = 0; i < This->ngroups; ++i) { -+ for (j = 0; j < This->groups[i].noutputs; ++j, ++k) { -+ This->map[k].master = k-j; -+ This->map[k].group = i; -+ } -+ } -+ -+ *ppOut = (IDirect3D9Ex *)This; -+ FIXME("\033[1;32m\nNative Direct3D 9 is active." -+ "\nFor more information visit https://wiki.ixit.cz/d3d9\033[0m\n"); -+ return D3D_OK; -+} -diff --git a/dlls/d3d9-nine/d3dadapter9.h b/dlls/d3d9-nine/d3dadapter9.h -new file mode 100644 -index 0000000..2fafdf2 ---- /dev/null -+++ b/dlls/d3d9-nine/d3dadapter9.h -@@ -0,0 +1,30 @@ -+/* -+ * D3DAdapter9 interface -+ * -+ * Copyright 2015 Patrick Rudolph -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA -+ */ -+ -+#ifndef __WINE_D3D9ADAPTER_H -+#define __WINE_D3D9ADAPTER_H -+ -+#include <X11/Xlib.h> -+ -+void d3dadapter9_init(HINSTANCE hinst); -+void d3dadapter9_destroy(HINSTANCE hinst); -+HRESULT d3dadapter9_new(Display *gdi_display, boolean ex, IDirect3D9Ex **ppOut); -+ -+#endif /* __WINE_D3D9ADAPTER_H */ -diff --git a/dlls/d3d9-nine/dri3.c b/dlls/d3d9-nine/dri3.c -new file mode 100644 -index 0000000..d147b23 ---- /dev/null -+++ b/dlls/d3d9-nine/dri3.c -@@ -0,0 +1,1344 @@ -+/* -+ * Wine DRI3 interface -+ * -+ * Copyright 2014-2015 Axel Davy -+ * Copyright 2015 Patrick Rudolph -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA -+ */ -+ -+ -+#include "config.h" -+#include "wine/debug.h" -+ -+WINE_DEFAULT_DEBUG_CHANNEL(d3dadapter); -+ -+#include <d3dadapter/d3dadapter9.h> -+#include <stdlib.h> -+#include <fcntl.h> -+#include <pthread.h> -+ -+#include "dri3.h" -+#include "winbase.h" /* for Sleep */ -+ -+#ifdef D3DADAPTER9_DRI2 -+#include <unistd.h> -+#include <sys/ioctl.h> -+#include <stdio.h> -+#include <string.h> -+ -+#define BOOL X_BOOL -+#define BYTE X_BYTE -+#define INT8 X_INT8 -+#define INT16 X_INT16 -+#define INT32 X_INT32 -+#define INT64 X_INT64 -+#include <X11/Xmd.h> -+#include <X11/Xproto.h> -+#undef BOOL -+#undef BYTE -+#undef INT8 -+#undef INT16 -+#undef INT32 -+#undef INT64 -+#undef LONG64 -+ -+#include <X11/Xlibint.h> -+#include <X11/extensions/dri2tokens.h> -+#include <X11/extensions/dri2proto.h> -+#include <X11/extensions/extutil.h> -+#define GL_GLEXT_PROTOTYPES 1 -+#define EGL_EGLEXT_PROTOTYPES 1 -+#define GL_GLEXT_LEGACY 1 -+#include <GL/gl.h> -+/* workaround gl header bug */ -+#define glBlendColor glBlendColorLEV -+#define glBlendEquation glBlendEquationLEV -+#include <GL/glext.h> -+#include <EGL/egl.h> -+#include <EGL/eglext.h> -+#include <libdrm/drm_fourcc.h> -+#include <libdrm/drm.h> -+/*GLAPI void GLAPIENTRY glFlush( void ); -+ -+GLAPI void APIENTRY glGenFramebuffers (GLsizei n, GLuint *framebuffers); -+GLAPI void APIENTRY glBindFramebufferEXT (GLenum target, GLuint framebuffer); -+GLAPI void APIENTRY glBlitFramebuffer (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); -+GLAPI void APIENTRY glFramebufferTexture2DEXT (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -+GLAPI void APIENTRY glBindFramebuffer (GLenum target, GLuint framebuffer); -+GLAPI void APIENTRY glFramebufferTexture2D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -+GLAPI void APIENTRY glDeleteTexturesEXT (GLsizei n, const GLuint *textures); -+EGLAPI EGLBoolean EGLAPIENTRY eglDestroyImageKHR (EGLDisplay dpy, EGLImageKHR image);*/ -+ -+typedef void (APIENTRYP PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target, GLeglImageOES image); -+typedef EGLImageKHR (EGLAPIENTRYP PFNEGLCREATEIMAGEKHRPROC) (EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list); -+typedef EGLDisplay (EGLAPIENTRYP PFNEGLGETPLATFORMDISPLAYEXTPROC) (EGLenum platform, void *native_display, const EGLint *attrib_list); -+ -+#endif -+ -+BOOL -+DRI3CheckExtension(Display *dpy, int major, int minor) -+{ -+ xcb_connection_t *xcb_connection = XGetXCBConnection(dpy); -+ xcb_dri3_query_version_cookie_t dri3_cookie; -+ xcb_dri3_query_version_reply_t *dri3_reply; -+ xcb_generic_error_t *error; -+ const xcb_query_extension_reply_t *extension; -+ int fd; -+ -+ xcb_prefetch_extension_data(xcb_connection, &xcb_dri3_id); -+ -+ extension = xcb_get_extension_data(xcb_connection, &xcb_dri3_id); -+ if (!(extension && extension->present)) { -+ ERR("DRI3 extension is not present\n"); -+ return FALSE; -+ } -+ -+ dri3_cookie = xcb_dri3_query_version(xcb_connection, major, minor); -+ -+ dri3_reply = xcb_dri3_query_version_reply(xcb_connection, dri3_cookie, &error); -+ if (!dri3_reply) { -+ free(error); -+ ERR("Issue getting requested version of DRI3: %d,%d\n", major, minor); -+ return FALSE; -+ } -+ -+ if (!DRI3Open(dpy, DefaultScreen(dpy), &fd)) { -+ ERR("DRI3 advertised, but not working\n"); -+ return FALSE; -+ } -+ close(fd); -+ -+ TRACE("DRI3 version %d,%d found. %d %d requested\n", major, minor, (int)dri3_reply->major_version, (int)dri3_reply->minor_version); -+ free(dri3_reply); -+ -+ return TRUE; -+} -+ -+#ifdef D3DADAPTER9_DRI2 -+ -+struct DRI2priv { -+ Display *dpy; -+ EGLDisplay display; -+ EGLContext context; -+ PFNGLEGLIMAGETARGETTEXTURE2DOESPROC glEGLImageTargetTexture2DOES_func; -+ PFNEGLCREATEIMAGEKHRPROC eglCreateImageKHR_func; -+ PFNEGLDESTROYIMAGEKHRPROC eglDestroyImageKHR_func; -+}; -+ -+/* TODO: We don't free memory properly. When exiting, eglTerminate doesn't work well(crash), and things are freed automatically. Rely on it */ -+ -+BOOL -+DRI2FallbackInit(Display *dpy, struct DRI2priv **priv) -+{ -+ PFNGLEGLIMAGETARGETTEXTURE2DOESPROC glEGLImageTargetTexture2DOES_func; -+ PFNEGLCREATEIMAGEKHRPROC eglCreateImageKHR_func; -+ PFNEGLGETPLATFORMDISPLAYEXTPROC eglGetPlatformDisplayEXT_func; -+ PFNEGLDESTROYIMAGEKHRPROC eglDestroyImageKHR_func; -+ EGLDisplay display; -+ EGLint major, minor; -+ EGLConfig config; -+ EGLContext context; -+ EGLint i; -+ EGLBoolean b; -+ EGLenum current_api = 0; -+ const char *extensions; -+ EGLint config_attribs[] = { -+ EGL_RENDERABLE_TYPE, EGL_OPENGL_BIT, -+ EGL_NONE -+ }; -+ EGLint context_compatibility_attribs[] = { -+ EGL_CONTEXT_OPENGL_PROFILE_MASK_KHR, EGL_CONTEXT_OPENGL_COMPATIBILITY_PROFILE_BIT_KHR, -+ EGL_NONE -+ }; -+ -+ current_api = eglQueryAPI(); -+ eglGetPlatformDisplayEXT_func = (PFNEGLGETPLATFORMDISPLAYEXTPROC) eglGetProcAddress("eglGetPlatformDisplayEXT"); -+ if (!eglGetPlatformDisplayEXT_func) -+ return FALSE; -+ display = eglGetPlatformDisplayEXT_func(EGL_PLATFORM_X11_EXT, dpy, NULL); -+ if (!display) -+ return FALSE; -+ if (eglInitialize(display, &major, &minor) != EGL_TRUE) -+ goto clean_egl_display; -+ -+ extensions = eglQueryString(display, EGL_CLIENT_APIS); -+ if (!extensions || !strstr(extensions, "OpenGL")) -+ goto clean_egl_display; -+ -+ extensions = eglQueryString(display, EGL_EXTENSIONS); -+ if (!extensions || !strstr(extensions, "EGL_EXT_image_dma_buf_import") || -+ !strstr(extensions, "EGL_KHR_create_context") || -+ !strstr(extensions, "EGL_KHR_surfaceless_context") || -+ !strstr(extensions, "EGL_KHR_image_base")) -+ goto clean_egl_display; -+ -+ if (!eglChooseConfig(display, config_attribs, &config, 1, &i)) -+ goto clean_egl_display; -+ -+ b = eglBindAPI(EGL_OPENGL_API); -+ if (b == EGL_FALSE) -+ goto clean_egl_display; -+ context = eglCreateContext(display, config, EGL_NO_CONTEXT, context_compatibility_attribs); -+ if (context == EGL_NO_CONTEXT) -+ goto clean_egl_display; -+ -+ glEGLImageTargetTexture2DOES_func = (PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) eglGetProcAddress("glEGLImageTargetTexture2DOES"); -+ eglCreateImageKHR_func = (PFNEGLCREATEIMAGEKHRPROC) eglGetProcAddress("eglCreateImageKHR"); -+ eglDestroyImageKHR_func = (PFNEGLDESTROYIMAGEKHRPROC) eglGetProcAddress("eglDestroyImageKHR"); -+ if (!eglCreateImageKHR_func || !glEGLImageTargetTexture2DOES_func || !eglDestroyImageKHR_func) { -+ ERR("eglGetProcAddress failed !"); -+ goto clean_egl_display; -+ } -+ -+ eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); -+ -+ *priv = calloc(1, sizeof(struct DRI2priv)); -+ if (!*priv) -+ goto clean_egl; -+ (*priv)->dpy = dpy; -+ (*priv)->display = display; -+ (*priv)->context = context; -+ (*priv)->glEGLImageTargetTexture2DOES_func = glEGLImageTargetTexture2DOES_func; -+ (*priv)->eglCreateImageKHR_func = eglCreateImageKHR_func; -+ (*priv)->eglDestroyImageKHR_func = eglDestroyImageKHR_func; -+ eglBindAPI(current_api); -+ return TRUE; -+ -+clean_egl: -+clean_egl_display: -+ eglTerminate(display); -+ eglBindAPI(current_api); -+ return FALSE; -+} -+ -+/* hypothesis: at this step all textures, etc are destroyed */ -+void -+DRI2FallbackDestroy(struct DRI2priv *priv) -+{ -+ EGLenum current_api; -+ current_api = eglQueryAPI(); -+ eglBindAPI(EGL_OPENGL_API); -+ eglMakeCurrent(priv->display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); -+ eglDestroyContext(priv->display, priv->context); -+ eglTerminate(priv->display); -+ eglBindAPI(current_api); -+ free(priv); -+} -+ -+BOOL -+DRI2FallbackCheckSupport(Display *dpy) -+{ -+ struct DRI2priv *priv; -+ int fd; -+ if (!DRI2FallbackInit(dpy, &priv)) -+ return FALSE; -+ DRI2FallbackDestroy(priv); -+ if (!DRI2FallbackOpen(dpy, DefaultScreen(dpy), &fd)) -+ return FALSE; -+ close(fd); -+ return TRUE; -+} -+ -+#endif -+ -+BOOL -+PRESENTCheckExtension(Display *dpy, int major, int minor) -+{ -+ xcb_connection_t *xcb_connection = XGetXCBConnection(dpy); -+ xcb_present_query_version_cookie_t present_cookie; -+ xcb_present_query_version_reply_t *present_reply; -+ xcb_generic_error_t *error; -+ const xcb_query_extension_reply_t *extension; -+ -+ xcb_prefetch_extension_data(xcb_connection, &xcb_present_id); -+ -+ extension = xcb_get_extension_data(xcb_connection, &xcb_present_id); -+ if (!(extension && extension->present)) { -+ ERR("PRESENT extension is not present\n"); -+ return FALSE; -+ } -+ -+ present_cookie = xcb_present_query_version(xcb_connection, major, minor); -+ -+ present_reply = xcb_present_query_version_reply(xcb_connection, present_cookie, &error); -+ if (!present_reply) { -+ free(error); -+ ERR("Issue getting requested version of PRESENT: %d,%d\n", major, minor); -+ return FALSE; -+ } -+ -+ TRACE("PRESENT version %d,%d found. %d %d requested\n", major, minor, (int)present_reply->major_version, (int)present_reply->minor_version); -+ free(present_reply); -+ -+ return TRUE; -+} -+ -+BOOL -+DRI3Open(Display *dpy, int screen, int *device_fd) -+{ -+ xcb_dri3_open_cookie_t cookie; -+ xcb_dri3_open_reply_t *reply; -+ xcb_connection_t *xcb_connection = XGetXCBConnection(dpy); -+ int fd; -+ Window root = RootWindow(dpy, screen); -+ -+ cookie = xcb_dri3_open(xcb_connection, root, 0); -+ -+ reply = xcb_dri3_open_reply(xcb_connection, cookie, NULL); -+ if (!reply) -+ return FALSE; -+ -+ if (reply->nfd != 1) { -+ free(reply); -+ return FALSE; -+ } -+ -+ fd = xcb_dri3_open_reply_fds(xcb_connection, reply)[0]; -+ fcntl(fd, F_SETFD, FD_CLOEXEC); -+ -+ *device_fd = fd; -+ free(reply); -+ -+ return TRUE; -+} -+ -+#ifdef D3DADAPTER9_DRI2 -+ -+static XExtensionInfo _dri2_info_data; -+static XExtensionInfo *dri2_info = &_dri2_info_data; -+static char dri2_name[] = DRI2_NAME; -+ -+#define DRI2CheckExtension(dpy, i, val) \ -+ XextCheckExtension(dpy, i, dri2_name, val) -+ -+ -+static int -+close_display(Display *dpy, -+ XExtCodes *codes); -+static Bool -+wire_to_event(Display *dpy, -+ XEvent *re, -+ xEvent *event); -+static Status -+event_to_wire(Display *dpy, -+ XEvent *re, -+ xEvent *event); -+static int -+error( Display *dpy, -+ xError *err, -+ XExtCodes *codes, -+ int *ret_code ); -+static XExtensionHooks dri2_hooks = { -+ NULL, /* create_gc */ -+ NULL, /* copy_gc */ -+ NULL, /* flush_gc */ -+ NULL, /* free_gc */ -+ NULL, /* create_font */ -+ NULL, /* free_font */ -+ close_display, /* close_display */ -+ wire_to_event, /* wire_to_event */ -+ event_to_wire, /* event_to_wire */ -+ error, /* error */ -+ NULL, /* error_string */ -+}; -+static XEXT_GENERATE_CLOSE_DISPLAY(close_display, dri2_info); -+static XEXT_GENERATE_FIND_DISPLAY(find_display, dri2_info, -+ dri2_name, &dri2_hooks, 0, NULL); -+static Bool -+wire_to_event(Display *dpy, -+ XEvent *re, -+ xEvent *event) -+{ -+ XExtDisplayInfo *info = find_display(dpy); -+ DRI2CheckExtension(dpy, info, False); -+ TRACE("dri2 wire_to_event\n"); -+ return False; -+} -+static Status -+event_to_wire(Display *dpy, -+ XEvent *re, -+ xEvent *event) -+{ -+ XExtDisplayInfo *info = find_display(dpy); -+ DRI2CheckExtension(dpy, info, False); -+ TRACE("dri2 event_to_wire\n"); -+ return False; -+} -+static int -+error(Display *dpy, -+ xError *err, -+ XExtCodes *codes, -+ int *ret_code) -+{ -+ TRACE("dri2 error\n"); -+ return False; -+} -+ -+#define XALIGN(x) (((x) + 3) & (~3)) -+ -+static BOOL -+DRI2Connect(Display *dpy, -+ XID window, -+ unsigned driver_type, -+ char **device ) -+{ -+ XExtDisplayInfo *info = find_display(dpy); -+ xDRI2ConnectReply rep; -+ xDRI2ConnectReq *req; -+ int dev_len, driv_len; -+ char *driver; -+ -+ DRI2CheckExtension(dpy, info, False); -+ -+ LockDisplay(dpy); -+ GetReq(DRI2Connect, req); -+ req->reqType = info->codes->major_opcode; -+ req->dri2ReqType = X_DRI2Connect; -+ req->window = window; -+ req->driverType = driver_type; -+ if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) { -+ UnlockDisplay(dpy); -+ SyncHandle(); -+ return False; -+ } -+ -+ /* check string lengths */ -+ dev_len = rep.deviceNameLength; -+ driv_len = rep.driverNameLength; -+ if (dev_len == 0 || driv_len == 0) { -+ _XEatData(dpy, XALIGN(dev_len) + XALIGN(driv_len)); -+ UnlockDisplay(dpy); -+ SyncHandle(); -+ return False; -+ } -+ -+ /* read out driver */ -+ driver = HeapAlloc(GetProcessHeap(), 0, driv_len + 1); -+ if (!driver) { -+ _XEatData(dpy, XALIGN(dev_len) + XALIGN(driv_len)); -+ UnlockDisplay(dpy); -+ SyncHandle(); -+ return False; -+ } -+ _XReadPad(dpy, driver, driv_len); -+ HeapFree(GetProcessHeap(), 0, driver); /* we don't need the driver */ -+ -+ /* read out device */ -+ *device = HeapAlloc(GetProcessHeap(), 0, dev_len + 1); -+ if (!*device) { -+ _XEatData(dpy, XALIGN(dev_len)); -+ UnlockDisplay(dpy); -+ SyncHandle(); -+ return False; -+ } -+ _XReadPad(dpy, *device, dev_len); -+ (*device)[dev_len] = '\0'; -+ -+ UnlockDisplay(dpy); -+ SyncHandle(); -+ -+ return True; -+} -+ -+static Bool -+DRI2Authenticate(Display *dpy, -+ XID window, -+ uint32_t token) -+{ -+ XExtDisplayInfo *info = find_display(dpy); -+ xDRI2AuthenticateReply rep; -+ xDRI2AuthenticateReq *req; -+ -+ DRI2CheckExtension(dpy, info, False); -+ -+ LockDisplay(dpy); -+ GetReq(DRI2Authenticate, req); -+ req->reqType = info->codes->major_opcode; -+ req->dri2ReqType = X_DRI2Authenticate; -+ req->window = window; -+ req->magic = token; -+ if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) { -+ UnlockDisplay(dpy); -+ SyncHandle(); -+ return False; -+ } -+ UnlockDisplay(dpy); -+ SyncHandle(); -+ -+ return rep.authenticated ? True : False; -+} -+ -+BOOL -+DRI2FallbackOpen(Display *dpy, int screen, int *device_fd) -+{ -+ char *device; -+ int fd; -+ Window root = RootWindow(dpy, screen); -+ drm_auth_t auth; -+ -+ if (!DRI2Connect(dpy, root, DRI2DriverDRI, &device)) -+ return FALSE; -+ -+ fd = open(device, O_RDWR); -+ HeapFree(GetProcessHeap(), 0, device); -+ if (fd < 0) -+ return FALSE; -+ -+ if (ioctl(fd, DRM_IOCTL_GET_MAGIC, &auth) != 0) { -+ close(fd); -+ return FALSE; -+ } -+ -+ if (!DRI2Authenticate(dpy, root, auth.magic)) { -+ close(fd); -+ return FALSE; -+ } -+ -+ *device_fd = fd; -+ -+ return TRUE; -+} -+ -+#endif -+ -+ -+BOOL -+DRI3PixmapFromDmaBuf(Display *dpy, int screen, int fd, int width, int height, int stride, int depth, int bpp, Pixmap *pixmap) -+{ -+ xcb_connection_t *xcb_connection = XGetXCBConnection(dpy); -+ Window root = RootWindow(dpy, screen); -+ xcb_void_cookie_t cookie; -+ xcb_generic_error_t *error; -+ -+ cookie = xcb_dri3_pixmap_from_buffer_checked(xcb_connection, -+ (*pixmap = xcb_generate_id(xcb_connection)), -+ root, -+ 0, -+ width, height, stride, -+ depth, bpp, fd); -+ error = xcb_request_check(xcb_connection, cookie); /* performs a flush */ -+ if (error) { -+ ERR("Error using DRI3 to convert a DmaBufFd to pixmap\n"); -+ return FALSE; -+ } -+ return TRUE; -+} -+ -+BOOL -+DRI3DmaBufFromPixmap(Display *dpy, Pixmap pixmap, int *fd, int *width, int *height, int *stride, int *depth, int *bpp) -+{ -+ xcb_connection_t *xcb_connection = XGetXCBConnection(dpy); -+ xcb_dri3_buffer_from_pixmap_cookie_t bp_cookie; -+ xcb_dri3_buffer_from_pixmap_reply_t *bp_reply; -+ -+ bp_cookie = xcb_dri3_buffer_from_pixmap(xcb_connection, pixmap); -+ bp_reply = xcb_dri3_buffer_from_pixmap_reply(xcb_connection, bp_cookie, NULL); -+ if (!bp_reply) -+ return FALSE; -+ *fd = xcb_dri3_buffer_from_pixmap_reply_fds(xcb_connection, bp_reply)[0]; -+ *width = bp_reply->width; -+ *height = bp_reply->height; -+ *stride = bp_reply->stride; -+ *depth = bp_reply->depth; -+ *bpp = bp_reply->depth; -+ return TRUE; -+} -+ -+struct PRESENTPriv { -+ xcb_connection_t *xcb_connection; -+ xcb_connection_t *xcb_connection_bis; /* to avoid libxcb thread bugs, use a different connection to present pixmaps */ -+ XID window; -+ uint64_t last_msc; -+ uint64_t last_target; -+ uint32_t last_serial_given; -+ xcb_special_event_t *special_event; -+ PRESENTPixmapPriv *first_present_priv; -+ int pixmap_present_pending; -+ BOOL notify_with_serial_pending; -+ pthread_mutex_t mutex_present; /* protect readind/writing present_priv things */ -+ pthread_mutex_t mutex_xcb_wait; -+ BOOL xcb_wait; -+}; -+ -+struct PRESENTPixmapPriv { -+ PRESENTpriv *present_priv; -+ Pixmap pixmap; -+ BOOL released; -+ unsigned int width; -+ unsigned int height; -+ unsigned int depth; -+ BOOL present_complete_pending; -+ uint32_t serial; -+#ifdef D3DADAPTER9_DRI2 -+ struct { -+ BOOL is_dri2; -+ struct DRI2priv *dri2_priv; -+ GLuint fbo_read; -+ GLuint fbo_write; -+ GLuint texture_read; -+ GLuint texture_write; -+ } dri2_info; -+#endif -+ BOOL last_present_was_flip; -+ PRESENTPixmapPriv *next; -+}; -+ -+static PRESENTPixmapPriv *PRESENTFindPixmapPriv(PRESENTpriv *present_priv, uint32_t serial) -+{ -+ PRESENTPixmapPriv *current = present_priv->first_present_priv; -+ -+ while (current) { -+ if (current->serial == serial) -+ return current; -+ current = current->next; -+ } -+ return NULL; -+} -+ -+static void PRESENThandle_events(PRESENTpriv *present_priv, xcb_present_generic_event_t *ge) -+{ -+ PRESENTPixmapPriv *present_pixmap_priv = NULL; -+ -+ switch (ge->evtype) { -+ case XCB_PRESENT_COMPLETE_NOTIFY: { -+ xcb_present_complete_notify_event_t *ce = (void *) ge; -+ if (ce->kind == XCB_PRESENT_COMPLETE_KIND_NOTIFY_MSC) { -+ if (ce->serial) -+ present_priv->notify_with_serial_pending = FALSE; -+ free(ce); -+ return; -+ } -+ present_pixmap_priv = PRESENTFindPixmapPriv(present_priv, ce->serial); -+ if (!present_pixmap_priv || ce->kind != XCB_PRESENT_COMPLETE_KIND_PIXMAP) { -+ ERR("FATAL ERROR: PRESENT handling failed\n"); -+ free(ce); -+ return; -+ } -+ present_pixmap_priv->present_complete_pending = FALSE; -+ switch (ce->mode) { -+ case XCB_PRESENT_COMPLETE_MODE_FLIP: -+ present_pixmap_priv->last_present_was_flip = TRUE; -+ break; -+ case XCB_PRESENT_COMPLETE_MODE_COPY: -+ present_pixmap_priv->last_present_was_flip = FALSE; -+ break; -+ } -+ present_priv->pixmap_present_pending--; -+ present_priv->last_msc = ce->msc; -+ break; -+ } -+ case XCB_PRESENT_EVENT_IDLE_NOTIFY: { -+ xcb_present_idle_notify_event_t *ie = (void *) ge; -+ present_pixmap_priv = PRESENTFindPixmapPriv(present_priv, ie->serial); -+ if (!present_pixmap_priv || present_pixmap_priv->pixmap != ie->pixmap) { -+ ERR("FATAL ERROR: PRESENT handling failed\n"); -+ free(ie); -+ return; -+ } -+ present_pixmap_priv->released = TRUE; -+ break; -+ } -+ } -+ free(ge); -+} -+ -+static void PRESENTflush_events(PRESENTpriv *present_priv, BOOL assert_no_other_thread_waiting) -+{ -+ xcb_generic_event_t *ev; -+ -+ if ((present_priv->xcb_wait && !assert_no_other_thread_waiting) || /* don't steal events to someone waiting */ -+ !present_priv->special_event) -+ return; -+ -+ while ((ev = xcb_poll_for_special_event(present_priv->xcb_connection, present_priv->special_event)) != NULL) { -+ PRESENThandle_events(present_priv, (void *) ev); -+ } -+} -+ -+static BOOL PRESENTwait_events(PRESENTpriv *present_priv, BOOL allow_other_threads) -+{ -+ xcb_generic_event_t *ev; -+ -+ if (allow_other_threads) { -+ present_priv->xcb_wait = TRUE; -+ pthread_mutex_lock(&present_priv->mutex_xcb_wait); -+ pthread_mutex_unlock(&present_priv->mutex_present); -+ } -+ ev = xcb_wait_for_special_event(present_priv->xcb_connection, present_priv->special_event); -+ if (allow_other_threads) { -+ pthread_mutex_unlock(&present_priv->mutex_xcb_wait); -+ pthread_mutex_lock(&present_priv->mutex_present); -+ present_priv->xcb_wait = FALSE; -+ } -+ if (!ev) { -+ ERR("FATAL error: xcb had an error\n"); -+ return FALSE; -+ } -+ -+ PRESENThandle_events(present_priv, (void *) ev); -+ return TRUE; -+} -+ -+static struct xcb_connection_t * -+create_xcb_connection(Display *dpy) -+{ -+ int screen_num = DefaultScreen(dpy); -+ xcb_connection_t *ret; -+ xcb_xfixes_query_version_cookie_t cookie; -+ xcb_xfixes_query_version_reply_t *rep; -+ -+ ret = xcb_connect(DisplayString(dpy), &screen_num); -+ cookie = xcb_xfixes_query_version_unchecked(ret, XCB_XFIXES_MAJOR_VERSION, XCB_XFIXES_MINOR_VERSION); -+ rep = xcb_xfixes_query_version_reply(ret, cookie, NULL); -+ if (rep) -+ free(rep); -+ return ret; -+} -+ -+BOOL -+PRESENTInit(Display *dpy, PRESENTpriv **present_priv) -+{ -+ *present_priv = (PRESENTpriv *) calloc(1, sizeof(PRESENTpriv)); -+ if (!*present_priv) { -+ return FALSE; -+ } -+ (*present_priv)->xcb_connection = create_xcb_connection(dpy); -+ (*present_priv)->xcb_connection_bis = create_xcb_connection(dpy); -+ pthread_mutex_init(&(*present_priv)->mutex_present, NULL); -+ pthread_mutex_init(&(*present_priv)->mutex_xcb_wait, NULL); -+ return TRUE; -+} -+ -+static void PRESENTForceReleases(PRESENTpriv *present_priv) -+{ -+ PRESENTPixmapPriv *current = NULL; -+ -+ if (!present_priv->window) -+ return; -+ -+ /* There should be no other thread listening for events here. -+ * This can happen when hDestWindowOverride changes without reset. -+ * This case should never happen, but can happen in theory.*/ -+ if (present_priv->xcb_wait) { -+ xcb_present_notify_msc(present_priv->xcb_connection, present_priv->window, 0, 0, 0, 0); -+ xcb_flush(present_priv->xcb_connection); -+ pthread_mutex_lock(&present_priv->mutex_xcb_wait); -+ pthread_mutex_unlock(&present_priv->mutex_xcb_wait); -+ /* the problem here is that we don't have access to the event the other thread got. -+ * It is either presented event, idle event or notify event. -+ */ -+ while (present_priv->pixmap_present_pending >= 2) -+ PRESENTwait_events(present_priv, FALSE); -+ PRESENTflush_events(present_priv, TRUE); -+ /* Remaining events to come can be a pair of present/idle, -+ * or an idle, or nothing. To be sure we are after all pixmaps -+ * have been presented, add an event to the queue that can only -+ * be after the present event, then if we receive an event more, -+ * we are sure all pixmaps were presented */ -+ present_priv->notify_with_serial_pending = TRUE; -+ xcb_present_notify_msc(present_priv->xcb_connection, present_priv->window, 1, present_priv->last_target + 5, 0, 0); -+ xcb_flush(present_priv->xcb_connection); -+ while (present_priv->notify_with_serial_pending) -+ PRESENTwait_events(present_priv, FALSE); -+ /* Now we are sure we are not expecting any new event */ -+ } else { -+ while (present_priv->pixmap_present_pending) /* wait all sent pixmaps are presented */ -+ PRESENTwait_events(present_priv, FALSE); -+ PRESENTflush_events(present_priv, TRUE); /* may be remaining idle event */ -+ /* Since idle events are send with the complete events when it is not flips, -+ * we are not expecting any new event here */ -+ } -+ -+ current = present_priv->first_present_priv; -+ while (current) { -+ if (!current->released) { -+ if (!current->last_present_was_flip && !present_priv->xcb_wait) { -+ ERR("ERROR: a pixmap seems not released by PRESENT for no reason. Code bug.\n"); -+ } else { -+ /* Present the same pixmap with a non-valid part to force the copy mode and the releases */ -+ xcb_xfixes_region_t valid, update; -+ xcb_rectangle_t rect_update; -+ rect_update.x = 0; -+ rect_update.y = 0; -+ rect_update.width = 8; -+ rect_update.height = 1; -+ valid = xcb_generate_id(present_priv->xcb_connection); -+ update = xcb_generate_id(present_priv->xcb_connection); -+ xcb_xfixes_create_region(present_priv->xcb_connection, valid, 1, &rect_update); -+ xcb_xfixes_create_region(present_priv->xcb_connection, update, 1, &rect_update); -+ /* here we know the pixmap has been presented. Thus if it is on screen, -+ * the following request can only make it released by the server if it is not */ -+ xcb_present_pixmap(present_priv->xcb_connection, present_priv->window, -+ current->pixmap, 0, valid, update, 0, 0, None, None, -+ None, XCB_PRESENT_OPTION_COPY | XCB_PRESENT_OPTION_ASYNC, 0, 0, 0, 0, NULL); -+ xcb_flush(present_priv->xcb_connection); -+ PRESENTwait_events(present_priv, FALSE); /* by assumption this can only be idle event */ -+ PRESENTflush_events(present_priv, TRUE); /* Shoudln't be needed */ -+ } -+ } -+ current = current->next; -+ } -+ /* Now all pixmaps are released (possibility if xcb_wait is true that one is not aware yet), -+ * and we don't expect any new Present event to come from Xserver */ -+} -+ -+static void PRESENTFreeXcbQueue(PRESENTpriv *present_priv) -+{ -+ if (present_priv->window) { -+ xcb_unregister_for_special_event(present_priv->xcb_connection, present_priv->special_event); -+ present_priv->last_msc = 0; -+ present_priv->last_target = 0; -+ present_priv->special_event = NULL; -+ } -+} -+ -+static BOOL PRESENTPrivChangeWindow(PRESENTpriv *present_priv, XID window) -+{ -+ xcb_void_cookie_t cookie; -+ xcb_generic_error_t *error; -+ xcb_present_event_t eid; -+ -+ PRESENTForceReleases(present_priv); -+ PRESENTFreeXcbQueue(present_priv); -+ present_priv->window = window; -+ -+ if (window) { -+ cookie = xcb_present_select_input_checked(present_priv->xcb_connection, -+ (eid = xcb_generate_id(present_priv->xcb_connection)), -+ window, -+ XCB_PRESENT_EVENT_MASK_COMPLETE_NOTIFY| -+ XCB_PRESENT_EVENT_MASK_IDLE_NOTIFY); -+ present_priv->special_event = xcb_register_for_special_xge(present_priv->xcb_connection, -+ &xcb_present_id, -+ eid, NULL); -+ error = xcb_request_check(present_priv->xcb_connection, cookie); /* performs a flush */ -+ if (error || !present_priv->special_event) { -+ ERR("FAILED to use the X PRESENT extension. Was the destination a window ?\n"); -+ if (present_priv->special_event) -+ xcb_unregister_for_special_event(present_priv->xcb_connection, present_priv->special_event); -+ present_priv->special_event = NULL; -+ present_priv->window = 0; -+ } -+ } -+ return (present_priv->window != 0); -+} -+ -+/* Destroy the content, except the link and the struct mem */ -+static void -+PRESENTDestroyPixmapContent(Display *dpy, PRESENTPixmapPriv *present_pixmap) -+{ -+ XFreePixmap(dpy, present_pixmap->pixmap); -+#ifdef D3DADAPTER9_DRI2 -+ if (present_pixmap->dri2_info.is_dri2) { -+ struct DRI2priv *dri2_priv = present_pixmap->dri2_info.dri2_priv; -+ EGLenum current_api; -+ current_api = eglQueryAPI(); -+ eglBindAPI(EGL_OPENGL_API); -+ if(eglMakeCurrent(dri2_priv->display, EGL_NO_SURFACE, EGL_NO_SURFACE, dri2_priv->context)) { -+ glDeleteFramebuffers(1, &present_pixmap->dri2_info.fbo_read); -+ glDeleteFramebuffers(1, &present_pixmap->dri2_info.fbo_write); -+ glDeleteTextures(1, &present_pixmap->dri2_info.texture_read); -+ glDeleteTextures(1, &present_pixmap->dri2_info.texture_write); -+ } else { -+ ERR("eglMakeCurrent failed with 0x%0X\n", eglGetError()); -+ } -+ eglMakeCurrent(dri2_priv->display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); -+ eglBindAPI(current_api); -+ } -+#endif -+} -+ -+void -+PRESENTDestroy(Display *dpy, PRESENTpriv *present_priv) -+{ -+ PRESENTPixmapPriv *current = NULL; -+ -+ pthread_mutex_lock(&present_priv->mutex_present); -+ -+ PRESENTForceReleases(present_priv); -+ -+ current = present_priv->first_present_priv; -+ while (current) { -+ PRESENTPixmapPriv *next = current->next; -+ PRESENTDestroyPixmapContent(dpy, current); -+ free(current); -+ current = next; -+ } -+ -+ PRESENTFreeXcbQueue(present_priv); -+ -+ xcb_disconnect(present_priv->xcb_connection); -+ xcb_disconnect(present_priv->xcb_connection_bis); -+ pthread_mutex_unlock(&present_priv->mutex_present); -+ pthread_mutex_destroy(&present_priv->mutex_present); -+ pthread_mutex_destroy(&present_priv->mutex_xcb_wait); -+ -+ free(present_priv); -+} -+ -+BOOL -+PRESENTPixmapInit(PRESENTpriv *present_priv, Pixmap pixmap, PRESENTPixmapPriv **present_pixmap_priv) -+{ -+ xcb_get_geometry_cookie_t cookie; -+ xcb_get_geometry_reply_t *reply; -+ -+ cookie = xcb_get_geometry(present_priv->xcb_connection, pixmap); -+ reply = xcb_get_geometry_reply(present_priv->xcb_connection, cookie, NULL); -+ -+ if (!reply) -+ return FALSE; -+ -+ *present_pixmap_priv = (PRESENTPixmapPriv *) calloc(1, sizeof(PRESENTPixmapPriv)); -+ if (!*present_pixmap_priv) { -+ free(reply); -+ return FALSE; -+ } -+ pthread_mutex_lock(&present_priv->mutex_present); -+ -+ (*present_pixmap_priv)->released = TRUE; -+ (*present_pixmap_priv)->pixmap = pixmap; -+ (*present_pixmap_priv)->present_priv = present_priv; -+ (*present_pixmap_priv)->next = present_priv->first_present_priv; -+ (*present_pixmap_priv)->width = reply->width; -+ (*present_pixmap_priv)->height = reply->height; -+ (*present_pixmap_priv)->depth = reply->depth; -+#ifdef D3DADAPTER9_DRI2 -+ (*present_pixmap_priv)->dri2_info.is_dri2 = FALSE; -+#endif -+ free(reply); -+ -+ present_priv->last_serial_given++; -+ (*present_pixmap_priv)->serial = present_priv->last_serial_given; -+ present_priv->first_present_priv = *present_pixmap_priv; -+ -+ pthread_mutex_unlock(&present_priv->mutex_present); -+ return TRUE; -+} -+ -+#ifdef D3DADAPTER9_DRI2 -+ -+BOOL -+DRI2FallbackPRESENTPixmap(PRESENTpriv *present_priv, struct DRI2priv *dri2_priv, -+ int fd, int width, int height, int stride, int depth, -+ int bpp, PRESENTPixmapPriv **present_pixmap_priv) -+{ -+ Window root = RootWindow(dri2_priv->dpy, DefaultScreen(dri2_priv->dpy)); -+ Pixmap pixmap; -+ EGLImageKHR image; -+ GLuint texture_read, texture_write, fbo_read, fbo_write; -+ EGLint attribs[] = { -+ EGL_WIDTH, 0, -+ EGL_HEIGHT, 0, -+ EGL_LINUX_DRM_FOURCC_EXT, DRM_FORMAT_ARGB8888, -+ EGL_DMA_BUF_PLANE0_FD_EXT, 0, -+ EGL_DMA_BUF_PLANE0_OFFSET_EXT, 0, -+ EGL_DMA_BUF_PLANE0_PITCH_EXT, 0, -+ EGL_NONE -+ }; -+ EGLenum current_api; -+ int status; -+ -+ pthread_mutex_lock(&present_priv->mutex_present); -+ -+ pixmap = XCreatePixmap(dri2_priv->dpy, root, width, height, 24); -+ if (!pixmap) -+ goto fail; -+ -+ attribs[1] = width; -+ attribs[3] = height; -+ attribs[7] = fd; -+ attribs[11] = stride; -+ -+ current_api = eglQueryAPI(); -+ eglBindAPI(EGL_OPENGL_API); -+ -+ /* We bind the dma-buf to a EGLImage, then to a texture, and then to a fbo. -+ * Note that we can delete the EGLImage, but we shouldn't delete the texture, -+ * else the fbo is invalid */ -+ -+ image = dri2_priv->eglCreateImageKHR_func(dri2_priv->display, -+ EGL_NO_CONTEXT, -+ EGL_LINUX_DMA_BUF_EXT, -+ NULL, attribs); -+ -+ if (image == EGL_NO_IMAGE_KHR) -+ goto fail; -+ close(fd); -+ -+ if(eglMakeCurrent(dri2_priv->display, EGL_NO_SURFACE, EGL_NO_SURFACE, dri2_priv->context)) { -+ glGenTextures(1, &texture_read); -+ glBindTexture(GL_TEXTURE_2D, texture_read); -+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); -+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); -+ dri2_priv->glEGLImageTargetTexture2DOES_func(GL_TEXTURE_2D, image); -+ glGenFramebuffers(1, &fbo_read); -+ glBindFramebuffer(GL_FRAMEBUFFER, fbo_read); -+ glFramebufferTexture2D(GL_FRAMEBUFFER, -+ GL_COLOR_ATTACHMENT0, -+ GL_TEXTURE_2D, texture_read, -+ 0); -+ status = glCheckFramebufferStatus(GL_FRAMEBUFFER); -+ if (status != GL_FRAMEBUFFER_COMPLETE) -+ goto fail; -+ glBindTexture(GL_TEXTURE_2D, 0); -+ dri2_priv->eglDestroyImageKHR_func(dri2_priv->display, image); -+ -+ /* We bind a newly created pixmap (to which we want to copy the content) -+ * to an EGLImage, then to a texture, then to a fbo. */ -+ image = dri2_priv->eglCreateImageKHR_func(dri2_priv->display, -+ dri2_priv->context, -+ EGL_NATIVE_PIXMAP_KHR, -+ (void *)pixmap, NULL); -+ if (image == EGL_NO_IMAGE_KHR) -+ goto fail; -+ -+ glGenTextures(1, &texture_write); -+ glBindTexture(GL_TEXTURE_2D, texture_write); -+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); -+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); -+ dri2_priv->glEGLImageTargetTexture2DOES_func(GL_TEXTURE_2D, image); -+ glGenFramebuffers(1, &fbo_write); -+ glBindFramebuffer(GL_FRAMEBUFFER, fbo_write); -+ glFramebufferTexture2D(GL_FRAMEBUFFER, -+ GL_COLOR_ATTACHMENT0, -+ GL_TEXTURE_2D, texture_write, -+ 0); -+ status = glCheckFramebufferStatus(GL_FRAMEBUFFER); -+ if (status != GL_FRAMEBUFFER_COMPLETE) -+ goto fail; -+ glBindTexture(GL_TEXTURE_2D, 0); -+ dri2_priv->eglDestroyImageKHR_func(dri2_priv->display, image); -+ } else { -+ ERR("eglMakeCurrent failed with 0x%0X\n", eglGetError()); -+ } -+ eglMakeCurrent(dri2_priv->display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); -+ -+ *present_pixmap_priv = (PRESENTPixmapPriv *) calloc(1, sizeof(PRESENTPixmapPriv)); -+ if (!*present_pixmap_priv) { -+ goto fail; -+ } -+ -+ (*present_pixmap_priv)->released = TRUE; -+ (*present_pixmap_priv)->pixmap = pixmap; -+ (*present_pixmap_priv)->present_priv = present_priv; -+ (*present_pixmap_priv)->next = present_priv->first_present_priv; -+ (*present_pixmap_priv)->width = width; -+ (*present_pixmap_priv)->height = height; -+ (*present_pixmap_priv)->depth = depth; -+ (*present_pixmap_priv)->dri2_info.is_dri2 = TRUE; -+ (*present_pixmap_priv)->dri2_info.dri2_priv = dri2_priv; -+ (*present_pixmap_priv)->dri2_info.fbo_read = fbo_read; -+ (*present_pixmap_priv)->dri2_info.fbo_write = fbo_write; -+ (*present_pixmap_priv)->dri2_info.texture_read = texture_read; -+ (*present_pixmap_priv)->dri2_info.texture_write = texture_write; -+ -+ present_priv->last_serial_given++; -+ (*present_pixmap_priv)->serial = present_priv->last_serial_given; -+ present_priv->first_present_priv = *present_pixmap_priv; -+ -+ eglBindAPI(current_api); -+ -+ pthread_mutex_unlock(&present_priv->mutex_present); -+ return TRUE; -+fail: -+ eglMakeCurrent(dri2_priv->display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); -+ eglBindAPI(current_api); -+ pthread_mutex_unlock(&present_priv->mutex_present); -+ return FALSE; -+} -+ -+#endif -+ -+BOOL -+PRESENTTryFreePixmap(Display *dpy, PRESENTPixmapPriv *present_pixmap_priv) -+{ -+ PRESENTpriv *present_priv = present_pixmap_priv->present_priv; -+ PRESENTPixmapPriv *current; -+ -+ pthread_mutex_lock(&present_priv->mutex_present); -+ -+ if (!present_pixmap_priv->released || present_pixmap_priv->present_complete_pending) { -+ pthread_mutex_unlock(&present_priv->mutex_present); -+ return FALSE; -+ } -+ -+ if (present_priv->first_present_priv == present_pixmap_priv) { -+ present_priv->first_present_priv = present_pixmap_priv->next; -+ goto free_priv; -+ } -+ -+ current = present_priv->first_present_priv; -+ while (current->next != present_pixmap_priv) -+ current = current->next; -+ current->next = present_pixmap_priv->next; -+free_priv: -+ PRESENTDestroyPixmapContent(dpy, present_pixmap_priv); -+ free(present_pixmap_priv); -+ pthread_mutex_unlock(&present_priv->mutex_present); -+ return TRUE; -+} -+ -+BOOL -+PRESENTHelperCopyFront(Display *dpy, PRESENTPixmapPriv *present_pixmap_priv) -+{ -+ PRESENTpriv *present_priv = present_pixmap_priv->present_priv; -+ xcb_void_cookie_t cookie; -+ xcb_generic_error_t *error; -+ -+ uint32_t v = 0; -+ xcb_gcontext_t gc; -+ -+ pthread_mutex_lock(&present_priv->mutex_present); -+ -+ if (!present_priv->window) { -+ pthread_mutex_unlock(&present_priv->mutex_present); -+ return FALSE; -+ } -+ -+ xcb_create_gc(present_priv->xcb_connection, -+ (gc = xcb_generate_id(present_priv->xcb_connection)), -+ present_priv->window, -+ XCB_GC_GRAPHICS_EXPOSURES, -+ &v); -+ cookie = xcb_copy_area_checked(present_priv->xcb_connection, -+ present_priv->window, -+ present_pixmap_priv->pixmap, -+ gc, -+ 0, 0, 0, 0, -+ present_pixmap_priv->width, -+ present_pixmap_priv->height); -+ error = xcb_request_check(present_priv->xcb_connection, cookie); -+ xcb_free_gc(present_priv->xcb_connection, gc); -+ pthread_mutex_unlock(&present_priv->mutex_present); -+ return (error != NULL); -+} -+ -+BOOL -+PRESENTPixmap(Display *dpy, XID window, -+ PRESENTPixmapPriv *present_pixmap_priv, D3DPRESENT_PARAMETERS *pPresentationParameters, -+ const RECT *pSourceRect, const RECT *pDestRect, const RGNDATA *pDirtyRegion) -+{ -+ PRESENTpriv *present_priv = present_pixmap_priv->present_priv; -+#ifdef D3DADAPTER9_DRI2 -+ struct DRI2priv *dri2_priv = present_pixmap_priv->dri2_info.dri2_priv; -+ EGLenum current_api; -+#endif -+ xcb_void_cookie_t cookie; -+ xcb_generic_error_t *error; -+ int64_t target_msc, presentationInterval; -+ xcb_xfixes_region_t valid, update; -+ int16_t x_off, y_off; -+ uint32_t options = XCB_PRESENT_OPTION_NONE; -+ -+ pthread_mutex_lock(&present_priv->mutex_present); -+ -+ if (window != present_priv->window) -+ PRESENTPrivChangeWindow(present_priv, window); -+ -+ if (!window) { -+ ERR("ERROR: Try to Present a pixmap on a NULL window\n"); -+ pthread_mutex_unlock(&present_priv->mutex_present); -+ return FALSE; -+ } -+ -+ PRESENTflush_events(present_priv, FALSE); -+ if (!present_pixmap_priv->released || present_pixmap_priv->present_complete_pending) { -+ ERR("FATAL ERROR: Trying to Present a pixmap not released\n"); -+ pthread_mutex_unlock(&present_priv->mutex_present); -+ return FALSE; -+ } -+#ifdef D3DADAPTER9_DRI2 -+ if (present_pixmap_priv->dri2_info.is_dri2) { -+ current_api = eglQueryAPI(); -+ eglBindAPI(EGL_OPENGL_API); -+ if(eglMakeCurrent(dri2_priv->display, EGL_NO_SURFACE, EGL_NO_SURFACE, dri2_priv->context)) { -+ glBindFramebuffer(GL_READ_FRAMEBUFFER, present_pixmap_priv->dri2_info.fbo_read); -+ glBindFramebuffer(GL_DRAW_FRAMEBUFFER, present_pixmap_priv->dri2_info.fbo_write); -+ -+ glBlitFramebuffer(0, 0, present_pixmap_priv->width, present_pixmap_priv->height, -+ 0, 0, present_pixmap_priv->width, present_pixmap_priv->height, -+ GL_COLOR_BUFFER_BIT, GL_NEAREST); -+ glFlush(); /* Perhaps useless */ -+ } else { -+ ERR("eglMakeCurrent failed with 0x%0X\n", eglGetError()); -+ } -+ eglMakeCurrent(dri2_priv->display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); -+ eglBindAPI(current_api); -+ } -+#endif -+ target_msc = present_priv->last_msc; -+ switch(pPresentationParameters->PresentationInterval) { -+ case D3DPRESENT_INTERVAL_DEFAULT: -+ case D3DPRESENT_INTERVAL_ONE: -+ presentationInterval = 1; -+ break; -+ case D3DPRESENT_INTERVAL_TWO: -+ presentationInterval = 2; -+ break; -+ case D3DPRESENT_INTERVAL_THREE: -+ presentationInterval = 3; -+ break; -+ case D3DPRESENT_INTERVAL_FOUR: -+ presentationInterval = 4; -+ break; -+ case D3DPRESENT_INTERVAL_IMMEDIATE: -+ default: -+ presentationInterval = 0; -+ options |= XCB_PRESENT_OPTION_ASYNC; -+ break; -+ } -+ target_msc += presentationInterval * (present_priv->pixmap_present_pending + 1); -+ -+ /* Note: PRESENT defines some way to do partial copy: -+ * presentproto: -+ * 'x-off' and 'y-off' define the location in the window where -+ * the 0,0 location of the pixmap will be presented. valid-area -+ * and update-area are relative to the pixmap. -+ */ -+ if (!pSourceRect && !pDestRect && !pDirtyRegion) { -+ valid = 0; -+ update = 0; -+ x_off = 0; -+ y_off = 0; -+ } else { -+ xcb_rectangle_t rect_update; -+ xcb_rectangle_t *rect_updates; -+ int i; -+ -+ rect_update.x = 0; -+ rect_update.y = 0; -+ rect_update.width = present_pixmap_priv->width; -+ rect_update.height = present_pixmap_priv->height; -+ x_off = 0; -+ y_off = 0; -+ if (pSourceRect) { -+ x_off = -pSourceRect->left; -+ y_off = -pSourceRect->top; -+ rect_update.x = pSourceRect->left; -+ rect_update.y = pSourceRect->top; -+ rect_update.width = pSourceRect->right - pSourceRect->left; -+ rect_update.height = pSourceRect->bottom - pSourceRect->top; -+ } -+ if (pDestRect) { -+ x_off += pDestRect->left; -+ y_off += pDestRect->top; -+ rect_update.width = pDestRect->right - pDestRect->left; -+ rect_update.height = pDestRect->bottom - pDestRect->top; -+ /* Note: the size of pDestRect and pSourceRect are supposed to be the same size -+ * because the driver would have done things to assure that. */ -+ } -+ valid = xcb_generate_id(present_priv->xcb_connection_bis); -+ update = xcb_generate_id(present_priv->xcb_connection_bis); -+ xcb_xfixes_create_region(present_priv->xcb_connection_bis, valid, 1, &rect_update); -+ if (pDirtyRegion && pDirtyRegion->rdh.nCount) { -+ rect_updates = (void *) calloc(pDirtyRegion->rdh.nCount, sizeof(xcb_rectangle_t)); -+ for (i = 0; i < pDirtyRegion->rdh.nCount; i++) -+ { -+ RECT rc; -+ memcpy(&rc, pDirtyRegion->Buffer + i * sizeof(RECT), sizeof(RECT)); -+ rect_update.x = rc.left; -+ rect_update.y = rc.top; -+ rect_update.width = rc.right - rc.left; -+ rect_update.height = rc.bottom - rc.top; -+ memcpy(rect_updates + i * sizeof(xcb_rectangle_t), &rect_update, sizeof(xcb_rectangle_t)); -+ } -+ xcb_xfixes_create_region(present_priv->xcb_connection_bis, update, pDirtyRegion->rdh.nCount, rect_updates); -+ free(rect_updates); -+ } else -+ xcb_xfixes_create_region(present_priv->xcb_connection_bis, update, 1, &rect_update); -+ } -+ if (pPresentationParameters->SwapEffect == D3DSWAPEFFECT_COPY) -+ options |= XCB_PRESENT_OPTION_COPY; -+ cookie = xcb_present_pixmap_checked(present_priv->xcb_connection_bis, -+ window, -+ present_pixmap_priv->pixmap, -+ present_pixmap_priv->serial, -+ valid, update, x_off, y_off, -+ None, None, None, options, -+ target_msc, 0, 0, 0, NULL); -+ error = xcb_request_check(present_priv->xcb_connection_bis, cookie); /* performs a flush */ -+ -+ if (update) -+ xcb_xfixes_destroy_region(present_priv->xcb_connection_bis, update); -+ if (valid) -+ xcb_xfixes_destroy_region(present_priv->xcb_connection_bis, valid); -+ -+ if (error) { -+ xcb_get_geometry_cookie_t cookie_geom; -+ xcb_get_geometry_reply_t *reply; -+ -+ cookie_geom = xcb_get_geometry(present_priv->xcb_connection_bis, window); -+ reply = xcb_get_geometry_reply(present_priv->xcb_connection_bis, cookie_geom, NULL); -+ -+ ERR("Error using PRESENT. Here some debug info\n"); -+ if (!reply) { -+ ERR("Error querying window info. Perhaps it doesn't exist anymore\n"); -+ pthread_mutex_unlock(&present_priv->mutex_present); -+ return FALSE; -+ } -+ ERR("Pixmap: width=%d, height=%d, depth=%d\n", -+ present_pixmap_priv->width, present_pixmap_priv->height, -+ present_pixmap_priv->depth); -+ ERR("Window: width=%d, height=%d, depth=%d, x=%d, y=%d\n", -+ (int) reply->width, (int) reply->height, -+ (int) reply->depth, (int) reply->x, (int) reply->y); -+ ERR("Present parameter: PresentationInterval=%d, BackBufferCount=%d, Pending presentations=%d\n", -+ pPresentationParameters->PresentationInterval, -+ pPresentationParameters->BackBufferCount, -+ present_priv->pixmap_present_pending -+ ); -+ if (present_pixmap_priv->depth != reply->depth) -+ ERR("Depths are different. PRESENT needs the pixmap and the window have same depth\n"); -+ free(reply); -+ pthread_mutex_unlock(&present_priv->mutex_present); -+ return FALSE; -+ } -+ present_priv->last_target = target_msc; -+ present_priv->pixmap_present_pending++; -+ present_pixmap_priv->present_complete_pending = TRUE; -+ present_pixmap_priv->released = FALSE; -+ pthread_mutex_unlock(&present_priv->mutex_present); -+ return TRUE; -+} -+ -+BOOL -+PRESENTWaitPixmapReleased(PRESENTPixmapPriv *present_pixmap_priv) -+{ -+ PRESENTpriv *present_priv = present_pixmap_priv->present_priv; -+ -+ pthread_mutex_lock(&present_priv->mutex_present); -+ -+ PRESENTflush_events(present_priv, FALSE); -+ -+ while (!present_pixmap_priv->released || present_pixmap_priv->present_complete_pending) { -+ /* Note: following if should not happen because we'll never -+ * use two PRESENTWaitPixmapReleased in parallels on same window. -+ * However it would make it work in that case */ -+ if (present_priv->xcb_wait) { /* we allow only one thread to dispatch events */ -+ pthread_mutex_lock(&present_priv->mutex_xcb_wait); -+ /* here the other thread got an event but hasn't treated it yet */ -+ pthread_mutex_unlock(&present_priv->mutex_xcb_wait); -+ pthread_mutex_unlock(&present_priv->mutex_present); -+ Sleep(10); /* Let it treat the event */ -+ pthread_mutex_lock(&present_priv->mutex_present); -+ } else if (!PRESENTwait_events(present_priv, TRUE)) { -+ pthread_mutex_unlock(&present_priv->mutex_present); -+ return FALSE; -+ } -+ } -+ pthread_mutex_unlock(&present_priv->mutex_present); -+ return TRUE; -+} -diff --git a/dlls/d3d9-nine/dri3.h b/dlls/d3d9-nine/dri3.h -new file mode 100644 -index 0000000..795c3c7 ---- /dev/null -+++ b/dlls/d3d9-nine/dri3.h -@@ -0,0 +1,106 @@ -+/* -+ * Wine X11DRV DRI3 interface -+ * -+ * Copyright 2014 Axel Davy -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA -+ */ -+ -+#ifndef __WINE_DRI3_H -+#define __WINE_DRI3_H -+ -+#ifndef __WINE_CONFIG_H -+# error You must include config.h to use this header -+#endif -+ -+#include <X11/Xlib.h> -+#include <X11/Xutil.h> -+#include <X11/Xlib-xcb.h> -+#include <xcb/xcb.h> -+#include <xcb/dri3.h> -+#include <xcb/present.h> -+ -+BOOL -+DRI3CheckExtension(Display *dpy, int major, int minor); -+ -+#ifdef D3DADAPTER9_DRI2 -+struct DRI2priv; -+ -+BOOL -+DRI2FallbackInit(Display *dpy, struct DRI2priv **priv); -+ -+void -+DRI2FallbackDestroy(struct DRI2priv *priv); -+ -+BOOL -+DRI2FallbackCheckSupport(Display *dpy); -+#endif -+ -+BOOL -+PRESENTCheckExtension(Display *dpy, int major, int minor); -+ -+BOOL -+DRI3Open(Display *dpy, int screen, int *device_fd); -+ -+#ifdef D3DADAPTER9_DRI2 -+BOOL -+DRI2FallbackOpen(Display *dpy, int screen, int *device_fd); -+#endif -+ -+BOOL -+DRI3PixmapFromDmaBuf(Display *dpy, int screen, int fd, int width, int height, int stride, int depth, int bpp, Pixmap *pixmap); -+ -+BOOL -+DRI3DmaBufFromPixmap(Display *dpy, Pixmap pixmap, int *fd, int *width, int *height, int *stride, int *depth, int *bpp); -+ -+typedef struct PRESENTPriv PRESENTpriv; -+typedef struct PRESENTPixmapPriv PRESENTPixmapPriv; -+ -+BOOL -+PRESENTInit(Display *dpy, PRESENTpriv **present_priv); -+ -+/* will clean properly and free all PRESENTPixmapPriv associated to PRESENTpriv. -+ * PRESENTPixmapPriv should not be freed by something else. -+ * If never a PRESENTPixmapPriv has to be destroyed, -+ * please destroy the current PRESENTpriv and create a new one. -+ * This will take care than all pixmaps are released */ -+void -+PRESENTDestroy(Display *dpy, PRESENTpriv *present_priv); -+ -+BOOL -+PRESENTPixmapInit(PRESENTpriv *present_priv, Pixmap pixmap, PRESENTPixmapPriv **present_pixmap_priv); -+ -+#ifdef D3DADAPTER9_DRI2 -+BOOL -+DRI2FallbackPRESENTPixmap(PRESENTpriv *present_priv, struct DRI2priv *priv, -+ int fd, int width, int height, int stride, int depth, -+ int bpp, PRESENTPixmapPriv **present_pixmap_priv); -+#endif -+ -+BOOL -+PRESENTTryFreePixmap(Display *dpy, PRESENTPixmapPriv *present_pixmap_priv); -+ -+BOOL -+PRESENTHelperCopyFront(Display *dpy, PRESENTPixmapPriv *present_pixmap_priv); -+ -+BOOL -+PRESENTPixmap(Display *dpy, XID window, -+ PRESENTPixmapPriv *present_pixmap_priv, D3DPRESENT_PARAMETERS *pPresentationParameters, -+ const RECT *pSourceRect, const RECT *pDestRect, const RGNDATA *pDirtyRegion); -+ -+BOOL -+PRESENTWaitPixmapReleased(PRESENTPixmapPriv *present_pixmap_priv); -+ -+#endif /* __WINE_DRI3_H */ -diff --git a/dlls/d3d9-nine/libd3d9-nine.def b/dlls/d3d9-nine/libd3d9-nine.def -new file mode 100644 -index 0000000..4f41fcb ---- /dev/null -+++ b/dlls/d3d9-nine/libd3d9-nine.def -@@ -0,0 +1,16 @@ -+; File generated automatically from ./dlls/d3d9-nine/d3d9-nine.spec; do not edit! -+ -+LIBRARY d3d9-nine.dll -+ -+EXPORTS -+ Direct3DShaderValidatorCreate9@0 @1 -+ D3DPERF_BeginEvent@8 @4 -+ D3DPERF_EndEvent@0 @5 -+ D3DPERF_GetStatus@0 @6 -+ D3DPERF_QueryRepeatFrame@0 @7 -+ D3DPERF_SetMarker@8 @8 -+ D3DPERF_SetOptions@4 @9 -+ D3DPERF_SetRegion@8 @10 -+ DebugSetMute@0 @12 -+ Direct3DCreate9@4 @13 -+ Direct3DCreate9Ex@8 @14 -diff --git a/dlls/d3d9-nine/present.c b/dlls/d3d9-nine/present.c -new file mode 100644 -index 0000000..931c784 ---- /dev/null -+++ b/dlls/d3d9-nine/present.c -@@ -0,0 +1,1333 @@ -+/* -+ * Wine ID3DAdapter9 support functions -+ * -+ * Copyright 2013 Joakim Sindholt -+ * Christoph Bumiller -+ * Copyright 2014 Tiziano Bacocco -+ * David Heidelberger -+ * Copyright 2014-2015 Axel Davy -+ * Copyright 2015 Patrick Rudolph -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA -+ */ -+ -+#include "config.h" -+#include "wine/port.h" -+#include "wine/debug.h" -+ -+WINE_DEFAULT_DEBUG_CHANNEL(d3dadapter); -+ -+#include <d3dadapter/d3dadapter9.h> -+#include <d3dadapter/drm.h> -+#include <libdrm/drm.h> -+#include <errno.h> -+#include <fcntl.h> -+ -+#include "dri3.h" -+#include "wine/library.h" -+#include "wine/unicode.h" -+ -+#ifndef D3DPRESENT_DONOTWAIT -+#define D3DPRESENT_DONOTWAIT 0x00000001 -+#endif -+ -+#define WINE_D3DADAPTER_DRIVER_PRESENT_VERSION_MAJOR 1 -+#ifdef ID3DPresent_GetWindowOccluded -+#define WINE_D3DADAPTER_DRIVER_PRESENT_VERSION_MINOR 1 -+#else -+#define WINE_D3DADAPTER_DRIVER_PRESENT_VERSION_MINOR 0 -+#endif -+ -+static const struct D3DAdapter9DRM *d3d9_drm = NULL; -+#ifdef D3DADAPTER9_DRI2 -+static int is_dri2_fallback = 0; -+#endif -+ -+#define X11DRV_ESCAPE 6789 -+enum x11drv_escape_codes -+{ -+ X11DRV_SET_DRAWABLE, /* set current drawable for a DC */ -+ X11DRV_GET_DRAWABLE, /* get current drawable for a DC */ -+ X11DRV_START_EXPOSURES, /* start graphics exposures */ -+ X11DRV_END_EXPOSURES, /* end graphics exposures */ -+ X11DRV_FLUSH_GL_DRAWABLE /* flush changes made to the gl drawable */ -+}; -+ -+struct x11drv_escape_get_drawable -+{ -+ enum x11drv_escape_codes code; /* escape code (X11DRV_GET_DRAWABLE) */ -+ Drawable drawable; /* X drawable */ -+ Drawable gl_drawable; /* GL drawable */ -+ int pixel_format; /* internal GL pixel format */ -+ RECT dc_rect; /* DC rectangle relative to drawable */ -+}; -+ -+static XContext d3d_hwnd_context; -+static CRITICAL_SECTION context_section; -+static CRITICAL_SECTION_DEBUG critsect_debug = -+{ -+ 0, 0, &context_section, -+ { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, -+ 0, 0, { (DWORD_PTR)(__FILE__ ": context_section") } -+}; -+static CRITICAL_SECTION context_section = { &critsect_debug, -1, 0, 0, 0, 0 }; -+ -+const GUID IID_ID3DPresent = { 0x77D60E80, 0xF1E6, 0x11DF, { 0x9E, 0x39, 0x95, 0x0C, 0xDF, 0xD7, 0x20, 0x85 } }; -+const GUID IID_ID3DPresentGroup = { 0xB9C3016E, 0xF32A, 0x11DF, { 0x9C, 0x18, 0x92, 0xEA, 0xDE, 0xD7, 0x20, 0x85 } }; -+ -+struct d3d_drawable -+{ -+ Drawable drawable; /* X11 drawable */ -+ RECT dc_rect; /* rect relative to the X11 drawable */ -+ HDC hdc; -+ HWND wnd; /* HWND (for convenience) */ -+}; -+ -+#ifdef ID3DPresent_GetWindowOccluded -+static HHOOK hhook; -+ -+struct d3d_wnd_hooks -+{ -+ HWND focus_wnd; -+ struct DRI3Present *present; -+ struct d3d_wnd_hooks *prev; -+ struct d3d_wnd_hooks *next; -+}; -+ -+static HRESULT dri3_present_unregister_window_hook( struct DRI3Present *This ); -+static HRESULT dri3_present_register_window_hook( struct DRI3Present *This ); -+ -+static struct d3d_wnd_hooks d3d_hooks; -+#endif -+ -+struct DRI3Present -+{ -+ /* COM vtable */ -+ void *vtable; -+ /* IUnknown reference count */ -+ LONG refs; -+ -+ D3DPRESENT_PARAMETERS params; -+ HWND focus_wnd; -+ PRESENTpriv *present_priv; -+#ifdef D3DADAPTER9_DRI2 -+ struct DRI2priv *dri2_priv; -+#endif -+ -+ WCHAR devname[32]; -+ HCURSOR hCursor; -+ -+ DEVMODEW initial_mode; -+ BOOL device_needs_reset; -+ BOOL occluded; -+ Display *gdi_display; -+ struct d3d_drawable *d3d; -+ boolean ex; -+ boolean no_window_changes; -+ boolean mode_changed; -+ long style; -+ long style_ex; -+ boolean drop_wnd_messages; -+}; -+ -+struct D3DWindowBuffer -+{ -+ PRESENTPixmapPriv *present_pixmap_priv; -+}; -+ -+static void -+free_d3dadapter_drawable(struct d3d_drawable *d3d) -+{ -+ ReleaseDC(d3d->wnd, d3d->hdc); -+ HeapFree(GetProcessHeap(), 0, d3d); -+} -+ -+void -+destroy_d3dadapter_drawable(Display *gdi_display, HWND hwnd) -+{ -+ struct d3d_drawable *d3d; -+ -+ EnterCriticalSection(&context_section); -+ if (!XFindContext(gdi_display, (XID)hwnd, -+ d3d_hwnd_context, (char **)&d3d)) { -+ XDeleteContext(gdi_display, (XID)hwnd, d3d_hwnd_context); -+ free_d3dadapter_drawable(d3d); -+ } -+ LeaveCriticalSection(&context_section); -+} -+ -+static struct d3d_drawable * -+create_d3dadapter_drawable(HWND hwnd) -+{ -+ struct x11drv_escape_get_drawable extesc = { X11DRV_GET_DRAWABLE }; -+ struct d3d_drawable *d3d; -+ -+ d3d = HeapAlloc(GetProcessHeap(), 0, sizeof(*d3d)); -+ if (!d3d) { -+ ERR("Couldn't allocate d3d_drawable.\n"); -+ return NULL; -+ } -+ -+ d3d->hdc = GetDCEx(hwnd, 0, DCX_CACHE | DCX_CLIPSIBLINGS); -+ if (ExtEscape(d3d->hdc, X11DRV_ESCAPE, sizeof(extesc), (LPCSTR)&extesc, -+ sizeof(extesc), (LPSTR)&extesc) <= 0) { -+ ERR("Unexpected error in X Drawable lookup (hwnd=%p, hdc=%p)\n", -+ hwnd, d3d->hdc); -+ ReleaseDC(hwnd, d3d->hdc); -+ HeapFree(GetProcessHeap(), 0, d3d); -+ return NULL; -+ } -+ -+ d3d->drawable = extesc.drawable; -+ d3d->wnd = hwnd; -+ d3d->dc_rect = extesc.dc_rect; -+ -+ return d3d; -+} -+ -+static struct d3d_drawable * -+get_d3d_drawable(Display *gdi_display, HWND hwnd) -+{ -+ struct d3d_drawable *d3d, *race; -+ -+ EnterCriticalSection(&context_section); -+ if (!XFindContext(gdi_display, (XID)hwnd, -+ d3d_hwnd_context, (char **)&d3d)) { -+ struct x11drv_escape_get_drawable extesc = { X11DRV_GET_DRAWABLE }; -+ -+ /* check if the window has moved since last we used it */ -+ if (ExtEscape(d3d->hdc, X11DRV_ESCAPE, sizeof(extesc), (LPCSTR)&extesc, -+ sizeof(extesc), (LPSTR)&extesc) <= 0) { -+ WARN("Window update check failed (hwnd=%p, hdc=%p)\n", -+ hwnd, d3d->hdc); -+ } -+ -+ if (!EqualRect(&d3d->dc_rect, &extesc.dc_rect)) -+ d3d->dc_rect = extesc.dc_rect; -+ -+ return d3d; -+ } -+ LeaveCriticalSection(&context_section); -+ -+ TRACE("No d3d_drawable attached to hwnd %p, creating one.\n", hwnd); -+ -+ d3d = create_d3dadapter_drawable(hwnd); -+ if (!d3d) { return NULL; } -+ -+ EnterCriticalSection(&context_section); -+ if (!XFindContext(gdi_display, (XID)hwnd, -+ d3d_hwnd_context, (char **)&race)) { -+ /* apparently someone beat us to creating this d3d drawable. Let's not -+ waste more time with X11 calls and just use theirs instead. */ -+ free_d3dadapter_drawable(d3d); -+ return race; -+ } -+ XSaveContext(gdi_display, (XID)hwnd, d3d_hwnd_context, (char *)d3d); -+ return d3d; -+} -+ -+static void -+release_d3d_drawable(struct d3d_drawable *d3d) -+{ -+ if (d3d) { LeaveCriticalSection(&context_section); } -+} -+ -+static ULONG WINAPI -+DRI3Present_AddRef( struct DRI3Present *This ) -+{ -+ ULONG refs = InterlockedIncrement(&This->refs); -+ TRACE("%p increasing refcount to %u.\n", This, refs); -+ return refs; -+} -+ -+static ULONG WINAPI -+DRI3Present_Release( struct DRI3Present *This ) -+{ -+ ULONG refs = InterlockedDecrement(&This->refs); -+ TRACE("%p decreasing refcount to %u.\n", This, refs); -+ if (refs == 0) { -+ /* dtor */ -+#ifdef ID3DPresent_GetWindowOccluded -+ dri3_present_unregister_window_hook(This); -+#endif -+ if (This->d3d) -+ destroy_d3dadapter_drawable(This->gdi_display, This->d3d->wnd); -+ ChangeDisplaySettingsExW(This->devname, &(This->initial_mode), 0, CDS_FULLSCREEN, NULL); -+ -+ PRESENTDestroy(This->gdi_display, This->present_priv); -+#ifdef D3DADAPTER9_DRI2 -+ if (is_dri2_fallback) -+ DRI2FallbackDestroy(This->dri2_priv); -+#endif -+ HeapFree(GetProcessHeap(), 0, This); -+ } -+ return refs; -+} -+ -+static HRESULT WINAPI -+DRI3Present_QueryInterface( struct DRI3Present *This, -+ REFIID riid, -+ void **ppvObject ) -+{ -+ if (!ppvObject) { return E_POINTER; } -+ -+ if (IsEqualGUID(&IID_ID3DPresent, riid) || -+ IsEqualGUID(&IID_IUnknown, riid)) { -+ *ppvObject = This; -+ DRI3Present_AddRef(This); -+ return S_OK; -+ } -+ -+ WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); -+ *ppvObject = NULL; -+ -+ return E_NOINTERFACE; -+} -+ -+static HRESULT -+DRI3Present_ChangePresentParameters( struct DRI3Present *This, -+ D3DPRESENT_PARAMETERS *params); -+ -+static HRESULT WINAPI -+DRI3Present_SetPresentParameters( struct DRI3Present *This, -+ D3DPRESENT_PARAMETERS *pPresentationParameters, -+ D3DDISPLAYMODEEX *pFullscreenDisplayMode ) -+{ -+ if (pFullscreenDisplayMode) -+ ERR("Ignoring pFullscreenDisplayMode\n"); -+ return DRI3Present_ChangePresentParameters(This, pPresentationParameters); -+} -+ -+static HRESULT WINAPI -+DRI3Present_D3DWindowBufferFromDmaBuf( struct DRI3Present *This, -+ int dmaBufFd, -+ int width, -+ int height, -+ int stride, -+ int depth, -+ int bpp, -+ struct D3DWindowBuffer **out) -+{ -+ Pixmap pixmap; -+ -+#ifdef D3DADAPTER9_DRI2 -+ if (is_dri2_fallback) { -+ *out = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, -+ sizeof(struct D3DWindowBuffer)); -+ DRI2FallbackPRESENTPixmap(This->present_priv, This->dri2_priv, -+ dmaBufFd, width, height, stride, depth, -+ bpp, -+ &((*out)->present_pixmap_priv)); -+ return D3D_OK; -+ } -+#endif -+ if (!DRI3PixmapFromDmaBuf(This->gdi_display, DefaultScreen(This->gdi_display), -+ dmaBufFd, width, height, stride, depth, -+ bpp, &pixmap )) -+ return D3DERR_DRIVERINTERNALERROR; -+ -+ *out = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, -+ sizeof(struct D3DWindowBuffer)); -+ PRESENTPixmapInit(This->present_priv, pixmap, &((*out)->present_pixmap_priv)); -+ return D3D_OK; -+} -+ -+static HRESULT WINAPI -+DRI3Present_DestroyD3DWindowBuffer( struct DRI3Present *This, -+ struct D3DWindowBuffer *buffer ) -+{ -+ /* the pixmap is managed by the PRESENT backend. -+ * But if it can delete it right away, we may have -+ * better performance */ -+ PRESENTTryFreePixmap(This->gdi_display, buffer->present_pixmap_priv); -+ HeapFree(GetProcessHeap(), 0, buffer); -+ return D3D_OK; -+} -+ -+static HRESULT WINAPI -+DRI3Present_WaitBufferReleased( struct DRI3Present *This, -+ struct D3DWindowBuffer *buffer) -+{ -+ PRESENTWaitPixmapReleased(buffer->present_pixmap_priv); -+ return D3D_OK; -+} -+ -+static HRESULT WINAPI -+DRI3Present_FrontBufferCopy( struct DRI3Present *This, -+ struct D3DWindowBuffer *buffer ) -+{ -+#ifdef D3DADAPTER9_DRI2 -+ if (is_dri2_fallback) -+ return D3DERR_DRIVERINTERNALERROR; -+#endif -+ /* TODO: use dc_rect */ -+ if (PRESENTHelperCopyFront(This->gdi_display, buffer->present_pixmap_priv)) -+ return D3D_OK; -+ else -+ return D3DERR_DRIVERINTERNALERROR; -+} -+ -+static HRESULT WINAPI -+DRI3Present_PresentBuffer( struct DRI3Present *This, -+ struct D3DWindowBuffer *buffer, -+ HWND hWndOverride, -+ const RECT *pSourceRect, -+ const RECT *pDestRect, -+ const RGNDATA *pDirtyRegion, -+ DWORD Flags ) -+{ -+ struct d3d_drawable *d3d; -+ RECT dest_translate; -+ -+ if (hWndOverride) { -+ d3d = get_d3d_drawable(This->gdi_display, hWndOverride); -+ } else if (This->params.hDeviceWindow) { -+ d3d = get_d3d_drawable(This->gdi_display, This->params.hDeviceWindow); -+ } else { -+ d3d = get_d3d_drawable(This->gdi_display, This->focus_wnd); -+ } -+ if (!d3d) { return D3DERR_DRIVERINTERNALERROR; } -+ -+ /* TODO: should we use a list here instead ? */ -+ if (This->d3d && (This->d3d->wnd != d3d->wnd)) { -+ destroy_d3dadapter_drawable(This->gdi_display, This->d3d->wnd); -+ } -+ This->d3d = d3d; -+ -+ if (d3d->dc_rect.top != 0 && -+ d3d->dc_rect.left != 0) { -+ if (!pDestRect) -+ pDestRect = (const RECT *) &(d3d->dc_rect); -+ else { -+ dest_translate.top = pDestRect->top + d3d->dc_rect.top; -+ dest_translate.left = pDestRect->left + d3d->dc_rect.left; -+ dest_translate.bottom = pDestRect->bottom + d3d->dc_rect.bottom; -+ dest_translate.right = pDestRect->right + d3d->dc_rect.right; -+ pDestRect = (const RECT *) &dest_translate; -+ } -+ } -+ -+ if (!PRESENTPixmap(This->gdi_display, d3d->drawable, buffer->present_pixmap_priv, -+ &This->params, pSourceRect, pDestRect, pDirtyRegion)) -+ return D3DERR_DRIVERINTERNALERROR; -+ -+ release_d3d_drawable(d3d); -+ -+ return D3D_OK; -+} -+ -+static HRESULT WINAPI -+DRI3Present_GetRasterStatus( struct DRI3Present *This, -+ D3DRASTER_STATUS *pRasterStatus ) -+{ -+ FIXME("(%p, %p), stub!\n", This, pRasterStatus); -+ return D3DERR_INVALIDCALL; -+} -+ -+static HRESULT WINAPI -+DRI3Present_GetDisplayMode( struct DRI3Present *This, -+ D3DDISPLAYMODEEX *pMode, -+ D3DDISPLAYROTATION *pRotation ) -+{ -+ DEVMODEW dm; -+ -+ ZeroMemory(&dm, sizeof(dm)); -+ dm.dmSize = sizeof(dm); -+ -+ EnumDisplaySettingsExW(This->devname, ENUM_CURRENT_SETTINGS, &dm, 0); -+ pMode->Width = dm.dmPelsWidth; -+ pMode->Height = dm.dmPelsHeight; -+ pMode->RefreshRate = dm.dmDisplayFrequency; -+ pMode->ScanLineOrdering = (dm.dmDisplayFlags & DM_INTERLACED) ? -+ D3DSCANLINEORDERING_INTERLACED : -+ D3DSCANLINEORDERING_PROGRESSIVE; -+ -+ /* XXX This is called "guessing" */ -+ switch (dm.dmBitsPerPel) { -+ case 32: pMode->Format = D3DFMT_X8R8G8B8; break; -+ case 24: pMode->Format = D3DFMT_R8G8B8; break; -+ case 16: pMode->Format = D3DFMT_R5G6B5; break; -+ default: -+ WARN("Unknown display format with %u bpp.\n", dm.dmBitsPerPel); -+ pMode->Format = D3DFMT_UNKNOWN; -+ } -+ -+ switch (dm.dmDisplayOrientation) { -+ case DMDO_DEFAULT: *pRotation = D3DDISPLAYROTATION_IDENTITY; break; -+ case DMDO_90: *pRotation = D3DDISPLAYROTATION_90; break; -+ case DMDO_180: *pRotation = D3DDISPLAYROTATION_180; break; -+ case DMDO_270: *pRotation = D3DDISPLAYROTATION_270; break; -+ default: -+ WARN("Unknown display rotation %u.\n", dm.dmDisplayOrientation); -+ *pRotation = D3DDISPLAYROTATION_IDENTITY; -+ } -+ -+ return D3D_OK; -+} -+ -+static HRESULT WINAPI -+DRI3Present_GetPresentStats( struct DRI3Present *This, -+ D3DPRESENTSTATS *pStats ) -+{ -+ FIXME("(%p, %p), stub!\n", This, pStats); -+ return D3DERR_INVALIDCALL; -+} -+ -+static HRESULT WINAPI -+DRI3Present_GetCursorPos( struct DRI3Present *This, -+ POINT *pPoint ) -+{ -+ BOOL ok; -+ HWND draw_window; -+ -+ if (!pPoint) -+ return D3DERR_INVALIDCALL; -+ -+ draw_window = This->params.hDeviceWindow ? -+ This->params.hDeviceWindow : This->focus_wnd; -+ -+ ok = GetCursorPos(pPoint); -+ ok = ok && ScreenToClient(draw_window, pPoint); -+ return ok ? S_OK : D3DERR_DRIVERINTERNALERROR; -+} -+ -+static HRESULT WINAPI -+DRI3Present_SetCursorPos( struct DRI3Present *This, -+ POINT *pPoint ) -+{ -+ BOOL ok; -+ POINT real_pos; -+ -+ if (!pPoint) -+ return D3DERR_INVALIDCALL; -+ -+ ok = SetCursorPos(pPoint->x, pPoint->y); -+ if (!ok) -+ goto error; -+ -+ ok = GetCursorPos(&real_pos); -+ if (!ok || real_pos.x != pPoint->x || real_pos.y != pPoint->y) -+ goto error; -+ -+ return D3D_OK; -+ -+error: -+ SetCursor(NULL); /* Hide cursor rather than put wrong pos */ -+ return D3DERR_DRIVERINTERNALERROR; -+} -+ -+ -+/* Note: assuming 32x32 cursor */ -+static HRESULT WINAPI -+DRI3Present_SetCursor( struct DRI3Present *This, -+ void *pBitmap, -+ POINT *pHotspot, -+ BOOL bShow ) -+{ -+ if (pBitmap) { -+ ICONINFO info; -+ HCURSOR cursor; -+ -+ DWORD mask[32]; -+ memset(mask, ~0, sizeof(mask)); -+ -+ if (!pHotspot) -+ return D3DERR_INVALIDCALL; -+ info.fIcon = FALSE; -+ info.xHotspot = pHotspot->x; -+ info.yHotspot = pHotspot->y; -+ info.hbmMask = CreateBitmap(32, 32, 1, 1, mask); -+ info.hbmColor = CreateBitmap(32, 32, 1, 32, pBitmap); -+ -+ cursor = CreateIconIndirect(&info); -+ if (info.hbmMask) DeleteObject(info.hbmMask); -+ if (info.hbmColor) DeleteObject(info.hbmColor); -+ if (cursor) -+ DestroyCursor(This->hCursor); -+ This->hCursor = cursor; -+ } -+ SetCursor(bShow ? This->hCursor : NULL); -+ -+ return D3D_OK; -+} -+ -+static HRESULT WINAPI -+DRI3Present_SetGammaRamp( struct DRI3Present *This, -+ const D3DGAMMARAMP *pRamp, -+ HWND hWndOverride ) -+{ -+ HWND hWnd = hWndOverride ? hWndOverride : This->focus_wnd; -+ HDC hdc; -+ BOOL ok; -+ if (!pRamp) { -+ return D3DERR_INVALIDCALL; -+ } -+ hdc = GetDC(hWnd); -+ ok = SetDeviceGammaRamp(hdc, (void *)pRamp); -+ ReleaseDC(hWnd, hdc); -+ return ok ? D3D_OK : D3DERR_DRIVERINTERNALERROR; -+} -+ -+static HRESULT WINAPI -+DRI3Present_GetWindowInfo( struct DRI3Present *This, -+ HWND hWnd, -+ int *width, int *height, int *depth ) -+{ -+ HRESULT hr; -+ RECT pRect; -+ -+ if (!hWnd) -+ hWnd = This->focus_wnd; -+ hr = GetClientRect(hWnd, &pRect); -+ if (!hr) -+ return D3DERR_INVALIDCALL; -+ *width = pRect.right - pRect.left; -+ *height = pRect.bottom - pRect.top; -+ *depth = 24; //TODO -+ return D3D_OK; -+} -+ -+static LONG fullscreen_style(LONG style) -+{ -+ /* Make sure the window is managed, otherwise we won't get keyboard input. */ -+ style |= WS_POPUP | WS_SYSMENU; -+ style &= ~(WS_CAPTION | WS_THICKFRAME); -+ -+ return style; -+} -+ -+static LONG fullscreen_exstyle(LONG exstyle) -+{ -+ /* Filter out window decorations. */ -+ exstyle &= ~(WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE); -+ -+ return exstyle; -+} -+ -+static HRESULT -+DRI3Present_ChangeDisplaySettingsIfNeccessary( struct DRI3Present *This, DEVMODEW *new_mode ) { -+ DEVMODEW current_mode; -+ LONG hr; -+ -+ ZeroMemory(¤t_mode, sizeof(DEVMODEW)); -+ /* Only change the mode if necessary. */ -+ if (!EnumDisplaySettingsW(This->devname, ENUM_CURRENT_SETTINGS, ¤t_mode)) -+ { -+ ERR("Failed to get current display mode.\n"); -+ } else if (current_mode.dmPelsWidth != new_mode->dmPelsWidth -+ || current_mode.dmPelsHeight != new_mode->dmPelsHeight -+ || (current_mode.dmDisplayFrequency != new_mode->dmDisplayFrequency -+ && (new_mode->dmFields & DM_DISPLAYFREQUENCY))) -+ { -+ hr = ChangeDisplaySettingsExW(This->devname, new_mode, 0, CDS_FULLSCREEN, NULL); -+ if (hr != DISP_CHANGE_SUCCESSFUL) { -+ /* try again without display RefreshRate */ -+ if (new_mode->dmFields & DM_DISPLAYFREQUENCY) { -+ new_mode->dmFields &= ~DM_DISPLAYFREQUENCY; -+ new_mode->dmDisplayFrequency = 0; -+ hr = ChangeDisplaySettingsExW(This->devname, new_mode, 0, CDS_FULLSCREEN, NULL); -+ if (hr != DISP_CHANGE_SUCCESSFUL) { -+ ERR("ChangeDisplaySettingsExW failed with 0x%08X\n", hr); -+ return D3DERR_INVALIDCALL; -+ } -+ } else { -+ ERR("ChangeDisplaySettingsExW failed with 0x%08X\n", hr); -+ return D3DERR_INVALIDCALL; -+ } -+ } -+ } -+ return D3D_OK; -+} -+ -+#ifdef ID3DPresent_GetWindowOccluded -+static struct d3d_wnd_hooks *get_last_hook(void) { -+ struct d3d_wnd_hooks *hook = &d3d_hooks; -+ while (hook->next) { -+ hook = hook->next; -+ } -+ return hook; -+} -+ -+LRESULT CALLBACK HookCallback(int nCode, WPARAM wParam, LPARAM lParam) -+{ -+ struct d3d_wnd_hooks *hook = &d3d_hooks; -+ boolean drop_wnd_messages; -+ -+ if (nCode < 0) { -+ return CallNextHookEx(hhook, nCode, wParam, lParam); -+ } -+ -+ if (lParam) { -+ CWPSTRUCT wndprocparams = *((CWPSTRUCT*)lParam); -+ while (hook->next) { -+ hook = hook->next; -+ -+ /* skip messages for other hwnds */ -+ if (hook->focus_wnd != wndprocparams.hwnd) -+ continue; -+ if (!hook->present) -+ continue; -+ -+ switch (wndprocparams.message) { -+ case WM_ACTIVATEAPP: -+ if (hook->present->drop_wnd_messages) -+ return -1; -+ -+ drop_wnd_messages = hook->present->drop_wnd_messages; -+ hook->present->drop_wnd_messages = TRUE; -+ if (wndprocparams.wParam == WA_INACTIVE) { -+ hook->present->occluded = TRUE; -+ -+ DRI3Present_ChangeDisplaySettingsIfNeccessary(hook->present, &(hook->present->initial_mode)); -+ -+ if (!hook->present->no_window_changes && -+ IsWindowVisible(hook->present->params.hDeviceWindow)) -+ ShowWindow(hook->present->params.hDeviceWindow, SW_MINIMIZE); -+ } else { -+ hook->present->device_needs_reset |= hook->present->occluded; -+ hook->present->occluded = FALSE; -+ -+ if (!hook->present->no_window_changes) { -+ /* restore window */ -+ SetWindowPos(hook->present->params.hDeviceWindow, NULL, 0, 0, -+ hook->present->params.BackBufferWidth, hook->present->params.BackBufferHeight, -+ SWP_NOACTIVATE | SWP_NOZORDER); -+ } -+ -+ if (hook->present->ex) { -+ DEVMODEW new_mode; -+ -+ ZeroMemory(&new_mode, sizeof(DEVMODEW)); -+ new_mode.dmPelsWidth = hook->present->params.BackBufferWidth; -+ new_mode.dmPelsHeight = hook->present->params.BackBufferHeight; -+ new_mode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; -+ if (hook->present->params.FullScreen_RefreshRateInHz) { -+ new_mode.dmFields |= DM_DISPLAYFREQUENCY; -+ new_mode.dmDisplayFrequency = hook->present->params.FullScreen_RefreshRateInHz; -+ } -+ new_mode.dmSize = sizeof(DEVMODEW); -+ DRI3Present_ChangeDisplaySettingsIfNeccessary(hook->present, &new_mode); -+ } -+ } -+ hook->present->drop_wnd_messages = drop_wnd_messages; -+ break; -+ case WM_DISPLAYCHANGE: -+ hook->present->mode_changed = TRUE; -+ hook->present->device_needs_reset = TRUE; -+ break; -+ /* TODO: handle other window messages here */ -+ default: -+ break; -+ } -+ } -+ } -+ -+ return CallNextHookEx(hhook, nCode, wParam, lParam); -+} -+ -+static HRESULT dri3_present_register_window_hook( struct DRI3Present *This ) { -+ struct d3d_wnd_hooks *lasthook; -+ struct d3d_wnd_hooks *hook = &d3d_hooks; -+ -+ HWND hWnd = This->focus_wnd; -+ -+ /* let's see if already hooked */ -+ while (hook->next) { -+ hook = hook->next; -+ if (hook->focus_wnd == hWnd && hook->present == This) -+ return D3DERR_INVALIDCALL; -+ } -+ /* create single WindowsHook in this process */ -+ if (!hhook) { -+ // TODO: do we need to handle different threadIDs ? -+ DWORD threadID = GetWindowThreadProcessId(hWnd, NULL); -+ hhook = SetWindowsHookExW(WH_CALLWNDPROC, HookCallback, NULL, threadID); -+ if (!hhook) { -+ ERR("SetWindowsHookEx failed with 0x%08x\n", GetLastError()); -+ return D3DERR_DRIVERINTERNALERROR; -+ } -+ } -+ lasthook = get_last_hook(); -+ hook = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, -+ sizeof(struct d3d_wnd_hooks)); -+ if (!hook) -+ return E_OUTOFMEMORY; -+ /* add window hwnd to list */ -+ lasthook->next = hook; -+ hook->prev = lasthook; -+ hook->focus_wnd = hWnd; -+ hook->present = This; -+ return D3D_OK; -+} -+ -+static HRESULT dri3_present_unregister_window_hook( struct DRI3Present *This ) { -+ struct d3d_wnd_hooks *hook = &d3d_hooks; -+ -+ HWND hWnd = This->focus_wnd; -+ -+ /* find hook and remove it */ -+ while (hook->next) { -+ hook = hook->next; -+ if(hook->focus_wnd == hWnd && hook->present == This) { -+ /* remove hook */ -+ hook->prev->next = hook->next; -+ HeapFree(GetProcessHeap(), 0, hook); -+ /* start again at list head */ -+ hook = &d3d_hooks; -+ } -+ } -+ /* remove single process WindowsHook */ -+ if (get_last_hook() == &d3d_hooks && hhook) { -+ if (!UnhookWindowsHookEx(hhook)) { -+ ERR("UnhookWindowsHookEx failed with 0x%08x\n", GetLastError()); -+ } -+ hhook = NULL; -+ } -+ -+ return D3D_OK; -+} -+ -+static BOOL WINAPI -+DRI3Present_GetWindowOccluded( struct DRI3Present *This ) -+{ -+ /* we missed to poll occluded */ -+ if (This->device_needs_reset) { -+ This->device_needs_reset = FALSE; -+ return TRUE; -+ } -+ -+ return This->occluded; -+} -+#endif -+/*----------*/ -+ -+ -+static ID3DPresentVtbl DRI3Present_vtable = { -+ (void *)DRI3Present_QueryInterface, -+ (void *)DRI3Present_AddRef, -+ (void *)DRI3Present_Release, -+ (void *)DRI3Present_SetPresentParameters, -+ (void *)DRI3Present_D3DWindowBufferFromDmaBuf, -+ (void *)DRI3Present_DestroyD3DWindowBuffer, -+ (void *)DRI3Present_WaitBufferReleased, -+ (void *)DRI3Present_FrontBufferCopy, -+ (void *)DRI3Present_PresentBuffer, -+ (void *)DRI3Present_GetRasterStatus, -+ (void *)DRI3Present_GetDisplayMode, -+ (void *)DRI3Present_GetPresentStats, -+ (void *)DRI3Present_GetCursorPos, -+ (void *)DRI3Present_SetCursorPos, -+ (void *)DRI3Present_SetCursor, -+ (void *)DRI3Present_SetGammaRamp, -+ (void *)DRI3Present_GetWindowInfo, -+#ifdef ID3DPresent_GetWindowOccluded -+ (void *)DRI3Present_GetWindowOccluded -+#endif -+}; -+ -+static HRESULT -+DRI3Present_ChangePresentParameters( struct DRI3Present *This, -+ D3DPRESENT_PARAMETERS *params ) -+{ -+ HWND draw_window = params->hDeviceWindow; -+ RECT rect; -+ DEVMODEW new_mode; -+ -+ if (!GetClientRect(draw_window, &rect)) { -+ WARN("GetClientRect failed.\n"); -+ rect.right = 640; -+ rect.bottom = 480; -+ } -+ -+ if (params->BackBufferWidth == 0) { -+ params->BackBufferWidth = rect.right - rect.left; -+ } -+ if (params->BackBufferHeight == 0) { -+ params->BackBufferHeight = rect.bottom - rect.top; -+ } -+ -+ if ((This->params.BackBufferWidth != params->BackBufferWidth) || -+ (This->params.BackBufferHeight != params->BackBufferHeight)) { -+ This->mode_changed = TRUE; -+ } -+ -+ if (This->mode_changed || (This->params.Windowed != params->Windowed)) { -+ if (!params->Windowed) { -+ /* switch display mode */ -+ ZeroMemory(&new_mode, sizeof(DEVMODEW)); -+ new_mode.dmPelsWidth = params->BackBufferWidth; -+ new_mode.dmPelsHeight = params->BackBufferHeight; -+ new_mode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; -+ if (params->FullScreen_RefreshRateInHz) { -+ new_mode.dmFields |= DM_DISPLAYFREQUENCY; -+ new_mode.dmDisplayFrequency = params->FullScreen_RefreshRateInHz; -+ } -+ new_mode.dmSize = sizeof(DEVMODEW); -+ DRI3Present_ChangeDisplaySettingsIfNeccessary(This, &new_mode); -+ } else { -+ DRI3Present_ChangeDisplaySettingsIfNeccessary(This, &This->initial_mode); -+ } -+ This->mode_changed = FALSE; -+ -+ if (This->params.Windowed) { -+ if (!params->Windowed) { -+ LONG style, style_ex; -+ boolean drop_wnd_messages; -+ -+ /* switch from window to fullscreen */ -+#ifdef ID3DPresent_GetWindowOccluded -+ if (dri3_present_register_window_hook(This)) { -+ SetWindowPos(This->focus_wnd, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE); -+ } -+#else -+ SetWindowPos(This->focus_wnd, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE); -+#endif -+ This->style = GetWindowLongW(draw_window, GWL_STYLE); -+ This->style_ex = GetWindowLongW(draw_window, GWL_EXSTYLE); -+ -+ style = fullscreen_style(This->style); -+ style_ex = fullscreen_exstyle(This->style_ex); -+ -+ drop_wnd_messages = This->drop_wnd_messages; -+ This->drop_wnd_messages = TRUE; -+ -+ SetWindowLongW(draw_window, GWL_STYLE, style); -+ SetWindowLongW(draw_window, GWL_EXSTYLE, style_ex); -+ SetWindowPos(draw_window, HWND_TOPMOST, 0, 0, params->BackBufferWidth, -+ params->BackBufferHeight, -+ SWP_FRAMECHANGED | SWP_SHOWWINDOW | SWP_NOACTIVATE); -+ This->drop_wnd_messages = drop_wnd_messages; -+ } -+ } else { -+ if (!params->Windowed) { -+ /* switch from fullscreen to fullscreen */ -+ MoveWindow(draw_window, 0, 0, -+ params->BackBufferWidth, -+ params->BackBufferHeight, -+ TRUE); -+ } else { -+ LONG style, style_ex; -+ boolean drop_wnd_messages; -+ -+ /* switch from fullscreen to window */ -+ style = GetWindowLongW(draw_window, GWL_STYLE); -+ style_ex = GetWindowLongW(draw_window, GWL_EXSTYLE); -+ -+ /* These flags are set by wined3d_device_setup_fullscreen_window, not the -+ * application, and we want to ignore them in the test below, since it's -+ * not the application's fault that they changed. Additionally, we want to -+ * preserve the current status of these flags (i.e. don't restore them) to -+ * more closely emulate the behavior of Direct3D, which leaves these flags -+ * alone when returning to windowed mode. */ -+ This->style ^= (This->style ^ style) & WS_VISIBLE; -+ This->style_ex ^= (This->style_ex ^ style_ex) & WS_EX_TOPMOST; -+ -+ /* Only restore the style if the application didn't modify it during the -+ * fullscreen phase. Some applications change it before calling Reset() -+ * when switching between windowed and fullscreen modes (HL2), some -+ * depend on the original style (Eve Online). */ -+ drop_wnd_messages = This->drop_wnd_messages; -+ This->drop_wnd_messages = TRUE; -+ if (style == fullscreen_style(This->style) && style_ex == fullscreen_exstyle(This->style_ex)) -+ { -+ SetWindowLongW(draw_window, GWL_STYLE, style); -+ SetWindowLongW(draw_window, GWL_EXSTYLE, style_ex); -+ } -+ SetWindowPos(draw_window, 0, 0, 0, 0, 0, SWP_FRAMECHANGED | -+ SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | -+ SWP_NOACTIVATE); -+ This->drop_wnd_messages = drop_wnd_messages; -+ -+#ifdef ID3DPresent_GetWindowOccluded -+ dri3_present_unregister_window_hook(This); -+#endif -+ This->style = 0; -+ This->style_ex = 0; -+ } -+ } -+ } else if (!params->Windowed) { -+ LONG style, style_ex; -+ /* move draw window back to place */ -+ -+ style = GetWindowLongW(draw_window, GWL_STYLE); -+ style_ex = GetWindowLongW(draw_window, GWL_EXSTYLE); -+ -+ style = fullscreen_style(style); -+ style_ex = fullscreen_exstyle(style_ex); -+ -+ SetWindowLongW(draw_window, GWL_STYLE, style); -+ SetWindowLongW(draw_window, GWL_EXSTYLE, style_ex); -+ SetWindowPos(draw_window, HWND_TOPMOST, 0, 0, params->BackBufferWidth, -+ params->BackBufferHeight, -+ SWP_FRAMECHANGED | SWP_SHOWWINDOW | SWP_NOACTIVATE); -+ } -+ -+ This->params = *params; -+ return D3D_OK; -+} -+ -+static HRESULT -+DRI3Present_new( Display *gdi_display, -+ const WCHAR *devname, -+ D3DPRESENT_PARAMETERS *params, -+ HWND focus_wnd, -+ struct DRI3Present **out, -+ boolean ex, -+ boolean no_window_changes ) -+{ -+ struct DRI3Present *This; -+ -+ if (!focus_wnd) { focus_wnd = params->hDeviceWindow; } -+ if (!focus_wnd) { -+ ERR("No focus HWND specified for presentation backend.\n"); -+ return D3DERR_INVALIDCALL; -+ } -+ -+ This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, -+ sizeof(struct DRI3Present)); -+ if (!This) { -+ ERR("Out of memory.\n"); -+ return E_OUTOFMEMORY; -+ } -+ -+ This->gdi_display = gdi_display; -+ This->vtable = &DRI3Present_vtable; -+ This->refs = 1; -+ This->focus_wnd = focus_wnd; -+ This->params.Windowed = TRUE; -+ This->ex = ex; -+ This->no_window_changes = no_window_changes; -+ -+ strcpyW(This->devname, devname); -+ -+ ZeroMemory(&(This->initial_mode), sizeof(This->initial_mode)); -+ This->initial_mode.dmSize = sizeof(This->initial_mode); -+ -+ EnumDisplaySettingsExW(This->devname, ENUM_CURRENT_SETTINGS, &(This->initial_mode), 0); -+ -+ PRESENTInit(gdi_display, &(This->present_priv)); -+#ifdef D3DADAPTER9_DRI2 -+ if (is_dri2_fallback) -+ DRI2FallbackInit(gdi_display, &(This->dri2_priv)); -+#endif -+ *out = This; -+ -+ return D3D_OK; -+} -+ -+struct DRI3PresentGroup -+{ -+ /* COM vtable */ -+ void *vtable; -+ /* IUnknown reference count */ -+ LONG refs; -+ -+ struct DRI3Present **present_backends; -+ unsigned npresent_backends; -+ Display *gdi_display; -+ boolean ex; -+ boolean no_window_changes; -+}; -+ -+static ULONG WINAPI -+DRI3PresentGroup_AddRef( struct DRI3PresentGroup *This ) -+{ -+ ULONG refs = InterlockedIncrement(&This->refs); -+ TRACE("%p increasing refcount to %u.\n", This, refs); -+ return refs; -+} -+ -+static ULONG WINAPI -+DRI3PresentGroup_Release( struct DRI3PresentGroup *This ) -+{ -+ ULONG refs = InterlockedDecrement(&This->refs); -+ TRACE("%p decreasing refcount to %u.\n", This, refs); -+ if (refs == 0) { -+ unsigned i; -+ if (This->present_backends) { -+ for (i = 0; i < This->npresent_backends; ++i) { -+ if (This->present_backends[i]) -+ DRI3Present_Release(This->present_backends[i]); -+ } -+ HeapFree(GetProcessHeap(), 0, This->present_backends); -+ } -+ HeapFree(GetProcessHeap(), 0, This); -+ } -+ return refs; -+} -+ -+static HRESULT WINAPI -+DRI3PresentGroup_QueryInterface( struct DRI3PresentGroup *This, -+ REFIID riid, -+ void **ppvObject ) -+{ -+ if (!ppvObject) { return E_POINTER; } -+ if (IsEqualGUID(&IID_ID3DPresentGroup, riid) || -+ IsEqualGUID(&IID_IUnknown, riid)) { -+ *ppvObject = This; -+ DRI3PresentGroup_AddRef(This); -+ return S_OK; -+ } -+ -+ WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); -+ *ppvObject = NULL; -+ -+ return E_NOINTERFACE; -+} -+ -+static UINT WINAPI -+DRI3PresentGroup_GetMultiheadCount( struct DRI3PresentGroup *This ) -+{ -+ FIXME("(%p), stub!\n", This); -+ return 1; -+} -+ -+static HRESULT WINAPI -+DRI3PresentGroup_GetPresent( struct DRI3PresentGroup *This, -+ UINT Index, -+ ID3DPresent **ppPresent ) -+{ -+ if (Index >= DRI3PresentGroup_GetMultiheadCount(This)) { -+ ERR("Index >= MultiHeadCount\n"); -+ return D3DERR_INVALIDCALL; -+ } -+ DRI3Present_AddRef(This->present_backends[Index]); -+ *ppPresent = (ID3DPresent *)This->present_backends[Index]; -+ -+ return D3D_OK; -+} -+ -+static HRESULT WINAPI -+DRI3PresentGroup_CreateAdditionalPresent( struct DRI3PresentGroup *This, -+ D3DPRESENT_PARAMETERS *pPresentationParameters, -+ ID3DPresent **ppPresent ) -+{ -+ HRESULT hr; -+ hr = DRI3Present_new(This->gdi_display, This->present_backends[0]->devname, -+ pPresentationParameters, 0, (struct DRI3Present **)ppPresent, -+ This->ex, This->no_window_changes); -+ return hr; -+} -+ -+static void WINAPI -+DRI3PresentGroup_GetVersion( struct DRI3PresentGroup *This, -+ int *major, -+ int *minor) -+{ -+ *major = WINE_D3DADAPTER_DRIVER_PRESENT_VERSION_MAJOR; -+ *minor = WINE_D3DADAPTER_DRIVER_PRESENT_VERSION_MINOR; -+} -+ -+static ID3DPresentGroupVtbl DRI3PresentGroup_vtable = { -+ (void *)DRI3PresentGroup_QueryInterface, -+ (void *)DRI3PresentGroup_AddRef, -+ (void *)DRI3PresentGroup_Release, -+ (void *)DRI3PresentGroup_GetMultiheadCount, -+ (void *)DRI3PresentGroup_GetPresent, -+ (void *)DRI3PresentGroup_CreateAdditionalPresent, -+ (void *)DRI3PresentGroup_GetVersion -+}; -+ -+HRESULT -+present_create_present_group( Display *gdi_display, -+ const WCHAR *device_name, -+ UINT adapter, -+ HWND focus_wnd, -+ D3DPRESENT_PARAMETERS *params, -+ unsigned nparams, -+ ID3DPresentGroup **group, -+ boolean ex, -+ boolean no_window_changes ) -+{ -+ struct DRI3PresentGroup *This = -+ HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, -+ sizeof(struct DRI3PresentGroup)); -+ DISPLAY_DEVICEW dd; -+ HRESULT hr; -+ unsigned i; -+ -+ if (!This) { -+ ERR("Out of memory.\n"); -+ return E_OUTOFMEMORY; -+ } -+ -+ This->gdi_display = gdi_display; -+ This->vtable = &DRI3PresentGroup_vtable; -+ This->refs = 1; -+ This->ex = ex; -+ This->no_window_changes = no_window_changes; -+ This->npresent_backends = nparams; -+ This->present_backends = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, -+ This->npresent_backends * -+ sizeof(struct DRI3Present *)); -+ if (!This->present_backends) { -+ DRI3PresentGroup_Release(This); -+ ERR("Out of memory.\n"); -+ return E_OUTOFMEMORY; -+ } -+ -+ if (nparams != 1) { adapter = 0; } -+ for (i = 0; i < This->npresent_backends; ++i) { -+ ZeroMemory(&dd, sizeof(dd)); -+ dd.cb = sizeof(dd); -+ /* find final device name */ -+ if (!EnumDisplayDevicesW(device_name, adapter+i, &dd, 0)) { -+ WARN("Couldn't find subdevice %d from `%s'\n", -+ i, debugstr_w(device_name)); -+ } -+ -+ /* create an ID3DPresent for it */ -+ hr = DRI3Present_new(gdi_display, dd.DeviceName, ¶ms[i], -+ focus_wnd, &This->present_backends[i], -+ This->ex, This->no_window_changes); -+ if (FAILED(hr)) { -+ DRI3PresentGroup_Release(This); -+ return hr; -+ } -+ } -+ -+ *group = (ID3DPresentGroup *)This; -+ TRACE("Returning %p\n", *group); -+ -+ return D3D_OK; -+} -+ -+HRESULT -+present_create_adapter9( Display *gdi_display, -+ HDC hdc, -+ ID3DAdapter9 **out ) -+{ -+ struct x11drv_escape_get_drawable extesc = { X11DRV_GET_DRAWABLE }; -+ HRESULT hr; -+ int fd; -+ -+ if (!d3d9_drm) { -+ ERR("DRM drivers are not supported on your system.\n"); -+ return D3DERR_DRIVERINTERNALERROR; -+ } -+ -+ if (ExtEscape(hdc, X11DRV_ESCAPE, sizeof(extesc), (LPCSTR)&extesc, -+ sizeof(extesc), (LPSTR)&extesc) <= 0) { -+ ERR("X11 drawable lookup failed (hdc=%p)\n", hdc); -+ } -+ -+#ifdef D3DADAPTER9_DRI2 -+ if (!is_dri2_fallback && !DRI3Open(gdi_display, DefaultScreen(gdi_display), &fd)) { -+#else -+ if (!DRI3Open(gdi_display, DefaultScreen(gdi_display), &fd)) { -+#endif -+ ERR("DRI3Open failed (fd=%d)\n", fd); -+ return D3DERR_DRIVERINTERNALERROR; -+ } -+#ifdef D3DADAPTER9_DRI2 -+ if (is_dri2_fallback && !DRI2FallbackOpen(gdi_display, DefaultScreen(gdi_display), &fd)) { -+ ERR("DRI2Open failed (fd=%d)\n", fd); -+ return D3DERR_DRIVERINTERNALERROR; -+ } -+#endif -+ hr = d3d9_drm->create_adapter(fd, out); -+ if (FAILED(hr)) { -+ ERR("Unable to create ID3DAdapter9 (fd=%d)\n", fd); -+ return hr; -+ } -+ -+ TRACE("Created ID3DAdapter9 with fd %d\n", fd); -+ -+ return D3D_OK; -+} -+ -+BOOL -+has_d3dadapter( Display *gdi_display ) -+{ -+ static const void * WINAPI (*pD3DAdapter9GetProc)(const char *); -+ static void *handle = NULL; -+ static int done = 0; -+ -+ char errbuf[256]; -+ -+#if !defined(SONAME_D3DADAPTER9) -+ return FALSE; -+#endif -+ -+ /* like in opengl.c (single threaded assumption OK?) */ -+ if (done) { return handle != NULL; } -+ done = 1; -+ -+ handle = wine_dlopen(D3D_MODULE_DIR "/" SONAME_D3DADAPTER9, -+ RTLD_GLOBAL | RTLD_NOW, errbuf, sizeof(errbuf)); -+ if (!handle) { -+ ERR("Failed to load %s: %s\n", SONAME_D3DADAPTER9, errbuf); -+ goto cleanup; -+ } -+ -+ /* find our entry point in d3dadapter9 */ -+ pD3DAdapter9GetProc = wine_dlsym(handle, "D3DAdapter9GetProc", -+ errbuf, sizeof(errbuf)); -+ if (!pD3DAdapter9GetProc) { -+ ERR("Failed to get the entry point from %s: %s", -+ SONAME_D3DADAPTER9, errbuf); -+ goto cleanup; -+ } -+ -+ /* get a handle to the drm backend struct */ -+ d3d9_drm = pD3DAdapter9GetProc(D3DADAPTER9DRM_NAME); -+ if (!d3d9_drm) { -+ ERR("%s doesn't support the `%s' backend.\n", -+ SONAME_D3DADAPTER9, D3DADAPTER9DRM_NAME); -+ goto cleanup; -+ } -+ -+ /* verify that we're binary compatible */ -+ if (d3d9_drm->major_version != D3DADAPTER9DRM_MAJOR) { -+ ERR("Version mismatch. %s has %d.%d, was expecting %d.x\n", -+ SONAME_D3DADAPTER9, d3d9_drm->major_version, -+ d3d9_drm->minor_version, D3DADAPTER9DRM_MAJOR); -+ goto cleanup; -+ } -+ -+ /* this will be used to store d3d_drawables */ -+ d3d_hwnd_context = XUniqueContext(); -+ -+ if (!PRESENTCheckExtension(gdi_display, 1, 0)) { -+ ERR("Unable to query PRESENT.\n"); -+ goto cleanup; -+ } -+ -+ if (!DRI3CheckExtension(gdi_display, 1, 0)) { -+#ifndef D3DADAPTER9_DRI2 -+ ERR("Unable to query DRI3.\n"); -+ goto cleanup; -+#else -+ ERR("Unable to query DRI3. Trying DRI2 fallback (slower performance).\n"); -+ is_dri2_fallback = 1; -+ if (!DRI2FallbackCheckSupport(gdi_display)) { -+ ERR("DRI2 fallback unsupported\n"); -+ goto cleanup; -+ } -+#endif -+ } -+ -+ return TRUE; -+ -+cleanup: -+ ERR("\033[1;31m\nNative Direct3D 9 will be unavailable." -+ "\nFor more information visit https://wiki.ixit.cz/d3d9\033[0m\n"); -+ if (handle) { -+ wine_dlclose(handle, NULL, 0); -+ handle = NULL; -+ } -+ -+ return FALSE; -+} -diff --git a/dlls/d3d9-nine/present.h b/dlls/d3d9-nine/present.h -new file mode 100644 -index 0000000..52791a5 ---- /dev/null -+++ b/dlls/d3d9-nine/present.h -@@ -0,0 +1,36 @@ -+/* -+ * Wine present interface -+ * -+ * Copyright 2015 Patrick Rudolph -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA -+ */ -+ -+#ifndef __WINE_PRESENT_H -+#define __WINE_PRESENT_H -+ -+#ifndef __WINE_CONFIG_H -+# error You must include config.h to use this header -+#endif -+ -+#include <X11/Xlib.h> -+ -+HRESULT present_create_present_group(Display *gdi_display, const WCHAR *device_name, UINT adapter, HWND focus, D3DPRESENT_PARAMETERS *params, unsigned nparams, ID3DPresentGroup **group, boolean ex, boolean no_window_changes); -+ -+HRESULT present_create_adapter9(Display *gdi_display, HDC hdc, ID3DAdapter9 **adapter); -+ -+BOOL has_d3dadapter(Display *gdi_display); -+ -+#endif /* __WINE_DRI3_H */ -diff --git a/dlls/d3d9-nine/version.rc b/dlls/d3d9-nine/version.rc -new file mode 100644 -index 0000000..bfafc2f ---- /dev/null -+++ b/dlls/d3d9-nine/version.rc -@@ -0,0 +1,26 @@ -+/* -+ * Copyright 2015 Patrick Rudolph -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA -+ */ -+ -+#define WINE_FILEDESCRIPTION_STR "Wine Gallium Nine Direct3D" -+#define WINE_FILENAME_STR "d3d9-nine.dll" -+#define WINE_FILEVERSION 5,3,1,904 -+#define WINE_FILEVERSION_STR "5.3.1.904" -+#define WINE_PRODUCTVERSION 5,3,1,904 -+#define WINE_PRODUCTVERSION_STR "5.3.1.904" -+ -+#include "wine/wine_common_ver.rc" -diff --git a/dlls/d3d9/Makefile.in b/dlls/d3d9/Makefile.in -index 1c05f5a..dc06d68 100644 ---- a/dlls/d3d9/Makefile.in -+++ b/dlls/d3d9/Makefile.in -@@ -1,6 +1,6 @@ - MODULE = d3d9.dll - IMPORTLIB = d3d9 --IMPORTS = dxguid uuid wined3d -+IMPORTS = dxguid uuid advapi32 wined3d - - C_SRCS = \ - buffer.c \ -diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c -index 151db41..5314915 100644 ---- a/dlls/d3d9/tests/d3d9ex.c -+++ b/dlls/d3d9/tests/d3d9ex.c -@@ -1410,6 +1410,7 @@ static void test_lost_device(void) - HRESULT hr; - BOOL ret; - struct device_desc desc; -+ IDirect3DSwapChain9 *swapchain; - - window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); -@@ -1434,6 +1435,12 @@ static void test_lost_device(void) - hr = IDirect3DDevice9Ex_CheckDeviceState(device, NULL); - ok(hr == S_PRESENT_OCCLUDED, "Got unexpected hr %#x.\n", hr); - -+ hr = IDirect3DDevice9Ex_GetSwapChain(device, 0, &swapchain); -+ ok(SUCCEEDED(hr), "Failed to get swapchain, hr %#x.\n", hr); -+ hr = IDirect3DSwapChain9_Present(swapchain, NULL, NULL, NULL, NULL, 0); -+ ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); -+ IDirect3DSwapChain9_Release(swapchain); -+ - ret = SetForegroundWindow(GetDesktopWindow()); - ok(ret, "Failed to set foreground window.\n"); - hr = IDirect3DDevice9Ex_TestCooperativeLevel(device); -@@ -1447,6 +1454,12 @@ static void test_lost_device(void) - hr = IDirect3DDevice9Ex_CheckDeviceState(device, NULL); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - -+ hr = IDirect3DDevice9Ex_GetSwapChain(device, 0, &swapchain); -+ ok(SUCCEEDED(hr), "Failed to get swapchain, hr %#x.\n", hr); -+ hr = IDirect3DSwapChain9_Present(swapchain, NULL, NULL, NULL, NULL, 0); -+ ok(hr == S_PRESENT_OCCLUDED, "Got unexpected hr %#x.\n", hr); -+ IDirect3DSwapChain9_Release(swapchain); -+ - ret = SetForegroundWindow(window); - ok(ret, "Failed to set foreground window.\n"); - hr = IDirect3DDevice9Ex_TestCooperativeLevel(device); -@@ -1460,6 +1473,12 @@ static void test_lost_device(void) - hr = IDirect3DDevice9Ex_CheckDeviceState(device, NULL); - ok(hr == S_PRESENT_OCCLUDED, "Got unexpected hr %#x.\n", hr); - -+ hr = IDirect3DDevice9Ex_GetSwapChain(device, 0, &swapchain); -+ ok(SUCCEEDED(hr), "Failed to get swapchain, hr %#x.\n", hr); -+ hr = IDirect3DSwapChain9_Present(swapchain, NULL, NULL, NULL, NULL, 0); -+ ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); -+ IDirect3DSwapChain9_Release(swapchain); -+ - desc.width = 1024; - desc.height = 768; - hr = reset_device(device, &desc); -@@ -1489,6 +1508,12 @@ static void test_lost_device(void) - hr = IDirect3DDevice9Ex_CheckDeviceState(device, NULL); - todo_wine ok(hr == S_PRESENT_MODE_CHANGED, "Got unexpected hr %#x.\n", hr); - -+ hr = IDirect3DDevice9Ex_GetSwapChain(device, 0, &swapchain); -+ ok(SUCCEEDED(hr), "Failed to get swapchain, hr %#x.\n", hr); -+ hr = IDirect3DSwapChain9_Present(swapchain, NULL, NULL, NULL, NULL, 0); -+ ok(hr == S_PRESENT_MODE_CHANGED, "Got unexpected hr %#x.\n", hr); -+ IDirect3DSwapChain9_Release(swapchain); -+ - hr = reset_device(device, &desc); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9Ex_TestCooperativeLevel(device); -@@ -1502,6 +1527,12 @@ static void test_lost_device(void) - hr = IDirect3DDevice9Ex_CheckDeviceState(device, NULL); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - -+ hr = IDirect3DDevice9Ex_GetSwapChain(device, 0, &swapchain); -+ ok(SUCCEEDED(hr), "Failed to get swapchain, hr %#x.\n", hr); -+ hr = IDirect3DSwapChain9_Present(swapchain, NULL, NULL, NULL, NULL, 0); -+ ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); -+ IDirect3DSwapChain9_Release(swapchain); -+ - ret = SetForegroundWindow(GetDesktopWindow()); - ok(ret, "Failed to set foreground window.\n"); - hr = IDirect3DDevice9Ex_TestCooperativeLevel(device); -diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c -index 326e789..0ff7211 100644 ---- a/dlls/d3d9/tests/device.c -+++ b/dlls/d3d9/tests/device.c -@@ -8222,10 +8222,10 @@ done: - - static void test_vidmem_accounting(void) - { -- IDirect3DDevice9 *device; -+ IDirect3DDevice9 *device, *device2; - IDirect3D9 *d3d9; - ULONG refcount; -- HWND window; -+ HWND window, window2; - HRESULT hr = D3D_OK; - IDirect3DTexture9 *textures[20]; - unsigned int i; -@@ -8233,6 +8233,8 @@ static void test_vidmem_accounting(void) - - window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); -+ window2 = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, -+ 0, 0, 640, 480, 0, 0, 0, 0); - d3d9 = Direct3DCreate9(D3D_SDK_VERSION); - ok(!!d3d9, "Failed to create a D3D object.\n"); - if (!(device = create_device(d3d9, window, NULL))) -@@ -8267,6 +8269,43 @@ static void test_vidmem_accounting(void) - IDirect3DTexture9_Release(textures[i]); - } - -+ /* Multi-device testing */ -+ if (!(device2 = create_device(d3d9, window2, NULL))) -+ { -+ skip("Failed to create a D3D device, skipping tests.\n"); -+ refcount = IDirect3DDevice9_Release(device); -+ ok(!refcount, "Device has %u references left.\n", refcount); -+ IDirect3D9_Release(d3d9); -+ DestroyWindow(window2); -+ DestroyWindow(window); -+ return; -+ } -+ -+ vidmem_start = IDirect3DDevice9_GetAvailableTextureMem(device); -+ memset(textures, 0, sizeof(textures)); -+ for (i = 0; (i < sizeof(textures) / sizeof(*textures)) && SUCCEEDED(hr); i++) -+ { -+ hr = IDirect3DDevice9_CreateTexture(device2, 1024, 1024, 1, D3DUSAGE_RENDERTARGET, -+ D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &textures[i], NULL); -+ /* D3DERR_OUTOFVIDEOMEMORY is returned when the card runs out of video memory -+ * E_FAIL is returned on address space or system memory exhaustion */ -+ ok(SUCCEEDED(hr) || hr == D3DERR_OUTOFVIDEOMEMORY || hr == E_OUTOFMEMORY, -+ "Failed to create texture, hr %#x.\n", hr); -+ } -+ vidmem_end = IDirect3DDevice9_GetAvailableTextureMem(device); -+ -+ /* Windows 7 uses device private counters */ -+ ok(vidmem_start > vidmem_end || broken(vidmem_start == vidmem_end), "Expected available texture memory to decrease during texture creation.\n"); -+ diff = vidmem_start - vidmem_end; -+ ok(diff > 1024 * 1024 * 2 * i || broken(diff == 0), "Expected a video memory difference of at least %u MB, got %u MB.\n", -+ 2 * i, diff / 1024 / 1024); -+ -+ for (i = 0; i < sizeof(textures) / sizeof(*textures); i++) -+ { -+ if (textures[i]) -+ IDirect3DTexture9_Release(textures[i]); -+ } -+ - refcount = IDirect3DDevice9_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); - IDirect3D9_Release(d3d9); -@@ -9987,6 +10026,7 @@ static void test_lost_device(void) - HWND window; - HRESULT hr; - BOOL ret; -+ IDirect3DSwapChain9 *swapchain; - - window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); -@@ -10014,6 +10054,12 @@ static void test_lost_device(void) - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); - -+ hr = IDirect3DDevice9_GetSwapChain(device, 0, &swapchain); -+ ok(SUCCEEDED(hr), "Failed to get swapchain, hr %#x.\n", hr); -+ hr = IDirect3DSwapChain9_Present(swapchain, NULL, NULL, NULL, NULL, 0); -+ ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); -+ IDirect3DSwapChain9_Release(swapchain); -+ - ret = ShowWindow(window, SW_RESTORE); - ok(ret, "Failed to restore window.\n"); - ret = SetForegroundWindow(window); -@@ -10023,6 +10069,12 @@ static void test_lost_device(void) - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); - -+ hr = IDirect3DDevice9_GetSwapChain(device, 0, &swapchain); -+ ok(SUCCEEDED(hr), "Failed to get swapchain, hr %#x.\n", hr); -+ hr = IDirect3DSwapChain9_Present(swapchain, NULL, NULL, NULL, NULL, 0); -+ ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); -+ IDirect3DSwapChain9_Release(swapchain); -+ - hr = reset_device(device, &device_desc); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_TestCooperativeLevel(device); -@@ -10030,6 +10082,12 @@ static void test_lost_device(void) - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - -+ hr = IDirect3DDevice9_GetSwapChain(device, 0, &swapchain); -+ ok(SUCCEEDED(hr), "Failed to get swapchain, hr %#x.\n", hr); -+ hr = IDirect3DSwapChain9_Present(swapchain, NULL, NULL, NULL, NULL, 0); -+ ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); -+ IDirect3DSwapChain9_Release(swapchain); -+ - device_desc.flags = 0; - hr = reset_device(device, &device_desc); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); -diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c -index b328b94..74d9dd9 100644 ---- a/dlls/d3d9/tests/visual.c -+++ b/dlls/d3d9/tests/visual.c -@@ -8535,6 +8535,167 @@ done: - DestroyWindow(window); - } - -+static void test_blend_invalid_arg(void) -+{ -+ IDirect3DSurface9 *backbuffer, *offscreen; -+ IDirect3DTexture9 *offscreenTexture; -+ IDirect3DDevice9 *device; -+ IDirect3D9 *d3d; -+ D3DCOLOR color; -+ ULONG refcount; -+ HWND window; -+ HRESULT hr; -+ DWORD rs; -+ -+ static const struct -+ { -+ struct vec3 position; -+ DWORD diffuse; -+ } -+ quad1[] = -+ { -+ {{-1.0f, -1.0f, 0.1f}, 0x4000ff00}, -+ {{-1.0f, 0.0f, 0.1f}, 0x4000ff00}, -+ {{ 0.0f, -1.0f, 0.1f}, 0x4000ff00}, -+ {{ 0.0f, 0.0f, 0.1f}, 0x4000ff00}, -+ }, -+ quad2[] = -+ { -+ {{ 0.0f, 0.0f, 0.1f}, 0x4000ff00}, -+ {{ 0.0f, 1.0f, 0.1f}, 0x4000ff00}, -+ {{ 1.0f, 0.0f, 0.1f}, 0x4000ff00}, -+ {{ 1.0f, 1.0f, 0.1f}, 0x4000ff00}, -+ }, -+ quad3[] = -+ { -+ {{-1.0f, 0.0f, 0.1f}, 0xc00000ff}, -+ {{-1.0f, 1.0f, 0.1f}, 0xc00000ff}, -+ {{ 0.0f, 0.0f, 0.1f}, 0xc00000ff}, -+ {{ 0.0f, 1.0f, 0.1f}, 0xc00000ff}, -+ }, -+ quad4[] = -+ { -+ {{ 0.0f, -1.0f, 0.1f}, 0xc00000ff}, -+ {{ 0.0f, 0.0f, 0.1f}, 0xc00000ff}, -+ {{ 1.0f, -1.0f, 0.1f}, 0xc00000ff}, -+ {{ 1.0f, 0.0f, 0.1f}, 0xc00000ff}, -+ }; -+ -+ window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, -+ 0, 0, 640, 480, NULL, NULL, NULL, NULL); -+ d3d = Direct3DCreate9(D3D_SDK_VERSION); -+ ok(!!d3d, "Failed to create a D3D object.\n"); -+ if (!(device = create_device(d3d, window, window, TRUE))) -+ { -+ skip("Failed to create a D3D device, skipping tests.\n"); -+ goto done; -+ } -+ /* Clear the render target with alpha = 0.5 */ -+ hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x80ff0000, 1.0f, 0); -+ ok(hr == D3D_OK, "Clear failed, hr = %08x\n", hr); -+ -+ hr = IDirect3DDevice9_CreateTexture(device, 128, 128, 1, D3DUSAGE_RENDERTARGET, -+ D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &offscreenTexture, NULL); -+ ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); -+ -+ hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); -+ ok(hr == D3D_OK, "Can't get back buffer, hr = %08x\n", hr); -+ -+ hr = IDirect3DTexture9_GetSurfaceLevel(offscreenTexture, 0, &offscreen); -+ ok(hr == D3D_OK, "Can't get offscreen surface, hr = %08x\n", hr); -+ -+ hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); -+ ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF failed, hr = %#08x\n", hr); -+ -+ hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); -+ ok(hr == D3D_OK, "SetTextureStageState failed, hr = %08x\n", hr); -+ hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE); -+ ok(hr == D3D_OK, "SetTextureStageState failed, hr = %08x\n", hr); -+ hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MINFILTER, D3DTEXF_POINT); -+ ok(SUCCEEDED(hr), "SetSamplerState D3DSAMP_MINFILTER failed (0x%08x)\n", hr); -+ hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MAGFILTER, D3DTEXF_POINT); -+ ok(SUCCEEDED(hr), "SetSamplerState D3DSAMP_MAGFILTER failed (0x%08x)\n", hr); -+ hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); -+ ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); -+ -+ hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ALPHABLENDENABLE, TRUE); -+ ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed, hr = %08x\n", hr); -+ hr = IDirect3DDevice9_BeginScene(device); -+ ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); -+ -+ /* draw quad to test default renderstate -+ * expect D3DRS_SRCBLEND == D3DBLEND_ONE -+ * expect D3DRS_DESTBLEND == D3DBLEND_ZERO */ -+ hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad1, sizeof(quad1[0])); -+ ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); -+ -+ /* set invalid value and expect D3DBLEND_ZERO instead */ -+ hr = IDirect3DDevice9_SetRenderState(device, D3DRS_SRCBLEND, 0); -+ ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); -+ hr = IDirect3DDevice9_GetRenderState(device, D3DRS_SRCBLEND, &rs); -+ ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); -+ ok(rs == 0, "Unexpected renderstate %#x.\n", rs); -+ hr = IDirect3DDevice9_SetRenderState(device, D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA); -+ ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); -+ -+ hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad2, sizeof(quad2[0])); -+ ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); -+ /* set non default valid values */ -+ hr = IDirect3DDevice9_SetRenderState(device, D3DRS_SRCBLEND, D3DBLEND_SRCALPHA); -+ ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); -+ hr = IDirect3DDevice9_GetRenderState(device, D3DRS_SRCBLEND, &rs); -+ ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); -+ ok(rs == D3DBLEND_SRCALPHA, "Unexpected renderstate %#x.\n", rs); -+ hr = IDirect3DDevice9_SetRenderState(device, D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA); -+ ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); -+ hr = IDirect3DDevice9_GetRenderState(device, D3DRS_DESTBLEND, &rs); -+ ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); -+ ok(rs == D3DBLEND_INVSRCALPHA, "Failed to get render state, hr %#x.\n", hr); -+ -+ hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad3, sizeof(quad3[0])); -+ ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); -+ -+ /* set invalid value and expect D3DBLEND_ZERO instead */ -+ hr = IDirect3DDevice9_SetRenderState(device, D3DRS_DESTBLEND, 200); -+ ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); -+ hr = IDirect3DDevice9_GetRenderState(device, D3DRS_DESTBLEND, &rs); -+ ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); -+ ok(rs == 200, "Failed to get render state, hr %#x.\n", hr); -+ -+ hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad4, sizeof(quad4[0])); -+ ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); -+ -+ hr = IDirect3DDevice9_EndScene(device); -+ ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); -+ -+ color = getPixelColor(device, 160, 360); -+ ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x00, 0xff, 0x00), 1), -+ "D3DRS_SRCBLEND ONE returned color %08x, expected 0x0000FF00\n", color); -+ -+ color = getPixelColor(device, 480, 120); -+ ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xbf, 0x00, 0x00), 1), -+ "invalid D3DRS_SRCBLEND returned color %08x, expected 0x00bf0000\n", color); -+ -+ color = getPixelColor(device, 160, 120); -+ ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x3f, 0x00, 0xC0), 1), -+ "D3DRS_SRCBLEND SRCALPHA returned color %08x, expected 0x003f00C0\n", color); -+ -+ color = getPixelColor(device, 480, 360); -+ ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x00, 0x00, 0xC0), 1), -+ "invalid D3DRS_DESTBLEND returned color %08x, expected 0x000000C0\n", color); -+ -+ IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); -+ -+ IDirect3DSurface9_Release(backbuffer); -+ IDirect3DTexture9_Release(offscreenTexture); -+ IDirect3DSurface9_Release(offscreen); -+ refcount = IDirect3DDevice9_Release(device); -+ ok(!refcount, "Device has %u references left.\n", refcount); -+done: -+ IDirect3D9_Release(d3d); -+ DestroyWindow(window); -+} -+ - static void fixed_function_decl_test(void) - { - IDirect3DVertexDeclaration9 *dcl_float = NULL, *dcl_short = NULL, *dcl_ubyte = NULL, *dcl_color = NULL; -@@ -12734,6 +12895,9 @@ static void alphatest_test(void) - } - testdata[] = - { -+ /* test invalid values, D3DCMP_NEVER for values less than D3DCMP_NEVER, -+ * D3DCMP_ALWAYS for values greater than D3DCMP_ALWAYS */ -+ {D3DCMP_NEVER-1, ALPHATEST_FAILED, ALPHATEST_FAILED, ALPHATEST_FAILED}, - {D3DCMP_NEVER, ALPHATEST_FAILED, ALPHATEST_FAILED, ALPHATEST_FAILED}, - {D3DCMP_LESS, ALPHATEST_PASSED, ALPHATEST_FAILED, ALPHATEST_FAILED}, - {D3DCMP_EQUAL, ALPHATEST_FAILED, ALPHATEST_PASSED, ALPHATEST_FAILED}, -@@ -12742,6 +12906,10 @@ static void alphatest_test(void) - {D3DCMP_NOTEQUAL, ALPHATEST_PASSED, ALPHATEST_FAILED, ALPHATEST_PASSED}, - {D3DCMP_GREATEREQUAL, ALPHATEST_FAILED, ALPHATEST_PASSED, ALPHATEST_PASSED}, - {D3DCMP_ALWAYS, ALPHATEST_PASSED, ALPHATEST_PASSED, ALPHATEST_PASSED}, -+ {D3DCMP_ALWAYS+1, ALPHATEST_PASSED, ALPHATEST_PASSED, ALPHATEST_PASSED}, -+ {D3DCMP_ALWAYS+2, ALPHATEST_PASSED, ALPHATEST_PASSED, ALPHATEST_PASSED}, -+ {D3DCMP_ALWAYS+3, ALPHATEST_PASSED, ALPHATEST_PASSED, ALPHATEST_PASSED}, -+ {0xdeadbeef, ALPHATEST_PASSED, ALPHATEST_PASSED, ALPHATEST_PASSED}, - }; - static const struct - { -@@ -18087,6 +18255,27 @@ static void test_negative_fixedfunction_fog(void) - D3DFOG_LINEAR, D3DFOG_NONE, 0x0000ff00, 0x0000ff00, 0x0000ff00}, - {D3DFVF_XYZ, quad, sizeof(*quad), &zero, { 0.0f}, {1.0f}, - D3DFOG_EXP, D3DFOG_NONE, 0x009b6400, 0x009b6400, 0x009b6400}, -+ /* test invalid values, expect a modulo 4 on samplerstate */ -+ {D3DFVF_XYZ, quad, sizeof(*quad), &zero, { 0.0f}, {1.0f}, -+ D3DFOG_LINEAR+1, D3DFOG_NONE, 0x0000ff00, 0x009b6400, 0x009b6400}, -+ {D3DFVF_XYZ, quad, sizeof(*quad), &zero, { 0.0f}, {1.0f}, -+ D3DFOG_LINEAR+2, D3DFOG_NONE, 0x00c73800, 0x009b6400, 0x009b6400}, -+ {D3DFVF_XYZ, quad, sizeof(*quad), &zero, { 0.0f}, {1.0f}, -+ D3DFOG_LINEAR+3, D3DFOG_NONE, 0x00c73800, 0x009b6400, 0x009b6400}, -+ {D3DFVF_XYZ, quad, sizeof(*quad), &zero, { 0.0f}, {1.0f}, -+ D3DFOG_LINEAR+4, D3DFOG_NONE, 0x007f7f00, 0x009b6400, 0x009b6400}, -+ {D3DFVF_XYZ, quad, sizeof(*quad), &zero, { 0.0f}, {1.0f}, -+ D3DFOG_LINEAR+5, D3DFOG_NONE, 0x0000ff00, 0x009b6400, 0x009b6400}, -+ {D3DFVF_XYZ, quad, sizeof(*quad), &zero, { 0.0f}, {1.0f}, -+ D3DFOG_LINEAR+6, D3DFOG_NONE, 0x00c73800, 0x009b6400, 0x009b6400}, -+ {D3DFVF_XYZ, quad, sizeof(*quad), &zero, { 0.0f}, {1.0f}, -+ D3DFOG_LINEAR+7, D3DFOG_NONE, 0x00c73800, 0x009b6400, 0x009b6400}, -+ {D3DFVF_XYZ, quad, sizeof(*quad), &zero, { 0.0f}, {1.0f}, -+ D3DFOG_LINEAR+8, D3DFOG_NONE, 0x007f7f00, 0x009b6400, 0x009b6400}, -+ {D3DFVF_XYZ, quad, sizeof(*quad), &zero, { 0.0f}, {1.0f}, -+ D3DFOG_LINEAR+9, D3DFOG_NONE, 0x0000ff00, 0x009b6400, 0x009b6400}, -+ {D3DFVF_XYZ, quad, sizeof(*quad), &zero, { 0.0f}, {1.0f}, -+ D3DFOG_LINEAR+10, D3DFOG_NONE, 0x00c73800, 0x009b6400, 0x009b6400}, - }; - D3DCAPS9 caps; - -@@ -20511,4 +20700,5 @@ START_TEST(visual) - test_depthbias(); - test_flip(); - test_uninitialized_varyings(); -+ test_blend_invalid_arg(); - } -diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c -index 74feb97..d331513 100644 ---- a/dlls/ntdll/loader.c -+++ b/dlls/ntdll/loader.c -@@ -92,6 +92,7 @@ struct builtin_load_info - { - const WCHAR *load_path; - const WCHAR *filename; -+ const WCHAR *fakemodule; - NTSTATUS status; - WINE_MODREF *wm; - }; -@@ -117,7 +118,8 @@ static WINE_MODREF *cached_modref; - static WINE_MODREF *current_modref; - static WINE_MODREF *last_failed_modref; - --static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_MODREF** pwm ); -+static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, LPCWSTR fakemodule, -+ DWORD flags, WINE_MODREF** pwm ); - static NTSTATUS process_attach( WINE_MODREF *wm, LPVOID lpReserved ); - static FARPROC find_ordinal_export( HMODULE module, const IMAGE_EXPORT_DIRECTORY *exports, - DWORD exp_size, DWORD ordinal, LPCWSTR load_path ); -@@ -443,7 +445,7 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS - if (!(wm = find_basename_module( mod_name ))) - { - TRACE( "delay loading %s for '%s'\n", debugstr_w(mod_name), forward ); -- if (load_dll( load_path, mod_name, 0, &wm ) == STATUS_SUCCESS && -+ if (load_dll( load_path, mod_name, NULL, 0, &wm ) == STATUS_SUCCESS && - !(wm->ldr.Flags & LDR_DONT_RESOLVE_REFS)) - { - if (process_attach( wm, NULL ) != STATUS_SUCCESS) -@@ -592,7 +594,7 @@ static WINE_MODREF *import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *d - { - ascii_to_unicode( buffer, name, len ); - buffer[len] = 0; -- status = load_dll( load_path, buffer, 0, &wmImp ); -+ status = load_dll( load_path, buffer, NULL, 0, &wmImp ); - } - else /* need to allocate a larger buffer */ - { -@@ -600,7 +602,7 @@ static WINE_MODREF *import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *d - if (!ptr) return NULL; - ascii_to_unicode( ptr, name, len ); - ptr[len] = 0; -- status = load_dll( load_path, ptr, 0, &wmImp ); -+ status = load_dll( load_path, ptr, NULL, 0, &wmImp ); - RtlFreeHeap( GetProcessHeap(), 0, ptr ); - } - -@@ -916,7 +918,7 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path ) - * Allocate a WINE_MODREF structure and add it to the process list - * The loader_section must be locked while calling this function. - */ --static WINE_MODREF *alloc_module( HMODULE hModule, LPCWSTR filename ) -+static WINE_MODREF *alloc_module( HMODULE hModule, LPCWSTR filename, LPCWSTR fakemodule ) - { - WINE_MODREF *wm; - const WCHAR *p; -@@ -939,7 +941,7 @@ static WINE_MODREF *alloc_module( HMODULE hModule, LPCWSTR filename ) - wm->ldr.TimeDateStamp = 0; - wm->ldr.ActivationContext = 0; - -- RtlCreateUnicodeString( &wm->ldr.FullDllName, filename ); -+ RtlCreateUnicodeString( &wm->ldr.FullDllName, fakemodule ? fakemodule : filename ); - if ((p = strrchrW( wm->ldr.FullDllName.Buffer, '\\' ))) p++; - else p = wm->ldr.FullDllName.Buffer; - RtlInitUnicodeString( &wm->ldr.BaseDllName, p ); -@@ -1578,7 +1580,7 @@ static void load_builtin_callback( void *module, const char *filename ) - return; - } - -- wm = alloc_module( module, fullname ); -+ wm = alloc_module( module, fullname, builtin_load_info->fakemodule ); - RtlFreeHeap( GetProcessHeap(), 0, fullname ); - if (!wm) - { -@@ -1760,8 +1762,8 @@ static NTSTATUS perform_relocations( void *module, SIZE_T len ) - /****************************************************************************** - * load_native_dll (internal) - */ --static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, -- DWORD flags, WINE_MODREF** pwm ) -+static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, LPCWSTR fakemodule, -+ HANDLE file, DWORD flags, WINE_MODREF** pwm ) - { - void *module; - HANDLE mapping; -@@ -1795,7 +1797,7 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, - - /* create the MODREF */ - -- if (!(wm = alloc_module( module, name ))) -+ if (!(wm = alloc_module( module, name, fakemodule ))) - { - status = STATUS_NO_MEMORY; - goto done; -@@ -1859,8 +1861,8 @@ done: - /*********************************************************************** - * load_builtin_dll - */ --static NTSTATUS load_builtin_dll( LPCWSTR load_path, LPCWSTR path, HANDLE file, -- DWORD flags, WINE_MODREF** pwm ) -+static NTSTATUS load_builtin_dll( LPCWSTR load_path, LPCWSTR path, LPCWSTR fakemodule, -+ HANDLE file, DWORD flags, WINE_MODREF** pwm ) - { - char error[256], dllname[MAX_PATH]; - const WCHAR *name, *p; -@@ -1880,6 +1882,7 @@ static NTSTATUS load_builtin_dll( LPCWSTR load_path, LPCWSTR path, HANDLE file, - */ - info.load_path = load_path; - info.filename = NULL; -+ info.fakemodule = fakemodule; - info.status = STATUS_SUCCESS; - info.wm = NULL; - -@@ -2198,14 +2201,14 @@ overflow: - return STATUS_BUFFER_TOO_SMALL; - } - -- - /*********************************************************************** - * load_dll (internal) - * - * Load a PE style module according to the load order. - * The loader_section must be locked while calling this function. - */ --static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_MODREF** pwm ) -+static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, LPCWSTR fakemodule, -+ DWORD flags, WINE_MODREF** pwm ) - { - enum loadorder loadorder; - WCHAR buffer[64]; -@@ -2242,6 +2245,25 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ - } - - main_exe = get_modref( NtCurrentTeb()->Peb->ImageBaseAddress ); -+ -+ /* handle dll redirection */ -+ if (!fakemodule) -+ { -+ BYTE buffer2[sizeof(KEY_VALUE_PARTIAL_INFORMATION) + MAX_PATH * sizeof(WCHAR)]; -+ WCHAR *redirect = get_redirect( main_exe ? main_exe->ldr.BaseDllName.Buffer : NULL, -+ filename, buffer2, sizeof(buffer2) ); -+ if (redirect) -+ { -+ FIXME("Loader redirect from %s to %s\n", debugstr_w(libname), debugstr_w(redirect)); -+ -+ nts = load_dll( load_path, redirect, filename, flags, pwm ); -+ -+ if (handle) NtClose( handle ); -+ if (filename != buffer) RtlFreeHeap( GetProcessHeap(), 0, filename ); -+ return nts; -+ } -+ } -+ - loadorder = get_load_order( main_exe ? main_exe->ldr.BaseDllName.Buffer : NULL, filename ); - - if (handle && is_fake_dll( handle )) -@@ -2264,22 +2286,22 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ - if (!handle) nts = STATUS_DLL_NOT_FOUND; - else - { -- nts = load_native_dll( load_path, filename, handle, flags, pwm ); -+ nts = load_native_dll( load_path, filename, fakemodule, handle, flags, pwm ); - if (nts == STATUS_INVALID_IMAGE_NOT_MZ) - /* not in PE format, maybe it's a builtin */ -- nts = load_builtin_dll( load_path, filename, handle, flags, pwm ); -+ nts = load_builtin_dll( load_path, filename, fakemodule, handle, flags, pwm ); - } - if (nts == STATUS_DLL_NOT_FOUND && loadorder == LO_NATIVE_BUILTIN) -- nts = load_builtin_dll( load_path, filename, 0, flags, pwm ); -+ nts = load_builtin_dll( load_path, filename, fakemodule, 0, flags, pwm ); - break; - case LO_BUILTIN: - case LO_BUILTIN_NATIVE: - case LO_DEFAULT: /* default is builtin,native */ -- nts = load_builtin_dll( load_path, filename, handle, flags, pwm ); -+ nts = load_builtin_dll( load_path, filename, fakemodule, handle, flags, pwm ); - if (!handle) break; /* nothing else we can try */ - /* file is not a builtin library, try without using the specified file */ - if (nts != STATUS_SUCCESS) -- nts = load_builtin_dll( load_path, filename, 0, flags, pwm ); -+ nts = load_builtin_dll( load_path, filename, fakemodule, 0, flags, pwm ); - if (nts == STATUS_SUCCESS && loadorder == LO_DEFAULT && - (MODULE_InitDLL( *pwm, DLL_WINE_PREATTACH, NULL ) != STATUS_SUCCESS)) - { -@@ -2289,7 +2311,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ - nts = STATUS_DLL_NOT_FOUND; - } - if (nts == STATUS_DLL_NOT_FOUND && loadorder != LO_BUILTIN) -- nts = load_native_dll( load_path, filename, handle, flags, pwm ); -+ nts = load_native_dll( load_path, filename, fakemodule, handle, flags, pwm ); - break; - } - -@@ -2322,7 +2344,7 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH LdrLoadDll(LPCWSTR path_name, DWORD flags, - RtlEnterCriticalSection( &loader_section ); - - if (!path_name) path_name = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer; -- nts = load_dll( path_name, libname->Buffer, flags, &wm ); -+ nts = load_dll( path_name, libname->Buffer, NULL, flags, &wm ); - - if (nts == STATUS_SUCCESS && !(wm->ldr.Flags & LDR_DONT_RESOLVE_REFS)) - { -@@ -3285,7 +3307,7 @@ void __wine_process_init(void) - /* setup the load callback and create ntdll modref */ - wine_dll_set_callback( load_builtin_callback ); - -- if ((status = load_builtin_dll( NULL, kernel32W, 0, 0, &wm )) != STATUS_SUCCESS) -+ if ((status = load_builtin_dll( NULL, kernel32W, NULL, 0, 0, &wm )) != STATUS_SUCCESS) - { - MESSAGE( "wine: could not load kernel32.dll, status %x\n", status ); - exit(1); -diff --git a/dlls/ntdll/loadorder.c b/dlls/ntdll/loadorder.c -index 401d256..c7c4592 100644 ---- a/dlls/ntdll/loadorder.c -+++ b/dlls/ntdll/loadorder.c -@@ -290,102 +290,165 @@ static inline enum loadorder get_env_load_order( const WCHAR *module ) - - - /*************************************************************************** -- * get_standard_key -+ * open_user_reg_key -+ * -+ * Return a handle to a registry key under HKCU. -+ */ -+static HANDLE open_user_reg_key(const WCHAR *key_name) -+{ -+ HANDLE hkey, root; -+ OBJECT_ATTRIBUTES attr; -+ UNICODE_STRING nameW; -+ -+ RtlOpenCurrentUser( KEY_ALL_ACCESS, &root ); -+ attr.Length = sizeof(attr); -+ attr.RootDirectory = root; -+ attr.ObjectName = &nameW; -+ attr.Attributes = 0; -+ attr.SecurityDescriptor = NULL; -+ attr.SecurityQualityOfService = NULL; -+ RtlInitUnicodeString( &nameW, key_name ); -+ -+ if (NtOpenKey( &hkey, KEY_ALL_ACCESS, &attr )) hkey = 0; -+ NtClose( root ); -+ -+ return hkey; -+} -+ -+ -+/*************************************************************************** -+ * open_app_reg_key -+ * -+ * Return a handle to an app-specific registry key. -+ */ -+static HANDLE open_app_reg_key( const WCHAR *sub_key, const WCHAR *app_name ) -+{ -+ static const WCHAR AppDefaultsW[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\', -+ 'A','p','p','D','e','f','a','u','l','t','s','\\',0}; -+ WCHAR *str; -+ HANDLE hkey; -+ -+ str = RtlAllocateHeap( GetProcessHeap(), 0, -+ sizeof(AppDefaultsW) + -+ strlenW(sub_key) * sizeof(WCHAR) + -+ strlenW(app_name) * sizeof(WCHAR) ); -+ if (!str) return 0; -+ strcpyW( str, AppDefaultsW ); -+ strcatW( str, app_name ); -+ strcatW( str, sub_key ); -+ -+ hkey = open_user_reg_key( str ); -+ RtlFreeHeap( GetProcessHeap(), 0, str ); -+ return hkey; -+} -+ -+ -+/*************************************************************************** -+ * get_override_standard_key - * - * Return a handle to the standard DllOverrides registry section. - */ --static HANDLE get_standard_key(void) -+static HANDLE get_override_standard_key(void) - { - static const WCHAR DllOverridesW[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\', - 'D','l','l','O','v','e','r','r','i','d','e','s',0}; - static HANDLE std_key = (HANDLE)-1; - - if (std_key == (HANDLE)-1) -- { -- OBJECT_ATTRIBUTES attr; -- UNICODE_STRING nameW; -- HANDLE root; -- -- RtlOpenCurrentUser( KEY_ALL_ACCESS, &root ); -- attr.Length = sizeof(attr); -- attr.RootDirectory = root; -- attr.ObjectName = &nameW; -- attr.Attributes = 0; -- attr.SecurityDescriptor = NULL; -- attr.SecurityQualityOfService = NULL; -- RtlInitUnicodeString( &nameW, DllOverridesW ); -- -- /* @@ Wine registry key: HKCU\Software\Wine\DllOverrides */ -- if (NtOpenKey( &std_key, KEY_ALL_ACCESS, &attr )) std_key = 0; -- NtClose( root ); -- } -+ std_key = open_user_reg_key( DllOverridesW ); -+ - return std_key; - } - - - /*************************************************************************** -- * get_app_key -+ * get_override_app_key - * - * Get the registry key for the app-specific DllOverrides list. - */ --static HANDLE get_app_key( const WCHAR *app_name ) -+static HANDLE get_override_app_key( const WCHAR *app_name ) - { -- OBJECT_ATTRIBUTES attr; -- UNICODE_STRING nameW; -- HANDLE root; -- WCHAR *str; -- static const WCHAR AppDefaultsW[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\', -- 'A','p','p','D','e','f','a','u','l','t','s','\\',0}; - static const WCHAR DllOverridesW[] = {'\\','D','l','l','O','v','e','r','r','i','d','e','s',0}; - static HANDLE app_key = (HANDLE)-1; - -- if (app_key != (HANDLE)-1) return app_key; -+ if (app_key == (HANDLE)-1) -+ app_key = open_app_reg_key( DllOverridesW, app_name ); - -- str = RtlAllocateHeap( GetProcessHeap(), 0, -- sizeof(AppDefaultsW) + sizeof(DllOverridesW) + -- strlenW(app_name) * sizeof(WCHAR) ); -- if (!str) return 0; -- strcpyW( str, AppDefaultsW ); -- strcatW( str, app_name ); -- strcatW( str, DllOverridesW ); -+ return app_key; -+} - -- RtlOpenCurrentUser( KEY_ALL_ACCESS, &root ); -- attr.Length = sizeof(attr); -- attr.RootDirectory = root; -- attr.ObjectName = &nameW; -- attr.Attributes = 0; -- attr.SecurityDescriptor = NULL; -- attr.SecurityQualityOfService = NULL; -- RtlInitUnicodeString( &nameW, str ); - -- /* @@ Wine registry key: HKCU\Software\Wine\AppDefaults\app.exe\DllOverrides */ -- if (NtOpenKey( &app_key, KEY_ALL_ACCESS, &attr )) app_key = 0; -- NtClose( root ); -- RtlFreeHeap( GetProcessHeap(), 0, str ); -+/*************************************************************************** -+ * get_redirect_standard_key -+ * -+ * Return a handle to the standard DllRedirects registry section. -+ */ -+static HANDLE get_redirect_standard_key(void) -+{ -+ static const WCHAR DllRedirectsW[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\', -+ 'D','l','l','R','e','d','i','r','e','c','t','s',0}; -+ static HANDLE std_key = (HANDLE)-1; -+ -+ if (std_key == (HANDLE)-1) -+ std_key = open_user_reg_key( DllRedirectsW ); -+ -+ return std_key; -+} -+ -+ -+/*************************************************************************** -+ * get_redirect_app_key -+ * -+ * Get the registry key for the app-specific DllRedirects list. -+ */ -+static HANDLE get_redirect_app_key( const WCHAR *app_name ) -+{ -+ static const WCHAR DllRedirectsW[] = {'\\','D','l','l','R','e','d','i','r','e','c','t','s',0}; -+ static HANDLE app_key = (HANDLE)-1; -+ -+ if (app_key == (HANDLE)-1) -+ app_key = open_app_reg_key( DllRedirectsW, app_name ); -+ - return app_key; - } - - - /*************************************************************************** -- * get_registry_value -+ * get_registry_string - * -- * Load the registry loadorder value for a given module. -+ * Load a registry string for a given module. - */ --static enum loadorder get_registry_value( HANDLE hkey, const WCHAR *module ) -+static WCHAR* get_registry_string( HANDLE hkey, const WCHAR *module, BYTE *buffer, -+ ULONG size ) - { - UNICODE_STRING valueW; -- char buffer[80]; - DWORD count; -+ WCHAR *ret = NULL; - - RtlInitUnicodeString( &valueW, module ); -- -- if (!NtQueryValueKey( hkey, &valueW, KeyValuePartialInformation, -- buffer, sizeof(buffer), &count )) -+ if (size >= sizeof(WCHAR) && -+ !NtQueryValueKey( hkey, &valueW, KeyValuePartialInformation, -+ buffer, size - sizeof(WCHAR), &count )) - { -- WCHAR *str = (WCHAR *)((KEY_VALUE_PARTIAL_INFORMATION *)buffer)->Data; -- return parse_load_order( str ); -+ KEY_VALUE_PARTIAL_INFORMATION *info = (void *)buffer; -+ ret = (WCHAR *)info->Data; -+ ret[info->DataLength / sizeof(WCHAR)] = 0; - } -- return LO_INVALID; -+ -+ return ret; -+} -+ -+ -+/*************************************************************************** -+ * get_registry_load_order -+ * -+ * Load the registry loadorder value for a given module. -+ */ -+static enum loadorder get_registry_load_order( HANDLE hkey, const WCHAR *module ) -+{ -+ BYTE buffer[81]; -+ WCHAR *str = get_registry_string( hkey, module, buffer, sizeof(buffer) ); -+ return str ? parse_load_order( str ) : LO_INVALID; - } - - -@@ -407,13 +470,13 @@ static enum loadorder get_load_order_value( HANDLE std_key, HANDLE app_key, cons - return ret; - } - -- if (app_key && ((ret = get_registry_value( app_key, module )) != LO_INVALID)) -+ if (app_key && ((ret = get_registry_load_order( app_key, module )) != LO_INVALID)) - { - TRACE( "got app defaults %s for %s\n", debugstr_loadorder(ret), debugstr_w(module) ); - return ret; - } - -- if (std_key && ((ret = get_registry_value( std_key, module )) != LO_INVALID)) -+ if (std_key && ((ret = get_registry_load_order( std_key, module )) != LO_INVALID)) - { - TRACE( "got standard key %s for %s\n", debugstr_loadorder(ret), debugstr_w(module) ); - return ret; -@@ -424,24 +487,44 @@ static enum loadorder get_load_order_value( HANDLE std_key, HANDLE app_key, cons - - - /*************************************************************************** -- * get_load_order (internal) -+ * get_redirect_value - * -- * Return the loadorder of a module. -- * The system directory and '.dll' extension is stripped from the path. -+ * Get the redirect value for the exact specified module string, looking in: -+ * 1. The per-application DllRedirects key -+ * 2. The standard DllRedirects key - */ --enum loadorder get_load_order( const WCHAR *app_name, const WCHAR *path ) -+static WCHAR* get_redirect_value( HANDLE std_key, HANDLE app_key, const WCHAR *module, -+ BYTE *buffer, ULONG size ) - { -- enum loadorder ret = LO_INVALID; -- HANDLE std_key, app_key = 0; -- WCHAR *module, *basename; -- UNICODE_STRING path_str; -- int len; -+ WCHAR *ret = NULL; - -- if (!init_done) init_load_order(); -- std_key = get_standard_key(); -- if (app_name) app_key = get_app_key( app_name ); -+ if (app_key && (ret = get_registry_string( app_key, module, buffer, size ))) -+ { -+ TRACE( "got app defaults %s for %s\n", debugstr_w(ret), debugstr_w(module) ); -+ return ret; -+ } - -- TRACE("looking for %s\n", debugstr_w(path)); -+ if (std_key && (ret = get_registry_string( std_key, module, buffer, size ))) -+ { -+ TRACE( "got standard key %s for %s\n", debugstr_w(ret), debugstr_w(module) ); -+ return ret; -+ } -+ -+ return ret; -+} -+ -+ -+/*************************************************************************** -+ * get_module_basename -+ * -+ * Determine the module basename. The caller is responsible for releasing -+ * the memory. -+ */ -+static WCHAR* get_module_basename( const WCHAR *path, WCHAR **basename ) -+{ -+ UNICODE_STRING path_str; -+ WCHAR *module; -+ int len; - - /* Strip path information if the module resides in the system directory - */ -@@ -453,12 +536,36 @@ enum loadorder get_load_order( const WCHAR *app_name, const WCHAR *path ) - if (!strchrW( p, '\\' ) && !strchrW( p, '/' )) path = p; - } - -- if (!(len = strlenW(path))) return ret; -- if (!(module = RtlAllocateHeap( GetProcessHeap(), 0, (len + 2) * sizeof(WCHAR) ))) return ret; -+ if (!(len = strlenW(path))) return NULL; -+ if (!(module = RtlAllocateHeap( GetProcessHeap(), 0, (len + 2) * sizeof(WCHAR) ))) return NULL; - strcpyW( module+1, path ); /* reserve module[0] for the wildcard char */ -- basename = (WCHAR *)get_basename( module+1 ); -+ *basename = (WCHAR *)get_basename( module+1 ); - - if (len >= 4) remove_dll_ext( module + 1 + len - 4 ); -+ return module; -+} -+ -+ -+/*************************************************************************** -+ * get_load_order (internal) -+ * -+ * Return the loadorder of a module. -+ * The system directory and '.dll' extension is stripped from the path. -+ */ -+enum loadorder get_load_order( const WCHAR *app_name, const WCHAR *path ) -+{ -+ enum loadorder ret = LO_INVALID; -+ HANDLE std_key, app_key = 0; -+ WCHAR *module, *basename; -+ -+ if (!init_done) init_load_order(); -+ std_key = get_override_standard_key(); -+ if (app_name) app_key = get_override_app_key( app_name ); -+ -+ TRACE("looking up loadorder for %s\n", debugstr_w(path)); -+ -+ if (!(module = get_module_basename(path, &basename))) -+ return ret; - - /* first explicit module name */ - if ((ret = get_load_order_value( std_key, app_key, module+1 )) != LO_INVALID) -@@ -489,3 +596,46 @@ enum loadorder get_load_order( const WCHAR *app_name, const WCHAR *path ) - RtlFreeHeap( GetProcessHeap(), 0, module ); - return ret; - } -+ -+ -+/*************************************************************************** -+ * get_redirect (internal) -+ * -+ * Return the redirect value of a module. -+ * The system directory and '.dll' extension is stripped from the path. -+ */ -+WCHAR* get_redirect( const WCHAR *app_name, const WCHAR *path, BYTE *buffer, ULONG size ) -+{ -+ WCHAR *ret = NULL; -+ HANDLE std_key, app_key = 0; -+ WCHAR *module, *basename; -+ -+ std_key = get_redirect_standard_key(); -+ if (app_name) app_key = get_redirect_app_key( app_name ); -+ -+ TRACE("looking up redirection for %s\n", debugstr_w(path)); -+ -+ if (!(module = get_module_basename(path, &basename))) -+ return ret; -+ -+ /* first explicit module name */ -+ if ((ret = get_redirect_value( std_key, app_key, module+1, buffer, size ))) -+ goto done; -+ -+ /* then module basename preceded by '*' */ -+ basename[-1] = '*'; -+ if ((ret = get_redirect_value( std_key, app_key, basename-1, buffer, size ))) -+ goto done; -+ -+ /* then module basename without '*' (only if explicit path) */ -+ if (basename != module+1 && (ret = get_redirect_value( std_key, app_key, basename, buffer, size ))) -+ goto done; -+ -+ /* and last the hard-coded default */ -+ ret = NULL; -+ TRACE( "no redirection found for %s\n", debugstr_w(path) ); -+ -+ done: -+ RtlFreeHeap( GetProcessHeap(), 0, module ); -+ return ret; -+} -diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h -index cbd19db..e522464 100644 ---- a/dlls/ntdll/ntdll_misc.h -+++ b/dlls/ntdll/ntdll_misc.h -@@ -205,6 +205,7 @@ enum loadorder - }; - - extern enum loadorder get_load_order( const WCHAR *app_name, const WCHAR *path ) DECLSPEC_HIDDEN; -+extern WCHAR* get_redirect( const WCHAR *app_name, const WCHAR *path, BYTE *buffer, ULONG size ) DECLSPEC_HIDDEN; - - struct debug_info - { -diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c -index 6bc4fb3..b0024a0 100644 ---- a/dlls/winex11.drv/init.c -+++ b/dlls/winex11.drv/init.c -@@ -365,6 +365,7 @@ static INT X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_d - { - struct x11drv_escape_get_drawable *data = out_data; - data->drawable = physDev->drawable; -+ data->dc_rect = physDev->dc_rect; - return TRUE; - } - break; -diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h -index 2694d23..3e94b64 100644 ---- a/dlls/winex11.drv/x11drv.h -+++ b/dlls/winex11.drv/x11drv.h -@@ -292,6 +292,7 @@ struct x11drv_escape_get_drawable - Drawable drawable; /* X drawable */ - Drawable gl_drawable; /* GL drawable */ - int pixel_format; /* internal GL pixel format */ -+ RECT dc_rect; /* DC rectangle relative to drawable */ - }; - - struct x11drv_escape_flush_gl_drawable -diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in -index 7b52a69..c86fdd0 100644 ---- a/programs/winecfg/Makefile.in -+++ b/programs/winecfg/Makefile.in -@@ -11,6 +11,7 @@ C_SRCS = \ - driveui.c \ - libraries.c \ - main.c \ -+ staging.c \ - theme.c \ - winecfg.c \ - x11drvdlg.c -diff --git a/programs/winecfg/main.c b/programs/winecfg/main.c -index b8a85fe..de209a9 100644 ---- a/programs/winecfg/main.c -+++ b/programs/winecfg/main.c -@@ -58,7 +58,7 @@ PropSheetCallback (HWND hWnd, UINT uMsg, LPARAM lParam) - return 0; - } - --#define NUM_PROPERTY_PAGES 7 -+#define NUM_PROPERTY_PAGES 8 - - static INT_PTR - doPropertySheet (HINSTANCE hInstance, HWND hOwner) -@@ -139,6 +139,16 @@ doPropertySheet (HINSTANCE hInstance, HWND hOwner) - psp[pg].lParam = 0; - pg++; - -+ psp[pg].dwSize = sizeof (PROPSHEETPAGEW); -+ psp[pg].dwFlags = PSP_USETITLE; -+ psp[pg].hInstance = hInstance; -+ psp[pg].u.pszTemplate = MAKEINTRESOURCEW (IDD_STAGING); -+ psp[pg].u2.pszIcon = NULL; -+ psp[pg].pfnDlgProc = StagingDlgProc; -+ psp[pg].pszTitle = load_string (IDS_TAB_STAGING); -+ psp[pg].lParam = 0; -+ pg++; -+ - /* - * Fill out the (General) PROPSHEETPAGE data structure - * for the property sheet -diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h -index 8604fb4..201e5c3 100644 ---- a/programs/winecfg/resource.h -+++ b/programs/winecfg/resource.h -@@ -45,6 +45,7 @@ - #define IDS_SHELL_FOLDER 16 - #define IDS_LINKS_TO 17 - #define IDS_WINECFG_TITLE_APP 18 /* App specific title */ -+#define IDS_TAB_STAGING 19 - #define IDI_WINECFG 100 - #define IDI_LOGO 102 - #define IDD_ABOUTCFG 107 -@@ -54,6 +55,7 @@ - #define IDD_DLLCFG 111 - #define IDD_DRIVECFG 112 - #define IDD_DESKTOP_INTEGRATION 115 -+#define IDD_STAGING 116 - #define IDC_WINVER 1012 - #define IDC_DESKTOP_WIDTH 1023 - #define IDC_DESKTOP_HEIGHT 1024 -@@ -218,3 +220,6 @@ - #define IDC_ABT_TITLE_TEXT 8436 - #define IDC_ABT_WEB_LINK 8437 - #define IDC_ABT_LICENSE_TEXT 8438 -+ -+/* Staging tab */ -+#define IDC_ENABLE_NATIVE_D3D9 9001 -diff --git a/programs/winecfg/staging.c b/programs/winecfg/staging.c -new file mode 100644 -index 0000000..4a53815 ---- /dev/null -+++ b/programs/winecfg/staging.c -@@ -0,0 +1,93 @@ -+/* -+ * WineCfg Staging panel -+ * -+ * Copyright 2014 Michael Müller -+ * Copyright 2015 Sebastian Lackner -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA -+ * -+ */ -+ -+#define COBJMACROS -+ -+#include "config.h" -+ -+#include <windows.h> -+#include <wine/unicode.h> -+#include <wine/debug.h> -+ -+#include "resource.h" -+#include "winecfg.h" -+ -+WINE_DEFAULT_DEBUG_CHANNEL(winecfg); -+ -+/* -+ * Gallium nine -+ */ -+static BOOL nine_get(void) -+{ -+ BOOL ret; -+ char *value = get_reg_key(config_key, keypath("DllRedirects"), "d3d9", NULL); -+ ret = (value && !strcmp(value, "d3d9-nine.dll")); -+ HeapFree(GetProcessHeap(), 0, value); -+ return ret; -+} -+ -+static void nine_set(BOOL status) -+{ -+ set_reg_key(config_key, keypath("DllRedirects"), "d3d9", status ? "d3d9-nine.dll" : NULL); -+} -+ -+ -+static void load_staging_settings(HWND dialog) -+{ -+ CheckDlgButton(dialog, IDC_ENABLE_NATIVE_D3D9, nine_get() ? BST_CHECKED : BST_UNCHECKED); -+#if !defined(SONAME_D3DADAPTER9) -+ disable(IDC_ENABLE_NATIVE_D3D9); -+#endif -+} -+ -+INT_PTR CALLBACK StagingDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) -+{ -+ switch (uMsg) -+ { -+ case WM_INITDIALOG: -+ break; -+ -+ case WM_NOTIFY: -+ if (((LPNMHDR)lParam)->code == PSN_SETACTIVE) -+ load_staging_settings(hDlg); -+ break; -+ -+ case WM_SHOWWINDOW: -+ set_window_title(hDlg); -+ break; -+ -+ case WM_DESTROY: -+ break; -+ -+ case WM_COMMAND: -+ if (HIWORD(wParam) != BN_CLICKED) break; -+ switch (LOWORD(wParam)) -+ { -+ case IDC_ENABLE_NATIVE_D3D9: -+ nine_set(IsDlgButtonChecked(hDlg, IDC_ENABLE_NATIVE_D3D9) == BST_CHECKED); -+ SendMessageW(GetParent(hDlg), PSM_CHANGED, 0, 0); -+ return TRUE; -+ } -+ break; -+ } -+ return FALSE; -+} -diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h -index 110856a..a949474 100644 ---- a/programs/winecfg/winecfg.h -+++ b/programs/winecfg/winecfg.h -@@ -87,6 +87,7 @@ INT_PTR CALLBACK AppDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) - INT_PTR CALLBACK LibrariesDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); - INT_PTR CALLBACK AudioDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); - INT_PTR CALLBACK ThemeDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); -+INT_PTR CALLBACK StagingDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); - INT_PTR CALLBACK AboutDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); - - /* Drive management */ -diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc -index 221916b..ee4c55d 100644 ---- a/programs/winecfg/winecfg.rc -+++ b/programs/winecfg/winecfg.rc -@@ -39,6 +39,7 @@ BEGIN - IDS_TAB_GRAPHICS "Graphics" - IDS_TAB_DESKTOP_INTEGRATION "Desktop Integration" - IDS_TAB_AUDIO "Audio" -+ IDS_TAB_STAGING "Staging" - IDS_TAB_ABOUT "About" - IDS_WINECFG_TITLE "Wine configuration" - IDS_WINECFG_TITLE_APP "Wine configuration for %s" -@@ -308,6 +309,15 @@ BEGIN - PUSHBUTTON "B&rowse...",IDC_BROWSE_SFPATH,195,195,50,13,WS_DISABLED - END - -+IDD_STAGING DIALOG 0, 0, 260, 220 -+STYLE WS_CHILD | WS_DISABLED -+FONT 8, "MS Shell Dlg" -+BEGIN -+ GROUPBOX "Staging settings",IDC_STATIC,8,4,244,210 -+ LTEXT "The following settings are experimental and may break stuff!\nMake sure to reset them again in case of a problem.\nGallium Nine requires MESA graphic drivers and AMD/Nvidia GPU.\n",IDC_STATIC,16,16,230,24 -+ CONTROL "Enable &Gallium Nine for better D3D9 graphic performance.",IDC_ENABLE_NATIVE_D3D9,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,40,230,8 -+END -+ - LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - - /* @makedep: winecfg.ico */ diff --git a/app-emulation/wine/files/wine-gcc-4.9-null-pointer.patch b/app-emulation/wine/files/wine-gcc-4.9-null-pointer.patch deleted file mode 100644 index 213f2c6c..00000000 --- a/app-emulation/wine/files/wine-gcc-4.9-null-pointer.patch +++ /dev/null @@ -1,35 +0,0 @@ -From deb274226783ab886bdb44876944e156757efe2b Mon Sep 17 00:00:00 2001 -From: Daniel Beitler <dan@dablabs.com> -Date: Sun, 18 May 2014 13:27:42 -0400 -Subject: [PATCH] msi: Prevent call to memset with a null pointer in - get_tablecolumns function. - ---- - dlls/msi/table.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/dlls/msi/table.c b/dlls/msi/table.c -index 8012369..9ed9421 100644 ---- a/dlls/msi/table.c -+++ b/dlls/msi/table.c -@@ -671,7 +671,7 @@ static UINT get_tablecolumns( MSIDATABASE *db, LPCWSTR szTableName, MSICOLUMNINF - /* Note: _Columns table doesn't have non-persistent data */ - - /* if maxcount is non-zero, assume it's exactly right for this table */ -- memset( colinfo, 0, maxcount * sizeof(*colinfo) ); -+ if (colinfo) memset( colinfo, 0, maxcount * sizeof(*colinfo) ); - count = table->row_count; - for (i = 0; i < count; i++) - { -@@ -684,7 +684,7 @@ static UINT get_tablecolumns( MSIDATABASE *db, LPCWSTR szTableName, MSICOLUMNINF - /* check the column number is in range */ - if (col < 1 || col > maxcount) - { -- ERR("column %d out of range\n", col); -+ ERR("column %d out of range (maxcount: %d)\n", col, maxcount); - continue; - } - /* check if this column was already set */ --- -1.9.1 - diff --git a/app-emulation/wine/wine-1.7.55.ebuild b/app-emulation/wine/wine-1.7.55.ebuild deleted file mode 100644 index 4fe3f03d..00000000 --- a/app-emulation/wine/wine-1.7.55.ebuild +++ /dev/null @@ -1,446 +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 versionator - -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 - MAJOR_V=$(get_version_component_range 1-2) - SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}/${P}.tar.bz2" - KEYWORDS="amd64 x86" -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 )" -fi - -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos +d3d9 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 ) - d3d9? ( !staging ) - staging? ( !d3d9 ) - 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}] ) - d3d9? ( media-libs/mesa[d3d9] ) - 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 use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then - einfo "Checking for gcc-5 ms_abi compiler bug ..." - $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die - # Run in subshell to prevent "Aborted" message - if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then - eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0" - eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild," - eerror "or use gcc-config to select a different compiler version." - eerror "See https://bugs.gentoo.org/549768" - eerror - return 1 - fi - 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 -} - -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 ${P}.tar.bz2 - use staging && 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 $? - fi - if use d3d9; then - epatch ${FILESDIR}/${P}-d3d9.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' loader/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 d3d9 d3dadapter) - $(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 pulseaudio) - $(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) - ) - - 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/dev-vcs/git-cvs/Manifest b/dev-vcs/git-cvs/Manifest deleted file mode 100644 index 49e816ea..00000000 --- a/dev-vcs/git-cvs/Manifest +++ /dev/null @@ -1,28 +0,0 @@ -DIST git-2.2.1.tar.xz 3590808 SHA256 09422dc9a0bdddf6bdd5b8634c71e1ed3125256c47424e6a2687701e764ef450 SHA512 66bccfa617d2c8e2e61e5aac9b8daef9d4dc151b85906af252cadef3306ecf792ad6d7869deb149f0d04f6e7c3e9f71119bfeece5690e61782fb357e5384027b WHIRLPOOL f288d0227f3ad3045fd7dcc7a7fa6e68cb29c3a4d363d6648aa4f09aa5742a4496c67d63d0ad120a1f8f9420b9ae30930b8ffb3229f176cf429f8b8c8a1d06e6 -DIST git-2.2.2-Gentoo-patches.tar.gz 4605 SHA256 70613dd13269a919069deadda91e157928d4ea9ff3b3e54d7755552610275cd0 SHA512 cd7b27108a0cb9449c90c063d7506ae28004d95bc3379542adf77cd135345b591383b264398ede5d7ce946dca01cd064d30688ec6143588d969a1f9dfc896c8c WHIRLPOOL 1ecffa35d78eadda38a517f9c3b1e177e8a84541cabeba95ab670dfa9d8ada9a7f7817c592bd80e9e0b5993549d9e9c2c3325b2eda07a60164679b3048b1d403 -DIST git-2.2.2.tar.xz 3592264 SHA256 aa6d2efcc0c7bb9b9edc6d56d90921706b833972f1d2abe70f71be7838f22d05 SHA512 e3ca6f40de04ed940f521fff4c7e92446e40ad1627acc5b4c090ebf114dcf279d4b1f3efe1189ffa43192fce412165621fc12ea90e2f7d02a6a9ccda655dc69b WHIRLPOOL 9e20def83bbb9b11cb5982fc5f19b09767657ff80f02a237dff6ddaddd3209b4cfb9288bec1b6dc80c6a6db1869cfcaa90e2374279012fc8215771c1a58a1fc2 -DIST git-2.3.0.tar.xz 3608648 SHA256 94b23a14d66df536cfe7de37551f55acf908f8bddf30a0f5325a255bb57b0aca SHA512 4be85d3ba3ffac6c55cce648ab6c0a6fe89164e9657480aeee0def79289dbcba486722756b1729d0cedda6012cd582b88129d483ce916bfe06cde5a423f05bc7 WHIRLPOOL d08762cf37536a347aabb2916dce9d482313c41a180b5c440481d9574e9a6c482eb18e0055410171478010e647ae353d70f7113fa07fd8d74bb77909e327ea75 -DIST git-2.3.1.tar.xz 3609908 SHA256 1acc4b051576143eb41d80f5675476629588c7c5fb4e6a1dc2c4590f47c498b7 SHA512 f113a9e8c7f9879088de6fa6bfbe9363f25eac279d5eb218ea1f5186cd1c45609760f498a5c066196b3a6e15dd931960e94dcdc14685e8ef1c5c72524113c0cf WHIRLPOOL f1c15ded4f4785d244a5242c823fcf8d63d1c3408c1a1696c99926fdbcab76e23e40d3ee8225925e786ce8eae7597a73a7f9f6cd8e5f1ef7d599ac8b254f9951 -DIST git-2.4.0.tar.xz 3681516 SHA256 b33438dd94659958a74850aacae4a2b3a626baec36d7f29c266130b08045bb24 SHA512 0114c5d0dbfeed46e0ba1c8c0da463c52cae6954238547502f44d9050af0d921906beea96ff2c5f56a7c822200d9daa0f1d040f883c701b88a23ec81ac777138 WHIRLPOOL 1f4667b295e541d4f035de9e415636f317f590e104119a1b212cb321f25120df31e45ba88470ee883d1ea9a0033f2b307981c9d9e5807919475dbc5f81b6b22e -DIST git-2.4.2.tar.xz 3683880 SHA256 4801ec1cd8c2175b58cfdbc721d0bf50d74ae226f36905fceb894c2fb620c9e5 SHA512 0013069b73572fd764489222ad94cf94b9e08fc65223187a300e6662fb56b27dceea0b3a473cf8630793a5bf0c87e3b63264936bc38b66f71c6a548912540326 WHIRLPOOL 52d2fcd44c4da3f0e1f2caa229e1086b92022b992e410f3c20344f527f3cb9a623d3f0b6a8d5d66f3e4f43b9677f0211ebbaaffe85a621b784af1f5bc3f5896c -DIST git-2.4.4.tar.xz 3689492 SHA256 f873b15d42281474fcba5921295d01e48a3cd3cddcbeb3d60176bf30f5f30260 SHA512 b4d3401d1e4f40f74f8eb75194d1edf0107786b942cf5e3fd127e4a268ce31ec4954195519444cc84e34caca4569d6fd41edafa2037116f60320f2c59c6e7cdf WHIRLPOOL 6fd9d4076586f25154cb448315a1492ffe7acfa5bb811c54e342acc4fcf28da423ab0042f23aa579adefbefa6b3f5dc45c949a36744c94d5420780a2175bde85 -DIST git-2.4.6.tar.xz 3690432 SHA256 bdd944571c03474517b6c9941d6f1fd735eccbb164e59fd133d38644b69453b6 SHA512 2c95a00af81d6fbd8f4984e89d7cb23396caacadd684466aeb5a11f1b3acfbc625f832060cbef5aee0748e36c1fddcd88b3b9c26c4d7aec1d185e5f7311346ef WHIRLPOOL 1ae191666bf27a7e18686b910cbe610f85b5b7a43266232359615fa2a22b80bc659277b71b21394eab53df0c912d9ad911c7793c2a041cd6c7d768a5f0416f5b -DIST git-2.5.0.tar.xz 3740620 SHA256 cc59b1bac6c1c67a9159872863f6c5bbe0d9404cac2a85c3e9d9fa49923ce45c SHA512 ef7538c9f5ba5b2ac08962401c30e5fd51323b54b9fb5315d259adccec346e8fae9362815832dc2b5ce63a259b315c40e419bb2385dde04d84b992e62f6789b6 WHIRLPOOL 653e7aeb966dec44631bbd257a41935b2e957be9324311a4fd91f3a0ba6f1f674e2e59b4c564d70c4eeaea3788f0af9273a1d0a753b3bc820e687f0d63bddf5d -DIST git-htmldocs-2.2.1.tar.xz 975488 SHA256 dee32b06ecf26044169adf40d95cb301c4219416a65c94b89c6513a80f03863b SHA512 68843b883e2fd4f14646ff97ba9e5f3fd4de9f6bbf57a40e9c1bceb6578ebf497e50f2b808fdb4174966e26bf9ac068b44cfdf111652d15796f4f84a7406d336 WHIRLPOOL 771af06f8663eaaa6de4d117277ea05680671c6d72010653ad8e2b037b7a8d77b4a3733b6c48e4775971304b680d0df2596ed1cb4eedbf9948135912ac9509a3 -DIST git-htmldocs-2.2.2.tar.xz 976312 SHA256 41179ff0816189d583f290a227a73788002a319c7ff8c5cada970878c50b901d SHA512 b51b7d619e82d83b4f0b90d31bfccc30291a5beb48b2f5e5e59e75e91e5d772e89b560534a683648cd5480f4bf241f733efc87b30062ef5bb003bf0b5dbeed7f WHIRLPOOL c9dc7ac1a40559e4306d7d97a1619a272faf83d8b05c5a11f5f7b010566cd02fe853fee7eb550c6ccf744db446966a9696f9eb6feeee7ce4f976c6aa88b097d2 -DIST git-htmldocs-2.3.0.tar.xz 980936 SHA256 e8e202bae7a89f22a815e15753e9742f2e140b3c0ca548e9a831cfdbfad3a873 SHA512 c4d226784d89469c8faa72f29ab87594682ba46b1887769e29f87ce0db1ac241c9568a8b1530e6d28d43a9861acf803f93dddcc1db59cbe97e21d7b9e374c565 WHIRLPOOL 5bb37b7e7b317ffbf842616b00caad54d4594748726063d2b66c2ccc5fc125a88001506ddff63b15ebaccd7e8a96399bad383eec13dbd8bdc40d5cf7f8696e2b -DIST git-htmldocs-2.3.1.tar.xz 981748 SHA256 03bfc92c813a5cbbb34b61fdd7b9cf1226ad9b2b8388d24c649d915df3b93dad SHA512 da371b5a2b73a60681cd6f3b5385bee2668e0d617788194e454a531c2dab652c9b70920cb307858eb5ba15fd0c2d24635862e8f432946b0e9dfee8ee3fcb731a WHIRLPOOL 9334037067d797fd02ae0fd9f6d400ee14d68246755ac48e5897b404214923417728b04added2e05cb52cdc345b3ac9975752507e1e1278cedd74a33cac64b1b -DIST git-htmldocs-2.4.0.tar.xz 990744 SHA256 70ee1fdb70507c74832ac021e8940c8249d9b69f2b86aeaf0888ae41772e93a7 SHA512 03837e671a08f08ab7bd70676e234995b44a53ce27c648c50a6dd5ff97ba4400beb3d4b7874d6c8bde3a00624a7c2dc15d15299eb7ad9874d7dfd722f2c2256a WHIRLPOOL 4877dd0c5fb94f032d11d5d22a3e90e8352f68afb50400eca8c2f42e72adf40c7b9878c7998cacf16ed2011b85f965bcc5c44ecb3fd931783bd07b75b84b800b -DIST git-htmldocs-2.4.2.tar.xz 992192 SHA256 792cfc6c8236fdb58dfd66e39766c7b8097080361eed28443207bc6c36e07911 SHA512 e9790b698c50a09724ec9c71001a70f2a6a7094b72326f290f3b5c7b274181f331fdbb71cb4e2db9edf1229ae534a715b2974424b89d515b901b074bdeb30b66 WHIRLPOOL ef3de3704e7c0e34174b1e16f0837c52d9ce9d64c0f61c417a52811ca623ae17304a2b9d484457569d635a269b4dedb3e940bf0fa7d3db1bc4f744bf1d392ff1 -DIST git-htmldocs-2.4.4.tar.xz 994376 SHA256 e7f411f3eb3ecccc87e7d96afdcd8e72734a331170412eb37f240b731b2c2580 SHA512 1133dfa8a92358dbe6de35e22822b63bfbd418e8cd6290e1201738e5fc707fed1f50937d921f5323147cae75b89d452e8bd82768046685d7d2017dcd842766aa WHIRLPOOL 4684d5c4b7d8c7477ce658bd804280caab0721957786cb096a0acdf170e01a97d90eed7aca1d1f976ec79347cd9501c3ebed7ddf663ae785988e2abf36d9c054 -DIST git-htmldocs-2.4.6.tar.xz 994712 SHA256 5213e8b882293ec3cda247dabbc75c6ee5243b9d330a8fafec004952fae91a88 SHA512 782fbc38a611380c0af2631bd6123d568b02159fb46159c763d97d75bd84debe43105d83ac3f321cd8383e1334806857bce1a48563fd0c19b43f527fe18615a8 WHIRLPOOL 170e4ecc8255e6d5d562274e6e3fb75c2fc62e415586d61498b680a076c74248664fca35bb7c532009f7f22be4ad14d1fe047e14791991fa32373bd7053e0396 -DIST git-htmldocs-2.5.0.tar.xz 1008428 SHA256 0924b290834e2a361a489cbc845a9bf04e56117597dc9c1a40e879cce655e4e2 SHA512 921ae8dd482719912f79f5affb6fa239290a954fb40625ac9fae2edf902989e5126ae7ca5c367b2b55c5387fb3cc3035ddf4e8b360743dbdee0f1b55ec33653c WHIRLPOOL e355781b06fba48d9ada859fe6fb515ddbfbac5a1d5c0918e8570e4566f68d644456606b5b0eb8e3e4cdc7c8b27a96b72cc1907008dff567cae71f0953968843 -DIST git-manpages-2.2.1.tar.xz 369796 SHA256 00f8357fd8ab9e3b397dd087b20d405ed141765d04f3f2162e65fdec7cb1e538 SHA512 9fea3a61afa7336c7da9a4c9c130ed4dd05bb3b5b1cc7fe5a3953109085169d9fb92aafd2b932e6b66ad93ac46e3b60ea05c0f311a8178b53bc1c2184773ada5 WHIRLPOOL f5d1f4d47a2bc244beb3a343db37fe6898fc121310cd6bec0d3292a3352a3c86e16b3538b22317419c760870fb511120a3b03c7bc0585bfaa15c1c7418a4e8ac -DIST git-manpages-2.2.2.tar.xz 369876 SHA256 d30688bb62763bf1b87f5eaf4c0a66c68999e479ccd2963108a5f6f82138147c SHA512 5c2220bb09f199ad4fe5c1bc20a813a6c62daab5e6e7fa87bf24861d25b7f7e0fdde215c4f59d8895badd7c361ed202e7837de48d2d54a155d24759db39dd4e1 WHIRLPOOL 45acc45663f13faf5b8197516bb934723bf84cd6db929443e2bd9fc3a915baf258ee93e782741e088a5f799115ea4ee6043225fc9ea9ec954feed21ba54c9be4 -DIST git-manpages-2.3.0.tar.xz 370864 SHA256 1641d4fb67159961b4c295d2d5a05954bae19ebcaaa67728b6d72b70020b7842 SHA512 aa54b9fd96831a690848ef6df708d45999f03bc45aab3600bf578c998bbb225f54a8999ee5012996cb9d6f28d0d18c97209329cfba557b86d3dd0da7a23b1c1b WHIRLPOOL 817db829cd9e9eba93dc537531fd861278baa410d5a9aca09b2010f299d87c744b8a20d707052c6f8d470a5be74dba7a3bba3d20390915cc2a3eed47e84acb75 -DIST git-manpages-2.3.1.tar.xz 370756 SHA256 c58b033af1b26baba78ffc940f4f5a0f16c3491a3f5708375d0bcf0d8031a940 SHA512 391ecf5e38921c9494b5f94e8f59d62f509934d1ef10f3b582632255a2bc62cbc894aa1bcd3018eb619516c1834b95bf7acbab6d73f859dbdcab094588fd4b61 WHIRLPOOL 01ed334a73bbb57c977e7f96fd63a7196b88be5560166df78c7250aa98e04dd48558a9775ddffba34d7c23318bc7d89eb53d06fae38b027349cdaabd39f107f2 -DIST git-manpages-2.4.0.tar.xz 372716 SHA256 b616dc6aa02dcac312e6aeae7af148913f76e1f851ba03ba340b4d2db316ecc7 SHA512 158bff66b9f73fc72d3ac6ac3246bebf831551c0ff1e9571913b952f5b891407ab4408ca2daa247869e50d43bb2e951eed6fdb3c39708c769630bbfc618f0efb WHIRLPOOL afed2ad93d6cf3deb571839d268a9aea66d4c2c8571b85a377a6ecd866df8ec8d07d22b65ddb9bc49ec7f16f8c9ecc54e936cd35325f2270264ae8d42e708b01 -DIST git-manpages-2.4.2.tar.xz 372804 SHA256 1b1830e804725e90ff319d801ab25f84ad956564379ef976bdc91bd58b743c32 SHA512 52f28cd537fc9fd34acad8834aa05d7d758e2f639df18b978effb676d5dbb660c99764075eb216c6377adb14b0b2d58584c8b3f635442bd4ded36a31b8757dc4 WHIRLPOOL f30b9293aa594111ce4baa46fee474b114199cc691ae43dea565a346f8ad7eb2cd72574bd6ddf9d5b32af020ad6032778cef3610ccac74d0f94be965b335962f -DIST git-manpages-2.4.4.tar.xz 373400 SHA256 4bf125ece40f33872c6d9ccd6d83ec0068de5216b4075eaee78e39d46b08c351 SHA512 548bebf0843beaa3b4962ddb711e002904b940e820815717959a2ada2fd0b2489b5f6112debd5192c47d18c867fc9c7c4fcb2fb219d7ce39356b7807d236c2a3 WHIRLPOOL 2be153a1f04da7062a1fef114fc77ceb35ade4fe773c3777c5469bf0803044022a6dbfd8a7fb16c2c051126142166bad7d9b22fe8b32bdf6c934a74337e4c413 -DIST git-manpages-2.4.6.tar.xz 373408 SHA256 f32d267bdaab75812dbd116d2b329d6dc7287a974e929e380e8cbf96e3822b8e SHA512 fa0562b8cc3e0421f7b45940f8cd4b58a5e58a1eb8571e2de85babf8ffd932fd210baa82aefe3c6090cb7dc51f64f299143be51beaacb37be97832b4a8e2a869 WHIRLPOOL 595beed93c621ffd9b7e0b507fc2941156975190eca8b638826ac32b6ea761bbb08f05e152dc88a7a3dbd168ab083a0128d61e72fae51cd0e94a8c91a1adb3ee -DIST git-manpages-2.5.0.tar.xz 377856 SHA256 1a6ea7220b1693eb384af0978a990ea8c0c634a7869d1ef63a2c8e427fc7f6ea SHA512 b3a5f2e8107c529ce81c1570a82472195e205ff1a8ddc75f4f0cbbf25f37a916700156df4418888c8a8a153ab58d5507a31027fb31faadeb5d4ba242847ab28d WHIRLPOOL 09f13622fff6a2b04a8ad584dab54c0b17cbfc6e803ca9e2deadab18071e50b50b37e395bb4746aff2e013f5b0025f8cdb1d439d8e6f3a659fad32646b30f4c7 diff --git a/dev-vcs/git-cvs/git-cvs-2.2.1.ebuild b/dev-vcs/git-cvs/git-cvs-2.2.1.ebuild deleted file mode 100644 index 7089d233..00000000 --- a/dev-vcs/git-cvs/git-cvs-2.2.1.ebuild +++ /dev/null @@ -1,234 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -GENTOO_DEPEND_ON_PERL=no - -PYTHON_COMPAT=( python2_{6,7} ) -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_MASTER=pu - -KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.1-Gentoo-patches.tar.gz" ) -inherit kog-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_PN="${PN/-cvs}" -MY_P="${MY_PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="CVS module for GIT, the stupid content tracker" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_GOOG="http://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI+=" ${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - KEYWORDS="~amd64 ~x86" -else - #SRC_URI="" - KEYWORDS="" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="doc" - -RDEPEND="~dev-vcs/git-${PV}[-cvs,perl] - dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite - ${PYTHON_DEPS}" -DEPEND="app-arch/cpio - dev-lang/perl:=[-build(-)] - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - app-text/xmlto - )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc" -fi - -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} -" - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - # broken assumptions, because of broken build system ... - myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts="${myopts} INSTALL=install TAR=tar" - myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh" - myopts="${myopts} SANE_TOOL_PATH=" - myopts="${myopts} OLD_ICONV=" - myopts="${myopts} NO_EXTERNAL_GREP=" - - # split ebuild: avoid collisions with dev-vcs/git's .mo files - myopts="${myopts} NO_GETTEXT=YesPlease" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - myopts="${myopts} INSTALLDIRS=vendor" - myopts="${myopts} NO_SVN_TESTS=YesPlease" - - has_version '>=app-text/asciidoc-8.0' \ - && myopts="${myopts} ASCIIDOC8=YesPlease" - myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts="${myopts} NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - unpack ${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - use doc && \ - cd "${S}"/Documentation && \ - unpack ${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - fi - - kog-patches_unpack -} - -src_prepare() { - # see the git ebuild for the list of patches - kog-patches_apply_all - - epatch_user - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die "sed failed" - - # Fix docbook2texi command - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - V=1 \ - "$@" - # This is the fix for bug #326625, but it also causes breakage, see bug - # #352693. - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ -} - -src_configure() { - exportmakeopts -} - -src_compile() { - #if use perl ; then - git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" - git_emake perl/perl.mak || die "emake perl/perl.mak failed" - #fi - git_emake || die "emake failed" - - cd "${S}"/Documentation - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi -} - -src_install() { - git_emake install || die "make install failed" - - rm -rf "${ED}"usr/share/gitweb || die - rm -rf "${ED}"usr/share/git-core/templates || die - rm -rf "${ED}"usr/share/git-gui || die - rm -rf "${ED}"usr/share/gitk || die - - local myrelfile="" - for myfile in "${ED}"usr/libexec/git-core/* "${ED}"usr/$(get_libdir)/* "${ED}"usr/share/man/*/* "${ED}"usr/bin/* ; do - # image dir contains the keyword "cvs" - myrelfile="${myfile/${ED}}" - case "${myrelfile}" in - *cvs*) - true ;; - *) - rm -rf "${myfile}" || die ;; - esac - done - - local libdir="${ED}"usr/$(get_libdir) - if [ -d "${libdir}" ]; then - # must be empty - rmdir "${libdir}" || die - fi - - doman man*/*cvs* || die - if use doc; then - docinto / - dodoc Documentation/*cvs*.txt - dohtml -p / Documentation/*cvs*.html - fi - - # kill empty dirs from ${ED} - find "${ED}" -type d -empty -delete || die -} diff --git a/dev-vcs/git-cvs/git-cvs-2.2.2.ebuild b/dev-vcs/git-cvs/git-cvs-2.2.2.ebuild deleted file mode 100644 index d447893a..00000000 --- a/dev-vcs/git-cvs/git-cvs-2.2.2.ebuild +++ /dev/null @@ -1,231 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -GENTOO_DEPEND_ON_PERL=no - -PYTHON_COMPAT=( python2_{6,7} ) -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_MASTER=pu - -KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit kog-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_PN="${PN/-cvs}" -MY_P="${MY_PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="CVS module for GIT, the stupid content tracker" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_GOOG="http://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI+=" ${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="doc" - -RDEPEND="~dev-vcs/git-${PV}[-cvs,perl] - dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite - ${PYTHON_DEPS}" -DEPEND="app-arch/cpio - dev-lang/perl:=[-build(-)] - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - app-text/xmlto - )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc" -fi - -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} -" - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - # broken assumptions, because of broken build system ... - myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts+=" INSTALL=install TAR=tar" - myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" - myopts+=" SANE_TOOL_PATH=" - myopts+=" OLD_ICONV=" - myopts+=" NO_EXTERNAL_GREP=" - - # split ebuild: avoid collisions with dev-vcs/git's .mo files - myopts+=" NO_GETTEXT=YesPlease" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - myopts+=" INSTALLDIRS=vendor" - myopts+=" NO_SVN_TESTS=YesPlease" - - has_version '>=app-text/asciidoc-8.0' \ - && myopts+=" ASCIIDOC8=YesPlease" - myopts+=" ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts+=" NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - unpack ${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - use doc && \ - cd "${S}"/Documentation && \ - unpack ${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - fi - - kog-patches_unpack -} - -src_prepare() { - # see the git ebuild for the list of patches - kog-patches_apply_all - - epatch_user - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die "sed failed" - - # Fix docbook2texi command - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - V=1 \ - "$@" - # This is the fix for bug #326625, but it also causes breakage, see bug - # #352693. - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ -} - -src_configure() { - exportmakeopts -} - -src_compile() { - #if use perl ; then - git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" - git_emake perl/perl.mak || die "emake perl/perl.mak failed" - #fi - git_emake || die "emake failed" - - cd "${S}"/Documentation - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi -} - -src_install() { - git_emake install || die "make install failed" - - rm -rf "${ED}"usr/share/gitweb || die - rm -rf "${ED}"usr/share/git-core/templates || die - rm -rf "${ED}"usr/share/git-gui || die - rm -rf "${ED}"usr/share/gitk || die - - local myrelfile="" - for myfile in "${ED}"usr/libexec/git-core/* "${ED}"usr/$(get_libdir)/* "${ED}"usr/share/man/*/* "${ED}"usr/bin/* ; do - # image dir contains the keyword "cvs" - myrelfile="${myfile/${ED}}" - case "${myrelfile}" in - *cvs*) - true ;; - *) - rm -rf "${myfile}" || die ;; - esac - done - - local libdir="${ED}"usr/$(get_libdir) - if [ -d "${libdir}" ]; then - # must be empty - rmdir "${libdir}" || die - fi - - doman man*/*cvs* || die - if use doc; then - docinto / - dodoc Documentation/*cvs*.txt - dohtml -p / Documentation/*cvs*.html - fi - - # kill empty dirs from ${ED} - find "${ED}" -type d -empty -delete || die -} diff --git a/dev-vcs/git-cvs/git-cvs-2.3.0.ebuild b/dev-vcs/git-cvs/git-cvs-2.3.0.ebuild deleted file mode 100644 index d447893a..00000000 --- a/dev-vcs/git-cvs/git-cvs-2.3.0.ebuild +++ /dev/null @@ -1,231 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -GENTOO_DEPEND_ON_PERL=no - -PYTHON_COMPAT=( python2_{6,7} ) -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_MASTER=pu - -KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit kog-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_PN="${PN/-cvs}" -MY_P="${MY_PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="CVS module for GIT, the stupid content tracker" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_GOOG="http://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI+=" ${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="doc" - -RDEPEND="~dev-vcs/git-${PV}[-cvs,perl] - dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite - ${PYTHON_DEPS}" -DEPEND="app-arch/cpio - dev-lang/perl:=[-build(-)] - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - app-text/xmlto - )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc" -fi - -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} -" - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - # broken assumptions, because of broken build system ... - myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts+=" INSTALL=install TAR=tar" - myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" - myopts+=" SANE_TOOL_PATH=" - myopts+=" OLD_ICONV=" - myopts+=" NO_EXTERNAL_GREP=" - - # split ebuild: avoid collisions with dev-vcs/git's .mo files - myopts+=" NO_GETTEXT=YesPlease" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - myopts+=" INSTALLDIRS=vendor" - myopts+=" NO_SVN_TESTS=YesPlease" - - has_version '>=app-text/asciidoc-8.0' \ - && myopts+=" ASCIIDOC8=YesPlease" - myopts+=" ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts+=" NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - unpack ${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - use doc && \ - cd "${S}"/Documentation && \ - unpack ${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - fi - - kog-patches_unpack -} - -src_prepare() { - # see the git ebuild for the list of patches - kog-patches_apply_all - - epatch_user - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die "sed failed" - - # Fix docbook2texi command - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - V=1 \ - "$@" - # This is the fix for bug #326625, but it also causes breakage, see bug - # #352693. - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ -} - -src_configure() { - exportmakeopts -} - -src_compile() { - #if use perl ; then - git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" - git_emake perl/perl.mak || die "emake perl/perl.mak failed" - #fi - git_emake || die "emake failed" - - cd "${S}"/Documentation - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi -} - -src_install() { - git_emake install || die "make install failed" - - rm -rf "${ED}"usr/share/gitweb || die - rm -rf "${ED}"usr/share/git-core/templates || die - rm -rf "${ED}"usr/share/git-gui || die - rm -rf "${ED}"usr/share/gitk || die - - local myrelfile="" - for myfile in "${ED}"usr/libexec/git-core/* "${ED}"usr/$(get_libdir)/* "${ED}"usr/share/man/*/* "${ED}"usr/bin/* ; do - # image dir contains the keyword "cvs" - myrelfile="${myfile/${ED}}" - case "${myrelfile}" in - *cvs*) - true ;; - *) - rm -rf "${myfile}" || die ;; - esac - done - - local libdir="${ED}"usr/$(get_libdir) - if [ -d "${libdir}" ]; then - # must be empty - rmdir "${libdir}" || die - fi - - doman man*/*cvs* || die - if use doc; then - docinto / - dodoc Documentation/*cvs*.txt - dohtml -p / Documentation/*cvs*.html - fi - - # kill empty dirs from ${ED} - find "${ED}" -type d -empty -delete || die -} diff --git a/dev-vcs/git-cvs/git-cvs-2.3.1.ebuild b/dev-vcs/git-cvs/git-cvs-2.3.1.ebuild deleted file mode 100644 index d447893a..00000000 --- a/dev-vcs/git-cvs/git-cvs-2.3.1.ebuild +++ /dev/null @@ -1,231 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -GENTOO_DEPEND_ON_PERL=no - -PYTHON_COMPAT=( python2_{6,7} ) -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_MASTER=pu - -KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit kog-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_PN="${PN/-cvs}" -MY_P="${MY_PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="CVS module for GIT, the stupid content tracker" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_GOOG="http://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI+=" ${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="doc" - -RDEPEND="~dev-vcs/git-${PV}[-cvs,perl] - dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite - ${PYTHON_DEPS}" -DEPEND="app-arch/cpio - dev-lang/perl:=[-build(-)] - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - app-text/xmlto - )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc" -fi - -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} -" - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - # broken assumptions, because of broken build system ... - myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts+=" INSTALL=install TAR=tar" - myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" - myopts+=" SANE_TOOL_PATH=" - myopts+=" OLD_ICONV=" - myopts+=" NO_EXTERNAL_GREP=" - - # split ebuild: avoid collisions with dev-vcs/git's .mo files - myopts+=" NO_GETTEXT=YesPlease" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - myopts+=" INSTALLDIRS=vendor" - myopts+=" NO_SVN_TESTS=YesPlease" - - has_version '>=app-text/asciidoc-8.0' \ - && myopts+=" ASCIIDOC8=YesPlease" - myopts+=" ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts+=" NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - unpack ${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - use doc && \ - cd "${S}"/Documentation && \ - unpack ${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - fi - - kog-patches_unpack -} - -src_prepare() { - # see the git ebuild for the list of patches - kog-patches_apply_all - - epatch_user - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die "sed failed" - - # Fix docbook2texi command - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - V=1 \ - "$@" - # This is the fix for bug #326625, but it also causes breakage, see bug - # #352693. - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ -} - -src_configure() { - exportmakeopts -} - -src_compile() { - #if use perl ; then - git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" - git_emake perl/perl.mak || die "emake perl/perl.mak failed" - #fi - git_emake || die "emake failed" - - cd "${S}"/Documentation - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi -} - -src_install() { - git_emake install || die "make install failed" - - rm -rf "${ED}"usr/share/gitweb || die - rm -rf "${ED}"usr/share/git-core/templates || die - rm -rf "${ED}"usr/share/git-gui || die - rm -rf "${ED}"usr/share/gitk || die - - local myrelfile="" - for myfile in "${ED}"usr/libexec/git-core/* "${ED}"usr/$(get_libdir)/* "${ED}"usr/share/man/*/* "${ED}"usr/bin/* ; do - # image dir contains the keyword "cvs" - myrelfile="${myfile/${ED}}" - case "${myrelfile}" in - *cvs*) - true ;; - *) - rm -rf "${myfile}" || die ;; - esac - done - - local libdir="${ED}"usr/$(get_libdir) - if [ -d "${libdir}" ]; then - # must be empty - rmdir "${libdir}" || die - fi - - doman man*/*cvs* || die - if use doc; then - docinto / - dodoc Documentation/*cvs*.txt - dohtml -p / Documentation/*cvs*.html - fi - - # kill empty dirs from ${ED} - find "${ED}" -type d -empty -delete || die -} diff --git a/dev-vcs/git-cvs/git-cvs-2.4.0.ebuild b/dev-vcs/git-cvs/git-cvs-2.4.0.ebuild deleted file mode 100644 index ef80e1fb..00000000 --- a/dev-vcs/git-cvs/git-cvs-2.4.0.ebuild +++ /dev/null @@ -1,232 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -GENTOO_DEPEND_ON_PERL=no - -PYTHON_COMPAT=( python2_7 ) -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_MASTER=pu - -KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit kog-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_PN="${PN/-cvs}" -MY_P="${MY_PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="CVS module for GIT, the stupid content tracker" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_GOOG="http://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - KEYWORDS="~amd64 ~x86" -fi - -kog-patches_update_SRC_URI - -LICENSE="GPL-2" -SLOT="0" -IUSE="doc" - -RDEPEND="~dev-vcs/git-${PV}[-cvs,perl] - dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite - ${PYTHON_DEPS}" -DEPEND="dev-lang/perl:=[-build(-)] - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - app-text/xmlto - )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc" -fi - -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} -" - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - # broken assumptions, because of broken build system ... - myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts+=" INSTALL=install TAR=tar" - myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" - myopts+=" SANE_TOOL_PATH=" - myopts+=" OLD_ICONV=" - myopts+=" NO_EXTERNAL_GREP=" - - # split ebuild: avoid collisions with dev-vcs/git's .mo files - myopts+=" NO_GETTEXT=YesPlease" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - myopts+=" INSTALLDIRS=vendor" - myopts+=" NO_SVN_TESTS=YesPlease" - - has_version '>=app-text/asciidoc-8.0' \ - && myopts+=" ASCIIDOC8=YesPlease" - myopts+=" ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts+=" NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - unpack ${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - use doc && \ - cd "${S}"/Documentation && \ - unpack ${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - fi - - kog-patches_unpack -} - -src_prepare() { - # see the git ebuild for the list of patches - kog-patches_apply_all - - epatch_user - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die "sed failed" - - # Fix docbook2texi command - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - V=1 \ - "$@" - # This is the fix for bug #326625, but it also causes breakage, see bug - # #352693. - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ -} - -src_configure() { - exportmakeopts -} - -src_compile() { - #if use perl ; then - git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" - git_emake perl/perl.mak || die "emake perl/perl.mak failed" - #fi - git_emake || die "emake failed" - - cd "${S}"/Documentation - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi -} - -src_install() { - git_emake install || die "make install failed" - - rm -rf "${ED}"usr/share/gitweb || die - rm -rf "${ED}"usr/share/git-core/templates || die - rm -rf "${ED}"usr/share/git-gui || die - rm -rf "${ED}"usr/share/gitk || die - - local myrelfile="" - for myfile in "${ED}"usr/libexec/git-core/* "${ED}"usr/$(get_libdir)/* "${ED}"usr/share/man/*/* "${ED}"usr/bin/* ; do - # image dir contains the keyword "cvs" - myrelfile="${myfile/${ED}}" - case "${myrelfile}" in - *cvs*) - true ;; - *) - rm -rf "${myfile}" || die ;; - esac - done - - local libdir="${ED}"usr/$(get_libdir) - if [ -d "${libdir}" ]; then - # must be empty - rmdir "${libdir}" || die - fi - - doman man*/*cvs* || die - if use doc; then - docinto / - dodoc Documentation/*cvs*.txt - dohtml -p / Documentation/*cvs*.html - fi - - # kill empty dirs from ${ED} - find "${ED}" -type d -empty -delete || die -} diff --git a/dev-vcs/git-cvs/git-cvs-2.4.2.ebuild b/dev-vcs/git-cvs/git-cvs-2.4.2.ebuild deleted file mode 100644 index ef80e1fb..00000000 --- a/dev-vcs/git-cvs/git-cvs-2.4.2.ebuild +++ /dev/null @@ -1,232 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -GENTOO_DEPEND_ON_PERL=no - -PYTHON_COMPAT=( python2_7 ) -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_MASTER=pu - -KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit kog-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_PN="${PN/-cvs}" -MY_P="${MY_PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="CVS module for GIT, the stupid content tracker" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_GOOG="http://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - KEYWORDS="~amd64 ~x86" -fi - -kog-patches_update_SRC_URI - -LICENSE="GPL-2" -SLOT="0" -IUSE="doc" - -RDEPEND="~dev-vcs/git-${PV}[-cvs,perl] - dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite - ${PYTHON_DEPS}" -DEPEND="dev-lang/perl:=[-build(-)] - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - app-text/xmlto - )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc" -fi - -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} -" - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - # broken assumptions, because of broken build system ... - myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts+=" INSTALL=install TAR=tar" - myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" - myopts+=" SANE_TOOL_PATH=" - myopts+=" OLD_ICONV=" - myopts+=" NO_EXTERNAL_GREP=" - - # split ebuild: avoid collisions with dev-vcs/git's .mo files - myopts+=" NO_GETTEXT=YesPlease" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - myopts+=" INSTALLDIRS=vendor" - myopts+=" NO_SVN_TESTS=YesPlease" - - has_version '>=app-text/asciidoc-8.0' \ - && myopts+=" ASCIIDOC8=YesPlease" - myopts+=" ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts+=" NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - unpack ${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - use doc && \ - cd "${S}"/Documentation && \ - unpack ${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - fi - - kog-patches_unpack -} - -src_prepare() { - # see the git ebuild for the list of patches - kog-patches_apply_all - - epatch_user - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die "sed failed" - - # Fix docbook2texi command - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - V=1 \ - "$@" - # This is the fix for bug #326625, but it also causes breakage, see bug - # #352693. - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ -} - -src_configure() { - exportmakeopts -} - -src_compile() { - #if use perl ; then - git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" - git_emake perl/perl.mak || die "emake perl/perl.mak failed" - #fi - git_emake || die "emake failed" - - cd "${S}"/Documentation - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi -} - -src_install() { - git_emake install || die "make install failed" - - rm -rf "${ED}"usr/share/gitweb || die - rm -rf "${ED}"usr/share/git-core/templates || die - rm -rf "${ED}"usr/share/git-gui || die - rm -rf "${ED}"usr/share/gitk || die - - local myrelfile="" - for myfile in "${ED}"usr/libexec/git-core/* "${ED}"usr/$(get_libdir)/* "${ED}"usr/share/man/*/* "${ED}"usr/bin/* ; do - # image dir contains the keyword "cvs" - myrelfile="${myfile/${ED}}" - case "${myrelfile}" in - *cvs*) - true ;; - *) - rm -rf "${myfile}" || die ;; - esac - done - - local libdir="${ED}"usr/$(get_libdir) - if [ -d "${libdir}" ]; then - # must be empty - rmdir "${libdir}" || die - fi - - doman man*/*cvs* || die - if use doc; then - docinto / - dodoc Documentation/*cvs*.txt - dohtml -p / Documentation/*cvs*.html - fi - - # kill empty dirs from ${ED} - find "${ED}" -type d -empty -delete || die -} diff --git a/dev-vcs/git-cvs/git-cvs-2.4.4.ebuild b/dev-vcs/git-cvs/git-cvs-2.4.4.ebuild deleted file mode 100644 index 886a7453..00000000 --- a/dev-vcs/git-cvs/git-cvs-2.4.4.ebuild +++ /dev/null @@ -1,232 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -GENTOO_DEPEND_ON_PERL=no - -PYTHON_COMPAT=( python2_7 ) -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_MASTER=pu - -KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit kog-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_PN="${PN/-cvs}" -MY_P="${MY_PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="CVS module for GIT, the stupid content tracker" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_GOOG="http://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - KEYWORDS="amd64 x86" -fi - -kog-patches_update_SRC_URI - -LICENSE="GPL-2" -SLOT="0" -IUSE="doc" - -RDEPEND="~dev-vcs/git-${PV}[-cvs,perl] - dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite - ${PYTHON_DEPS}" -DEPEND="dev-lang/perl:=[-build(-)] - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - app-text/xmlto - )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc" -fi - -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} -" - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - # broken assumptions, because of broken build system ... - myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts+=" INSTALL=install TAR=tar" - myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" - myopts+=" SANE_TOOL_PATH=" - myopts+=" OLD_ICONV=" - myopts+=" NO_EXTERNAL_GREP=" - - # split ebuild: avoid collisions with dev-vcs/git's .mo files - myopts+=" NO_GETTEXT=YesPlease" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - myopts+=" INSTALLDIRS=vendor" - myopts+=" NO_SVN_TESTS=YesPlease" - - has_version '>=app-text/asciidoc-8.0' \ - && myopts+=" ASCIIDOC8=YesPlease" - myopts+=" ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts+=" NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - unpack ${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - use doc && \ - cd "${S}"/Documentation && \ - unpack ${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - fi - - kog-patches_unpack -} - -src_prepare() { - # see the git ebuild for the list of patches - kog-patches_apply_all - - epatch_user - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die "sed failed" - - # Fix docbook2texi command - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - V=1 \ - "$@" - # This is the fix for bug #326625, but it also causes breakage, see bug - # #352693. - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ -} - -src_configure() { - exportmakeopts -} - -src_compile() { - #if use perl ; then - git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" - git_emake perl/perl.mak || die "emake perl/perl.mak failed" - #fi - git_emake || die "emake failed" - - cd "${S}"/Documentation - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi -} - -src_install() { - git_emake install || die "make install failed" - - rm -rf "${ED}"usr/share/gitweb || die - rm -rf "${ED}"usr/share/git-core/templates || die - rm -rf "${ED}"usr/share/git-gui || die - rm -rf "${ED}"usr/share/gitk || die - - local myrelfile="" - for myfile in "${ED}"usr/libexec/git-core/* "${ED}"usr/$(get_libdir)/* "${ED}"usr/share/man/*/* "${ED}"usr/bin/* ; do - # image dir contains the keyword "cvs" - myrelfile="${myfile/${ED}}" - case "${myrelfile}" in - *cvs*) - true ;; - *) - rm -rf "${myfile}" || die ;; - esac - done - - local libdir="${ED}"usr/$(get_libdir) - if [ -d "${libdir}" ]; then - # must be empty - rmdir "${libdir}" || die - fi - - doman man*/*cvs* || die - if use doc; then - docinto / - dodoc Documentation/*cvs*.txt - dohtml -p / Documentation/*cvs*.html - fi - - # kill empty dirs from ${ED} - find "${ED}" -type d -empty -delete || die -} diff --git a/dev-vcs/git-cvs/git-cvs-2.4.6.ebuild b/dev-vcs/git-cvs/git-cvs-2.4.6.ebuild deleted file mode 100644 index ef80e1fb..00000000 --- a/dev-vcs/git-cvs/git-cvs-2.4.6.ebuild +++ /dev/null @@ -1,232 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -GENTOO_DEPEND_ON_PERL=no - -PYTHON_COMPAT=( python2_7 ) -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_MASTER=pu - -KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit kog-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_PN="${PN/-cvs}" -MY_P="${MY_PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="CVS module for GIT, the stupid content tracker" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_GOOG="http://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - KEYWORDS="~amd64 ~x86" -fi - -kog-patches_update_SRC_URI - -LICENSE="GPL-2" -SLOT="0" -IUSE="doc" - -RDEPEND="~dev-vcs/git-${PV}[-cvs,perl] - dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite - ${PYTHON_DEPS}" -DEPEND="dev-lang/perl:=[-build(-)] - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - app-text/xmlto - )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc" -fi - -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} -" - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - # broken assumptions, because of broken build system ... - myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts+=" INSTALL=install TAR=tar" - myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" - myopts+=" SANE_TOOL_PATH=" - myopts+=" OLD_ICONV=" - myopts+=" NO_EXTERNAL_GREP=" - - # split ebuild: avoid collisions with dev-vcs/git's .mo files - myopts+=" NO_GETTEXT=YesPlease" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - myopts+=" INSTALLDIRS=vendor" - myopts+=" NO_SVN_TESTS=YesPlease" - - has_version '>=app-text/asciidoc-8.0' \ - && myopts+=" ASCIIDOC8=YesPlease" - myopts+=" ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts+=" NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - unpack ${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - use doc && \ - cd "${S}"/Documentation && \ - unpack ${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - fi - - kog-patches_unpack -} - -src_prepare() { - # see the git ebuild for the list of patches - kog-patches_apply_all - - epatch_user - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die "sed failed" - - # Fix docbook2texi command - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - V=1 \ - "$@" - # This is the fix for bug #326625, but it also causes breakage, see bug - # #352693. - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ -} - -src_configure() { - exportmakeopts -} - -src_compile() { - #if use perl ; then - git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" - git_emake perl/perl.mak || die "emake perl/perl.mak failed" - #fi - git_emake || die "emake failed" - - cd "${S}"/Documentation - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi -} - -src_install() { - git_emake install || die "make install failed" - - rm -rf "${ED}"usr/share/gitweb || die - rm -rf "${ED}"usr/share/git-core/templates || die - rm -rf "${ED}"usr/share/git-gui || die - rm -rf "${ED}"usr/share/gitk || die - - local myrelfile="" - for myfile in "${ED}"usr/libexec/git-core/* "${ED}"usr/$(get_libdir)/* "${ED}"usr/share/man/*/* "${ED}"usr/bin/* ; do - # image dir contains the keyword "cvs" - myrelfile="${myfile/${ED}}" - case "${myrelfile}" in - *cvs*) - true ;; - *) - rm -rf "${myfile}" || die ;; - esac - done - - local libdir="${ED}"usr/$(get_libdir) - if [ -d "${libdir}" ]; then - # must be empty - rmdir "${libdir}" || die - fi - - doman man*/*cvs* || die - if use doc; then - docinto / - dodoc Documentation/*cvs*.txt - dohtml -p / Documentation/*cvs*.html - fi - - # kill empty dirs from ${ED} - find "${ED}" -type d -empty -delete || die -} diff --git a/dev-vcs/git-cvs/git-cvs-2.5.0.ebuild b/dev-vcs/git-cvs/git-cvs-2.5.0.ebuild deleted file mode 100644 index ef80e1fb..00000000 --- a/dev-vcs/git-cvs/git-cvs-2.5.0.ebuild +++ /dev/null @@ -1,232 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -GENTOO_DEPEND_ON_PERL=no - -PYTHON_COMPAT=( python2_7 ) -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_MASTER=pu - -KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit kog-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_PN="${PN/-cvs}" -MY_P="${MY_PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="CVS module for GIT, the stupid content tracker" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_GOOG="http://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - KEYWORDS="~amd64 ~x86" -fi - -kog-patches_update_SRC_URI - -LICENSE="GPL-2" -SLOT="0" -IUSE="doc" - -RDEPEND="~dev-vcs/git-${PV}[-cvs,perl] - dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite - ${PYTHON_DEPS}" -DEPEND="dev-lang/perl:=[-build(-)] - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - app-text/xmlto - )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc" -fi - -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} -" - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - # broken assumptions, because of broken build system ... - myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts+=" INSTALL=install TAR=tar" - myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" - myopts+=" SANE_TOOL_PATH=" - myopts+=" OLD_ICONV=" - myopts+=" NO_EXTERNAL_GREP=" - - # split ebuild: avoid collisions with dev-vcs/git's .mo files - myopts+=" NO_GETTEXT=YesPlease" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - myopts+=" INSTALLDIRS=vendor" - myopts+=" NO_SVN_TESTS=YesPlease" - - has_version '>=app-text/asciidoc-8.0' \ - && myopts+=" ASCIIDOC8=YesPlease" - myopts+=" ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts+=" NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - unpack ${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - use doc && \ - cd "${S}"/Documentation && \ - unpack ${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - fi - - kog-patches_unpack -} - -src_prepare() { - # see the git ebuild for the list of patches - kog-patches_apply_all - - epatch_user - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die "sed failed" - - # Fix docbook2texi command - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - V=1 \ - "$@" - # This is the fix for bug #326625, but it also causes breakage, see bug - # #352693. - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ -} - -src_configure() { - exportmakeopts -} - -src_compile() { - #if use perl ; then - git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" - git_emake perl/perl.mak || die "emake perl/perl.mak failed" - #fi - git_emake || die "emake failed" - - cd "${S}"/Documentation - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi -} - -src_install() { - git_emake install || die "make install failed" - - rm -rf "${ED}"usr/share/gitweb || die - rm -rf "${ED}"usr/share/git-core/templates || die - rm -rf "${ED}"usr/share/git-gui || die - rm -rf "${ED}"usr/share/gitk || die - - local myrelfile="" - for myfile in "${ED}"usr/libexec/git-core/* "${ED}"usr/$(get_libdir)/* "${ED}"usr/share/man/*/* "${ED}"usr/bin/* ; do - # image dir contains the keyword "cvs" - myrelfile="${myfile/${ED}}" - case "${myrelfile}" in - *cvs*) - true ;; - *) - rm -rf "${myfile}" || die ;; - esac - done - - local libdir="${ED}"usr/$(get_libdir) - if [ -d "${libdir}" ]; then - # must be empty - rmdir "${libdir}" || die - fi - - doman man*/*cvs* || die - if use doc; then - docinto / - dodoc Documentation/*cvs*.txt - dohtml -p / Documentation/*cvs*.html - fi - - # kill empty dirs from ${ED} - find "${ED}" -type d -empty -delete || die -} diff --git a/dev-vcs/git-gui-tools/Manifest b/dev-vcs/git-gui-tools/Manifest deleted file mode 100644 index c2378c09..00000000 --- a/dev-vcs/git-gui-tools/Manifest +++ /dev/null @@ -1,10 +0,0 @@ -DIST git-2.2.1.tar.xz 3590808 SHA256 09422dc9a0bdddf6bdd5b8634c71e1ed3125256c47424e6a2687701e764ef450 SHA512 66bccfa617d2c8e2e61e5aac9b8daef9d4dc151b85906af252cadef3306ecf792ad6d7869deb149f0d04f6e7c3e9f71119bfeece5690e61782fb357e5384027b WHIRLPOOL f288d0227f3ad3045fd7dcc7a7fa6e68cb29c3a4d363d6648aa4f09aa5742a4496c67d63d0ad120a1f8f9420b9ae30930b8ffb3229f176cf429f8b8c8a1d06e6 -DIST git-2.2.2-Gentoo-patches.tar.gz 4605 SHA256 70613dd13269a919069deadda91e157928d4ea9ff3b3e54d7755552610275cd0 SHA512 cd7b27108a0cb9449c90c063d7506ae28004d95bc3379542adf77cd135345b591383b264398ede5d7ce946dca01cd064d30688ec6143588d969a1f9dfc896c8c WHIRLPOOL 1ecffa35d78eadda38a517f9c3b1e177e8a84541cabeba95ab670dfa9d8ada9a7f7817c592bd80e9e0b5993549d9e9c2c3325b2eda07a60164679b3048b1d403 -DIST git-2.2.2.tar.xz 3592264 SHA256 aa6d2efcc0c7bb9b9edc6d56d90921706b833972f1d2abe70f71be7838f22d05 SHA512 e3ca6f40de04ed940f521fff4c7e92446e40ad1627acc5b4c090ebf114dcf279d4b1f3efe1189ffa43192fce412165621fc12ea90e2f7d02a6a9ccda655dc69b WHIRLPOOL 9e20def83bbb9b11cb5982fc5f19b09767657ff80f02a237dff6ddaddd3209b4cfb9288bec1b6dc80c6a6db1869cfcaa90e2374279012fc8215771c1a58a1fc2 -DIST git-2.3.0.tar.xz 3608648 SHA256 94b23a14d66df536cfe7de37551f55acf908f8bddf30a0f5325a255bb57b0aca SHA512 4be85d3ba3ffac6c55cce648ab6c0a6fe89164e9657480aeee0def79289dbcba486722756b1729d0cedda6012cd582b88129d483ce916bfe06cde5a423f05bc7 WHIRLPOOL d08762cf37536a347aabb2916dce9d482313c41a180b5c440481d9574e9a6c482eb18e0055410171478010e647ae353d70f7113fa07fd8d74bb77909e327ea75 -DIST git-2.3.1.tar.xz 3609908 SHA256 1acc4b051576143eb41d80f5675476629588c7c5fb4e6a1dc2c4590f47c498b7 SHA512 f113a9e8c7f9879088de6fa6bfbe9363f25eac279d5eb218ea1f5186cd1c45609760f498a5c066196b3a6e15dd931960e94dcdc14685e8ef1c5c72524113c0cf WHIRLPOOL f1c15ded4f4785d244a5242c823fcf8d63d1c3408c1a1696c99926fdbcab76e23e40d3ee8225925e786ce8eae7597a73a7f9f6cd8e5f1ef7d599ac8b254f9951 -DIST git-2.4.0.tar.xz 3681516 SHA256 b33438dd94659958a74850aacae4a2b3a626baec36d7f29c266130b08045bb24 SHA512 0114c5d0dbfeed46e0ba1c8c0da463c52cae6954238547502f44d9050af0d921906beea96ff2c5f56a7c822200d9daa0f1d040f883c701b88a23ec81ac777138 WHIRLPOOL 1f4667b295e541d4f035de9e415636f317f590e104119a1b212cb321f25120df31e45ba88470ee883d1ea9a0033f2b307981c9d9e5807919475dbc5f81b6b22e -DIST git-2.4.2.tar.xz 3683880 SHA256 4801ec1cd8c2175b58cfdbc721d0bf50d74ae226f36905fceb894c2fb620c9e5 SHA512 0013069b73572fd764489222ad94cf94b9e08fc65223187a300e6662fb56b27dceea0b3a473cf8630793a5bf0c87e3b63264936bc38b66f71c6a548912540326 WHIRLPOOL 52d2fcd44c4da3f0e1f2caa229e1086b92022b992e410f3c20344f527f3cb9a623d3f0b6a8d5d66f3e4f43b9677f0211ebbaaffe85a621b784af1f5bc3f5896c -DIST git-2.4.4.tar.xz 3689492 SHA256 f873b15d42281474fcba5921295d01e48a3cd3cddcbeb3d60176bf30f5f30260 SHA512 b4d3401d1e4f40f74f8eb75194d1edf0107786b942cf5e3fd127e4a268ce31ec4954195519444cc84e34caca4569d6fd41edafa2037116f60320f2c59c6e7cdf WHIRLPOOL 6fd9d4076586f25154cb448315a1492ffe7acfa5bb811c54e342acc4fcf28da423ab0042f23aa579adefbefa6b3f5dc45c949a36744c94d5420780a2175bde85 -DIST git-2.4.6.tar.xz 3690432 SHA256 bdd944571c03474517b6c9941d6f1fd735eccbb164e59fd133d38644b69453b6 SHA512 2c95a00af81d6fbd8f4984e89d7cb23396caacadd684466aeb5a11f1b3acfbc625f832060cbef5aee0748e36c1fddcd88b3b9c26c4d7aec1d185e5f7311346ef WHIRLPOOL 1ae191666bf27a7e18686b910cbe610f85b5b7a43266232359615fa2a22b80bc659277b71b21394eab53df0c912d9ad911c7793c2a041cd6c7d768a5f0416f5b -DIST git-2.5.0.tar.xz 3740620 SHA256 cc59b1bac6c1c67a9159872863f6c5bbe0d9404cac2a85c3e9d9fa49923ce45c SHA512 ef7538c9f5ba5b2ac08962401c30e5fd51323b54b9fb5315d259adccec346e8fae9362815832dc2b5ce63a259b315c40e419bb2385dde04d84b992e62f6789b6 WHIRLPOOL 653e7aeb966dec44631bbd257a41935b2e957be9324311a4fd91f3a0ba6f1f674e2e59b4c564d70c4eeaea3788f0af9273a1d0a753b3bc820e687f0d63bddf5d diff --git a/dev-vcs/git-gui-tools/git-gui-tools-2.2.1.ebuild b/dev-vcs/git-gui-tools/git-gui-tools-2.2.1.ebuild deleted file mode 100644 index ba6a10e0..00000000 --- a/dev-vcs/git-gui-tools/git-gui-tools-2.2.1.ebuild +++ /dev/null @@ -1,217 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -# split ebuild providing only ->>> gitk, gitview, git-gui, git-citool - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python2_{6,7} ) -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_MASTER=pu - -KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.1-Gentoo-patches.tar.gz" ) -inherit kog-patches toolchain-funcs eutils python-single-r1 ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_PV="${MY_PV/-gui-tools}" -MY_P="${PN}-${MY_PV}" -MY_P="${MY_P/-gui-tools}" - -DESCRIPTION="GUI tools derived from git: gitk, git-gui and gitview" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_GOOG="http://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI+=" ${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}" - KEYWORDS="~amd64 ~x86" -else - #SRC_URI="" - KEYWORDS="" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - sys-libs/zlib - dev-lang/tk" - -RDEPEND="${CDEPEND} - ~dev-vcs/git-${PV} - dev-vcs/git[-gtk] - dev-vcs/git[-tk] - dev-vcs/git[python] - >=dev-python/pygtk-2.8[${PYTHON_USEDEP}] - >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}] - ${PYTHON_DEPS}" - -DEPEND="${CDEPEND} - app-arch/cpio - " - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} -" - -pkg_setup() { - #if use python ; then - python-single-r1_pkg_setup - #fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - myopts="${myopts} NO_EXPAT=YesPlease" - myopts="${myopts} NO_CURL=YesPlease" - # broken assumptions, because of broken build system ... - myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts="${myopts} INSTALL=install TAR=tar" - myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh" - myopts="${myopts} SANE_TOOL_PATH=" - myopts="${myopts} OLD_ICONV=" - myopts="${myopts} NO_EXTERNAL_GREP=" - - # split ebuild: avoid collisions with dev-vcs/git's .mo files - myopts="${myopts} NO_GETTEXT=YesPlease" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - #use nls \ - # || myopts="${myopts} NO_GETTEXT=YesPlease" - # use tk \ - # || myopts="${myopts} NO_TCLTK=YesPlease" - #use perl \ - # && myopts="${myopts} INSTALLDIRS=vendor" \ - # || myopts="${myopts} NO_PERL=YesPlease" - myopts="${myopts} NO_PERL=YesPlease" - #use python \ - # || myopts="${myopts} NO_PYTHON=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts="${myopts} NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - - kog-patches_unpack -} - -src_prepare() { - # see the git ebuild for the list of patches - kog-patches_apply_all - - epatch_user - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL -} - -git_emake() { - PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - V=1 \ - "$@" -} - -src_configure() { - exportmakeopts -} - -src_compile() { - git_emake || die "emake failed" -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - #if use python && use gtk ; then - python_doscript "${S}"/contrib/gitview/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - #fi - - #find "${ED}"/usr/lib64/perl5/ \ - # -name .packlist \ - # -exec rm \{\} \; - - rm -r "${ED}"usr/share/git-core || die - rm -r "${ED}"usr/libexec/git-core/mergetools || die - - local myfile - - # be sure not to remove tools' lib/python-exec/* - for myfile in "${ED}"usr/lib*/python*; do - if [[ ! ${myfile} = */python-exec ]]; then - rm -r "${myfile}" || die "rm ${myfile} failed" - fi - done - - for myfile in "${ED}"usr/bin/*; do - case "$myfile" in - */gitview*|*/gitk*) - true ;; - *) - rm -f "$myfile" ;; - esac - done - - for myfile in "${ED}"usr/libexec/git-core/*; do - case "$myfile" in - */git-gui|*/git-gui--askpass|*/git-citool) - true ;; - *) - rm -f "$myfile" ;; - esac - done -} diff --git a/dev-vcs/git-gui-tools/git-gui-tools-2.2.2.ebuild b/dev-vcs/git-gui-tools/git-gui-tools-2.2.2.ebuild deleted file mode 100644 index 43898cec..00000000 --- a/dev-vcs/git-gui-tools/git-gui-tools-2.2.2.ebuild +++ /dev/null @@ -1,205 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -# split ebuild providing only ->>> gitk, gitview, git-gui, git-citool - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python2_{6,7} ) -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_MASTER=pu - -KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit kog-patches toolchain-funcs eutils python-single-r1 ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_PV="${MY_PV/-gui-tools}" -MY_P="${PN}-${MY_PV}" -MY_P="${MY_P/-gui-tools}" - -DESCRIPTION="GUI tools derived from git: gitk, git-gui and gitview" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_GOOG="http://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI+=" ${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - sys-libs/zlib - dev-lang/tk" - -RDEPEND="${CDEPEND} - ~dev-vcs/git-${PV} - dev-vcs/git[-gtk] - dev-vcs/git[-tk] - dev-vcs/git[python] - >=dev-python/pygtk-2.8[${PYTHON_USEDEP}] - >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}] - ${PYTHON_DEPS}" - -DEPEND="${CDEPEND} - app-arch/cpio - " - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} -" - -pkg_setup() { - #if use python ; then - python-single-r1_pkg_setup - #fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - myopts+=" NO_EXPAT=YesPlease" - myopts+=" NO_CURL=YesPlease" - # broken assumptions, because of broken build system ... - myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts+=" INSTALL=install TAR=tar" - myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" - myopts+=" SANE_TOOL_PATH=" - myopts+=" OLD_ICONV=" - myopts+=" NO_EXTERNAL_GREP=" - - # split ebuild: avoid collisions with dev-vcs/git's .mo files - myopts+=" NO_GETTEXT=YesPlease" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - myopts+=" NO_PERL=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts+=" NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - - kog-patches_unpack -} - -src_prepare() { - # see the git ebuild for the list of patches - kog-patches_apply_all - - epatch_user - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL -} - -git_emake() { - PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - V=1 \ - "$@" -} - -src_configure() { - exportmakeopts -} - -src_compile() { - git_emake || die "emake failed" -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - #if use python && use gtk ; then - python_doscript "${S}"/contrib/gitview/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - #fi - - #find "${ED}"/usr/lib64/perl5/ \ - # -name .packlist \ - # -exec rm \{\} \; - - rm -r "${ED}"usr/share/git-core || die - rm -r "${ED}"usr/libexec/git-core/mergetools || die - - local myfile - - # be sure not to remove tools' lib/python-exec/* - for myfile in "${ED}"usr/lib*/python*; do - if [[ ! ${myfile} = */python-exec ]]; then - rm -r "${myfile}" || die "rm ${myfile} failed" - fi - done - - for myfile in "${ED}"usr/bin/*; do - case "$myfile" in - */gitview*|*/gitk*) - true ;; - *) - rm -f "$myfile" ;; - esac - done - - for myfile in "${ED}"usr/libexec/git-core/*; do - case "$myfile" in - */git-gui|*/git-gui--askpass|*/git-citool) - true ;; - *) - rm -f "$myfile" ;; - esac - done -} diff --git a/dev-vcs/git-gui-tools/git-gui-tools-2.3.0.ebuild b/dev-vcs/git-gui-tools/git-gui-tools-2.3.0.ebuild deleted file mode 100644 index 43898cec..00000000 --- a/dev-vcs/git-gui-tools/git-gui-tools-2.3.0.ebuild +++ /dev/null @@ -1,205 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -# split ebuild providing only ->>> gitk, gitview, git-gui, git-citool - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python2_{6,7} ) -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_MASTER=pu - -KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit kog-patches toolchain-funcs eutils python-single-r1 ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_PV="${MY_PV/-gui-tools}" -MY_P="${PN}-${MY_PV}" -MY_P="${MY_P/-gui-tools}" - -DESCRIPTION="GUI tools derived from git: gitk, git-gui and gitview" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_GOOG="http://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI+=" ${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - sys-libs/zlib - dev-lang/tk" - -RDEPEND="${CDEPEND} - ~dev-vcs/git-${PV} - dev-vcs/git[-gtk] - dev-vcs/git[-tk] - dev-vcs/git[python] - >=dev-python/pygtk-2.8[${PYTHON_USEDEP}] - >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}] - ${PYTHON_DEPS}" - -DEPEND="${CDEPEND} - app-arch/cpio - " - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} -" - -pkg_setup() { - #if use python ; then - python-single-r1_pkg_setup - #fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - myopts+=" NO_EXPAT=YesPlease" - myopts+=" NO_CURL=YesPlease" - # broken assumptions, because of broken build system ... - myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts+=" INSTALL=install TAR=tar" - myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" - myopts+=" SANE_TOOL_PATH=" - myopts+=" OLD_ICONV=" - myopts+=" NO_EXTERNAL_GREP=" - - # split ebuild: avoid collisions with dev-vcs/git's .mo files - myopts+=" NO_GETTEXT=YesPlease" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - myopts+=" NO_PERL=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts+=" NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - - kog-patches_unpack -} - -src_prepare() { - # see the git ebuild for the list of patches - kog-patches_apply_all - - epatch_user - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL -} - -git_emake() { - PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - V=1 \ - "$@" -} - -src_configure() { - exportmakeopts -} - -src_compile() { - git_emake || die "emake failed" -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - #if use python && use gtk ; then - python_doscript "${S}"/contrib/gitview/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - #fi - - #find "${ED}"/usr/lib64/perl5/ \ - # -name .packlist \ - # -exec rm \{\} \; - - rm -r "${ED}"usr/share/git-core || die - rm -r "${ED}"usr/libexec/git-core/mergetools || die - - local myfile - - # be sure not to remove tools' lib/python-exec/* - for myfile in "${ED}"usr/lib*/python*; do - if [[ ! ${myfile} = */python-exec ]]; then - rm -r "${myfile}" || die "rm ${myfile} failed" - fi - done - - for myfile in "${ED}"usr/bin/*; do - case "$myfile" in - */gitview*|*/gitk*) - true ;; - *) - rm -f "$myfile" ;; - esac - done - - for myfile in "${ED}"usr/libexec/git-core/*; do - case "$myfile" in - */git-gui|*/git-gui--askpass|*/git-citool) - true ;; - *) - rm -f "$myfile" ;; - esac - done -} diff --git a/dev-vcs/git-gui-tools/git-gui-tools-2.3.1.ebuild b/dev-vcs/git-gui-tools/git-gui-tools-2.3.1.ebuild deleted file mode 100644 index 43898cec..00000000 --- a/dev-vcs/git-gui-tools/git-gui-tools-2.3.1.ebuild +++ /dev/null @@ -1,205 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -# split ebuild providing only ->>> gitk, gitview, git-gui, git-citool - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python2_{6,7} ) -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_MASTER=pu - -KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit kog-patches toolchain-funcs eutils python-single-r1 ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_PV="${MY_PV/-gui-tools}" -MY_P="${PN}-${MY_PV}" -MY_P="${MY_P/-gui-tools}" - -DESCRIPTION="GUI tools derived from git: gitk, git-gui and gitview" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_GOOG="http://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI+=" ${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - sys-libs/zlib - dev-lang/tk" - -RDEPEND="${CDEPEND} - ~dev-vcs/git-${PV} - dev-vcs/git[-gtk] - dev-vcs/git[-tk] - dev-vcs/git[python] - >=dev-python/pygtk-2.8[${PYTHON_USEDEP}] - >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}] - ${PYTHON_DEPS}" - -DEPEND="${CDEPEND} - app-arch/cpio - " - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} -" - -pkg_setup() { - #if use python ; then - python-single-r1_pkg_setup - #fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - myopts+=" NO_EXPAT=YesPlease" - myopts+=" NO_CURL=YesPlease" - # broken assumptions, because of broken build system ... - myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts+=" INSTALL=install TAR=tar" - myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" - myopts+=" SANE_TOOL_PATH=" - myopts+=" OLD_ICONV=" - myopts+=" NO_EXTERNAL_GREP=" - - # split ebuild: avoid collisions with dev-vcs/git's .mo files - myopts+=" NO_GETTEXT=YesPlease" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - myopts+=" NO_PERL=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts+=" NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - - kog-patches_unpack -} - -src_prepare() { - # see the git ebuild for the list of patches - kog-patches_apply_all - - epatch_user - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL -} - -git_emake() { - PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - V=1 \ - "$@" -} - -src_configure() { - exportmakeopts -} - -src_compile() { - git_emake || die "emake failed" -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - #if use python && use gtk ; then - python_doscript "${S}"/contrib/gitview/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - #fi - - #find "${ED}"/usr/lib64/perl5/ \ - # -name .packlist \ - # -exec rm \{\} \; - - rm -r "${ED}"usr/share/git-core || die - rm -r "${ED}"usr/libexec/git-core/mergetools || die - - local myfile - - # be sure not to remove tools' lib/python-exec/* - for myfile in "${ED}"usr/lib*/python*; do - if [[ ! ${myfile} = */python-exec ]]; then - rm -r "${myfile}" || die "rm ${myfile} failed" - fi - done - - for myfile in "${ED}"usr/bin/*; do - case "$myfile" in - */gitview*|*/gitk*) - true ;; - *) - rm -f "$myfile" ;; - esac - done - - for myfile in "${ED}"usr/libexec/git-core/*; do - case "$myfile" in - */git-gui|*/git-gui--askpass|*/git-citool) - true ;; - *) - rm -f "$myfile" ;; - esac - done -} diff --git a/dev-vcs/git-gui-tools/git-gui-tools-2.4.0.ebuild b/dev-vcs/git-gui-tools/git-gui-tools-2.4.0.ebuild deleted file mode 100644 index 1def28e8..00000000 --- a/dev-vcs/git-gui-tools/git-gui-tools-2.4.0.ebuild +++ /dev/null @@ -1,205 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -# split ebuild providing only ->>> gitk, gitview, git-gui, git-citool - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python2_7 ) -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_MASTER=pu - -KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit kog-patches toolchain-funcs eutils python-single-r1 ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_PV="${MY_PV/-gui-tools}" -MY_P="${PN}-${MY_PV}" -MY_P="${MY_P/-gui-tools}" - -DESCRIPTION="GUI tools derived from git: gitk, git-gui and gitview" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_GOOG="http://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}" - KEYWORDS="~amd64 ~x86" -fi - -kog-patches_update_SRC_URI - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - sys-libs/zlib - dev-lang/tk:=" - -RDEPEND="${CDEPEND} - ~dev-vcs/git-${PV} - dev-vcs/git[-gtk] - dev-vcs/git[-tk] - dev-vcs/git[python] - >=dev-python/pygtk-2.8[${PYTHON_USEDEP}] - >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}] - ${PYTHON_DEPS}" - -DEPEND="${CDEPEND}" - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} -" - -pkg_setup() { - #if use python ; then - python-single-r1_pkg_setup - #fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - myopts+=" NO_EXPAT=YesPlease" - myopts+=" NO_CURL=YesPlease" - # broken assumptions, because of broken build system ... - myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts+=" INSTALL=install TAR=tar" - myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" - myopts+=" SANE_TOOL_PATH=" - myopts+=" OLD_ICONV=" - myopts+=" NO_EXTERNAL_GREP=" - - # split ebuild: avoid collisions with dev-vcs/git's .mo files - myopts+=" NO_GETTEXT=YesPlease" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - myopts+=" NO_PERL=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts+=" NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - - kog-patches_unpack -} - -src_prepare() { - # see the git ebuild for the list of patches - kog-patches_apply_all - - epatch_user - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL -} - -git_emake() { - PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - V=1 \ - "$@" -} - -src_configure() { - exportmakeopts -} - -src_compile() { - git_emake || die "emake failed" -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - #if use python && use gtk ; then - python_doscript "${S}"/contrib/gitview/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - #fi - - #find "${ED}"/usr/lib64/perl5/ \ - # -name .packlist \ - # -exec rm \{\} \; - - rm -r "${ED}"usr/share/git-core || die - rm -r "${ED}"usr/libexec/git-core/mergetools || die - - local myfile - - # be sure not to remove tools' lib/python-exec/* - for myfile in "${ED}"usr/lib*/python*; do - if [[ ! ${myfile} = */python-exec ]]; then - rm -r "${myfile}" || die "rm ${myfile} failed" - fi - done - - for myfile in "${ED}"usr/bin/*; do - case "$myfile" in - */gitview*|*/gitk*) - true ;; - *) - rm -f "$myfile" ;; - esac - done - - for myfile in "${ED}"usr/libexec/git-core/*; do - case "$myfile" in - */git-gui|*/git-gui--askpass|*/git-citool) - true ;; - *) - rm -f "$myfile" ;; - esac - done -} diff --git a/dev-vcs/git-gui-tools/git-gui-tools-2.4.2.ebuild b/dev-vcs/git-gui-tools/git-gui-tools-2.4.2.ebuild deleted file mode 100644 index 1def28e8..00000000 --- a/dev-vcs/git-gui-tools/git-gui-tools-2.4.2.ebuild +++ /dev/null @@ -1,205 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -# split ebuild providing only ->>> gitk, gitview, git-gui, git-citool - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python2_7 ) -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_MASTER=pu - -KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit kog-patches toolchain-funcs eutils python-single-r1 ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_PV="${MY_PV/-gui-tools}" -MY_P="${PN}-${MY_PV}" -MY_P="${MY_P/-gui-tools}" - -DESCRIPTION="GUI tools derived from git: gitk, git-gui and gitview" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_GOOG="http://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}" - KEYWORDS="~amd64 ~x86" -fi - -kog-patches_update_SRC_URI - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - sys-libs/zlib - dev-lang/tk:=" - -RDEPEND="${CDEPEND} - ~dev-vcs/git-${PV} - dev-vcs/git[-gtk] - dev-vcs/git[-tk] - dev-vcs/git[python] - >=dev-python/pygtk-2.8[${PYTHON_USEDEP}] - >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}] - ${PYTHON_DEPS}" - -DEPEND="${CDEPEND}" - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} -" - -pkg_setup() { - #if use python ; then - python-single-r1_pkg_setup - #fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - myopts+=" NO_EXPAT=YesPlease" - myopts+=" NO_CURL=YesPlease" - # broken assumptions, because of broken build system ... - myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts+=" INSTALL=install TAR=tar" - myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" - myopts+=" SANE_TOOL_PATH=" - myopts+=" OLD_ICONV=" - myopts+=" NO_EXTERNAL_GREP=" - - # split ebuild: avoid collisions with dev-vcs/git's .mo files - myopts+=" NO_GETTEXT=YesPlease" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - myopts+=" NO_PERL=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts+=" NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - - kog-patches_unpack -} - -src_prepare() { - # see the git ebuild for the list of patches - kog-patches_apply_all - - epatch_user - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL -} - -git_emake() { - PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - V=1 \ - "$@" -} - -src_configure() { - exportmakeopts -} - -src_compile() { - git_emake || die "emake failed" -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - #if use python && use gtk ; then - python_doscript "${S}"/contrib/gitview/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - #fi - - #find "${ED}"/usr/lib64/perl5/ \ - # -name .packlist \ - # -exec rm \{\} \; - - rm -r "${ED}"usr/share/git-core || die - rm -r "${ED}"usr/libexec/git-core/mergetools || die - - local myfile - - # be sure not to remove tools' lib/python-exec/* - for myfile in "${ED}"usr/lib*/python*; do - if [[ ! ${myfile} = */python-exec ]]; then - rm -r "${myfile}" || die "rm ${myfile} failed" - fi - done - - for myfile in "${ED}"usr/bin/*; do - case "$myfile" in - */gitview*|*/gitk*) - true ;; - *) - rm -f "$myfile" ;; - esac - done - - for myfile in "${ED}"usr/libexec/git-core/*; do - case "$myfile" in - */git-gui|*/git-gui--askpass|*/git-citool) - true ;; - *) - rm -f "$myfile" ;; - esac - done -} diff --git a/dev-vcs/git-gui-tools/git-gui-tools-2.4.4.ebuild b/dev-vcs/git-gui-tools/git-gui-tools-2.4.4.ebuild deleted file mode 100644 index 7583e839..00000000 --- a/dev-vcs/git-gui-tools/git-gui-tools-2.4.4.ebuild +++ /dev/null @@ -1,205 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -# split ebuild providing only ->>> gitk, gitview, git-gui, git-citool - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python2_7 ) -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_MASTER=pu - -KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit kog-patches toolchain-funcs eutils python-single-r1 ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_PV="${MY_PV/-gui-tools}" -MY_P="${PN}-${MY_PV}" -MY_P="${MY_P/-gui-tools}" - -DESCRIPTION="GUI tools derived from git: gitk, git-gui and gitview" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_GOOG="http://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}" - KEYWORDS="amd64 x86" -fi - -kog-patches_update_SRC_URI - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - sys-libs/zlib - dev-lang/tk:=" - -RDEPEND="${CDEPEND} - ~dev-vcs/git-${PV} - dev-vcs/git[-gtk] - dev-vcs/git[-tk] - dev-vcs/git[python] - >=dev-python/pygtk-2.8[${PYTHON_USEDEP}] - >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}] - ${PYTHON_DEPS}" - -DEPEND="${CDEPEND}" - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} -" - -pkg_setup() { - #if use python ; then - python-single-r1_pkg_setup - #fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - myopts+=" NO_EXPAT=YesPlease" - myopts+=" NO_CURL=YesPlease" - # broken assumptions, because of broken build system ... - myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts+=" INSTALL=install TAR=tar" - myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" - myopts+=" SANE_TOOL_PATH=" - myopts+=" OLD_ICONV=" - myopts+=" NO_EXTERNAL_GREP=" - - # split ebuild: avoid collisions with dev-vcs/git's .mo files - myopts+=" NO_GETTEXT=YesPlease" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - myopts+=" NO_PERL=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts+=" NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - - kog-patches_unpack -} - -src_prepare() { - # see the git ebuild for the list of patches - kog-patches_apply_all - - epatch_user - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL -} - -git_emake() { - PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - V=1 \ - "$@" -} - -src_configure() { - exportmakeopts -} - -src_compile() { - git_emake || die "emake failed" -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - #if use python && use gtk ; then - python_doscript "${S}"/contrib/gitview/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - #fi - - #find "${ED}"/usr/lib64/perl5/ \ - # -name .packlist \ - # -exec rm \{\} \; - - rm -r "${ED}"usr/share/git-core || die - rm -r "${ED}"usr/libexec/git-core/mergetools || die - - local myfile - - # be sure not to remove tools' lib/python-exec/* - for myfile in "${ED}"usr/lib*/python*; do - if [[ ! ${myfile} = */python-exec ]]; then - rm -r "${myfile}" || die "rm ${myfile} failed" - fi - done - - for myfile in "${ED}"usr/bin/*; do - case "$myfile" in - */gitview*|*/gitk*) - true ;; - *) - rm -f "$myfile" ;; - esac - done - - for myfile in "${ED}"usr/libexec/git-core/*; do - case "$myfile" in - */git-gui|*/git-gui--askpass|*/git-citool) - true ;; - *) - rm -f "$myfile" ;; - esac - done -} diff --git a/dev-vcs/git-gui-tools/git-gui-tools-2.4.6.ebuild b/dev-vcs/git-gui-tools/git-gui-tools-2.4.6.ebuild deleted file mode 100644 index 1def28e8..00000000 --- a/dev-vcs/git-gui-tools/git-gui-tools-2.4.6.ebuild +++ /dev/null @@ -1,205 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -# split ebuild providing only ->>> gitk, gitview, git-gui, git-citool - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python2_7 ) -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_MASTER=pu - -KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit kog-patches toolchain-funcs eutils python-single-r1 ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_PV="${MY_PV/-gui-tools}" -MY_P="${PN}-${MY_PV}" -MY_P="${MY_P/-gui-tools}" - -DESCRIPTION="GUI tools derived from git: gitk, git-gui and gitview" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_GOOG="http://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}" - KEYWORDS="~amd64 ~x86" -fi - -kog-patches_update_SRC_URI - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - sys-libs/zlib - dev-lang/tk:=" - -RDEPEND="${CDEPEND} - ~dev-vcs/git-${PV} - dev-vcs/git[-gtk] - dev-vcs/git[-tk] - dev-vcs/git[python] - >=dev-python/pygtk-2.8[${PYTHON_USEDEP}] - >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}] - ${PYTHON_DEPS}" - -DEPEND="${CDEPEND}" - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} -" - -pkg_setup() { - #if use python ; then - python-single-r1_pkg_setup - #fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - myopts+=" NO_EXPAT=YesPlease" - myopts+=" NO_CURL=YesPlease" - # broken assumptions, because of broken build system ... - myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts+=" INSTALL=install TAR=tar" - myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" - myopts+=" SANE_TOOL_PATH=" - myopts+=" OLD_ICONV=" - myopts+=" NO_EXTERNAL_GREP=" - - # split ebuild: avoid collisions with dev-vcs/git's .mo files - myopts+=" NO_GETTEXT=YesPlease" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - myopts+=" NO_PERL=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts+=" NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - - kog-patches_unpack -} - -src_prepare() { - # see the git ebuild for the list of patches - kog-patches_apply_all - - epatch_user - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL -} - -git_emake() { - PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - V=1 \ - "$@" -} - -src_configure() { - exportmakeopts -} - -src_compile() { - git_emake || die "emake failed" -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - #if use python && use gtk ; then - python_doscript "${S}"/contrib/gitview/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - #fi - - #find "${ED}"/usr/lib64/perl5/ \ - # -name .packlist \ - # -exec rm \{\} \; - - rm -r "${ED}"usr/share/git-core || die - rm -r "${ED}"usr/libexec/git-core/mergetools || die - - local myfile - - # be sure not to remove tools' lib/python-exec/* - for myfile in "${ED}"usr/lib*/python*; do - if [[ ! ${myfile} = */python-exec ]]; then - rm -r "${myfile}" || die "rm ${myfile} failed" - fi - done - - for myfile in "${ED}"usr/bin/*; do - case "$myfile" in - */gitview*|*/gitk*) - true ;; - *) - rm -f "$myfile" ;; - esac - done - - for myfile in "${ED}"usr/libexec/git-core/*; do - case "$myfile" in - */git-gui|*/git-gui--askpass|*/git-citool) - true ;; - *) - rm -f "$myfile" ;; - esac - done -} diff --git a/dev-vcs/git-gui-tools/git-gui-tools-2.5.0.ebuild b/dev-vcs/git-gui-tools/git-gui-tools-2.5.0.ebuild deleted file mode 100644 index 1def28e8..00000000 --- a/dev-vcs/git-gui-tools/git-gui-tools-2.5.0.ebuild +++ /dev/null @@ -1,205 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -# split ebuild providing only ->>> gitk, gitview, git-gui, git-citool - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python2_7 ) -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_MASTER=pu - -KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit kog-patches toolchain-funcs eutils python-single-r1 ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_PV="${MY_PV/-gui-tools}" -MY_P="${PN}-${MY_PV}" -MY_P="${MY_P/-gui-tools}" - -DESCRIPTION="GUI tools derived from git: gitk, git-gui and gitview" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_GOOG="http://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}" - KEYWORDS="~amd64 ~x86" -fi - -kog-patches_update_SRC_URI - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - sys-libs/zlib - dev-lang/tk:=" - -RDEPEND="${CDEPEND} - ~dev-vcs/git-${PV} - dev-vcs/git[-gtk] - dev-vcs/git[-tk] - dev-vcs/git[python] - >=dev-python/pygtk-2.8[${PYTHON_USEDEP}] - >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}] - ${PYTHON_DEPS}" - -DEPEND="${CDEPEND}" - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} -" - -pkg_setup() { - #if use python ; then - python-single-r1_pkg_setup - #fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - myopts+=" NO_EXPAT=YesPlease" - myopts+=" NO_CURL=YesPlease" - # broken assumptions, because of broken build system ... - myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts+=" INSTALL=install TAR=tar" - myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" - myopts+=" SANE_TOOL_PATH=" - myopts+=" OLD_ICONV=" - myopts+=" NO_EXTERNAL_GREP=" - - # split ebuild: avoid collisions with dev-vcs/git's .mo files - myopts+=" NO_GETTEXT=YesPlease" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - myopts+=" NO_PERL=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts+=" NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - - kog-patches_unpack -} - -src_prepare() { - # see the git ebuild for the list of patches - kog-patches_apply_all - - epatch_user - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL -} - -git_emake() { - PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - V=1 \ - "$@" -} - -src_configure() { - exportmakeopts -} - -src_compile() { - git_emake || die "emake failed" -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - #if use python && use gtk ; then - python_doscript "${S}"/contrib/gitview/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - #fi - - #find "${ED}"/usr/lib64/perl5/ \ - # -name .packlist \ - # -exec rm \{\} \; - - rm -r "${ED}"usr/share/git-core || die - rm -r "${ED}"usr/libexec/git-core/mergetools || die - - local myfile - - # be sure not to remove tools' lib/python-exec/* - for myfile in "${ED}"usr/lib*/python*; do - if [[ ! ${myfile} = */python-exec ]]; then - rm -r "${myfile}" || die "rm ${myfile} failed" - fi - done - - for myfile in "${ED}"usr/bin/*; do - case "$myfile" in - */gitview*|*/gitk*) - true ;; - *) - rm -f "$myfile" ;; - esac - done - - for myfile in "${ED}"usr/libexec/git-core/*; do - case "$myfile" in - */git-gui|*/git-gui--askpass|*/git-citool) - true ;; - *) - rm -f "$myfile" ;; - esac - done -} diff --git a/dev-vcs/git-subversion/Manifest b/dev-vcs/git-subversion/Manifest deleted file mode 100644 index 49e816ea..00000000 --- a/dev-vcs/git-subversion/Manifest +++ /dev/null @@ -1,28 +0,0 @@ -DIST git-2.2.1.tar.xz 3590808 SHA256 09422dc9a0bdddf6bdd5b8634c71e1ed3125256c47424e6a2687701e764ef450 SHA512 66bccfa617d2c8e2e61e5aac9b8daef9d4dc151b85906af252cadef3306ecf792ad6d7869deb149f0d04f6e7c3e9f71119bfeece5690e61782fb357e5384027b WHIRLPOOL f288d0227f3ad3045fd7dcc7a7fa6e68cb29c3a4d363d6648aa4f09aa5742a4496c67d63d0ad120a1f8f9420b9ae30930b8ffb3229f176cf429f8b8c8a1d06e6 -DIST git-2.2.2-Gentoo-patches.tar.gz 4605 SHA256 70613dd13269a919069deadda91e157928d4ea9ff3b3e54d7755552610275cd0 SHA512 cd7b27108a0cb9449c90c063d7506ae28004d95bc3379542adf77cd135345b591383b264398ede5d7ce946dca01cd064d30688ec6143588d969a1f9dfc896c8c WHIRLPOOL 1ecffa35d78eadda38a517f9c3b1e177e8a84541cabeba95ab670dfa9d8ada9a7f7817c592bd80e9e0b5993549d9e9c2c3325b2eda07a60164679b3048b1d403 -DIST git-2.2.2.tar.xz 3592264 SHA256 aa6d2efcc0c7bb9b9edc6d56d90921706b833972f1d2abe70f71be7838f22d05 SHA512 e3ca6f40de04ed940f521fff4c7e92446e40ad1627acc5b4c090ebf114dcf279d4b1f3efe1189ffa43192fce412165621fc12ea90e2f7d02a6a9ccda655dc69b WHIRLPOOL 9e20def83bbb9b11cb5982fc5f19b09767657ff80f02a237dff6ddaddd3209b4cfb9288bec1b6dc80c6a6db1869cfcaa90e2374279012fc8215771c1a58a1fc2 -DIST git-2.3.0.tar.xz 3608648 SHA256 94b23a14d66df536cfe7de37551f55acf908f8bddf30a0f5325a255bb57b0aca SHA512 4be85d3ba3ffac6c55cce648ab6c0a6fe89164e9657480aeee0def79289dbcba486722756b1729d0cedda6012cd582b88129d483ce916bfe06cde5a423f05bc7 WHIRLPOOL d08762cf37536a347aabb2916dce9d482313c41a180b5c440481d9574e9a6c482eb18e0055410171478010e647ae353d70f7113fa07fd8d74bb77909e327ea75 -DIST git-2.3.1.tar.xz 3609908 SHA256 1acc4b051576143eb41d80f5675476629588c7c5fb4e6a1dc2c4590f47c498b7 SHA512 f113a9e8c7f9879088de6fa6bfbe9363f25eac279d5eb218ea1f5186cd1c45609760f498a5c066196b3a6e15dd931960e94dcdc14685e8ef1c5c72524113c0cf WHIRLPOOL f1c15ded4f4785d244a5242c823fcf8d63d1c3408c1a1696c99926fdbcab76e23e40d3ee8225925e786ce8eae7597a73a7f9f6cd8e5f1ef7d599ac8b254f9951 -DIST git-2.4.0.tar.xz 3681516 SHA256 b33438dd94659958a74850aacae4a2b3a626baec36d7f29c266130b08045bb24 SHA512 0114c5d0dbfeed46e0ba1c8c0da463c52cae6954238547502f44d9050af0d921906beea96ff2c5f56a7c822200d9daa0f1d040f883c701b88a23ec81ac777138 WHIRLPOOL 1f4667b295e541d4f035de9e415636f317f590e104119a1b212cb321f25120df31e45ba88470ee883d1ea9a0033f2b307981c9d9e5807919475dbc5f81b6b22e -DIST git-2.4.2.tar.xz 3683880 SHA256 4801ec1cd8c2175b58cfdbc721d0bf50d74ae226f36905fceb894c2fb620c9e5 SHA512 0013069b73572fd764489222ad94cf94b9e08fc65223187a300e6662fb56b27dceea0b3a473cf8630793a5bf0c87e3b63264936bc38b66f71c6a548912540326 WHIRLPOOL 52d2fcd44c4da3f0e1f2caa229e1086b92022b992e410f3c20344f527f3cb9a623d3f0b6a8d5d66f3e4f43b9677f0211ebbaaffe85a621b784af1f5bc3f5896c -DIST git-2.4.4.tar.xz 3689492 SHA256 f873b15d42281474fcba5921295d01e48a3cd3cddcbeb3d60176bf30f5f30260 SHA512 b4d3401d1e4f40f74f8eb75194d1edf0107786b942cf5e3fd127e4a268ce31ec4954195519444cc84e34caca4569d6fd41edafa2037116f60320f2c59c6e7cdf WHIRLPOOL 6fd9d4076586f25154cb448315a1492ffe7acfa5bb811c54e342acc4fcf28da423ab0042f23aa579adefbefa6b3f5dc45c949a36744c94d5420780a2175bde85 -DIST git-2.4.6.tar.xz 3690432 SHA256 bdd944571c03474517b6c9941d6f1fd735eccbb164e59fd133d38644b69453b6 SHA512 2c95a00af81d6fbd8f4984e89d7cb23396caacadd684466aeb5a11f1b3acfbc625f832060cbef5aee0748e36c1fddcd88b3b9c26c4d7aec1d185e5f7311346ef WHIRLPOOL 1ae191666bf27a7e18686b910cbe610f85b5b7a43266232359615fa2a22b80bc659277b71b21394eab53df0c912d9ad911c7793c2a041cd6c7d768a5f0416f5b -DIST git-2.5.0.tar.xz 3740620 SHA256 cc59b1bac6c1c67a9159872863f6c5bbe0d9404cac2a85c3e9d9fa49923ce45c SHA512 ef7538c9f5ba5b2ac08962401c30e5fd51323b54b9fb5315d259adccec346e8fae9362815832dc2b5ce63a259b315c40e419bb2385dde04d84b992e62f6789b6 WHIRLPOOL 653e7aeb966dec44631bbd257a41935b2e957be9324311a4fd91f3a0ba6f1f674e2e59b4c564d70c4eeaea3788f0af9273a1d0a753b3bc820e687f0d63bddf5d -DIST git-htmldocs-2.2.1.tar.xz 975488 SHA256 dee32b06ecf26044169adf40d95cb301c4219416a65c94b89c6513a80f03863b SHA512 68843b883e2fd4f14646ff97ba9e5f3fd4de9f6bbf57a40e9c1bceb6578ebf497e50f2b808fdb4174966e26bf9ac068b44cfdf111652d15796f4f84a7406d336 WHIRLPOOL 771af06f8663eaaa6de4d117277ea05680671c6d72010653ad8e2b037b7a8d77b4a3733b6c48e4775971304b680d0df2596ed1cb4eedbf9948135912ac9509a3 -DIST git-htmldocs-2.2.2.tar.xz 976312 SHA256 41179ff0816189d583f290a227a73788002a319c7ff8c5cada970878c50b901d SHA512 b51b7d619e82d83b4f0b90d31bfccc30291a5beb48b2f5e5e59e75e91e5d772e89b560534a683648cd5480f4bf241f733efc87b30062ef5bb003bf0b5dbeed7f WHIRLPOOL c9dc7ac1a40559e4306d7d97a1619a272faf83d8b05c5a11f5f7b010566cd02fe853fee7eb550c6ccf744db446966a9696f9eb6feeee7ce4f976c6aa88b097d2 -DIST git-htmldocs-2.3.0.tar.xz 980936 SHA256 e8e202bae7a89f22a815e15753e9742f2e140b3c0ca548e9a831cfdbfad3a873 SHA512 c4d226784d89469c8faa72f29ab87594682ba46b1887769e29f87ce0db1ac241c9568a8b1530e6d28d43a9861acf803f93dddcc1db59cbe97e21d7b9e374c565 WHIRLPOOL 5bb37b7e7b317ffbf842616b00caad54d4594748726063d2b66c2ccc5fc125a88001506ddff63b15ebaccd7e8a96399bad383eec13dbd8bdc40d5cf7f8696e2b -DIST git-htmldocs-2.3.1.tar.xz 981748 SHA256 03bfc92c813a5cbbb34b61fdd7b9cf1226ad9b2b8388d24c649d915df3b93dad SHA512 da371b5a2b73a60681cd6f3b5385bee2668e0d617788194e454a531c2dab652c9b70920cb307858eb5ba15fd0c2d24635862e8f432946b0e9dfee8ee3fcb731a WHIRLPOOL 9334037067d797fd02ae0fd9f6d400ee14d68246755ac48e5897b404214923417728b04added2e05cb52cdc345b3ac9975752507e1e1278cedd74a33cac64b1b -DIST git-htmldocs-2.4.0.tar.xz 990744 SHA256 70ee1fdb70507c74832ac021e8940c8249d9b69f2b86aeaf0888ae41772e93a7 SHA512 03837e671a08f08ab7bd70676e234995b44a53ce27c648c50a6dd5ff97ba4400beb3d4b7874d6c8bde3a00624a7c2dc15d15299eb7ad9874d7dfd722f2c2256a WHIRLPOOL 4877dd0c5fb94f032d11d5d22a3e90e8352f68afb50400eca8c2f42e72adf40c7b9878c7998cacf16ed2011b85f965bcc5c44ecb3fd931783bd07b75b84b800b -DIST git-htmldocs-2.4.2.tar.xz 992192 SHA256 792cfc6c8236fdb58dfd66e39766c7b8097080361eed28443207bc6c36e07911 SHA512 e9790b698c50a09724ec9c71001a70f2a6a7094b72326f290f3b5c7b274181f331fdbb71cb4e2db9edf1229ae534a715b2974424b89d515b901b074bdeb30b66 WHIRLPOOL ef3de3704e7c0e34174b1e16f0837c52d9ce9d64c0f61c417a52811ca623ae17304a2b9d484457569d635a269b4dedb3e940bf0fa7d3db1bc4f744bf1d392ff1 -DIST git-htmldocs-2.4.4.tar.xz 994376 SHA256 e7f411f3eb3ecccc87e7d96afdcd8e72734a331170412eb37f240b731b2c2580 SHA512 1133dfa8a92358dbe6de35e22822b63bfbd418e8cd6290e1201738e5fc707fed1f50937d921f5323147cae75b89d452e8bd82768046685d7d2017dcd842766aa WHIRLPOOL 4684d5c4b7d8c7477ce658bd804280caab0721957786cb096a0acdf170e01a97d90eed7aca1d1f976ec79347cd9501c3ebed7ddf663ae785988e2abf36d9c054 -DIST git-htmldocs-2.4.6.tar.xz 994712 SHA256 5213e8b882293ec3cda247dabbc75c6ee5243b9d330a8fafec004952fae91a88 SHA512 782fbc38a611380c0af2631bd6123d568b02159fb46159c763d97d75bd84debe43105d83ac3f321cd8383e1334806857bce1a48563fd0c19b43f527fe18615a8 WHIRLPOOL 170e4ecc8255e6d5d562274e6e3fb75c2fc62e415586d61498b680a076c74248664fca35bb7c532009f7f22be4ad14d1fe047e14791991fa32373bd7053e0396 -DIST git-htmldocs-2.5.0.tar.xz 1008428 SHA256 0924b290834e2a361a489cbc845a9bf04e56117597dc9c1a40e879cce655e4e2 SHA512 921ae8dd482719912f79f5affb6fa239290a954fb40625ac9fae2edf902989e5126ae7ca5c367b2b55c5387fb3cc3035ddf4e8b360743dbdee0f1b55ec33653c WHIRLPOOL e355781b06fba48d9ada859fe6fb515ddbfbac5a1d5c0918e8570e4566f68d644456606b5b0eb8e3e4cdc7c8b27a96b72cc1907008dff567cae71f0953968843 -DIST git-manpages-2.2.1.tar.xz 369796 SHA256 00f8357fd8ab9e3b397dd087b20d405ed141765d04f3f2162e65fdec7cb1e538 SHA512 9fea3a61afa7336c7da9a4c9c130ed4dd05bb3b5b1cc7fe5a3953109085169d9fb92aafd2b932e6b66ad93ac46e3b60ea05c0f311a8178b53bc1c2184773ada5 WHIRLPOOL f5d1f4d47a2bc244beb3a343db37fe6898fc121310cd6bec0d3292a3352a3c86e16b3538b22317419c760870fb511120a3b03c7bc0585bfaa15c1c7418a4e8ac -DIST git-manpages-2.2.2.tar.xz 369876 SHA256 d30688bb62763bf1b87f5eaf4c0a66c68999e479ccd2963108a5f6f82138147c SHA512 5c2220bb09f199ad4fe5c1bc20a813a6c62daab5e6e7fa87bf24861d25b7f7e0fdde215c4f59d8895badd7c361ed202e7837de48d2d54a155d24759db39dd4e1 WHIRLPOOL 45acc45663f13faf5b8197516bb934723bf84cd6db929443e2bd9fc3a915baf258ee93e782741e088a5f799115ea4ee6043225fc9ea9ec954feed21ba54c9be4 -DIST git-manpages-2.3.0.tar.xz 370864 SHA256 1641d4fb67159961b4c295d2d5a05954bae19ebcaaa67728b6d72b70020b7842 SHA512 aa54b9fd96831a690848ef6df708d45999f03bc45aab3600bf578c998bbb225f54a8999ee5012996cb9d6f28d0d18c97209329cfba557b86d3dd0da7a23b1c1b WHIRLPOOL 817db829cd9e9eba93dc537531fd861278baa410d5a9aca09b2010f299d87c744b8a20d707052c6f8d470a5be74dba7a3bba3d20390915cc2a3eed47e84acb75 -DIST git-manpages-2.3.1.tar.xz 370756 SHA256 c58b033af1b26baba78ffc940f4f5a0f16c3491a3f5708375d0bcf0d8031a940 SHA512 391ecf5e38921c9494b5f94e8f59d62f509934d1ef10f3b582632255a2bc62cbc894aa1bcd3018eb619516c1834b95bf7acbab6d73f859dbdcab094588fd4b61 WHIRLPOOL 01ed334a73bbb57c977e7f96fd63a7196b88be5560166df78c7250aa98e04dd48558a9775ddffba34d7c23318bc7d89eb53d06fae38b027349cdaabd39f107f2 -DIST git-manpages-2.4.0.tar.xz 372716 SHA256 b616dc6aa02dcac312e6aeae7af148913f76e1f851ba03ba340b4d2db316ecc7 SHA512 158bff66b9f73fc72d3ac6ac3246bebf831551c0ff1e9571913b952f5b891407ab4408ca2daa247869e50d43bb2e951eed6fdb3c39708c769630bbfc618f0efb WHIRLPOOL afed2ad93d6cf3deb571839d268a9aea66d4c2c8571b85a377a6ecd866df8ec8d07d22b65ddb9bc49ec7f16f8c9ecc54e936cd35325f2270264ae8d42e708b01 -DIST git-manpages-2.4.2.tar.xz 372804 SHA256 1b1830e804725e90ff319d801ab25f84ad956564379ef976bdc91bd58b743c32 SHA512 52f28cd537fc9fd34acad8834aa05d7d758e2f639df18b978effb676d5dbb660c99764075eb216c6377adb14b0b2d58584c8b3f635442bd4ded36a31b8757dc4 WHIRLPOOL f30b9293aa594111ce4baa46fee474b114199cc691ae43dea565a346f8ad7eb2cd72574bd6ddf9d5b32af020ad6032778cef3610ccac74d0f94be965b335962f -DIST git-manpages-2.4.4.tar.xz 373400 SHA256 4bf125ece40f33872c6d9ccd6d83ec0068de5216b4075eaee78e39d46b08c351 SHA512 548bebf0843beaa3b4962ddb711e002904b940e820815717959a2ada2fd0b2489b5f6112debd5192c47d18c867fc9c7c4fcb2fb219d7ce39356b7807d236c2a3 WHIRLPOOL 2be153a1f04da7062a1fef114fc77ceb35ade4fe773c3777c5469bf0803044022a6dbfd8a7fb16c2c051126142166bad7d9b22fe8b32bdf6c934a74337e4c413 -DIST git-manpages-2.4.6.tar.xz 373408 SHA256 f32d267bdaab75812dbd116d2b329d6dc7287a974e929e380e8cbf96e3822b8e SHA512 fa0562b8cc3e0421f7b45940f8cd4b58a5e58a1eb8571e2de85babf8ffd932fd210baa82aefe3c6090cb7dc51f64f299143be51beaacb37be97832b4a8e2a869 WHIRLPOOL 595beed93c621ffd9b7e0b507fc2941156975190eca8b638826ac32b6ea761bbb08f05e152dc88a7a3dbd168ab083a0128d61e72fae51cd0e94a8c91a1adb3ee -DIST git-manpages-2.5.0.tar.xz 377856 SHA256 1a6ea7220b1693eb384af0978a990ea8c0c634a7869d1ef63a2c8e427fc7f6ea SHA512 b3a5f2e8107c529ce81c1570a82472195e205ff1a8ddc75f4f0cbbf25f37a916700156df4418888c8a8a153ab58d5507a31027fb31faadeb5d4ba242847ab28d WHIRLPOOL 09f13622fff6a2b04a8ad584dab54c0b17cbfc6e803ca9e2deadab18071e50b50b37e395bb4746aff2e013f5b0025f8cdb1d439d8e6f3a659fad32646b30f4c7 diff --git a/dev-vcs/git-subversion/git-subversion-2.2.1.ebuild b/dev-vcs/git-subversion/git-subversion-2.2.1.ebuild deleted file mode 100644 index 5a9336a6..00000000 --- a/dev-vcs/git-subversion/git-subversion-2.2.1.ebuild +++ /dev/null @@ -1,264 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -GENTOO_DEPEND_ON_PERL=no - -PYTHON_COMPAT=( python2_{6,7} ) -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_MASTER=pu - -KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.1-Gentoo-patches.tar.gz" ) -inherit kog-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_PN="${PN/-subversion}" -MY_P="${MY_PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="Subversion module for GIT, the stupid content tracker" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_GOOG="http://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI+=" ${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - KEYWORDS="~amd64 ~x86" -else - #SRC_URI="" - KEYWORDS="" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="doc iconv nls +threads" - -RDEPEND="~dev-vcs/git-${PV}[-subversion,perl] - dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey - ${PYTHON_DEPS}" -DEPEND="app-arch/cpio - dev-lang/perl:=[-build(-)] - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - app-text/xmlto - )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc" -fi - -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} -" - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - # broken assumptions, because of broken build system ... - myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts="${myopts} INSTALL=install TAR=tar" - myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh" - myopts="${myopts} SANE_TOOL_PATH=" - myopts="${myopts} OLD_ICONV=" - myopts="${myopts} NO_EXTERNAL_GREP=" - - # split ebuild: avoid collisions with dev-vcs/git's .mo files - myopts="${myopts} NO_GETTEXT=YesPlease" - - # For svn-fe - #extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" - extlibs="-lz -lssl -lcrypto ${S}/xdiff/lib.a $(usex threads -lpthread '')" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - myopts="${myopts} INSTALLDIRS=vendor" - myopts="${myopts} NO_SVN_TESTS=YesPlease" - myopts="${myopts} NO_CVS=YesPlease" - - has_version '>=app-text/asciidoc-8.0' \ - && myopts="${myopts} ASCIIDOC8=YesPlease" - myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts="${myopts} NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" - export EXTLIBS="${extlibs}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - unpack ${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - use doc && \ - cd "${S}"/Documentation && \ - unpack ${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - fi - - kog-patches_unpack - -} - -src_prepare() { - # see the git ebuild for the list of patches - kog-patches_apply_all - - epatch_user - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die "sed failed" - - # Fix docbook2texi command - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - V=1 \ - "$@" - # This is the fix for bug #326625, but it also causes breakage, see bug - # #352693. - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ -} - -src_configure() { - exportmakeopts -} - -src_compile() { - #if use perl ; then - git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" - git_emake perl/perl.mak || die "emake perl/perl.mak failed" - #fi - - git_emake || die "emake failed" - - cd "${S}"/Documentation - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi - - cd "${S}"/contrib/svn-fe - # by defining EXTLIBS we override the detection for libintl and - # libiconv, bug #516168 - local nlsiconv= - use nls && use !elibc_glibc && nlsiconv+=" -lintl" - use iconv && use !elibc_glibc && nlsiconv+=" -liconv" - git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed" - if use doc ; then - git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" - fi -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - rm -r "${ED}"usr/share/gitweb || die - rm -r "${ED}"usr/bin || die - rm -r "${ED}"usr/share/git-core/templates || die - rm -r "${ED}"usr/share/git-gui || die - rm -r "${ED}"usr/share/gitk || die - - # avoid conflict with dev-vcs/git - # it looks weird but this binary is installed by git ebuild - # so removing in git-subversion - rm "${ED}"usr/libexec/git-core/git-remote-testsvn || die - - for myfile in "${ED}"usr/libexec/git-core/* "${ED}"usr/$(get_libdir)/* "${ED}"usr/share/man/*/*; do - case "$myfile" in - *svn*) - true ;; - *) - rm -r "${myfile}" || die ;; - esac - done - - local libdir="${ED}"usr/$(get_libdir) - if [ -d "${libdir}" ]; then - # must be empty - rmdir "${libdir}" || die - fi - - doman man*/*svn* || die - if use doc; then - docinto / - dodoc Documentation/*svn*.txt - dohtml -p / Documentation/*svn*.html - fi - - cd "${S}"/contrib/svn-fe - dobin svn-fe - dodoc svn-fe.txt - use doc && doman svn-fe.1 && dohtml svn-fe.html - cd "${S}" - - # kill empty dirs from ${ED} - find "${ED}" -type d -empty -delete || die -} diff --git a/dev-vcs/git-subversion/git-subversion-2.2.2.ebuild b/dev-vcs/git-subversion/git-subversion-2.2.2.ebuild deleted file mode 100644 index 8c0524c8..00000000 --- a/dev-vcs/git-subversion/git-subversion-2.2.2.ebuild +++ /dev/null @@ -1,261 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -GENTOO_DEPEND_ON_PERL=no - -PYTHON_COMPAT=( python2_{6,7} ) -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_MASTER=pu - -KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit kog-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_PN="${PN/-subversion}" -MY_P="${MY_PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="Subversion module for GIT, the stupid content tracker" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_GOOG="http://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI+=" ${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="doc iconv nls +threads" - -RDEPEND="~dev-vcs/git-${PV}[-subversion,perl] - dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey - ${PYTHON_DEPS}" -DEPEND="app-arch/cpio - dev-lang/perl:=[-build(-)] - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - app-text/xmlto - )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc" -fi - -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} -" - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - # broken assumptions, because of broken build system ... - myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts+=" INSTALL=install TAR=tar" - myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" - myopts+=" SANE_TOOL_PATH=" - myopts+=" OLD_ICONV=" - myopts+=" NO_EXTERNAL_GREP=" - - # split ebuild: avoid collisions with dev-vcs/git's .mo files - myopts+=" NO_GETTEXT=YesPlease" - - # For svn-fe - #extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" - extlibs="-lz -lssl -lcrypto ${S}/xdiff/lib.a $(usex threads -lpthread '')" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - myopts+=" INSTALLDIRS=vendor" - myopts+=" NO_SVN_TESTS=YesPlease" - myopts+=" NO_CVS=YesPlease" - - has_version '>=app-text/asciidoc-8.0' \ - && myopts+=" ASCIIDOC8=YesPlease" - myopts+=" ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts+=" NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" - export EXTLIBS="${extlibs}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - unpack ${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - use doc && \ - cd "${S}"/Documentation && \ - unpack ${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - fi - - kog-patches_unpack - -} - -src_prepare() { - # see the git ebuild for the list of patches - kog-patches_apply_all - - epatch_user - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die "sed failed" - - # Fix docbook2texi command - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - V=1 \ - "$@" - # This is the fix for bug #326625, but it also causes breakage, see bug - # #352693. - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ -} - -src_configure() { - exportmakeopts -} - -src_compile() { - #if use perl ; then - git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" - git_emake perl/perl.mak || die "emake perl/perl.mak failed" - #fi - - git_emake || die "emake failed" - - cd "${S}"/Documentation - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi - - cd "${S}"/contrib/svn-fe - # by defining EXTLIBS we override the detection for libintl and - # libiconv, bug #516168 - local nlsiconv= - use nls && use !elibc_glibc && nlsiconv+=" -lintl" - use iconv && use !elibc_glibc && nlsiconv+=" -liconv" - git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed" - if use doc ; then - git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" - fi -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - rm -r "${ED}"usr/share/gitweb || die - rm -r "${ED}"usr/bin || die - rm -r "${ED}"usr/share/git-core/templates || die - rm -r "${ED}"usr/share/git-gui || die - rm -r "${ED}"usr/share/gitk || die - - # avoid conflict with dev-vcs/git - # it looks weird but this binary is installed by git ebuild - # so removing in git-subversion - rm "${ED}"usr/libexec/git-core/git-remote-testsvn || die - - for myfile in "${ED}"usr/libexec/git-core/* "${ED}"usr/$(get_libdir)/* "${ED}"usr/share/man/*/*; do - case "$myfile" in - *svn*) - true ;; - *) - rm -r "${myfile}" || die ;; - esac - done - - local libdir=${ED}usr/$(get_libdir) - if [[ -d ${libdir} ]]; then - # must be empty - rmdir "${libdir}" || die - fi - - doman man*/*svn* || die - if use doc; then - docinto / - dodoc Documentation/*svn*.txt - dohtml -p / Documentation/*svn*.html - fi - - cd "${S}"/contrib/svn-fe - dobin svn-fe - dodoc svn-fe.txt - use doc && doman svn-fe.1 && dohtml svn-fe.html - cd "${S}" - - # kill empty dirs from ${ED} - find "${ED}" -type d -empty -delete || die -} diff --git a/dev-vcs/git-subversion/git-subversion-2.3.0.ebuild b/dev-vcs/git-subversion/git-subversion-2.3.0.ebuild deleted file mode 100644 index 8c0524c8..00000000 --- a/dev-vcs/git-subversion/git-subversion-2.3.0.ebuild +++ /dev/null @@ -1,261 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -GENTOO_DEPEND_ON_PERL=no - -PYTHON_COMPAT=( python2_{6,7} ) -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_MASTER=pu - -KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit kog-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_PN="${PN/-subversion}" -MY_P="${MY_PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="Subversion module for GIT, the stupid content tracker" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_GOOG="http://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI+=" ${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="doc iconv nls +threads" - -RDEPEND="~dev-vcs/git-${PV}[-subversion,perl] - dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey - ${PYTHON_DEPS}" -DEPEND="app-arch/cpio - dev-lang/perl:=[-build(-)] - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - app-text/xmlto - )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc" -fi - -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} -" - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - # broken assumptions, because of broken build system ... - myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts+=" INSTALL=install TAR=tar" - myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" - myopts+=" SANE_TOOL_PATH=" - myopts+=" OLD_ICONV=" - myopts+=" NO_EXTERNAL_GREP=" - - # split ebuild: avoid collisions with dev-vcs/git's .mo files - myopts+=" NO_GETTEXT=YesPlease" - - # For svn-fe - #extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" - extlibs="-lz -lssl -lcrypto ${S}/xdiff/lib.a $(usex threads -lpthread '')" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - myopts+=" INSTALLDIRS=vendor" - myopts+=" NO_SVN_TESTS=YesPlease" - myopts+=" NO_CVS=YesPlease" - - has_version '>=app-text/asciidoc-8.0' \ - && myopts+=" ASCIIDOC8=YesPlease" - myopts+=" ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts+=" NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" - export EXTLIBS="${extlibs}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - unpack ${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - use doc && \ - cd "${S}"/Documentation && \ - unpack ${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - fi - - kog-patches_unpack - -} - -src_prepare() { - # see the git ebuild for the list of patches - kog-patches_apply_all - - epatch_user - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die "sed failed" - - # Fix docbook2texi command - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - V=1 \ - "$@" - # This is the fix for bug #326625, but it also causes breakage, see bug - # #352693. - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ -} - -src_configure() { - exportmakeopts -} - -src_compile() { - #if use perl ; then - git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" - git_emake perl/perl.mak || die "emake perl/perl.mak failed" - #fi - - git_emake || die "emake failed" - - cd "${S}"/Documentation - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi - - cd "${S}"/contrib/svn-fe - # by defining EXTLIBS we override the detection for libintl and - # libiconv, bug #516168 - local nlsiconv= - use nls && use !elibc_glibc && nlsiconv+=" -lintl" - use iconv && use !elibc_glibc && nlsiconv+=" -liconv" - git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed" - if use doc ; then - git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" - fi -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - rm -r "${ED}"usr/share/gitweb || die - rm -r "${ED}"usr/bin || die - rm -r "${ED}"usr/share/git-core/templates || die - rm -r "${ED}"usr/share/git-gui || die - rm -r "${ED}"usr/share/gitk || die - - # avoid conflict with dev-vcs/git - # it looks weird but this binary is installed by git ebuild - # so removing in git-subversion - rm "${ED}"usr/libexec/git-core/git-remote-testsvn || die - - for myfile in "${ED}"usr/libexec/git-core/* "${ED}"usr/$(get_libdir)/* "${ED}"usr/share/man/*/*; do - case "$myfile" in - *svn*) - true ;; - *) - rm -r "${myfile}" || die ;; - esac - done - - local libdir=${ED}usr/$(get_libdir) - if [[ -d ${libdir} ]]; then - # must be empty - rmdir "${libdir}" || die - fi - - doman man*/*svn* || die - if use doc; then - docinto / - dodoc Documentation/*svn*.txt - dohtml -p / Documentation/*svn*.html - fi - - cd "${S}"/contrib/svn-fe - dobin svn-fe - dodoc svn-fe.txt - use doc && doman svn-fe.1 && dohtml svn-fe.html - cd "${S}" - - # kill empty dirs from ${ED} - find "${ED}" -type d -empty -delete || die -} diff --git a/dev-vcs/git-subversion/git-subversion-2.3.1.ebuild b/dev-vcs/git-subversion/git-subversion-2.3.1.ebuild deleted file mode 100644 index 8c0524c8..00000000 --- a/dev-vcs/git-subversion/git-subversion-2.3.1.ebuild +++ /dev/null @@ -1,261 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -GENTOO_DEPEND_ON_PERL=no - -PYTHON_COMPAT=( python2_{6,7} ) -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_MASTER=pu - -KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit kog-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_PN="${PN/-subversion}" -MY_P="${MY_PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="Subversion module for GIT, the stupid content tracker" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_GOOG="http://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI+=" ${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="doc iconv nls +threads" - -RDEPEND="~dev-vcs/git-${PV}[-subversion,perl] - dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey - ${PYTHON_DEPS}" -DEPEND="app-arch/cpio - dev-lang/perl:=[-build(-)] - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - app-text/xmlto - )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc" -fi - -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} -" - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - # broken assumptions, because of broken build system ... - myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts+=" INSTALL=install TAR=tar" - myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" - myopts+=" SANE_TOOL_PATH=" - myopts+=" OLD_ICONV=" - myopts+=" NO_EXTERNAL_GREP=" - - # split ebuild: avoid collisions with dev-vcs/git's .mo files - myopts+=" NO_GETTEXT=YesPlease" - - # For svn-fe - #extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" - extlibs="-lz -lssl -lcrypto ${S}/xdiff/lib.a $(usex threads -lpthread '')" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - myopts+=" INSTALLDIRS=vendor" - myopts+=" NO_SVN_TESTS=YesPlease" - myopts+=" NO_CVS=YesPlease" - - has_version '>=app-text/asciidoc-8.0' \ - && myopts+=" ASCIIDOC8=YesPlease" - myopts+=" ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts+=" NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" - export EXTLIBS="${extlibs}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - unpack ${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - use doc && \ - cd "${S}"/Documentation && \ - unpack ${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - fi - - kog-patches_unpack - -} - -src_prepare() { - # see the git ebuild for the list of patches - kog-patches_apply_all - - epatch_user - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die "sed failed" - - # Fix docbook2texi command - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - V=1 \ - "$@" - # This is the fix for bug #326625, but it also causes breakage, see bug - # #352693. - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ -} - -src_configure() { - exportmakeopts -} - -src_compile() { - #if use perl ; then - git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" - git_emake perl/perl.mak || die "emake perl/perl.mak failed" - #fi - - git_emake || die "emake failed" - - cd "${S}"/Documentation - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi - - cd "${S}"/contrib/svn-fe - # by defining EXTLIBS we override the detection for libintl and - # libiconv, bug #516168 - local nlsiconv= - use nls && use !elibc_glibc && nlsiconv+=" -lintl" - use iconv && use !elibc_glibc && nlsiconv+=" -liconv" - git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed" - if use doc ; then - git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" - fi -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - rm -r "${ED}"usr/share/gitweb || die - rm -r "${ED}"usr/bin || die - rm -r "${ED}"usr/share/git-core/templates || die - rm -r "${ED}"usr/share/git-gui || die - rm -r "${ED}"usr/share/gitk || die - - # avoid conflict with dev-vcs/git - # it looks weird but this binary is installed by git ebuild - # so removing in git-subversion - rm "${ED}"usr/libexec/git-core/git-remote-testsvn || die - - for myfile in "${ED}"usr/libexec/git-core/* "${ED}"usr/$(get_libdir)/* "${ED}"usr/share/man/*/*; do - case "$myfile" in - *svn*) - true ;; - *) - rm -r "${myfile}" || die ;; - esac - done - - local libdir=${ED}usr/$(get_libdir) - if [[ -d ${libdir} ]]; then - # must be empty - rmdir "${libdir}" || die - fi - - doman man*/*svn* || die - if use doc; then - docinto / - dodoc Documentation/*svn*.txt - dohtml -p / Documentation/*svn*.html - fi - - cd "${S}"/contrib/svn-fe - dobin svn-fe - dodoc svn-fe.txt - use doc && doman svn-fe.1 && dohtml svn-fe.html - cd "${S}" - - # kill empty dirs from ${ED} - find "${ED}" -type d -empty -delete || die -} diff --git a/dev-vcs/git-subversion/git-subversion-2.4.0.ebuild b/dev-vcs/git-subversion/git-subversion-2.4.0.ebuild deleted file mode 100644 index bdf08653..00000000 --- a/dev-vcs/git-subversion/git-subversion-2.4.0.ebuild +++ /dev/null @@ -1,262 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -GENTOO_DEPEND_ON_PERL=no - -PYTHON_COMPAT=( python2_7 ) -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_MASTER=pu - -KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit kog-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_PN="${PN/-subversion}" -MY_P="${MY_PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="Subversion module for GIT, the stupid content tracker" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_GOOG="http://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - KEYWORDS="~amd64 ~x86" -fi - -kog-patches_update_SRC_URI - -LICENSE="GPL-2" -SLOT="0" -IUSE="doc iconv nls +threads" - -RDEPEND="~dev-vcs/git-${PV}[-subversion,perl] - dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey - ${PYTHON_DEPS}" -DEPEND="dev-lang/perl:=[-build(-)] - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - app-text/xmlto - )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc" -fi - -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} -" - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - # broken assumptions, because of broken build system ... - myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts+=" INSTALL=install TAR=tar" - myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" - myopts+=" SANE_TOOL_PATH=" - myopts+=" OLD_ICONV=" - myopts+=" NO_EXTERNAL_GREP=" - - # split ebuild: avoid collisions with dev-vcs/git's .mo files - myopts+=" NO_GETTEXT=YesPlease" - - # For svn-fe - #extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" - extlibs="-lz -lssl -lcrypto ${S}/xdiff/lib.a $(usex threads -lpthread '')" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - myopts+=" INSTALLDIRS=vendor" - myopts+=" NO_SVN_TESTS=YesPlease" - myopts+=" NO_CVS=YesPlease" - - has_version '>=app-text/asciidoc-8.0' \ - && myopts+=" ASCIIDOC8=YesPlease" - myopts+=" ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts+=" NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" - export EXTLIBS="${extlibs}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - unpack ${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - use doc && \ - cd "${S}"/Documentation && \ - unpack ${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - fi - - kog-patches_unpack - -} - -src_prepare() { - # see the git ebuild for the list of patches - kog-patches_apply_all - - epatch_user - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die "sed failed" - - # Fix docbook2texi command - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - V=1 \ - "$@" - # This is the fix for bug #326625, but it also causes breakage, see bug - # #352693. - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ -} - -src_configure() { - exportmakeopts -} - -src_compile() { - #if use perl ; then - git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" - git_emake perl/perl.mak || die "emake perl/perl.mak failed" - #fi - - git_emake || die "emake failed" - - cd "${S}"/Documentation - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi - - cd "${S}"/contrib/svn-fe - # by defining EXTLIBS we override the detection for libintl and - # libiconv, bug #516168 - local nlsiconv= - use nls && use !elibc_glibc && nlsiconv+=" -lintl" - use iconv && use !elibc_glibc && nlsiconv+=" -liconv" - git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed" - if use doc ; then - git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" - fi -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - rm -r "${ED}"usr/share/gitweb || die - rm -r "${ED}"usr/bin || die - rm -r "${ED}"usr/share/git-core/templates || die - rm -r "${ED}"usr/share/git-gui || die - rm -r "${ED}"usr/share/gitk || die - - # avoid conflict with dev-vcs/git - # it looks weird but this binary is installed by git ebuild - # so removing in git-subversion - rm "${ED}"usr/libexec/git-core/git-remote-testsvn || die - - for myfile in "${ED}"usr/libexec/git-core/* "${ED}"usr/$(get_libdir)/* "${ED}"usr/share/man/*/*; do - case "$myfile" in - *svn*) - true ;; - *) - rm -r "${myfile}" || die ;; - esac - done - - local libdir=${ED}usr/$(get_libdir) - if [[ -d ${libdir} ]]; then - # must be empty - rmdir "${libdir}" || die - fi - - doman man*/*svn* || die - if use doc; then - docinto / - dodoc Documentation/*svn*.txt - dohtml -p / Documentation/*svn*.html - fi - - cd "${S}"/contrib/svn-fe - dobin svn-fe - dodoc svn-fe.txt - use doc && doman svn-fe.1 && dohtml svn-fe.html - cd "${S}" - - # kill empty dirs from ${ED} - find "${ED}" -type d -empty -delete || die -} diff --git a/dev-vcs/git-subversion/git-subversion-2.4.2.ebuild b/dev-vcs/git-subversion/git-subversion-2.4.2.ebuild deleted file mode 100644 index bdf08653..00000000 --- a/dev-vcs/git-subversion/git-subversion-2.4.2.ebuild +++ /dev/null @@ -1,262 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -GENTOO_DEPEND_ON_PERL=no - -PYTHON_COMPAT=( python2_7 ) -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_MASTER=pu - -KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit kog-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_PN="${PN/-subversion}" -MY_P="${MY_PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="Subversion module for GIT, the stupid content tracker" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_GOOG="http://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - KEYWORDS="~amd64 ~x86" -fi - -kog-patches_update_SRC_URI - -LICENSE="GPL-2" -SLOT="0" -IUSE="doc iconv nls +threads" - -RDEPEND="~dev-vcs/git-${PV}[-subversion,perl] - dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey - ${PYTHON_DEPS}" -DEPEND="dev-lang/perl:=[-build(-)] - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - app-text/xmlto - )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc" -fi - -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} -" - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - # broken assumptions, because of broken build system ... - myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts+=" INSTALL=install TAR=tar" - myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" - myopts+=" SANE_TOOL_PATH=" - myopts+=" OLD_ICONV=" - myopts+=" NO_EXTERNAL_GREP=" - - # split ebuild: avoid collisions with dev-vcs/git's .mo files - myopts+=" NO_GETTEXT=YesPlease" - - # For svn-fe - #extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" - extlibs="-lz -lssl -lcrypto ${S}/xdiff/lib.a $(usex threads -lpthread '')" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - myopts+=" INSTALLDIRS=vendor" - myopts+=" NO_SVN_TESTS=YesPlease" - myopts+=" NO_CVS=YesPlease" - - has_version '>=app-text/asciidoc-8.0' \ - && myopts+=" ASCIIDOC8=YesPlease" - myopts+=" ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts+=" NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" - export EXTLIBS="${extlibs}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - unpack ${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - use doc && \ - cd "${S}"/Documentation && \ - unpack ${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - fi - - kog-patches_unpack - -} - -src_prepare() { - # see the git ebuild for the list of patches - kog-patches_apply_all - - epatch_user - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die "sed failed" - - # Fix docbook2texi command - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - V=1 \ - "$@" - # This is the fix for bug #326625, but it also causes breakage, see bug - # #352693. - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ -} - -src_configure() { - exportmakeopts -} - -src_compile() { - #if use perl ; then - git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" - git_emake perl/perl.mak || die "emake perl/perl.mak failed" - #fi - - git_emake || die "emake failed" - - cd "${S}"/Documentation - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi - - cd "${S}"/contrib/svn-fe - # by defining EXTLIBS we override the detection for libintl and - # libiconv, bug #516168 - local nlsiconv= - use nls && use !elibc_glibc && nlsiconv+=" -lintl" - use iconv && use !elibc_glibc && nlsiconv+=" -liconv" - git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed" - if use doc ; then - git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" - fi -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - rm -r "${ED}"usr/share/gitweb || die - rm -r "${ED}"usr/bin || die - rm -r "${ED}"usr/share/git-core/templates || die - rm -r "${ED}"usr/share/git-gui || die - rm -r "${ED}"usr/share/gitk || die - - # avoid conflict with dev-vcs/git - # it looks weird but this binary is installed by git ebuild - # so removing in git-subversion - rm "${ED}"usr/libexec/git-core/git-remote-testsvn || die - - for myfile in "${ED}"usr/libexec/git-core/* "${ED}"usr/$(get_libdir)/* "${ED}"usr/share/man/*/*; do - case "$myfile" in - *svn*) - true ;; - *) - rm -r "${myfile}" || die ;; - esac - done - - local libdir=${ED}usr/$(get_libdir) - if [[ -d ${libdir} ]]; then - # must be empty - rmdir "${libdir}" || die - fi - - doman man*/*svn* || die - if use doc; then - docinto / - dodoc Documentation/*svn*.txt - dohtml -p / Documentation/*svn*.html - fi - - cd "${S}"/contrib/svn-fe - dobin svn-fe - dodoc svn-fe.txt - use doc && doman svn-fe.1 && dohtml svn-fe.html - cd "${S}" - - # kill empty dirs from ${ED} - find "${ED}" -type d -empty -delete || die -} diff --git a/dev-vcs/git-subversion/git-subversion-2.4.4.ebuild b/dev-vcs/git-subversion/git-subversion-2.4.4.ebuild deleted file mode 100644 index dc8d3685..00000000 --- a/dev-vcs/git-subversion/git-subversion-2.4.4.ebuild +++ /dev/null @@ -1,262 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -GENTOO_DEPEND_ON_PERL=no - -PYTHON_COMPAT=( python2_7 ) -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_MASTER=pu - -KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit kog-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_PN="${PN/-subversion}" -MY_P="${MY_PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="Subversion module for GIT, the stupid content tracker" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_GOOG="http://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - KEYWORDS="amd64 x86" -fi - -kog-patches_update_SRC_URI - -LICENSE="GPL-2" -SLOT="0" -IUSE="doc iconv nls +threads" - -RDEPEND="~dev-vcs/git-${PV}[-subversion,perl] - dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey - ${PYTHON_DEPS}" -DEPEND="dev-lang/perl:=[-build(-)] - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - app-text/xmlto - )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc" -fi - -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} -" - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - # broken assumptions, because of broken build system ... - myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts+=" INSTALL=install TAR=tar" - myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" - myopts+=" SANE_TOOL_PATH=" - myopts+=" OLD_ICONV=" - myopts+=" NO_EXTERNAL_GREP=" - - # split ebuild: avoid collisions with dev-vcs/git's .mo files - myopts+=" NO_GETTEXT=YesPlease" - - # For svn-fe - #extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" - extlibs="-lz -lssl -lcrypto ${S}/xdiff/lib.a $(usex threads -lpthread '')" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - myopts+=" INSTALLDIRS=vendor" - myopts+=" NO_SVN_TESTS=YesPlease" - myopts+=" NO_CVS=YesPlease" - - has_version '>=app-text/asciidoc-8.0' \ - && myopts+=" ASCIIDOC8=YesPlease" - myopts+=" ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts+=" NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" - export EXTLIBS="${extlibs}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - unpack ${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - use doc && \ - cd "${S}"/Documentation && \ - unpack ${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - fi - - kog-patches_unpack - -} - -src_prepare() { - # see the git ebuild for the list of patches - kog-patches_apply_all - - epatch_user - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die "sed failed" - - # Fix docbook2texi command - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - V=1 \ - "$@" - # This is the fix for bug #326625, but it also causes breakage, see bug - # #352693. - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ -} - -src_configure() { - exportmakeopts -} - -src_compile() { - #if use perl ; then - git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" - git_emake perl/perl.mak || die "emake perl/perl.mak failed" - #fi - - git_emake || die "emake failed" - - cd "${S}"/Documentation - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi - - cd "${S}"/contrib/svn-fe - # by defining EXTLIBS we override the detection for libintl and - # libiconv, bug #516168 - local nlsiconv= - use nls && use !elibc_glibc && nlsiconv+=" -lintl" - use iconv && use !elibc_glibc && nlsiconv+=" -liconv" - git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed" - if use doc ; then - git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" - fi -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - rm -r "${ED}"usr/share/gitweb || die - rm -r "${ED}"usr/bin || die - rm -r "${ED}"usr/share/git-core/templates || die - rm -r "${ED}"usr/share/git-gui || die - rm -r "${ED}"usr/share/gitk || die - - # avoid conflict with dev-vcs/git - # it looks weird but this binary is installed by git ebuild - # so removing in git-subversion - rm "${ED}"usr/libexec/git-core/git-remote-testsvn || die - - for myfile in "${ED}"usr/libexec/git-core/* "${ED}"usr/$(get_libdir)/* "${ED}"usr/share/man/*/*; do - case "$myfile" in - *svn*) - true ;; - *) - rm -r "${myfile}" || die ;; - esac - done - - local libdir=${ED}usr/$(get_libdir) - if [[ -d ${libdir} ]]; then - # must be empty - rmdir "${libdir}" || die - fi - - doman man*/*svn* || die - if use doc; then - docinto / - dodoc Documentation/*svn*.txt - dohtml -p / Documentation/*svn*.html - fi - - cd "${S}"/contrib/svn-fe - dobin svn-fe - dodoc svn-fe.txt - use doc && doman svn-fe.1 && dohtml svn-fe.html - cd "${S}" - - # kill empty dirs from ${ED} - find "${ED}" -type d -empty -delete || die -} diff --git a/dev-vcs/git-subversion/git-subversion-2.4.6.ebuild b/dev-vcs/git-subversion/git-subversion-2.4.6.ebuild deleted file mode 100644 index bdf08653..00000000 --- a/dev-vcs/git-subversion/git-subversion-2.4.6.ebuild +++ /dev/null @@ -1,262 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -GENTOO_DEPEND_ON_PERL=no - -PYTHON_COMPAT=( python2_7 ) -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_MASTER=pu - -KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit kog-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_PN="${PN/-subversion}" -MY_P="${MY_PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="Subversion module for GIT, the stupid content tracker" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_GOOG="http://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - KEYWORDS="~amd64 ~x86" -fi - -kog-patches_update_SRC_URI - -LICENSE="GPL-2" -SLOT="0" -IUSE="doc iconv nls +threads" - -RDEPEND="~dev-vcs/git-${PV}[-subversion,perl] - dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey - ${PYTHON_DEPS}" -DEPEND="dev-lang/perl:=[-build(-)] - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - app-text/xmlto - )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc" -fi - -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} -" - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - # broken assumptions, because of broken build system ... - myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts+=" INSTALL=install TAR=tar" - myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" - myopts+=" SANE_TOOL_PATH=" - myopts+=" OLD_ICONV=" - myopts+=" NO_EXTERNAL_GREP=" - - # split ebuild: avoid collisions with dev-vcs/git's .mo files - myopts+=" NO_GETTEXT=YesPlease" - - # For svn-fe - #extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" - extlibs="-lz -lssl -lcrypto ${S}/xdiff/lib.a $(usex threads -lpthread '')" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - myopts+=" INSTALLDIRS=vendor" - myopts+=" NO_SVN_TESTS=YesPlease" - myopts+=" NO_CVS=YesPlease" - - has_version '>=app-text/asciidoc-8.0' \ - && myopts+=" ASCIIDOC8=YesPlease" - myopts+=" ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts+=" NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" - export EXTLIBS="${extlibs}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - unpack ${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - use doc && \ - cd "${S}"/Documentation && \ - unpack ${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - fi - - kog-patches_unpack - -} - -src_prepare() { - # see the git ebuild for the list of patches - kog-patches_apply_all - - epatch_user - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die "sed failed" - - # Fix docbook2texi command - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - V=1 \ - "$@" - # This is the fix for bug #326625, but it also causes breakage, see bug - # #352693. - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ -} - -src_configure() { - exportmakeopts -} - -src_compile() { - #if use perl ; then - git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" - git_emake perl/perl.mak || die "emake perl/perl.mak failed" - #fi - - git_emake || die "emake failed" - - cd "${S}"/Documentation - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi - - cd "${S}"/contrib/svn-fe - # by defining EXTLIBS we override the detection for libintl and - # libiconv, bug #516168 - local nlsiconv= - use nls && use !elibc_glibc && nlsiconv+=" -lintl" - use iconv && use !elibc_glibc && nlsiconv+=" -liconv" - git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed" - if use doc ; then - git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" - fi -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - rm -r "${ED}"usr/share/gitweb || die - rm -r "${ED}"usr/bin || die - rm -r "${ED}"usr/share/git-core/templates || die - rm -r "${ED}"usr/share/git-gui || die - rm -r "${ED}"usr/share/gitk || die - - # avoid conflict with dev-vcs/git - # it looks weird but this binary is installed by git ebuild - # so removing in git-subversion - rm "${ED}"usr/libexec/git-core/git-remote-testsvn || die - - for myfile in "${ED}"usr/libexec/git-core/* "${ED}"usr/$(get_libdir)/* "${ED}"usr/share/man/*/*; do - case "$myfile" in - *svn*) - true ;; - *) - rm -r "${myfile}" || die ;; - esac - done - - local libdir=${ED}usr/$(get_libdir) - if [[ -d ${libdir} ]]; then - # must be empty - rmdir "${libdir}" || die - fi - - doman man*/*svn* || die - if use doc; then - docinto / - dodoc Documentation/*svn*.txt - dohtml -p / Documentation/*svn*.html - fi - - cd "${S}"/contrib/svn-fe - dobin svn-fe - dodoc svn-fe.txt - use doc && doman svn-fe.1 && dohtml svn-fe.html - cd "${S}" - - # kill empty dirs from ${ED} - find "${ED}" -type d -empty -delete || die -} diff --git a/dev-vcs/git-subversion/git-subversion-2.5.0.ebuild b/dev-vcs/git-subversion/git-subversion-2.5.0.ebuild deleted file mode 100644 index bdf08653..00000000 --- a/dev-vcs/git-subversion/git-subversion-2.5.0.ebuild +++ /dev/null @@ -1,262 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -GENTOO_DEPEND_ON_PERL=no - -PYTHON_COMPAT=( python2_7 ) -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_MASTER=pu - -KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit kog-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_PN="${PN/-subversion}" -MY_P="${MY_PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="Subversion module for GIT, the stupid content tracker" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_GOOG="http://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - KEYWORDS="~amd64 ~x86" -fi - -kog-patches_update_SRC_URI - -LICENSE="GPL-2" -SLOT="0" -IUSE="doc iconv nls +threads" - -RDEPEND="~dev-vcs/git-${PV}[-subversion,perl] - dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey - ${PYTHON_DEPS}" -DEPEND="dev-lang/perl:=[-build(-)] - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - app-text/xmlto - )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc" -fi - -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} -" - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - # broken assumptions, because of broken build system ... - myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts+=" INSTALL=install TAR=tar" - myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" - myopts+=" SANE_TOOL_PATH=" - myopts+=" OLD_ICONV=" - myopts+=" NO_EXTERNAL_GREP=" - - # split ebuild: avoid collisions with dev-vcs/git's .mo files - myopts+=" NO_GETTEXT=YesPlease" - - # For svn-fe - #extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" - extlibs="-lz -lssl -lcrypto ${S}/xdiff/lib.a $(usex threads -lpthread '')" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - myopts+=" INSTALLDIRS=vendor" - myopts+=" NO_SVN_TESTS=YesPlease" - myopts+=" NO_CVS=YesPlease" - - has_version '>=app-text/asciidoc-8.0' \ - && myopts+=" ASCIIDOC8=YesPlease" - myopts+=" ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts+=" NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" - export EXTLIBS="${extlibs}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - unpack ${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - use doc && \ - cd "${S}"/Documentation && \ - unpack ${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - fi - - kog-patches_unpack - -} - -src_prepare() { - # see the git ebuild for the list of patches - kog-patches_apply_all - - epatch_user - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die "sed failed" - - # Fix docbook2texi command - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - V=1 \ - "$@" - # This is the fix for bug #326625, but it also causes breakage, see bug - # #352693. - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ -} - -src_configure() { - exportmakeopts -} - -src_compile() { - #if use perl ; then - git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" - git_emake perl/perl.mak || die "emake perl/perl.mak failed" - #fi - - git_emake || die "emake failed" - - cd "${S}"/Documentation - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi - - cd "${S}"/contrib/svn-fe - # by defining EXTLIBS we override the detection for libintl and - # libiconv, bug #516168 - local nlsiconv= - use nls && use !elibc_glibc && nlsiconv+=" -lintl" - use iconv && use !elibc_glibc && nlsiconv+=" -liconv" - git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed" - if use doc ; then - git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" - fi -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - rm -r "${ED}"usr/share/gitweb || die - rm -r "${ED}"usr/bin || die - rm -r "${ED}"usr/share/git-core/templates || die - rm -r "${ED}"usr/share/git-gui || die - rm -r "${ED}"usr/share/gitk || die - - # avoid conflict with dev-vcs/git - # it looks weird but this binary is installed by git ebuild - # so removing in git-subversion - rm "${ED}"usr/libexec/git-core/git-remote-testsvn || die - - for myfile in "${ED}"usr/libexec/git-core/* "${ED}"usr/$(get_libdir)/* "${ED}"usr/share/man/*/*; do - case "$myfile" in - *svn*) - true ;; - *) - rm -r "${myfile}" || die ;; - esac - done - - local libdir=${ED}usr/$(get_libdir) - if [[ -d ${libdir} ]]; then - # must be empty - rmdir "${libdir}" || die - fi - - doman man*/*svn* || die - if use doc; then - docinto / - dodoc Documentation/*svn*.txt - dohtml -p / Documentation/*svn*.html - fi - - cd "${S}"/contrib/svn-fe - dobin svn-fe - dodoc svn-fe.txt - use doc && doman svn-fe.1 && dohtml svn-fe.html - cd "${S}" - - # kill empty dirs from ${ED} - find "${ED}" -type d -empty -delete || die -} diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest deleted file mode 100644 index 49e816ea..00000000 --- a/dev-vcs/git/Manifest +++ /dev/null @@ -1,28 +0,0 @@ -DIST git-2.2.1.tar.xz 3590808 SHA256 09422dc9a0bdddf6bdd5b8634c71e1ed3125256c47424e6a2687701e764ef450 SHA512 66bccfa617d2c8e2e61e5aac9b8daef9d4dc151b85906af252cadef3306ecf792ad6d7869deb149f0d04f6e7c3e9f71119bfeece5690e61782fb357e5384027b WHIRLPOOL f288d0227f3ad3045fd7dcc7a7fa6e68cb29c3a4d363d6648aa4f09aa5742a4496c67d63d0ad120a1f8f9420b9ae30930b8ffb3229f176cf429f8b8c8a1d06e6 -DIST git-2.2.2-Gentoo-patches.tar.gz 4605 SHA256 70613dd13269a919069deadda91e157928d4ea9ff3b3e54d7755552610275cd0 SHA512 cd7b27108a0cb9449c90c063d7506ae28004d95bc3379542adf77cd135345b591383b264398ede5d7ce946dca01cd064d30688ec6143588d969a1f9dfc896c8c WHIRLPOOL 1ecffa35d78eadda38a517f9c3b1e177e8a84541cabeba95ab670dfa9d8ada9a7f7817c592bd80e9e0b5993549d9e9c2c3325b2eda07a60164679b3048b1d403 -DIST git-2.2.2.tar.xz 3592264 SHA256 aa6d2efcc0c7bb9b9edc6d56d90921706b833972f1d2abe70f71be7838f22d05 SHA512 e3ca6f40de04ed940f521fff4c7e92446e40ad1627acc5b4c090ebf114dcf279d4b1f3efe1189ffa43192fce412165621fc12ea90e2f7d02a6a9ccda655dc69b WHIRLPOOL 9e20def83bbb9b11cb5982fc5f19b09767657ff80f02a237dff6ddaddd3209b4cfb9288bec1b6dc80c6a6db1869cfcaa90e2374279012fc8215771c1a58a1fc2 -DIST git-2.3.0.tar.xz 3608648 SHA256 94b23a14d66df536cfe7de37551f55acf908f8bddf30a0f5325a255bb57b0aca SHA512 4be85d3ba3ffac6c55cce648ab6c0a6fe89164e9657480aeee0def79289dbcba486722756b1729d0cedda6012cd582b88129d483ce916bfe06cde5a423f05bc7 WHIRLPOOL d08762cf37536a347aabb2916dce9d482313c41a180b5c440481d9574e9a6c482eb18e0055410171478010e647ae353d70f7113fa07fd8d74bb77909e327ea75 -DIST git-2.3.1.tar.xz 3609908 SHA256 1acc4b051576143eb41d80f5675476629588c7c5fb4e6a1dc2c4590f47c498b7 SHA512 f113a9e8c7f9879088de6fa6bfbe9363f25eac279d5eb218ea1f5186cd1c45609760f498a5c066196b3a6e15dd931960e94dcdc14685e8ef1c5c72524113c0cf WHIRLPOOL f1c15ded4f4785d244a5242c823fcf8d63d1c3408c1a1696c99926fdbcab76e23e40d3ee8225925e786ce8eae7597a73a7f9f6cd8e5f1ef7d599ac8b254f9951 -DIST git-2.4.0.tar.xz 3681516 SHA256 b33438dd94659958a74850aacae4a2b3a626baec36d7f29c266130b08045bb24 SHA512 0114c5d0dbfeed46e0ba1c8c0da463c52cae6954238547502f44d9050af0d921906beea96ff2c5f56a7c822200d9daa0f1d040f883c701b88a23ec81ac777138 WHIRLPOOL 1f4667b295e541d4f035de9e415636f317f590e104119a1b212cb321f25120df31e45ba88470ee883d1ea9a0033f2b307981c9d9e5807919475dbc5f81b6b22e -DIST git-2.4.2.tar.xz 3683880 SHA256 4801ec1cd8c2175b58cfdbc721d0bf50d74ae226f36905fceb894c2fb620c9e5 SHA512 0013069b73572fd764489222ad94cf94b9e08fc65223187a300e6662fb56b27dceea0b3a473cf8630793a5bf0c87e3b63264936bc38b66f71c6a548912540326 WHIRLPOOL 52d2fcd44c4da3f0e1f2caa229e1086b92022b992e410f3c20344f527f3cb9a623d3f0b6a8d5d66f3e4f43b9677f0211ebbaaffe85a621b784af1f5bc3f5896c -DIST git-2.4.4.tar.xz 3689492 SHA256 f873b15d42281474fcba5921295d01e48a3cd3cddcbeb3d60176bf30f5f30260 SHA512 b4d3401d1e4f40f74f8eb75194d1edf0107786b942cf5e3fd127e4a268ce31ec4954195519444cc84e34caca4569d6fd41edafa2037116f60320f2c59c6e7cdf WHIRLPOOL 6fd9d4076586f25154cb448315a1492ffe7acfa5bb811c54e342acc4fcf28da423ab0042f23aa579adefbefa6b3f5dc45c949a36744c94d5420780a2175bde85 -DIST git-2.4.6.tar.xz 3690432 SHA256 bdd944571c03474517b6c9941d6f1fd735eccbb164e59fd133d38644b69453b6 SHA512 2c95a00af81d6fbd8f4984e89d7cb23396caacadd684466aeb5a11f1b3acfbc625f832060cbef5aee0748e36c1fddcd88b3b9c26c4d7aec1d185e5f7311346ef WHIRLPOOL 1ae191666bf27a7e18686b910cbe610f85b5b7a43266232359615fa2a22b80bc659277b71b21394eab53df0c912d9ad911c7793c2a041cd6c7d768a5f0416f5b -DIST git-2.5.0.tar.xz 3740620 SHA256 cc59b1bac6c1c67a9159872863f6c5bbe0d9404cac2a85c3e9d9fa49923ce45c SHA512 ef7538c9f5ba5b2ac08962401c30e5fd51323b54b9fb5315d259adccec346e8fae9362815832dc2b5ce63a259b315c40e419bb2385dde04d84b992e62f6789b6 WHIRLPOOL 653e7aeb966dec44631bbd257a41935b2e957be9324311a4fd91f3a0ba6f1f674e2e59b4c564d70c4eeaea3788f0af9273a1d0a753b3bc820e687f0d63bddf5d -DIST git-htmldocs-2.2.1.tar.xz 975488 SHA256 dee32b06ecf26044169adf40d95cb301c4219416a65c94b89c6513a80f03863b SHA512 68843b883e2fd4f14646ff97ba9e5f3fd4de9f6bbf57a40e9c1bceb6578ebf497e50f2b808fdb4174966e26bf9ac068b44cfdf111652d15796f4f84a7406d336 WHIRLPOOL 771af06f8663eaaa6de4d117277ea05680671c6d72010653ad8e2b037b7a8d77b4a3733b6c48e4775971304b680d0df2596ed1cb4eedbf9948135912ac9509a3 -DIST git-htmldocs-2.2.2.tar.xz 976312 SHA256 41179ff0816189d583f290a227a73788002a319c7ff8c5cada970878c50b901d SHA512 b51b7d619e82d83b4f0b90d31bfccc30291a5beb48b2f5e5e59e75e91e5d772e89b560534a683648cd5480f4bf241f733efc87b30062ef5bb003bf0b5dbeed7f WHIRLPOOL c9dc7ac1a40559e4306d7d97a1619a272faf83d8b05c5a11f5f7b010566cd02fe853fee7eb550c6ccf744db446966a9696f9eb6feeee7ce4f976c6aa88b097d2 -DIST git-htmldocs-2.3.0.tar.xz 980936 SHA256 e8e202bae7a89f22a815e15753e9742f2e140b3c0ca548e9a831cfdbfad3a873 SHA512 c4d226784d89469c8faa72f29ab87594682ba46b1887769e29f87ce0db1ac241c9568a8b1530e6d28d43a9861acf803f93dddcc1db59cbe97e21d7b9e374c565 WHIRLPOOL 5bb37b7e7b317ffbf842616b00caad54d4594748726063d2b66c2ccc5fc125a88001506ddff63b15ebaccd7e8a96399bad383eec13dbd8bdc40d5cf7f8696e2b -DIST git-htmldocs-2.3.1.tar.xz 981748 SHA256 03bfc92c813a5cbbb34b61fdd7b9cf1226ad9b2b8388d24c649d915df3b93dad SHA512 da371b5a2b73a60681cd6f3b5385bee2668e0d617788194e454a531c2dab652c9b70920cb307858eb5ba15fd0c2d24635862e8f432946b0e9dfee8ee3fcb731a WHIRLPOOL 9334037067d797fd02ae0fd9f6d400ee14d68246755ac48e5897b404214923417728b04added2e05cb52cdc345b3ac9975752507e1e1278cedd74a33cac64b1b -DIST git-htmldocs-2.4.0.tar.xz 990744 SHA256 70ee1fdb70507c74832ac021e8940c8249d9b69f2b86aeaf0888ae41772e93a7 SHA512 03837e671a08f08ab7bd70676e234995b44a53ce27c648c50a6dd5ff97ba4400beb3d4b7874d6c8bde3a00624a7c2dc15d15299eb7ad9874d7dfd722f2c2256a WHIRLPOOL 4877dd0c5fb94f032d11d5d22a3e90e8352f68afb50400eca8c2f42e72adf40c7b9878c7998cacf16ed2011b85f965bcc5c44ecb3fd931783bd07b75b84b800b -DIST git-htmldocs-2.4.2.tar.xz 992192 SHA256 792cfc6c8236fdb58dfd66e39766c7b8097080361eed28443207bc6c36e07911 SHA512 e9790b698c50a09724ec9c71001a70f2a6a7094b72326f290f3b5c7b274181f331fdbb71cb4e2db9edf1229ae534a715b2974424b89d515b901b074bdeb30b66 WHIRLPOOL ef3de3704e7c0e34174b1e16f0837c52d9ce9d64c0f61c417a52811ca623ae17304a2b9d484457569d635a269b4dedb3e940bf0fa7d3db1bc4f744bf1d392ff1 -DIST git-htmldocs-2.4.4.tar.xz 994376 SHA256 e7f411f3eb3ecccc87e7d96afdcd8e72734a331170412eb37f240b731b2c2580 SHA512 1133dfa8a92358dbe6de35e22822b63bfbd418e8cd6290e1201738e5fc707fed1f50937d921f5323147cae75b89d452e8bd82768046685d7d2017dcd842766aa WHIRLPOOL 4684d5c4b7d8c7477ce658bd804280caab0721957786cb096a0acdf170e01a97d90eed7aca1d1f976ec79347cd9501c3ebed7ddf663ae785988e2abf36d9c054 -DIST git-htmldocs-2.4.6.tar.xz 994712 SHA256 5213e8b882293ec3cda247dabbc75c6ee5243b9d330a8fafec004952fae91a88 SHA512 782fbc38a611380c0af2631bd6123d568b02159fb46159c763d97d75bd84debe43105d83ac3f321cd8383e1334806857bce1a48563fd0c19b43f527fe18615a8 WHIRLPOOL 170e4ecc8255e6d5d562274e6e3fb75c2fc62e415586d61498b680a076c74248664fca35bb7c532009f7f22be4ad14d1fe047e14791991fa32373bd7053e0396 -DIST git-htmldocs-2.5.0.tar.xz 1008428 SHA256 0924b290834e2a361a489cbc845a9bf04e56117597dc9c1a40e879cce655e4e2 SHA512 921ae8dd482719912f79f5affb6fa239290a954fb40625ac9fae2edf902989e5126ae7ca5c367b2b55c5387fb3cc3035ddf4e8b360743dbdee0f1b55ec33653c WHIRLPOOL e355781b06fba48d9ada859fe6fb515ddbfbac5a1d5c0918e8570e4566f68d644456606b5b0eb8e3e4cdc7c8b27a96b72cc1907008dff567cae71f0953968843 -DIST git-manpages-2.2.1.tar.xz 369796 SHA256 00f8357fd8ab9e3b397dd087b20d405ed141765d04f3f2162e65fdec7cb1e538 SHA512 9fea3a61afa7336c7da9a4c9c130ed4dd05bb3b5b1cc7fe5a3953109085169d9fb92aafd2b932e6b66ad93ac46e3b60ea05c0f311a8178b53bc1c2184773ada5 WHIRLPOOL f5d1f4d47a2bc244beb3a343db37fe6898fc121310cd6bec0d3292a3352a3c86e16b3538b22317419c760870fb511120a3b03c7bc0585bfaa15c1c7418a4e8ac -DIST git-manpages-2.2.2.tar.xz 369876 SHA256 d30688bb62763bf1b87f5eaf4c0a66c68999e479ccd2963108a5f6f82138147c SHA512 5c2220bb09f199ad4fe5c1bc20a813a6c62daab5e6e7fa87bf24861d25b7f7e0fdde215c4f59d8895badd7c361ed202e7837de48d2d54a155d24759db39dd4e1 WHIRLPOOL 45acc45663f13faf5b8197516bb934723bf84cd6db929443e2bd9fc3a915baf258ee93e782741e088a5f799115ea4ee6043225fc9ea9ec954feed21ba54c9be4 -DIST git-manpages-2.3.0.tar.xz 370864 SHA256 1641d4fb67159961b4c295d2d5a05954bae19ebcaaa67728b6d72b70020b7842 SHA512 aa54b9fd96831a690848ef6df708d45999f03bc45aab3600bf578c998bbb225f54a8999ee5012996cb9d6f28d0d18c97209329cfba557b86d3dd0da7a23b1c1b WHIRLPOOL 817db829cd9e9eba93dc537531fd861278baa410d5a9aca09b2010f299d87c744b8a20d707052c6f8d470a5be74dba7a3bba3d20390915cc2a3eed47e84acb75 -DIST git-manpages-2.3.1.tar.xz 370756 SHA256 c58b033af1b26baba78ffc940f4f5a0f16c3491a3f5708375d0bcf0d8031a940 SHA512 391ecf5e38921c9494b5f94e8f59d62f509934d1ef10f3b582632255a2bc62cbc894aa1bcd3018eb619516c1834b95bf7acbab6d73f859dbdcab094588fd4b61 WHIRLPOOL 01ed334a73bbb57c977e7f96fd63a7196b88be5560166df78c7250aa98e04dd48558a9775ddffba34d7c23318bc7d89eb53d06fae38b027349cdaabd39f107f2 -DIST git-manpages-2.4.0.tar.xz 372716 SHA256 b616dc6aa02dcac312e6aeae7af148913f76e1f851ba03ba340b4d2db316ecc7 SHA512 158bff66b9f73fc72d3ac6ac3246bebf831551c0ff1e9571913b952f5b891407ab4408ca2daa247869e50d43bb2e951eed6fdb3c39708c769630bbfc618f0efb WHIRLPOOL afed2ad93d6cf3deb571839d268a9aea66d4c2c8571b85a377a6ecd866df8ec8d07d22b65ddb9bc49ec7f16f8c9ecc54e936cd35325f2270264ae8d42e708b01 -DIST git-manpages-2.4.2.tar.xz 372804 SHA256 1b1830e804725e90ff319d801ab25f84ad956564379ef976bdc91bd58b743c32 SHA512 52f28cd537fc9fd34acad8834aa05d7d758e2f639df18b978effb676d5dbb660c99764075eb216c6377adb14b0b2d58584c8b3f635442bd4ded36a31b8757dc4 WHIRLPOOL f30b9293aa594111ce4baa46fee474b114199cc691ae43dea565a346f8ad7eb2cd72574bd6ddf9d5b32af020ad6032778cef3610ccac74d0f94be965b335962f -DIST git-manpages-2.4.4.tar.xz 373400 SHA256 4bf125ece40f33872c6d9ccd6d83ec0068de5216b4075eaee78e39d46b08c351 SHA512 548bebf0843beaa3b4962ddb711e002904b940e820815717959a2ada2fd0b2489b5f6112debd5192c47d18c867fc9c7c4fcb2fb219d7ce39356b7807d236c2a3 WHIRLPOOL 2be153a1f04da7062a1fef114fc77ceb35ade4fe773c3777c5469bf0803044022a6dbfd8a7fb16c2c051126142166bad7d9b22fe8b32bdf6c934a74337e4c413 -DIST git-manpages-2.4.6.tar.xz 373408 SHA256 f32d267bdaab75812dbd116d2b329d6dc7287a974e929e380e8cbf96e3822b8e SHA512 fa0562b8cc3e0421f7b45940f8cd4b58a5e58a1eb8571e2de85babf8ffd932fd210baa82aefe3c6090cb7dc51f64f299143be51beaacb37be97832b4a8e2a869 WHIRLPOOL 595beed93c621ffd9b7e0b507fc2941156975190eca8b638826ac32b6ea761bbb08f05e152dc88a7a3dbd168ab083a0128d61e72fae51cd0e94a8c91a1adb3ee -DIST git-manpages-2.5.0.tar.xz 377856 SHA256 1a6ea7220b1693eb384af0978a990ea8c0c634a7869d1ef63a2c8e427fc7f6ea SHA512 b3a5f2e8107c529ce81c1570a82472195e205ff1a8ddc75f4f0cbbf25f37a916700156df4418888c8a8a153ab58d5507a31027fb31faadeb5d4ba242847ab28d WHIRLPOOL 09f13622fff6a2b04a8ad584dab54c0b17cbfc6e803ca9e2deadab18071e50b50b37e395bb4746aff2e013f5b0025f8cdb1d439d8e6f3a659fad32646b30f4c7 diff --git a/dev-vcs/git/files/git-daemon-r1.initd b/dev-vcs/git/files/git-daemon-r1.initd deleted file mode 100644 index 339b6238..00000000 --- a/dev-vcs/git/files/git-daemon-r1.initd +++ /dev/null @@ -1,13 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/files/git-daemon-r1.initd,v 1.2 2014/02/07 07:59:03 polynomial-c Exp $ - -pidfile="/run/git-daemon.pid" -command="/usr/bin/git" -command_args="daemon ${GITDAEMON_OPTS}" -start_stop_daemon_args="-b -m -p ${pidfile} -u ${GIT_USER:-nobody}:${GIT_GROUP:-nobody}" - -depend() { - use logger -} diff --git a/dev-vcs/git/files/git-daemon.confd b/dev-vcs/git/files/git-daemon.confd deleted file mode 100644 index db77de5d..00000000 --- a/dev-vcs/git/files/git-daemon.confd +++ /dev/null @@ -1,19 +0,0 @@ -# conf.d file for git-daemon -# -# Please check man 1 git-daemon for more information about the options -# git-daemon accepts. You MUST edit this to include your repositories you wish -# to serve. -# -# Some of the meaningful options are: -# --syslog --- Enables syslog logging -# --verbose --- Enables verbose logging -# --export-all --- Exports all repositories -# --port=XXXX --- Starts in port XXXX instead of 9418 -# -GITDAEMON_OPTS="--syslog --base-path=/var/git" - -# To run an anonymous git safely, the following user should be able to only -# read your Git repositories. It should not able able to write to anywhere on -# your system, esp. not the repositories. -GIT_USER="nobody" -GIT_GROUP="nobody" diff --git a/dev-vcs/git/files/git-daemon.socket b/dev-vcs/git/files/git-daemon.socket deleted file mode 100644 index 3dec01d2..00000000 --- a/dev-vcs/git/files/git-daemon.socket +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Git Activation Socket - -[Socket] -ListenStream=9418 -Accept=true - -[Install] -WantedBy=sockets.target diff --git a/dev-vcs/git/files/git-daemon.xinetd b/dev-vcs/git/files/git-daemon.xinetd deleted file mode 100644 index 02c938d4..00000000 --- a/dev-vcs/git/files/git-daemon.xinetd +++ /dev/null @@ -1,13 +0,0 @@ -service git-daemon -{ - disable = yes - socket_type = stream - wait = no - user = nobody - type = UNLISTED - protocol = tcp - log_on_failure += USERID - port = 9418 - server = /usr/bin/git - server_args = daemon --inetd --syslog --export-all --base-path=/var/git -} diff --git a/dev-vcs/git/files/git-daemon_at.service b/dev-vcs/git/files/git-daemon_at.service deleted file mode 100644 index 2a080d4e..00000000 --- a/dev-vcs/git/files/git-daemon_at.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Git Repositories Server Daemon -Documentation=man:git-daemon(1) - -[Service] -User=nobody -Group=nobody -EnvironmentFile=/etc/conf.d/git-daemon -# Ignore non-zero exit status, access error makes git-daemon return them -ExecStart=-/usr/libexec/git-core/git-daemon --inetd --base-path=/var/git --verbose $GITDAEMON_OPTS -StandardInput=socket -StandardOutput=inherit -StandardError=journal diff --git a/dev-vcs/git/git-2.2.1.ebuild b/dev-vcs/git/git-2.2.1.ebuild deleted file mode 100644 index 0758c91c..00000000 --- a/dev-vcs/git/git-2.2.1.ebuild +++ /dev/null @@ -1,649 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python2_{6,7} ) -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_MASTER=pu - -KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.1-Gentoo-patches.tar.gz" ) -inherit kog-patches toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_GOOG="http://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI+=" ${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - KEYWORDS="~amd64 ~x86" -else - #SRC_URI="" - KEYWORDS="" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - dev-libs/openssl - sys-libs/zlib - pcre? ( dev-libs/libpcre ) - perl? ( dev-lang/perl:=[-build(-)] ) - tk? ( dev-lang/tk ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs ) - gnome-keyring? ( gnome-base/libgnome-keyring )" - -RDEPEND="${CDEPEND} - gpg? ( app-crypt/gnupg ) - mediawiki? ( - dev-perl/HTML-Tree - dev-perl/MediaWiki-API - ) - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) - cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - python? ( gtk? - ( - >=dev-python/pygtk-2.8[${PYTHON_USEDEP}] - >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}] - ) - ${PYTHON_DEPS} )" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - app-arch/cpio - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - app-text/xmlto - ) - nls? ( sys-devel/gettext ) - test? ( app-crypt/gnupg )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - cgi? ( perl ) - cvs? ( perl ) - mediawiki? ( perl ) - subversion? ( perl ) - webdav? ( curl ) - gtk? ( python ) - python? ( ${PYTHON_REQUIRED_USE} ) -" - -pkg_setup() { - if use subversion && has_version "dev-vcs/subversion[dso]"; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi - if use python ; then - python-single-r1_pkg_setup - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use blksha1 ; then - myopts="${myopts} BLK_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts="${myopts} PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts="${myopts} NO_EXPAT=YesPlease" - else - myopts="${myopts} NO_CURL=YesPlease" - fi - - # broken assumptions, because of broken build system ... - myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts="${myopts} INSTALL=install TAR=tar" - myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh" - myopts="${myopts} SANE_TOOL_PATH=" - myopts="${myopts} OLD_ICONV=" - myopts="${myopts} NO_EXTERNAL_GREP=" - - # For svn-fe - extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - use iconv \ - || myopts="${myopts} NO_ICONV=YesPlease" - use nls \ - || myopts="${myopts} NO_GETTEXT=YesPlease" - use tk \ - || myopts="${myopts} NO_TCLTK=YesPlease" - use pcre \ - && myopts="${myopts} USE_LIBPCRE=yes" \ - && extlibs="${extlibs} -lpcre" - use perl \ - && myopts="${myopts} INSTALLDIRS=vendor" \ - || myopts="${myopts} NO_PERL=YesPlease" - use python \ - || myopts="${myopts} NO_PYTHON=YesPlease" - use subversion \ - || myopts="${myopts} NO_SVN_TESTS=YesPlease" - use threads \ - && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" \ - || myopts="${myopts} NO_PTHREADS=YesPlease" - use cvs \ - || myopts="${myopts} NO_CVS=YesPlease" -# Disabled until ~m68k-mint can be keyworded again -# if [[ ${CHOST} == *-mint* ]] ; then -# myopts="${myopts} NO_MMAP=YesPlease" -# myopts="${myopts} NO_IPV6=YesPlease" -# myopts="${myopts} NO_STRLCPY=YesPlease" -# myopts="${myopts} NO_MEMMEM=YesPlease" -# myopts="${myopts} NO_MKDTEMP=YesPlease" -# myopts="${myopts} NO_MKSTEMPS=YesPlease" -# fi - if [[ ${CHOST} == ia64-*-hpux* ]]; then - myopts="${myopts} NO_NSEC=YesPlease" - fi - if [[ ${CHOST} == *-*-aix* ]]; then - myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease" - fi - if [[ ${CHOST} == *-solaris* ]]; then - myopts="${myopts} NEEDS_LIBICONV=YesPlease" - fi - - has_version '>=app-text/asciidoc-8.0' \ - && myopts="${myopts} ASCIIDOC8=YesPlease" - myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts="${myopts} NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" - export EXTLIBS="${extlibs}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - - kog-patches_unpack -} - -src_prepare() { - # bug #350330 - automagic CVS when we don't want it is bad. - # git-...-optional-cvs.patch - - # git-...-mw-vendor.patch - # git-...-svn-fe-linking.patch - kog-patches_apply_all - - epatch_user - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL - - # Fix docbook2texi command - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # Fix git-subtree missing DESTDIR - sed -i \ - -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \ - -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \ - contrib/subtree/Makefile -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="" - use python && PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - V=1 \ - "$@" - # This is the fix for bug #326625, but it also causes breakage, see bug - # #352693. - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ -} - -src_configure() { - exportmakeopts -} - -src_compile() { - if use perl ; then - git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" - git_emake perl/perl.mak || die "emake perl/perl.mak failed" - fi - git_emake || die "emake failed" - - if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el - fi - - if use perl && use cgi ; then - git_emake \ - gitweb/gitweb.cgi \ - || die "emake gitweb/gitweb.cgi failed" - fi - - if [[ ${CHOST} == *-darwin* ]]; then - cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain" - git_emake || die "emake credential-osxkeychain" - fi - - cd "${S}"/Documentation - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi - - if use subversion ; then - cd "${S}"/contrib/svn-fe - # by defining EXTLIBS we override the detection for libintl and - # libiconv, bug #516168 - local nlsiconv= - use nls && use !elibc_glibc && nlsiconv+=" -lintl" - use iconv && use !elibc_glibc && nlsiconv+=" -liconv" - git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed" - if use doc ; then - git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" - fi - cd "${S}" - fi - - if use gnome-keyring ; then - cd "${S}"/contrib/credential/gnome-keyring - git_emake || die "emake git-credential-gnome-keyring failed" - fi - - cd "${S}"/contrib/subtree - git_emake - use doc && git_emake doc - - if use mediawiki ; then - cd "${S}"/contrib/mw-to-git - git_emake - fi -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - if [[ ${CHOST} == *-darwin* ]]; then - dobin contrib/credential/osxkeychain/git-credential-osxkeychain - fi - - # Depending on the tarball and manual rebuild of the documentation, the - # manpages may exist in either OR both of these directories. - if ! use cvs; then - find man? -name "*git*cvs*" | xargs rm - fi - find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] - find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] - - dodoc README Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - for d in / /howto/ /technical/ ; do - docinto ${d} - dodoc Documentation${d}*.txt - use doc && dohtml -p ${d} Documentation${d}*.html - done - docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info - - newbashcomp contrib/completion/git-completion.bash ${PN} - bashcomp_alias git gitk - # Not really a bash-completion file (bug #477920) - # but still needed uncompressed (bug #507480) - insinto /usr/share/${PN} - doins contrib/completion/git-prompt.sh - - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - fi - - if use python && use gtk ; then - python_doscript "${S}"/contrib/gitview/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - fi - - #dobin contrib/fast-import/git-p4 # Moved upstream - #dodoc contrib/fast-import/git-p4.txt # Moved upstream - newbin contrib/fast-import/import-tars.perl import-tars - exeinto /usr/libexec/git-core/ - newexe contrib/git-resurrect.sh git-resurrect - - # git-subtree - cd "${S}"/contrib/subtree - git_emake install || die "Failed to emake install git-subtree" - if use doc ; then - git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree" - fi - newdoc README README.git-subtree - dodoc git-subtree.txt - cd "${S}" - - if use mediawiki ; then - cd "${S}"/contrib/mw-to-git - git_emake install - cd "${S}" - fi - - # diff-highlight - dobin contrib/diff-highlight/diff-highlight - newdoc contrib/diff-highlight/README README.diff-highlight - - # git-jump - exeinto /usr/libexec/git-core/ - doexe contrib/git-jump/git-jump - newdoc contrib/git-jump/README git-jump.txt - - # git-contacts - exeinto /usr/libexec/git-core/ - doexe contrib/contacts/git-contacts - dodoc contrib/contacts/git-contacts.txt - - if use gnome-keyring ; then - cd "${S}"/contrib/credential/gnome-keyring - dobin git-credential-gnome-keyring - fi - - if use subversion ; then - cd "${S}"/contrib/svn-fe - dobin svn-fe - dodoc svn-fe.txt - use doc && doman svn-fe.1 && dohtml svn-fe.html - cd "${S}" - fi - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # completion - installed above - # credential/gnome-keyring TODO - # diff-highlight - done above - # emacs - installed above - # examples - these are stuff that is not used in Git anymore actually - # git-jump - done above - # gitview - installed above - # p4import - excluded because fast-import has a better one - # patches - stuff the Git guys made to go upstream to other places - # persistent-https - TODO - # mw-to-git - TODO - # subtree - build seperately - # svnimport - use git-svn - # thunderbird-patch-inline - fixes thunderbird - for i in \ - buildsystems convert-objects fast-import \ - hg-to-git hooks remotes2config.sh rerere-train.sh \ - stats workdir \ - ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - # We used to install in /usr/share/${PN}/gitweb - # but upstream installs in /usr/share/gitweb - # so we will install a symlink and use their location for compat with other - # distros - dosym /usr/share/gitweb /usr/share/${PN}/gitweb - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - find "${ED}"/usr/lib64/perl5/ \ - -name .packlist \ - -exec rm \{\} \; - else - rm -rf "${ED}"/usr/share/gitweb - fi - - if ! use subversion ; then - rm -f "${ED}"/usr/libexec/git-core/git-svn \ - "${ED}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - if use !prefix; then - newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service" - systemd_dounit "${FILESDIR}/git-daemon.socket" - fi - - perl_delete_localpod - - # burn CVS with fire, see #373439 - if ! use cvs; then - rm -r "${ED}"/usr/bin/git-cvsserver \ - "${ED}"/usr/libexec/git-core/git-cvs* || die - fi -} - -src_test() { - local disabled="" #t7004-tag.sh" #520270 - local tests_cvs="t9200-git-cvsexportcommit.sh \ - t9400-git-cvsserver-server.sh \ - t9401-git-cvsserver-crlf.sh \ - t9402-git-cvsserver-refs.sh \ - t9600-cvsimport.sh \ - t9601-cvsimport-vendor-branch.sh \ - t9602-cvsimport-branches-tags.sh \ - t9603-cvsimport-patchsets.sh \ - t9604-cvsimport-timestamps.sh" - local tests_perl="t3701-add-interactive.sh \ - t5502-quickfetch.sh \ - t5512-ls-remote.sh \ - t5520-pull.sh \ - t7106-reset-unborn-branch.sh \ - t7501-commit.sh" - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot="t0001-init.sh \ - t0004-unwritable.sh \ - t0070-fundamental.sh \ - t1004-read-tree-m-u-wf.sh \ - t3700-add.sh \ - t7300-clean.sh" - # t9100 still fails with symlinks in SVN 1.7 - local test_svn="t9100-git-svn-basic.sh" - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled="${disabled} t5000-tar-tree.sh" - fi - - cvs=0 - use cvs && let cvs=$cvs+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ $cvs -eq 1 ]]; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled="${disabled} ${tests_cvs}" - fi - einfo "Skipping other tests that require being non-root" - disabled="${disabled} ${tests_nonroot}" - else - [[ $cvs -gt 0 ]] && \ - has_version dev-vcs/cvs && \ - let cvs=$cvs+1 - [[ $cvs -gt 1 ]] && \ - has_version "dev-vcs/cvs[server]" && \ - let cvs=$cvs+1 - if [[ $cvs -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled="${disabled} ${tests_cvs}" - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled="${disabled} ${tests_perl}" - fi - - einfo "Disabling tests that fail with SVN 1.7" - disabled="${disabled} ${test_svn}" - - # Reset all previously disabled tests - cd "${S}/t" - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" - done - - # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ - -i "${S}"/t/Makefile - - # Clean old results first, must always run - cd "${S}/t" - nonfatal git_emake clean - - # Now run the tests, keep going if we hit an error, and don't terminate on - # failure - cd "${S}" - einfo "Start test run" - #MAKEOPTS=-j1 - nonfatal git_emake --keep-going test - rc=$? - - # Display nice results, now print the results - cd "${S}/t" - nonfatal git_emake aggregate-results - - # And bail if there was a problem - [ $rc -eq 0 ] || die "tests failed. Please file a bug." -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - einfo "Please read /usr/share/bash-completion/git for Git bash command completion" - einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt" - einfo "Note that the prompt bash code is now in that separate script" - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-vcs/git/git-2.2.2.ebuild b/dev-vcs/git/git-2.2.2.ebuild deleted file mode 100644 index b6cf6bbb..00000000 --- a/dev-vcs/git/git-2.2.2.ebuild +++ /dev/null @@ -1,646 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python2_{6,7} ) -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_MASTER=pu - -KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit kog-patches toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_GOOG="http://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI+=" ${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - dev-libs/openssl - sys-libs/zlib - pcre? ( dev-libs/libpcre ) - perl? ( dev-lang/perl:=[-build(-)] ) - tk? ( dev-lang/tk ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs ) - gnome-keyring? ( gnome-base/libgnome-keyring )" - -RDEPEND="${CDEPEND} - gpg? ( app-crypt/gnupg ) - mediawiki? ( - dev-perl/HTML-Tree - dev-perl/MediaWiki-API - ) - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) - cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - python? ( gtk? - ( - >=dev-python/pygtk-2.8[${PYTHON_USEDEP}] - >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}] - ) - ${PYTHON_DEPS} )" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - app-arch/cpio - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - app-text/xmlto - ) - nls? ( sys-devel/gettext ) - test? ( app-crypt/gnupg )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - cgi? ( perl ) - cvs? ( perl ) - mediawiki? ( perl ) - subversion? ( perl ) - webdav? ( curl ) - gtk? ( python ) - python? ( ${PYTHON_REQUIRED_USE} ) -" - -pkg_setup() { - if use subversion && has_version "dev-vcs/subversion[dso]"; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi - if use python ; then - python-single-r1_pkg_setup - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use blksha1 ; then - myopts+=" BLK_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts+=" PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts+=" NO_EXPAT=YesPlease" - else - myopts+=" NO_CURL=YesPlease" - fi - - # broken assumptions, because of broken build system ... - myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts+=" INSTALL=install TAR=tar" - myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" - myopts+=" SANE_TOOL_PATH=" - myopts+=" OLD_ICONV=" - myopts+=" NO_EXTERNAL_GREP=" - - # For svn-fe - extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - use iconv \ - || myopts+=" NO_ICONV=YesPlease" - use nls \ - || myopts+=" NO_GETTEXT=YesPlease" - use tk \ - || myopts+=" NO_TCLTK=YesPlease" - use pcre \ - && myopts+=" USE_LIBPCRE=yes" \ - && extlibs+=" -lpcre" - use perl \ - && myopts+=" INSTALLDIRS=vendor" \ - || myopts+=" NO_PERL=YesPlease" - use python \ - || myopts+=" NO_PYTHON=YesPlease" - use subversion \ - || myopts+=" NO_SVN_TESTS=YesPlease" - use threads \ - && myopts+=" THREADED_DELTA_SEARCH=YesPlease" \ - || myopts+=" NO_PTHREADS=YesPlease" - use cvs \ - || myopts+=" NO_CVS=YesPlease" -# Disabled until ~m68k-mint can be keyworded again -# if [[ ${CHOST} == *-mint* ]] ; then -# myopts+=" NO_MMAP=YesPlease" -# myopts+=" NO_IPV6=YesPlease" -# myopts+=" NO_STRLCPY=YesPlease" -# myopts+=" NO_MEMMEM=YesPlease" -# myopts+=" NO_MKDTEMP=YesPlease" -# myopts+=" NO_MKSTEMPS=YesPlease" -# fi - if [[ ${CHOST} == ia64-*-hpux* ]]; then - myopts+=" NO_NSEC=YesPlease" - fi - if [[ ${CHOST} == *-*-aix* ]]; then - myopts+=" NO_FNMATCH_CASEFOLD=YesPlease" - fi - if [[ ${CHOST} == *-solaris* ]]; then - myopts+=" NEEDS_LIBICONV=YesPlease" - fi - - has_version '>=app-text/asciidoc-8.0' \ - && myopts+=" ASCIIDOC8=YesPlease" - myopts+=" ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts+=" NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" - export EXTLIBS="${extlibs}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - - kog-patches_unpack -} - -src_prepare() { - # bug #350330 - automagic CVS when we don't want it is bad. - # git-...-optional-cvs.patch - - # git-...-mw-vendor.patch - # git-...-svn-fe-linking.patch - kog-patches_apply_all - - epatch_user - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL - - # Fix docbook2texi command - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # Fix git-subtree missing DESTDIR - sed -i \ - -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \ - -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \ - contrib/subtree/Makefile -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="" - use python && PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - V=1 \ - "$@" - # This is the fix for bug #326625, but it also causes breakage, see bug - # #352693. - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ -} - -src_configure() { - exportmakeopts -} - -src_compile() { - if use perl ; then - git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" - git_emake perl/perl.mak || die "emake perl/perl.mak failed" - fi - git_emake || die "emake failed" - - if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el - fi - - if use perl && use cgi ; then - git_emake \ - gitweb/gitweb.cgi \ - || die "emake gitweb/gitweb.cgi failed" - fi - - if [[ ${CHOST} == *-darwin* ]]; then - cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain" - git_emake || die "emake credential-osxkeychain" - fi - - cd "${S}"/Documentation - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi - - if use subversion ; then - cd "${S}"/contrib/svn-fe - # by defining EXTLIBS we override the detection for libintl and - # libiconv, bug #516168 - local nlsiconv= - use nls && use !elibc_glibc && nlsiconv+=" -lintl" - use iconv && use !elibc_glibc && nlsiconv+=" -liconv" - git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed" - if use doc ; then - git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" - fi - cd "${S}" - fi - - if use gnome-keyring ; then - cd "${S}"/contrib/credential/gnome-keyring - git_emake || die "emake git-credential-gnome-keyring failed" - fi - - cd "${S}"/contrib/subtree - git_emake - use doc && git_emake doc - - if use mediawiki ; then - cd "${S}"/contrib/mw-to-git - git_emake - fi -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - if [[ ${CHOST} == *-darwin* ]]; then - dobin contrib/credential/osxkeychain/git-credential-osxkeychain - fi - - # Depending on the tarball and manual rebuild of the documentation, the - # manpages may exist in either OR both of these directories. - if ! use cvs; then - find man? -name "*git*cvs*" | xargs rm - fi - find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] - find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] - - dodoc README Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - for d in / /howto/ /technical/ ; do - docinto ${d} - dodoc Documentation${d}*.txt - use doc && dohtml -p ${d} Documentation${d}*.html - done - docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info - - newbashcomp contrib/completion/git-completion.bash ${PN} - bashcomp_alias git gitk - # Not really a bash-completion file (bug #477920) - # but still needed uncompressed (bug #507480) - insinto /usr/share/${PN} - doins contrib/completion/git-prompt.sh - - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - fi - - if use python && use gtk ; then - python_doscript "${S}"/contrib/gitview/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - fi - - #dobin contrib/fast-import/git-p4 # Moved upstream - #dodoc contrib/fast-import/git-p4.txt # Moved upstream - newbin contrib/fast-import/import-tars.perl import-tars - exeinto /usr/libexec/git-core/ - newexe contrib/git-resurrect.sh git-resurrect - - # git-subtree - cd "${S}"/contrib/subtree - git_emake install || die "Failed to emake install git-subtree" - if use doc ; then - git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree" - fi - newdoc README README.git-subtree - dodoc git-subtree.txt - cd "${S}" - - if use mediawiki ; then - cd "${S}"/contrib/mw-to-git - git_emake install - cd "${S}" - fi - - # diff-highlight - dobin contrib/diff-highlight/diff-highlight - newdoc contrib/diff-highlight/README README.diff-highlight - - # git-jump - exeinto /usr/libexec/git-core/ - doexe contrib/git-jump/git-jump - newdoc contrib/git-jump/README git-jump.txt - - # git-contacts - exeinto /usr/libexec/git-core/ - doexe contrib/contacts/git-contacts - dodoc contrib/contacts/git-contacts.txt - - if use gnome-keyring ; then - cd "${S}"/contrib/credential/gnome-keyring - dobin git-credential-gnome-keyring - fi - - if use subversion ; then - cd "${S}"/contrib/svn-fe - dobin svn-fe - dodoc svn-fe.txt - use doc && doman svn-fe.1 && dohtml svn-fe.html - cd "${S}" - fi - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # completion - installed above - # credential/gnome-keyring TODO - # diff-highlight - done above - # emacs - installed above - # examples - these are stuff that is not used in Git anymore actually - # git-jump - done above - # gitview - installed above - # p4import - excluded because fast-import has a better one - # patches - stuff the Git guys made to go upstream to other places - # persistent-https - TODO - # mw-to-git - TODO - # subtree - build seperately - # svnimport - use git-svn - # thunderbird-patch-inline - fixes thunderbird - for i in \ - buildsystems convert-objects fast-import \ - hg-to-git hooks remotes2config.sh rerere-train.sh \ - stats workdir \ - ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - # We used to install in /usr/share/${PN}/gitweb - # but upstream installs in /usr/share/gitweb - # so we will install a symlink and use their location for compat with other - # distros - dosym /usr/share/gitweb /usr/share/${PN}/gitweb - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - find "${ED}"/usr/lib64/perl5/ \ - -name .packlist \ - -exec rm \{\} \; - else - rm -rf "${ED}"/usr/share/gitweb - fi - - if ! use subversion ; then - rm -f "${ED}"/usr/libexec/git-core/git-svn \ - "${ED}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - if use !prefix ; then - newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service" - systemd_dounit "${FILESDIR}/git-daemon.socket" - fi - - perl_delete_localpod - - # burn CVS with fire, see #373439 - if ! use cvs; then - rm -r "${ED}"/usr/bin/git-cvsserver \ - "${ED}"/usr/libexec/git-core/git-cvs* || die - fi -} - -src_test() { - local disabled="" #t7004-tag.sh" #520270 - local tests_cvs="t9200-git-cvsexportcommit.sh \ - t9400-git-cvsserver-server.sh \ - t9401-git-cvsserver-crlf.sh \ - t9402-git-cvsserver-refs.sh \ - t9600-cvsimport.sh \ - t9601-cvsimport-vendor-branch.sh \ - t9602-cvsimport-branches-tags.sh \ - t9603-cvsimport-patchsets.sh \ - t9604-cvsimport-timestamps.sh" - local tests_perl="t3701-add-interactive.sh \ - t5502-quickfetch.sh \ - t5512-ls-remote.sh \ - t5520-pull.sh \ - t7106-reset-unborn-branch.sh \ - t7501-commit.sh" - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot="t0001-init.sh \ - t0004-unwritable.sh \ - t0070-fundamental.sh \ - t1004-read-tree-m-u-wf.sh \ - t3700-add.sh \ - t7300-clean.sh" - # t9100 still fails with symlinks in SVN 1.7 - local test_svn="t9100-git-svn-basic.sh" - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled="${disabled} t5000-tar-tree.sh" - fi - - cvs=0 - use cvs && let cvs=$cvs+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ $cvs -eq 1 ]]; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled="${disabled} ${tests_cvs}" - fi - einfo "Skipping other tests that require being non-root" - disabled="${disabled} ${tests_nonroot}" - else - [[ $cvs -gt 0 ]] && \ - has_version dev-vcs/cvs && \ - let cvs=$cvs+1 - [[ $cvs -gt 1 ]] && \ - has_version "dev-vcs/cvs[server]" && \ - let cvs=$cvs+1 - if [[ $cvs -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled="${disabled} ${tests_cvs}" - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled="${disabled} ${tests_perl}" - fi - - einfo "Disabling tests that fail with SVN 1.7" - disabled="${disabled} ${test_svn}" - - # Reset all previously disabled tests - cd "${S}/t" - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" - done - - # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ - -i "${S}"/t/Makefile - - # Clean old results first, must always run - cd "${S}/t" - nonfatal git_emake clean - - # Now run the tests, keep going if we hit an error, and don't terminate on - # failure - cd "${S}" - einfo "Start test run" - #MAKEOPTS=-j1 - nonfatal git_emake --keep-going test - rc=$? - - # Display nice results, now print the results - cd "${S}/t" - nonfatal git_emake aggregate-results - - # And bail if there was a problem - [ $rc -eq 0 ] || die "tests failed. Please file a bug." -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - einfo "Please read /usr/share/bash-completion/git for Git bash command completion" - einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt" - einfo "Note that the prompt bash code is now in that separate script" - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-vcs/git/git-2.3.0.ebuild b/dev-vcs/git/git-2.3.0.ebuild deleted file mode 100644 index b6cf6bbb..00000000 --- a/dev-vcs/git/git-2.3.0.ebuild +++ /dev/null @@ -1,646 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python2_{6,7} ) -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_MASTER=pu - -KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit kog-patches toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_GOOG="http://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI+=" ${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - dev-libs/openssl - sys-libs/zlib - pcre? ( dev-libs/libpcre ) - perl? ( dev-lang/perl:=[-build(-)] ) - tk? ( dev-lang/tk ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs ) - gnome-keyring? ( gnome-base/libgnome-keyring )" - -RDEPEND="${CDEPEND} - gpg? ( app-crypt/gnupg ) - mediawiki? ( - dev-perl/HTML-Tree - dev-perl/MediaWiki-API - ) - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) - cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - python? ( gtk? - ( - >=dev-python/pygtk-2.8[${PYTHON_USEDEP}] - >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}] - ) - ${PYTHON_DEPS} )" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - app-arch/cpio - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - app-text/xmlto - ) - nls? ( sys-devel/gettext ) - test? ( app-crypt/gnupg )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - cgi? ( perl ) - cvs? ( perl ) - mediawiki? ( perl ) - subversion? ( perl ) - webdav? ( curl ) - gtk? ( python ) - python? ( ${PYTHON_REQUIRED_USE} ) -" - -pkg_setup() { - if use subversion && has_version "dev-vcs/subversion[dso]"; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi - if use python ; then - python-single-r1_pkg_setup - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use blksha1 ; then - myopts+=" BLK_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts+=" PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts+=" NO_EXPAT=YesPlease" - else - myopts+=" NO_CURL=YesPlease" - fi - - # broken assumptions, because of broken build system ... - myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts+=" INSTALL=install TAR=tar" - myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" - myopts+=" SANE_TOOL_PATH=" - myopts+=" OLD_ICONV=" - myopts+=" NO_EXTERNAL_GREP=" - - # For svn-fe - extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - use iconv \ - || myopts+=" NO_ICONV=YesPlease" - use nls \ - || myopts+=" NO_GETTEXT=YesPlease" - use tk \ - || myopts+=" NO_TCLTK=YesPlease" - use pcre \ - && myopts+=" USE_LIBPCRE=yes" \ - && extlibs+=" -lpcre" - use perl \ - && myopts+=" INSTALLDIRS=vendor" \ - || myopts+=" NO_PERL=YesPlease" - use python \ - || myopts+=" NO_PYTHON=YesPlease" - use subversion \ - || myopts+=" NO_SVN_TESTS=YesPlease" - use threads \ - && myopts+=" THREADED_DELTA_SEARCH=YesPlease" \ - || myopts+=" NO_PTHREADS=YesPlease" - use cvs \ - || myopts+=" NO_CVS=YesPlease" -# Disabled until ~m68k-mint can be keyworded again -# if [[ ${CHOST} == *-mint* ]] ; then -# myopts+=" NO_MMAP=YesPlease" -# myopts+=" NO_IPV6=YesPlease" -# myopts+=" NO_STRLCPY=YesPlease" -# myopts+=" NO_MEMMEM=YesPlease" -# myopts+=" NO_MKDTEMP=YesPlease" -# myopts+=" NO_MKSTEMPS=YesPlease" -# fi - if [[ ${CHOST} == ia64-*-hpux* ]]; then - myopts+=" NO_NSEC=YesPlease" - fi - if [[ ${CHOST} == *-*-aix* ]]; then - myopts+=" NO_FNMATCH_CASEFOLD=YesPlease" - fi - if [[ ${CHOST} == *-solaris* ]]; then - myopts+=" NEEDS_LIBICONV=YesPlease" - fi - - has_version '>=app-text/asciidoc-8.0' \ - && myopts+=" ASCIIDOC8=YesPlease" - myopts+=" ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts+=" NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" - export EXTLIBS="${extlibs}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - - kog-patches_unpack -} - -src_prepare() { - # bug #350330 - automagic CVS when we don't want it is bad. - # git-...-optional-cvs.patch - - # git-...-mw-vendor.patch - # git-...-svn-fe-linking.patch - kog-patches_apply_all - - epatch_user - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL - - # Fix docbook2texi command - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # Fix git-subtree missing DESTDIR - sed -i \ - -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \ - -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \ - contrib/subtree/Makefile -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="" - use python && PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - V=1 \ - "$@" - # This is the fix for bug #326625, but it also causes breakage, see bug - # #352693. - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ -} - -src_configure() { - exportmakeopts -} - -src_compile() { - if use perl ; then - git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" - git_emake perl/perl.mak || die "emake perl/perl.mak failed" - fi - git_emake || die "emake failed" - - if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el - fi - - if use perl && use cgi ; then - git_emake \ - gitweb/gitweb.cgi \ - || die "emake gitweb/gitweb.cgi failed" - fi - - if [[ ${CHOST} == *-darwin* ]]; then - cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain" - git_emake || die "emake credential-osxkeychain" - fi - - cd "${S}"/Documentation - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi - - if use subversion ; then - cd "${S}"/contrib/svn-fe - # by defining EXTLIBS we override the detection for libintl and - # libiconv, bug #516168 - local nlsiconv= - use nls && use !elibc_glibc && nlsiconv+=" -lintl" - use iconv && use !elibc_glibc && nlsiconv+=" -liconv" - git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed" - if use doc ; then - git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" - fi - cd "${S}" - fi - - if use gnome-keyring ; then - cd "${S}"/contrib/credential/gnome-keyring - git_emake || die "emake git-credential-gnome-keyring failed" - fi - - cd "${S}"/contrib/subtree - git_emake - use doc && git_emake doc - - if use mediawiki ; then - cd "${S}"/contrib/mw-to-git - git_emake - fi -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - if [[ ${CHOST} == *-darwin* ]]; then - dobin contrib/credential/osxkeychain/git-credential-osxkeychain - fi - - # Depending on the tarball and manual rebuild of the documentation, the - # manpages may exist in either OR both of these directories. - if ! use cvs; then - find man? -name "*git*cvs*" | xargs rm - fi - find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] - find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] - - dodoc README Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - for d in / /howto/ /technical/ ; do - docinto ${d} - dodoc Documentation${d}*.txt - use doc && dohtml -p ${d} Documentation${d}*.html - done - docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info - - newbashcomp contrib/completion/git-completion.bash ${PN} - bashcomp_alias git gitk - # Not really a bash-completion file (bug #477920) - # but still needed uncompressed (bug #507480) - insinto /usr/share/${PN} - doins contrib/completion/git-prompt.sh - - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - fi - - if use python && use gtk ; then - python_doscript "${S}"/contrib/gitview/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - fi - - #dobin contrib/fast-import/git-p4 # Moved upstream - #dodoc contrib/fast-import/git-p4.txt # Moved upstream - newbin contrib/fast-import/import-tars.perl import-tars - exeinto /usr/libexec/git-core/ - newexe contrib/git-resurrect.sh git-resurrect - - # git-subtree - cd "${S}"/contrib/subtree - git_emake install || die "Failed to emake install git-subtree" - if use doc ; then - git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree" - fi - newdoc README README.git-subtree - dodoc git-subtree.txt - cd "${S}" - - if use mediawiki ; then - cd "${S}"/contrib/mw-to-git - git_emake install - cd "${S}" - fi - - # diff-highlight - dobin contrib/diff-highlight/diff-highlight - newdoc contrib/diff-highlight/README README.diff-highlight - - # git-jump - exeinto /usr/libexec/git-core/ - doexe contrib/git-jump/git-jump - newdoc contrib/git-jump/README git-jump.txt - - # git-contacts - exeinto /usr/libexec/git-core/ - doexe contrib/contacts/git-contacts - dodoc contrib/contacts/git-contacts.txt - - if use gnome-keyring ; then - cd "${S}"/contrib/credential/gnome-keyring - dobin git-credential-gnome-keyring - fi - - if use subversion ; then - cd "${S}"/contrib/svn-fe - dobin svn-fe - dodoc svn-fe.txt - use doc && doman svn-fe.1 && dohtml svn-fe.html - cd "${S}" - fi - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # completion - installed above - # credential/gnome-keyring TODO - # diff-highlight - done above - # emacs - installed above - # examples - these are stuff that is not used in Git anymore actually - # git-jump - done above - # gitview - installed above - # p4import - excluded because fast-import has a better one - # patches - stuff the Git guys made to go upstream to other places - # persistent-https - TODO - # mw-to-git - TODO - # subtree - build seperately - # svnimport - use git-svn - # thunderbird-patch-inline - fixes thunderbird - for i in \ - buildsystems convert-objects fast-import \ - hg-to-git hooks remotes2config.sh rerere-train.sh \ - stats workdir \ - ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - # We used to install in /usr/share/${PN}/gitweb - # but upstream installs in /usr/share/gitweb - # so we will install a symlink and use their location for compat with other - # distros - dosym /usr/share/gitweb /usr/share/${PN}/gitweb - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - find "${ED}"/usr/lib64/perl5/ \ - -name .packlist \ - -exec rm \{\} \; - else - rm -rf "${ED}"/usr/share/gitweb - fi - - if ! use subversion ; then - rm -f "${ED}"/usr/libexec/git-core/git-svn \ - "${ED}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - if use !prefix ; then - newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service" - systemd_dounit "${FILESDIR}/git-daemon.socket" - fi - - perl_delete_localpod - - # burn CVS with fire, see #373439 - if ! use cvs; then - rm -r "${ED}"/usr/bin/git-cvsserver \ - "${ED}"/usr/libexec/git-core/git-cvs* || die - fi -} - -src_test() { - local disabled="" #t7004-tag.sh" #520270 - local tests_cvs="t9200-git-cvsexportcommit.sh \ - t9400-git-cvsserver-server.sh \ - t9401-git-cvsserver-crlf.sh \ - t9402-git-cvsserver-refs.sh \ - t9600-cvsimport.sh \ - t9601-cvsimport-vendor-branch.sh \ - t9602-cvsimport-branches-tags.sh \ - t9603-cvsimport-patchsets.sh \ - t9604-cvsimport-timestamps.sh" - local tests_perl="t3701-add-interactive.sh \ - t5502-quickfetch.sh \ - t5512-ls-remote.sh \ - t5520-pull.sh \ - t7106-reset-unborn-branch.sh \ - t7501-commit.sh" - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot="t0001-init.sh \ - t0004-unwritable.sh \ - t0070-fundamental.sh \ - t1004-read-tree-m-u-wf.sh \ - t3700-add.sh \ - t7300-clean.sh" - # t9100 still fails with symlinks in SVN 1.7 - local test_svn="t9100-git-svn-basic.sh" - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled="${disabled} t5000-tar-tree.sh" - fi - - cvs=0 - use cvs && let cvs=$cvs+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ $cvs -eq 1 ]]; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled="${disabled} ${tests_cvs}" - fi - einfo "Skipping other tests that require being non-root" - disabled="${disabled} ${tests_nonroot}" - else - [[ $cvs -gt 0 ]] && \ - has_version dev-vcs/cvs && \ - let cvs=$cvs+1 - [[ $cvs -gt 1 ]] && \ - has_version "dev-vcs/cvs[server]" && \ - let cvs=$cvs+1 - if [[ $cvs -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled="${disabled} ${tests_cvs}" - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled="${disabled} ${tests_perl}" - fi - - einfo "Disabling tests that fail with SVN 1.7" - disabled="${disabled} ${test_svn}" - - # Reset all previously disabled tests - cd "${S}/t" - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" - done - - # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ - -i "${S}"/t/Makefile - - # Clean old results first, must always run - cd "${S}/t" - nonfatal git_emake clean - - # Now run the tests, keep going if we hit an error, and don't terminate on - # failure - cd "${S}" - einfo "Start test run" - #MAKEOPTS=-j1 - nonfatal git_emake --keep-going test - rc=$? - - # Display nice results, now print the results - cd "${S}/t" - nonfatal git_emake aggregate-results - - # And bail if there was a problem - [ $rc -eq 0 ] || die "tests failed. Please file a bug." -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - einfo "Please read /usr/share/bash-completion/git for Git bash command completion" - einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt" - einfo "Note that the prompt bash code is now in that separate script" - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-vcs/git/git-2.3.1.ebuild b/dev-vcs/git/git-2.3.1.ebuild deleted file mode 100644 index b6cf6bbb..00000000 --- a/dev-vcs/git/git-2.3.1.ebuild +++ /dev/null @@ -1,646 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python2_{6,7} ) -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_MASTER=pu - -KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit kog-patches toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_GOOG="http://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI+=" ${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - dev-libs/openssl - sys-libs/zlib - pcre? ( dev-libs/libpcre ) - perl? ( dev-lang/perl:=[-build(-)] ) - tk? ( dev-lang/tk ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs ) - gnome-keyring? ( gnome-base/libgnome-keyring )" - -RDEPEND="${CDEPEND} - gpg? ( app-crypt/gnupg ) - mediawiki? ( - dev-perl/HTML-Tree - dev-perl/MediaWiki-API - ) - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) - cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - python? ( gtk? - ( - >=dev-python/pygtk-2.8[${PYTHON_USEDEP}] - >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}] - ) - ${PYTHON_DEPS} )" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - app-arch/cpio - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - app-text/xmlto - ) - nls? ( sys-devel/gettext ) - test? ( app-crypt/gnupg )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - cgi? ( perl ) - cvs? ( perl ) - mediawiki? ( perl ) - subversion? ( perl ) - webdav? ( curl ) - gtk? ( python ) - python? ( ${PYTHON_REQUIRED_USE} ) -" - -pkg_setup() { - if use subversion && has_version "dev-vcs/subversion[dso]"; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi - if use python ; then - python-single-r1_pkg_setup - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use blksha1 ; then - myopts+=" BLK_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts+=" PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts+=" NO_EXPAT=YesPlease" - else - myopts+=" NO_CURL=YesPlease" - fi - - # broken assumptions, because of broken build system ... - myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts+=" INSTALL=install TAR=tar" - myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" - myopts+=" SANE_TOOL_PATH=" - myopts+=" OLD_ICONV=" - myopts+=" NO_EXTERNAL_GREP=" - - # For svn-fe - extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - use iconv \ - || myopts+=" NO_ICONV=YesPlease" - use nls \ - || myopts+=" NO_GETTEXT=YesPlease" - use tk \ - || myopts+=" NO_TCLTK=YesPlease" - use pcre \ - && myopts+=" USE_LIBPCRE=yes" \ - && extlibs+=" -lpcre" - use perl \ - && myopts+=" INSTALLDIRS=vendor" \ - || myopts+=" NO_PERL=YesPlease" - use python \ - || myopts+=" NO_PYTHON=YesPlease" - use subversion \ - || myopts+=" NO_SVN_TESTS=YesPlease" - use threads \ - && myopts+=" THREADED_DELTA_SEARCH=YesPlease" \ - || myopts+=" NO_PTHREADS=YesPlease" - use cvs \ - || myopts+=" NO_CVS=YesPlease" -# Disabled until ~m68k-mint can be keyworded again -# if [[ ${CHOST} == *-mint* ]] ; then -# myopts+=" NO_MMAP=YesPlease" -# myopts+=" NO_IPV6=YesPlease" -# myopts+=" NO_STRLCPY=YesPlease" -# myopts+=" NO_MEMMEM=YesPlease" -# myopts+=" NO_MKDTEMP=YesPlease" -# myopts+=" NO_MKSTEMPS=YesPlease" -# fi - if [[ ${CHOST} == ia64-*-hpux* ]]; then - myopts+=" NO_NSEC=YesPlease" - fi - if [[ ${CHOST} == *-*-aix* ]]; then - myopts+=" NO_FNMATCH_CASEFOLD=YesPlease" - fi - if [[ ${CHOST} == *-solaris* ]]; then - myopts+=" NEEDS_LIBICONV=YesPlease" - fi - - has_version '>=app-text/asciidoc-8.0' \ - && myopts+=" ASCIIDOC8=YesPlease" - myopts+=" ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts+=" NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" - export EXTLIBS="${extlibs}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - - kog-patches_unpack -} - -src_prepare() { - # bug #350330 - automagic CVS when we don't want it is bad. - # git-...-optional-cvs.patch - - # git-...-mw-vendor.patch - # git-...-svn-fe-linking.patch - kog-patches_apply_all - - epatch_user - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL - - # Fix docbook2texi command - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # Fix git-subtree missing DESTDIR - sed -i \ - -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \ - -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \ - contrib/subtree/Makefile -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="" - use python && PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - V=1 \ - "$@" - # This is the fix for bug #326625, but it also causes breakage, see bug - # #352693. - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ -} - -src_configure() { - exportmakeopts -} - -src_compile() { - if use perl ; then - git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" - git_emake perl/perl.mak || die "emake perl/perl.mak failed" - fi - git_emake || die "emake failed" - - if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el - fi - - if use perl && use cgi ; then - git_emake \ - gitweb/gitweb.cgi \ - || die "emake gitweb/gitweb.cgi failed" - fi - - if [[ ${CHOST} == *-darwin* ]]; then - cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain" - git_emake || die "emake credential-osxkeychain" - fi - - cd "${S}"/Documentation - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi - - if use subversion ; then - cd "${S}"/contrib/svn-fe - # by defining EXTLIBS we override the detection for libintl and - # libiconv, bug #516168 - local nlsiconv= - use nls && use !elibc_glibc && nlsiconv+=" -lintl" - use iconv && use !elibc_glibc && nlsiconv+=" -liconv" - git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed" - if use doc ; then - git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" - fi - cd "${S}" - fi - - if use gnome-keyring ; then - cd "${S}"/contrib/credential/gnome-keyring - git_emake || die "emake git-credential-gnome-keyring failed" - fi - - cd "${S}"/contrib/subtree - git_emake - use doc && git_emake doc - - if use mediawiki ; then - cd "${S}"/contrib/mw-to-git - git_emake - fi -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - if [[ ${CHOST} == *-darwin* ]]; then - dobin contrib/credential/osxkeychain/git-credential-osxkeychain - fi - - # Depending on the tarball and manual rebuild of the documentation, the - # manpages may exist in either OR both of these directories. - if ! use cvs; then - find man? -name "*git*cvs*" | xargs rm - fi - find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] - find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] - - dodoc README Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - for d in / /howto/ /technical/ ; do - docinto ${d} - dodoc Documentation${d}*.txt - use doc && dohtml -p ${d} Documentation${d}*.html - done - docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info - - newbashcomp contrib/completion/git-completion.bash ${PN} - bashcomp_alias git gitk - # Not really a bash-completion file (bug #477920) - # but still needed uncompressed (bug #507480) - insinto /usr/share/${PN} - doins contrib/completion/git-prompt.sh - - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - fi - - if use python && use gtk ; then - python_doscript "${S}"/contrib/gitview/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - fi - - #dobin contrib/fast-import/git-p4 # Moved upstream - #dodoc contrib/fast-import/git-p4.txt # Moved upstream - newbin contrib/fast-import/import-tars.perl import-tars - exeinto /usr/libexec/git-core/ - newexe contrib/git-resurrect.sh git-resurrect - - # git-subtree - cd "${S}"/contrib/subtree - git_emake install || die "Failed to emake install git-subtree" - if use doc ; then - git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree" - fi - newdoc README README.git-subtree - dodoc git-subtree.txt - cd "${S}" - - if use mediawiki ; then - cd "${S}"/contrib/mw-to-git - git_emake install - cd "${S}" - fi - - # diff-highlight - dobin contrib/diff-highlight/diff-highlight - newdoc contrib/diff-highlight/README README.diff-highlight - - # git-jump - exeinto /usr/libexec/git-core/ - doexe contrib/git-jump/git-jump - newdoc contrib/git-jump/README git-jump.txt - - # git-contacts - exeinto /usr/libexec/git-core/ - doexe contrib/contacts/git-contacts - dodoc contrib/contacts/git-contacts.txt - - if use gnome-keyring ; then - cd "${S}"/contrib/credential/gnome-keyring - dobin git-credential-gnome-keyring - fi - - if use subversion ; then - cd "${S}"/contrib/svn-fe - dobin svn-fe - dodoc svn-fe.txt - use doc && doman svn-fe.1 && dohtml svn-fe.html - cd "${S}" - fi - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # completion - installed above - # credential/gnome-keyring TODO - # diff-highlight - done above - # emacs - installed above - # examples - these are stuff that is not used in Git anymore actually - # git-jump - done above - # gitview - installed above - # p4import - excluded because fast-import has a better one - # patches - stuff the Git guys made to go upstream to other places - # persistent-https - TODO - # mw-to-git - TODO - # subtree - build seperately - # svnimport - use git-svn - # thunderbird-patch-inline - fixes thunderbird - for i in \ - buildsystems convert-objects fast-import \ - hg-to-git hooks remotes2config.sh rerere-train.sh \ - stats workdir \ - ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - # We used to install in /usr/share/${PN}/gitweb - # but upstream installs in /usr/share/gitweb - # so we will install a symlink and use their location for compat with other - # distros - dosym /usr/share/gitweb /usr/share/${PN}/gitweb - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - find "${ED}"/usr/lib64/perl5/ \ - -name .packlist \ - -exec rm \{\} \; - else - rm -rf "${ED}"/usr/share/gitweb - fi - - if ! use subversion ; then - rm -f "${ED}"/usr/libexec/git-core/git-svn \ - "${ED}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - if use !prefix ; then - newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service" - systemd_dounit "${FILESDIR}/git-daemon.socket" - fi - - perl_delete_localpod - - # burn CVS with fire, see #373439 - if ! use cvs; then - rm -r "${ED}"/usr/bin/git-cvsserver \ - "${ED}"/usr/libexec/git-core/git-cvs* || die - fi -} - -src_test() { - local disabled="" #t7004-tag.sh" #520270 - local tests_cvs="t9200-git-cvsexportcommit.sh \ - t9400-git-cvsserver-server.sh \ - t9401-git-cvsserver-crlf.sh \ - t9402-git-cvsserver-refs.sh \ - t9600-cvsimport.sh \ - t9601-cvsimport-vendor-branch.sh \ - t9602-cvsimport-branches-tags.sh \ - t9603-cvsimport-patchsets.sh \ - t9604-cvsimport-timestamps.sh" - local tests_perl="t3701-add-interactive.sh \ - t5502-quickfetch.sh \ - t5512-ls-remote.sh \ - t5520-pull.sh \ - t7106-reset-unborn-branch.sh \ - t7501-commit.sh" - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot="t0001-init.sh \ - t0004-unwritable.sh \ - t0070-fundamental.sh \ - t1004-read-tree-m-u-wf.sh \ - t3700-add.sh \ - t7300-clean.sh" - # t9100 still fails with symlinks in SVN 1.7 - local test_svn="t9100-git-svn-basic.sh" - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled="${disabled} t5000-tar-tree.sh" - fi - - cvs=0 - use cvs && let cvs=$cvs+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ $cvs -eq 1 ]]; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled="${disabled} ${tests_cvs}" - fi - einfo "Skipping other tests that require being non-root" - disabled="${disabled} ${tests_nonroot}" - else - [[ $cvs -gt 0 ]] && \ - has_version dev-vcs/cvs && \ - let cvs=$cvs+1 - [[ $cvs -gt 1 ]] && \ - has_version "dev-vcs/cvs[server]" && \ - let cvs=$cvs+1 - if [[ $cvs -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled="${disabled} ${tests_cvs}" - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled="${disabled} ${tests_perl}" - fi - - einfo "Disabling tests that fail with SVN 1.7" - disabled="${disabled} ${test_svn}" - - # Reset all previously disabled tests - cd "${S}/t" - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" - done - - # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ - -i "${S}"/t/Makefile - - # Clean old results first, must always run - cd "${S}/t" - nonfatal git_emake clean - - # Now run the tests, keep going if we hit an error, and don't terminate on - # failure - cd "${S}" - einfo "Start test run" - #MAKEOPTS=-j1 - nonfatal git_emake --keep-going test - rc=$? - - # Display nice results, now print the results - cd "${S}/t" - nonfatal git_emake aggregate-results - - # And bail if there was a problem - [ $rc -eq 0 ] || die "tests failed. Please file a bug." -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - einfo "Please read /usr/share/bash-completion/git for Git bash command completion" - einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt" - einfo "Note that the prompt bash code is now in that separate script" - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-vcs/git/git-2.4.0.ebuild b/dev-vcs/git/git-2.4.0.ebuild deleted file mode 100644 index 7d7a470c..00000000 --- a/dev-vcs/git/git-2.4.0.ebuild +++ /dev/null @@ -1,647 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python2_7 ) -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_MASTER=pu - -KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit kog-patches toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_GOOG="http://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - KEYWORDS="~amd64 ~x86" -fi - -kog-patches_update_SRC_URI - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - dev-libs/openssl:0= - sys-libs/zlib - pcre? ( dev-libs/libpcre ) - perl? ( dev-lang/perl:=[-build(-)] ) - tk? ( dev-lang/tk:= ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs ) - gnome-keyring? ( gnome-base/libgnome-keyring )" - -RDEPEND="${CDEPEND} - gpg? ( app-crypt/gnupg ) - mediawiki? ( - dev-perl/HTML-Tree - dev-perl/MediaWiki-API - ) - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) - cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - python? ( gtk? - ( - >=dev-python/pygtk-2.8[${PYTHON_USEDEP}] - >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}] - ) - ${PYTHON_DEPS} )" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - app-text/xmlto - ) - nls? ( sys-devel/gettext ) - test? ( app-crypt/gnupg )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - cgi? ( perl ) - cvs? ( perl ) - mediawiki? ( perl ) - subversion? ( perl ) - webdav? ( curl ) - gtk? ( python ) - python? ( ${PYTHON_REQUIRED_USE} ) -" - -pkg_setup() { - if use subversion && has_version "dev-vcs/subversion[dso]"; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi - if use python ; then - python-single-r1_pkg_setup - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use blksha1 ; then - myopts+=" BLK_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts+=" PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts+=" NO_EXPAT=YesPlease" - else - myopts+=" NO_CURL=YesPlease" - fi - - # broken assumptions, because of broken build system ... - myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts+=" INSTALL=install TAR=tar" - myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" - myopts+=" SANE_TOOL_PATH=" - myopts+=" OLD_ICONV=" - myopts+=" NO_EXTERNAL_GREP=" - - # For svn-fe - extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - use iconv \ - || myopts+=" NO_ICONV=YesPlease" - use nls \ - || myopts+=" NO_GETTEXT=YesPlease" - use tk \ - || myopts+=" NO_TCLTK=YesPlease" - use pcre \ - && myopts+=" USE_LIBPCRE=yes" \ - && extlibs+=" -lpcre" - use perl \ - && myopts+=" INSTALLDIRS=vendor" \ - || myopts+=" NO_PERL=YesPlease" - use python \ - || myopts+=" NO_PYTHON=YesPlease" - use subversion \ - || myopts+=" NO_SVN_TESTS=YesPlease" - use threads \ - && myopts+=" THREADED_DELTA_SEARCH=YesPlease" \ - || myopts+=" NO_PTHREADS=YesPlease" - use cvs \ - || myopts+=" NO_CVS=YesPlease" -# Disabled until ~m68k-mint can be keyworded again -# if [[ ${CHOST} == *-mint* ]] ; then -# myopts+=" NO_MMAP=YesPlease" -# myopts+=" NO_IPV6=YesPlease" -# myopts+=" NO_STRLCPY=YesPlease" -# myopts+=" NO_MEMMEM=YesPlease" -# myopts+=" NO_MKDTEMP=YesPlease" -# myopts+=" NO_MKSTEMPS=YesPlease" -# fi - if [[ ${CHOST} == ia64-*-hpux* ]]; then - myopts+=" NO_NSEC=YesPlease" - fi - if [[ ${CHOST} == *-*-aix* ]]; then - myopts+=" NO_FNMATCH_CASEFOLD=YesPlease" - fi - if [[ ${CHOST} == *-solaris* ]]; then - myopts+=" NEEDS_LIBICONV=YesPlease" - fi - - has_version '>=app-text/asciidoc-8.0' \ - && myopts+=" ASCIIDOC8=YesPlease" - myopts+=" ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts+=" NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" - export EXTLIBS="${extlibs}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - - kog-patches_unpack -} - -src_prepare() { - # bug #350330 - automagic CVS when we don't want it is bad. - # git-...-optional-cvs.patch - - # git-...-mw-vendor.patch - # git-...-svn-fe-linking.patch - kog-patches_apply_all - - epatch_user - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL - - # Fix docbook2texi command - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # Fix git-subtree missing DESTDIR - sed -i \ - -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \ - -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \ - contrib/subtree/Makefile -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="" - use python && PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - V=1 \ - "$@" - # This is the fix for bug #326625, but it also causes breakage, see bug - # #352693. - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ -} - -src_configure() { - exportmakeopts -} - -src_compile() { - if use perl ; then - git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" - git_emake perl/perl.mak || die "emake perl/perl.mak failed" - fi - git_emake || die "emake failed" - - if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el - fi - - if use perl && use cgi ; then - git_emake \ - gitweb/gitweb.cgi \ - || die "emake gitweb/gitweb.cgi failed" - fi - - if [[ ${CHOST} == *-darwin* ]]; then - cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain" - git_emake || die "emake credential-osxkeychain" - fi - - cd "${S}"/Documentation - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi - - if use subversion ; then - cd "${S}"/contrib/svn-fe - # by defining EXTLIBS we override the detection for libintl and - # libiconv, bug #516168 - local nlsiconv= - use nls && use !elibc_glibc && nlsiconv+=" -lintl" - use iconv && use !elibc_glibc && nlsiconv+=" -liconv" - git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed" - if use doc ; then - git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" - fi - cd "${S}" - fi - - if use gnome-keyring ; then - cd "${S}"/contrib/credential/gnome-keyring - git_emake || die "emake git-credential-gnome-keyring failed" - fi - - cd "${S}"/contrib/subtree - git_emake - use doc && git_emake doc - - if use mediawiki ; then - cd "${S}"/contrib/mw-to-git - git_emake - fi -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - if [[ ${CHOST} == *-darwin* ]]; then - dobin contrib/credential/osxkeychain/git-credential-osxkeychain - fi - - # Depending on the tarball and manual rebuild of the documentation, the - # manpages may exist in either OR both of these directories. - if ! use cvs; then - find man? -name "*git*cvs*" | xargs rm - fi - find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] - find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] - - dodoc README Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - for d in / /howto/ /technical/ ; do - docinto ${d} - dodoc Documentation${d}*.txt - use doc && dohtml -p ${d} Documentation${d}*.html - done - docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info - - newbashcomp contrib/completion/git-completion.bash ${PN} - bashcomp_alias git gitk - # Not really a bash-completion file (bug #477920) - # but still needed uncompressed (bug #507480) - insinto /usr/share/${PN} - doins contrib/completion/git-prompt.sh - - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - fi - - if use python && use gtk ; then - python_doscript "${S}"/contrib/gitview/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - fi - - #dobin contrib/fast-import/git-p4 # Moved upstream - #dodoc contrib/fast-import/git-p4.txt # Moved upstream - newbin contrib/fast-import/import-tars.perl import-tars - exeinto /usr/libexec/git-core/ - newexe contrib/git-resurrect.sh git-resurrect - - # git-subtree - cd "${S}"/contrib/subtree - git_emake install || die "Failed to emake install git-subtree" - if use doc ; then - git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree" - fi - newdoc README README.git-subtree - dodoc git-subtree.txt - cd "${S}" - - if use mediawiki ; then - cd "${S}"/contrib/mw-to-git - git_emake install - cd "${S}" - fi - - # diff-highlight - dobin contrib/diff-highlight/diff-highlight - newdoc contrib/diff-highlight/README README.diff-highlight - - # git-jump - exeinto /usr/libexec/git-core/ - doexe contrib/git-jump/git-jump - newdoc contrib/git-jump/README git-jump.txt - - # git-contacts - exeinto /usr/libexec/git-core/ - doexe contrib/contacts/git-contacts - dodoc contrib/contacts/git-contacts.txt - - if use gnome-keyring ; then - cd "${S}"/contrib/credential/gnome-keyring - dobin git-credential-gnome-keyring - fi - - if use subversion ; then - cd "${S}"/contrib/svn-fe - dobin svn-fe - dodoc svn-fe.txt - use doc && doman svn-fe.1 && dohtml svn-fe.html - cd "${S}" - fi - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # completion - installed above - # credential/gnome-keyring TODO - # diff-highlight - done above - # emacs - installed above - # examples - these are stuff that is not used in Git anymore actually - # git-jump - done above - # gitview - installed above - # p4import - excluded because fast-import has a better one - # patches - stuff the Git guys made to go upstream to other places - # persistent-https - TODO - # mw-to-git - TODO - # subtree - build seperately - # svnimport - use git-svn - # thunderbird-patch-inline - fixes thunderbird - for i in \ - buildsystems convert-objects fast-import \ - hg-to-git hooks remotes2config.sh rerere-train.sh \ - stats workdir \ - ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - # We used to install in /usr/share/${PN}/gitweb - # but upstream installs in /usr/share/gitweb - # so we will install a symlink and use their location for compat with other - # distros - dosym /usr/share/gitweb /usr/share/${PN}/gitweb - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - find "${ED}"/usr/lib64/perl5/ \ - -name .packlist \ - -exec rm \{\} \; - else - rm -rf "${ED}"/usr/share/gitweb - fi - - if ! use subversion ; then - rm -f "${ED}"/usr/libexec/git-core/git-svn \ - "${ED}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - if use !prefix ; then - newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service" - systemd_dounit "${FILESDIR}/git-daemon.socket" - fi - - perl_delete_localpod - - # burn CVS with fire, see #373439 - if ! use cvs; then - rm -r "${ED}"/usr/bin/git-cvsserver \ - "${ED}"/usr/libexec/git-core/git-cvs* || die - fi -} - -src_test() { - local disabled="" #t7004-tag.sh" #520270 - local tests_cvs="t9200-git-cvsexportcommit.sh \ - t9400-git-cvsserver-server.sh \ - t9401-git-cvsserver-crlf.sh \ - t9402-git-cvsserver-refs.sh \ - t9600-cvsimport.sh \ - t9601-cvsimport-vendor-branch.sh \ - t9602-cvsimport-branches-tags.sh \ - t9603-cvsimport-patchsets.sh \ - t9604-cvsimport-timestamps.sh" - local tests_perl="t3701-add-interactive.sh \ - t5502-quickfetch.sh \ - t5512-ls-remote.sh \ - t5520-pull.sh \ - t7106-reset-unborn-branch.sh \ - t7501-commit.sh" - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot="t0001-init.sh \ - t0004-unwritable.sh \ - t0070-fundamental.sh \ - t1004-read-tree-m-u-wf.sh \ - t3700-add.sh \ - t7300-clean.sh" - # t9100 still fails with symlinks in SVN 1.7 - local test_svn="t9100-git-svn-basic.sh" - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled="${disabled} t5000-tar-tree.sh" - fi - - cvs=0 - use cvs && let cvs=$cvs+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ $cvs -eq 1 ]]; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled="${disabled} ${tests_cvs}" - fi - einfo "Skipping other tests that require being non-root" - disabled="${disabled} ${tests_nonroot}" - else - [[ $cvs -gt 0 ]] && \ - has_version dev-vcs/cvs && \ - let cvs=$cvs+1 - [[ $cvs -gt 1 ]] && \ - has_version "dev-vcs/cvs[server]" && \ - let cvs=$cvs+1 - if [[ $cvs -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled="${disabled} ${tests_cvs}" - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled="${disabled} ${tests_perl}" - fi - - einfo "Disabling tests that fail with SVN 1.7" - disabled="${disabled} ${test_svn}" - - # Reset all previously disabled tests - cd "${S}/t" - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" - done - - # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ - -i "${S}"/t/Makefile - - # Clean old results first, must always run - cd "${S}/t" - nonfatal git_emake clean - - # Now run the tests, keep going if we hit an error, and don't terminate on - # failure - cd "${S}" - einfo "Start test run" - #MAKEOPTS=-j1 - nonfatal git_emake --keep-going test - rc=$? - - # Display nice results, now print the results - cd "${S}/t" - nonfatal git_emake aggregate-results - - # And bail if there was a problem - [ $rc -eq 0 ] || die "tests failed. Please file a bug." -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - einfo "Please read /usr/share/bash-completion/git for Git bash command completion" - einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt" - einfo "Note that the prompt bash code is now in that separate script" - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-vcs/git/git-2.4.2.ebuild b/dev-vcs/git/git-2.4.2.ebuild deleted file mode 100644 index 7d7a470c..00000000 --- a/dev-vcs/git/git-2.4.2.ebuild +++ /dev/null @@ -1,647 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python2_7 ) -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_MASTER=pu - -KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit kog-patches toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_GOOG="http://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - KEYWORDS="~amd64 ~x86" -fi - -kog-patches_update_SRC_URI - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - dev-libs/openssl:0= - sys-libs/zlib - pcre? ( dev-libs/libpcre ) - perl? ( dev-lang/perl:=[-build(-)] ) - tk? ( dev-lang/tk:= ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs ) - gnome-keyring? ( gnome-base/libgnome-keyring )" - -RDEPEND="${CDEPEND} - gpg? ( app-crypt/gnupg ) - mediawiki? ( - dev-perl/HTML-Tree - dev-perl/MediaWiki-API - ) - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) - cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - python? ( gtk? - ( - >=dev-python/pygtk-2.8[${PYTHON_USEDEP}] - >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}] - ) - ${PYTHON_DEPS} )" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - app-text/xmlto - ) - nls? ( sys-devel/gettext ) - test? ( app-crypt/gnupg )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - cgi? ( perl ) - cvs? ( perl ) - mediawiki? ( perl ) - subversion? ( perl ) - webdav? ( curl ) - gtk? ( python ) - python? ( ${PYTHON_REQUIRED_USE} ) -" - -pkg_setup() { - if use subversion && has_version "dev-vcs/subversion[dso]"; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi - if use python ; then - python-single-r1_pkg_setup - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use blksha1 ; then - myopts+=" BLK_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts+=" PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts+=" NO_EXPAT=YesPlease" - else - myopts+=" NO_CURL=YesPlease" - fi - - # broken assumptions, because of broken build system ... - myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts+=" INSTALL=install TAR=tar" - myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" - myopts+=" SANE_TOOL_PATH=" - myopts+=" OLD_ICONV=" - myopts+=" NO_EXTERNAL_GREP=" - - # For svn-fe - extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - use iconv \ - || myopts+=" NO_ICONV=YesPlease" - use nls \ - || myopts+=" NO_GETTEXT=YesPlease" - use tk \ - || myopts+=" NO_TCLTK=YesPlease" - use pcre \ - && myopts+=" USE_LIBPCRE=yes" \ - && extlibs+=" -lpcre" - use perl \ - && myopts+=" INSTALLDIRS=vendor" \ - || myopts+=" NO_PERL=YesPlease" - use python \ - || myopts+=" NO_PYTHON=YesPlease" - use subversion \ - || myopts+=" NO_SVN_TESTS=YesPlease" - use threads \ - && myopts+=" THREADED_DELTA_SEARCH=YesPlease" \ - || myopts+=" NO_PTHREADS=YesPlease" - use cvs \ - || myopts+=" NO_CVS=YesPlease" -# Disabled until ~m68k-mint can be keyworded again -# if [[ ${CHOST} == *-mint* ]] ; then -# myopts+=" NO_MMAP=YesPlease" -# myopts+=" NO_IPV6=YesPlease" -# myopts+=" NO_STRLCPY=YesPlease" -# myopts+=" NO_MEMMEM=YesPlease" -# myopts+=" NO_MKDTEMP=YesPlease" -# myopts+=" NO_MKSTEMPS=YesPlease" -# fi - if [[ ${CHOST} == ia64-*-hpux* ]]; then - myopts+=" NO_NSEC=YesPlease" - fi - if [[ ${CHOST} == *-*-aix* ]]; then - myopts+=" NO_FNMATCH_CASEFOLD=YesPlease" - fi - if [[ ${CHOST} == *-solaris* ]]; then - myopts+=" NEEDS_LIBICONV=YesPlease" - fi - - has_version '>=app-text/asciidoc-8.0' \ - && myopts+=" ASCIIDOC8=YesPlease" - myopts+=" ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts+=" NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" - export EXTLIBS="${extlibs}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - - kog-patches_unpack -} - -src_prepare() { - # bug #350330 - automagic CVS when we don't want it is bad. - # git-...-optional-cvs.patch - - # git-...-mw-vendor.patch - # git-...-svn-fe-linking.patch - kog-patches_apply_all - - epatch_user - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL - - # Fix docbook2texi command - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # Fix git-subtree missing DESTDIR - sed -i \ - -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \ - -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \ - contrib/subtree/Makefile -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="" - use python && PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - V=1 \ - "$@" - # This is the fix for bug #326625, but it also causes breakage, see bug - # #352693. - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ -} - -src_configure() { - exportmakeopts -} - -src_compile() { - if use perl ; then - git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" - git_emake perl/perl.mak || die "emake perl/perl.mak failed" - fi - git_emake || die "emake failed" - - if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el - fi - - if use perl && use cgi ; then - git_emake \ - gitweb/gitweb.cgi \ - || die "emake gitweb/gitweb.cgi failed" - fi - - if [[ ${CHOST} == *-darwin* ]]; then - cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain" - git_emake || die "emake credential-osxkeychain" - fi - - cd "${S}"/Documentation - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi - - if use subversion ; then - cd "${S}"/contrib/svn-fe - # by defining EXTLIBS we override the detection for libintl and - # libiconv, bug #516168 - local nlsiconv= - use nls && use !elibc_glibc && nlsiconv+=" -lintl" - use iconv && use !elibc_glibc && nlsiconv+=" -liconv" - git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed" - if use doc ; then - git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" - fi - cd "${S}" - fi - - if use gnome-keyring ; then - cd "${S}"/contrib/credential/gnome-keyring - git_emake || die "emake git-credential-gnome-keyring failed" - fi - - cd "${S}"/contrib/subtree - git_emake - use doc && git_emake doc - - if use mediawiki ; then - cd "${S}"/contrib/mw-to-git - git_emake - fi -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - if [[ ${CHOST} == *-darwin* ]]; then - dobin contrib/credential/osxkeychain/git-credential-osxkeychain - fi - - # Depending on the tarball and manual rebuild of the documentation, the - # manpages may exist in either OR both of these directories. - if ! use cvs; then - find man? -name "*git*cvs*" | xargs rm - fi - find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] - find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] - - dodoc README Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - for d in / /howto/ /technical/ ; do - docinto ${d} - dodoc Documentation${d}*.txt - use doc && dohtml -p ${d} Documentation${d}*.html - done - docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info - - newbashcomp contrib/completion/git-completion.bash ${PN} - bashcomp_alias git gitk - # Not really a bash-completion file (bug #477920) - # but still needed uncompressed (bug #507480) - insinto /usr/share/${PN} - doins contrib/completion/git-prompt.sh - - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - fi - - if use python && use gtk ; then - python_doscript "${S}"/contrib/gitview/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - fi - - #dobin contrib/fast-import/git-p4 # Moved upstream - #dodoc contrib/fast-import/git-p4.txt # Moved upstream - newbin contrib/fast-import/import-tars.perl import-tars - exeinto /usr/libexec/git-core/ - newexe contrib/git-resurrect.sh git-resurrect - - # git-subtree - cd "${S}"/contrib/subtree - git_emake install || die "Failed to emake install git-subtree" - if use doc ; then - git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree" - fi - newdoc README README.git-subtree - dodoc git-subtree.txt - cd "${S}" - - if use mediawiki ; then - cd "${S}"/contrib/mw-to-git - git_emake install - cd "${S}" - fi - - # diff-highlight - dobin contrib/diff-highlight/diff-highlight - newdoc contrib/diff-highlight/README README.diff-highlight - - # git-jump - exeinto /usr/libexec/git-core/ - doexe contrib/git-jump/git-jump - newdoc contrib/git-jump/README git-jump.txt - - # git-contacts - exeinto /usr/libexec/git-core/ - doexe contrib/contacts/git-contacts - dodoc contrib/contacts/git-contacts.txt - - if use gnome-keyring ; then - cd "${S}"/contrib/credential/gnome-keyring - dobin git-credential-gnome-keyring - fi - - if use subversion ; then - cd "${S}"/contrib/svn-fe - dobin svn-fe - dodoc svn-fe.txt - use doc && doman svn-fe.1 && dohtml svn-fe.html - cd "${S}" - fi - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # completion - installed above - # credential/gnome-keyring TODO - # diff-highlight - done above - # emacs - installed above - # examples - these are stuff that is not used in Git anymore actually - # git-jump - done above - # gitview - installed above - # p4import - excluded because fast-import has a better one - # patches - stuff the Git guys made to go upstream to other places - # persistent-https - TODO - # mw-to-git - TODO - # subtree - build seperately - # svnimport - use git-svn - # thunderbird-patch-inline - fixes thunderbird - for i in \ - buildsystems convert-objects fast-import \ - hg-to-git hooks remotes2config.sh rerere-train.sh \ - stats workdir \ - ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - # We used to install in /usr/share/${PN}/gitweb - # but upstream installs in /usr/share/gitweb - # so we will install a symlink and use their location for compat with other - # distros - dosym /usr/share/gitweb /usr/share/${PN}/gitweb - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - find "${ED}"/usr/lib64/perl5/ \ - -name .packlist \ - -exec rm \{\} \; - else - rm -rf "${ED}"/usr/share/gitweb - fi - - if ! use subversion ; then - rm -f "${ED}"/usr/libexec/git-core/git-svn \ - "${ED}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - if use !prefix ; then - newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service" - systemd_dounit "${FILESDIR}/git-daemon.socket" - fi - - perl_delete_localpod - - # burn CVS with fire, see #373439 - if ! use cvs; then - rm -r "${ED}"/usr/bin/git-cvsserver \ - "${ED}"/usr/libexec/git-core/git-cvs* || die - fi -} - -src_test() { - local disabled="" #t7004-tag.sh" #520270 - local tests_cvs="t9200-git-cvsexportcommit.sh \ - t9400-git-cvsserver-server.sh \ - t9401-git-cvsserver-crlf.sh \ - t9402-git-cvsserver-refs.sh \ - t9600-cvsimport.sh \ - t9601-cvsimport-vendor-branch.sh \ - t9602-cvsimport-branches-tags.sh \ - t9603-cvsimport-patchsets.sh \ - t9604-cvsimport-timestamps.sh" - local tests_perl="t3701-add-interactive.sh \ - t5502-quickfetch.sh \ - t5512-ls-remote.sh \ - t5520-pull.sh \ - t7106-reset-unborn-branch.sh \ - t7501-commit.sh" - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot="t0001-init.sh \ - t0004-unwritable.sh \ - t0070-fundamental.sh \ - t1004-read-tree-m-u-wf.sh \ - t3700-add.sh \ - t7300-clean.sh" - # t9100 still fails with symlinks in SVN 1.7 - local test_svn="t9100-git-svn-basic.sh" - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled="${disabled} t5000-tar-tree.sh" - fi - - cvs=0 - use cvs && let cvs=$cvs+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ $cvs -eq 1 ]]; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled="${disabled} ${tests_cvs}" - fi - einfo "Skipping other tests that require being non-root" - disabled="${disabled} ${tests_nonroot}" - else - [[ $cvs -gt 0 ]] && \ - has_version dev-vcs/cvs && \ - let cvs=$cvs+1 - [[ $cvs -gt 1 ]] && \ - has_version "dev-vcs/cvs[server]" && \ - let cvs=$cvs+1 - if [[ $cvs -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled="${disabled} ${tests_cvs}" - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled="${disabled} ${tests_perl}" - fi - - einfo "Disabling tests that fail with SVN 1.7" - disabled="${disabled} ${test_svn}" - - # Reset all previously disabled tests - cd "${S}/t" - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" - done - - # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ - -i "${S}"/t/Makefile - - # Clean old results first, must always run - cd "${S}/t" - nonfatal git_emake clean - - # Now run the tests, keep going if we hit an error, and don't terminate on - # failure - cd "${S}" - einfo "Start test run" - #MAKEOPTS=-j1 - nonfatal git_emake --keep-going test - rc=$? - - # Display nice results, now print the results - cd "${S}/t" - nonfatal git_emake aggregate-results - - # And bail if there was a problem - [ $rc -eq 0 ] || die "tests failed. Please file a bug." -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - einfo "Please read /usr/share/bash-completion/git for Git bash command completion" - einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt" - einfo "Note that the prompt bash code is now in that separate script" - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-vcs/git/git-2.4.4.ebuild b/dev-vcs/git/git-2.4.4.ebuild deleted file mode 100644 index e3e341af..00000000 --- a/dev-vcs/git/git-2.4.4.ebuild +++ /dev/null @@ -1,647 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python2_7 ) -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_MASTER=pu - -KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit kog-patches toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_GOOG="http://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - KEYWORDS="amd64 x86" -fi - -kog-patches_update_SRC_URI - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - dev-libs/openssl:0= - sys-libs/zlib - pcre? ( dev-libs/libpcre ) - perl? ( dev-lang/perl:=[-build(-)] ) - tk? ( dev-lang/tk:= ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs ) - gnome-keyring? ( gnome-base/libgnome-keyring )" - -RDEPEND="${CDEPEND} - gpg? ( app-crypt/gnupg ) - mediawiki? ( - dev-perl/HTML-Tree - dev-perl/MediaWiki-API - ) - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) - cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - python? ( gtk? - ( - >=dev-python/pygtk-2.8[${PYTHON_USEDEP}] - >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}] - ) - ${PYTHON_DEPS} )" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - app-text/xmlto - ) - nls? ( sys-devel/gettext ) - test? ( app-crypt/gnupg )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - cgi? ( perl ) - cvs? ( perl ) - mediawiki? ( perl ) - subversion? ( perl ) - webdav? ( curl ) - gtk? ( python ) - python? ( ${PYTHON_REQUIRED_USE} ) -" - -pkg_setup() { - if use subversion && has_version "dev-vcs/subversion[dso]"; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi - if use python ; then - python-single-r1_pkg_setup - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use blksha1 ; then - myopts+=" BLK_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts+=" PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts+=" NO_EXPAT=YesPlease" - else - myopts+=" NO_CURL=YesPlease" - fi - - # broken assumptions, because of broken build system ... - myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts+=" INSTALL=install TAR=tar" - myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" - myopts+=" SANE_TOOL_PATH=" - myopts+=" OLD_ICONV=" - myopts+=" NO_EXTERNAL_GREP=" - - # For svn-fe - extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - use iconv \ - || myopts+=" NO_ICONV=YesPlease" - use nls \ - || myopts+=" NO_GETTEXT=YesPlease" - use tk \ - || myopts+=" NO_TCLTK=YesPlease" - use pcre \ - && myopts+=" USE_LIBPCRE=yes" \ - && extlibs+=" -lpcre" - use perl \ - && myopts+=" INSTALLDIRS=vendor" \ - || myopts+=" NO_PERL=YesPlease" - use python \ - || myopts+=" NO_PYTHON=YesPlease" - use subversion \ - || myopts+=" NO_SVN_TESTS=YesPlease" - use threads \ - && myopts+=" THREADED_DELTA_SEARCH=YesPlease" \ - || myopts+=" NO_PTHREADS=YesPlease" - use cvs \ - || myopts+=" NO_CVS=YesPlease" -# Disabled until ~m68k-mint can be keyworded again -# if [[ ${CHOST} == *-mint* ]] ; then -# myopts+=" NO_MMAP=YesPlease" -# myopts+=" NO_IPV6=YesPlease" -# myopts+=" NO_STRLCPY=YesPlease" -# myopts+=" NO_MEMMEM=YesPlease" -# myopts+=" NO_MKDTEMP=YesPlease" -# myopts+=" NO_MKSTEMPS=YesPlease" -# fi - if [[ ${CHOST} == ia64-*-hpux* ]]; then - myopts+=" NO_NSEC=YesPlease" - fi - if [[ ${CHOST} == *-*-aix* ]]; then - myopts+=" NO_FNMATCH_CASEFOLD=YesPlease" - fi - if [[ ${CHOST} == *-solaris* ]]; then - myopts+=" NEEDS_LIBICONV=YesPlease" - fi - - has_version '>=app-text/asciidoc-8.0' \ - && myopts+=" ASCIIDOC8=YesPlease" - myopts+=" ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts+=" NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" - export EXTLIBS="${extlibs}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - - kog-patches_unpack -} - -src_prepare() { - # bug #350330 - automagic CVS when we don't want it is bad. - # git-...-optional-cvs.patch - - # git-...-mw-vendor.patch - # git-...-svn-fe-linking.patch - kog-patches_apply_all - - epatch_user - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL - - # Fix docbook2texi command - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # Fix git-subtree missing DESTDIR - sed -i \ - -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \ - -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \ - contrib/subtree/Makefile -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="" - use python && PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - V=1 \ - "$@" - # This is the fix for bug #326625, but it also causes breakage, see bug - # #352693. - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ -} - -src_configure() { - exportmakeopts -} - -src_compile() { - if use perl ; then - git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" - git_emake perl/perl.mak || die "emake perl/perl.mak failed" - fi - git_emake || die "emake failed" - - if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el - fi - - if use perl && use cgi ; then - git_emake \ - gitweb/gitweb.cgi \ - || die "emake gitweb/gitweb.cgi failed" - fi - - if [[ ${CHOST} == *-darwin* ]]; then - cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain" - git_emake || die "emake credential-osxkeychain" - fi - - cd "${S}"/Documentation - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi - - if use subversion ; then - cd "${S}"/contrib/svn-fe - # by defining EXTLIBS we override the detection for libintl and - # libiconv, bug #516168 - local nlsiconv= - use nls && use !elibc_glibc && nlsiconv+=" -lintl" - use iconv && use !elibc_glibc && nlsiconv+=" -liconv" - git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed" - if use doc ; then - git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" - fi - cd "${S}" - fi - - if use gnome-keyring ; then - cd "${S}"/contrib/credential/gnome-keyring - git_emake || die "emake git-credential-gnome-keyring failed" - fi - - cd "${S}"/contrib/subtree - git_emake - use doc && git_emake doc - - if use mediawiki ; then - cd "${S}"/contrib/mw-to-git - git_emake - fi -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - if [[ ${CHOST} == *-darwin* ]]; then - dobin contrib/credential/osxkeychain/git-credential-osxkeychain - fi - - # Depending on the tarball and manual rebuild of the documentation, the - # manpages may exist in either OR both of these directories. - if ! use cvs; then - find man? -name "*git*cvs*" | xargs rm - fi - find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] - find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] - - dodoc README Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - for d in / /howto/ /technical/ ; do - docinto ${d} - dodoc Documentation${d}*.txt - use doc && dohtml -p ${d} Documentation${d}*.html - done - docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info - - newbashcomp contrib/completion/git-completion.bash ${PN} - bashcomp_alias git gitk - # Not really a bash-completion file (bug #477920) - # but still needed uncompressed (bug #507480) - insinto /usr/share/${PN} - doins contrib/completion/git-prompt.sh - - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - fi - - if use python && use gtk ; then - python_doscript "${S}"/contrib/gitview/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - fi - - #dobin contrib/fast-import/git-p4 # Moved upstream - #dodoc contrib/fast-import/git-p4.txt # Moved upstream - newbin contrib/fast-import/import-tars.perl import-tars - exeinto /usr/libexec/git-core/ - newexe contrib/git-resurrect.sh git-resurrect - - # git-subtree - cd "${S}"/contrib/subtree - git_emake install || die "Failed to emake install git-subtree" - if use doc ; then - git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree" - fi - newdoc README README.git-subtree - dodoc git-subtree.txt - cd "${S}" - - if use mediawiki ; then - cd "${S}"/contrib/mw-to-git - git_emake install - cd "${S}" - fi - - # diff-highlight - dobin contrib/diff-highlight/diff-highlight - newdoc contrib/diff-highlight/README README.diff-highlight - - # git-jump - exeinto /usr/libexec/git-core/ - doexe contrib/git-jump/git-jump - newdoc contrib/git-jump/README git-jump.txt - - # git-contacts - exeinto /usr/libexec/git-core/ - doexe contrib/contacts/git-contacts - dodoc contrib/contacts/git-contacts.txt - - if use gnome-keyring ; then - cd "${S}"/contrib/credential/gnome-keyring - dobin git-credential-gnome-keyring - fi - - if use subversion ; then - cd "${S}"/contrib/svn-fe - dobin svn-fe - dodoc svn-fe.txt - use doc && doman svn-fe.1 && dohtml svn-fe.html - cd "${S}" - fi - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # completion - installed above - # credential/gnome-keyring TODO - # diff-highlight - done above - # emacs - installed above - # examples - these are stuff that is not used in Git anymore actually - # git-jump - done above - # gitview - installed above - # p4import - excluded because fast-import has a better one - # patches - stuff the Git guys made to go upstream to other places - # persistent-https - TODO - # mw-to-git - TODO - # subtree - build seperately - # svnimport - use git-svn - # thunderbird-patch-inline - fixes thunderbird - for i in \ - buildsystems convert-objects fast-import \ - hg-to-git hooks remotes2config.sh rerere-train.sh \ - stats workdir \ - ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - # We used to install in /usr/share/${PN}/gitweb - # but upstream installs in /usr/share/gitweb - # so we will install a symlink and use their location for compat with other - # distros - dosym /usr/share/gitweb /usr/share/${PN}/gitweb - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - find "${ED}"/usr/lib64/perl5/ \ - -name .packlist \ - -exec rm \{\} \; - else - rm -rf "${ED}"/usr/share/gitweb - fi - - if ! use subversion ; then - rm -f "${ED}"/usr/libexec/git-core/git-svn \ - "${ED}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - if use !prefix ; then - newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service" - systemd_dounit "${FILESDIR}/git-daemon.socket" - fi - - perl_delete_localpod - - # burn CVS with fire, see #373439 - if ! use cvs; then - rm -r "${ED}"/usr/bin/git-cvsserver \ - "${ED}"/usr/libexec/git-core/git-cvs* || die - fi -} - -src_test() { - local disabled="" #t7004-tag.sh" #520270 - local tests_cvs="t9200-git-cvsexportcommit.sh \ - t9400-git-cvsserver-server.sh \ - t9401-git-cvsserver-crlf.sh \ - t9402-git-cvsserver-refs.sh \ - t9600-cvsimport.sh \ - t9601-cvsimport-vendor-branch.sh \ - t9602-cvsimport-branches-tags.sh \ - t9603-cvsimport-patchsets.sh \ - t9604-cvsimport-timestamps.sh" - local tests_perl="t3701-add-interactive.sh \ - t5502-quickfetch.sh \ - t5512-ls-remote.sh \ - t5520-pull.sh \ - t7106-reset-unborn-branch.sh \ - t7501-commit.sh" - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot="t0001-init.sh \ - t0004-unwritable.sh \ - t0070-fundamental.sh \ - t1004-read-tree-m-u-wf.sh \ - t3700-add.sh \ - t7300-clean.sh" - # t9100 still fails with symlinks in SVN 1.7 - local test_svn="t9100-git-svn-basic.sh" - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled="${disabled} t5000-tar-tree.sh" - fi - - cvs=0 - use cvs && let cvs=$cvs+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ $cvs -eq 1 ]]; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled="${disabled} ${tests_cvs}" - fi - einfo "Skipping other tests that require being non-root" - disabled="${disabled} ${tests_nonroot}" - else - [[ $cvs -gt 0 ]] && \ - has_version dev-vcs/cvs && \ - let cvs=$cvs+1 - [[ $cvs -gt 1 ]] && \ - has_version "dev-vcs/cvs[server]" && \ - let cvs=$cvs+1 - if [[ $cvs -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled="${disabled} ${tests_cvs}" - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled="${disabled} ${tests_perl}" - fi - - einfo "Disabling tests that fail with SVN 1.7" - disabled="${disabled} ${test_svn}" - - # Reset all previously disabled tests - cd "${S}/t" - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" - done - - # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ - -i "${S}"/t/Makefile - - # Clean old results first, must always run - cd "${S}/t" - nonfatal git_emake clean - - # Now run the tests, keep going if we hit an error, and don't terminate on - # failure - cd "${S}" - einfo "Start test run" - #MAKEOPTS=-j1 - nonfatal git_emake --keep-going test - rc=$? - - # Display nice results, now print the results - cd "${S}/t" - nonfatal git_emake aggregate-results - - # And bail if there was a problem - [ $rc -eq 0 ] || die "tests failed. Please file a bug." -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - einfo "Please read /usr/share/bash-completion/git for Git bash command completion" - einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt" - einfo "Note that the prompt bash code is now in that separate script" - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-vcs/git/git-2.4.6.ebuild b/dev-vcs/git/git-2.4.6.ebuild deleted file mode 100644 index c1da93f2..00000000 --- a/dev-vcs/git/git-2.4.6.ebuild +++ /dev/null @@ -1,647 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python2_7 ) -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_MASTER=pu - -KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit kog-patches toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_GOOG="http://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - KEYWORDS="~amd64 ~x86" -fi - -kog-patches_update_SRC_URI - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - dev-libs/openssl:0= - sys-libs/zlib - pcre? ( dev-libs/libpcre ) - perl? ( dev-lang/perl:=[-build(-)] ) - tk? ( dev-lang/tk:= ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs ) - gnome-keyring? ( gnome-base/libgnome-keyring )" - -RDEPEND="${CDEPEND} - gpg? ( app-crypt/gnupg ) - mediawiki? ( - dev-perl/HTML-Tree - dev-perl/MediaWiki-API - ) - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) - cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - python? ( gtk? - ( - >=dev-python/pygtk-2.8[${PYTHON_USEDEP}] - >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}] - ) - ${PYTHON_DEPS} )" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - app-text/xmlto - ) - nls? ( sys-devel/gettext ) - test? ( app-crypt/gnupg )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - cgi? ( perl ) - cvs? ( perl ) - mediawiki? ( perl ) - subversion? ( perl ) - webdav? ( curl ) - gtk? ( python ) - python? ( ${PYTHON_REQUIRED_USE} ) -" - -pkg_setup() { - if use subversion && has_version "dev-vcs/subversion[dso]"; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi - if use python ; then - python-single-r1_pkg_setup - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use blksha1 ; then - myopts+=" BLK_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts+=" PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts+=" NO_EXPAT=YesPlease" - else - myopts+=" NO_CURL=YesPlease" - fi - - # broken assumptions, because of broken build system ... - myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts+=" INSTALL=install TAR=tar" - myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" - myopts+=" SANE_TOOL_PATH=" - myopts+=" OLD_ICONV=" - myopts+=" NO_EXTERNAL_GREP=" - - # For svn-fe - extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - use iconv \ - || myopts+=" NO_ICONV=YesPlease" - use nls \ - || myopts+=" NO_GETTEXT=YesPlease" - use tk \ - || myopts+=" NO_TCLTK=YesPlease" - use pcre \ - && myopts+=" USE_LIBPCRE=yes" \ - && extlibs+=" -lpcre" - use perl \ - && myopts+=" INSTALLDIRS=vendor" \ - || myopts+=" NO_PERL=YesPlease" - use python \ - || myopts+=" NO_PYTHON=YesPlease" - use subversion \ - || myopts+=" NO_SVN_TESTS=YesPlease" - use threads \ - && myopts+=" THREADED_DELTA_SEARCH=YesPlease" \ - || myopts+=" NO_PTHREADS=YesPlease" - use cvs \ - || myopts+=" NO_CVS=YesPlease" -# Disabled until ~m68k-mint can be keyworded again -# if [[ ${CHOST} == *-mint* ]] ; then -# myopts+=" NO_MMAP=YesPlease" -# myopts+=" NO_IPV6=YesPlease" -# myopts+=" NO_STRLCPY=YesPlease" -# myopts+=" NO_MEMMEM=YesPlease" -# myopts+=" NO_MKDTEMP=YesPlease" -# myopts+=" NO_MKSTEMPS=YesPlease" -# fi - if [[ ${CHOST} == ia64-*-hpux* ]]; then - myopts+=" NO_NSEC=YesPlease" - fi - if [[ ${CHOST} == *-*-aix* ]]; then - myopts+=" NO_FNMATCH_CASEFOLD=YesPlease" - fi - if [[ ${CHOST} == *-solaris* ]]; then - myopts+=" NEEDS_LIBICONV=YesPlease" - fi - - has_version '>=app-text/asciidoc-8.0' \ - && myopts+=" ASCIIDOC8=YesPlease" - myopts+=" ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts+=" NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" - export EXTLIBS="${extlibs}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - - kog-patches_unpack -} - -src_prepare() { - # bug #350330 - automagic CVS when we don't want it is bad. - # git-...-optional-cvs.patch - - # git-...-mw-vendor.patch - # git-...-svn-fe-linking.patch - kog-patches_apply_all - - epatch_user - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL - - # Fix docbook2texi command - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # Fix git-subtree missing DESTDIR - sed -i \ - -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \ - -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \ - contrib/subtree/Makefile -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="" - use python && PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - V=1 \ - "$@" - # This is the fix for bug #326625, but it also causes breakage, see bug - # #352693. - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ -} - -src_configure() { - exportmakeopts -} - -src_compile() { - if use perl ; then - git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" - git_emake perl/perl.mak || die "emake perl/perl.mak failed" - fi - git_emake || die "emake failed" - - if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el - fi - - if use perl && use cgi ; then - git_emake \ - gitweb/gitweb.cgi \ - || die "emake gitweb/gitweb.cgi failed" - fi - - if [[ ${CHOST} == *-darwin* ]]; then - cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain" - git_emake || die "emake credential-osxkeychain" - fi - - cd "${S}"/Documentation - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi - - if use subversion ; then - cd "${S}"/contrib/svn-fe - # by defining EXTLIBS we override the detection for libintl and - # libiconv, bug #516168 - local nlsiconv= - use nls && use !elibc_glibc && nlsiconv+=" -lintl" - use iconv && use !elibc_glibc && nlsiconv+=" -liconv" - git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed" - if use doc ; then - git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" - fi - cd "${S}" - fi - - if use gnome-keyring ; then - cd "${S}"/contrib/credential/gnome-keyring - git_emake || die "emake git-credential-gnome-keyring failed" - fi - - cd "${S}"/contrib/subtree - git_emake - use doc && git_emake doc - - if use mediawiki ; then - cd "${S}"/contrib/mw-to-git - git_emake - fi -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - if [[ ${CHOST} == *-darwin* ]]; then - dobin contrib/credential/osxkeychain/git-credential-osxkeychain - fi - - # Depending on the tarball and manual rebuild of the documentation, the - # manpages may exist in either OR both of these directories. - if ! use cvs; then - find man? -name "*git*cvs*" | xargs rm - fi - find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] - find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] - - dodoc README Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - for d in / /howto/ /technical/ ; do - docinto ${d} - dodoc Documentation${d}*.txt - use doc && dohtml -p ${d} Documentation${d}*.html - done - docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info - - newbashcomp contrib/completion/git-completion.bash ${PN} - bashcomp_alias git gitk - # Not really a bash-completion file (bug #477920) - # but still needed uncompressed (bug #507480) - insinto /usr/share/${PN} - doins contrib/completion/git-prompt.sh - - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - fi - - if use python && use gtk ; then - python_doscript "${S}"/contrib/gitview/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - fi - - #dobin contrib/fast-import/git-p4 # Moved upstream - #dodoc contrib/fast-import/git-p4.txt # Moved upstream - newbin contrib/fast-import/import-tars.perl import-tars - exeinto /usr/libexec/git-core/ - newexe contrib/git-resurrect.sh git-resurrect - - # git-subtree - cd "${S}"/contrib/subtree - git_emake install || die "Failed to emake install git-subtree" - if use doc ; then - git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree" - fi - newdoc README README.git-subtree - dodoc git-subtree.txt - cd "${S}" - - if use mediawiki ; then - cd "${S}"/contrib/mw-to-git - git_emake install - cd "${S}" - fi - - # diff-highlight - dobin contrib/diff-highlight/diff-highlight - newdoc contrib/diff-highlight/README README.diff-highlight - - # git-jump - exeinto /usr/libexec/git-core/ - doexe contrib/git-jump/git-jump - newdoc contrib/git-jump/README git-jump.txt - - # git-contacts - exeinto /usr/libexec/git-core/ - doexe contrib/contacts/git-contacts - dodoc contrib/contacts/git-contacts.txt - - if use gnome-keyring ; then - cd "${S}"/contrib/credential/gnome-keyring - dobin git-credential-gnome-keyring - fi - - if use subversion ; then - cd "${S}"/contrib/svn-fe - dobin svn-fe - dodoc svn-fe.txt - use doc && doman svn-fe.1 && dohtml svn-fe.html - cd "${S}" - fi - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # completion - installed above - # credential/gnome-keyring TODO - # diff-highlight - done above - # emacs - installed above - # examples - these are stuff that is not used in Git anymore actually - # git-jump - done above - # gitview - installed above - # p4import - excluded because fast-import has a better one - # patches - stuff the Git guys made to go upstream to other places - # persistent-https - TODO - # mw-to-git - TODO - # subtree - build seperately - # svnimport - use git-svn - # thunderbird-patch-inline - fixes thunderbird - for i in \ - buildsystems convert-objects fast-import \ - hg-to-git hooks remotes2config.sh rerere-train.sh \ - stats workdir \ - ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - # We used to install in /usr/share/${PN}/gitweb - # but upstream installs in /usr/share/gitweb - # so we will install a symlink and use their location for compat with other - # distros - dosym /usr/share/gitweb /usr/share/${PN}/gitweb - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - find "${ED}"/usr/lib64/perl5/ \ - -name .packlist \ - -exec rm \{\} \; - else - rm -rf "${ED}"/usr/share/gitweb - fi - - if ! use subversion ; then - rm -f "${ED}"/usr/libexec/git-core/git-svn \ - "${ED}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - if use !prefix ; then - newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service" - systemd_dounit "${FILESDIR}/git-daemon.socket" - fi - - perl_delete_localpod - - # burn CVS with fire, see #373439 - if ! use cvs; then - rm -r "${ED}"/usr/bin/git-cvsserver \ - "${ED}"/usr/libexec/git-core/git-cvs* || die - fi -} - -src_test() { - local disabled="" #t7004-tag.sh" #520270 - local tests_cvs="t9200-git-cvsexportcommit.sh \ - t9400-git-cvsserver-server.sh \ - t9401-git-cvsserver-crlf.sh \ - t9402-git-cvsserver-refs.sh \ - t9600-cvsimport.sh \ - t9601-cvsimport-vendor-branch.sh \ - t9602-cvsimport-branches-tags.sh \ - t9603-cvsimport-patchsets.sh \ - t9604-cvsimport-timestamps.sh" - local tests_perl="t3701-add-interactive.sh \ - t5502-quickfetch.sh \ - t5512-ls-remote.sh \ - t5520-pull.sh \ - t7106-reset-unborn-branch.sh \ - t7501-commit.sh" - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot="t0001-init.sh \ - t0004-unwritable.sh \ - t0070-fundamental.sh \ - t1004-read-tree-m-u-wf.sh \ - t3700-add.sh \ - t7300-clean.sh" - # t9100 still fails with symlinks in SVN 1.7 - local test_svn="t9100-git-svn-basic.sh" - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled="${disabled} t5000-tar-tree.sh" - fi - - cvs=0 - use cvs && let cvs=$cvs+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ $cvs -eq 1 ]]; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled="${disabled} ${tests_cvs}" - fi - einfo "Skipping other tests that require being non-root" - disabled="${disabled} ${tests_nonroot}" - else - [[ $cvs -gt 0 ]] && \ - has_version dev-vcs/cvs && \ - let cvs=$cvs+1 - [[ $cvs -gt 1 ]] && \ - has_version "dev-vcs/cvs[server]" && \ - let cvs=$cvs+1 - if [[ $cvs -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled="${disabled} ${tests_cvs}" - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled="${disabled} ${tests_perl}" - fi - - einfo "Disabling tests that fail with SVN 1.7" - disabled="${disabled} ${test_svn}" - - # Reset all previously disabled tests - cd "${S}/t" - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" - done - - # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ - -i "${S}"/t/Makefile - - # Clean old results first, must always run - cd "${S}/t" - nonfatal git_emake clean - - # Now run the tests, keep going if we hit an error, and don't terminate on - # failure - cd "${S}" - einfo "Start test run" - #MAKEOPTS=-j1 - nonfatal git_emake --keep-going test - rc=$? - - # Display nice results, now print the results - cd "${S}/t" - nonfatal git_emake aggregate-results - - # And bail if there was a problem - [ $rc -eq 0 ] || die "tests failed. Please file a bug." -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - einfo "Please read /usr/share/bash-completion/git for Git bash command completion" - einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt" - einfo "Note that the prompt bash code is now in that separate script" - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-vcs/git/git-2.5.0.ebuild b/dev-vcs/git/git-2.5.0.ebuild deleted file mode 100644 index c1da93f2..00000000 --- a/dev-vcs/git/git-2.5.0.ebuild +++ /dev/null @@ -1,647 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python2_7 ) -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_MASTER=pu - -KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit kog-patches toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_GOOG="http://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - KEYWORDS="~amd64 ~x86" -fi - -kog-patches_update_SRC_URI - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - dev-libs/openssl:0= - sys-libs/zlib - pcre? ( dev-libs/libpcre ) - perl? ( dev-lang/perl:=[-build(-)] ) - tk? ( dev-lang/tk:= ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs ) - gnome-keyring? ( gnome-base/libgnome-keyring )" - -RDEPEND="${CDEPEND} - gpg? ( app-crypt/gnupg ) - mediawiki? ( - dev-perl/HTML-Tree - dev-perl/MediaWiki-API - ) - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) - cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - python? ( gtk? - ( - >=dev-python/pygtk-2.8[${PYTHON_USEDEP}] - >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}] - ) - ${PYTHON_DEPS} )" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - app-text/xmlto - ) - nls? ( sys-devel/gettext ) - test? ( app-crypt/gnupg )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - cgi? ( perl ) - cvs? ( perl ) - mediawiki? ( perl ) - subversion? ( perl ) - webdav? ( curl ) - gtk? ( python ) - python? ( ${PYTHON_REQUIRED_USE} ) -" - -pkg_setup() { - if use subversion && has_version "dev-vcs/subversion[dso]"; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi - if use python ; then - python-single-r1_pkg_setup - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use blksha1 ; then - myopts+=" BLK_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts+=" PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts+=" NO_EXPAT=YesPlease" - else - myopts+=" NO_CURL=YesPlease" - fi - - # broken assumptions, because of broken build system ... - myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts+=" INSTALL=install TAR=tar" - myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" - myopts+=" SANE_TOOL_PATH=" - myopts+=" OLD_ICONV=" - myopts+=" NO_EXTERNAL_GREP=" - - # For svn-fe - extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - use iconv \ - || myopts+=" NO_ICONV=YesPlease" - use nls \ - || myopts+=" NO_GETTEXT=YesPlease" - use tk \ - || myopts+=" NO_TCLTK=YesPlease" - use pcre \ - && myopts+=" USE_LIBPCRE=yes" \ - && extlibs+=" -lpcre" - use perl \ - && myopts+=" INSTALLDIRS=vendor" \ - || myopts+=" NO_PERL=YesPlease" - use python \ - || myopts+=" NO_PYTHON=YesPlease" - use subversion \ - || myopts+=" NO_SVN_TESTS=YesPlease" - use threads \ - && myopts+=" THREADED_DELTA_SEARCH=YesPlease" \ - || myopts+=" NO_PTHREADS=YesPlease" - use cvs \ - || myopts+=" NO_CVS=YesPlease" -# Disabled until ~m68k-mint can be keyworded again -# if [[ ${CHOST} == *-mint* ]] ; then -# myopts+=" NO_MMAP=YesPlease" -# myopts+=" NO_IPV6=YesPlease" -# myopts+=" NO_STRLCPY=YesPlease" -# myopts+=" NO_MEMMEM=YesPlease" -# myopts+=" NO_MKDTEMP=YesPlease" -# myopts+=" NO_MKSTEMPS=YesPlease" -# fi - if [[ ${CHOST} == ia64-*-hpux* ]]; then - myopts+=" NO_NSEC=YesPlease" - fi - if [[ ${CHOST} == *-*-aix* ]]; then - myopts+=" NO_FNMATCH_CASEFOLD=YesPlease" - fi - if [[ ${CHOST} == *-solaris* ]]; then - myopts+=" NEEDS_LIBICONV=YesPlease" - fi - - has_version '>=app-text/asciidoc-8.0' \ - && myopts+=" ASCIIDOC8=YesPlease" - myopts+=" ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts+=" NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" - export EXTLIBS="${extlibs}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - - kog-patches_unpack -} - -src_prepare() { - # bug #350330 - automagic CVS when we don't want it is bad. - # git-...-optional-cvs.patch - - # git-...-mw-vendor.patch - # git-...-svn-fe-linking.patch - kog-patches_apply_all - - epatch_user - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL - - # Fix docbook2texi command - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # Fix git-subtree missing DESTDIR - sed -i \ - -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \ - -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \ - contrib/subtree/Makefile -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="" - use python && PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - V=1 \ - "$@" - # This is the fix for bug #326625, but it also causes breakage, see bug - # #352693. - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ -} - -src_configure() { - exportmakeopts -} - -src_compile() { - if use perl ; then - git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" - git_emake perl/perl.mak || die "emake perl/perl.mak failed" - fi - git_emake || die "emake failed" - - if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el - fi - - if use perl && use cgi ; then - git_emake \ - gitweb/gitweb.cgi \ - || die "emake gitweb/gitweb.cgi failed" - fi - - if [[ ${CHOST} == *-darwin* ]]; then - cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain" - git_emake || die "emake credential-osxkeychain" - fi - - cd "${S}"/Documentation - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi - - if use subversion ; then - cd "${S}"/contrib/svn-fe - # by defining EXTLIBS we override the detection for libintl and - # libiconv, bug #516168 - local nlsiconv= - use nls && use !elibc_glibc && nlsiconv+=" -lintl" - use iconv && use !elibc_glibc && nlsiconv+=" -liconv" - git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed" - if use doc ; then - git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" - fi - cd "${S}" - fi - - if use gnome-keyring ; then - cd "${S}"/contrib/credential/gnome-keyring - git_emake || die "emake git-credential-gnome-keyring failed" - fi - - cd "${S}"/contrib/subtree - git_emake - use doc && git_emake doc - - if use mediawiki ; then - cd "${S}"/contrib/mw-to-git - git_emake - fi -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - if [[ ${CHOST} == *-darwin* ]]; then - dobin contrib/credential/osxkeychain/git-credential-osxkeychain - fi - - # Depending on the tarball and manual rebuild of the documentation, the - # manpages may exist in either OR both of these directories. - if ! use cvs; then - find man? -name "*git*cvs*" | xargs rm - fi - find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] - find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] - - dodoc README Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - for d in / /howto/ /technical/ ; do - docinto ${d} - dodoc Documentation${d}*.txt - use doc && dohtml -p ${d} Documentation${d}*.html - done - docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info - - newbashcomp contrib/completion/git-completion.bash ${PN} - bashcomp_alias git gitk - # Not really a bash-completion file (bug #477920) - # but still needed uncompressed (bug #507480) - insinto /usr/share/${PN} - doins contrib/completion/git-prompt.sh - - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - fi - - if use python && use gtk ; then - python_doscript "${S}"/contrib/gitview/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - fi - - #dobin contrib/fast-import/git-p4 # Moved upstream - #dodoc contrib/fast-import/git-p4.txt # Moved upstream - newbin contrib/fast-import/import-tars.perl import-tars - exeinto /usr/libexec/git-core/ - newexe contrib/git-resurrect.sh git-resurrect - - # git-subtree - cd "${S}"/contrib/subtree - git_emake install || die "Failed to emake install git-subtree" - if use doc ; then - git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree" - fi - newdoc README README.git-subtree - dodoc git-subtree.txt - cd "${S}" - - if use mediawiki ; then - cd "${S}"/contrib/mw-to-git - git_emake install - cd "${S}" - fi - - # diff-highlight - dobin contrib/diff-highlight/diff-highlight - newdoc contrib/diff-highlight/README README.diff-highlight - - # git-jump - exeinto /usr/libexec/git-core/ - doexe contrib/git-jump/git-jump - newdoc contrib/git-jump/README git-jump.txt - - # git-contacts - exeinto /usr/libexec/git-core/ - doexe contrib/contacts/git-contacts - dodoc contrib/contacts/git-contacts.txt - - if use gnome-keyring ; then - cd "${S}"/contrib/credential/gnome-keyring - dobin git-credential-gnome-keyring - fi - - if use subversion ; then - cd "${S}"/contrib/svn-fe - dobin svn-fe - dodoc svn-fe.txt - use doc && doman svn-fe.1 && dohtml svn-fe.html - cd "${S}" - fi - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # completion - installed above - # credential/gnome-keyring TODO - # diff-highlight - done above - # emacs - installed above - # examples - these are stuff that is not used in Git anymore actually - # git-jump - done above - # gitview - installed above - # p4import - excluded because fast-import has a better one - # patches - stuff the Git guys made to go upstream to other places - # persistent-https - TODO - # mw-to-git - TODO - # subtree - build seperately - # svnimport - use git-svn - # thunderbird-patch-inline - fixes thunderbird - for i in \ - buildsystems convert-objects fast-import \ - hg-to-git hooks remotes2config.sh rerere-train.sh \ - stats workdir \ - ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - # We used to install in /usr/share/${PN}/gitweb - # but upstream installs in /usr/share/gitweb - # so we will install a symlink and use their location for compat with other - # distros - dosym /usr/share/gitweb /usr/share/${PN}/gitweb - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - find "${ED}"/usr/lib64/perl5/ \ - -name .packlist \ - -exec rm \{\} \; - else - rm -rf "${ED}"/usr/share/gitweb - fi - - if ! use subversion ; then - rm -f "${ED}"/usr/libexec/git-core/git-svn \ - "${ED}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - if use !prefix ; then - newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service" - systemd_dounit "${FILESDIR}/git-daemon.socket" - fi - - perl_delete_localpod - - # burn CVS with fire, see #373439 - if ! use cvs; then - rm -r "${ED}"/usr/bin/git-cvsserver \ - "${ED}"/usr/libexec/git-core/git-cvs* || die - fi -} - -src_test() { - local disabled="" #t7004-tag.sh" #520270 - local tests_cvs="t9200-git-cvsexportcommit.sh \ - t9400-git-cvsserver-server.sh \ - t9401-git-cvsserver-crlf.sh \ - t9402-git-cvsserver-refs.sh \ - t9600-cvsimport.sh \ - t9601-cvsimport-vendor-branch.sh \ - t9602-cvsimport-branches-tags.sh \ - t9603-cvsimport-patchsets.sh \ - t9604-cvsimport-timestamps.sh" - local tests_perl="t3701-add-interactive.sh \ - t5502-quickfetch.sh \ - t5512-ls-remote.sh \ - t5520-pull.sh \ - t7106-reset-unborn-branch.sh \ - t7501-commit.sh" - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot="t0001-init.sh \ - t0004-unwritable.sh \ - t0070-fundamental.sh \ - t1004-read-tree-m-u-wf.sh \ - t3700-add.sh \ - t7300-clean.sh" - # t9100 still fails with symlinks in SVN 1.7 - local test_svn="t9100-git-svn-basic.sh" - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled="${disabled} t5000-tar-tree.sh" - fi - - cvs=0 - use cvs && let cvs=$cvs+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ $cvs -eq 1 ]]; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled="${disabled} ${tests_cvs}" - fi - einfo "Skipping other tests that require being non-root" - disabled="${disabled} ${tests_nonroot}" - else - [[ $cvs -gt 0 ]] && \ - has_version dev-vcs/cvs && \ - let cvs=$cvs+1 - [[ $cvs -gt 1 ]] && \ - has_version "dev-vcs/cvs[server]" && \ - let cvs=$cvs+1 - if [[ $cvs -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled="${disabled} ${tests_cvs}" - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled="${disabled} ${tests_perl}" - fi - - einfo "Disabling tests that fail with SVN 1.7" - disabled="${disabled} ${test_svn}" - - # Reset all previously disabled tests - cd "${S}/t" - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" - done - - # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ - -i "${S}"/t/Makefile - - # Clean old results first, must always run - cd "${S}/t" - nonfatal git_emake clean - - # Now run the tests, keep going if we hit an error, and don't terminate on - # failure - cd "${S}" - einfo "Start test run" - #MAKEOPTS=-j1 - nonfatal git_emake --keep-going test - rc=$? - - # Display nice results, now print the results - cd "${S}/t" - nonfatal git_emake aggregate-results - - # And bail if there was a problem - [ $rc -eq 0 ] || die "tests failed. Please file a bug." -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - einfo "Please read /usr/share/bash-completion/git for Git bash command completion" - einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt" - einfo "Note that the prompt bash code is now in that separate script" - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-vcs/git/metadata.xml b/dev-vcs/git/metadata.xml deleted file mode 100644 index 8eca3310..00000000 --- a/dev-vcs/git/metadata.xml +++ /dev/null @@ -1,38 +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> - <name>Robin H. Johnson</name> - </maintainer> - <maintainer> - <email>polynomial-c@gentoo.org</email> - <name>Lars Wendler</name> - </maintainer> - <longdescription lang="en"> - Git - Fast Version Control System. Official titled - "GIT - the stupid content tracker". - - Git is a popular version control system designed to handle very large - projects with speed and efficiency; it is used mainly for various open - source projects, most notably the Linux kernel. - - Git falls in the category of distributed source code management tools, - similar to e.g. GNU Arch or Monotone (or BitKeeper in the proprietary - world). Every Git working directory is a full-fledged repository with full - revision tracking capabilities, not dependent on network access or a central - server. - </longdescription> - <use> - <flag name="blksha1">Use the new optimized SHA1 implementation</flag> - <flag name="cgi">Install gitweb too</flag> - <flag name="curl">Support fetching and pushing (requires webdav too) over http:// and https:// protocols</flag> - <flag name="gpg">Pull in gnupg for signing -- without gnupg, attempts at signing will fail at runtime!</flag> - <flag name="gtk">Include the gitview contrib tool</flag> - <flag name="highlight">GitWeb support for app-text/highlight</flag> - <flag name="mediawiki">Support pulling and pushing from MediaWiki</flag> - <flag name="ppcsha1">Make use of a bundled routine that is optimized for the PPC arch</flag> - <flag name="subversion">Include git-svn for <pkg>dev-vcs/subversion</pkg> support</flag> - <flag name="webdav">Adds support for push'ing to HTTP/HTTPS repositories via DAV</flag> - </use> -</pkgmetadata> diff --git a/dev-vcs/subversion-java/Manifest b/dev-vcs/subversion-java/Manifest deleted file mode 100644 index e5bbdbfa..00000000 --- a/dev-vcs/subversion-java/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST subversion-1.8.10.tar.bz2 19423 SHA256 e5c6a67c491959687e8ea068a2bb69b24f475fd5367eadfca9a4273762a48ed9 SHA512 961f4abb5e558760e9053071f914da6879802f61e8fb8db3fad36948fdd04bd6dc80ba3362f95f55048e2c3aba82b67df14ef66ccc4372d1ec7b927e684e4adc WHIRLPOOL 9c2f9223d746c32b3757901692cffd9b40d86aa0ce56a2ff988341f345f576e7079afbb26479264511976adaeda757efd5594423c05b2fe8542ffb6741c6ca61 -DIST subversion-1.8.11.tar.bz2 6896225 SHA256 10b056420e1f194c12840368f6bf58842e6200f9cb8cc5ebbf9be2e89e56e4d9 SHA512 86c4ff71a0f448895f26cb1674d1e7230ceacfa5cb2a0ccf28589b8c7f30ff65d2bb6b2c201b95ce53b7b877de98e1a69bf291a8cea4e4005afbbb1d0a62aae1 WHIRLPOOL 08c782e2f578a613e5c380922c05230b3ed0114b28f0dbd6a976089db5f563b160641158682e1d53481b06a961a401e26114452517e51e16a0fc12c0c88b3247 -DIST subversion-1.8.13.tar.bz2 6863330 SHA256 1099cc68840753b48aedb3a27ebd1e2afbcc84ddb871412e5d500e843d607579 SHA512 5b145888fdd294b871066483f9cc5af811aadd88c537c3859b005b73efaf66bd8d5c7c4dc6562897c00331be2ddfd834688a90eb5c229bc6625ab3c45c02045f WHIRLPOOL d79c71385e21ee3254a798687fd1de3e01a1577287b03d9a0f87e0a31621501e749ee9b37f40c59cb206fc68ba9968132e724f3c4a12c7aa8d5aa59d66a4ade4 -DIST subversion-1.8.9-Gentoo-patches.tar.gz 3179 SHA256 95847de918a22c51120ead7695034b587a4654c78d1ac18c26f1be891ffe8ffa SHA512 4f4ad2b900b25c3dfe72a0a41097402e0f96d6c12ab410c595262d586be37c7284a1b38b013aaf20bbed301704b2676b4f6e80544039b1ef47071049704131b8 WHIRLPOOL be5d33bd34bfea2a6f4b1e002522bb51407042e2ea5c8bf0beb2c8185238df4567eceeda993fd6b13b3022499e338da66483c044e5480f3f455b0cc12d705aad diff --git a/dev-vcs/subversion-java/metadata.xml b/dev-vcs/subversion-java/metadata.xml deleted file mode 100644 index 76865e8f..00000000 --- a/dev-vcs/subversion-java/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer> - <email>slawomir.nizio@sabayon.org</email> - <description>Maintainer for split subversion-java ebuild.</description> - </maintainer> -</pkgmetadata> diff --git a/dev-vcs/subversion-java/subversion-java-1.8.10.ebuild b/dev-vcs/subversion-java/subversion-java-1.8.10.ebuild deleted file mode 100644 index 2e6bed29..00000000 --- a/dev-vcs/subversion-java/subversion-java-1.8.10.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 -WANT_AUTOMAKE="none" -MY_P="${P/_/-}" - -MY_SVN_PN="subversion" -MY_SVN_P="${MY_SVN_PN}-${PV}" -MY_SVN_PF="${MY_SVN_PN}-${PVR}" -MY_SVN_CATEGORY="${CATEGORY}" - -# note: java-pkg-2, not java-pkt-opt-2 -KOG_PATCHES_SRC=( http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/${MY_SVN_PN}-1.8.9-Gentoo-patches.tar.gz ) -inherit kog-patches autotools eutils flag-o-matic java-pkg-2 libtool multilib - -DESCRIPTION="Java bindings for Subversion" -HOMEPAGE="http://subversion.apache.org/" -SRC_URI+=" mirror://apache/${PN}/${MY_SVN_P}.tar.bz2" -S="${WORKDIR}/${MY_SVN_P/_/-}" - -LICENSE="Subversion" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" - -IUSE="debug doc nls" - -COMMON_DEPEND="~dev-vcs/subversion-${PV} - >=dev-libs/apr-1.3:1 - >=dev-libs/apr-util-1.3:1" -RDEPEND=" - ${COMMON_DEPEND} - app-arch/bzip2 - >=virtual/jre-1.5" -DEPEND="${COMMON_DEPEND} - >=virtual/jdk-1.5" - -pkg_setup() { - java-pkg-2_pkg_setup - - if use debug ; then - append-cppflags -DSVN_DEBUG -DAP_DEBUG - fi - # http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C51C42014.3060700@wandisco.com%3E - [[ ${CHOST} == *-solaris2* ]] && append-cppflags -D__EXTENSIONS__ -} - -src_prepare() { - kog-patches_apply_all - epatch_user - - fperms +x build/transform_libtool_scripts.sh - - sed -i \ - -e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \ - -e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac - - # this bites us in particular on Solaris - sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \ - die "/bin/sh is not POSIX shell!" - - eautoconf - elibtoolize - - sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \ - -i build-outputs.mk || die "sed failed" -} - -src_configure() { - local myconf - - myconf+=" --without-swig" - myconf+=" --without-junit" - - case ${CHOST} in - *-aix*) - # avoid recording immediate path to sharedlibs into executables - append-ldflags -Wl,-bnoipath - ;; - *-interix*) - # loader crashes on the LD_PRELOADs... - myconf+=" --disable-local-library-preloading" - ;; - *-solaris*) - # need -lintl to link - use nls && append-libs intl - # this breaks installation, on x64 echo replacement is 32-bits - myconf+=" --disable-local-library-preloading" - ;; - *-mint*) - myconf+=" --enable-all-static --disable-local-library-preloading" - ;; - *) - # inject LD_PRELOAD entries for easy in-tree development - myconf+=" --enable-local-library-preloading" - ;; - esac - - #version 1.7.7 again tries to link against the older installed version and fails, when trying to - #compile for x86 on amd64, so workaround this issue again - #check newer versions, if this is still/again needed - myconf+=" --disable-disallowing-of-undefined-references" - - econf --libdir="${EPREFIX}/usr/$(get_libdir)" \ - --without-apache-libexecdir \ - --without-apxs \ - --without-berkeley-db \ - --without-ctypesgen \ - --disable-runtime-module-search \ - --without-gnome-keyring \ - --enable-javahl \ - --with-jdk="${JAVA_HOME}" \ - --without-kwallet \ - $(use_enable nls) \ - --without-sasl \ - --without-serf \ - ${myconf} \ - --with-apr="${EPREFIX}/usr/bin/apr-1-config" \ - --with-apr-util="${EPREFIX}/usr/bin/apu-1-config" \ - --disable-experimental-libtool \ - --without-jikes \ - --disable-mod-activation \ - --disable-static -} - -src_compile() { - emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl - - if use doc ; then - emake doc-javahl - fi -} - -src_install() { - emake DESTDIR="${D}" install-javahl - java-pkg_regso "${ED}"usr/$(get_libdir)/libsvnjavahl*$(get_libname) - java-pkg_jarinto /usr/share/"${MY_SVN_PN}"/lib - java-pkg_dojar "${ED}"usr/$(get_libdir)/svn-javahl/svn-javahl.jar - rm -fr "${ED}"usr/$(get_libdir)/svn-javahl/*.jar - - mv "${ED}usr/share/${PN}/package.env" "${ED}/usr/share/${MY_SVN_PN}/" || die - - if use doc ; then - java-pkg_dojavadoc doc/javadoc - fi - - prune_libtool_files --all -} diff --git a/dev-vcs/subversion-java/subversion-java-1.8.11.ebuild b/dev-vcs/subversion-java/subversion-java-1.8.11.ebuild deleted file mode 100644 index 95bd5678..00000000 --- a/dev-vcs/subversion-java/subversion-java-1.8.11.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 -WANT_AUTOMAKE="none" -MY_P="${P/_/-}" - -MY_SVN_PN="subversion" -MY_SVN_P="${MY_SVN_PN}-${PV}" -MY_SVN_PF="${MY_SVN_PN}-${PVR}" -MY_SVN_CATEGORY="${CATEGORY}" - -# note: java-pkg-2, not java-pkt-opt-2 -KOG_PATCHES_SRC=( http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/${MY_SVN_PN}-1.8.9-Gentoo-patches.tar.gz ) -inherit kog-patches autotools eutils flag-o-matic java-pkg-2 libtool multilib - -DESCRIPTION="Java bindings for Subversion" -HOMEPAGE="http://subversion.apache.org/" -SRC_URI="mirror://apache/${PN}/${MY_SVN_P}.tar.bz2" -S="${WORKDIR}/${MY_SVN_P/_/-}" - -kog-patches_update_SRC_URI - -LICENSE="Subversion" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" - -IUSE="debug doc nls" - -COMMON_DEPEND="~dev-vcs/subversion-${PV} - >=dev-libs/apr-1.3:1 - >=dev-libs/apr-util-1.3:1" -RDEPEND=" - ${COMMON_DEPEND} - app-arch/bzip2 - >=virtual/jre-1.5" -DEPEND="${COMMON_DEPEND} - >=virtual/jdk-1.5" - -pkg_setup() { - java-pkg-2_pkg_setup - - if use debug ; then - append-cppflags -DSVN_DEBUG -DAP_DEBUG - fi - # http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C51C42014.3060700@wandisco.com%3E - [[ ${CHOST} == *-solaris2* ]] && append-cppflags -D__EXTENSIONS__ -} - -src_prepare() { - local KOG_PATCHES_SKIP=( subversion-1.8.9-po_fixes.patch ) - kog-patches_apply_all - epatch_user - - fperms +x build/transform_libtool_scripts.sh - - sed -i \ - -e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \ - -e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac - - # this bites us in particular on Solaris - sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \ - die "/bin/sh is not POSIX shell!" - - eautoconf - elibtoolize - - sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \ - -i build-outputs.mk || die "sed failed" -} - -src_configure() { - local myconf - - myconf+=" --without-swig" - myconf+=" --without-junit" - - case ${CHOST} in - *-aix*) - # avoid recording immediate path to sharedlibs into executables - append-ldflags -Wl,-bnoipath - ;; - *-interix*) - # loader crashes on the LD_PRELOADs... - myconf+=" --disable-local-library-preloading" - ;; - *-solaris*) - # need -lintl to link - use nls && append-libs intl - # this breaks installation, on x64 echo replacement is 32-bits - myconf+=" --disable-local-library-preloading" - ;; - *-mint*) - myconf+=" --enable-all-static --disable-local-library-preloading" - ;; - *) - # inject LD_PRELOAD entries for easy in-tree development - myconf+=" --enable-local-library-preloading" - ;; - esac - - #version 1.7.7 again tries to link against the older installed version and fails, when trying to - #compile for x86 on amd64, so workaround this issue again - #check newer versions, if this is still/again needed - myconf+=" --disable-disallowing-of-undefined-references" - - econf --libdir="${EPREFIX}/usr/$(get_libdir)" \ - --without-apache-libexecdir \ - --without-apxs \ - --without-berkeley-db \ - --without-ctypesgen \ - --disable-runtime-module-search \ - --without-gnome-keyring \ - --enable-javahl \ - --with-jdk="${JAVA_HOME}" \ - --without-kwallet \ - $(use_enable nls) \ - --without-sasl \ - --without-serf \ - ${myconf} \ - --with-apr="${EPREFIX}/usr/bin/apr-1-config" \ - --with-apr-util="${EPREFIX}/usr/bin/apu-1-config" \ - --disable-experimental-libtool \ - --without-jikes \ - --disable-mod-activation \ - --disable-static -} - -src_compile() { - emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl - - if use doc ; then - emake doc-javahl - fi -} - -src_install() { - emake DESTDIR="${D}" install-javahl - java-pkg_regso "${ED}"usr/$(get_libdir)/libsvnjavahl*$(get_libname) - java-pkg_jarinto /usr/share/"${MY_SVN_PN}"/lib - java-pkg_dojar "${ED}"usr/$(get_libdir)/svn-javahl/svn-javahl.jar - rm -fr "${ED}"usr/$(get_libdir)/svn-javahl/*.jar - - mv "${ED}usr/share/${PN}/package.env" "${ED}/usr/share/${MY_SVN_PN}/" || die - - if use doc ; then - java-pkg_dojavadoc doc/javadoc - fi - - prune_libtool_files --all -} diff --git a/dev-vcs/subversion-java/subversion-java-1.8.13.ebuild b/dev-vcs/subversion-java/subversion-java-1.8.13.ebuild deleted file mode 100644 index 824f4b0a..00000000 --- a/dev-vcs/subversion-java/subversion-java-1.8.13.ebuild +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 -WANT_AUTOMAKE="none" -MY_P="${P/_/-}" - -MY_SVN_PN="subversion" -MY_SVN_P="${MY_SVN_PN}-${PV}" -MY_SVN_PF="${MY_SVN_PN}-${PVR}" -MY_SVN_CATEGORY="${CATEGORY}" - -# note: java-pkg-2, not java-pkt-opt-2 -KOG_PATCHES_SRC=( http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/${MY_SVN_PN}-1.8.9-Gentoo-patches.tar.gz ) -inherit kog-patches autotools eutils flag-o-matic java-pkg-2 libtool multilib - -DESCRIPTION="Java bindings for Subversion" -HOMEPAGE="http://subversion.apache.org/" -SRC_URI="mirror://apache/${PN}/${MY_SVN_P}.tar.bz2" -S="${WORKDIR}/${MY_SVN_P/_/-}" - -kog-patches_update_SRC_URI - -LICENSE="Subversion" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" - -IUSE="debug doc nls" - -COMMON_DEPEND="~dev-vcs/subversion-${PV} - >=dev-libs/apr-1.3:1 - >=dev-libs/apr-util-1.3:1 - sys-apps/file" -RDEPEND=" - ${COMMON_DEPEND} - app-arch/bzip2 - >=virtual/jre-1.5" -DEPEND="${COMMON_DEPEND} - >=virtual/jdk-1.5" - -pkg_setup() { - java-pkg-2_pkg_setup - - if use debug ; then - append-cppflags -DSVN_DEBUG -DAP_DEBUG - fi - # http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C51C42014.3060700@wandisco.com%3E - [[ ${CHOST} == *-solaris2* ]] && append-cppflags -D__EXTENSIONS__ -} - -src_prepare() { - local KOG_PATCHES_SKIP=( subversion-1.8.9-po_fixes.patch ) - kog-patches_apply_all - epatch_user - - fperms +x build/transform_libtool_scripts.sh - - sed -i \ - -e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \ - -e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac - - # this bites us in particular on Solaris - sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \ - die "/bin/sh is not POSIX shell!" - - eautoconf - elibtoolize - - sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \ - -i build-outputs.mk || die "sed failed" -} - -src_configure() { - local myconf - - myconf+=" --without-swig" - myconf+=" --without-junit" - - case ${CHOST} in - *-aix*) - # avoid recording immediate path to sharedlibs into executables - append-ldflags -Wl,-bnoipath - ;; - *-interix*) - # loader crashes on the LD_PRELOADs... - myconf+=" --disable-local-library-preloading" - ;; - *-solaris*) - # need -lintl to link - use nls && append-libs intl - # this breaks installation, on x64 echo replacement is 32-bits - myconf+=" --disable-local-library-preloading" - ;; - *-mint*) - myconf+=" --enable-all-static --disable-local-library-preloading" - ;; - *) - # inject LD_PRELOAD entries for easy in-tree development - myconf+=" --enable-local-library-preloading" - ;; - esac - - #version 1.7.7 again tries to link against the older installed version and fails, when trying to - #compile for x86 on amd64, so workaround this issue again - #check newer versions, if this is still/again needed - myconf+=" --disable-disallowing-of-undefined-references" - - econf --libdir="${EPREFIX}/usr/$(get_libdir)" \ - --without-apache-libexecdir \ - --without-apxs \ - --without-berkeley-db \ - --without-ctypesgen \ - --disable-runtime-module-search \ - --without-gnome-keyring \ - --enable-javahl \ - --with-jdk="${JAVA_HOME}" \ - --without-kwallet \ - $(use_enable nls) \ - --without-sasl \ - --without-serf \ - ${myconf} \ - --with-apr="${EPREFIX}/usr/bin/apr-1-config" \ - --with-apr-util="${EPREFIX}/usr/bin/apu-1-config" \ - --disable-experimental-libtool \ - --without-jikes \ - --disable-mod-activation \ - --disable-static -} - -src_compile() { - emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl - - if use doc ; then - emake doc-javahl - fi -} - -src_install() { - emake DESTDIR="${D}" install-javahl - java-pkg_regso "${ED}"usr/$(get_libdir)/libsvnjavahl*$(get_libname) - java-pkg_jarinto /usr/share/"${MY_SVN_PN}"/lib - java-pkg_dojar "${ED}"usr/$(get_libdir)/svn-javahl/svn-javahl.jar - rm -fr "${ED}"usr/$(get_libdir)/svn-javahl/*.jar - - mv "${ED}usr/share/${PN}/package.env" "${ED}/usr/share/${MY_SVN_PN}/" || die - - if use doc ; then - java-pkg_dojavadoc doc/javadoc - fi - - prune_libtool_files --all -} diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest deleted file mode 100644 index e5bbdbfa..00000000 --- a/dev-vcs/subversion/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST subversion-1.8.10.tar.bz2 19423 SHA256 e5c6a67c491959687e8ea068a2bb69b24f475fd5367eadfca9a4273762a48ed9 SHA512 961f4abb5e558760e9053071f914da6879802f61e8fb8db3fad36948fdd04bd6dc80ba3362f95f55048e2c3aba82b67df14ef66ccc4372d1ec7b927e684e4adc WHIRLPOOL 9c2f9223d746c32b3757901692cffd9b40d86aa0ce56a2ff988341f345f576e7079afbb26479264511976adaeda757efd5594423c05b2fe8542ffb6741c6ca61 -DIST subversion-1.8.11.tar.bz2 6896225 SHA256 10b056420e1f194c12840368f6bf58842e6200f9cb8cc5ebbf9be2e89e56e4d9 SHA512 86c4ff71a0f448895f26cb1674d1e7230ceacfa5cb2a0ccf28589b8c7f30ff65d2bb6b2c201b95ce53b7b877de98e1a69bf291a8cea4e4005afbbb1d0a62aae1 WHIRLPOOL 08c782e2f578a613e5c380922c05230b3ed0114b28f0dbd6a976089db5f563b160641158682e1d53481b06a961a401e26114452517e51e16a0fc12c0c88b3247 -DIST subversion-1.8.13.tar.bz2 6863330 SHA256 1099cc68840753b48aedb3a27ebd1e2afbcc84ddb871412e5d500e843d607579 SHA512 5b145888fdd294b871066483f9cc5af811aadd88c537c3859b005b73efaf66bd8d5c7c4dc6562897c00331be2ddfd834688a90eb5c229bc6625ab3c45c02045f WHIRLPOOL d79c71385e21ee3254a798687fd1de3e01a1577287b03d9a0f87e0a31621501e749ee9b37f40c59cb206fc68ba9968132e724f3c4a12c7aa8d5aa59d66a4ade4 -DIST subversion-1.8.9-Gentoo-patches.tar.gz 3179 SHA256 95847de918a22c51120ead7695034b587a4654c78d1ac18c26f1be891ffe8ffa SHA512 4f4ad2b900b25c3dfe72a0a41097402e0f96d6c12ab410c595262d586be37c7284a1b38b013aaf20bbed301704b2676b4f6e80544039b1ef47071049704131b8 WHIRLPOOL be5d33bd34bfea2a6f4b1e002522bb51407042e2ea5c8bf0beb2c8185238df4567eceeda993fd6b13b3022499e338da66483c044e5480f3f455b0cc12d705aad diff --git a/dev-vcs/subversion/files/47_mod_dav_svn.conf b/dev-vcs/subversion/files/47_mod_dav_svn.conf deleted file mode 100644 index 52d08b7a..00000000 --- a/dev-vcs/subversion/files/47_mod_dav_svn.conf +++ /dev/null @@ -1,16 +0,0 @@ -<IfDefine SVN> -LoadModule dav_svn_module modules/mod_dav_svn.so -<IfDefine SVN_AUTHZ> -LoadModule authz_svn_module modules/mod_authz_svn.so -</IfDefine> - -# Example configuration: -#<Location /svn/repos> -# DAV svn -# SVNPath ${SVN_REPOS_LOC}/repos -# AuthType Basic -# AuthName "Subversion repository" -# AuthUserFile ${SVN_REPOS_LOC}/conf/svnusers -# Require valid-user -#</Location> -</IfDefine> diff --git a/dev-vcs/subversion/files/svnserve.confd b/dev-vcs/subversion/files/svnserve.confd deleted file mode 100644 index 83997ce9..00000000 --- a/dev-vcs/subversion/files/svnserve.confd +++ /dev/null @@ -1,10 +0,0 @@ -# The commented variables in this file are the defaults that are used -# in the init-script. You don't need to uncomment them except to -# customize them to different values. - -# Options for svnserve -#SVNSERVE_OPTS="--root=/var/svn" - -# User and group as which to run svnserve -#SVNSERVE_USER="svn" -#SVNSERVE_GROUP="svnusers" diff --git a/dev-vcs/subversion/files/svnserve.initd2 b/dev-vcs/subversion/files/svnserve.initd2 deleted file mode 100644 index 605a4e53..00000000 --- a/dev-vcs/subversion/files/svnserve.initd2 +++ /dev/null @@ -1,26 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/files/svnserve.initd2,v 1.2 2012/01/14 19:46:34 tommy Exp $ - -depend() { - need net -} - -start() { - ebegin "Starting svnserve" - # Ensure that we run from a readable working dir, and that we do not - # lock filesystems when being run from such a location. - cd / - start-stop-daemon --start --quiet --background --make-pidfile \ - --pidfile /var/run/svnserve.pid --exec /usr/bin/svnserve \ - --user ${SVNSERVE_USER:-apache} --group ${SVNSERVE_GROUP:-apache} -- \ - --foreground --daemon ${SVNSERVE_OPTS:---root=/var/svn} - eend $? -} - -stop() { - ebegin "Stopping svnserve" - start-stop-daemon --stop --quiet --pidfile /var/run/svnserve.pid - eend $? -} diff --git a/dev-vcs/subversion/files/svnserve.initd3 b/dev-vcs/subversion/files/svnserve.initd3 deleted file mode 100644 index 2a4fd4b0..00000000 --- a/dev-vcs/subversion/files/svnserve.initd3 +++ /dev/null @@ -1,21 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/files/svnserve.initd3,v 1.1 2015/04/09 12:58:45 polynomial-c Exp $ - -description="svn server" -pidfile="/var/run/svnserve.pid" -command="/usr/bin/svnserve" -command_args="--foreground --daemon ${SVNSERVE_OPTS:---root=/var/svn}" -command_background="true" -start_stop_daemon_args="-u ${SVNSERVE_USER:-apache} -g ${SVNSERVE_GROUP:-apache}" - -depend() { - need net -} - -start_pre() { - # Ensure that we run from a readable working dir, and that we do not - # lock filesystems when being run from such a location. - cd / -} diff --git a/dev-vcs/subversion/files/svnserve.xinetd b/dev-vcs/subversion/files/svnserve.xinetd deleted file mode 100644 index e29f906b..00000000 --- a/dev-vcs/subversion/files/svnserve.xinetd +++ /dev/null @@ -1,14 +0,0 @@ -service svn -{ - socket_type = stream - wait = no - user = apache - group = apache - umask = 002 - protocol = tcp - log_on_failure += USERID HOST - port = 3690 - server = /usr/bin/svnserve - server_args = -i - disable = yes -} diff --git a/dev-vcs/subversion/metadata.xml b/dev-vcs/subversion/metadata.xml deleted file mode 100644 index aa158f77..00000000 --- a/dev-vcs/subversion/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> - <maintainer> - <email>slawomir.nizio@sabayon.org</email> - <description>Maintainer of the split Subversion ebuild.</description> - </maintainer> - <use> - <flag name="ctypes-python">Build and install Ctypes Python bindings</flag> - <flag name="dso">Enable runtime module search</flag> - <flag name="extras">Install extra scripts (examples, tools, hooks)</flag> - <flag name="http">Enable http support using <pkg>net-libs/serf</pkg></flag> - </use> -</pkgmetadata> diff --git a/dev-vcs/subversion/subversion-1.8.10.ebuild b/dev-vcs/subversion/subversion-1.8.10.ebuild deleted file mode 100644 index cf8d073e..00000000 --- a/dev-vcs/subversion/subversion-1.8.10.ebuild +++ /dev/null @@ -1,463 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 -PYTHON_COMPAT=( python{2_6,2_7} ) -DISTUTILS_OPTIONAL=1 -WANT_AUTOMAKE="none" -GENTOO_DEPEND_ON_PERL="no" - -KOG_PATCHES_SRC=( http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/${PN}-1.8.9-Gentoo-patches.tar.gz ) -inherit kog-patches autotools bash-completion-r1 db-use depend.apache distutils-r1 elisp-common flag-o-matic libtool multilib perl-module eutils - -MY_P="${P/_/-}" -DESCRIPTION="Advanced version control system" -HOMEPAGE="http://subversion.apache.org/" -SRC_URI+=" mirror://apache/${PN}/${MY_P}.tar.bz2" -S="${WORKDIR}/${MY_P}" - -LICENSE="Subversion GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kde nls perl python ruby sasl test vim-syntax" - -COMMON_DEPEND=">=dev-db/sqlite-3.7.12 - >=dev-libs/apr-1.3:1 - >=dev-libs/apr-util-1.3:1 - dev-libs/expat - sys-libs/zlib - app-arch/bzip2 - berkdb? ( >=sys-libs/db-4.0.14 ) - ctypes-python? ( ${PYTHON_DEPS} ) - gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring ) - kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 >=kde-base/kdelibs-4:4 ) - perl? ( dev-lang/perl ) - python? ( ${PYTHON_DEPS} ) - ruby? ( >=dev-lang/ruby-1.9.3:1.9 - dev-ruby/rubygems[ruby_targets_ruby19] ) - sasl? ( dev-libs/cyrus-sasl ) - http? ( >=net-libs/serf-1.2.1 )" -RDEPEND="${COMMON_DEPEND} - apache2? ( www-servers/apache[apache2_modules_dav] ) - kde? ( kde-base/kwalletd ) - nls? ( virtual/libintl ) - perl? ( dev-perl/URI )" -# Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once -DEPEND="${COMMON_DEPEND} - test? ( ${PYTHON_DEPS} ) - !!<sys-apps/sandbox-1.6 - ctypes-python? ( dev-python/ctypesgen ) - doc? ( app-doc/doxygen ) - gnome-keyring? ( virtual/pkgconfig ) - kde? ( virtual/pkgconfig ) - nls? ( sys-devel/gettext ) - http? ( virtual/pkgconfig )" -PDEPEND="java? ( ~dev-vcs/subversion-java-${PV} )" - -REQUIRED_USE=" - ctypes-python? ( ${PYTHON_REQUIRED_USE} ) - python? ( ${PYTHON_REQUIRED_USE} ) - test? ( - ${PYTHON_REQUIRED_USE} - !dso - )" - -want_apache - -pkg_setup() { - if use berkdb ; then - local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config --includes \ - | grep -Eoe '-I${EPREFIX}/usr/include/db[[:digit:]]\.[[:digit:]]' \ - | sed 's:.*b::')" - einfo - if [[ -z "${SVN_BDB_VERSION}" ]] ; then - if [[ -n "${apu_bdb_version}" ]] ; then - SVN_BDB_VERSION="${apu_bdb_version}" - einfo "Matching db version to apr-util" - else - SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")" - einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB." - fi - fi - einfo "Using: Berkeley DB ${SVN_BDB_VERSION}" - einfo - - if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then - eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying" - eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}." - eerror "Rebuild dev-libs/apr-util or set SVN_BDB_VERSION=\"${apu_bdb_version}\"." - eerror "Aborting to avoid possible run-time crashes." - die "Berkeley DB version mismatch" - fi - fi - - depend.apache_pkg_setup - - if ! use http ; then - ewarn "WebDAV support is disabled. You need WebDAV to" - ewarn "access repositories through the HTTP protocol." - ewarn "Consider enabling \"http\" USE flag" - echo -ne "\a" - fi - - if use debug ; then - append-cppflags -DSVN_DEBUG -DAP_DEBUG - fi - - # http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C51C42014.3060700@wandisco.com%3E - [[ ${CHOST} == *-solaris2* ]] && append-cppflags -D__EXTENSIONS__ - - # Allow for custom repository locations. - SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}" -} - -src_prepare() { - kog-patches_apply_all - epatch_user - - fperms +x build/transform_libtool_scripts.sh - - sed -i \ - -e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \ - -e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac - - # this bites us in particular on Solaris - sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \ - die "/bin/sh is not POSIX shell!" - - eautoconf - elibtoolize - - sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \ - -i build-outputs.mk || die "sed failed" - - if use python ; then - if [[ ${CHOST} == *-darwin* ]] ; then - # http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C20130614113003.GA19257@tarsus.local2%3E - # in short, we don't have gnome-keyring stuff here, patch - # borrowed from MacPorts - die "Darwin not supported; use Gentoo ebuild" # no need to bother with the patch for our needs - #epatch "${FILESDIR}"/...swig-python-no-gnome-keyring.patch - fi - - # XXX: make python_copy_sources accept path - S=${S}/subversion/bindings/swig/python python_copy_sources - rm -r "${S}"/subversion/bindings/swig/python || die - fi -} - -src_configure() { - local myconf - - if use python || use perl || use ruby; then - myconf+=" --with-swig" - else - myconf+=" --without-swig" - fi - - case ${CHOST} in - *-aix*) - # avoid recording immediate path to sharedlibs into executables - append-ldflags -Wl,-bnoipath - ;; - *-interix*) - # loader crashes on the LD_PRELOADs... - myconf+=" --disable-local-library-preloading" - ;; - *-solaris*) - # need -lintl to link - use nls && append-libs intl - # this breaks installation, on x64 echo replacement is 32-bits - myconf+=" --disable-local-library-preloading" - ;; - *-mint*) - myconf+=" --enable-all-static --disable-local-library-preloading" - ;; - *) - # inject LD_PRELOAD entries for easy in-tree development - myconf+=" --enable-local-library-preloading" - ;; - esac - - #version 1.7.7 again tries to link against the older installed version and fails, when trying to - #compile for x86 on amd64, so workaround this issue again - #check newer versions, if this is still/again needed - myconf+=" --disable-disallowing-of-undefined-references" - - # for build-time scripts - if use ctypes-python || use python || use test; then - python_export_best - fi - - if use python && [[ ${CHOST} == *-darwin* ]] ; then - export ac_cv_python_link="$(tc-getCC) "'$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)' - export ac_cv_python_libs='$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)' - export ac_cv_python_compile="$(tc-getCC)" - fi - - # force ruby-1.9 - # allow overriding Python include directory - ac_cv_path_RUBY="${EPREFIX}"/usr/bin/ruby19 ac_cv_path_RDOC="${EPREFIX}"/usr/bin/rdoc19 \ - ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \ - econf --libdir="${EPREFIX}/usr/$(get_libdir)" \ - $(use_with apache2 apache-libexecdir) \ - $(use_with apache2 apxs "${APXS}") \ - $(use_with berkdb berkeley-db "db.h:${EPREFIX}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}") \ - $(use_with ctypes-python ctypesgen "${EPREFIX}/usr") \ - $(use_enable dso runtime-module-search) \ - $(use_with gnome-keyring) \ - --disable-javahl \ - $(use_with kde kwallet) \ - $(use_enable nls) \ - $(use_with sasl) \ - $(use_with http serf) \ - ${myconf} \ - --with-apr="${EPREFIX}/usr/bin/apr-1-config" \ - --with-apr-util="${EPREFIX}/usr/bin/apu-1-config" \ - --disable-experimental-libtool \ - --without-jikes \ - --disable-mod-activation \ - --disable-static -} - -src_compile() { - emake local-all - - if use ctypes-python ; then - # pre-generate .py files - use ctypes-python && emake ctypes-python - - pushd subversion/bindings/ctypes-python >/dev/null || die - distutils-r1_src_compile - popd >/dev/null || die - fi - - if use python ; then - swig_py_compile() { - local p=subversion/bindings/swig/python - rm -f ${p} || die - ln -s "${BUILD_DIR}" ${p} || die - - python_export PYTHON_INCLUDEDIR - emake swig-py \ - swig_pydir="$(python_get_sitedir)/libsvn" \ - swig_pydir_extra="$(python_get_sitedir)/svn" - } - - # this will give us proper BUILD_DIR for symlinking - BUILD_DIR=python \ - python_foreach_impl swig_py_compile - fi - - if use perl ; then - emake swig-pl - fi - - if use ruby ; then - emake swig-rb - fi - - if use extras ; then - emake tools - fi - - if use doc ; then - doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed" - fi -} - -src_test() { - if has_version ~${CATEGORY}/${P} ; then - default - - if use ctypes-python ; then - python_test() { - "${PYTHON}" subversion/bindings/ctypes-python/test/run_all.py \ - || die "ctypes-python tests fail with ${EPYTHON}" - } - - distutils-r1_src_test - fi - - if use python ; then - swig_py_test() { - pushd "${BUILD_DIR}" >/dev/null || die - "${PYTHON}" tests/run_all.py || die "swig-py tests fail with ${EPYTHON}" - popd >/dev/null || die - } - - BUILD_DIR=subversion/bindings/swig/python \ - python_foreach_impl swig_py_test - fi - else - ewarn "The test suite shows errors when there is an older version of" - ewarn "${CATEGORY}/${PN} installed. Please install =${CATEGORY}/${P}*" - ewarn "before running the test suite." - ewarn "Test suite skipped." - fi -} - -src_install() { - emake -j1 DESTDIR="${D}" local-install - - if use ctypes-python ; then - pushd subversion/bindings/ctypes-python >/dev/null || die - distutils-r1_src_install - popd >/dev/null || die - fi - - if use python ; then - swig_py_install() { - local p=subversion/bindings/swig/python - rm -f ${p} || die - ln -s "${BUILD_DIR}" ${p} || die - - emake \ - DESTDIR="${D}" \ - swig_pydir="$(python_get_sitedir)/libsvn" \ - swig_pydir_extra="$(python_get_sitedir)/svn" \ - install-swig-py - } - - BUILD_DIR=python \ - python_foreach_impl swig_py_install - fi - - if use perl ; then - emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl - fixlocalpod - find "${ED}" "(" -name .packlist -o -name "*.bs" ")" -delete - fi - - if use ruby ; then - emake DESTDIR="${D}" install-swig-rb - fi - - # Install Apache module configuration. - if use apache2 ; then - keepdir "${APACHE_MODULES_CONFDIR}" - insinto "${APACHE_MODULES_CONFDIR}" - doins "${FILESDIR}/47_mod_dav_svn.conf" - fi - - # Install Bash Completion, bug 43179. - newbashcomp tools/client-side/bash_completion subversion - rm -f tools/client-side/bash_completion - - # Install hot backup script, bug 54304. - newbin tools/backup/hot-backup.py svn-hot-backup - rm -fr tools/backup - - # Install svnserve init-script and xinet.d snippet, bug 43245. - newinitd "${FILESDIR}"/svnserve.initd2 svnserve - newconfd "${FILESDIR}"/svnserve.confd svnserve - insinto /etc/xinetd.d - newins "${FILESDIR}"/svnserve.xinetd svnserve - - #adjust default user and group with disabled apache2 USE flag, bug 381385 - use apache2 || sed -e "s\USER:-apache\USER:-svn\g" \ - -e "s\GROUP:-apache\GROUP:-svnusers\g" \ - -i "${ED}"etc/init.d/svnserve || die - use apache2 || sed -e "0,/apache/s//svn/" \ - -e "s:apache:svnusers:" \ - -i "${ED}"etc/xinetd.d/svnserve || die - - # Install documentation. - dodoc CHANGES COMMITTERS README - dodoc tools/xslt/svnindex.{css,xsl} - rm -fr tools/xslt - - # Install extra files. - if use extras ; then - cat << EOF > 80subversion-extras -PATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin" -ROOTPATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin" -EOF - doenvd 80subversion-extras - - emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools - - find tools "(" -name "*.bat" -o -name "*.in" -o -name ".libs" ")" -print0 | xargs -0 rm -fr - rm -fr tools/client-side/svnmucc - rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}* - rm -fr tools/{buildbot,dev,diff,po} - - insinto /usr/share/${PN} - find tools -name '*.py' -exec sed -i -e '1s:python:&2:' {} + || die - doins -r tools - fi - - if use doc ; then - dohtml -r doc/doxygen/html/* - fi - - prune_libtool_files --all - - cd "${ED}"usr/share/locale - for i in * ; do - [[ $i == *$LINGUAS* ]] || { rm -r $i || die ; } - done -} - -pkg_preinst() { - # Compare versions of Berkeley DB, bug 122877. - if use berkdb && [[ -f "${EROOT}usr/bin/svn" ]] ; then - OLD_BDB_VERSION="$(scanelf -nq "${EROOT}usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" - NEW_BDB_VERSION="$(scanelf -nq "${ED}usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" - if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]] ; then - CHANGED_BDB_VERSION="1" - fi - fi -} - -pkg_postinst() { - use perl && perl-module_pkg_postinst - - if [[ -n "${CHANGED_BDB_VERSION}" ]] ; then - ewarn "You upgraded from an older version of Berkeley DB and may experience" - ewarn "problems with your repository. Run the following commands as root to fix it:" - ewarn " db4_recover -h ${SVN_REPOS_LOC}/repos" - ewarn " chown -Rf apache:apache ${SVN_REPOS_LOC}/repos" - fi - - ewarn "If you run subversion as a daemon, you will need to restart it to avoid module mismatches." -} - -pkg_postrm() { - use perl && perl-module_pkg_postrm -} - -pkg_config() { - # Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC} - # already has EPREFIX in it - einfo "Initializing the database in ${SVN_REPOS_LOC}..." - if [[ -e "${SVN_REPOS_LOC}/repos" ]] ; then - echo "A Subversion repository already exists and I will not overwrite it." - echo "Delete \"${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version." - else - mkdir -p "${SVN_REPOS_LOC}/conf" - - einfo "Populating repository directory..." - # Create initial repository. - "${EROOT}usr/bin/svnadmin" create "${SVN_REPOS_LOC}/repos" - - einfo "Setting repository permissions..." - SVNSERVE_USER="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")" - SVNSERVE_GROUP="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_GROUP}")" - if use apache2 ; then - [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache" - [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache" - else - [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn" - [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers" - fi - chmod -Rf go-rwx "${SVN_REPOS_LOC}/conf" - chmod -Rf o-rwx "${SVN_REPOS_LOC}/repos" - echo "Please create \"${SVNSERVE_GROUP}\" group if it does not exist yet." - echo "Afterwards please create \"${SVNSERVE_USER}\" user with homedir \"${SVN_REPOS_LOC}\"" - echo "and as part of the \"${SVNSERVE_GROUP}\" group if it does not exist yet." - echo "Finally, execute \"chown -Rf ${SVNSERVE_USER}:${SVNSERVE_GROUP} ${SVN_REPOS_LOC}/repos\"" - echo "to finish the configuration." - fi -} diff --git a/dev-vcs/subversion/subversion-1.8.11.ebuild b/dev-vcs/subversion/subversion-1.8.11.ebuild deleted file mode 100644 index ccab9e37..00000000 --- a/dev-vcs/subversion/subversion-1.8.11.ebuild +++ /dev/null @@ -1,465 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 -PYTHON_COMPAT=( python{2_6,2_7} ) -DISTUTILS_OPTIONAL=1 -WANT_AUTOMAKE="none" -GENTOO_DEPEND_ON_PERL="no" - -KOG_PATCHES_SRC=( mirror://sabayon/dev-vcs/${PN}-1.8.9-Gentoo-patches.tar.gz ) -inherit kog-patches autotools bash-completion-r1 db-use depend.apache distutils-r1 elisp-common flag-o-matic libtool multilib perl-module eutils - -MY_P="${P/_/-}" -DESCRIPTION="Advanced version control system" -HOMEPAGE="http://subversion.apache.org/" -SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2" -S="${WORKDIR}/${MY_P}" - -kog-patches_update_SRC_URI - -LICENSE="Subversion GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kde nls perl python ruby sasl test vim-syntax" - -COMMON_DEPEND=">=dev-db/sqlite-3.7.12 - >=dev-libs/apr-1.3:1 - >=dev-libs/apr-util-1.3:1 - dev-libs/expat - sys-libs/zlib - app-arch/bzip2 - berkdb? ( >=sys-libs/db-4.0.14 ) - ctypes-python? ( ${PYTHON_DEPS} ) - gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring ) - kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 >=kde-base/kdelibs-4:4 ) - perl? ( dev-lang/perl:= ) - python? ( ${PYTHON_DEPS} ) - ruby? ( >=dev-lang/ruby-1.9.3:1.9 - dev-ruby/rubygems[ruby_targets_ruby19] ) - sasl? ( dev-libs/cyrus-sasl ) - http? ( >=net-libs/serf-1.2.1 )" -RDEPEND="${COMMON_DEPEND} - apache2? ( www-servers/apache[apache2_modules_dav] ) - kde? ( || ( kde-apps/kwalletd:4 kde-base/kwalletd ) ) - nls? ( virtual/libintl ) - perl? ( dev-perl/URI )" -# Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once -DEPEND="${COMMON_DEPEND} - test? ( ${PYTHON_DEPS} ) - !!<sys-apps/sandbox-1.6 - ctypes-python? ( dev-python/ctypesgen ) - doc? ( app-doc/doxygen ) - gnome-keyring? ( virtual/pkgconfig ) - kde? ( virtual/pkgconfig ) - nls? ( sys-devel/gettext ) - http? ( virtual/pkgconfig )" -PDEPEND="java? ( ~dev-vcs/subversion-java-${PV} )" - -REQUIRED_USE=" - ctypes-python? ( ${PYTHON_REQUIRED_USE} ) - python? ( ${PYTHON_REQUIRED_USE} ) - test? ( - ${PYTHON_REQUIRED_USE} - !dso - )" - -want_apache - -pkg_setup() { - if use berkdb ; then - local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config --includes \ - | grep -Eoe '-I${EPREFIX}/usr/include/db[[:digit:]]\.[[:digit:]]' \ - | sed 's:.*b::')" - einfo - if [[ -z "${SVN_BDB_VERSION}" ]] ; then - if [[ -n "${apu_bdb_version}" ]] ; then - SVN_BDB_VERSION="${apu_bdb_version}" - einfo "Matching db version to apr-util" - else - SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")" - einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB." - fi - fi - einfo "Using: Berkeley DB ${SVN_BDB_VERSION}" - einfo - - if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then - eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying" - eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}." - eerror "Rebuild dev-libs/apr-util or set SVN_BDB_VERSION=\"${apu_bdb_version}\"." - eerror "Aborting to avoid possible run-time crashes." - die "Berkeley DB version mismatch" - fi - fi - - depend.apache_pkg_setup - - if ! use http ; then - ewarn "WebDAV support is disabled. You need WebDAV to" - ewarn "access repositories through the HTTP protocol." - ewarn "Consider enabling \"http\" USE flag" - echo -ne "\a" - fi - - if use debug ; then - append-cppflags -DSVN_DEBUG -DAP_DEBUG - fi - - # http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C51C42014.3060700@wandisco.com%3E - [[ ${CHOST} == *-solaris2* ]] && append-cppflags -D__EXTENSIONS__ - - # Allow for custom repository locations. - SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}" -} - -src_prepare() { - local KOG_PATCHES_SKIP=( subversion-1.8.9-po_fixes.patch ) - kog-patches_apply_all - epatch_user - - fperms +x build/transform_libtool_scripts.sh - - sed -i \ - -e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \ - -e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac - - # this bites us in particular on Solaris - sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \ - die "/bin/sh is not POSIX shell!" - - eautoconf - elibtoolize - - sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \ - -i build-outputs.mk || die "sed failed" - - if use python ; then - if [[ ${CHOST} == *-darwin* ]] ; then - # http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C20130614113003.GA19257@tarsus.local2%3E - # in short, we don't have gnome-keyring stuff here, patch - # borrowed from MacPorts - die "Darwin not supported; use Gentoo ebuild" # no need to bother with the patch for our needs - #epatch "${FILESDIR}"/...swig-python-no-gnome-keyring.patch - fi - - # XXX: make python_copy_sources accept path - S=${S}/subversion/bindings/swig/python python_copy_sources - rm -r "${S}"/subversion/bindings/swig/python || die - fi -} - -src_configure() { - local myconf - - if use python || use perl || use ruby; then - myconf+=" --with-swig" - else - myconf+=" --without-swig" - fi - - case ${CHOST} in - *-aix*) - # avoid recording immediate path to sharedlibs into executables - append-ldflags -Wl,-bnoipath - ;; - *-interix*) - # loader crashes on the LD_PRELOADs... - myconf+=" --disable-local-library-preloading" - ;; - *-solaris*) - # need -lintl to link - use nls && append-libs intl - # this breaks installation, on x64 echo replacement is 32-bits - myconf+=" --disable-local-library-preloading" - ;; - *-mint*) - myconf+=" --enable-all-static --disable-local-library-preloading" - ;; - *) - # inject LD_PRELOAD entries for easy in-tree development - myconf+=" --enable-local-library-preloading" - ;; - esac - - #version 1.7.7 again tries to link against the older installed version and fails, when trying to - #compile for x86 on amd64, so workaround this issue again - #check newer versions, if this is still/again needed - myconf+=" --disable-disallowing-of-undefined-references" - - # for build-time scripts - if use ctypes-python || use python || use test; then - python_export_best - fi - - if use python && [[ ${CHOST} == *-darwin* ]] ; then - export ac_cv_python_link="$(tc-getCC) "'$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)' - export ac_cv_python_libs='$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)' - export ac_cv_python_compile="$(tc-getCC)" - fi - - # force ruby-1.9 - # allow overriding Python include directory - ac_cv_path_RUBY="${EPREFIX}"/usr/bin/ruby19 ac_cv_path_RDOC="${EPREFIX}"/usr/bin/rdoc19 \ - ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \ - econf --libdir="${EPREFIX}/usr/$(get_libdir)" \ - $(use_with apache2 apache-libexecdir) \ - $(use_with apache2 apxs "${APXS}") \ - $(use_with berkdb berkeley-db "db.h:${EPREFIX}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}") \ - $(use_with ctypes-python ctypesgen "${EPREFIX}/usr") \ - $(use_enable dso runtime-module-search) \ - $(use_with gnome-keyring) \ - --disable-javahl \ - $(use_with kde kwallet) \ - $(use_enable nls) \ - $(use_with sasl) \ - $(use_with http serf) \ - ${myconf} \ - --with-apr="${EPREFIX}/usr/bin/apr-1-config" \ - --with-apr-util="${EPREFIX}/usr/bin/apu-1-config" \ - --disable-experimental-libtool \ - --without-jikes \ - --disable-mod-activation \ - --disable-static -} - -src_compile() { - emake local-all - - if use ctypes-python ; then - # pre-generate .py files - use ctypes-python && emake ctypes-python - - pushd subversion/bindings/ctypes-python >/dev/null || die - distutils-r1_src_compile - popd >/dev/null || die - fi - - if use python ; then - swig_py_compile() { - local p=subversion/bindings/swig/python - rm -f ${p} || die - ln -s "${BUILD_DIR}" ${p} || die - - python_export PYTHON_INCLUDEDIR - emake swig-py \ - swig_pydir="$(python_get_sitedir)/libsvn" \ - swig_pydir_extra="$(python_get_sitedir)/svn" - } - - # this will give us proper BUILD_DIR for symlinking - BUILD_DIR=python \ - python_foreach_impl swig_py_compile - fi - - if use perl ; then - emake swig-pl - fi - - if use ruby ; then - emake swig-rb - fi - - if use extras ; then - emake tools - fi - - if use doc ; then - doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed" - fi -} - -src_test() { - if has_version ~${CATEGORY}/${P} ; then - default - - if use ctypes-python ; then - python_test() { - "${PYTHON}" subversion/bindings/ctypes-python/test/run_all.py \ - || die "ctypes-python tests fail with ${EPYTHON}" - } - - distutils-r1_src_test - fi - - if use python ; then - swig_py_test() { - pushd "${BUILD_DIR}" >/dev/null || die - "${PYTHON}" tests/run_all.py || die "swig-py tests fail with ${EPYTHON}" - popd >/dev/null || die - } - - BUILD_DIR=subversion/bindings/swig/python \ - python_foreach_impl swig_py_test - fi - else - ewarn "The test suite shows errors when there is an older version of" - ewarn "${CATEGORY}/${PN} installed. Please install =${CATEGORY}/${P}*" - ewarn "before running the test suite." - ewarn "Test suite skipped." - fi -} - -src_install() { - emake -j1 DESTDIR="${D}" local-install - - if use ctypes-python ; then - pushd subversion/bindings/ctypes-python >/dev/null || die - distutils-r1_src_install - popd >/dev/null || die - fi - - if use python ; then - swig_py_install() { - local p=subversion/bindings/swig/python - rm -f ${p} || die - ln -s "${BUILD_DIR}" ${p} || die - - emake \ - DESTDIR="${D}" \ - swig_pydir="$(python_get_sitedir)/libsvn" \ - swig_pydir_extra="$(python_get_sitedir)/svn" \ - install-swig-py - } - - BUILD_DIR=python \ - python_foreach_impl swig_py_install - fi - - if use perl ; then - emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl - perl_delete_localpod - find "${ED}" "(" -name .packlist -o -name "*.bs" ")" -delete - fi - - if use ruby ; then - emake DESTDIR="${D}" install-swig-rb - fi - - # Install Apache module configuration. - if use apache2 ; then - keepdir "${APACHE_MODULES_CONFDIR}" - insinto "${APACHE_MODULES_CONFDIR}" - doins "${FILESDIR}/47_mod_dav_svn.conf" - fi - - # Install Bash Completion, bug 43179. - newbashcomp tools/client-side/bash_completion svn - bashcomp_alias svn svn{admin,dumpfilter,look,sync,version} - rm -f tools/client-side/bash_completion - - # Install hot backup script, bug 54304. - newbin tools/backup/hot-backup.py svn-hot-backup - rm -fr tools/backup - - # Install svnserve init-script and xinet.d snippet, bug 43245. - newinitd "${FILESDIR}"/svnserve.initd2 svnserve - newconfd "${FILESDIR}"/svnserve.confd svnserve - insinto /etc/xinetd.d - newins "${FILESDIR}"/svnserve.xinetd svnserve - - #adjust default user and group with disabled apache2 USE flag, bug 381385 - use apache2 || sed -e "s\USER:-apache\USER:-svn\g" \ - -e "s\GROUP:-apache\GROUP:-svnusers\g" \ - -i "${ED}"etc/init.d/svnserve || die - use apache2 || sed -e "0,/apache/s//svn/" \ - -e "s:apache:svnusers:" \ - -i "${ED}"etc/xinetd.d/svnserve || die - - # Install documentation. - dodoc CHANGES COMMITTERS README - dodoc tools/xslt/svnindex.{css,xsl} - rm -fr tools/xslt - - # Install extra files. - if use extras ; then - cat << EOF > 80subversion-extras -PATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin" -ROOTPATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin" -EOF - doenvd 80subversion-extras - - emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools - - find tools "(" -name "*.bat" -o -name "*.in" -o -name ".libs" ")" -print0 | xargs -0 rm -fr - rm -fr tools/client-side/svnmucc - rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}* - rm -fr tools/{buildbot,dev,diff,po} - - insinto /usr/share/${PN} - find tools -name '*.py' -exec sed -i -e '1s:python:&2:' {} + || die - doins -r tools - fi - - if use doc ; then - dohtml -r doc/doxygen/html/* - fi - - prune_libtool_files --all - - cd "${ED}"usr/share/locale - for i in * ; do - [[ $i == *$LINGUAS* ]] || { rm -r $i || die ; } - done -} - -pkg_preinst() { - # Compare versions of Berkeley DB, bug 122877. - if use berkdb && [[ -f "${EROOT}usr/bin/svn" ]] ; then - OLD_BDB_VERSION="$(scanelf -nq "${EROOT}usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" - NEW_BDB_VERSION="$(scanelf -nq "${ED}usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" - if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]] ; then - CHANGED_BDB_VERSION="1" - fi - fi -} - -pkg_postinst() { - if [[ -n "${CHANGED_BDB_VERSION}" ]] ; then - ewarn "You upgraded from an older version of Berkeley DB and may experience" - ewarn "problems with your repository. Run the following commands as root to fix it:" - ewarn " db4_recover -h ${SVN_REPOS_LOC}/repos" - ewarn " chown -Rf apache:apache ${SVN_REPOS_LOC}/repos" - fi - - ewarn "If you run subversion as a daemon, you will need to restart it to avoid module mismatches." -} - -pkg_postrm() { - : -} - -pkg_config() { - # Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC} - # already has EPREFIX in it - einfo "Initializing the database in ${SVN_REPOS_LOC}..." - if [[ -e "${SVN_REPOS_LOC}/repos" ]] ; then - echo "A Subversion repository already exists and I will not overwrite it." - echo "Delete \"${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version." - else - mkdir -p "${SVN_REPOS_LOC}/conf" - - einfo "Populating repository directory..." - # Create initial repository. - "${EROOT}usr/bin/svnadmin" create "${SVN_REPOS_LOC}/repos" - - einfo "Setting repository permissions..." - SVNSERVE_USER="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")" - SVNSERVE_GROUP="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_GROUP}")" - if use apache2 ; then - [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache" - [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache" - else - [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn" - [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers" - fi - chmod -Rf go-rwx "${SVN_REPOS_LOC}/conf" - chmod -Rf o-rwx "${SVN_REPOS_LOC}/repos" - echo "Please create \"${SVNSERVE_GROUP}\" group if it does not exist yet." - echo "Afterwards please create \"${SVNSERVE_USER}\" user with homedir \"${SVN_REPOS_LOC}\"" - echo "and as part of the \"${SVNSERVE_GROUP}\" group if it does not exist yet." - echo "Finally, execute \"chown -Rf ${SVNSERVE_USER}:${SVNSERVE_GROUP} ${SVN_REPOS_LOC}/repos\"" - echo "to finish the configuration." - fi -} diff --git a/dev-vcs/subversion/subversion-1.8.13.ebuild b/dev-vcs/subversion/subversion-1.8.13.ebuild deleted file mode 100644 index 15031e5e..00000000 --- a/dev-vcs/subversion/subversion-1.8.13.ebuild +++ /dev/null @@ -1,466 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) -DISTUTILS_OPTIONAL=1 -WANT_AUTOMAKE="none" -GENTOO_DEPEND_ON_PERL="no" - -KOG_PATCHES_SRC=( mirror://sabayon/dev-vcs/${PN}-1.8.9-Gentoo-patches.tar.gz ) -inherit kog-patches autotools bash-completion-r1 db-use depend.apache distutils-r1 elisp-common flag-o-matic libtool multilib perl-module eutils - -MY_P="${P/_/-}" -DESCRIPTION="Advanced version control system" -HOMEPAGE="http://subversion.apache.org/" -SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2" -S="${WORKDIR}/${MY_P}" - -kog-patches_update_SRC_URI - -LICENSE="Subversion GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kde nls perl python ruby sasl test vim-syntax" - -COMMON_DEPEND=">=dev-db/sqlite-3.7.12 - >=dev-libs/apr-1.3:1 - >=dev-libs/apr-util-1.3:1 - dev-libs/expat - sys-apps/file - sys-libs/zlib - app-arch/bzip2 - berkdb? ( >=sys-libs/db-4.0.14:= ) - ctypes-python? ( ${PYTHON_DEPS} ) - gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/libgnome-keyring ) - kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 >=kde-base/kdelibs-4:4 ) - perl? ( dev-lang/perl:= ) - python? ( ${PYTHON_DEPS} ) - ruby? ( >=dev-lang/ruby-2.1:2.1 - dev-ruby/rubygems[ruby_targets_ruby21] ) - sasl? ( dev-libs/cyrus-sasl ) - http? ( >=net-libs/serf-1.2.1 )" -RDEPEND="${COMMON_DEPEND} - apache2? ( www-servers/apache[apache2_modules_dav] ) - kde? ( || ( kde-apps/kwalletd:4 kde-base/kwalletd ) ) - nls? ( virtual/libintl ) - perl? ( dev-perl/URI )" -# Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once -DEPEND="${COMMON_DEPEND} - test? ( ${PYTHON_DEPS} ) - !!<sys-apps/sandbox-1.6 - ctypes-python? ( dev-python/ctypesgen ) - doc? ( app-doc/doxygen ) - gnome-keyring? ( virtual/pkgconfig ) - kde? ( virtual/pkgconfig ) - nls? ( sys-devel/gettext ) - http? ( virtual/pkgconfig )" -PDEPEND="java? ( ~dev-vcs/subversion-java-${PV} )" - -REQUIRED_USE=" - ctypes-python? ( ${PYTHON_REQUIRED_USE} ) - python? ( ${PYTHON_REQUIRED_USE} ) - test? ( - ${PYTHON_REQUIRED_USE} - !dso - )" - -want_apache - -pkg_setup() { - if use berkdb ; then - local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config --includes \ - | grep -Eoe '-I${EPREFIX}/usr/include/db[[:digit:]]\.[[:digit:]]' \ - | sed 's:.*b::')" - einfo - if [[ -z "${SVN_BDB_VERSION}" ]] ; then - if [[ -n "${apu_bdb_version}" ]] ; then - SVN_BDB_VERSION="${apu_bdb_version}" - einfo "Matching db version to apr-util" - else - SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")" - einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB." - fi - fi - einfo "Using: Berkeley DB ${SVN_BDB_VERSION}" - einfo - - if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then - eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying" - eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}." - eerror "Rebuild dev-libs/apr-util or set SVN_BDB_VERSION=\"${apu_bdb_version}\"." - eerror "Aborting to avoid possible run-time crashes." - die "Berkeley DB version mismatch" - fi - fi - - depend.apache_pkg_setup - - if ! use http ; then - ewarn "WebDAV support is disabled. You need WebDAV to" - ewarn "access repositories through the HTTP protocol." - ewarn "Consider enabling \"http\" USE flag" - echo -ne "\a" - fi - - if use debug ; then - append-cppflags -DSVN_DEBUG -DAP_DEBUG - fi - - # http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C51C42014.3060700@wandisco.com%3E - [[ ${CHOST} == *-solaris2* ]] && append-cppflags -D__EXTENSIONS__ - - # Allow for custom repository locations. - SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}" -} - -src_prepare() { - local KOG_PATCHES_SKIP=( subversion-1.8.9-po_fixes.patch ) - kog-patches_apply_all - epatch_user - - fperms +x build/transform_libtool_scripts.sh - - sed -i \ - -e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \ - -e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac - - # this bites us in particular on Solaris - sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \ - die "/bin/sh is not POSIX shell!" - - eautoconf - elibtoolize - - sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \ - -i build-outputs.mk || die "sed failed" - - if use python ; then - if [[ ${CHOST} == *-darwin* ]] ; then - # http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C20130614113003.GA19257@tarsus.local2%3E - # in short, we don't have gnome-keyring stuff here, patch - # borrowed from MacPorts - die "Darwin not supported; use Gentoo ebuild" # no need to bother with the patch for our needs - #epatch "${FILESDIR}"/...swig-python-no-gnome-keyring.patch - fi - - # XXX: make python_copy_sources accept path - S=${S}/subversion/bindings/swig/python python_copy_sources - rm -r "${S}"/subversion/bindings/swig/python || die - fi -} - -src_configure() { - local myconf - - if use python || use perl || use ruby; then - myconf+=" --with-swig" - else - myconf+=" --without-swig" - fi - - case ${CHOST} in - *-aix*) - # avoid recording immediate path to sharedlibs into executables - append-ldflags -Wl,-bnoipath - ;; - *-interix*) - # loader crashes on the LD_PRELOADs... - myconf+=" --disable-local-library-preloading" - ;; - *-solaris*) - # need -lintl to link - use nls && append-libs intl - # this breaks installation, on x64 echo replacement is 32-bits - myconf+=" --disable-local-library-preloading" - ;; - *-mint*) - myconf+=" --enable-all-static --disable-local-library-preloading" - ;; - *) - # inject LD_PRELOAD entries for easy in-tree development - myconf+=" --enable-local-library-preloading" - ;; - esac - - #version 1.7.7 again tries to link against the older installed version and fails, when trying to - #compile for x86 on amd64, so workaround this issue again - #check newer versions, if this is still/again needed - myconf+=" --disable-disallowing-of-undefined-references" - - # for build-time scripts - if use ctypes-python || use python || use test; then - python_export_best - fi - - if use python && [[ ${CHOST} == *-darwin* ]] ; then - export ac_cv_python_link="$(tc-getCC) "'$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)' - export ac_cv_python_libs='$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)' - export ac_cv_python_compile="$(tc-getCC)" - fi - - # force ruby-2.1 - # allow overriding Python include directory - ac_cv_path_RUBY="${EPREFIX}"/usr/bin/ruby21 ac_cv_path_RDOC="${EPREFIX}"/usr/bin/rdoc21 \ - ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \ - econf --libdir="${EPREFIX}/usr/$(get_libdir)" \ - $(use_with apache2 apache-libexecdir) \ - $(use_with apache2 apxs "${APXS}") \ - $(use_with berkdb berkeley-db "db.h:${EPREFIX}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}") \ - $(use_with ctypes-python ctypesgen "${EPREFIX}/usr") \ - $(use_enable dso runtime-module-search) \ - $(use_with gnome-keyring) \ - --disable-javahl \ - $(use_with kde kwallet) \ - $(use_enable nls) \ - $(use_with sasl) \ - $(use_with http serf) \ - ${myconf} \ - --with-apr="${EPREFIX}/usr/bin/apr-1-config" \ - --with-apr-util="${EPREFIX}/usr/bin/apu-1-config" \ - --disable-experimental-libtool \ - --without-jikes \ - --disable-mod-activation \ - --disable-static -} - -src_compile() { - emake local-all - - if use ctypes-python ; then - # pre-generate .py files - use ctypes-python && emake ctypes-python - - pushd subversion/bindings/ctypes-python >/dev/null || die - distutils-r1_src_compile - popd >/dev/null || die - fi - - if use python ; then - swig_py_compile() { - local p=subversion/bindings/swig/python - rm -f ${p} || die - ln -s "${BUILD_DIR}" ${p} || die - - python_export PYTHON_INCLUDEDIR - emake swig-py \ - swig_pydir="$(python_get_sitedir)/libsvn" \ - swig_pydir_extra="$(python_get_sitedir)/svn" - } - - # this will give us proper BUILD_DIR for symlinking - BUILD_DIR=python \ - python_foreach_impl swig_py_compile - fi - - if use perl ; then - emake swig-pl - fi - - if use ruby ; then - emake swig-rb - fi - - if use extras ; then - emake tools - fi - - if use doc ; then - doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed" - fi -} - -src_test() { - if has_version ~${CATEGORY}/${P} ; then - default - - if use ctypes-python ; then - python_test() { - "${PYTHON}" subversion/bindings/ctypes-python/test/run_all.py \ - || die "ctypes-python tests fail with ${EPYTHON}" - } - - distutils-r1_src_test - fi - - if use python ; then - swig_py_test() { - pushd "${BUILD_DIR}" >/dev/null || die - "${PYTHON}" tests/run_all.py || die "swig-py tests fail with ${EPYTHON}" - popd >/dev/null || die - } - - BUILD_DIR=subversion/bindings/swig/python \ - python_foreach_impl swig_py_test - fi - else - ewarn "The test suite shows errors when there is an older version of" - ewarn "${CATEGORY}/${PN} installed. Please install =${CATEGORY}/${P}*" - ewarn "before running the test suite." - ewarn "Test suite skipped." - fi -} - -src_install() { - emake -j1 DESTDIR="${D}" local-install - - if use ctypes-python ; then - pushd subversion/bindings/ctypes-python >/dev/null || die - distutils-r1_src_install - popd >/dev/null || die - fi - - if use python ; then - swig_py_install() { - local p=subversion/bindings/swig/python - rm -f ${p} || die - ln -s "${BUILD_DIR}" ${p} || die - - emake \ - DESTDIR="${D}" \ - swig_pydir="$(python_get_sitedir)/libsvn" \ - swig_pydir_extra="$(python_get_sitedir)/svn" \ - install-swig-py - } - - BUILD_DIR=python \ - python_foreach_impl swig_py_install - fi - - if use perl ; then - emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl - perl_delete_localpod - find "${ED}" "(" -name .packlist -o -name "*.bs" ")" -delete - fi - - if use ruby ; then - emake DESTDIR="${D}" install-swig-rb - fi - - # Install Apache module configuration. - if use apache2 ; then - keepdir "${APACHE_MODULES_CONFDIR}" - insinto "${APACHE_MODULES_CONFDIR}" - doins "${FILESDIR}/47_mod_dav_svn.conf" - fi - - # Install Bash Completion, bug 43179. - newbashcomp tools/client-side/bash_completion svn - bashcomp_alias svn svn{admin,dumpfilter,look,sync,version} - rm -f tools/client-side/bash_completion - - # Install hot backup script, bug 54304. - newbin tools/backup/hot-backup.py svn-hot-backup - rm -fr tools/backup - - # Install svnserve init-script and xinet.d snippet, bug 43245. - newinitd "${FILESDIR}"/svnserve.initd3 svnserve - newconfd "${FILESDIR}"/svnserve.confd svnserve - insinto /etc/xinetd.d - newins "${FILESDIR}"/svnserve.xinetd svnserve - - #adjust default user and group with disabled apache2 USE flag, bug 381385 - use apache2 || sed -e "s\USER:-apache\USER:-svn\g" \ - -e "s\GROUP:-apache\GROUP:-svnusers\g" \ - -i "${ED}"etc/init.d/svnserve || die - use apache2 || sed -e "0,/apache/s//svn/" \ - -e "s:apache:svnusers:" \ - -i "${ED}"etc/xinetd.d/svnserve || die - - # Install documentation. - dodoc CHANGES COMMITTERS README - dodoc tools/xslt/svnindex.{css,xsl} - rm -fr tools/xslt - - # Install extra files. - if use extras ; then - cat << EOF > 80subversion-extras -PATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin" -ROOTPATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin" -EOF - doenvd 80subversion-extras - - emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools - - find tools "(" -name "*.bat" -o -name "*.in" -o -name ".libs" ")" -print0 | xargs -0 rm -fr - rm -fr tools/client-side/svnmucc - rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}* - rm -fr tools/{buildbot,dev,diff,po} - - insinto /usr/share/${PN} - find tools -name '*.py' -exec sed -i -e '1s:python:&2:' {} + || die - doins -r tools - fi - - if use doc ; then - dohtml -r doc/doxygen/html/* - fi - - prune_libtool_files --all - - cd "${ED}"usr/share/locale - for i in * ; do - [[ $i == *$LINGUAS* ]] || { rm -r $i || die ; } - done -} - -pkg_preinst() { - # Compare versions of Berkeley DB, bug 122877. - if use berkdb && [[ -f "${EROOT}usr/bin/svn" ]] ; then - OLD_BDB_VERSION="$(scanelf -nq "${EROOT}usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" - NEW_BDB_VERSION="$(scanelf -nq "${ED}usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" - if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]] ; then - CHANGED_BDB_VERSION="1" - fi - fi -} - -pkg_postinst() { - if [[ -n "${CHANGED_BDB_VERSION}" ]] ; then - ewarn "You upgraded from an older version of Berkeley DB and may experience" - ewarn "problems with your repository. Run the following commands as root to fix it:" - ewarn " db4_recover -h ${SVN_REPOS_LOC}/repos" - ewarn " chown -Rf apache:apache ${SVN_REPOS_LOC}/repos" - fi - - ewarn "If you run subversion as a daemon, you will need to restart it to avoid module mismatches." -} - -pkg_postrm() { - : -} - -pkg_config() { - # Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC} - # already has EPREFIX in it - einfo "Initializing the database in ${SVN_REPOS_LOC}..." - if [[ -e "${SVN_REPOS_LOC}/repos" ]] ; then - echo "A Subversion repository already exists and I will not overwrite it." - echo "Delete \"${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version." - else - mkdir -p "${SVN_REPOS_LOC}/conf" - - einfo "Populating repository directory..." - # Create initial repository. - "${EROOT}usr/bin/svnadmin" create "${SVN_REPOS_LOC}/repos" - - einfo "Setting repository permissions..." - SVNSERVE_USER="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")" - SVNSERVE_GROUP="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_GROUP}")" - if use apache2 ; then - [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache" - [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache" - else - [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn" - [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers" - fi - chmod -Rf go-rwx "${SVN_REPOS_LOC}/conf" - chmod -Rf o-rwx "${SVN_REPOS_LOC}/repos" - echo "Please create \"${SVNSERVE_GROUP}\" group if it does not exist yet." - echo "Afterwards please create \"${SVNSERVE_USER}\" user with homedir \"${SVN_REPOS_LOC}\"" - echo "and as part of the \"${SVNSERVE_GROUP}\" group if it does not exist yet." - echo "Finally, execute \"chown -Rf ${SVNSERVE_USER}:${SVNSERVE_GROUP} ${SVN_REPOS_LOC}/repos\"" - echo "to finish the configuration." - fi -} diff --git a/net-misc/modemmanager/ChangeLog b/net-misc/modemmanager/ChangeLog deleted file mode 100644 index b020c34f..00000000 --- a/net-misc/modemmanager/ChangeLog +++ /dev/null @@ -1,410 +0,0 @@ -# ChangeLog for net-misc/modemmanager -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/ChangeLog,v 1.87 2015/04/20 14:28:19 chainsaw Exp $ - -*modemmanager-1.4.6 (20 Apr 2015) - - 20 Apr 2015; Tony Vroon <chainsaw@gentoo.org> +modemmanager-1.4.6.ebuild: - Version bump, primarily improves error reporting. Tested on Sierra Wireless - EM3705 with Three UK LTE network. Herd approval by Alexandre "tetromino" - Rostovtsev. - - 15 Mar 2015; Pacho Ramos <pacho@gentoo.org> modemmanager-1.4.2.ebuild: - x86 stable, bug 534012 - - 15 Mar 2015; Pacho Ramos <pacho@gentoo.org> modemmanager-1.4.2.ebuild: - ppc64 stable, bug 534012 - - 15 Mar 2015; Pacho Ramos <pacho@gentoo.org> modemmanager-1.4.2.ebuild: - ppc stable, bug 534012 - - 14 Mar 2015; Pacho Ramos <pacho@gentoo.org> modemmanager-1.4.2.ebuild: - amd64 stable, bug 534012 - -*modemmanager-1.4.4 (07 Mar 2015) - - 07 Mar 2015; Pacho Ramos <pacho@gentoo.org> +modemmanager-1.4.4.ebuild: - Version bump - - 03 Mar 2015; Yixun Lan <dlan@gentoo.org> modemmanager-1.4.0.ebuild: - add arm64 support, tested on A53 board - -*modemmanager-1.4.2 (26 Jan 2015) - - 26 Jan 2015; Pacho Ramos <pacho@gentoo.org> +modemmanager-1.4.2.ebuild, - -modemmanager-1.2.0-r1.ebuild: - Version bump, drop old - - 01 Jan 2015; Markus Meier <maekke@gentoo.org> modemmanager-1.4.0.ebuild: - arm stable, bug #529964 - - 30 Dec 2014; Agostino Sarubbo <ago@gentoo.org> modemmanager-1.4.0.ebuild: - Stable for ppc64, wrt bug #529964 - - 28 Dec 2014; Agostino Sarubbo <ago@gentoo.org> modemmanager-1.4.0.ebuild: - Stable for ppc, wrt bug #529964 - - 19 Dec 2014; Pacho Ramos <pacho@gentoo.org> modemmanager-1.4.0.ebuild: - amd64 stable, bug 529964 - - 18 Dec 2014; Pacho Ramos <pacho@gentoo.org> modemmanager-1.4.0.ebuild: - x86 stable, bug 529964 - - 13 Nov 2014; Pacho Ramos <pacho@gentoo.org> - -files/01-org.freedesktop.ModemManager.pkla, - -files/01-org.freedesktop.ModemManager.rules, -modemmanager-0.6.0.0.ebuild: - Drop old (#508854) - - 11 Oct 2014; Markus Meier <maekke@gentoo.org> modemmanager-1.2.0-r1.ebuild: - arm stable, bug #512012 - -*modemmanager-1.4.0 (23 Sep 2014) - - 23 Sep 2014; Pacho Ramos <pacho@gentoo.org> +modemmanager-1.4.0.ebuild, - -files/modemmanager-0.6.0.0-multi-plugin-probing.patch, - -files/modemmanager-1.0.0-dbus-generation.patch, - -files/modemmanager-1.0.0-logging-serial.patch, -modemmanager-1.0.0-r2.ebuild, - -modemmanager-1.2.0.ebuild: - Version bump, drop old - - 12 Sep 2014; Vicente Olivert Riera <vincent@gentoo.org> - modemmanager-0.6.0.0.ebuild, modemmanager-1.0.0-r2.ebuild, - modemmanager-1.2.0-r1.ebuild, modemmanager-1.2.0.ebuild: - Add ~mips keyword - - 21 Aug 2014; Agostino Sarubbo <ago@gentoo.org> modemmanager-1.2.0-r1.ebuild: - Stable for ppc64, wrt bug #512012 - - 28 Jul 2014; Agostino Sarubbo <ago@gentoo.org> modemmanager-1.2.0-r1.ebuild: - Stable for ppc, wrt bug #512012 - - 24 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> - modemmanager-0.6.0.0.ebuild, modemmanager-1.0.0-r2.ebuild, - modemmanager-1.2.0-r1.ebuild, modemmanager-1.2.0.ebuild: - Use get_udevdir instead of the deprecated udev_get_udevdir. Use - virtual/libgudev with := instead of virtual/udev for automatic rebuild. - - 04 May 2014; Pacho Ramos <pacho@gentoo.org> modemmanager-1.2.0-r1.ebuild: - x86 stable, bug 508862 - - 04 May 2014; Pacho Ramos <pacho@gentoo.org> modemmanager-1.2.0-r1.ebuild: - amd64 stable, bug 508862 - -*modemmanager-1.2.0-r1 (30 Apr 2014) - - 30 Apr 2014; Tony Vroon <chainsaw@gentoo.org> +modemmanager-1.2.0-r1.ebuild: - Enable MBIM support as well as introducing the dependency, closes bug - #509186. A stale --without-mbim line got left behind. Gnome herd commit - approval from tetromino. - -*modemmanager-1.2.0 (12 Apr 2014) - - 12 Apr 2014; Pacho Ramos <pacho@gentoo.org> +modemmanager-1.2.0.ebuild, - metadata.xml: - Version bump, add mbim support (#507188 by Leho Kraav) - - 08 Mar 2014; Pacho Ramos <pacho@gentoo.org> -modemmanager-0.6.0.0-r1.ebuild, - -modemmanager-0.7.991.ebuild, -modemmanager-1.0.0-r1.ebuild, - modemmanager-1.0.0-r2.ebuild: - RDEPEND on libqmi subslot (if it's added in the future there), drop old - - 22 Feb 2014; Pacho Ramos <pacho@gentoo.org> modemmanager-0.6.0.0-r1.ebuild: - Fix wrong commit, bug 502160 - - 22 Feb 2014; Pacho Ramos <pacho@gentoo.org> modemmanager-1.0.0-r2.ebuild: - Fix wrong commit, bug 502160 - - 22 Feb 2014; Pacho Ramos <pacho@gentoo.org> modemmanager-0.6.0.0-r1.ebuild, - modemmanager-1.0.0-r2.ebuild: - arch stable, bug 888 - - 08 Dec 2013; Pacho Ramos <pacho@gentoo.org> modemmanager-1.0.0-r2.ebuild: - x86 stable, bug #478252 - - 30 Nov 2013; Pacho Ramos <pacho@gentoo.org> modemmanager-1.0.0-r2.ebuild: - amd64 stable, bug #478252 - -*modemmanager-1.0.0-r2 (24 Jul 2013) - - 24 Jul 2013; Alexandre Rostovtsev <tetromino@gentoo.org> - +modemmanager-1.0.0-r2.ebuild, +files/01-org.freedesktop.ModemManager1.rules: - Update plugdev polkit rules for modemmanager's dbus interface changes. - -*modemmanager-1.0.0-r1 (24 Jul 2013) - - 24 Jul 2013; Pacho Ramos <pacho@gentoo.org> - +files/modemmanager-1.0.0-dbus-generation.patch, - +files/modemmanager-1.0.0-logging-serial.patch, +modemmanager-1.0.0-r1.ebuild, - -modemmanager-1.0.0.ebuild: - Apply upstream fixes, also solving dbus file generation (#477710 by Martin - Dummer). - - 20 Jul 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml: - Redigest (#472866 by Albert W. Hopkins), also adopt the package - -*modemmanager-1.0.0 (20 Jul 2013) - - 20 Jul 2013; Pacho Ramos <pacho@gentoo.org> +modemmanager-1.0.0.ebuild, - -modemmanager-0.7.990.ebuild, -modemmanager-9999.ebuild: - Version bump, drop old. Also remove 9999 ebuild as nobody is really - maintaining it. - - 10 Jun 2013; Pacho Ramos <pacho@gentoo.org> modemmanager-0.7.991.ebuild: - Use just released tarball as before, not one generated from git snapshot. - -*modemmanager-0.7.991 (10 Jun 2013) - - 10 Jun 2013; Pacho Ramos <pacho@gentoo.org> +modemmanager-0.7.991.ebuild: - Version bump - -*modemmanager-0.6.0.0-r1 (12 Feb 2013) - - 12 Feb 2013; Alexandre Rostovtsev <tetromino@gentoo.org> - -files/modemmanager-0.5-glib-2.31.patch, -modemmanager-0.5.2.0-r3.ebuild, - +modemmanager-0.6.0.0-r1.ebuild, - +files/modemmanager-0.6.0.0-multi-plugin-probing.patch: - Add a patch to prevent multiple plugins from simultaneously controlling one - modem port (bug #456782, thanks to Tony Vroon). Drop old. - - 03 Feb 2013; Agostino Sarubbo <ago@gentoo.org> modemmanager-0.6.0.0.ebuild: - Stable for arm, wrt bug #448006 - - 31 Jan 2013; Agostino Sarubbo <ago@gentoo.org> modemmanager-0.6.0.0.ebuild: - Stable for ppc64, wrt bug #448006 - - 31 Jan 2013; Alexandre Rostovtsev <tetromino@gentoo.org> - modemmanager-0.7.990.ebuild, modemmanager-9999.ebuild: - Add qmi USE flags to 0.7.990 ebuild since libqmi-1.0.0 is now in portage. Add - missing gdbus-codegen dependency. - -*modemmanager-9999 (28 Jan 2013) -*modemmanager-0.7.990 (28 Jan 2013) - - 28 Jan 2013; Alexandre Rostovtsev <tetromino@gentoo.org> - +modemmanager-0.7.990.ebuild, +modemmanager-9999.ebuild, metadata.xml: - Add 0.8 development pre-release and a live git ebuild. 0.8 features improved - hardware support, and has a new dbus API which is incompatible with older - ModemManager releases. - - 28 Jan 2013; Alexandre Rostovtsev <tetromino@gentoo.org> - -modemmanager-0.4.ebuild, -modemmanager-0.5.2.0-r2.ebuild, - modemmanager-0.5.2.0-r3.ebuild, modemmanager-0.6.0.0.ebuild: - Fix license; ModemManager had switched from LGPL to GPL in 2009. Drop old. - - 27 Jan 2013; Agostino Sarubbo <ago@gentoo.org> modemmanager-0.6.0.0.ebuild: - Stable for ppc, wrt bug #448006 - - 27 Jan 2013; Agostino Sarubbo <ago@gentoo.org> modemmanager-0.6.0.0.ebuild: - Stable for x86, wrt bug #448006 - - 27 Jan 2013; Agostino Sarubbo <ago@gentoo.org> modemmanager-0.6.0.0.ebuild: - Stable for amd64, wrt bug #448006 - - 06 Jan 2013; Agostino Sarubbo <ago@gentoo.org> modemmanager-0.6.0.0.ebuild: - Add ~sparc, wrt bug #449220 - - 01 Jan 2013; Agostino Sarubbo <ago@gentoo.org> modemmanager-0.6.0.0.ebuild: - Add ~alpha, wrt bug #449220 - - 01 Jan 2013; Agostino Sarubbo <ago@gentoo.org> modemmanager-0.6.0.0.ebuild: - Add ~ia64, wrt bug #449220 - - 02 Dec 2012; Samuli Suominen <ssuominen@gentoo.org> modemmanager-0.4.ebuild, - modemmanager-0.5.2.0-r2.ebuild, modemmanager-0.5.2.0-r3.ebuild, - modemmanager-0.6.0.0.ebuild: - Use virtual/udev instead of sys-fs/udev wrt #444398 - - 11 Oct 2012; Anthony G. Basile <blueness@gentoo.org> - modemmanager-0.5.2.0-r3.ebuild: - stable ppc ppc64, bug #430370 - - 07 Oct 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml: - Drop maintainer as talked with him. - -*modemmanager-0.6.0.0 (13 Sep 2012) - - 13 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org> - -modemmanager-0.4_p20110205-r1.ebuild, -modemmanager-0.5.ebuild, - -modemmanager-0.5.2.0.ebuild, +modemmanager-0.6.0.0.ebuild: - Version bump with lots of SMS fixes and improved hardware support. Drop old. - - 23 Aug 2012; Markus Meier <maekke@gentoo.org> modemmanager-0.5.2.0-r3.ebuild: - arm stable, bug #430370 - - 17 Aug 2012; Johannes Huber <johu@gentoo.org> modemmanager-0.5.2.0-r3.ebuild: - Stable for x86, wrt bug #430370 - - 16 Aug 2012; Agostino Sarubbo <ago@gentoo.org> - modemmanager-0.5.2.0-r3.ebuild: - Stable for amd64, wrt bug #430370 - -*modemmanager-0.5.2.0-r3 (11 Aug 2012) - - 11 Aug 2012; Samuli Suominen <ssuominen@gentoo.org> - +modemmanager-0.5.2.0-r3.ebuild: - Query udev.pc pkg-config file for correct udevdir value. - -*modemmanager-0.5.2.0-r2 (05 Jul 2012) - - 05 Jul 2012; Alexandre Rostovtsev <tetromino@gentoo.org> - -modemmanager-0.5.2.0-r1.ebuild, +modemmanager-0.5.2.0-r2.ebuild: - Move polkit rules.d file to /usr/share (bug #421577 comment #12, thanks to - Dennis Lissov). - - 04 Jul 2012; Alexandre Rostovtsev <tetromino@gentoo.org> - files/01-org.freedesktop.ModemManager.rules: - Add a comment to the polkit-1/rules.d file. - -*modemmanager-0.5.2.0-r1 (04 Jul 2012) - - 04 Jul 2012; Alexandre Rostovtsev <tetromino@gentoo.org> - +files/01-org.freedesktop.ModemManager.rules, - +modemmanager-0.5.2.0-r1.ebuild: - Install polkit-1/rules.d file for polkit-0.106 support (bug #421581, thanks - to Samuli Suominen). - - 27 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> modemmanager-0.4.ebuild, - modemmanager-0.4_p20110205-r1.ebuild, modemmanager-0.5.ebuild, - modemmanager-0.5.2.0.ebuild: - inherit multilib.eclass for get_libdir function - - 27 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> - modemmanager-0.5.2.0.ebuild: - .pkla files are only used by <sys-auth/polkit-0.106 wrt #421581 - - 24 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org> - modemmanager-0.4.ebuild, modemmanager-0.4_p20110205-r1.ebuild, - +files/modemmanager-0.5-glib-2.31.patch, modemmanager-0.5.ebuild: - Fix building old versions against >=glib-2.31. - - 05 May 2012; Jeff Horelick <jdhore@gentoo.org> modemmanager-0.4.ebuild, - modemmanager-0.4_p20110205-r1.ebuild, modemmanager-0.5.ebuild, - modemmanager-0.5.2.0.ebuild: - dev-util/pkgconfig -> virtual/pkgconfig - - 27 Mar 2012; Alexandre Rostovtsev <tetromino@gentoo.org> - modemmanager-0.5.2.0.ebuild: - Fix pkg_postinst message. - -*modemmanager-0.5.2.0 (27 Mar 2012) - - 27 Mar 2012; Alexandre Rostovtsev <tetromino@gentoo.org> - +files/01-org.freedesktop.ModemManager.pkla, +modemmanager-0.5.2.0.ebuild, - metadata.xml: - Version bump with lots of bugfixes. Allow users in plugdev group full control - over their modems if USE=policykit (bug #406421, thanks to Priit Laes). Add - myself to maintainers. - - 16 Feb 2012; Mike Frysinger <vapier@gentoo.org> modemmanager-0.5.ebuild: - Fix USE=doc depend and install so it actually does something. - -*modemmanager-0.5 (14 Aug 2011) - - 14 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org> -modemmanager-0.3.ebuild, - -modemmanager-0.4_p20101211.ebuild, -modemmanager-0.4_p20110205.ebuild, - +modemmanager-0.5.ebuild: - Bump to 0.5, from gnome overlay, bug 378729 - -*modemmanager-0.4_p20110205-r1 (06 Jul 2011) - - 06 Jul 2011; Samuli Suominen <ssuominen@gentoo.org> - +modemmanager-0.4_p20110205-r1.ebuild: - Fix udev rules.d directory from /etc/udev to /lib/udev. - - 09 Jun 2011; Sebastian Pipping <sping@gentoo.org> modemmanager-0.3.ebuild, - modemmanager-0.4.ebuild, modemmanager-0.4_p20101211.ebuild, - modemmanager-0.4_p20110205.ebuild: - Add >=sys-fs/udev-171[gudev] as an alternative dependency to - >=sys-fs/udev-145[extras] (bug #370385) - -*modemmanager-0.4_p20110205 (04 Feb 2011) - - 04 Feb 2011; Robert Piasek <dagger@gentoo.org> - +modemmanager-0.4_p20110205.ebuild: - Add new snapshot of ModemManager - -*modemmanager-0.4_p20101211 (11 Dec 2010) - - 11 Dec 2010; Robert Piasek <dagger@gentoo.org> - +modemmanager-0.4_p20101211.ebuild: - New snapshot of ModemManager - - 28 Oct 2010; Samuli Suominen <ssuominen@gentoo.org> - modemmanager-0.4.ebuild: - ppc64 stable wrt #321593 - - 19 Oct 2010; Brent Baude <ranger@gentoo.org> modemmanager-0.4.ebuild: - Marking modemmanager-0.4 ppc for bug 321593 - - 20 Aug 2010; Markos Chandras <hwoarang@gentoo.org> - modemmanager-0.4.ebuild: - Stable on amd64 wrt bug #321593 - - 13 Aug 2010; Christian Faulhammer <fauli@gentoo.org> - modemmanager-0.4.ebuild: - stable x86, bug 321593 - -*modemmanager-0.4 (08 Jul 2010) - - 08 Jul 2010; Nirbheek Chauhan <nirbheek@gentoo.org> - +modemmanager-0.4.ebuild: - Bump to 0.4, new use-flag 'policykit', remove static libs and .la files, - fix deps, add elog about usb_modeswitch, add dist-version, add support for - ppp-2.4.5 (if/when it's added), fixes bug 326605 - - 07 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> - modemmanager-0.3_p20100401.ebuild: - Missing dev-util/intltool and sys-devel/gettext DEPEND wrt #312887 by - Bjoern Ottervik. - -*modemmanager-0.3_p20100401 (01 Apr 2010) - - 01 Apr 2010; Robert Piasek <dagger@gentoo.org> - -modemmanager-0.2_p20091109.ebuild, -modemmanager-0.2_p20091123.ebuild, - +modemmanager-0.3_p20100401.ebuild: - New snapshot of ModemManager (bug #312587) - - 10 Mar 2010; Joseph Jezak <josejx@gentoo.org> modemmanager-0.3.ebuild: - Marked ~ppc/~ppc64 for bug #296548. - - 25 Jan 2010; Nirbheek Chauhan <nirbheek@gentoo.org> metadata.xml: - metadata.xml: add myself, fix indentation - -*modemmanager-0.3 (25 Jan 2010) - - 25 Jan 2010; Nirbheek Chauhan <nirbheek@gentoo.org> - +modemmanager-0.3.ebuild: - Bump to 0.3, needed for networkmanager-0.8 - -*modemmanager-0.2_p20091123 (23 Nov 2009) - - 23 Nov 2009; Robert Piasek <dagger@gentoo.org> - -modemmanager-0.2_p20090925.ebuild, +modemmanager-0.2_p20091123.ebuild: - New snapshot of modemmanager. Contains fixes for PPC. Special thanks to - papillon81 for helping to hunt this the problem down. - -*modemmanager-0.2_p20091109 (09 Nov 2009) - - 09 Nov 2009; Robert Piasek <dagger@gentoo.org> - -modemmanager-0.2_p20090824.ebuild, +modemmanager-0.2_p20091109.ebuild: - Version bump for development version of ModemManager - - 28 Sep 2009; Robert Piasek <dagger@gentoo.org> - modemmanager-0.2_p20090925.ebuild: - Disable -Werrors - -*modemmanager-0.2_p20090925 (25 Sep 2009) - - 25 Sep 2009; Robert Piasek <dagger@gentoo.org> - +modemmanager-0.2_p20090925.ebuild: - new snapshot - - 22 Sep 2009; Robert Piasek <dagger@gentoo.org> - modemmanager-0.2_p20090824.ebuild: - Added ARM keyword - -*modemmanager-0.2_p20090806 (13 Aug 2009) - - 13 Aug 2009; Robert Piasek <dagger@gentoo.org> - +modemmanager-0.2_p20090806.ebuild, +metadata.xml: - Initial ebuild of modemmanager diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest deleted file mode 100644 index b84e3460..00000000 --- a/net-misc/modemmanager/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST ModemManager-1.4.0.tar.xz 1313396 SHA256 efe12c30d4660a4694dec2a1ea68ea176f4dc3cb4b9e843929115943dc189ca0 SHA512 4c6ab92f6151c190585f83cbd5a50f283f1bea9a98207d81a9cc577a26ff9ff32b0b1efade0a1f44dfc5f77d96da999aede1626a1ddb2a97a9741884408685fb WHIRLPOOL 1c75bc86dea1fa9d5a7510cbc5cfdc2ea1a23e28a9d42ed30a7124f4f13535703eec3b240b9de2398562af11cfa3fa55c24cc5a5a55f4b1817e4a58217c98c22 -DIST ModemManager-1.4.2.tar.xz 1350604 SHA256 07d332fbe6f45f788f740810951e04042aaf023bd5ecf8ef0b3a06e37703585d SHA512 8be9387f78de5213ff77374ee2cba67c08301b29b2cd957c8bab86446d1227759833b9ecafb3caef590701f6422bae587db848391cf15c1dd16b5421e976a4c6 WHIRLPOOL 6a554a80ce53d1eb41f993ee5113a8f5606f20dde5c415f4c3375510bd5acb655f84ff5a17a5d678ba615810bcbc1366005b3d72dbab2b087a50f5e5352641a2 -DIST ModemManager-1.4.4.tar.xz 1395696 SHA256 1bf88861259772dc81e864e2faccfff0590d41676451a128c5f4e73550dd14d8 SHA512 66cc177b1fa0fef9da4c61a0019278fdcf00580b48ec4b0a01202b6132f887d64858871dcdc5965f8833eb85e49fe50f9406398961569d8e9a5d15003d1205cf WHIRLPOOL a9e960024c46bd3eeb39efaedd53a9401ebe88b3f158afc66908d0bdf4175b1ea31dadd229f9c9251167267e970ae3df177df26ab8075a0baf38d5794116d7ff -DIST ModemManager-1.4.6.tar.xz 1396764 SHA256 0cedabf46310f8c56630b116944f54ee64369c76c2f35f5f460ca19a8bb5a5cd SHA512 fb74961df2e3e1604de58838da6e8dd7cf80fee97dbfd71eb7f2df60cc319bf38df8c5706a5933856c500b014d3156066e608bb0820c967ddbd964bd9fc2fdec WHIRLPOOL 4f63ac160a4d4acddd2064a58204e6ba410543aefc936ffb753fbb15e004d089cf874ee2390df174638ae15f26f4cf7c7e720de793e69f0cd0b6a923558b0af1 diff --git a/net-misc/modemmanager/files/01-org.freedesktop.ModemManager1.rules b/net-misc/modemmanager/files/01-org.freedesktop.ModemManager1.rules deleted file mode 100644 index 7fca6472..00000000 --- a/net-misc/modemmanager/files/01-org.freedesktop.ModemManager1.rules +++ /dev/null @@ -1,7 +0,0 @@ -// Let users in plugdev group modify ModemManager -polkit.addRule(function(action, subject) { - if (/^org\.freedesktop\.ModemManager1\.(Device\.Control|Contacts|Messaging|Location)$/.test(action.id) && - subject.isInGroup("plugdev") && subject.active) { - return "yes"; - } -}); diff --git a/net-misc/modemmanager/metadata.xml b/net-misc/modemmanager/metadata.xml deleted file mode 100644 index c10566d5..00000000 --- a/net-misc/modemmanager/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>gnome</herd> - <use> - <flag name="mbim">Enable MBIM modem protocol</flag> - <flag name="qmi">Enable support for the QMI modem protocol used by - devices with Qualcomm chipsets</flag> - <flag name="qmi-newest">Avoid deprecated QMI commands. Warning: may - cause incompatibility with older devices.</flag> - </use> -</pkgmetadata> diff --git a/net-misc/modemmanager/modemmanager-1.4.0.ebuild b/net-misc/modemmanager/modemmanager-1.4.0.ebuild deleted file mode 100644 index 3dfa1686..00000000 --- a/net-misc/modemmanager/modemmanager-1.4.0.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-1.4.0.ebuild,v 1.7 2015/03/03 09:32:56 dlan Exp $ - -EAPI="5" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" -VALA_MIN_API_VERSION="0.18" -VALA_USE_DEPEND="vapigen" - -inherit gnome2 user readme.gentoo udev vala - -DESCRIPTION="Modem and mobile broadband management libraries" -HOMEPAGE="http://cgit.freedesktop.org/ModemManager/ModemManager/" -SRC_URI="http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz" - -LICENSE="GPL-2+" -SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N} -KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86" -IUSE="+introspection mbim policykit +qmi qmi-newest vala" -REQUIRED_USE=" - qmi-newest? ( qmi ) - vala? ( introspection ) -" - -RDEPEND=" - >=dev-libs/glib-2.32:2 - virtual/libgudev:= - introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) - mbim? ( >=net-libs/libmbim-1.10 ) - policykit? ( >=sys-auth/polkit-0.106[introspection] ) - qmi? ( >=net-libs/libqmi-1.6.0:= ) -" -DEPEND="${RDEPEND} - dev-util/gdbus-codegen - >=dev-util/intltool-0.40 - sys-devel/gettext - virtual/pkgconfig - vala? ( $(vala_depend) ) -" - -S="${WORKDIR}/ModemManager-${PV}" - -src_prepare() { - DOC_CONTENTS="If your USB modem shows up as a Flash drive when you plug it in, - You should install sys-apps/usb_modeswitch which will automatically - switch it over to USB modem mode whenever you plug it in.\n" - - if use policykit; then - DOC_CONTENTS+="\nTo control your modem without needing to enter the root password, - add your user account to the 'plugdev' group." - fi - - use vala && vala_src_prepare - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - --disable-more-warnings \ - --with-udev-base-dir="$(get_udevdir)" \ - --disable-static \ - --with-dist-version=${PVR} \ - $(use_enable introspection) \ - $(use_with mbim) \ - $(use_with policykit polkit) \ - $(use_with qmi) \ - $(use_with qmi-newest newest-qmi-commands) \ - $(use_enable vala) -} - -src_install() { - gnome2_src_install - - # Allow users in plugdev group full control over their modem - if use policykit; then - insinto /usr/share/polkit-1/rules.d/ - doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules - fi - - readme.gentoo_create_doc -} - -pkg_postinst() { - gnome2_pkg_postinst - - use policykit && enewgroup plugdev - - # The polkit rules file moved to /usr/share - old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules" - if [[ -f "${old_rules}" ]]; then - case "$(md5sum ${old_rules})" in - c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* ) - # Automatically delete the old rules.d file if the user did not change it - elog - elog "Removing old ${old_rules} ..." - rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually" - ;; - * ) - elog "The ${old_rules}" - elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2" - elog "If you edited ${old_rules}" - elog "without changing its behavior, you may want to remove it." - ;; - esac - fi - - readme.gentoo_print_elog -} diff --git a/net-misc/modemmanager/modemmanager-1.4.2.ebuild b/net-misc/modemmanager/modemmanager-1.4.2.ebuild deleted file mode 100644 index 0fd6846c..00000000 --- a/net-misc/modemmanager/modemmanager-1.4.2.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-1.4.2.ebuild,v 1.5 2015/03/15 13:31:29 pacho Exp $ - -EAPI="5" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" -VALA_USE_DEPEND="vapigen" - -inherit gnome2 user readme.gentoo udev vala - -DESCRIPTION="Modem and mobile broadband management libraries" -HOMEPAGE="http://cgit.freedesktop.org/ModemManager/ModemManager/" -SRC_URI="http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz" - -LICENSE="GPL-2+" -SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N} -KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ppc ppc64 ~sparc x86" -IUSE="+introspection mbim policykit +qmi qmi-newest vala gudev" -REQUIRED_USE=" - qmi-newest? ( qmi ) - vala? ( introspection ) -" - -RDEPEND=" - >=dev-libs/glib-2.32:2 - gudev? ( virtual/libgudev:= ) - introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) - mbim? ( >=net-libs/libmbim-1.10 ) - policykit? ( >=sys-auth/polkit-0.106[introspection] ) - qmi? ( >=net-libs/libqmi-1.6.0:= ) -" -DEPEND="${RDEPEND} - dev-util/gdbus-codegen - >=dev-util/intltool-0.40 - sys-devel/gettext - virtual/pkgconfig - vala? ( $(vala_depend) ) -" - -S="${WORKDIR}/ModemManager-${PV}" - -src_prepare() { - DOC_CONTENTS="If your USB modem shows up as a Flash drive when you plug it in, - You should install sys-apps/usb_modeswitch which will automatically - switch it over to USB modem mode whenever you plug it in.\n" - - if use policykit; then - DOC_CONTENTS+="\nTo control your modem without needing to enter the root password, - add your user account to the 'plugdev' group." - fi - - use vala && vala_src_prepare - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - --disable-more-warnings \ - if use_gudev - --with-udev-base-dir="$(get_udevdir)" \ - fi - --disable-static \ - --with-dist-version=${PVR} \ - $(use_enable gudev) - $(use_enable introspection) \ - $(use_with mbim) \ - $(use_with policykit polkit) \ - $(use_with qmi) \ - $(use_with qmi-newest newest-qmi-commands) \ - $(use_enable vala) -} - -src_install() { - gnome2_src_install - - # Allow users in plugdev group full control over their modem - if use policykit; then - insinto /usr/share/polkit-1/rules.d/ - doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules - fi - - readme.gentoo_create_doc -} - -pkg_postinst() { - gnome2_pkg_postinst - - use policykit && enewgroup plugdev - - # The polkit rules file moved to /usr/share - old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules" - if [[ -f "${old_rules}" ]]; then - case "$(md5sum ${old_rules})" in - c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* ) - # Automatically delete the old rules.d file if the user did not change it - elog - elog "Removing old ${old_rules} ..." - rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually" - ;; - * ) - elog "The ${old_rules}" - elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2" - elog "If you edited ${old_rules}" - elog "without changing its behavior, you may want to remove it." - ;; - esac - fi - - readme.gentoo_print_elog -} diff --git a/net-misc/modemmanager/modemmanager-1.4.4.ebuild b/net-misc/modemmanager/modemmanager-1.4.4.ebuild deleted file mode 100644 index 65f41240..00000000 --- a/net-misc/modemmanager/modemmanager-1.4.4.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-1.4.4.ebuild,v 1.1 2015/03/07 14:28:46 pacho Exp $ - -EAPI="5" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" -VALA_USE_DEPEND="vapigen" - -inherit gnome2 user readme.gentoo udev vala - -DESCRIPTION="Modem and mobile broadband management libraries" -HOMEPAGE="http://cgit.freedesktop.org/ModemManager/ModemManager/" -SRC_URI="http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz" - -LICENSE="GPL-2+" -SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N} -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="+introspection mbim policykit +qmi qmi-newest vala" -REQUIRED_USE=" - qmi-newest? ( qmi ) - vala? ( introspection ) -" - -RDEPEND=" - >=dev-libs/glib-2.32:2 - virtual/libgudev:= - introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) - mbim? ( >=net-libs/libmbim-1.10 ) - policykit? ( >=sys-auth/polkit-0.106[introspection] ) - qmi? ( >=net-libs/libqmi-1.12.4:= ) -" -DEPEND="${RDEPEND} - dev-util/gdbus-codegen - >=dev-util/intltool-0.40 - sys-devel/gettext - virtual/pkgconfig - vala? ( $(vala_depend) ) -" - -S="${WORKDIR}/ModemManager-${PV}" - -src_prepare() { - DOC_CONTENTS="If your USB modem shows up as a Flash drive when you plug it in, - You should install sys-apps/usb_modeswitch which will automatically - switch it over to USB modem mode whenever you plug it in.\n" - - if use policykit; then - DOC_CONTENTS+="\nTo control your modem without needing to enter the root password, - add your user account to the 'plugdev' group." - fi - - use vala && vala_src_prepare - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - --disable-more-warnings \ - --with-udev-base-dir="$(get_udevdir)" \ - --disable-static \ - --with-dist-version=${PVR} \ - $(use_enable introspection) \ - $(use_with mbim) \ - $(use_with policykit polkit) \ - $(use_with qmi) \ - $(use_with qmi-newest newest-qmi-commands) \ - $(use_enable vala) -} - -src_install() { - gnome2_src_install - - # Allow users in plugdev group full control over their modem - if use policykit; then - insinto /usr/share/polkit-1/rules.d/ - doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules - fi - - readme.gentoo_create_doc -} - -pkg_postinst() { - gnome2_pkg_postinst - - use policykit && enewgroup plugdev - - # The polkit rules file moved to /usr/share - old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules" - if [[ -f "${old_rules}" ]]; then - case "$(md5sum ${old_rules})" in - c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* ) - # Automatically delete the old rules.d file if the user did not change it - elog - elog "Removing old ${old_rules} ..." - rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually" - ;; - * ) - elog "The ${old_rules}" - elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2" - elog "If you edited ${old_rules}" - elog "without changing its behavior, you may want to remove it." - ;; - esac - fi - - readme.gentoo_print_elog -} diff --git a/net-misc/modemmanager/modemmanager-1.4.6.ebuild b/net-misc/modemmanager/modemmanager-1.4.6.ebuild deleted file mode 100644 index 6fec727d..00000000 --- a/net-misc/modemmanager/modemmanager-1.4.6.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-1.4.6.ebuild,v 1.1 2015/04/20 14:28:19 chainsaw Exp $ - -EAPI="5" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" -VALA_USE_DEPEND="vapigen" - -inherit gnome2 user readme.gentoo udev vala - -DESCRIPTION="Modem and mobile broadband management libraries" -HOMEPAGE="http://cgit.freedesktop.org/ModemManager/ModemManager/" -SRC_URI="http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz" - -LICENSE="GPL-2+" -SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N} -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="+introspection mbim policykit +qmi qmi-newest vala" -REQUIRED_USE=" - qmi-newest? ( qmi ) - vala? ( introspection ) -" - -RDEPEND=" - >=dev-libs/glib-2.32:2 - virtual/libgudev:= - introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) - mbim? ( >=net-libs/libmbim-1.10 ) - policykit? ( >=sys-auth/polkit-0.106[introspection] ) - qmi? ( >=net-libs/libqmi-1.12.4:= ) -" -DEPEND="${RDEPEND} - dev-util/gdbus-codegen - >=dev-util/intltool-0.40 - sys-devel/gettext - virtual/pkgconfig - vala? ( $(vala_depend) ) -" - -S="${WORKDIR}/ModemManager-${PV}" - -src_prepare() { - DOC_CONTENTS="If your USB modem shows up as a Flash drive when you plug it in, - You should install sys-apps/usb_modeswitch which will automatically - switch it over to USB modem mode whenever you plug it in.\n" - - if use policykit; then - DOC_CONTENTS+="\nTo control your modem without needing to enter the root password, - add your user account to the 'plugdev' group." - fi - - use vala && vala_src_prepare - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - --disable-more-warnings \ - --with-udev-base-dir="$(get_udevdir)" \ - --disable-static \ - --with-dist-version=${PVR} \ - $(use_enable introspection) \ - $(use_with mbim) \ - $(use_with policykit polkit) \ - $(use_with qmi) \ - $(use_with qmi-newest newest-qmi-commands) \ - $(use_enable vala) -} - -src_install() { - gnome2_src_install - - # Allow users in plugdev group full control over their modem - if use policykit; then - insinto /usr/share/polkit-1/rules.d/ - doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules - fi - - readme.gentoo_create_doc -} - -pkg_postinst() { - gnome2_pkg_postinst - - use policykit && enewgroup plugdev - - # The polkit rules file moved to /usr/share - old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules" - if [[ -f "${old_rules}" ]]; then - case "$(md5sum ${old_rules})" in - c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* ) - # Automatically delete the old rules.d file if the user did not change it - elog - elog "Removing old ${old_rules} ..." - rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually" - ;; - * ) - elog "The ${old_rules}" - elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2" - elog "If you edited ${old_rules}" - elog "without changing its behavior, you may want to remove it." - ;; - esac - fi - - readme.gentoo_print_elog -} diff --git a/net-wireless/crda/Manifest b/net-wireless/crda/Manifest deleted file mode 100644 index d4f8fa21..00000000 --- a/net-wireless/crda/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST crda-1.1.0.tar.bz2 21418 RMD160 56107c11c898d94db3b7d39e17ea9f53afc64ffb SHA1 1ab73f7df83aab511d484b6f8b959a96bd6ab1da SHA256 82695b11263e6b329b4789fbc6b43b7a2d91de667904767bd5d3e4a49556bfc1 -DIST crda-1.1.1.tar.bz2 21666 RMD160 035e381f6276dacd06afc05fbfefdbbf7e768091 SHA1 73643b3f49b34c4150df4abb793a36792cc68fb7 SHA256 59b4760da44a8f803caeaaa7fb97e0c6bd3f35f40445b28258e7f14c2fbe13b5 -EBUILD crda-1.1.0-r1.ebuild 1235 RMD160 3292753d2eb93f8b5c58be3a72ec7912c86c03b1 SHA1 c11d2f635823cc311e6981eb628606b242a80674 SHA256 889a8722ad807f3d4f053093c8b78334d9c15c647f5437933528190ae35612b7 -EBUILD crda-1.1.1.ebuild 905 RMD160 a908790ac379adffae983c25c23b6b0662d3b130 SHA1 91a578ecd725b06fa1dbf12a14dea3f7d319a478 SHA256 f0d2c90b8a747d45deff02fce2c8980326a0260d1206ea55f40242ce72ce9620 diff --git a/net-wireless/crda/crda-1.1.0-r1.ebuild b/net-wireless/crda/crda-1.1.0-r1.ebuild deleted file mode 100644 index 4616d1f7..00000000 --- a/net-wireless/crda/crda-1.1.0-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/crda-1.0.1-r1.ebuild,v 1.2 2009/01/29 18:37:01 gentoofan23 Exp $ - -inherit toolchain-funcs multilib - -DESCRIPTION="Central Regulatory Domain Agent for wireless networks." -HOMEPAGE="http://wireless.kernel.org/en/developers/Regulatory" -SRC_URI="http://wireless.kernel.org/download/crda/${P}.tar.bz2" -LICENSE="as-is" -SLOT="0" - -DESIRED_REGDB="20090817" -KEYWORDS="amd64 ~ppc ~ppc64 x86" -IUSE="" -DEPEND="dev-libs/libgcrypt - dev-libs/libnl - dev-python/m2crypto - =net-wireless/wireless-regdb-${DESIRED_REGDB}" -RDEPEND="dev-libs/libnl - =net-wireless/wireless-regdb-${DESIRED_REGDB}" -# I am "pretty sure" about the rdepends - -src_unpack() { - unpack ${A} - - ##Make sure we install the rules where udev rules go... - sed -i -e "/^UDEV_RULE_DIR/s:lib:$(get_libdir):" "${S}"/Makefile || die \ - "Makefile sed failed" - cp /usr/lib/crda/custom-distro.key.pub.pem ${S}/pubkeys/ || die "please 'emerge -1 =wireless-regdb-${DESIRED_REGDB}', sorry" -} - -src_compile() { - emake CC="$(tc-getCC)" || die "Compilation failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" -} diff --git a/net-wireless/crda/crda-1.1.1.ebuild b/net-wireless/crda/crda-1.1.1.ebuild deleted file mode 100644 index 122c1262..00000000 --- a/net-wireless/crda/crda-1.1.1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit toolchain-funcs multilib - -DESCRIPTION="Central Regulatory Domain Agent for wireless networks." -HOMEPAGE="http://wireless.kernel.org/en/developers/Regulatory" -SRC_URI="http://wireless.kernel.org/download/crda/${P}.tar.bz2" -LICENSE="as-is" -SLOT="0" - -KEYWORDS="amd64 ~ppc ~ppc64 x86" -IUSE="" -DEPEND="dev-libs/openssl - dev-libs/libgcrypt - dev-libs/libnl - dev-python/m2crypto" -RDEPEND="dev-libs/libnl - dev-libs/openssl - net-wireless/wireless-regdb" - -src_compile() { - emake UDEV_RULE_DIR=/etc/udev/rules.d/ USE_OPENSSL=1 RUNTIME_PUBKEY_DIR=/usr/$(get_libdir)/crda/ CC="$(tc-getCC)" || die "Compilation failed" -} - -src_install() { - emake UDEV_RULE_DIR=/etc/udev/rules.d/ USE_OPENSSL=1 RUNTIME_PUBKEY_DIR=/usr/$(get_libdir)/crda/ DESTDIR="${D}" install || die "emake install failed" -} diff --git a/net-wireless/wireless-regdb/Manifest b/net-wireless/wireless-regdb/Manifest deleted file mode 100644 index 7302ff74..00000000 --- a/net-wireless/wireless-regdb/Manifest +++ /dev/null @@ -1,13 +0,0 @@ -AUX extra-monitor-20090817.patch 1710 RMD160 cc644913fd588251f2ab16761a44363eb35015aa SHA1 660987a7b70c993ceb76efec8f960ca97956fe06 SHA256 7ed4039b3ba98d9c8ff25f3395e1a87a5cf05d2b20111ac9972d869c98d40872 -AUX extra-monitor-20091125.patch 1710 RMD160 cc644913fd588251f2ab16761a44363eb35015aa SHA1 660987a7b70c993ceb76efec8f960ca97956fe06 SHA256 7ed4039b3ba98d9c8ff25f3395e1a87a5cf05d2b20111ac9972d869c98d40872 -AUX extra-monitor-debug.patch 1036 RMD160 8100c465b61bfd45781cc6531d74614cfab8e929 SHA1 2b91e5367e82356ab72819432696695fa5354b1e SHA256 57f94302847d7a16cbfd7150cfa91ccebfc2ce752a6a41e223ffcb6599d5592a -AUX extra-monitor.patch 721 RMD160 eecf971cc407b8d34903b3d8667ac93fe86d1876 SHA1 8e2bf69309d6188f2a789180743a72c0f7c74dc2 SHA256 78752000995d1edd69d7584fd98bcde439fb1e1de4ecdfe6eeec4ca7d8d855f9 -DIST wireless-regdb-2009.01.30.tar.bz2 11515 RMD160 56ec08a66db2795afef93271d0c93178ac9130ca SHA1 280935c9428d353a9d50a0bfa533fc187ccfe6cb SHA256 8b86eeab87497b708b2ec590ebf32659244dbfba57d33329ce0310c8564dd75b -DIST wireless-regdb-2009.03.09.tar.bz2 11855 RMD160 e1f4f9c64ddfcd9374f8ac5327203e1e048a6d10 SHA1 f823eeb0c637fee9c705fc7112b33fc9eb55fa4a SHA256 794c5f7d59cd83ba6fe33ef5a25cd28fa655f395df43b648157ccec2fe5faf35 -DIST wireless-regdb-2009.08.17.tar.bz2 12745 RMD160 21ebefcd8d8aefd3b559f432f0948a763144ded4 SHA1 ab87bfd0b2f26a8e1213da16ce2add47c831ac66 SHA256 6b1e39bec4c1122e5639e979f2632430e41a2acac8ba251a13bf5c953f4775a1 -DIST wireless-regdb-2009.11.25.tar.bz2 12844 RMD160 a129a77e700b42de339e6c1891d51e729349fbe0 SHA1 c8afeffc4ad4f292d43551ce1c5c20e8aa559c34 SHA256 b9d569a41f66323339b7aa203db6e2d8f39c98192f134b5eef2135cf09cd943f -EBUILD wireless-regdb-20090130-r1.ebuild 1064 RMD160 d428dcb67fc6876fd01dac56c2e60d38738f3349 SHA1 e3693e277f12e3c6a77b1fa0c992f09590b8aef7 SHA256 83446433160c2d15e6a53c4920c31bdf425b91d6d1008a8536c98e9c34121780 -EBUILD wireless-regdb-20090309.ebuild 1006 RMD160 c26e06edb51e763c2fa95af9a38587290282651f SHA1 b94515d5cb3bfe26e5bfc2dbc4d96891bacfe685 SHA256 39e29e13e7eddfb5570cb271f98ba906d0a47b6657dd500936c2d7e9620fce68 -EBUILD wireless-regdb-20090817.ebuild 967 RMD160 3222490393c947c8987b8eaa0cd49afccb571093 SHA1 cb40eafba2712c64848952800866608f6d48f3a5 SHA256 2d55b76432f181ff4493f039758ad28662fb66281205deb7ac391bb00069191d -EBUILD wireless-regdb-20091125-r1.ebuild 1026 RMD160 1498ca1c83692114a1d0ec0ad7c2bbafed34e5ed SHA1 09bf32b8e6bae577f150c1f14d49aabff1324e4b SHA256 06d1670201529a7a19d2c6c45fe66484cc02cba66fae27156f6806ce81e5944e -EBUILD wireless-regdb-20091125.ebuild 1047 RMD160 3743bae6a7f8e2b34ca3f5d14f14bf7a9d29859b SHA1 31e45b23b1f41c24ad921505141e673a0cf201b9 SHA256 a237766fe331196ba58fe29ba332495f2924f3e16724430f9d023f2f298e6b81 diff --git a/net-wireless/wireless-regdb/files/extra-monitor-20090817.patch b/net-wireless/wireless-regdb/files/extra-monitor-20090817.patch deleted file mode 100644 index 9f06e473..00000000 --- a/net-wireless/wireless-regdb/files/extra-monitor-20090817.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -Naur wireless-regdb-2009.08.17-orig/db.txt wireless-regdb-2009.08.17/db.txt ---- wireless-regdb-2009.08.17-orig/db.txt 2009-08-17 09:25:16.000000000 -0400 -+++ wireless-regdb-2009.08.17/db.txt 2009-09-07 20:44:51.000000000 -0400 -@@ -579,6 +579,13 @@ - country VN: - (2402 - 2482 @ 40), (N/A, 20) - -+country XN: -+ (2182 - 7010 @ 40), (N/A, 40) -+ -+country XX: -+ (2182 - 7010 @ 40), (N/A, 30), PASSIVE-SCAN, NO-IBSS -+ -+ - country YE: - (2402 - 2482 @ 40), (N/A, 20) - -diff -Naur wireless-regdb-2009.08.17-orig/Makefile wireless-regdb-2009.08.17/Makefile ---- wireless-regdb-2009.08.17-orig/Makefile 2009-08-17 09:25:16.000000000 -0400 -+++ wireless-regdb-2009.08.17/Makefile 2009-09-07 20:45:53.000000000 -0400 -@@ -18,8 +18,8 @@ - echo custom-distro; \ - fi) - --DISTRO_PRIVKEY ?= ~/.wireless-regdb-$(LSB_ID).key.priv.pem --DISTRO_PUBKEY ?= ~/.wireless-regdb-$(LSB_ID).key.priv.pem -+DISTRO_PRIVKEY ?= wireless-regdb-$(LSB_ID).key.priv.pem -+DISTRO_PUBKEY ?= wireless-regdb-$(LSB_ID).key.priv.pem - - REGDB_AUTHOR ?= $(shell if [ -f $(DISTRO_PRIVKEY) ]; then \ - echo $(LSB_ID) ; \ -@@ -29,7 +29,7 @@ - echo custom-user; \ - fi) - --REGDB_PRIVKEY ?= ~/.wireless-regdb-$(REGDB_AUTHOR).key.priv.pem -+REGDB_PRIVKEY ?= wireless-regdb-$(REGDB_AUTHOR).key.priv.pem - REGDB_PUBKEY ?= $(REGDB_AUTHOR).key.pub.pem - - REGDB_UPSTREAM_PUBKEY ?= linville.key.pub.pem -@@ -91,8 +91,8 @@ - # Distributions packagers should do only once: - # make install-distro-key - # This will create a private key for you and install it into --# ~/.wireless-regdb-$(LSB_ID).key.priv.pem --# To make new releaes just do: -+# wireless-regdb-$(LSB_ID).key.priv.pem -+# To make new releases just do: - # make maintainer-clean - # make - # sudo make install diff --git a/net-wireless/wireless-regdb/files/extra-monitor-20091125.patch b/net-wireless/wireless-regdb/files/extra-monitor-20091125.patch deleted file mode 100644 index 9f06e473..00000000 --- a/net-wireless/wireless-regdb/files/extra-monitor-20091125.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -Naur wireless-regdb-2009.08.17-orig/db.txt wireless-regdb-2009.08.17/db.txt ---- wireless-regdb-2009.08.17-orig/db.txt 2009-08-17 09:25:16.000000000 -0400 -+++ wireless-regdb-2009.08.17/db.txt 2009-09-07 20:44:51.000000000 -0400 -@@ -579,6 +579,13 @@ - country VN: - (2402 - 2482 @ 40), (N/A, 20) - -+country XN: -+ (2182 - 7010 @ 40), (N/A, 40) -+ -+country XX: -+ (2182 - 7010 @ 40), (N/A, 30), PASSIVE-SCAN, NO-IBSS -+ -+ - country YE: - (2402 - 2482 @ 40), (N/A, 20) - -diff -Naur wireless-regdb-2009.08.17-orig/Makefile wireless-regdb-2009.08.17/Makefile ---- wireless-regdb-2009.08.17-orig/Makefile 2009-08-17 09:25:16.000000000 -0400 -+++ wireless-regdb-2009.08.17/Makefile 2009-09-07 20:45:53.000000000 -0400 -@@ -18,8 +18,8 @@ - echo custom-distro; \ - fi) - --DISTRO_PRIVKEY ?= ~/.wireless-regdb-$(LSB_ID).key.priv.pem --DISTRO_PUBKEY ?= ~/.wireless-regdb-$(LSB_ID).key.priv.pem -+DISTRO_PRIVKEY ?= wireless-regdb-$(LSB_ID).key.priv.pem -+DISTRO_PUBKEY ?= wireless-regdb-$(LSB_ID).key.priv.pem - - REGDB_AUTHOR ?= $(shell if [ -f $(DISTRO_PRIVKEY) ]; then \ - echo $(LSB_ID) ; \ -@@ -29,7 +29,7 @@ - echo custom-user; \ - fi) - --REGDB_PRIVKEY ?= ~/.wireless-regdb-$(REGDB_AUTHOR).key.priv.pem -+REGDB_PRIVKEY ?= wireless-regdb-$(REGDB_AUTHOR).key.priv.pem - REGDB_PUBKEY ?= $(REGDB_AUTHOR).key.pub.pem - - REGDB_UPSTREAM_PUBKEY ?= linville.key.pub.pem -@@ -91,8 +91,8 @@ - # Distributions packagers should do only once: - # make install-distro-key - # This will create a private key for you and install it into --# ~/.wireless-regdb-$(LSB_ID).key.priv.pem --# To make new releaes just do: -+# wireless-regdb-$(LSB_ID).key.priv.pem -+# To make new releases just do: - # make maintainer-clean - # make - # sudo make install diff --git a/net-wireless/wireless-regdb/files/extra-monitor-debug.patch b/net-wireless/wireless-regdb/files/extra-monitor-debug.patch deleted file mode 100644 index bb20f867..00000000 --- a/net-wireless/wireless-regdb/files/extra-monitor-debug.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -Naur wireless-regdb-2009.03.09-orig/db.txt wireless-regdb-2009.03.09/db.txt ---- wireless-regdb-2009.03.09-orig/db.txt 2009-03-12 09:53:34.000000000 -0400 -+++ wireless-regdb-2009.03.09/db.txt 2009-03-12 10:27:39.000000000 -0400 -@@ -551,11 +551,16 @@ - (2402 - 2482 @ 40), (N/A, 20) - - country US: -- (2402 - 2472 @ 40), (3, 27) -+ (2182 - 2402 @ 40), (6, 30), PASSIVE-SCAN, NO-IBSS -+ (2402 - 2472 @ 40), (6, 30) -+ (2472 - 3500 @ 40), (6, 30), PASSIVE-SCAN, NO-IBSS -+ (3500 - 5170 @ 40), (3, 17), PASSIVE-SCAN, NO-IBSS - (5170 - 5250 @ 40), (3, 17) - (5250 - 5330 @ 40), (3, 20), DFS -+ (5330 - 5490 @ 40), (3, 20), PASSIVE-SCAN, NO-IBSS - (5490 - 5710 @ 40), (3, 20), DFS - (5735 - 5835 @ 40), (3, 30) -+ (5835 - 7010 @ 40), (3, 30), PASSIVE-SCAN, NO-IBSS - - country UY: - (2402 - 2482 @ 40), (N/A, 20) -@@ -575,6 +580,12 @@ - country VN: - (2402 - 2482 @ 40), (N/A, 20) - -+country XN: -+ (2182 - 7010 @ 40), (N/A, 40) -+ -+country XX: -+ (2182 - 7010 @ 40), (N/A, 30), PASSIVE-SCAN, NO-IBSS -+ - country YE: - (2402 - 2482 @ 40), (N/A, 20) - diff --git a/net-wireless/wireless-regdb/files/extra-monitor.patch b/net-wireless/wireless-regdb/files/extra-monitor.patch deleted file mode 100644 index b026a2f1..00000000 --- a/net-wireless/wireless-regdb/files/extra-monitor.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Naur wireless-regdb-2009.01.30/db.txt wireless-regdb-2009.01.30-zc/db.txt ---- wireless-regdb-2009.01.30/db.txt 2009-02-10 15:54:30.000000000 -0500 -+++ wireless-regdb-2009.01.30-zc/db.txt 2009-02-10 15:56:59.000000000 -0500 -@@ -540,11 +540,15 @@ - (2402 - 2482 @ 40), (N/A, 20) - - country US: -+ (2182 - 2402 @ 40), (N/A, 0), PASSIVE-SCAN, NO-IBSS - (2402 - 2472 @ 40), (3, 27) -+ (2472 - 5170 @ 40), (N/A, 0), PASSIVE-SCAN, NO-IBSS - (5170 - 5250 @ 40), (3, 17) - (5250 - 5330 @ 40), (3, 20), DFS -+ (5330 - 5490 @ 40), (N/A, 0), PASSIVE-SCAN, NO-IBSS - (5490 - 5710 @ 40), (3, 20), DFS - (5735 - 5835 @ 40), (3, 30) -+ (5835 - 7000 @ 40), (N/A, 0), PASSIVE-SCAN, NO-IBSS - - country UY: - (2402 - 2482 @ 40), (N/A, 20) diff --git a/net-wireless/wireless-regdb/wireless-regdb-20090130-r1.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20090130-r1.ebuild deleted file mode 100644 index 6b5e521b..00000000 --- a/net-wireless/wireless-regdb/wireless-regdb-20090130-r1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-regdb/wireless-regdb-20090130.ebuild,v 1.1 2009/02/02 18:42:21 chainsaw Exp $ - -MY_P="wireless-regdb-${PV:0:4}.${PV:4:2}.${PV:6:2}" -DESCRIPTION="Binary regulatory database for CRDA" -HOMEPAGE="http://wireless.kernel.org/en/developers/Regulatory" -SRC_URI="http://wireless.kernel.org/download/wireless-regdb/${MY_P}.tar.bz2" -LICENSE="as-is" -SLOT="0" - -inherit eutils - -KEYWORDS="amd64 ~ppc ~ppc64 x86" -IUSE="" -DEPEND="dev-libs/openssl - dev-lang/python - dev-python/m2crypto" -#RDEPEND="${DEPEND}" It doesn't actually have runtime deps afaik -S="${WORKDIR}/${MY_P}" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/extra-monitor.patch - emake maintainer-clean || die "make maintainer-clean failed" -} - -src_compile() { - emake key.priv.pem || die "make key.priv.pem failed" - emake || die "emake failed" -} - -src_install() { - insinto /usr/lib/crda/ - doins regulatory.bin - doins key.pub.pem -} diff --git a/net-wireless/wireless-regdb/wireless-regdb-20090309.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20090309.ebuild deleted file mode 100644 index e5b84e8a..00000000 --- a/net-wireless/wireless-regdb/wireless-regdb-20090309.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-regdb/wireless-regdb-20090130.ebuild,v 1.1 2009/02/02 18:42:21 chainsaw Exp $ - -MY_P="wireless-regdb-${PV:0:4}.${PV:4:2}.${PV:6:2}" -DESCRIPTION="Binary regulatory database for CRDA" -HOMEPAGE="http://wireless.kernel.org/en/developers/Regulatory" -SRC_URI="http://wireless.kernel.org/download/wireless-regdb/${MY_P}.tar.bz2" -LICENSE="as-is" -SLOT="0" - -inherit eutils - -KEYWORDS="amd64 ~ppc ~ppc64 x86" -IUSE="" -DEPEND="dev-libs/openssl - dev-lang/python - dev-python/m2crypto" - -S="${WORKDIR}/${MY_P}" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/extra-monitor-debug.patch - emake maintainer-clean || die "make maintainer-clean failed" -} - -src_compile() { - emake key.priv.pem || die "make key.priv.pem failed" - emake || die "emake failed" -} - -src_install() { - insinto /usr/lib/crda/ - doins regulatory.bin - doins key.pub.pem -} diff --git a/net-wireless/wireless-regdb/wireless-regdb-20090817.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20090817.ebuild deleted file mode 100644 index 867166e0..00000000 --- a/net-wireless/wireless-regdb/wireless-regdb-20090817.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-regdb/wireless-regdb-20090130.ebuild,v 1.1 2009/02/02 18:42:21 chainsaw Exp $ - -MY_P="wireless-regdb-${PV:0:4}.${PV:4:2}.${PV:6:2}" -DESCRIPTION="Binary regulatory database for CRDA" -HOMEPAGE="http://wireless.kernel.org/en/developers/Regulatory" -SRC_URI="http://wireless.kernel.org/download/wireless-regdb/${MY_P}.tar.bz2" -LICENSE="as-is" -SLOT="0" - -inherit eutils - -KEYWORDS="amd64 ~ppc ~ppc64 x86" -IUSE="" -DEPEND="dev-libs/openssl - dev-lang/python - dev-python/m2crypto" - -S="${WORKDIR}/${MY_P}" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/extra-monitor-${PV}.patch -} - -src_compile() { - emake install-distro-key || die "make install-distro-key failed" - emake || die "emake failed" -} - -src_install() { - insinto /usr/lib/crda/ - doins regulatory.bin - doins custom-distro.key.pub.pem -} diff --git a/net-wireless/wireless-regdb/wireless-regdb-20091125-r1.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20091125-r1.ebuild deleted file mode 100644 index c8060c71..00000000 --- a/net-wireless/wireless-regdb/wireless-regdb-20091125-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-regdb/wireless-regdb-20090130.ebuild,v 1.1 2009/02/02 18:42:21 chainsaw Exp $ - -MY_P="wireless-regdb-${PV:0:4}.${PV:4:2}.${PV:6:2}" -DESCRIPTION="Binary regulatory database for CRDA" -HOMEPAGE="http://wireless.kernel.org/en/developers/Regulatory" -SRC_URI="http://wireless.kernel.org/download/wireless-regdb/${MY_P}.tar.bz2" -LICENSE="as-is" -SLOT="0" - -inherit eutils - -KEYWORDS="amd64 ~ppc ~ppc64 x86" -IUSE="" -DEPEND="dev-libs/openssl - dev-lang/python - dev-python/m2crypto" - -S="${WORKDIR}/${MY_P}" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/extra-monitor-${PV}.patch -} - -#TODO: add pentoo use flag to not patch the regdb, maybe adjust deps - -src_compile() { - emake install-distro-key || die "make install-distro-key failed" - emake || die "emake failed" -} - -src_install() { - insinto /usr/$(get_libdir)/crda/ - doins regulatory.bin - doins *.key.pub.pem -} diff --git a/net-wireless/wireless-regdb/wireless-regdb-20091125.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20091125.ebuild deleted file mode 100644 index 9d8166d6..00000000 --- a/net-wireless/wireless-regdb/wireless-regdb-20091125.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-regdb/wireless-regdb-20090130.ebuild,v 1.1 2009/02/02 18:42:21 chainsaw Exp $ - -MY_P="wireless-regdb-${PV:0:4}.${PV:4:2}.${PV:6:2}" -DESCRIPTION="Binary regulatory database for CRDA" -HOMEPAGE="http://wireless.kernel.org/en/developers/Regulatory" -SRC_URI="http://wireless.kernel.org/download/wireless-regdb/${MY_P}.tar.bz2" -LICENSE="as-is" -SLOT="0" - -inherit eutils - -KEYWORDS="amd64 ~ppc ~ppc64 x86" -IUSE="" -DEPEND="dev-libs/openssl - dev-lang/python - dev-python/m2crypto" - -S="${WORKDIR}/${MY_P}" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/extra-monitor-${PV}.patch -} - -#TODO: add pentoo use flag to not patch the regdb, maybe adjust deps - -src_compile() { - emake install-distro-key || die "make install-distro-key failed" - emake || die "emake failed" -} - -src_install() { - insinto /usr/$(get_libdir)/crda/ - doins regulatory.bin - doins custom-distro.key.pub.pem -} diff --git a/sci-libs/gsl-empty/Manifest b/sci-libs/gsl-empty/Manifest deleted file mode 100644 index c29d31be..00000000 --- a/sci-libs/gsl-empty/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX cblas.pc.in 290 SHA256 f47133de2f49a5ff53c8e295d03fbe8923c79cd0978cedb903cfdf7e57a873a1 SHA512 2a1dc22097e2a50fd4a797c446b32202b74e9d754c8b61c51a3789c3eb42372adcc7fb25901c468d604cc4e7961d7f11e0e5883179894047948e46879fc04719 WHIRLPOOL f8e93aa2c61d3ac08664c3162f0e754c1d6cefca0a4d4ab8ee8f763e6ec46049ff5537c7f9266200856b58ffab88fb9af115eb4be32deb99ed6d2005abcb13ec -AUX eselect.cblas.gsl 216 SHA256 2be1ba93a0bafa73df52913f54d1c7fd299aa1cd0a98c5fbe4eac894073ebac7 SHA512 e5cd92f4e9829538642a0fed54fdf75bc579c8c20769997ec5a3ce0287993476e68fbeefec8e46162d05ea908d2e79187c15ebdd00f6558ecbd25de21ece64dc WHIRLPOOL 1a0591e670a1ca51fa6cc4b2883931a49f3da59c2c673d786f6acdb72b50b7fee22ee30f2d3c6ac864c149381c23ca5c41ba586f159830cdeff97b86cf6a03f3 -AUX gsl-1.15-cblas.patch 17217 SHA256 1d69dd2d1b37abd541b86fed2b28e9f63e947f92f1b85af1c2f83074b12a8491 SHA512 fd099610b612b44a8b8ab8efd6350894fe7df46c94cf20e9d4377360c4cc31b11a8d9e18f6db6db9d8f4b7098b1d1569167ddb29e30396c656e381d25c1ec852 WHIRLPOOL 4794cfb018f50e59e11eb60bf11d348a7131360d757868aa9f08e75f432ee786d82143cdb3743ce3a526649cc2877b45dbe14eb49464cea9f23add0db87638b5 -DIST gsl-1.15.tar.gz 3281134 SHA256 85b907e57902e2b7606ef3aef960302ffdd13bd9dc5b8fcbfa75e4f0bf340ea3 SHA512 dcea557bcd34d4ee6d2c52741c2f95702e5e6110a99f033b412489b1930d21a40ead29392f754656375801d706df01199878263e856ca3081f9a514dc3299185 WHIRLPOOL 06ffffb83ea56cf6306878063770a117e096352dda3c3dd4a7526153bc770969f61e38fa08c02ec01335bd812581db15e4e5164a7da2363741179268cb393478 -EBUILD gsl-empty-1.15.ebuild 3122 SHA256 3100d494786e24d135222d1767898ae03f0410b7289417f22e34df75aed6b86a SHA512 b45bb46c406b9081258fe6a73b309bc9bf626775047ac8598b893d4de82ce0079df8ecb76b10800b1d548500afdae409f796e415b02da46372ce33a3d19cbfe7 WHIRLPOOL 7a33b3e6dfef930bf57dcb8286315b5ce7a55017b3e881387c30c0fbfa168009c97eccaa4bf1d16e27e3d241a13992d1105255d204dcee3917af993e7e9a91ca -MISC metadata.xml 1026 SHA256 6df14f9543ae80840437ac04fca5f5b4ca052a722c5146b015eeb26b1c11f1f4 SHA512 02751504e7a1563ca2008426536d03c8d5f00272519f73dccbe4df8f93fa26132fa57eee085cee9e1ce68e396893ef602283d8cd6722ba2f27bb322b8c201951 WHIRLPOOL fcbfd38fc5d1bafc3d3e08d0031b401fd5d67f1dcc1318c9ef57fa443d8998c6f9975d4f9a2b08e1d10e5e0e557511508193fd9742dc6e415067ccd723f740d8 diff --git a/sci-libs/gsl-empty/files/cblas.pc.in b/sci-libs/gsl-empty/files/cblas.pc.in deleted file mode 100644 index a2580f85..00000000 --- a/sci-libs/gsl-empty/files/cblas.pc.in +++ /dev/null @@ -1,12 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=/usr/@LIBDIR@ -includedir=${prefix}/include - -Name: cblas -Description: GSL C Implementation of the Basic Linear Algebra Subprograms -Version: @PV@ -URL: http://www.gnu.org/software/gsl -Libs: -L${libdir} -lcblas -Libs.private: -lm -Cflags: -I${includedir} diff --git a/sci-libs/gsl-empty/files/eselect.cblas.gsl b/sci-libs/gsl-empty/files/eselect.cblas.gsl deleted file mode 100644 index af6fee51..00000000 --- a/sci-libs/gsl-empty/files/eselect.cblas.gsl +++ /dev/null @@ -1,5 +0,0 @@ -libgslcblas.so /usr/@LIBDIR@/libcblas.so -libgslcblas.so.0 /usr/@LIBDIR@/libcblas.so.0 -libgslcblas.a /usr/@LIBDIR@/libcblas.a -../blas/gsl/cblas.pc /usr/@LIBDIR@/pkgconfig/cblas.pc -gsl/gsl_cblas.h /usr/include/cblas.h diff --git a/sci-libs/gsl-empty/files/gsl-1.15-cblas.patch b/sci-libs/gsl-empty/files/gsl-1.15-cblas.patch deleted file mode 100644 index dd402f39..00000000 --- a/sci-libs/gsl-empty/files/gsl-1.15-cblas.patch +++ /dev/null @@ -1,286 +0,0 @@ -diff -Nur gsl-1.15.orig/acx_cblas.m4 gsl-1.15/acx_cblas.m4 ---- gsl-1.15.orig/acx_cblas.m4 1970-01-01 01:00:00.000000000 +0100 -+++ gsl-1.15/acx_cblas.m4 2011-07-28 22:16:03.000000000 +0100 -@@ -0,0 +1,60 @@ -+AC_DEFUN([ACX_CBLAS],[ -+ use_cblas=no -+ use_cblas_libs="-lcblas -lblas" -+ use_cblas_cflags="" -+ -+ AC_ARG_WITH(cblas, -+ [AS_HELP_STRING([--with-cblas], [use external CBLAS library (default is no)])]) -+ -+ case $with_cblas in -+ yes) use_cblas=yes ;; -+ no | "" ) use_cblas=no ;; -+ -* | */* | *.a | *.so | *.so.* | *.o) use_cblas_libs="$with_cblas" ;; -+ *) use_cblas_libs="-l$with_cblas" ;; -+ esac -+ -+ AC_ARG_WITH(cblas-libs, -+ [AS_HELP_STRING([--with-cblas-libs=<libs>], -+ [external cblas libraries to link with (default is "$use_cblas_libs")])], -+ [use_cblas_libs=$withval], []) -+ -+ AC_ARG_WITH(cblas-cflags, -+ [AS_HELP_STRING([--with-cblas-cflags=<flags>], -+ [extra cflags to compile with external cblas ("-I<dir>")])], -+ [use_cblas_cflags=$withval], []) -+ -+ if test x$use_cblas != xno; then -+ if test "x$CBLAS_LIBS" = x; then -+ CBLAS_LIBS="$use_cblas_libs" -+ fi -+ if test "x$CBLAS_FLAGS" = x; then -+ CBLAS_CFLAGS="$use_cblas_cflags" -+ fi -+ -+ CFLAGS_sav="$CFLAGS" -+ CFLAGS="$CFLAGS $CBLAS_CFLAGS" -+ AC_CHECK_HEADER(cblas.h, , -+ [AC_MSG_ERROR([ -+ *** Header file cblas.h not found. -+ *** If you installed cblas header in a non standard place, -+ *** specify its install prefix using the following option -+ *** --with-cblas-cflags="-I<include_dir>"]) -+ ]) -+ CFLAGS="$CFLAGS_sav" -+ -+ LIBS_sav="$LIBS" -+ LIBS="$LIBS $CBLAS_LIBS -lm" -+ AC_MSG_CHECKING([for cblas_sgemm in $CBLAS_LIBS]) -+ AC_TRY_LINK_FUNC(cblas_sgemm, [use_cblas=yes], -+ [AC_MSG_ERROR([ -+ *** Linking with cblas with $LIBS failed. -+ *** If you installed cblas library in a non standard place, -+ *** specify its install prefix using the following option -+ *** --with-cblas-libs="-L<lib_dir> -l<lib>"]) -+ ]) -+ AC_MSG_RESULT($use_cblas) -+ LIBS="$LIBS_sav" -+ AC_SUBST(CBLAS_CFLAGS) -+ AC_SUBST(CBLAS_LIBS) -+ fi -+]) -diff -Nur gsl-1.15.orig/bspline/Makefile.am gsl-1.15/bspline/Makefile.am ---- gsl-1.15.orig/bspline/Makefile.am 2011-07-28 22:15:49.000000000 +0100 -+++ gsl-1.15/bspline/Makefile.am 2011-07-28 22:16:03.000000000 +0100 -@@ -12,6 +12,6 @@ - - TESTS = $(check_PROGRAMS) - --test_LDADD = libgslbspline.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../cblas/libgslcblas.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../statistics/libgslstatistics.la -+test_LDADD = libgslbspline.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la @CBLAS_LINK_LIBS@ ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../statistics/libgslstatistics.la - - test_SOURCES = test.c -diff -Nur gsl-1.15.orig/configure.ac gsl-1.15/configure.ac ---- gsl-1.15.orig/configure.ac 2011-07-28 22:15:49.000000000 +0100 -+++ gsl-1.15/configure.ac 2011-07-28 22:16:03.000000000 +0100 -@@ -190,6 +190,16 @@ - AC_CHECK_LIB(m, cos) - fi - -+sinclude(acx_cblas.m4) -+ACX_CBLAS -+if test "x$CBLAS_LIBS" != "x"; then -+ CBLAS_LINK_LIBS="$CBLAS_LIBS" -+else -+ CBLAS_LINK_LIBS="\$(top_builddir)/cblas/libgslcblas.la" -+ CBLAS_LIBS="-lgslcblas" -+fi -+AC_SUBST(CBLAS_LINK_LIBS) -+ - dnl Remember to put a definition in acconfig.h for each of these - AC_CHECK_DECLS(feenableexcept,,,[#define _GNU_SOURCE 1 - #include <fenv.h>]) -diff -Nur gsl-1.15.orig/eigen/Makefile.am gsl-1.15/eigen/Makefile.am ---- gsl-1.15.orig/eigen/Makefile.am 2011-07-28 22:15:49.000000000 +0100 -+++ gsl-1.15/eigen/Makefile.am 2011-07-28 22:16:03.000000000 +0100 -@@ -11,7 +11,7 @@ - - TESTS = $(check_PROGRAMS) - --test_LDADD = libgsleigen.la ../test/libgsltest.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../sys/libgslsys.la ../err/libgslerr.la ../utils/libutils.la ../rng/libgslrng.la ../sort/libgslsort.la -+test_LDADD = libgsleigen.la ../test/libgsltest.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../sys/libgslsys.la ../err/libgslerr.la ../utils/libutils.la ../rng/libgslrng.la ../sort/libgslsort.la - - test_SOURCES = test.c - -diff -Nur gsl-1.15.orig/gsl-config.in gsl-1.15/gsl-config.in ---- gsl-1.15.orig/gsl-config.in 2011-07-28 22:15:49.000000000 +0100 -+++ gsl-1.15/gsl-config.in 2011-07-28 22:16:03.000000000 +0100 -@@ -58,11 +58,11 @@ - ;; - - --cflags) -- echo @GSL_CFLAGS@ -+ echo @GSL_CFLAGS@ @CBLAS_CFLAGS@ - ;; - - --libs) -- : ${GSL_CBLAS_LIB=-lgslcblas} -+ : ${GSL_CBLAS_LIB=@CBLAS_LIBS@} - echo @GSL_LIBS@ $GSL_CBLAS_LIB @GSL_LIBM@ - ;; - -diff -Nur gsl-1.15.orig/gsl.pc.in gsl-1.15/gsl.pc.in ---- gsl-1.15.orig/gsl.pc.in 2011-07-28 22:15:49.000000000 +0100 -+++ gsl-1.15/gsl.pc.in 2011-07-28 22:20:14.000000000 +0100 -@@ -2,7 +2,7 @@ - exec_prefix=@exec_prefix@ - libdir=@libdir@ - includedir=@includedir@ --GSL_CBLAS_LIB=-lgslcblas -+GSL_CBLAS_LIB=@CBLAS_LIBS@ - - Name: GSL - Description: GNU Scientific Library -diff -Nur gsl-1.15.orig/interpolation/Makefile.am gsl-1.15/interpolation/Makefile.am ---- gsl-1.15.orig/interpolation/Makefile.am 2011-07-28 22:15:49.000000000 +0100 -+++ gsl-1.15/interpolation/Makefile.am 2011-07-28 22:16:03.000000000 +0100 -@@ -10,7 +10,7 @@ - - TESTS = $(check_PROGRAMS) - --test_LDADD = libgslinterpolation.la ../poly/libgslpoly.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../cblas/libgslcblas.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+test_LDADD = libgslinterpolation.la ../poly/libgslpoly.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la @CBLAS_LINK_LIBS@ ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - - test_SOURCES = test.c - -diff -Nur gsl-1.15.orig/linalg/Makefile.am gsl-1.15/linalg/Makefile.am ---- gsl-1.15.orig/linalg/Makefile.am 2011-07-28 22:15:49.000000000 +0100 -+++ gsl-1.15/linalg/Makefile.am 2011-07-28 22:16:03.000000000 +0100 -@@ -12,7 +12,7 @@ - - check_PROGRAMS = test - --test_LDADD = libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+test_LDADD = libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - - test_SOURCES = test.c - -diff -Nur gsl-1.15.orig/Makefile.am gsl-1.15/Makefile.am ---- gsl-1.15.orig/Makefile.am 2011-07-28 22:15:49.000000000 +0100 -+++ gsl-1.15/Makefile.am 2011-07-28 22:16:03.000000000 +0100 -@@ -19,13 +19,12 @@ - - lib_LTLIBRARIES = libgsl.la - libgsl_la_SOURCES = version.c --libgsl_la_LIBADD = $(SUBLIBS) -+libgsl_la_LIBADD = $(SUBLIBS) @CBLAS_LINK_LIBS@ - libgsl_la_LDFLAGS = -version-info $(GSL_LT_VERSION) - noinst_HEADERS = templates_on.h templates_off.h build.h - - MINGW32_HOST = @MINGW32_HOST@ - if MINGW32_HOST --libgsl_la_LIBADD += cblas/libgslcblas.la - libgsl_la_LDFLAGS += -no-undefined - endif - -@@ -35,10 +34,10 @@ - bin_PROGRAMS = gsl-randist gsl-histogram - - gsl_randist_SOURCES = gsl-randist.c --gsl_randist_LDADD = libgsl.la cblas/libgslcblas.la -+gsl_randist_LDADD = libgsl.la - - gsl_histogram_SOURCES = gsl-histogram.c --gsl_histogram_LDADD = libgsl.la cblas/libgslcblas.la -+gsl_histogram_LDADD = libgsl.la - - check_SCRIPTS = test_gsl_histogram.sh pkgconfig.test - TESTS = test_gsl_histogram.sh pkgconfig.test -@@ -57,6 +56,8 @@ - -e 's|@GSL_CFLAGS[@]|$(GSL_CFLAGS)|g' \ - -e 's|@GSL_LIBM[@]|$(GSL_LIBM)|g' \ - -e 's|@GSL_LIBS[@]|$(GSL_LIBS)|g' \ -+ -e 's|@CBLAS_CFLAGS[@]|$(CBLAS_CFLAGS)|g' \ -+ -e 's|@CBLAS_LIBS[@]|$(CBLAS_LIBS)|g' \ - -e 's|@LIBS[@]|$(LIBS)|g' \ - -e 's|@VERSION[@]|$(VERSION)|g' - -diff -Nur gsl-1.15.orig/multifit/Makefile.am gsl-1.15/multifit/Makefile.am ---- gsl-1.15.orig/multifit/Makefile.am 2011-07-28 22:15:49.000000000 +0100 -+++ gsl-1.15/multifit/Makefile.am 2011-07-28 22:16:03.000000000 +0100 -@@ -13,8 +13,8 @@ - TESTS = $(check_PROGRAMS) - - test_SOURCES = test.c --test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la -+test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la - - #demo_SOURCES = demo.c --#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la -+#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la - -diff -Nur gsl-1.15.orig/multimin/Makefile.am gsl-1.15/multimin/Makefile.am ---- gsl-1.15.orig/multimin/Makefile.am 2011-07-28 22:15:49.000000000 +0100 -+++ gsl-1.15/multimin/Makefile.am 2011-07-28 22:16:03.000000000 +0100 -@@ -13,8 +13,8 @@ - TESTS = $(check_PROGRAMS) - - test_SOURCES = test.c test_funcs.c test_funcs.h --test_LDADD = libgslmultimin.la ../min/libgslmin.la ../poly/libgslpoly.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+test_LDADD = libgslmultimin.la ../min/libgslmin.la ../poly/libgslpoly.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - - #demo_SOURCES = demo.c --#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - -diff -Nur gsl-1.15.orig/multiroots/Makefile.am gsl-1.15/multiroots/Makefile.am ---- gsl-1.15.orig/multiroots/Makefile.am 2011-07-28 22:15:49.000000000 +0100 -+++ gsl-1.15/multiroots/Makefile.am 2011-07-28 22:16:03.000000000 +0100 -@@ -15,5 +15,5 @@ - TESTS = $(check_PROGRAMS) - - test_SOURCES = test.c test_funcs.c test_funcs.h --test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - -diff -Nur gsl-1.15.orig/ode-initval/Makefile.am gsl-1.15/ode-initval/Makefile.am ---- gsl-1.15.orig/ode-initval/Makefile.am 2011-07-28 22:15:49.000000000 +0100 -+++ gsl-1.15/ode-initval/Makefile.am 2011-07-28 22:16:03.000000000 +0100 -@@ -12,7 +12,7 @@ - - TESTS = $(check_PROGRAMS) - --test_LDADD = libgslodeiv.la ../linalg/libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../permutation/libgslpermutation.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+test_LDADD = libgslodeiv.la ../linalg/libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../permutation/libgslpermutation.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - - test_SOURCES = test.c - -diff -Nur gsl-1.15.orig/poly/Makefile.am gsl-1.15/poly/Makefile.am ---- gsl-1.15.orig/poly/Makefile.am 2011-07-28 22:15:49.000000000 +0100 -+++ gsl-1.15/poly/Makefile.am 2011-07-28 22:16:03.000000000 +0100 -@@ -10,7 +10,7 @@ - - TESTS = $(check_PROGRAMS) - --check_PROGRAMS = test -+#check_PROGRAMS = test - - test_SOURCES = test.c - test_LDADD = libgslpoly.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -diff -Nur gsl-1.15.orig/specfunc/Makefile.am gsl-1.15/specfunc/Makefile.am ---- gsl-1.15.orig/specfunc/Makefile.am 2011-07-28 22:15:49.000000000 +0100 -+++ gsl-1.15/specfunc/Makefile.am 2011-07-28 22:16:03.000000000 +0100 -@@ -12,7 +12,7 @@ - - check_PROGRAMS = test - --test_LDADD = libgslspecfunc.la ../eigen/libgsleigen.la ../linalg/libgsllinalg.la ../sort/libgslsort.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+test_LDADD = libgslspecfunc.la ../eigen/libgsleigen.la ../linalg/libgsllinalg.la ../sort/libgslsort.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - - test_SOURCES = test_sf.c test_sf.h test_airy.c test_bessel.c test_coulomb.c test_dilog.c test_gamma.c test_hyperg.c test_legendre.c test_mathieu.c - -diff -Nur gsl-1.15.orig/wavelet/Makefile.am gsl-1.15/wavelet/Makefile.am ---- gsl-1.15.orig/wavelet/Makefile.am 2011-07-28 22:15:49.000000000 +0100 -+++ gsl-1.15/wavelet/Makefile.am 2011-07-28 22:16:03.000000000 +0100 -@@ -10,7 +10,7 @@ - - TESTS = $(check_PROGRAMS) - --test_LDADD = libgslwavelet.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+test_LDADD = libgslwavelet.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - - test_SOURCES = test.c - diff --git a/sci-libs/gsl-empty/gsl-empty-1.15.ebuild b/sci-libs/gsl-empty/gsl-empty-1.15.ebuild deleted file mode 100644 index 9d8b0ab0..00000000 --- a/sci-libs/gsl-empty/gsl-empty-1.15.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=4 - -inherit eutils flag-o-matic autotools toolchain-funcs - -MY_PN="gsl" -MY_P="${MY_PN}"-"${PV}" - -DESCRIPTION="The GNU Scientific Library" -HOMEPAGE="http://www.gnu.org/software/gsl/" -SRC_URI="mirror://gnu/${MY_PN}/${MY_P}.tar.gz" - - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="cblas-external static-libs" - -RDEPEND="cblas-external? ( virtual/cblas )" -DEPEND="${RDEPEND} - app-eselect/eselect-cblas - virtual/pkgconfig" - -DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO ) - -S="${WORKDIR}"/${MY_P} - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]]; then - # prevent to use external cblas from a previously installed gsl - local current_lib - if use cblas-external; then - current_lib=$(eselect cblas show | cut -d' ' -f2) - if [[ ${current_lib} == gsl ]]; then - ewarn "USE flag cblas-external is set: linking gsl with an external cblas." - ewarn "However the current selected external cblas is gsl." - ewarn "Please install and/or eselect another cblas" - die "Circular gsl dependency" - fi - fi - fi -} - -pkg_setup() { - ESELECT_PROF="gsl" - - if [[ ${MERGE_TYPE} != binary ]]; then - # bug 349005 - [[ $(tc-getCC)$ == *gcc* ]] && \ - [[ $(tc-getCC)$ != *apple* ]] && \ - [[ $(gcc-major-version)$(gcc-minor-version) -eq 44 ]] \ - && filter-mfpmath sse - filter-flags -ffast-math - fi -} - -src_prepare() { - epatch "${FILESDIR}"/${MY_P}-cblas.patch - - cp "${FILESDIR}"/eselect.cblas.gsl "${T}"/ - sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.cblas.gsl || die - if [[ ${CHOST} == *-darwin* ]] ; then - sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \ - "${T}"/eselect.cblas.gsl || die - fi -} - -src_configure() { - if use cblas-external; then - export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)" - export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)" - fi - econf \ - --enable-shared \ - --prefix=/opt/gsl \ - --sysconfdir=/opt/gsl/etc \ - $(use_with cblas-external cblas) \ - $(use_enable static-libs static) -} - -src_install() { - #default - - find "${ED}" -name '*.la' -exec rm -f {} + - - # take care of pkgconfig file for cblas implementation. - sed -e "s/@LIBDIR@/$(get_libdir)/" \ - -e "s/@PV@/${PV}/" \ - -e "/^prefix=/s:=:=${EPREFIX}:" \ - -e "/^libdir=/s:=:=${EPREFIX}:" \ - "${FILESDIR}"/cblas.pc.in > cblas.pc \ - || die "sed cblas.pc failed" -} - -pkg_postinst() { - local p=cblas - local current_lib=$(eselect ${p} show | cut -d' ' -f2) - if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then - # work around eselect bug #189942 - local configfile="${EROOT}"/etc/env.d/${p}/$(get_libdir)/config - [[ -e ${configfile} ]] && rm -f ${configfile} - eselect ${p} set ${ESELECT_PROF} - elog "${p} has been eselected to ${ESELECT_PROF}" - else - elog "Current eselected ${p} is ${current_lib}" - elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):" - elog "\t eselect ${p} set ${ESELECT_PROF}" - fi -} diff --git a/sci-libs/gsl-empty/metadata.xml b/sci-libs/gsl-empty/metadata.xml deleted file mode 100644 index 7ab2ed03..00000000 --- a/sci-libs/gsl-empty/metadata.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>sci</herd> - <longdescription lang="en"> - The GNU Scientific Library (GSL) is a collection of routines for - numerical analysis. The routines are written from scratch by the GSL - team in C, and present a modern API for C programmers, while allowing - wrappers to be written for very high level languages. - - GSL includes data types and routines for complex numbers, vectors, - matrices, basic linear algebra subroutines (BLAS), eigensystems, - simulated annealing, minimization, root finding, pseudo-random - numbers, least-squares fitting, fast Fourier transforms (FFT), - differential equations, quadrature, Monte Carlo integration, special - functions, physical constants, and much more. -</longdescription> - <use> - <flag name="cblas-external">Link gsl with external cblas provided by - (<pkg>virtual/cblas</pkg>) instead of shipped internal version</flag> - </use> -</pkgmetadata> diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest deleted file mode 100644 index c29b99c1..00000000 --- a/sci-libs/gsl/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gsl-1.15.tar.gz 3281134 SHA256 85b907e57902e2b7606ef3aef960302ffdd13bd9dc5b8fcbfa75e4f0bf340ea3 SHA512 dcea557bcd34d4ee6d2c52741c2f95702e5e6110a99f033b412489b1930d21a40ead29392f754656375801d706df01199878263e856ca3081f9a514dc3299185 WHIRLPOOL 06ffffb83ea56cf6306878063770a117e096352dda3c3dd4a7526153bc770969f61e38fa08c02ec01335bd812581db15e4e5164a7da2363741179268cb393478 diff --git a/sci-libs/gsl/files/cblas.pc.in b/sci-libs/gsl/files/cblas.pc.in deleted file mode 100644 index a2580f85..00000000 --- a/sci-libs/gsl/files/cblas.pc.in +++ /dev/null @@ -1,12 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=/usr/@LIBDIR@ -includedir=${prefix}/include - -Name: cblas -Description: GSL C Implementation of the Basic Linear Algebra Subprograms -Version: @PV@ -URL: http://www.gnu.org/software/gsl -Libs: -L${libdir} -lcblas -Libs.private: -lm -Cflags: -I${includedir} diff --git a/sci-libs/gsl/files/eselect.cblas.gsl b/sci-libs/gsl/files/eselect.cblas.gsl deleted file mode 100644 index af6fee51..00000000 --- a/sci-libs/gsl/files/eselect.cblas.gsl +++ /dev/null @@ -1,5 +0,0 @@ -libgslcblas.so /usr/@LIBDIR@/libcblas.so -libgslcblas.so.0 /usr/@LIBDIR@/libcblas.so.0 -libgslcblas.a /usr/@LIBDIR@/libcblas.a -../blas/gsl/cblas.pc /usr/@LIBDIR@/pkgconfig/cblas.pc -gsl/gsl_cblas.h /usr/include/cblas.h diff --git a/sci-libs/gsl/files/gsl-1.15-cblas.patch b/sci-libs/gsl/files/gsl-1.15-cblas.patch deleted file mode 100644 index dd402f39..00000000 --- a/sci-libs/gsl/files/gsl-1.15-cblas.patch +++ /dev/null @@ -1,286 +0,0 @@ -diff -Nur gsl-1.15.orig/acx_cblas.m4 gsl-1.15/acx_cblas.m4 ---- gsl-1.15.orig/acx_cblas.m4 1970-01-01 01:00:00.000000000 +0100 -+++ gsl-1.15/acx_cblas.m4 2011-07-28 22:16:03.000000000 +0100 -@@ -0,0 +1,60 @@ -+AC_DEFUN([ACX_CBLAS],[ -+ use_cblas=no -+ use_cblas_libs="-lcblas -lblas" -+ use_cblas_cflags="" -+ -+ AC_ARG_WITH(cblas, -+ [AS_HELP_STRING([--with-cblas], [use external CBLAS library (default is no)])]) -+ -+ case $with_cblas in -+ yes) use_cblas=yes ;; -+ no | "" ) use_cblas=no ;; -+ -* | */* | *.a | *.so | *.so.* | *.o) use_cblas_libs="$with_cblas" ;; -+ *) use_cblas_libs="-l$with_cblas" ;; -+ esac -+ -+ AC_ARG_WITH(cblas-libs, -+ [AS_HELP_STRING([--with-cblas-libs=<libs>], -+ [external cblas libraries to link with (default is "$use_cblas_libs")])], -+ [use_cblas_libs=$withval], []) -+ -+ AC_ARG_WITH(cblas-cflags, -+ [AS_HELP_STRING([--with-cblas-cflags=<flags>], -+ [extra cflags to compile with external cblas ("-I<dir>")])], -+ [use_cblas_cflags=$withval], []) -+ -+ if test x$use_cblas != xno; then -+ if test "x$CBLAS_LIBS" = x; then -+ CBLAS_LIBS="$use_cblas_libs" -+ fi -+ if test "x$CBLAS_FLAGS" = x; then -+ CBLAS_CFLAGS="$use_cblas_cflags" -+ fi -+ -+ CFLAGS_sav="$CFLAGS" -+ CFLAGS="$CFLAGS $CBLAS_CFLAGS" -+ AC_CHECK_HEADER(cblas.h, , -+ [AC_MSG_ERROR([ -+ *** Header file cblas.h not found. -+ *** If you installed cblas header in a non standard place, -+ *** specify its install prefix using the following option -+ *** --with-cblas-cflags="-I<include_dir>"]) -+ ]) -+ CFLAGS="$CFLAGS_sav" -+ -+ LIBS_sav="$LIBS" -+ LIBS="$LIBS $CBLAS_LIBS -lm" -+ AC_MSG_CHECKING([for cblas_sgemm in $CBLAS_LIBS]) -+ AC_TRY_LINK_FUNC(cblas_sgemm, [use_cblas=yes], -+ [AC_MSG_ERROR([ -+ *** Linking with cblas with $LIBS failed. -+ *** If you installed cblas library in a non standard place, -+ *** specify its install prefix using the following option -+ *** --with-cblas-libs="-L<lib_dir> -l<lib>"]) -+ ]) -+ AC_MSG_RESULT($use_cblas) -+ LIBS="$LIBS_sav" -+ AC_SUBST(CBLAS_CFLAGS) -+ AC_SUBST(CBLAS_LIBS) -+ fi -+]) -diff -Nur gsl-1.15.orig/bspline/Makefile.am gsl-1.15/bspline/Makefile.am ---- gsl-1.15.orig/bspline/Makefile.am 2011-07-28 22:15:49.000000000 +0100 -+++ gsl-1.15/bspline/Makefile.am 2011-07-28 22:16:03.000000000 +0100 -@@ -12,6 +12,6 @@ - - TESTS = $(check_PROGRAMS) - --test_LDADD = libgslbspline.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../cblas/libgslcblas.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../statistics/libgslstatistics.la -+test_LDADD = libgslbspline.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la @CBLAS_LINK_LIBS@ ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../statistics/libgslstatistics.la - - test_SOURCES = test.c -diff -Nur gsl-1.15.orig/configure.ac gsl-1.15/configure.ac ---- gsl-1.15.orig/configure.ac 2011-07-28 22:15:49.000000000 +0100 -+++ gsl-1.15/configure.ac 2011-07-28 22:16:03.000000000 +0100 -@@ -190,6 +190,16 @@ - AC_CHECK_LIB(m, cos) - fi - -+sinclude(acx_cblas.m4) -+ACX_CBLAS -+if test "x$CBLAS_LIBS" != "x"; then -+ CBLAS_LINK_LIBS="$CBLAS_LIBS" -+else -+ CBLAS_LINK_LIBS="\$(top_builddir)/cblas/libgslcblas.la" -+ CBLAS_LIBS="-lgslcblas" -+fi -+AC_SUBST(CBLAS_LINK_LIBS) -+ - dnl Remember to put a definition in acconfig.h for each of these - AC_CHECK_DECLS(feenableexcept,,,[#define _GNU_SOURCE 1 - #include <fenv.h>]) -diff -Nur gsl-1.15.orig/eigen/Makefile.am gsl-1.15/eigen/Makefile.am ---- gsl-1.15.orig/eigen/Makefile.am 2011-07-28 22:15:49.000000000 +0100 -+++ gsl-1.15/eigen/Makefile.am 2011-07-28 22:16:03.000000000 +0100 -@@ -11,7 +11,7 @@ - - TESTS = $(check_PROGRAMS) - --test_LDADD = libgsleigen.la ../test/libgsltest.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../sys/libgslsys.la ../err/libgslerr.la ../utils/libutils.la ../rng/libgslrng.la ../sort/libgslsort.la -+test_LDADD = libgsleigen.la ../test/libgsltest.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../sys/libgslsys.la ../err/libgslerr.la ../utils/libutils.la ../rng/libgslrng.la ../sort/libgslsort.la - - test_SOURCES = test.c - -diff -Nur gsl-1.15.orig/gsl-config.in gsl-1.15/gsl-config.in ---- gsl-1.15.orig/gsl-config.in 2011-07-28 22:15:49.000000000 +0100 -+++ gsl-1.15/gsl-config.in 2011-07-28 22:16:03.000000000 +0100 -@@ -58,11 +58,11 @@ - ;; - - --cflags) -- echo @GSL_CFLAGS@ -+ echo @GSL_CFLAGS@ @CBLAS_CFLAGS@ - ;; - - --libs) -- : ${GSL_CBLAS_LIB=-lgslcblas} -+ : ${GSL_CBLAS_LIB=@CBLAS_LIBS@} - echo @GSL_LIBS@ $GSL_CBLAS_LIB @GSL_LIBM@ - ;; - -diff -Nur gsl-1.15.orig/gsl.pc.in gsl-1.15/gsl.pc.in ---- gsl-1.15.orig/gsl.pc.in 2011-07-28 22:15:49.000000000 +0100 -+++ gsl-1.15/gsl.pc.in 2011-07-28 22:20:14.000000000 +0100 -@@ -2,7 +2,7 @@ - exec_prefix=@exec_prefix@ - libdir=@libdir@ - includedir=@includedir@ --GSL_CBLAS_LIB=-lgslcblas -+GSL_CBLAS_LIB=@CBLAS_LIBS@ - - Name: GSL - Description: GNU Scientific Library -diff -Nur gsl-1.15.orig/interpolation/Makefile.am gsl-1.15/interpolation/Makefile.am ---- gsl-1.15.orig/interpolation/Makefile.am 2011-07-28 22:15:49.000000000 +0100 -+++ gsl-1.15/interpolation/Makefile.am 2011-07-28 22:16:03.000000000 +0100 -@@ -10,7 +10,7 @@ - - TESTS = $(check_PROGRAMS) - --test_LDADD = libgslinterpolation.la ../poly/libgslpoly.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../cblas/libgslcblas.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+test_LDADD = libgslinterpolation.la ../poly/libgslpoly.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la @CBLAS_LINK_LIBS@ ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - - test_SOURCES = test.c - -diff -Nur gsl-1.15.orig/linalg/Makefile.am gsl-1.15/linalg/Makefile.am ---- gsl-1.15.orig/linalg/Makefile.am 2011-07-28 22:15:49.000000000 +0100 -+++ gsl-1.15/linalg/Makefile.am 2011-07-28 22:16:03.000000000 +0100 -@@ -12,7 +12,7 @@ - - check_PROGRAMS = test - --test_LDADD = libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+test_LDADD = libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - - test_SOURCES = test.c - -diff -Nur gsl-1.15.orig/Makefile.am gsl-1.15/Makefile.am ---- gsl-1.15.orig/Makefile.am 2011-07-28 22:15:49.000000000 +0100 -+++ gsl-1.15/Makefile.am 2011-07-28 22:16:03.000000000 +0100 -@@ -19,13 +19,12 @@ - - lib_LTLIBRARIES = libgsl.la - libgsl_la_SOURCES = version.c --libgsl_la_LIBADD = $(SUBLIBS) -+libgsl_la_LIBADD = $(SUBLIBS) @CBLAS_LINK_LIBS@ - libgsl_la_LDFLAGS = -version-info $(GSL_LT_VERSION) - noinst_HEADERS = templates_on.h templates_off.h build.h - - MINGW32_HOST = @MINGW32_HOST@ - if MINGW32_HOST --libgsl_la_LIBADD += cblas/libgslcblas.la - libgsl_la_LDFLAGS += -no-undefined - endif - -@@ -35,10 +34,10 @@ - bin_PROGRAMS = gsl-randist gsl-histogram - - gsl_randist_SOURCES = gsl-randist.c --gsl_randist_LDADD = libgsl.la cblas/libgslcblas.la -+gsl_randist_LDADD = libgsl.la - - gsl_histogram_SOURCES = gsl-histogram.c --gsl_histogram_LDADD = libgsl.la cblas/libgslcblas.la -+gsl_histogram_LDADD = libgsl.la - - check_SCRIPTS = test_gsl_histogram.sh pkgconfig.test - TESTS = test_gsl_histogram.sh pkgconfig.test -@@ -57,6 +56,8 @@ - -e 's|@GSL_CFLAGS[@]|$(GSL_CFLAGS)|g' \ - -e 's|@GSL_LIBM[@]|$(GSL_LIBM)|g' \ - -e 's|@GSL_LIBS[@]|$(GSL_LIBS)|g' \ -+ -e 's|@CBLAS_CFLAGS[@]|$(CBLAS_CFLAGS)|g' \ -+ -e 's|@CBLAS_LIBS[@]|$(CBLAS_LIBS)|g' \ - -e 's|@LIBS[@]|$(LIBS)|g' \ - -e 's|@VERSION[@]|$(VERSION)|g' - -diff -Nur gsl-1.15.orig/multifit/Makefile.am gsl-1.15/multifit/Makefile.am ---- gsl-1.15.orig/multifit/Makefile.am 2011-07-28 22:15:49.000000000 +0100 -+++ gsl-1.15/multifit/Makefile.am 2011-07-28 22:16:03.000000000 +0100 -@@ -13,8 +13,8 @@ - TESTS = $(check_PROGRAMS) - - test_SOURCES = test.c --test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la -+test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la - - #demo_SOURCES = demo.c --#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la -+#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la - -diff -Nur gsl-1.15.orig/multimin/Makefile.am gsl-1.15/multimin/Makefile.am ---- gsl-1.15.orig/multimin/Makefile.am 2011-07-28 22:15:49.000000000 +0100 -+++ gsl-1.15/multimin/Makefile.am 2011-07-28 22:16:03.000000000 +0100 -@@ -13,8 +13,8 @@ - TESTS = $(check_PROGRAMS) - - test_SOURCES = test.c test_funcs.c test_funcs.h --test_LDADD = libgslmultimin.la ../min/libgslmin.la ../poly/libgslpoly.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+test_LDADD = libgslmultimin.la ../min/libgslmin.la ../poly/libgslpoly.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - - #demo_SOURCES = demo.c --#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - -diff -Nur gsl-1.15.orig/multiroots/Makefile.am gsl-1.15/multiroots/Makefile.am ---- gsl-1.15.orig/multiroots/Makefile.am 2011-07-28 22:15:49.000000000 +0100 -+++ gsl-1.15/multiroots/Makefile.am 2011-07-28 22:16:03.000000000 +0100 -@@ -15,5 +15,5 @@ - TESTS = $(check_PROGRAMS) - - test_SOURCES = test.c test_funcs.c test_funcs.h --test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - -diff -Nur gsl-1.15.orig/ode-initval/Makefile.am gsl-1.15/ode-initval/Makefile.am ---- gsl-1.15.orig/ode-initval/Makefile.am 2011-07-28 22:15:49.000000000 +0100 -+++ gsl-1.15/ode-initval/Makefile.am 2011-07-28 22:16:03.000000000 +0100 -@@ -12,7 +12,7 @@ - - TESTS = $(check_PROGRAMS) - --test_LDADD = libgslodeiv.la ../linalg/libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../permutation/libgslpermutation.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+test_LDADD = libgslodeiv.la ../linalg/libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../permutation/libgslpermutation.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - - test_SOURCES = test.c - -diff -Nur gsl-1.15.orig/poly/Makefile.am gsl-1.15/poly/Makefile.am ---- gsl-1.15.orig/poly/Makefile.am 2011-07-28 22:15:49.000000000 +0100 -+++ gsl-1.15/poly/Makefile.am 2011-07-28 22:16:03.000000000 +0100 -@@ -10,7 +10,7 @@ - - TESTS = $(check_PROGRAMS) - --check_PROGRAMS = test -+#check_PROGRAMS = test - - test_SOURCES = test.c - test_LDADD = libgslpoly.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -diff -Nur gsl-1.15.orig/specfunc/Makefile.am gsl-1.15/specfunc/Makefile.am ---- gsl-1.15.orig/specfunc/Makefile.am 2011-07-28 22:15:49.000000000 +0100 -+++ gsl-1.15/specfunc/Makefile.am 2011-07-28 22:16:03.000000000 +0100 -@@ -12,7 +12,7 @@ - - check_PROGRAMS = test - --test_LDADD = libgslspecfunc.la ../eigen/libgsleigen.la ../linalg/libgsllinalg.la ../sort/libgslsort.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+test_LDADD = libgslspecfunc.la ../eigen/libgsleigen.la ../linalg/libgsllinalg.la ../sort/libgslsort.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - - test_SOURCES = test_sf.c test_sf.h test_airy.c test_bessel.c test_coulomb.c test_dilog.c test_gamma.c test_hyperg.c test_legendre.c test_mathieu.c - -diff -Nur gsl-1.15.orig/wavelet/Makefile.am gsl-1.15/wavelet/Makefile.am ---- gsl-1.15.orig/wavelet/Makefile.am 2011-07-28 22:15:49.000000000 +0100 -+++ gsl-1.15/wavelet/Makefile.am 2011-07-28 22:16:03.000000000 +0100 -@@ -10,7 +10,7 @@ - - TESTS = $(check_PROGRAMS) - --test_LDADD = libgslwavelet.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+test_LDADD = libgslwavelet.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - - test_SOURCES = test.c - diff --git a/sci-libs/gsl/gsl-1.15.ebuild b/sci-libs/gsl/gsl-1.15.ebuild deleted file mode 100644 index 5fad25b5..00000000 --- a/sci-libs/gsl/gsl-1.15.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=4 - -inherit eutils flag-o-matic autotools toolchain-funcs - -DESCRIPTION="The GNU Scientific Library" -HOMEPAGE="http://www.gnu.org/software/gsl/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="cblas-external static-libs" - -RDEPEND="cblas-external? ( virtual/cblas )" -DEPEND="${RDEPEND} - app-eselect/eselect-cblas - virtual/pkgconfig" - -DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO ) - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]]; then - # prevent to use external cblas from a previously installed gsl - local current_lib - if use cblas-external; then - current_lib=$(eselect cblas show | cut -d' ' -f2) - if [[ ${current_lib} == gsl ]]; then - ewarn "USE flag cblas-external is set: linking gsl with an external cblas." - ewarn "However the current selected external cblas is gsl." - ewarn "Please install and/or eselect another cblas" - die "Circular gsl dependency" - fi - fi - fi -} - -pkg_setup() { - ESELECT_PROF="gsl" - - if [[ ${MERGE_TYPE} != binary ]]; then - # bug 349005 - [[ $(tc-getCC)$ == *gcc* ]] && \ - [[ $(tc-getCC)$ != *apple* ]] && \ - [[ $(gcc-major-version)$(gcc-minor-version) -eq 44 ]] \ - && filter-mfpmath sse - filter-flags -ffast-math - fi -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-cblas.patch - eautoreconf - - cp "${FILESDIR}"/eselect.cblas.gsl "${T}"/ - sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.cblas.gsl || die - if [[ ${CHOST} == *-darwin* ]] ; then - sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \ - "${T}"/eselect.cblas.gsl || die - fi -} - -src_configure() { - if use cblas-external; then - export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)" - export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)" - fi - econf \ - --enable-shared \ - $(use_with cblas-external cblas) \ - $(use_enable static-libs static) -} - -src_install() { - default - - find "${ED}" -name '*.la' -exec rm -f {} + - - # take care of pkgconfig file for cblas implementation. - sed -e "s/@LIBDIR@/$(get_libdir)/" \ - -e "s/@PV@/${PV}/" \ - -e "/^prefix=/s:=:=${EPREFIX}:" \ - -e "/^libdir=/s:=:=${EPREFIX}:" \ - "${FILESDIR}"/cblas.pc.in > cblas.pc \ - || die "sed cblas.pc failed" - insinto /usr/$(get_libdir)/blas/gsl - doins cblas.pc || die "installing cblas.pc failed" - eselect cblas add $(get_libdir) "${T}"/eselect.cblas.gsl \ - ${ESELECT_PROF} -} - -pkg_postinst() { - local p=cblas - local current_lib=$(eselect ${p} show | cut -d' ' -f2) - if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then - # work around eselect bug #189942 - local configfile="${EROOT}"/etc/env.d/${p}/$(get_libdir)/config - [[ -e ${configfile} ]] && rm -f ${configfile} - eselect ${p} set ${ESELECT_PROF} - elog "${p} has been eselected to ${ESELECT_PROF}" - else - elog "Current eselected ${p} is ${current_lib}" - elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):" - elog "\t eselect ${p} set ${ESELECT_PROF}" - fi -} diff --git a/sci-libs/gsl/metadata.xml b/sci-libs/gsl/metadata.xml deleted file mode 100644 index 7ab2ed03..00000000 --- a/sci-libs/gsl/metadata.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>sci</herd> - <longdescription lang="en"> - The GNU Scientific Library (GSL) is a collection of routines for - numerical analysis. The routines are written from scratch by the GSL - team in C, and present a modern API for C programmers, while allowing - wrappers to be written for very high level languages. - - GSL includes data types and routines for complex numbers, vectors, - matrices, basic linear algebra subroutines (BLAS), eigensystems, - simulated annealing, minimization, root finding, pseudo-random - numbers, least-squares fitting, fast Fourier transforms (FFT), - differential equations, quadrature, Monte Carlo integration, special - functions, physical constants, and much more. -</longdescription> - <use> - <flag name="cblas-external">Link gsl with external cblas provided by - (<pkg>virtual/cblas</pkg>) instead of shipped internal version</flag> - </use> -</pkgmetadata> diff --git a/sys-auth/pambase/Manifest b/sys-auth/pambase/Manifest deleted file mode 100644 index 04effc7e..00000000 --- a/sys-auth/pambase/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST pambase-20120417.tar.bz2 3361 SHA256 3fde3ff7714b3722b45545da36fdde6ca95a55d1b0a8cfb23666ec0de3ec5871 SHA512 7a666eb67f6484e536ecb070402036bcfdd137aced27df3f08b136d06eee5c13a6dc14aa93ea09e94c7f31e5a98db97dbaccd0c46af24b57028247de3a7cd9fe WHIRLPOOL 323edb9ef488a0ba562ef279d4acfb682540bf87838be9a3319ad2029ba1465d015fdf94c3192e24517ae9f0ed264e38d17aba65934211bd7b39bf309ee12540 diff --git a/sys-auth/pambase/files/pambase-20120417-drop-motd-for-now.patch b/sys-auth/pambase/files/pambase-20120417-drop-motd-for-now.patch deleted file mode 100644 index 3543c640..00000000 --- a/sys-auth/pambase/files/pambase-20120417-drop-motd-for-now.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- pambase-20120417.orig/system-login.in -+++ pambase-20120417/system-login.in -@@ -56,9 +56,6 @@ session optional pam_gnome_keyring.so a - #if HAVE_SELINUX - session required pam_selinux.so multiple open - #endif --#if HAVE_MOTD --session optional pam_motd.so motd=/etc/motd --#endif - #if HAVE_MAIL - session optional pam_mail.so - #endif diff --git a/sys-auth/pambase/files/pambase-20120417-lastlog-silent.patch b/sys-auth/pambase/files/pambase-20120417-lastlog-silent.patch deleted file mode 100644 index 79266a74..00000000 --- a/sys-auth/pambase/files/pambase-20120417-lastlog-silent.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- pambase-20120417/login.in.orig 2012-11-21 14:31:49.031948988 +0100 -+++ pambase-20120417/login.in 2012-11-21 14:32:41.172330601 +0100 -@@ -3,4 +3,6 @@ - - account include system-local-login - password include system-local-login -+ -+session optional pam_lastlog.so DEBUG - session include system-local-login ---- pambase-20120417/system-login.in.orig 2012-11-21 14:31:42.232160039 +0100 -+++ pambase-20120417/system-login.in 2012-11-21 14:35:20.738025880 +0100 -@@ -41,7 +41,7 @@ - session required pam_env.so DEBUG - #endif - #if HAVE_LASTLOG --session optional pam_lastlog.so DEBUG -+session optional pam_lastlog.so silent DEBUG - #endif - session include system-auth - #if HAVE_CONSOLEKIT diff --git a/sys-auth/pambase/files/pambase-20120417-systemd-2.patch b/sys-auth/pambase/files/pambase-20120417-systemd-2.patch deleted file mode 100644 index 047fb41c..00000000 --- a/sys-auth/pambase/files/pambase-20120417-systemd-2.patch +++ /dev/null @@ -1,29 +0,0 @@ -http://bugs.gentoo.org/372229 - ---- Makefile -+++ Makefile -@@ -28,6 +28,10 @@ - PAMFLAGS += -DHAVE_CONSOLEKIT=1 - endif - -+ifeq "$(SYSTEMD)" "yes" -+PAMFLAGS += -DHAVE_SYSTEMD=1 -+endif -+ - ifeq "$(GNOME_KEYRING)" "yes" - PAMFLAGS += -DHAVE_GNOME_KEYRING=1 - endif ---- system-login.in -+++ system-login.in -@@ -45,7 +45,10 @@ - #endif - session include system-auth - #if HAVE_CONSOLEKIT --session optional pam_ck_connector.so nox11 -+-session optional pam_ck_connector.so nox11 -+#endif -+#if HAVE_SYSTEMD -+-session optional pam_systemd.so - #endif - #if HAVE_GNOME_KEYRING - session optional pam_gnome_keyring.so auto_start diff --git a/sys-auth/pambase/metadata.xml b/sys-auth/pambase/metadata.xml deleted file mode 100644 index 7a357751..00000000 --- a/sys-auth/pambase/metadata.xml +++ /dev/null @@ -1,84 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>pam</herd> - <maintainer> - <email>pam-bugs@gentoo.org</email> - </maintainer> - <use> - <flag name="cracklib"> - Enable pam_cracklib module on system authentication stack. This - produces warnings when changing password to something easily - crackable. It requires the same USE flag to be enabled on - <pkg>sys-libs/pam</pkg> or system login might be impossible. - </flag> - <flag name="consolekit"> - Enable pam_ck_connector module on local system logins. This - allows for console logins to make use of ConsoleKit - authorization. - </flag> - <flag name="systemd"> - Use pam_systemd module to register user sessions in the systemd - control group hierarchy. - </flag> - <flag name="gnome-keyring"> - Enable pam_gnome_keyring module on system login stack. This - enables proper Gnome Keyring access to logins, whether they are - done with the login shell, a Desktop Manager or a remote login - systems such as SSH. - </flag> - <flag name="debug"> - Enable debug information logging on syslog(3) for all the - modules supporting this in the system authentication and system - login stacks. - </flag> - <flag name="passwdqc"> - Enable pam_passwdqc module on system auth stack for password - quality validation. This is an alternative to pam_cracklib - producing warnings, rejecting or providing example passwords - when changing your system password. It is used by default by - OpenWall GNU/*/Linux and by FreeBSD. - </flag> - <flag name="mktemp"> - Enable pam_mktemp module on system auth stack for session - handling. This module creates a private temporary directory for - the user, and sets TMP and TMPDIR accordingly. - </flag> - <flag name="pam_ssh"> - Enable pam_ssh module on system auth stack for authentication - and session handling. This module will accept as password the - passphrase of a private SSH key (one of ~/.ssh/id_rsa, - ~/.ssh/id_dsa or ~/.ssh/identity), and will spawn an ssh-agent - instance to cache the open key. - </flag> - <flag name="sha512"> - Switch Linux-PAM's pam_unix module to use sha512 for passwords - hashes rather than MD5. This option requires - <pkg>>=sys-libs/pam-1.0.1</pkg> built against - <pkg>>=sys-libs/glibc-2.7</pkg>, if it's built against an - earlier version, it will silently be ignored, and MD5 hashes - will be used. All the passwords changed after this USE flag is - enabled will be saved to the shadow file hashed using SHA512 - function. The password previously saved will be left - untouched. Please note that while SHA512-hashed passwords will - still be recognised if the USE flag is removed, the shadow file - will not be compatible with systems using an earlier glibc - version. - </flag> - <flag name="pam_krb5"> - Enable pam_krb5 module on system auth stack, as an alternative - to pam_unix. If Kerberos authentication succeed, only pam_unix - will be ignore, and all the other modules will proceed as usual, - including Gnome Keyring and other session modules. It requires - <pkg>sys-libs/pam</pkg> as PAM implementation. - </flag> - <flag name="minimal"> - Disables the standard PAM modules that provide extra information - to users on login; this includes pam_tally (and pam_tally2 for - Linux PAM 1.1 and later), pam_lastlog, pam_motd and other - similar modules. This might not be a good idea on a multi-user - system but could reduce slightly the overhead on single-user - non-networked systems. - </flag> - </use> -</pkgmetadata> diff --git a/sys-auth/pambase/pambase-20120417-r5.ebuild b/sys-auth/pambase/pambase-20120417-r5.ebuild deleted file mode 100644 index fe791970..00000000 --- a/sys-auth/pambase/pambase-20120417-r5.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=4 -inherit eutils - -DESCRIPTION="PAM base configuration files" -HOMEPAGE="http://www.gentoo.org/proj/en/base/pam/" -SRC_URI="http://dev.gentoo.org/~flameeyes/${PN}/${P}.tar.bz2 - http://dev.gentoo.org/~phajdan.jr/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -sparc-fbsd -x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux" -IUSE="consolekit cracklib debug minimal mktemp pam_krb5 pam_ssh passwdqc selinux +sha512 systemd" - -RESTRICT=binchecks - -MIN_PAM_REQ=1.1.3 - -RDEPEND=" - || ( - >=sys-libs/pam-${MIN_PAM_REQ} - ( sys-auth/openpam || ( sys-freebsd/freebsd-pam-modules sys-netbsd/netbsd-pam-modules ) ) - ) - consolekit? ( sys-auth/consolekit[pam] ) - cracklib? ( >=sys-libs/pam-${MIN_PAM_REQ}[cracklib] ) - mktemp? ( sys-auth/pam_mktemp ) - pam_krb5? ( - >=sys-libs/pam-${MIN_PAM_REQ} - >=sys-auth/pam_krb5-4.3 - ) - pam_ssh? ( sys-auth/pam_ssh ) - passwdqc? ( >=sys-auth/pam_passwdqc-1.0.4 ) - selinux? ( >=sys-libs/pam-${MIN_PAM_REQ}[selinux] ) - sha512? ( >=sys-libs/pam-${MIN_PAM_REQ} ) - !<sys-apps/shadow-4.1.5-r1 - !<sys-freebsd/freebsd-pam-modules-6.2-r1 - !<sys-libs/pam-0.99.9.0-r1" -DEPEND="app-portage/portage-utils" - -src_prepare() { - epatch "${FILESDIR}"/${P}-systemd-2.patch - epatch "${FILESDIR}"/${P}-lastlog-silent.patch - # Drop pam_motd for now, since it breaks DEs autologin - epatch "${FILESDIR}"/${P}-drop-motd-for-now.patch -} - -src_compile() { - local implementation= - local linux_pam_version= - if has_version sys-libs/pam; then - implementation=linux-pam - local ver_str=$(qatom `best_version sys-libs/pam` | cut -d ' ' -f 3) - linux_pam_version=$(printf "0x%02x%02x%02x" ${ver_str//\./ }) - elif has_version sys-auth/openpam; then - implementation=openpam - else - die "PAM implementation not identified" - fi - - use_var() { - local varname=$(echo $1 | tr [a-z] [A-Z]) - local usename=${2-$(echo $1 | tr [A-Z] [a-z])} - local varvalue=$(usex $usename) - echo "${varname}=${varvalue}" - } - - emake \ - GIT=true \ - $(use_var debug) \ - $(use_var cracklib) \ - $(use_var passwdqc) \ - $(use_var selinux) \ - $(use_var mktemp) \ - $(use_var PAM_SSH pam_ssh) \ - $(use_var sha512) \ - $(use_var KRB5 pam_krb5) \ - $(use_var minimal) \ - $(use_var consolekit) \ - GNOME_KEYRING=yes \ - SYSTEMD=yes \ - IMPLEMENTATION=${implementation} \ - LINUX_PAM_VERSION=${linux_pam_version} -} - -src_test() { :; } - -src_install() { - emake GIT=true DESTDIR="${ED}" install -} - -pkg_postinst() { - if use sha512; then - elog "Starting from version 20080801, pambase optionally enables" - elog "SHA512-hashed passwords. For this to work, you need sys-libs/pam-1.0.1" - elog "built against sys-libs/glibc-2.7 or later." - elog "If you don't have support for this, it will automatically fallback" - elog "to MD5-hashed passwords, just like before." - elog - elog "Please note that the change only affects the newly-changed passwords" - elog "and that SHA512-hashed passwords will not work on earlier versions" - elog "of glibc or Linux-PAM." - fi -} diff --git a/sys-devel/ucpp/ChangeLog b/sys-devel/ucpp/ChangeLog deleted file mode 100644 index f3ea73b2..00000000 --- a/sys-devel/ucpp/ChangeLog +++ /dev/null @@ -1,24 +0,0 @@ -# ChangeLog for sys-devel/ucpp -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/ucpp/ChangeLog,v 1.4 2012/11/21 16:37:13 scarabeus Exp $ - -*ucpp-1.3.3 (21 Nov 2012) - - 21 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> +ucpp-1.3.3.ebuild, - ucpp-1.3.ebuild, ucpp-9999.ebuild: - Version bump to release version i tagged. - -*ucpp-9999 (24 Sep 2012) - - 24 Sep 2012; Tomáš Chvátal <scarabeus@gentoo.org> +ucpp-9999.ebuild, - metadata.xml: - Add ucpp live ebuild as this will be required by lo 3.7. - - 02 Aug 2011; Alexey Shvetsov <alexxy@gentoo.org> ucpp-1.3.ebuild: - Add ~amd64-linux keyword - -*ucpp-1.3 (28 Jul 2011) - - 28 Jul 2011; Alexey Shvetsov <alexxy@gentoo.org> +ucpp-1.3.ebuild, - +files/tune.h.patch, +metadata.xml: - Initial import to tree diff --git a/sys-devel/ucpp/Manifest b/sys-devel/ucpp/Manifest deleted file mode 100644 index f035f513..00000000 --- a/sys-devel/ucpp/Manifest +++ /dev/null @@ -1,8 +0,0 @@ -AUX tune.h.patch 723 SHA256 27bdbc0e81ba1c60b4f069b6a05eedb44445d4768b2a5808e53117a7ed7e7871 SHA512 04fe5d91c22774df447a8c46955c864756d5e9538e94595943647d88b0044f4211be389f97472fad90a10f6c10e673c826dc585e480b33f7bce443defc186119 WHIRLPOOL 4ef22d4111a28cbd87a0c2ff895096a8bd27a2d6fff56c063642524825f114e4156a1ea7f5e527b4100bdf02b7a403d573fb5b6d1edb82b545a2f7e6d9faa1ac -DIST ucpp-1.3.3.tar.xz 274608 SHA256 4e9525477ca90f8ad6bf1ba3a0c08858a99d5e4d206cd72e3242f6918ddee754 SHA512 4ebef29a82a015a7f1a86fc213197f5c17ffcd378da48374e3066755a155848f0af738827c026aa820b2c1a5a5f086a984450429630c0e883ce70cd0c31d406e WHIRLPOOL a9e826c065d1c5760be9d8fe863b0371624c885c1b6e0d78960c488a90a4da75194e377f13935fc12f7cfb4f4d5c8c9ea2996bf393d8f62c53d0340899a8d5ec -DIST ucpp-1.3.tar.bz2 73958 SHA256 d0a51c20040385b143f15fc08eefec6119773fb07232a14c08bbb49cb1c5f1fa -EBUILD ucpp-1.3.3.ebuild 657 SHA256 e7b14742dcff6bc462257d6cadb216344b28d9759b2c9b57986a5e0353eacfc1 SHA512 d0232b1cb9b6d7c5deac3d95c43642074d275f57263149424274a925e1d37c57d26c925a253a3287a3dc27183499afd1c4e08de6bd92b85966a58300891aabba WHIRLPOOL a29eb4e64885d79631ae13f053ed9e34c9addcde9c24ed98a06d155227e04b303597a96a8b75affae8532f6a32f0ce5984281c1cbaa20e586483eaa51d372a69 -EBUILD ucpp-1.3.ebuild 770 SHA256 2bc5cb06972775cfaa593bdc6fd14d83f0bc0dba93533014f7a85b1e267cbef7 SHA512 4c45a709e67a8b33fcb8314e3d8d39b38bc3623b1e45958ca36b840cbb1e7069fce54cb5f07a73dfb6e27a111b63ed5a40c1352b270cb80646273e7d3d6e3488 WHIRLPOOL 4f1d062dc7fad3df494704fcd750c04a85f212506293be374ed14affdee82d8f693473d5241fe5457e7d14e30ddd47e486655f23592cb70069516029440a6d5b -EBUILD ucpp-9999.ebuild 690 SHA256 f3f1f30d38433b34adf7cf6235819f348511833c1c8d1d5326e3c67dbda737a7 SHA512 22eb4a4a74f13797166209819ba0434bf21e8b759f014ec51ddf3d07c400a567828169edb8d725293946fbed0a6288c9f744058d0368a8272a8fdeecec2a9019 WHIRLPOOL e2261fd54ed193873a0988fe2c63fba86d02c11560151a354d06ac77650357388a560e27e38da5210fb8d0732eb6514443aeed0d59287c1ba848ea4fb3ee7a95 -MISC ChangeLog 817 SHA256 4e84c696c63d61e65e3f0ca545343c4cc1a80fdbcd1d06207cb7e6c10069b7f8 SHA512 8f44194bc4be723b5f76d2c3694d4ad8ad6cbcde2f99d271642085c83bbefbdc4ddab27bb2af1c24dca98d47c4b8a11ae32bc65d091dd414531ec5573f54a044 WHIRLPOOL 9a56dce9229307db900b371c3025e0037f885b8a332e75566a222f79493a4171863b3cc1432a215e8b80bfc28cf5f40623f95d07642262869c48582782a9150a -MISC metadata.xml 182 SHA256 b9c161e3f05dbaa2157c1aaece681f28c1d81b251e79923f9f9326d1523c0509 SHA512 82aa50dbb9bce1055ffcbc266becd01f97441ec698dea4f713e82664dadc30ed735d7bf47cb1e4ee9d97d4ab0f37cf559d027a1c86bf2e1d9249b538048c7942 WHIRLPOOL 33747b74de9fa24c064a98d4165f62ee8ec35576da63977e1f78fb9d3dac559350cc0044dfc01b73bca926e20e731662e571a5cc481caf37df58c4462b1c31b2 diff --git a/sys-devel/ucpp/files/tune.h.patch b/sys-devel/ucpp/files/tune.h.patch deleted file mode 100644 index 7455dd24..00000000 --- a/sys-devel/ucpp/files/tune.h.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- tune.h 2008-10-01 19:15:41.000000000 +0200 -+++ tune.h.new 2009-03-22 11:59:42.000000000 +0100 -@@ -281,10 +281,10 @@ - * - * If you want no standard assertion, define STD_ASSERT to 0. - */ --/* -+ - #define STD_ASSERT "cpu(i386)", "machine(i386)", "system(unix)", \ - "system(freebsd)" --*/ -+ - - /* ====================================================================== */ - /* -@@ -293,10 +293,10 @@ - * Each string must be either "name" or "name=token-list". If you want - * no predefined macro, define STD_MACROS to 0. - */ --/* -+ - #define STD_MACROS "__FreeBSD=4", "__unix", "__i386", \ - "__FreeBSD__=4", "__unix__", "__i386__" --*/ -+ - - /* ====================================================================== */ - /* diff --git a/sys-devel/ucpp/metadata.xml b/sys-devel/ucpp/metadata.xml deleted file mode 100644 index 94f0af23..00000000 --- a/sys-devel/ucpp/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>openoffice</herd> - <herd>sci</herd> -</pkgmetadata> diff --git a/sys-devel/ucpp/ucpp-1.3.3.ebuild b/sys-devel/ucpp/ucpp-1.3.3.ebuild deleted file mode 100644 index df585406..00000000 --- a/sys-devel/ucpp/ucpp-1.3.3.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/ucpp/ucpp-1.3.3.ebuild,v 1.1 2012/11/21 16:37:12 scarabeus Exp $ - -EAPI=5 - -inherit eutils - -DESCRIPTION="A quick and light preprocessor, but anyway fully compliant to C99" -HOMEPAGE="http://code.google.com/p/ucpp/" -SRC_URI="http://dev.gentooexperimental.org/~scarabeus/${P}.tar.xz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux" -IUSE="static-libs" - -src_configure() { - econf \ - --disable-werror \ - $(use_enable static-libs static) -} - -src_install() { - default - - prune_libtool_files --all -} diff --git a/sys-devel/ucpp/ucpp-1.3.ebuild b/sys-devel/ucpp/ucpp-1.3.ebuild deleted file mode 100644 index 5cdb83e0..00000000 --- a/sys-devel/ucpp/ucpp-1.3.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/ucpp/ucpp-1.3.ebuild,v 1.3 2012/11/21 16:37:12 scarabeus Exp $ - -EAPI="2" - -inherit eutils toolchain-funcs - -DESCRIPTION="A quick and light preprocessor, but anyway fully compliant to C99" -HOMEPAGE="http://code.google.com/p/ucpp/" -SRC_URI="mirror://gentoo/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux" -IUSE="" - -src_prepare() { - epatch "${FILESDIR}"/tune.h.patch -} - -src_compile() { - emake \ - FLAGS="${CFLAGS} -DSTAND_ALONE" \ - CC=$(tc-getCC) \ - STAND_ALONE="-DSTAND_ALONE" || die -} - -src_install() { - dolib.a lib${PN}.a || die - doman ${PN}.1 || die - dobin ${PN} || die - dodoc README || die -} diff --git a/sys-devel/ucpp/ucpp-9999.ebuild b/sys-devel/ucpp/ucpp-9999.ebuild deleted file mode 100644 index 1743b604..00000000 --- a/sys-devel/ucpp/ucpp-9999.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/ucpp/ucpp-9999.ebuild,v 1.2 2012/11/21 16:37:12 scarabeus Exp $ - -EAPI=5 - -EGIT_REPO_URI="git://github.com/scarabeusiv/ucpp.git" -inherit eutils git-2 autotools - -DESCRIPTION="A quick and light preprocessor, but anyway fully compliant to C99" -HOMEPAGE="http://code.google.com/p/ucpp/" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="" -IUSE="static-libs" - -src_prepare() { - eautoreconf -} - -src_configure() { - econf \ - --prefix=/opt/ucpp \ - --disable-werror \ - $(use_enable static-libs static) -} - -src_install() { - default - - prune_libtool_files --all - die -} diff --git a/sys-devel/ucpp/ucpp/ChangeLog b/sys-devel/ucpp/ucpp/ChangeLog deleted file mode 100644 index f3ea73b2..00000000 --- a/sys-devel/ucpp/ucpp/ChangeLog +++ /dev/null @@ -1,24 +0,0 @@ -# ChangeLog for sys-devel/ucpp -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/ucpp/ChangeLog,v 1.4 2012/11/21 16:37:13 scarabeus Exp $ - -*ucpp-1.3.3 (21 Nov 2012) - - 21 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> +ucpp-1.3.3.ebuild, - ucpp-1.3.ebuild, ucpp-9999.ebuild: - Version bump to release version i tagged. - -*ucpp-9999 (24 Sep 2012) - - 24 Sep 2012; Tomáš Chvátal <scarabeus@gentoo.org> +ucpp-9999.ebuild, - metadata.xml: - Add ucpp live ebuild as this will be required by lo 3.7. - - 02 Aug 2011; Alexey Shvetsov <alexxy@gentoo.org> ucpp-1.3.ebuild: - Add ~amd64-linux keyword - -*ucpp-1.3 (28 Jul 2011) - - 28 Jul 2011; Alexey Shvetsov <alexxy@gentoo.org> +ucpp-1.3.ebuild, - +files/tune.h.patch, +metadata.xml: - Initial import to tree |