diff options
author | 2018-04-30 21:11:51 +0000 | |
---|---|---|
committer | 2018-04-30 21:11:51 +0000 | |
commit | d11779b22d33ba2198eb947ac4caef15e524d51f (patch) | |
tree | 4f4099880d9013a43c9aecc801193eb6cb72fd3e | |
parent | Merge updates from master (diff) | |
parent | net-irc/epic5: Fix build with glibc-2.26, bug 652738 (diff) | |
download | gentoo-d11779b22d33ba2198eb947ac4caef15e524d51f.tar.gz gentoo-d11779b22d33ba2198eb947ac4caef15e524d51f.tar.bz2 gentoo-d11779b22d33ba2198eb947ac4caef15e524d51f.zip |
Merge updates from master
113 files changed, 312 insertions, 788 deletions
diff --git a/app-misc/g15mpd/g15mpd-1.0.0-r1.ebuild b/app-misc/g15mpd/g15mpd-1.0.0-r1.ebuild index 7cc98849f96f..13ecc8900f6a 100644 --- a/app-misc/g15mpd/g15mpd-1.0.0-r1.ebuild +++ b/app-misc/g15mpd/g15mpd-1.0.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -23,8 +23,7 @@ RDEPEND=" x11-libs/libXtst " DEPEND="${RDEPEND} - x11-proto/xproto - x11-proto/xextproto" + x11-base/xorg-proto" src_prepare() { epatch "${FILESDIR}"/${P}-libmpd.patch diff --git a/app-misc/joy2key/joy2key-1.6.3-r1.ebuild b/app-misc/joy2key/joy2key-1.6.3-r1.ebuild index 11f1f0f98d09..00ef6ed03b4b 100644 --- a/app-misc/joy2key/joy2key-1.6.3-r1.ebuild +++ b/app-misc/joy2key/joy2key-1.6.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -17,7 +17,7 @@ RDEPEND=" x11-apps/xwininfo )" DEPEND=" ${RDEPEND} - X? ( x11-proto/xproto )" + X? ( x11-base/xorg-proto )" DOCS=( AUTHORS ChangeLog joy2keyrc.sample rawscancodes README TODO ) diff --git a/app-misc/joymouse/joymouse-0.5.ebuild b/app-misc/joymouse/joymouse-0.5.ebuild index 7a1886e92a4a..a34fee3f186c 100644 --- a/app-misc/joymouse/joymouse-0.5.ebuild +++ b/app-misc/joymouse/joymouse-0.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -11,10 +11,10 @@ SLOT="0" KEYWORDS="amd64 ~mips ~ppc x86" IUSE="" -DEPEND="x11-proto/xextproto - x11-proto/inputproto" RDEPEND="x11-libs/libX11 x11-libs/libXtst" +DEPEND="${RDEPEND} + x11-base/xorg-proto" src_prepare() { sed -i 's/printf(message/fputs(message, stdout/g' src/joymouse.c || die diff --git a/app-misc/oneko/oneko-1.2-r2.ebuild b/app-misc/oneko/oneko-1.2-r2.ebuild index f0847a294f5a..9866e7ac2964 100644 --- a/app-misc/oneko/oneko-1.2-r2.ebuild +++ b/app-misc/oneko/oneko-1.2-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -21,10 +21,10 @@ RDEPEND=" " DEPEND=" ${RDEPEND} + app-text/rman + x11-base/xorg-proto x11-misc/gccmakedep x11-misc/imake - app-text/rman - x11-proto/xextproto " S=${WORKDIR}/oneko-${PV}.sakura.5 diff --git a/app-misc/sonypid/sonypid-1.9.ebuild b/app-misc/sonypid/sonypid-1.9.ebuild index 26e9537b63ea..cb8e02458bd0 100644 --- a/app-misc/sonypid/sonypid-1.9.ebuild +++ b/app-misc/sonypid/sonypid-1.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -16,7 +16,7 @@ IUSE="" RDEPEND="x11-libs/libXtst" DEPEND="${RDEPEND} - x11-proto/inputproto" + x11-base/xorg-proto" src_compile() { emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" diff --git a/app-misc/workrave/workrave-1.10.20.ebuild b/app-misc/workrave/workrave-1.10.20.ebuild index eb0accfb92a4..84cbc53fece7 100644 --- a/app-misc/workrave/workrave-1.10.20.ebuild +++ b/app-misc/workrave/workrave-1.10.20.ebuild @@ -55,9 +55,7 @@ DEPEND="${RDEPEND} dev-python/cheetah >=dev-util/intltool-0.40.0 sys-devel/autoconf-archive - x11-proto/xproto - x11-proto/inputproto - x11-proto/recordproto + x11-base/xorg-proto virtual/pkgconfig doc? ( app-text/docbook-sgml-utils diff --git a/app-text/active-dvi/active-dvi-1.10.2-r1.ebuild b/app-text/active-dvi/active-dvi-1.10.2-r1.ebuild index da5ecbb0bf95..ab1bc39469ff 100644 --- a/app-text/active-dvi/active-dvi-1.10.2-r1.ebuild +++ b/app-text/active-dvi/active-dvi-1.10.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -27,7 +27,7 @@ DEPEND="${RDEPEND} dev-texlive/texlive-pstricks dev-texlive/texlive-pictures dev-texlive/texlive-latexextra - x11-proto/xineramaproto + x11-base/xorg-proto dev-ml/findlib app-text/htmlc dev-tex/hevea" diff --git a/app-text/gv/gv-3.7.3-r1.ebuild b/app-text/gv/gv-3.7.3-r1.ebuild index 35a80d634e16..e93336e80634 100644 --- a/app-text/gv/gv-3.7.3-r1.ebuild +++ b/app-text/gv/gv-3.7.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=4 @@ -25,7 +25,7 @@ RDEPEND="app-text/ghostscript-gpl xinerama? ( x11-libs/libXinerama )" DEPEND="${RDEPEND} virtual/pkgconfig - x11-proto/xproto" + x11-base/xorg-proto" DOCS="AUTHORS ChangeLog NEWS README" diff --git a/app-text/gv/gv-3.7.3.90.ebuild b/app-text/gv/gv-3.7.3.90.ebuild index db63c43154e6..95b3ac253ccb 100644 --- a/app-text/gv/gv-3.7.3.90.ebuild +++ b/app-text/gv/gv-3.7.3.90.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -26,7 +26,7 @@ RDEPEND="app-text/ghostscript-gpl xinerama? ( x11-libs/libXinerama )" DEPEND="${RDEPEND} virtual/pkgconfig - x11-proto/xproto" + x11-base/xorg-proto" DOCS="AUTHORS ChangeLog NEWS README" diff --git a/app-text/pspresent/pspresent-1.3-r1.ebuild b/app-text/pspresent/pspresent-1.3-r1.ebuild index 128bda4cc35e..c13ed4cddafe 100644 --- a/app-text/pspresent/pspresent-1.3-r1.ebuild +++ b/app-text/pspresent/pspresent-1.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="2" @@ -18,8 +18,7 @@ RDEPEND="x11-libs/libX11 xinerama? ( x11-libs/libXinerama ) app-text/ghostscript-gpl" DEPEND="${RDEPEND} - x11-proto/xproto - xinerama? ( x11-proto/xineramaproto ) + x11-base/xorg-proto >=sys-apps/sed-4" src_prepare() { diff --git a/dev-games/clanlib/clanlib-0.8.1.ebuild b/dev-games/clanlib/clanlib-0.8.1.ebuild index dbd437a41db7..32096e028f55 100644 --- a/dev-games/clanlib/clanlib-0.8.1.ebuild +++ b/dev-games/clanlib/clanlib-0.8.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -30,7 +30,7 @@ RDEPEND="media-libs/libpng:0 mikmod? ( media-libs/libmikmod ) vorbis? ( media-libs/libvorbis )" DEPEND="${RDEPEND} - x11-proto/xf86vidmodeproto" + x11-base/xorg-proto" S=${WORKDIR}/ClanLib-${PV} diff --git a/dev-games/irrlicht/irrlicht-1.8.4.ebuild b/dev-games/irrlicht/irrlicht-1.8.4.ebuild index 185d6517ccce..e843c52e456a 100644 --- a/dev-games/irrlicht/irrlicht-1.8.4.ebuild +++ b/dev-games/irrlicht/irrlicht-1.8.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -23,8 +23,7 @@ RDEPEND="virtual/jpeg:0 x11-libs/libXxf86vm" DEPEND="${RDEPEND} app-arch/unzip - x11-proto/xproto - x11-proto/xf86vidmodeproto" + x11-base/xorg-proto" S=${WORKDIR}/${P}/source/${PN^} diff --git a/dev-games/ogre/ogre-1.9.0-r1.ebuild b/dev-games/ogre/ogre-1.9.0-r1.ebuild index 5714d1a67a48..dd3d2ee065a3 100644 --- a/dev-games/ogre/ogre-1.9.0-r1.ebuild +++ b/dev-games/ogre/ogre-1.9.0-r1.ebuild @@ -51,8 +51,8 @@ RDEPEND=" tools? ( dev-libs/tinyxml[stl] ) zip? ( sys-libs/zlib dev-libs/zziplib )" DEPEND="${RDEPEND} - x11-proto/xf86vidmodeproto virtual/pkgconfig + x11-base/xorg-proto doc? ( app-doc/doxygen )" PATCHES=( diff --git a/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild b/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild index fa98c6bb2e37..7b066c0abf2c 100644 --- a/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild +++ b/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild @@ -74,9 +74,8 @@ RDEPEND=" DEPEND="${RDEPEND} app-arch/unzip virtual/pkgconfig - x11-proto/xextproto + x11-base/xorg-proto doc? ( app-doc/doxygen ) - xrandr? ( x11-proto/randrproto ) " S="${WORKDIR}/${MY_P}" diff --git a/dev-lang/swi-prolog/swi-prolog-6.6.6.ebuild b/dev-lang/swi-prolog/swi-prolog-6.6.6.ebuild index 0969747fad20..e1429546e28b 100644 --- a/dev-lang/swi-prolog/swi-prolog-6.6.6.ebuild +++ b/dev-lang/swi-prolog/swi-prolog-6.6.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -35,7 +35,7 @@ RDEPEND="sys-libs/ncurses:= x11-libs/libSM )" DEPEND="${RDEPEND} - X? ( x11-proto/xproto ) + X? ( x11-base/xorg-proto ) java? ( test? ( =dev-java/junit-3.8* ) )" S="${WORKDIR}/pl-${PV}" diff --git a/dev-lang/swi-prolog/swi-prolog-7.2.3-r1.ebuild b/dev-lang/swi-prolog/swi-prolog-7.2.3-r1.ebuild index 5ff022070d03..6c67f53b8051 100644 --- a/dev-lang/swi-prolog/swi-prolog-7.2.3-r1.ebuild +++ b/dev-lang/swi-prolog/swi-prolog-7.2.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -39,7 +39,7 @@ RDEPEND="sys-libs/ncurses:= x11-libs/libSM )" DEPEND="${RDEPEND} - X? ( x11-proto/xproto ) + X? ( x11-base/xorg-proto ) java? ( test? ( =dev-java/junit-3.8* ) )" S="${WORKDIR}/swipl-${PV}" diff --git a/dev-lang/swi-prolog/swi-prolog-7.4.2.ebuild b/dev-lang/swi-prolog/swi-prolog-7.4.2.ebuild index 848c0aa426ce..9b30d3fd846b 100644 --- a/dev-lang/swi-prolog/swi-prolog-7.4.2.ebuild +++ b/dev-lang/swi-prolog/swi-prolog-7.4.2.ebuild @@ -41,7 +41,7 @@ RDEPEND="sys-libs/ncurses:= x11-libs/libSM )" DEPEND="${RDEPEND} - X? ( x11-proto/xproto ) + X? ( x11-base/xorg-proto ) java? ( test? ( =dev-java/junit-3.8* ) )" S="${WORKDIR}/swipl-${PV}" diff --git a/dev-lang/swi-prolog/swi-prolog-7.6.3.ebuild b/dev-lang/swi-prolog/swi-prolog-7.6.3.ebuild index ac17db45d196..f745720052e3 100644 --- a/dev-lang/swi-prolog/swi-prolog-7.6.3.ebuild +++ b/dev-lang/swi-prolog/swi-prolog-7.6.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -41,7 +41,7 @@ RDEPEND="sys-libs/ncurses:= x11-libs/libSM )" DEPEND="${RDEPEND} - X? ( x11-proto/xproto ) + X? ( x11-base/xorg-proto ) java? ( test? ( =dev-java/junit-3.8* ) )" S="${WORKDIR}/swipl-${PV}" diff --git a/dev-lang/swi-prolog/swi-prolog-7.6.4.ebuild b/dev-lang/swi-prolog/swi-prolog-7.6.4.ebuild index c714e15e3b0a..f745720052e3 100644 --- a/dev-lang/swi-prolog/swi-prolog-7.6.4.ebuild +++ b/dev-lang/swi-prolog/swi-prolog-7.6.4.ebuild @@ -41,7 +41,7 @@ RDEPEND="sys-libs/ncurses:= x11-libs/libSM )" DEPEND="${RDEPEND} - X? ( x11-proto/xproto ) + X? ( x11-base/xorg-proto ) java? ( test? ( =dev-java/junit-3.8* ) )" S="${WORKDIR}/swipl-${PV}" diff --git a/dev-lang/swi-prolog/swi-prolog-7.7.10.ebuild b/dev-lang/swi-prolog/swi-prolog-7.7.10.ebuild index b3c8e67bc2e8..420bd6d9fb12 100644 --- a/dev-lang/swi-prolog/swi-prolog-7.7.10.ebuild +++ b/dev-lang/swi-prolog/swi-prolog-7.7.10.ebuild @@ -41,7 +41,7 @@ RDEPEND="sys-libs/ncurses:= x11-libs/libSM )" DEPEND="${RDEPEND} - X? ( x11-proto/xproto ) + X? ( x11-base/xorg-proto ) java? ( test? ( =dev-java/junit-3.8* ) )" S="${WORKDIR}/swipl-${PV}" diff --git a/dev-lang/swi-prolog/swi-prolog-7.7.11.ebuild b/dev-lang/swi-prolog/swi-prolog-7.7.11.ebuild index b3c8e67bc2e8..420bd6d9fb12 100644 --- a/dev-lang/swi-prolog/swi-prolog-7.7.11.ebuild +++ b/dev-lang/swi-prolog/swi-prolog-7.7.11.ebuild @@ -41,7 +41,7 @@ RDEPEND="sys-libs/ncurses:= x11-libs/libSM )" DEPEND="${RDEPEND} - X? ( x11-proto/xproto ) + X? ( x11-base/xorg-proto ) java? ( test? ( =dev-java/junit-3.8* ) )" S="${WORKDIR}/swipl-${PV}" diff --git a/dev-lang/tk/tk-8.5.17-r100.ebuild b/dev-lang/tk/tk-8.5.17-r100.ebuild index 74b8c11c8361..1eb7f8236def 100644 --- a/dev-lang/tk/tk-8.5.17-r100.ebuild +++ b/dev-lang/tk/tk-8.5.17-r100.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -31,7 +31,7 @@ RDEPEND=" ~dev-lang/tcl-${PV}:8.5= !=dev-lang/tk-8.5:0" DEPEND="${RDEPEND} - !aqua? ( x11-proto/xproto )" + !aqua? ( x11-base/xorg-proto )" SPARENT="${WORKDIR}/${MY_P}" S="${SPARENT}"/unix diff --git a/dev-lang/tk/tk-8.5.17.ebuild b/dev-lang/tk/tk-8.5.17.ebuild index c02680975894..ba1ccc104522 100644 --- a/dev-lang/tk/tk-8.5.17.ebuild +++ b/dev-lang/tk/tk-8.5.17.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -27,7 +27,7 @@ RDEPEND=" ) ~dev-lang/tcl-${PV}:0=" DEPEND="${RDEPEND} - !aqua? ( x11-proto/xproto )" + !aqua? ( x11-base/xorg-proto )" SPARENT="${WORKDIR}/${MY_P}" S="${SPARENT}"/unix diff --git a/dev-lang/tk/tk-8.6.5-r1.ebuild b/dev-lang/tk/tk-8.6.5-r1.ebuild index 58f59da86c2f..c1ec2facd229 100644 --- a/dev-lang/tk/tk-8.6.5-r1.ebuild +++ b/dev-lang/tk/tk-8.6.5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -26,7 +26,7 @@ RDEPEND=" ) ~dev-lang/tcl-${PV}:0=[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND} - !aqua? ( >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )" + !aqua? ( x11-base/xorg-proto )" # Not bumped to 8.6 #RESTRICT=test diff --git a/dev-lang/tk/tk-8.6.5.ebuild b/dev-lang/tk/tk-8.6.5.ebuild index 6364158a803e..4e6adacef09f 100644 --- a/dev-lang/tk/tk-8.6.5.ebuild +++ b/dev-lang/tk/tk-8.6.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -26,7 +26,7 @@ RDEPEND=" ) ~dev-lang/tcl-${PV}:0=[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND} - !aqua? ( >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )" + !aqua? ( x11-base/xorg-proto )" # Not bumped to 8.6 #RESTRICT=test diff --git a/dev-lang/tk/tk-8.6.6.ebuild b/dev-lang/tk/tk-8.6.6.ebuild index be33b1d36f4d..92472b01b1f4 100644 --- a/dev-lang/tk/tk-8.6.6.ebuild +++ b/dev-lang/tk/tk-8.6.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -26,7 +26,7 @@ RDEPEND=" ) ~dev-lang/tcl-${PV}:0=[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND} - !aqua? ( >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )" + !aqua? ( x11-base/xorg-proto )" # Not bumped to 8.6 #RESTRICT=test diff --git a/dev-lang/tk/tk-8.6.7.ebuild b/dev-lang/tk/tk-8.6.7.ebuild index fa1e159eccd6..0261f20c9e03 100644 --- a/dev-lang/tk/tk-8.6.7.ebuild +++ b/dev-lang/tk/tk-8.6.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -26,7 +26,7 @@ RDEPEND=" ) ~dev-lang/tcl-${PV}:0=[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND} - !aqua? ( >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )" + !aqua? ( x11-base/xorg-proto )" # Not bumped to 8.6 #RESTRICT=test diff --git a/dev-ruby/bones/bones-3.8.4-r2.ebuild b/dev-ruby/bones/bones-3.8.4-r2.ebuild new file mode 100644 index 000000000000..444e1d22f300 --- /dev/null +++ b/dev-ruby/bones/bones-3.8.4-r2.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +USE_RUBY="ruby23 ruby24" + +RUBY_FAKEGEM_RECIPE_TEST="rspec" + +RUBY_FAKEGEM_RECIPE_DOC="rdoc" + +RUBY_FAKEGEM_EXTRADOC="History.txt README.rdoc" + +RUBY_FAKEGEM_EXTRAINSTALL="default version.txt" + +inherit ruby-fakegem + +DESCRIPTION="Tool that creates new Ruby projects from a code skeleton" +HOMEPAGE="https://github.com/TwP/bones" + +IUSE="test" +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +ruby_add_rdepend " + dev-ruby/builder:* + >=dev-ruby/loquacious-1.9.1 + >=dev-ruby/little-plugger-1.1.3 + =dev-ruby/rake-12*" + +all_ruby_prepare() { + eapply "${FILESDIR}"/${PN}-3.8.1-builder.patch + + sed -i -e '/rdoc/,/Gem::Dependency/ s:~>:>=:' ../metadata || die +} diff --git a/dev-ruby/childprocess/Manifest b/dev-ruby/childprocess/Manifest index a77796d52ed7..c3ab55ad4d9f 100644 --- a/dev-ruby/childprocess/Manifest +++ b/dev-ruby/childprocess/Manifest @@ -1,5 +1,3 @@ DIST childprocess-0.6.3.gem 31744 BLAKE2B 18fedbe7fbfa1a3954e74206b1f6207351d430a2092dda1f230f54c790c5531cf2a4f302bb86a9adf044e16cfafb132ece45152defd0c4c18445f49d5466f2b1 SHA512 93d2dbd23dfbaa6eb7eaf1c5791802180aece373aa912e78b1c3652e4e96f0e73ef948e484715863eef95e6af6daa1292944ebe987c331ce0d59ba086c803db5 -DIST childprocess-0.7.0.gem 32256 BLAKE2B 58654d088b2b45917ce279de5178b21694ddb32c2771eb04b2b9de2db5e1f4cfcd6250947a38f51332dbdde730118cd63cd5432f0d54138b795416bbc6589365 SHA512 f06203ffecc09f5ab2dd2fe003de0e1f96906b1c5966c2dd630cccae046fd4b4efc6f8c96d4c825af2b4ab2e0e8dd63f6dee97701627d0ad311f0d8395c89c8a -DIST childprocess-0.7.1.gem 32256 BLAKE2B 428eef33c465e8805c855a9389fb0f393e04c48f0f30de4cd2f407cbf403fcfd621283cc9aafcc8336c19415245b180d46036c0e50910fcd8543ad346e0faec3 SHA512 c8e22a3244b5f6315ea003b20feb3f5a576c73938d8eb730f3aea99dc63662497a954531139983ffce74ebc089609e9ecc665144cfa6f05c699804615ca68902 DIST childprocess-0.8.0.gem 32768 BLAKE2B c473da69bd38bda1e28e6adbac7b11597b05eafa58315996435052683f2e3ed500f3c83b27b17859115e1113e0da726007d0ccac3fee171b5338a9026482ac6f SHA512 7e10c15930012bf99ea28afa677a6f745d4e6ebfc21f21f7101111c5a2d35df4fb146bbddb4d1e7a6711324ee7604af50995960570e85ed3f8fe087c59fc02cf DIST childprocess-0.9.0.gem 32768 BLAKE2B cb836c2cc3f9d6bda1db88aec8692499dae2a325611dcdfae482fd6a7bbf065612f0efbe140c08447566b8759ce125968a153d6df38889403d98bc94fe397d7b SHA512 5a788556e14491b0801b8a533d8d8eebba726af6417c8c6c7146738fcae2f92e9faa090312e77d974852003f5a4d155d5307b0c9d1ff1d18173ad653d21f63d8 diff --git a/dev-ruby/childprocess/childprocess-0.7.0.ebuild b/dev-ruby/childprocess/childprocess-0.7.0.ebuild deleted file mode 100644 index e8c89651a6e1..000000000000 --- a/dev-ruby/childprocess/childprocess-0.7.0.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# ruby24 -> fails tests -USE_RUBY="ruby21 ruby22 ruby23" - -RUBY_FAKEGEM_RECIPE_TEST="rspec3" - -RUBY_FAKEGEM_RECIPE_DOC="rdoc" -RUBY_FAKEGEM_EXTRADOC="README.md" - -RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" - -inherit ruby-fakegem - -DESCRIPTION="Solution for controlling external programs running in the background" -HOMEPAGE="https://github.com/jarib/childprocess" - -LICENSE="MIT" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86" -IUSE="" - -ruby_add_rdepend ">=dev-ruby/ffi-1.0.11" - -all_ruby_prepare() { - # Remove bundler support - rm Gemfile || die - sed -i -e "/[Bb]undler/d" Rakefile || die - sed -i -e "/[Cc]overalls/d" spec/spec_helper.rb || die - sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die -} diff --git a/dev-ruby/childprocess/childprocess-0.7.1.ebuild b/dev-ruby/childprocess/childprocess-0.7.1.ebuild deleted file mode 100644 index 8401e8954299..000000000000 --- a/dev-ruby/childprocess/childprocess-0.7.1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -USE_RUBY="ruby21 ruby22 ruby23 ruby24" - -RUBY_FAKEGEM_RECIPE_TEST="rspec3" - -RUBY_FAKEGEM_RECIPE_DOC="rdoc" -RUBY_FAKEGEM_EXTRADOC="README.md" - -RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" - -inherit ruby-fakegem - -DESCRIPTION="Solution for controlling external programs running in the background" -HOMEPAGE="https://github.com/jarib/childprocess" - -LICENSE="MIT" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="" - -ruby_add_rdepend ">=dev-ruby/ffi-1.0.11" - -all_ruby_prepare() { - # Remove bundler support - rm Gemfile || die - sed -i -e "/[Bb]undler/d" Rakefile || die - sed -i -e "/[Cc]overalls/d" spec/spec_helper.rb || die - sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die -} - -each_ruby_prepare() { - sed -i -e "s:'ruby':'"${RUBY}"':" spec/childprocess_spec.rb || die -} - -each_ruby_test() { - RUBYLIB=lib RSPEC_VERSION=3 ruby-ng_rspec -} diff --git a/dev-ruby/css_parser/Manifest b/dev-ruby/css_parser/Manifest index 851295a4b60c..9621ff520275 100644 --- a/dev-ruby/css_parser/Manifest +++ b/dev-ruby/css_parser/Manifest @@ -1,2 +1 @@ -DIST css_parser-1.4.10.tar.gz 26718 BLAKE2B fe83cba6f013548e924823f93a727e09d99063e3bc118b62e96e8cbccdc9347ba004ca19627a6c6f5963f24ce8bed0a7af6c3b5bfe3b0c3f73f9f8dbb55398a7 SHA512 ad48200cd9f6fd36d1b13e8699098380c7d74e5349ed1a6aa294615800689a2959f7a91acff9679a630f525d0141f40aaade498570de4f296333c9525b0f1c22 DIST css_parser-1.6.0.tar.gz 33251 BLAKE2B 1e28e6999675fadc1bc6a98417cc698fb2e5f16e8d8b27e186037112ac9c3cee82161c7530b962209d76d91359d68016210a371c9e8a7f7d631c7aec73bc5c81 SHA512 838baf3cc4249e890f7cf006370f148261b392549e6cc25b11246e15c8347a8877b4cc3bfe70dee18a822a9a8fc496705787262d79e177d62587f41ba6f4c4d6 diff --git a/dev-ruby/css_parser/css_parser-1.4.10.ebuild b/dev-ruby/css_parser/css_parser-1.4.10.ebuild deleted file mode 100644 index 441acc968782..000000000000 --- a/dev-ruby/css_parser/css_parser-1.4.10.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -USE_RUBY="ruby21 ruby22 ruby23" - -RUBY_FAKEGEM_RECIPE_DOC="rdoc" -RUBY_FAKEGEM_DOC_DIR="doc" -RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md " -RUBY_FAKEGEM_TASK_TEST="" -RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" - -GITHUB_USER="premailer" -GITHUB_PROJECT="${PN}" -inherit ruby-fakegem - -DESCRIPTION="Sass-based Stylesheet Framework" -HOMEPAGE="http://compass-style.org/ https://github.com/premailer/css_parser/" -LICENSE="MIT" - -SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz" - -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="doc test" - -ruby_add_rdepend "dev-ruby/addressable - virtual/ruby-ssl" - -ruby_add_bdepend "test? ( dev-ruby/maxitest )" - -all_ruby_prepare() { - # get rid of bundler usage - rm Gemfile || die - sed -i -e '/bundler/d' -e '/bump/d' Rakefile || die - sed -i -e '/bundler/d' test/test_helper.rb || die - # Avoid tests using the network. - sed -i -e '/test_loading_a_remote_file_over_ssl/,/end/ s:^:#:' test/test_css_parser_loading.rb || die - -} - -each_ruby_test() { - ${RUBY} -Ilib test/*.rb || die -} diff --git a/dev-ruby/domain_name/domain_name-0.5.20180417.ebuild b/dev-ruby/domain_name/domain_name-0.5.20180417.ebuild index 1f96ef6e4efe..e9da54dd9dd3 100644 --- a/dev-ruby/domain_name/domain_name-0.5.20180417.ebuild +++ b/dev-ruby/domain_name/domain_name-0.5.20180417.ebuild @@ -3,7 +3,7 @@ EAPI=5 -USE_RUBY="ruby21 ruby22 ruby23 ruby24" +USE_RUBY="ruby23 ruby24 ruby25" RUBY_FAKEGEM_RECIPE_TEST="none" RUBY_FAKEGEM_TASK_DOC="" diff --git a/dev-ruby/dotenv/Manifest b/dev-ruby/dotenv/Manifest index 5565b97d7156..5cd2f68cf46a 100644 --- a/dev-ruby/dotenv/Manifest +++ b/dev-ruby/dotenv/Manifest @@ -1,3 +1,2 @@ -DIST dotenv-2.2.1.tar.gz 15855 BLAKE2B c970fbd30e3c616b9426f4f758e47c81cf54887de0a11560f4ed3aabda6b1b83f49849775d129658d3a2eb6ecdfe4fbea670d0a63443954ac1d53177125a895b SHA512 67e9cc5323d505f0b5a5a1278d0ce6c72a577fc096508b5a6de7b73f3c0fa2ca8144475783ab2b9ef04cf44d6e57ddb8e09f849c44729f7bb7c4bb7156baa443 DIST dotenv-2.2.2.tar.gz 15856 BLAKE2B e27a2650c79aadb31545c3a02d698f5cc3c9e27ddf07aa853a1f776b467f3cb707dda4ee3a0c107fbeb4a5609ded993ab74c81721cab088239858c28bd8e3ded SHA512 6af4039cec9c4c85240dc01eee5e24cac6b762e2fcb0d371bbde4cf03743e1917436664d2ea2e59fa619fddce96c9d3848354d42c3a621556cb120ed1cd0cf2b DIST dotenv-2.4.0.tar.gz 16613 BLAKE2B e9f6a3bd08f610f829c09a250916d2b3194f699aa3b19c05e13ac77a4fdcf8a830ff43ddd6203d08fc96b70fc6b5d35b518ee2a640dd5a2b49886fac8a67fdb9 SHA512 59ae851ef6444dafa673549e84e9476c9ffb78ac6aa078be0fbdc0a1011e4df1dbbc664c612759c0932051bbe954a62679b4d9304dea0191469bf3d792943955 diff --git a/dev-ruby/dotenv/dotenv-2.2.1.ebuild b/dev-ruby/dotenv/dotenv-2.2.1.ebuild deleted file mode 100644 index 1f940776cc6f..000000000000 --- a/dev-ruby/dotenv/dotenv-2.2.1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -USE_RUBY="ruby21 ruby22 ruby23" - -RUBY_FAKEGEM_EXTRADOC="README.md Changelog.md" -RUBY_FAKEGEM_RECIPE_TEST="rspec3" -RUBY_FAKEGEM_RECIPE_DOC="rdoc" - -RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" - -inherit ruby-fakegem - -DESCRIPTION="Loads environment variables from .env into ENV" -HOMEPAGE="https://github.com/bkeepers/dotenv" -SRC_URI="https://github.com/bkeepers/dotenv/archive/v${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="MIT" - -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -SLOT="2" -IUSE="" - -ruby_add_bdepend "test? ( dev-ruby/spring dev-ruby/rails )" - -all_ruby_prepare() { - sed -i -e '/:guard/,/end/ s:^:#:' \ - -e '5igem "rspec", "~> 3.0"' Gemfile || die - - sed -i -e '/rubocop/ s:^:#:' -e 's/git ls-files/find/' dotenv.gemspec || die -} - -each_ruby_prepare() { - sed -i -e "s:ruby -v:${RUBY} -v:g" spec/dotenv/parser_spec.rb || die -} diff --git a/dev-ruby/faraday/Manifest b/dev-ruby/faraday/Manifest index 59fe21801d8e..8cfe60da1334 100644 --- a/dev-ruby/faraday/Manifest +++ b/dev-ruby/faraday/Manifest @@ -1,4 +1,3 @@ -DIST faraday-0.11.0.tar.gz 59736 BLAKE2B a4224ec6bf415bd535695561714f247ea9005db622145d7f6f9e5fee19ffb9c5b5f14d6dfe62bc6ed8396d1171506a40cf38ad5c4d1a1d344aaf16bcad412fc7 SHA512 d7e66f7d634b5c517dd688e874557839dbd7f720283dbeb27fd118c8cbcc596898545d62548d3c7c94d7cf49bdcda0d2fa705a1d20fa4d7ce238b38688d5cc62 DIST faraday-0.12.2.tar.gz 62809 BLAKE2B 4dcd60192df36e1b9766eab3bcbacd729239b0e09d9e82a73d825c750fdbcfae8161cf803f078b841236a5e18b1849b4cdc34e6adebb9eaea0f0442cd65b2e74 SHA512 966fc419d529a8bba5caa6d3932ee94f7b248110edc880b532860c24abd70cb50182e40b94b4143e26575c6db7ce046fa71ac0d25010385d7f0c3dda87f39439 DIST faraday-0.14.0.tar.gz 65105 BLAKE2B bf5101083bd828e2ea98dcd487c7c082f8b2d2eb4d03ac7ad04e1873666db9e2cec1e6eb9887364874ea5f32d0313019d1eada5e05e25e0415bdd5aa2bcfca97 SHA512 25bba07e76a2a8bf02b0c81c045329e72d5911a2aacae56611db33dc25c89bd48bb1b4de9b20c6edc1514d3ceae8b06fca6076c85580533047c222cb30ef8dc7 DIST faraday-0.15.0.tar.gz 66086 BLAKE2B 5018d8e92b2988b08f4e7a5b0876ca6cd4049c74199ee0356adc48867611fd6d30d884bd3cf3e7703a02c7a6e967f9c47cdc44deb75045b8cee46992977fb834 SHA512 46602d89b1bbf5a41143a9a71fab193642e7c41db39dc1edc0efb99f4a7a924c5a698460a0a4f921f7ce1f73ee8eb12e6d79a08dea02c7142856d0aa1b95b521 diff --git a/dev-ruby/faraday/faraday-0.11.0.ebuild b/dev-ruby/faraday/faraday-0.11.0.ebuild deleted file mode 100644 index 8f6ce93b341d..000000000000 --- a/dev-ruby/faraday/faraday-0.11.0.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -USE_RUBY="ruby21 ruby22 ruby23" - -RUBY_FAKEGEM_TASK_TEST="test" -RUBY_FAKEGEM_TASK_DOC="" - -RUBY_FAKEGEM_EXTRADOC="README.md" - -RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" - -inherit ruby-fakegem eutils - -DESCRIPTION="HTTP/REST API client library with pluggable components" -HOMEPAGE="https://github.com/lostisland/faraday" -SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" -IUSE="" - -DEPEND+=" test? ( sys-process/lsof )" - -ruby_add_rdepend ">=dev-ruby/multipart-post-1.2.0 <dev-ruby/multipart-post-3" -ruby_add_bdepend "test? ( - >=dev-ruby/test-unit-2.4 - dev-ruby/httpclient - dev-ruby/rack-test - dev-ruby/sinatra - dev-ruby/net-http-persistent - dev-ruby/patron - )" - -all_ruby_prepare() { - # Remove bundler support. - rm Gemfile || die - sed -i -e '/[Bb]undler/d' Rakefile test/helper.rb || die - sed -i -e '/bundler/,/^fi/ s:^:#:' script/test || die - - # Remove simplecov and coveralls support, not needed to run tests. - sed -i -e '/simplecov/,/^end/ s:^:#:' \ - -e '1igem "rack", "~>1.0"; require "yaml"' \ - test/helper.rb || die - - # Remove tests for adapters that are not packaged for Gentoo. - rm test/adapters/em_http_test.rb test/adapters/em_synchrony_test.rb test/adapters/excon_test.rb test/adapters/typhoeus_test.rb || die - - # The proxy server is already killed, may be OS X vs Linux issue. - sed -i -e '138 s/^/#/' script/test || die - - sed -i -e '/git ls-files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die -} - -each_ruby_prepare() { - # Make sure the test scripts use the right ruby interpreter - sed -i -e 's:ruby:'${RUBY}':' script/* || die -} - -each_ruby_test() { - each_fakegem_test - - # Sleep some time to allow the sinatra test server to die - einfo "Waiting for test server to stop" - sleep 10 -} diff --git a/dev-ruby/faraday_middleware-multi_json/faraday_middleware-multi_json-0.0.6-r1.ebuild b/dev-ruby/faraday_middleware-multi_json/faraday_middleware-multi_json-0.0.6-r1.ebuild index 21b72b842fc7..ca8addbae7d6 100644 --- a/dev-ruby/faraday_middleware-multi_json/faraday_middleware-multi_json-0.0.6-r1.ebuild +++ b/dev-ruby/faraday_middleware-multi_json/faraday_middleware-multi_json-0.0.6-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -USE_RUBY="ruby21 ruby22 ruby23" +USE_RUBY="ruby23 ruby24" RUBY_FAKEGEM_RECIPE_TEST="rspec" RUBY_FAKEGEM_RECIPE_DOC="rdoc" diff --git a/dev-ruby/faraday_middleware/Manifest b/dev-ruby/faraday_middleware/Manifest index 7b7b5f729120..a56f834ff7c7 100644 --- a/dev-ruby/faraday_middleware/Manifest +++ b/dev-ruby/faraday_middleware/Manifest @@ -1,4 +1 @@ -DIST faraday_middleware-0.11.0.1.tar.gz 24349 BLAKE2B f2ce9ece102baa86c9ee763c51da2d7a7318a72d8e6b6f102baaef51ad7b13da32c525b7a67992fcab83d0a145e8cb40d3c4bf31ea1bcb18bd73ee54e327e6d9 SHA512 0bda75432ffa406485e60e9f71dc850a13dc1dd89a8262c9a4101d982fec44b63c72452458d29c49b529ca3483b577ea760400b465bf4b30ae1623a42cb96051 -DIST faraday_middleware-0.11.0.tar.gz 24345 BLAKE2B 43325e27d428a74b1b20eafbe99562442ed7d0f98d19cec3f96fea0ae63f810fab92eabb9a3deb586e4d5933db8d2e9bc1f8270bc99c76a4afd7035fa251f192 SHA512 555407c2daa220fe050a33a6572626bdd47b800f75a87cc0b4da7a311aa3a89c24873434fdb8c14ae92e34c253179697471c25a42d18034b8a1e1e8c332f0e13 -DIST faraday_middleware-0.12.0.tar.gz 24896 BLAKE2B 2a371a55baeafb86196cda66b4d36d1aee3d96c50c1e2550edfe70fe0512c2462739b19c3001bb4569d70d98fda2b27fb59fb466051f331a0839420494f564fe SHA512 e4867c122d69e3b8e8a405a85bc8be4c1489861f4acf42369f34ecda67ca0e821509ef522e742bc8b7a20fb0650a45866a04f4b4469829fbc50cd040cef374af DIST faraday_middleware-0.12.2.tar.gz 25041 BLAKE2B 0ce9750f9ce8394d1d926345c50c6b565bc2f5bbc3991d8543424dacb243f2176a066cdb4c7dd4fa66f7f90beb477aa66513538d7a6c2f84de56075c304d3caa SHA512 a93c6ad6a97da1c84e539ff5976f464e6126ea444b269be2f3bb3dab71ef6f46fd12cc0b4de7aa34842d4dcc274cca584ef879a8c1b80ca4557af4d4dafcd755 diff --git a/dev-ruby/faraday_middleware/faraday_middleware-0.11.0.1.ebuild b/dev-ruby/faraday_middleware/faraday_middleware-0.11.0.1.ebuild deleted file mode 100644 index 635339e4da2a..000000000000 --- a/dev-ruby/faraday_middleware/faraday_middleware-0.11.0.1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -USE_RUBY="ruby21 ruby22 ruby23" - -RUBY_FAKEGEM_RECIPE_TEST="rspec3" - -RUBY_FAKEGEM_RECIPE_DOC="rdoc" -RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" - -RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" - -inherit ruby-fakegem eutils - -DESCRIPTION="Various middleware for Faraday" -HOMEPAGE="https://github.com/lostisland/faraday_middleware" -SRC_URI="https://github.com/lostisland/faraday_middleware/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="+parsexml +oauth +mashify +rashify" - -ruby_add_rdepend " - >=dev-ruby/faraday-0.7.4 <dev-ruby/faraday-1 - parsexml? ( >=dev-ruby/multi_xml-0.5.3 ) - oauth? ( >=dev-ruby/simple_oauth-0.1 ) - mashify? ( >=dev-ruby/hashie-1.2:* ) - rashify? ( >=dev-ruby/rash-0.3 )" - -# Bundler must be used because the optional dependencies have different -# version requirements that must be resolved. -ruby_add_bdepend "test? ( - dev-ruby/bundler - dev-ruby/addressable - dev-ruby/rake - dev-ruby/webmock:0 - dev-ruby/json:0 - >=dev-ruby/multi_xml-0.5.3 - >=dev-ruby/rack-cache-1.1 - >=dev-ruby/simple_oauth-0.1 - >=dev-ruby/hashie-1.2 - >=dev-ruby/rash-0.3 )" - -all_ruby_prepare() { - sed -i -e '/\(cane\|parallel\|simplecov\)/ s:^:#:' \ - -e '/rspec/ s/>=/~>/' \ - -e "/addressable/ s/, '< 2.4'//" \ - -e "/rake/ s/, '< 11'//" \ - -e "/rack-cache/ s/, '< 1.3'//" \ - -e "/simple_oauth/ s/, '< 0.3'//" Gemfile || die - - # Avoid unneeded dependency on git - sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die -} - -each_ruby_test() { - ${RUBY} -S bundle exec rspec-3 spec || die -} diff --git a/dev-ruby/faraday_middleware/faraday_middleware-0.11.0.ebuild b/dev-ruby/faraday_middleware/faraday_middleware-0.11.0.ebuild deleted file mode 100644 index b5796f7721b5..000000000000 --- a/dev-ruby/faraday_middleware/faraday_middleware-0.11.0.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -USE_RUBY="ruby21 ruby22 ruby23" - -RUBY_FAKEGEM_RECIPE_TEST="rspec3" - -RUBY_FAKEGEM_RECIPE_DOC="rdoc" -RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" - -RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" - -inherit ruby-fakegem eutils - -DESCRIPTION="Various middleware for Faraday" -HOMEPAGE="https://github.com/lostisland/faraday_middleware" -SRC_URI="https://github.com/lostisland/faraday_middleware/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="+parsexml +oauth +mashify +rashify" - -ruby_add_rdepend " - >=dev-ruby/faraday-0.7.4 <dev-ruby/faraday-1 - parsexml? ( >=dev-ruby/multi_xml-0.5.3 ) - oauth? ( >=dev-ruby/simple_oauth-0.1 ) - mashify? ( >=dev-ruby/hashie-1.2:* ) - rashify? ( >=dev-ruby/rash-0.3 )" - -# Bundler must be used because the optional dependencies have different -# version requirements that must be resolved. -ruby_add_bdepend "test? ( - dev-ruby/bundler - dev-ruby/addressable - dev-ruby/rake - dev-ruby/webmock:0 - >=dev-ruby/multi_xml-0.5.3 - >=dev-ruby/rack-cache-1.1 - >=dev-ruby/simple_oauth-0.1 - >=dev-ruby/hashie-1.2 - >=dev-ruby/rash-0.3 )" - -all_ruby_prepare() { - sed -i -e '/\(cane\|parallel\|simplecov\)/ s:^:#:' \ - -e '/rspec/ s/>=/~>/' \ - -e "/addressable/ s/, '< 2.4'//" \ - -e "/rake/ s/, '< 11'//" \ - -e "/rack-cache/ s/, '< 1.3'//" \ - -e "/simple_oauth/ s/, '< 0.3'//" Gemfile || die -} - -each_ruby_test() { - ${RUBY} -S bundle exec rspec-3 spec || die -} diff --git a/dev-ruby/faraday_middleware/faraday_middleware-0.12.0.ebuild b/dev-ruby/faraday_middleware/faraday_middleware-0.12.0.ebuild deleted file mode 100644 index 3f3eefd7c5d3..000000000000 --- a/dev-ruby/faraday_middleware/faraday_middleware-0.12.0.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -USE_RUBY="ruby21 ruby22 ruby23" - -RUBY_FAKEGEM_RECIPE_TEST="rspec3" - -RUBY_FAKEGEM_RECIPE_DOC="rdoc" -RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" - -RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" - -inherit ruby-fakegem eutils - -DESCRIPTION="Various middleware for Faraday" -HOMEPAGE="https://github.com/lostisland/faraday_middleware" -SRC_URI="https://github.com/lostisland/faraday_middleware/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="+parsexml +oauth +mashify +rashify" - -ruby_add_rdepend " - >=dev-ruby/faraday-0.7.4 <dev-ruby/faraday-1 - parsexml? ( >=dev-ruby/multi_xml-0.5.3 ) - oauth? ( >=dev-ruby/simple_oauth-0.1 ) - mashify? ( >=dev-ruby/hashie-1.2:* ) - rashify? ( >=dev-ruby/rash_alt-0.4.3 )" - -# Bundler must be used because the optional dependencies have different -# version requirements that must be resolved. -ruby_add_bdepend "test? ( - dev-ruby/bundler - dev-ruby/addressable - dev-ruby/rake - dev-ruby/webmock:0 - dev-ruby/json:0 - >=dev-ruby/multi_xml-0.5.3 - >=dev-ruby/rack-cache-1.1 - >=dev-ruby/simple_oauth-0.1 - >=dev-ruby/hashie-1.2 - >=dev-ruby/rash_alt-0.4.3 )" - -all_ruby_prepare() { - sed -i -e '/\(cane\|parallel\|simplecov\)/ s:^:#:' \ - -e '/rspec/ s/>=/~>/' \ - -e "/addressable/ s/, '< 2.4'//" \ - -e "/rake/ s/, '< 11'//" \ - -e "/rack-cache/ s/, '< 1.3'//" \ - -e "/simple_oauth/ s/, '< 0.3'//" Gemfile || die - - # Avoid unneeded dependency on git - sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die -} - -each_ruby_test() { - ${RUBY} -S bundle exec rspec-3 spec || die -} diff --git a/dev-ruby/gh/gh-0.15.1-r1.ebuild b/dev-ruby/gh/gh-0.15.1-r1.ebuild new file mode 100644 index 000000000000..eb0b4e6120c0 --- /dev/null +++ b/dev-ruby/gh/gh-0.15.1-r1.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +USE_RUBY="ruby23 ruby24" +RUBY_FAKEGEM_RECIPE_DOC="rdoc" +RUBY_FAKEGEM_RECIPE_TEST="rspec3" + +RUBY_FAKEGEM_GEMSPEC="gh.gemspec" + +inherit ruby-fakegem + +DESCRIPTION="multi-layer client for the github api v3" +HOMEPAGE="https://github.com/travis-ci/gh" +SRC_URI="https://github.com/travis-ci/gh/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +ruby_add_bdepend " + dev-ruby/webmock +" + +ruby_add_rdepend " + >=dev-ruby/addressable-2.4.0:0 + dev-ruby/backports + >dev-ruby/faraday-0.8 + >dev-ruby/multi_json-1.0 + >=dev-ruby/net-http-persistent-2.9:0 + dev-ruby/net-http-pipeline +" + +all_ruby_prepare() { + sed -i -e '/addressable/ s/2.4.0/2.4/' \ + -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die +} diff --git a/dev-ruby/globalid/Manifest b/dev-ruby/globalid/Manifest index ac25dd0bd196..452fb1c06596 100644 --- a/dev-ruby/globalid/Manifest +++ b/dev-ruby/globalid/Manifest @@ -1,2 +1 @@ -DIST globalid-0.4.0.tar.gz 18087 BLAKE2B f720a5b760d5a82726155b67ea82977ffcacc109bc431f92afa33bf95b79420a006e9d87650f40ebe5d1b365b3364f645426486b697974072bfbd1e1c4660b88 SHA512 181ee39c12bffe16048b6ae77064f9a9f7babbc8fab43893c8eb89f98571ecd6cbe0032174a9ed6db04398e5f848d718a9ec2d587ac6cfdac4478c7e80284a61 DIST globalid-0.4.1.tar.gz 17924 BLAKE2B 6657c916049f841f472f6320868287451d061f96501f5a2b4df8fd71512f5752d5568185c8166344494fa3f6829ec0047f54235c8ea4e01b040653b8699d0484 SHA512 da484c6c7e8155416d008d650929c6b72981d2ae2d1654eb02e414838a065dad9b4ba3c6e275abb008a0d9cad1e2d4d5295d90807c7d7fc73e55b7071c0fd657 diff --git a/dev-ruby/globalid/globalid-0.4.0-r1.ebuild b/dev-ruby/globalid/globalid-0.4.0-r1.ebuild deleted file mode 100644 index f1e1afc71284..000000000000 --- a/dev-ruby/globalid/globalid-0.4.0-r1.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -USE_RUBY="ruby21 ruby22 ruby23 ruby24" - -RUBY_FAKEGEM_RECIPE_DOC="rdoc" -RUBY_FAKEGEM_EXTRADOC="README.md" - -inherit ruby-fakegem - -DESCRIPTION="Reference models by URI" -HOMEPAGE="https://github.com/rails/globalid" -SRC_URI="https://github.com/rails/globalid/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux" -IUSE="" - -ruby_add_bdepend "test? ( dev-ruby/bundler >=dev-ruby/activemodel-4.2.0 >=dev-ruby/railties-4.2.0 )" -ruby_add_rdepend ">=dev-ruby/activesupport-4.2.0:*" - -all_ruby_prepare() { - rm -f Gemfile.lock || die -} diff --git a/dev-ruby/globalid/globalid-0.4.0.ebuild b/dev-ruby/globalid/globalid-0.4.0.ebuild deleted file mode 100644 index 1942f432f108..000000000000 --- a/dev-ruby/globalid/globalid-0.4.0.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -USE_RUBY="ruby21 ruby22 ruby23" - -RUBY_FAKEGEM_RECIPE_DOC="rdoc" -RUBY_FAKEGEM_EXTRADOC="README.md" - -inherit ruby-fakegem - -DESCRIPTION="Reference models by URI" -HOMEPAGE="https://github.com/rails/globalid" -SRC_URI="https://github.com/rails/globalid/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux" -IUSE="" - -ruby_add_bdepend "test? ( dev-ruby/bundler >=dev-ruby/activemodel-4.2.0 >=dev-ruby/railties-4.2.0 )" -ruby_add_rdepend ">=dev-ruby/activesupport-4.2.0:*" - -all_ruby_prepare() { - rm -f Gemfile.lock || die -} diff --git a/dev-ruby/haml-rails/haml-rails-1.0.0.ebuild b/dev-ruby/haml-rails/haml-rails-1.0.0.ebuild index dd47f90c37c5..d99497999a32 100644 --- a/dev-ruby/haml-rails/haml-rails-1.0.0.ebuild +++ b/dev-ruby/haml-rails/haml-rails-1.0.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -USE_RUBY="ruby21 ruby22 ruby23" +USE_RUBY="ruby23 ruby24" RUBY_FAKEGEM_EXTRADOC="README.md" RUBY_FAKEGEM_RECIPE_DOC="yard" diff --git a/dev-ruby/hiera/Manifest b/dev-ruby/hiera/Manifest index cadefcb8a11e..21c76332c96e 100644 --- a/dev-ruby/hiera/Manifest +++ b/dev-ruby/hiera/Manifest @@ -1,5 +1,4 @@ DIST hiera-1.3.4.gem 30208 BLAKE2B c0f65db3807e645ec08d60447b3aa0ecd9e826afc730296743faf6cded31ac203fdbe369df0055dc68fbb90f453dad26e8f3679d0c707b14cdcb6ff67328229b SHA512 be3b702f0e3c2e61d8d6a8c1ff1280f9a1be3dc4adc2a605b4ee3b5db82d513bd58fb6b22ef546a625cf4eefa43d597365187b776ee92c2dd9946eaa4b147128 DIST hiera-3.2.2.gem 40448 BLAKE2B a94bebb0e3549a3bde83ef80db8c13af8bfb6dbf0f9f3efc244ddf211fed47c7f763e033c348d3a0fd20ad04c3de009b4d37fee0da080a77c4eac2a1439b8751 SHA512 5a341c47305592421945fee3ab3fbc2c39f3f847d1c45d9b6dc8cc90da8057c25b32abf127b667fc00071c1fa7809034a5dd1e640c49f4ba6c2ab3e5718753b1 -DIST hiera-3.3.1.gem 40960 BLAKE2B 6bf380cd9a46c4b035578e576fc01af3e026a26c421c5d7745d5f1a62c143999faa466d8b15ed30621bba0ce13a5cf42a38e1f572993560019a73c717050cab7 SHA512 c9032fa0d01f43b22b5d59fa9e8f3b6353b2a91b4ddba9aa6f7c8debfbd2b1089f0b471be5cd0f864025aabeb3f117dabab0a342ae9f659d6dfc13480f27a7a5 DIST hiera-3.4.2.gem 41472 BLAKE2B d4b1fd0432a4b8fffbf9e55118e93578226fd270ec11da4b999d1e1b7edc32fda70d7a7b84c016034d8028ae51d55d5076dc51780b10ff59af52077ddda6224d SHA512 33045e395fa06467ae61f42eeab5b48b76a03274243db52dff7dbf8a08052b8cd2e0dd609d6a13317efab485408c7351cc2553ba2e5a767afa09a8a21735852f DIST hiera-3.4.3.gem 40960 BLAKE2B a4747c6096065c1272bd3099893d27c53b5e869be16643fbd59fa0eead692e3bd082fcbf82463614336d00c3068244bd632fd6c3a87ba520566a8643f674bfc4 SHA512 126e626b9c9020f2b8565aaff35f30b35c73785120425d186c97186c5bdfafc4831216250f78fd33ffd5e1dde49646b262887747c0d73442a252c391329959e2 diff --git a/dev-ruby/hiera/hiera-3.3.1.ebuild b/dev-ruby/hiera/hiera-3.3.1.ebuild deleted file mode 100644 index 1d8ee8a87cd9..000000000000 --- a/dev-ruby/hiera/hiera-3.3.1.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -USE_RUBY="ruby21 ruby22 ruby23" - -RUBY_FAKEGEM_RECIPE_TEST="rspec3" - -RUBY_FAKEGEM_TASK_DOC="" -RUBY_FAKEGEM_EXTRADOC="README.md" - -inherit ruby-fakegem - -DESCRIPTION="A simple pluggable Hierarchical Database" -HOMEPAGE="https://docs.puppet.com/hiera/latest/" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="" -KEYWORDS="~amd64 ~hppa ~ppc ~x86" - -ruby_add_bdepend "test? ( dev-ruby/mocha )" - -ruby_add_rdepend "dev-ruby/deep_merge" diff --git a/dev-ruby/hipchat/hipchat-1.6.0.ebuild b/dev-ruby/hipchat/hipchat-1.6.0.ebuild index 9cc20c1f227b..e0c8e1822bb5 100644 --- a/dev-ruby/hipchat/hipchat-1.6.0.ebuild +++ b/dev-ruby/hipchat/hipchat-1.6.0.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -USE_RUBY="ruby21 ruby22 ruby23" +USE_RUBY="ruby23 ruby24" RUBY_FAKEGEM_RECIPE_TEST="rspec3" RUBY_FAKEGEM_RECIPE_DOC="rdoc" @@ -25,7 +25,7 @@ ruby_add_rdepend "dev-ruby/httparty dev-ruby/mimemagic" ruby_add_bdepend "test? ( dev-ruby/rr dev-ruby/rake - >dev-ruby/webmock-1.22.6:0 + dev-ruby/webmock )" all_ruby_prepare() { diff --git a/dev-ruby/httparty/Manifest b/dev-ruby/httparty/Manifest index 94361812cf83..7a0be90aff23 100644 --- a/dev-ruby/httparty/Manifest +++ b/dev-ruby/httparty/Manifest @@ -1,4 +1,3 @@ DIST httparty-0.14.0.gem 84992 BLAKE2B 5fdb305a01c6c16bd8c9ea7bd11f0dddcb39a4bc3113b1e7ca83965f44b3462a41acaf1020e12e91b323d16ce27b65f2ea6f7d9e62722fbcecadc4d61dfd433c SHA512 db04caaeff3277c071a2d3914f782f9151597d601a2f8817e704c977b95b149144c47df73284f83396ce1099f75f7fdc3caaa17385a515878366e2b3fcb84b04 -DIST httparty-0.15.7.gem 87552 BLAKE2B d7a0907d1c24113c129493a57ca900f45026e1ed7cc4407ac367d8ba5afa615af31496a2003755951d52672bdecd0646aaaf407b3c47d4856c9c492e7ec5cac7 SHA512 6bdf5946bc0f22afed346091078dd43dd62cb6190b3d01bc0de5c9732c611474e207c38b4c6eca5f3cc1e2139880c2eac19554d359dac861de33c5c5ceb28c5e DIST httparty-0.16.0.gem 89088 BLAKE2B 27715c6760a9adeec289a005f89de219b32e6ad5c3f937478ad4187df895096f9375b0d20a4b33c1c62b96de6313017a713a036247756a96fe9366e7c1e77247 SHA512 c523ab3555d0a86e2df53e800be57b88f40bb680e7df31e754ddc3e76728eb2228e6ddbe9a3e580c4c604a126ebcd33be79dfde3758faf99aadbba4d30d9508d DIST httparty-0.16.2.gem 89600 BLAKE2B 581b5fcadf59bb50864b2fa6d1aae220ff9881bba53363601c6e70c3291dc2cee351a8f42b1946ad516cdcab5a85b832e4260f04394e54255e0cd76bc6860d5e SHA512 13efbacb9ee0325fbb185279ca9f7ffcc0131189ccf98d9889c6a1b6bcfa04fd7cbc6d1393bffe69a5a813a2f54f70b5926e176305fa70480dd0902968c894d0 diff --git a/dev-ruby/httparty/httparty-0.15.7.ebuild b/dev-ruby/httparty/httparty-0.15.7.ebuild deleted file mode 100644 index b65c830b1ec3..000000000000 --- a/dev-ruby/httparty/httparty-0.15.7.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -USE_RUBY="ruby22 ruby23 ruby24" - -RUBY_FAKEGEM_RECIPE_TEST="rspec3" - -RUBY_FAKEGEM_TASK_DOC="" -RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md" - -inherit ruby-fakegem - -DESCRIPTION="Makes http fun! Also, makes consuming restful web services dead easy" -HOMEPAGE="https://jnunemaker.github.com/httparty" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -ruby_add_rdepend '>=dev-ruby/multi_xml-0.5.2' - -ruby_add_bdepend 'test? ( dev-ruby/webmock )' - -all_ruby_prepare() { - # Remove bundler - rm Gemfile || die - sed -i -e '/[Bb]undler/ s:^:#:' Rakefile || die - - # Avoid test dependency on cucumber. We can't run the features since - # they depend on mongrel which is no longer packaged. - sed -i -e '/cucumber/I s:^:#:' Rakefile || die - - # Avoid test dependency on simplecov - sed -i -e '/simplecov/I s:^:#:' \ - -e '1i require "cgi"; require "delegate"' spec/spec_helper.rb || die - - # Avoid test that works standalone but fails in the suite - sed -i -e '/calls block given to perform with each redirect/,/^ end/ s:^:#:' spec/httparty/request_spec.rb -} - -all_ruby_install() { - all_fakegem_install - - docinto examples - dodoc examples/* -} diff --git a/dev-ruby/httparty/httparty-0.16.0.ebuild b/dev-ruby/httparty/httparty-0.16.0.ebuild index b65c830b1ec3..472d30ad10ff 100644 --- a/dev-ruby/httparty/httparty-0.16.0.ebuild +++ b/dev-ruby/httparty/httparty-0.16.0.ebuild @@ -17,7 +17,7 @@ HOMEPAGE="https://jnunemaker.github.com/httparty" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="" ruby_add_rdepend '>=dev-ruby/multi_xml-0.5.2' diff --git a/dev-ruby/jeweler/Manifest b/dev-ruby/jeweler/Manifest index f7491da1d241..8d408576a837 100644 --- a/dev-ruby/jeweler/Manifest +++ b/dev-ruby/jeweler/Manifest @@ -1 +1,2 @@ DIST jeweler-2.3.7.gem 61952 BLAKE2B fff72e299131b3080c36002e90d36e89db8fcef85cb5e8cbb0976e4b06f0555117d2b6e6375d298f03683565a8d2826471a2f847f481f215d1ccdc231346e1e9 SHA512 4ca397c75059a28d623afbb22fc5b2b5627e7c3f078b2b77eb623d0b70f518fa58fce54526e12b417ffbf40e1b635dfbd57ff1d91264ed3ca7bb6917bb4ca784 +DIST jeweler-2.3.9.gem 61952 BLAKE2B 2c802f27db9a5018473792c184c56b1d2262ec4e30ba24da964bd8dfebecc7551ea50f4a4c0f823907a14afc5358036ff2efb0d9e8404befb2c451688f578b1e SHA512 d8e91702cf046cd16b5b0f718966adecaa7777f2ce526e3fac3be97f8e91ffa32362a9a96d1c8b390b400f38d0d7a59860437487459cb0490366ef2d38fec6f2 diff --git a/dev-ruby/jeweler/jeweler-2.3.9.ebuild b/dev-ruby/jeweler/jeweler-2.3.9.ebuild new file mode 100644 index 000000000000..e953d1d6e966 --- /dev/null +++ b/dev-ruby/jeweler/jeweler-2.3.9.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +USE_RUBY="ruby23 ruby24" + +RUBY_FAKEGEM_TASK_DOC="-Ilib yard" +RUBY_FAKEGEM_DOCDIR="doc" + +# Tests and features also need the same set of dependencies present. +RUBY_FAKEGEM_TASK_TEST="-Ilib test" + +RUBY_FAKEGEM_EXTRADOC="ChangeLog.markdown README.markdown" + +RUBY_FAKEGEM_GEMSPEC="jeweler.gemspec" + +inherit ruby-fakegem + +DESCRIPTION="Rake tasks to manage gems, versioning and generate new projects" +HOMEPAGE="https://wiki.github.com/technicalpickles/jeweler" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +IUSE="" + +ruby_add_bdepend " + dev-ruby/yard + test? ( + dev-ruby/shoulda + dev-ruby/rr + dev-ruby/test-unit-rr + dev-ruby/test_construct + dev-ruby/test-unit:2 + ) +" + +ruby_add_rdepend " + dev-ruby/builder:* + >=dev-ruby/bundler-1.0 + >=dev-ruby/git-1.2.5 + >=dev-ruby/github_api-0.16.0 + >=dev-ruby/highline-1.6.15 + >=dev-ruby/nokogiri-1.5.10 + dev-ruby/psych:0 + dev-ruby/rake + dev-ruby/rdoc + dev-ruby/semver2 +" + +all_ruby_prepare() { + # Remove bundler support. + rm Gemfile || die + sed -i -e '/bundler/d' -e '/Bundler.setup/d' Rakefile test/test_helper.rb features/support/env.rb || die + + sed -i -e '/coverall/I s:^:#:' \ + -e '1i gem "test-unit"' test/test_helper.rb || die + + # Avoid a test that only passes in the git repository. + sed -i -e '/find the base repo/,/^ end/ s:^:#:' test/test_jeweler.rb || die + + # Avoid dependency on cucumber, make sure semver2 gem is used (puppet also provides "semver") + sed -i -e '/cucumber/,$ s:^:#:' \ + -e '1igem "semver2"' Rakefile || die + + # Loosen github_api requirement + sed -i -e '/github_api/ s/0.16.0/0.16/' ${RUBY_FAKEGEM_GEMSPEC} || die +} diff --git a/dev-ruby/kramdown/Manifest b/dev-ruby/kramdown/Manifest index 2f5dcbd82012..2344005f8d7f 100644 --- a/dev-ruby/kramdown/Manifest +++ b/dev-ruby/kramdown/Manifest @@ -1,2 +1 @@ -DIST kramdown-1.13.2.gem 249856 BLAKE2B 33aacadc09a1f720cf9876690647d2005272c571e861f9f69852e7bbfaa2cbd36802def1f732e9762e9c5c417f85a4eaa63d72a70e37cd9a6b6dd6bed5a099e0 SHA512 dd2194184a7761bc490535a9d5631b78441b83f040e37dafc25b956dd680fe398d19ae75aff06dc2ec6a7573ac198169e175ef78a95743f0f7b4874bf28cebf8 DIST kramdown-1.14.0.gem 250368 BLAKE2B 78d3638ec58a5c237a9350cad1edabf2d4fa0307013a0ced18f6835c4a8cdd623e4825b06670d5c588147013b191912f93e51e74ab1fe007761c117334f378aa SHA512 bd6295db2fe0d3a7dca936d47f0aaf7f939a86361dfdd3203a52683a9eb11a68075cad7d068cc56a315db3c14e73cf5aebb87531ba3086301a7521c5a86f9905 diff --git a/dev-ruby/kramdown/kramdown-1.13.2-r1.ebuild b/dev-ruby/kramdown/kramdown-1.13.2-r1.ebuild deleted file mode 100644 index fbc6f81f1a4e..000000000000 --- a/dev-ruby/kramdown/kramdown-1.13.2-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -USE_RUBY="ruby21 ruby22 ruby23" - -RUBY_FAKEGEM_EXTRADOC="README.md AUTHORS CONTRIBUTERS" - -RUBY_FAKEGEM_EXTRAINSTALL="data" - -inherit ruby-fakegem - -DESCRIPTION="Yet-another-markdown-parser but fast, pure Ruby, using strict syntax definition" -HOMEPAGE="https://kramdown.gettalong.org/" - -LICENSE="MIT" - -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64" -IUSE="latex" - -LATEX_DEPS="latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra )" -RDEPEND+=" ${LATEX_DEPS}" -DEPEND+=" test? ( ${LATEX_DEPS} app-text/htmltidy )" - -ruby_add_rdepend "dev-ruby/prawn:2 - >=dev-ruby/prawn-table-0.2.2 =dev-ruby/prawn-table-0.2* - >=dev-ruby/rouge-1.8:0 - >=dev-ruby/itextomml-1.5 - >=dev-ruby/coderay-1.0.0 - >=dev-ruby/ritex-1.0 - >=dev-ruby/stringex-1.5.1" - -ruby_add_bdepend "doc? ( dev-ruby/rdoc ) - test? ( >=dev-ruby/minitest-5.0 )" - -all_ruby_prepare() { - if ! use latex; then - # Remove latex tests. They will fail gracefully when latex isn't - # present at all, but not when components are missing (most - # notable ucs.sty). - sed -i -e '/latex -v/,/^ end/ s:^:#:' test/test_files.rb || die - fi - - # Avoid tests requiring node to be installed with mathjaxnode. - rm -f test/testcases/span/math/mathjaxnode* \ - test/testcases/block/15_math/mathjaxnode* || die -} - -all_ruby_install() { - all_fakegem_install - - doman man/man1/kramdown.1 -} diff --git a/dev-ruby/little-plugger/little-plugger-1.1.4.ebuild b/dev-ruby/little-plugger/little-plugger-1.1.4.ebuild index e0ca649c1046..b0e5d7f961a6 100644 --- a/dev-ruby/little-plugger/little-plugger-1.1.4.ebuild +++ b/dev-ruby/little-plugger/little-plugger-1.1.4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 -USE_RUBY="ruby21 ruby22 ruby23 ruby24" +USE_RUBY="ruby23 ruby24 ruby25" RUBY_FAKEGEM_RECIPE_TEST="rspec3" diff --git a/dev-ruby/loquacious/loquacious-1.9.1-r2.ebuild b/dev-ruby/loquacious/loquacious-1.9.1-r2.ebuild index 445d1b99a150..958838aaa2e7 100644 --- a/dev-ruby/loquacious/loquacious-1.9.1-r2.ebuild +++ b/dev-ruby/loquacious/loquacious-1.9.1-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 -USE_RUBY="ruby21 ruby22 ruby23 ruby24" +USE_RUBY="ruby23 ruby24 ruby25" RUBY_FAKEGEM_RECIPE_TEST="rspec" @@ -22,11 +22,6 @@ LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -all_ruby_prepare() { - # Remove metadata because it confuses jruby. - rm -f ../metadata || die -} - all_ruby_compile() { if use doc; then rdoc lib || die "Documentation generation failed." diff --git a/dev-ruby/multipart-post/multipart-post-2.0.0-r1.ebuild b/dev-ruby/multipart-post/multipart-post-2.0.0-r1.ebuild index ff429b4380eb..e2c7ae596b20 100644 --- a/dev-ruby/multipart-post/multipart-post-2.0.0-r1.ebuild +++ b/dev-ruby/multipart-post/multipart-post-2.0.0-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 -USE_RUBY="ruby21 ruby22 ruby23 ruby24" +USE_RUBY="ruby23 ruby24 ruby25" RUBY_FAKEGEM_TASK_TEST="" RUBY_FAKEGEM_TASK_DOC="" diff --git a/dev-ruby/net-http-persistent/net-http-persistent-3.0.0.ebuild b/dev-ruby/net-http-persistent/net-http-persistent-3.0.0.ebuild index d4e49a903b02..e7b05c4ea0d1 100644 --- a/dev-ruby/net-http-persistent/net-http-persistent-3.0.0.ebuild +++ b/dev-ruby/net-http-persistent/net-http-persistent-3.0.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -USE_RUBY="ruby21 ruby22 ruby23 ruby24" +USE_RUBY="ruby23 ruby24 ruby25" RUBY_FAKEGEM_RECIPE_DOC="rdoc" diff --git a/dev-ruby/patron/patron-0.12.1.ebuild b/dev-ruby/patron/patron-0.12.1.ebuild index 843a380dbda2..9e7b6892856e 100644 --- a/dev-ruby/patron/patron-0.12.1.ebuild +++ b/dev-ruby/patron/patron-0.12.1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -USE_RUBY="ruby22 ruby23 ruby24" +USE_RUBY="ruby23 ruby24 ruby25" RUBY_FAKEGEM_RECIPE_TEST="rspec3" RUBY_FAKEGEM_RECIPE_DOC="rdoc" diff --git a/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild b/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild index 5144e27c5e5a..ce48c2e3f5c4 100644 --- a/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild +++ b/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild @@ -112,9 +112,9 @@ RDEPEND="${COMMONDEPEND} PDEPEND=" dev-util/automoc virtual/pkgconfig + x11-base/xorg-proto >=x11-libs/libXtst-1.1.0 x11-misc/xdg-utils - x11-proto/xf86vidmodeproto handbook? ( kde-apps/khelpcenter:* ) policykit? ( kde-plasma/polkit-kde-agent ) " diff --git a/media-gfx/cellwriter/cellwriter-1.3.4.ebuild b/media-gfx/cellwriter/cellwriter-1.3.4.ebuild index 517e2596d527..cb3737df9143 100644 --- a/media-gfx/cellwriter/cellwriter-1.3.4.ebuild +++ b/media-gfx/cellwriter/cellwriter-1.3.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=2 @@ -17,7 +17,7 @@ RDEPEND="x11-libs/libXtst gnome? ( gnome-base/libgnome )" DEPEND="${RDEPEND} virtual/pkgconfig - x11-proto/inputproto" + x11-base/xorg-proto" src_configure() { econf $(use_with gnome) diff --git a/media-gfx/cellwriter/cellwriter-1.3.5.ebuild b/media-gfx/cellwriter/cellwriter-1.3.5.ebuild index 9f5a7bfdccdf..83526f625890 100644 --- a/media-gfx/cellwriter/cellwriter-1.3.5.ebuild +++ b/media-gfx/cellwriter/cellwriter-1.3.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -18,7 +18,7 @@ RDEPEND="x11-libs/gtk+:2 x11-libs/libXtst" DEPEND="${RDEPEND} virtual/pkgconfig - x11-proto/xproto" + x11-base/xorg-proto" DOCS="AUTHORS ChangeLog README TODO" # NEWS is no-op diff --git a/media-gfx/fbida/fbida-2.12.ebuild b/media-gfx/fbida/fbida-2.12.ebuild index a54e6b18ce07..21c9c5498dc4 100644 --- a/media-gfx/fbida/fbida-2.12.ebuild +++ b/media-gfx/fbida/fbida-2.12.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -47,7 +47,7 @@ CDEPEND=" DEPEND=" ${CDEPEND} - X? ( x11-proto/xextproto x11-proto/xproto ) + X? ( x11-base/xorg-proto ) " RDEPEND=" diff --git a/media-gfx/fbida/fbida-2.13-r1.ebuild b/media-gfx/fbida/fbida-2.13-r1.ebuild index b3534f6df821..ca112ea82bfb 100644 --- a/media-gfx/fbida/fbida-2.13-r1.ebuild +++ b/media-gfx/fbida/fbida-2.13-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -47,7 +47,7 @@ CDEPEND=" DEPEND=" ${CDEPEND} - X? ( x11-proto/xextproto x11-proto/xproto ) + X? ( x11-base/xorg-proto ) " RDEPEND=" diff --git a/media-gfx/fbida/fbida-2.14.ebuild b/media-gfx/fbida/fbida-2.14.ebuild index 482c92a8d701..0df94d361425 100644 --- a/media-gfx/fbida/fbida-2.14.ebuild +++ b/media-gfx/fbida/fbida-2.14.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -47,7 +47,7 @@ CDEPEND=" DEPEND=" ${CDEPEND} - X? ( x11-proto/xextproto x11-proto/xproto ) + X? ( x11-base/xorg-proto ) " RDEPEND=" diff --git a/media-gfx/fbida/fbida-9999.ebuild b/media-gfx/fbida/fbida-9999.ebuild index dc27ba67de8a..ff4be7c5c7ab 100644 --- a/media-gfx/fbida/fbida-9999.ebuild +++ b/media-gfx/fbida/fbida-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -49,7 +49,7 @@ CDEPEND=" DEPEND=" ${CDEPEND} - X? ( x11-proto/xextproto x11-proto/xproto ) + X? ( x11-base/xorg-proto ) " RDEPEND=" diff --git a/media-gfx/feh/feh-2.18.3.ebuild b/media-gfx/feh/feh-2.18.3.ebuild index 1b1f2eb93d5c..72bb0487879c 100644 --- a/media-gfx/feh/feh-2.18.3.ebuild +++ b/media-gfx/feh/feh-2.18.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -22,8 +22,8 @@ COMMON_DEPEND="media-libs/imlib2[X] RDEPEND="${COMMON_DEPEND} virtual/jpeg:0" DEPEND="${COMMON_DEPEND} + x11-base/xorg-proto x11-libs/libXt - x11-proto/xproto test? ( >=dev-lang/perl-5.10 dev-perl/Test-Command diff --git a/media-gfx/feh/feh-2.24.ebuild b/media-gfx/feh/feh-2.24.ebuild index 97faff3af810..ee6ce5b79e0e 100644 --- a/media-gfx/feh/feh-2.24.ebuild +++ b/media-gfx/feh/feh-2.24.ebuild @@ -22,8 +22,8 @@ COMMON_DEPEND="media-libs/imlib2[X] RDEPEND="${COMMON_DEPEND} virtual/jpeg:0" DEPEND="${COMMON_DEPEND} + x11-base/xorg-proto x11-libs/libXt - x11-proto/xproto test? ( >=dev-lang/perl-5.10 dev-perl/Test-Command diff --git a/media-gfx/feh/feh-2.25.1.ebuild b/media-gfx/feh/feh-2.25.1.ebuild index 97faff3af810..ee6ce5b79e0e 100644 --- a/media-gfx/feh/feh-2.25.1.ebuild +++ b/media-gfx/feh/feh-2.25.1.ebuild @@ -22,8 +22,8 @@ COMMON_DEPEND="media-libs/imlib2[X] RDEPEND="${COMMON_DEPEND} virtual/jpeg:0" DEPEND="${COMMON_DEPEND} + x11-base/xorg-proto x11-libs/libXt - x11-proto/xproto test? ( >=dev-lang/perl-5.10 dev-perl/Test-Command diff --git a/media-gfx/feh/feh-2.25.ebuild b/media-gfx/feh/feh-2.25.ebuild index 97faff3af810..ee6ce5b79e0e 100644 --- a/media-gfx/feh/feh-2.25.ebuild +++ b/media-gfx/feh/feh-2.25.ebuild @@ -22,8 +22,8 @@ COMMON_DEPEND="media-libs/imlib2[X] RDEPEND="${COMMON_DEPEND} virtual/jpeg:0" DEPEND="${COMMON_DEPEND} + x11-base/xorg-proto x11-libs/libXt - x11-proto/xproto test? ( >=dev-lang/perl-5.10 dev-perl/Test-Command diff --git a/media-gfx/fontforge/fontforge-20170731-r3.ebuild b/media-gfx/fontforge/fontforge-20170731-r3.ebuild index 3461e5fc1b1a..ccf771d57450 100644 --- a/media-gfx/fontforge/fontforge-20170731-r3.ebuild +++ b/media-gfx/fontforge/fontforge-20170731-r3.ebuild @@ -51,7 +51,7 @@ RDEPEND=" DEPEND="${RDEPEND} sys-devel/gettext virtual/pkgconfig - X? ( x11-proto/inputproto ) + X? ( x11-base/xorg-proto ) " # Needs keywording on many arches. diff --git a/media-gfx/gifsicle/gifsicle-1.86.ebuild b/media-gfx/gifsicle/gifsicle-1.86.ebuild index 5d14f6a42a12..4ce9c26ea623 100644 --- a/media-gfx/gifsicle/gifsicle-1.86.ebuild +++ b/media-gfx/gifsicle/gifsicle-1.86.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -14,7 +14,7 @@ IUSE="X" RDEPEND="X? ( x11-libs/libX11 x11-libs/libXt )" DEPEND="${RDEPEND} - X? ( x11-proto/xproto )" + X? ( x11-base/xorg-proto )" src_configure() { local myconf diff --git a/media-gfx/gifsicle/gifsicle-1.90.ebuild b/media-gfx/gifsicle/gifsicle-1.90.ebuild index 1120482889a9..9cb9ee7fd17a 100644 --- a/media-gfx/gifsicle/gifsicle-1.90.ebuild +++ b/media-gfx/gifsicle/gifsicle-1.90.ebuild @@ -14,7 +14,7 @@ IUSE="X" RDEPEND="X? ( x11-libs/libX11 x11-libs/libXt )" DEPEND="${RDEPEND} - X? ( x11-proto/xproto )" + X? ( x11-base/xorg-proto )" src_configure() { econf $(usex X "" "--disable-gifview") diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-3.22.0.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-3.22.0.ebuild index 8067e0b9f597..7abe28836619 100644 --- a/media-gfx/gnome-screenshot/gnome-screenshot-3.22.0.ebuild +++ b/media-gfx/gnome-screenshot/gnome-screenshot-3.22.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -28,9 +28,9 @@ RDEPEND="${COMMON_DEPEND} " # ${PN} was part of gnome-utils before 3.4 DEPEND="${COMMON_DEPEND} - x11-proto/xextproto >=dev-util/intltool-0.50.2 virtual/pkgconfig + x11-base/xorg-proto " DOC_CONTENTS="${P} saves screenshots in ~/Pictures/ and defaults to diff --git a/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild b/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild index 1a862494fb19..22edbc5a0ffd 100644 --- a/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild +++ b/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild @@ -59,7 +59,7 @@ RDEPEND=" DEPEND="${RDEPEND} !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig - X? ( x11-proto/xextproto )" + X? ( x11-base/xorg-proto )" REQUIRED_USE="corefonts? ( truetype ) test? ( corefonts )" diff --git a/media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild b/media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild index 7458e47a0da7..d971391a6a9c 100644 --- a/media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild +++ b/media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild @@ -59,7 +59,7 @@ RDEPEND=" DEPEND="${RDEPEND} !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig - X? ( x11-proto/xextproto )" + X? ( x11-base/xorg-proto )" REQUIRED_USE="corefonts? ( truetype ) test? ( corefonts )" diff --git a/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild b/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild index 1aeb69caf13a..4874250e8c06 100644 --- a/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild +++ b/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild @@ -59,7 +59,7 @@ RDEPEND=" DEPEND="${RDEPEND} !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig - X? ( x11-proto/xextproto )" + X? ( x11-base/xorg-proto )" REQUIRED_USE="corefonts? ( truetype ) test? ( corefonts )" diff --git a/media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild b/media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild index 5264d406ea24..7b4ac4bbb033 100644 --- a/media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild +++ b/media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild @@ -59,7 +59,7 @@ RDEPEND=" DEPEND="${RDEPEND} !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig - X? ( x11-proto/xextproto )" + X? ( x11-base/xorg-proto )" REQUIRED_USE="corefonts? ( truetype ) test? ( corefonts )" diff --git a/media-gfx/swftools/metadata.xml b/media-gfx/swftools/metadata.xml index 7e0acf82177c..6f49eba8f496 100644 --- a/media-gfx/swftools/metadata.xml +++ b/media-gfx/swftools/metadata.xml @@ -1,11 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> - <email>dblaci@dblaci.hu</email> -</maintainer> -<maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> -</maintainer> +<!-- maintainer-needed --> </pkgmetadata> diff --git a/media-gfx/xfig/xfig-3.2.6a-r1.ebuild b/media-gfx/xfig/xfig-3.2.6a-r1.ebuild index 4104b2e0d1a6..d68fd060b615 100644 --- a/media-gfx/xfig/xfig-3.2.6a-r1.ebuild +++ b/media-gfx/xfig/xfig-3.2.6a-r1.ebuild @@ -27,8 +27,7 @@ RDEPEND=" postscript? ( app-text/ghostscript-gpl ) " DEPEND="${RDEPEND} - x11-proto/xproto - x11-proto/inputproto + x11-base/xorg-proto " PATCHES=( diff --git a/media-gfx/xli/xli-1.17.0-r5.ebuild b/media-gfx/xli/xli-1.17.0-r5.ebuild index 64185ccfaefb..fecafa404d77 100644 --- a/media-gfx/xli/xli-1.17.0-r5.ebuild +++ b/media-gfx/xli/xli-1.17.0-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -22,7 +22,7 @@ RDEPEND="app-arch/bzip2 DEPEND="${RDEPEND} app-text/rman - x11-proto/xextproto + x11-base/xorg-proto x11-misc/imake !media-gfx/xloadimage" diff --git a/media-video/alevt/alevt-1.6.2.ebuild b/media-video/alevt/alevt-1.6.2.ebuild index 5e65dbcd0b4b..d93fd6f0ccb3 100644 --- a/media-video/alevt/alevt-1.6.2.ebuild +++ b/media-video/alevt/alevt-1.6.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=4 @@ -16,7 +16,7 @@ IUSE="" RDEPEND="x11-libs/libX11 >=media-libs/libpng-1.4" DEPEND="${RDEPEND} - x11-proto/xproto" + x11-base/xorg-proto" RESTRICT="strip" diff --git a/media-video/cheese/cheese-3.24.0.ebuild b/media-video/cheese/cheese-3.24.0.ebuild index c4355c816aa4..b9978f7735b1 100644 --- a/media-video/cheese/cheese-3.24.0.ebuild +++ b/media-video/cheese/cheese-3.24.0.ebuild @@ -54,7 +54,7 @@ DEPEND="${COMMON_DEPEND} >=dev-util/intltool-0.50 dev-util/itstool virtual/pkgconfig - x11-proto/xf86vidmodeproto + x11-base/xorg-proto test? ( dev-libs/glib:2[utils] ) " diff --git a/media-video/mplayer/mplayer-1.3.0-r3.ebuild b/media-video/mplayer/mplayer-1.3.0-r3.ebuild index db84aec79d57..c52e83c38b30 100644 --- a/media-video/mplayer/mplayer-1.3.0-r3.ebuild +++ b/media-video/mplayer/mplayer-1.3.0-r3.ebuild @@ -130,17 +130,13 @@ RDEPEND+=" xvmc? ( x11-libs/libXvMC ) " -X_DEPS=" - x11-proto/videoproto - x11-proto/xf86vidmodeproto -" ASM_DEP="dev-lang/yasm" DEPEND="${RDEPEND} virtual/pkgconfig - dga? ( x11-proto/xf86dgaproto ) - X? ( ${X_DEPS} ) - xinerama? ( x11-proto/xineramaproto ) - xscreensaver? ( x11-proto/scrnsaverproto ) + dga? ( x11-base/xorg-proto ) + X? ( x11-base/xorg-proto ) + xinerama? ( x11-base/xorg-proto ) + xscreensaver? ( x11-base/xorg-proto ) amd64? ( ${ASM_DEP} ) doc? ( dev-libs/libxslt app-text/docbook-xml-dtd diff --git a/media-video/mplayer/mplayer-1.3.0-r5.ebuild b/media-video/mplayer/mplayer-1.3.0-r5.ebuild index 7f4d347dd713..1e14de1f1ea4 100644 --- a/media-video/mplayer/mplayer-1.3.0-r5.ebuild +++ b/media-video/mplayer/mplayer-1.3.0-r5.ebuild @@ -129,17 +129,13 @@ RDEPEND+=" xvmc? ( x11-libs/libXvMC ) " -X_DEPS=" - x11-proto/videoproto - x11-proto/xf86vidmodeproto -" ASM_DEP="dev-lang/yasm" DEPEND="${RDEPEND} virtual/pkgconfig - dga? ( x11-proto/xf86dgaproto ) - X? ( ${X_DEPS} ) - xinerama? ( x11-proto/xineramaproto ) - xscreensaver? ( x11-proto/scrnsaverproto ) + dga? ( x11-base/xorg-proto ) + X? ( x11-base/xorg-proto ) + xinerama? ( x11-base/xorg-proto ) + xscreensaver? ( x11-base/xorg-proto ) amd64? ( ${ASM_DEP} ) doc? ( dev-libs/libxslt app-text/docbook-xml-dtd diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild index 0ca08a83c5c3..252dcec7163c 100644 --- a/media-video/mplayer/mplayer-9999.ebuild +++ b/media-video/mplayer/mplayer-9999.ebuild @@ -129,17 +129,13 @@ RDEPEND+=" xvmc? ( x11-libs/libXvMC ) " -X_DEPS=" - x11-proto/videoproto - x11-proto/xf86vidmodeproto -" ASM_DEP="dev-lang/yasm" DEPEND="${RDEPEND} virtual/pkgconfig - dga? ( x11-proto/xf86dgaproto ) - X? ( ${X_DEPS} ) - xinerama? ( x11-proto/xineramaproto ) - xscreensaver? ( x11-proto/scrnsaverproto ) + dga? ( x11-base/xorg-proto ) + X? ( x11-base/xorg-proto ) + xinerama? ( x11-base/xorg-proto ) + xscreensaver? ( x11-base/xorg-proto ) amd64? ( ${ASM_DEP} ) doc? ( dev-libs/libxslt app-text/docbook-xml-dtd diff --git a/media-video/nvidia-settings/nvidia-settings-340.58-r1.ebuild b/media-video/nvidia-settings/nvidia-settings-340.58-r1.ebuild index 5062a31c59b6..10851bb2c8f2 100644 --- a/media-video/nvidia-settings/nvidia-settings-340.58-r1.ebuild +++ b/media-video/nvidia-settings/nvidia-settings-340.58-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -32,7 +32,7 @@ RDEPEND=" x11-libs/libvdpau" DEPEND="${RDEPEND} virtual/pkgconfig - x11-proto/xproto" + x11-base/xorg-proto" src_compile() { einfo "Building libXNVCtrl..." diff --git a/media-video/nvidia-settings/nvidia-settings-340.58.ebuild b/media-video/nvidia-settings/nvidia-settings-340.58.ebuild index c20dca0ad414..5e890a832b15 100644 --- a/media-video/nvidia-settings/nvidia-settings-340.58.ebuild +++ b/media-video/nvidia-settings/nvidia-settings-340.58.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -32,7 +32,7 @@ RDEPEND=" x11-libs/libvdpau" DEPEND="${RDEPEND} virtual/pkgconfig - x11-proto/xproto" + x11-base/xorg-proto" src_compile() { einfo "Building libXNVCtrl..." diff --git a/media-video/nvidia-settings/nvidia-settings-355.11.ebuild b/media-video/nvidia-settings/nvidia-settings-355.11.ebuild index 373cf95cc307..8225afc77a3e 100644 --- a/media-video/nvidia-settings/nvidia-settings-355.11.ebuild +++ b/media-video/nvidia-settings/nvidia-settings-355.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -34,7 +34,7 @@ RDEPEND="${COMMON_DEPEND} x11-drivers/nvidia-drivers:0/355" DEPEND="${RDEPEND} virtual/pkgconfig - x11-proto/xproto" + x11-base/xorg-proto" src_compile() { einfo "Building libXNVCtrl..." diff --git a/media-video/nvidia-settings/nvidia-settings-358.16.ebuild b/media-video/nvidia-settings/nvidia-settings-358.16.ebuild index c2b74e3d2af7..1ef8e7edc4b8 100644 --- a/media-video/nvidia-settings/nvidia-settings-358.16.ebuild +++ b/media-video/nvidia-settings/nvidia-settings-358.16.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -34,7 +34,7 @@ RDEPEND="${COMMON_DEPEND} x11-drivers/nvidia-drivers:0/358" DEPEND="${RDEPEND} virtual/pkgconfig - x11-proto/xproto" + x11-base/xorg-proto" src_compile() { einfo "Building libXNVCtrl..." diff --git a/media-video/parole/parole-0.8.1.ebuild b/media-video/parole/parole-0.8.1.ebuild index a8dd869c52d7..dda831291c0d 100644 --- a/media-video/parole/parole-0.8.1.ebuild +++ b/media-video/parole/parole-0.8.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -35,7 +35,7 @@ DEPEND="${COMMON_DEPEND} dev-util/intltool sys-devel/gettext virtual/pkgconfig - x11-proto/xproto" + x11-base/xorg-proto" pkg_setup() { XFCONF=( diff --git a/media-video/parole/parole-1.0.0.ebuild b/media-video/parole/parole-1.0.0.ebuild index 377232165ea8..ba3fa0b882ea 100644 --- a/media-video/parole/parole-1.0.0.ebuild +++ b/media-video/parole/parole-1.0.0.ebuild @@ -37,7 +37,7 @@ DEPEND="${COMMON_DEPEND} dev-util/intltool sys-devel/gettext virtual/pkgconfig - x11-proto/xproto" + x11-base/xorg-proto" DOCS=( AUTHORS ChangeLog README THANKS TODO ) diff --git a/media-video/parole/parole-1.0.1.ebuild b/media-video/parole/parole-1.0.1.ebuild index 3fe9a536f39c..c67039828941 100644 --- a/media-video/parole/parole-1.0.1.ebuild +++ b/media-video/parole/parole-1.0.1.ebuild @@ -37,7 +37,7 @@ DEPEND="${COMMON_DEPEND} dev-util/intltool sys-devel/gettext virtual/pkgconfig - x11-proto/xproto" + x11-base/xorg-proto" DOCS=( AUTHORS ChangeLog README THANKS TODO ) diff --git a/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r4.ebuild b/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r4.ebuild index 51d0a0b43c44..fba38e965e18 100644 --- a/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r4.ebuild +++ b/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=2 @@ -26,14 +26,12 @@ RDEPEND="sys-libs/zlib alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit )" DEPEND="${RDEPEND} - x11-proto/xextproto" + x11-base/xorg-proto" src_prepare() { - if has_version ">=x11-proto/xextproto-7.1.1"; then - sed -i \ - -e 's:shmstr.h:shmproto.h:g' \ - src/rmd_{getzpixmap.c,update_image.c} || die - fi + sed -i \ + -e 's:shmstr.h:shmproto.h:g' \ + src/rmd_{getzpixmap.c,update_image.c} || die # fix weird Framerates with new libtheora epatch "${FILESDIR}/${PV}-fix_new_theora.patch" diff --git a/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r5.ebuild b/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r5.ebuild index 8fd17ae7e35f..5247e79de061 100644 --- a/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r5.ebuild +++ b/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r5.ebuild @@ -26,14 +26,12 @@ RDEPEND="sys-libs/zlib alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack )" DEPEND="${RDEPEND} - x11-proto/xextproto" + x11-base/xorg-proto" src_prepare() { - if has_version ">=x11-proto/xextproto-7.1.1"; then - sed -i \ - -e 's:shmstr.h:shmproto.h:g' \ - src/rmd_{getzpixmap.c,update_image.c} || die - fi + sed -i \ + -e 's:shmstr.h:shmproto.h:g' \ + src/rmd_{getzpixmap.c,update_image.c} || die # fix weird Framerates with new libtheora epatch "${FILESDIR}/${PV}-fix_new_theora.patch" diff --git a/media-video/totem/totem-3.24.0.ebuild b/media-video/totem/totem-3.24.0.ebuild index e0494408ed43..127a2007f2e6 100644 --- a/media-video/totem/totem-3.24.0.ebuild +++ b/media-video/totem/totem-3.24.0.ebuild @@ -71,8 +71,7 @@ DEPEND="${COMMON_DEPEND} >=dev-util/intltool-0.50.1 sys-devel/gettext virtual/pkgconfig - x11-proto/xextproto - x11-proto/xproto + x11-base/xorg-proto dev-libs/gobject-introspection-common gnome-base/gnome-common diff --git a/media-video/vlc/vlc-2.2.8-r1.ebuild b/media-video/vlc/vlc-2.2.8-r1.ebuild index 39a113518713..df48927b371c 100644 --- a/media-video/vlc/vlc-2.2.8-r1.ebuild +++ b/media-video/vlc/vlc-2.2.8-r1.ebuild @@ -184,7 +184,7 @@ DEPEND="${RDEPEND} virtual/pkgconfig:* amd64? ( dev-lang/yasm:* ) x86? ( dev-lang/yasm:* ) - xcb? ( x11-proto/xproto:0 ) + xcb? ( x11-base/xorg-proto ) " PATCHES=( diff --git a/media-video/vlc/vlc-3.0.1-r1.ebuild b/media-video/vlc/vlc-3.0.1-r1.ebuild index f4d4543afd5e..1ac9c9a5b143 100644 --- a/media-video/vlc/vlc-3.0.1-r1.ebuild +++ b/media-video/vlc/vlc-3.0.1-r1.ebuild @@ -219,7 +219,7 @@ DEPEND="${RDEPEND} virtual/pkgconfig:* amd64? ( dev-lang/yasm:* ) x86? ( dev-lang/yasm:* ) - X? ( x11-proto/xproto ) + X? ( x11-base/xorg-proto ) " PATCHES=( diff --git a/media-video/vlc/vlc-3.0.2.ebuild b/media-video/vlc/vlc-3.0.2.ebuild index 2c2154219fe5..212e34f012a3 100644 --- a/media-video/vlc/vlc-3.0.2.ebuild +++ b/media-video/vlc/vlc-3.0.2.ebuild @@ -219,7 +219,7 @@ DEPEND="${RDEPEND} virtual/pkgconfig:* amd64? ( dev-lang/yasm:* ) x86? ( dev-lang/yasm:* ) - X? ( x11-proto/xproto ) + X? ( x11-base/xorg-proto ) " PATCHES=( diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild index 2c2154219fe5..212e34f012a3 100644 --- a/media-video/vlc/vlc-3.0.9999.ebuild +++ b/media-video/vlc/vlc-3.0.9999.ebuild @@ -219,7 +219,7 @@ DEPEND="${RDEPEND} virtual/pkgconfig:* amd64? ( dev-lang/yasm:* ) x86? ( dev-lang/yasm:* ) - X? ( x11-proto/xproto ) + X? ( x11-base/xorg-proto ) " PATCHES=( diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index 030488234700..f09e4c9d6e9b 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -220,7 +220,7 @@ DEPEND="${RDEPEND} virtual/pkgconfig:* amd64? ( dev-lang/yasm:* ) x86? ( dev-lang/yasm:* ) - X? ( x11-proto/xproto ) + X? ( x11-base/xorg-proto ) " PATCHES=( diff --git a/media-video/xanim-export/xanim-export-2.80.1-r5.ebuild b/media-video/xanim-export/xanim-export-2.80.1-r5.ebuild index 3b7acf11a3c8..f07331fb724b 100644 --- a/media-video/xanim-export/xanim-export-2.80.1-r5.ebuild +++ b/media-video/xanim-export/xanim-export-2.80.1-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 inherit flag-o-matic eutils toolchain-funcs @@ -68,9 +68,8 @@ RDEPEND="virtual/jpeg media-libs/libquicktime" DEPEND="${RDEPEND} app-arch/ncompress - x11-proto/xextproto - x11-proto/xproto - virtual/pkgconfig" + virtual/pkgconfig + x11-base/xorg-proto" S=${WORKDIR}/${MY_P} diff --git a/media-video/xine-ui/xine-ui-0.99.10.ebuild b/media-video/xine-ui/xine-ui-0.99.10.ebuild index e030de84625a..a01737dad30d 100644 --- a/media-video/xine-ui/xine-ui-0.99.10.ebuild +++ b/media-video/xine-ui/xine-ui-0.99.10.ebuild @@ -39,10 +39,8 @@ RDEPEND="|| ( app-arch/tar app-arch/libarchive ) DEPEND="${RDEPEND} nls? ( >=sys-devel/gettext-0.18.3 ) X? ( + x11-base/xorg-proto x11-libs/libXt - x11-proto/inputproto - x11-proto/xf86vidmodeproto - xinerama? ( x11-proto/xineramaproto ) ) virtual/pkgconfig" diff --git a/media-video/xine-ui/xine-ui-0.99.9.ebuild b/media-video/xine-ui/xine-ui-0.99.9.ebuild index 3bed5b2be508..1740be0f676c 100644 --- a/media-video/xine-ui/xine-ui-0.99.9.ebuild +++ b/media-video/xine-ui/xine-ui-0.99.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -39,10 +39,8 @@ RDEPEND="|| ( app-arch/tar app-arch/libarchive ) DEPEND="${RDEPEND} nls? ( >=sys-devel/gettext-0.18.3 ) X? ( + x11-base/xorg-proto x11-libs/libXt - x11-proto/inputproto - x11-proto/xf86vidmodeproto - xinerama? ( x11-proto/xineramaproto ) ) virtual/pkgconfig" diff --git a/net-im/mcabber/mcabber-1.0.5.ebuild b/net-im/mcabber/mcabber-1.0.5.ebuild index b91ae75262f0..b93fb2ad50f5 100644 --- a/net-im/mcabber/mcabber-1.0.5.ebuild +++ b/net-im/mcabber/mcabber-1.0.5.ebuild @@ -32,6 +32,7 @@ RDEPEND="crypt? ( >=app-crypt/gpgme-1.0.0 ) idn? ( net-dns/libidn ) spell? ( app-text/enchant ) dev-libs/glib:2 + net-libs/libnsl:0= sys-libs/ncurses:0= >=net-libs/loudmouth-1.4.3-r1[ssl?]" DEPEND="${RDEPEND} diff --git a/net-irc/epic5/epic5-1.1.10-r1.ebuild b/net-irc/epic5/epic5-1.1.10-r1.ebuild index 97036b79137d..32634a469338 100644 --- a/net-irc/epic5/epic5-1.1.10-r1.ebuild +++ b/net-irc/epic5/epic5-1.1.10-r1.ebuild @@ -49,7 +49,8 @@ src_prepare() { "${FILESDIR}"/${P}-tcl-automagic-as-needed.patch \ "${FILESDIR}"/${PN}-1.1.2-perl-automagic-as-needed.patch \ "${FILESDIR}"/${P}-without-localdir.patch \ - "${FILESDIR}"/${P}-socks5-libsocks.patch + "${FILESDIR}"/${P}-socks5-libsocks.patch \ + "${FILESDIR}"/${P}-xlocale.patch eautoconf } diff --git a/net-irc/epic5/epic5-1.1.10-r2.ebuild b/net-irc/epic5/epic5-1.1.10-r2.ebuild index 289bab3402a8..b2c668fcd02e 100644 --- a/net-irc/epic5/epic5-1.1.10-r2.ebuild +++ b/net-irc/epic5/epic5-1.1.10-r2.ebuild @@ -31,12 +31,13 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${P} PATCHES=( - "${FILESDIR}"/${PN}-1.1.2-libarchive-automagic.patch \ - "${FILESDIR}"/${P}-ruby-automagic-as-needed.patch \ - "${FILESDIR}"/${P}-tcl-automagic-as-needed.patch \ - "${FILESDIR}"/${PN}-1.1.2-perl-automagic-as-needed.patch \ - "${FILESDIR}"/${P}-without-localdir.patch \ + "${FILESDIR}"/${PN}-1.1.2-libarchive-automagic.patch + "${FILESDIR}"/${P}-ruby-automagic-as-needed.patch + "${FILESDIR}"/${P}-tcl-automagic-as-needed.patch + "${FILESDIR}"/${PN}-1.1.2-perl-automagic-as-needed.patch + "${FILESDIR}"/${P}-without-localdir.patch "${FILESDIR}"/${P}-socks5-libsocks.patch + "${FILESDIR}"/${P}-xlocale.patch ) src_prepare() { diff --git a/net-irc/epic5/files/epic5-1.1.10-xlocale.patch b/net-irc/epic5/files/epic5-1.1.10-xlocale.patch new file mode 100644 index 000000000000..8c5c7e44bfff --- /dev/null +++ b/net-irc/epic5/files/epic5-1.1.10-xlocale.patch @@ -0,0 +1,11 @@ +diff -ruN epic5-1.1.10.orig/source/recode.c epic5-1.1.10/source/recode.c +--- epic5-1.1.10.orig/source/recode.c 2014-04-11 17:12:26.000000000 +0200 ++++ epic5-1.1.10/source/recode.c 2018-04-30 22:55:11.976293375 +0200 +@@ -41,7 +41,6 @@ + #include <langinfo.h> + #include <locale.h> + #include <wctype.h> +-#include <xlocale.h> + + /* + * Here's the plan... diff --git a/www-client/chromium/chromium-66.0.3359.139.ebuild b/www-client/chromium/chromium-66.0.3359.139.ebuild index cf52ce6305d2..87ff23089739 100644 --- a/www-client/chromium/chromium-66.0.3359.139.ebuild +++ b/www-client/chromium/chromium-66.0.3359.139.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P} LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 ~x86" IUSE="component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine" RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )" |