diff options
| author |   Ian Delaney <idella4@gentoo.org> | 2015-12-13 17:59:05 +0800 |
|---|---|---|
| committer | Ian Delaney <idella4@gentoo.org> | 2015-12-13 19:19:41 +0800 |
| commit | d82f5af3f983333786e8fccdb16fedd61e61d6b9 (patch) | |
| tree | bfce15d1c79b6d724a084d7360d3f6faca37f685 | |
| parent | media-gfx/pinta: rebump to vn. 1.6-r1 (diff) | |
| parent | app-arch/rar: remove 5.1.0 (diff) | |
| download | gentoo-d82f5af3f983333786e8fccdb16fedd61e61d6b9.tar.gz gentoo-d82f5af3f983333786e8fccdb16fedd61e61d6b9.tar.bz2 gentoo-d82f5af3f983333786e8fccdb16fedd61e61d6b9.zip | |
Merge remote-tracking branch 'remotes/Elizafox/master'
Pull request: https://github.com/gentoo/gentoo/pull/466
105 files changed, 1979 insertions, 2427 deletions
diff --git a/app-arch/rar/Manifest b/app-arch/rar/Manifest index 61551f394987..7f3c3b602d98 100644 --- a/app-arch/rar/Manifest +++ b/app-arch/rar/Manifest @@ -1,9 +1,6 @@ -DIST rarlinux-5.1.0.tar.gz 1103841 SHA256 586ba2671ace61f2d56fe85e54710b6a588cd9f87f95030b81d9b2aff2292636 SHA512 affe60f9865ad172bb8053af50e977afbb70a43e0cfeefb4e9d6924f2d9718670662a24770e46cf990715d9841ae3387d2c30522075f5cde97a05a2b0da23f22 WHIRLPOOL 9e957ff470130e40d05c2c80064ea39fa5c2fbb3c3ce85381bf9d3c8bac7487e10ab773c2752c8b7cb38906c8792c4b23bb96cd2fe22fdb7f2f764a274d5d2be DIST rarlinux-5.2.1.tar.gz 1109839 SHA256 dafe2deb46d0a9cc99b5f4e7204913051d4a2010e08311a0d3565050bd74026f SHA512 bb7ad791f5a34b8d48008a75f9d8008237f36261be6e722d8fdf97a19e70e444c42232544ac63514c354e1d173260dcb635024f72c77afff172f326a137ef21c WHIRLPOOL 6ee7d38bac0c158f0ab6b534544dd7fcd3bf3459219790d2f05ae60df86e7502ca8211580035d62279e99bd427577c4a79bd2eca6e1b99dc2dfde679a07537ec DIST rarlinux-5.3.0.tar.gz 1114667 SHA256 7638f20ba68a49e9d9b3b247d9922f3d36c248eaa2e784bd2f0fad0aa1fd7ba8 SHA512 b2eb9831cac88f7f72a169c081a35fc688aa82a5e80cf681440b38f7d5f7691511ca1b85960b3949668faa4c1fe0921fb170d7a1ffb52d77db124fd073f1516b WHIRLPOOL 42ee7ef6f4a186b6284490e04378d24fcdbdea2406724137522ce2c18ebc62f8321e7092673ce4ea3e917b0ea393145b8f496ba06e780bdf2526b3223d5474aa -DIST rarlinux-x64-5.1.0.tar.gz 1139386 SHA256 8c04474201179cc3d3a4f3d1aa7bdd6ee3244479aa16371d2449cf416f882299 SHA512 76b1bf5f7cfc950415d3b9295b010766d1caf7207b86eae00edaf325898e7934909982658c6bc7d113dcc2dbcd7fdb40dc02dddeca63cbc90d69950fde426bb7 WHIRLPOOL 0fa10a995777a2aad7575b2842d5e82c741de9458fd9349c21cb3c8842a260ebc1b8480451c287239a6047b543330279f63fc3a6ac9b0517629997e70ba246dd DIST rarlinux-x64-5.2.1.tar.gz 1145110 SHA256 54015e921bf2789ca90afdf913c5a5d57db612bfdbf33eedae7b068aa1016a2d SHA512 fe0f866aa7437608e60d3d760263aa2428d7154f0574140008d19a088b6968b06a02d056bd6e9f1b30f4b06c5fd447bf8383bd823d958c6676cd7d835f14de2c WHIRLPOOL b82f153a9aa1e239e2b1e137c71005ce812ce446911e9f62c43609a810cfb86874aa7137698b7a79326d693d4571da20df19973206412be429f1b593908fa86e DIST rarlinux-x64-5.3.0.tar.gz 1149037 SHA256 8075b01d29ba0fc0c927f08e2a1b2149921bdb42c9457b7a7ef0950e387b5131 SHA512 3391db53adcdc355b6c58843a59f17a0adc2abc874ba8828cb985f27d33d27804d6a8c4db642fbef6a09d513858a6b507f6b49f9097a499d800f4cdd953f1f3e WHIRLPOOL b450bf85d36627c0b03be1523cdee980ac771ea5acd9786264fc10efd8473b1cec031dec57d1b1f345ea601fed94f0505d300d106800076c20bc97a437b6fd26 -DIST winrar-x64-510.exe 1915800 SHA256 3dad374e0a3b38e5629e8e9d591c77e73199e7714fef2cfb651a133e843971ed SHA512 a7d723ca45d376fe1b003be0ccd0477e51b057784ee14feeb78727207c390a9e31efe481eb998f316ea27f33298b0235690eed71242fa4f591603f3cc7238f20 WHIRLPOOL 9a6992d1cf6e52f352199f037b410853134e77245cb758f641569c91e208a1f693f5a9eb0e0680763b5bd0539fca2bac55b8af13106957a40d32297b8078536e DIST winrar-x64-521.exe 1941744 SHA256 e315674d9e2f5f63977fb5fd8e8bcafcdc106594b83e7ba062c5bec24901a5d2 SHA512 b08be6ea9dcbd19ac3849045a18d59a968ade46bcdfe3c6451dbcb5856d294b9dbdb89b1d38dff1749b44c47dc47b4de519ae5561825f06498455ffec48c7822 WHIRLPOOL 4faf6f2379e8b589974bff8fbb4a8a9561d2d60473f7874c0bf163a8915e902d7550847bd808e32ace3f48cfc02246b07b69b50ed848881d84d59d0594fd2322 DIST winrar-x64-530.exe 1964912 SHA256 951b53d30aa7d40f5fd4720ddd7385d431ede0e18df496fcb9c255ee1520d668 SHA512 ebe7ba3e3bc36941a6cf4f27f00edfd62e2297fda6de64a3718da10f10c9a9510b1dea96e5d128602e3b4069e276c88f79914b535a0acb390158a620510501ca WHIRLPOOL ac463202b33f4130e45da5df85b47a0eaf268686aefb5bcd8b09da729f1348d000d513f8297c67520515321b0d6632a16d6ed23ccc73efbd18c605cb624981d1 diff --git a/app-arch/rar/rar-5.1.0.ebuild b/app-arch/rar/rar-5.1.0.ebuild deleted file mode 100644 index fbc5b1ef4829..000000000000 --- a/app-arch/rar/rar-5.1.0.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI=4 -MY_PV="${PV/0_beta/b}" -DESCRIPTION="RAR compressor/uncompressor" -HOMEPAGE="http://www.rarsoft.com/" -URI_x86="http://www.rarlab.com/rar/rarlinux-${MY_PV}.tar.gz" -URI_amd64="http://www.rarlab.com/rar/rarlinux-x64-${MY_PV}.tar.gz" -URI_w64="http://www.rarlab.com/rar/winrar-x64-${MY_PV//.}.exe" -SRC_URI="x86? ( ${URI_x86} ) - amd64? ( ${URI_amd64} ) - all_sfx? ( - ${URI_x86} - ${URI_amd64} - ${URI_w64} - )" - -LICENSE="RAR" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="all_sfx static" - -DEPEND="all_sfx? ( app-arch/unrar )" -RDEPEND="sys-libs/glibc" - -S=${WORKDIR}/${PN} - -QA_FLAGS_IGNORED="opt/rar/default.sfx - opt/rar/default-elf32.sfx - opt/rar/default-elf64.sfx - opt/rar/default-win32.sfx - opt/rar/default-win64.sfx - opt/rar/WinCon.SFX - opt/rar/WinCon64.SFX - opt/rar/Zip.SFX - opt/rar/Zip64.SFX - opt/rar/unrar - opt/rar/rar" -QA_PRESTRIPPED=${QA_FLAGS_IGNORED} - -src_unpack() { - use x86 && unpack ${URI_x86##*/} - use amd64 && unpack ${URI_amd64##*/} - rm -f "${S}"/license.txt - if use all_sfx ; then - mkdir sfx - cd sfx - unpack ${URI_x86##*/} - mv rar/default.sfx default-elf32.sfx || die - unpack ${URI_amd64##*/} - mv rar/default.sfx default-elf64.sfx || die - ln -s "${DISTDIR}"/${URI_w64##*/} w64.rar - unpack ./w64.rar - mv Default.SFX default-win32.sfx || die - mv Default64.SFX default-win64.sfx || die - fi -} - -src_compile() { :; } - -src_install() { - exeinto /opt/rar - doexe rar unrar || die - use static && { newexe rar_static rar || die ; } - - dodir /opt/bin - dosym ../rar/rar /opt/bin/rar || die - dosym ../rar/unrar /opt/bin/unrar || die - - insinto /opt/rar - if use all_sfx ; then - doins "${WORKDIR}"/sfx/*.{sfx,SFX} || die - else - doins default.sfx || die - fi - doins rarfiles.lst || die - dodoc *.txt -} diff --git a/app-misc/c_rehash/c_rehash-1.7-r1.ebuild b/app-misc/c_rehash/c_rehash-1.7-r1.ebuild index 6b3179a5d8c7..239e445ee2ff 100644 --- a/app-misc/c_rehash/c_rehash-1.7-r1.ebuild +++ b/app-misc/c_rehash/c_rehash-1.7-r1.ebuild @@ -10,7 +10,7 @@ SRC_URI="http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssl/openssl-c_ LICENSE="openssl" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux" IUSE="" RDEPEND="!<dev-libs/openssl-1.0.2d-r1:0" diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest index b333f7009109..351cd50348ab 100644 --- a/app-portage/eix/Manifest +++ b/app-portage/eix/Manifest @@ -6,3 +6,4 @@ DIST eix-0.30.8.tar.xz 559076 SHA256 525c5d0276b8d40de012668af36042ecb674175c3b9 DIST eix-0.31.1.tar.bz2 791116 SHA256 1402d474ee3d1dc6fcfe35508657629d4a5aef6cbe1913687fa65c8e139f3fdf SHA512 7fdd579f884f92bf58a876c89c4f397610c2af8da0c47382bf25b8d4919d1f24713fd8029ab82c73a9be382e51b1aac78476d006961620f12c0386fe864b6c22 WHIRLPOOL 3ea640ab80a6119497323312b4b527aa8060597ed09d29a43d68abf3ae20bafeb793c6df1890a2e433f5d77485b14dfa507795fc7e9e0d7e2b69dd16668c5aa8 DIST eix-0.31.2.tar.bz2 787190 SHA256 c03226d0971067561e931c0afe75878552a6178ede7326601c3a839b289c72d9 SHA512 61a7f58ba48030000bd4ca50575aec95ba7726c12d935bd1fa7a2b28440fbc66a272fc727bc6a2b7716e285d3b93b7a888cef017c66d8682f29e9388dc89a6a1 WHIRLPOOL d67ab5ee83ab74c895f5e7345b40a7313c1ad1a1a2af184f54e5481eed9f6134920c172fe1dcae0522b2d965832e76cfbe14020181d799eff04a1afc6938af64 DIST eix-0.31.3.tar.bz2 795783 SHA256 bc578fa28be43ec321054df6e4727f2dd4c09b1ca8e1e9b1d4ebe064bdd7f03c SHA512 f0f07fbcb0b8696d7e689fd322ba3475d4d10c2ba703981de7458cf5f37c7d06746fac753cc14a7fd0c434c9e284127a64f941bbad408ebc077807b8f33952bb WHIRLPOOL a00556d5a57ee665e327071580e63107c27df60b96690c8c249b15487867bbc720244d1926c3f54795f7d6bdb6348f09d7cbfbd29f52a43b4dc8e0994579f58b +DIST eix-0.31.4.tar.xz 579480 SHA256 87051338b523f07a734c3c07e30fe99b4ca85ed268df60a54aeed1b594e1b7d0 SHA512 1a43fd8a4686f6e6c3021fb67acaa9ac0b19baad539e10d0ebd3db38bfc6179ce4b1c91745f76f167c32e45f9164ed3f1a8129a9eb97d8bc3bd35027999c5dc2 WHIRLPOOL 0f3962b7b72b9c12d9e2b0561ab242ebfcc48161e259667ed0752d49d2419c7a6f801481b48522605d8aa20968c688f917b24a823009a8f5a9e780a845afaa09 diff --git a/app-portage/eix/eix-0.31.4.ebuild b/app-portage/eix/eix-0.31.4.ebuild new file mode 100644 index 000000000000..8715cf5588b3 --- /dev/null +++ b/app-portage/eix/eix-0.31.4.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PLOCALES="de ru" +inherit bash-completion-r1 eutils l10n + +DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays and more" +HOMEPAGE="https://github.com/vaeth/eix/" +SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris" +IUSE="debug +dep doc nls optimization security strong-optimization strong-security sqlite swap-remote tools" + +BOTHDEPEND="sqlite? ( >=dev-db/sqlite-3 ) + nls? ( virtual/libintl )" +RDEPEND="${BOTHDEPEND} + app-shells/push" +DEPEND="${BOTHDEPEND} + app-arch/xz-utils + nls? ( sys-devel/gettext )" + +pkg_setup() { + case " ${REPLACING_VERSIONS}" in + *\ 0.[0-9].*|*\ 0.1[0-9].*|*\ 0.2[0-4].*|*\ 0.25.0*) + local eixcache="${EROOT}/var/cache/${PN}" + test -f "${eixcache}" && rm -f -- "${eixcache}";; + esac +} + +src_prepare() { + sed -i -e "s'/'${EPREFIX}/'" -- "${S}"/tmpfiles.d/eix.conf || die + epatch_user +} + +src_configure() { + econf $(use_with sqlite) $(use_with doc extra-doc) \ + $(use_enable nls) $(use_enable tools separate-tools) \ + $(use_enable security) $(use_enable optimization) \ + $(use_enable strong-security) \ + $(use_enable strong-optimization) $(use_enable debug debugging) \ + $(use_enable swap-remote) \ + $(use_with prefix always-accept-keywords) \ + $(use_with dep dep-default) \ + --with-zsh-completion \ + --with-portage-rootpath="${ROOTPATH}" \ + --with-eprefix-default="${EPREFIX}" \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" +} + +src_install() { + default + dobashcomp bash/eix + insinto "/usr/lib/tmpfiles.d" + doins tmpfiles.d/eix.conf +} + +pkg_postinst() { + test -d "${EROOT}var/cache/${PN}" || { + mkdir "${EROOT}var/cache/${PN}" + use prefix || chown portage:portage "${EROOT}var/cache/${PN}" + } + local obs="${EROOT}var/cache/eix.previous" + ! test -f "${obs}" || ewarn "Found obsolete ${obs}, please remove it" +} + +pkg_postrm() { + [ -n "${REPLACED_BY_VERSION}" ] || rm -rf -- "${EROOT}var/cache/${PN}" +} diff --git a/app-shells/hstr/Manifest b/app-shells/hstr/Manifest index b11e1145bef2..d43a4174f767 100644 --- a/app-shells/hstr/Manifest +++ b/app-shells/hstr/Manifest @@ -1,2 +1,3 @@ DIST hstr-1.17.tar.gz 37289 SHA256 9e4b6e74bb7852945e25727105c5339c49c9ce1218481845c8d0205514d85e70 SHA512 eb89496c8554eb29ebb30430aa01179f7265a8ec15b0b9452f7e3ac4867ae4349e6141e11f0af01a4d15ba06131c18ec9ab760c8e68100fa2b8f2a793b237f9b WHIRLPOOL 2b33f485525b2cb033a82b249976d7c670d8f02948e84e73f350b19bdc955e551014f14ad4cfc845144ff0e0d8c3690c50b4444a414c7909f0106242d13a9cc2 DIST hstr-1.18.tar.gz 43672 SHA256 85eb071938c2e7314e5fbd245a81c7b0cd93a8864bf9cba5b5041acb5052ba73 SHA512 e0684a694a514a341c30bfa7fc596f858658f3be9db6c490f628b4c48d1bf08acd8b4b03361ceb6aef65d42a5b01a1c0a8ce94698b5f7f5193ef030d7dc896c4 WHIRLPOOL 1bd00be28623ea8e05c1cec3d95451b7f92e6b17bfb5bd2853560955fc5ace9226edefdee820e9cee6c3542180f699b56371b9766a65a8efc669987dd5e961fb +DIST hstr-1.19.tar.gz 43946 SHA256 1783fa175416e99cb540cbc47092b87dc2362dc2a2f988f59eb66b0d793e4136 SHA512 f3c6598f21f1b77fa33b4910e945ae398741a9e94ea0c496b03542b394523c0b0fe34e24d9778280847486859728e7dcb798b6e1776c9e5e5d54c3378f7b720c WHIRLPOOL 76508633d70292df71989bbab7f549066f6c48f8018c4d94d0d5508e966efd4beb4f2f59acafb3a84b60fb70fef5edf1050da8ed4d107d1d9d2a3cc882d08662 diff --git a/app-shells/hstr/hstr-1.19.ebuild b/app-shells/hstr/hstr-1.19.ebuild new file mode 100644 index 000000000000..57a6535441f2 --- /dev/null +++ b/app-shells/hstr/hstr-1.19.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +AUTOTOOLS_AUTORECONF=true + +inherit autotools-utils + +DESCRIPTION="Shell history suggest box - easily view, navigate, search and manage your command history" +HOMEPAGE="https://github.com/dvorka/hstr http://www.mindforger.com" +SRC_URI="https://github.com/dvorka/hstr/archive/${PV}.tar.gz -> ${P}.tar.gz" + +SLOT="0" +LICENSE="Apache-2.0" +KEYWORDS="~amd64 ~x86 ~ppc ~ppc64 ~amd64-linux ~x86-linux" +IUSE="" + +RDEPEND="sys-libs/ncurses:0=" +DEPEND="${RDEPEND} + virtual/pkgconfig +" + +DOCS=( CONFIGURATION.md README.md ) + +src_prepare() { + sed \ + -e 's:-O2::g' \ + -i src/Makefile.am || die + autotools-utils_src_prepare +} diff --git a/dev-libs/libb64/Manifest b/dev-libs/libb64/Manifest new file mode 100644 index 000000000000..f215421b3d4a --- /dev/null +++ b/dev-libs/libb64/Manifest @@ -0,0 +1 @@ +DIST libb64-1.2.src.zip 16063 SHA256 343d8d61c5cbe3d3407394f16a5390c06f8ff907bd8d614c16546310b689bfd3 SHA512 ac041c78bf324a027e311fb10935886f8713f9b6ac53136396186a5b5fd936efdf6add715899827591bdf6d3727f6e27f680bc273c7634517cc2e1941140f596 WHIRLPOOL 4dfd317674dfe9daa7832bbddb3e668e83a11d216aa8fd05d3cb8b9697397c73183aadc0c8124e68f0397bf64cb1c9e819abd216ede4bf3d7f85176c05c8cf35 diff --git a/dev-libs/libb64/libb64-1.2.ebuild b/dev-libs/libb64/libb64-1.2.ebuild new file mode 100644 index 000000000000..c5eac62d1bb2 --- /dev/null +++ b/dev-libs/libb64/libb64-1.2.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +DESCRIPTION="Fast Base64 encoding/decoding routines" +HOMEPAGE="http://libb64.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.src.zip" + +LICENSE="CC-PD" +# static library, so always rebuild +SLOT="0/${PVR}" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="app-arch/unzip" + +src_compile() { + # override -O3, -Werror non-sense + emake -C src CFLAGS="${CFLAGS} -I../include" +} + +src_install() { + dolib src/libb64.a + insinto /usr/include + doins -r include/b64 + dodoc AUTHORS BENCHMARKS CHANGELOG README +} diff --git a/dev-libs/libb64/metadata.xml b/dev-libs/libb64/metadata.xml new file mode 100644 index 000000000000..5cb9324943ab --- /dev/null +++ b/dev-libs/libb64/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer> + <email>mgorny@gentoo.org</email> + <name>Michał Górny</name> + </maintainer> +</pkgmetadata> diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest index d6d9e3a74c45..8c80771b2d91 100644 --- a/dev-libs/libinput/Manifest +++ b/dev-libs/libinput/Manifest @@ -2,3 +2,4 @@ DIST libinput-0.9.0.tar.xz 510512 SHA256 309043976f41f5451c2a4b1c25bc2993b18aecb DIST libinput-1.0.1.tar.xz 800244 SHA256 482fb35119b457ba65a8bebaa47e4f6b4dbd77e59c320014a22296847b7ff99e SHA512 17efc6ddd58aadcd30aecb4d1b8b6ad32f6f61c592f29b0a99aac7d49e5cb814038874d9e8996cd6726f15c58bf4239169564c650a3250a87a9ec6fd3110c5bb WHIRLPOOL 0bba6b4a58ca0020ebcbffe5675d75832b4ed67a350ca141d990f9db522a2eee942543f475d76c1f2b816b849074f4a50e30bcb3adc99bd4abdea1a43800a2d5 DIST libinput-1.1.0.tar.xz 802348 SHA256 673186ea2a0d2b695afaa9758834f9217b175774d9ae222e1b43ff63c663f582 SHA512 7f014eabed120c00fcd2d8748aed44a8ca31fd30bdda8b289ca63f7d1bebb9c49f1d508707fb0c4a5c7c4a37b58548efdff0e9b7761475f18e1cf787a80520e6 WHIRLPOOL 028518c20cfc6daa442dd92d04183a6575b95b1f4792a646ce42c09a7bc75e5bb469ca88b8cad89919c0814e00aa65178cc49c9dca6e9aad4ce997a94f9ba645 DIST libinput-1.1.1.tar.xz 791276 SHA256 2de2b433ddc73ba1bfd4d309fd873d0ced6937cf1a7a94e4afbf18ddd8f8dd17 SHA512 3806e67a4530be71463b693076a64f210475d3487abc2848f5ee13b92b281c6e4950bdb754c6b9c090c51c5b8dd4e698b882ae325bdea78bb05e6b7399eb75f0 WHIRLPOOL 031af4cb17d51d2f888cdb3192ccb25e4b3eb22422aeda3e999fd215b3d5bba89782b1f4a5e0b95706bf6da2ffaf3cbc0b5078a1fa95433afd414b79826542de +DIST libinput-1.1.2.tar.xz 818680 SHA256 a323a32718a8f0f5e85e1ed3a81f0dde45eb52b215a15c7887bec40961d97a84 SHA512 7babc1be1ad08915fb9cf361c99d9c91eea74cfd67cc5b7608f53dbcec8ed986cd9844e6a555a88c52687e7660a20ed3ff9342aba206125d7d4ba40019bb2127 WHIRLPOOL 472ad01b4dae48882e0edbe5bac727084f3e9c8d7fd5138d99b751e08f73cc5f390d091039f60ddd2e2187aaab72020fc15e392fbde16338cc67415512274b6d diff --git a/dev-libs/libinput/libinput-1.1.2.ebuild b/dev-libs/libinput/libinput-1.1.2.ebuild new file mode 100644 index 000000000000..26877357fe85 --- /dev/null +++ b/dev-libs/libinput/libinput-1.1.2.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils udev + +DESCRIPTION="Library to handle input devices in Wayland" +HOMEPAGE="http://www.freedesktop.org/wiki/Software/libinput/" +SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz" + +LICENSE="MIT" +SLOT="0/10" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="test" +# Tests require write access to udev rules directory which is a no-no for live system. +# Other tests are just about logs, exported symbols and autotest of the test library. +RESTRICT="test" + +RDEPEND=" + >=dev-libs/libevdev-0.4 + >=sys-libs/mtdev-1.1 + virtual/libudev +" +DEPEND="${RDEPEND} + virtual/pkgconfig" +# test? ( +# >=dev-libs/check-0.9.10 +# dev-util/valgrind +# sys-libs/libunwind ) + +src_configure() { + # Doc handling in kinda strange but everything + # is available in the tarball already. + sed -e 's/^\(SUBDIRS =.*\)doc\(.*\)$/\1\2/' \ + -i Makefile.am Makefile.in || die +} + +src_configure() { + # gui can be built but will not be installed + # building documentation silently fails with graphviz syntax errors + econf \ + --disable-documentation \ + --disable-event-gui \ + $(use_enable test tests) \ + --with-udev-dir="$(get_udevdir)" +} + +src_install() { + emake install DESTDIR="${D}" + dodoc -r doc/html + prune_libtool_files +} diff --git a/dev-libs/openssl/openssl-1.0.2e.ebuild b/dev-libs/openssl/openssl-1.0.2e.ebuild index bbffaea350ee..5ce910c542e0 100644 --- a/dev-libs/openssl/openssl-1.0.2e.ebuild +++ b/dev-libs/openssl/openssl-1.0.2e.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz" LICENSE="openssl" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux" IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 static-libs test +tls-heartbeat vanilla zlib" RESTRICT="!bindist? ( bindist )" diff --git a/dev-php/PEAR-Mail_Mime/Manifest b/dev-php/PEAR-Mail_Mime/Manifest index 250e3767b80f..5af1cbc4c532 100644 --- a/dev-php/PEAR-Mail_Mime/Manifest +++ b/dev-php/PEAR-Mail_Mime/Manifest @@ -1,2 +1,3 @@ +DIST Mail_Mime-1.10.0.tgz 35767 SHA256 40867f312a7cc2bde95ea78a905bf8c7ded2dfe97b184dea43c21bf6ea5fd7eb SHA512 7fe54db4b0dee1ab3186d9ba8d4e5be02ddbcef530f1a3b70e509ca43ef0e4516ba8e829ba4397a30a703fcdbf42de36c10c204269ffa8be5d5f254e8929c9d6 WHIRLPOOL 357d00fe30e19c31580ef45b496ed893523216c8928a08298a8f9af400eba4f0a5f0a1c888be6095c2c68251dba670eeddaf771012b4cf84370e0b3970147917 DIST Mail_Mime-1.8.8.tgz 32059 SHA256 d1a7fb767ebdabef6b8d346911a0f91fc2bb23df36175cf036474f5ed942ced1 SHA512 c2d9735041f61ca7b7addbf4deae09e6b7448f3d34143fe10d49152802f100db2c29dcf9e8938010f275c38630b849c8e45bb2db54eed6504e8425669a18d0b8 WHIRLPOOL 573133f646decf3f88728c80c381efb1b4d307575c33bed6b53eb09f0b313352813b5364081be39166dcd7335480f89e6c861599b9f894aa083bc88614c6b39b DIST Mail_Mime-1.9.0.tgz 35042 SHA256 17ee289990ab8f0b62d9806a5e094f4b130b9ba75e939f3496be9d9d9f3506d0 SHA512 915084166943be396603cc63736818fd4401e21b417d159cb47cf22c0de4153a7ecc4496c192212ac5c952196a35a56936def16305fb69beec64582994574fb7 WHIRLPOOL 9b279d872aa881301256f021d256fdc6701c54c52400f085c45641fcb056577ecb90d61c3a63dccf4195459f2f861d9afdb522986bb61edf2b1b559edfcd2764 diff --git a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.0.ebuild b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.0.ebuild new file mode 100644 index 000000000000..f5bd01523fae --- /dev/null +++ b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit php-pear-r1 + +DESCRIPTION="Create and manipulate mime messages with PHP" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="test" + +src_test() { + # Requires the "pear" executable from dev-php/PEAR-PEAR. + pear run-tests tests || die + + # The command succeeds regardless of whether or not the test suite + # passed, but this file is only written when there was a failure. + [[ -f run-tests.log ]] && die "test suite failed" +} diff --git a/dev-php/PEAR-Mail_Mime/files/1.5.2-php-pass-by-reference-fix.patch b/dev-php/PEAR-Mail_Mime/files/1.5.2-php-pass-by-reference-fix.patch deleted file mode 100644 index b18e4c642514..000000000000 --- a/dev-php/PEAR-Mail_Mime/files/1.5.2-php-pass-by-reference-fix.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- mime.php.orig 2007-08-16 12:16:47.000000000 +0200 -+++ mime.php 2007-08-16 12:25:07.000000000 +0200 -@@ -376,7 +376,7 @@ - * @return string contents of $file_name - * @access private - */ -- function &_file2str($file_name) -+ function _file2str($file_name) - { - if (!is_readable($file_name)) { - $err = PEAR::raiseError('File is not readable ' . $file_name); -@@ -413,7 +413,7 @@ - * @return object The text mimePart object - * @access private - */ -- function &_addTextPart(&$obj, $text) -+ function _addTextPart(&$obj, $text) - { - $params['content_type'] = 'text/plain'; - $params['encoding'] = $this->_build_params['text_encoding']; -@@ -437,7 +437,7 @@ - * @return object The html mimePart object - * @access private - */ -- function &_addHtmlPart(&$obj) -+ function _addHtmlPart(&$obj) - { - $params['content_type'] = 'text/html'; - $params['encoding'] = $this->_build_params['html_encoding']; -@@ -459,7 +459,7 @@ - * @return object The multipart/mixed mimePart object - * @access private - */ -- function &_addMixedPart() -+ function _addMixedPart() - { - $params = array(); - $params['content_type'] = 'multipart/mixed'; -@@ -480,7 +480,7 @@ - * @return object The multipart/mixed mimePart object - * @access private - */ -- function &_addAlternativePart(&$obj) -+ function _addAlternativePart(&$obj) - { - $params['content_type'] = 'multipart/alternative'; - if (is_object($obj)) { -@@ -502,7 +502,7 @@ - * @return object The multipart/mixed mimePart object - * @access private - */ -- function &_addRelatedPart(&$obj) -+ function _addRelatedPart(&$obj) - { - $params['content_type'] = 'multipart/related'; - if (is_object($obj)) { -@@ -523,7 +523,7 @@ - * @return object The image mimePart object - * @access private - */ -- function &_addHtmlImagePart(&$obj, $value) -+ function _addHtmlImagePart(&$obj, $value) - { - $params['content_type'] = $value['c_type']; - $params['encoding'] = 'base64'; -@@ -546,7 +546,7 @@ - * @return object The image mimePart object - * @access private - */ -- function &_addAttachmentPart(&$obj, $value) -+ function _addAttachmentPart(&$obj, $value) - { - $params['dfilename'] = $value['name']; - $params['encoding'] = $value['encoding']; diff --git a/dev-php/PEAR-Mail_Mime/files/1.8.3-php-pass-by-reference-fix.patch b/dev-php/PEAR-Mail_Mime/files/1.8.3-php-pass-by-reference-fix.patch deleted file mode 100644 index ab87c19287e6..000000000000 --- a/dev-php/PEAR-Mail_Mime/files/1.8.3-php-pass-by-reference-fix.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- a/Mail/mime.php.orig 2007-08-16 12:16:47.000000000 +0200 -+++ b/Mail/mime.php 2007-08-16 12:25:07.000000000 +0200 -@@ -376,7 +376,7 @@ - * @return string contents of $file_name - * @access private - */ -- function &_file2str($file_name) -+ function _file2str($file_name) - { - if (!is_readable($file_name)) { - $err = PEAR::raiseError('File is not readable ' . $file_name); -@@ -413,7 +413,7 @@ - * @return object The text mimePart object - * @access private - */ -- function &_addTextPart(&$obj, $text) -+ function _addTextPart(&$obj, $text) - { - $params['content_type'] = 'text/plain'; - $params['encoding'] = $this->_build_params['text_encoding']; -@@ -437,7 +437,7 @@ - * @return object The html mimePart object - * @access private - */ -- function &_addHtmlPart(&$obj) -+ function _addHtmlPart(&$obj) - { - $params['content_type'] = 'text/html'; - $params['encoding'] = $this->_build_params['html_encoding']; -@@ -459,7 +459,7 @@ - * @return object The multipart/mixed mimePart object - * @access private - */ -- function &_addMixedPart() -+ function _addMixedPart() - { - $params = array(); - $params['content_type'] = 'multipart/mixed'; -@@ -480,7 +480,7 @@ - * @return object The multipart/mixed mimePart object - * @access private - */ -- function &_addAlternativePart(&$obj) -+ function _addAlternativePart(&$obj) - { - $params['content_type'] = 'multipart/alternative'; - if (is_object($obj)) { -@@ -502,7 +502,7 @@ - * @return object The multipart/mixed mimePart object - * @access private - */ -- function &_addRelatedPart(&$obj) -+ function _addRelatedPart(&$obj) - { - $params['content_type'] = 'multipart/related'; - if (is_object($obj)) { -@@ -523,7 +523,7 @@ - * @return object The image mimePart object - * @access private - */ -- function &_addHtmlImagePart(&$obj, $value) -+ function _addHtmlImagePart(&$obj, $value) - { - $params['content_type'] = $value['c_type']; - $params['encoding'] = 'base64'; -@@ -546,7 +546,7 @@ - * @return object The image mimePart object - * @access private - */ -- function &_addAttachmentPart(&$obj, $value) -+ function _addAttachmentPart(&$obj, $value) - { - $params['dfilename'] = $value['name']; - $params['encoding'] = $value['encoding']; diff --git a/dev-php/PEAR-Mail_Mime/files/php-pass-by-reference-fix.patch b/dev-php/PEAR-Mail_Mime/files/php-pass-by-reference-fix.patch deleted file mode 100644 index 677e67117a3c..000000000000 --- a/dev-php/PEAR-Mail_Mime/files/php-pass-by-reference-fix.patch +++ /dev/null @@ -1,76 +0,0 @@ ---- mime.php 2005-07-13 22:49:04.000000000 +0200 -+++ mime.php 2006-03-07 12:22:41.000000000 +0100 -@@ -309,7 +309,7 @@ - * @return object The text mimePart object - * @access private - */ -- function &_addTextPart(&$obj, $text) -+ function _addTextPart(&$obj, $text) - { - $params['content_type'] = 'text/plain'; - $params['encoding'] = $this->_build_params['text_encoding']; -@@ -330,7 +330,7 @@ - * @return object The html mimePart object - * @access private - */ -- function &_addHtmlPart(&$obj) -+ function _addHtmlPart(&$obj) - { - $params['content_type'] = 'text/html'; - $params['encoding'] = $this->_build_params['html_encoding']; -@@ -350,7 +350,7 @@ - * @return object The multipart/mixed mimePart object - * @access private - */ -- function &_addMixedPart() -+ function _addMixedPart() - { - $params['content_type'] = 'multipart/mixed'; - return new Mail_mimePart('', $params); -@@ -366,7 +366,7 @@ - * @return object The multipart/mixed mimePart object - * @access private - */ -- function &_addAlternativePart(&$obj) -+ function _addAlternativePart(&$obj) - { - $params['content_type'] = 'multipart/alternative'; - if (is_object($obj)) { -@@ -386,7 +386,7 @@ - * @return object The multipart/mixed mimePart object - * @access private - */ -- function &_addRelatedPart(&$obj) -+ function _addRelatedPart(&$obj) - { - $params['content_type'] = 'multipart/related'; - if (is_object($obj)) { -@@ -405,7 +405,7 @@ - * @return object The image mimePart object - * @access private - */ -- function &_addHtmlImagePart(&$obj, $value) -+ function _addHtmlImagePart(&$obj, $value) - { - $params['content_type'] = $value['c_type']; - $params['encoding'] = 'base64'; -@@ -424,7 +424,7 @@ - * @return object The image mimePart object - * @access private - */ -- function &_addAttachmentPart(&$obj, $value) -+ function _addAttachmentPart(&$obj, $value) - { - $params['content_type'] = $value['c_type']; - $params['encoding'] = $value['encoding']; ---- mimePart.php 2004-12-11 00:08:26.000000000 +0100 -+++ mimePart.php 2006-03-07 12:22:41.000000000 +0100 -@@ -261,7 +261,7 @@ - * otherwise you will not be able to add further subparts. - * @access public - */ -- function &addSubPart($body, $params) -+ function addSubPart($body, $params) - { - $this->_subparts[] = new Mail_mimePart($body, $params); - return $this->_subparts[count($this->_subparts) - 1]; diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest index 2c78b9541aea..d3a998638710 100644 --- a/dev-python/aiohttp/Manifest +++ b/dev-python/aiohttp/Manifest @@ -1,3 +1,3 @@ -DIST aiohttp-0.14.4.tar.gz 1253273 SHA256 2338c8506ce7853ac2df7efba731a3fd015a7ee2561afab0d69ddefb43403f5a SHA512 453626e2acb2da85b39fd9dab01c51bbbbdf3422e2d7ff833e8be141f43d27d046646bafe6d58d96d37457208ecc2347a3724f056152c639c18de99da619538d WHIRLPOOL 42e8e23c3b1c28463617f9137288886ccf2d61fe404e8b06e105e0a48b36b06382a7a58a6e6c91bc38886e09874ba6112300fd6bf3adfce704129a7edbc4936d DIST aiohttp-0.17.4.tar.gz 475034 SHA256 a2f122b41f29eb10772f1600ada5fec849c5dc717c1dcaa05c95bf0712af8843 SHA512 bca0aa93f51fae32eff383ffbd7790886a822647e77884fb5a26b6d2673429b61cf5483527297740a4b237b3e038934990df1061e32e6617d6a3da10276b9116 WHIRLPOOL a7abec0b3daa84078beee9057b5dfdf021b7522fa6b7f847f65008a061802f2cd61dee34886b833c8465f0a5379af9cb45b1f2117cd0b386b6ea488f3f9f2b3c DIST aiohttp-0.18.4.tar.gz 2165117 SHA256 23f1a5de84d0384ab2e78405db56be5e4af0681c42ddbc0caecf2402ddee3019 SHA512 ae4d72d661b2e69e9eb9d258d3c8842cd3e7a8a1d71dd71ccfbc7a3cf5916d65c82f3e3fe56731d5a326d810c01c32dbcb88900b7db68f3f5172c15e482aadc4 WHIRLPOOL 6b59b45e510472c8082868025e660c98e509760d87d08962b7fcc29680e1e31d89bf4e15d2559c7f202ebe70a28cc9eae4908c999cc7c0c29e4b6ea4ed2fbaaf +DIST aiohttp-0.19.0.tar.gz 2173954 SHA256 9bfb173baec179431a1c8f3566185e8ebbd1517cf4450217087d79e26e44c287 SHA512 4e20d9e4eac4bd11538faa8a2b9ad6d65b432cb0bc468b851aebc32b6ac15417e65bf68c5801efb2911562f63ba2cd3da31e9cb8347e5aa8f840ba91a986061f WHIRLPOOL 9db94601eec1ff2b5bdbcf04b662a3f7f7d04c24f742d30244bc90d5390f9ae1c303c8de3a0ad253ff7aa068f07a9e439fb0ccadb80db1ba57f6ac3620a1621b diff --git a/dev-python/aiohttp/aiohttp-0.14.4-r1.ebuild b/dev-python/aiohttp/aiohttp-0.14.4-r1.ebuild deleted file mode 100644 index fc7434edb9ea..000000000000 --- a/dev-python/aiohttp/aiohttp-0.14.4-r1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -PYTHON_COMPAT=( python{3_3,3_4} ) - -inherit distutils-r1 - -DESCRIPTION="HTTP client/server for asyncio" -HOMEPAGE="https://github.com/KeepSafe/aiohttp https://pypi.python.org/pypi/aiohttp" -SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" - -RDEPEND="virtual/python-asyncio[${PYTHON_USEDEP}]" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - ${RDEPEND} - dev-python/chardet[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - www-servers/gunicorn[${PYTHON_USEDEP}] )" - -python_test() { - nosetests || die "Tests failed under ${EPYTHON}" -} diff --git a/dev-python/aiohttp/aiohttp-0.19.0.ebuild b/dev-python/aiohttp/aiohttp-0.19.0.ebuild new file mode 100644 index 000000000000..93457c4c4ac5 --- /dev/null +++ b/dev-python/aiohttp/aiohttp-0.19.0.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +PYTHON_COMPAT=( python3_4 ) + +inherit distutils-r1 + +DESCRIPTION="http client/server for asyncio" +HOMEPAGE="https://github.com/KeepSafe/aiohttp https://pypi.python.org/pypi/aiohttp" +SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc examples test" + +CDEPEND="dev-python/chardet[${PYTHON_USEDEP}]" +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + dev-python/cython[${PYTHON_USEDEP}] + doc? ( + >=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}] + dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}] + dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}] + dev-python/sphinx[${PYTHON_USEDEP}] + ) + test? ( + ${CDEPEND} + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pytest-raisesregexp[${PYTHON_USEDEP}] + www-servers/gunicorn[${PYTHON_USEDEP}] + ) +" +RDEPEND="${CDEPEND}" + +python_compile_all() { + use doc && emake -C docs html +} + +python_test() { + PYTHONPATH="$(PWD):${PYTHONPATH}" ${PYTHON} -m pytest tests/ || die "Tests failed under ${EPYTHON}" +} + +python_install_all() { + use doc && local HTML_DOCS=( docs/_build/html/. ) + use examples && local EXAMPLES=( examples/. ) + + distutils-r1_python_install_all +} diff --git a/dev-python/autobahn/autobahn-0.10.4.ebuild b/dev-python/autobahn/autobahn-0.10.4.ebuild index 9a4531498063..c854a1a1ed33 100644 --- a/dev-python/autobahn/autobahn-0.10.4.ebuild +++ b/dev-python/autobahn/autobahn-0.10.4.ebuild @@ -27,7 +27,7 @@ RDEPEND=" >=dev-python/six-1.6.1[${PYTHON_USEDEP}] >=dev-python/snappy-0.5[${PYTHON_USEDEP}] >=dev-python/trollius-0.1.2[${PYTHON_USEDEP}] - >=dev-python/twisted-core-11.1[$(python_gen_usedep python2*)] + >=dev-python/twisted-core-11.1[$(python_gen_usedep 'python2*')] >=dev-python/txaio-1.0.0[${PYTHON_USEDEP}] >=dev-python/ujson-1.33[${PYTHON_USEDEP}] >=dev-python/wsaccel-0.6.2[${PYTHON_USEDEP}] diff --git a/dev-python/autobahn/autobahn-0.9.4.2.ebuild b/dev-python/autobahn/autobahn-0.9.4.2.ebuild index 013823d3adf1..c7b0bc61f291 100644 --- a/dev-python/autobahn/autobahn-0.9.4.2.ebuild +++ b/dev-python/autobahn/autobahn-0.9.4.2.ebuild @@ -23,7 +23,7 @@ RDEPEND=" dev-python/snappy[${PYTHON_USEDEP}] dev-python/lz4[${PYTHON_USEDEP}] dev-python/msgpack[${PYTHON_USEDEP}] - dev-python/twisted-core[$(python_gen_usedep python2*)] + dev-python/twisted-core[$(python_gen_usedep 'python2*')] dev-python/ujson[${PYTHON_USEDEP}] dev-python/wsaccel[${PYTHON_USEDEP}] dev-python/zope-interface[${PYTHON_USEDEP}] diff --git a/dev-python/crumbs/Manifest b/dev-python/crumbs/Manifest index e45c1949305a..6ef1b708f8c6 100644 --- a/dev-python/crumbs/Manifest +++ b/dev-python/crumbs/Manifest @@ -1,4 +1,4 @@ -DIST crumbs-1.2.2.tar.gz 7721 SHA256 eb3ea05bab4ba34501e2d18da151d7036bfd68e948383d3f7303891463ff590f SHA512 be20aa24ef25d3fac1cba7e653b06e0ab394286032f7f01320c53ba88cff363a72d6302a44da7019acd3f2f04ea98d7a2f4d01b5f9f9cc0327391346a4a4ebf6 WHIRLPOOL 73f834900b19c2fd4dacb705ca6af5bc89fab6f8712115e3e894775c7bf6e5d87071faa2a5152350e1d7244751e2d6a9e07732c88e3ca40aae56ece560d77f72 DIST crumbs-2.0.0.tar.gz 13134 SHA256 776634a652205791f30419dbd3f89f26eecb0bf041348690f4552deb7f61ebc1 SHA512 b518041ed7d3d1026b83901f3ffa2faf1da30fb39c598eb88eebabfeb3489c4ce2b2de1f0267bdb3e7d9366509efe0e109f54ec45b9297345f1224c2de5213c5 WHIRLPOOL 64b7e09898c5861ab950fae1331ef973f4c42cc57e2204f23aaf11dce8eb84b817d9ee44b58acebbb909d1266a38eed419a615e8102cc76a46b4b41bb846592f DIST crumbs-2.0.1.tar.gz 12377 SHA256 b537d608b9c54d8fc0bd73a4a60599fe2a68ba66ecd05f3f45a25d2301f439ca SHA512 d15a8f3484f8178a1d41555d1783fdf6356c97f05247cf3daf6c56af9e0bd2795ee187f7fde549f5e23b4883317608cc40a71dedfaf49e544c87a12a0f97738a WHIRLPOOL a74e0e61726ca7dbeb702ce92b369137b7c21da5e224a365c9fbf3e6221859c6307329447c6835ff824950d0155cf180d62616f10b6f3084cb041751e9e8d0c4 DIST crumbs-2.0.2.tar.gz 19639 SHA256 4a520626d4f7687f45caa2fa85963b1e931e13156edab83b3738c7bbe7c8be91 SHA512 68786ccc0287e3aa3e62d351f38c01c16fc40b64d016a6f855d312292d4ae3e1e68e493fc2d621527fb82a7c7dc87df4b2b5ba04288d9cb8ccd2e7337fd51381 WHIRLPOOL ad04976b65d8f972053c104fd945b299341cb7ac8513e5e9b49f41af876aef37190870201c3403af55981070ccd5bb7879230ececa41264722763e6545792f13 +DIST crumbs-2.1.0.tar.gz 19968 SHA256 f1343b0e8096adc3717a9606d570457ec025677aa75f3abb34c9b7d1aab79fbf SHA512 f68a7d0eb4375db6172ce714cf9350d236320e9a37b732f96cb6fa35f11b14ff19dcb233ae5062cadede625470e777ade12ddebe669d1ab7fccf9425a31a6087 WHIRLPOOL 73f806bbdccca68c1581200cd58c106cdbdbfb19d4ced68776c0c35e368e252ddf92348191fed39818facf79bbe726d1b5a298e5518cff2a4c858d9b53d89fd6 diff --git a/dev-python/crumbs/crumbs-1.2.2-r1.ebuild b/dev-python/crumbs/crumbs-2.1.0.ebuild index 7d196a80f763..ac6bb75de8c1 100644 --- a/dev-python/crumbs/crumbs-1.2.2-r1.ebuild +++ b/dev-python/crumbs/crumbs-2.1.0.ebuild @@ -3,7 +3,7 @@ # $Id$ EAPI=5 -PYTHON_COMPAT=( python2_7 python3_3 ) +PYTHON_COMPAT=( python2_7 python3_3 python3_4 ) inherit distutils-r1 @@ -14,20 +14,35 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64" -IUSE="inotify test" +IUSE="doc test" +CDEPEND="dev-python/pyinotify[${PYTHON_USEDEP}]" DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] + doc? ( + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] + ) test? ( + ${CDEPEND} dev-python/coverage[${PYTHON_USEDEP}] - dev-python/flake8[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] ) " -RDEPEND="inotify? ( dev-python/pyinotify[${PYTHON_USEDEP}] )" +RDEPEND="${CDEPEND}" + +python_compile_all() { + use doc && esetup.py build_sphinx + + distutils-r1_python_compile_all +} python_test() { - flake8 || die 'flake8' - nosetests || die 'nosetests' + nosetests || die "Tests failed on ${EPYTHON}" +} + +python_install_all() { + use doc && local HTML_DOCS=( docs/_build/html/. ) + + distutils-r1_python_install_all } diff --git a/dev-python/stormpath/Manifest b/dev-python/stormpath/Manifest index 6fc21b3d81d8..2bca960662a6 100644 --- a/dev-python/stormpath/Manifest +++ b/dev-python/stormpath/Manifest @@ -1,3 +1,3 @@ -DIST stormpath-2.1.2.tar.gz 4337164 SHA256 10f46c7ebb27274f61c4b550eb6fc58e54260fa0fb1f96a4b7fce530d789d11c SHA512 c3b3e93f4d5515df8e5ab94770c995a5e7912a53f58f05ca3a1f630c41fc0f76e39cf213dbfad8858d7bfe5f964f6d9cbfad9013de33e9a02e0484bd92a7957d WHIRLPOOL adfbf1cf071167a93989cd4d80039a4eb8c42a908075207a4db4db3a38c87e3b9470b9c1c02946e9481e52d875e836d0c77a72050de2a1f79fc78b5ed037dfe2 DIST stormpath-2.1.4.tar.gz 4338169 SHA256 adbc595b243861be0268c2c71061de8ce6dc8f9a92d7398f92bf77a734315b2f SHA512 6834f1b8db731872208c96b9acb2ff66e5d7fcbb6ae0c1f1de541ce1597a786834f2b68c43d00c5adcb1018749c53b45444dde2a81a520fed79fd9b6f0f07ab0 WHIRLPOOL 6f50a1f6476d4486f43da55ae48c56942ef90820db4434c3b567222cb65d56aaa5649249dfc10add807f5ccba245d99b89efa031201af61bc888b902cf66b4ea DIST stormpath-2.1.5.tar.gz 4339093 SHA256 cea6810c5caa666c3a73ea0bbf14826687318aea2a82c51d93886679b786b94b SHA512 d373d36bd6dc647fcedad99722c6ff53447b4b11090ffbbf2e72a206d27e66804d7e756d0588b80b11110700297beebb894b4d5301df97a836a4204622ea83af WHIRLPOOL 14a580f934afc74f7f15b4ac897474bb00ab199470d94c671b3f39c625d460aa601329a18cf23b206f12ab2b0f9f25d5903c14f507f614e38953da47bdfc7a92 +DIST stormpath-2.1.6.tar.gz 4339678 SHA256 47649cf8edaf5ef48346f74558e62e0aaf28fb49bd7e3db99db9338739913d77 SHA512 2cc6ecd674ca6b5fcfbb6664f863cb4c6378748eb5ca2ceb5e0db3ac46c567a4b62a1bb595044b15c0294b5abe471c9ac675b93db49e5d2e146cd8954c8c7611 WHIRLPOOL c15085c2a1e5600ff93bc1e013439270c17472035a39fde52f31e21971b5508b4ff50a9a5f1472aa185282fefbfc9015a88eed0b5c641acf787abfaf9f72e06b diff --git a/dev-python/stormpath/stormpath-2.1.2.ebuild b/dev-python/stormpath/stormpath-2.1.6.ebuild index e6bdfe5b1541..e6bdfe5b1541 100644 --- a/dev-python/stormpath/stormpath-2.1.2.ebuild +++ b/dev-python/stormpath/stormpath-2.1.6.ebuild diff --git a/dev-ruby/aws-sdk-core/Manifest b/dev-ruby/aws-sdk-core/Manifest new file mode 100644 index 000000000000..d42fcdfdac6d --- /dev/null +++ b/dev-ruby/aws-sdk-core/Manifest @@ -0,0 +1 @@ +DIST aws-sdk-ruby-2.2.5.tar.gz 1671525 SHA256 5fba8661d99d939162a349fddf0a89003267856f4faaa8baa5875c916241e4d1 SHA512 93e848922b9410297ccd82d8e71477f8246c4088f6145e53e7300ff7b4d8a3683274aba794a11df9fbe3a600b0b4cf6d4487f5a45f11fe8b4aad967ae4ee6e33 WHIRLPOOL fac9dc67dc047bc652b4645612f534c08f6b29f9ce456e80d1c7d497bdc748961e15b579162b0a9d42f3f416801eb2a9a365c817698e18638ec0f4a38ff1b6b7 diff --git a/dev-ruby/aws-sdk-core/aws-sdk-core-2.2.5.ebuild b/dev-ruby/aws-sdk-core/aws-sdk-core-2.2.5.ebuild new file mode 100644 index 000000000000..d6f6910f7391 --- /dev/null +++ b/dev-ruby/aws-sdk-core/aws-sdk-core-2.2.5.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +USE_RUBY="ruby20 ruby21" + +RUBY_FAKEGEM_RECIPE_TEST="rspec3" +RUBY_FAKEGEM_RECIPE_DOC="rdoc" +RUBY_FAKEGEM_DOCDIR="doc" + +RUBY_FAKEGEM_EXTRAINSTALL="apis ca-bundle.crt endpoints.json" + +GITHUB_USER="aws" +GITHUB_PROJECT="aws-sdk-ruby" +RUBY_S="${GITHUB_PROJECT}-${PV}/${PN}" + +RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" + +inherit ruby-fakegem + +DESCRIPTION="Official SDK for Amazon Web Services" +HOMEPAGE="http://aws.amazon.com/sdkforruby" +SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="2" +KEYWORDS="~amd64" +IUSE="" + +ruby_add_rdepend "dev-ruby/jmespath:1" + +all_ruby_prepare() { + # Avoid spec that gets confused by our directory names + sed -i -e '/requires prefixes from plugin names when loading/,/end/ s:^:#:' \ + spec/seahorse/client/plugin_list_spec.rb || die +} diff --git a/dev-ruby/aws-sdk-core/metadata.xml b/dev-ruby/aws-sdk-core/metadata.xml new file mode 100644 index 000000000000..eb9a6f7cf849 --- /dev/null +++ b/dev-ruby/aws-sdk-core/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>ruby</herd> + <upstream> + <remote-id type="github">aws/aws-sdk-ruby</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ruby/aws-sdk-resources/Manifest b/dev-ruby/aws-sdk-resources/Manifest new file mode 100644 index 000000000000..d42fcdfdac6d --- /dev/null +++ b/dev-ruby/aws-sdk-resources/Manifest @@ -0,0 +1 @@ +DIST aws-sdk-ruby-2.2.5.tar.gz 1671525 SHA256 5fba8661d99d939162a349fddf0a89003267856f4faaa8baa5875c916241e4d1 SHA512 93e848922b9410297ccd82d8e71477f8246c4088f6145e53e7300ff7b4d8a3683274aba794a11df9fbe3a600b0b4cf6d4487f5a45f11fe8b4aad967ae4ee6e33 WHIRLPOOL fac9dc67dc047bc652b4645612f534c08f6b29f9ce456e80d1c7d497bdc748961e15b579162b0a9d42f3f416801eb2a9a365c817698e18638ec0f4a38ff1b6b7 diff --git a/dev-ruby/aws-sdk-resources/aws-sdk-resources-2.2.5.ebuild b/dev-ruby/aws-sdk-resources/aws-sdk-resources-2.2.5.ebuild new file mode 100644 index 000000000000..e9a1a4ccad56 --- /dev/null +++ b/dev-ruby/aws-sdk-resources/aws-sdk-resources-2.2.5.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +USE_RUBY="ruby20 ruby21" + +RUBY_FAKEGEM_RECIPE_TEST="rspec3" +RUBY_FAKEGEM_RECIPE_DOC="rdoc" +RUBY_FAKEGEM_DOCDIR="doc" + +RUBY_FAKEGEM_EXTRAINSTALL="resources.schema.json" + +GITHUB_USER="aws" +GITHUB_PROJECT="aws-sdk-ruby" +RUBY_S="${GITHUB_PROJECT}-${PV}/${PN}" + +RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" + +inherit ruby-fakegem + +DESCRIPTION="Official SDK for Amazon Web Services" +HOMEPAGE="http://aws.amazon.com/sdkforruby" +SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="2" +KEYWORDS="~amd64" +IUSE="" + +ruby_add_rdepend "~dev-ruby/aws-sdk-core-${PV}" diff --git a/dev-ruby/aws-sdk-resources/metadata.xml b/dev-ruby/aws-sdk-resources/metadata.xml new file mode 100644 index 000000000000..eb9a6f7cf849 --- /dev/null +++ b/dev-ruby/aws-sdk-resources/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>ruby</herd> + <upstream> + <remote-id type="github">aws/aws-sdk-ruby</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ruby/aws-sdk/Manifest b/dev-ruby/aws-sdk/Manifest index 097bb999b4f5..7864e757251f 100644 --- a/dev-ruby/aws-sdk/Manifest +++ b/dev-ruby/aws-sdk/Manifest @@ -1 +1,2 @@ DIST aws-sdk-ruby-1.66.0.tar.gz 1774530 SHA256 265e20a99c17d3f476ce6f6e981fd37e8e529dac2a38eba1ef7a25205f8f49b6 SHA512 53b13bab1db26f9eb6ba411a7143377fbdc56548fe881742953f388af60508be30cc2c82a3dce89675be2c799774d30313d19b47875a52d4c9134ce5f4b1914c WHIRLPOOL 265d01034a3e31f8e12dc8962d67fa727e7123de0e5c56c633a84d4b7e91168f6c8ea9f4e4291ef54ef570f4675f2f087610bf11b11ec9efdb1c345c42dcb1ec +DIST aws-sdk-ruby-2.2.5.tar.gz 1671525 SHA256 5fba8661d99d939162a349fddf0a89003267856f4faaa8baa5875c916241e4d1 SHA512 93e848922b9410297ccd82d8e71477f8246c4088f6145e53e7300ff7b4d8a3683274aba794a11df9fbe3a600b0b4cf6d4487f5a45f11fe8b4aad967ae4ee6e33 WHIRLPOOL fac9dc67dc047bc652b4645612f534c08f6b29f9ce456e80d1c7d497bdc748961e15b579162b0a9d42f3f416801eb2a9a365c817698e18638ec0f4a38ff1b6b7 diff --git a/dev-ruby/aws-sdk/aws-sdk-2.2.5.ebuild b/dev-ruby/aws-sdk/aws-sdk-2.2.5.ebuild new file mode 100644 index 000000000000..b2a9596b0f3c --- /dev/null +++ b/dev-ruby/aws-sdk/aws-sdk-2.2.5.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +USE_RUBY="ruby20 ruby21" + +RUBY_FAKEGEM_RECIPE_TEST="" +RUBY_FAKEGEM_RECIPE_DOC="rdoc" +RUBY_FAKEGEM_DOCDIR="doc" +RUBY_FAKEGEM_EXTRADOC="../CHANGELOG.md ../MIGRATING.md ../README.md ../UPGRADING.md" + +GITHUB_USER="aws" +GITHUB_PROJECT="${PN}-ruby" +RUBY_S="${GITHUB_PROJECT}-${PV}/${PN}" + +RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" + +inherit ruby-fakegem + +DESCRIPTION="Official SDK for Amazon Web Services" +HOMEPAGE="http://aws.amazon.com/sdkforruby" +SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="2" +KEYWORDS="~amd64" +IUSE="" + +ruby_add_rdepend "virtual/ruby-ssl + ~dev-ruby/aws-sdk-resources-${PV}" diff --git a/dev-ruby/rmagick/Manifest b/dev-ruby/rmagick/Manifest index d37264642d9a..07777e15194b 100644 --- a/dev-ruby/rmagick/Manifest +++ b/dev-ruby/rmagick/Manifest @@ -1,3 +1,2 @@ -DIST RMagick-2.13.2.tar.bz2 1208478 SHA256 a8c2df101549f74c66f687eceada6b703183234d7ce67dc84d85d16745a638e3 SHA512 b7e9111b9221467f827e57e1d3113d714dcc5cfd32483a2a3aefc5a59fe7f98efae612145db097c3837ef55c2acd0cdde6638a94ffb595a0fba412edeb469530 WHIRLPOOL 4d89bd1a1fa341b83b539437b8a4893f955d2b196e4469d106acb49b6eac28f6777a82e4120f6a88ffc06e0d2d84e40531f713cd39388584d70ff992422b2a75 DIST rmagick-2.13.4.gem 1539584 SHA256 7877ce2fe1b05e51e62b0a4f5d17ecae6223c17bdb61c9b4e1715dd74d541afa SHA512 c458867654af82adf10e74408055920e01963292c7890b581f473f30a8b090998f085f1701e42190ee1f62de44fcecb5e593df74e68c9d7a8fc8050f359ff643 WHIRLPOOL 2aa5fc6dbc7787d41b46ec36c6e85540aa85e020c9e060df6d2ea22c74e80665f68c32e07d70a10a3a95911943c25724c92730f1edd05c7ccda3867bb725d239 DIST rmagick-2.15.4.gem 1545216 SHA256 69db6635c2630ffd63c1858646cbc280226f31a7bc34e1c9d1322c2c73e1e386 SHA512 9cb43632e510e3592e3a643117d61020d6cbec932acecc19c1e977cca001ccc04bae46669895fa2f5f0e8d43c09f1c2c429595a9358a4a74cbdbb4ecd8957b80 WHIRLPOOL 92e62fe057c6cd918577ef4a5d54021514d12cb631f7e6debbbb44f2260f361f719a03e973905552dd54089ac65f51926177de43024d0734ff0557cc1e0e0d62 diff --git a/dev-ruby/rmagick/rmagick-2.13.2-r1.ebuild b/dev-ruby/rmagick/rmagick-2.13.2-r1.ebuild deleted file mode 100644 index c735aa321e3f..000000000000 --- a/dev-ruby/rmagick/rmagick-2.13.2-r1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -USE_RUBY="ruby19 ruby20" - -RUBY_FAKEGEM_TASK_TEST="" -RUBY_FAKEGEM_TASK_DOC="" - -RUBY_FAKEGEM_EXTRADOC="ChangeLog README.html README-Mac-OSX.txt" - -inherit multilib ruby-fakegem - -DESCRIPTION="An interface between Ruby and the ImageMagick(TM) image processing library" -HOMEPAGE="http://rmagick.rubyforge.org/" -SRC_URI="mirror://rubyforge/rmagick/RMagick-${PV}.tar.bz2" - -LICENSE="Artistic" -SLOT="0" -KEYWORDS="amd64 hppa ~mips ppc ppc64 x86 ~x86-macos" -IUSE="doc" - -# hdri causes extensive changes in the imagemagick internals, and -# rmagick is not ready to deal with those, see bug 184356. -RDEPEND+=" >=media-gfx/imagemagick-6.4.9:=[-hdri]" -DEPEND+=" >=media-gfx/imagemagick-6.4.9:=[-hdri]" - -RUBY_S="RMagick-${PV}" - -each_ruby_configure() { - pushd ext/RMagick - ${RUBY} extconf.rb || die "extconf.rb failed" - popd -} - -each_ruby_compile() { - pushd ext/RMagick - emake V=1 - popd -} - -each_ruby_install() { - each_fakegem_install - ruby_fakegem_newins ext/RMagick/RMagick2$(get_modname) lib/RMagick2$(get_modname) -} - -all_ruby_install() { - all_fakegem_install - - docinto examples - dodoc examples/* - - if use doc ; then - dohtml -r doc - fi -} diff --git a/dev-ruby/ruby-elf/ruby-elf-1.0.8.ebuild b/dev-ruby/ruby-elf/ruby-elf-1.0.8.ebuild index 001f3a02820a..f969f90ebad5 100644 --- a/dev-ruby/ruby-elf/ruby-elf-1.0.8.ebuild +++ b/dev-ruby/ruby-elf/ruby-elf-1.0.8.ebuild @@ -4,7 +4,7 @@ EAPI=5 -USE_RUBY="ruby19 ruby20" +USE_RUBY="ruby19 ruby20 ruby21 ruby22" GITHUB_URI="https://github.com/Flameeyes/${PN}" diff --git a/dev-util/pycharm-professional/Manifest b/dev-util/pycharm-professional/Manifest index db23dca1a351..b878be307192 100644 --- a/dev-util/pycharm-professional/Manifest +++ b/dev-util/pycharm-professional/Manifest @@ -4,4 +4,5 @@ DIST pycharm-professional-4.5.2.tar.gz 160339662 SHA256 a736a1d648ff7ae742b86ff2 DIST pycharm-professional-4.5.3.tar.gz 160688951 SHA256 5ac0ff2ad0e5a61d93182637ff308c30227f1c2f7e396149a9720782bc336601 SHA512 ea21e30d98bd5f83438fb3c51c366828dc1ab62540b7c22c3164afdd93f338ec677795dc43177e698efc86b72d2337fc3546abb1d78bc388697312afa4f7c018 WHIRLPOOL d89217d63086b5b0213b267eabb301900e0f4fb8b16a69260ba50a153fb7568f5dfbe6dec89f6c64083fd51d9fa089fced55a324a2837cfffd2c1abebffd8db6 DIST pycharm-professional-4.5.4.tar.gz 160665389 SHA256 0d3a0a627901a1519ee77a0f2b34bc9cd7ba9a20c1276862ed5324187d25c6b7 SHA512 2f0fc1018128984bc1763c263e185763e9f2af03306d61bdc30f229dfd54bf7094e46a3758eeaacd34c9c47bb0522d52f17206ce3da283d52be685a4a34da90e WHIRLPOOL d76ec00b68642fd716bfca94e9465de1855fd4e60dc15a49ae683abc48a172d57dde166b3a13d178680bbe25b54fa863494b01bfdff575d7b0f75ddfb124d39b DIST pycharm-professional-5.0.1.tar.gz 183926748 SHA256 038501f116f5b18e5fc30c7b7edf1c076f0ec6d5f2e2c14348004dc8b6745a80 SHA512 1ffd2b8c50600d2ead207ffe6f9439dd3f008258fd530c45587779bb99c4a49f2238d956552add72f908672e69e22712699efd56f1e831f470e496734b6a702a WHIRLPOOL dc4163b7f0986e8ed6cf9643a6612743cb9279537bb8c779bb8f89ef4442ca2033a4c440458625a33860ee00771ee7d903c278a4d413c0ca0db4110009925870 +DIST pycharm-professional-5.0.2.tar.gz 187822566 SHA256 1f98d4c7d1daca6d12734617af622fba0b6aa3e2e7b5d04195e905e099e6ac21 SHA512 7af4562bcd0579a609b54f3a0afc0121661e39c5037403e779af54d1cbb319c2bb784c2816121fb4b79b3f45f13aa8d3d374c30c9eba9a7d95b129a4b6a375eb WHIRLPOOL 4f174029d7b5bee053fe745ef73ca3c665613789729917183489139af0b7fcdd0d1391a08b5b6d1d194b302aeadcd785ecfe74919647a231dd8ca4550de96608 DIST pycharm-professional-5.0.tar.gz 183117515 SHA256 066ca91c7d810765a96e82673d4241de855b82cd0d46dc88e46f00da00789c9a SHA512 183597e004604cc49dfff674f8fb9c05fa73d1a3e01dc66368f0b49ea2ada653fe28a64181697449d9adeecfda3e8d8e7105bd75aa82f9ccd9331d783146e18a WHIRLPOOL 94b5030d3131ae92c83596ff6c9f547068022048d3bf9cff9d21d3c8664664b4bf9805098bd677fe7f48ad7160f9a6d6923fe930edb99612f6718a4cd1294122 diff --git a/dev-util/pycharm-professional/pycharm-professional-5.0.2.ebuild b/dev-util/pycharm-professional/pycharm-professional-5.0.2.ebuild new file mode 100644 index 000000000000..dfb1dc5e49a8 --- /dev/null +++ b/dev-util/pycharm-professional/pycharm-professional-5.0.2.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils readme.gentoo + +DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis" +HOMEPAGE="http://www.jetbrains.com/pycharm/" +SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz" + +LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=">=virtual/jre-1.6 + dev-python/pip" +DEPEND="" + +RESTRICT="mirror strip" +QA_PREBUILT="opt/${PN}/bin/fsnotifier + opt/${PN}/bin/fsnotifier64 + opt/${PN}/bin/libyjpagent-linux.so + opt/${PN}/bin/libyjpagent-linux64.so" + +MY_PN=${PN/-professional/} +S="${WORKDIR}/${MY_PN}-${PV}" + +src_install() { + insinto /opt/${PN} + doins -r * + + fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh} + + dosym /opt/${PN}/bin/pycharm.sh /usr/bin/${PN} + newicon "bin/${MY_PN}.png" ${PN}.png + make_desktop_entry ${PN} "${PN}" "${PN}" + + readme.gentoo_src_install +} diff --git a/dev-util/sysdig/Manifest b/dev-util/sysdig/Manifest index c16e1c5cb54f..938916be5fe9 100644 --- a/dev-util/sysdig/Manifest +++ b/dev-util/sysdig/Manifest @@ -1,3 +1,4 @@ DIST sysdig-0.1.104.tar.gz 459784 SHA256 05a7ed95a1b73053cae0a77de199e84d7c9804014166527e3b211ed637c3fbab SHA512 5b2a3daeee5ce1860c3feb0e21796157f7228286df86432ec201d3ff6568458f2c2d77010b72de2f6c9cea0e7eb53ea112e988c9e83eb4df084754e0cd91b126 WHIRLPOOL b873e977403d9c36a10e77b85cbdb1bf72a70bd03b846a82c844964a57d8e84fded357e7ef7ec0ffff33c2724810eca8e19ba4c4265405f6ead446d09e41d409 DIST sysdig-0.1.92.tar.xz 244728 SHA256 794ae6cef6ab8dae029979f5985b72c15f209e927518a3881e8a7624d77d5132 SHA512 661af8eece353ba0b0ea518496da89f4525f767c2797ff9f9e5caf670b6b3e7fa0c5cb14c3852971f563b665b42105a143d458a041b270d7107a403b2ec98b11 WHIRLPOOL bb47d717bcb3c5c948f4344a56e45996cfe275a48ea19f0fa12c2fce91f81fad317c9b5c05812e9c2aaf02240b597fb85f60a5ad3ee391a1a825de62a7eab57c DIST sysdig-0.1.98.tar.xz 263328 SHA256 5d60896ad2997f3dcf5d7252a53f5f7808ded11bd7c63f3a8c2aaaa1421f018f SHA512 8e4ab622fd0d69567e63054df256bfddda5765e2cf4d89490cd871625e4bb16d3d25ecbf0965f00e312d03ef3044615a7fd94d2f704b1a833ae1da9e2f66f33a WHIRLPOOL a96f8e8635d03351e4f42e8b3959c890a63a1232df5c9cc03f9359e18a926e23561e4f4fb10986285ff757e3ee47305a7fde01905541984e5582ba740962db70 +DIST sysdig-0.5.1.tar.gz 505015 SHA256 dad586680f1615a769143d54a9ed19753dc0a4be164c680cc14dd2910a989623 SHA512 87fd22ef8d9c54b609d6e7a01f388b677159034ed462ec62c51d11ac8af6f2af872eed7274f6a04c5a4c47f8ba88844596524762ddcd017da05943ca7d1d773f WHIRLPOOL 4679453c6e45c70a06a923f75e1093c304a3a650601e67215564b3b5c211736d6484773c2f0dad76f6d0e2dbd47d645d77adaf71a5d8f12a0ac999bf11e726bf diff --git a/dev-util/sysdig/sysdig-0.5.1.ebuild b/dev-util/sysdig/sysdig-0.5.1.ebuild new file mode 100644 index 000000000000..7b979a16c7b1 --- /dev/null +++ b/dev-util/sysdig/sysdig-0.5.1.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit linux-mod bash-completion-r1 cmake-utils + +DESCRIPTION="A system exploration and troubleshooting tool" +HOMEPAGE="http://www.sysdig.org/" +SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+modules" + +RDEPEND=" + dev-lang/luajit:2= + >=dev-libs/jsoncpp-0.6_pre:0= + dev-libs/libb64:0= + sys-libs/ncurses:0= + sys-libs/zlib:0= + dev-libs/openssl:0= + net-misc/curl:0=" +DEPEND="${RDEPEND} + app-arch/xz-utils + virtual/os-headers" + +# needed for the kernel module +CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS" + +pkg_pretend() { + use modules && linux-mod_pkg_setup +} + +pkg_setup() { + use modules && linux-mod_pkg_setup +} + +src_prepare() { + sed -i -e 's:-ggdb::' CMakeLists.txt || die + + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + # we will use linux-mod for that + -DBUILD_DRIVER=OFF + # libscap examples are not installed or really useful + -DBUILD_LIBSCAP_EXAMPLES=OFF + + # unbundle the deps + -DUSE_BUNDLED_DEPS=OFF +# -DUSE_BUNDLED_LUAJIT=OFF +# -DLUAJIT_PREFIX="${EPREFIX}"/usr +# -DLUAJIT_INCLUDE="${EPREFIX}"/usr/include/luajit-2.0 +# -DUSE_BUNDLED_JSONCPP=OFF +# -DJSONCPP_PREFIX="${EPREFIX}"/usr +# -DJSONCPP_INCLUDE="${EPREFIX}"/usr/include/jsoncpp +# -DUSE_BUNDLED_NCURSES=OFF +# -DUSE_BUNDLED_OPENSSL=OFF +# -DUSE_BUNDLED_CURL=OFF +# -DZLIB_PREFIX="${EPREFIX}"/usr + ) + + cmake-utils_src_configure + + # setup linux-mod ugliness + MODULE_NAMES="sysdig-probe(extra:${BUILD_DIR}/driver:)" + BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"' + BUILD_TARGETS="driver" +} + +src_compile() { + cmake-utils_src_compile + + use modules && linux-mod_src_compile +} + +src_install() { + cmake-utils_src_install + + use modules && linux-mod_src_install + + # remove sources + rm -r "${ED%/}"/usr/src || die + + # move bashcomp to the proper location + dobashcomp "${ED%/}"/usr/etc/bash_completion.d/sysdig || die + rm -r "${ED%/}"/usr/etc || die +} diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 82b77adb4ab5..43fa8bffc970 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1663,7 +1663,12 @@ toolchain_src_install() { for x in cpp gcc g++ c++ gcov g77 gcj gcjh gfortran gccgo ; do # For some reason, g77 gets made instead of ${CTARGET}-g77... # this should take care of that - [[ -f ${x} ]] && mv ${x} ${CTARGET}-${x} + if [[ -f ${x} ]] ; then + # In case they're hardlinks, clear out the target first + # otherwise the mv below will complain. + rm -f ${CTARGET}-${x} + mv ${x} ${CTARGET}-${x} + fi if [[ -f ${CTARGET}-${x} ]] ; then if ! is_crosscompile ; then @@ -1681,6 +1686,11 @@ toolchain_src_install() { ln -sf ${CTARGET}-${x} ${CTARGET}-${x}-${GCC_CONFIG_VER} fi done + # Clear out the main go binaries as we don't want to clobber dev-lang/go + # when gcc-config runs. #567806 + if tc_version_is_at_least 5 && is_go ; then + rm -f go gofmt + fi # Now do the fun stripping stuff env RESTRICT="" CHOST=${CHOST} prepstrip "${D}${BINPATH}" diff --git a/games-action/supertuxkart/Manifest b/games-action/supertuxkart/Manifest index a1bb6cdf8f45..4250de873193 100644 --- a/games-action/supertuxkart/Manifest +++ b/games-action/supertuxkart/Manifest @@ -1,4 +1,3 @@ DIST supertuxkart-0.8.1-src.tar.bz2 229944480 SHA256 335301ae61b0c177be68d5593c65e5b197dc807421f08a8a35740a254cacf8d6 SHA512 1d72230a2cfa6196c6ea6c5464f01d1a0064994c9dafbf5d47c04b5db87e82590fde57a88d5316f2cf6094dcebae5e115b81e5ecc964a29bd669bc83d527d13a WHIRLPOOL 5cf87e57cd5b5d12e4549bf49efb0596e4a1fafa7cba58e366c843e2ebf61c02e5c3471d1591f1231194021cbcb6082829e026616403680fc7ad05bd235b155e -DIST supertuxkart-0.9-src.tar.xz 385780604 SHA256 c0eb24eb49e23ed6d03f4864feb43573e14971c8420bf60c3c654d4e05ff9aa6 SHA512 0876ad8bda49b3a26be82ee60742704608f4aca3e16fc038a06d9aa8dce9389b15fa69b547eca4b4a3c073cea495e7872924732a2e66802987c905348ff25ebb WHIRLPOOL 780c664d418de612fdfa2905dc86f0eddced5b2c0eef60b67931203afd34b418eb254d0270113846a1c51e149acd6a64157263895163fb1016a9a840384eeb51 DIST supertuxkart-0.9.1-src.tar.xz 425822808 SHA256 c50f00a71df165fb613d20e86bea2d9d5e51ed3e27e1d436fbac3b07cf2ea149 SHA512 11ea064210ea6bc36258f08e57c6aac46739133017ad3ba97ca0edd84c818c2f72dae60bbe7cd79135be9785fb0e15c9904b151c894e1c21b881598113344cf4 WHIRLPOOL 8acd59e878b44f8e504d57687ea1bbece05d5f14b29e0c62a22183729129fb115fccb9a1a89d5e0a86881ac6487c36ea520aab835ba5efaaa3c71471fda9b15f DIST supertuxkart.png 4435 SHA256 99bc1801cb0514946cb0171d6d5a84484b6dc881edfa7f096b6eb5fea2f28828 SHA512 a180332f79220431922fa8b351cb476ebc5d9d1df09f20707eb3bdd7002fd264cb027b8190c73c5221050e6e8601beb6758a5809d05aedfb18f0bdb426f47eda WHIRLPOOL eef651802a927b451226fc06a682d7dea68b65b05195130ccfc7544165f26f65bda4fc9565e09d6487d02be3cf57880b0c6c257f26587c6bc6d30afc6aa5d3c2 diff --git a/games-action/supertuxkart/supertuxkart-0.9.1.ebuild b/games-action/supertuxkart/supertuxkart-0.9.1.ebuild index b070ae748dfa..14341dad79ba 100644 --- a/games-action/supertuxkart/supertuxkart-0.9.1.ebuild +++ b/games-action/supertuxkart/supertuxkart-0.9.1.ebuild @@ -25,7 +25,7 @@ RDEPEND="media-libs/libpng:0 net-misc/curl sys-libs/zlib virtual/glu - virtual/jpeg:62 + virtual/jpeg:0 virtual/libintl virtual/opengl x11-libs/libX11 @@ -62,9 +62,9 @@ src_compile() { } src_install() { - cmake-utils_src_install + DOCS="AUTHORS CHANGELOG.md README.md TODO.md" \ + cmake-utils_src_install doicon -s 64 "${DISTDIR}"/${PN}.png - dodoc AUTHORS CHANGELOG.md README.md TODO.md prepgamesdirs } diff --git a/games-action/supertuxkart/supertuxkart-0.9.ebuild b/games-action/supertuxkart/supertuxkart-0.9.ebuild deleted file mode 100644 index b070ae748dfa..000000000000 --- a/games-action/supertuxkart/supertuxkart-0.9.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit gnome2-utils cmake-utils eutils games - -DESCRIPTION="A kart racing game starring Tux, the linux penguin (TuxKart fork)" -HOMEPAGE="http://supertuxkart.sourceforge.net/" -SRC_URI="mirror://sourceforge/supertuxkart/SuperTuxKart/${PV}/${P}-src.tar.xz - mirror://gentoo/${PN}.png" - -LICENSE="GPL-3 CC-BY-SA-3.0 CC-BY-2.0 public-domain ZLIB" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="debug fribidi wiimote" - -# don't unbundle irrlicht and bullet -# both are modified and system versions will break the game -# http://sourceforge.net/tracker/?func=detail&aid=3454889&group_id=74339&atid=540679 - -RDEPEND="media-libs/libpng:0 - media-libs/libvorbis - media-libs/openal - net-misc/curl - sys-libs/zlib - virtual/glu - virtual/jpeg:62 - virtual/libintl - virtual/opengl - x11-libs/libX11 - x11-libs/libXxf86vm - fribidi? ( dev-libs/fribidi ) - wiimote? ( net-wireless/bluez )" -DEPEND="${RDEPEND} - sys-devel/gettext - virtual/pkgconfig" - -src_prepare() { - # inconsistent handling of debug definition - # avoid using Debug build type - if use debug ; then - sed -i \ - -e 's/add_definitions(-DNDEBUG)/add_definitions(-DDEBUG)/' \ - CMakeLists.txt || die - fi -} - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_use fribidi FRIBIDI) - $(cmake-utils_use_use wiimote WIIUSE) - -DSTK_INSTALL_BINARY_DIR="${GAMES_BINDIR}" - -DSTK_INSTALL_DATA_DIR="${GAMES_DATADIR}"/${PN} - ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_install() { - cmake-utils_src_install - doicon -s 64 "${DISTDIR}"/${PN}.png - dodoc AUTHORS CHANGELOG.md README.md TODO.md - prepgamesdirs -} - -pkg_preinst() { - games_pkg_preinst - gnome2_icon_savelist -} - -pkg_postinst() { - games_pkg_postinst - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild index bd8bcdf06a11..5b8f79877faa 100644 --- a/games-emulation/dolphin/dolphin-9999.ebuild +++ b/games-emulation/dolphin/dolphin-9999.ebuild @@ -14,7 +14,7 @@ then inherit git-r3 KEYWORDS="" else - SRC_URI="https://${PN}-emu.googlecode.com/files/${P}-src.zip" + SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.zip -> ${P}.zip" KEYWORDS="~amd64" fi @@ -23,35 +23,61 @@ HOMEPAGE="https://www.dolphin-emu.org/" LICENSE="GPL-2" SLOT="0" -IUSE="alsa ao bluetooth doc ffmpeg lto +lzo openal opengl openmp portaudio pulseaudio" +IUSE="alsa ao bluetooth doc egl +evdev ffmpeg llvm log lto openal pch portaudio profile pulseaudio qt5 sdl upnp +wxwidgets" RDEPEND=">=media-libs/glew-1.10 >=media-libs/libsfml-2.1 - >=net-libs/miniupnpc-1.8 + >net-libs/enet-1.3.7 + >=net-libs/mbedtls-2.1.1 + sys-libs/glibc sys-libs/readline:= + sys-libs/zlib x11-libs/libXext + x11-libs/libXi x11-libs/libXrandr - media-libs/libsdl2[haptic,joystick] - net-libs/polarssl[havege] + virtual/libusb:1 + virtual/opengl alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) bluetooth? ( net-wireless/bluez ) - ffmpeg? ( virtual/ffmpeg - !!>=media-video/libav-10 ) - lzo? ( dev-libs/lzo ) - openal? ( media-libs/openal ) - opengl? ( virtual/opengl ) + egl? ( media-libs/mesa[egl] ) + evdev? ( + dev-libs/libevdev + virtual/udev + ) + ffmpeg? ( + virtual/ffmpeg + !!>=media-video/libav-10 + ) + llvm? ( sys-devel/llvm ) + openal? ( + media-libs/openal + media-libs/libsoundtouch + ) portaudio? ( media-libs/portaudio ) + profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) + sdl? ( media-libs/libsdl2[haptic,joystick] ) + upnp? ( >=net-libs/miniupnpc-1.7 ) + wxwidgets? ( + dev-libs/glib:2 + x11-libs/gtk+:2 + x11-libs/wxGTK:${WX_GTK_VER}[opengl,X] + ) " DEPEND="${RDEPEND} + >=dev-util/cmake-2.8.8 + >=sys-devel/gcc-4.9.0 app-arch/zip media-gfx/nvidia-cg-toolkit media-libs/freetype - media-libs/libsoundtouch - >net-libs/enet-1.3.7 - >=sys-devel/gcc-4.9.0 - x11-libs/wxGTK:${WX_GTK_VER} + sys-devel/gettext + virtual/pkgconfig " pkg_pretend() { @@ -80,6 +106,9 @@ src_prepare() { if use !bluetooth; then sed -i -e '/check_lib(BLUEZ/d' CMakeLists.txt || die fi + if use !llvm; then + sed -i -e '/include(FindLLVM/d' CMakeLists.txt || die + fi if use !openal; then sed -i -e '/include(FindOpenAL/d' CMakeLists.txt || die fi @@ -111,6 +140,10 @@ src_prepare() { src_configure() { + if use wxwidgets; then + need-wxwidgets unicode + fi + local mycmakeargs=( "-DDOLPHIN_WC_REVISION=${PV}" "-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}" @@ -119,8 +152,16 @@ src_configure() { "-Dplugindir=$(games_get_libdir)/${PN}" "-DUSE_SHARED_ENET=ON" $( cmake-utils_use ffmpeg ENCODE_FRAMEDUMPS ) + $( cmake-utils_use log FASTLOG ) + $( cmake-utils_use profile OPROFILING ) + $( cmake-utils_use_disable wxwidgets WX ) + $( cmake-utils_use_enable evdev EVDEV ) $( cmake-utils_use_enable lto LTO ) - $( cmake-utils_use openmp OPENMP ) + $( cmake-utils_use_enable pch PCH ) + $( cmake-utils_use_enable qt5 QT ) + $( cmake-utils_use_enable sdl SDL ) + $( cmake-utils_use_use egl EGL ) + $( cmake-utils_use_use upnp UPNP ) ) cmake-utils_src_configure diff --git a/games-emulation/dolphin/metadata.xml b/games-emulation/dolphin/metadata.xml index 17c3f1ff970d..2e94d663a924 100644 --- a/games-emulation/dolphin/metadata.xml +++ b/games-emulation/dolphin/metadata.xml @@ -2,6 +2,10 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <use> + <flag name="egl">Enable EGL support</flag> + <flag name="evdev">Enable evdev input support</flag> + <flag name="llvm">Enable the LLVM-based disassembler for debugger mode</flag> + <flag name="log">Increase logging output</flag> <flag name="lto">Add support for link-time optimizations.</flag> </use> <longdescription lang="en"> diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest index 58c95891ecef..e7a2fa4bc96a 100644 --- a/net-misc/wget/Manifest +++ b/net-misc/wget/Manifest @@ -1,3 +1,2 @@ DIST wget-1.16.3.tar.xz 1794148 SHA256 67f7b7b0f5c14db633e3b18f53172786c001e153d545cfc85d82759c5c2ffb37 SHA512 2d1fe632bcd116a68ae333278e368cb810081b51d2259ddade602bebf3dd08dee1f51f67c9c7d79d2410e19fe0d48a0b9a1b1a7c7c6eeb47e2840ce6c1a3471c WHIRLPOOL b8fe9880523fc295b092c3b9ff4f9af58c071f55d516903ded66df67722cd27955ad651f6f2f6032b611e5445dd89b8ff97878443abc04d095c29e76f0564490 -DIST wget-1.17-fix_disabled_ipv6.patch 4218 SHA256 3ba621258f60fe4b64735f0beed8b691c58b502a6109a1116c819a76b0e02147 SHA512 83a123fa0f2b269993265dd0e23d35bab2d82e7e9055689987a19b09a9c7833e5ffd33d136ee0e5c0645f1a81f65d4f155b9a96c20a1fa7270dbbc674f1bad3b WHIRLPOOL b74fb6d3ae67be9ab924b1eee87a6b48b0b8b4bb34d0cb42697af408ee1ea5734c265b745692c41da73c7885523b305c4b4c3f043bf2431b37f950e6ca9406ef -DIST wget-1.17.tar.xz 1884628 SHA256 bd69d63acbf329a8286ccebbe63cd4fecc998718131a0d4b2ab9239542d2bb87 SHA512 4936dad41580f6ba33df73de041e407cd6dd5266af4af947ebf4c54457f0f296e3462cfff1fb203b27ff5760ec4f6f4d24ea4faceeea461f98c22b031225947f WHIRLPOOL a0e87d20e99276c74c7ea17e09893481d02e431a19184cbc2b0245d61b555f521293de89de7c27f5645d8ad22f2628ab0aab42b901ccd548c19bf026b8f1bef4 +DIST wget-1.17.1.tar.xz 1894140 SHA256 fe559b61eb9cc01635ac6206a14e02cb51591838c35fa83c7a4aacae0bdd97c9 SHA512 aa13584c94d0911268aeee9d6c7b1a7de259e0ec0f9daebe767e1f45afba097a6e9de09f370e55ead7acc9faa68f189063ac9e3d2d4a8d490f0b4edb6adc19ba WHIRLPOOL 3efbac1862cb6537ea08eeb95dea2f34ca29f6a170c80961ef3037d411458ac343dfd13f2ff056b528e6591fb282eaf4bf1c2113939b25764c39630510b35cf0 diff --git a/net-misc/wget/wget-1.17.ebuild b/net-misc/wget/wget-1.17.1.ebuild index dc0a5883c40d..86a006c0bb5b 100644 --- a/net-misc/wget/wget-1.17.ebuild +++ b/net-misc/wget/wget-1.17.1.ebuild @@ -9,8 +9,7 @@ inherit flag-o-matic python-any-r1 toolchain-funcs DESCRIPTION="Network utility to retrieve files from the WWW" HOMEPAGE="https://www.gnu.org/software/wget/" -SRC_URI="mirror://gnu/wget/${P}.tar.xz - http://git.savannah.gnu.org/cgit/wget.git/patch/?id=2cfcadf5e6d5c444765aa460915ae27109a8dbce -> ${PN}-1.17-fix_disabled_ipv6.patch" +SRC_URI="mirror://gnu/wget/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" @@ -49,10 +48,6 @@ pkg_setup() { use test && python-any-r1_pkg_setup } -src_prepare() { - epatch "${DISTDIR}"/${P}-fix_disabled_ipv6.patch -} - src_configure() { # fix compilation on Solaris, we need filio.h for FIONBIO as used in # the included gnutls -- force ioctl.h to include this header diff --git a/net-p2p/bitcoinxt-qt/Manifest b/net-p2p/bitcoinxt-qt/Manifest new file mode 100644 index 000000000000..fb8aed061c65 --- /dev/null +++ b/net-p2p/bitcoinxt-qt/Manifest @@ -0,0 +1 @@ +DIST bitcoinxt-qt-0.11.0d.tar.gz 5408217 SHA256 66b4bd52ed8b97e28da46ac552396c40853a9d7f765063603552e1cf118a2227 SHA512 98dd980c1cc65006160819f0e9045bc962cc6faddbde22f7bfea4bbcfef4662a5c1280386f9f68b42bc3e3e99e89ecf02d211fe20107bba57c14e6b3017a339c WHIRLPOOL 9468d20db5ec7e6f5d4f96156ab5568f0870ccb4b8037a9ec3bb0e3636a59f07a846ca731ebe99affda5cfbcd3ec117beeaff025f7aad0ab23a88379ae2c1b23 diff --git a/net-p2p/bitcoinxt-qt/bitcoinxt-qt-0.11.0d.ebuild b/net-p2p/bitcoinxt-qt/bitcoinxt-qt-0.11.0d.ebuild new file mode 100644 index 000000000000..dfbf4a76fa44 --- /dev/null +++ b/net-p2p/bitcoinxt-qt/bitcoinxt-qt-0.11.0d.ebuild @@ -0,0 +1,197 @@ +# Copyright 2010-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +DB_VER="4.8" + +inherit db-use autotools eutils toolchain-funcs user fdo-mime gnome2-utils kde4-functions qt4-r2 + +DESCRIPTION="BitcoinXT crypto-currency GUI wallet" +HOMEPAGE="https://github/bitcoinxt/bitcoinxt" +My_PV="${PV/\.0d/}D" +SRC_URI="https://github.com/bitcoinxt/bitcoinxt/archive/v${My_PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux" +IUSE="dbus +doc kde libressl ljr +logrotate +qrcode qt4 qt5 +ssl test upnp +wallet" +REQUIRED_USE="${REQUIRED_USE} ^^ ( qt4 qt5 )" + +LANGS="ach af_ZA ar be_BY bg bs ca ca@valencia ca_ES cmn cs cy da de el_GR en eo es es_CL es_DO es_MX es_UY et eu_ES fa fa_IR fi fr fr_CA gl gu_IN he hi_IN hr hu id_ID it ja ka kk_KZ ko_KR ky la lt lv_LV mn ms_MY nb nl pam pl pt_BR pt_PT ro_RO ru sah sk sl_SI sq sr sv th_TH tr uk ur_PK uz@Cyrl vi vi_VN zh_HK zh_CN zh_TW" +for X in ${LANGS} ; do + IUSE="${IUSE} linguas_${X}" +done + +OPENSSL_DEPEND=" + !libressl? ( dev-libs/openssl:0[-bindist] ) + libressl? ( dev-libs/libressl )" +WALLET_DEPEND="media-gfx/qrencode sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx]" + +RDEPEND=" + dev-libs/protobuf + qrcode? ( + media-gfx/qrencode + ) + qt4? ( dev-qt/qtgui:4 ) + qt5? ( dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/linguist-tools:5 ) + app-shells/bash:0 + dev-libs/boost[threads(+)] + dev-libs/glib:2 + dev-libs/crypto++ + ssl? ( ${OPENSSL_DEPEND} ) + logrotate? ( app-admin/logrotate ) + wallet? ( ${WALLET_DEPEND} ) + upnp? ( net-libs/miniupnpc ) + virtual/bitcoin-leveldb + dbus? ( + qt4? ( dev-qt/qtdbus:4 ) + qt5? ( dev-qt/qtdbus:5 ) + ) +" + +DEPEND="${RDEPEND}" + +S="${WORKDIR}/bitcoinxt-${My_PV}" + +pkg_setup() { + local UG='bitcoinxt' + enewgroup "${UG}" + enewuser "${UG}" -1 -1 /var/lib/bitcoinxt "${UG}" + # force this user to the sh shell - which is normally bash + chsh -s /bin/sh ${UG} + elog "user ${UG} set to allow logins" + elog "" + elog "Do not forget to set the password for ${UG} to allow you to log in" +} + +src_prepare() { + epatch "${FILESDIR}/9999-syslibs.patch" + + local filt= yeslang= nolang= + + for lan in $LANGS; do + if [ ! -e src/qt/locale/bitcoin_$lan.ts ]; then + die "Language '$lan' no longer supported. Ebuild needs update." + fi + done + + for ts in $(ls src/qt/locale/*.ts) + do + x="${ts/*bitcoin_/}" + x="${x/.ts/}" + if ! use "linguas_$x"; then + nolang="$nolang $x" + rm "$ts" + filt="$filt\\|$x" + else + yeslang="$yeslang $x" + fi + done + filt="bitcoin_\\(${filt:2}\\)\\.\(qm\|ts\)" + sed "/${filt}/d" -i 'src/qt/bitcoin_locale.qrc' + sed "s/locale\/${filt}/bitcoin.qrc/" -i 'src/Makefile.qt.include' + einfo "Languages -- Enabled:$yeslang -- Disabled:$nolang" + + cd "${S}" + eautoreconf +} + +src_configure() { + local my_econf= + + if use upnp; then + my_econf="${my_econf} --with-miniupnpc --enable-upnp-default" + else + my_econf="${my_econf} --without-miniupnpc --disable-upnp-default" + fi + if use wallet; then + my_econf="${my_econf} --enable-wallet" + else + my_econf="${my_econf} --disable-wallet" + fi + my_econf="${my_econf} --with-system-leveldb" + econf \ + --disable-ccache \ + --disable-static \ + --without-libs \ + --without-utils \ + --without-daemon \ + ${my_econf} \ + $(use_with dbus qtdbus) \ + $(use_with qrcode qrencode) \ + --with-gui=$(usex qt5 qt5 qt4) + "$@" +} + +src_compile() { + local OPTS=() + + OPTS+=("CXXFLAGS=${CXXFLAGS} -I$(db_includedir "${DB_VER}")") + OPTS+=("LDFLAGS=${LDFLAGS} -ldb_cxx-${DB_VER}") + + use ssl && OPTS+=(USE_SSL=1) + use upnp && OPTS+=(USE_UPNP=1) + + cd src || die + emake CXX="$(tc-getCXX)" "${OPTS[@]}" + mv qt/bitcoin-qt ${PN} +} + +src_install() { + local my_topdir="/var/lib/bitcoinxt" + local my_data="${my_topdir}/.bitcoin" + + dobin src/${PN} + + insinto "${my_data}" + if [ -f "${ROOT}${my_data}/bitcoin.conf" ]; then + elog "${EROOT}${my_data}/bitcoin.conf already installed - not overwriting it" + else + doins "${FILESDIR}/bitcoin.conf" + elog "default ${EROOT}${my_data}/bitcoin.conf installed - you will need to edit it" + fowners bitcoinxt:bitcoinxt "${my_data}/bitcoin.conf" + fperms 400 "${my_data}/bitcoin.conf" + fi + + keepdir "${my_data}" + fperms 700 "${my_topdir}" + fowners bitcoinxt:bitcoinxt "${my_topdir}" + fowners bitcoinxt:bitcoinxt "${my_data}" + + insinto /usr/share/pixmaps + newins "share/pixmaps/bitcoin.ico" "${PN}.ico" + make_desktop_entry "${PN} %u" "BitcoinXT-Qt" "/usr/share/pixmaps/${PN}.ico" "Qt;Network;P2P;Office;Finance;" "MimeType=x-scheme-handler/bitcoin;\nTerminal=false" + + if use kde; then + insinto /usr/share/kde4/services + doins contrib/debian/bitcoin-qt.protocol + fi + + if use doc; then + dodoc README.md + dodoc doc/release-notes.md + dodoc doc/assets-attribution.md doc/bips.md doc/tor.md + doman contrib/debian/manpages/bitcoin-qt.1 + fi + + if use logrotate; then + insinto /etc/logrotate.d + newins "${FILESDIR}/bitcoinxtd.logrotate" bitcoinxtd + fi +} + +update_caches() { + gnome2_icon_cache_update + fdo-mime_desktop_database_update + buildsycoca +} + +pkg_postinst() { + update_caches +} + +pkg_postrm() { + update_caches +} diff --git a/net-p2p/bitcoinxt-qt/files/9999-syslibs.patch b/net-p2p/bitcoinxt-qt/files/9999-syslibs.patch new file mode 100644 index 000000000000..2cdf2ab9837b --- /dev/null +++ b/net-p2p/bitcoinxt-qt/files/9999-syslibs.patch @@ -0,0 +1,243 @@ +diff --git a/build-aux/m4/bitcoin_subdir_to_include.m4 b/build-aux/m4/bitcoin_subdir_to_include.m4 +index 66f106c..5f0a3b1 100644 +--- a/build-aux/m4/bitcoin_subdir_to_include.m4 ++++ b/build-aux/m4/bitcoin_subdir_to_include.m4 +@@ -5,7 +5,7 @@ AC_DEFUN([BITCOIN_SUBDIR_TO_INCLUDE],[ + AC_MSG_RESULT([default]) + else + echo "#include <$2$3.h>" >conftest.cpp +- newinclpath=`${CXXCPP} ${CPPFLAGS} -M conftest.cpp 2>/dev/null | [ tr -d '\\n\\r\\\\' | sed -e 's/^.*[[:space:]:]\(\/[^[:space:]]*\)]$3[\.h[[:space:]].*$/\1/' -e t -e d`] ++ newinclpath=$(${CXXCPP} ${CPPFLAGS} -M conftest.cpp 2>/dev/null | sed [-E -e ':a' -e '/\\$/!b b' -e N -e 's/\\\n/ /' -e 't a' -e ':b' -e 's/^[^:]*:[[:space:]]*(([^[:space:]\]|\\.)*[[:space:]])*(([^[:space:]\]|\\.)*)]$3\.h[([[:space:]].*)?$/\3/' -e 't' -e d]) + AC_MSG_RESULT([${newinclpath}]) + if test "x${newinclpath}" != "x"; then + eval "$1=\"\$$1\"' -I${newinclpath}'" +diff --git a/configure.ac b/configure.ac +index 37fe47e..14e5c34 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -170,6 +170,18 @@ AC_ARG_WITH([utils], + [build_bitcoin_utils=$withval], + [build_bitcoin_utils=yes]) + ++AC_ARG_ENABLE([util-cli], ++ [AS_HELP_STRING([--enable-util-cli], ++ [build bitcoin-cli])], ++ [build_bitcoin_cli=$enableval], ++ [build_bitcoin_cli=$build_bitcoin_utils]) ++ ++AC_ARG_ENABLE([util-tx], ++ [AS_HELP_STRING([--enable-util-tx], ++ [build bitcoin-tx])], ++ [build_bitcoin_tx=$enableval], ++ [build_bitcoin_tx=$build_bitcoin_utils]) ++ + AC_ARG_WITH([libs], + [AS_HELP_STRING([--with-libs], + [build libraries (default=yes)])], +@@ -488,14 +500,65 @@ if test x$use_reduce_exports = xyes; then + [AC_MSG_ERROR([Cannot set default symbol visibility. Use --disable-reduce-exports.])]) + fi + ++dnl Check for leveldb, only if explicitly requested + LEVELDB_CPPFLAGS= + LIBLEVELDB= + LIBMEMENV= +-AM_CONDITIONAL([EMBEDDED_LEVELDB],[true]) ++AC_ARG_WITH([system-leveldb], ++ [AS_HELP_STRING([--with-system-leveldb], ++ [Build with system LevelDB (default is no; DANGEROUS; NOT SUPPORTED)])], ++ [system_leveldb=$withval], ++ [system_leveldb=no] ++) ++if test x$system_leveldb != xno; then ++ LEVELDB_CPPFLAGS= ++ AC_CHECK_LIB([leveldb],[main],[ ++ LIBLEVELDB=-lleveldb ++ ],[ ++ AC_MSG_ERROR([leveldb library not found; using --with-system-leveldb is not supported anyway]) ++ ]) ++ TEMP_LIBS="$LIBS" ++ LIBS="$LIBS $LIBLEVELDB" ++ AC_CHECK_LIB([memenv],[main],[ ++ LIBMEMENV=-lmemenv ++ ],[ ++ AC_MSG_ERROR([LevelDB's memenv library not found; using --with-system-leveldb is not supported anyway]) ++ ]) ++ LIBS="$TEMP_LIBS" ++ AC_CHECK_HEADER([leveldb/filter_policy.h],[],[ ++ AC_MSG_ERROR([LevelDB headers not found; using --with-system-leveldb is not supported anyway]) ++ ]) ++ AC_CHECK_HEADER([leveldb/helpers/memenv.h],[ ++ AC_MSG_CHECKING([for memenv.h path]) ++ BITCOIN_SUBDIR_TO_INCLUDE([LEVELDB_CPPFLAGS],[leveldb/helpers/],[memenv]) ++ ],[ ++ AC_CHECK_HEADER([memenv.h],[],[ ++ AC_MSG_ERROR([LevelDB headers not found; using --with-system-leveldb is not supported anyway]) ++ ]) ++ ]) ++fi ++AM_CONDITIONAL([EMBEDDED_LEVELDB],[test x$system_leveldb = xno]) + AC_SUBST(LEVELDB_CPPFLAGS) + AC_SUBST(LIBLEVELDB) + AC_SUBST(LIBMEMENV) + ++dnl Check for libsecp256k1, only if explicitly requested ++AC_ARG_WITH([system-libsecp256k1], ++ [AS_HELP_STRING([--with-system-libsecp256k1], ++ [Build with system libsecp256k1 (default is no; DANGEROUS; NOT SUPPORTED)])], ++ [system_libsecp256k1=$withval], ++ [system_libsecp256k1=no] ++) ++if test x$system_libsecp256k1 != xno; then ++ PKG_CHECK_MODULES([libsecp256k1],[libsecp256k1],,[true]) ++else ++ libsecp256k1_CFLAGS='-I$(srcdir)/secp256k1/include' ++ libsecp256k1_LIBS='secp256k1/libsecp256k1.la' ++fi ++AM_CONDITIONAL([EMBEDDED_LIBSECP256K1],[test x$system_libsecp256k1 = xno]) ++AC_SUBST(libsecp256k1_CFLAGS) ++AC_SUBST(libsecp256k1_LIBS) ++ + if test x$enable_wallet != xno; then + dnl Check for libdb_cxx only if wallet enabled + BITCOIN_FIND_BDB48 +@@ -515,7 +578,7 @@ BITCOIN_QT_INIT + dnl sets $bitcoin_enable_qt, $bitcoin_enable_qt_test, $bitcoin_enable_qt_dbus + BITCOIN_QT_CONFIGURE([$use_pkgconfig], [qt4]) + +-if test x$build_bitcoin_utils$build_bitcoind$bitcoin_enable_qt$use_tests = xnononono; then ++if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoind$bitcoin_enable_qt$use_tests = xnonononono; then + use_boost=no + else + use_boost=yes +@@ -701,9 +764,13 @@ AC_MSG_CHECKING([whether to build bitcoind]) + AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes]) + AC_MSG_RESULT($build_bitcoind) + +-AC_MSG_CHECKING([whether to build utils (bitcoin-cli bitcoin-tx)]) +-AM_CONDITIONAL([BUILD_BITCOIN_UTILS], [test x$build_bitcoin_utils = xyes]) +-AC_MSG_RESULT($build_bitcoin_utils) ++AC_MSG_CHECKING([whether to build bitcoin-cli]) ++AM_CONDITIONAL([BUILD_BITCOIN_CLI], [test x$build_bitcoin_cli = xyes]) ++AC_MSG_RESULT($build_bitcoin_cli) ++ ++AC_MSG_CHECKING([whether to build bitcoin-tx]) ++AM_CONDITIONAL([BUILD_BITCOIN_TX], [test x$build_bitcoin_tx = xyes]) ++AC_MSG_RESULT($build_bitcoin_tx) + + AC_MSG_CHECKING([whether to build libraries]) + AM_CONDITIONAL([BUILD_BITCOIN_LIBS], [test x$build_bitcoin_libs = xyes]) +@@ -826,7 +893,7 @@ else + AC_MSG_RESULT([no]) + fi + +-if test x$build_bitcoin_utils$build_bitcoin_libs$build_bitcoind$bitcoin_enable_qt$use_tests = xnonononono; then ++if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoin_libs$build_bitcoind$bitcoin_enable_qt$use_tests = xnononononono; then + AC_MSG_ERROR([No targets! Please specify at least one of: --with-utils --with-libs --with-daemon --with-gui or --enable-tests]) + fi + +@@ -895,8 +962,10 @@ PKGCONFIG_LIBDIR_TEMP="$PKG_CONFIG_LIBDIR" + unset PKG_CONFIG_LIBDIR + PKG_CONFIG_LIBDIR="$PKGCONFIG_LIBDIR_TEMP" + ++if test x$system_libsecp256k1 = xno; then + ac_configure_args="${ac_configure_args} --disable-shared --with-pic --with-bignum=no" + AC_CONFIG_SUBDIRS([src/secp256k1]) ++fi + + AC_OUTPUT + +diff --git a/qa/pull-tester/rpc-tests.sh b/qa/pull-tester/rpc-tests.sh +index 9b31865..5bb187c 100755 +--- a/qa/pull-tester/rpc-tests.sh ++++ b/qa/pull-tester/rpc-tests.sh +@@ -57,7 +57,7 @@ testScriptsExt=( + extArg="-extended" + passOn=${@#$extArg} + +-if [ "x${ENABLE_BITCOIND}${ENABLE_UTILS}${ENABLE_WALLET}" = "x111" ]; then ++if [ "x${ENABLE_BITCOIND}${ENABLE_CLI}${ENABLE_WALLET}" = "x111" ]; then + for (( i = 0; i < ${#testScripts[@]}; i++ )) + do + if [ -z "$1" ] || [ "${1:0:1}" == "-" ] || [ "$1" == "${testScripts[$i]}" ] || [ "$1.py" == "${testScripts[$i]}" ] +diff --git a/qa/pull-tester/tests-config.sh.in b/qa/pull-tester/tests-config.sh.in +index 10f4d33..e0e407d 100755 +--- a/qa/pull-tester/tests-config.sh.in ++++ b/qa/pull-tester/tests-config.sh.in +@@ -8,7 +8,7 @@ EXEEXT="@EXEEXT@" + + # These will turn into comments if they were disabled when configuring. + @ENABLE_WALLET_TRUE@ENABLE_WALLET=1 +-@BUILD_BITCOIN_UTILS_TRUE@ENABLE_UTILS=1 ++@BUILD_BITCOIN_CLI_TRUE@ENABLE_CLI=1 + @BUILD_BITCOIND_TRUE@ENABLE_BITCOIND=1 + + REAL_BITCOIND="$BUILDDIR/src/bitcoind${EXEEXT}" +diff --git a/src/Makefile.am b/src/Makefile.am +index 1c2f770..4d60ddf 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -1,4 +1,6 @@ ++if EMBEDDED_LIBSECP256K1 + DIST_SUBDIRS = secp256k1 ++endif + AM_LDFLAGS = $(PTHREAD_CFLAGS) $(LIBTOOL_LDFLAGS) + + +@@ -20,7 +22,7 @@ endif + BITCOIN_CONFIG_INCLUDES=-I$(builddir)/config + BITCOIN_INCLUDES=-I$(builddir) -I$(builddir)/obj $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) $(CRYPTO_CFLAGS) $(SSL_CFLAGS) + +-BITCOIN_INCLUDES += -I$(srcdir)/secp256k1/include ++BITCOIN_INCLUDES += $(libsecp256k1_CFLAGS) + + LIBBITCOIN_SERVER=libbitcoin_server.a + LIBBITCOIN_WALLET=libbitcoin_wallet.a +@@ -30,10 +32,16 @@ LIBBITCOIN_UTIL=libbitcoin_util.a + LIBBITCOIN_CRYPTO=crypto/libbitcoin_crypto.a + LIBBITCOIN_UNIVALUE=univalue/libbitcoin_univalue.a + LIBBITCOINQT=qt/libbitcoinqt.a ++if EMBEDDED_LIBSECP256K1 + LIBSECP256K1=secp256k1/libsecp256k1.la ++else ++LIBSECP256K1=$(libsecp256k1_LIBS) ++endif + ++if EMBEDDED_LIBSECP256K1 + $(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*) + $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) ++endif + + # Make is not made aware of per-object dependencies to avoid limiting building parallelization + # But to build the less dependent modules first, we manually select their order here: +@@ -63,8 +71,11 @@ if BUILD_BITCOIND + bin_PROGRAMS += bitcoind + endif + +-if BUILD_BITCOIN_UTILS +- bin_PROGRAMS += bitcoin-cli bitcoin-tx ++if BUILD_BITCOIN_CLI ++ bin_PROGRAMS += bitcoin-cli ++endif ++if BUILD_BITCOIN_TX ++ bin_PROGRAMS += bitcoin-tx + endif + + .PHONY: FORCE +diff --git a/src/Makefile.test.include b/src/Makefile.test.include +index 0997148..14b4deb 100644 +--- a/src/Makefile.test.include ++++ b/src/Makefile.test.include +@@ -111,10 +111,12 @@ bitcoin_test_check: $(TEST_BINARY) FORCE + bitcoin_test_clean : FORCE + rm -f $(CLEAN_BITCOIN_TEST) $(test_test_bitcoin_OBJECTS) $(TEST_BINARY) + ++if EMBEDDED_LIBSECP256K1 + check-local: + @echo "Running test/bitcoin-util-test.py..." + $(AM_V_at)srcdir=$(srcdir) PYTHONPATH=$(builddir)/test $(srcdir)/test/bitcoin-util-test.py + $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check ++endif + + %.json.h: %.json + @$(MKDIR_P) $(@D) diff --git a/net-p2p/bitcoinxtd/files/bitcoinxt.conf b/net-p2p/bitcoinxt-qt/files/bitcoin.conf index c6a55f3d9133..c6a55f3d9133 100644 --- a/net-p2p/bitcoinxtd/files/bitcoinxt.conf +++ b/net-p2p/bitcoinxt-qt/files/bitcoin.conf diff --git a/net-p2p/bitcoinxt-qt/files/bitcoinxtd.logrotate b/net-p2p/bitcoinxt-qt/files/bitcoinxtd.logrotate new file mode 100644 index 000000000000..d23bac78b8fa --- /dev/null +++ b/net-p2p/bitcoinxt-qt/files/bitcoinxtd.logrotate @@ -0,0 +1,8 @@ +/var/lib/bitcoinxt/.bitcoinxt/debug.log { + missingok + weekly + sharedscripts + postrotate + killall -HUP bitcoinxtd + endscript +} diff --git a/net-p2p/bitcoinxt-qt/metadata.xml b/net-p2p/bitcoinxt-qt/metadata.xml new file mode 100644 index 000000000000..bc630878c880 --- /dev/null +++ b/net-p2p/bitcoinxt-qt/metadata.xml @@ -0,0 +1,22 @@ +<?xml version='1.0' encoding='UTF-8'?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>proxy-maintainers</herd> + <maintainer> + <email>blueness@gentoo.org</email> + <name>Anthony G. Basile</name> + </maintainer> + <maintainer> + <email>rono@sentuny.com</email> + <name>Ron OHara</name> + </maintainer> + <use> + <flag name="logrotate">Use app-admin/logrotate for rotating logs</flag> + <flag name="ljr">Enable Luke Dashjr's patches</flag> + <flag name="qrcode">Enable generation of QR Codes for receiving payments</flag> + <flag name="wallet">Enable wallet support</flag> + </use> + <upstream> + <remote-id type="github">bitcoinxt/bitcoinxt</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-p2p/bitcoinxtd/Manifest b/net-p2p/bitcoinxtd/Manifest index 0b2beb961c57..f5c7d53244a7 100644 --- a/net-p2p/bitcoinxtd/Manifest +++ b/net-p2p/bitcoinxtd/Manifest @@ -1 +1 @@ -DIST bitcoinxtd-0.11.0.tar.gz 5226736 SHA256 f6fc1651b3cad90bae6f9d70a5f476ca4cd9b8b38681331bccc6d2651c5e2c89 SHA512 044f2b95644b831641fc48fe65e980438e58e784635b32f393e9aeb6473124708df3870aa3bd3848acd90b4b9785fba9163ad07e5ea7d243c175741429bc2b6b WHIRLPOOL 5b2e692e0ccafff454260bb1f8871bec2775c21124e22cf11fd3d175b2d25634fc514e0cfe6b6334e20692846319e9f5fd1a580d8ef31389d6e84025bc600eaa +DIST bitcoinxtd-0.11.0d.tar.gz 5408217 SHA256 66b4bd52ed8b97e28da46ac552396c40853a9d7f765063603552e1cf118a2227 SHA512 98dd980c1cc65006160819f0e9045bc962cc6faddbde22f7bfea4bbcfef4662a5c1280386f9f68b42bc3e3e99e89ecf02d211fe20107bba57c14e6b3017a339c WHIRLPOOL 9468d20db5ec7e6f5d4f96156ab5568f0870ccb4b8037a9ec3bb0e3636a59f07a846ca731ebe99affda5cfbcd3ec117beeaff025f7aad0ab23a88379ae2c1b23 diff --git a/net-p2p/bitcoinxtd/bitcoinxtd-0.11.0.ebuild b/net-p2p/bitcoinxtd/bitcoinxtd-0.11.0d.ebuild index 78c23669c929..c4d3929240b9 100644 --- a/net-p2p/bitcoinxtd/bitcoinxtd-0.11.0.ebuild +++ b/net-p2p/bitcoinxtd/bitcoinxtd-0.11.0d.ebuild @@ -9,21 +9,22 @@ DB_VER="4.8" inherit db-use autotools eutils toolchain-funcs user systemd DESCRIPTION="BitcoinXT crypto-currency wallet for automated services" -HOMEPAGE="https://github.com/bitcoinxt/bitcoinxt" -My_PV="${PV/\.0/}A" +HOMEPAGE="https://github/bitcoinxt/bitcoinxt" +My_PV="${PV/\.0d/}D" SRC_URI="https://github.com/bitcoinxt/bitcoinxt/archive/v${My_PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="+doc +ssl +logrotate +upnp +wallet" +IUSE="+doc libressl +logrotate +ssl +upnp +wallet" -OPENSSL_DEPEND="dev-libs/openssl:0[-bindist]" +OPENSSL_DEPEND=" + !libressl? ( dev-libs/openssl:0[-bindist] ) + libressl? ( dev-libs/libressl )" WALLET_DEPEND="media-gfx/qrencode sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx]" RDEPEND=" app-shells/bash:0 - sys-apps/sed dev-libs/boost[threads(+)] dev-libs/glib:2 dev-libs/crypto++ @@ -90,14 +91,19 @@ src_compile() { src_install() { local my_topdir="/var/lib/bitcoinxt" - local my_data="${my_topdir}/.bitcoinxt" + local my_data="${my_topdir}/.bitcoin" dobin src/${PN} insinto "${my_data}" - doins "${FILESDIR}/bitcoinxt.conf" - fowners bitcoinxt:bitcoinxt "${my_data}/bitcoinxt.conf" - fperms 600 "${my_data}/bitcoinxt.conf" + if [ -f "${ROOT}${my_data}/bitcoin.conf" ]; then + elog "${EROOT}${my_data}/bitcoin.conf already installed - not overwriting it" + else + doins "${FILESDIR}/bitcoin.conf" + elog "default ${EROOT}${my_data}/bitcoin.conf installed - you will need to edit it" + fowners bitcoinxt:bitcoinxt "${my_data}/bitcoin.conf" + fperms 400 "${my_data}/bitcoin.conf" + fi newconfd "${FILESDIR}/bitcoinxt.confd" ${PN} newinitd "${FILESDIR}/bitcoinxt.initd" ${PN} diff --git a/net-p2p/bitcoinxtd/files/bitcoin.conf b/net-p2p/bitcoinxtd/files/bitcoin.conf new file mode 100644 index 000000000000..c6a55f3d9133 --- /dev/null +++ b/net-p2p/bitcoinxtd/files/bitcoin.conf @@ -0,0 +1,8 @@ +# http://www.bitcoin.org/smf/index.php?topic=644.0 +#rpcuser= +#rpcpassword= + + + + + diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest index 8dfca5ce9197..a8d4281eeca1 100644 --- a/net-print/cups-filters/Manifest +++ b/net-print/cups-filters/Manifest @@ -1,2 +1,3 @@ DIST cups-filters-1.0.71.tar.xz 1339116 SHA256 3180aa209c383402822e568ccef8e1ca43f51e30b3af2039c34ebae919a69c1f SHA512 dc243e88d535c8d7e7fd53074b1093a46fc22742504efa09096d2b216846df875e4d914f25d2f726034692538cfdf1b713bc1ef44d199003a21e242b99f44a01 WHIRLPOOL 4afc7079594563f57af81501192cc0cba19db6cd5c10a9544339858a343e245b485e528fbf80eecd711341b23b8321bde817c49db7ddd2f0b801da2b4b9c580d DIST cups-filters-1.2.0.tar.xz 1357268 SHA256 31dcb71dc79129056a5b0f6d30880bdb6511ee7acd06a3f5bd4e9d2684801d62 SHA512 1389d45607bee8376f23efc9b723df276002bf47292670e6cc872a8896ffe06d9eb0aa6f2be0c8c0ad86c8831bcc8f3779baa78d52224fb17dc2bf4ce9a97ca2 WHIRLPOOL 40b75a8ea04774f264691b85065a05296653c2c8e1de4b459a1ae995b4ea23ddbdd0b2e5ae7ab651f7486962507eb64f211034c6f8f24a958af15c794e12afc5 +DIST cups-filters-1.3.0.tar.xz 1362904 SHA256 61b669809dda352a427546e09de5a68a3d960c7646ef5c590772d4aa1b445995 SHA512 3bff2a836be4f2722e2c06ea1ef8faf994c38eba244482cd1b84c33cef4d156e41470a4c7feda31c96ab01fc3872fcbba411ed4ce71fa4b57e817336d7e11888 WHIRLPOOL 156bbf35c129f64ab3900add54ff89c80ddce1b9bb18d5a66ef8b20b2d2c0243d4ba623fa398c812def575cf27f131e5f228e697f964543e9190f36b3e31dd9d diff --git a/net-print/cups-filters/cups-filters-1.3.0.ebuild b/net-print/cups-filters/cups-filters-1.3.0.ebuild new file mode 100644 index 000000000000..52f9132f487a --- /dev/null +++ b/net-print/cups-filters/cups-filters-1.3.0.ebuild @@ -0,0 +1,122 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +GENTOO_DEPEND_ON_PERL=no + +inherit base eutils perl-module autotools systemd + +if [[ "${PV}" == "9999" ]] ; then + inherit bzr + EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters" + KEYWORDS="~arm64" +else + SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint" +fi +DESCRIPTION="Cups PDF filters" +HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat" + +LICENSE="MIT GPL-2" +SLOT="0" +IUSE="dbus +foomatic jpeg perl png static-libs tiff zeroconf" + +RDEPEND=" + >=app-text/ghostscript-gpl-9.09 + app-text/poppler:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)] + >=app-text/qpdf-3.0.2:= + media-libs/fontconfig + media-libs/freetype:2 + media-libs/lcms:2 + >=net-print/cups-1.7.3 + !<=net-print/cups-1.5.9999 + sys-devel/bc + sys-libs/zlib + dbus? ( sys-apps/dbus ) + foomatic? ( !net-print/foomatic-filters ) + jpeg? ( virtual/jpeg:0 ) + perl? ( dev-lang/perl:= ) + png? ( media-libs/libpng:0= ) + tiff? ( media-libs/tiff:0 ) + zeroconf? ( net-dns/avahi[dbus] ) +" +DEPEND="${RDEPEND} + dev-util/gdbus-codegen +" + +src_prepare() { + base_src_prepare + sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die + eautoreconf +} + +src_configure() { + econf \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + $(use_enable dbus) \ + $(use_enable zeroconf avahi) \ + $(use_enable static-libs static) \ + --with-fontdir="fonts/conf.avail" \ + --with-pdftops=pdftops \ + --enable-imagefilters \ + $(use_with jpeg) \ + $(use_with png) \ + $(use_with tiff) \ + --with-rcdir=no \ + --with-browseremoteprotocols=DNSSD,CUPS \ + --without-php +} + +src_compile() { + MAKEOPTS=-j1 default + + if use perl; then + pushd "${S}/scripting/perl" > /dev/null + perl-module_src_configure + perl-module_src_compile + popd > /dev/null + fi +} + +src_install() { + default + + if use perl; then + pushd "${S}/scripting/perl" > /dev/null + perl-module_src_install + perl_delete_localpod + popd > /dev/null + fi + + # workaround: some printer drivers still require pstoraster and pstopxl, bug #383831 + dosym /usr/libexec/cups/filter/gstoraster /usr/libexec/cups/filter/pstoraster + dosym /usr/libexec/cups/filter/gstopxl /usr/libexec/cups/filter/pstopxl + + prune_libtool_files --all + + cp "${FILESDIR}"/cups-browsed.init.d "${T}"/cups-browsed || die + + if ! use zeroconf ; then + sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die + sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die + fi + + if ! use foomatic ; then + # this needs an upstream solution / configure switch + rm -v "${ED}/usr/bin/foomatic-rip" || die + rm -v "${ED}/usr/libexec/cups/filter/foomatic-rip" || die + rm -v "${ED}/usr/share/man/man1/foomatic-rip.1" || die + fi + + doinitd "${T}"/cups-browsed + systemd_dounit "${S}/utils/cups-browsed.service" +} + +pkg_postinst() { + if ! use foomatic ; then + ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely." + ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained." + fi +} diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index f28df2ff97a7..e5e18f5c46e4 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -99,7 +99,7 @@ kde-apps/kaccounts-integration kdepim # Michael Palimaka <kensington@gentoo.org> (27 Aug 2015) # Unreleased dependencies -kde-apps/dolphin:5 thumbnail +=kde-apps/dolphin-15.08* thumbnail # James Le Cuirot <chewi@gentoo.org> (18 Aug 2015) # gcc[awt] is only used by gcj-jdk[awt] and that isn't needed by diff --git a/profiles/targets/desktop/plasma/package.use b/profiles/targets/desktop/plasma/package.use index 1850926a07d6..f5d13b298960 100644 --- a/profiles/targets/desktop/plasma/package.use +++ b/profiles/targets/desktop/plasma/package.use @@ -43,6 +43,7 @@ kde-apps/kdebase-runtime-meta -crash-reporter minimal kde-apps/kdesu -handbook kde-apps/knetattach -handbook kde-apps/konsole:4 -handbook minimal +kde-apps/kwalletmanager:4 minimal kde-apps/solid-runtime -bluetooth kde-base/baloo minimal kde-base/kactivities minimal @@ -74,6 +75,7 @@ net-news/rssguard -qt4 >=net-news/quiterss-0.17.7 -qt4 net-p2p/bitcoin-qt -qt4 >=net-p2p/qbittorrent-3.2.0 -qt4 +>=net-wireless/wpa_supplicant-2.5 -qt4 >=sci-geosciences/qlandkartegt-1.8.0 -qt4 sci-visualization/kst -qt4 www-client/qupzilla -kde -qt4 diff --git a/sci-biology/bamtools/bamtools-1.0.2.ebuild b/sci-biology/bamtools/bamtools-1.0.2-r1.ebuild index 08c40d0705d3..dc1b60ba432e 100644 --- a/sci-biology/bamtools/bamtools-1.0.2.ebuild +++ b/sci-biology/bamtools/bamtools-1.0.2-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=4 +EAPI=5 inherit cmake-utils @@ -15,19 +15,34 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -DEPEND="sys-libs/zlib" -RDEPEND="${DEPEND}" +RDEPEND=" + dev-libs/jsoncpp + sys-libs/zlib" +DEPEND="${RDEPEND}" + +src_prepare() { + sed \ + -e '/third_party/d' \ + -i src/CMakeLists.txt || die + rm -r src/third_party || die + + sed \ + -e 's:json.h:json/json.h:g' \ + -i src/toolkit/bamtools_filter.cpp || die + + cmake-utils_src_prepare +} src_install() { + local i for i in bin/bamtools-${PV} lib/libbamtools.so.${PV} lib/libbamtools-utils.so.${PV}; do TMPDIR="$(pwd)" scanelf -Xr $i || die done dobin bin/bamtools - dolib lib/* - insinto /usr/include/bamtools/api - doins include/api/* - insinto /usr/include/bamtools/shared - doins include/shared/* + dolib.so lib/*so* + use static-libs && dolib.a lib/*a + insinto /usr/include/bamtools + doins include/api include/shared dodoc README } diff --git a/sys-apps/memtest86+/files/memtest86+-5.01-gcc-473.patch b/sys-apps/memtest86+/files/memtest86+-5.01-gcc-473.patch index ff9b15a9e4e1..b793c326b262 100644 --- a/sys-apps/memtest86+/files/memtest86+-5.01-gcc-473.patch +++ b/sys-apps/memtest86+/files/memtest86+-5.01-gcc-473.patch @@ -19,27 +19,6 @@ diff -Narup memtest86+-5.01-orig/controller.c memtest86+-5.01/controller.c pci_conf_read( possible_nhm_bus[i], 3, 4, 0x00, 2, &vid); pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did); vid &= 0xFFFF; -diff -Narup memtest86+-5.01-orig/io.h memtest86+-5.01/io.h ---- memtest86+-5.01-orig/io.h 2013-08-09 22:01:58.000000000 -0400 -+++ memtest86+-5.01/io.h 2014-06-22 11:00:19.279251873 -0400 -@@ -31,7 +31,7 @@ - */ - - #define __OUT1(s,x) \ --extern inline void __out##s(unsigned x value, unsigned short port) { -+static inline void __out##s(unsigned x value, unsigned short port) { - - #define __OUT2(s,s1,s2) \ - __asm__ __volatile__ ("out" #s " %" s1 "0,%" s2 "1" -@@ -43,7 +43,7 @@ __OUT1(s##_p,x) __OUT2(s,s1,"w") : : "a" - __OUT1(s##c_p,x) __OUT2(s,s1,"") : : "a" (value), "id" (port)); SLOW_DOWN_IO; } - - #define __IN1(s) \ --extern inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v; -+static inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v; - - #define __IN2(s,s1,s2) \ - __asm__ __volatile__ ("in" #s " %" s2 "1,%" s1 "0" diff -Narup memtest86+-5.01-orig/Makefile memtest86+-5.01/Makefile --- memtest86+-5.01-orig/Makefile 2013-08-09 22:01:58.000000000 -0400 +++ memtest86+-5.01/Makefile 2014-06-22 10:59:27.463573842 -0400 diff --git a/sys-apps/memtest86+/files/memtest86+-5.01-io-extern-inline.patch b/sys-apps/memtest86+/files/memtest86+-5.01-io-extern-inline.patch new file mode 100644 index 000000000000..8dc13b1307f5 --- /dev/null +++ b/sys-apps/memtest86+/files/memtest86+-5.01-io-extern-inline.patch @@ -0,0 +1,29 @@ +the meaning of extern inline changed between standards. use static inline +for these tiny I/O functions everywhere to keep things simple. + +--- a/io.h ++++ b/io.h +@@ -31,6 +31,6 @@ + */ + + #define __OUT1(s,x) \ +-extern inline void __out##s(unsigned x value, unsigned short port) { ++static inline void __out##s(unsigned x value, unsigned short port) { + + #define __OUT2(s,s1,s2) \ +@@ -43,6 +43,6 @@ + __OUT1(s##c_p,x) __OUT2(s,s1,"") : : "a" (value), "id" (port)); SLOW_DOWN_IO; } + + #define __IN1(s) \ +-extern inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v; ++static inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v; + + #define __IN2(s,s1,s2) \ +@@ -55,6 +55,6 @@ + __IN1(s##c_p) __IN2(s,s1,"") : "=a" (_v) : "id" (port) ,##i ); SLOW_DOWN_IO; return _v; } + + #define __OUTS(s) \ +-extern inline void outs##s(unsigned short port, const void * addr, unsigned long count) \ ++static inline void outs##s(unsigned short port, const void * addr, unsigned long count) \ + { __asm__ __volatile__ ("cld ; rep ; outs" #s \ + : "=S" (addr), "=c" (count) : "d" (port),"0" (addr),"1" (count)); } diff --git a/sys-apps/memtest86+/files/memtest86+-5.01-no-clean.patch b/sys-apps/memtest86+/files/memtest86+-5.01-no-clean.patch new file mode 100644 index 000000000000..876edcf68360 --- /dev/null +++ b/sys-apps/memtest86+/files/memtest86+-5.01-no-clean.patch @@ -0,0 +1,16 @@ +don't run the clean target when building all as we run into parallel races: + - memtest kicks off building of a bunch of .o files + - clean runs in parallel which runs `rm` and deletes some of the new .o + - memtest goes to link and fails because objects are missing + +--- a/Makefile ++++ b/Makefile +@@ -19,7 +19,7 @@ + smp.o vmem.o random.o + + +-all: clean memtest.bin memtest ++all: memtest.bin memtest + + # Link it statically once so I know I don't have undefined + # symbols and then link it dynamically so I have full diff --git a/sys-apps/memtest86+/files/memtest86+-5.01-no-scp.patch b/sys-apps/memtest86+/files/memtest86+-5.01-no-scp.patch new file mode 100644 index 000000000000..8303ccf4229c --- /dev/null +++ b/sys-apps/memtest86+/files/memtest86+-5.01-no-scp.patch @@ -0,0 +1,12 @@ +this makes no sense in a sane build world + +--- a/Makefile ++++ b/Makefile +@@ -21,7 +21,6 @@ + + + all: clean memtest.bin memtest +- scp memtest.bin root@192.168.0.12:/srv/tftp/mt86plus + + # Link it statically once so I know I don't have undefined + # symbols and then link it dynamically so I have full diff --git a/sys-apps/memtest86+/files/memtest86+-5.01-reboot-def.patch b/sys-apps/memtest86+/files/memtest86+-5.01-reboot-def.patch new file mode 100644 index 000000000000..a121fdecd75a --- /dev/null +++ b/sys-apps/memtest86+/files/memtest86+-5.01-reboot-def.patch @@ -0,0 +1,13 @@ +the reboot func is used elsewhere, so don't mark it inline + +--- a/lib.c ++++ b/lib.c +@@ -33,7 +33,7 @@ struct ascii_map_str { + int keycode; + }; + +-inline void reboot(void) ++void reboot(void) + { + + /* tell the BIOS to do a cold start */ diff --git a/sys-apps/memtest86+/memtest86+-5.01-r1.ebuild b/sys-apps/memtest86+/memtest86+-5.01-r1.ebuild index 1232c12688c4..6186228b89cc 100644 --- a/sys-apps/memtest86+/memtest86+-5.01-r1.ebuild +++ b/sys-apps/memtest86+/memtest86+-5.01-r1.ebuild @@ -24,9 +24,12 @@ DEPEND="" src_prepare() { sed -i -e 's,0x10000,0x100000,' memtest.lds || die - sed -e "s/scp memtest.bin root@192.168.0.12:\/srv\/tftp\/mt86plus//g" -i Makefile epatch "${FILESDIR}/${P}-gcc-473.patch" \ "${FILESDIR}/${P}-hardcoded_cc.patch" + epatch "${FILESDIR}"/${P}-no-scp.patch + epatch "${FILESDIR}"/${P}-io-extern-inline.patch #548312 + epatch "${FILESDIR}"/${P}-reboot-def.patch #548312 + epatch "${FILESDIR}"/${P}-no-clean.patch #557890 if use serial ; then sed -i \ diff --git a/sys-apps/memtest86+/memtest86+-5.01.ebuild b/sys-apps/memtest86+/memtest86+-5.01.ebuild deleted file mode 100644 index 88def26d997e..000000000000 --- a/sys-apps/memtest86+/memtest86+-5.01.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit mount-boot eutils toolchain-funcs - -DESCRIPTION="Memory tester based on memtest86" -HOMEPAGE="http://www.memtest.org/" -SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="floppy serial" - -BOOTDIR=/boot/memtest86plus -QA_PRESTRIPPED="${BOOTDIR}/memtest.netbsd" -QA_FLAGS_IGNORED="${BOOTDIR}/memtest.netbsd" - -RDEPEND="floppy? ( >=sys-boot/grub-0.95:0 sys-fs/mtools )" -DEPEND="" - -src_prepare() { - sed -i -e 's,0x10000,0x100000,' memtest.lds || die - sed -e "s/scp memtest.bin root@192.168.0.12:\/srv\/tftp\/mt86plus//g" -i Makefile - epatch "${FILESDIR}/${P}-gcc-473.patch" \ - "${FILESDIR}/${P}-hardcoded_cc.patch" - - if use serial ; then - sed -i \ - -e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \ - config.h \ - || die "sed failed" - fi - - cat - > "${T}"/39_${PN} <<EOF -#!/bin/sh -exec tail -n +3 \$0 - -menuentry "${PN} ${PV}" { - linux16 ${BOOTDIR}/memtest -} - -menuentry "${PN} ${PV} (netbsd)" { - insmod bsd - knetbsd ${BOOTDIR}/memtest.netbsd -} -EOF - - tc-export AS CC LD -} - -src_test() { :; } - -src_install() { - insinto ${BOOTDIR} - newins memtest.bin memtest - newins memtest memtest.netbsd - dosym memtest ${BOOTDIR}/memtest.bin - - exeinto /etc/grub.d - doexe "${T}"/39_${PN} - - dodoc README README.build-process FAQ changelog - - if use floppy ; then - dobin "${FILESDIR}"/make-memtest86+-boot-floppy - doman "${FILESDIR}"/make-memtest86+-boot-floppy.1 - fi -} - -pkg_postinst() { - mount-boot_pkg_postinst - elog - elog "memtest has been installed in ${BOOTDIR}/" - elog "You may wish to update your bootloader configs" - elog "by adding these lines:" - elog " - For grub2 just run grub-mkconfig, a configuration file is installed" - elog " as /etc/grub.d/39_${PN}" - elog " - For grub legacy: (replace '?' with correct numbers for your boot partition)" - elog " > title=${PN}" - elog " > root (hd?,?)" - elog " > kernel ${BOOTDIR}/memtest" - elog " - For lilo:" - elog " > image = ${BOOTDIR}/memtest" - elog " > label = ${PN}" - elog -} diff --git a/sys-apps/systemd/files/226-kcmp.patch b/sys-apps/systemd/files/226-kcmp.patch new file mode 100644 index 000000000000..a91f49fb4875 --- /dev/null +++ b/sys-apps/systemd/files/226-kcmp.patch @@ -0,0 +1,31 @@ +From 75b554579b4e962e2c02053129a37611a2dc9133 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Mon, 14 Sep 2015 18:55:09 -0400 +Subject: [PATCH] Add fallback for kcmp() in case __NR_kcmp is undefined + +IA64 is missing this syscall as of linux-4.2. +This works around it until the necessary kernel patch gets merged. +--- + src/basic/missing.h | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/basic/missing.h b/src/basic/missing.h +index dc1f244..371ef8a 100644 +--- a/src/basic/missing.h ++++ b/src/basic/missing.h +@@ -1028,7 +1028,12 @@ static inline int renameat2(int oldfd, const char *oldname, int newfd, const cha + + #if !HAVE_DECL_KCMP + static inline int kcmp(pid_t pid1, pid_t pid2, int type, unsigned long idx1, unsigned long idx2) { ++#if defined(__NR_kcmp) + return syscall(__NR_kcmp, pid1, pid2, type, idx1, idx2); ++#else ++ errno = ENOSYS; ++ return -1; ++#endif + } + #endif + +-- +2.6.4 + diff --git a/sys-apps/systemd/systemd-226-r2.ebuild b/sys-apps/systemd/systemd-226-r2.ebuild index 10471ac5466f..44742e88e6f1 100644 --- a/sys-apps/systemd/systemd-226-r2.ebuild +++ b/sys-apps/systemd/systemd-226-r2.ebuild @@ -147,6 +147,7 @@ src_prepare() { epatch "${FILESDIR}/218-Dont-enable-audit-by-default.patch" epatch "${FILESDIR}/226-noclean-tmp.patch" epatch "${FILESDIR}/CVE-2015-7510.patch" + epatch "${FILESDIR}/226-kcmp.patch" epatch_user eautoreconf } diff --git a/sys-auth/otpcalc/Manifest b/sys-auth/otpcalc/Manifest index 36425b6a8fc6..11217354bf06 100644 --- a/sys-auth/otpcalc/Manifest +++ b/sys-auth/otpcalc/Manifest @@ -1 +1,2 @@ DIST otpCalc-0.97.tar.gz 123704 SHA256 e2c19fa6178ed42f0576650db6f94942cac366feadf82c2a679b35197c65f745 SHA512 5d22bd01fe90b32801d6f1c5ac3105036c14ac8197dda3c8454974ec72830a5f8cd693bd0520a51defdb0a7c7703483770410ba560436168826f8b6133a2524f WHIRLPOOL f73c745e336e9196003869c76cbf30a69dd94fde2549a2cd3391de531b36e36504e4d5c779159f254c425f69381be3bae05f0cdd13a1a920d593f82db0052459 +DIST otpcalc-0.97-patches-1.tar.xz 4384 SHA256 596dc03c86ed1552f3527c0649a54a98727b237c79f094d69756b2dd25165706 SHA512 950b2df68acf377750710b0b9578b431b4aa745414a494b87062fffa559485cc4117bb08e68f22a79781047cfd2682082e30b1db81cddc5a3448bc285c5553bf WHIRLPOOL d6e6d541c5e1c30ea7aa160b86c05bfba1265f314141040cc345824184beb67ac6d4d9530e3b4175f09113712dc6a34bbb15a41caecb427a980c71e20e04da11 diff --git a/sys-auth/otpcalc/otpcalc-0.97-r8.ebuild b/sys-auth/otpcalc/otpcalc-0.97-r8.ebuild new file mode 100644 index 000000000000..76c2de454282 --- /dev/null +++ b/sys-auth/otpcalc/otpcalc-0.97-r8.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit toolchain-funcs + +DESCRIPTION="A One Time Password and S/Key calculator for X" +HOMEPAGE="http://killa.net/infosec/otpCalc/" +SRC_URI="http://killa.net/infosec/otpCalc/otpCalc-${PV}.tar.gz + https://dev.gentoo.org/~ulm/distfiles/${P}-patches-1.tar.xz" + +LICENSE="GPL-2+" # bundled crypto functions are not used +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" + +RDEPEND="x11-libs/gtk+:2 + dev-libs/openssl:0" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +S="${WORKDIR}/otpCalc-${PV}" + +src_prepare() { + eapply ../patch + eapply_user + + # override hardcoded FLAGS + sed -i \ + -e 's:$(CC) $(CFLAGS) $^:$(CC) $(LDFLAGS) $(CFLAGS) $^:' \ + -e "s#-s -O3#${CFLAGS}#g" \ + Makefile.in || die + + tc-export CC +} + +src_compile() { + emake otpCalc otpCalc.1 +} + +src_install() { + dobin otpCalc + dosym otpCalc /usr/bin/otpcalc + doman otpCalc.1 + newman - otpcalc.1 <<< ".so man1/otpCalc.1" + insinto /usr/share/applications + doins "${FILESDIR}/${PN}.desktop" + dodoc BUGS ChangeLog TODO +} diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest index ae373320f514..ae1a4a28657d 100644 --- a/sys-boot/grub/Manifest +++ b/sys-boot/grub/Manifest @@ -1,12 +1,7 @@ DIST dejavu-sans-ttf-2.34.zip 406977 SHA256 242e8c1cb2bdc7458bece02cca898f962c2bc919dcf67d97428149228290184d SHA512 dcd802b9c83cfa749b7542d0855eb1facb665a035af8c05f58830fce3ce37ba8d4a6f0353c07ae924c7fc25460d330b7312cbaffd34a2cb314a8e222de385c1b WHIRLPOOL d8b3289997cc39aca1c909ac1cae79727a19932f07b116a4a0bcc83e4a2f136d05d18c8ef2b05504a2f1f65eba85f93d61d52b0c913be7bb3e23f6a403eb6a82 DIST grub-0.97-patches-1.14.tar.bz2 52916 SHA256 5c7ca31fd9b2123471daf2e46a1936c4044ad0c12e353d9d3d8c3f83a1c7a0e5 SHA512 d9a8d420fd5a36f181ca608f9b70be90f9d82cee66c8484636fda5085290586071b5d9379d917e8141b993ffc4777859cd02971c916d6167dca6f50d83282c26 WHIRLPOOL 60abd5087e85d9969784b9f5a100934606a76da03b665533d9d4d1d13f4e2d15de233a71e67a32d18a5fbfe128c2c8bf04c0d4451de24e6ca4fbd8dd862e23ea DIST grub-0.97.tar.gz 971783 SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b SHA512 c2bc9ffc8583aeae71cee9ddcc4418969768d4e3764d47307da54f93981c0109fb07d84b061b3a3628bd00ba4d14a54742bc04848110eb3ae8ca25dbfbaabadb WHIRLPOOL 0ad7f5dc035e2a3ad5fd29b6388f06fd12a8cc694117b4cbd42b5302433aa522db23566222d35219fe17fb95edb5090553156198507f70208eda5d858fd52dd5 -DIST grub-2.00_p5107.tar.xz 5836972 SHA256 92fd8f93621e7083f32ba6ef407f2984e5d3caaafdc35fb3d89ed054ca7c4dac SHA512 a70017dfc837e8fa869af7f71ca6191973f3f44f5a93378100cff5da425aa132b3903a3602ab907ef070872bb7a17f0586c8415845645c596d0621a4929ca83d WHIRLPOOL 5d88806fc849d2ff78ca590312110be4505e2801fee7c68faba39a54a44eedc16eb25dad88f1ff0058dea2e98382944c7e7632ccfa6f4a171ff0ef00cf67fd2d -DIST grub-2.02_beta2-gentoo-r1.tar.xz 8048 SHA256 9a69edb0d64024b785a7f1bca58269b11e1be40f13ff2a96247249594bdb47d2 SHA512 c2ddaa188e7a2747e2256d0bb1e7c42427d5733cced3ff4b334be0671da8fab8d370861cdfee0319b4a29903a247375cf2e2a56955cc38e94a303bac5a93d974 WHIRLPOOL 0d923ed97921e145857580f7cff1f63278a4a95563d6e346b3680581991f9c7ad6d9b9965d40e407448392ee37b8c7862068281ac8f66b2a71856e1035f28eda DIST grub-2.02_beta2-gentoo-r3.tar.xz 14532 SHA256 78d14f27ed60458601021d13c247387dad324d4141ed46721e2e14f4a4fda990 SHA512 b46390c217e9a1f9fccbefbc5aab062c228919b9b7b6f16effd9d292534c516a28747376d85d5db8b7f883cf7e8c2aa0ca6573e8ed2913aadabbc1cd795fc861 WHIRLPOOL acb6d2e39e1670a4342e21e6d35ab390e36557512784a8ee0b5bda051ec5fb633061a28d2a2deab8c3d1961052db6c3870742ff866e292d8e4c0fd3c7a0acf45 -DIST grub-2.02_beta2-gentoo.tar.xz 6916 SHA256 63453b35faa6e02cc6e3067160158a591ed8d1e417fc2d1fce25556b28f76e03 SHA512 edc37adae1a4c9bad4bb29f335379e1e2b0a25ba7ef2768689fe0dfc236ea7057d80699659fd5facda431df957073827eba1cd83dd0204e81f068570de3722a7 WHIRLPOOL b463cb3f4a714b20845d3dbd493a0d3408a47a1fe140ca3a4dffa77052f9bfcf25046de7881e516022aa970c48701a1278cd8b598e8e1ce03a28347fbd68dab0 DIST grub-2.02~beta2.tar.xz 5798740 SHA256 f6c702b2a8ea58f27a2b02928bb77973cb5a827af08f63db38c471c0a01b418d SHA512 359903928febce1df53b3bd38aab701b4ea010dfad0dee434e853c865af4bbc60d115e61eac100c79f18d89aa78b2216ef20123f4ef04cc948ecbe226ea1a58c WHIRLPOOL f92e94f43888648484a972a0c82b0a2ac4dc7fbdd6e35ca8b11a6ee92168ac8cf7ee68987b84697ec46ad18189e5c5c9aee8105b91bb131cd7f6f499f45cd58f DIST splash.xpm.gz 33856 SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf SHA512 5ae1f786f7d46a95a7061068d5b2b3ad64607c7b190d6f28379508c5dce67e26308325bfd637542a84855dfcf1ea3d143947326fdb189a6a8972208d3ead23da WHIRLPOOL d95b7b588ea8ac7c2c8c53eb8057aef21c825da6411afe3b7e864c606aeffaaebce8ae41ce3e979f277bd6b48a9e82a1f2ea8afc836213b56523d8a854227d7b -DIST unifont-5.1.20080820.pcf.gz 1379965 SHA256 122b9c470f29b70223b0e07404a6dfa7f339fcfa6ae74c024f478945af7a9a63 SHA512 8939e2bc82ca97b60e6678f3ff079a2be7ba9b702f2e8ee289e853af5823695f7baafbf14b674fc5e41071f2a6de4f2dadd56bf8b4653849dd756d59622f1649 WHIRLPOOL 0f083d66781cc4c3e554ebeda4e21843fa275ecf3e1908b4873fadfe37b7c88e8346a124656704bb1b29f89afee23d6301b4df0f19e788f454c60d47156fe78d -DIST unifont-7.0.01.pcf.gz 1358916 SHA256 7618a96ad50703213848af8ecae816828f528bb8ed179a749f7ca2b86eb15805 SHA512 f985e11729d18cb16d3e46fd1004242aa731a9b03ba16035f5954076686e8cdc39df9087daded5e044ead995b03650d8cf1bba9d060d65b5c3af630dbc9e3260 WHIRLPOOL da682398a22abd4282674d9a79b8fdd53e03054863cc166e43e2640dfb7f11c0b71cd3e42431f2086692f3a4202c2ecae9d6d7126249db0127e2da276aae7c9f DIST unifont-7.0.06.pcf.gz 1359006 SHA256 acf516b464928244c25dd1afddd02f6f459686b5135685694d875d7eca8bf4f2 SHA512 a62f21366b51a582d2b5a66710c8a6183bc869407867da78e59ecec9dabcff7a2522a8bc454cf511592d336befea812d36622589ef119160fe3014d927fa11b3 WHIRLPOOL 9f431f9b6af23a87e3291e5c66d6f1e56f8c8ce23222821dbf41aa03edac4d80e8e6c5895c024951cf199d41904e6c9f830103427568a9b0386f68adc0a959d7 diff --git a/sys-boot/grub/grub-2.00_p5107-r2.ebuild b/sys-boot/grub/grub-2.00_p5107-r2.ebuild deleted file mode 100644 index 73e8c11bbacd..000000000000 --- a/sys-boot/grub/grub-2.00_p5107-r2.ebuild +++ /dev/null @@ -1,306 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -if [[ ${PV} == 9999 ]]; then - AUTOTOOLS_AUTORECONF=1 - GRUB_AUTOGEN=1 -fi - -inherit autotools-utils bash-completion-r1 eutils flag-o-matic mount-boot multibuild pax-utils toolchain-funcs versionator - -if [[ ${PV} != 9999 ]]; then - if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then - # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860 - MY_P=${P/_/'~'} - SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz" - S=${WORKDIR}/${MY_P} - else - SRC_URI="mirror://gnu/${PN}/${P}.tar.xz - mirror://gentoo/${P}.tar.xz - https://dev.gentoo.org/~floppym/dist/${P}.tar.xz" - S=${WORKDIR}/${P%_*} - fi - KEYWORDS="amd64 x86" - PATCHES=( - "${FILESDIR}/grub-2.00-freetype-2.5.1.patch" - ) -else - inherit git-r3 - EGIT_REPO_URI="git://git.sv.gnu.org/grub.git - http://git.savannah.gnu.org/r/grub.git" -fi - -DEJAVU=dejavu-sans-ttf-2.34 -UNIFONT=unifont-5.1.20080820.pcf -SRC_URI+=" truetype? ( - mirror://sourceforge/dejavu/${DEJAVU}.zip - http://unifoundry.com/${UNIFONT}.gz -)" - -DESCRIPTION="GNU GRUB boot loader" -HOMEPAGE="https://www.gnu.org/software/grub/" - -# Includes licenses for dejavu and unifont -LICENSE="GPL-3 truetype? ( BitstreamVera GPL-2-with-font-exception )" -SLOT="2" -IUSE="custom-cflags debug device-mapper doc efiemu mount +multislot nls static sdl test truetype libzfs" - -GRUB_ALL_PLATFORMS=( - # everywhere: - emu - # mips only: - qemu-mips yeeloong - # amd64, x86, ppc, ppc64: - ieee1275 - # amd64, x86: - coreboot multiboot efi-32 pc qemu - # amd64, ia64: - efi-64 -) -IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}" - -REQUIRED_USE="grub_platforms_qemu? ( truetype ) - grub_platforms_yeeloong? ( truetype )" - -# os-prober: Used on runtime to detect other OSes -# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue -RDEPEND=" - app-arch/xz-utils - >=sys-libs/ncurses-5.2-r5 - debug? ( - sdl? ( media-libs/libsdl ) - ) - device-mapper? ( >=sys-fs/lvm2-2.02.45 ) - libzfs? ( sys-fs/zfs ) - mount? ( sys-fs/fuse ) - truetype? ( media-libs/freetype ) - ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) - ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) -" -DEPEND="${RDEPEND} - app-misc/pax-utils - >=dev-lang/python-2.5.2 - sys-devel/flex - sys-devel/bison - sys-apps/help2man - sys-apps/texinfo - static? ( - app-arch/xz-utils[static-libs(+)] - truetype? ( - app-arch/bzip2[static-libs(+)] - media-libs/freetype[static-libs(+)] - sys-libs/zlib[static-libs(+)] - ) - ) - test? ( - dev-libs/libisoburn - app-emulation/qemu - ) - truetype? ( app-arch/unzip ) -" -RDEPEND+=" - kernel_linux? ( - grub_platforms_efi-32? ( sys-boot/efibootmgr ) - grub_platforms_efi-64? ( sys-boot/efibootmgr ) - ) - !multislot? ( !sys-boot/grub:0 ) - nls? ( sys-devel/gettext ) -" - -if [[ -n ${GRUB_AUTOGEN} ]]; then - DEPEND+=" >=sys-devel/autogen-5.10" -fi - -STRIP_MASK="*/grub/*/*.{mod,img}" -RESTRICT="test" - -QA_EXECSTACK=" - usr/bin/grub* - usr/sbin/grub* - usr/lib*/grub/*/*.mod - usr/lib*/grub/*/*.module - usr/lib*/grub/*/kernel.exec - usr/lib*/grub/*/kernel.img -" - -QA_WX_LOAD=" - usr/lib*/grub/*/kernel.exec - usr/lib*/grub/*/kernel.img - usr/lib*/grub/*/*.image -" - -QA_PRESTRIPPED=" - usr/lib.*/grub/.*/kernel.img -" - -src_unpack() { - if [[ ${PV} == 9999 ]]; then - git-r3_src_unpack - fi - default_src_unpack -} - -src_prepare() { - [[ ${PATCHES} ]] && epatch "${PATCHES[@]}" - sed -i -e /autoreconf/d autogen.sh || die - if use multislot; then - # fix texinfo file name, bug 416035 - sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die - fi - epatch_user - if [[ -n ${GRUB_AUTOGEN} ]]; then - bash autogen.sh || die - fi - if [[ -n ${AUTOTOOLS_AUTORECONF} ]]; then - autopoint() { return 0; } - eautoreconf - fi -} - -setup_fonts() { - ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die - ln -s "${WORKDIR}/${UNIFONT}" unifont.pcf || die -} - -grub_configure() { - local platform - - case ${MULTIBUILD_VARIANT} in - efi-32) - platform=efi - if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then - local CTARGET=${CTARGET:-i386} - fi ;; - efi-64) - platform=efi - if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then - local CTARGET=${CTARGET:-x86_64} - local TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}" - local TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}" - export TARGET_CFLAGS TARGET_CPPFLAGS - fi ;; - guessed) ;; - *) platform=${MULTIBUILD_VARIANT} ;; - esac - - local myeconfargs=( - --disable-werror - --program-prefix= - --libdir="${EPREFIX}"/usr/lib - --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html - $(use_enable debug mm-debug) - $(use_enable debug grub-emu-usb) - $(use_enable device-mapper) - $(use_enable mount grub-mount) - $(use_enable nls) - $(use_enable truetype grub-mkfont) - $(use_enable libzfs) - $(use sdl && use_enable debug grub-emu-sdl) - ${platform:+--with-platform=}${platform} - - # Let configure detect this where supported - $(usex efiemu '' '--disable-efiemu') - ) - - if use multislot; then - myeconfargs+=( --program-transform-name="s,grub,grub2," ) - fi - - if use truetype; then - mkdir -p "${BUILD_DIR}" || die - run_in_build_dir setup_fonts - fi - - autotools-utils_src_configure -} - -src_configure() { - use custom-cflags || unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS - use static && export HOST_LDFLAGS="${HOST_LDFLAGS} -static" - - tc-ld-disable-gold #439082 #466536 #526348 - export TARGET_LDFLAGS+=" ${LDFLAGS}" - unset LDFLAGS - - tc-export CC NM OBJCOPY STRIP - export TARGET_CC=${TARGET_CC:-${CC}} - tc-export BUILD_CC # Bug 485592 - - # Portage will take care of cleaning up GRUB_PLATFORMS - MULTIBUILD_VARIANTS=( ${GRUB_PLATFORMS:-guessed} ) - multibuild_parallel_foreach_variant grub_configure -} - -src_compile() { - # Sandbox bug 404013. - use libzfs && addpredict /etc/dfs:/dev/zfs - - multibuild_foreach_variant autotools-utils_src_compile - - use doc && multibuild_for_best_variant \ - autotools-utils_src_compile -C docs html -} - -src_test() { - # The qemu dependency is a bit complex. - # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform. - multibuild_foreach_variant autotools-utils_src_test -} - -src_install() { - multibuild_foreach_variant autotools-utils_src_install \ - bashcompletiondir="$(get_bashcompdir)" - - use doc && multibuild_for_best_variant run_in_build_dir \ - emake -C docs DESTDIR="${D}" install-html - - if use multislot; then - mv "${ED%/}"/usr/share/info/grub{,2}.info || die - fi - - insinto /etc/default - newins "${FILESDIR}"/grub.default-2 grub - - cd "${ED}" || die - pax-mark mpes $(scanelf -BF %F usr/{bin,sbin}) -} - -pkg_postinst() { - mount-boot_mount_boot_partition - - if [[ -e "${ROOT%/}/boot/grub2/grub.cfg" && ! -e "${ROOT%/}/boot/grub/grub.cfg" ]]; then - mkdir -p "${ROOT%/}/boot/grub" - ln -s ../grub2/grub.cfg "${ROOT%/}/boot/grub/grub.cfg" - fi - - mount-boot_pkg_postinst - - elog "For information on how to configure GRUB2 please refer to the guide:" - elog " https://wiki.gentoo.org/wiki/GRUB2_Quick_Start" - - if has_version 'sys-boot/grub:0'; then - elog "A migration guide for GRUB Legacy users is available:" - elog " https://wiki.gentoo.org/wiki/GRUB2_Migration" - fi - - if [[ -z ${REPLACING_VERSIONS} ]]; then - if ! has_version sys-boot/os-prober; then - elog "Install sys-boot/os-prober to enable detection of other operating systems using grub2-mkconfig." - fi - if ! has_version dev-libs/libisoburn; then - elog "Install dev-libs/libisoburn to enable creation of rescue media using grub2-mkrescue." - fi - else - local v - for v in ${REPLACING_VERSIONS}; do - if use multislot && ! version_is_at_least 2.00_p5107-r1 ${v}; then - ewarn "The grub directory has changed from /boot/grub2 to /boot/grub." - ewarn "Please run grub2-install and grub2-mkconfig -o /boot/grub/grub.cfg." - break - fi - done - fi -} diff --git a/sys-boot/grub/grub-2.02_beta2-r3.ebuild b/sys-boot/grub/grub-2.02_beta2-r3.ebuild deleted file mode 100644 index 63fe13a0b2dd..000000000000 --- a/sys-boot/grub/grub-2.02_beta2-r3.ebuild +++ /dev/null @@ -1,313 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -AUTOTOOLS_AUTORECONF=1 -GRUB_AUTOGEN=1 - -if [[ -n ${GRUB_AUTOGEN} ]]; then - PYTHON_COMPAT=( python{2_7,3_3,3_4} ) - inherit python-any-r1 -fi - -inherit autotools-utils bash-completion-r1 eutils flag-o-matic mount-boot multibuild pax-utils toolchain-funcs versionator - -if [[ ${PV} != 9999 ]]; then - if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then - # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860 - MY_P=${P/_/'~'} - SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz - https://dev.gentoo.org/~floppym/dist/${P}-gentoo.tar.xz" - S=${WORKDIR}/${MY_P} - else - SRC_URI="mirror://gnu/${PN}/${P}.tar.xz - https://dev.gentoo.org/~floppym/dist/${P}.tar.xz" - S=${WORKDIR}/${P%_*} - fi - KEYWORDS="amd64 x86" - PATCHES=() -else - inherit git-r3 - EGIT_REPO_URI="git://git.sv.gnu.org/grub.git - http://git.savannah.gnu.org/r/grub.git" -fi - -DEJAVU=dejavu-sans-ttf-2.34 -UNIFONT=unifont-7.0.01 -SRC_URI+=" mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz - truetype? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )" - -DESCRIPTION="GNU GRUB boot loader" -HOMEPAGE="https://www.gnu.org/software/grub/" - -# Includes licenses for dejavu and unifont -LICENSE="GPL-3 truetype? ( BitstreamVera GPL-2-with-font-exception )" -SLOT="2" -IUSE="debug device-mapper doc efiemu mount +multislot nls static sdl test truetype libzfs" - -GRUB_ALL_PLATFORMS=( - # everywhere: - emu - # mips only: - qemu-mips loongson - # amd64, x86, ppc, ppc64: - ieee1275 - # amd64, x86: - coreboot multiboot efi-32 pc qemu xen - # amd64, ia64: - efi-64 -) -IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}" - -# os-prober: Used on runtime to detect other OSes -# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue -RDEPEND=" - app-arch/xz-utils - >=sys-libs/ncurses-5.2-r5 - debug? ( - sdl? ( media-libs/libsdl ) - ) - device-mapper? ( >=sys-fs/lvm2-2.02.45 ) - libzfs? ( sys-fs/zfs ) - mount? ( sys-fs/fuse ) - truetype? ( media-libs/freetype:2= ) - ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) - ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - app-misc/pax-utils - sys-devel/flex - sys-devel/bison - sys-apps/help2man - sys-apps/texinfo - grub_platforms_coreboot? ( media-libs/freetype:2 ) - grub_platforms_qemu? ( media-libs/freetype:2 ) - grub_platforms_ieee1275? ( media-libs/freetype:2 ) - grub_platforms_loongson? ( media-libs/freetype:2 ) - grub_platforms_xen? ( app-emulation/xen-tools:= ) - static? ( - app-arch/xz-utils[static-libs(+)] - truetype? ( - app-arch/bzip2[static-libs(+)] - media-libs/freetype[static-libs(+)] - sys-libs/zlib[static-libs(+)] - ) - ) - test? ( - dev-libs/libisoburn - app-emulation/qemu - ) - truetype? ( app-arch/unzip ) -" -RDEPEND+=" - kernel_linux? ( - grub_platforms_efi-32? ( sys-boot/efibootmgr ) - grub_platforms_efi-64? ( sys-boot/efibootmgr ) - ) - !multislot? ( !sys-boot/grub:0 ) - nls? ( sys-devel/gettext ) -" - -DEPEND+=" !!=media-libs/freetype-2.5.4" - -STRIP_MASK="*/grub/*/*.{mod,img}" -RESTRICT="test" - -QA_EXECSTACK=" - usr/bin/grub*-emu* - usr/lib*/grub/*/*.mod - usr/lib*/grub/*/*.module - usr/lib*/grub/*/kernel.exec - usr/lib*/grub/*/kernel.img -" - -QA_WX_LOAD=" - usr/lib*/grub/*/kernel.exec - usr/lib*/grub/*/kernel.img - usr/lib*/grub/*/*.image -" - -QA_PRESTRIPPED=" - usr/lib.*/grub/.*/kernel.img -" - -src_unpack() { - if [[ ${PV} == 9999 ]]; then - git-r3_src_unpack - fi - default_src_unpack -} - -src_prepare() { - EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch - - [[ ${PATCHES} ]] && epatch "${PATCHES[@]}" - - sed -i -e /autoreconf/d autogen.sh || die - - if use multislot; then - # fix texinfo file name, bug 416035 - sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die - fi - - epatch_user - - if [[ -n ${GRUB_AUTOGEN} ]]; then - python_setup - bash autogen.sh || die - fi - - if [[ -n ${AUTOTOOLS_AUTORECONF} ]]; then - autopoint() { return 0; } - eautoreconf - fi -} - -setup_fonts() { - ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die - if use truetype; then - ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die - fi -} - -grub_configure() { - local platform - - case ${MULTIBUILD_VARIANT} in - efi-32) - platform=efi - if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then - local CTARGET=${CTARGET:-i386} - fi ;; - efi-64) - platform=efi - if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then - local CTARGET=${CTARGET:-x86_64} - local TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}" - local TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}" - export TARGET_CFLAGS TARGET_CPPFLAGS - fi ;; - guessed) ;; - *) platform=${MULTIBUILD_VARIANT} ;; - esac - - local myeconfargs=( - --disable-werror - --program-prefix= - --libdir="${EPREFIX}"/usr/lib - --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html - $(use_enable debug mm-debug) - $(use_enable debug grub-emu-usb) - $(use_enable device-mapper) - $(use_enable mount grub-mount) - $(use_enable nls) - $(use_enable truetype grub-mkfont) - $(use_enable libzfs) - $(use sdl && use_enable debug grub-emu-sdl) - ${platform:+--with-platform=}${platform} - - # Let configure detect this where supported - $(usex efiemu '' '--disable-efiemu') - ) - - if use multislot; then - myeconfargs+=( --program-transform-name="s,grub,grub2," ) - fi - - mkdir -p "${BUILD_DIR}" || die - run_in_build_dir setup_fonts - - autotools-utils_src_configure -} - -src_configure() { - # Bug 508758. - replace-flags -O3 -O2 - - # We don't want to leak flags onto boot code. - export HOST_CCASFLAGS=${CCASFLAGS} - export HOST_CFLAGS=${CFLAGS} - export HOST_CPPFLAGS=${CPPFLAGS} - export HOST_LDFLAGS=${LDFLAGS} - unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS - - use static && HOST_LDFLAGS+=" -static" - - tc-ld-disable-gold #439082 #466536 #526348 - export TARGET_LDFLAGS+=" ${LDFLAGS}" - unset LDFLAGS - - tc-export CC NM OBJCOPY STRIP - export TARGET_CC=${TARGET_CC:-${CC}} - tc-export BUILD_CC # Bug 485592 - - # Portage will take care of cleaning up GRUB_PLATFORMS - MULTIBUILD_VARIANTS=( ${GRUB_PLATFORMS:-guessed} ) - multibuild_parallel_foreach_variant grub_configure -} - -src_compile() { - # Sandbox bug 404013. - use libzfs && addpredict /etc/dfs:/dev/zfs - - multibuild_foreach_variant autotools-utils_src_compile - - use doc && multibuild_for_best_variant \ - autotools-utils_src_compile -C docs html -} - -src_test() { - # The qemu dependency is a bit complex. - # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform. - multibuild_foreach_variant autotools-utils_src_test -} - -src_install() { - multibuild_foreach_variant autotools-utils_src_install \ - bashcompletiondir="$(get_bashcompdir)" - - use doc && multibuild_for_best_variant run_in_build_dir \ - emake -C docs DESTDIR="${D}" install-html - - if use multislot; then - mv "${ED%/}"/usr/share/info/grub{,2}.info || die - fi - - insinto /etc/default - newins "${FILESDIR}"/grub.default-3 grub -} - -pkg_postinst() { - mount-boot_mount_boot_partition - - if [[ -e "${ROOT%/}/boot/grub2/grub.cfg" ]]; then - ewarn "The grub directory has changed from /boot/grub2 to /boot/grub." - ewarn "Please run grub2-install and grub2-mkconfig -o /boot/grub/grub.cfg." - - if [[ ! -e "${ROOT%/}/boot/grub/grub.cfg" ]]; then - mkdir -p "${ROOT%/}/boot/grub" - ln -s ../grub2/grub.cfg "${ROOT%/}/boot/grub/grub.cfg" - fi - fi - - mount-boot_pkg_postinst - - elog "For information on how to configure GRUB2 please refer to the guide:" - elog " https://wiki.gentoo.org/wiki/GRUB2_Quick_Start" - - if has_version 'sys-boot/grub:0'; then - elog "A migration guide for GRUB Legacy users is available:" - elog " https://wiki.gentoo.org/wiki/GRUB2_Migration" - fi - - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog - elog "You may consider installing the following optional packages:" - optfeature "Detect other operating systems (grub-mkconfig)" sys-boot/os-prober - optfeature "Create rescue media (grub-mkrescue)" dev-libs/libisoburn - optfeature "Enable RAID device detection" sys-fs/mdadm - fi -} diff --git a/sys-boot/grub/grub-2.02_beta2-r6.ebuild b/sys-boot/grub/grub-2.02_beta2-r6.ebuild deleted file mode 100644 index 6ff525d1693c..000000000000 --- a/sys-boot/grub/grub-2.02_beta2-r6.ebuild +++ /dev/null @@ -1,319 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -AUTOTOOLS_AUTORECONF=1 -GRUB_AUTOGEN=1 - -if [[ -n ${GRUB_AUTOGEN} ]]; then - PYTHON_COMPAT=( python{2_7,3_3,3_4} ) - inherit python-any-r1 -fi - -inherit autotools-utils bash-completion-r1 eutils flag-o-matic mount-boot multibuild pax-utils toolchain-funcs versionator - -if [[ ${PV} != 9999 ]]; then - if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then - # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860 - MY_P=${P/_/'~'} - SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz - https://dev.gentoo.org/~floppym/dist/${P}-gentoo-r1.tar.xz" - S=${WORKDIR}/${MY_P} - else - SRC_URI="mirror://gnu/${PN}/${P}.tar.xz - https://dev.gentoo.org/~floppym/dist/${P}.tar.xz" - S=${WORKDIR}/${P%_*} - fi - KEYWORDS="~amd64 ~x86" - PATCHES=() -else - inherit git-r3 - EGIT_REPO_URI="git://git.sv.gnu.org/grub.git - http://git.savannah.gnu.org/r/grub.git" -fi - -DEJAVU=dejavu-sans-ttf-2.34 -UNIFONT=unifont-7.0.01 -SRC_URI+=" mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz - truetype? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )" - -DESCRIPTION="GNU GRUB boot loader" -HOMEPAGE="https://www.gnu.org/software/grub/" - -# Includes licenses for dejavu and unifont -LICENSE="GPL-3 truetype? ( BitstreamVera GPL-2-with-font-exception )" -SLOT="2" -IUSE="debug device-mapper doc efiemu mount +multislot nls static sdl test truetype libzfs" - -GRUB_ALL_PLATFORMS=( - # everywhere: - emu - # mips only: - qemu-mips loongson - # amd64, x86, ppc, ppc64: - ieee1275 - # amd64, x86: - coreboot multiboot efi-32 pc qemu xen - # amd64, ia64: - efi-64 -) -IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}" - -# os-prober: Used on runtime to detect other OSes -# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue -RDEPEND=" - app-arch/xz-utils - >=sys-libs/ncurses-5.2-r5 - debug? ( - sdl? ( media-libs/libsdl ) - ) - device-mapper? ( >=sys-fs/lvm2-2.02.45 ) - libzfs? ( sys-fs/zfs ) - mount? ( sys-fs/fuse ) - truetype? ( media-libs/freetype:2= ) - ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) - ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - app-misc/pax-utils - sys-devel/flex - sys-devel/bison - sys-apps/help2man - sys-apps/texinfo - grub_platforms_coreboot? ( media-libs/freetype:2 ) - grub_platforms_qemu? ( media-libs/freetype:2 ) - grub_platforms_ieee1275? ( media-libs/freetype:2 ) - grub_platforms_loongson? ( media-libs/freetype:2 ) - grub_platforms_xen? ( app-emulation/xen-tools:= ) - static? ( - app-arch/xz-utils[static-libs(+)] - truetype? ( - app-arch/bzip2[static-libs(+)] - media-libs/freetype[static-libs(+)] - sys-libs/zlib[static-libs(+)] - ) - ) - test? ( - dev-libs/libisoburn - app-emulation/qemu - ) - truetype? ( app-arch/unzip ) -" -RDEPEND+=" - kernel_linux? ( - grub_platforms_efi-32? ( sys-boot/efibootmgr ) - grub_platforms_efi-64? ( sys-boot/efibootmgr ) - ) - !multislot? ( !sys-boot/grub:0 ) - nls? ( sys-devel/gettext ) -" - -DEPEND+=" !!=media-libs/freetype-2.5.4" - -STRIP_MASK="*/grub/*/*.{mod,img}" -RESTRICT="test" - -QA_EXECSTACK=" - usr/bin/grub*-emu* - usr/lib*/grub/*/*.mod - usr/lib*/grub/*/*.module - usr/lib*/grub/*/kernel.exec - usr/lib*/grub/*/kernel.img -" - -QA_WX_LOAD=" - usr/lib*/grub/*/kernel.exec - usr/lib*/grub/*/kernel.img - usr/lib*/grub/*/*.image -" - -QA_PRESTRIPPED=" - usr/lib.*/grub/.*/kernel.img -" - -src_unpack() { - if [[ ${PV} == 9999 ]]; then - git-r3_src_unpack - fi - default_src_unpack -} - -src_prepare() { - EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch - - [[ ${PATCHES} ]] && epatch "${PATCHES[@]}" - - sed -i -e /autoreconf/d autogen.sh || die - - if use multislot; then - # fix texinfo file name, bug 416035 - sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die - fi - - epatch_user - - if [[ -n ${GRUB_AUTOGEN} ]]; then - python_setup - bash autogen.sh || die - fi - - if [[ -n ${AUTOTOOLS_AUTORECONF} ]]; then - autopoint() { return 0; } - eautoreconf - fi -} - -setup_fonts() { - ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die - if use truetype; then - ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die - fi -} - -grub_configure() { - local platform - - case ${MULTIBUILD_VARIANT} in - efi-32) - platform=efi - if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then - local CTARGET=${CTARGET:-i386} - fi ;; - efi-64) - platform=efi - if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then - local CTARGET=${CTARGET:-x86_64} - local TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}" - local TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}" - export TARGET_CFLAGS TARGET_CPPFLAGS - fi ;; - guessed) ;; - *) platform=${MULTIBUILD_VARIANT} ;; - esac - - local myeconfargs=( - --disable-werror - --program-prefix= - --libdir="${EPREFIX}"/usr/lib - --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html - $(use_enable debug mm-debug) - $(use_enable debug grub-emu-usb) - $(use_enable device-mapper) - $(use_enable mount grub-mount) - $(use_enable nls) - $(use_enable truetype grub-mkfont) - $(use_enable libzfs) - $(use sdl && use_enable debug grub-emu-sdl) - ${platform:+--with-platform=}${platform} - - # Let configure detect this where supported - $(usex efiemu '' '--disable-efiemu') - ) - - if use multislot; then - myeconfargs+=( --program-transform-name="s,grub,grub2," ) - fi - - mkdir -p "${BUILD_DIR}" || die - run_in_build_dir setup_fonts - - autotools-utils_src_configure -} - -src_configure() { - # Bug 508758. - replace-flags -O3 -O2 - - # We don't want to leak flags onto boot code. - export HOST_CCASFLAGS=${CCASFLAGS} - export HOST_CFLAGS=${CFLAGS} - export HOST_CPPFLAGS=${CPPFLAGS} - export HOST_LDFLAGS=${LDFLAGS} - unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS - - use static && HOST_LDFLAGS+=" -static" - - tc-ld-disable-gold #439082 #466536 #526348 - export TARGET_LDFLAGS+=" ${LDFLAGS}" - unset LDFLAGS - - tc-export CC NM OBJCOPY STRIP - export TARGET_CC=${TARGET_CC:-${CC}} - tc-export BUILD_CC # Bug 485592 - - # Portage will take care of cleaning up GRUB_PLATFORMS - MULTIBUILD_VARIANTS=( ${GRUB_PLATFORMS:-guessed} ) - multibuild_parallel_foreach_variant grub_configure -} - -src_compile() { - # Sandbox bug 404013. - use libzfs && addpredict /etc/dfs:/dev/zfs - - multibuild_foreach_variant autotools-utils_src_compile - - use doc && multibuild_for_best_variant \ - autotools-utils_src_compile -C docs html -} - -src_test() { - # The qemu dependency is a bit complex. - # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform. - multibuild_foreach_variant autotools-utils_src_test -} - -src_install() { - multibuild_foreach_variant autotools-utils_src_install \ - bashcompletiondir="$(get_bashcompdir)" - - local grub=grub - if use multislot; then - grub=grub2 - mv "${ED%/}"/usr/share/info/grub{,2}.info || die - mv "${ED%/}"/$(get_bashcompdir)/grub{,2} || die - fi - - bashcomp_alias ${grub} ${grub}-{install,set-default,mkrescue,reboot,script-check,editenv,sparc64-setup,mkfont,mkpasswd-pbkdf2,mkimage,bios-setup,mkconfig,probe} - - use doc && multibuild_for_best_variant run_in_build_dir \ - emake -C docs DESTDIR="${D}" install-html - - insinto /etc/default - newins "${FILESDIR}"/grub.default-3 grub -} - -pkg_postinst() { - mount-boot_mount_boot_partition - - if [[ -e "${ROOT%/}/boot/grub2/grub.cfg" ]]; then - ewarn "The grub directory has changed from /boot/grub2 to /boot/grub." - ewarn "Please run grub2-install and grub2-mkconfig -o /boot/grub/grub.cfg." - - if [[ ! -e "${ROOT%/}/boot/grub/grub.cfg" ]]; then - mkdir -p "${ROOT%/}/boot/grub" - ln -s ../grub2/grub.cfg "${ROOT%/}/boot/grub/grub.cfg" - fi - fi - - mount-boot_pkg_postinst - - elog "For information on how to configure GRUB2 please refer to the guide:" - elog " https://wiki.gentoo.org/wiki/GRUB2_Quick_Start" - - if has_version 'sys-boot/grub:0'; then - elog "A migration guide for GRUB Legacy users is available:" - elog " https://wiki.gentoo.org/wiki/GRUB2_Migration" - fi - - if [[ -z ${REPLACING_VERSIONS} ]]; then - if ! has_version sys-boot/os-prober; then - elog "Install sys-boot/os-prober to enable detection of other operating systems using grub2-mkconfig." - fi - if ! has_version dev-libs/libisoburn; then - elog "Install dev-libs/libisoburn to enable creation of rescue media using grub2-mkrescue." - fi - fi -} diff --git a/sys-boot/grub/grub-2.02_beta2-r7.ebuild b/sys-boot/grub/grub-2.02_beta2-r7.ebuild index 7c320db84596..8231ff6bc11f 100644 --- a/sys-boot/grub/grub-2.02_beta2-r7.ebuild +++ b/sys-boot/grub/grub-2.02_beta2-r7.ebuild @@ -61,7 +61,7 @@ REQUIRED_USE=" # xorriso (dev-libs/libisoburn): Used on runtime for mkrescue RDEPEND=" app-arch/xz-utils - >=sys-libs/ncurses-5.2-r5 + >=sys-libs/ncurses-5.2-r5:0= debug? ( sdl? ( media-libs/libsdl ) ) diff --git a/sys-boot/grub/grub-9999-r1.ebuild b/sys-boot/grub/grub-9999-r1.ebuild index 781785783852..149153a2dd29 100644 --- a/sys-boot/grub/grub-9999-r1.ebuild +++ b/sys-boot/grub/grub-9999-r1.ebuild @@ -63,7 +63,7 @@ REQUIRED_USE=" # xorriso (dev-libs/libisoburn): Used on runtime for mkrescue RDEPEND=" app-arch/xz-utils - >=sys-libs/ncurses-5.2-r5 + >=sys-libs/ncurses-5.2-r5:0= debug? ( sdl? ( media-libs/libsdl ) ) diff --git a/sys-devel/flex/files/flex-2.6.0-out-of-tree-build.patch b/sys-devel/flex/files/flex-2.6.0-out-of-tree-build.patch new file mode 100644 index 000000000000..36c69f235f77 --- /dev/null +++ b/sys-devel/flex/files/flex-2.6.0-out-of-tree-build.patch @@ -0,0 +1,16 @@ +https://bugs.gentoo.org/567332 + +this is a snippet taken from the upstream commit: +09eae589d3954a1e1206aa01108ee75ef57776da Used in-tree header file for c++ tests. + +--- a/tests/Makefile.in ++++ b/tests/Makefile.in +@@ -35,6 +35,8 @@ + # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + # PURPOSE. + ++AM_CPPFLAGS = -I$(top_srcdir)/src ++ + VPATH = @srcdir@ + am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ diff --git a/sys-devel/flex/files/flex-2.6.0-out-of-tree-test.patch b/sys-devel/flex/files/flex-2.6.0-out-of-tree-test.patch new file mode 100644 index 000000000000..fafa085baf20 --- /dev/null +++ b/sys-devel/flex/files/flex-2.6.0-out-of-tree-test.patch @@ -0,0 +1,90 @@ +https://bugs.gentoo.org/567332 +https://github.com/westes/flex/pull/39 + +From e7761df66e8412093d0c1c25ce24e3a912076564 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Sat, 12 Dec 2015 23:28:43 -0500 +Subject: [PATCH] tests: fix paths to input files + +The current test wrapper works only when the inputs are specified using +relative paths. If they're specified with absolute paths, the driver +fails to detect the inputs because it always prepends the input dir name +which itself is a relative path: +$ cd tests +$ ./testwrapper.sh -d . -i $PWD/reject.txt -t ./reject_ver.table +<fails to open inputs> + +This normally doesn't show up because people run `./configure` or, for +out of tree builds, `../configure`. But if you happen to run configure +with an absolute path, then automake tends to generate absolute paths +as well leading to test failures. + +Fix all of this by dropping the implicit input directory prepending. +In practice, it doesn't even make sense: +- INPUT_NAME is often a list of files, not just a single one +- the input directory is used to find the testname tables which are + usually generated, so it's impossible to use files from both source + and build directories +- most of the time, the full/correct path is already specified +--- + tests/Makefile.am | 4 ++-- + tests/testwrapper.sh | 10 +++++----- + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index cc9c178..6d1d9fe 100644 +--- a/tests/Makefile.in ++++ b/tests/Makefile.in +@@ -35,7 +35,7 @@ LOG_COMPILER = $(srcdir)/testwrapper.sh + LOG_COMPILER = $(srcdir)/testwrapper.sh + AM_LOG_FLAGS = -d $(srcdir) -r + REJECT_LOG_COMPILER = $(srcdir)/testwrapper.sh +-AM_REJECT_LOG_FLAGS = -d $(srcdir) -i reject.txt -r ++AM_REJECT_LOG_FLAGS = -d $(srcdir) -i $(srcdir)/reject.txt -r + TABLE_LOG_COMPILER = $(srcdir)/testwrapper.sh + AM_TABLE_LOG_FLAGS = -d $(builddir) -i $(srcdir)/reject.txt -t + DIRECT_LOG_COMPILER = $(srcdir)/testwrapper.sh +@@ -437,7 +437,7 @@ tableopts_tests := $(tableopts_opttests) $(tableopts_vertests) $(tableopts_sert + tableopts_tests := $(tableopts_opttests) $(tableopts_vertests) $(tableopts_sertests) + tableopts_c := $(addsuffix .c,$(tableopts_tests)) + OPT_LOG_COMPILER = $(srcdir)/testwrapper.sh +-AM_OPT_LOG_FLAGS = -d $(srcdir) -i tableopts.txt -r ++AM_OPT_LOG_FLAGS = -d $(srcdir) -i $(srcdir)/tableopts.txt -r + SER_LOG_COMPILER = $(srcdir)/testwrapper.sh + AM_SER_LOG_FLAGS = -d $(builddir) -i $(srcdir)/tableopts.txt -r -t + VER_LOG_COMPILER = $(srcdir)/testwrapper.sh +diff --git a/tests/testwrapper.sh b/tests/testwrapper.sh +index 30127b5..051e20b 100755 +--- a/tests/testwrapper.sh ++++ b/tests/testwrapper.sh +@@ -30,10 +30,10 @@ while getopts :d:i:rt1 OPTION ; do + + TESTNAME="${!OPTIND}" + +-INPUT_NAME=${INPUT_NAME:-`basename $TESTNAME`.txt} ++INPUT_NAME=${INPUT_NAME:-$INPUT_DIRECTORY/`basename $TESTNAME`.txt} + + if [ "$DO_COMPARISON" -eq "1" ] ; then +- test `$TESTNAME 1 < $INPUT_DIRECTORY/$INPUT_NAME` -eq `$TESTNAME < $INPUT_DIRECTORY/$INPUT_NAME` ++ test `$TESTNAME 1 < $INPUT_NAME` -eq `$TESTNAME < $INPUT_NAME` + exit $? + fi + +@@ -42,11 +42,11 @@ if [ $INPUT_COUNT -gt 1 ] ; then + exit $? + fi + +-if [ -f ${INPUT_DIRECTORY}/${INPUT_NAME} ] ; then ++if [ -f ${INPUT_NAME} ] ; then + if [ $USE_REDIRECT == 1 ] ; then +- $TESTNAME ${USE_TABLES:+${INPUT_DIRECTORY}/${TESTNAME}.tables} < $INPUT_DIRECTORY/$INPUT_NAME ++ $TESTNAME ${USE_TABLES:+${INPUT_DIRECTORY}/${TESTNAME}.tables} < $INPUT_NAME + else +- $TESTNAME ${USE_TABLES:+${INPUT_DIRECTORY}/${TESTNAME}.tables} $INPUT_DIRECTORY/$INPUT_NAME ++ $TESTNAME ${USE_TABLES:+${INPUT_DIRECTORY}/${TESTNAME}.tables} $INPUT_NAME + fi + else + $TESTNAME +-- +2.6.2 + diff --git a/sys-devel/flex/flex-2.6.0.ebuild b/sys-devel/flex/flex-2.6.0.ebuild index aa83cdcb0560..b603320301d1 100644 --- a/sys-devel/flex/flex-2.6.0.ebuild +++ b/sys-devel/flex/flex-2.6.0.ebuild @@ -22,6 +22,11 @@ DEPEND="${RDEPEND} nls? ( sys-devel/gettext ) test? ( sys-devel/bison )" +src_prepare() { + epatch "${FILESDIR}"/${P}-out-of-tree-build.patch #567332 + epatch "${FILESDIR}"/${P}-out-of-tree-test.patch #567332 +} + src_configure() { use static && append-ldflags -static diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild index 2f8afe756340..bf4286783fd3 100644 --- a/sys-devel/llvm/llvm-9999.ebuild +++ b/sys-devel/llvm/llvm-9999.ebuild @@ -201,11 +201,11 @@ src_prepare() { -i tools/lldb/scripts/Python/modules/CMakeLists.txt || die fi - python_setup - # User patches epatch_user + python_setup + # Native libdir is used to hold LLVMgold.so NATIVE_LIBDIR=$(get_libdir) } @@ -215,7 +215,7 @@ multilib_src_configure() { if use multitarget; then targets=all else - targets='host;CppBackend' + targets='host;BPF;CppBackend' use video_cards_radeon && targets+=';AMDGPU' fi diff --git a/sys-kernel/aufs-sources/Manifest b/sys-kernel/aufs-sources/Manifest index 5e75a070c03f..2628a5ba1ec7 100644 --- a/sys-kernel/aufs-sources/Manifest +++ b/sys-kernel/aufs-sources/Manifest @@ -14,6 +14,9 @@ DIST deblob-check-4.0 670921 SHA256 042b511913187672d9a0512765e662ba5d4283812ebe DIST genpatches-3.18-22.base.tar.xz 651380 SHA256 9c866ac44e0c716a5292c3ec907fc52edfce1a32d75cbc63e51f2adbd10067d0 SHA512 d1183150a2ee641714dc85c873713936d862688d4314a6906a25943bbfb34566fe5d0e838d61eba2fc369a657aa762f6276a2a31a5c4e2e9429db4330a0fa03a WHIRLPOOL 22d358be0bfd836ded82b5fc347f5bc266186ee0374120f2def7e6d8c4e87c43ab364eb64c6b141ee8d0705912ebc12f5525694c7d6fcbc9da38c0012ed09da2 DIST genpatches-3.18-22.experimental.tar.xz 61604 SHA256 a216f6a678d83ca91283adddaef52face5980718cc7eae9d8764f782422771c8 SHA512 aa2819419490a7ea0ac06179c07a2139e671877b4a5109c019c8931f21069e4d313c75279b679a76ead8381bc1f709a77b8eb19da27f3d5e8d4d4fb97a0ae5c3 WHIRLPOOL fb4364fc476edac40019c1215c5ba94e29ffd003aae37cb8bb642008e2f0a853ec174c4495699a2c7984dd190d895aeab17cae3ab6c6045ff497c07716a46939 DIST genpatches-3.18-22.extras.tar.xz 16196 SHA256 deeab880c0705b9a02492e2e73152614b7c7dd9f213303fd5284ee07debf0416 SHA512 5ba6d42c5973daa52a54bc77f3f13312d9c6f496e002ab2ad613a08f18ee64dad39472ec0cdb0e545b2c95aee0d69fd30c38877d15f266768a22fabb8a06e2a3 WHIRLPOOL 84092c11122198958498e26d3c4fccbf06451ff9c880510f763968644d03c30160f01090c2bc5b411cb813715083682b90b750401ffd7c8f011ae24f203e90c0 +DIST genpatches-3.18-24.base.tar.xz 723760 SHA256 6b21c67c926c470cd09321d3650194b596434cadb1370ae05440168f9288fa65 SHA512 a46ea4adcc975f0946daf3f71b3e92514fb22d6992e501f381ba30dd471f2b1b25c6571d4029d1b860a14792f2e1be2af3bb72f3917022162cb1c04a8898a87e WHIRLPOOL 7e3859e47893a5b4fa1ba242fe63f4d0cd90ac0927ff8deed8cca84e830728e087a105f1807eb3eb80159b7b4d665af3acbcd92302789c9a7af31b73d7402c4c +DIST genpatches-3.18-24.experimental.tar.xz 61612 SHA256 f92a05e405bca99e38597669cef64a87c1332b2e72fbc14f93ac4eab73827454 SHA512 04f2ced0957132f0454f0b80781afddf015998849841c300dd8c750977df7218b9c026e35a1b7daeb5ad04c7c590745d5b9058fb7830d6533b456587714d98d5 WHIRLPOOL 6418de81a7027e09e6e0e59ed67c11ef2656a1091e29f10264f5ad2426bc71669e74b053d55a927a831e7ce18a17bbc319fdb5297853444b51d9fa9fa1a3688c +DIST genpatches-3.18-24.extras.tar.xz 16184 SHA256 0415f6e56f06b088ef78d7980c447a4a2ddf7d8915c391df0e826f8dac7a3823 SHA512 4a380e0ed2a23fd593dd22d6688e8339f9fe5508c5c7b83604e0d361890f6741418323a0dc4f5652d441d1facaaeb573811ee6770aad8c3cf512a22777a1ac77 WHIRLPOOL 98aacab957a5283b9eea0e204c275b15cece98fb7e80ca69447b0ac9cf96c52c1a11165366108de284a50650421b0f848bdf6b0fa749e55f1173aae5c103f18a DIST genpatches-4.0-11.base.tar.xz 234968 SHA256 49cfd38bb97a92984c0d8b955c2f795701897544a4bfea4d2d2932543abca31a SHA512 059a049248c2eaaae4c4201235586306f846b12503fa1aa3bdea9ad31b4522f030beb057926cf79ffa9468e2940a68b6f6089511a60005dd339e4775c8a682cd WHIRLPOOL a5a31fa2a1db39fd01ed72e9917481a7c4f406c8168a2dac078df5a46c41d0be69df6ef532aae0f06fbf81a5a5e2262a9ba4785bdb13c48b21e338347d6be1ee DIST genpatches-4.0-11.experimental.tar.xz 61632 SHA256 cedb08c7d68cf62038aa6f8db3999a7d6daf434a08d0c811308affd5d18667d4 SHA512 cfe5281678acc938ba0c906ef58a654889a71da5238fbff13e5e78f328dc07485345deea6080abf1380a8a3ec5314691b8f5a35ae0cf627e6ebb38ba66860e38 WHIRLPOOL 5bfd4de5098fe5cd05bc7184a5797f9b310a848b2d96e04b83986f45d3961abaf6cfb76b801b9031c0b46c2c072578b59b98781c8c432b7ec0989449f8098a04 DIST genpatches-4.0-11.extras.tar.xz 16288 SHA256 84b7509ecc82f7ff1b90959b88e9e0ad77544610d5a95aacfb88b7200b9aced1 SHA512 95354b1a2dce8d93a50cc1e1e79ea807134eb050c7a76921ada26f5bfa210963a16c9af7bda0b75894201a1e82929859f6dfa5c23cf63fe4586e4264eef85c7f WHIRLPOOL 4ebc929d8e39c0967b99d558f68e5454e6ffc771273b7e9637d8d0ba477c67ee490e0a443a8aa4fdcc74f3aab59cf8e9c159f2a3b152b33fb9a8f395a67b0085 @@ -26,6 +29,12 @@ DIST genpatches-4.1-16.extras.tar.xz 16176 SHA256 a6e00246f5e8feef952529d7be5110 DIST genpatches-4.1-17.base.tar.xz 411900 SHA256 a19b332a06c9486f38fa0397ddf16a107f524c8fda184a9ba3941d85e29d0f83 SHA512 32ce0d796844516cd27bfcb035ff791cbeb4c3b7cce5465268bf88a306dc1870145b6d5758fb7ef4d53acfb29bb4b8333b5b4ff7cef5a0711efea8ea11052121 WHIRLPOOL aae1f608d665f253fb106e25a51c884caa37f44961027e938daf323689c9c4b0c64071b4a7b4b6d3b07f51f2243a9b84e683aad4ea0fdcc04f09e0b97b65fb5b DIST genpatches-4.1-17.experimental.tar.xz 61620 SHA256 104939e96a8be5483f61a25c716facaa88ae9c5169ea0d265c6758d4d681a339 SHA512 8c9994e556ef20252b59b6a534602b7964f8effc6428464a3463c58aecf0a7e3d93dd9138f89c6f8a8f8cebeb3f60f0df01c2c067fe4998066a42c6c8544a969 WHIRLPOOL 9d1f3a479b8e82597e0a7b2aafedbbbf16a767158134b3b7ead88d753d6723097eba0376930bb20465d84b21b0dd9e850d64fded278d98482b2b8498525f1499 DIST genpatches-4.1-17.extras.tar.xz 16176 SHA256 755f880b1683ac915aa36739ee355fbdc00ceaa6a0843fb4a02f122008a2b33b SHA512 70151870af107d62095f2df0a8881e8934225fd70e5be1731f0a01856ffed61e3b284c20d04105c18a1302974b5bf39b01565ffd9a2338db91dea146b9b626d2 WHIRLPOOL 7250978f19dce490f21f84a27867465d0db195f3bd6b3619e84e591bb83e61d28e732ceef65d90cffc3878ab41eec10b17b6b1b15eaa68e5bf9745a877c4a537 +DIST genpatches-4.1-18.base.tar.xz 434312 SHA256 e039e095053deb5b21709c3277ffed00c44a8589bed2e2481f2a74de548ef00c SHA512 599f8e0fd53a59429a5dd8ddf29ff2673827068132c3aca43894a629f007ec58c9ce872b0a39e65c7222b420ef25fa1324d3c60b0c526fea4345c004c55e8b12 WHIRLPOOL dc7322d05e7fd4a10bd149b00510ebb636832571108c7b751b90a3d8bd9dec0af01b29f59ac5e984621d1f6dc085600c919b28e06eb3f1d287c6f3045e585610 +DIST genpatches-4.1-18.experimental.tar.xz 61640 SHA256 183ac4b1c8b8fa2b8986ee37920246955f05d8be48c8d59017c3821572d1da7a SHA512 65335da4b6571111248fb6ee035d3be189b4045a9b05d695f21082fae25f4bc071b065bca416c2e99f69ebccbd8d2dded542532edf41299f8e3b662465a78c23 WHIRLPOOL 0ddf13a2c3ea96b73380c95e8f5eac4a77c9936dca1e52828f7aa4c056c4a01b35df12e509239874e0af61ccb6c38ec21f25444eec4a35a609b72bd397218ac6 +DIST genpatches-4.1-18.extras.tar.xz 16180 SHA256 6c386d8e019d5ff811aaf2c75c14c819237e94df4f3cd7037e4e04a9660ce5ca SHA512 7e1239796426182271aaefbf3cf0afb14a0864f39cbc2a14105afbe137b347967035fe716d43bb31b75518b598f20c8523262564adef32b14564f60a1f9b3306 WHIRLPOOL 3906fc8c6565ce77c283dd125be18601043d74df0e0c498e9e542dd933d085201b20a4751c52eafa30fbb908baeed820b074e691fc4359f43c53ddc0eac6c401 +DIST genpatches-4.2-10.base.tar.xz 248292 SHA256 8eb6bba57faabfba57c4415b145300c9fb7b96e9aebcb0dcde7b18aa447dc725 SHA512 0f449d0bc29102ea25fd695508fe17ce8258c216d454777d642727f2eb2f1042acde47bd52bcfabed296d4fc3d0fe3bcb080e5bde5077b1e0879b1651e7f9ffe WHIRLPOOL 3d07c16cc43de6237d6fee0af2bed8d3dae0c8e688d255a48f54b7b6a293ec9eb9658168120c18226079e1e2ca4ecff30b681ea326dcf9b434b2642c3910e16f +DIST genpatches-4.2-10.experimental.tar.xz 61620 SHA256 e3f6a3d33552281f012456a580cc1e624cb8acdf33f28bc07231319fe3db4dd2 SHA512 d72a6d135b36dbb2e665a537a8d9e31b6fae2cda68aca32532a1e6ea249da88bcbc4b9f853e62ca4f8b58c78a4f242d7fe96ff673f3a881091112a35868f1dff WHIRLPOOL 634df2eefc154eca49e8d15aa286ce79941a4193bba4534dcd6340419993e428351562c7e17e8b19a1c47bd53a9a31485952e035061c8b1b5a5922224cf477dc +DIST genpatches-4.2-10.extras.tar.xz 16180 SHA256 6c386d8e019d5ff811aaf2c75c14c819237e94df4f3cd7037e4e04a9660ce5ca SHA512 7e1239796426182271aaefbf3cf0afb14a0864f39cbc2a14105afbe137b347967035fe716d43bb31b75518b598f20c8523262564adef32b14564f60a1f9b3306 WHIRLPOOL 3906fc8c6565ce77c283dd125be18601043d74df0e0c498e9e542dd933d085201b20a4751c52eafa30fbb908baeed820b074e691fc4359f43c53ddc0eac6c401 DIST genpatches-4.2-7.base.tar.xz 177852 SHA256 7f7528ef582219a6d5aee348b09c8523f7b6d5b80eed2d7c6d0a804dffb11440 SHA512 657a7316aaf139820898f0136f5eb0011d38a439f55257567c70074f65f78ab67b316132fa0cf3a19990c8decc49ebf13ed8b4be4788df66e51dd45ac307da31 WHIRLPOOL a6cb9ab193d124f524e84ec427bcd397cc8ac0327743f8ad69d5b61b2d91c4187eefdcc3c48aacae28f10553fb19eec82a48f988eba22845c658159d9f529d0a DIST genpatches-4.2-7.experimental.tar.xz 215956 SHA256 be585b9619c5828dca83243f5a3f74c7b5cd7bf775164c89a3eed808665795b5 SHA512 f555c5f870683de39c268ec7b5444340e1eeaadd2b48dc727c4bcc1a06a77643c9d058feb4d41276e0119132ea3c4fd09bb8b3171508fa48cd1a64643cfc6d5d WHIRLPOOL 02860073cf626b8c98e3aaa7df9c7138c8fec8387d58f6781d450c6f671dadf1ca8b329ca8768f9187a155b1fd7dd6a570de75d96973ee42e13e9a6fc0f2762b DIST genpatches-4.2-7.extras.tar.xz 16180 SHA256 2a280c94254b721cacb423e683593fc800fd645fe54dc568b845cf02887932b9 SHA512 9af37fd4762c658001b2726534c0bbedf033d29a76017ee53d2ded37282bcb709bb4b33864fd0fb69e107955c98cc37cd82cfe0dab1cdff1ea88f68f87aa2ed9 WHIRLPOOL 2c516cdf55f6dcb613e873a69c968c0b2e18f779baf7f12d0bdc77de09c17205819b014772d10dd25bd1cf1feb1fb3397561b520c6b8261649407663095f2e42 diff --git a/sys-kernel/aufs-sources/aufs-sources-3.18.24.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.18.24.ebuild new file mode 100644 index 000000000000..0ac7063b660c --- /dev/null +++ b/sys-kernel/aufs-sources/aufs-sources-3.18.24.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ETYPE="sources" +K_WANT_GENPATCHES="base extras experimental" +K_GENPATCHES_VER="24" +K_DEBLOB_AVAILABLE="1" +UNIPATCH_STRICTORDER=1 +inherit kernel-2 eutils readme.gentoo +detect_version +detect_arch + +AUFS_VERSION=3.18.1+_p20151012 +AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz" +# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs3-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar +AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}" + +KEYWORDS="~amd64 ~x86" +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/" +IUSE="deblob experimental module vanilla" + +DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs3 support" +SRC_URI=" + ${KERNEL_URI} + ${ARCH_URI} + ${AUFS_URI} + !vanilla? ( ${GENPATCHES_URI} ) + " + +PDEPEND="=sys-fs/aufs-util-3*" + +README_GENTOO_SUFFIX="-r1" + +src_unpack() { + if use vanilla; then + unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT + ewarn "You are using USE=vanilla" + ewarn "This will drop all support from the gentoo kernel security team" + fi + + UNIPATCH_LIST=" + "${WORKDIR}"/aufs3-kbuild.patch + "${WORKDIR}"/aufs3-base.patch + "${WORKDIR}"/aufs3-mmap.patch" + + use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch" + + unpack ${AUFS_TARBALL} + + einfo "Using aufs3 version: ${AUFS_VERSION}" + + kernel-2_src_unpack +} + +src_prepare() { + if ! use module; then + sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die + fi + cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die + cp -rf "${WORKDIR}"/{Documentation,fs} . || die +} + +src_install() { + kernel-2_src_install + dodoc "${WORKDIR}"/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch + docompress -x /usr/share/doc/${PF}/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch + readme.gentoo_create_doc +} + +pkg_postinst() { + kernel-2_pkg_postinst + einfo "For more info on this patchset, and how to report problems, see:" + einfo "${HOMEPAGE}" + has_version sys-fs/aufs-util || \ + elog "In order to use aufs FS you need to install sys-fs/aufs-util" + + readme.gentoo_pkg_postinst +} + +pkg_postrm() { + kernel-2_pkg_postrm +} diff --git a/sys-kernel/aufs-sources/aufs-sources-4.1.14.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.1.14.ebuild new file mode 100644 index 000000000000..51d9acf54a3c --- /dev/null +++ b/sys-kernel/aufs-sources/aufs-sources-4.1.14.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ETYPE="sources" +K_WANT_GENPATCHES="base extras experimental" +K_GENPATCHES_VER="18" +K_DEBLOB_AVAILABLE="0" +UNIPATCH_STRICTORDER=1 +inherit kernel-2 eutils readme.gentoo +detect_version +detect_arch + +AUFS_VERSION=4.1_p20151116 +AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz" +# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar +AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}" + +KEYWORDS="~amd64 ~x86" +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/" +IUSE="deblob experimental module vanilla" + +DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs4 support" +SRC_URI=" + ${KERNEL_URI} + ${ARCH_URI} + ${AUFS_URI} + !vanilla? ( ${GENPATCHES_URI} ) + " + +PDEPEND="=sys-fs/aufs-util-4*" + +README_GENTOO_SUFFIX="-r1" + +src_unpack() { + if use vanilla; then + unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT + ewarn "You are using USE=vanilla" + ewarn "This will drop all support from the gentoo kernel security team" + fi + + UNIPATCH_LIST=" + "${WORKDIR}"/aufs4-kbuild.patch + "${WORKDIR}"/aufs4-base.patch + "${WORKDIR}"/aufs4-mmap.patch" + + use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch" + + unpack ${AUFS_TARBALL} + + einfo "Using aufs4 version: ${AUFS_VERSION}" + + kernel-2_src_unpack +} + +src_prepare() { + if ! use module; then + sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die + fi + cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die + cp -rf "${WORKDIR}"/{Documentation,fs} . || die +} + +src_install() { + kernel-2_src_install + dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch + docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch + readme.gentoo_create_doc +} + +pkg_postinst() { + kernel-2_pkg_postinst + einfo "For more info on this patchset, and how to report problems, see:" + einfo "${HOMEPAGE}" + has_version sys-fs/aufs-util || \ + elog "In order to use aufs FS you need to install sys-fs/aufs-util" + + readme.gentoo_pkg_postinst +} + +pkg_postrm() { + kernel-2_pkg_postrm +} diff --git a/sys-kernel/aufs-sources/aufs-sources-4.2.7.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.2.7.ebuild new file mode 100644 index 000000000000..4a07ab03238c --- /dev/null +++ b/sys-kernel/aufs-sources/aufs-sources-4.2.7.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ETYPE="sources" +K_WANT_GENPATCHES="base extras experimental" +K_GENPATCHES_VER="10" +K_DEBLOB_AVAILABLE="0" +UNIPATCH_STRICTORDER=1 +inherit kernel-2 eutils readme.gentoo +detect_version +detect_arch + +AUFS_VERSION=4.2_p20151116 +AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz" +# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar +AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}" + +KEYWORDS="~amd64 ~x86" +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/" +IUSE="deblob experimental module vanilla" + +DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs4 support" +SRC_URI=" + ${KERNEL_URI} + ${ARCH_URI} + ${AUFS_URI} + !vanilla? ( ${GENPATCHES_URI} ) + " + +PDEPEND="=sys-fs/aufs-util-4*" + +README_GENTOO_SUFFIX="-r1" + +src_unpack() { + if use vanilla; then + unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT + ewarn "You are using USE=vanilla" + ewarn "This will drop all support from the gentoo kernel security team" + fi + + UNIPATCH_LIST=" + "${WORKDIR}"/aufs4-kbuild.patch + "${WORKDIR}"/aufs4-base.patch + "${WORKDIR}"/aufs4-mmap.patch" + + use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch" + + unpack ${AUFS_TARBALL} + + einfo "Using aufs4 version: ${AUFS_VERSION}" + + kernel-2_src_unpack +} + +src_prepare() { + if ! use module; then + sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die + fi + cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die + cp -rf "${WORKDIR}"/{Documentation,fs} . || die +} + +src_install() { + kernel-2_src_install + dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch + docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch + readme.gentoo_create_doc +} + +pkg_postinst() { + kernel-2_pkg_postinst + einfo "For more info on this patchset, and how to report problems, see:" + einfo "${HOMEPAGE}" + has_version sys-fs/aufs-util || \ + elog "In order to use aufs FS you need to install sys-fs/aufs-util" + + readme.gentoo_pkg_postinst +} + +pkg_postrm() { + kernel-2_pkg_postrm +} diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest index c74ae18db0a6..db453b0f4711 100644 --- a/sys-kernel/gentoo-sources/Manifest +++ b/sys-kernel/gentoo-sources/Manifest @@ -8,6 +8,9 @@ DIST genpatches-3.10-97.extras.tar.xz 17832 SHA256 6eb6942f08071bd467bdb13218975 DIST genpatches-3.10-98.base.tar.xz 1303112 SHA256 51a91a0d98ceb9c77c900aa4ad86b51113341a2823ccb90c3bd926bb3009b07b SHA512 621cdf1e7ffa02d4e9b0996681f8d60bcf26a30ac4bf8d00145806047a7ace8cbf60195840ba858d775c64107356cbc1efd4b601f6e0219bd2e9552b71d6540b WHIRLPOOL c054f0b2c7de4ba83d0bb53838b0b11564fb7950c081bc65c27f99efaba2e8495f90b62c4c477cbe7f0a47ab20832c070cfe747b526d30481a11839d5a5738d2 DIST genpatches-3.10-98.experimental.tar.xz 60160 SHA256 663505a20e625da9160d279fb42dc578490050d85e83a5b1addde985c456f205 SHA512 8efc7c68eaf21a57e85a76deffc87596eab82988868616ee5e8ee0fc041ef16352fce6c0ac456b10c015416bfbd1b2b8f48cc2d3032c194fa0a097f6a488b432 WHIRLPOOL 49bb906de3a71bc098f3efd686193dfb68b99f110e3025ff3f10fd964ee238be7c46abc4e642b41dda4f579a870b5448c87bf0bb1580dabc6a04b9928cc34b7b DIST genpatches-3.10-98.extras.tar.xz 17840 SHA256 b8207c98fa54727f8c5ad98fa9c36d64ed1b6e035749e969c2c7b9c40d63fff4 SHA512 6c9f9c980de8b160a5ee32d69889bb224c5715eca8412b51bb24f5f24565e28c8ea200d28f26332709e7aada9981867aff76731cec12997e730481f82f09b455 WHIRLPOOL 419b8657351293fa04b0c41bdfbc025e51602f149866fe05cc47c7cbe746c31a2cdd652d652df327949707550f04a0558b442c1815f5e1f596ef830efebe4fd8 +DIST genpatches-3.10-99.base.tar.xz 1308444 SHA256 f8b6ed7dfd6481a1086065881f1693e0d57233827a70c4ca2537c8411ef911ec SHA512 4e2a5788e2a18090dcfaef78d97a9e95cdc27584f5cf71004ff842f47ad5a89b9123f54bfd9be44dc354474151d9beb575df2572a3d47cf9a3452811ba592dad WHIRLPOOL 8a8e44d2e4246d627d6ccf04cd48498bbbd48dd859f41fe07e5492ea929cf0b50f0b1938353ec5dc17bcfa23ca68097330465f5bec2189188983ef930f5ad024 +DIST genpatches-3.10-99.experimental.tar.xz 60164 SHA256 a8bb27a7292a8cf63285743478830b88b70be2ee5ad4beeb9d713e39f4f10ead SHA512 5e81bc456813429eb23f90ec8c7ebe0214e7e376da16ddc622c00a83210372cc0807306272a98754d2480746d8421025eb5b5ba3ea6e879aecf3aae21007caa5 WHIRLPOOL 907641fc4789490ced829b51f0fcc1a3e324a0d97e0b1edb581da91674830cbd59dbe16027573035203a6a24e8a3da680f1f6ee921107a8f2a6958c337c7c710 +DIST genpatches-3.10-99.extras.tar.xz 17840 SHA256 f959a2835307736a3bd1306a2733c677f30f3b245a2aea301440e50220734980 SHA512 4f8c2f6af332be76ffe543d5ce0225ba1b5c8624d4945cfd56043892a2ffc61e65592387938be8fddc73e89d1382ec47524f6f6ff4b61bfeca977a267d72b131 WHIRLPOOL 052dfe64463f5950426dccab6dcaa21abc5abadae27fa0182902bfeac8410fc38bf32d41bce58e585f324287b49d6aec9e59abc19515212f6940007222fa3212 DIST genpatches-3.12-46.base.tar.xz 1477068 SHA256 62f8e7101afdf671a51e3beb9b01f8c06cc3df6b12274fdbfdb1bacf2d3f2952 SHA512 8464d356a7267f41a5d4b8eaae24b3ba391d51157adb3b5b7d6bd626b1569e5c565f4383e138bd3d939d4a2bc3dfde349f74c2b421365205d98132cb79442612 WHIRLPOOL 50aa1c4ccb5bf46e54ef1cbf699c7af27f00252325b09bf25e8f9cead1faf346a94bce29e4cc556e7eb3e339b627e8fd321acc320221a8a208fcff4493eaaa29 DIST genpatches-3.12-46.experimental.tar.xz 46524 SHA256 48069be9b5b0a4ba7f1da5dc046770e2e36a52951bd6815a00907cd721881b25 SHA512 6daf5d04d5cf569eb5b0bedd5feee8f3869938ceb9093f109f82ec8e4fed5349a5dfd445f89a9f5c5459b2524bc4d00707c4fbfa449783ef63a65204755546e3 WHIRLPOOL e51be15d4756dcc8ec59179809584bc1232ff20148a1bb2143947138a8591311a7bc7162b29ea3db81c0781551a186b7650f597ad850864b1ffd2f7dc975b00f DIST genpatches-3.12-46.extras.tar.xz 18240 SHA256 7cf508f807c15884428573ec210eeefb53470504bfef2eca8357e60d82cbfc4c SHA512 11736da85ec15ae89dff6c850ea730fe5ca62bfa24d864df3d7c832fb20fc4321485306124b516037b3121e1b8c5a47bc0610f17767867babc9f8cab4ee599e0 WHIRLPOOL c5164b37852f78ef0297c70a41f984ff6647eced6e980f7718d924622f28c8ccb325b32cc04f0cb14b01fde029ed09f0b2b6d0ed41126140061e010aa4e95405 @@ -20,6 +23,9 @@ DIST genpatches-3.14-62.extras.tar.xz 18252 SHA256 6702160c63ae9de7eb95279ffbe3e DIST genpatches-3.14-63.base.tar.xz 1110736 SHA256 430af952731acb738d0569465120f5a60f46a5dfcdba943705ca10ed56bcc4d4 SHA512 7dcca031f1c1d48094ce5cdda960f2b3f38aa1c6022929df2125a5581fcda84330ddf0f99fa00b4d3174be5dcbd24abb569ecdd3add0f3cfbc288409310b9dee WHIRLPOOL 0d46ff7f6960470fcf2019a17885c98f27422e9c406d0019d9cb51ca14a0f122e4c95699e07324c4bc30d3e7e538377c8c15976cc619d578d10f893a3d5af0b3 DIST genpatches-3.14-63.experimental.tar.xz 60316 SHA256 60fcccec6ceec3080c0b76e12f204ba443a8bb92e22b9d3f3b72a86f9338ec87 SHA512 43c31320aace9aecf6064eb877fa21fa25a90355dccb63545edef91105ac69ea7316477ed4ff222b818a9f83e896466cac8dce872274c2fa9c851a144b7a2cd7 WHIRLPOOL 259a9a1d2e94f6f4de11e3712102d51496042ae92097a8714354bcabb70c794c45da63747d739d9f9cbe45e0b19aa7458f979c582b4c1c4e7d86ad979972b66d DIST genpatches-3.14-63.extras.tar.xz 18260 SHA256 d85286f9101952e49f47bd8919449abf7984ba8d5ad1e1711c5e66912a127fef SHA512 10c2e2ce6b227b30404deeb0d01ab0407becd042fb7d462e351ed56d47f973a8710fb07428f7941f972e6c5ba516ca3663c7745898022d3246b35a1cf47165fa WHIRLPOOL 18fe9f3149066dadef9d56e25a15edb8728a8bfb8e1d1d492f46183f90c17ddb84f3065dedee25cb38997f987d6548989818298163f07aa34d3088f49370fe15 +DIST genpatches-3.14-64.base.tar.xz 1117320 SHA256 4ac5de230cb3174469273057203cc2463a2a16a776bacfa65bb922b7f33123dc SHA512 2170058710496275200c7d69e643451cb41578944e60b1cfca0761a4cf0de7f94db37a9f7b0f8880f4031a897d9c437a537e9ee36ad389d613106e98a4e3074c WHIRLPOOL 0fb3bc3d262b548499205a7797e85f8606e1f7682d1c4e8acc066ff10c69cbcccc54478da4b014607c4aacd72e1a388d81117a91e913a9f73f2fc49de0cbda72 +DIST genpatches-3.14-64.experimental.tar.xz 60304 SHA256 dbd95c2e037084a85aed25e3669bffed7f94cc3052734e7954a43ecc3cd577e6 SHA512 9a53dd76dac497028907ed6cf17aade8675620e11bcba88a54f97db3b744123d634bc4d50c262f689e8e5026ec9716febd967461e91b775d0b2e1e53b5589c43 WHIRLPOOL 6fa792538577bf56cf21914c574359c91ba164c519ff0c6c5d10ac218b9c84d73fe017543ab2c5804d63240ce265556983cfd0907c0eae3d1124bb34919f0fc2 +DIST genpatches-3.14-64.extras.tar.xz 18252 SHA256 e6a4f086c0ffb45e5345bd18354c8bff4870f768843a3ce6ad671db99ce8d439 SHA512 ee7dbd7e9db3405cf6b0b55110cee4a7844732dc80b19ec6b76ae27b355fbca58500aa10745dcf8d91db080e67e091400d2c227a35fa3e2c838f1be91740f452 WHIRLPOOL a2c3f61a9191e7703bae7f0dc8bdfa81d349440aa5c2fd3b60456bb36464b35f601a6dc5ecf37552ddc1e8cdd77722c23224d6984b04312bd508ec7e1f264a44 DIST genpatches-3.18-21.base.tar.xz 632956 SHA256 f657997b05dc52e215c22fde16cb227895d072ac2716d25481654849a9e373f1 SHA512 f1dac401caf1cd6282fc47670ad9e3540855542d7eee77f27231bdb9679d3da07b7b09f675ce5998aa777024817546ba8747c7d75aa45cbeb2789dbabf5c5602 WHIRLPOOL 26d19e9302ffd72123c897f7012ae6d81cbab7a7d1b498d10b6aef27fd5e7f4d466fb510c6e72ef3c5f855eb9c88e80f8adbf436e80d52dcbcf1ac1f3e1bf684 DIST genpatches-3.18-21.experimental.tar.xz 61600 SHA256 ebee995e505d68dcf95f39986b73185b353cc64627b048f230e755195a910094 SHA512 d7866e7948e8d6c83a452f99ca50ed06951f68b7552d9dc182c5686d43abe3dc76e3773c8325a87b65e8bf1fa4c09db75fc1af27b7837bb60918e82273cc17e4 WHIRLPOOL 01f897a369a036624364de57b1ea213b8bbe1b1e9bea792e45e0e5b921c3cff0a88174c3284359466059e3dc3793a51ea92a1aa4a5c7b0dd79d98e99693ccd80 DIST genpatches-3.18-21.extras.tar.xz 16192 SHA256 76e21081cdcb3c1b38632ec5375b456287ed572c1a3cb64cc036471a4ae4f726 SHA512 c1e98a5d2350b07a5d939863386027765c8820e32a45a9c68201beb6de811aadcd32c82ef8ef0627290f6fef7ad5751418b2aa7ab4e2d8f3e5b6683e40fbc80a WHIRLPOOL b39979d760f0695fb2632bf7fbed16070e24efa03992c0575bbd13185ab33f0e2d05e35071e9f352f0eaa83e15015550229c33df2294beebe2ef6d24fa2b755e @@ -46,6 +52,9 @@ DIST genpatches-4.1-16.extras.tar.xz 16176 SHA256 a6e00246f5e8feef952529d7be5110 DIST genpatches-4.1-17.base.tar.xz 411900 SHA256 a19b332a06c9486f38fa0397ddf16a107f524c8fda184a9ba3941d85e29d0f83 SHA512 32ce0d796844516cd27bfcb035ff791cbeb4c3b7cce5465268bf88a306dc1870145b6d5758fb7ef4d53acfb29bb4b8333b5b4ff7cef5a0711efea8ea11052121 WHIRLPOOL aae1f608d665f253fb106e25a51c884caa37f44961027e938daf323689c9c4b0c64071b4a7b4b6d3b07f51f2243a9b84e683aad4ea0fdcc04f09e0b97b65fb5b DIST genpatches-4.1-17.experimental.tar.xz 61620 SHA256 104939e96a8be5483f61a25c716facaa88ae9c5169ea0d265c6758d4d681a339 SHA512 8c9994e556ef20252b59b6a534602b7964f8effc6428464a3463c58aecf0a7e3d93dd9138f89c6f8a8f8cebeb3f60f0df01c2c067fe4998066a42c6c8544a969 WHIRLPOOL 9d1f3a479b8e82597e0a7b2aafedbbbf16a767158134b3b7ead88d753d6723097eba0376930bb20465d84b21b0dd9e850d64fded278d98482b2b8498525f1499 DIST genpatches-4.1-17.extras.tar.xz 16176 SHA256 755f880b1683ac915aa36739ee355fbdc00ceaa6a0843fb4a02f122008a2b33b SHA512 70151870af107d62095f2df0a8881e8934225fd70e5be1731f0a01856ffed61e3b284c20d04105c18a1302974b5bf39b01565ffd9a2338db91dea146b9b626d2 WHIRLPOOL 7250978f19dce490f21f84a27867465d0db195f3bd6b3619e84e591bb83e61d28e732ceef65d90cffc3878ab41eec10b17b6b1b15eaa68e5bf9745a877c4a537 +DIST genpatches-4.1-18.base.tar.xz 434312 SHA256 e039e095053deb5b21709c3277ffed00c44a8589bed2e2481f2a74de548ef00c SHA512 599f8e0fd53a59429a5dd8ddf29ff2673827068132c3aca43894a629f007ec58c9ce872b0a39e65c7222b420ef25fa1324d3c60b0c526fea4345c004c55e8b12 WHIRLPOOL dc7322d05e7fd4a10bd149b00510ebb636832571108c7b751b90a3d8bd9dec0af01b29f59ac5e984621d1f6dc085600c919b28e06eb3f1d287c6f3045e585610 +DIST genpatches-4.1-18.experimental.tar.xz 61640 SHA256 183ac4b1c8b8fa2b8986ee37920246955f05d8be48c8d59017c3821572d1da7a SHA512 65335da4b6571111248fb6ee035d3be189b4045a9b05d695f21082fae25f4bc071b065bca416c2e99f69ebccbd8d2dded542532edf41299f8e3b662465a78c23 WHIRLPOOL 0ddf13a2c3ea96b73380c95e8f5eac4a77c9936dca1e52828f7aa4c056c4a01b35df12e509239874e0af61ccb6c38ec21f25444eec4a35a609b72bd397218ac6 +DIST genpatches-4.1-18.extras.tar.xz 16180 SHA256 6c386d8e019d5ff811aaf2c75c14c819237e94df4f3cd7037e4e04a9660ce5ca SHA512 7e1239796426182271aaefbf3cf0afb14a0864f39cbc2a14105afbe137b347967035fe716d43bb31b75518b598f20c8523262564adef32b14564f60a1f9b3306 WHIRLPOOL 3906fc8c6565ce77c283dd125be18601043d74df0e0c498e9e542dd933d085201b20a4751c52eafa30fbb908baeed820b074e691fc4359f43c53ddc0eac6c401 DIST genpatches-4.2-10.base.tar.xz 248292 SHA256 8eb6bba57faabfba57c4415b145300c9fb7b96e9aebcb0dcde7b18aa447dc725 SHA512 0f449d0bc29102ea25fd695508fe17ce8258c216d454777d642727f2eb2f1042acde47bd52bcfabed296d4fc3d0fe3bcb080e5bde5077b1e0879b1651e7f9ffe WHIRLPOOL 3d07c16cc43de6237d6fee0af2bed8d3dae0c8e688d255a48f54b7b6a293ec9eb9658168120c18226079e1e2ca4ecff30b681ea326dcf9b434b2642c3910e16f DIST genpatches-4.2-10.experimental.tar.xz 61620 SHA256 e3f6a3d33552281f012456a580cc1e624cb8acdf33f28bc07231319fe3db4dd2 SHA512 d72a6d135b36dbb2e665a537a8d9e31b6fae2cda68aca32532a1e6ea249da88bcbc4b9f853e62ca4f8b58c78a4f242d7fe96ff673f3a881091112a35868f1dff WHIRLPOOL 634df2eefc154eca49e8d15aa286ce79941a4193bba4534dcd6340419993e428351562c7e17e8b19a1c47bd53a9a31485952e035061c8b1b5a5922224cf477dc DIST genpatches-4.2-10.extras.tar.xz 16180 SHA256 6c386d8e019d5ff811aaf2c75c14c819237e94df4f3cd7037e4e04a9660ce5ca SHA512 7e1239796426182271aaefbf3cf0afb14a0864f39cbc2a14105afbe137b347967035fe716d43bb31b75518b598f20c8523262564adef32b14564f60a1f9b3306 WHIRLPOOL 3906fc8c6565ce77c283dd125be18601043d74df0e0c498e9e542dd933d085201b20a4751c52eafa30fbb908baeed820b074e691fc4359f43c53ddc0eac6c401 diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.10.94.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.10.94.ebuild new file mode 100644 index 000000000000..dc54d6bbcadf --- /dev/null +++ b/sys-kernel/gentoo-sources/gentoo-sources-3.10.94.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +ETYPE="sources" +K_WANT_GENPATCHES="base extras experimental" +K_GENPATCHES_VER="99" +K_DEBLOB_AVAILABLE="0" +inherit kernel-2 +detect_version +detect_arch + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" +IUSE="experimental" + +DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" + +pkg_postinst() { + kernel-2_pkg_postinst + einfo "For more info on this patchset, and how to report problems, see:" + einfo "${HOMEPAGE}" + +} + +pkg_postrm() { + kernel-2_pkg_postrm +} diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.14.58.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.14.58.ebuild new file mode 100644 index 000000000000..68bb950daf89 --- /dev/null +++ b/sys-kernel/gentoo-sources/gentoo-sources-3.14.58.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +ETYPE="sources" +K_WANT_GENPATCHES="base extras experimental" +K_GENPATCHES_VER="64" +K_DEBLOB_AVAILABLE="0" +inherit kernel-2 +detect_version +detect_arch + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" +IUSE="experimental" + +DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" + +pkg_postinst() { + kernel-2_pkg_postinst + einfo "For more info on this patchset, and how to report problems, see:" + einfo "${HOMEPAGE}" +} + +pkg_postrm() { + kernel-2_pkg_postrm +} diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.1.14.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.1.14.ebuild new file mode 100644 index 000000000000..f8e3ffe45abc --- /dev/null +++ b/sys-kernel/gentoo-sources/gentoo-sources-4.1.14.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +ETYPE="sources" +K_WANT_GENPATCHES="base extras experimental" +K_GENPATCHES_VER="18" +K_DEBLOB_AVAILABLE="0" +K_KDBUS_AVAILABLE="0" + +inherit kernel-2 +detect_version +detect_arch + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" +IUSE="experimental" + +DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" + +pkg_postinst() { + kernel-2_pkg_postinst + einfo "For more info on this patchset, and how to report problems, see:" + einfo "${HOMEPAGE}" +} + +pkg_postrm() { + kernel-2_pkg_postrm +} diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest index 5d862bb9b675..aafe739cfd6a 100644 --- a/www-apache/passenger/Manifest +++ b/www-apache/passenger/Manifest @@ -1,7 +1,2 @@ -DIST passenger-4.0.53.tar.gz 4447609 SHA256 0b8d256cd930f93cfe723392aaa12fa3f9d5ddfddc82bbb7ab287673d029e101 SHA512 45919317c42da898783a22095fe75ed26f9142d227a25f5546f16861ce8c3ecfe2d804a845d389a00019df914cafd7625dc4e8fb31bc2f4ede5ecf41ce69c2a7 WHIRLPOOL fd205aefdec95eee82165d5a65e3dcf112544784549aa51d8a52703b51242120583e64837604ba31957e2cc98fb85a164f9ee19c367980869e0ff0159759c492 -DIST passenger-4.0.59.tar.gz 4521206 SHA256 8b4756564a5133dc97425883d15d1ba1c9f6566c79e92794dc3e1f5b749238ae SHA512 d29400c71cf9530b41ce8b8d4cf94007e4d77fb4ceff290786506d6b9dfbab790f18423dc5dcd71aef07147ba2610c2982f7ca733a8e491de6a0cb3704c54bfb WHIRLPOOL 4683d19813ecbb284ec3eb9681c6c1a1b84f256f0262e6c2b1941df5872031a30da1396cb22fa1cfbad2f53f8971131ed0418c2ef4c20160a3d67f151d54208a DIST passenger-4.0.60.tar.gz 5271049 SHA256 bbb8c18cc371441ce4ee9a4de4d124b6ec5e6af6e95a472b93a72d0357dc88fe SHA512 144df1e5e3dfbf9f9fa13d959c0324760b01c5e86b3f8e52c3d7d9c32eec916a35cc5c52a8c7a5ab9ed1ccee4d7efc9f77fc9940ad1515937a7bfe964753b219 WHIRLPOOL c8f3993b2745eb577c2eddbca2fd280e7db56adbeb4f72ba4b29770d95b991a8012243d1a9bd19aa59a28cfb9326117d649f70cf6d406a4e53acd1e40deb5b57 -DIST passenger-5.0.18.tar.gz 4927106 SHA256 8a92393f5413bb20686295f62a586e3af3b68e631b679413c990b5f0b58ba767 SHA512 dbe3bcdcdf1fae77b822bd157a61e28471e8139ee7165cccd819aedca7d5a0fc4204be8da9cb628fa2180807bb8c46143c98d7e9d1f84afeb6cc99695a7754af WHIRLPOOL 02686489207001383bdbad7661ce3d6303b94403e7795a16b9d7fae388d412f699342fce911d3e8038830387a76e846c213bb6cc80e9d55992ea4e511e7f6ed7 -DIST passenger-5.0.20.tar.gz 5307200 SHA256 a5b35780beb7ecd39d18375acab3e4fa1a2e104b7a324f41a1f89c99e7b8b04c SHA512 72c79b8433270336cc5a1dac11afa45f9095b8a29dd764e7e640dca1f376b23c422e2a9438ff25747c5d438266d5a3870b66121ed6642033fdc3e274c8d7e32f WHIRLPOOL 7bde79e1e7efceb3dca84d8ebfa7b15d71f8cf041e69c19ab2824ce2bb5d692fe64bda07b7b55dcb6cecd746cf0548b230ef4af41299329d0a6ed07bfb661fd2 -DIST passenger-5.0.21.tar.gz 5307571 SHA256 66bc55a43f08d77b7a5e42928bf19d7cab2297866996ebcaa4db01a2d78cc60c SHA512 28d4e3aeb182e5b8794642a0abbe4624b1280130c8afd021fd2c05bda170d0eb6b32afc9b0575a4e5e391f117bb3f127b969391d89d9b9b60cc337502c002446 WHIRLPOOL 96157f9422612bd81667a3f272b2964ab074449870fcfa432ab129a69eb19f753d784c45d210cc11654b94d647645293843e89e0f0f3d8b870c993c296b0bd10 DIST passenger-5.0.22.tar.gz 5412739 SHA256 0dfefb780ff134e6dd9352886f1086b980777adf27a98507ebfed648938b628f SHA512 9fe709d7d83d65e3f610cd0aacfa07122790d2b0797a5e807be129012254ded63d20b8e6cbe194e47bc7761af8fec67e884ed7f370d18baf06778e3035b0708b WHIRLPOOL 6348af6c8e434d1b64de024ddaf769000d9b6a7d33dc23c5d83d3bdb835f9ee78ca73ead764442f5e481949a28814fe6d2a77891240ebb7a0252c201695e50cb diff --git a/www-apache/passenger/passenger-4.0.53.ebuild b/www-apache/passenger/passenger-4.0.53.ebuild deleted file mode 100644 index 4502b5502f81..000000000000 --- a/www-apache/passenger/passenger-4.0.53.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -USE_RUBY="ruby19 ruby20" - -inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs - -DESCRIPTION="Passenger (a.k.a. mod_rails) makes deployment of Ruby on Rails applications a breeze" -HOMEPAGE="http://modrails.com/" -SRC_URI="http://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="debug" - -ruby_add_bdepend "dev-ruby/rake" - -ruby_add_rdepend " - >=dev-ruby/daemon_controller-1.2.0 - >=dev-ruby/rack-1.0.0 - >=dev-ruby/rake-0.8.1" - -CDEPEND=">=dev-libs/libev-4.15 net-misc/curl[ssl] - www-servers/apache[apache2_modules_unixd(+)]" - -RDEPEND="${RDEPEND} ${CDEPEND}" -DEPEND="${DEPEND} ${CDEPEND}" - -APACHE2_MOD_CONF="30_mod_${PN}-4.0.0 30_mod_${PN}" -APACHE2_MOD_DEFINE="PASSENGER" - -need_apache2 - -pkg_setup() { - use debug && append-flags -DPASSENGER_DEBUG -} - -all_ruby_prepare() { - epatch "${FILESDIR}"/${PN}-4.0.49-gentoo.patch - - # Change these with sed instead of a patch so that we can easily use - # the toolchain-funcs methods. - sed -i -e "s/gcc/$(tc-getCC)/" \ - -e "s/g++/$(tc-getCXX)/" \ - -e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die - - # Avoid fixed debugging CFLAGs. - sed -e '/debugging_cflags/areturn ""' -i lib/phusion_passenger/platform_info/compiler.rb || die - - # Use sed here so that we can dynamically set the documentation directory. - sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \ - -e "s:/usr/lib/apache2/modules/mod_passenger.so:${APACHE_MODULESDIR}/mod_passenger.so:" \ - -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \ - lib/phusion_passenger.rb || die - sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" ext/common/ResourceLocator.h || die - - # Don't install a tool that won't work in our setup. - sed -i -e '/passenger-install-apache2-module/d' lib/phusion_passenger/packaging.rb || die - rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script." - - # Make sure we use the system-provided version. - rm -rf ext/libev || die "Unable to remove vendored libev." - - # Avoid building documentation to avoid a dependency on mizuho. - #sed -i -e 's/, :doc//' build/packaging.rb || die - touch doc/*.html || die - - # Use the correct arch-specific lib directory - sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' build/packaging.rb || die - - # Fix hard-coded use of AR - sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/cplusplus_support.rb || die -} - -all_ruby_compile() { - V=1 EXTRA_LDFLAGS="${LDFLAGS}" \ - APXS2="${APXS}" \ - HTTPD="${APACHE_BIN}" \ - USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \ - ruby -S rake apache2 || die "rake failed" -} - -each_ruby_compile() { - append-flags -fno-strict-aliasing - - V=1 EXTRA_LDFLAGS="${LDFLAGS}" \ - APXS2="${APXS}" \ - HTTPD="${APACHE_BIN}" \ - USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \ - ${RUBY} -S rake native_support || die "rake failed" -} - -all_ruby_install() { - APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so" - apache-module_src_install - - # Patch in the correct libdir - sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die -} - -each_ruby_install() { - DISTDIR="${D}" \ - RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \ - RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \ - APXS2="${APXS}" \ - HTTPD="${APACHE_BIN}" \ - EXTRA_LDFLAGS="${LDFLAGS}" \ - USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \ - ${RUBY} -S rake fakeroot || die "rake failed" -} - -pkg_postint() { - einfo "The apache module is compiled for the currently eselected ruby." - einfo" If you eselect another ruby you must recompile passenger as well." -} diff --git a/www-apache/passenger/passenger-4.0.59-r1.ebuild b/www-apache/passenger/passenger-4.0.59-r1.ebuild deleted file mode 100644 index 0267fedf4289..000000000000 --- a/www-apache/passenger/passenger-4.0.59-r1.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21 ruby22" - -inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs - -DESCRIPTION="Passenger (a.k.a. mod_rails) makes deployment of Ruby on Rails applications a breeze" -HOMEPAGE="http://modrails.com/" -SRC_URI="http://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug" - -ruby_add_bdepend "dev-ruby/rake" - -ruby_add_rdepend " - >=dev-ruby/daemon_controller-1.2.0 - >=dev-ruby/rack-1.0.0:* - >=dev-ruby/rake-0.8.1" - -CDEPEND=">=dev-libs/libev-4.15 net-misc/curl[ssl] - www-servers/apache[apache2_modules_unixd(+)]" - -RDEPEND="${RDEPEND} ${CDEPEND}" -DEPEND="${DEPEND} ${CDEPEND}" - -APACHE2_MOD_CONF="30_mod_${PN}-4.0.0 30_mod_${PN}" -APACHE2_MOD_DEFINE="PASSENGER" - -need_apache2 - -pkg_setup() { - use debug && append-flags -DPASSENGER_DEBUG -} - -all_ruby_prepare() { - epatch "${FILESDIR}"/${PN}-4.0.49-gentoo.patch - - # Change these with sed instead of a patch so that we can easily use - # the toolchain-funcs methods. - sed -i -e "s/gcc/$(tc-getCC)/" \ - -e "s/g++/$(tc-getCXX)/" \ - -e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die - - # Avoid fixed debugging CFLAGs. - sed -e '/debugging_cflags/areturn ""' -i lib/phusion_passenger/platform_info/compiler.rb || die - - # Use sed here so that we can dynamically set the documentation directory. - sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \ - -e "s:/usr/lib/apache2/modules/mod_passenger.so:${APACHE_MODULESDIR}/mod_passenger.so:" \ - -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \ - lib/phusion_passenger.rb || die - sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" ext/common/ResourceLocator.h || die - - # Don't install a tool that won't work in our setup. - sed -i -e '/passenger-install-apache2-module/d' lib/phusion_passenger/packaging.rb || die - rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script." - - # Make sure we use the system-provided version. - rm -rf ext/libev || die "Unable to remove vendored libev." - - # Avoid building documentation to avoid a dependency on mizuho. - #sed -i -e 's/, :doc//' build/packaging.rb || die - touch doc/*.html || die - - # Fix hard-coded use of AR - sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/cplusplus_support.rb || die -} - -all_ruby_compile() { - V=1 EXTRA_LDFLAGS="${LDFLAGS}" \ - APXS2="${APXS}" \ - HTTPD="${APACHE_BIN}" \ - FS_LIBDIR='/usr/'$(get_libdir) \ - USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \ - ruby -S rake apache2 || die "rake failed" -} - -each_ruby_compile() { - append-flags -fno-strict-aliasing - - V=1 EXTRA_LDFLAGS="${LDFLAGS}" \ - APXS2="${APXS}" \ - HTTPD="${APACHE_BIN}" \ - FS_LIBDIR='/usr/'$(get_libdir) \ - USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \ - ${RUBY} -S rake native_support || die "rake failed" -} - -all_ruby_install() { - APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so" - apache-module_src_install - - # Patch in the correct libdir - sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die - - dodoc CHANGELOG README.md -} - -each_ruby_install() { - DISTDIR="${D}" \ - RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \ - RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \ - APXS2="${APXS}" \ - HTTPD="${APACHE_BIN}" \ - FS_LIBDIR='/usr/'$(get_libdir) \ - EXTRA_LDFLAGS="${LDFLAGS}" \ - USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \ - ${RUBY} -S rake fakeroot || die "rake failed" -} diff --git a/www-apache/passenger/passenger-4.0.59.ebuild b/www-apache/passenger/passenger-4.0.59.ebuild deleted file mode 100644 index a0e70011afe0..000000000000 --- a/www-apache/passenger/passenger-4.0.59.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21 ruby22" - -inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs - -DESCRIPTION="Passenger (a.k.a. mod_rails) makes deployment of Ruby on Rails applications a breeze" -HOMEPAGE="http://modrails.com/" -SRC_URI="http://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug" - -ruby_add_bdepend "dev-ruby/rake" - -ruby_add_rdepend " - >=dev-ruby/daemon_controller-1.2.0 - >=dev-ruby/rack-1.0.0 - >=dev-ruby/rake-0.8.1" - -CDEPEND=">=dev-libs/libev-4.15 net-misc/curl[ssl] - www-servers/apache[apache2_modules_unixd(+)]" - -RDEPEND="${RDEPEND} ${CDEPEND}" -DEPEND="${DEPEND} ${CDEPEND}" - -APACHE2_MOD_CONF="30_mod_${PN}-4.0.0 30_mod_${PN}" -APACHE2_MOD_DEFINE="PASSENGER" - -need_apache2 - -pkg_setup() { - use debug && append-flags -DPASSENGER_DEBUG -} - -all_ruby_prepare() { - epatch "${FILESDIR}"/${PN}-4.0.49-gentoo.patch - - # Change these with sed instead of a patch so that we can easily use - # the toolchain-funcs methods. - sed -i -e "s/gcc/$(tc-getCC)/" \ - -e "s/g++/$(tc-getCXX)/" \ - -e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die - - # Avoid fixed debugging CFLAGs. - sed -e '/debugging_cflags/areturn ""' -i lib/phusion_passenger/platform_info/compiler.rb || die - - # Use sed here so that we can dynamically set the documentation directory. - sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \ - -e "s:/usr/lib/apache2/modules/mod_passenger.so:${APACHE_MODULESDIR}/mod_passenger.so:" \ - -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \ - lib/phusion_passenger.rb || die - sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" ext/common/ResourceLocator.h || die - - # Don't install a tool that won't work in our setup. - sed -i -e '/passenger-install-apache2-module/d' lib/phusion_passenger/packaging.rb || die - rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script." - - # Make sure we use the system-provided version. - rm -rf ext/libev || die "Unable to remove vendored libev." - - # Avoid building documentation to avoid a dependency on mizuho. - #sed -i -e 's/, :doc//' build/packaging.rb || die - touch doc/*.html || die - - # Use the correct arch-specific lib directory - sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' build/packaging.rb || die - - # Fix hard-coded use of AR - sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/cplusplus_support.rb || die -} - -all_ruby_compile() { - V=1 EXTRA_LDFLAGS="${LDFLAGS}" \ - APXS2="${APXS}" \ - HTTPD="${APACHE_BIN}" \ - USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \ - ruby -S rake apache2 || die "rake failed" -} - -each_ruby_compile() { - append-flags -fno-strict-aliasing - - V=1 EXTRA_LDFLAGS="${LDFLAGS}" \ - APXS2="${APXS}" \ - HTTPD="${APACHE_BIN}" \ - USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \ - ${RUBY} -S rake native_support || die "rake failed" -} - -all_ruby_install() { - APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so" - apache-module_src_install - - # Patch in the correct libdir - sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die - - dodoc CHANGELOG README.md -} - -each_ruby_install() { - DISTDIR="${D}" \ - RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \ - RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \ - APXS2="${APXS}" \ - HTTPD="${APACHE_BIN}" \ - EXTRA_LDFLAGS="${LDFLAGS}" \ - USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \ - ${RUBY} -S rake fakeroot || die "rake failed" -} diff --git a/www-apache/passenger/passenger-5.0.18.ebuild b/www-apache/passenger/passenger-5.0.18.ebuild deleted file mode 100644 index 79dd68d10996..000000000000 --- a/www-apache/passenger/passenger-5.0.18.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21 ruby22" - -inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs - -DESCRIPTION="Passenger (a.k.a. mod_rails) makes deployment of Ruby on Rails applications a breeze" -HOMEPAGE="http://modrails.com/" -SRC_URI="http://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug" - -ruby_add_bdepend "dev-ruby/rake" - -ruby_add_rdepend " - >=dev-ruby/rack-1.0.0:* - >=dev-ruby/rake-0.8.1" - -# libev is bundled but with adapations that do not seem to be accepted -# upstream, so we must use the bundled version :-( -CDEPEND=" - >=dev-libs/libuv-1.5.0 - net-misc/curl[ssl] - www-servers/apache[apache2_modules_unixd(+)]" - -RDEPEND="${RDEPEND} ${CDEPEND}" -DEPEND="${DEPEND} ${CDEPEND}" - -APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}" -APACHE2_MOD_DEFINE="PASSENGER" - -need_apache2 - -pkg_setup() { - use debug && append-flags -DPASSENGER_DEBUG -} - -all_ruby_prepare() { - epatch "${FILESDIR}"/${PN}-5.0.4-gentoo.patch - - # Change these with sed instead of a patch so that we can easily use - # the toolchain-funcs methods. - sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \ - -e "/^CXX/ s/=.*$/= '$(tc-getCXX)'/" \ - -e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die - - # Avoid fixed debugging CFLAGs. - sed -e '/debugging_cflags/areturn ""' -i lib/phusion_passenger/platform_info/compiler.rb || die - - # Use sed here so that we can dynamically set the documentation directory. - sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \ - -e "s:/usr/lib/apache2/modules/mod_passenger.so:${APACHE_MODULESDIR}/mod_passenger.so:" \ - -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \ - lib/phusion_passenger.rb || die - sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" ext/common/ResourceLocator.h || die - - # Don't install a tool that won't work in our setup. - sed -i -e '/passenger-install-apache2-module/d' lib/phusion_passenger/packaging.rb || die - rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script." - - # Make sure we use the system-provided version where possible - rm -rf ext/libuv || die "Unable to remove vendored code." - - # Avoid building documentation to avoid a dependency on mizuho. - #sed -i -e 's/, :doc//' build/packaging.rb || die - touch doc/*.html || die - - # Use the correct arch-specific lib directory - sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' build/packaging.rb || die - - # Fix hard-coded use of AR - sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/cplusplus_support.rb || die -} - -all_ruby_compile() { - V=1 EXTRA_LDFLAGS="${LDFLAGS}" \ - APXS2="${APXS}" \ - HTTPD="${APACHE_BIN}" \ - USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \ - ruby -S rake apache2 || die "rake failed" -} - -each_ruby_compile() { - append-flags -fno-strict-aliasing - - V=1 EXTRA_LDFLAGS="${LDFLAGS}" \ - APXS2="${APXS}" \ - HTTPD="${APACHE_BIN}" \ - USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \ - ${RUBY} -S rake native_support || die "rake failed" -} - -all_ruby_install() { - APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so" - apache-module_src_install - - # Patch in the correct libdir - sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die - - dodoc CHANGELOG README.md -} - -each_ruby_install() { - DISTDIR="${D}" \ - RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \ - RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \ - APXS2="${APXS}" \ - HTTPD="${APACHE_BIN}" \ - EXTRA_LDFLAGS="${LDFLAGS}" \ - USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \ - ${RUBY} -S rake fakeroot || die "rake failed" -} diff --git a/www-apache/passenger/passenger-5.0.20-r1.ebuild b/www-apache/passenger/passenger-5.0.20-r1.ebuild deleted file mode 100644 index a9c600ab93b9..000000000000 --- a/www-apache/passenger/passenger-5.0.20-r1.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21 ruby22" - -inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs - -DESCRIPTION="Passenger (a.k.a. mod_rails) makes deployment of Ruby on Rails applications a breeze" -HOMEPAGE="http://modrails.com/" -SRC_URI="http://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug" - -ruby_add_bdepend "dev-ruby/rake" - -ruby_add_rdepend " - >=dev-ruby/rack-1.0.0:* - >=dev-ruby/rake-0.8.1" - -# libev is bundled but with adapations that do not seem to be accepted -# upstream, so we must use the bundled version :-( -CDEPEND=" - >=dev-libs/libuv-1.5.0 - net-misc/curl[ssl] - www-servers/apache[apache2_modules_unixd(+)]" - -RDEPEND="${RDEPEND} ${CDEPEND}" -DEPEND="${DEPEND} ${CDEPEND}" - -APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}" -APACHE2_MOD_DEFINE="PASSENGER" - -need_apache2 - -pkg_setup() { - use debug && append-flags -DPASSENGER_DEBUG -} - -all_ruby_prepare() { - epatch "${FILESDIR}"/${PN}-5.0.20-gentoo.patch - - # Change these with sed instead of a patch so that we can easily use - # the toolchain-funcs methods. - sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \ - -e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \ - -e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die - - # Avoid fixed debugging CFLAGs. - sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die - - # Use sed here so that we can dynamically set the documentation directory. - sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \ - -e "s:/usr/lib/apache2/modules/mod_passenger.so:${APACHE_MODULESDIR}/mod_passenger.so:" \ - -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \ - src/ruby_supportlib/phusion_passenger.rb || die - sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" src/cxx_supportlib/ResourceLocator.h || die - - # Don't install a tool that won't work in our setup. - sed -i -e '/passenger-install-apache2-module/d' src/ruby_supportlib/phusion_passenger/packaging.rb || die - rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script." - - # Make sure we use the system-provided version where possible - rm -rf src/cxx_supportlib/vendor-copy/libuv || die "Unable to remove vendored code." - - # Avoid building documentation to avoid a dependency on mizuho. - #sed -i -e 's/, :doc//' build/packaging.rb || die - touch doc/*.html || die - - # Fix hard-coded use of AR - sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/cplusplus_support.rb || die -} - -all_ruby_compile() { - V=1 EXTRA_LDFLAGS="${LDFLAGS}" \ - APXS2="${APXS}" \ - HTTPD="${APACHE_BIN}" \ - FS_LIBDIR='/usr/'$(get_libdir) \ - USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \ - ruby -S rake apache2 || die "rake failed" -} - -each_ruby_compile() { - append-flags -fno-strict-aliasing - - V=1 EXTRA_LDFLAGS="${LDFLAGS}" \ - APXS2="${APXS}" \ - HTTPD="${APACHE_BIN}" \ - FS_LIBDIR='/usr/'$(get_libdir) \ - USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \ - ${RUBY} -S rake native_support || die "rake failed" -} - -all_ruby_install() { - APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so" - apache-module_src_install - - # Patch in the correct libdir - sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die - - dodoc CHANGELOG README.md -} - -each_ruby_install() { - DISTDIR="${D}" \ - RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \ - RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \ - APXS2="${APXS}" \ - HTTPD="${APACHE_BIN}" \ - FS_LIBDIR='/usr/'$(get_libdir) \ - EXTRA_LDFLAGS="${LDFLAGS}" \ - USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \ - ${RUBY} -S rake fakeroot || die "rake failed" -} diff --git a/www-apache/passenger/passenger-5.0.20.ebuild b/www-apache/passenger/passenger-5.0.20.ebuild deleted file mode 100644 index b385fee2e1fa..000000000000 --- a/www-apache/passenger/passenger-5.0.20.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21 ruby22" - -inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs - -DESCRIPTION="Passenger (a.k.a. mod_rails) makes deployment of Ruby on Rails applications a breeze" -HOMEPAGE="http://modrails.com/" -SRC_URI="http://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug" - -ruby_add_bdepend "dev-ruby/rake" - -ruby_add_rdepend " - >=dev-ruby/rack-1.0.0:* - >=dev-ruby/rake-0.8.1" - -# libev is bundled but with adapations that do not seem to be accepted -# upstream, so we must use the bundled version :-( -CDEPEND=" - >=dev-libs/libuv-1.5.0 - net-misc/curl[ssl] - www-servers/apache[apache2_modules_unixd(+)]" - -RDEPEND="${RDEPEND} ${CDEPEND}" -DEPEND="${DEPEND} ${CDEPEND}" - -APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}" -APACHE2_MOD_DEFINE="PASSENGER" - -need_apache2 - -pkg_setup() { - use debug && append-flags -DPASSENGER_DEBUG -} - -all_ruby_prepare() { - epatch "${FILESDIR}"/${PN}-5.0.20-gentoo.patch - - # Change these with sed instead of a patch so that we can easily use - # the toolchain-funcs methods. - sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \ - -e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \ - -e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die - - # Avoid fixed debugging CFLAGs. - sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die - - # Use sed here so that we can dynamically set the documentation directory. - sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \ - -e "s:/usr/lib/apache2/modules/mod_passenger.so:${APACHE_MODULESDIR}/mod_passenger.so:" \ - -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \ - src/ruby_supportlib/phusion_passenger.rb || die - sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" src/cxx_supportlib/ResourceLocator.h || die - - # Don't install a tool that won't work in our setup. - sed -i -e '/passenger-install-apache2-module/d' src/ruby_supportlib/phusion_passenger/packaging.rb || die - rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script." - - # Make sure we use the system-provided version where possible - rm -rf src/cxx_supportlib/vendor-copy/libuv || die "Unable to remove vendored code." - - # Avoid building documentation to avoid a dependency on mizuho. - #sed -i -e 's/, :doc//' build/packaging.rb || die - touch doc/*.html || die - - # Use the correct arch-specific lib directory - sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' build/packaging.rb || die - - # Fix hard-coded use of AR - sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/cplusplus_support.rb || die -} - -all_ruby_compile() { - V=1 EXTRA_LDFLAGS="${LDFLAGS}" \ - APXS2="${APXS}" \ - HTTPD="${APACHE_BIN}" \ - USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \ - ruby -S rake apache2 || die "rake failed" -} - -each_ruby_compile() { - append-flags -fno-strict-aliasing - - V=1 EXTRA_LDFLAGS="${LDFLAGS}" \ - APXS2="${APXS}" \ - HTTPD="${APACHE_BIN}" \ - USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \ - ${RUBY} -S rake native_support || die "rake failed" -} - -all_ruby_install() { - APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so" - apache-module_src_install - - # Patch in the correct libdir - sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die - - dodoc CHANGELOG README.md -} - -each_ruby_install() { - DISTDIR="${D}" \ - RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \ - RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \ - APXS2="${APXS}" \ - HTTPD="${APACHE_BIN}" \ - EXTRA_LDFLAGS="${LDFLAGS}" \ - USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \ - ${RUBY} -S rake fakeroot || die "rake failed" -} diff --git a/www-apache/passenger/passenger-5.0.21.ebuild b/www-apache/passenger/passenger-5.0.21.ebuild deleted file mode 100644 index a9c600ab93b9..000000000000 --- a/www-apache/passenger/passenger-5.0.21.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21 ruby22" - -inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs - -DESCRIPTION="Passenger (a.k.a. mod_rails) makes deployment of Ruby on Rails applications a breeze" -HOMEPAGE="http://modrails.com/" -SRC_URI="http://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug" - -ruby_add_bdepend "dev-ruby/rake" - -ruby_add_rdepend " - >=dev-ruby/rack-1.0.0:* - >=dev-ruby/rake-0.8.1" - -# libev is bundled but with adapations that do not seem to be accepted -# upstream, so we must use the bundled version :-( -CDEPEND=" - >=dev-libs/libuv-1.5.0 - net-misc/curl[ssl] - www-servers/apache[apache2_modules_unixd(+)]" - -RDEPEND="${RDEPEND} ${CDEPEND}" -DEPEND="${DEPEND} ${CDEPEND}" - -APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}" -APACHE2_MOD_DEFINE="PASSENGER" - -need_apache2 - -pkg_setup() { - use debug && append-flags -DPASSENGER_DEBUG -} - -all_ruby_prepare() { - epatch "${FILESDIR}"/${PN}-5.0.20-gentoo.patch - - # Change these with sed instead of a patch so that we can easily use - # the toolchain-funcs methods. - sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \ - -e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \ - -e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die - - # Avoid fixed debugging CFLAGs. - sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die - - # Use sed here so that we can dynamically set the documentation directory. - sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \ - -e "s:/usr/lib/apache2/modules/mod_passenger.so:${APACHE_MODULESDIR}/mod_passenger.so:" \ - -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \ - src/ruby_supportlib/phusion_passenger.rb || die - sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" src/cxx_supportlib/ResourceLocator.h || die - - # Don't install a tool that won't work in our setup. - sed -i -e '/passenger-install-apache2-module/d' src/ruby_supportlib/phusion_passenger/packaging.rb || die - rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script." - - # Make sure we use the system-provided version where possible - rm -rf src/cxx_supportlib/vendor-copy/libuv || die "Unable to remove vendored code." - - # Avoid building documentation to avoid a dependency on mizuho. - #sed -i -e 's/, :doc//' build/packaging.rb || die - touch doc/*.html || die - - # Fix hard-coded use of AR - sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/cplusplus_support.rb || die -} - -all_ruby_compile() { - V=1 EXTRA_LDFLAGS="${LDFLAGS}" \ - APXS2="${APXS}" \ - HTTPD="${APACHE_BIN}" \ - FS_LIBDIR='/usr/'$(get_libdir) \ - USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \ - ruby -S rake apache2 || die "rake failed" -} - -each_ruby_compile() { - append-flags -fno-strict-aliasing - - V=1 EXTRA_LDFLAGS="${LDFLAGS}" \ - APXS2="${APXS}" \ - HTTPD="${APACHE_BIN}" \ - FS_LIBDIR='/usr/'$(get_libdir) \ - USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \ - ${RUBY} -S rake native_support || die "rake failed" -} - -all_ruby_install() { - APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so" - apache-module_src_install - - # Patch in the correct libdir - sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die - - dodoc CHANGELOG README.md -} - -each_ruby_install() { - DISTDIR="${D}" \ - RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \ - RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \ - APXS2="${APXS}" \ - HTTPD="${APACHE_BIN}" \ - FS_LIBDIR='/usr/'$(get_libdir) \ - EXTRA_LDFLAGS="${LDFLAGS}" \ - USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \ - ${RUBY} -S rake fakeroot || die "rake failed" -} diff --git a/www-client/otter/Manifest b/www-client/otter/Manifest index 8b4346b23018..3df37844c598 100644 --- a/www-client/otter/Manifest +++ b/www-client/otter/Manifest @@ -1 +1,2 @@ DIST otter-0.9.07.tar.gz 2634317 SHA256 1c27509f9736a9c99e12a3ef23b08cc41548ad7f6d7481bf07020fb471788da9 SHA512 035462e7a601e74a6a3dc924caf2d80e38e2ec75d75211d5f83176e0065a0289e8c0fd034643aa01c94dd6cfe9f695a4533e7464e6f019ed9153eec20641fa78 WHIRLPOOL 4c50c76d2d5fc75f9c6545dc57e2b21295e046af1bae9653999bc4880c5bd6021cfb75e125d6c75f3ef76e6c3999bcf271cafc090ab52d63cf84165876541227 +DIST otter-0.9.08.tar.gz 3124966 SHA256 b4606aca5983b90b232a90517f283c2c6a1045f295352792b4a2c00a51b5d4c8 SHA512 9244a84490bb8dda12b932f6b39a41000a96740ef9c194e8f52a31122d763f857462e88219f086e8ad886dd6e0d79d4143060ddb801aaeb30c2952cef283e5ff WHIRLPOOL b395badb4b92e954f6437267ef3cb4f9b59a8b4043efd3bccadc8e9b3dc63dfb460d872e1837363464a2f8b46eca2022d7aaea318ccfcbe73329959c38f1aca2 diff --git a/www-client/otter/otter-0.9.07.ebuild b/www-client/otter/otter-0.9.07.ebuild index bda1f5e25e1f..11d2ff0b075f 100644 --- a/www-client/otter/otter-0.9.07.ebuild +++ b/www-client/otter/otter-0.9.07.ebuild @@ -20,7 +20,7 @@ DEPEND=" dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 - dev-qt/qtnetwork:5 + dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsql:5 diff --git a/www-client/otter/otter-0.9.08.ebuild b/www-client/otter/otter-0.9.08.ebuild new file mode 100644 index 000000000000..4627713d4beb --- /dev/null +++ b/www-client/otter/otter-0.9.08.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +WANT_CMAKE="always" +inherit eutils cmake-utils + +DESCRIPTION="Project aiming to recreate classic Opera (12.x) UI using Qt5" +HOMEPAGE="http://otter-browser.org/" +SRC_URI="https://github.com/Emdek/${PN}/archive/v${PV/_p/-dev}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND=" + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtmultimedia:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtprintsupport:5 + dev-qt/qtscript:5 + dev-qt/qtsql:5 + dev-qt/qtwebkit:5 + dev-qt/qtwidgets:5 + dev-qt/qtxmlpatterns:5 +" +RDEPEND=" + ${DEPEND} +" + +S=${WORKDIR}/${PN}-browser-${PV/_p/-dev} +DOCS=( CHANGELOG CONTRIBUTING.md TODO ) + +src_prepare() { + if [[ -n ${LINGUAS} ]]; then + local lingua + for lingua in resources/translations/*.qm; do + lingua=$(basename ${lingua}) + lingua=${lingua/otter-browser_/} + lingua=${lingua/.qm/} + if ! has ${lingua} ${LINGUAS}; then + rm resources/translations/otter-browser_${lingua}.qm || die + fi + done + fi +} + +src_install() { + cmake-utils_src_install + domenu ${PN}-browser.desktop +} diff --git a/www-client/otter/otter-9999.ebuild b/www-client/otter/otter-9999.ebuild index 1ad2bad3987f..a152eb8e2aa7 100644 --- a/www-client/otter/otter-9999.ebuild +++ b/www-client/otter/otter-9999.ebuild @@ -20,7 +20,7 @@ DEPEND=" dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 - dev-qt/qtnetwork:5 + dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsql:5 |