diff --git a/app-accessibility/festival/festival-2.1-r1.ebuild b/app-accessibility/festival/festival-2.1-r1.ebuild index 7c65182c1ed8..8f7fe3763578 100644 --- a/app-accessibility/festival/festival-2.1-r1.ebuild +++ b/app-accessibility/festival/festival-2.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/festival-2.1-r1.ebuild,v 1.7 2015/04/13 09:37:01 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/festival-2.1-r1.ebuild,v 1.8 2015/04/18 15:54:23 pacho Exp $ EAPI="2" inherit eutils multilib toolchain-funcs user @@ -24,7 +24,7 @@ SRC_URI="${SITE}/${MY_P}.tar.gz LICENSE="FESTIVAL HPND BSD rc regexp-UofT free-noncomm" SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~x86-fbsd" IUSE="" DEPEND="~app-accessibility/speech-tools-2.1 diff --git a/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild b/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild index 77fb990a16e4..3db035615acf 100644 --- a/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild +++ b/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild,v 1.9 2015/04/13 09:36:44 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild,v 1.10 2015/04/18 15:54:35 pacho Exp $ EAPI="5" @@ -16,7 +16,7 @@ SRC_URI="http://www.festvox.org/packed/festival/${PV}/${MY_P}-release.tar.gz LICENSE="FESTIVAL HPND BSD rc regexp-UofT" SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~x86-fbsd" IUSE="nas X" RDEPEND=" diff --git a/app-admin/ansible/ansible-1.8.4.ebuild b/app-admin/ansible/ansible-1.8.4.ebuild index ceebd98648b8..636723562f56 100644 --- a/app-admin/ansible/ansible-1.8.4.ebuild +++ b/app-admin/ansible/ansible-1.8.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/ansible/ansible-1.8.4.ebuild,v 1.2 2015/04/08 15:18:14 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/ansible/ansible-1.8.4.ebuild,v 1.3 2015/04/19 09:45:51 ago Exp $ EAPI=5 @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ~x86 ~x64-macos" +KEYWORDS="amd64 x86 ~x64-macos" RDEPEND=" dev-python/jinja[${PYTHON_USEDEP}] diff --git a/app-admin/apachetop/apachetop-0.12.6-r2.ebuild b/app-admin/apachetop/apachetop-0.12.6-r2.ebuild index ba1fccd3ceba..5a61e776ba38 100644 --- a/app-admin/apachetop/apachetop-0.12.6-r2.ebuild +++ b/app-admin/apachetop/apachetop-0.12.6-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/apachetop/apachetop-0.12.6-r2.ebuild,v 1.2 2015/04/01 05:09:45 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/apachetop/apachetop-0.12.6-r2.ebuild,v 1.3 2015/04/18 15:53:51 pacho Exp $ EAPI=5 inherit eutils autotools @@ -11,7 +11,7 @@ SRC_URI="http://www.webta.org/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 hppa ~mips ~ppc ~sparc ~x86" +KEYWORDS="~amd64 hppa ~mips ~ppc ~sparc x86" IUSE="fam pcre" RDEPEND=" diff --git a/app-admin/fleet/Manifest b/app-admin/fleet/Manifest index 6876bcb33ec5..5d7402f7fa29 100644 --- a/app-admin/fleet/Manifest +++ b/app-admin/fleet/Manifest @@ -1,3 +1,3 @@ -DIST fleet-0.9.0.tar.gz 405482 SHA256 3198e19e038a4a4f2f7d2f36aa7ffd3cdf2cfdaed0e7c255b33c465deded90e8 SHA512 cbff807f38cad108112216751fd0aa1ab402062d0cb68245c177fc89d88bb6a43c10d8b6ba577b493f1b16c910f6cf1e209bec96da550a3e44fad5ce004ab1d3 WHIRLPOOL 5b1cafe5bd48a30c3a523d00fbeb311db4ecafe7737564389f4223f5deedbc5e4056f001084e652a1e9c61e5fff25b8cc1e2ee32930b6a514c5ca8f41aefbcca +DIST fleet-0.10.0.tar.gz 427728 SHA256 024b29cb217a81d04a48e6e5017549149fccfe76042a3570e9a3b8206cefcf48 SHA512 e9ffb51ab6be508e8c5f07860f6ef7c2beabed039870cd4926397ff8d28c9dcdb01c6d18fe513bc429ab9bde7eb8a91644b0534b8396d5ad33d1ace8e7dd7ac6 WHIRLPOOL 458830e2fe0c0937665e4e4ec23992801aaa6938e62b08f1486568fe92f70731f4dfeb83a8b13f5161d8819df7a409388db1c1849ceb3f4011179ea86303b3b0 DIST fleet-0.9.1.tar.gz 404954 SHA256 573387652fb5b4d6fad99ec344502edd575550bc649ffb6bf43b38309cd85ce7 SHA512 acc80707a6a0142b731c963474a7b31d43790007a28eb05e05f229bc1fb7775cbd64e0ff8cb469954ec76a0219f7501f4b8b51dce4b772ea5db7b3afb97fe50c WHIRLPOOL 8536f5d92090ac20aa2da26153f1c0769ca3288016b27619921036126dd94611e59a678d5f78847e1df61328e6aa4e89f5a2b001a4ce2ebe7a2a3067b57498e7 DIST fleet-0.9.2.tar.gz 405420 SHA256 7b5c1dd091b304f8e6cbf31a102533a697d4e3212d34eeca53daa69445f71555 SHA512 b7280b1d714162569942db22ba029ff46b28413d81b1c3c9f94876fc7a1e879c58bf4471d813d5121a0a9a0f76d580b9fc146a01af5dc2303bf43536d6d23c7a WHIRLPOOL 9e314a6328ea15b876f083a3b68478b85d1c12d314d210b40e7ac7a1a5950716c27cb82d60a3c950a64107358c97b9ac9b1212bd4d24ece8e8a8f5389359033b diff --git a/app-admin/fleet/fleet-0.9.0.ebuild b/app-admin/fleet/fleet-0.10.0.ebuild similarity index 65% rename from app-admin/fleet/fleet-0.9.0.ebuild rename to app-admin/fleet/fleet-0.10.0.ebuild index 4bc12e9eebd5..d3a0c437226c 100644 --- a/app-admin/fleet/fleet-0.9.0.ebuild +++ b/app-admin/fleet/fleet-0.10.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/fleet/fleet-0.9.0.ebuild,v 1.1 2014/12/07 20:30:55 alunduil Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/fleet/fleet-0.10.0.ebuild,v 1.1 2015/04/17 23:30:18 alunduil Exp $ EAPI=5 @@ -41,10 +41,3 @@ src_install() { insinto /etc/${PN} newins "${PN}".conf.sample "${PN}".conf } - -pkg_postinst() { - ewarn "If you're upgrading from a version less than 0.8.0, please read the messages!" - elog "The fleet binary name changed to fleetd." - elog "If you're using systemd, update your configuration:" - elog " systemctl disable fleet && systemctl enable fleetd" -} diff --git a/app-admin/fleet/fleet-9999.ebuild b/app-admin/fleet/fleet-9999.ebuild index 914b2372a68b..03d99e315992 100644 --- a/app-admin/fleet/fleet-9999.ebuild +++ b/app-admin/fleet/fleet-9999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/fleet/fleet-9999.ebuild,v 1.4 2014/12/07 20:30:55 alunduil Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/fleet/fleet-9999.ebuild,v 1.5 2015/04/17 23:27:25 alunduil Exp $ EAPI=5 @@ -43,10 +43,3 @@ src_install() { insinto /etc/${PN} newins "${PN}".conf.sample "${PN}".conf } - -pkg_postinst() { - ewarn "If you're upgrading from a version less than 0.8.0, please read the messages!" - elog "The fleet binary name changed to fleetd." - elog "If you're using systemd, update your configuration:" - elog " systemctl disable fleet; systemctl enable fleetd" -} diff --git a/app-admin/logrotate/logrotate-3.8.9.ebuild b/app-admin/logrotate/logrotate-3.8.9.ebuild index f85914698fc1..6614134317ce 100644 --- a/app-admin/logrotate/logrotate-3.8.9.ebuild +++ b/app-admin/logrotate/logrotate-3.8.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.8.9.ebuild,v 1.7 2015/04/14 12:13:43 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.8.9.ebuild,v 1.8 2015/04/19 09:36:46 ago Exp $ EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="https://fedorahosted.org/releases/l/o/logrotate/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd" IUSE="acl selinux" CDEPEND=" diff --git a/app-admin/mcollective/mcollective-2.8.0.ebuild b/app-admin/mcollective/mcollective-2.8.0.ebuild index 20cdd2591d8b..cb3897ff358a 100644 --- a/app-admin/mcollective/mcollective-2.8.0.ebuild +++ b/app-admin/mcollective/mcollective-2.8.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/mcollective/mcollective-2.8.0.ebuild,v 1.2 2015/03/27 16:28:18 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/mcollective/mcollective-2.8.0.ebuild,v 1.3 2015/04/19 09:37:04 ago Exp $ EAPI="5" @@ -15,7 +15,7 @@ SRC_URI="http://puppetlabs.com/downloads/mcollective/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="doc +client" DEPEND="" diff --git a/app-admin/r10k/r10k-1.1.3.ebuild b/app-admin/r10k/r10k-1.1.3-r1.ebuild similarity index 82% rename from app-admin/r10k/r10k-1.1.3.ebuild rename to app-admin/r10k/r10k-1.1.3-r1.ebuild index 318403c37035..945f4e869c1d 100644 --- a/app-admin/r10k/r10k-1.1.3.ebuild +++ b/app-admin/r10k/r10k-1.1.3-r1.ebuild @@ -1,14 +1,16 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/r10k/r10k-1.1.3.ebuild,v 1.2 2015/04/13 23:15:21 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/r10k/r10k-1.1.3-r1.ebuild,v 1.1 2015/04/19 18:05:10 graaff Exp $ EAPI=5 -USE_RUBY="ruby19" +USE_RUBY="ruby19 ruby20 ruby21" RUBY_FAKEGEM_RECIPE_TEST="rspec" RUBY_FAKEGEM_TASK_DOC="" +RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" + inherit ruby-fakegem DESCRIPTION="Puppet environment and module deployment" @@ -19,20 +21,20 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="+git" -ruby_add_bdepend "test? ( =dev-ruby/rspec-2.14* )" - ruby_add_rdepend " >=dev-ruby/colored-1.2 - =dev-ruby/cri-2.4* + =dev-ruby/cri-2* >=dev-ruby/systemu-2.5.2 - =dev-ruby/log4r-1.1.10 dev-ruby/json" RDEPEND="${RDEPEND} git? ( >=dev-vcs/git-1.6.6 )" all_ruby_prepare() { - sed -i 's/json_pure/json/' "${WORKDIR}/all/metadata" || die "metadata fix failed" + sed -i -e 's/json_pure/json/' \ + -e '/cri/ s/2.4.0/2.4/' \ + -e '/systemu/ s/2.5.2/2.5/' \ + -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die } pkg_postinst() { diff --git a/app-admin/rsyslog/rsyslog-8.7.0-r2.ebuild b/app-admin/rsyslog/rsyslog-8.7.0-r2.ebuild index df596de7a065..7db692d34945 100644 --- a/app-admin/rsyslog/rsyslog-8.7.0-r2.ebuild +++ b/app-admin/rsyslog/rsyslog-8.7.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-8.7.0-r2.ebuild,v 1.4 2015/03/30 16:33:26 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-8.7.0-r2.ebuild,v 1.5 2015/04/19 09:46:26 pacho Exp $ EAPI=5 AUTOTOOLS_AUTORECONF=1 @@ -33,7 +33,7 @@ else http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz doc? ( http://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz ) " - KEYWORDS="amd64 ~arm hppa ~x86" + KEYWORDS="amd64 ~arm hppa x86" PATCHES+=( "${FILESDIR}"/${BRANCH}/50-rsyslog-run-queue-persist-test-only-once.patch ) PATCHES+=( "${FILESDIR}"/${BRANCH}/50-rsyslog-fix-size-based-legacy-config-statements.patch ) diff --git a/app-admin/salt/metadata.xml b/app-admin/salt/metadata.xml index 04a6efbeb817..021df189a4f5 100644 --- a/app-admin/salt/metadata.xml +++ b/app-admin/salt/metadata.xml @@ -22,7 +22,6 @@ backbone of cloud and data center management. Enable support for salt-api. - Enable support for cherrypy. Enable salt-cloud support via libcloud. Support managing virtual machines with app-emulation/libvirt. Enable support for gnupg via python-gnupg. diff --git a/app-admin/setools/setools-3.3.8-r7.ebuild b/app-admin/setools/setools-3.3.8-r7.ebuild index 50b1f37f767f..7ec89d5fc68a 100644 --- a/app-admin/setools/setools-3.3.8-r7.ebuild +++ b/app-admin/setools/setools-3.3.8-r7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-3.3.8-r7.ebuild,v 1.4 2015/03/16 21:34:05 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-3.3.8-r7.ebuild,v 1.5 2015/04/18 22:02:57 perfinion Exp $ EAPI="5" PYTHON_COMPAT=( python2_7 python3_4 ) @@ -17,40 +17,29 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="X debug java python" -DEPEND=">=sys-devel/automake-1.12.1 - >=sys-libs/libsepol-2.4 +COMMONDEPEND=">=sys-libs/libsepol-2.4 >=sys-libs/libselinux-2.4 - sys-devel/bison - sys-devel/flex - >=dev-db/sqlite-3.2:3 - dev-libs/libxml2:2 - virtual/pkgconfig - java? ( - >=virtual/jdk-1.4 - dev-lang/swig - ) - python? ( - ${PYTHON_DEPS} - dev-lang/swig - ) - X? ( - >=dev-lang/tk-8.4.9 - >=gnome-base/libglade-2.0 - >=x11-libs/gtk+-2.8:2 - )" - -RDEPEND=">=sys-libs/libsepol-2.1.4 - >=sys-libs/libselinux-2.3 >=dev-db/sqlite-3.2:3 dev-libs/libxml2:2 java? ( >=virtual/jre-1.4 ) + python? ( ${PYTHON_DEPS} ) X? ( >=dev-lang/tk-8.4.9 - >=dev-tcltk/bwidget-1.8 >=gnome-base/libglade-2.0 >=x11-libs/gtk+-2.8:2 )" +DEPEND="${COMMONDEPEND} + >=sys-devel/automake-1.12.1 + sys-devel/bison + sys-devel/flex + virtual/pkgconfig + java? ( dev-lang/swig ) + python? ( dev-lang/swig )" + +RDEPEND="${COMMONDEPEND} + X? ( >=dev-tcltk/bwidget-1.8 )" + RESTRICT="test" # setools dirs that contain python code to build PYTHON_DIRS="libapol/swig/python libpoldiff/swig/python libqpol/swig/python libseaudit/swig/python libsefs/swig/python python" diff --git a/app-admin/xstow/Manifest b/app-admin/xstow/Manifest index efb206c49b71..824aa2238976 100644 --- a/app-admin/xstow/Manifest +++ b/app-admin/xstow/Manifest @@ -1,2 +1 @@ -DIST xstow-1.0.0.tar.bz2 153206 SHA256 0109f10fb25a474803ec357a38c17d806dd9a21eac39b21d79b48c2af571c0fe SHA512 1bc4d6d1c5bcc68c07ac9386c964878591e63e452f46ca974460005df385647937d689ce00221d81de54983036660107b36fce174ff4859bb597f32b60b02a6e WHIRLPOOL f5b0490deaf4be76109e81c55ac8f5588648c0bf5310b578211e402ec207617253cabeb7bf86279bb5df462be5d1b4be8df8ea093a73288d0dac9962bc75848c DIST xstow-1.0.1.tar.bz2 153530 SHA256 b25279134689519c15fa5caea3d437c0e8c49d9cfa0c91cc45fb842025b1bf35 SHA512 bb4bb0e9d8fbfe3933c2137cd2258e3246ebfba549aec669a7f324e82af0eea4ab7ca38e68d7102c1417c1566029318749139fa91efd7a904b8f742d426a3d4b WHIRLPOOL 052f3ed2ddf3b6612d898a596aec4547578253aca1e1fa2dc7b3209646c029d59b589ede80ad40586b5c926e6e7826591f98d0137feddfcd4aa5fea66218a23a diff --git a/app-admin/xstow/xstow-1.0.0-r1.ebuild b/app-admin/xstow/xstow-1.0.0-r1.ebuild deleted file mode 100644 index 9d4f735e8273..000000000000 --- a/app-admin/xstow/xstow-1.0.0-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/xstow/xstow-1.0.0-r1.ebuild,v 1.6 2013/05/10 06:11:33 patrick Exp $ - -inherit eutils - -DESCRIPTION="replacement for GNU stow with extensions" -HOMEPAGE="http://xstow.sourceforge.net/" -SRC_URI="mirror://sourceforge/xstow/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="ncurses static" - -DEPEND="ncurses? ( sys-libs/ncurses )" -RDEPEND="${DEPEND}" - -src_compile() { - econf --disable-dependency-tracking\ - $(use_with ncurses curses)\ - $(use_enable static) - emake || die "emake failed." -} - -src_install() { - emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}/html" \ - install || die "emake install failed." - dodoc AUTHORS ChangeLog NEWS README TODO - - # create new STOWDIR - dodir /var/lib/xstow - - # install env.d file to add STOWDIR to PATH and LDPATH - doenvd "${FILESDIR}/99xstow" || die "doenvd failed" -} - -pkg_postinst() { - elog "We now recommend that you use /var/lib/xstow as your STOWDIR" - elog "instead of /usr/local in order to avoid conflicts with the" - elog "symlink from /usr/lib64 -> /usr/lib. See Bug 246264 " - elog "(regarding app-admin/stow, equally applicable to XStow) for" - elog "more details on this change." - elog "For your convenience, PATH has been updated to include" - elog "/var/lib/bin." -} diff --git a/app-admin/xstow/xstow-1.0.1.ebuild b/app-admin/xstow/xstow-1.0.1.ebuild index 4d9e56c5e1f2..746125965b50 100644 --- a/app-admin/xstow/xstow-1.0.1.ebuild +++ b/app-admin/xstow/xstow-1.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/xstow/xstow-1.0.1.ebuild,v 1.6 2015/03/28 21:45:07 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/xstow/xstow-1.0.1.ebuild,v 1.7 2015/04/19 09:37:52 pacho Exp $ EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/xstow/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc ~x86" +KEYWORDS="amd64 ppc x86" IUSE="ncurses" DEPEND="ncurses? ( sys-libs/ncurses )" diff --git a/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-3.7.2.ebuild b/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-3.7.2.ebuild index 6072531520ee..ad1296ec07ee 100644 --- a/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-3.7.2.ebuild +++ b/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-3.7.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-3.7.2.ebuild,v 1.3 2015/04/08 15:17:34 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-3.7.2.ebuild,v 1.4 2015/04/19 09:37:23 ago Exp $ EAPI=5 @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/unofficial-sigs/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" # We need its user/group. diff --git a/app-arch/alien/alien-8.90.ebuild b/app-arch/alien/alien-8.90.ebuild index 00f9a3c98f47..4253f9293099 100644 --- a/app-arch/alien/alien-8.90.ebuild +++ b/app-arch/alien/alien-8.90.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/alien/alien-8.90.ebuild,v 1.5 2015/04/13 08:16:26 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/alien/alien-8.90.ebuild,v 1.6 2015/04/19 09:35:54 pacho Exp $ EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="alpha amd64 hppa ppc ~ppc64 ~x86" +KEYWORDS="alpha amd64 hppa ppc ~ppc64 x86" IUSE="+bzip2" RDEPEND="app-arch/rpm diff --git a/app-backup/bacula/bacula-7.0.5-r1.ebuild b/app-backup/bacula/bacula-7.0.5-r1.ebuild index d127520134de..78856b613064 100644 --- a/app-backup/bacula/bacula-7.0.5-r1.ebuild +++ b/app-backup/bacula/bacula-7.0.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-7.0.5-r1.ebuild,v 1.6 2015/04/17 13:11:51 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-7.0.5-r1.ebuild,v 1.7 2015/04/19 07:03:22 pacho Exp $ EAPI="5" @@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz" LICENSE="AGPL-3" SLOT="0" -KEYWORDS="amd64 ppc sparc ~x86" +KEYWORDS="amd64 ppc sparc x86" IUSE="acl bacula-clientonly bacula-nodir bacula-nosd examples ipv6 logwatch mysql postgres qt4 readline +sqlite3 ssl static tcpd vim-syntax X" DEPEND=" diff --git a/app-backup/duply/duply-1.9.1.ebuild b/app-backup/duply/duply-1.9.1.ebuild index ead7ecee1ba1..6a2eae5e3e1d 100644 --- a/app-backup/duply/duply-1.9.1.ebuild +++ b/app-backup/duply/duply-1.9.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-backup/duply/duply-1.9.1.ebuild,v 1.2 2015/04/08 15:32:29 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-backup/duply/duply-1.9.1.ebuild,v 1.3 2015/04/19 09:46:34 ago Exp $ EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/ftplicity/${PN}_${PV}.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" DEPEND="app-text/txt2man" diff --git a/app-backup/pdumpfs/files/pdumpfs-in.patch b/app-backup/pdumpfs/files/pdumpfs-in.patch new file mode 100644 index 000000000000..cddfb995918a --- /dev/null +++ b/app-backup/pdumpfs/files/pdumpfs-in.patch @@ -0,0 +1,40 @@ +patch by proxy maintainer, P. Healy, April 2015 +# Bug 509960 +--- pdumpfs.in_orig 2004-12-21 02:43:12.000000000 +0000 ++++ pdumpfs.in 2015-04-01 10:58:22.671131947 +0100 +@@ -48,7 +48,7 @@ + # + + require 'find' +-require 'ftools' ++require 'fileutils' + require 'getoptlong' + require 'date' + +@@ -868,7 +868,7 @@ + today = File.join(dest, datedir(start_time), base) + + File.umask(0077) +- File.mkpath(today) unless @dry_run ++ FileUtils.mkpath(today) unless @dry_run + if latest + update_snapshot(src, latest, today) + else +@@ -1018,7 +1018,7 @@ + + case type + when "directory" +- File.mkpath(today) ++ FileUtils.mkpath(today) + when "unchanged" + File.force_link(latest, today) + when "updated" +@@ -1089,7 +1089,7 @@ + + case type + when "directory" +- File.mkpath(t) ++ FileUtils.mkpath(t) + when "new_file" + copy(s, t) + when "symlink" diff --git a/app-backup/pdumpfs/files/pdumpfs-test.patch b/app-backup/pdumpfs/files/pdumpfs-test.patch new file mode 100644 index 000000000000..e81e8b0f2d8a --- /dev/null +++ b/app-backup/pdumpfs/files/pdumpfs-test.patch @@ -0,0 +1,12 @@ +patch by proxy maintainer, P. Healy, April 2015 +# Bug 509960 +--- tests/pdumpfs-test_orig 2004-08-10 07:54:28.000000000 +0100 ++++ tests/pdumpfs-test 2015-04-01 11:24:35.948633870 +0100 +@@ -17,6 +17,7 @@ + + ../pdumpfs src dest > tmp.log || exit 1 + diff -r src dest/$today/src || exit 1 ++mkdir -p dest/$yesterday && rmdir dest/$yesterday + mv dest/$today dest/$yesterday + + echo update > src/foo diff --git a/app-backup/pdumpfs/metadata.xml b/app-backup/pdumpfs/metadata.xml index 857d39d0cf4c..3717738d65d6 100644 --- a/app-backup/pdumpfs/metadata.xml +++ b/app-backup/pdumpfs/metadata.xml @@ -1,9 +1,16 @@ - -maintainer-needed@gentoo.org - + proxy-maintainers + + lmiphay@gmail.com + Paul Healy + Active Maintainer, Assign bugs + + + idella4@gentoo.org + Ian Delaney + pdumpfs is a simple daily backup system similar to Plan9's dumpfs which preserves every daily snapshot. pdumpfs is written in Ruby. You can access diff --git a/app-backup/pdumpfs/pdumpfs-1.3-r1.ebuild b/app-backup/pdumpfs/pdumpfs-1.3-r2.ebuild similarity index 66% rename from app-backup/pdumpfs/pdumpfs-1.3-r1.ebuild rename to app-backup/pdumpfs/pdumpfs-1.3-r2.ebuild index 88bee6939713..15183989e337 100644 --- a/app-backup/pdumpfs/pdumpfs-1.3-r1.ebuild +++ b/app-backup/pdumpfs/pdumpfs-1.3-r2.ebuild @@ -1,6 +1,10 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-backup/pdumpfs/pdumpfs-1.3-r1.ebuild,v 1.7 2010/04/03 04:36:58 matsuu Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-backup/pdumpfs/pdumpfs-1.3-r2.ebuild,v 1.2 2015/04/19 13:14:35 idella4 Exp $ + +EAPI=5 + +inherit eutils DESCRIPTION="a daily backup system similar to Plan9's dumpfs" HOMEPAGE="http://0xcc.net/pdumpfs/" @@ -8,23 +12,29 @@ SRC_URI="http://0xcc.net/pdumpfs/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc sparc x86" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" IUSE="linguas_ja" -DEPEND=">=dev-lang/ruby-1.8.1" +DEPEND=">=dev-lang/ruby-2.0.0_p598" + +src_prepare() { + # Bug #509960 + epatch "${FILESDIR}/${PN}-in.patch" \ + "${FILESDIR}/${PN}-test.patch" +} src_compile() { - emake pdumpfs || die "make pdumpfs failed" + emake pdumpfs } src_test() { # RUBYOPT=-rauto_gem without rubygems installed will cause ruby to fail, bug #158455 and #163473. export RUBYOPT="${GENTOO_RUBYOPT}" - emake check || die "make check failed" + emake check } src_install() { - dobin pdumpfs || die + dobin pdumpfs doman man/man8/pdumpfs.8 dohtml -r doc/* diff --git a/app-backup/rdiff-backup/rdiff-backup-1.3.3-r1.ebuild b/app-backup/rdiff-backup/rdiff-backup-1.3.3-r1.ebuild new file mode 100644 index 000000000000..f10392c032dc --- /dev/null +++ b/app-backup/rdiff-backup/rdiff-backup-1.3.3-r1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-backup/rdiff-backup/rdiff-backup-1.3.3-r1.ebuild,v 1.1 2015/04/18 15:03:00 alunduil Exp $ + +EAPI=5 +PYTHON_COMPAT=( python2_7 ) + +inherit distutils-r1 + +DESCRIPTION="Local/remote mirroring+incremental backup" +HOMEPAGE="http://rdiff-backup.nongnu.org/" +SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +IUSE="examples" + +DEPEND=" + >=net-libs/librsync-0.9.7 +" +RDEPEND=" + dev-python/pyxattr[${PYTHON_USEDEP}] + dev-python/pylibacl[${PYTHON_USEDEP}] +" + +python_install_all() { + use examples && local EXAMPLES=( examples.html ) + + distutils-r1_python_install_all +} diff --git a/app-benchmarks/acovea/acovea-5.1.1-r1.ebuild b/app-benchmarks/acovea/acovea-5.1.1-r1.ebuild index 3e972234a19d..cae74ec709cf 100644 --- a/app-benchmarks/acovea/acovea-5.1.1-r1.ebuild +++ b/app-benchmarks/acovea/acovea-5.1.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/acovea/acovea-5.1.1-r1.ebuild,v 1.3 2015/03/02 09:30:52 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/acovea/acovea-5.1.1-r1.ebuild,v 1.4 2015/04/19 09:40:50 pacho Exp $ EAPI=2 WANT_AUTOMAKE=1.9 @@ -12,7 +12,7 @@ SRC_URI="http://www.coyotegulch.com/distfiles/lib${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc ~x86" +KEYWORDS="amd64 ppc x86" IUSE="static-libs" RDEPEND=">=dev-libs/libcoyotl-3.1.0 diff --git a/app-cdr/cdrkit/cdrkit-1.1.11-r2.ebuild b/app-cdr/cdrkit/cdrkit-1.1.11-r2.ebuild index 84ee935a657f..c9024a9afbf3 100644 --- a/app-cdr/cdrkit/cdrkit-1.1.11-r2.ebuild +++ b/app-cdr/cdrkit/cdrkit-1.1.11-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrkit/cdrkit-1.1.11-r2.ebuild,v 1.8 2014/08/13 09:16:43 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrkit/cdrkit-1.1.11-r2.ebuild,v 1.9 2015/04/18 20:38:52 pacho Exp $ EAPI=5 inherit cmake-utils eutils @@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}.orig.tar.gz LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 sparc x86 ~x86-fbsd ~arm-linux ~x86-linux" +KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~arm-linux ~x86-linux" IUSE="debug hfs unicode" RDEPEND="app-arch/bzip2 diff --git a/app-crypt/gcr/gcr-3.14.0.ebuild b/app-crypt/gcr/gcr-3.14.0.ebuild index a4ce0482f00c..d38933857926 100644 --- a/app-crypt/gcr/gcr-3.14.0.ebuild +++ b/app-crypt/gcr/gcr-3.14.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/gcr/gcr-3.14.0.ebuild,v 1.8 2015/04/05 12:44:40 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/gcr/gcr-3.14.0.ebuild,v 1.9 2015/04/18 08:24:38 leio Exp $ EAPI="5" GCONF_DEBUG="no" @@ -21,7 +21,7 @@ KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-f COMMON_DEPEND=" >=app-crypt/gnupg-2 >=app-crypt/p11-kit-0.19 - >=dev-libs/glib-2.34:2 + >=dev-libs/glib-2.38:2 >=dev-libs/libgcrypt-1.2.2:0= >=dev-libs/libtasn1-1:= >=sys-apps/dbus-1 diff --git a/app-crypt/pesign/Manifest b/app-crypt/pesign/Manifest index 828551598b97..4d114926bda6 100644 --- a/app-crypt/pesign/Manifest +++ b/app-crypt/pesign/Manifest @@ -1 +1 @@ -DIST 0.108.tar.gz 96838 SHA256 2019882be0286df1c58efa8c588332106b89418a6bd0fce3de8da4ca16636986 SHA512 f72fb9c3e843341300b68e06bb153690734f6e506cdd9f0d9362c760ff48194ed1ed29e0b58a5050e7331069ad47a9902cc9e34bf616667baf84208f2b69a918 WHIRLPOOL 0af005d0b6dbdff23787c009153cae07c6907d111f57831611e85c49656e29e150ffd71683f349880cfb8975547ea3a3e655cdce31b047b355ecf097e7c7ba77 +DIST pesign-0.108.tar.gz 96838 SHA256 2019882be0286df1c58efa8c588332106b89418a6bd0fce3de8da4ca16636986 SHA512 f72fb9c3e843341300b68e06bb153690734f6e506cdd9f0d9362c760ff48194ed1ed29e0b58a5050e7331069ad47a9902cc9e34bf616667baf84208f2b69a918 WHIRLPOOL 0af005d0b6dbdff23787c009153cae07c6907d111f57831611e85c49656e29e150ffd71683f349880cfb8975547ea3a3e655cdce31b047b355ecf097e7c7ba77 diff --git a/app-crypt/pesign/pesign-0.108.ebuild b/app-crypt/pesign/pesign-0.108.ebuild index 361e8ff369d1..d8f1bdee3061 100644 --- a/app-crypt/pesign/pesign-0.108.ebuild +++ b/app-crypt/pesign/pesign-0.108.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/pesign/pesign-0.108.ebuild,v 1.3 2014/05/13 02:22:31 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/pesign/pesign-0.108.ebuild,v 1.4 2015/04/18 12:18:22 swegener Exp $ EAPI="4" inherit eutils multilib DESCRIPTION="Tools for manipulating signed PE-COFF binaries" HOMEPAGE="https://github.com/vathpela/pesign" -SRC_URI="https://github.com/vathpela/${PN}/archive/${PV}.tar.gz" +SRC_URI="https://github.com/vathpela/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" diff --git a/app-editors/mg/mg-20141127.ebuild b/app-editors/mg/mg-20141127.ebuild index 87112c30bda9..1d1491750239 100644 --- a/app-editors/mg/mg-20141127.ebuild +++ b/app-editors/mg/mg-20141127.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/mg/mg-20141127.ebuild,v 1.7 2015/04/13 09:40:50 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/mg/mg-20141127.ebuild,v 1.8 2015/04/19 09:44:04 pacho Exp $ EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="http://homepage.boetes.org/software/mg/${P}.tar.gz" LICENSE="public-domain" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="alpha amd64 arm hppa ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd" IUSE="livecd" RDEPEND="sys-libs/ncurses diff --git a/app-editors/retext/retext-4.1.3.ebuild b/app-editors/retext/retext-4.1.3.ebuild index c7758ef0adf6..d2b101598aa9 100644 --- a/app-editors/retext/retext-4.1.3.ebuild +++ b/app-editors/retext/retext-4.1.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/retext/retext-4.1.3.ebuild,v 1.3 2015/01/31 13:16:48 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/retext/retext-4.1.3.ebuild,v 1.4 2015/04/19 06:56:33 pacho Exp $ EAPI=5 @@ -19,7 +19,7 @@ if [[ ${PV} == *9999* ]] ; then KEYWORDS="" else SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" - KEYWORDS="amd64 ~x86" + KEYWORDS="amd64 x86" fi DESCRIPTION="A Qt-based text editor for Markdown and reStructuredText" diff --git a/app-editors/vim-qt/vim-qt-20150102.ebuild b/app-editors/vim-qt/vim-qt-20150102.ebuild index 40935139f25e..3ef357a76f0c 100644 --- a/app-editors/vim-qt/vim-qt-20150102.ebuild +++ b/app-editors/vim-qt/vim-qt-20150102.ebuild @@ -1,10 +1,11 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-qt/vim-qt-20150102.ebuild,v 1.2 2015/03/31 17:34:46 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-qt/vim-qt-20150102.ebuild,v 1.3 2015/04/17 23:23:53 pesa Exp $ EAPI=5 PYTHON_COMPAT=( python{2_7,3_3,3_4} ) PYTHON_REQ_USE="threads" + inherit eutils fdo-mime flag-o-matic prefix python-single-r1 DESCRIPTION="Qt GUI version of the Vim text editor" @@ -15,13 +16,12 @@ if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI=( "https://bitbucket.org/equalsraf/${PN}.git" "https://github.com/equalsraf/${PN}.git" - "git://gitorious.org/${PN}/${PN}.git" ) KEYWORDS="" else SRC_URI="https://github.com/equalsraf/${PN}/archive/package-${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/${PN}-package-${PV}" + S=${WORKDIR}/${PN}-package-${PV} fi LICENSE="vim" @@ -31,11 +31,12 @@ IUSE="acl cscope debug lua luajit nls perl python racket ruby" REQUIRED_USE="luajit? ( lua ) python? ( ${PYTHON_REQUIRED_USE} )" -RDEPEND=">=app-eselect/eselect-vi-1.1.8 +RDEPEND=" >=app-editors/vim-core-7.4.560[acl?] - sys-libs/ncurses + >=app-eselect/eselect-vi-1.1.8 >=dev-qt/qtcore-4.7.0:4 >=dev-qt/qtgui-4.7.0:4 + sys-libs/ncurses acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) lua? ( luajit? ( dev-lang/luajit ) diff --git a/app-emacs/apel/apel-10.8-r1.ebuild b/app-emacs/apel/apel-10.8-r1.ebuild index 364dbec29f98..e1177e8f6c39 100644 --- a/app-emacs/apel/apel-10.8-r1.ebuild +++ b/app-emacs/apel/apel-10.8-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emacs/apel/apel-10.8-r1.ebuild,v 1.12 2015/03/02 09:34:47 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emacs/apel/apel-10.8-r1.ebuild,v 1.13 2015/04/18 20:39:18 pacho Exp $ EAPI=4 @@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.jpl.org/pub/elisp/apel/${P}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" +KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" IUSE="" ELISP_PATCHES="${PN}-10.8-020_Prevent-fontset-error.patch diff --git a/app-emacs/apel/apel-10.8.ebuild b/app-emacs/apel/apel-10.8.ebuild deleted file mode 100644 index dd9d58ba1cbd..000000000000 --- a/app-emacs/apel/apel-10.8.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emacs/apel/apel-10.8.ebuild,v 1.9 2014/08/10 17:43:22 slyfox Exp $ - -EAPI=3 - -inherit elisp - -DESCRIPTION="A Portable Emacs Library is a library for making portable Emacs Lisp programs" -HOMEPAGE="http://cvs.m17n.org/elisp/APEL/" -SRC_URI="ftp://ftp.jpl.org/pub/elisp/apel/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" -IUSE="" - -src_prepare() { - cat <<-EOF >> APEL-CFG - (setq APEL_PREFIX "apel") - (setq EMU_PREFIX "apel") - EOF -} - -src_compile() { - emake PREFIX="${ED}/usr" \ - LISPDIR="${ED}/${SITELISP}" \ - VERSION_SPECIFIC_LISPDIR="${ED}/${SITELISP}" || die -} - -src_install() { - einstall PREFIX="${ED}/usr" \ - LISPDIR="${ED}/${SITELISP}" \ - VERSION_SPECIFIC_LISPDIR="${ED}/${SITELISP}" || die - - elisp-site-file-install "${FILESDIR}/50apel-gentoo.el" - - dodoc ChangeLog README* -} - -pkg_postinst() { - elisp-site-regen - - elog "See the README.en file in /usr/share/doc/${PF} for tips" - elog "on how to customize this package." - elog "And you need to rebuild packages depending on ${PN}." -} diff --git a/app-emacs/d-mode/files/d-mode-2.0.6-emacs-24.4.patch b/app-emacs/d-mode/files/d-mode-2.0.6-emacs-24.4.patch index c40605b87a99..e8fc3500b48e 100644 --- a/app-emacs/d-mode/files/d-mode-2.0.6-emacs-24.4.patch +++ b/app-emacs/d-mode/files/d-mode-2.0.6-emacs-24.4.patch @@ -1,15 +1,13 @@ https://bugs.gentoo.org/536490 +https://bugs.gentoo.org/547026 --- Emacs-D-Mode-2.0.6-orig/d-mode.el +++ Emacs-D-Mode-2.0.6/d-mode.el -@@ -66,6 +66,10 @@ +@@ -66,6 +66,7 @@ ;; necessary to get them compiled.) ;; Coment out 'when-compile part for debugging (eval-when-compile -+ (and (= emacs-major-version 24) -+ (= emacs-minor-version 4) -+ (null emacs-repository-version) -+ (require 'cl)) ++ (require 'cl) (require 'cc-langs) (require 'cc-fonts) ) diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest index 19563bbd01d8..e26eb5817395 100644 --- a/app-emulation/docker-compose/Manifest +++ b/app-emulation/docker-compose/Manifest @@ -1,3 +1,3 @@ -DIST docker-compose-1.1.0_rc2.tar.gz 46737 SHA256 7da03a3456a2628ba727d74b207fb62941d3395d1007bf2c230e81ac792e56ac SHA512 8ae4780479fa030328623cf04fdce122801b1957017899b70c93bb74a3ad11b4a8a70c2cb3f0b0f0db0c8c47e56a736fd6b892cfd8a8561c252235d7c2ac5797 WHIRLPOOL 62207db65d28710c2820f4f3b2390c42d7dba187cd210e93a5f8be5a01305000bf6739abb40439fd649c2f823cc39812da110e99f0461b2b3e1d5d565a71c187 +DIST docker-compose-1.2.0.tar.gz 57150 SHA256 46ef3c5cb7dd79fa7fd1d5fc5ec5be6a5c634192bc09c604c0ea75adb89cb652 SHA512 d13f6d6d22979dbc4554c003e611097627e2273f06dd13a1c666c1ba138288597ebef08f1beaf6d342721391cb49ad5ce9ae2ff03367a041fc0c53fbb62c9ac4 WHIRLPOOL c7bb3e14a4c2788eb49241ce02dcaed5e49fe60652ca1a51d13e1712f946046415f5397d5bf892b5e0451059a4aee1b156ee7bdfdf64a22d000caae7b17254c0 DIST docker-compose-1.2.0_rc3.tar.gz 57366 SHA256 1d95191aebc31fd25b770217688407628390b5e5f09b1fd1a4e01ee0dc5fedeb SHA512 8a240648ecdb0bcb6e21ab5d217f8b7ad788732aa1648f8b6ce62db398562970fe4902e3ec9eeb528d9366195ab2d33d908b77c7d03f97322fe14a821b50d8f2 WHIRLPOOL 0776a5f1fd3fd157757910686e34b348991c17cfa0128118d09648dc42e79c97481a2e2be927ff3edebb76d0a6e66706eb9124aba840ba679d67705625c8a5f6 DIST docker-compose-1.2.0_rc4.tar.gz 57629 SHA256 f164816b1c0349e602dfc251fc6ec674e7218a90979e5c8a7d38bf7eb061fc40 SHA512 1ae1ce6ab67615a5ca274507cdf3a782c98d379c7aa4de76917d2a1df00990dcb4210d14364a3bdb7744a56a8ac38127b41f4d91766d5c7de4f3eaefc7fb2558 WHIRLPOOL b5456e4d488054d4dec71cd2c1a720546f6bab58126ba598d3858cba666d86e42c0657431ec41fecca9b2c810a6e37ca1eeb6f5fbfc4ecdddd6ff55c491c1ced diff --git a/app-emulation/docker-compose/docker-compose-1.1.0_rc2.ebuild b/app-emulation/docker-compose/docker-compose-1.2.0.ebuild similarity index 70% rename from app-emulation/docker-compose/docker-compose-1.1.0_rc2.ebuild rename to app-emulation/docker-compose/docker-compose-1.2.0.ebuild index c6362358586a..ab8e82e06b82 100644 --- a/app-emulation/docker-compose/docker-compose-1.1.0_rc2.ebuild +++ b/app-emulation/docker-compose/docker-compose-1.2.0.ebuild @@ -1,17 +1,15 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker-compose/docker-compose-1.1.0_rc2.ebuild,v 1.1 2015/01/31 16:49:42 alunduil Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker-compose/docker-compose-1.2.0.ebuild,v 1.1 2015/04/18 00:56:00 alunduil Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) -inherit distutils-r1 vcs-snapshot - -MY_PV="${PV//_/-}" +inherit bash-completion-r1 distutils-r1 DESCRIPTION="Multi-container orchestration for Docker" HOMEPAGE="https://www.docker.com/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" @@ -19,16 +17,17 @@ KEYWORDS="~amd64" IUSE="test" CDEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] >=dev-python/dockerpty-0.3.2[${PYTHON_USEDEP}] =dev-python/docker-py-0.6.0[${PYTHON_USEDEP}] - =dev-python/docker-py-1.0.0[${PYTHON_USEDEP}] + =dev-python/docopt-0.6.1[${PYTHON_USEDEP}] =dev-python/pyyaml-3.10[${PYTHON_USEDEP}] =dev-python/requests-2.2.1[${PYTHON_USEDEP}] - =dev-python/six-1.3.0[${PYTHON_USEDEP}] =dev-python/texttable-0.8.1[${PYTHON_USEDEP}] @@ -37,7 +36,6 @@ CDEPEND=" -Date: Thu, 24 Feb 2011 13:11:53 +0100 -Subject: [PATCH] msxml3: Include the system libxml headers before the Windows - headers. - -[Alexandre Rostovtsev : backport to wine-1.2.3] ---- - dlls/msxml3/attribute.c | 6 ++++++ - dlls/msxml3/bsc.c | 6 ++++++ - dlls/msxml3/cdata.c | 5 +++++ - dlls/msxml3/comment.c | 5 +++++ - dlls/msxml3/dispex.c | 5 +++++ - dlls/msxml3/docfrag.c | 5 +++++ - dlls/msxml3/domdoc.c | 11 +++++++++-- - dlls/msxml3/domimpl.c | 5 +++++ - dlls/msxml3/element.c | 5 +++++ - dlls/msxml3/entityref.c | 5 +++++ - dlls/msxml3/factory.c | 5 +++++ - dlls/msxml3/httprequest.c | 6 ++++++ - dlls/msxml3/main.c | 15 +++++++++++++++ - dlls/msxml3/msxml_private.h | 23 ----------------------- - dlls/msxml3/node.c | 31 +++++++++++++++++++++++++++---- - dlls/msxml3/nodelist.c | 5 +++++ - dlls/msxml3/nodemap.c | 5 +++++ - dlls/msxml3/parseerror.c | 5 +++++ - dlls/msxml3/pi.c | 5 +++++ - dlls/msxml3/queryresult.c | 9 +++++++-- - dlls/msxml3/regsvr.c | 4 ++++ - dlls/msxml3/saxreader.c | 10 +++++++--- - dlls/msxml3/schema.c | 12 ++++++++++++ - dlls/msxml3/text.c | 5 +++++ - dlls/msxml3/xmldoc.c | 5 +++++ - dlls/msxml3/xmlelem.c | 5 +++++ - 26 files changed, 174 insertions(+), 34 deletions(-) - -diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c -index d78fa47..3df93d6 100644 ---- a/dlls/msxml3/attribute.c -+++ b/dlls/msxml3/attribute.c -@@ -23,6 +23,12 @@ - #include "config.h" - - #include -+#ifdef HAVE_LIBXML2 -+# include -+# include -+# include -+#endif -+ - #include "windef.h" - #include "winbase.h" - #include "winuser.h" -diff --git a/dlls/msxml3/bsc.c b/dlls/msxml3/bsc.c -index b24e04c..01a09a5 100644 ---- a/dlls/msxml3/bsc.c -+++ b/dlls/msxml3/bsc.c -@@ -23,6 +23,12 @@ - - #include - #include -+#ifdef HAVE_LIBXML2 -+# include -+# include -+# include -+#endif -+ - #include "windef.h" - #include "winbase.h" - #include "winuser.h" -diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c -index 3fba66c..caf8cd8 100644 ---- a/dlls/msxml3/cdata.c -+++ b/dlls/msxml3/cdata.c -@@ -23,6 +23,11 @@ - #include "config.h" - - #include -+#ifdef HAVE_LIBXML2 -+# include -+# include -+#endif -+ - #include "windef.h" - #include "winbase.h" - #include "winuser.h" -diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c -index e74de07..1cabfa3 100644 ---- a/dlls/msxml3/comment.c -+++ b/dlls/msxml3/comment.c -@@ -23,6 +23,11 @@ - #include "config.h" - - #include -+#ifdef HAVE_LIBXML2 -+# include -+# include -+#endif -+ - #include "windef.h" - #include "winbase.h" - #include "winuser.h" -diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c -index 09b71fe..6b01b15 100644 ---- a/dlls/msxml3/dispex.c -+++ b/dlls/msxml3/dispex.c -@@ -22,6 +22,11 @@ - - #include - #include -+#ifdef HAVE_LIBXML2 -+# include -+# include -+#endif -+ - #include "windef.h" - #include "winbase.h" - #include "winuser.h" -diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c -index fff3f62..bebd252 100644 ---- a/dlls/msxml3/docfrag.c -+++ b/dlls/msxml3/docfrag.c -@@ -23,6 +23,11 @@ - #include "config.h" - - #include -+#ifdef HAVE_LIBXML2 -+# include -+# include -+#endif -+ - #include "windef.h" - #include "winbase.h" - #include "winuser.h" -diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c -index 0007503..e6a61e4 100644 ---- a/dlls/msxml3/domdoc.c -+++ b/dlls/msxml3/domdoc.c -@@ -25,6 +25,15 @@ - - #include - #include -+#ifdef HAVE_LIBXML2 -+# include -+# include -+# include -+# include -+# include -+# include -+#endif -+ - #include "windef.h" - #include "winbase.h" - #include "winuser.h" -@@ -47,8 +56,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); - - #ifdef HAVE_LIBXML2 - --#include -- - /* not defined in older versions */ - #define XML_SAVE_FORMAT 1 - #define XML_SAVE_NO_DECL 2 -diff --git a/dlls/msxml3/domimpl.c b/dlls/msxml3/domimpl.c -index dd518a1..c6794ac 100644 ---- a/dlls/msxml3/domimpl.c -+++ b/dlls/msxml3/domimpl.c -@@ -23,6 +23,11 @@ - #include "config.h" - - #include -+#ifdef HAVE_LIBXML2 -+# include -+# include -+#endif -+ - #include "windef.h" - #include "winbase.h" - #include "winuser.h" -diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c -index 617c008..1b5c693 100644 ---- a/dlls/msxml3/element.c -+++ b/dlls/msxml3/element.c -@@ -23,6 +23,11 @@ - #include "config.h" - - #include -+#ifdef HAVE_LIBXML2 -+# include -+# include -+#endif -+ - #include "windef.h" - #include "winbase.h" - #include "winuser.h" -diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c -index db46193..1baea6e 100644 ---- a/dlls/msxml3/entityref.c -+++ b/dlls/msxml3/entityref.c -@@ -23,6 +23,11 @@ - #include "config.h" - - #include -+#ifdef HAVE_LIBXML2 -+# include -+# include -+#endif -+ - #include "windef.h" - #include "winbase.h" - #include "winuser.h" -diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c -index 3fd229c..45df9f0 100644 ---- a/dlls/msxml3/factory.c -+++ b/dlls/msxml3/factory.c -@@ -24,6 +24,11 @@ - #include "config.h" - - #include -+#ifdef HAVE_LIBXML2 -+# include -+# include -+#endif -+ - #include "windef.h" - #include "winbase.h" - #include "winuser.h" -diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c -index 4585484..be1a5f7 100644 ---- a/dlls/msxml3/httprequest.c -+++ b/dlls/msxml3/httprequest.c -@@ -22,6 +22,12 @@ - #include "config.h" - - #include -+#ifdef HAVE_LIBXML2 -+# include -+# include -+# include -+#endif -+ - #include "windef.h" - #include "winbase.h" - #include "winuser.h" -diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c -index 60b0cbd..47a89b1 100644 ---- a/dlls/msxml3/main.c -+++ b/dlls/msxml3/main.c -@@ -25,6 +25,21 @@ - #define COBJMACROS - - #include -+#ifdef HAVE_LIBXML2 -+# include -+# include -+# ifdef SONAME_LIBXSLT -+# ifdef HAVE_LIBXSLT_PATTERN_H -+# include -+# endif -+# ifdef HAVE_LIBXSLT_TRANSFORM_H -+# include -+# endif -+# include -+# include -+# endif -+#endif -+ - #include "windef.h" - #include "winbase.h" - #include "winuser.h" -diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h -index e0279f1..e1fbb59 100644 ---- a/dlls/msxml3/msxml_private.h -+++ b/dlls/msxml3/msxml_private.h -@@ -102,10 +102,6 @@ BOOL dispex_query_interface(DispatchEx*,REFIID,void**); - - #ifdef HAVE_LIBXML2 - --#ifdef HAVE_LIBXML_PARSER_H --#include --#endif -- - /* constructors */ - extern IUnknown *create_domdoc( xmlNodePtr document ); - extern IUnknown *create_xmldoc( void ); -@@ -184,25 +180,6 @@ static inline BSTR bstr_from_xmlChar(const xmlChar *str) - - #endif - --void* libxslt_handle; --#ifdef SONAME_LIBXSLT --# ifdef HAVE_LIBXSLT_PATTERN_H --# include --# endif --# ifdef HAVE_LIBXSLT_TRANSFORM_H --# include --# endif --# include --# include -- --# define MAKE_FUNCPTR(f) extern typeof(f) * p##f --MAKE_FUNCPTR(xsltApplyStylesheet); --MAKE_FUNCPTR(xsltCleanupGlobals); --MAKE_FUNCPTR(xsltFreeStylesheet); --MAKE_FUNCPTR(xsltParseStylesheetDoc); --# undef MAKE_FUNCPTR --#endif -- - extern IXMLDOMParseError *create_parseError( LONG code, BSTR url, BSTR reason, BSTR srcText, - LONG line, LONG linepos, LONG filepos ); - extern HRESULT DOMDocument_create( IUnknown *pUnkOuter, LPVOID *ppObj ); -diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c -index bbdcb5d..2980566 100644 ---- a/dlls/msxml3/node.c -+++ b/dlls/msxml3/node.c -@@ -24,6 +24,23 @@ - - #include - #include -+ -+#ifdef HAVE_LIBXML2 -+# include -+# include -+# include -+# ifdef SONAME_LIBXSLT -+# ifdef HAVE_LIBXSLT_PATTERN_H -+# include -+# endif -+# ifdef HAVE_LIBXSLT_TRANSFORM_H -+# include -+# endif -+# include -+# include -+# endif -+#endif -+ - #include "windef.h" - #include "winbase.h" - #include "winuser.h" -@@ -33,16 +50,22 @@ - - #include "msxml_private.h" - --#ifdef HAVE_LIBXML2 --# include --#endif -- - #include "wine/debug.h" - - WINE_DEFAULT_DEBUG_CHANNEL(msxml); - - #ifdef HAVE_LIBXML2 - -+#ifdef SONAME_LIBXSLT -+extern void* libxslt_handle; -+# define MAKE_FUNCPTR(f) extern typeof(f) * p##f -+MAKE_FUNCPTR(xsltApplyStylesheet); -+MAKE_FUNCPTR(xsltCleanupGlobals); -+MAKE_FUNCPTR(xsltFreeStylesheet); -+MAKE_FUNCPTR(xsltParseStylesheetDoc); -+# undef MAKE_FUNCPTR -+#endif -+ - static const WCHAR szBinBase64[] = {'b','i','n','.','b','a','s','e','6','4',0}; - static const WCHAR szString[] = {'s','t','r','i','n','g',0}; - static const WCHAR szNumber[] = {'n','u','m','b','e','r',0}; -diff --git a/dlls/msxml3/nodelist.c b/dlls/msxml3/nodelist.c -index f643c5e..4b2bba9 100644 ---- a/dlls/msxml3/nodelist.c -+++ b/dlls/msxml3/nodelist.c -@@ -23,6 +23,11 @@ - #include "config.h" - - #include -+#ifdef HAVE_LIBXML2 -+# include -+# include -+#endif -+ - #include "windef.h" - #include "winbase.h" - #include "winuser.h" -diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c -index 7d23ec8..d3d9c38 100644 ---- a/dlls/msxml3/nodemap.c -+++ b/dlls/msxml3/nodemap.c -@@ -23,6 +23,11 @@ - #define COBJMACROS - - #include -+#ifdef HAVE_LIBXML2 -+# include -+# include -+#endif -+ - #include "windef.h" - #include "winbase.h" - #include "winuser.h" -diff --git a/dlls/msxml3/parseerror.c b/dlls/msxml3/parseerror.c -index 4b0dc57..89f14ca 100644 ---- a/dlls/msxml3/parseerror.c -+++ b/dlls/msxml3/parseerror.c -@@ -25,6 +25,11 @@ - - #include - #include -+#ifdef HAVE_LIBXML2 -+# include -+# include -+#endif -+ - #include "windef.h" - #include "winbase.h" - #include "winerror.h" -diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c -index 0baefe4..3ebc1bf 100644 ---- a/dlls/msxml3/pi.c -+++ b/dlls/msxml3/pi.c -@@ -23,6 +23,11 @@ - #include "config.h" - - #include -+#ifdef HAVE_LIBXML2 -+# include -+# include -+#endif -+ - #include "windef.h" - #include "winbase.h" - #include "winuser.h" -diff --git a/dlls/msxml3/queryresult.c b/dlls/msxml3/queryresult.c -index 2c6f23e..8613b20 100644 ---- a/dlls/msxml3/queryresult.c -+++ b/dlls/msxml3/queryresult.c -@@ -24,6 +24,13 @@ - #include "config.h" - - #include -+#ifdef HAVE_LIBXML2 -+# include -+# include -+# include -+# include -+#endif -+ - #include "windef.h" - #include "winbase.h" - #include "winuser.h" -@@ -48,8 +55,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); - - #ifdef HAVE_LIBXML2 - --#include -- - typedef struct _queryresult - { - DispatchEx dispex; -diff --git a/dlls/msxml3/regsvr.c b/dlls/msxml3/regsvr.c -index 415e5af..864d61e 100644 ---- a/dlls/msxml3/regsvr.c -+++ b/dlls/msxml3/regsvr.c -@@ -24,6 +24,10 @@ - - #include - #include -+#ifdef HAVE_LIBXML2 -+# include -+# include -+#endif - - #define COBJMACROS - -diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c -index eca9f1d..f2d340e 100644 ---- a/dlls/msxml3/saxreader.c -+++ b/dlls/msxml3/saxreader.c -@@ -24,6 +24,13 @@ - - #include - #include -+#ifdef HAVE_LIBXML2 -+# include -+# include -+# include -+# include -+#endif -+ - #include "windef.h" - #include "winbase.h" - #include "winuser.h" -@@ -43,9 +50,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); - - #ifdef HAVE_LIBXML2 - --#include --#include -- - typedef struct _saxreader - { - const struct IVBSAXXMLReaderVtbl *lpVBSAXXMLReaderVtbl; -diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c -index 72d7854..c1465c0 100644 ---- a/dlls/msxml3/schema.c -+++ b/dlls/msxml3/schema.c -@@ -23,6 +23,18 @@ - #include "config.h" - - #include -+#ifdef HAVE_LIBXML2 -+# include -+# include -+# include -+# include -+# include -+# include -+# include -+# include -+# include -+#endif -+ - #include "windef.h" - #include "winbase.h" - #include "winuser.h" -diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c -index fdcb06b..72b2ffd 100644 ---- a/dlls/msxml3/text.c -+++ b/dlls/msxml3/text.c -@@ -24,6 +24,11 @@ - #include "config.h" - - #include -+#ifdef HAVE_LIBXML2 -+# include -+# include -+#endif -+ - #include "windef.h" - #include "winbase.h" - #include "winuser.h" -diff --git a/dlls/msxml3/xmldoc.c b/dlls/msxml3/xmldoc.c -index d1a010f..0d1006e 100644 ---- a/dlls/msxml3/xmldoc.c -+++ b/dlls/msxml3/xmldoc.c -@@ -23,6 +23,11 @@ - #include "config.h" - - #include -+#ifdef HAVE_LIBXML2 -+# include -+# include -+#endif -+ - #include "windef.h" - #include "winbase.h" - #include "winuser.h" -diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c -index a71b18b..a818d14 100644 ---- a/dlls/msxml3/xmlelem.c -+++ b/dlls/msxml3/xmlelem.c -@@ -23,6 +23,11 @@ - #include "config.h" - - #include -+#ifdef HAVE_LIBXML2 -+# include -+# include -+#endif -+ - #include "windef.h" - #include "winbase.h" - #include "winuser.h" --- -1.7.8.3 - diff --git a/app-emulation/wine/files/wine-1.5.23-winebuild-CCAS.patch b/app-emulation/wine/files/wine-1.5.23-winebuild-CCAS.patch deleted file mode 100644 index 3971ddd362c9..000000000000 --- a/app-emulation/wine/files/wine-1.5.23-winebuild-CCAS.patch +++ /dev/null @@ -1,214 +0,0 @@ -From 57c57e9dfae50f045503ae9f3107fa3748512483 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Sun, 3 Feb 2013 19:19:36 -0500 -Subject: [PATCH] winebuild: Use $CCAS to assemble if found - -Commit c14bdaf1 made winebuild use Clang to assemble if found. - -However, just because a user has some version of Clang installed, it -does not mean that she wants to use Clang to assemble Wine. For example, -a user who has both Clang and GAS installed may want to use GAS to avoid -textrels (see https://bugs.gentoo.org/show_bug.cgi?id=455308). - -This patch allows the user to override which assembler gets used by -exporting CCAS at Wine configure time; the name CCAS was chosen for -compatibility with automake's standard AM_PROG_AS macro. ---- - configure | 106 ++++++++++++++++++++++++++++++++++++++++++++ - configure.ac | 4 ++ - tools/winebuild/Makefile.in | 5 ++- - tools/winebuild/utils.c | 12 +++++ - 4 files changed, 126 insertions(+), 1 deletion(-) - -diff --git a/configure b/configure -index e3253ee..d0b7777 100755 ---- a/configure -+++ b/configure -@@ -732,6 +732,8 @@ FLEX - TOOLSDIR - WOW64_DISABLE - TARGETFLAGS -+ac_ct_CCAS -+CCAS - CPPBIN - ac_ct_CXX - CXXFLAGS -@@ -861,6 +863,7 @@ CPPFLAGS - CXX - CXXFLAGS - CCC -+CCAS - CPP - XMKMF' - -@@ -1549,6 +1552,7 @@ Some influential environment variables: - you have headers in a nonstandard directory - CXX C++ compiler command - CXXFLAGS C++ compiler flags -+ CCAS Assembler command - CPP C preprocessor - XMKMF Path to xmkmf, Makefile generator for X Window System - -@@ -4075,6 +4079,108 @@ cat >>confdefs.h <<_ACEOF - _ACEOF - - -+ -+if test -n "$ac_tool_prefix"; then -+ for ac_prog in clang gas as -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_CCAS+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$CCAS"; then -+ ac_cv_prog_CCAS="$CCAS" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_CCAS="$ac_tool_prefix$ac_prog" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+CCAS=$ac_cv_prog_CCAS -+if test -n "$CCAS"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CCAS" >&5 -+$as_echo "$CCAS" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+ test -n "$CCAS" && break -+ done -+fi -+if test -z "$CCAS"; then -+ ac_ct_CCAS=$CCAS -+ for ac_prog in clang gas as -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_CCAS+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_CCAS"; then -+ ac_cv_prog_ac_ct_CCAS="$ac_ct_CCAS" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_CCAS="$ac_prog" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_CCAS=$ac_cv_prog_ac_ct_CCAS -+if test -n "$ac_ct_CCAS"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CCAS" >&5 -+$as_echo "$ac_ct_CCAS" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+ test -n "$ac_ct_CCAS" && break -+done -+ -+ if test "x$ac_ct_CCAS" = x; then -+ CCAS=""$CC"" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ CCAS=$ac_ct_CCAS -+ fi -+fi -+ -+ - case $host in - *-darwin*) - if test "x$enable_win64" = "xyes" -diff --git a/configure.ac b/configure.ac -index c93cd08..760f325 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -126,6 +126,10 @@ dnl We can't use AC_PROG_CPP for winegcc, it uses by default $(CC) -E - AC_CHECK_TOOL(CPPBIN,cpp,cpp) - AC_DEFINE_UNQUOTED(EXEEXT,["$ac_exeext"],[Define to the file extension for executables.]) - -+dnl Analogous to AM_PROG_AS -+AC_ARG_VAR([CCAS],[Assembler command]) -+AC_CHECK_TOOLS(CCAS,[clang gas as],["$CC"]) -+ - case $host in - *-darwin*) - if test "x$enable_win64" = "xyes" -diff --git a/tools/winebuild/Makefile.in b/tools/winebuild/Makefile.in -index 2017129..3fe47a3 100644 ---- a/tools/winebuild/Makefile.in -+++ b/tools/winebuild/Makefile.in -@@ -1,4 +1,7 @@ --DEFS = -D__WINESRC__ $(EXTRADEFS) -+DEFS = \ -+ -DCCAS="\"@CCAS@\"" \ -+ -D__WINESRC__ \ -+ $(EXTRADEFS) - - PROGRAMS = winebuild$(EXEEXT) - MANPAGE = winebuild.man -diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c -index 262ff3a..1c5f918 100644 ---- a/tools/winebuild/utils.c -+++ b/tools/winebuild/utils.c -@@ -352,6 +352,18 @@ struct strarray *get_as_command(void) - static int as_is_clang = 0; - struct strarray *args = strarray_init(); - -+ if (!as_command && strlen( CCAS )) -+ { -+ struct stat st; -+ -+ if (!stat( CCAS, &st )) -+ as_command = CCAS; -+ else -+ as_command = find_tool( CCAS, NULL ); -+ -+ if (as_command && strstr( as_command, "clang" )) as_is_clang = 1; -+ } -+ - if (!as_command) - { - as_command = find_tool( "clang", NULL ); --- -1.8.1.2 - diff --git a/app-emulation/wine/metadata.xml b/app-emulation/wine/metadata.xml index 34b2fcd2361d..c14be1c7c846 100644 --- a/app-emulation/wine/metadata.xml +++ b/app-emulation/wine/metadata.xml @@ -33,7 +33,5 @@ Think of Wine as a compatibility layer for running Windows programs. Wine does n http://wiki.winehq.org/NtlmAuthSetupGuide and http://wiki.winehq.org/NtlmSigningAndSealing Apply unofficial Wine-Staging patches for advanced feature support that haven't made it into upstream Wine yet - Build a 32bit version of Wine (won't run Win64 binaries) - Build a 64bit version of Wine (won't run Win32 binaries) diff --git a/app-emulation/wine/wine-1.2.3.ebuild b/app-emulation/wine/wine-1.2.3.ebuild deleted file mode 100644 index b1ab41d246b7..000000000000 --- a/app-emulation/wine/wine-1.2.3.ebuild +++ /dev/null @@ -1,233 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.2.3.ebuild,v 1.28 2015/01/01 21:01:23 ryao Exp $ - -EAPI="5" - -inherit eutils flag-o-matic multilib - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://source.winehq.org/git/wine.git" - inherit git-2 autotools - SRC_URI="" - #KEYWORDS="" -else - AUTOTOOLS_AUTO_DEPEND="no" - inherit autotools - MY_P="${PN}-${PV/_/-}" - SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2" - KEYWORDS="-* amd64 x86 ~x86-fbsd" - S=${WORKDIR}/${MY_P} -fi - -pulse_patches() { echo "$1"/winepulse-{0.36,0.35-configure.ac,0.38-winecfg}.patch ; } -GV="1.0.0-x86" -DESCRIPTION="Free implementation of Windows(tm) on Unix" -HOMEPAGE="http://www.winehq.org/" -SRC_URI="${SRC_URI} - gecko? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}.cab ) - pulseaudio? ( `pulse_patches http://art.ified.ca/downloads/winepulse` )" - -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm jack jpeg ldap mp3 nas ncurses openal +opengl +oss +perl png +prelink pulseaudio samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml" -REQUIRED_USE="elibc_glibc? ( threads )" #286560 -RESTRICT="test" #72375 - -MLIB_DEPS="amd64? ( - truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) - X? ( - >=app-emulation/emul-linux-x86-xlibs-2.1 - >=app-emulation/emul-linux-x86-soundlibs-2.1 - ) - mp3? ( app-emulation/emul-linux-x86-soundlibs ) - openal? ( app-emulation/emul-linux-x86-sdl ) - opengl? ( app-emulation/emul-linux-x86-opengl ) - scanner? ( app-emulation/emul-linux-x86-medialibs ) - v4l? ( app-emulation/emul-linux-x86-medialibs ) - app-emulation/emul-linux-x86-baselibs - >=sys-kernel/linux-headers-2.6 - )" -RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 ) - perl? ( dev-lang/perl dev-perl/XML-Simple ) - capi? ( net-dialup/capi4k-utils ) - ncurses? ( >=sys-libs/ncurses-5.2 ) - fontconfig? ( media-libs/fontconfig:= ) - gphoto2? ( media-libs/libgphoto2:= ) - jack? ( media-sound/jack-audio-connection-kit ) - openal? ( media-libs/openal:= ) - dbus? ( sys-apps/dbus ) - gnutls? ( net-libs/gnutls:= ) - X? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libXcursor - x11-libs/libXrandr - x11-libs/libXi - x11-libs/libXxf86vm - ) - xinerama? ( x11-libs/libXinerama ) - alsa? ( media-libs/alsa-lib ) - nas? ( media-libs/nas ) - cups? ( net-print/cups:= ) - opengl? ( - virtual/glu - virtual/opengl - ) - pulseaudio? ( media-sound/pulseaudio ) - gsm? ( media-sound/gsm:= ) - jpeg? ( virtual/jpeg:0= ) - ldap? ( net-nds/openldap:= ) - mp3? ( >=media-sound/mpg123-1.5.0 ) - samba? ( >=net-fs/samba-3.0.25 ) - xml? ( dev-libs/libxml2 dev-libs/libxslt ) - scanner? ( media-gfx/sane-backends:= ) - ssl? ( dev-libs/openssl:0= ) - png? ( media-libs/libpng:0= ) - v4l? ( media-libs/libv4l ) - !win64? ( ${MLIB_DEPS} ) - win32? ( ${MLIB_DEPS} ) - xcomposite? ( x11-libs/libXcomposite )" -DEPEND="${RDEPEND} - pulseaudio? ( ${AUTOTOOLS_DEPEND} ) - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) - xinerama? ( x11-proto/xineramaproto ) - prelink? ( sys-devel/prelink ) - virtual/pkgconfig - virtual/yacc - sys-devel/flex" - -wine_build_environment_check() { - [[ ${MERGE_TYPE} = "binary" ]] && return 0 - - if use win64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then - eerror "You need gcc-4.4+ to build 64-bit wine" - eerror - return 1 - fi -} - -pkg_pretend() { - wine_build_environment_check || die -} - -pkg_setup() { - wine_build_environment_check || die -} - -src_unpack() { - if [[ ${PV} == "9999" ]] ; then - git-2_src_unpack - else - unpack ${MY_P}.tar.bz2 - fi -} - -src_prepare() { - local md5="$(md5sum server/protocol.def)" - if use pulseaudio ; then - EPATCH_OPTS=-p1 epatch `pulse_patches "${DISTDIR}"` - eautoreconf - fi - epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726 - epatch "${FILESDIR}"/${PN}-1.2.3-msxml3-libxml2-headers.patch #397993 - epatch_user #282735 - if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then - einfo "server/protocol.def was patched; running tools/make_requests" - tools/make_requests || die #432348 - fi - sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die - sed -i '/^MimeType/d' tools/wine.desktop || die #117785 -} - -do_configure() { - local builddir="${WORKDIR}/wine$1" - mkdir -p "${builddir}" - pushd "${builddir}" >/dev/null - - ECONF_SOURCE=${S} \ - econf \ - --sysconfdir=/etc/wine \ - $(use_with alsa) \ - $(use_with capi) \ - --without-cms \ - $(use_with cups) \ - $(use_with ncurses curses) \ - --without-esd \ - $(use_with fontconfig) \ - $(use_with gnutls) \ - $(use_with gphoto2 gphoto) \ - $(use_with gsm) \ - --without-hal \ - $(use_with jack) \ - $(use_with jpeg) \ - $(use_with ldap) \ - $(use_with mp3 mpg123) \ - $(use_with nas) \ - $(use_with openal) \ - $(use_with opengl) \ - $(use_with ssl openssl) \ - $(use_with oss) \ - $(use_with png) \ - $(use_with threads pthread) \ - $(use pulseaudio && use_with pulseaudio pulse) \ - $(use_with scanner sane) \ - $(use_enable test tests) \ - $(use_with truetype freetype) \ - $(use_with v4l) \ - $(use_with X x) \ - $(use_with xcomposite) \ - $(use_with xinerama) \ - $(use_with xml) \ - $(use_with xml xslt) \ - $2 - - emake -j1 depend - - popd >/dev/null -} -src_configure() { - export LDCONFIG=/bin/true - use custom-cflags || strip-flags - - if use win64 ; then - do_configure 64 --enable-win64 - use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64 - else - ABI=x86 do_configure 32 --disable-win64 - fi -} - -src_compile() { - local b - for b in 64 32 ; do - local builddir="${WORKDIR}/wine${b}" - [[ -d ${builddir} ]] || continue - emake -C "${builddir}" all - done -} - -src_install() { - local b - for b in 64 32 ; do - local builddir="${WORKDIR}/wine${b}" - [[ -d ${builddir} ]] || continue - emake -C "${builddir}" install DESTDIR="${D}" - done - dodoc ANNOUNCE AUTHORS README - if use gecko ; then - insinto /usr/share/wine/gecko - doins "${DISTDIR}"/wine_gecko-${GV}.cab - fi - if ! use perl ; then - rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die - fi -} - -pkg_postinst() { - paxctl -psmr "${ROOT}"/usr/bin/wine{,-preloader} 2>/dev/null #255055 -} diff --git a/app-emulation/wine/wine-1.3.28.ebuild b/app-emulation/wine/wine-1.3.28.ebuild deleted file mode 100644 index b8fa465cda24..000000000000 --- a/app-emulation/wine/wine-1.3.28.ebuild +++ /dev/null @@ -1,213 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.28.ebuild,v 1.20 2015/01/01 21:01:23 ryao Exp $ - -EAPI="5" - -inherit eutils flag-o-matic multilib - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://source.winehq.org/git/wine.git" - inherit git-2 - SRC_URI="" - #KEYWORDS="" -else - MY_P="${PN}-${PV/_/-}" - SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2" - KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" - S=${WORKDIR}/${MY_P} -fi - -GV="1.3" -DESCRIPTION="Free implementation of Windows(tm) on Unix" -HOMEPAGE="http://www.winehq.org/" -SRC_URI="${SRC_URI} - gecko? ( - mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi - win64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi ) - )" - -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer jpeg ldap mp3 ncurses nls openal opencl +opengl +oss +perl png +prelink samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml" -REQUIRED_USE="elibc_glibc? ( threads )" #286560 -RESTRICT="test" #72375 - -MLIB_DEPS="amd64? ( - truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) - X? ( - >=app-emulation/emul-linux-x86-xlibs-2.1 - >=app-emulation/emul-linux-x86-soundlibs-2.1 - ) - mp3? ( app-emulation/emul-linux-x86-soundlibs ) - openal? ( app-emulation/emul-linux-x86-sdl ) - opengl? ( app-emulation/emul-linux-x86-opengl ) - scanner? ( app-emulation/emul-linux-x86-medialibs ) - v4l? ( app-emulation/emul-linux-x86-medialibs ) - app-emulation/emul-linux-x86-baselibs - >=sys-kernel/linux-headers-2.6 - )" -RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 ) - perl? ( dev-lang/perl dev-perl/XML-Simple ) - capi? ( net-dialup/capi4k-utils ) - ncurses? ( >=sys-libs/ncurses-5.2:= ) - fontconfig? ( media-libs/fontconfig:= ) - gphoto2? ( media-libs/libgphoto2:= ) - openal? ( media-libs/openal:= ) - dbus? ( sys-apps/dbus ) - gnutls? ( net-libs/gnutls:= ) - gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) - X? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libXcursor - x11-libs/libXrandr - x11-libs/libXi - x11-libs/libXxf86vm - ) - xinerama? ( x11-libs/libXinerama ) - alsa? ( media-libs/alsa-lib ) - cups? ( net-print/cups:= ) - opencl? ( virtual/opencl ) - opengl? ( - virtual/glu - virtual/opengl - ) - gsm? ( media-sound/gsm:= ) - jpeg? ( virtual/jpeg:0= ) - ldap? ( net-nds/openldap:= ) - mp3? ( >=media-sound/mpg123-1.5.0 ) - nls? ( sys-devel/gettext ) - samba? ( >=net-fs/samba-3.0.25 ) - xml? ( dev-libs/libxml2 dev-libs/libxslt ) - scanner? ( media-gfx/sane-backends:= ) - ssl? ( dev-libs/openssl:0= ) - png? ( media-libs/libpng:0= ) - v4l? ( media-libs/libv4l ) - !win64? ( ${MLIB_DEPS} ) - win32? ( ${MLIB_DEPS} ) - xcomposite? ( x11-libs/libXcomposite )" -DEPEND="${RDEPEND} - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) - xinerama? ( x11-proto/xineramaproto ) - prelink? ( sys-devel/prelink ) - virtual/pkgconfig - virtual/yacc - sys-devel/flex" - -src_unpack() { - if use win64 ; then - [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \ - && die "you need gcc-4.4+ to build 64bit wine" - fi - - if [[ ${PV} == "9999" ]] ; then - git-2_src_unpack - else - unpack ${MY_P}.tar.bz2 - fi -} - -src_prepare() { - local md5="$(md5sum server/protocol.def)" - epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726 - epatch_user #282735 - if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then - einfo "server/protocol.def was patched; running tools/make_requests" - tools/make_requests || die #432348 - fi - sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die - sed -i '/^MimeType/d' tools/wine.desktop || die #117785 -} - -do_configure() { - local builddir="${WORKDIR}/wine$1" - mkdir -p "${builddir}" - pushd "${builddir}" >/dev/null - - ECONF_SOURCE=${S} \ - econf \ - --sysconfdir=/etc/wine \ - $(use_with alsa) \ - $(use_with capi) \ - --without-cms \ - $(use_with cups) \ - $(use_with ncurses curses) \ - $(use_with fontconfig) \ - $(use_with gnutls) \ - $(use_with gphoto2 gphoto) \ - $(use_with gsm) \ - $(use_with gstreamer) \ - --without-hal \ - $(use_with jpeg) \ - $(use_with ldap) \ - $(use_with mp3 mpg123) \ - $(use_with nls gettextpo) \ - $(use_with openal) \ - $(use_with opencl) \ - $(use_with opengl) \ - $(use_with ssl openssl) \ - $(use_with oss) \ - $(use_with png) \ - $(use_with threads pthread) \ - $(use_with scanner sane) \ - $(use_enable test tests) \ - $(use_with truetype freetype) \ - $(use_with v4l) \ - $(use_with X x) \ - $(use_with xcomposite) \ - $(use_with xinerama) \ - $(use_with xml) \ - $(use_with xml xslt) \ - $2 - - emake -j1 depend - - popd >/dev/null -} -src_configure() { - export LDCONFIG=/bin/true - use custom-cflags || strip-flags - - if use win64 ; then - do_configure 64 --enable-win64 - use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64 - else - ABI=x86 do_configure 32 --disable-win64 - fi -} - -src_compile() { - local b - for b in 64 32 ; do - local builddir="${WORKDIR}/wine${b}" - [[ -d ${builddir} ]] || continue - emake -C "${builddir}" all - done -} - -src_install() { - local b - for b in 64 32 ; do - local builddir="${WORKDIR}/wine${b}" - [[ -d ${builddir} ]] || continue - emake -C "${builddir}" install DESTDIR="${D}" - done - dodoc ANNOUNCE AUTHORS README - if use gecko ; then - insinto /usr/share/wine/gecko - doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi - use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi - fi - if ! use perl ; then - rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die - fi -} - -pkg_postinst() { - paxctl -psmr "${ROOT}"/usr/bin/wine{,-preloader} 2>/dev/null #255055 -} diff --git a/app-emulation/wine/wine-1.4.1.ebuild b/app-emulation/wine/wine-1.4.1.ebuild deleted file mode 100644 index f366993f966f..000000000000 --- a/app-emulation/wine/wine-1.4.1.ebuild +++ /dev/null @@ -1,249 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.4.1.ebuild,v 1.15 2015/01/01 21:01:23 ryao Exp $ - -EAPI="5" - -inherit autotools eutils flag-o-matic multilib pax-utils - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://source.winehq.org/git/wine.git" - inherit git-2 - SRC_URI="" - #KEYWORDS="" -else - MY_P="${PN}-${PV/_/-}" - SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2" - KEYWORDS="-* amd64 x86 ~x86-fbsd" - S=${WORKDIR}/${MY_P} -fi - -GV="1.4" -DESCRIPTION="Free implementation of Windows(tm) on Unix" -HOMEPAGE="http://www.winehq.org/" -SRC_URI="${SRC_URI} - gecko? ( - mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi - win64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi ) - )" - -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer jpeg ldap mp3 ncurses nls odbc openal opencl +opengl +oss +perl png +prelink samba scanner selinux ssl test +threads +truetype udisks v4l +win32 +win64 +X xcomposite xinerama xml" -REQUIRED_USE="elibc_glibc? ( threads )" #286560 -RESTRICT="test" #72375 - -MLIB_DEPS="amd64? ( - truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) - X? ( - >=app-emulation/emul-linux-x86-xlibs-2.1 - >=app-emulation/emul-linux-x86-soundlibs-2.1 - ) - mp3? ( app-emulation/emul-linux-x86-soundlibs ) - odbc? ( app-emulation/emul-linux-x86-db ) - openal? ( app-emulation/emul-linux-x86-sdl ) - opengl? ( app-emulation/emul-linux-x86-opengl ) - scanner? ( app-emulation/emul-linux-x86-medialibs ) - v4l? ( app-emulation/emul-linux-x86-medialibs ) - app-emulation/emul-linux-x86-baselibs - >=sys-kernel/linux-headers-2.6 - )" -RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 ) - perl? ( dev-lang/perl dev-perl/XML-Simple ) - capi? ( net-dialup/capi4k-utils ) - ncurses? ( >=sys-libs/ncurses-5.2:= ) - fontconfig? ( media-libs/fontconfig:= ) - gphoto2? ( media-libs/libgphoto2:= ) - openal? ( media-libs/openal:= ) - udisks? ( - sys-apps/dbus - sys-fs/udisks:0 - ) - gnutls? ( net-libs/gnutls:= ) - gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) - X? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libXcursor - x11-libs/libXrandr - x11-libs/libXi - x11-libs/libXxf86vm - ) - xinerama? ( x11-libs/libXinerama ) - alsa? ( media-libs/alsa-lib ) - cups? ( net-print/cups:= ) - opencl? ( virtual/opencl ) - opengl? ( - virtual/glu - virtual/opengl - ) - gsm? ( media-sound/gsm:= ) - jpeg? ( virtual/jpeg:0= ) - ldap? ( net-nds/openldap:= ) - mp3? ( >=media-sound/mpg123-1.5.0 ) - nls? ( sys-devel/gettext ) - odbc? ( dev-db/unixODBC:= ) - samba? ( >=net-fs/samba-3.0.25 ) - selinux? ( sec-policy/selinux-wine ) - xml? ( dev-libs/libxml2 dev-libs/libxslt ) - scanner? ( media-gfx/sane-backends:= ) - ssl? ( dev-libs/openssl:0= ) - png? ( media-libs/libpng:0= ) - v4l? ( media-libs/libv4l ) - !win64? ( ${MLIB_DEPS} ) - win32? ( ${MLIB_DEPS} ) - xcomposite? ( x11-libs/libXcomposite )" -DEPEND="${RDEPEND} - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) - xinerama? ( x11-proto/xineramaproto ) - prelink? ( sys-devel/prelink ) - virtual/pkgconfig - virtual/yacc - sys-devel/flex" - -wine_build_environment_check() { - [[ ${MERGE_TYPE} = "binary" ]] && return 0 - - if use win64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then - eerror "You need gcc-4.4+ to build 64-bit wine" - eerror - return 1 - fi - - if use win32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; then - eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." - eerror "See https://bugs.gentoo.org/487864 for more details." - eerror - return 1 - fi -} - -pkg_pretend() { - wine_build_environment_check || die -} - -pkg_setup() { - wine_build_environment_check || die -} - -src_unpack() { - if [[ ${PV} == "9999" ]] ; then - git-2_src_unpack - else - unpack ${MY_P}.tar.bz2 - fi -} - -src_prepare() { - local md5="$(md5sum server/protocol.def)" - epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726 - epatch "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615 - epatch_user #282735 - if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then - einfo "server/protocol.def was patched; running tools/make_requests" - tools/make_requests || die #432348 - fi - eautoreconf - sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die - sed -i '/^MimeType/d' tools/wine.desktop || die #117785 -} - -do_configure() { - local builddir="${WORKDIR}/wine$1" - mkdir -p "${builddir}" - pushd "${builddir}" >/dev/null - - ECONF_SOURCE=${S} \ - econf \ - --sysconfdir=/etc/wine \ - $(use_with alsa) \ - $(use_with capi) \ - --without-cms \ - $(use_with cups) \ - $(use_with ncurses curses) \ - $(use_with udisks dbus) \ - $(use_with fontconfig) \ - $(use_with gnutls) \ - $(use_with gphoto2 gphoto) \ - $(use_with gsm) \ - $(use_with gstreamer) \ - --without-hal \ - $(use_with jpeg) \ - $(use_with ldap) \ - $(use_with mp3 mpg123) \ - $(use_with nls gettext) \ - $(use_with openal) \ - $(use_with opencl) \ - $(use_with opengl) \ - $(use_with ssl openssl) \ - $(use_with oss) \ - $(use_with png) \ - $(use_with threads pthread) \ - $(use_with scanner sane) \ - $(use_enable test tests) \ - $(use_with truetype freetype) \ - $(use_with v4l) \ - $(use_with X x) \ - $(use_with xcomposite) \ - $(use_with xinerama) \ - $(use_with xml) \ - $(use_with xml xslt) \ - $2 - - emake -j1 depend - - popd >/dev/null -} - -src_configure() { - export LDCONFIG=/bin/true - use custom-cflags || strip-flags - - if use win64 ; then - do_configure 64 --enable-win64 - use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64 - else - ABI=x86 do_configure 32 --disable-win64 - fi -} - -src_compile() { - local b - for b in 64 32 ; do - local builddir="${WORKDIR}/wine${b}" - [[ -d ${builddir} ]] || continue - emake -C "${builddir}" all - done -} - -src_install() { - local b - for b in 64 32 ; do - local builddir="${WORKDIR}/wine${b}" - [[ -d ${builddir} ]] || continue - emake -C "${builddir}" install DESTDIR="${D}" - done - dodoc ANNOUNCE AUTHORS README - if use gecko ; then - insinto /usr/share/wine/gecko - doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi - use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi - fi - if ! use perl ; then - rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die - fi - - if use win32 || ! use win64; then - pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055 - fi - use win64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader} - - if use win64 && ! use win32; then - dosym /usr/bin/wine{64,} # 404331 - dosym /usr/bin/wine{64,}-preloader - fi -} diff --git a/app-emulation/wine/wine-1.7.41.ebuild b/app-emulation/wine/wine-1.7.41.ebuild new file mode 100644 index 000000000000..0f06491b3106 --- /dev/null +++ b/app-emulation/wine/wine-1.7.41.ebuild @@ -0,0 +1,547 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.41.ebuild,v 1.1 2015/04/19 03:45:33 tetromino Exp $ + +EAPI="5" + +AUTOTOOLS_AUTORECONF=1 +PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW" +PLOCALE_BACKUP="en" + +inherit autotools-utils eutils fdo-mime flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://source.winehq.org/git/wine.git" + EGIT_BRANCH="master" + inherit git-r3 + SRC_URI="" + #KEYWORDS="" +else + MY_P="${PN}-${PV/_/-}" + SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2" + KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" + S=${WORKDIR}/${MY_P} +fi + +GV="2.36" +MV="4.5.6" +STAGING_P="wine-staging-${PV}" +STAGING_DIR="${WORKDIR}/${STAGING_P}" +WINE_GENTOO="wine-gentoo-2015.03.07" +GST_P="wine-1.7.34-gstreamer-v5" +DESCRIPTION="Free implementation of Windows(tm) on Unix" +HOMEPAGE="http://www.winehq.org/" +SRC_URI="${SRC_URI} + gecko? ( + abi_x86_32? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi ) + abi_x86_64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi ) + ) + mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi ) + gstreamer? ( http://dev.gentoo.org/~tetromino/distfiles/${PN}/${GST_P}.patch.bz2 ) + http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2" + +if [[ ${PV} == "9999" ]] ; then + STAGING_EGIT_REPO_URI="git://github.com/wine-compholio/wine-staging.git" +else + SRC_URI="${SRC_URI} + staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz ) + pulseaudio? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )" +fi + +LICENSE="LGPL-2.1" +SLOT="0" +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png +prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml" +REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) + test? ( abi_x86_32 ) + elibc_glibc? ( threads ) + mono? ( abi_x86_32 ) + pipelight? ( staging ) + s3tc? ( staging ) + vaapi? ( staging ) + osmesa? ( opengl )" #286560 + +# FIXME: the test suite is unsuitable for us; many tests require net access +# or fail due to Xvfb's opengl limitations. +RESTRICT="test" + +NATIVE_DEPEND=" + truetype? ( >=media-libs/freetype-2.0.0 ) + capi? ( net-dialup/capi4k-utils ) + ncurses? ( >=sys-libs/ncurses-5.2:= ) + udisks? ( sys-apps/dbus ) + fontconfig? ( media-libs/fontconfig:= ) + gphoto2? ( media-libs/libgphoto2:= ) + openal? ( media-libs/openal:= ) + gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) + X? ( + x11-libs/libXcursor + x11-libs/libXext + x11-libs/libXrandr + x11-libs/libXi + x11-libs/libXxf86vm + ) + xinerama? ( x11-libs/libXinerama ) + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups:= ) + opencl? ( virtual/opencl ) + opengl? ( + virtual/glu + virtual/opengl + ) + gsm? ( media-sound/gsm:= ) + jpeg? ( virtual/jpeg:0= ) + ldap? ( net-nds/openldap:= ) + lcms? ( media-libs/lcms:2= ) + mp3? ( >=media-sound/mpg123-1.5.0 ) + netapi? ( net-fs/samba[netapi(+)] ) + nls? ( sys-devel/gettext ) + odbc? ( dev-db/unixODBC:= ) + osmesa? ( media-libs/mesa[osmesa] ) + pcap? ( net-libs/libpcap ) + staging? ( sys-apps/attr ) + pulseaudio? ( media-sound/pulseaudio ) + xml? ( dev-libs/libxml2 dev-libs/libxslt ) + scanner? ( media-gfx/sane-backends:= ) + ssl? ( net-libs/gnutls:= ) + png? ( media-libs/libpng:0= ) + v4l? ( media-libs/libv4l ) + vaapi? ( x11-libs/libva[X] ) + xcomposite? ( x11-libs/libXcomposite )" + +COMMON_DEPEND=" + !amd64? ( ${NATIVE_DEPEND} ) + amd64? ( + abi_x86_64? ( ${NATIVE_DEPEND} ) + abi_x86_32? ( + truetype? ( || ( + >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] + >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] + ) ) + ncurses? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] + ) ) + udisks? ( || ( + >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] + >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] + ) ) + fontconfig? ( || ( + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] + ) ) + gphoto2? ( || ( + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] + >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] + ) ) + openal? ( || ( + app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] + >=media-libs/openal-1.15.1[abi_x86_32(-)] + ) ) + gstreamer? ( || ( + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] + ( + >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] + >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] + ) + ) ) + X? ( || ( + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + ( + >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] + >=x11-libs/libXext-1.3.2[abi_x86_32(-)] + >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] + >=x11-libs/libXi-1.7.2[abi_x86_32(-)] + >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] + ) + ) ) + xinerama? ( || ( + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] + ) ) + alsa? ( || ( + app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] + >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] + ) ) + cups? ( || ( + app-emulation/emul-linux-x86-baselibs + >=net-print/cups-1.7.1-r1[abi_x86_32(-)] + ) ) + opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) + opengl? ( || ( + app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] + ( + >=virtual/glu-9.0-r1[abi_x86_32(-)] + >=virtual/opengl-7.0-r1[abi_x86_32(-)] + ) + ) ) + gsm? ( || ( + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] + ) ) + jpeg? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=virtual/jpeg-0-r2:0[abi_x86_32(-)] + ) ) + ldap? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] + ) ) + lcms? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=media-libs/lcms-2.5:2[abi_x86_32(-)] + ) ) + mp3? ( || ( + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/mpg123-1.15.4[abi_x86_32(-)] + ) ) + netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) + nls? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] + ) ) + odbc? ( || ( + app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] + >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] + ) ) + osmesa? ( || ( + >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] + >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] + ) ) + pcap? ( net-libs/libpcap[abi_x86_32(-)] ) + pulseaudio? ( || ( + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/pulseaudio-5.0[abi_x86_32(-)] + ) ) + staging? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] + ) ) + xml? ( || ( + >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] + ( + >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] + >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] + ) + ) ) + scanner? ( || ( + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] + >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] + ) ) + ssl? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] + ) ) + png? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] + ) ) + v4l? ( || ( + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] + >=media-libs/libv4l-0.9.5[abi_x86_32(-)] + ) ) + vaapi? ( x11-libs/libva[X,abi_x86_32(-)] ) + xcomposite? ( || ( + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] + ) ) + ) + )" + +RDEPEND="${COMMON_DEPEND} + dos? ( games-emulation/dosbox ) + perl? ( dev-lang/perl dev-perl/XML-Simple ) + s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] ) + samba? ( >=net-fs/samba-3.0.25 ) + selinux? ( sec-policy/selinux-wine ) + udisks? ( sys-fs/udisks:2 ) + pulseaudio? ( realtime? ( sys-auth/rtkit ) )" + +# tools/make_requests requires perl +DEPEND="${COMMON_DEPEND} + amd64? ( abi_x86_32? ( !abi_x86_64? ( ${NATIVE_DEPEND} ) ) ) + staging? ( dev-lang/perl dev-perl/XML-Simple ) + X? ( + x11-proto/inputproto + x11-proto/xextproto + x11-proto/xf86vidmodeproto + ) + xinerama? ( x11-proto/xineramaproto ) + prelink? ( sys-devel/prelink ) + >=sys-kernel/linux-headers-2.6 + virtual/pkgconfig + virtual/yacc + sys-devel/flex" + +# These use a non-standard "Wine" category, which is provided by +# /etc/xdg/applications-merged/wine.menu +QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop +usr/share/applications/wine-notepad.desktop +usr/share/applications/wine-uninstaller.desktop +usr/share/applications/wine-winecfg.desktop" + +wine_build_environment_check() { + [[ ${MERGE_TYPE} = "binary" ]] && return 0 + + if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then + eerror "You need gcc-4.4+ to build 64-bit wine" + eerror + return 1 + fi + + if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; then + eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." + eerror "See https://bugs.gentoo.org/487864 for more details." + eerror + return 1 + fi +} + +pkg_pretend() { + wine_build_environment_check || die +} + +pkg_setup() { + wine_build_environment_check || die +} + +src_unpack() { + if [[ ${PV} == "9999" ]] ; then + git-r3_src_unpack + if use staging || use pulseaudio; then + EGIT_REPO_URI=${STAGING_EGIT_REPO_URI} + unset ${PN}_LIVE_REPO; + EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack + fi + else + unpack ${MY_P}.tar.bz2 + use staging || use pulseaudio && unpack "${STAGING_P}.tar.gz" + fi + + unpack "${WINE_GENTOO}.tar.bz2" + use gstreamer && unpack "${GST_P}.patch.bz2" + + l10n_find_plocales_changes "${S}/po" "" ".po" +} + +src_prepare() { + local md5="$(md5sum server/protocol.def)" + local PATCHES=( + "${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726 + "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615 + "${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386 + "${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508 + ) + if use gstreamer; then + # See http://bugs.winehq.org/show_bug.cgi?id=30557 + ewarn "Applying experimental patch to fix GStreamer support. Note that" + ewarn "this patch has been reported to cause crashes in certain games." + + # Wine-Staging 1.7.38 "ntdll: Fix race-condition when threads are killed + # during shutdown" patch and "Added patch to implement shared memory + # wineserver communication for various user32 functions" prevents the + # gstreamer patch from applying cleanly. + # So undo the staging patch, apply gstreamer, then re-apply rebased staging + # patch on top. + if use staging; then + PATCHES+=( + "${FILESDIR}/${PN}-1.7.39-gstreamer-v5-staging-pre.patch" + "${WORKDIR}/${GST_P}.patch" + "${FILESDIR}/${PN}-1.7.39-gstreamer-v5-staging-post.patch" ) + else + PATCHES+=( "${WORKDIR}/${GST_P}.patch" ) + fi + fi + if use staging; then + ewarn "Applying the unofficial Wine-Staging patchset which is unsupported" + ewarn "by Wine developers. Please don't report bugs to Wine bugzilla" + ewarn "unless you can reproduce them with USE=-staging" + + local STAGING_EXCLUDE="" + use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight" + + # Launch wine-staging patcher in a subshell, using epatch as a backend, and gitapply.sh as a backend for binary patches + ebegin "Running Wine-Staging patch installer" + ( + set -- DESTDIR="${S}" --backend=epatch --no-autoconf --all ${STAGING_EXCLUDE} + cd "${STAGING_DIR}/patches" + source "${STAGING_DIR}/patches/patchinstall.sh" + ) + eend $? + elif use pulseaudio; then + PATCHES+=( "${STAGING_DIR}/patches/winepulse-PulseAudio_Support"/*.patch ) + fi + autotools-utils_src_prepare + + # Modification of the server protocol requires regenerating the server requests + if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then + einfo "server/protocol.def was patched; running tools/make_requests" + tools/make_requests || die #432348 + fi + sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die + if ! use run-exes; then + sed -i '/^MimeType/d' tools/wine.desktop || die #117785 + fi + + # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652 + cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die + + l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS +} + +src_configure() { + export LDCONFIG=/bin/true + use custom-cflags || strip-flags + + multilib-minimal_src_configure +} + +multilib_src_configure() { + local myconf=( + --sysconfdir=/etc/wine + $(use_with alsa) + $(use_with capi) + $(use_with lcms cms) + $(use_with cups) + $(use_with ncurses curses) + $(use_with udisks dbus) + $(use_with fontconfig) + $(use_with ssl gnutls) + $(use_enable gecko mshtml) + $(use_with gphoto2 gphoto) + $(use_with gsm) + $(use_with gstreamer) + --without-hal + $(use_with jpeg) + $(use_with ldap) + $(use_enable mono mscoree) + $(use_with mp3 mpg123) + $(use_with netapi) + $(use_with nls gettext) + $(use_with openal) + $(use_with opencl) + $(use_with opengl) + $(use_with osmesa) + $(use_with oss) + $(use_with pcap) + $(use_with png) + $(use_with threads pthread) + $(use_with scanner sane) + $(use_enable test tests) + $(use_with truetype freetype) + $(use_with v4l) + $(use_with X x) + $(use_with xcomposite) + $(use_with xinerama) + $(use_with xml) + $(use_with xml xslt) + ) + + if use pulseaudio || use staging; then + myconf+=( $(use_with pulseaudio pulse) ) + fi + use staging && myconf+=( + --with-xattr + $(use_with vaapi va) + ) + + local PKG_CONFIG AR RANLIB + # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038 + # set AR and RANLIB to make QA scripts happy; #483342 + tc-export PKG_CONFIG AR RANLIB + + if use amd64; then + if [[ ${ABI} == amd64 ]]; then + myconf+=( --enable-win64 ) + else + myconf+=( --disable-win64 ) + fi + + # Note: using --with-wine64 results in problems with multilib.eclass + # CC/LD hackery. We're using separate tools instead. + fi + + ECONF_SOURCE=${S} \ + econf "${myconf[@]}" + emake depend +} + +multilib_src_test() { + # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader" + if [[ ${ABI} == x86 ]]; then + if [[ $(id -u) == 0 ]]; then + ewarn "Skipping tests since they cannot be run under the root user." + ewarn "To run the test ${PN} suite, add userpriv to FEATURES in make.conf" + return + fi + + WINEPREFIX="${T}/.wine-${ABI}" \ + Xemake test + fi +} + +multilib_src_install_all() { + local DOCS=( ANNOUNCE AUTHORS README ) + local l + add_locale_docs() { + local locale_doc="documentation/README.$1" + [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} ) + } + l10n_for_each_locale_do add_locale_docs + + einstalldocs + prune_libtool_files --all + + emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}" + if use gecko ; then + insinto /usr/share/wine/gecko + use abi_x86_32 && doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi + use abi_x86_64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi + fi + if use mono ; then + insinto /usr/share/wine/mono + doins "${DISTDIR}"/wine-mono-${MV}.msi + fi + if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script + rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die + fi + + use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055 + use abi_x86_64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader} + + if use abi_x86_64 && ! use abi_x86_32; then + dosym /usr/bin/wine{64,} # 404331 + dosym /usr/bin/wine{64,}-preloader + fi + + # respect LINGUAS when installing man pages, #469418 + for l in de fr pl; do + use linguas_${l} || rm -r "${D}"usr/share/man/${l}* + done +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + gnome2_icon_cache_update + fdo-mime_desktop_database_update + + if ! use gecko; then + ewarn "Without Wine Gecko, wine prefixes will not have a default" + ewarn "implementation of iexplore. Many older windows applications" + ewarn "rely upon the existence of an iexplore implementation, so" + ewarn "you will likely need to install an external one, like via winetricks" + fi + if ! use mono; then + ewarn "Without Wine Mono, wine prefixes will not have a default" + ewarn "implementation of .NET. Many windows applications rely upon" + ewarn "the existence of a .NET implementation, so you will likely need" + ewarn "to install an external one, like via winetricks" + fi +} + +pkg_postrm() { + gnome2_icon_cache_update + fdo-mime_desktop_database_update +} diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild index 09f1fed73af0..8f44a0f1aacf 100644 --- a/app-emulation/wine/wine-9999.ebuild +++ b/app-emulation/wine/wine-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.175 2015/03/22 19:58:44 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.176 2015/04/19 03:45:33 tetromino Exp $ EAPI="5" @@ -406,12 +406,14 @@ multilib_src_configure() { $(use_with udisks dbus) $(use_with fontconfig) $(use_with ssl gnutls) + $(use_enable gecko mshtml) $(use_with gphoto2 gphoto) $(use_with gsm) $(use_with gstreamer) --without-hal $(use_with jpeg) $(use_with ldap) + $(use_enable mono mscoree) $(use_with mp3 mpg123) $(use_with netapi) $(use_with nls gettext) @@ -524,6 +526,19 @@ pkg_preinst() { pkg_postinst() { gnome2_icon_cache_update fdo-mime_desktop_database_update + + if ! use gecko; then + ewarn "Without Wine Gecko, wine prefixes will not have a default" + ewarn "implementation of iexplore. Many older windows applications" + ewarn "rely upon the existence of an iexplore implementation, so" + ewarn "you will likely need to install an external one, like via winetricks" + fi + if ! use mono; then + ewarn "Without Wine Mono, wine prefixes will not have a default" + ewarn "implementation of .NET. Many windows applications rely upon" + ewarn "the existence of a .NET implementation, so you will likely need" + ewarn "to install an external one, like via winetricks" + fi } pkg_postrm() { diff --git a/app-emulation/winetricks/Manifest b/app-emulation/winetricks/Manifest index 23f2f5aba7f1..62fcb4df3162 100644 --- a/app-emulation/winetricks/Manifest +++ b/app-emulation/winetricks/Manifest @@ -1,2 +1,2 @@ -DIST winetricks-20141130.tar.gz 164917 SHA256 6088f45cac80e0a05a52b0a8885739f98b2c5ae07062bfa2aee1265d63891b56 SHA512 b7fbbcbef1a197b65c0def1cffb238d2ac58862e60aa76503171098ff35cf190a072ae7cddf865f5b03a8269702a804c7ad8ada498b922814f0aad8b2970cee1 WHIRLPOOL 16347e85d161cbf78df9d46b1b49292fe0618e6bfc32d0115e104d0bba1e5cbd6f974e6872ddb7ac8679c8dcf9eccbe0b26841ce02723d1456e0a3c3645d53ed +DIST winetricks-20150416.tar.gz 171166 SHA256 6b1bda0d9ec34c7a8596d59a49fa29fbe00848d9f0fecbf9dff8b314d51a1945 SHA512 75997e0645eb0e984117c6998eeb5c10318ac0be9307e6d60485aae0894d4f631c0486c54f04e7622b2827cafef717e778bfbb4f33a5fc5cb2b8a37430a937b9 WHIRLPOOL 5dc99c1152f5c7d0c8f08dea75cbdb758de64ad6362b078675d90124d9722f73249dda811b19b6be60dc40a4e182ba9f76de577ae3200328acbbc9b570a167db DIST winetricks-gentoo-2012.11.24.tar.bz2 6398 SHA256 dded8c294cc5c2e71e4a5d1531ab165178cf3d2d1d890d0656368c2e499bfeb9 SHA512 59c93b73f3a7b2d11aefcde2ff66659ff1de21ad4b5f232f4b60572f3a48b15a6c49f369b1696862bf1b33fde190bf5598945e9536fb41ddec42d8def4d2be2a WHIRLPOOL 268da9e06712a678fbbcfff8eac1fca364b5e46f0a9c48a591eb88f03260b1a55f203eb2908bfe1f0a534b77c866127ff6f7049b0e43fe8abeaaa26fe55de75b diff --git a/app-emulation/winetricks/winetricks-20141130.ebuild b/app-emulation/winetricks/winetricks-20150416.ebuild similarity index 83% rename from app-emulation/winetricks/winetricks-20141130.ebuild rename to app-emulation/winetricks/winetricks-20150416.ebuild index e6af04d0c17a..0d5a70c66a81 100644 --- a/app-emulation/winetricks/winetricks-20141130.ebuild +++ b/app-emulation/winetricks/winetricks-20150416.ebuild @@ -1,19 +1,18 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/winetricks-20141130.ebuild,v 1.2 2015/03/23 05:34:46 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/winetricks-20150416.ebuild,v 1.2 2015/04/19 00:00:03 tetromino Exp $ EAPI=5 inherit gnome2-utils eutils if [[ ${PV} == "99999999" ]] ; then - EGIT_REPO_URI="https://github.com/Winetricks/winetricks.git" + EGIT_REPO_URI="git://github.com/Winetricks/${PN}.git" inherit git-r3 SRC_URI="" else - SRC_URI="http://winetricks.org/download/releases/${P}.tar.gz" + SRC_URI="https://github.com/Winetricks/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" - S="${WORKDIR}" fi wtg=winetricks-gentoo-2012.11.24 SRC_URI="${SRC_URI} @@ -21,7 +20,7 @@ SRC_URI="${SRC_URI} kde? ( http://dev.gentoo.org/~tetromino/distfiles/wine/${wtg}.tar.bz2 )" DESCRIPTION="Easy way to install DLLs needed to work around problems in Wine" -HOMEPAGE="http://code.google.com/p/winetricks/ http://wiki.winehq.org/winetricks" +HOMEPAGE="http://winetricks.org http://wiki.winehq.org/winetricks" LICENSE="LGPL-2.1+" SLOT="0" @@ -35,7 +34,7 @@ RDEPEND="app-arch/cabextract net-misc/wget x11-misc/xdg-utils gtk? ( gnome-extra/zenity ) - kde? ( kde-base/kdialog ) + kde? ( || ( kde-base/kdialog kde-apps/kdialog ) ) rar? ( app-arch/unrar )" # Uses non-standard "Wine" category, which is provided by app-emulation/wine; #451552 diff --git a/app-emulation/winetricks/winetricks-99999999.ebuild b/app-emulation/winetricks/winetricks-99999999.ebuild index 19cbe6ecee86..6aa67e939cda 100644 --- a/app-emulation/winetricks/winetricks-99999999.ebuild +++ b/app-emulation/winetricks/winetricks-99999999.ebuild @@ -1,19 +1,18 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/winetricks-99999999.ebuild,v 1.13 2015/03/23 05:34:46 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/winetricks-99999999.ebuild,v 1.15 2015/04/19 00:00:03 tetromino Exp $ EAPI=5 inherit gnome2-utils eutils if [[ ${PV} == "99999999" ]] ; then - EGIT_REPO_URI="https://github.com/Winetricks/winetricks.git" + EGIT_REPO_URI="git://github.com/Winetricks/${PN}.git" inherit git-r3 SRC_URI="" else - SRC_URI="http://winetricks.org/download/releases/${P}.tar.gz" + SRC_URI="https://github.com/Winetricks/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" - S="${WORKDIR}" fi wtg=winetricks-gentoo-2012.11.24 SRC_URI="${SRC_URI} @@ -21,7 +20,7 @@ SRC_URI="${SRC_URI} kde? ( http://dev.gentoo.org/~tetromino/distfiles/wine/${wtg}.tar.bz2 )" DESCRIPTION="Easy way to install DLLs needed to work around problems in Wine" -HOMEPAGE="http://code.google.com/p/winetricks/ http://wiki.winehq.org/winetricks" +HOMEPAGE="http://winetricks.org http://wiki.winehq.org/winetricks" LICENSE="LGPL-2.1+" SLOT="0" @@ -35,7 +34,7 @@ RDEPEND="app-arch/cabextract net-misc/wget x11-misc/xdg-utils gtk? ( gnome-extra/zenity ) - kde? ( kde-base/kdialog ) + kde? ( || ( kde-base/kdialog kde-apps/kdialog ) ) rar? ( app-arch/unrar )" # Uses non-standard "Wine" category, which is provided by app-emulation/wine; #451552 diff --git a/app-eselect/eselect-php/eselect-php-0.7.1-r4.ebuild b/app-eselect/eselect-php/eselect-php-0.7.1-r4.ebuild index 0ffdc3e553a8..811788621af2 100644 --- a/app-eselect/eselect-php/eselect-php-0.7.1-r4.ebuild +++ b/app-eselect/eselect-php/eselect-php-0.7.1-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-eselect/eselect-php/eselect-php-0.7.1-r4.ebuild,v 1.2 2015/04/07 04:45:17 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-eselect/eselect-php/eselect-php-0.7.1-r4.ebuild,v 1.3 2015/04/19 08:56:26 ago Exp $ EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="http://dev.gentoo.org/~olemarkus/eselect-php/eselect-php-${PV}.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="fpm apache2" DEPEND=">=app-admin/eselect-1.2.4 diff --git a/app-eselect/eselect-scala/Manifest b/app-eselect/eselect-scala/Manifest index fb046e0d6fc7..1acc705c8306 100644 --- a/app-eselect/eselect-scala/Manifest +++ b/app-eselect/eselect-scala/Manifest @@ -1 +1 @@ -DIST eselect-scala-0.1.0.tar.gz 1789 SHA256 800155287671d75e95f998b9836c721615a746bda53165c659c63bf47627a81e SHA512 da14c3be21332c565a9f6dcce885240feea03296e97382e38f0b9903fce48ce3ff27dfc5fb4c3a3ead86be9d4ce553ae9f6af97b524d60c27e0bad57e9b236b1 WHIRLPOOL ecf9b367e56aa4de493b9d45af5ea491955fe8ab3bfc514699afaeecd8d175663a6c3cf76e6e4bb620266ddcdfa798f6a11ba49504ce956f4e582cb2e2465290 +DIST eselect-scala-0.1.1.tar.gz 1781 SHA256 e3b477858897675c6ab970674b16844853df5949654a5cf526367ecb3579ed33 SHA512 2de1b6067c385d1fb0fa0c708467ebd5d491c3ee532888ad497008fe7f78a8f4be9843af444d71107e05c111579ed83015094c3eca5d6f2c338855af4b722363 WHIRLPOOL 76c0e8631f1584ac1cbb1ee609409cba4f20db93ad9e1a9ea83f0209d3b86016c911c5da9e23044597e57bcf8c53e43e33d2031d7edcd6c421ba06ea10d47ecc diff --git a/app-eselect/eselect-scala/eselect-scala-0.1.0.ebuild b/app-eselect/eselect-scala/eselect-scala-0.1.1.ebuild similarity index 89% rename from app-eselect/eselect-scala/eselect-scala-0.1.0.ebuild rename to app-eselect/eselect-scala/eselect-scala-0.1.1.ebuild index 323cd4a67fd3..f87358b5abe7 100644 --- a/app-eselect/eselect-scala/eselect-scala-0.1.0.ebuild +++ b/app-eselect/eselect-scala/eselect-scala-0.1.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-eselect/eselect-scala/eselect-scala-0.1.0.ebuild,v 1.1 2015/04/17 14:36:02 gienah Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-eselect/eselect-scala/eselect-scala-0.1.1.ebuild,v 1.1 2015/04/18 02:55:04 gienah Exp $ EAPI=5 diff --git a/app-i18n/fcitx-anthy/fcitx-anthy-0.1.1.ebuild b/app-i18n/fcitx-anthy/fcitx-anthy-0.1.1.ebuild index e0ef3658c6f2..6bff139fe4cc 100644 --- a/app-i18n/fcitx-anthy/fcitx-anthy-0.1.1.ebuild +++ b/app-i18n/fcitx-anthy/fcitx-anthy-0.1.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-anthy/fcitx-anthy-0.1.1.ebuild,v 1.4 2013/08/03 14:47:43 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-anthy/fcitx-anthy-0.1.1.ebuild,v 1.5 2015/04/19 11:49:09 blueness Exp $ EAPI=5 inherit cmake-utils gnome2-utils @@ -11,7 +11,7 @@ SRC_URI="http://fcitx.googlecode.com/files/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc x86" +KEYWORDS="amd64 ppc ~ppc64 x86" IUSE="" RDEPEND=">=app-i18n/fcitx-4.2.5 diff --git a/app-i18n/fcitx-anthy/fcitx-anthy-0.2.0.ebuild b/app-i18n/fcitx-anthy/fcitx-anthy-0.2.0.ebuild index eb06ba32e601..d51ee3aac9ab 100644 --- a/app-i18n/fcitx-anthy/fcitx-anthy-0.2.0.ebuild +++ b/app-i18n/fcitx-anthy/fcitx-anthy-0.2.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-anthy/fcitx-anthy-0.2.0.ebuild,v 1.2 2014/03/08 12:02:27 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-anthy/fcitx-anthy-0.2.0.ebuild,v 1.3 2015/04/19 11:49:09 blueness Exp $ EAPI=5 inherit cmake-utils gnome2-utils @@ -11,7 +11,7 @@ SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 ~ppc ~ppc64 ~x86" IUSE="" RDEPEND=">=app-i18n/fcitx-4.2.8 diff --git a/app-i18n/fcitx-anthy/fcitx-anthy-0.2.1.ebuild b/app-i18n/fcitx-anthy/fcitx-anthy-0.2.1.ebuild index d3bc771d6745..825a59a9fb80 100644 --- a/app-i18n/fcitx-anthy/fcitx-anthy-0.2.1.ebuild +++ b/app-i18n/fcitx-anthy/fcitx-anthy-0.2.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-anthy/fcitx-anthy-0.2.1.ebuild,v 1.1 2014/11/02 07:44:26 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-anthy/fcitx-anthy-0.2.1.ebuild,v 1.2 2015/04/19 11:49:09 blueness Exp $ EAPI=5 inherit cmake-utils gnome2-utils @@ -11,7 +11,7 @@ SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="" RDEPEND=">=app-i18n/fcitx-4.2.8 diff --git a/app-i18n/fcitx-chewing/fcitx-chewing-0.2.0.ebuild b/app-i18n/fcitx-chewing/fcitx-chewing-0.2.0.ebuild index b13a3da6ba36..66d72e98002d 100644 --- a/app-i18n/fcitx-chewing/fcitx-chewing-0.2.0.ebuild +++ b/app-i18n/fcitx-chewing/fcitx-chewing-0.2.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-chewing/fcitx-chewing-0.2.0.ebuild,v 1.4 2013/08/03 14:47:56 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-chewing/fcitx-chewing-0.2.0.ebuild,v 1.5 2015/04/19 11:52:24 blueness Exp $ EAPI=5 inherit cmake-utils @@ -11,7 +11,7 @@ SRC_URI="http://fcitx.googlecode.com/files/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc x86" +KEYWORDS="amd64 ppc ~ppc64 x86" IUSE="" RDEPEND=">=app-i18n/fcitx-4.2.7 diff --git a/app-i18n/fcitx-chewing/fcitx-chewing-0.2.1.ebuild b/app-i18n/fcitx-chewing/fcitx-chewing-0.2.1.ebuild index 54fcd02d3d58..c2408a01ca9b 100644 --- a/app-i18n/fcitx-chewing/fcitx-chewing-0.2.1.ebuild +++ b/app-i18n/fcitx-chewing/fcitx-chewing-0.2.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-chewing/fcitx-chewing-0.2.1.ebuild,v 1.2 2014/03/08 12:02:44 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-chewing/fcitx-chewing-0.2.1.ebuild,v 1.3 2015/04/19 11:52:24 blueness Exp $ EAPI=5 inherit cmake-utils @@ -11,7 +11,7 @@ SRC_URI="http://fcitx.googlecode.com/files/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 ~ppc ~ppc64 ~x86" IUSE="" RDEPEND=">=app-i18n/fcitx-4.2.8 diff --git a/app-i18n/fcitx-chewing/fcitx-chewing-0.2.2.ebuild b/app-i18n/fcitx-chewing/fcitx-chewing-0.2.2.ebuild index 39a0b23a3b2a..6c9901b158cd 100644 --- a/app-i18n/fcitx-chewing/fcitx-chewing-0.2.2.ebuild +++ b/app-i18n/fcitx-chewing/fcitx-chewing-0.2.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-chewing/fcitx-chewing-0.2.2.ebuild,v 1.1 2014/11/02 08:35:49 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-chewing/fcitx-chewing-0.2.2.ebuild,v 1.2 2015/04/19 11:52:24 blueness Exp $ EAPI=5 inherit cmake-utils @@ -11,7 +11,7 @@ SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="" RDEPEND=">=app-i18n/fcitx-4.2.8 diff --git a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.1.ebuild b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.1.ebuild index 2aeb06b1c823..065760275c02 100644 --- a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.1.ebuild +++ b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.1.ebuild,v 1.4 2013/08/03 14:48:07 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.1.ebuild,v 1.5 2015/04/19 11:55:00 blueness Exp $ EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="http://fcitx.googlecode.com/files/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc x86" +KEYWORDS="amd64 ppc ~ppc64 x86" IUSE="" RDEPEND=">=app-i18n/fcitx-4.2.7 diff --git a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.2.ebuild b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.2.ebuild index a1e03fab0c35..f438b8b8cece 100644 --- a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.2.ebuild +++ b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.2.ebuild,v 1.2 2014/03/08 12:03:01 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.2.ebuild,v 1.3 2015/04/19 11:55:00 blueness Exp $ EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 ~ppc ~ppc64 ~x86" IUSE="" RDEPEND=">=app-i18n/fcitx-4.2.8 diff --git a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.3.ebuild b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.3.ebuild index 74d57bdf504d..8b982587bf7a 100644 --- a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.3.ebuild +++ b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.3.ebuild,v 1.1 2014/01/20 15:15:36 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.3.ebuild,v 1.2 2015/04/19 11:55:00 blueness Exp $ EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="" RDEPEND=">=app-i18n/fcitx-4.2.8 diff --git a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.4.ebuild b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.4.ebuild index faa484be67bc..7feb23711a65 100644 --- a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.4.ebuild +++ b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.4.ebuild,v 1.1 2014/11/02 08:41:12 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.4.ebuild,v 1.2 2015/04/19 11:55:00 blueness Exp $ EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="" RDEPEND=">=app-i18n/fcitx-4.2.8 diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.6.ebuild b/app-i18n/fcitx-configtool/fcitx-configtool-0.4.6.ebuild index 8d3eb73a8a29..f886991652bf 100644 --- a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.6.ebuild +++ b/app-i18n/fcitx-configtool/fcitx-configtool-0.4.6.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-configtool/fcitx-configtool-0.4.6.ebuild,v 1.5 2013/08/03 14:48:22 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-configtool/fcitx-configtool-0.4.6.ebuild,v 1.6 2015/04/19 11:58:33 blueness Exp $ EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="http://fcitx.googlecode.com/files/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ppc x86" +KEYWORDS="amd64 ppc ~ppc64 x86" IUSE="gtk +gtk3" REQUIRED_USE="|| ( gtk gtk3 )" diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.7.ebuild b/app-i18n/fcitx-configtool/fcitx-configtool-0.4.7.ebuild index cc89f1cb8004..51d1e585ffab 100644 --- a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.7.ebuild +++ b/app-i18n/fcitx-configtool/fcitx-configtool-0.4.7.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-configtool/fcitx-configtool-0.4.7.ebuild,v 1.2 2014/03/08 12:03:18 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-configtool/fcitx-configtool-0.4.7.ebuild,v 1.3 2015/04/19 11:58:33 blueness Exp $ EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 ~ppc ~ppc64 ~x86" IUSE="gtk +gtk3" REQUIRED_USE="|| ( gtk gtk3 )" diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.8.ebuild b/app-i18n/fcitx-configtool/fcitx-configtool-0.4.8.ebuild index cb8089f512bc..7ef68d5c3349 100644 --- a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.8.ebuild +++ b/app-i18n/fcitx-configtool/fcitx-configtool-0.4.8.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-configtool/fcitx-configtool-0.4.8.ebuild,v 1.1 2014/01/20 15:12:27 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-configtool/fcitx-configtool-0.4.8.ebuild,v 1.2 2015/04/19 11:58:33 blueness Exp $ EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="gtk +gtk3" REQUIRED_USE="|| ( gtk gtk3 )" diff --git a/app-i18n/fcitx-hangul/fcitx-hangul-0.2.1.ebuild b/app-i18n/fcitx-hangul/fcitx-hangul-0.2.1.ebuild index 9380242887a6..515d88bcaeae 100644 --- a/app-i18n/fcitx-hangul/fcitx-hangul-0.2.1.ebuild +++ b/app-i18n/fcitx-hangul/fcitx-hangul-0.2.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-hangul/fcitx-hangul-0.2.1.ebuild,v 1.4 2013/08/03 14:48:35 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-hangul/fcitx-hangul-0.2.1.ebuild,v 1.5 2015/04/19 12:03:26 blueness Exp $ EAPI=5 inherit cmake-utils gnome2-utils @@ -11,7 +11,7 @@ SRC_URI="http://fcitx.googlecode.com/files/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc x86" +KEYWORDS="amd64 ppc ~ppc64 x86" IUSE="" RDEPEND=">=app-i18n/fcitx-4.2.7 diff --git a/app-i18n/fcitx-hangul/fcitx-hangul-0.3.0.ebuild b/app-i18n/fcitx-hangul/fcitx-hangul-0.3.0.ebuild index c7f91aaab3e0..3ce8e0c8dd57 100644 --- a/app-i18n/fcitx-hangul/fcitx-hangul-0.3.0.ebuild +++ b/app-i18n/fcitx-hangul/fcitx-hangul-0.3.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-hangul/fcitx-hangul-0.3.0.ebuild,v 1.2 2014/03/08 12:03:36 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-hangul/fcitx-hangul-0.3.0.ebuild,v 1.3 2015/04/19 12:03:26 blueness Exp $ EAPI=5 inherit cmake-utils gnome2-utils @@ -11,7 +11,7 @@ SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 ~ppc ~ppc64 ~x86" IUSE="" RDEPEND=">=app-i18n/fcitx-4.2.8 diff --git a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.2.1.ebuild b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.2.1.ebuild index 0dd9bdb129f8..d5acdbbf9ba9 100644 --- a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.2.1.ebuild +++ b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.2.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.2.1.ebuild,v 1.5 2014/06/01 20:55:58 naota Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.2.1.ebuild,v 1.6 2015/04/19 12:00:15 blueness Exp $ EAPI=5 inherit cmake-utils gnome2-utils @@ -11,7 +11,7 @@ SRC_URI="http://fcitx.googlecode.com/files/${P}_dict.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc x86" +KEYWORDS="amd64 ppc ~ppc64 x86" IUSE="" RDEPEND=">=app-i18n/fcitx-4.2.7 diff --git a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.3.1.ebuild b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.3.1.ebuild index 6ceab4f28654..958cb748223a 100644 --- a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.3.1.ebuild +++ b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.3.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.3.1.ebuild,v 1.3 2015/02/03 07:16:06 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.3.1.ebuild,v 1.4 2015/04/19 12:00:15 blueness Exp $ EAPI=5 inherit cmake-utils gnome2-utils @@ -11,7 +11,7 @@ SRC_URI="http://download.fcitx-im.org/${PN}/${P}_dict.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 ~ppc ~ppc64 ~x86" IUSE="dictmanager" RDEPEND=">=app-i18n/fcitx-4.2.8 diff --git a/app-i18n/fcitx-rime/fcitx-rime-0.2.0.ebuild b/app-i18n/fcitx-rime/fcitx-rime-0.2.0.ebuild index e9ab3e226f3a..2f45c692a6f0 100644 --- a/app-i18n/fcitx-rime/fcitx-rime-0.2.0.ebuild +++ b/app-i18n/fcitx-rime/fcitx-rime-0.2.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-rime/fcitx-rime-0.2.0.ebuild,v 1.3 2013/09/02 08:06:08 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-rime/fcitx-rime-0.2.0.ebuild,v 1.4 2015/04/19 11:46:20 blueness Exp $ EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="https://fcitx.googlecode.com/files/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~ppc ~ppc64 x86" IUSE="" RDEPEND=">=app-i18n/fcitx-4.2.7 diff --git a/app-i18n/fcitx-rime/fcitx-rime-0.2.2.ebuild b/app-i18n/fcitx-rime/fcitx-rime-0.2.2.ebuild index 75db8cf9043f..f25f17a4151f 100644 --- a/app-i18n/fcitx-rime/fcitx-rime-0.2.2.ebuild +++ b/app-i18n/fcitx-rime/fcitx-rime-0.2.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-rime/fcitx-rime-0.2.2.ebuild,v 1.2 2014/03/08 12:04:08 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-rime/fcitx-rime-0.2.2.ebuild,v 1.3 2015/04/19 11:46:20 blueness Exp $ EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 ~ppc ~ppc64 ~x86" IUSE="" RDEPEND=">=app-i18n/fcitx-4.2.8 diff --git a/app-i18n/fcitx-rime/fcitx-rime-0.3.0.ebuild b/app-i18n/fcitx-rime/fcitx-rime-0.3.0.ebuild index 6aa9d7866ca9..0de62d9cc36c 100644 --- a/app-i18n/fcitx-rime/fcitx-rime-0.3.0.ebuild +++ b/app-i18n/fcitx-rime/fcitx-rime-0.3.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-rime/fcitx-rime-0.3.0.ebuild,v 1.1 2014/01/20 15:26:19 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-rime/fcitx-rime-0.3.0.ebuild,v 1.2 2015/04/19 11:46:20 blueness Exp $ EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="" RDEPEND=">=app-i18n/fcitx-4.2.8.1 diff --git a/app-i18n/fcitx-rime/fcitx-rime-0.3.1.ebuild b/app-i18n/fcitx-rime/fcitx-rime-0.3.1.ebuild index 841635a90f84..2af62f972bcf 100644 --- a/app-i18n/fcitx-rime/fcitx-rime-0.3.1.ebuild +++ b/app-i18n/fcitx-rime/fcitx-rime-0.3.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-rime/fcitx-rime-0.3.1.ebuild,v 1.1 2014/05/20 12:58:14 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-rime/fcitx-rime-0.3.1.ebuild,v 1.2 2015/04/19 11:46:20 blueness Exp $ EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="" RDEPEND=">=app-i18n/fcitx-4.2.8.1 diff --git a/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.0.ebuild b/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.0.ebuild index cfedd693d310..90b5a23929a5 100644 --- a/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.0.ebuild +++ b/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.0.ebuild,v 1.1 2013/01/31 09:21:41 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.0.ebuild,v 1.2 2015/04/19 11:47:38 blueness Exp $ EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="http://fcitx.googlecode.com/files/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="" RDEPEND=">=app-i18n/fcitx-4.2.7 diff --git a/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.1.ebuild b/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.1.ebuild index ce53bd3fa2d9..7fec90405652 100644 --- a/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.1.ebuild +++ b/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.1.ebuild,v 1.2 2014/03/08 12:04:23 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.1.ebuild,v 1.3 2015/04/19 11:47:38 blueness Exp $ EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 ~ppc ~ppc64 ~x86" IUSE="" RDEPEND=">=app-i18n/fcitx-4.2.8 diff --git a/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.3.ebuild b/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.3.ebuild index 5ac95cfa18af..9c7041275f25 100644 --- a/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.3.ebuild +++ b/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.3.ebuild,v 1.4 2013/08/03 14:49:04 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.3.ebuild,v 1.5 2015/04/19 12:06:55 blueness Exp $ EAPI=5 inherit cmake-utils gnome2-utils @@ -11,7 +11,7 @@ SRC_URI="http://fcitx.googlecode.com/files/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc x86" +KEYWORDS="amd64 ppc ~ppc64 x86" IUSE="" RDEPEND=">=app-i18n/fcitx-4.2.7[table]" diff --git a/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.4.ebuild b/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.4.ebuild index f72396bdd900..c6b229e23f3e 100644 --- a/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.4.ebuild +++ b/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.4.ebuild,v 1.2 2014/03/08 12:04:40 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.4.ebuild,v 1.3 2015/04/19 12:06:55 blueness Exp $ EAPI=5 inherit cmake-utils gnome2-utils @@ -11,7 +11,7 @@ SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 ~ppc ~ppc64 ~x86" IUSE="" RDEPEND=">=app-i18n/fcitx-4.2.8[table]" diff --git a/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.5.ebuild b/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.5.ebuild index 8780974ba55b..b7da4aa2c50e 100644 --- a/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.5.ebuild +++ b/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.5.ebuild,v 1.1 2014/01/20 15:37:53 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.5.ebuild,v 1.2 2015/04/19 12:06:55 blueness Exp $ EAPI=5 inherit cmake-utils gnome2-utils @@ -11,7 +11,7 @@ SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="" RDEPEND=">=app-i18n/fcitx-4.2.8[table]" diff --git a/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.6.ebuild b/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.6.ebuild index ec766a518a70..bed196778805 100644 --- a/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.6.ebuild +++ b/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.6.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.6.ebuild,v 1.1 2014/11/02 08:45:20 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.6.ebuild,v 1.2 2015/04/19 12:06:55 blueness Exp $ EAPI=5 inherit cmake-utils gnome2-utils @@ -11,7 +11,7 @@ SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="" RDEPEND=">=app-i18n/fcitx-4.2.8[table]" diff --git a/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.7.ebuild b/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.7.ebuild index e929654df299..39abddd96118 100644 --- a/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.7.ebuild +++ b/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.7.ebuild,v 1.1 2015/03/26 13:07:08 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.7.ebuild,v 1.2 2015/04/19 12:06:55 blueness Exp $ EAPI=5 inherit cmake-utils gnome2-utils @@ -11,7 +11,7 @@ SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="" RDEPEND=">=app-i18n/fcitx-4.2.8[table]" diff --git a/app-i18n/fcitx-unikey/fcitx-unikey-0.2.0.ebuild b/app-i18n/fcitx-unikey/fcitx-unikey-0.2.0.ebuild index 9560b9aba489..0018feb25bc8 100644 --- a/app-i18n/fcitx-unikey/fcitx-unikey-0.2.0.ebuild +++ b/app-i18n/fcitx-unikey/fcitx-unikey-0.2.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-unikey/fcitx-unikey-0.2.0.ebuild,v 1.4 2013/08/03 14:49:19 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-unikey/fcitx-unikey-0.2.0.ebuild,v 1.5 2015/04/19 12:05:06 blueness Exp $ EAPI=5 inherit cmake-utils gnome2-utils @@ -11,7 +11,7 @@ SRC_URI="http://fcitx.googlecode.com/files/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ppc x86" +KEYWORDS="amd64 ppc ~ppc64 x86" IUSE="+qt4" RDEPEND=">=app-i18n/fcitx-4.2.7[qt4?]" diff --git a/app-i18n/fcitx-unikey/fcitx-unikey-0.2.2.ebuild b/app-i18n/fcitx-unikey/fcitx-unikey-0.2.2.ebuild index 16e0dcef3190..501fb53715d2 100644 --- a/app-i18n/fcitx-unikey/fcitx-unikey-0.2.2.ebuild +++ b/app-i18n/fcitx-unikey/fcitx-unikey-0.2.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-unikey/fcitx-unikey-0.2.2.ebuild,v 1.2 2014/03/08 12:04:57 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-unikey/fcitx-unikey-0.2.2.ebuild,v 1.3 2015/04/19 12:05:06 blueness Exp $ EAPI=5 inherit cmake-utils gnome2-utils @@ -11,7 +11,7 @@ SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 ~ppc ~ppc64 ~x86" IUSE="+qt4" RDEPEND=">=app-i18n/fcitx-4.2.8[qt4?]" diff --git a/app-i18n/fcitx-unikey/fcitx-unikey-0.2.3.ebuild b/app-i18n/fcitx-unikey/fcitx-unikey-0.2.3.ebuild index 9e6f963e4d4f..2c030e8dd38a 100644 --- a/app-i18n/fcitx-unikey/fcitx-unikey-0.2.3.ebuild +++ b/app-i18n/fcitx-unikey/fcitx-unikey-0.2.3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-unikey/fcitx-unikey-0.2.3.ebuild,v 1.1 2014/02/27 10:41:48 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-unikey/fcitx-unikey-0.2.3.ebuild,v 1.2 2015/04/19 12:05:06 blueness Exp $ EAPI=5 inherit cmake-utils gnome2-utils @@ -11,7 +11,7 @@ SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="+qt4" RDEPEND=">=app-i18n/fcitx-4.2.8[qt4?]" diff --git a/app-i18n/fcitx-unikey/fcitx-unikey-0.2.4.ebuild b/app-i18n/fcitx-unikey/fcitx-unikey-0.2.4.ebuild index d027480ad0ad..679f52478026 100644 --- a/app-i18n/fcitx-unikey/fcitx-unikey-0.2.4.ebuild +++ b/app-i18n/fcitx-unikey/fcitx-unikey-0.2.4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-unikey/fcitx-unikey-0.2.4.ebuild,v 1.1 2014/11/02 08:47:44 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-unikey/fcitx-unikey-0.2.4.ebuild,v 1.2 2015/04/19 12:05:06 blueness Exp $ EAPI=5 inherit cmake-utils gnome2-utils @@ -11,7 +11,7 @@ SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="+qt4" RDEPEND=">=app-i18n/fcitx-4.2.8[qt4?]" diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-0.4.2.ebuild b/app-i18n/kcm-fcitx/kcm-fcitx-0.4.2.ebuild index e3c1e209c4e9..22ad7f4cba3b 100644 --- a/app-i18n/kcm-fcitx/kcm-fcitx-0.4.2.ebuild +++ b/app-i18n/kcm-fcitx/kcm-fcitx-0.4.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/kcm-fcitx/kcm-fcitx-0.4.2.ebuild,v 1.4 2013/08/03 14:49:31 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/kcm-fcitx/kcm-fcitx-0.4.2.ebuild,v 1.5 2015/04/19 11:44:30 blueness Exp $ EAPI=5 inherit kde4-base @@ -11,7 +11,7 @@ SRC_URI="http://fcitx.googlecode.com/files/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ppc x86" +KEYWORDS="amd64 ppc ~ppc64 x86" IUSE="" RDEPEND=">=app-i18n/fcitx-4.2.7[qt4] diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-0.4.3.ebuild b/app-i18n/kcm-fcitx/kcm-fcitx-0.4.3.ebuild index 75789932ba24..0f9fa3de72fe 100644 --- a/app-i18n/kcm-fcitx/kcm-fcitx-0.4.3.ebuild +++ b/app-i18n/kcm-fcitx/kcm-fcitx-0.4.3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/kcm-fcitx/kcm-fcitx-0.4.3.ebuild,v 1.2 2014/03/08 12:05:15 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/kcm-fcitx/kcm-fcitx-0.4.3.ebuild,v 1.3 2015/04/19 11:44:30 blueness Exp $ EAPI=5 inherit kde4-base @@ -11,7 +11,7 @@ SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 ~ppc ~ppc64 ~x86" IUSE="" RDEPEND=">=app-i18n/fcitx-4.2.8[qt4] diff --git a/app-i18n/libhangul/libhangul-0.0.10.ebuild b/app-i18n/libhangul/libhangul-0.0.10.ebuild index d82f1fd25b3f..2cddf12e8bd8 100644 --- a/app-i18n/libhangul/libhangul-0.0.10.ebuild +++ b/app-i18n/libhangul/libhangul-0.0.10.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/libhangul/libhangul-0.0.10.ebuild,v 1.7 2014/08/10 17:49:37 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/libhangul/libhangul-0.0.10.ebuild,v 1.8 2015/04/19 11:35:36 blueness Exp $ DESCRIPTION="libhangul is a generalized and portable library for processing hangul" HOMEPAGE="http://kldp.net/projects/hangul/" @@ -8,7 +8,7 @@ SRC_URI="http://kldp.net/frs/download.php/5417/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ppc x86" +KEYWORDS="amd64 ppc ~ppc64 x86" IUSE="" src_install() { diff --git a/app-i18n/libhangul/libhangul-0.0.12.ebuild b/app-i18n/libhangul/libhangul-0.0.12.ebuild index ae7b83e8c700..b952058a925e 100644 --- a/app-i18n/libhangul/libhangul-0.0.12.ebuild +++ b/app-i18n/libhangul/libhangul-0.0.12.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/libhangul/libhangul-0.0.12.ebuild,v 1.7 2014/08/10 17:49:37 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/libhangul/libhangul-0.0.12.ebuild,v 1.8 2015/04/19 11:35:36 blueness Exp $ EAPI="3" @@ -10,7 +10,7 @@ SRC_URI="http://kldp.net/frs/download.php/5855/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ppc x86" +KEYWORDS="amd64 ppc ~ppc64 x86" IUSE="nls static-libs test" RDEPEND="nls? ( virtual/libintl )" diff --git a/app-i18n/libhangul/libhangul-0.1.0.ebuild b/app-i18n/libhangul/libhangul-0.1.0.ebuild index 43ca4b639af6..a5c9c46c3f77 100644 --- a/app-i18n/libhangul/libhangul-0.1.0.ebuild +++ b/app-i18n/libhangul/libhangul-0.1.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/libhangul/libhangul-0.1.0.ebuild,v 1.6 2014/08/10 17:49:37 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/libhangul/libhangul-0.1.0.ebuild,v 1.7 2015/04/19 11:35:36 blueness Exp $ EAPI=4 @@ -10,7 +10,7 @@ SRC_URI="http://libhangul.googlecode.com/files/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ~ppc x86" +KEYWORDS="amd64 ~ppc ~ppc64 x86" IUSE="nls static-libs test" RDEPEND="nls? ( virtual/libintl )" diff --git a/app-i18n/libpinyin/libpinyin-0.8.0.ebuild b/app-i18n/libpinyin/libpinyin-0.8.0.ebuild index a96cffee541c..61d40e0653f8 100644 --- a/app-i18n/libpinyin/libpinyin-0.8.0.ebuild +++ b/app-i18n/libpinyin/libpinyin-0.8.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/libpinyin/libpinyin-0.8.0.ebuild,v 1.4 2013/08/03 14:49:45 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/libpinyin/libpinyin-0.8.0.ebuild,v 1.5 2015/04/19 11:42:57 blueness Exp $ EAPI=5 inherit autotools eutils @@ -12,7 +12,7 @@ SRC_URI="mirror://github/${PN}/${PN}/${PN}-lite-${PV}.tar.gz -> ${P}.tar LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc x86" +KEYWORDS="amd64 ppc ~ppc64 x86" IUSE="" RDEPEND="=sys-libs/db-4* diff --git a/app-i18n/libpinyin/libpinyin-0.9.93.ebuild b/app-i18n/libpinyin/libpinyin-0.9.93.ebuild index 7ecdf8fd715f..bd94e11aab47 100644 --- a/app-i18n/libpinyin/libpinyin-0.9.93.ebuild +++ b/app-i18n/libpinyin/libpinyin-0.9.93.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/libpinyin/libpinyin-0.9.93.ebuild,v 1.1 2013/07/24 12:14:17 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/libpinyin/libpinyin-0.9.93.ebuild,v 1.2 2015/04/19 11:42:57 blueness Exp $ EAPI=5 inherit autotools eutils @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/${PN}-lite-${PV}.tar.gz -> ${P}.tar LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="" RDEPEND="=sys-libs/db-4* diff --git a/app-i18n/libpinyin/libpinyin-1.0.0.ebuild b/app-i18n/libpinyin/libpinyin-1.0.0.ebuild index 3c139e00cf2b..f8865cfc0138 100644 --- a/app-i18n/libpinyin/libpinyin-1.0.0.ebuild +++ b/app-i18n/libpinyin/libpinyin-1.0.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/libpinyin/libpinyin-1.0.0.ebuild,v 1.4 2015/03/02 10:13:50 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/libpinyin/libpinyin-1.0.0.ebuild,v 1.5 2015/04/19 11:42:57 blueness Exp $ EAPI=5 inherit autotools eutils @@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/${PN}-lite-${PV}.tar.gz -> ${P}.tar LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm64 x86" +KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86" IUSE="" RDEPEND="=sys-libs/db-4* diff --git a/app-i18n/librime/librime-0.9.9.ebuild b/app-i18n/librime/librime-0.9.9.ebuild index e2355c5559f6..acf310e3c23d 100644 --- a/app-i18n/librime/librime-0.9.9.ebuild +++ b/app-i18n/librime/librime-0.9.9.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/librime/librime-0.9.9.ebuild,v 1.4 2013/09/02 08:06:22 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/librime/librime-0.9.9.ebuild,v 1.5 2015/04/19 11:37:13 blueness Exp $ EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="http://rimeime.googlecode.com/files/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~ppc ~ppc64 x86" IUSE="static-libs test" RDEPEND="app-i18n/opencc diff --git a/app-i18n/librime/librime-1.1-r1.ebuild b/app-i18n/librime/librime-1.1-r1.ebuild index 322bf66e34c2..84ad8f0d198e 100644 --- a/app-i18n/librime/librime-1.1-r1.ebuild +++ b/app-i18n/librime/librime-1.1-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/librime/librime-1.1-r1.ebuild,v 1.1 2014/04/08 23:27:37 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/librime/librime-1.1-r1.ebuild,v 1.2 2015/04/19 11:37:13 blueness Exp $ EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="http://rimeime.googlecode.com/files/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="static-libs test" RDEPEND="app-i18n/opencc diff --git a/app-i18n/librime/librime-1.2.ebuild b/app-i18n/librime/librime-1.2.ebuild index c94bad7305d4..2927a30591df 100644 --- a/app-i18n/librime/librime-1.2.ebuild +++ b/app-i18n/librime/librime-1.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/librime/librime-1.2.ebuild,v 1.3 2014/08/22 02:51:26 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/librime/librime-1.2.ebuild,v 1.4 2015/04/19 11:37:13 blueness Exp $ EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="http://dl.bintray.com/lotem/rime/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="static-libs test" RDEPEND="app-i18n/opencc diff --git a/app-i18n/rime-data/rime-data-0.22.ebuild b/app-i18n/rime-data/rime-data-0.22.ebuild index 02f10732467a..0d1ad37f1b9f 100644 --- a/app-i18n/rime-data/rime-data-0.22.ebuild +++ b/app-i18n/rime-data/rime-data-0.22.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/rime-data/rime-data-0.22.ebuild,v 1.3 2013/09/02 08:06:16 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/rime-data/rime-data-0.22.ebuild,v 1.4 2015/04/19 11:38:47 blueness Exp $ EAPI=4 @@ -12,7 +12,7 @@ SRC_URI="http://rimeime.googlecode.com/files/${MY_P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~ppc ~ppc64 x86" IUSE="" DEPEND="app-i18n/librime" diff --git a/app-i18n/rime-data/rime-data-0.32.ebuild b/app-i18n/rime-data/rime-data-0.32.ebuild index 36d999d767f7..cbb69bd1db6a 100644 --- a/app-i18n/rime-data/rime-data-0.32.ebuild +++ b/app-i18n/rime-data/rime-data-0.32.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/rime-data/rime-data-0.32.ebuild,v 1.1 2014/01/11 01:10:00 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/rime-data/rime-data-0.32.ebuild,v 1.2 2015/04/19 11:38:47 blueness Exp $ EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="http://rimeime.googlecode.com/files/${MY_P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="" DEPEND="app-i18n/librime" diff --git a/app-i18n/rime-data/rime-data-0.35.ebuild b/app-i18n/rime-data/rime-data-0.35.ebuild index dabd5537748a..84f84514d568 100644 --- a/app-i18n/rime-data/rime-data-0.35.ebuild +++ b/app-i18n/rime-data/rime-data-0.35.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/rime-data/rime-data-0.35.ebuild,v 1.1 2014/08/01 06:50:36 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/rime-data/rime-data-0.35.ebuild,v 1.2 2015/04/19 11:38:47 blueness Exp $ EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="http://dl.bintray.com/lotem/rime/${MY_P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="" DEPEND="app-i18n/librime" diff --git a/app-i18n/sunpinyin-data/sunpinyin-data-20121025.ebuild b/app-i18n/sunpinyin-data/sunpinyin-data-20121025.ebuild index d31772ca7737..06b48ba4b4a8 100644 --- a/app-i18n/sunpinyin-data/sunpinyin-data-20121025.ebuild +++ b/app-i18n/sunpinyin-data/sunpinyin-data-20121025.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/sunpinyin-data/sunpinyin-data-20121025.ebuild,v 1.1 2013/01/30 13:33:55 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/sunpinyin-data/sunpinyin-data-20121025.ebuild,v 1.2 2015/04/19 11:34:01 blueness Exp $ EAPI=5 @@ -14,7 +14,7 @@ SRC_URI="http://open-gram.googlecode.com/files/dict.utf8-${DICT_VERSION}.tar.bz2 LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="" DEPEND=">=app-i18n/sunpinyin-2.0.4_pre20130108" diff --git a/app-i18n/sunpinyin-data/sunpinyin-data-20130220.ebuild b/app-i18n/sunpinyin-data/sunpinyin-data-20130220.ebuild index 33855e7047b8..0db55f6e13f7 100644 --- a/app-i18n/sunpinyin-data/sunpinyin-data-20130220.ebuild +++ b/app-i18n/sunpinyin-data/sunpinyin-data-20130220.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/sunpinyin-data/sunpinyin-data-20130220.ebuild,v 1.2 2014/03/08 12:05:45 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/sunpinyin-data/sunpinyin-data-20130220.ebuild,v 1.3 2015/04/19 11:34:01 blueness Exp $ EAPI=5 @@ -14,7 +14,7 @@ SRC_URI="http://open-gram.googlecode.com/files/dict.utf8-${DICT_VERSION}.tar.bz2 LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 ~ppc ~ppc64 ~x86" IUSE="" DEPEND=">=app-i18n/sunpinyin-2.0.4_pre20130108" diff --git a/app-i18n/sunpinyin/sunpinyin-2.0.3-r1.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.3-r1.ebuild index d170d227dfc4..dd95b23e204e 100644 --- a/app-i18n/sunpinyin/sunpinyin-2.0.3-r1.ebuild +++ b/app-i18n/sunpinyin/sunpinyin-2.0.3-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/sunpinyin/sunpinyin-2.0.3-r1.ebuild,v 1.4 2012/05/03 19:24:34 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/sunpinyin/sunpinyin-2.0.3-r1.ebuild,v 1.5 2015/04/19 11:33:18 blueness Exp $ EAPI="3" @@ -14,7 +14,7 @@ SRC_URI="${HOMEPAGE}/files/${P}.tar.gz LICENSE="LGPL-2.1 CDDL" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="" RDEPEND="dev-db/sqlite:3" diff --git a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108.ebuild index d83cea9835dd..ff36b516c03e 100644 --- a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108.ebuild +++ b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108.ebuild,v 1.3 2014/03/08 12:05:30 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108.ebuild,v 1.4 2015/04/19 11:33:18 blueness Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) @@ -12,7 +12,7 @@ SRC_URI="http://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz" LICENSE="LGPL-2.1 CDDL" SLOT="0/1" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 ~ppc ~ppc64 ~x86" IUSE="" RDEPEND="dev-db/sqlite:3" diff --git a/app-laptop/thinkfan/thinkfan-0.9.2-r1.ebuild b/app-laptop/thinkfan/thinkfan-0.9.2-r1.ebuild index 7ca4ba92f825..68a74d3f5946 100644 --- a/app-laptop/thinkfan/thinkfan-0.9.2-r1.ebuild +++ b/app-laptop/thinkfan/thinkfan-0.9.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-laptop/thinkfan/thinkfan-0.9.2-r1.ebuild,v 1.2 2015/03/27 16:29:08 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-laptop/thinkfan/thinkfan-0.9.2-r1.ebuild,v 1.3 2015/04/19 09:45:20 pacho Exp $ EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="atasmart" DEPEND="atasmart? ( dev-libs/libatasmart )" diff --git a/app-misc/boxes/boxes-1.1.2-r1.ebuild b/app-misc/boxes/boxes-1.1.2-r1.ebuild index 2b0cbf898f11..3ec4c0726e21 100644 --- a/app-misc/boxes/boxes-1.1.2-r1.ebuild +++ b/app-misc/boxes/boxes-1.1.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/boxes/boxes-1.1.2-r1.ebuild,v 1.4 2015/04/14 10:52:15 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/boxes/boxes-1.1.2-r1.ebuild,v 1.5 2015/04/19 09:47:34 ago Exp $ EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="https://github.com/ascii-boxes/boxes/archive/v${PV}.tar.gz -> ${P}.tar. LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="alpha amd64 ia64 ~mips ~ppc ~ppc64 ~sparc x86" IUSE="" DEPEND=" diff --git a/app-misc/delay/delay-1.6-r2.ebuild b/app-misc/delay/delay-1.6-r2.ebuild index dc6c55a144b0..48f2153324d1 100644 --- a/app-misc/delay/delay-1.6-r2.ebuild +++ b/app-misc/delay/delay-1.6-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/delay/delay-1.6-r2.ebuild,v 1.4 2015/03/02 09:32:03 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/delay/delay-1.6-r2.ebuild,v 1.5 2015/04/19 09:46:38 pacho Exp $ EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="http://onegeek.org/~tom/software/delay/dl/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~mips ppc ~ppc64 ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos" +KEYWORDS="amd64 ~mips ppc ~ppc64 x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos" RDEPEND="sys-libs/ncurses" DEPEND=" diff --git a/app-misc/gentoo/gentoo-0.20.6.ebuild b/app-misc/gentoo/gentoo-0.20.6.ebuild index d5991b207b0f..42d0a39c5bc5 100644 --- a/app-misc/gentoo/gentoo-0.20.6.ebuild +++ b/app-misc/gentoo/gentoo-0.20.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/gentoo/gentoo-0.20.6.ebuild,v 1.4 2015/04/14 12:15:02 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/gentoo/gentoo-0.20.6.ebuild,v 1.5 2015/04/19 09:37:46 ago Exp $ EAPI=5 inherit autotools eutils @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 hppa ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 hppa ia64 ~ppc ~ppc64 ~sparc x86" IUSE="nls" RDEPEND=" diff --git a/app-misc/oneko/Manifest b/app-misc/oneko/Manifest index 85cd9443749c..45c190943c6e 100644 --- a/app-misc/oneko/Manifest +++ b/app-misc/oneko/Manifest @@ -2,4 +2,3 @@ DIST oneko-1.2-cat.png 223 SHA256 994dec71c4021f4e228b8c69fcefde5b11244445ff8ff6 DIST oneko-1.2-dog.png 236 SHA256 5ca2d41b5538618196cfe9e40dd75856fde77fe35cba99ed9b2eacf1fb0e5502 SHA512 11e4a4ecfba26a0ea782846ca288da7ba3f68629dc8f4b0d7987923f06afe57971d53c9161ed13711a9a1f737ea3d8ec76f559311dd10234dca49cfa9d20f533 WHIRLPOOL d6c1545191d46de1a782668b1b29de6e483359a1346efa79adb1a24b6660b55f054d37707d0103ec002ce34a2924f82a6e01d1f84fc4c33337c925991fbfbfc6 DIST oneko-1.2-sakura-nobsd.patch.bz2 2967 SHA256 335965399706844874a9700d70f66d53a862efa8f49297d67c5ac9f7ab7ec37a SHA512 dbab7471b1c76d8bd7b0c0f9512ce274d98b7e96e8f1cb781a07b031d3a23c0c716222465dee16ad77f658c681116e71e6f8f50ab45ee8f24d132e24fed6849e WHIRLPOOL c600481394d45c5d3f3a7e20a94f5dfeb65ba0101c9609ea185e6b99207ab1f7ff7701a110287f19271fa63c5aac4672c6550884b6491a240f6b99eff1420925 DIST oneko-1.2.sakura.5.tar.gz 76825 SHA256 2c2e05f1241e9b76f54475b5577cd4fb6670de058218d04a741a04ebd4a2b22f SHA512 328bc267c027dc2bf9f4d0bf7a3a5cfb0f77e7ffe566dad58ba8728a8d72f905ef0b1b92fea77179d1e79886aea8a6b27cda44dc227d96b69ed34b4fdde3ec15 WHIRLPOOL 084c6e44ca0fec0352d227fb2e81427f2a1fb5e3be2153a5e4467e26b2280899b418f2869c63214d7a687a9e32858fe4860fe9c8b276f9917539ee03f386161f -DIST oneko-1.2.tar.gz 56353 SHA256 ec3332b757ed34de0ec7383b478cd94c841e7e3305518bcb44bd031579e37a01 SHA512 bab89130df19ed7118c4fff4c6f1817e1462b060e0644baea08466a5567a9e7df57fd99914af3aca7c6184ea7b4bc5129c803ecb4e993e9488f5af529878ea11 WHIRLPOOL cb31108556b1614376cc9ffcb252c47e0f027d2d144c09952ed13ce18dd74116870117768339c8ab3d11476759a96d458727e1ee76b5fd72a335e98622d68f58 diff --git a/app-misc/oneko/files/oneko-1.2-include.patch b/app-misc/oneko/files/oneko-1.2-include.patch index 61d0a03f46b9..70b3c2405a5c 100644 --- a/app-misc/oneko/files/oneko-1.2-include.patch +++ b/app-misc/oneko/files/oneko-1.2-include.patch @@ -1,5 +1,5 @@ ---- a/oneko.h 2010-09-17 04:05:11.000000000 +0200 -+++ b/oneko.h 2010-09-17 04:15:18.000000000 +0200 +--- a/oneko.h ++++ b/oneko.h @@ -14,6 +14,7 @@ #include diff --git a/app-misc/oneko/oneko-1.2-r1.ebuild b/app-misc/oneko/oneko-1.2-r1.ebuild deleted file mode 100644 index c45a4f815214..000000000000 --- a/app-misc/oneko/oneko-1.2-r1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/oneko/oneko-1.2-r1.ebuild,v 1.5 2012/11/16 14:41:39 ulm Exp $ - -inherit eutils - -DESCRIPTION="A cat, dog and others which chase the mouse or windows around the screen" -HOMEPAGE="http://www.daidouji.com/oneko/" -SRC_URI="http://www.daidouji.com/oneko/distfiles/${P}.sakura.5.tar.gz - mirror://gentoo/${P}-cat.png - mirror://gentoo/${P}-dog.png - mirror://gentoo/${P}-sakura-nobsd.patch.bz2" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="~amd64 ~ppc ppc64 x86" -IUSE="" - -RDEPEND="x11-libs/libX11 - x11-libs/libXext" -DEPEND="${RDEPEND} - x11-misc/gccmakedep - x11-misc/imake - app-text/rman - x11-proto/xextproto" - -S="${WORKDIR}/oneko-${PV}.sakura.5" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${WORKDIR}/${P}-sakura-nobsd.patch" -} - -src_compile() { - xmkmf -a || die "running xmkmf failed!" - emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "make failed!" -} - -src_install() { - into /usr - dobin oneko - mv oneko._man oneko.1x - doman oneko.1x - dodoc README README-NEW README-SUPP - newicon "${DISTDIR}/${P}-cat.png" "cat.png" - newicon "${DISTDIR}/${P}-dog.png" "dog.png" - make_desktop_entry "oneko" "oneko (cat)" "cat" "Game;Amusement" - make_desktop_entry "oneko -dog" "oneko (dog)" "dog" "Game;Amusement" - make_desktop_entry "killall -TERM oneko" "oneko kill" "" "Game;Amusement" -} - -pkg_postinst() { - elog "To kill oneko, type the following in a terminal:" - elog "" - elog "killall oneko" - elog "" - elog "If your mouse cursor changes to the default black cross" - elog "after running ${PN}, you should emerge x11-apps/xsetroot" - elog "and run:" - elog "" - elog "xsetroot -cursor_name left_ptr" - elog "" -} diff --git a/app-misc/oneko/oneko-1.2-r2.ebuild b/app-misc/oneko/oneko-1.2-r2.ebuild index 5ae0318a3cb8..b20bc176b12a 100644 --- a/app-misc/oneko/oneko-1.2-r2.ebuild +++ b/app-misc/oneko/oneko-1.2-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/oneko/oneko-1.2-r2.ebuild,v 1.7 2014/08/09 12:04:35 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/oneko/oneko-1.2-r2.ebuild,v 1.8 2015/04/18 12:46:53 pacho Exp $ EAPI=5 inherit eutils toolchain-funcs @@ -14,7 +14,7 @@ SRC_URI="http://www.daidouji.com/oneko/distfiles/${P}.sakura.5.tar.gz LICENSE="public-domain" SLOT="0" -KEYWORDS="amd64 ppc ~ppc64 x86" +KEYWORDS="amd64 ppc ppc64 x86" RDEPEND=" x11-libs/libX11 diff --git a/app-misc/oneko/oneko-1.2.ebuild b/app-misc/oneko/oneko-1.2.ebuild deleted file mode 100644 index ce101cc5da8f..000000000000 --- a/app-misc/oneko/oneko-1.2.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/oneko/oneko-1.2.ebuild,v 1.19 2012/11/16 14:41:39 ulm Exp $ - -DESCRIPTION="A cat (or dog) which chases the mouse around the screen" -HOMEPAGE="http://agtoys.sourceforge.net" -SRC_URI="http://agtoys.sourceforge.net/oneko/${P}.tar.gz" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="x86 amd64 ppc ppc64" -IUSE="" - -RDEPEND="x11-libs/libX11 - x11-libs/libXext" -DEPEND="${RDEPEND} - x11-misc/gccmakedep - x11-misc/imake - app-text/rman - x11-proto/xextproto" - -src_compile() { - xmkmf -a || die - emake || die -} - -src_install() { - into /usr - dobin oneko - mv oneko._man oneko.1x - doman oneko.1x - dodoc oneko.1x.html oneko.1.html README README-NEW -} diff --git a/app-mobilephone/gammu/Manifest b/app-mobilephone/gammu/Manifest index ad8c4f00dbd4..40e50c604033 100644 --- a/app-mobilephone/gammu/Manifest +++ b/app-mobilephone/gammu/Manifest @@ -1,3 +1 @@ -DIST gammu-1.28.0.tar.bz2 2391956 SHA256 f620bbb48c15c730cae39feb3e729c6ca070e59ab4e9dee624cc35eae416bf16 SHA512 a183acb6d8120c432630d75cee70e608d3030243084ca1e90c76469d81b358a6e5c16da651a031fb8620410bb131efdaf3926e81662ef3c8356a8631b90f5be7 WHIRLPOOL 5fd3bec505cd66bda14a1949599116fee7b64a00c1ec1621d0af7a35d9cc2b92151f78ba3efdc16be7b7d5a0f539ae0e5e1ed3303294fae7f82042f231b55dc2 -DIST gammu-1.32.0.tar.bz2 6296184 SHA256 de67caa102aa4c8fbed5300e5a0262e40411c4cc79f4379a8d34eed797968fc3 SHA512 8758085c3c3ecb34710513d04ec0e686c8bf06f2c3b60c618eaf77e42eba047f0dbc2898cfbc0c31c0811f30a6c2955cc372e3cb819e7ff41224f55ef1df187d WHIRLPOOL 717ca87674639429a45759b56859c49420e612a8f703003671ca00232ae99ad1424b012d525a65a306baf0ed856d8a61e72105bc89537fcfc12d7bd1210626a4 DIST gammu-1.33.0.tar.bz2 6535262 SHA256 b326223e36a334dbaed68252a9cf2d90fd898d6de4d1085dcf9c2320881aece3 SHA512 42252a36c7ad5a2945fcf23fcb1b5bb0201d27e8830d3b4a7f4c36bf00f12f5a0f7797e17098bda8d526d4ddc3b1808c0786dfae0feef9424516fa68bf2f3f1e WHIRLPOOL 27c0110da7b686bc7dd19f4f897c59d4e66aa6dbec78dec208fa8c90f70b80c1375c7b8a4b54fe40295d388de61efb11695823a503d1f85a46797c97ddf988fa diff --git a/app-mobilephone/gammu/files/gammu-1.25.0-skip-locktest.patch b/app-mobilephone/gammu/files/gammu-1.25.0-skip-locktest.patch deleted file mode 100644 index 65a7be0f743c..000000000000 --- a/app-mobilephone/gammu/files/gammu-1.25.0-skip-locktest.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nru gammu-1.25.0.orig/tests/CMakeLists.txt gammu-1.25.0/tests/CMakeLists.txt ---- gammu-1.25.0.orig/tests/CMakeLists.txt 2009-08-16 01:08:09.000000000 +0200 -+++ gammu-1.25.0/tests/CMakeLists.txt 2009-08-16 01:40:36.000000000 +0200 -@@ -645,7 +645,7 @@ - - # Test for locking, only on !WIN32 and if we can write to lock dir - if (NOT WIN32) -- execute_process(COMMAND test -w /var/lock/ RESULT_VARIABLE VAR_LOCK_WRITABLE) -+ set (VAR_LOCK_WRITABLE 1) - if (VAR_LOCK_WRITABLE EQUAL 0) - add_executable(locking locking.c) - target_link_libraries(locking libGammu) diff --git a/app-mobilephone/gammu/gammu-1.28.0.ebuild b/app-mobilephone/gammu/gammu-1.28.0.ebuild deleted file mode 100644 index a908faf6fcc5..000000000000 --- a/app-mobilephone/gammu/gammu-1.28.0.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/gammu-1.28.0.ebuild,v 1.8 2014/12/28 14:49:38 titanofold Exp $ - -EAPI="3" - -PYTHON_DEPEND="python? 2" - -inherit eutils cmake-utils python - -DESCRIPTION="A tool to handle your cellular phone" -HOMEPAGE="http://www.wammu.eu/" -SRC_URI="http://dl.cihar.com/gammu/releases/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="curl debug bluetooth irda mysql postgres dbi nls python usb" - -RDEPEND="bluetooth? ( net-wireless/bluez ) - curl? ( net-misc/curl ) - usb? ( virtual/libusb:1 ) - mysql? ( virtual/mysql ) - postgres? ( dev-db/postgresql[server] ) - dbi? ( >=dev-db/libdbi-0.8.3 ) - dev-util/dialog - !dev-python/python-gammu" # needs to be removed from the tree -DEPEND="${RDEPEND} - irda? ( virtual/os-headers ) - nls? ( sys-devel/gettext ) - dev-util/cmake" - -# sys-devel/gettext is needed for creating .mo files -# Supported languages and translated documentation -# Be sure all languages are prefixed with a single space! -MY_AVAILABLE_LINGUAS=" af bg ca cs da de el es et fi fr gl he hu id it ko nl pl pt_BR ru sk sv sw zh_CN zh_TW" -IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}" - -pkg_setup() { - if use python; then - python_set_active_version 2 - python_pkg_setup - fi -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-skip-locktest.patch - - local lang support_linguas=no - for lang in ${MY_AVAILABLE_LINGUAS} ; do - if use linguas_${lang} ; then - support_linguas=yes - break - fi - done - # install all languages when all selected LINGUAS aren't supported - if [ "${support_linguas}" = "yes" ]; then - for lang in ${MY_AVAILABLE_LINGUAS} ; do - if ! use linguas_${lang} ; then - rm -rf locale/${lang} || die - fi - done - fi -} - -src_configure() { - # debug flag is used inside cmake-utils.eclass - local mycmakeargs="$(cmake-utils_use_with bluetooth Bluez) \ - $(cmake-utils_use_with irda IRDA) \ - $(cmake-utils_use_with curl CURL) \ - $(cmake-utils_use_with usb USB) \ - $(cmake-utils_use_with python PYTHON) \ - $(cmake-utils_use_with mysql MySQL) \ - $(cmake-utils_use_with postgres Postgres) \ - $(cmake-utils_use_with dbi LibDBI) \ - $(cmake-utils_use_with nls GettextLibs) \ - $(cmake-utils_use_with nls Iconv) \ - -DBUILD_SHARED_LIBS=ON -DINSTALL_DOC_DIR=share/doc/${PF}" - if use python; then - mycmakeargs="${mycmakeargs} -DBUILD_PYTHON=$(PYTHON -a)" - fi - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_test() { - LD_LIBRARY_PATH="${WORKDIR}"/${PN}_build/common cmake-utils_src_test -} - -src_install() { - cmake-utils_src_install -} - -pkg_postinst() { - use python && python_mod_optimize gammu -} - -pkg_postrm() { - use python && python_mod_cleanup gammu -} diff --git a/app-mobilephone/gammu/gammu-1.32.0-r1.ebuild b/app-mobilephone/gammu/gammu-1.32.0-r1.ebuild deleted file mode 100644 index 0bd29e67da68..000000000000 --- a/app-mobilephone/gammu/gammu-1.32.0-r1.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/gammu-1.32.0-r1.ebuild,v 1.3 2014/12/28 14:49:38 titanofold Exp $ - -EAPI=5 - -PYTHON_DEPEND="python? 2" - -inherit eutils cmake-utils python - -DESCRIPTION="A tool to handle your cellular phone" -HOMEPAGE="http://www.wammu.eu/" -SRC_URI="http://dl.cihar.com/${PN}/releases/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="bash-completion bluetooth curl dbi debug irda mysql nls postgres python usb" - -RDEPEND="bluetooth? ( net-wireless/bluez ) - curl? ( net-misc/curl ) - usb? ( virtual/libusb:1 ) - mysql? ( virtual/mysql ) - postgres? ( dev-db/postgresql[server] ) - dbi? ( >=dev-db/libdbi-0.8.3 ) - dev-util/dialog" -DEPEND="${RDEPEND} - irda? ( virtual/os-headers ) - nls? ( sys-devel/gettext )" - -# sys-devel/gettext is needed for creating .mo files -# Supported languages and translated documentation -# Be sure all languages are prefixed with a single space! -MY_AVAILABLE_LINGUAS=" af ar bg ca cs da de el en_GB es et fi fr gl he hu id it ko nl pl pt_BR ru sk sv sw tr zh_CN zh_TW" -IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}" - -pkg_setup() { - if use python; then - python_set_active_version 2 - python_pkg_setup - fi -} - -src_prepare() { - epatch "${FILESDIR}/${PN}-skip-locktest.patch" - epatch "${FILESDIR}/${PN}-1.32.0-bashcompdir.patch" - - local lang support_linguas=no - for lang in ${MY_AVAILABLE_LINGUAS} ; do - if use linguas_${lang} ; then - support_linguas=yes - break - fi - done - # install all languages when all selected LINGUAS aren't supported - if [ "${support_linguas}" = "yes" ]; then - for lang in ${MY_AVAILABLE_LINGUAS} ; do - if ! use linguas_${lang} ; then - rm -rf locale/${lang} || die - fi - done - fi -} - -src_configure() { - # debug flag is used inside cmake-utils.eclass - local mycmakeargs=( - $(cmake-utils_use_with bluetooth Bluez) \ - $(cmake-utils_use_with irda IRDA) \ - $(cmake-utils_use_with curl CURL) \ - $(cmake-utils_use_with usb USB) \ - $(cmake-utils_use_with python PYTHON) \ - $(cmake-utils_use_with mysql MySQL) \ - $(cmake-utils_use_with postgres Postgres) \ - $(cmake-utils_use_with dbi LibDBI) \ - $(cmake-utils_use_with nls GettextLibs) \ - $(cmake-utils_use_with nls Iconv) \ - -DBUILD_SHARED_LIBS=ON \ - -DINSTALL_DOC_DIR="share/doc/${PF}" - ) - if ! use bash-completion; then - mycmakeargs+=( -DINSTALL_BASH_COMPLETION=OFF ) - fi - if use python; then - mycmakeargs+=( -DBUILD_PYTHON="$(PYTHON -a)" ) - fi - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_test() { - LD_LIBRARY_PATH="${WORKDIR}/${PN}_build/common" cmake-utils_src_test -} - -src_install() { - cmake-utils_src_install -} - -pkg_postinst() { - use python && python_mod_optimize gammu -} - -pkg_postrm() { - use python && python_mod_cleanup gammu -} diff --git a/app-mobilephone/gammu/gammu-1.33.0.ebuild b/app-mobilephone/gammu/gammu-1.33.0.ebuild index 9264aac8936c..4c6f88ca9e50 100644 --- a/app-mobilephone/gammu/gammu-1.33.0.ebuild +++ b/app-mobilephone/gammu/gammu-1.33.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/gammu-1.33.0.ebuild,v 1.4 2015/04/08 13:13:43 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/gammu-1.33.0.ebuild,v 1.5 2015/04/19 09:47:53 ago Exp $ EAPI=5 @@ -14,7 +14,7 @@ SRC_URI="http://dl.cihar.com/${PN}/releases/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="bash-completion bluetooth curl dbi debug irda mysql nls postgres python usb" RDEPEND="bluetooth? ( net-wireless/bluez ) diff --git a/app-office/impressive/impressive-0.10.5.ebuild b/app-office/impressive/impressive-0.10.5.ebuild index 76e3a9062aa2..9b8a618b3a1f 100644 --- a/app-office/impressive/impressive-0.10.5.ebuild +++ b/app-office/impressive/impressive-0.10.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/impressive/impressive-0.10.5.ebuild,v 1.4 2015/03/27 16:30:36 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/impressive/impressive-0.10.5.ebuild,v 1.5 2015/04/19 06:55:24 pacho Exp $ EAPI=5 @@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" DEPEND="" diff --git a/app-office/lyx/lyx-2.1.3.ebuild b/app-office/lyx/lyx-2.1.3.ebuild index 266a310d8eac..00720f1efbbc 100644 --- a/app-office/lyx/lyx-2.1.3.ebuild +++ b/app-office/lyx/lyx-2.1.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-2.1.3.ebuild,v 1.6 2015/04/14 11:00:53 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-2.1.3.ebuild,v 1.7 2015/04/19 10:06:02 ago Exp $ EAPI=5 @@ -19,7 +19,7 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.1.x/${MY_P}.tar.xz LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 hppa ia64 ~ppc ~ppc64 ~sparc x86 ~x64-macos ~x86-macos" IUSE="cups debug nls +latex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant" LANGS="ar ca cs de da el en es eu fi fr gl he hu ia id it ja nb nn pl pt ro ru sk sr sv tr uk zh_CN zh_TW" diff --git a/app-office/pybliographer/pybliographer-1.2.15-r1.ebuild b/app-office/pybliographer/pybliographer-1.2.15-r1.ebuild index 16a487937186..4a77854e9421 100644 --- a/app-office/pybliographer/pybliographer-1.2.15-r1.ebuild +++ b/app-office/pybliographer/pybliographer-1.2.15-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/pybliographer/pybliographer-1.2.15-r1.ebuild,v 1.3 2015/01/29 10:58:31 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/pybliographer/pybliographer-1.2.15-r1.ebuild,v 1.5 2015/04/18 13:17:41 pacho Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) @@ -14,12 +14,12 @@ SRC_URI="mirror://sourceforge/pybliographer/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ppc x86" +KEYWORDS="amd64 ppc x86" IUSE="" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -DEPEND="${PYTHON_DEPS} +RDEPEND="${PYTHON_DEPS} >=app-text/recode-3.6-r1 app-text/scrollkeeper dev-libs/glib:2 @@ -30,7 +30,9 @@ DEPEND="${PYTHON_DEPS} dev-python/pygtk:2[${PYTHON_USEDEP}] >=dev-python/python-bibtex-1.2.5[${PYTHON_USEDEP}] " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND} + app-text/gnome-doc-utils +" src_prepare() { # Workaround for bug 487204. diff --git a/app-office/pybliographer/pybliographer-1.2.15.ebuild b/app-office/pybliographer/pybliographer-1.2.15.ebuild deleted file mode 100644 index d8fdd2ba4ec0..000000000000 --- a/app-office/pybliographer/pybliographer-1.2.15.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/pybliographer/pybliographer-1.2.15.ebuild,v 1.3 2012/08/10 11:21:47 blueness Exp $ - -EAPI="3" -PYTHON_DEPEND="2:2.6" - -inherit autotools gnome2 python - -DESCRIPTION="Pybliographer is a tool for working with bibliographic databases" -HOMEPAGE="http://pybliographer.org/" -SRC_URI="mirror://sourceforge/pybliographer/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ppc x86" -IUSE="" - -DOCS="AUTHORS ChangeLog* NEWS TODO README" - -DEPEND=">=app-text/recode-3.6-r1 - app-text/scrollkeeper - dev-libs/glib:2 - dev-python/gconf-python:2 - dev-python/gnome-vfs-python:2 - dev-python/libgnome-python:2 - dev-python/pygobject:2 - dev-python/pygtk:2 - >=dev-python/python-bibtex-1.2.5" -RDEPEND="${DEPEND}" - -pkg_setup() { - python_set_active_version 2 - python_pkg_setup -} - -src_prepare() { - gnome2_src_prepare - - # Disable byte-compilation of Python modules. - sed -i \ - -e "/import compileall/d" \ - Makefile.am || die "sed failed" - - # Install Python modules into site-packages directories. - find -name Makefile.am | xargs sed -i \ - -e "/^pybdir[[:space:]]*=[[:space:]]*/s:\$(datadir):$(python_get_sitedir):" || die "sed failed" - sed -i \ - -e "s:\${datadir}/@PACKAGE@:$(python_get_sitedir)/@PACKAGE@:" \ - etc/installer.in || die "sed failed" - sed -i \ - -e "s:gladedir = \$(datadir):gladedir = $(python_get_sitedir):" \ - Pyblio/GnomeUI/glade/Makefile.am || die "sed failed" - eautoreconf -} - -src_configure() { - gnome2_src_configure --disable-depchecks -} - -src_install() { - gnome2_src_install - python_convert_shebangs -r 2 "${ED}usr/bin" -} - -pkg_postinst() { - gnome2_pkg_postinst - python_mod_optimize pybliographer -} - -pkg_postrm() { - gnome2_pkg_postrm - python_mod_cleanup pybliographer -} diff --git a/app-office/scribus/scribus-1.4.4-r1.ebuild b/app-office/scribus/scribus-1.4.4-r1.ebuild index 9bb171441945..eda96284fa67 100644 --- a/app-office/scribus/scribus-1.4.4-r1.ebuild +++ b/app-office/scribus/scribus-1.4.4-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.4-r1.ebuild,v 1.5 2015/04/12 14:51:58 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.4-r1.ebuild,v 1.6 2015/04/18 15:55:39 pacho Exp $ EAPI=5 @@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 hppa ppc ~ppc64 ~sparc ~x86" +KEYWORDS="amd64 hppa ppc ~ppc64 ~sparc x86" IUSE="cairo debug examples hunspell +minimal +pdf scripts templates tk" # a=$(ls resources/translations/po/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'); echo ${a} diff --git a/app-office/texmaker/texmaker-4.3.ebuild b/app-office/texmaker/texmaker-4.3.ebuild index 4a279f0f6413..c2a45ddfd98c 100644 --- a/app-office/texmaker/texmaker-4.3.ebuild +++ b/app-office/texmaker/texmaker-4.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-4.3.ebuild,v 1.4 2015/03/27 16:30:41 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-4.3.ebuild,v 1.5 2015/04/19 09:48:17 ago Exp $ EAPI=5 @@ -25,7 +25,7 @@ SRC_URI="http://www.xm1math.net/texmaker/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux" IUSE="" S="${WORKDIR}/${MY_P}" diff --git a/app-portage/elogviewer/elogviewer-2.1-r2.ebuild b/app-portage/elogviewer/elogviewer-2.1-r2.ebuild index 51fb35ffdd0d..cec5df497394 100644 --- a/app-portage/elogviewer/elogviewer-2.1-r2.ebuild +++ b/app-portage/elogviewer/elogviewer-2.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/elogviewer/elogviewer-2.1-r2.ebuild,v 1.2 2015/02/03 23:18:03 dolsen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/elogviewer/elogviewer-2.1-r2.ebuild,v 1.3 2015/04/19 09:32:06 pacho Exp $ EAPI="5" PYTHON_COMPAT=(python{2_7,3_3,3_4}) @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ppc ~sparc ~x86 ~x86-fbsd" +KEYWORDS="amd64 ~ppc ~sparc x86 ~x86-fbsd" IUSE="" RDEPEND=" diff --git a/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.4.1.ebuild b/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.4.1.ebuild index bc316f71c682..346dbce3483f 100644 --- a/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.4.1.ebuild +++ b/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.4.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.4.1.ebuild,v 1.4 2015/04/08 07:30:34 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.4.1.ebuild,v 1.5 2015/04/19 06:59:17 pacho Exp $ EAPI=5 PYTHON_COMPAT=( python{2_7,3_3,3_4} ) @@ -13,7 +13,7 @@ SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2" LICENSE="BSD-2" SLOT="0" -KEYWORDS="amd64 arm ~mips ~x86 ~x86-fbsd" +KEYWORDS="amd64 arm ~mips x86 ~x86-fbsd" IUSE="" RDEPEND=">=app-portage/gentoopm-0.2.1[${PYTHON_USEDEP}]" diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest index d3f9a5515f98..588d190e5b83 100644 --- a/app-text/calibre/Manifest +++ b/app-text/calibre/Manifest @@ -1,5 +1,5 @@ DIST calibre-1.20.0.tar.xz 32430560 SHA256 475e09b1be4b9977240cbbe6743ab79da4b1f1afe3fe6015d212d868e8f2fac4 SHA512 84ac25080cf4948398b79f9a1af688cca9cf9a5a9200b2aad649f5fda1cd0556be4ade0c8b09ea6ffcc95654eac0aaaa5b8f8ed6ea9830174bc150e64de85e31 WHIRLPOOL 61b6ecde2e3f8679c1afea95dcd152a94ce03522c06dff34b406a5705f6255243f0565fbb5f9bef3ac96d7127190bd1b4363233fa24fafcd0412e061201f6fe8 DIST calibre-1.47.0.tar.xz 36581960 SHA256 efeb71a5bb4742a9c0a99038fdd97baa55c35e8ba5312e19e422c004bbf5b8c2 SHA512 c6131422891bed0615644336ad1dfc52803ff28d7d33994bea4a34f70655d12ab6b638432156665132805a900324742c41f8d5b7963f24eee4b68359fc433ece WHIRLPOOL dac2b04e195206d7956d7bdb5f45b37cd1e7a873db542d26bd0802d886fb9111aba1e603a795d03a2bf3b55d8cdb92671e11dfdc9fdcdc0707e280a380548f0b DIST calibre-1.48.0.tar.xz 35126680 SHA256 e704090f6611c5e374252c3f1b58e077ccd3170a3ea39893e5bf687287abf472 SHA512 0b70f16b10e6c9bbc24955baf74e8fc8e116aaaa1d75d018f5135f657606286de3bfffbebf3b367b2be52708deb05a162de919bba930dcbff59c4ec15c13b28d WHIRLPOOL 1a07a8c916119e92bdf41276db1aef572b704271808bcd6c3a0a4e823c8a76bd2f4267765dee2f378430beec401288b25b35dee6859980adf5b7a9ebe885eff9 -DIST calibre-2.20.0.tar.xz 36187720 SHA256 6d529240eb317c34aa82ca85779c9685453e1bb7192652d8d097fcbe8933448c SHA512 3df3f7ba92d81c6ef47efbdb2ab995db0d3f19cee9857836a603c96f7a145657e16e5ed0b5cc5a59a449e1fa2e76d203e70ad2587871ecb38f06ecf75a309350 WHIRLPOOL 3236a89098d4e171f27b7a42e694c9fa3ca628077fbc495b1a911984a1d7670eb43740fa957578e5c145c19416ce0441849ce0c773ed0abd607d7ff54ad710fa DIST calibre-2.21.0.tar.xz 36415844 SHA256 eb15469ece3f8ac3005f6a0ec1a6ad68b58f185c5e493334ebba2edea578b1a9 SHA512 e6ebd09c8a1d981598e2d7df994682cb8adc1d0f78be1cee4afe750e72e58834ef69d4d95cd2edcd163b12771468ee44c161c66287d17130e8a6451063ca4b6d WHIRLPOOL 1e5da868d73566a0f9779a51655a045b4c1a1ab96b132a735e5e2410ebce826ed9bb72df2b04a6273a25853997836c8a3416da41cea70de8908bbd88a950020c +DIST calibre-2.25.0.tar.xz 36706108 SHA256 208bfb6990428ac7c5b4f5105474d3787f7dec7caf1b0a8b2513ded41ab7ec40 SHA512 1cf909e6ce9b2438497ad20d334a913e188713d6040d5f89e41ad28b443e053eee5080de11ef6578c2ff4b5f902105b1c3f2b63c479a9eac1aa1db7ad15e1d1d WHIRLPOOL 4f30193b04b159fa9fce8891ae05565a04cba79f58b96d5cd9c8b48e14f8ae860ac2582228037cdf40154da5d8bdcf04d2d0f924a9f93f4375eb23c84eba2571 diff --git a/app-text/calibre/calibre-2.20.0.ebuild b/app-text/calibre/calibre-2.25.0.ebuild similarity index 96% rename from app-text/calibre/calibre-2.20.0.ebuild rename to app-text/calibre/calibre-2.25.0.ebuild index 97e5a2b09536..03c48eb7efeb 100644 --- a/app-text/calibre/calibre-2.20.0.ebuild +++ b/app-text/calibre/calibre-2.25.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-2.20.0.ebuild,v 1.1 2015/03/08 03:31:46 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-2.25.0.ebuild,v 1.1 2015/04/18 14:25:29 yngwin Exp $ EAPI=5 inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs @@ -46,10 +46,12 @@ COMMON_DEPEND=" >=dev-python/dnspython-1.6.0[python_targets_python2_7(-)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)] >=dev-python/cssutils-0.9.9[python_targets_python2_7(-)] - >=dev-python/dbus-python-0.82.2[python_targets_python2_7(-)] + >=dev-python/dbus-python-1.2.0[python_targets_python2_7(-)] >=dev-python/lxml-3.2.1[python_targets_python2_7(-)] >=dev-python/mechanize-0.1.11[python_targets_python2_7(-)] dev-python/netifaces[python_targets_python2_7(-)] + dev-python/psutil[python_targets_python2_7(-)] + >=dev-python/pygments-2.0.1[python_targets_python2_7(-)] >=dev-python/python-dateutil-1.4.1[python_targets_python2_7(-)] >=dev-python/PyQt5-5.2.0[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)] dev-qt/qtcore:5 diff --git a/app-text/glosung/files/glosung-3.6.2-scons-2.3.2-respectflags.patch b/app-text/glosung/files/glosung-3.6.2-scons-2.3.2-respectflags.patch new file mode 100644 index 000000000000..0f4ac73a06bd --- /dev/null +++ b/app-text/glosung/files/glosung-3.6.2-scons-2.3.2-respectflags.patch @@ -0,0 +1,63 @@ +--- a/SConstruct ++++ b/SConstruct +@@ -17,6 +17,7 @@ + + + import os ++import SCons.Util + + version = '3.6.2' + +@@ -32,14 +33,22 @@ + (this option is only for packaging)''') + + env = Environment ( +- LINK = 'gcc', +- CC = 'gcc', + CPPPATH = '', + LINKFLAGS = '', + CCFLAGS = '', + ENV = os.environ, + TARFLAGS = '-c -j') + ++if os.environ.has_key('CC'): ++ env['CC'] = os.environ['CC'] ++if os.environ.has_key('CFLAGS'): ++ env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS']) ++if os.environ.has_key('CXX'): ++ env['CXX'] = os.environ['CXX'] ++if os.environ.has_key('CXXFLAGS'): ++ env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS']) ++if os.environ.has_key('LDFLAGS'): ++ env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS']) + + if env['PLATFORM'] == 'win32': + prefix = ARGUMENTS.get ('PREFIX', '') +@@ -58,7 +68,7 @@ + BuildDir ('build', 'src') + + cpppath = ['#', '#build'] +-ccflags = ['-O2', '-std=c99', '-Wall', '-g', '-Wl,--export-dynamic', ++ccflags = ['-std=c99', + # '-DLIBXML_STATIC', + '-DVERSION=\\"' + version + '\\"', + '-DGLOSUNG_DATA_DIR=\\"' + data_dir + '\\"', +@@ -74,7 +74,7 @@ + '-DGLOSUNG_DATA_DIR=\\"' + data_dir + '\\"', + '-DPACKAGE_PIXMAPS_DIR=\\"' + pixmap_dir + '\\"'] + +-linkflags = ['-Wl,--export-dynamic', '-L.'] ++linkflags = [] + # -L/usr/lib' + # `pkg-config --libs gtk+-2.0 libxml-2.0 gconf-2.0 libcurl` + +@@ -83,9 +83,6 @@ + ccflags.append ('-pg', '-fprofile-arcs') + linkflags.append ('-pg', '-fprofile-arcs') + +-if env['PLATFORM'] != 'win32': +- linkflags.append ('-Wl,--as-needed') +- + #if not (ARGUMENTS.get ('dev')): + if (ARGUMENTS.get ('dev')): + ccflags += [ diff --git a/app-text/glosung/glosung-3.6.2-r1.ebuild b/app-text/glosung/glosung-3.6.2-r1.ebuild index b891a54a0fa6..99a8896a767a 100644 --- a/app-text/glosung/glosung-3.6.2-r1.ebuild +++ b/app-text/glosung/glosung-3.6.2-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/glosung/glosung-3.6.2-r1.ebuild,v 1.3 2013/01/30 19:02:07 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/glosung/glosung-3.6.2-r1.ebuild,v 1.4 2015/04/19 01:23:29 creffett Exp $ EAPI=5 @@ -32,7 +32,11 @@ DEPEND="${RDEPEND} src_prepare() { epatch "${FILESDIR}/${PN}-3.6.2-glib-includes.patch" - epatch "${FILESDIR}/${PN}-3.6.2-scons-respectflags.patch" + if has_version '>=dev-util/scons-2.3.2'; then + epatch "${FILESDIR}/${PN}-3.6.2-scons-2.3.2-respectflags.patch" + else + epatch "${FILESDIR}/${PN}-3.6.2-scons-respectflags.patch" + fi } src_compile() { diff --git a/app-text/paperwork/Manifest b/app-text/paperwork/Manifest index eb60da99fa11..0c704f544de8 100644 --- a/app-text/paperwork/Manifest +++ b/app-text/paperwork/Manifest @@ -1,3 +1,4 @@ DIST paperwork-0.2.1.tar.gz 163417 SHA256 300e185608eec55162b657e1ae1dae4d1deab0cf168415fb8471dc413847dee4 SHA512 863af1ba16c101527a5ddd8544dbba2ead4f41d997b04b41b486719ce923d3219ca428e079cce3df25a5e35f3ff020618731fccae5617327df90f5e47bd7f2b0 WHIRLPOOL adc1c66c4cceb655d403f259176278f6b0e4e9fb9548cf11157556714f96f7719794e00f1d21c498e662a81ec53e0e553ca0cf443880e6443ed149f3141e4d50 DIST paperwork-0.2.2.tar.gz 164026 SHA256 ea663b6bf528ce653fa15496a133a4899efe25b78565a8d3c3512350abfe5d6f SHA512 21726a3e916a2a4b94a1fe84bbe04ed7c901e9ac9ae2b7f3e94fc84255b83c6b65a07485bfc899a28f1d66456aa2fdb58758e36aea1083a89f9c739c496c62bd WHIRLPOOL ecd844267094f9d9033f1922a08b310fd0c72e97f992aa879d46faf1b2987b66bde5e5b5d5f1fb440c8a665e3c8f10c187fa86ea878284f46f43cd327a7c83ea +DIST paperwork-0.2.3.tar.gz 164350 SHA256 92f7ef27d26b9b4d3e1d4f87b2788e47cfef0fb386ca813daf02e486e791ccf6 SHA512 e9b423dc35b1c952eca93a891b94b1d25d1af612c22671ccae0b37a32bc29ceb800d0ab9a300d12d0eb4dceb45843ef4123c1796f94a82a40292ad3848ba7d12 WHIRLPOOL 3d1f07a89e9a3177fc4c10d699328ce91e27e76fcb2b6ae704e7f12e11bcbd48fafc88ef07cf6c4903d9c8d7774e7daa47b8ce5bd7fb694ab303cbff8c6c6f94 DIST paperwork-0.2.tar.gz 161800 SHA256 81fcbfc04bc640c1a432864e74365cb170fb52198f3149773577641a37f4afee SHA512 8fc5d08844a5a21ee04cb98d18f5eaafe3bac6ab7919f347d5f837473b0c083bd2cdb7c54966a2d4e4790f8bb8df931bd2104a606fa3a14371224b3933e5763d WHIRLPOOL f45f0204fd939b383b9566cd945739cf78736e1d23ad09aab9d6d07fdcfc14d34ac09c6b45f29e9b5d8de12ccf7df46e8d37d95320001086a6ce24a2a9452c04 diff --git a/app-text/paperwork/paperwork-0.2.3.ebuild b/app-text/paperwork/paperwork-0.2.3.ebuild new file mode 100644 index 000000000000..cfc80c2902e6 --- /dev/null +++ b/app-text/paperwork/paperwork-0.2.3.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/paperwork/paperwork-0.2.3.ebuild,v 1.2 2015/04/18 08:07:50 voyageur Exp $ + +EAPI=5 +PYTHON_COMPAT=( python2_7 ) + +inherit distutils-r1 + +DESCRIPTION="a personal document manager for scanned documents (and PDFs)" +HOMEPAGE="https://github.com/jflesch/paperwork" +SRC_URI="https://github.com/jflesch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="app-text/poppler[introspection] + dev-python/joblib[${PYTHON_USEDEP}] + dev-python/pycairo[${PYTHON_USEDEP}] + dev-python/pycountry[${PYTHON_USEDEP}] + dev-python/pyenchant[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] + >=dev-python/pyinsane-1.3.8[${PYTHON_USEDEP}] + >=dev-python/pyocr-0.3.0[${PYTHON_USEDEP}] + dev-python/python-levenshtein[${PYTHON_USEDEP}] + dev-python/termcolor[${PYTHON_USEDEP}] + dev-python/whoosh[${PYTHON_USEDEP}] + dev-util/glade[introspection,python] + sci-libs/scikits_learn[${PYTHON_USEDEP}] + sci-libs/scikits_image[${PYTHON_USEDEP}] + virtual/python-imaging[${PYTHON_USEDEP}] + x11-libs/gtk+:3[introspection]" +DEPEND="${RDEPEND}" diff --git a/app-text/qpdfview/qpdfview-0.4.13-r1.ebuild b/app-text/qpdfview/qpdfview-0.4.13-r1.ebuild index 940a3a3c2be0..e1e4c9dadcd6 100644 --- a/app-text/qpdfview/qpdfview-0.4.13-r1.ebuild +++ b/app-text/qpdfview/qpdfview-0.4.13-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/qpdfview-0.4.13-r1.ebuild,v 1.2 2015/03/27 16:28:13 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/qpdfview-0.4.13-r1.ebuild,v 1.3 2015/04/19 09:48:38 ago Exp $ EAPI=5 @@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux" IUSE="cups dbus djvu fitz +pdf postscript +qt4 qt5 sqlite +svg synctex" REQUIRED_USE="^^ ( qt4 qt5 ) diff --git a/app-text/xapian-omega/xapian-omega-1.2.19.ebuild b/app-text/xapian-omega/xapian-omega-1.2.19.ebuild index 325d78246c9c..478e196c6e57 100644 --- a/app-text/xapian-omega/xapian-omega-1.2.19.ebuild +++ b/app-text/xapian-omega/xapian-omega-1.2.19.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/xapian-omega/xapian-omega-1.2.19.ebuild,v 1.7 2015/04/14 10:53:37 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/xapian-omega/xapian-omega-1.2.19.ebuild,v 1.8 2015/04/19 06:55:47 pacho Exp $ EAPI="5" @@ -11,7 +11,7 @@ S="${WORKDIR}/xapian-omega-${PV}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc ~x86" +KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86" IUSE="" DEPEND=">=dev-libs/xapian-${PV} diff --git a/dev-cpp/commoncpp2/commoncpp2-1.8.1-r1.ebuild b/dev-cpp/commoncpp2/commoncpp2-1.8.1-r1.ebuild index a8dd6570cafe..0a18adadbb6c 100644 --- a/dev-cpp/commoncpp2/commoncpp2-1.8.1-r1.ebuild +++ b/dev-cpp/commoncpp2/commoncpp2-1.8.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/commoncpp2-1.8.1-r1.ebuild,v 1.5 2015/04/06 13:06:08 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/commoncpp2-1.8.1-r1.ebuild,v 1.6 2015/04/18 12:47:48 pacho Exp $ EAPI="5" @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz" HOMEPAGE="http://www.gnu.org/software/commoncpp/" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ppc ~ppc64 x86" +KEYWORDS="amd64 ~ppc ppc64 x86" IUSE="debug doc examples ipv6 gnutls ssl static-libs" REQUIRED_USE="gnutls? ( ssl )" diff --git a/dev-cpp/yaml-cpp/yaml-cpp-0.3.0.ebuild b/dev-cpp/yaml-cpp/yaml-cpp-0.3.0.ebuild index 597ce5956d08..ffd8fce56caf 100644 --- a/dev-cpp/yaml-cpp/yaml-cpp-0.3.0.ebuild +++ b/dev-cpp/yaml-cpp/yaml-cpp-0.3.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/yaml-cpp/yaml-cpp-0.3.0.ebuild,v 1.3 2013/08/07 10:37:12 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/yaml-cpp/yaml-cpp-0.3.0.ebuild,v 1.4 2015/04/19 11:30:38 blueness Exp $ EAPI=4 @@ -12,7 +12,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~arm x86" +KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86" IUSE="" DEPEND="" diff --git a/dev-cpp/yaml-cpp/yaml-cpp-0.5.1.ebuild b/dev-cpp/yaml-cpp/yaml-cpp-0.5.1.ebuild index 16f3da10b448..2934838ced7c 100644 --- a/dev-cpp/yaml-cpp/yaml-cpp-0.5.1.ebuild +++ b/dev-cpp/yaml-cpp/yaml-cpp-0.5.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/yaml-cpp/yaml-cpp-0.5.1.ebuild,v 1.6 2013/08/18 13:24:21 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/yaml-cpp/yaml-cpp-0.5.1.ebuild,v 1.7 2015/04/19 11:30:38 blueness Exp $ EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" IUSE="" DEPEND=">=dev-libs/boost-1.49.0-r2" diff --git a/dev-db/couchdb/couchdb-1.6.1.ebuild b/dev-db/couchdb/couchdb-1.6.1.ebuild index 4ad64c1b4433..2cf9565b6d2c 100644 --- a/dev-db/couchdb/couchdb-1.6.1.ebuild +++ b/dev-db/couchdb/couchdb-1.6.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/couchdb-1.6.1.ebuild,v 1.2 2015/04/08 13:13:48 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/couchdb-1.6.1.ebuild,v 1.3 2015/04/19 09:38:08 ago Exp $ EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="mirror://apache/couchdb/source/${PV}/apache-${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc x86" IUSE="selinux test" RDEPEND=">=dev-libs/icu-4.3.1:= diff --git a/dev-db/myodbc/myodbc-5.2.7-r1.ebuild b/dev-db/myodbc/myodbc-5.2.7-r1.ebuild index f5ec7c52a6b1..e1ff527e5487 100644 --- a/dev-db/myodbc/myodbc-5.2.7-r1.ebuild +++ b/dev-db/myodbc/myodbc-5.2.7-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/myodbc-5.2.7-r1.ebuild,v 1.3 2015/03/02 09:33:49 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/myodbc-5.2.7-r1.ebuild,v 1.4 2015/04/19 07:02:28 pacho Exp $ EAPI=5 inherit cmake-multilib eutils flag-o-matic versionator @@ -16,7 +16,7 @@ RESTRICT="primaryuri" LICENSE="GPL-2" SLOT="${MAJOR}" -KEYWORDS="amd64 ppc ~x86" +KEYWORDS="amd64 ppc x86" IUSE="" RDEPEND=" diff --git a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.4.ebuild b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.4.ebuild index cf54fc898e2f..1e5aac7b48d7 100644 --- a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.4.ebuild +++ b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.4.ebuild,v 1.2 2014/04/10 14:55:13 haubi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.4.ebuild,v 1.3 2015/04/19 13:28:01 ago Exp $ EAPI="4" @@ -25,7 +25,7 @@ SRC_URI=" LICENSE="OTN" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" RESTRICT="fetch splitdebug" IUSE="" diff --git a/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.2.0.4.ebuild b/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.2.0.4.ebuild index aaa0437a04a6..62d5787215f7 100644 --- a/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.2.0.4.ebuild +++ b/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.2.0.4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.2.0.4.ebuild,v 1.1 2014/04/04 08:31:20 haubi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.2.0.4.ebuild,v 1.2 2015/04/19 13:28:09 ago Exp $ EAPI="4" @@ -21,7 +21,7 @@ SRC_URI=" LICENSE="OTN" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" RESTRICT="fetch splitdebug" IUSE="" diff --git a/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.4.ebuild b/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.4.ebuild index 2e24e8756407..b43bb3a58266 100644 --- a/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.4.ebuild +++ b/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.4.ebuild,v 1.1 2014/04/04 08:24:25 haubi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.4.ebuild,v 1.2 2015/04/19 13:28:05 ago Exp $ EAPI="4" @@ -21,7 +21,7 @@ SRC_URI=" LICENSE="OTN" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" RESTRICT="fetch splitdebug" IUSE="" diff --git a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.4.ebuild b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.4.ebuild index ae427247265b..a26ae034ba74 100644 --- a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.4.ebuild +++ b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.4.ebuild,v 1.1 2014/04/04 08:21:39 haubi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.4.ebuild,v 1.2 2015/04/19 13:28:13 ago Exp $ EAPI="4" @@ -21,7 +21,7 @@ SRC_URI=" LICENSE="OTN" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" RESTRICT="fetch splitdebug" IUSE="" diff --git a/dev-db/vsqlite++/Manifest b/dev-db/vsqlite++/Manifest index a92c8ae996db..db7a5164dcbc 100644 --- a/dev-db/vsqlite++/Manifest +++ b/dev-db/vsqlite++/Manifest @@ -1,2 +1,2 @@ -DIST 0.3.12.tar.gz 23720 SHA256 655d53abe7b21b024111565cf9da8ccaa90540e5ff36d7d227c2eaa22305e925 SHA512 5e134de01a3f2c8adab40ae4f598b5c3b095b7503bf1bcc1aae012d3b087ff68b7cd1fc4dbea74b8cfeac82e9a18428efccea3c1e5a229c2aec05f8228c28344 WHIRLPOOL 66c1252ecc2d05ad2a3690141efe4dace892a839b8b649cbf7b96e55de30bc5d384bd22394d94ca112b0f26380baf6b5db0a6c94d469b9cc5777986e9ae61842 -DIST 0.3.13.tar.gz 28195 SHA256 73dea3c0b4b7769254da17182efbf9fc16893c50ed0d544abfdde127b69467d5 SHA512 70fcd16348e3b2a0854b1d496c68fda7e354068aefbd6a5ad21d7a42afebd2bd746f604240475acfeebe00898ab156f9dfd687346fdf5c77d775262db3a5666e WHIRLPOOL 02d79a14dabbc7a2191f40370d94071c95c4dcb72f4eb6ba68b38872296a92473ddfd06a702bb6862fa2a5eac9ac921dd93e3312615bc587b319cf7a64ee5427 +DIST vsqlite++-0.3.12.tar.gz 23720 SHA256 655d53abe7b21b024111565cf9da8ccaa90540e5ff36d7d227c2eaa22305e925 SHA512 5e134de01a3f2c8adab40ae4f598b5c3b095b7503bf1bcc1aae012d3b087ff68b7cd1fc4dbea74b8cfeac82e9a18428efccea3c1e5a229c2aec05f8228c28344 WHIRLPOOL 66c1252ecc2d05ad2a3690141efe4dace892a839b8b649cbf7b96e55de30bc5d384bd22394d94ca112b0f26380baf6b5db0a6c94d469b9cc5777986e9ae61842 +DIST vsqlite++-0.3.13.tar.gz 28195 SHA256 73dea3c0b4b7769254da17182efbf9fc16893c50ed0d544abfdde127b69467d5 SHA512 70fcd16348e3b2a0854b1d496c68fda7e354068aefbd6a5ad21d7a42afebd2bd746f604240475acfeebe00898ab156f9dfd687346fdf5c77d775262db3a5666e WHIRLPOOL 02d79a14dabbc7a2191f40370d94071c95c4dcb72f4eb6ba68b38872296a92473ddfd06a702bb6862fa2a5eac9ac921dd93e3312615bc587b319cf7a64ee5427 diff --git a/dev-db/vsqlite++/vsqlite++-0.3.12.ebuild b/dev-db/vsqlite++/vsqlite++-0.3.12.ebuild index 0cf9aff76d0d..3d16d8fb0b9d 100644 --- a/dev-db/vsqlite++/vsqlite++-0.3.12.ebuild +++ b/dev-db/vsqlite++/vsqlite++-0.3.12.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/vsqlite++/vsqlite++-0.3.12.ebuild,v 1.4 2015/03/21 21:35:07 nativemad Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/vsqlite++/vsqlite++-0.3.12.ebuild,v 1.5 2015/04/18 12:12:20 swegener Exp $ EAPI=5 AUTOTOOLS_IN_SOURCE_BUILD=1 @@ -10,7 +10,7 @@ inherit autotools-utils DESCRIPTION="VSQLite++ - A welldesigned and portable SQLite3 Wrapper for C++" HOMEPAGE="http://evilissimo.fedorapeople.org/releases/vsqlite--/" -SRC_URI="https://github.com/vinzenz/vsqlite--/archive/${PV}.tar.gz" +SRC_URI="https://github.com/vinzenz/vsqlite--/archive/${PV}.tar.gz -> ${P}.tar.gz" IUSE="static-libs" LICENSE="BSD" diff --git a/dev-db/vsqlite++/vsqlite++-0.3.13-r1.ebuild b/dev-db/vsqlite++/vsqlite++-0.3.13-r1.ebuild index 6ff8ef6872f8..8a539679f22e 100644 --- a/dev-db/vsqlite++/vsqlite++-0.3.13-r1.ebuild +++ b/dev-db/vsqlite++/vsqlite++-0.3.13-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/vsqlite++/vsqlite++-0.3.13-r1.ebuild,v 1.2 2015/03/07 08:05:56 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/vsqlite++/vsqlite++-0.3.13-r1.ebuild,v 1.3 2015/04/18 12:12:20 swegener Exp $ EAPI=5 AUTOTOOLS_IN_SOURCE_BUILD=1 @@ -10,7 +10,7 @@ inherit autotools-utils DESCRIPTION="VSQLite++ - A welldesigned and portable SQLite3 Wrapper for C++" HOMEPAGE="http://evilissimo.fedorapeople.org/releases/vsqlite--/" -SRC_URI="https://github.com/vinzenz/vsqlite--/archive/${PV}.tar.gz" +SRC_URI="https://github.com/vinzenz/vsqlite--/archive/${PV}.tar.gz -> ${P}.tar.gz" IUSE="static-libs" LICENSE="BSD" diff --git a/dev-embedded/libftdi/libftdi-1.0.ebuild b/dev-embedded/libftdi/libftdi-1.0.ebuild index 47e937df86a9..9c48943b1c10 100644 --- a/dev-embedded/libftdi/libftdi-1.0.ebuild +++ b/dev-embedded/libftdi/libftdi-1.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-embedded/libftdi/libftdi-1.0.ebuild,v 1.3 2013/12/09 05:24:42 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/libftdi/libftdi-1.0.ebuild,v 1.4 2015/04/18 03:06:18 vapier Exp $ EAPI="4" @@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]] ; then inherit git-2 else SRC_URI="http://www.intra2net.com/en/developer/${PN}/download/${MY_P}.tar.bz2" - KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86" fi DESCRIPTION="Userspace access to FTDI USB interface chips" diff --git a/dev-embedded/libftdi/libftdi-9999.ebuild b/dev-embedded/libftdi/libftdi-9999.ebuild index 8de246c75a1c..6ce7dd5bd5f6 100644 --- a/dev-embedded/libftdi/libftdi-9999.ebuild +++ b/dev-embedded/libftdi/libftdi-9999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-embedded/libftdi/libftdi-9999.ebuild,v 1.8 2013/03/12 11:17:26 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/libftdi/libftdi-9999.ebuild,v 1.9 2015/04/18 03:06:18 vapier Exp $ EAPI="4" @@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]] ; then inherit git-2 else SRC_URI="http://www.intra2net.com/en/developer/${PN}/download/${MY_P}.tar.bz2" - KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86" fi DESCRIPTION="Userspace access to FTDI USB interface chips" diff --git a/dev-games/aseprite/aseprite-0.9.5.ebuild b/dev-games/aseprite/aseprite-0.9.5.ebuild deleted file mode 100644 index 719328ac585d..000000000000 --- a/dev-games/aseprite/aseprite-0.9.5.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/aseprite/aseprite-0.9.5.ebuild,v 1.4 2013/07/18 20:48:51 creffett Exp $ - -EAPI=5 - -inherit cmake-utils flag-o-matic - -DESCRIPTION="Animated sprite editor & pixel art tool" -HOMEPAGE="http://www.aseprite.org" -SRC_URI="http://aseprite.googlecode.com/files/aseprite-${PV}.tar.xz" - -LICENSE="GPL-2 FTL" -SLOT="0" -KEYWORDS="amd64 x86" - -IUSE="debug memleak static test" - -RDEPEND="dev-libs/tinyxml - media-libs/allegro:0[X,png] - media-libs/giflib - media-libs/libpng:0 - net-misc/curl - sys-libs/zlib - virtual/jpeg - x11-libs/libX11" -DEPEND="${RDEPEND} - test? ( dev-cpp/gtest )" - -PATCHES=( "${FILESDIR}"/aseprite-0.9.5-as-needed.patch ) - -DOCS=( docs/quickref.odt - docs/files/ase.txt - docs/files/fli.txt - docs/files/msk.txt - docs/files/pic.txt - docs/files/picpro.txt ) - -src_prepare() { - cmake-utils_src_prepare - - # Fix to make flag-o-matic work. - if use debug ; then - sed -i '/-DNDEBUG/d' CMakeLists.txt || die - fi - - # Only do a static link with Allegro if the user explicitly wants it. - if ! use static ; then - sed -i '/-DALLEGRO_STATICLINK/d' CMakeLists.txt || die - fi - - # Remove long compiling tests for users with FEATURES="-test", - # also removes the gtest dependency from the build. - if ! use test ; then - sed -i '/^find_unittests/d' src/CMakeLists.txt || die - sed -i '/include_directories(.*third_party\/gtest.*)/d' src/CMakeLists.txt || die - sed -i '/add_subdirectory(gtest)/d' third_party/CMakeLists.txt || die - fi -} - -src_configure() { - use debug && append-cppflags -DDEBUGMODE -D_DEBUG - - local mycmakeargs - - mycmakeargs=( - -DENABLE_UPDATER=OFF - -DUSE_SHARED_ALLEGRO4=ON - -DUSE_SHARED_CURL=ON - -DUSE_SHARED_GIFLIB=ON - -DUSE_SHARED_JPEGLIB=ON - -DUSE_SHARED_LIBLOADPNG=ON - -DUSE_SHARED_LIBPNG=ON - -DUSE_SHARED_TINYXML=ON - -DUSE_SHARED_ZLIB=ON - -DFULLSCREEN_PLATFORM=ON - $(cmake-utils_use_enable memleak) - $(cmake-utils_use_use static STATIC_LIBC) - ) - - if use test ; then - mycmakeargs+=( - -DUSE_SHARED_GTEST=ON - ) - fi - - cmake-utils_src_configure -} - -pkg_postinst() { - elog "Warning: aseprite might not choose the resolution correctly; so, you might need" - elog " to change the resolution once using the -resolution WxH[xBPP] argument." - elog "" - elog " On subsequent runs, aseprite will remember the resolution you have set." - elog "" - elog " For example: \`aseprite -resolution 1440x900\`" -} diff --git a/dev-games/cegui/Manifest b/dev-games/cegui/Manifest index 543ceb559ba9..11cbd74e8e75 100644 --- a/dev-games/cegui/Manifest +++ b/dev-games/cegui/Manifest @@ -1,7 +1,3 @@ DIST CEGUI-0.6.2-DOCS.tar.gz 18396638 SHA256 f1ea46bd583c486a6c588118573ebde55b06e90b190083e95525820e950ce2c8 SHA512 56ded923f21f18d837d71425e06fe8675a2efa979edde461a9e4e558c213cbb79ff8eeb576211da6ade56526ccdd9644a7a45b3619058615388e3882f96b9fb4 WHIRLPOOL f67c9dba4558c43ec9d14c160f228e974de4364bfe36ebfa9f3fe6bfc290fd5c4f024e954525845cd83645a06d53e6d63776137cbe58c459bcdd0e350d12e9c7 DIST CEGUI-0.6.2b.tar.gz 2628081 SHA256 eb77741cd9fcc927a876e8116b98691212e973d2264e2071406423f6ca3e305f SHA512 52ed7e7a97024138af957815a396dda74b650e7c53542d2d48c5eb95335bec270abca3685c49b05078f4338079334df6bfbcec75e9b7eb21ee40bdbff5f57b20 WHIRLPOOL 3fde683a82fb0be33565adb28fbcb4b7001be99f1b3bdb2d3af9abecc5dc7681d633f141cc19f9eb1dc264d0fb0b2084ea604202a22a3e2cc415bdb6b9686161 -DIST CEGUI-0.7.7.tar.gz 9176105 SHA256 551e6fe4fffc7586b0ef0434b83ddc2b3889fc8c7eb22d4cca92b1c7ce25059a SHA512 a3adaf1fc8a9adbe7e2eb5939bacbbb6c9b9c5c0299c247e3f562faae1fa5d697634536d2a977925346b49d1060326359fd4739462074b780b6f6649e6f7a4f0 WHIRLPOOL cc394977876137cf0b5b8f75f0ae66eb5a2fcb30e2088b41392f53fdd15a3a4d989ab4784924667f18a12fe569ef3472027e0334e7190cb60fe2d2f596603cf7 -DIST CEGUI-0.7.9.tar.gz 9204644 SHA256 7c3b264def08b46de749c2acaba363e907479d924612436f3bd09da2e474bb8c SHA512 c7fcf64360145d32b7fbbf49e627cff8da4ff8cb62b2999837d68951c7218526247388b4e1dae9873cc2734fb36cac328e4a4982fb1d343cdb2a98831cdd0bf0 WHIRLPOOL bf0af2f1f2490cf1374e3fdf19ed616457aacb55ce7c363aee679a361432d3bbe1d9feb7ae223bcece202ee13fd82d7910b4abdeff7efac07bf9d8076d0be9a5 -DIST CEGUI-DOCS-0.7.7.tar.gz 14303467 SHA256 21b6fb8841dfb40650d68b3149afe24d7bde7c1986c0e3d86f9c34baa1b00c6c SHA512 cf0745ab9fdc4ca939aabeacf3c15e677ce26a3f4ecf136debc661842adc24955b30460a69238ab65ae65e4367e7da3515125befed2f017aa1b4981f32ccd08c WHIRLPOOL 2faa44214efe454211267f6417a5a0817026e3e46315acabe6b0ead1354443f0396c2bff8ecaa82210d922d59d2d5a6b60b9bab3c6cc2c7184ce6a5f49cd81bc -DIST CEGUI-DOCS-0.7.9.tar.gz 16240236 SHA256 6c5305d7bff392b97d6bbbafb9b2579ad4974320d57397010ae4415da125fe5e SHA512 d1c7cd80861ee467c865fbad115ecaed79220bc373b1c3e2fcd9a69e89f750925954f20196f366dc334c8eb7eb6dc444c8ded190eb7f9ab52e0521d02ef78767 WHIRLPOOL 8c9757d4497d23803a6653fb0e5c55ebc2449e145fa216f2f5f72d0f8adca66e63712a9e150dffbca36396805d0e713052272afbfe0471b8edbc45619939276d DIST cegui-0.8.4.tar.bz2 17894771 SHA256 b5fcbd548b83045e92c4da413928113be77ebee0117368925e1904b3b957a388 SHA512 493c949426ff2d9b760712b5fe7ed6a427404cd13934c36c7bdf207c0458686bcc74b675e9aeb5d16cd04f0874515503b8d3135ceb71b4d74738f047e4da39c7 WHIRLPOOL 1550a7fe2688c8247c8036e7302b0990b3abf3b16d794cd1d7f38a4af1feb4d373db476d911428e1380b79ff0feba1dedc1abefba17255b46eb6fa4956c39bc4 diff --git a/dev-games/cegui/cegui-0.6.2b.ebuild b/dev-games/cegui/cegui-0.6.2b.ebuild index 1a21127519fd..09d3cfb081dd 100644 --- a/dev-games/cegui/cegui-0.6.2b.ebuild +++ b/dev-games/cegui/cegui-0.6.2b.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 -# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/cegui-0.6.2b.ebuild,v 1.12 2012/05/03 06:35:30 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/cegui-0.6.2b.ebuild,v 1.13 2015/04/19 06:41:02 mr_bones_ Exp $ -EAPI=2 +EAPI=5 inherit autotools eutils MY_P=CEGUI-${PV%b} @@ -45,12 +45,11 @@ src_prepare() { "${FILESDIR}"/${P}-gcc46.patch sed -i \ -e 's/ILvoid/void/g' \ - ImageCodecModules/DevILImageCodec/CEGUIDevILImageCodec.cpp \ - || die "sed failed" + ImageCodecModules/DevILImageCodec/CEGUIDevILImageCodec.cpp || die if use examples ; then - cp -r Samples Samples.clean - rm -f $(find Samples.clean -name 'Makefile*') - rm -rf Samples.clean/bin + cp -r Samples Samples.clean || die + rm -f $(find Samples.clean -name 'Makefile*') || die + rm -rf Samples.clean/bin || die fi eautoreconf #220040 } @@ -84,14 +83,13 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc AUTHORS ChangeLog README TODO + default if use doc ; then - dohtml -r documentation/api_reference || die "dohtml failed" - dodoc documentation/*.pdf || die "dodoc failed" + dohtml -r documentation/api_reference + dodoc documentation/*.pdf fi if use examples ; then insinto /usr/share/doc/${PF}/Samples - doins -r Samples.clean/* || die "doins failed" + doins -r Samples.clean/* fi } diff --git a/dev-games/cegui/cegui-0.7.7-r1.ebuild b/dev-games/cegui/cegui-0.7.7-r1.ebuild deleted file mode 100644 index e5a152f61031..000000000000 --- a/dev-games/cegui/cegui-0.7.7-r1.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/cegui-0.7.7-r1.ebuild,v 1.4 2013/01/25 15:08:09 ago Exp $ - -EAPI=4 -inherit eutils - -MY_P=CEGUI-${PV} -MY_D=CEGUI-DOCS-${PV} -DESCRIPTION="Crazy Eddie's GUI System" -HOMEPAGE="http://www.cegui.org.uk/" -SRC_URI="mirror://sourceforge/crayzedsgui/${MY_P}.tar.gz - doc? ( mirror://sourceforge/crayzedsgui/${MY_D}.tar.gz )" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 -ppc x86" -IUSE="bidi debug devil doc examples expat gtk irrlicht lua ogre opengl pcre static-libs tinyxml truetype xerces-c +xml zip" -REQUIRED_USE="|| ( expat tinyxml xerces-c xml )" # bug 362223 - -RDEPEND="bidi? ( dev-libs/fribidi ) - devil? ( media-libs/devil ) - expat? ( dev-libs/expat ) - truetype? ( media-libs/freetype:2 ) - irrlicht? ( dev-games/irrlicht ) - lua? ( - dev-lang/lua - dev-lua/toluapp - ) - ogre? ( >=dev-games/ogre-1.7 ) - opengl? ( - virtual/opengl - virtual/glu - media-libs/freeglut - media-libs/glew - ) - pcre? ( dev-libs/libpcre ) - tinyxml? ( dev-libs/tinyxml ) - xerces-c? ( dev-libs/xerces-c ) - xml? ( dev-libs/libxml2 ) - zip? ( sys-libs/zlib[minizip] )" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( app-doc/doxygen )" - -S=${WORKDIR}/${MY_P} -S2=${WORKDIR}/${MY_P}_static - -src_prepare() { - epatch "${FILESDIR}"/${P}-irrlicht-1.8.patch - - # use minizip from zlib rather than local code - if use zip ; then - sed -i \ - -e '/CEGUI_BUILD_MINIZIP_RESOURCE_PROVIDER_TRUE/{ - s:minizip/ioapi.cpp minizip/unzip.cpp::; - s:libCEGUIBase@cegui_bsfx@_la-ioapi.lo::; - s:libCEGUIBase@cegui_bsfx@_la-unzip.lo:: - }' \ - -e '/^ZLIB_LIBS/s:=.*:= -lminizip:' \ - cegui/src/Makefile.in || die - fi - rm -rf cegui/src/minizip - - if use examples ; then - cp -r Samples Samples.clean - rm -f $(find Samples.clean -name 'Makefile*') - fi - - if use static-libs ; then - cp -a "${S}" "${S2}" || die - fi -} - -src_configure() { - local myconf=( - $(use_enable bidi bidirectional-text) - $(use_enable debug) - $(use_enable devil) - $(use_enable examples samples) - $(use_enable expat) - $(use_enable truetype freetype) - $(use_enable irrlicht irrlicht-renderer) - $(use_enable lua lua-module) - $(use_enable lua toluacegui) - --enable-external-toluapp - $(use_enable ogre ogre-renderer) - $(use_enable opengl opengl-renderer) - --enable-external-glew - $(use_enable pcre) - $(use_enable tinyxml) - --enable-external-tinyxml - $(use_enable xerces-c) - $(use_enable xml libxml) - $(use_enable zip minizip-resource-provider) - --enable-null-renderer - --enable-stb - --enable-tga - --disable-corona - --disable-dependency-tracking - --disable-freeimage - --disable-rapidxml - --disable-samples - --disable-silly - $(use_with gtk gtk2) - ) - - econf \ - "${myconf[@]}" \ - --disable-static \ - --enable-shared - - if use static-libs ; then - cd "${S2}" || die - econf \ - "${myconf[@]}" \ - --enable-static \ - --disable-shared - fi - - # we are doing a double build here cause - # the build system does not permit - # "--enable-static --enable-shared" -} - -src_compile() { - default - - if use static-libs ; then - emake -C "${S2}" - fi -} - -src_install() { - local i - default - - if use doc ; then - emake html || die - dohtml -r doc/doxygen/html/* || die - fi - if use examples ; then - insinto /usr/share/doc/${PF}/Samples - doins -r Samples.clean/* || die - fi - - if use static-libs ; then - find "${S2}" -name "*CEGUI*.a" -exec dolib.a '{}' \; - - # fix/merge .la files - for i in `find "${D}" -name "*.la"` ; do - sed \ - -e "s/old_library=''/old_library='$(basename ${i%.la}).a'/" \ - -i ${i} || die "fixing .la files failed" - done - else - # remove .la files - prune_libtool_files --all - fi -} diff --git a/dev-games/cegui/cegui-0.7.9.ebuild b/dev-games/cegui/cegui-0.7.9.ebuild deleted file mode 100644 index ccb8680431bd..000000000000 --- a/dev-games/cegui/cegui-0.7.9.ebuild +++ /dev/null @@ -1,158 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/cegui-0.7.9.ebuild,v 1.1 2013/01/18 21:57:16 hasufell Exp $ - -EAPI=4 -inherit eutils - -MY_P=CEGUI-${PV} -MY_D=CEGUI-DOCS-${PV} -DESCRIPTION="Crazy Eddie's GUI System" -HOMEPAGE="http://www.cegui.org.uk/" -SRC_URI="mirror://sourceforge/crayzedsgui/${MY_P}.tar.gz - doc? ( mirror://sourceforge/crayzedsgui/${MY_D}.tar.gz )" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 -ppc ~x86" -IUSE="bidi debug devil doc examples expat gtk irrlicht lua ogre opengl pcre static-libs tinyxml truetype xerces-c +xml zip" -REQUIRED_USE="|| ( expat tinyxml xerces-c xml )" # bug 362223 - -RDEPEND="bidi? ( dev-libs/fribidi ) - devil? ( media-libs/devil ) - expat? ( dev-libs/expat ) - truetype? ( media-libs/freetype:2 ) - irrlicht? ( dev-games/irrlicht ) - lua? ( - dev-lang/lua - dev-lua/toluapp - ) - ogre? ( >=dev-games/ogre-1.7 ) - opengl? ( - virtual/opengl - virtual/glu - media-libs/freeglut - media-libs/glew - ) - pcre? ( dev-libs/libpcre ) - tinyxml? ( dev-libs/tinyxml ) - xerces-c? ( dev-libs/xerces-c ) - xml? ( dev-libs/libxml2 ) - zip? ( sys-libs/zlib[minizip] )" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( app-doc/doxygen )" - -S=${WORKDIR}/${MY_P} -S2=${WORKDIR}/${MY_P}_static - -src_prepare() { - # use minizip from zlib rather than local code - if use zip ; then - sed -i \ - -e '/CEGUI_BUILD_MINIZIP_RESOURCE_PROVIDER_TRUE/{ - s:minizip/ioapi.cpp minizip/unzip.cpp::; - s:libCEGUIBase@cegui_bsfx@_la-ioapi.lo::; - s:libCEGUIBase@cegui_bsfx@_la-unzip.lo:: - }' \ - -e '/^ZLIB_LIBS/s:=.*:= -lminizip:' \ - cegui/src/Makefile.in || die - fi - rm -rf cegui/src/minizip - - if use examples ; then - cp -r Samples Samples.clean - rm -f $(find Samples.clean -name 'Makefile*') - fi - - if use static-libs ; then - cp -a "${S}" "${S2}" || die - fi -} - -src_configure() { - local myconf=( - $(use_enable bidi bidirectional-text) - $(use_enable debug) - $(use_enable devil) - $(use_enable examples samples) - $(use_enable expat) - $(use_enable truetype freetype) - $(use_enable irrlicht irrlicht-renderer) - $(use_enable lua lua-module) - $(use_enable lua toluacegui) - --enable-external-toluapp - $(use_enable ogre ogre-renderer) - $(use_enable opengl opengl-renderer) - --enable-external-glew - $(use_enable pcre) - $(use_enable tinyxml) - --enable-external-tinyxml - $(use_enable xerces-c) - $(use_enable xml libxml) - $(use_enable zip minizip-resource-provider) - --enable-null-renderer - --enable-stb - --enable-tga - --disable-corona - --disable-dependency-tracking - --disable-freeimage - --disable-rapidxml - --disable-samples - --disable-silly - $(use_with gtk gtk2) - ) - - econf \ - "${myconf[@]}" \ - --disable-static \ - --enable-shared - - if use static-libs ; then - cd "${S2}" || die - econf \ - "${myconf[@]}" \ - --enable-static \ - --disable-shared - fi - - # we are doing a double build here cause - # the build system does not permit - # "--enable-static --enable-shared" -} - -src_compile() { - default - - if use static-libs ; then - emake -C "${S2}" - fi -} - -src_install() { - local i - default - - if use doc ; then - emake html || die - dohtml -r doc/doxygen/html/* || die - fi - if use examples ; then - insinto /usr/share/doc/${PF}/Samples - doins -r Samples.clean/* || die - fi - - if use static-libs ; then - find "${S2}" -name "*CEGUI*.a" -exec dolib.a '{}' \; - - # fix/merge .la files - for i in `find "${D}" -name "*.la"` ; do - sed \ - -e "s/old_library=''/old_library='$(basename ${i%.la}).a'/" \ - -i ${i} || die "fixing .la files failed" - done - else - # remove .la files - prune_libtool_files --all - fi -} diff --git a/dev-games/cegui/files/cegui-0.7.7-irrlicht-1.8.patch b/dev-games/cegui/files/cegui-0.7.7-irrlicht-1.8.patch deleted file mode 100644 index 2a61db655a74..000000000000 --- a/dev-games/cegui/files/cegui-0.7.7-irrlicht-1.8.patch +++ /dev/null @@ -1,18 +0,0 @@ -http://crayzedsgui.hg.sourceforge.net/hgweb/crayzedsgui/cegui_mk2/rev/51125cc0aab5 - ---- a/cegui/src/RendererModules/Irrlicht/CEGUIIrrlichtGeometryBuffer.cpp -+++ b/cegui/src/RendererModules/Irrlicht/CEGUIIrrlichtGeometryBuffer.cpp -@@ -303,7 +303,12 @@ - else */ - { - d_material.MaterialType = irr::video::EMT_ONETEXTURE_BLEND; -- d_material.MaterialTypeParam = irr::video::pack_texureBlendFunc( -+ d_material.MaterialTypeParam = -+#if IRRLICHT_VERSION_MAJOR > 1 || (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR >= 8) -+ irr::video::pack_textureBlendFunc( -+#else -+ irr::video::pack_texureBlendFunc( -+#endif - irr::video::EBF_SRC_ALPHA, - irr::video::EBF_ONE_MINUS_SRC_ALPHA, - irr::video::EMFN_MODULATE_1X, diff --git a/dev-games/mygui/mygui-3.2.2.ebuild b/dev-games/mygui/mygui-3.2.2.ebuild index 9696fa8f8cd8..9f3a6f230ea6 100644 --- a/dev-games/mygui/mygui-3.2.2.ebuild +++ b/dev-games/mygui/mygui-3.2.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/mygui/mygui-3.2.2.ebuild,v 1.2 2015/04/08 12:13:56 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/mygui/mygui-3.2.2.ebuild,v 1.3 2015/04/19 10:06:20 ago Exp $ EAPI=5 CMAKE_REMOVE_MODULES="yes" @@ -16,7 +16,7 @@ SRC_URI="https://github.com/MyGUI/mygui/archive/${MY_P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="debug doc +ogre -opengl plugins samples static-libs test tools linguas_ru" REQUIRED_USE="ogre? ( !opengl ) opengl? ( !ogre )" diff --git a/dev-games/simgear/simgear-3.4.0.ebuild b/dev-games/simgear/simgear-3.4.0.ebuild index d1b5dd0e03bd..0d9c378d8454 100644 --- a/dev-games/simgear/simgear-3.4.0.ebuild +++ b/dev-games/simgear/simgear-3.4.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/simgear/simgear-3.4.0.ebuild,v 1.2 2015/04/08 15:17:50 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/simgear/simgear-3.4.0.ebuild,v 1.3 2015/04/19 10:16:02 ago Exp $ EAPI=5 @@ -11,7 +11,7 @@ HOMEPAGE="http://www.simgear.org/" SRC_URI="http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/${P}.tar.bz2" LICENSE="GPL-2" -KEYWORDS="amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc x86" SLOT="0" IUSE="debug subversion test" diff --git a/dev-haskell/hashable/hashable-1.2.1.0.ebuild b/dev-haskell/hashable/hashable-1.2.1.0.ebuild index 4ec7cd3b3ec5..0c6cc4ebf2ed 100644 --- a/dev-haskell/hashable/hashable-1.2.1.0.ebuild +++ b/dev-haskell/hashable/hashable-1.2.1.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hashable/hashable-1.2.1.0.ebuild,v 1.7 2015/03/02 09:30:24 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hashable/hashable-1.2.1.0.ebuild,v 1.8 2015/04/18 20:39:34 pacho Exp $ EAPI=5 @@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="alpha amd64 ~ia64 ppc ~ppc64 ~sparc x86" +KEYWORDS="alpha amd64 ~ia64 ppc ppc64 ~sparc x86" IUSE="+cpu_flags_x86_sse2 cpu_flags_x86_sse4_1" RDEPEND=">=dev-haskell/text-0.11.0.5:=[profile?] diff --git a/dev-haskell/vector/vector-0.10.0.1.ebuild b/dev-haskell/vector/vector-0.10.0.1.ebuild index a6f6f319fc0c..014c8662657d 100644 --- a/dev-haskell/vector/vector-0.10.0.1.ebuild +++ b/dev-haskell/vector/vector-0.10.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/vector/vector-0.10.0.1.ebuild,v 1.7 2015/02/20 13:14:52 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/vector/vector-0.10.0.1.ebuild,v 1.8 2015/04/18 12:48:12 pacho Exp $ EAPI=5 @@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="alpha amd64 ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" +KEYWORDS="alpha amd64 ia64 ~ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" IUSE="" RDEPEND=">=dev-haskell/primitive-0.5.0.1:=[profile?] /dev/null - mkdir dmgmount - hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg \ - -mountpoint "${T}"/dmgmount - xar -xf dmgmount/JDK\ $(get_version_component_range 2)\ Update\ $(get_version_component_range 4).pkg - hdiutil detach "${T}"/dmgmount - zcat jdk1${MY_PV/u/0}.pkg/Payload | cpio -idv - mv Contents/Home "${S}" - popd > /dev/null - else - default - fi -} - -src_prepare() { - if use jce; then - mv "${WORKDIR}"/${JCE_DIR} "${S}"/jre/lib/security/ || die - fi -} - -src_install() { - local dest="/opt/${P}" - local ddest="${ED}${dest}" - - # Create files used as storage for system preferences. - mkdir jre/.systemPrefs || die - touch jre/.systemPrefs/.system.lock || die - touch jre/.systemPrefs/.systemRootModFile || die - - # We should not need the ancient plugin for Firefox 2 anymore, plus it has - # writable executable segments - if use x86; then - rm -vf {,jre/}lib/i386/libjavaplugin_oji.so \ - {,jre/}lib/i386/libjavaplugin_nscp*.so - rm -vrf jre/plugin/i386 - fi - # Without nsplugin flag, also remove the new plugin - local arch=${ARCH}; - use x86 && arch=i386; - if ! use nsplugin; then - rm -vf {,jre/}lib/${arch}/libnpjp2.so \ - {,jre/}lib/${arch}/libjavaplugin_jni.so - fi - - dodoc COPYRIGHT - dohtml README.html - - dodir "${dest}" - cp -pPR bin include jre lib man "${ddest}" || die - - if use derby; then - cp -pPR db "${ddest}" || die - fi - - if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then - cp -pPR demo sample "${ddest}" || die - if use kernel_linux; then - cp -pPR "${WORKDIR}"/javafx-samples-${FX_VERSION//_/.} \ - "${ddest}"/javafx-samples || die - fi - fi - - if use jce; then - dodir "${dest}"/jre/lib/security/strong-jce - mv "${ddest}"/jre/lib/security/US_export_policy.jar \ - "${ddest}"/jre/lib/security/strong-jce || die - mv "${ddest}"/jre/lib/security/local_policy.jar \ - "${ddest}"/jre/lib/security/strong-jce || die - dosym "${dest}"/jre/lib/security/${JCE_DIR}/US_export_policy.jar \ - "${dest}"/jre/lib/security/US_export_policy.jar - dosym "${dest}"/jre/lib/security/${JCE_DIR}/local_policy.jar \ - "${dest}"/jre/lib/security/local_policy.jar - fi - - if use nsplugin; then - install_mozilla_plugin "${dest}"/jre/lib/${arch}/libnpjp2.so - fi - - if use source; then - cp -p src.zip "${ddest}" || die - fi - - if use !arm && use !x86-macos && use !x64-macos ; then - # Install desktop file for the Java Control Panel. - # Using ${PN}-${SLOT} to prevent file collision with jre and or - # other slots. make_desktop_entry can't be used as ${P} would - # end up in filename. - newicon jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \ - sun-jcontrol-${PN}-${SLOT}.png || die - sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT}#" \ - -e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \ - -e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \ - -e "s#Application;##" \ - -e "/Encoding/d" \ - jre/lib/desktop/applications/sun_java.desktop \ - > "${T}"/jcontrol-${PN}-${SLOT}.desktop || die - domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop - fi - - # Prune all fontconfig files so libfontconfig will be used and only install - # a Gentoo specific one if fontconfig is disabled. - # http://docs.oracle.com/javase/7/docs/technotes/guides/intl/fontconfig.html - rm "${ddest}"/jre/lib/fontconfig.* - if ! use fontconfig; then - cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die - eprefixify "${T}"/fontconfig.properties - insinto "${dest}"/jre/lib/ - doins "${T}"/fontconfig.properties - fi - - # This needs to be done before CDS - #215225 - java-vm_set-pax-markings "${ddest}" - - # see bug #207282 - einfo "Creating the Class Data Sharing archives" - case ${ARCH} in - arm|ia64) - ${ddest}/bin/java -client -Xshare:dump || die - ;; - x86) - ${ddest}/bin/java -client -Xshare:dump || die - # limit heap size for large memory on x86 #467518 - # this is a workaround and shouldn't be needed. - ${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die - ;; - *) - ${ddest}/bin/java -server -Xshare:dump || die - ;; - esac - - # Remove empty dirs we might have copied - find "${D}" -type d -empty -exec rmdir -v {} + || die - - if use x86-macos || use x64-macos ; then - # fix misc install_name issues - pushd "${ddest}"/jre/lib > /dev/null || die - local lib needed nlib npath - for lib in \ - libJObjC libdecora-sse libglass libjavafx-{font,iio} \ - libjfxmedia libjfxwebkit libprism-es2 ; - do - lib=${lib}.dylib - einfo "Fixing self-reference of ${lib}" - install_name_tool \ - -id "${EPREFIX}${dest}/jre/lib/${lib}" \ - "${lib}" - done - popd > /dev/null - for nlib in jdk1{5,6} ; do - install_name_tool -change \ - /usr/lib/libgcc_s_ppc64.1.dylib \ - $($(tc-getCC) -print-file-name=libgcc_s_ppc64.1.dylib) \ - "${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib - install_name_tool -id \ - "${EPREFIX}${dest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib \ - "${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib - done - fi - - set_java_env - java-vm_revdep-mask - java-vm_sandbox-predict /dev/random /proc/self/coredump_filter -} diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.40-r1.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.40-r1.ebuild deleted file mode 100644 index 75a333fb22e8..000000000000 --- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.40-r1.ebuild +++ /dev/null @@ -1,317 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.40-r1.ebuild,v 1.3 2015/04/08 12:32:33 ago Exp $ - -EAPI="5" - -inherit eutils java-vm-2 prefix versionator - -# This URIs need to be updated when bumping! -JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html" -JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html" - -# This is a list of archs supported by this update. -# Currently arm comes and goes. -AT_AVAILABLE=( amd64 x86 x64-solaris sparc64-solaris x86-macos x64-macos ) - -# Sometimes some or all of the demos are missing, this is to not have to rewrite half -# the ebuild when it happens. -DEMOS_AVAILABLE=( amd64 x86 x64-solaris sparc64-solaris x86-macos x64-macos ) - -if [[ "$(get_version_component_range 4)" == 0 ]] ; then - S_PV="$(get_version_component_range 1-3)" -else - MY_PV_EXT="u$(get_version_component_range 4)" - S_PV="$(get_version_component_range 1-4)" -fi - -MY_PV="$(get_version_component_range 2)${MY_PV_EXT}" - -AT_amd64="jdk-${MY_PV}-linux-x64.tar.gz" -AT_arm="jdk-${MY_PV}-linux-arm-vfp-hflt.tar.gz" -AT_x86="jdk-${MY_PV}-linux-i586.tar.gz" -AT_x64_solaris="jdk-${MY_PV}-solaris-x64.tar.gz" -AT_sparc64_solaris="${AT_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9.tar.gz" -AT_x86_macos="jdk-${MY_PV}-macosx-x64.dmg" -AT_x64_macos="jdk-${MY_PV}-macosx-x64.dmg" - -DEMOS_amd64="jdk-${MY_PV}-linux-x64-demos.tar.gz" -DEMOS_arm="jdk-${MY_PV}-linux-arm-vfp-hflt-demos.tar.gz" -DEMOS_x86="jdk-${MY_PV}-linux-i586-demos.tar.gz" -DEMOS_x64_solaris="jdk-${MY_PV}-solaris-x64-demos.tar.gz" -DEMOS_sparc64_solaris="jdk-${MY_PV}-solaris-sparcv9-demos.tar.gz" -DEMOS_x86_macos="jdk-${MY_PV}-macosx-x86_64-demos.zip" -DEMOS_x64_macos="jdk-${MY_PV}-macosx-x86_64-demos.zip" - -JCE_DIR="UnlimitedJCEPolicyJDK8" -JCE_FILE="jce_policy-8.zip" - -DESCRIPTION="Oracle's Java SE Development Kit" -HOMEPAGE="http://www.oracle.com/technetwork/java/javase/" -for d in "${AT_AVAILABLE[@]}"; do - SRC_URI+=" ${d}? ( $(eval "echo \${$(echo AT_${d/-/_})}")" - if has ${d} "${DEMOS_AVAILABLE[@]}"; then - SRC_URI+=" examples? ( $(eval "echo \${$(echo DEMOS_${d/-/_})}") )" - fi - SRC_URI+=" )" -done -unset d -SRC_URI+=" jce? ( ${JCE_FILE} )" - -LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )" -SLOT="1.8" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris" -IUSE="+X alsa aqua derby doc examples +fontconfig jce nsplugin pax_kernel selinux source" - -RESTRICT="fetch strip" -QA_PREBUILT="*" - -COMMON_DEP="" -RDEPEND="${COMMON_DEP} - X? ( !aqua? ( - x11-libs/libX11:0 - x11-libs/libXext:0 - x11-libs/libXi:0 - x11-libs/libXrender:0 - x11-libs/libXtst:0 - ) ) - alsa? ( media-libs/alsa-lib:0 ) - doc? ( dev-java/java-sdk-docs:${SLOT} ) - fontconfig? ( media-libs/fontconfig:1.0 ) - !prefix? ( sys-libs/glibc:* ) - selinux? ( sec-policy/selinux-java )" -# A PaX header isn't created by scanelf, so depend on paxctl to avoid fallback -# marking. See bug #427642. -DEPEND="${COMMON_DEP} - jce? ( app-arch/unzip:0 ) - examples? ( kernel_linux? ( app-arch/unzip:0 ) ) - pax_kernel? ( sys-apps/paxctl:0 )" - -S="${WORKDIR}/jdk" - -check_tarballs_available() { - local uri=$1; shift - local dl= unavailable= - for dl in "${@}" ; do - [[ ! -f "${DISTDIR}/${dl}" ]] && unavailable+=" ${dl}" - done - - if [[ -n "${unavailable}" ]] ; then - if [[ -z ${_check_tarballs_available_once} ]] ; then - einfo - einfo "Oracle requires you to download the needed files manually after" - einfo "accepting their license through a javascript capable web browser." - einfo - _check_tarballs_available_once=1 - fi - einfo "Download the following files:" - for dl in ${unavailable}; do - einfo " ${dl}" - done - einfo "at '${uri}'" - einfo "and move them to '${DISTDIR}'" - einfo - einfo "If the above mentioned urls do not point to the correct version anymore," - einfo "please download the files from Oracle's java download archive:" - einfo - einfo " http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html#jdk-${MY_PV}-oth-JPR" - einfo - fi -} - -pkg_nofetch() { - local distfiles=( $(eval "echo \${$(echo AT_${ARCH/-/_})}") ) - if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then - distfiles+=( $(eval "echo \${$(echo DEMOS_${ARCH/-/_})}") ) - fi - check_tarballs_available "${JDK_URI}" "${distfiles[@]}" - - use jce && check_tarballs_available "${JCE_URI}" "${JCE_FILE}" -} - -src_unpack() { - if use arm ; then - # Special case for ARM soft VS hard float. - #if [[ ${CHOST} == *-hardfloat-* ]] ; then - unpack jdk-${MY_PV}-linux-arm-vfp-hflt.tar.gz - use examples && unpack jdk-${MY_PV}-linux-arm-vfp-hflt-demos.tar.gz - #else - # unpack jdk-${MY_PV}-linux-arm-vfp-sflt.tar.gz - # use examples && unpack jdk-${MY_PV}-linux-arm-vfp-sflt-demos.tar.gz - #fi - use jce && unpack ${JCE_FILE} - elif use x86-macos || use x64-macos ; then - pushd "${T}" > /dev/null - mkdir dmgmount - hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg \ - -mountpoint "${T}"/dmgmount - local update=$(get_version_component_range 4) - [[ ${#update} == 1 ]] && update="0${update}" - xar -xf dmgmount/JDK\ $(get_version_component_range 2)\ Update\ ${update}.pkg - hdiutil detach "${T}"/dmgmount - zcat jdk1${MY_PV%u*}0${update}.pkg/Payload | cpio -idv - mv Contents/Home "${WORKDIR}"/jdk${MY_PV} - popd > /dev/null - else - default - fi - - # Upstream is changing their versioning scheme every release around 1.8.0.*; - # to stop having to change it over and over again, just wildcard match and - # live a happy life instead of trying to get this new jdk1.8.0_05 to work. - mv "${WORKDIR}"/jdk* "${S}" || die -} - -src_prepare() { - if use jce ; then - mv "${WORKDIR}"/${JCE_DIR} "${S}"/jre/lib/security/ || die - fi -} - -src_install() { - local dest="/opt/${P}" - local ddest="${ED}${dest}" - - # Create files used as storage for system preferences. - mkdir jre/.systemPrefs || die - touch jre/.systemPrefs/.system.lock || die - touch jre/.systemPrefs/.systemRootModFile || die - - # We should not need the ancient plugin for Firefox 2 anymore, plus it has - # writable executable segments - if use x86 ; then - rm -vf {,jre/}lib/i386/libjavaplugin_oji.so \ - {,jre/}lib/i386/libjavaplugin_nscp*.so - rm -vrf jre/plugin/i386 - fi - - # Without nsplugin flag, also remove the new plugin - local arch=${ARCH}; - use x86 && arch=i386; - if ! use nsplugin ; then - rm -vf {,jre/}lib/${arch}/libnpjp2.so \ - {,jre/}lib/${arch}/libjavaplugin_jni.so - fi - - dodoc COPYRIGHT - dohtml README.html - - dodir "${dest}" - cp -pPR bin include jre lib man "${ddest}" || die - - if use derby ; then - cp -pPR db "${ddest}" || die - fi - - if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}" ; then - cp -pPR demo sample "${ddest}" || die - fi - - if use jce ; then - dodir "${dest}"/jre/lib/security/strong-jce - mv "${ddest}"/jre/lib/security/US_export_policy.jar \ - "${ddest}"/jre/lib/security/strong-jce || die - mv "${ddest}"/jre/lib/security/local_policy.jar \ - "${ddest}"/jre/lib/security/strong-jce || die - dosym "${dest}"/jre/lib/security/${JCE_DIR}/US_export_policy.jar \ - "${dest}"/jre/lib/security/US_export_policy.jar - dosym "${dest}"/jre/lib/security/${JCE_DIR}/local_policy.jar \ - "${dest}"/jre/lib/security/local_policy.jar - fi - - if use nsplugin ; then - install_mozilla_plugin "${dest}"/jre/lib/${arch}/libnpjp2.so - fi - - if use source ; then - for mysrc in src javafx-src; do - mysrc="${mysrc}.zip" - ebegin "Copying source file ${mysrc}" - cp -p "${mysrc}" "${ddest}" || die - eend $? - done - fi - - if [[ -d jre/lib/desktop ]] ; then - # Install desktop file for the Java Control Panel. - # Using ${PN}-${SLOT} to prevent file collision with jre and or - # other slots. make_desktop_entry can't be used as ${P} would - # end up in filename. - newicon jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \ - sun-jcontrol-${PN}-${SLOT}.png || die - sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT}#" \ - -e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \ - -e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \ - -e "s#Application;##" \ - -e "/Encoding/d" \ - jre/lib/desktop/applications/sun_java.desktop \ - > "${T}"/jcontrol-${PN}-${SLOT}.desktop || die - domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop - fi - - # Prune all fontconfig files so libfontconfig will be used and only install - # a Gentoo specific one if fontconfig is disabled. - # http://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html - rm "${ddest}"/jre/lib/fontconfig.* - if ! use fontconfig ; then - cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die - eprefixify "${T}"/fontconfig.properties - insinto "${dest}"/jre/lib/ - doins "${T}"/fontconfig.properties - fi - - # This needs to be done before CDS - #215225 - java-vm_set-pax-markings "${ddest}" - - # see bug #207282 - einfo "Creating the Class Data Sharing archives" - case ${ARCH} in - arm|ia64) - ${ddest}/bin/java -client -Xshare:dump || die - ;; - x86) - ${ddest}/bin/java -client -Xshare:dump || die - # limit heap size for large memory on x86 #467518 - # this is a workaround and shouldn't be needed. - ${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die - ;; - *) - ${ddest}/bin/java -server -Xshare:dump || die - ;; - esac - - # Remove empty dirs we might have copied. - find "${D}" -type d -empty -exec rmdir -v {} + || die - - if use x86-macos || use x64-macos ; then - # Fix miscellaneous install_name issues. - pushd "${ddest}"/jre/lib > /dev/null || die - local lib needed nlib npath - for lib in \ - decora_sse glass jfx{media,webkit} \ - javafx_{font,font_t2k,iio} prism_{common,es2,sw} \ - ; do - lib=lib${lib}.dylib - einfo "Fixing self-reference of ${lib}" - install_name_tool \ - -id "${EPREFIX}${dest}/jre/lib/${lib}" \ - "${lib}" - done - popd > /dev/null - - # TODO: This reads "jdk1{5,6}", what about "jdk1{7,8}"? - for nlib in jdk1{5,6} ; do - install_name_tool -change \ - /usr/lib/libgcc_s_ppc64.1.dylib \ - $($(tc-getCC) -print-file-name=libgcc_s_ppc64.1.dylib) \ - "${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib - install_name_tool -id \ - "${EPREFIX}${dest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib \ - "${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib - done - fi - - set_java_env - java-vm_revdep-mask - java-vm_sandbox-predict /dev/random /proc/self/coredump_filter -} diff --git a/dev-java/oracle-jre-bin/Manifest b/dev-java/oracle-jre-bin/Manifest index 94b53680191d..49b4385fb7ca 100644 --- a/dev-java/oracle-jre-bin/Manifest +++ b/dev-java/oracle-jre-bin/Manifest @@ -1,10 +1,6 @@ DIST UnlimitedJCEPolicyJDK7.zip 7426 SHA256 7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d SHA512 02eca7da8f3fffea388431d5352290535a63d53a1f5c795d6511ccba62445787a0ee6ad4bc1852e5262860b6d607ba2a8c6a3dbb0c3e1d7c3a67ac7bbc783204 WHIRLPOOL 02460c7ca54f5f62c3f349addf8e2a101f7a56987e9f62365fac3f703b0c93ac5de4d55697a3d04f78b547b072e0acc95a0720d2ce3b429d2fd5936d50edd1ac DIST jce_policy-8.zip 8409 SHA256 f3020a3922efd6626c2fff45695d527f34a8020e938a49292561f18ad1320b59 SHA512 abbaa81a35f904ec61b4cf3c2d1ca8c8d49e53bb248e698185eea906939d68f5063412800585ec74027aab1012ef189aebe1dc99fe8ef4230a0ecb0b527f88e5 WHIRLPOOL 8c9ce1ea4673b75fa6271b74e598880f98361d5d2c9c25439fa0af3d07cfeb871b39682dae4e38160f49770b1fec953162e451b9b2cf44d2c72a226944212bcc -DIST jre-7u76-linux-i586.tar.gz 48501515 SHA256 38aecf5f6c8706f293b40db0133fca0aca5e6ab520c1b9b0a3fc38ef2988b3cf SHA512 084752d9f41352df061be8327d6eecdd07d4065de8c0a7201f36cbc1fbd62c1ca45b21dc882601c34a09bca29317ebe952ac589904d4893545544134ed619cce WHIRLPOOL c6f90d86a5b1e06385996354a8aa450b83e0516345a014a2f55a41e436e2e00121d200d5d83ff96691237330945589de97d8e6e5895ef5dae0aa352c4b476768 -DIST jre-7u76-linux-x64.tar.gz 47058747 SHA256 22808ec8c747409858e952c124bbc05734feff057ead402be2b2a7fa5852e4d9 SHA512 b4101ade8c0f9a7891f01b62740e53873db410637663fda02f4a6ecddc8ade0db2650162654eb9514811fafc640925ff780b5b7a9e3f2a58df207ff97d954aef WHIRLPOOL 21aac95873276ed0cec72ec80ccad226e47c5894324c925e1d1bd9b7c0d15f03e41e50a6bca5fd36d0d4c5caa079a11774b756e8ccffacffb5ea99ae49ee334a DIST jre-7u80-linux-i586.tar.gz 48558751 SHA256 b773aef1458a4adde03af62f8163c7e4614b485e1f01699ff8f5f60919251575 SHA512 d85b8700248a4ad0a0873d0c84b2175fb0a66773c43899ab47ac531be089794c17eb0e8b7503d46efd78833da17c9fa8a83ad1cb9c062e191acfb77155639474 WHIRLPOOL 766c88748bc758a1b35bd6008750cc8f2678801b1cc5629bcb7a756e4a32973a5f5ad927348b3ce3ad9ecb3e7aca5d1af2b613fba35d4f53f9601b1ff42312b2 DIST jre-7u80-linux-x64.tar.gz 47110223 SHA256 4c01efd0d8e80bb6e2f324ec3408ce64f066d4506c7ec93a491f615a4523f4f3 SHA512 e61e78ab1be0313690e8ab8d6cbae7366dd78aa4716f47c8908178196b658b94ee318dd04043965a72c34d8ef5c1cb4902afaa2188e76eb944256f090339107d WHIRLPOOL 1af7417b327402abaf4074445f051924de8b19810668890e089b66a488dddfc7f50cdd96a012130a591940338177164f66c83caf54c5d6d370be27d119a907fe -DIST jre-8u40-linux-i586.tar.gz 65652483 SHA256 1a5c90e36bfa8117aa4764f8d1ef7b61607d694af2b6ab4ceb27cdeb65c46d01 SHA512 614bd56bbe94cc08c182d36c1bb0846fda08c7834b9d063e941cd7043137aa68ec2458a6c804226332dbf0bdb5acaaa30fb2e2d96985d24f4264b7075317f990 WHIRLPOOL a1ace57317f3023d4b0ad2c7d475a0f2de5e561db0497a6d574ba3080d3553313fe61f6d4fc3ca009cace23e1dae47659d66e0be2311195ecb31c7585ddde515 -DIST jre-8u40-linux-x64.tar.gz 63777545 SHA256 17f4e8df5082b0df63dfb962e2e3da0f98e45850aebf5e4a91f0471d2cde7d4a SHA512 01c0b40f538282eb232970fe70e244680725522c73d81226f872f066db435db7756f1d9256bf8f22f29edd78aef5a88a51957ba8143a01e32bcf40e3b5c0ae77 WHIRLPOOL 25b869e385887b311e99b9de525c16295a24f4dd2c56500a7775a02dd81241f80b80766992d65b74a5bb6074510e6195b28919d5712f8c8da019e26b1325577f DIST jre-8u45-linux-i586.tar.gz 65672226 SHA256 2f0bfecaae5afe296f42064d9725100698341f87bc46dc2c71cb0a4f03ba1574 SHA512 91b4b959ed7198feb26bb5f38eb9018ec621392c968c5011914295502e417b0af032fd69602d4cf79d5ba20ccb6c1166ae8a7a8ab4cc3aa95d1c678422b894df WHIRLPOOL 327b8c99c1662d29370d9777664862cc3dfac9e07ad98c9a1f0d237efb4b48e1b9c5c89015f52b918f453f10c64099b8e3cac193a1b3f018ea206939790639b6 DIST jre-8u45-linux-x64.tar.gz 63822322 SHA256 c156128cd92eb91e9320f61a8f36305b3382043afe3467304c6abd044d27da0a SHA512 c70d9ae5d1f2d47aab1943e4123155c10973b26d951fb220978097c676850c37c7ed48c643784989292c766f8afa141740614704ec6901d1f4882096f1c67789 WHIRLPOOL c965868d17307f8454a2acab6bbb3d86c19c059b89c72dc9b823844d0a4e2acad7674fa7297979d9e056663e31a83ac32409deca97125117632f8d20171a14cc diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.76.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.76.ebuild deleted file mode 100644 index 7356c9f864b1..000000000000 --- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.76.ebuild +++ /dev/null @@ -1,185 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.76.ebuild,v 1.3 2015/01/28 10:41:55 ago Exp $ - -EAPI="5" - -inherit java-vm-2 eutils prefix versionator - -MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)" -S_PV="$(replace_version_separator 3 '_')" - -X86_AT="jre-${MY_PV}-linux-i586.tar.gz" -AMD64_AT="jre-${MY_PV}-linux-x64.tar.gz" - -# This URIs need updating when bumping! -JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre7-downloads-1880261.html#jre-${MY_PV}-oth-JPR" -JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html" - -JCE_DIR="UnlimitedJCEPolicy" -JCE_FILE="${JCE_DIR}JDK7.zip" - -DESCRIPTION="Oracle's Java SE Runtime Environment" -HOMEPAGE="http://www.oracle.com/technetwork/java/javase/" -SRC_URI=" - x86? ( ${X86_AT} ) - amd64? ( ${AMD64_AT} ) - jce? ( ${JCE_FILE} )" - -LICENSE="Oracle-BCLA-JavaSE" -SLOT="1.7" -KEYWORDS="amd64 x86" -IUSE="X alsa fontconfig jce nsplugin pax_kernel selinux" - -RESTRICT="fetch strip" -QA_PREBUILT="*" - -COMMON_DEP="" -RDEPEND="${COMMON_DEP} - X? ( - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrender - x11-libs/libXtst - x11-libs/libX11 - ) - alsa? ( media-libs/alsa-lib ) - fontconfig? ( media-libs/fontconfig ) - !prefix? ( sys-libs/glibc ) - selinux? ( sec-policy/selinux-java )" -# scanelf won't create a PaX header, so depend on paxctl to avoid fallback -# marking. #427642 -DEPEND="${COMMON_DEP} - jce? ( app-arch/unzip ) - pax_kernel? ( sys-apps/paxctl )" - -S="${WORKDIR}/jre${S_PV}" - -pkg_nofetch() { - if use x86; then - AT=${X86_AT} - elif use amd64; then - AT=${AMD64_AT} - fi - - einfo "Please download '${AT}' from:" - einfo "'${JRE_URI}'" - einfo "and move it to '${DISTDIR}'" - - if use jce; then - einfo "Also download '${JCE_FILE}' from:" - einfo "'${JCE_URI}'" - einfo "and move it to '${DISTDIR}'" - fi - - einfo - einfo "If the above mentioned urls do not point to the correct version anymore," - einfo "please download the files from Oracle's java download archive:" - einfo - einfo " http://www.oracle.com/technetwork/java/javase/downloads/java-archive-downloads-javase7-521261.html#jre-${MY_PV}-oth-JPR" - einfo -} - -src_prepare() { - if use jce; then - mv "${WORKDIR}"/${JCE_DIR} lib/security/ || die - fi -} - -src_install() { - local dest="/opt/${P}" - local ddest="${ED}${dest}" - - # Create files used as storage for system preferences. - mkdir .systemPrefs || die - touch .systemPrefs/.system.lock || die - touch .systemPrefs/.systemRootModFile || die - - # We should not need the ancient plugin for Firefox 2 anymore, plus it has - # writable executable segments - if use x86; then - rm -vf lib/i386/libjavaplugin_oji.so \ - lib/i386/libjavaplugin_nscp*.so - rm -vrf plugin/i386 - fi - # Without nsplugin flag, also remove the new plugin - local arch=${ARCH}; - use x86 && arch=i386; - if ! use nsplugin; then - rm -vf lib/${arch}/libnpjp2.so \ - lib/${arch}/libjavaplugin_jni.so - fi - - dodir "${dest}" - cp -pPR bin lib man "${ddest}" || die - - # This needs to be done before CDS - #215225 - java-vm_set-pax-markings "${ddest}" - - # see bug #207282 - einfo "Creating the Class Data Sharing archives" - case ${ARCH} in - arm|ia64) - ${ddest}/bin/java -client -Xshare:dump || die - ;; - x86) - ${ddest}/bin/java -client -Xshare:dump || die - # limit heap size for large memory on x86 #467518 - # this is a workaround and shouldn't be needed. - ${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die - ;; - *) - ${ddest}/bin/java -server -Xshare:dump || die - ;; - esac - - # Remove empty dirs we might have copied - find "${D}" -type d -empty -exec rmdir -v {} + || die - - dodoc COPYRIGHT README - - if use jce; then - dodir ${dest}/lib/security/strong-jce - mv "${ddest}"/lib/security/US_export_policy.jar \ - "${ddest}"/lib/security/strong-jce || die - mv "${ddest}"/lib/security/local_policy.jar \ - "${ddest}"/lib/security/strong-jce || die - dosym "${dest}"/lib/security/${JCE_DIR}/US_export_policy.jar \ - "${dest}"/lib/security/US_export_policy.jar - dosym "${dest}"/lib/security/${JCE_DIR}/local_policy.jar \ - "${dest}"/lib/security/local_policy.jar - fi - - if use nsplugin; then - install_mozilla_plugin "${dest}"/lib/${arch}/libnpjp2.so - fi - - # Install desktop file for the Java Control Panel. - # Using ${PN}-${SLOT} to prevent file collision with jre and or other slots. - # make_desktop_entry can't be used as ${P} would end up in filename. - newicon lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \ - sun-jcontrol-${PN}-${SLOT}.png || die - sed -e "s#Name=.*#Name=Java Control Panel for Oracle JRE ${SLOT}#" \ - -e "s#Exec=.*#Exec=/opt/${P}/bin/jcontrol#" \ - -e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \ - -e "s#Application;##" \ - -e "/Encoding/d" \ - lib/desktop/applications/sun_java.desktop > \ - "${T}"/jcontrol-${PN}-${SLOT}.desktop || die - domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop - - # Prune all fontconfig files so libfontconfig will be used and only install - # a Gentoo specific one if fontconfig is disabled. - # http://docs.oracle.com/javase/7/docs/technotes/guides/intl/fontconfig.html - rm "${ddest}"/lib/fontconfig.* || die - if ! use fontconfig; then - cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die - eprefixify "${T}"/fontconfig.properties - insinto "${dest}"/lib/ - doins "${T}"/fontconfig.properties - fi - - set_java_env - java-vm_revdep-mask - java-vm_sandbox-predict /dev/random /proc/self/coredump_filter -} diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.40.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.40.ebuild deleted file mode 100644 index 856402a93166..000000000000 --- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.40.ebuild +++ /dev/null @@ -1,200 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.40.ebuild,v 1.3 2015/04/08 12:32:20 ago Exp $ - -EAPI="5" - -inherit java-vm-2 eutils prefix versionator - -if [[ "$(get_version_component_range 4)" == 0 ]] ; then - S_PV="$(get_version_component_range 1-3)" -else - MY_PV_EXT="u$(get_version_component_range 4)" - S_PV="$(get_version_component_range 1-4)" -fi - -MY_PV="$(get_version_component_range 2)${MY_PV_EXT}" - -X86_AT="jre-${MY_PV}-linux-i586.tar.gz" -AMD64_AT="jre-${MY_PV}-linux-x64.tar.gz" - -# This URIs need updating when bumping! -JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html" -JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html" - -JCE_DIR="UnlimitedJCEPolicyJDK8" -JCE_FILE="jce_policy-8.zip" - -DESCRIPTION="Oracle's Java SE Runtime Environment" -HOMEPAGE="http://www.oracle.com/technetwork/java/javase/" -SRC_URI=" - x86? ( ${X86_AT} ) - amd64? ( ${AMD64_AT} ) - jce? ( ${JCE_FILE} )" - -LICENSE="Oracle-BCLA-JavaSE" -SLOT="1.8" -KEYWORDS="amd64 x86" -IUSE="X alsa fontconfig jce nsplugin pax_kernel selinux" - -RESTRICT="fetch strip" -QA_PREBUILT="*" - -COMMON_DEP="" -RDEPEND="${COMMON_DEP} - X? ( - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrender - x11-libs/libXtst - x11-libs/libX11 - ) - alsa? ( media-libs/alsa-lib ) - fontconfig? ( media-libs/fontconfig ) - !prefix? ( sys-libs/glibc ) - selinux? ( sec-policy/selinux-java )" -# scanelf won't create a PaX header, so depend on paxctl to avoid fallback -# marking. #427642 -DEPEND="${COMMON_DEP} - jce? ( app-arch/unzip ) - pax_kernel? ( sys-apps/paxctl )" - -S="${WORKDIR}/jre" - -pkg_nofetch() { - if use x86; then - AT=${X86_AT} - elif use amd64; then - AT=${AMD64_AT} - fi - - einfo "Please download '${AT}' from:" - einfo "'${JRE_URI}'" - einfo "and move it to '${DISTDIR}'" - - if use jce; then - einfo "Also download '${JCE_FILE}' from:" - einfo "'${JCE_URI}'" - einfo "and move it to '${DISTDIR}'" - fi - - einfo - einfo "If the above mentioned urls do not point to the correct version anymore," - einfo "please download the files from Oracle's java download archive:" - einfo - einfo " http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html#jre-${MY_PV}-oth-JPR" - einfo - -} - -src_unpack() { - default - - # Upstream is changing their versioning scheme every release around 1.8.0.*; - # to stop having to change it over and over again, just wildcard match and - # live a happy life instead of trying to get this new jre1.8.0_05 to work. - mv "${WORKDIR}"/jre* "${S}" || die -} - -src_prepare() { - if use jce; then - mv "${WORKDIR}"/${JCE_DIR} lib/security/ || die - fi -} - -src_install() { - local dest="/opt/${P}" - local ddest="${ED}${dest}" - - # Create files used as storage for system preferences. - mkdir .systemPrefs || die - touch .systemPrefs/.system.lock || die - touch .systemPrefs/.systemRootModFile || die - - # We should not need the ancient plugin for Firefox 2 anymore, plus it has - # writable executable segments - if use x86; then - rm -vf lib/i386/libjavaplugin_oji.so \ - lib/i386/libjavaplugin_nscp*.so - rm -vrf plugin/i386 - fi - # Without nsplugin flag, also remove the new plugin - local arch=${ARCH}; - use x86 && arch=i386; - if ! use nsplugin; then - rm -vf lib/${arch}/libnpjp2.so \ - lib/${arch}/libjavaplugin_jni.so - fi - - dodir "${dest}" - cp -pPR bin lib man "${ddest}" || die - - # This needs to be done before CDS - #215225 - java-vm_set-pax-markings "${ddest}" - - # see bug #207282 - einfo "Creating the Class Data Sharing archives" - case ${ARCH} in - arm|ia64) - ${ddest}/bin/java -client -Xshare:dump || die - ;; - x86) - ${ddest}/bin/java -client -Xshare:dump || die - # limit heap size for large memory on x86 #467518 - # this is a workaround and shouldn't be needed. - ${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die - ;; - *) - ${ddest}/bin/java -server -Xshare:dump || die - ;; - esac - # Remove empty dirs we might have copied - find "${D}" -type d -empty -exec rmdir -v {} + || die - - dodoc COPYRIGHT README - - if use jce; then - dodir ${dest}/lib/security/strong-jce - mv "${ddest}"/lib/security/US_export_policy.jar \ - "${ddest}"/lib/security/strong-jce || die - mv "${ddest}"/lib/security/local_policy.jar \ - "${ddest}"/lib/security/strong-jce || die - dosym "${dest}"/lib/security/${JCE_DIR}/US_export_policy.jar \ - "${dest}"/lib/security/US_export_policy.jar - dosym "${dest}"/lib/security/${JCE_DIR}/local_policy.jar \ - "${dest}"/lib/security/local_policy.jar - fi - - if use nsplugin; then - install_mozilla_plugin "${dest}"/lib/${arch}/libnpjp2.so - fi - - # Install desktop file for the Java Control Panel. - # Using ${PN}-${SLOT} to prevent file collision with jre and or other slots. - # make_desktop_entry can't be used as ${P} would end up in filename. - newicon lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \ - sun-jcontrol-${PN}-${SLOT}.png || die - sed -e "s#Name=.*#Name=Java Control Panel for Oracle JRE ${SLOT}#" \ - -e "s#Exec=.*#Exec=/opt/${P}/bin/jcontrol#" \ - -e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \ - -e "s#Application;##" \ - -e "/Encoding/d" \ - lib/desktop/applications/sun_java.desktop > \ - "${T}"/jcontrol-${PN}-${SLOT}.desktop || die - domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop - - # Prune all fontconfig files so libfontconfig will be used and only install - # a Gentoo specific one if fontconfig is disabled. - # http://docs.oracle.com/javase/7/docs/technotes/guides/intl/fontconfig.html - rm "${ddest}"/lib/fontconfig.* || die - if ! use fontconfig; then - cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die - eprefixify "${T}"/fontconfig.properties - insinto "${dest}"/lib/ - doins "${T}"/fontconfig.properties - fi - - set_java_env - java-vm_revdep-mask - java-vm_sandbox-predict /dev/random /proc/self/coredump_filter -} diff --git a/dev-java/sbt/Manifest b/dev-java/sbt/Manifest new file mode 100644 index 000000000000..f370af64bad2 --- /dev/null +++ b/dev-java/sbt/Manifest @@ -0,0 +1,6 @@ +DIST sbt-0.13.8-gentoo-binary.tar.bz2 1048674 SHA256 4a2b22c9d9fbe922d5a5336d88ca21f18b2545850fec16485c824aee43df53e1 SHA512 9a5707601387d604b746ea21145a3c7735dd4b6d36541111b47519b66e5abc929ecc96ff52e144ed39a3db947204a1956e19394a1848e3fd8904f9a98ec24816 WHIRLPOOL 4fb1bde15ab57260a25b0a4a1634122af2e2b9d6cd35d3a9c693d9bba6c398bee489f05bf29a763a60d7a04f54823bdd9fc54ec5a2809900b28f890930649fc7 +DIST sbt-0.13.8-ivy2-deps.tar.bz2 124672043 SHA256 565ba7434316a3ab2f61f58b4bc57317e5c2ae7c9ee95061c39cfddd5767a355 SHA512 47b2f235b7d5883086f8246265e9081a50dcdaede43550a1c0de1c85a9ebf24b47e1331b662aa5c0faebaf22a37849ffb2c1f25a7592c461e62f582984ad4b70 WHIRLPOOL f92b2cd087d51f0ae31d5ac93d1dca7214ace6df8c06b050287007f05697e81ac14758368730e6df45043ba80167b9581e636b0364d5ba3a5c7352fafd7e5007 +DIST sbt-0.13.8-sbt-deps.tar.bz2 88352931 SHA256 d0eab3858f389e201277d1ead68352172830b17dd8343f09e0e63e4880a5e20e SHA512 a6e886f5f18821c26df28a2e8cf2773b4841854fc1bd4dfa43924089966020da5affd635da96a8e13efc7c06be6a5bf53697ca91f5fbf41efcdf8dda00e8428d WHIRLPOOL 54744676b33b11ffb350b5a543986efd5cd629594ce4bac5154a78df233619a92a2a4842659acf9c15533e764d24333183372f136b3b1f7463bbe55347c41b8f +DIST sbt-0.13.8-src.tar.bz2 32766054 SHA256 5225864c54e5718dc68cfcd554a7215bd028947d61ed9522e2ad9d0a19cbdd83 SHA512 f6c834c6294c957e8d5b89a3a616f23a980cca1f882695d09a6e0080d1013227ba3bac86942b39c13e49fb6ac9fb72c3478df24ec8549b8b9812ea352932fff8 WHIRLPOOL 5054578505fe35b6c5f269c72b921920cf232a1efed18da5cd1833457d46f4e4342988be46539001b4dcfcfc6c807785915f4d0791af939dc83018ffcc03effe +DIST sbt-0.13.8-test-deps.tar.bz2 40704285 SHA256 7cb252d69b5868905e0592df7ef9a83ce09f75cb10a72bc9dcd649286bb524a3 SHA512 a79ea9c81abc436168f04f674ffef4fee6f7c7a5dede5a3060e2e2bd9a9863dd5f1c7b31c02f3823fb5a67b2bb43c44d306efb59468f625e4db277cface47cd0 WHIRLPOOL 268ea150c5ca2fe1988317e0616262de814e2aa7213f64b99baf389c3e67e2093a04765ac27f08bd585fe33c77d9dd8c7a0ba8d3bd77d937d9a7260dab72c23a +DIST sbt-launch-0.13.7.jar 1208380 SHA256 9673ca4611e6367955ae068d5888f7ae665ab013c3e8435ffe2ca94318c6d607 SHA512 f48a42f3a9b938de97b20ad281eff2bbc0ccc04d5fda06aa6af3ba02bcc27e4fec10e4bc30660a9df4b453c153c5244805561294168b98a0219c7950d3ded388 WHIRLPOOL 2b1e11dada40b2491eca94e3090ed41342f982a300ad3d2f2be6fa79f01c4b8d302b283f05a765411d3803b012368b2a1dffd70352b315b8e44d6f61c2110822 diff --git a/dev-java/sbt/metadata.xml b/dev-java/sbt/metadata.xml new file mode 100644 index 000000000000..fc08f926629c --- /dev/null +++ b/dev-java/sbt/metadata.xml @@ -0,0 +1,12 @@ + + + + + gienah@gentoo.org> + + +The interactive build tool. +Use Scala to define your tasks. Then run them in parallel from the shell. + +Install from (Gentoo-compiled) binary instead of building from sources. Set this when you run out of memory during build. + diff --git a/dev-java/sbt/sbt-0.13.8.ebuild b/dev-java/sbt/sbt-0.13.8.ebuild new file mode 100644 index 000000000000..0a3e9cc0bb95 --- /dev/null +++ b/dev-java/sbt/sbt-0.13.8.ebuild @@ -0,0 +1,147 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/sbt/sbt-0.13.8.ebuild,v 1.1 2015/04/19 05:55:53 gienah Exp $ + +EAPI="5" + +# repoman gives LIVEVCS.unmasked even with EGIT_COMMIT, so create snapshot +inherit eutils java-pkg-2 # git-r3 + +L_PN="sbt-launch" +L_P="${L_PN}-${PV}" + +B_PV="0.13.7" +BL_P="${L_PN}-${B_PV}" +B_P="${PN}-${B_PV}" + +SV="2.10" + +# creating the sbt src snapshot: +# git clone https://github.com/sbt/sbt.git sbt-0.13.8 +# cd sbt-0.13.8 +# git checkout v0.13.8 +# cd .. +# tar --owner=portage --group=portage -cjf sbt-0.13.8-src.tar.bz2 sbt-0.13.8 + +# creating the binary: +# cd $WORDKIR +# tar -cjf sbt-0.13.8-gentoo-binary.tar.bz2 sbt-0.13.8/sbt-launch/target/sbt-launch.jar + +DESCRIPTION="sbt is a build tool for Scala and Java projects that aims to do the basics well" +HOMEPAGE="http://www.scala-sbt.org/" +EGIT_COMMIT="v${PV}" +EGIT_REPO_URI="https://github.com/sbt/sbt.git" +SRC_URI="!binary? +( + http://dev.gentoo.org/~gienah/snapshots/${P}-src.tar.bz2 + http://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.bz2 + http://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.bz2 + http://dev.gentoo.org/~gienah/snapshots/${P}-test-deps.tar.bz2 + http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/${L_PN}/${PV}/${L_PN}.jar -> ${BL_P}.jar +) +binary? ( http://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.bz2 )" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="binary" + +DEPEND="virtual/jdk:1.6 + >=dev-lang/scala-2.10.4-r1:${SV}" +RDEPEND=">=virtual/jre-1.6 + dev-lang/scala:*" + +# test hangs or fails +RESTRICT="test" + +src_unpack() { + # if ! use binary; then + # git-r3_src_unpack + # fi + # Unpack tar files only. + for f in ${A} ; do + [[ ${f} == *".tar."* ]] && unpack ${f} + done +} + +java_prepare() { + if ! use binary; then + # Note: to bump sbt, some things to try are: + # 1. remove the http://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.bz2 + # http://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.bz2 and + # http://dev.gentoo.org/~gienah/snapshots/${P}-test-deps.tar.bz2 from SRC_URI + # 2. Comment the sbt publishLocal line in src_compile. + # 3. try: + # FEATURES='noclean -test' emerge -v dev-java/sbt + # It should fail in src_install since the sbt publishLocal is not done. + # Check if it downloads more stuff in + # src_compile to ${WORKDIR}/.ivy2 and ${WORKDIR}/.sbt. + # 4. If some of the downloads fail, it might be necessary to run the sbt compile + # again manually to obtain all the dependencies, if so (with jdk 1.6): + # cd to ${S} + # export EROOT=/ + # export WORKDIR='/var/tmp/portage/dev-java/sbt-0.13.8/work' + # export SV="2.10" + # export B_P=sbt-0.13.7 + # export PATH="/usr/share/scala-${SV}/bin:${WORKDIR}/${B_P}:${PATH}" + # sbt compile + # cd ${WORKDIR} + # find .ivy2 .sbt -uid 0 -exec chown portage:portage {} \; + # 5. cd ${WORKDIR} + # tar -cjf sbt-0.13.8-ivy2-deps.tar.bz2 .ivy2 + # tar -cjf sbt-0.13.8-sbt-deps.tar.bz2 .sbt + # 6. It downloads more dependencies for src_test, however the presence of some of these may cause + # the src_compile to fail. So download them seperately as root so we can identify the + # additional files. Note: src_test creates some files in ${WORKDIR}/.m2 which are can + # hopefully be ignored. As root: + # cd ${S} + # sbt test + # cd ${WORKDIR} + # find .ivy2 .sbt -uid 0 -print + # Then add those files to sbt-0.13.8-ivy2-test-deps.tar.bz2 except the files in the directories + # .ivy2/local + # .ivy2/cache/org.scala-sbt + # Something like: + # tar --owner=portage --group=portage -cjf sbt-0.13.8-test-deps.tar.bz2 + # 7. Undo the earlier temporary edits to the ebuild. + mkdir "${WORKDIR}/${B_P}" || die + cp -p "${DISTDIR}/${BL_P}.jar" "${WORKDIR}/${B_P}/${L_PN}.jar" || die + cat <<- EOF > "${WORKDIR}/${B_P}/sbt" + #!/bin/sh + SBT_OPTS="-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=512M" + java -Djavac.args="-encoding UTF-8" -Duser.home="${WORKDIR}" \${SBT_OPTS} -jar "${WORKDIR}/${B_P}/sbt-launch.jar" "\$@" + EOF + chmod u+x "${WORKDIR}/${B_P}/sbt" || die + local SCALA_PVR="$(java-config --query=PVR --package=scala-${SV})" + local SFV="${SCALA_PVR/-*}" + sed -e "s@scalaVersion := \"2.10.4\",@scalaVersion := \"${SFV}\",\n scalaHome := Some(file(\"/usr/share/scala-${SV}\")),@" \ + -i "${S}/build.sbt" || die + fi +} + +src_compile() { + if ! use binary; then + export PATH="${EROOT}usr/share/scala-${SV}/bin:${WORKDIR}/${B_P}:${PATH}" + einfo "=== sbt compile ..." + "${WORKDIR}/${B_P}/sbt" -Dsbt.log.noformat=true compile || die + einfo "=== sbt publishLocal ..." + "${WORKDIR}/${B_P}/sbt" -Dsbt.log.noformat=true publishLocal || die + fi +} + +src_test() { + if ! use binary; then + export PATH="${EROOT}usr/share/scala-${SV}/bin:${WORKDIR}/${B_P}:${PATH}" + "${WORKDIR}/${B_P}/sbt" -Dsbt.log.noformat=true test || die + fi +} + +src_install() { + if ! use binary; then + pushd sbt-launch/target || die + mv ${L_P}.jar ${L_PN}.jar || die + popd + fi + java-pkg_dojar sbt-launch/target/${L_PN}.jar + java-pkg_dolauncher sbt --main xsbt.boot.Boot --java_args "-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=512M" +} diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.57.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.57.ebuild index 03452241e753..1112465822b2 100644 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.57.ebuild +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.57.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.57.ebuild,v 1.1 2014/12/14 11:31:16 ercpe Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.57.ebuild,v 1.2 2015/04/19 09:44:32 pacho Exp $ EAPI="5" JAVA_PKG_IUSE="source" @@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz" LICENSE="Apache-2.0" SLOT="3.0" -KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" IUSE="" DEPEND=">=virtual/jdk-1.6" diff --git a/dev-java/xz-java/xz-java-1.5.ebuild b/dev-java/xz-java/xz-java-1.5.ebuild index fa052e1ece5d..fffbe3651410 100644 --- a/dev-java/xz-java/xz-java-1.5.ebuild +++ b/dev-java/xz-java/xz-java-1.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/xz-java/xz-java-1.5.ebuild,v 1.2 2015/03/27 16:30:16 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/xz-java/xz-java-1.5.ebuild,v 1.3 2015/04/19 09:43:25 pacho Exp $ EAPI=5 JAVA_PKG_IUSE="doc examples source" @@ -13,7 +13,7 @@ SRC_URI="http://tukaani.org/xz/${P}.zip" LICENSE="public-domain" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" RDEPEND=">=virtual/jre-1.4" DEPEND=">=virtual/jdk-1.4 diff --git a/dev-lang/elixir/Manifest b/dev-lang/elixir/Manifest index 68ab33a9ded5..1a537f907736 100644 --- a/dev-lang/elixir/Manifest +++ b/dev-lang/elixir/Manifest @@ -7,3 +7,4 @@ DIST elixir-1.0.0.tar.gz 1032066 SHA256 527774b05bcaacb0347299b42035b606107e8866 DIST elixir-1.0.1.tar.gz 1033936 SHA256 87ecbe8aa8eecfed5033a80b0f1ad2fe95ef835fa909fde65fbc622a5aa3431b SHA512 88743b578bdd0f70356d6adfa0793ebe13a77b0022692b7329be9f192dd61ebf14e802b331e79e40460dd7b6937bf5fe12cb82bb5672db14f320385cadf5ba72 WHIRLPOOL a80ff718431163714a68ccf807c2b5db3f40bbd1307d28d03d7c661e72204a697e89b76491c0b288edcba1a598fcbf5442f14dee432e4aa1d88f6f43268511c7 DIST elixir-1.0.2.tar.gz 1033260 SHA256 6156ee396e85045358d11a6839e157e8fa9573b7414bddbd2c91843ed2b4b962 SHA512 3768bdfeab7478df5e8e7208f5f6e5fad584d3beef78784a322e346851a39c0da5657cb0f88632246377d0795ac735bd80e7a68ca879c08b9e21283a807b4511 WHIRLPOOL 6b766c6cff9f95e95b218ff830ae1d0655e52197c817f9f0b484e7a4f94c37da931ffe48e6caa5430a00fc4807ac0a870bf175b2e20a0c016748de606d106369 DIST elixir-1.0.3.tar.gz 1039041 SHA256 ec6c4eaffcb771d91bdea9fb274600c624fd16b1891d194b3fcb2b521f52cc75 SHA512 d48636c355181a633dfc5d256f9a1718d74137686080c965d2d568e3d9b0f5cc1352f2ed4d12e50bd89c4cfc9cd59e7a1112ae22979012845df0556124151d1e WHIRLPOOL e76b92272598aba72e9b067eef20492b692f9d4aeeff796a35dc9ea2ee27eed40a5eea369bb92c3a58e23001cf5ea627eb72bf7b7b8b13827f8601479f104135 +DIST elixir-1.0.4.tar.gz 1040843 SHA256 79341fde3b01217aa252b8996d1b1b27cd1006cb89fe43446d5241e3dcb84bad SHA512 c25bc101fd3d1bc8bfb8c793b5da95ac544d0b921538dc24fcd92ff87d1f6248f3c760f714dd7fe061827c5495004d4f7d6d4788c28daf9d519694e49afd5e0f WHIRLPOOL 3ede94b8151319198be053c8e432d801cbbd3386c8c931d5f075696e21668272d3fc058a6f7f9726fd4f6989a70e16d99850d8852703bf23c115ce2cd44a539b diff --git a/dev-lang/elixir/elixir-1.0.4.ebuild b/dev-lang/elixir/elixir-1.0.4.ebuild new file mode 100644 index 000000000000..d3c98eae936d --- /dev/null +++ b/dev-lang/elixir/elixir-1.0.4.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/elixir/elixir-1.0.4.ebuild,v 1.1 2015/04/18 10:59:24 hasufell Exp $ + +EAPI=5 + +inherit multilib + +DESCRIPTION="Elixir programming language" +HOMEPAGE="http://elixir-lang.org" +SRC_URI="https://github.com/elixir-lang/elixir/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0 ErlPL-1.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=">=dev-lang/erlang-17" +RDEPEND="${DEPEND}" + +src_compile() { + emake Q="" +} + +src_install() { + emake DESTDIR="${D}" LIBDIR="$(get_libdir)" PREFIX="/usr" install + dodoc README.md CHANGELOG.md CONTRIBUTING.md +} diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest index 5d33a0d4e221..d23a40850675 100644 --- a/dev-lang/php/Manifest +++ b/dev-lang/php/Manifest @@ -1,7 +1,10 @@ DIST php-5.3.29.tar.bz2 11396771 SHA256 c4e1cf6972b2a9c7f2777a18497d83bf713cdbecabb65d3ff62ba441aebb0091 SHA512 c22c463df7371bbd97beb258f0a9b9d77ec5c3c733fc565091e2bfcda3da2f1d2ab406047afcc70a6da2331acd2698885328d5a334c9922fa7591852eefda5f7 WHIRLPOOL bb9db8ba267016af18d0d993e764561b11d6fc1302ed139d2b047ec84f139b078faf53d27a7dd394b0972199b3990c34a77ef1e2f7b632ceb5660cb1667bf0ab DIST php-5.4.39.tar.bz2 12271717 SHA256 7ceb76538e709c74533210ae41148d5c01c330ac8a73220954bbc4fcae69d77e SHA512 b944517b754fbdfc0b50dd18d2644edc9abe3a66ac9806c748b7b98f5c5c07eeaabdf7990799bb39ebf716b90b4e8b34e5fedb3379c1b05bce5530d3cdf4e42d WHIRLPOOL 28fdea55684c99b53545c83fffa686a76714846d2a0af0fa514f450fdf86faa3541f752113a51189a0ec7786a5d55171eaa7be3a8d0418b60fe920be552fcf22 +DIST php-5.4.40.tar.bz2 12272787 SHA256 4898ffe8ac3ccb2d8cc94f7d76a9ea0414d954f5d4479895ddfccdc2e158a51a SHA512 23fc43a310d8f05078c5a0fdc574a49d7037385f6c6fb154c1cb900d87b9f356d2fe8a708d7f20cb1304c4715f1c5bdd64063049f4d7fe157621e36e83cf7535 WHIRLPOOL b74c868e5991562ff0a019f438bc52d228fb17de95e252a7f1e2c323c0cf21da0be8a72f7f44f18051d7bb295974fc1ee605415658e2d5657eddb1e3726a233d DIST php-5.5.22.tar.bz2 13305486 SHA256 c218c184bef2905bc79fcdda6040f3d1738261395fb706396935d1c6f6e162bb SHA512 3eabd6fa2cd10e83fc3c00fb43313feefbb8c2772778dc6f176612fcb449761e22b55053e5b0b7f6954c0c141ab6c799f08bdca1851078511b7ef9376dadefac WHIRLPOOL 7c36ba90ed40d315475d721a3827065ee0e8748315f100383d4481b8ff1fb9af2b2a25f4dec5f3c5d8f378ff2213ce80fdc4c624c8a51cc312d51d505118b514 DIST php-5.5.23.tar.bz2 13308115 SHA256 a99ab264dcd40181baa9defeaa4b21eb2c20d4e9316b904cc05f628762e6ada7 SHA512 b72f74d91afa9d9cc2d7b24468a37382cce47d337c63cd6a4abeea0a1c1d4d4df4245fe085a685a16cc0197fb342211653d41007ff1a4439a664ee33a1525896 WHIRLPOOL b6668a847d4d8b984c2fae8187d81206af010d8334df46f99978a4ad59854f3909dbd8d462d2ad4d52b290abdeb77562cec691aa21432aefbd88474d9b4584a9 +DIST php-5.5.24.tar.bz2 13337043 SHA256 801b5cf2e0c01b07314d4ac3c8a7c28d524bdd8263ebdd0e33a99008251316a2 SHA512 c43f03a93d0199cc174f1b00b4a34717a82500d5f2cd408d8e39f31cff171f8a2019f31beed044524a795e54fab344e55c41f5d1f3b9e9fea98e2cd04aba6152 WHIRLPOOL 8179016a5d6ebf4993137433bd92a01f162880b373b165be7b1702c5a3ddedd11c308e0e4c0c0b64f84a3cc9083e7e0647d2488997c59ebb126c4bff59d216de DIST php-5.6.7.tar.bz2 13697400 SHA256 02954fb74c61a7879d48ebdcd4ecb78aa0056f4215ca9b096232de28eb8f17bc SHA512 594b306cd2bb1dd2034a39b13d3642d957869b305c5e169e6020472b659feb6d1a7a1d1a75bf71965335450caf4762d9a0db2585d68e95606e34e9d03580830f WHIRLPOOL a6155be31975d9e0af039e3974ede650c920dcfef9bd4224f1f997c190762838541bf9f3747ce52516aee40860833babf31f1fdadf86f81531ce6877cbbd0d9b +DIST php-5.6.8.tar.bz2 13724681 SHA256 0af0045745d61eeb74a3ea744529a2481b27cb689da720e6c0250675043724e4 SHA512 1d2466411b3704db8af5db5ed6b0a073510fbeda3c01036fda2b0f9cf6c8ccfb2039ea9ea2ff51769d228c06f9c43ad83c080d164c6981df46d48904e767e939 WHIRLPOOL 27600e85ece76e923b405c8402ebd54bcb738e23e0d646b13c1c656f24d724bc51e062fba0d307e88b0160ff357d0b29c8d4384695e11492b1cb04589d2c1fee DIST php-patchset-5.3-r0.tar.bz2 7368 SHA256 1a67b34a681dea33ea38f0ffc32b70a78b4c5dc1c3603d1bba31bb130d803ef7 SHA512 765b0cf56a3e63ded4ad1d1ba67567881ad06bdc2814cc07004fa338f38fd69078819c7463d2c55e00805c8f33fa925b94228bf7bc3d223acc33c6cff540024c WHIRLPOOL 59e18b33e11d968fac2a4571173121bf8141bb2f1eab62192e15bc59e351d3ab973f04343b447681d8a2adddf0844edb8a481d027bfc14c7e1fd8222169094ec DIST php-patchset-5.4-r2.tar.bz2 5824 SHA256 4a47f4d31f50a244f85349486cdb3474cf315562e097ed4c116c2b9b5730ecef SHA512 3c2523458a627373da7acb93fb2cd621f50b19fe2ba1d30beb62eeaaa39045262b917cfd0b631046fec9c8027cfa99bd0426a079ab45eb172b21d25d6e085dde WHIRLPOOL fe4f015e2f0dc66cc23ef16fb5bb33117952593ae0770d4bcd37ecc1c431cbcc7874189d265696305c60b4e395e7ce902667e38203db46867304868271affdea diff --git a/dev-lang/php/php-5.4.40.ebuild b/dev-lang/php/php-5.4.40.ebuild new file mode 100644 index 000000000000..2c1c560cc70b --- /dev/null +++ b/dev-lang/php/php-5.4.40.ebuild @@ -0,0 +1,802 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.40.ebuild,v 1.3 2015/04/19 08:15:51 ago Exp $ + +EAPI=5 + +inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd + +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" + +function php_get_uri () +{ + case "${1}" in + "php-pre") + echo "http://downloads.php.net/stas/${2}" + ;; + "php") + echo "http://www.php.net/distributions/${2}" + ;; + "olemarkus") + echo "http://dev.gentoo.org/~olemarkus/php/${2}" + ;; + "gentoo") + echo "mirror://gentoo/${2}" + ;; + *) + die "unhandled case in php_get_uri" + ;; + esac +} + +PHP_MV="$(get_major_version)" +SLOT="$(get_version_component_range 1-2)" + +# alias, so we can handle different types of releases (finals, rcs, alphas, +# betas, ...) w/o changing the whole ebuild +PHP_PV="${PV/_rc/RC}" +PHP_PV="${PHP_PV/_alpha/alpha}" +PHP_PV="${PHP_PV/_beta/beta}" +PHP_RELEASE="php" +[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre" +[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre" +[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre" +PHP_P="${PN}-${PHP_PV}" + +PHP_PATCHSET_LOC="olemarkus" + +PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" + +PHP_PATCHSET="2" +PHP_PATCHSET_URI=" + $(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${SLOT}-r${PHP_PATCHSET}.tar.bz2")" + +PHP_FPM_INIT_VER="4" +PHP_FPM_CONF_VER="1" + +SRC_URI=" + ${PHP_SRC_URI} + ${PHP_PATCHSET_URI}" + +DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs" +HOMEPAGE="http://php.net/" +LICENSE="PHP-3" + +S="${WORKDIR}/${PHP_P}" + +# We can build the following SAPIs in the given order +SAPIS="embed cli cgi fpm apache2" + +# SAPIs and SAPI-specific USE flags (cli SAPI is default on): +IUSE="${IUSE} + ${SAPIS/cli/+cli} + threads" + +IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk + crypt +ctype curl curlwrappers debug + enchant exif +fileinfo +filter firebird + flatfile ftp gd gdbm gmp +hash +iconv imap inifile + intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash + mssql mysql mysqlnd mysqli nls + oci8-instant-client odbc pcntl pdo +phar +posix postgres qdbm + readline recode selinux +session sharedmem + +simplexml snmp soap sockets spell sqlite ssl + sybase-ct sysvipc systemd tidy +tokenizer truetype unicode wddx + +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib" + +DEPEND=" + >=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?] + >=dev-libs/libpcre-8.32[unicode] + apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] + =dev-libs/libmcrypt-2.4 ) + curl? ( >=net-misc/curl-7.10.5 ) + enchant? ( app-text/enchant ) + exif? ( !gd? ( + virtual/jpeg:0 + media-libs/libpng:0= + sys-libs/zlib + ) ) + firebird? ( dev-db/firebird ) + gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) + gdbm? ( >=sys-libs/gdbm-1.8.0 ) + gmp? ( >=dev-libs/gmp-4.1.2 ) + iconv? ( virtual/libiconv ) + imap? ( virtual/imap-c-client[ssl=] ) + intl? ( dev-libs/icu:= ) + iodbc? ( dev-db/libiodbc ) + kerberos? ( virtual/krb5 ) + ldap? ( >=net-nds/openldap-1.2.11 ) + ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) + libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) + mssql? ( dev-db/freetds[mssql] ) + !mysqlnd? ( + mysql? ( virtual/mysql ) + mysqli? ( >=virtual/mysql-4.1 ) + ) + nls? ( sys-devel/gettext ) + oci8-instant-client? ( dev-db/oracle-instantclient-basic ) + odbc? ( >=dev-db/unixODBC-1.8.13 ) + postgres? ( dev-db/postgresql ) + qdbm? ( dev-db/qdbm ) + readline? ( sys-libs/readline ) + recode? ( app-text/recode ) + sharedmem? ( dev-libs/mm ) + simplexml? ( >=dev-libs/libxml2-2.6.8 ) + snmp? ( >=net-analyzer/net-snmp-5.2 ) + soap? ( >=dev-libs/libxml2-2.6.8 ) + spell? ( >=app-text/aspell-0.50 ) + sqlite? ( >=dev-db/sqlite-3.7.6.3 ) + ssl? ( >=dev-libs/openssl-0.9.7 ) + sybase-ct? ( dev-db/freetds ) + tidy? ( app-text/htmltidy ) + truetype? ( + =media-libs/freetype-2* + >=media-libs/t1lib-5.0.0 + !gd? ( + virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) + ) + unicode? ( dev-libs/oniguruma ) + wddx? ( >=dev-libs/libxml2-2.6.8 ) + xml? ( >=dev-libs/libxml2-2.6.8 ) + xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) + xmlreader? ( >=dev-libs/libxml2-2.6.8 ) + xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) + xpm? ( + x11-libs/libXpm + virtual/jpeg:0 + media-libs/libpng:0= sys-libs/zlib + ) + xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) + zip? ( sys-libs/zlib ) + zlib? ( sys-libs/zlib ) + virtual/mta +" + +php="=${CATEGORY}/${PF}" + +REQUIRED_USE=" + truetype? ( gd ) + cjk? ( gd ) + exif? ( gd ) + + xpm? ( gd ) + gd? ( zlib ) + simplexml? ( xml ) + soap? ( xml ) + wddx? ( xml ) + xmlrpc? ( || ( xml iconv ) ) + xmlreader? ( xml ) + xslt? ( xml ) + ldap-sasl? ( ldap ) + mhash? ( hash ) + phar? ( hash ) + mysqlnd? ( || ( + mysql + mysqli + pdo + ) ) + + qdbm? ( !gdbm ) + readline? ( !libedit ) + recode? ( !imap !mysql !mysqli ) + sharedmem? ( !threads ) + + !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )" + +RDEPEND="${DEPEND}" + +RDEPEND="${RDEPEND} + fpm? ( + selinux? ( sec-policy/selinux-phpfpm ) + systemd? ( sys-apps/systemd ) )" + +DEPEND="${DEPEND} + sys-devel/flex + >=sys-devel/m4-1.4.3 + >=sys-devel/libtool-1.5.18" + +# Allow users to install production version if they want to + +case "${PHP_INI_VERSION}" in + production|development) + ;; + *) + PHP_INI_VERSION="development" + ;; +esac + +PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}" +PHP_INI_FILE="php.ini" + +want_apache + +pkg_setup() { + depend.apache_pkg_setup +} + +php_install_ini() { + local phpsapi="${1}" + + # work out where we are installing the ini file + php_set_ini_dir "${phpsapi}" + + local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}" + cp "${PHP_INI_UPSTREAM}" "${phpinisrc}" + + # default to /tmp for save_path, bug #282768 + sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" + + # Set the extension dir + sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}" + + # Set the include path to point to where we want to find PEAR packages + sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" + + if use_if_iuse opcache; then + elog "Adding opcache to ${phpinisrc}" + echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> ${phpinisrc} + fi + + dodir "${PHP_INI_DIR#${EPREFIX}}" + insinto "${PHP_INI_DIR#${EPREFIX}}" + newins "${phpinisrc}" "${PHP_INI_FILE}" + + elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}" + elog + + dodir "${PHP_EXT_INI_DIR#${EPREFIX}}" + dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}" + + # SAPI-specific handling + + if [[ "${sapi}" == "fpm" ]] ; then + [[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0 + einfo "Installing FPM CGI config file php-fpm.conf" + insinto "${PHP_INI_DIR#${EPREFIX}}" + newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf + + # Remove bogus /etc/php-fpm.conf.default (bug 359906) + [[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default" + fi + + # Install PHP ini files into /usr/share/php + + dodoc php.ini-development + dodoc php.ini-production + +} + +php_set_ini_dir() { + PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}" + PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext" + PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active" +} + +src_prepare() { + # USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path + # ([empty session.save_path]/session_mm_[sapi][gid].sem) + # there is no easy way to circumvent that, all php calls during + # install use -n, so no php.ini file will be used. + # As such, this is the easiest way to get around + addpredict /session_mm_cli250.sem + addpredict /session_mm_cli0.sem + + # Change PHP branding + # Get the alpha/beta/rc version + sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \ + -i configure.in || die "Unable to change PHP branding" + + # Patch PHP to show Gentoo as the server platform + sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \ + -i configure.in || die "Failed to fix server platform name" + + # Prevent PHP from activating the Apache config, + # as we will do that ourselves + sed -i \ + -e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \ + -e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \ + configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 + + # Patch PHP to support heimdal instead of mit-krb5 + if has_version "app-crypt/heimdal" ; then + sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \ + || die "Failed to fix heimdal libname" + sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \ + || die "Failed to fix heimdal crypt library reference" + fi + + #Add user patches #357637 + epatch_user + + #force rebuilding aclocal.m4 + rm aclocal.m4 + eautoreconf + + if [[ ${CHOST} == *-darwin* ]] ; then + # http://bugs.php.net/bug.php?id=48795, bug #343481 + sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die + fi +} + +src_configure() { + addpredict /usr/share/snmp/mibs/.index + addpredict /var/lib/net-snmp/mib_indexes + + PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}" + + # This is a global variable and should be in caps. It isn't because the + # phpconfutils eclass relies on exactly this name... + # for --with-libdir see bug #327025 + my_conf=" + --prefix="${PHP_DESTDIR}" + --mandir="${PHP_DESTDIR}"/man + --infodir="${PHP_DESTDIR}"/info + --libdir="${PHP_DESTDIR}"/lib + --with-libdir=$(get_libdir) + --without-pear + $(use_enable threads maintainer-zts)" + + # extension USE flag shared + my_conf+=" + $(use_enable bcmath bcmath ) + $(use_with bzip2 bz2 "${EPREFIX}"/usr) + $(use_enable calendar calendar ) + $(use_enable ctype ctype ) + $(use_with curl curl "${EPREFIX}"/usr) + $(use_with curlwrappers curlwrappers "${EPREFIX}"/usr) + $(use_enable xml dom ) + $(use_with enchant enchant "${EPREFIX}"/usr) + $(use_enable exif exif ) + $(use_enable fileinfo fileinfo ) + $(use_enable filter filter ) + $(use_enable ftp ftp ) + $(use_with nls gettext "${EPREFIX}"/usr) + $(use_with gmp gmp "${EPREFIX}"/usr) + $(use_enable hash hash ) + $(use_with mhash mhash "${EPREFIX}"/usr) + $(use_with iconv iconv $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}"/usr)) + $(use_enable intl intl ) + $(use_enable ipv6 ipv6 ) + $(use_enable json json ) + $(use_with kerberos kerberos "${EPREFIX}"/usr) + $(use_enable xml libxml ) + $(use_with xml libxml-dir "${EPREFIX}"/usr) + $(use_enable unicode mbstring ) + $(use_with crypt mcrypt "${EPREFIX}"/usr) + $(use_with mssql mssql "${EPREFIX}"/usr) + $(use_with unicode onig "${EPREFIX}"/usr) + $(use_with ssl openssl "${EPREFIX}"/usr) + $(use_with ssl openssl-dir "${EPREFIX}"/usr) + $(use_enable pcntl pcntl ) + $(use_enable phar phar ) + $(use_enable pdo pdo ) + $(use_with postgres pgsql "${EPREFIX}"/usr) + $(use_enable posix posix ) + $(use_with spell pspell "${EPREFIX}"/usr) + $(use_with recode recode "${EPREFIX}"/usr) + $(use_enable simplexml simplexml ) + $(use_enable sharedmem shmop ) + $(use_with snmp snmp "${EPREFIX}"/usr) + $(use_enable soap soap ) + $(use_enable sockets sockets ) + $(use_with sqlite sqlite3 "${EPREFIX}"/usr) + $(use_with sybase-ct sybase-ct "${EPREFIX}"/usr) + $(use_enable sysvipc sysvmsg ) + $(use_enable sysvipc sysvsem ) + $(use_enable sysvipc sysvshm ) + $(use_with systemd fpm-systemd) + $(use_with tidy tidy "${EPREFIX}"/usr) + $(use_enable tokenizer tokenizer ) + $(use_enable wddx wddx ) + $(use_enable xml xml ) + $(use_enable xmlreader xmlreader ) + $(use_enable xmlwriter xmlwriter ) + $(use_with xmlrpc xmlrpc) + $(use_with xslt xsl "${EPREFIX}"/usr) + $(use_enable zip zip ) + $(use_with zlib zlib "${EPREFIX}"/usr) + $(use_enable debug debug )" + + # DBA support + if use cdb || use berkdb || use flatfile || use gdbm || use inifile \ + || use qdbm ; then + my_conf="${my_conf} --enable-dba${shared}" + fi + + # DBA drivers support + my_conf+=" + $(use_with cdb cdb) + $(use_with berkdb db4 ${EPREFIX}/usr) + $(use_enable flatfile flatfile ) + $(use_with gdbm gdbm ${EPREFIX}/usr) + $(use_enable inifile inifile ) + $(use_with qdbm qdbm ${EPREFIX}/usr)" + + # Support for the GD graphics library + my_conf+=" + $(use_with truetype freetype-dir ${EPREFIX}/usr) + $(use_with truetype t1lib ${EPREFIX}/usr) + $(use_enable cjk gd-jis-conv ) + $(use_with gd jpeg-dir ${EPREFIX}/usr) + $(use_with gd png-dir ${EPREFIX}/usr) + $(use_with xpm xpm-dir ${EPREFIX}/usr)" + # enable gd last, so configure can pick up the previous settings + my_conf+=" + $(use_with gd gd)" + + # IMAP support + if use imap ; then + my_conf+=" + $(use_with imap imap ${EPREFIX}/usr) + $(use_with ssl imap-ssl ${EPREFIX}/usr)" + fi + + # Interbase/firebird support + + if use firebird ; then + my_conf+=" + $(use_with firebird interbase ${EPREFIX}/usr)" + fi + + # LDAP support + if use ldap ; then + my_conf+=" + $(use_with ldap ldap ${EPREFIX}/usr) + $(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)" + fi + + # MySQL support + if use mysql ; then + if use mysqlnd ; then + my_conf+=" + $(use_with mysql mysql mysqlnd)" + else + my_conf+=" + $(use_with mysql mysql ${EPREFIX}/usr)" + fi + my_conf+=" + $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)" + fi + + # MySQLi support + if use mysqlnd ; then + my_conf+=" + $(use_with mysqli mysqli mysqlnd)" + else + my_conf+=" + $(use_with mysqli mysqli ${EPREFIX}/usr/bin/mysql_config)" + fi + + # ODBC support + if use odbc ; then + my_conf+=" + $(use_with odbc unixODBC ${EPREFIX}/usr)" + fi + + if use iodbc ; then + my_conf+=" + $(use_with iodbc iodbc ${EPREFIX}/usr)" + fi + + # Oracle support + if use oci8-instant-client ; then + my_conf+=" + $(use_with oci8-instant-client oci8)" + fi + + # PDO support + if use pdo ; then + my_conf+=" + $(use_with mssql pdo-dblib )" + if use mysqlnd ; then + my_conf+=" + $(use_with mysqlnd pdo-mysql mysqlnd)" + else + my_conf+=" + $(use_with mysql pdo-mysql ${EPREFIX}/usr)" + fi + my_conf+=" + $(use_with postgres pdo-pgsql ) + $(use_with sqlite pdo-sqlite ${EPREFIX}/usr) + $(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)" + if use oci8-instant-client ; then + my_conf+=" + $(use_with oci8-instant-client pdo-oci)" + fi + fi + + # readline/libedit support + my_conf+=" + $(use_with readline readline ${EPREFIX}/usr) + $(use_with libedit libedit ${EPREFIX}/usr)" + + # Session support + if use session ; then + my_conf+=" + $(use_with sharedmem mm ${EPREFIX}/usr)" + else + my_conf+=" + $(use_enable session session )" + fi + + # Use pic for shared modules such as apache2's mod_php + my_conf="${my_conf} --with-pic" + + # we use the system copy of pcre + # --with-pcre-regex affects ext/pcre + # --with-pcre-dir affects ext/filter and ext/zip + my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr" + + # Catch CFLAGS problems + # Fixes bug #14067. + # Changed order to run it in reverse for bug #32022 and #12021. + replace-cpu-flags "k6*" "i586" + + # Support user-passed configuration parameters + my_conf="${my_conf} ${EXTRA_ECONF:-}" + + # Support the Apache2 extras, they must be set globally for all + # SAPIs to work correctly, especially for external PHP extensions + + mkdir -p "${WORKDIR}/sapis-build" + for one_sapi in $SAPIS ; do + use "${one_sapi}" || continue + php_set_ini_dir "${one_sapi}" + + cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}" + cd "${WORKDIR}/sapis-build/${one_sapi}" + + sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR} + --with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}" + + for sapi in $SAPIS ; do + case "$sapi" in + cli|cgi|embed|fpm) + if [[ "${one_sapi}" == "${sapi}" ]] ; then + sapi_conf="${sapi_conf} --enable-${sapi}" + else + sapi_conf="${sapi_conf} --disable-${sapi}" + fi + ;; + + apache2) + if [[ "${one_sapi}" == "${sapi}" ]] ; then + sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs" + else + sapi_conf="${sapi_conf} --without-apxs2" + fi + ;; + esac + done + + econf ${sapi_conf} + done +} + +src_compile() { + # snmp seems to run during src_compile, too (bug #324739) + addpredict /usr/share/snmp/mibs/.index + addpredict /var/lib/net-snmp/mib_indexes + + for sapi in ${SAPIS} ; do + if use "${sapi}"; then + cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1" + emake || die "emake failed" + fi + done +} + +src_install() { + # see bug #324739 for what happens when we don't have that + addpredict /usr/share/snmp/mibs/.index + + # grab the first SAPI that got built and install common files from there + local first_sapi="" + for sapi in $SAPIS ; do + if use $sapi ; then + first_sapi=$sapi + break + fi + done + + # Makefile forgets to create this before trying to write to it... + dodir "${PHP_DESTDIR#${EPREFIX}}/bin" + + # Install php environment (without any sapis) + cd "${WORKDIR}/sapis-build/$first_sapi" + emake INSTALL_ROOT="${D}" \ + install-build install-headers install-programs \ + || die "emake install failed" + + local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)" + + # Create the directory where we'll put version-specific php scripts + keepdir /usr/share/php${PHP_MV} + + local sapi="", file="" + local sapi_list="" + + for sapi in ${SAPIS}; do + if use "${sapi}" ; then + einfo "Installing SAPI: ${sapi}" + cd "${WORKDIR}/sapis-build/${sapi}" + + if [[ "${sapi}" == "apache2" ]] ; then + # We're specifically not using emake install-sapi as libtool + # may cause unnecessary relink failures (see bug #351266) + insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/" + newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)" + keepdir "/usr/$(get_libdir)/apache2/modules" + else + # needed each time, php_install_ini would reset it + local dest="${PHP_DESTDIR#${EPREFIX}}" + into "${dest}" + case "$sapi" in + cli) + source="sapi/cli/php" + ;; + cgi) + source="sapi/cgi/php-cgi" + ;; + fpm) + source="sapi/fpm/php-fpm" + ;; + embed) + source="libs/libphp${PHP_MV}$(get_libname)" + ;; + *) + die "unhandled sapi in src_install" + ;; + esac + + if [[ "${source}" == *"$(get_libname)" ]]; then + dolib.so "${source}" || die "Unable to install ${sapi} sapi" + else + dobin "${source}" || die "Unable to install ${sapi} sapi" + local name="$(basename ${source})" + dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}" + fi + fi + + php_install_ini "${sapi}" + + # construct correct SAPI string for php-config + # thanks to ferringb for the bash voodoo + if [[ "${sapi}" == "apache2" ]]; then + sapi_list="${sapi_list:+${sapi_list} }apache2handler" + else + sapi_list="${sapi_list:+${sapi_list} }${sapi}" + fi + fi + done + + # Installing opcache module + if use_if_iuse opcache ; then + dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module" + fi + + # Install env.d files + newenvd "${FILESDIR}/20php5-envd" \ + "20php${SLOT}" + sed -e "s|/lib/|/$(get_libdir)/|g" -i \ + "${ED}/etc/env.d/20php${SLOT}" + sed -e "s|php5|php${SLOT}|g" -i \ + "${ED}/etc/env.d/20php${SLOT}" + + # set php-config variable correctly (bug #278439) + sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \ + "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" + + if use fpm ; then + if use systemd; then + systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service" + else + systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service" + fi + fi +} + +src_test() { + echo ">>> Test phase [test]: ${CATEGORY}/${PF}" + PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php" + if [[ ! -x "${PHP_BIN}" ]] ; then + ewarn "Test phase requires USE=cli, skipping" + return + else + export TEST_PHP_EXECUTABLE="${PHP_BIN}" + fi + + if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then + export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi" + fi + + REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d "session.save_path=${T}" \ + "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}" + + for name in ${EXPECTED_TEST_FAILURES}; do + mv "${name}.out" "${name}.out.orig" 2>/dev/null + done + + local failed="$(find -name '*.out')" + if [[ ${failed} != "" ]] ; then + ewarn "The following test cases failed unexpectedly:" + for name in ${failed}; do + ewarn " ${name/.out/}" + done + else + einfo "No unexpected test failures, all fine" + fi + + if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then + local passed="" + for name in ${EXPECTED_TEST_FAILURES}; do + [[ -f "${name}.diff" ]] && continue + passed="${passed} ${name}" + done + if [[ ${passed} != "" ]] ; then + einfo "The following test cases passed unexpectedly:" + for name in ${passed}; do + ewarn " ${passed}" + done + else + einfo "None of the known-to-fail tests passed, all fine" + fi + fi +} + +pkg_postinst() { + # Output some general info to the user + if use apache2 ; then + APACHE2_MOD_DEFINE="PHP5" + APACHE2_MOD_CONF="70_mod_php5" # actually provided by app-eselect/eselect-php + apache-module_pkg_postinst + fi + + # Create the symlinks for php + for m in ${SAPIS}; do + [[ ${m} == 'embed' ]] && continue; + if use $m ; then + local ci=$(eselect php show $m) + if [[ -z $ci ]]; then + eselect php set $m php${SLOT} + einfo "Switched ${m} to use php:${SLOT}" + einfo + elif [[ $ci != "php${SLOT}" ]] ; then + elog "To switch $m to use php:${SLOT}, run" + elog " eselect php set $m php${SLOT}" + elog + fi + fi + done + + elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order" + elog "to compile extensions for the ${SLOT} ABI" + elog + if ! use readline && use cli ; then + ewarn "Note that in order to use php interactivly, you need to enable" + ewarn "the readline USE flag or php -a will hang" + fi + elog + elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version." + elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either" + elog "'production' or 'development' in ${EPREFIX}/etc/make.conf" + elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}" + + elog + elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:" + elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml" + elog +} + +pkg_prerm() { + eselect php cleanup +} diff --git a/dev-lang/php/php-5.5.24.ebuild b/dev-lang/php/php-5.5.24.ebuild new file mode 100644 index 000000000000..0a70fc87f8df --- /dev/null +++ b/dev-lang/php/php-5.5.24.ebuild @@ -0,0 +1,784 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.24.ebuild,v 1.3 2015/04/19 08:15:51 ago Exp $ + +EAPI=5 + +inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd + +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" + +function php_get_uri () +{ + case "${1}" in + "php-pre") + echo "http://downloads.php.net/dsp/${2}" + ;; + "php") + echo "http://www.php.net/distributions/${2}" + ;; + "olemarkus") + echo "http://dev.gentoo.org/~olemarkus/php/${2}" + ;; + "gentoo") + echo "mirror://gentoo/${2}" + ;; + *) + die "unhandled case in php_get_uri" + ;; + esac +} + +PHP_MV="$(get_major_version)" +SLOT="$(get_version_component_range 1-2)" + +# alias, so we can handle different types of releases (finals, rcs, alphas, +# betas, ...) w/o changing the whole ebuild +PHP_PV="${PV/_rc/RC}" +PHP_PV="${PHP_PV/_alpha/alpha}" +PHP_PV="${PHP_PV/_beta/beta}" +PHP_RELEASE="php" +[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre" +[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre" +[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre" +PHP_P="${PN}-${PHP_PV}" + +PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" + +PHP_FPM_CONF_VER="1" + +SRC_URI="${PHP_SRC_URI}" + +DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs" +HOMEPAGE="http://php.net/" +LICENSE="PHP-3" + +S="${WORKDIR}/${PHP_P}" + +# We can build the following SAPIs in the given order +SAPIS="embed cli cgi fpm apache2" + +# SAPIs and SAPI-specific USE flags (cli SAPI is default on): +IUSE="${IUSE} + ${SAPIS/cli/+cli} + threads" + +IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk + crypt +ctype curl debug + enchant exif frontbase +fileinfo +filter firebird + flatfile ftp gd gdbm gmp +hash +iconv imap inifile + intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash + mssql mysql libmysqlclient mysqli nls + oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm + readline recode selinux +session sharedmem + +simplexml snmp soap sockets spell sqlite ssl + sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx + +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib" + +DEPEND=" + >=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?] + >=dev-libs/libpcre-8.32[unicode] + apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] + =dev-libs/libmcrypt-2.4 ) + curl? ( >=net-misc/curl-7.10.5 ) + enchant? ( app-text/enchant ) + exif? ( !gd? ( + virtual/jpeg:0 + media-libs/libpng:0= + sys-libs/zlib + ) ) + firebird? ( dev-db/firebird ) + gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) + gdbm? ( >=sys-libs/gdbm-1.8.0 ) + gmp? ( >=dev-libs/gmp-4.1.2 ) + iconv? ( virtual/libiconv ) + imap? ( virtual/imap-c-client[ssl=] ) + intl? ( dev-libs/icu:= ) + iodbc? ( dev-db/libiodbc ) + kerberos? ( virtual/krb5 ) + ldap? ( >=net-nds/openldap-1.2.11 ) + ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) + libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) + mssql? ( dev-db/freetds[mssql] ) + libmysqlclient? ( + mysql? ( virtual/mysql ) + mysqli? ( >=virtual/mysql-4.1 ) + ) + nls? ( sys-devel/gettext ) + oci8-instant-client? ( dev-db/oracle-instantclient-basic ) + odbc? ( >=dev-db/unixODBC-1.8.13 ) + postgres? ( dev-db/postgresql ) + qdbm? ( dev-db/qdbm ) + readline? ( sys-libs/readline ) + recode? ( app-text/recode ) + sharedmem? ( dev-libs/mm ) + simplexml? ( >=dev-libs/libxml2-2.6.8 ) + snmp? ( >=net-analyzer/net-snmp-5.2 ) + soap? ( >=dev-libs/libxml2-2.6.8 ) + spell? ( >=app-text/aspell-0.50 ) + sqlite? ( >=dev-db/sqlite-3.7.6.3 ) + ssl? ( >=dev-libs/openssl-0.9.7 ) + sybase-ct? ( dev-db/freetds ) + tidy? ( app-text/htmltidy ) + truetype? ( + =media-libs/freetype-2* + >=media-libs/t1lib-5.0.0 + !gd? ( + virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) + ) + unicode? ( dev-libs/oniguruma ) + vpx? ( media-libs/libvpx ) + wddx? ( >=dev-libs/libxml2-2.6.8 ) + xml? ( >=dev-libs/libxml2-2.6.8 ) + xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) + xmlreader? ( >=dev-libs/libxml2-2.6.8 ) + xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) + xpm? ( + x11-libs/libXpm + virtual/jpeg:0 + media-libs/libpng:0= sys-libs/zlib + ) + xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) + zip? ( sys-libs/zlib ) + zlib? ( sys-libs/zlib ) + virtual/mta +" + +php="=${CATEGORY}/${PF}" + +REQUIRED_USE=" + truetype? ( gd ) + vpx? ( gd ) + cjk? ( gd ) + exif? ( gd ) + + xpm? ( gd ) + gd? ( zlib ) + simplexml? ( xml ) + soap? ( xml ) + wddx? ( xml ) + xmlrpc? ( || ( xml iconv ) ) + xmlreader? ( xml ) + xslt? ( xml ) + ldap-sasl? ( ldap ) + mhash? ( hash ) + phar? ( hash ) + libmysqlclient? ( || ( + mysql + mysqli + pdo + ) ) + + qdbm? ( !gdbm ) + readline? ( !libedit ) + recode? ( !imap !mysql !mysqli ) + sharedmem? ( !threads ) + + !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )" + +RDEPEND="${DEPEND}" + +RDEPEND="${RDEPEND} + fpm? ( + selinux? ( sec-policy/selinux-phpfpm ) + systemd? ( sys-apps/systemd ) )" + +DEPEND="${DEPEND} + sys-devel/flex + >=sys-devel/m4-1.4.3 + >=sys-devel/libtool-1.5.18" + +# Allow users to install production version if they want to + +case "${PHP_INI_VERSION}" in + production|development) + ;; + *) + PHP_INI_VERSION="development" + ;; +esac + +PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}" +PHP_INI_FILE="php.ini" + +want_apache + +pkg_setup() { + depend.apache_pkg_setup +} + +php_install_ini() { + local phpsapi="${1}" + + # work out where we are installing the ini file + php_set_ini_dir "${phpsapi}" + + local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}" + cp "${PHP_INI_UPSTREAM}" "${phpinisrc}" + + # default to /tmp for save_path, bug #282768 + sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" + + # Set the extension dir + sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}" + + # Set the include path to point to where we want to find PEAR packages + sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" + + dodir "${PHP_INI_DIR#${EPREFIX}}" + insinto "${PHP_INI_DIR#${EPREFIX}}" + newins "${phpinisrc}" "${PHP_INI_FILE}" + + elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}" + elog + + dodir "${PHP_EXT_INI_DIR#${EPREFIX}}" + dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}" + + if use_if_iuse opcache; then + elog "Adding opcache to $PHP_EXT_INI_DIR" + echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> "${D}/${PHP_EXT_INI_DIR}"/opcache.ini + dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini" + fi + + # SAPI-specific handling + + if [[ "${sapi}" == "fpm" ]] ; then + [[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0 + einfo "Installing FPM CGI config file php-fpm.conf" + insinto "${PHP_INI_DIR#${EPREFIX}}" + newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf + + # Remove bogus /etc/php-fpm.conf.default (bug 359906) + [[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default" + fi + + # Install PHP ini files into /usr/share/php + + dodoc php.ini-development + dodoc php.ini-production + +} + +php_set_ini_dir() { + PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}" + PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext" + PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active" +} + +src_prepare() { + # USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path + # ([empty session.save_path]/session_mm_[sapi][gid].sem) + # there is no easy way to circumvent that, all php calls during + # install use -n, so no php.ini file will be used. + # As such, this is the easiest way to get around + addpredict /session_mm_cli250.sem + addpredict /session_mm_cli0.sem + + # Change PHP branding + # Get the alpha/beta/rc version + sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \ + -i configure.in || die "Unable to change PHP branding" + + # Patch PHP to show Gentoo as the server platform + sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \ + -i configure.in || die "Failed to fix server platform name" + + # Prevent PHP from activating the Apache config, + # as we will do that ourselves + sed -i \ + -e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \ + -e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \ + configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 + + # Patch PHP to support heimdal instead of mit-krb5 + if has_version "app-crypt/heimdal" ; then + sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \ + || die "Failed to fix heimdal libname" + sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \ + || die "Failed to fix heimdal crypt library reference" + fi + + #Add user patches #357637 + epatch_user + + #force rebuilding aclocal.m4 + rm aclocal.m4 + eautoreconf + + if [[ ${CHOST} == *-darwin* ]] ; then + # http://bugs.php.net/bug.php?id=48795, bug #343481 + sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die + fi +} + +src_configure() { + addpredict /usr/share/snmp/mibs/.index + addpredict /var/lib/net-snmp/mib_indexes + + PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}" + + # This is a global variable and should be in caps. It isn't because the + # phpconfutils eclass relies on exactly this name... + # for --with-libdir see bug #327025 + my_conf=" + --prefix="${PHP_DESTDIR}" + --mandir="${PHP_DESTDIR}"/man + --infodir="${PHP_DESTDIR}"/info + --libdir="${PHP_DESTDIR}"/lib + --with-libdir=$(get_libdir) + --without-pear + $(use_enable threads maintainer-zts)" + + # extension USE flag shared + my_conf+=" + $(use_enable bcmath bcmath ) + $(use_with bzip2 bz2 "${EPREFIX}"/usr) + $(use_enable calendar calendar ) + $(use_enable ctype ctype ) + $(use_with curl curl "${EPREFIX}"/usr) + $(use_enable xml dom ) + $(use_with enchant enchant "${EPREFIX}"/usr) + $(use_enable exif exif ) + $(use_enable fileinfo fileinfo ) + $(use_enable filter filter ) + $(use_enable ftp ftp ) + $(use_with nls gettext "${EPREFIX}"/usr) + $(use_with gmp gmp "${EPREFIX}"/usr) + $(use_enable hash hash ) + $(use_with mhash mhash "${EPREFIX}"/usr) + $(use_with iconv iconv $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}"/usr)) + $(use_enable intl intl ) + $(use_enable ipv6 ipv6 ) + $(use_enable json json ) + $(use_with kerberos kerberos "${EPREFIX}"/usr) + $(use_enable xml libxml ) + $(use_with xml libxml-dir "${EPREFIX}"/usr) + $(use_enable unicode mbstring ) + $(use_with crypt mcrypt "${EPREFIX}"/usr) + $(use_with mssql mssql "${EPREFIX}"/usr) + $(use_with unicode onig "${EPREFIX}"/usr) + $(use_with ssl openssl "${EPREFIX}"/usr) + $(use_with ssl openssl-dir "${EPREFIX}"/usr) + $(use_enable pcntl pcntl ) + $(use_enable phar phar ) + $(use_enable pdo pdo ) + $(use_enable opcache opcache ) + $(use_with postgres pgsql "${EPREFIX}"/usr) + $(use_enable posix posix ) + $(use_with spell pspell "${EPREFIX}"/usr) + $(use_with recode recode "${EPREFIX}"/usr) + $(use_enable simplexml simplexml ) + $(use_enable sharedmem shmop ) + $(use_with snmp snmp "${EPREFIX}"/usr) + $(use_enable soap soap ) + $(use_enable sockets sockets ) + $(use_with sqlite sqlite3 "${EPREFIX}"/usr) + $(use_with sybase-ct sybase-ct "${EPREFIX}"/usr) + $(use_enable sysvipc sysvmsg ) + $(use_enable sysvipc sysvsem ) + $(use_enable sysvipc sysvshm ) + $(use_with systemd fpm-systemd) + $(use_with tidy tidy "${EPREFIX}"/usr) + $(use_enable tokenizer tokenizer ) + $(use_enable wddx wddx ) + $(use_enable xml xml ) + $(use_enable xmlreader xmlreader ) + $(use_enable xmlwriter xmlwriter ) + $(use_with xmlrpc xmlrpc) + $(use_with xslt xsl "${EPREFIX}"/usr) + $(use_enable zip zip ) + $(use_with zlib zlib "${EPREFIX}"/usr) + $(use_enable debug debug )" + + # DBA support + if use cdb || use berkdb || use flatfile || use gdbm || use inifile \ + || use qdbm ; then + my_conf="${my_conf} --enable-dba${shared}" + fi + + # DBA drivers support + my_conf+=" + $(use_with cdb cdb) + $(use_with berkdb db4 ${EPREFIX}/usr) + $(use_enable flatfile flatfile ) + $(use_with gdbm gdbm ${EPREFIX}/usr) + $(use_enable inifile inifile ) + $(use_with qdbm qdbm ${EPREFIX}/usr)" + + # Support for the GD graphics library + my_conf+=" + $(use_with truetype freetype-dir ${EPREFIX}/usr) + $(use_with truetype t1lib ${EPREFIX}/usr) + $(use_enable cjk gd-jis-conv ) + $(use_with gd jpeg-dir ${EPREFIX}/usr) + $(use_with gd png-dir ${EPREFIX}/usr) + $(use_with xpm xpm-dir ${EPREFIX}/usr) + $(use_with vpx vpx-dir ${EPREFIX}/usr)" + # enable gd last, so configure can pick up the previous settings + my_conf+=" + $(use_with gd gd)" + + # IMAP support + if use imap ; then + my_conf+=" + $(use_with imap imap ${EPREFIX}/usr) + $(use_with ssl imap-ssl ${EPREFIX}/usr)" + fi + + # Interbase/firebird support + + if use firebird ; then + my_conf+=" + $(use_with firebird interbase ${EPREFIX}/usr)" + fi + + # LDAP support + if use ldap ; then + my_conf+=" + $(use_with ldap ldap ${EPREFIX}/usr) + $(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)" + fi + + # MySQL support + local mysqllib="mysqlnd" + local mysqlilib="mysqlnd" + use libmysqlclient && mysqllib="${EPREFIX}/usr" + use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config" + + my_conf+=" $(use_with mysql mysql $mysqllib)" + my_conf+=" $(use_with mysqli mysqli $mysqlilib)" + + local mysqlsock=" $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)" + if use mysql ; then + my_conf+="${mysqlsock}" + elif use mysqli ; then + my_conf+="${mysqlsock}" + fi + + # ODBC support + if use odbc ; then + my_conf+=" + $(use_with odbc unixODBC ${EPREFIX}/usr)" + fi + + if use iodbc ; then + my_conf+=" + $(use_with iodbc iodbc ${EPREFIX}/usr)" + fi + + # Oracle support + if use oci8-instant-client ; then + my_conf+=" + $(use_with oci8-instant-client oci8)" + fi + + # PDO support + if use pdo ; then + my_conf+=" + $(use_with mssql pdo-dblib ) + $(use_with mysql pdo-mysql ${mysqllib}) + $(use_with postgres pdo-pgsql ) + $(use_with sqlite pdo-sqlite ${EPREFIX}/usr) + $(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)" + if use oci8-instant-client ; then + my_conf+=" + $(use_with oci8-instant-client pdo-oci)" + fi + fi + + # readline/libedit support + my_conf+=" + $(use_with readline readline ${EPREFIX}/usr) + $(use_with libedit libedit ${EPREFIX}/usr)" + + # Session support + if use session ; then + my_conf+=" + $(use_with sharedmem mm ${EPREFIX}/usr)" + else + my_conf+=" + $(use_enable session session )" + fi + + # Use pic for shared modules such as apache2's mod_php + my_conf="${my_conf} --with-pic" + + # we use the system copy of pcre + # --with-pcre-regex affects ext/pcre + # --with-pcre-dir affects ext/filter and ext/zip + my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr" + + # Catch CFLAGS problems + # Fixes bug #14067. + # Changed order to run it in reverse for bug #32022 and #12021. + replace-cpu-flags "k6*" "i586" + + # Support user-passed configuration parameters + my_conf="${my_conf} ${EXTRA_ECONF:-}" + + # Support the Apache2 extras, they must be set globally for all + # SAPIs to work correctly, especially for external PHP extensions + + mkdir -p "${WORKDIR}/sapis-build" + for one_sapi in $SAPIS ; do + use "${one_sapi}" || continue + php_set_ini_dir "${one_sapi}" + + cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}" + cd "${WORKDIR}/sapis-build/${one_sapi}" + + sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR} + --with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}" + + for sapi in $SAPIS ; do + case "$sapi" in + cli|cgi|embed|fpm) + if [[ "${one_sapi}" == "${sapi}" ]] ; then + sapi_conf="${sapi_conf} --enable-${sapi}" + else + sapi_conf="${sapi_conf} --disable-${sapi}" + fi + ;; + + apache2) + if [[ "${one_sapi}" == "${sapi}" ]] ; then + sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs" + else + sapi_conf="${sapi_conf} --without-apxs2" + fi + ;; + esac + done + + econf ${sapi_conf} + done +} + +src_compile() { + # snmp seems to run during src_compile, too (bug #324739) + addpredict /usr/share/snmp/mibs/.index + addpredict /var/lib/net-snmp/mib_indexes + + for sapi in ${SAPIS} ; do + if use "${sapi}"; then + cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1" + emake || die "emake failed" + fi + done +} + +src_install() { + # see bug #324739 for what happens when we don't have that + addpredict /usr/share/snmp/mibs/.index + + # grab the first SAPI that got built and install common files from there + local first_sapi="" + for sapi in $SAPIS ; do + if use $sapi ; then + first_sapi=$sapi + break + fi + done + + # Makefile forgets to create this before trying to write to it... + dodir "${PHP_DESTDIR#${EPREFIX}}/bin" + + # Install php environment (without any sapis) + cd "${WORKDIR}/sapis-build/$first_sapi" + emake INSTALL_ROOT="${D}" \ + install-build install-headers install-programs \ + || die "emake install failed" + + local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)" + + # Create the directory where we'll put version-specific php scripts + keepdir /usr/share/php${PHP_MV} + + local sapi="", file="" + local sapi_list="" + + for sapi in ${SAPIS}; do + if use "${sapi}" ; then + einfo "Installing SAPI: ${sapi}" + cd "${WORKDIR}/sapis-build/${sapi}" + + if [[ "${sapi}" == "apache2" ]] ; then + # We're specifically not using emake install-sapi as libtool + # may cause unnecessary relink failures (see bug #351266) + insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/" + newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)" + keepdir "/usr/$(get_libdir)/apache2/modules" + else + # needed each time, php_install_ini would reset it + local dest="${PHP_DESTDIR#${EPREFIX}}" + into "${dest}" + case "$sapi" in + cli) + source="sapi/cli/php" + ;; + cgi) + source="sapi/cgi/php-cgi" + ;; + fpm) + source="sapi/fpm/php-fpm" + ;; + embed) + source="libs/libphp${PHP_MV}$(get_libname)" + ;; + *) + die "unhandled sapi in src_install" + ;; + esac + + if [[ "${source}" == *"$(get_libname)" ]]; then + dolib.so "${source}" || die "Unable to install ${sapi} sapi" + else + dobin "${source}" || die "Unable to install ${sapi} sapi" + local name="$(basename ${source})" + dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}" + fi + fi + + php_install_ini "${sapi}" + + # construct correct SAPI string for php-config + # thanks to ferringb for the bash voodoo + if [[ "${sapi}" == "apache2" ]]; then + sapi_list="${sapi_list:+${sapi_list} }apache2handler" + else + sapi_list="${sapi_list:+${sapi_list} }${sapi}" + fi + fi + done + + # Installing opcache module + if use_if_iuse opcache ; then + dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module" + fi + + # Install env.d files + newenvd "${FILESDIR}/20php5-envd" \ + "20php${SLOT}" + sed -e "s|/lib/|/$(get_libdir)/|g" -i \ + "${ED}/etc/env.d/20php${SLOT}" + sed -e "s|php5|php${SLOT}|g" -i \ + "${ED}/etc/env.d/20php${SLOT}" + + # set php-config variable correctly (bug #278439) + sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \ + "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" + + if use fpm ; then + if use systemd; then + systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service" + else + systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service" + fi + fi +} + +src_test() { + echo ">>> Test phase [test]: ${CATEGORY}/${PF}" + PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php" + if [[ ! -x "${PHP_BIN}" ]] ; then + ewarn "Test phase requires USE=cli, skipping" + return + else + export TEST_PHP_EXECUTABLE="${PHP_BIN}" + fi + + if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then + export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi" + fi + + REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d "session.save_path=${T}" \ + "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}" + + for name in ${EXPECTED_TEST_FAILURES}; do + mv "${name}.out" "${name}.out.orig" 2>/dev/null + done + + local failed="$(find -name '*.out')" + if [[ ${failed} != "" ]] ; then + ewarn "The following test cases failed unexpectedly:" + for name in ${failed}; do + ewarn " ${name/.out/}" + done + else + einfo "No unexpected test failures, all fine" + fi + + if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then + local passed="" + for name in ${EXPECTED_TEST_FAILURES}; do + [[ -f "${name}.diff" ]] && continue + passed="${passed} ${name}" + done + if [[ ${passed} != "" ]] ; then + einfo "The following test cases passed unexpectedly:" + for name in ${passed}; do + ewarn " ${passed}" + done + else + einfo "None of the known-to-fail tests passed, all fine" + fi + fi +} + +pkg_postinst() { + # Output some general info to the user + if use apache2 ; then + APACHE2_MOD_DEFINE="PHP5" + APACHE2_MOD_CONF="70_mod_php5" # actually provided by app-eselect/eselect-php + apache-module_pkg_postinst + fi + + # Create the symlinks for php + for m in ${SAPIS}; do + [[ ${m} == 'embed' ]] && continue; + if use $m ; then + local ci=$(eselect php show $m) + if [[ -z $ci ]]; then + eselect php set $m php${SLOT} + einfo "Switched ${m} to use php:${SLOT}" + einfo + elif [[ $ci != "php${SLOT}" ]] ; then + elog "To switch $m to use php:${SLOT}, run" + elog " eselect php set $m php${SLOT}" + elog + fi + fi + done + + elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order" + elog "to compile extensions for the ${SLOT} ABI" + elog + if ! use readline && use cli ; then + ewarn "Note that in order to use php interactivly, you need to enable" + ewarn "the readline USE flag or php -a will hang" + fi + elog + elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version." + elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either" + elog "'production' or 'development' in ${EPREFIX}/etc/make.conf" + elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}" + + elog + elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:" + elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml" + elog +} + +pkg_prerm() { + eselect php cleanup +} diff --git a/dev-lang/php/php-5.6.8.ebuild b/dev-lang/php/php-5.6.8.ebuild new file mode 100644 index 000000000000..1f300cbcc8e4 --- /dev/null +++ b/dev-lang/php/php-5.6.8.ebuild @@ -0,0 +1,787 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.6.8.ebuild,v 1.1 2015/04/18 10:56:15 olemarkus Exp $ + +EAPI=5 + +inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" + +function php_get_uri () +{ + case "${1}" in + "php-pre") + echo "http://downloads.php.net/dsp/${2}" + ;; + "php") + echo "http://www.php.net/distributions/${2}" + ;; + "olemarkus") + echo "http://dev.gentoo.org/~olemarkus/php/${2}" + ;; + "gentoo") + echo "mirror://gentoo/${2}" + ;; + *) + die "unhandled case in php_get_uri" + ;; + esac +} + +PHP_MV="$(get_major_version)" +SLOT="$(get_version_component_range 1-2)" + +# alias, so we can handle different types of releases (finals, rcs, alphas, +# betas, ...) w/o changing the whole ebuild +PHP_PV="${PV/_rc/RC}" +PHP_PV="${PHP_PV/_alpha/alpha}" +PHP_PV="${PHP_PV/_beta/beta}" +PHP_RELEASE="php" +[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre" +[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre" +[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre" +PHP_P="${PN}-${PHP_PV}" + +PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" + +PHP_FPM_CONF_VER="1" + +SRC_URI="${PHP_SRC_URI}" + +DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs" +HOMEPAGE="http://php.net/" +LICENSE="PHP-3" + +S="${WORKDIR}/${PHP_P}" + +# We can build the following SAPIs in the given order +SAPIS="embed cli cgi fpm apache2" + +# SAPIs and SAPI-specific USE flags (cli SAPI is default on): +IUSE="${IUSE} + ${SAPIS/cli/+cli} + threads" + +IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk + crypt +ctype curl debug + enchant exif frontbase +fileinfo +filter firebird + flatfile ftp gd gdbm gmp +hash +iconv imap inifile + intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash + mssql mysql libmysqlclient mysqli nls + oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm + readline recode selinux +session sharedmem + +simplexml snmp soap sockets spell sqlite ssl + sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx + +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib" + +DEPEND=" + >=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?] + >=dev-libs/libpcre-8.32[unicode] + apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] + =dev-libs/libmcrypt-2.4 ) + curl? ( >=net-misc/curl-7.10.5 ) + enchant? ( app-text/enchant ) + exif? ( !gd? ( + virtual/jpeg:0 + media-libs/libpng:0= + sys-libs/zlib + ) ) + firebird? ( dev-db/firebird ) + gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) + gdbm? ( >=sys-libs/gdbm-1.8.0 ) + gmp? ( >=dev-libs/gmp-4.1.2 ) + iconv? ( virtual/libiconv ) + imap? ( virtual/imap-c-client[ssl=] ) + intl? ( dev-libs/icu:= ) + iodbc? ( dev-db/libiodbc ) + kerberos? ( virtual/krb5 ) + ldap? ( >=net-nds/openldap-1.2.11 ) + ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) + libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) + mssql? ( dev-db/freetds[mssql] ) + libmysqlclient? ( + mysql? ( virtual/mysql ) + mysqli? ( >=virtual/mysql-4.1 ) + ) + nls? ( sys-devel/gettext ) + oci8-instant-client? ( dev-db/oracle-instantclient-basic ) + odbc? ( >=dev-db/unixODBC-1.8.13 ) + postgres? ( dev-db/postgresql ) + qdbm? ( dev-db/qdbm ) + readline? ( sys-libs/readline ) + recode? ( app-text/recode ) + sharedmem? ( dev-libs/mm ) + simplexml? ( >=dev-libs/libxml2-2.6.8 ) + snmp? ( >=net-analyzer/net-snmp-5.2 ) + soap? ( >=dev-libs/libxml2-2.6.8 ) + spell? ( >=app-text/aspell-0.50 ) + sqlite? ( >=dev-db/sqlite-3.7.6.3 ) + ssl? ( >=dev-libs/openssl-0.9.7 ) + sybase-ct? ( dev-db/freetds ) + tidy? ( app-text/htmltidy ) + truetype? ( + =media-libs/freetype-2* + >=media-libs/t1lib-5.0.0 + !gd? ( + virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) + ) + unicode? ( dev-libs/oniguruma ) + vpx? ( media-libs/libvpx ) + wddx? ( >=dev-libs/libxml2-2.6.8 ) + xml? ( >=dev-libs/libxml2-2.6.8 ) + xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) + xmlreader? ( >=dev-libs/libxml2-2.6.8 ) + xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) + xpm? ( + x11-libs/libXpm + virtual/jpeg:0 + media-libs/libpng:0= sys-libs/zlib + ) + xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) + zip? ( sys-libs/zlib ) + zlib? ( sys-libs/zlib ) + virtual/mta +" + +php="=${CATEGORY}/${PF}" + +REQUIRED_USE=" + truetype? ( gd ) + vpx? ( gd ) + cjk? ( gd ) + exif? ( gd ) + + xpm? ( gd ) + gd? ( zlib ) + simplexml? ( xml ) + soap? ( xml ) + wddx? ( xml ) + xmlrpc? ( || ( xml iconv ) ) + xmlreader? ( xml ) + xslt? ( xml ) + ldap-sasl? ( ldap ) + mhash? ( hash ) + phar? ( hash ) + libmysqlclient? ( || ( + mysql + mysqli + pdo + ) ) + + qdbm? ( !gdbm ) + readline? ( !libedit ) + recode? ( !imap !mysql !mysqli ) + sharedmem? ( !threads ) + + !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )" + +RDEPEND="${DEPEND}" + +RDEPEND="${RDEPEND} + fpm? ( + selinux? ( sec-policy/selinux-phpfpm ) + systemd? ( sys-apps/systemd ) )" + +DEPEND="${DEPEND} + sys-devel/flex + >=sys-devel/m4-1.4.3 + >=sys-devel/libtool-1.5.18" + +# Allow users to install production version if they want to + +case "${PHP_INI_VERSION}" in + production|development) + ;; + *) + PHP_INI_VERSION="development" + ;; +esac + +PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}" +PHP_INI_FILE="php.ini" + +want_apache + +pkg_setup() { + depend.apache_pkg_setup +} + +php_install_ini() { + local phpsapi="${1}" + + # work out where we are installing the ini file + php_set_ini_dir "${phpsapi}" + + local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}" + cp "${PHP_INI_UPSTREAM}" "${phpinisrc}" + + # default to /tmp for save_path, bug #282768 + sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" + + # Set the extension dir + sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}" + + # Set the include path to point to where we want to find PEAR packages + sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" + + dodir "${PHP_INI_DIR#${EPREFIX}}" + insinto "${PHP_INI_DIR#${EPREFIX}}" + newins "${phpinisrc}" "${PHP_INI_FILE}" + + elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}" + elog + + dodir "${PHP_EXT_INI_DIR#${EPREFIX}}" + dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}" + + if use_if_iuse opcache; then + elog "Adding opcache to $PHP_EXT_INI_DIR" + echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> "${D}/${PHP_EXT_INI_DIR}"/opcache.ini + dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini" + fi + + # SAPI-specific handling + + if [[ "${sapi}" == "fpm" ]] ; then + [[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0 + einfo "Installing FPM CGI config file php-fpm.conf" + insinto "${PHP_INI_DIR#${EPREFIX}}" + newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf + + # Remove bogus /etc/php-fpm.conf.default (bug 359906) + [[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default" + fi + + # Install PHP ini files into /usr/share/php + + dodoc php.ini-development + dodoc php.ini-production + +} + +php_set_ini_dir() { + PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}" + PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext" + PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active" +} + +src_prepare() { + # USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path + # ([empty session.save_path]/session_mm_[sapi][gid].sem) + # there is no easy way to circumvent that, all php calls during + # install use -n, so no php.ini file will be used. + # As such, this is the easiest way to get around + addpredict /session_mm_cli250.sem + addpredict /session_mm_cli0.sem + + # Change PHP branding + # Get the alpha/beta/rc version + sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \ + -i configure.in || die "Unable to change PHP branding" + + # Patch PHP to show Gentoo as the server platform + sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \ + -i configure.in || die "Failed to fix server platform name" + + # Prevent PHP from activating the Apache config, + # as we will do that ourselves + sed -i \ + -e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \ + -e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \ + configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 + + # Patch PHP to support heimdal instead of mit-krb5 + if has_version "app-crypt/heimdal" ; then + sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \ + || die "Failed to fix heimdal libname" + sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \ + || die "Failed to fix heimdal crypt library reference" + fi + + # Fix build with libvpx-1.4.0, bug #545952 . + epatch "${FILESDIR}/${PN}-libvpx.patch" + + #Add user patches #357637 + epatch_user + + #force rebuilding aclocal.m4 + rm aclocal.m4 + eautoreconf + + if [[ ${CHOST} == *-darwin* ]] ; then + # http://bugs.php.net/bug.php?id=48795, bug #343481 + sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die + fi +} + +src_configure() { + addpredict /usr/share/snmp/mibs/.index + addpredict /var/lib/net-snmp/mib_indexes + + PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}" + + # This is a global variable and should be in caps. It isn't because the + # phpconfutils eclass relies on exactly this name... + # for --with-libdir see bug #327025 + my_conf=" + --prefix="${PHP_DESTDIR}" + --mandir="${PHP_DESTDIR}"/man + --infodir="${PHP_DESTDIR}"/info + --libdir="${PHP_DESTDIR}"/lib + --with-libdir=$(get_libdir) + --without-pear + $(use_enable threads maintainer-zts)" + + # extension USE flag shared + my_conf+=" + $(use_enable bcmath bcmath ) + $(use_with bzip2 bz2 "${EPREFIX}"/usr) + $(use_enable calendar calendar ) + $(use_enable ctype ctype ) + $(use_with curl curl "${EPREFIX}"/usr) + $(use_enable xml dom ) + $(use_with enchant enchant "${EPREFIX}"/usr) + $(use_enable exif exif ) + $(use_enable fileinfo fileinfo ) + $(use_enable filter filter ) + $(use_enable ftp ftp ) + $(use_with nls gettext "${EPREFIX}"/usr) + $(use_with gmp gmp "${EPREFIX}"/usr) + $(use_enable hash hash ) + $(use_with mhash mhash "${EPREFIX}"/usr) + $(use_with iconv iconv $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}"/usr)) + $(use_enable intl intl ) + $(use_enable ipv6 ipv6 ) + $(use_enable json json ) + $(use_with kerberos kerberos "${EPREFIX}"/usr) + $(use_enable xml libxml ) + $(use_with xml libxml-dir "${EPREFIX}"/usr) + $(use_enable unicode mbstring ) + $(use_with crypt mcrypt "${EPREFIX}"/usr) + $(use_with mssql mssql "${EPREFIX}"/usr) + $(use_with unicode onig "${EPREFIX}"/usr) + $(use_with ssl openssl "${EPREFIX}"/usr) + $(use_with ssl openssl-dir "${EPREFIX}"/usr) + $(use_enable pcntl pcntl ) + $(use_enable phar phar ) + $(use_enable pdo pdo ) + $(use_enable opcache opcache ) + $(use_with postgres pgsql "${EPREFIX}"/usr) + $(use_enable posix posix ) + $(use_with spell pspell "${EPREFIX}"/usr) + $(use_with recode recode "${EPREFIX}"/usr) + $(use_enable simplexml simplexml ) + $(use_enable sharedmem shmop ) + $(use_with snmp snmp "${EPREFIX}"/usr) + $(use_enable soap soap ) + $(use_enable sockets sockets ) + $(use_with sqlite sqlite3 "${EPREFIX}"/usr) + $(use_with sybase-ct sybase-ct "${EPREFIX}"/usr) + $(use_enable sysvipc sysvmsg ) + $(use_enable sysvipc sysvsem ) + $(use_enable sysvipc sysvshm ) + $(use_with systemd fpm-systemd) + $(use_with tidy tidy "${EPREFIX}"/usr) + $(use_enable tokenizer tokenizer ) + $(use_enable wddx wddx ) + $(use_enable xml xml ) + $(use_enable xmlreader xmlreader ) + $(use_enable xmlwriter xmlwriter ) + $(use_with xmlrpc xmlrpc) + $(use_with xslt xsl "${EPREFIX}"/usr) + $(use_enable zip zip ) + $(use_with zlib zlib "${EPREFIX}"/usr) + $(use_enable debug debug )" + + # DBA support + if use cdb || use berkdb || use flatfile || use gdbm || use inifile \ + || use qdbm ; then + my_conf="${my_conf} --enable-dba${shared}" + fi + + # DBA drivers support + my_conf+=" + $(use_with cdb cdb) + $(use_with berkdb db4 ${EPREFIX}/usr) + $(use_enable flatfile flatfile ) + $(use_with gdbm gdbm ${EPREFIX}/usr) + $(use_enable inifile inifile ) + $(use_with qdbm qdbm ${EPREFIX}/usr)" + + # Support for the GD graphics library + my_conf+=" + $(use_with truetype freetype-dir ${EPREFIX}/usr) + $(use_with truetype t1lib ${EPREFIX}/usr) + $(use_enable cjk gd-jis-conv ) + $(use_with gd jpeg-dir ${EPREFIX}/usr) + $(use_with gd png-dir ${EPREFIX}/usr) + $(use_with xpm xpm-dir ${EPREFIX}/usr) + $(use_with vpx vpx-dir ${EPREFIX}/usr)" + # enable gd last, so configure can pick up the previous settings + my_conf+=" + $(use_with gd gd)" + + # IMAP support + if use imap ; then + my_conf+=" + $(use_with imap imap ${EPREFIX}/usr) + $(use_with ssl imap-ssl ${EPREFIX}/usr)" + fi + + # Interbase/firebird support + + if use firebird ; then + my_conf+=" + $(use_with firebird interbase ${EPREFIX}/usr)" + fi + + # LDAP support + if use ldap ; then + my_conf+=" + $(use_with ldap ldap ${EPREFIX}/usr) + $(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)" + fi + + # MySQL support + local mysqllib="mysqlnd" + local mysqlilib="mysqlnd" + use libmysqlclient && mysqllib="${EPREFIX}/usr" + use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config" + + my_conf+=" $(use_with mysql mysql $mysqllib)" + my_conf+=" $(use_with mysqli mysqli $mysqlilib)" + + local mysqlsock=" $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)" + if use mysql ; then + my_conf+="${mysqlsock}" + elif use mysqli ; then + my_conf+="${mysqlsock}" + fi + + # ODBC support + if use odbc ; then + my_conf+=" + $(use_with odbc unixODBC ${EPREFIX}/usr)" + fi + + if use iodbc ; then + my_conf+=" + $(use_with iodbc iodbc ${EPREFIX}/usr)" + fi + + # Oracle support + if use oci8-instant-client ; then + my_conf+=" + $(use_with oci8-instant-client oci8)" + fi + + # PDO support + if use pdo ; then + my_conf+=" + $(use_with mssql pdo-dblib ) + $(use_with mysql pdo-mysql ${mysqllib}) + $(use_with postgres pdo-pgsql ) + $(use_with sqlite pdo-sqlite ${EPREFIX}/usr) + $(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)" + if use oci8-instant-client ; then + my_conf+=" + $(use_with oci8-instant-client pdo-oci)" + fi + fi + + # readline/libedit support + my_conf+=" + $(use_with readline readline ${EPREFIX}/usr) + $(use_with libedit libedit ${EPREFIX}/usr)" + + # Session support + if use session ; then + my_conf+=" + $(use_with sharedmem mm ${EPREFIX}/usr)" + else + my_conf+=" + $(use_enable session session )" + fi + + # Use pic for shared modules such as apache2's mod_php + my_conf="${my_conf} --with-pic" + + # we use the system copy of pcre + # --with-pcre-regex affects ext/pcre + # --with-pcre-dir affects ext/filter and ext/zip + my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr" + + # Catch CFLAGS problems + # Fixes bug #14067. + # Changed order to run it in reverse for bug #32022 and #12021. + replace-cpu-flags "k6*" "i586" + + # Support user-passed configuration parameters + my_conf="${my_conf} ${EXTRA_ECONF:-}" + + # Support the Apache2 extras, they must be set globally for all + # SAPIs to work correctly, especially for external PHP extensions + + mkdir -p "${WORKDIR}/sapis-build" + for one_sapi in $SAPIS ; do + use "${one_sapi}" || continue + php_set_ini_dir "${one_sapi}" + + cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}" + cd "${WORKDIR}/sapis-build/${one_sapi}" + + sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR} + --with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}" + + for sapi in $SAPIS ; do + case "$sapi" in + cli|cgi|embed|fpm) + if [[ "${one_sapi}" == "${sapi}" ]] ; then + sapi_conf="${sapi_conf} --enable-${sapi}" + else + sapi_conf="${sapi_conf} --disable-${sapi}" + fi + ;; + + apache2) + if [[ "${one_sapi}" == "${sapi}" ]] ; then + sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs" + else + sapi_conf="${sapi_conf} --without-apxs2" + fi + ;; + esac + done + + econf ${sapi_conf} + done +} + +src_compile() { + # snmp seems to run during src_compile, too (bug #324739) + addpredict /usr/share/snmp/mibs/.index + addpredict /var/lib/net-snmp/mib_indexes + + for sapi in ${SAPIS} ; do + if use "${sapi}"; then + cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1" + emake || die "emake failed" + fi + done +} + +src_install() { + # see bug #324739 for what happens when we don't have that + addpredict /usr/share/snmp/mibs/.index + + # grab the first SAPI that got built and install common files from there + local first_sapi="" + for sapi in $SAPIS ; do + if use $sapi ; then + first_sapi=$sapi + break + fi + done + + # Makefile forgets to create this before trying to write to it... + dodir "${PHP_DESTDIR#${EPREFIX}}/bin" + + # Install php environment (without any sapis) + cd "${WORKDIR}/sapis-build/$first_sapi" + emake INSTALL_ROOT="${D}" \ + install-build install-headers install-programs \ + || die "emake install failed" + + local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)" + + # Create the directory where we'll put version-specific php scripts + keepdir /usr/share/php${PHP_MV} + + local sapi="", file="" + local sapi_list="" + + for sapi in ${SAPIS}; do + if use "${sapi}" ; then + einfo "Installing SAPI: ${sapi}" + cd "${WORKDIR}/sapis-build/${sapi}" + + if [[ "${sapi}" == "apache2" ]] ; then + # We're specifically not using emake install-sapi as libtool + # may cause unnecessary relink failures (see bug #351266) + insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/" + newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)" + keepdir "/usr/$(get_libdir)/apache2/modules" + else + # needed each time, php_install_ini would reset it + local dest="${PHP_DESTDIR#${EPREFIX}}" + into "${dest}" + case "$sapi" in + cli) + source="sapi/cli/php" + ;; + cgi) + source="sapi/cgi/php-cgi" + ;; + fpm) + source="sapi/fpm/php-fpm" + ;; + embed) + source="libs/libphp${PHP_MV}$(get_libname)" + ;; + *) + die "unhandled sapi in src_install" + ;; + esac + + if [[ "${source}" == *"$(get_libname)" ]]; then + dolib.so "${source}" || die "Unable to install ${sapi} sapi" + else + dobin "${source}" || die "Unable to install ${sapi} sapi" + local name="$(basename ${source})" + dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}" + fi + fi + + php_install_ini "${sapi}" + + # construct correct SAPI string for php-config + # thanks to ferringb for the bash voodoo + if [[ "${sapi}" == "apache2" ]]; then + sapi_list="${sapi_list:+${sapi_list} }apache2handler" + else + sapi_list="${sapi_list:+${sapi_list} }${sapi}" + fi + fi + done + + # Installing opcache module + if use_if_iuse opcache ; then + dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module" + fi + + # Install env.d files + newenvd "${FILESDIR}/20php5-envd" \ + "20php${SLOT}" + sed -e "s|/lib/|/$(get_libdir)/|g" -i \ + "${ED}/etc/env.d/20php${SLOT}" + sed -e "s|php5|php${SLOT}|g" -i \ + "${ED}/etc/env.d/20php${SLOT}" + + # set php-config variable correctly (bug #278439) + sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \ + "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" + + if use fpm ; then + if use systemd; then + systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service" + else + systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service" + fi + fi +} + +src_test() { + echo ">>> Test phase [test]: ${CATEGORY}/${PF}" + PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php" + if [[ ! -x "${PHP_BIN}" ]] ; then + ewarn "Test phase requires USE=cli, skipping" + return + else + export TEST_PHP_EXECUTABLE="${PHP_BIN}" + fi + + if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then + export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi" + fi + + REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d "session.save_path=${T}" \ + "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}" + + for name in ${EXPECTED_TEST_FAILURES}; do + mv "${name}.out" "${name}.out.orig" 2>/dev/null + done + + local failed="$(find -name '*.out')" + if [[ ${failed} != "" ]] ; then + ewarn "The following test cases failed unexpectedly:" + for name in ${failed}; do + ewarn " ${name/.out/}" + done + else + einfo "No unexpected test failures, all fine" + fi + + if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then + local passed="" + for name in ${EXPECTED_TEST_FAILURES}; do + [[ -f "${name}.diff" ]] && continue + passed="${passed} ${name}" + done + if [[ ${passed} != "" ]] ; then + einfo "The following test cases passed unexpectedly:" + for name in ${passed}; do + ewarn " ${passed}" + done + else + einfo "None of the known-to-fail tests passed, all fine" + fi + fi +} + +pkg_postinst() { + # Output some general info to the user + if use apache2 ; then + APACHE2_MOD_DEFINE="PHP5" + APACHE2_MOD_CONF="70_mod_php5" # actually provided by app-eselect/eselect-php + apache-module_pkg_postinst + fi + + # Create the symlinks for php + for m in ${SAPIS}; do + [[ ${m} == 'embed' ]] && continue; + if use $m ; then + local ci=$(eselect php show $m) + if [[ -z $ci ]]; then + eselect php set $m php${SLOT} + einfo "Switched ${m} to use php:${SLOT}" + einfo + elif [[ $ci != "php${SLOT}" ]] ; then + elog "To switch $m to use php:${SLOT}, run" + elog " eselect php set $m php${SLOT}" + elog + fi + fi + done + + elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order" + elog "to compile extensions for the ${SLOT} ABI" + elog + if ! use readline && use cli ; then + ewarn "Note that in order to use php interactivly, you need to enable" + ewarn "the readline USE flag or php -a will hang" + fi + elog + elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version." + elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either" + elog "'production' or 'development' in ${EPREFIX}/etc/make.conf" + elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}" + + elog + elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:" + elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml" + elog +} + +pkg_prerm() { + eselect php cleanup +} diff --git a/dev-lang/regina-rexx/Manifest b/dev-lang/regina-rexx/Manifest index 25544d5ccfc8..64d09cb87597 100644 --- a/dev-lang/regina-rexx/Manifest +++ b/dev-lang/regina-rexx/Manifest @@ -1,2 +1 @@ -DIST Regina-REXX-3.3.tar.gz 940352 SHA256 3bce9da3631dbf073b8373359fb8a2924d7b511995e7dfd34deca8c6b5d0582c SHA512 d7b4816886fc4d9d9a75091c1220f5b00bfc4ee6d2e066185126735bb47e664b0283576e5119ad0f11fe88a158c6db8aab81fa46f631583fe28f7279dbba115f WHIRLPOOL f964de0da6f9b60800d194ee79a2926a99f3e94f7eaa9cb69715223eb6b47b8877980a66b8d9ef48b6b3ee88cd4106742ca05ae2c618d1a76236d4d4d9ecbfe3 DIST Regina-REXX-3.6.tar.gz 1140272 SHA256 687a52327b74e75cf383c427268346ef884c9aed6cdd7d3108feff2171ecfbcc SHA512 07a65c633da97e2a696c3d038808fa377af05f99fef2322398f4712726f4b7311957afeb9e2c18988feb29392ef06ddae7f7bde1a7574af0b0e8bbd286aa2e8e WHIRLPOOL be930cd0e8cf96a95eccf61d711ec633d7acfaf7b383f2633ac696bddbf8c01ab2ba2ef4bda8cf0f4f9404128e9f3eabbb3168864a5b93360f46b5f09fa1feb1 diff --git a/dev-lang/regina-rexx/regina-rexx-3.3.ebuild b/dev-lang/regina-rexx/regina-rexx-3.3.ebuild deleted file mode 100644 index 12c3cfb5209c..000000000000 --- a/dev-lang/regina-rexx/regina-rexx-3.3.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/regina-rexx/regina-rexx-3.3.ebuild,v 1.19 2012/12/10 00:46:35 jer Exp $ - -WANT_AUTOCONF="2.1" - -inherit autotools - -DESCRIPTION="Portable Rexx interpreter" -HOMEPAGE="http://regina-rexx.sourceforge.net" -SRC_URI="mirror://sourceforge/regina-rexx/Regina-REXX-${PV}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ppc x86" -IUSE="" - -DEPEND="" -RDEPEND="" - -S=${WORKDIR}/Regina-${PV} - -src_unpack() { - unpack ${A} - cd "${S}" - eautoreconf -} - -src_compile() { - econf - sed -i \ - -e 's|-$(INSTALL) -m 755 -c ./rxstack.init.d $(STARTUPDIR)/rxstack||' \ - -e "s|/usr/share/regina|${D}/usr/share/regina|" \ - Makefile || die - emake CC=$(tc-getCC) CFLAGS="${CFLAGS} -fno-strict-aliasing" -j1 || die "make problem" -} - -src_install() { - einstall datadir="${D}"/usr/share/regina || die - rm -rf "${D}"/etc/rc.d - - doinitd "${FILESDIR}"/rxstack - - dodoc BUGS HACKERS.txt README.Unix README_SAFE TODO - - # Fix Shebang line in example scripts - sed -e 's:/var/tmp/portage/dev-lang/regina-rexx-3.3/image::' \ - -i "${D}"/usr/share/regina/regina/*.rexx -} - -pkg_postinst() { - elog "You may want to run" - elog - elog "\trc-update add rxstack default" - elog - elog "to enable Rexx queues (optional)." -} diff --git a/dev-lang/scala/scala-2.10.2-r2.ebuild b/dev-lang/scala/scala-2.10.2-r2.ebuild index de93e7be024b..b50c8c5c2a35 100644 --- a/dev-lang/scala/scala-2.10.2-r2.ebuild +++ b/dev-lang/scala/scala-2.10.2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.10.2-r2.ebuild,v 1.1 2015/04/17 14:39:37 gienah Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.10.2-r2.ebuild,v 1.2 2015/04/18 07:42:09 gienah Exp $ EAPI="5" @@ -137,8 +137,8 @@ java_prepare() { # Note: to bump scala, some things to try are: # 1. update all the sha1s in JURI # 2. comment out applying the maven-deps patch and all the stuff here up to and including the sed of build.xml - # 3. try emerge scala, it will likely download more stuff in src_compile to ${WORDIR}/.m2 - # 4. tar up the stuff in ${WORDIR}/.m2 and change the ${P}-maven-deps.tar.gz in SRC_URI to point to it. + # 3. try emerge scala, it will likely download more stuff in src_compile to ${WORKDIR}/.m2 + # 4. tar up the stuff in ${WORKDIR}/.m2 and change the ${P}-maven-deps.tar.gz in SRC_URI to point to it. # 5. uncomment the maven-deps patch apply and all the stuff up to and including the sed of build.xml # 6. the hash in ${P}-no-git.patch should be updated by searching for hash matching the scala release # tag, so that the source code hyper-links in the scala documentation will point to the correct version of diff --git a/dev-lang/scala/scala-2.10.3-r1.ebuild b/dev-lang/scala/scala-2.10.3-r1.ebuild index d44cb15e8850..176f718e1b66 100644 --- a/dev-lang/scala/scala-2.10.3-r1.ebuild +++ b/dev-lang/scala/scala-2.10.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.10.3-r1.ebuild,v 1.1 2015/04/17 14:39:37 gienah Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.10.3-r1.ebuild,v 1.2 2015/04/18 07:42:09 gienah Exp $ EAPI="5" @@ -151,7 +151,7 @@ java_prepare() { # Note: to bump scala, some things to try are: # 1. update all the sha1s in JURI # 2. remove the http://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps.tar.gz from SRC_URI - # 3. try emerge scala. Check if it downloads more stuff in src_compile to ${WORDIR}/.m2 + # 3. try emerge scala. Check if it downloads more stuff in src_compile to ${WORKDIR}/.m2 # or /var/tmp/portage/.m2 or /root/.m2 # 4. tar up all the .m2 junk into ${P}-maven-deps.tar.gz and add it to SRC_URI. sed -e "s@\(\)@\1${WORKDIR}\2\n @" \ diff --git a/dev-lang/scala/scala-2.10.4-r1.ebuild b/dev-lang/scala/scala-2.10.4-r1.ebuild index c6f08837b47f..13d502e52af9 100644 --- a/dev-lang/scala/scala-2.10.4-r1.ebuild +++ b/dev-lang/scala/scala-2.10.4-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.10.4-r1.ebuild,v 1.1 2015/04/17 14:39:37 gienah Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.10.4-r1.ebuild,v 1.2 2015/04/18 07:42:09 gienah Exp $ EAPI="5" @@ -154,7 +154,7 @@ java_prepare() { # Note: to bump scala, some things to try are: # 1. update all the sha1s in JURI # 2. remove the http://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps.tar.gz from SRC_URI - # 3. try emerge scala. Check if it downloads more stuff in src_compile to ${WORDIR}/.m2 + # 3. try emerge scala. Check if it downloads more stuff in src_compile to ${WORKDIR}/.m2 # or /var/tmp/portage/.m2 or /root/.m2 # 4. tar up all the .m2 junk into ${P}-maven-deps.tar.gz and add it to SRC_URI. sed -e "s@\(\)@\1${WORKDIR}\2\n @" \ diff --git a/dev-lang/scala/scala-2.11.1-r1.ebuild b/dev-lang/scala/scala-2.11.1-r1.ebuild index 78a7f4482019..3cc6dfb9a156 100644 --- a/dev-lang/scala/scala-2.11.1-r1.ebuild +++ b/dev-lang/scala/scala-2.11.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.11.1-r1.ebuild,v 1.1 2015/04/17 14:39:37 gienah Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.11.1-r1.ebuild,v 1.2 2015/04/18 07:42:09 gienah Exp $ EAPI="5" @@ -137,7 +137,7 @@ java_prepare() { # Note: to bump scala, some things to try are: # 1. update all the sha1s in JURI # 2. remove the http://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps.tar.gz from SRC_URI - # 3. try emerge scala. Check if it downloads more stuff in src_compile to ${WORDIR}/.m2 + # 3. try emerge scala. Check if it downloads more stuff in src_compile to ${WORKDIR}/.m2 # or /var/tmp/portage/.m2 or /root/.m2 # 4. tar up all the .m2 junk into ${P}-maven-deps.tar.gz and add it to SRC_URI. sed -e "s@\(\)@\1${WORKDIR}\2\n @" \ diff --git a/dev-lang/scala/scala-2.11.2-r1.ebuild b/dev-lang/scala/scala-2.11.2-r1.ebuild index 1a3a11c0b59f..60cd316b153c 100644 --- a/dev-lang/scala/scala-2.11.2-r1.ebuild +++ b/dev-lang/scala/scala-2.11.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.11.2-r1.ebuild,v 1.1 2015/04/17 14:39:37 gienah Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.11.2-r1.ebuild,v 1.2 2015/04/18 07:42:09 gienah Exp $ EAPI="5" @@ -137,7 +137,7 @@ java_prepare() { # Note: to bump scala, some things to try are: # 1. update all the sha1s in JURI # 2. remove the http://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps.tar.gz from SRC_URI - # 3. try emerge scala. Check if it downloads more stuff in src_compile to ${WORDIR}/.m2 + # 3. try emerge scala. Check if it downloads more stuff in src_compile to ${WORKDIR}/.m2 # or /var/tmp/portage/.m2 or /root/.m2 # 4. tar up all the .m2 junk into ${P}-maven-deps.tar.gz and add it to SRC_URI. sed -e "s@\(\)@\1${WORKDIR}\2\n @" \ diff --git a/dev-lang/scala/scala-2.11.4-r1.ebuild b/dev-lang/scala/scala-2.11.4-r1.ebuild index 8925fe69f668..8feb57b4692f 100644 --- a/dev-lang/scala/scala-2.11.4-r1.ebuild +++ b/dev-lang/scala/scala-2.11.4-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.11.4-r1.ebuild,v 1.1 2015/04/17 14:39:37 gienah Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.11.4-r1.ebuild,v 1.2 2015/04/18 07:42:09 gienah Exp $ EAPI="5" @@ -137,7 +137,7 @@ java_prepare() { # Note: to bump scala, some things to try are: # 1. update all the sha1s in JURI # 2. remove the http://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps.tar.gz from SRC_URI - # 3. try emerge scala. Check if it downloads more stuff in src_compile to ${WORDIR}/.m2 + # 3. try emerge scala. Check if it downloads more stuff in src_compile to ${WORKDIR}/.m2 # or /var/tmp/portage/.m2 or /root/.m2 # 4. tar up all the .m2 junk into ${P}-maven-deps.tar.gz and add it to SRC_URI. sed -e "s@\(\)@\1${WORKDIR}\2\n @" \ diff --git a/dev-lang/scala/scala-2.11.6.ebuild b/dev-lang/scala/scala-2.11.6.ebuild index 72597c018fa8..ee05c5ec74c5 100644 --- a/dev-lang/scala/scala-2.11.6.ebuild +++ b/dev-lang/scala/scala-2.11.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.11.6.ebuild,v 1.1 2015/04/17 14:39:37 gienah Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.11.6.ebuild,v 1.2 2015/04/18 07:42:09 gienah Exp $ EAPI="5" @@ -137,7 +137,7 @@ java_prepare() { # Note: to bump scala, some things to try are: # 1. update all the sha1s in JURI # 2. remove the http://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps.tar.gz from SRC_URI - # 3. try emerge scala. Check if it downloads more stuff in src_compile to ${WORDIR}/.m2 + # 3. try emerge scala. Check if it downloads more stuff in src_compile to ${WORKDIR}/.m2 # or /var/tmp/portage/.m2 or /root/.m2 # 4. tar up all the .m2 junk into ${P}-maven-deps.tar.gz and add it to SRC_URI. sed -e "s@\(\)@\1${WORKDIR}\2\n @" \ diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest index c7d79e85e1c9..866013e2b43a 100644 --- a/dev-libs/botan/Manifest +++ b/dev-libs/botan/Manifest @@ -1,6 +1,3 @@ -DIST Botan-1.10.1.tbz 2195784 SHA256 205a3c011391d01ca3e4f127a2ffbf993a4f59788ffa45a6df06ef4ff382a89e SHA512 6e1fecf6cb9103428c444a13b89eb21983c054f1327fcc48ff89876749644c1e635e09d8af595e8ff31ab9c657a11cf4953e9c262a6ee42bce3f68370f0636fa WHIRLPOOL 39e881806a4ee24ed75c6ac1cad8cd7ded962026138641da70ea672a45982fe9d8c6d3b41302c5b5b96567809377bcbcf3801aea8e6792f9d5e8705f6b6c3533 -DIST Botan-1.10.3.tbz 2215991 SHA256 e1db6af2deb230699b076cde893ad949f0580d4fd7b030fcd791ae982d184734 SHA512 e14a961dca2ece04b20a574ad1eb4467f1d94ac1c1fb3b66db704d750aa9953dd78e5700065b896eea63effeffdeb6c529cc8de6eea30c3acef851cd7ddb872b WHIRLPOOL 2b400ec5f6bbaf235a88a057a5dbde05987894a6f8cbf3a8fc0447192d42ce13d4fe9a06060ef09d5eaafe5357ee726345b1e753654136f1612a7c7912688fd5 DIST Botan-1.10.5.tbz 2214817 SHA256 2934c00533847dc93c485081d3ce6aae4a110151a69b587b895241159da77cf3 SHA512 7456eaf2bbdabac9438cdd28dbc0735924480034d848c40039b5b58d52924b4cb065316989d6902201bc62fb5c19cba109b550b6865ca4d11748e3a3a1ececa6 WHIRLPOOL 7fd3de981d55a03925e78a4afcee55c0f3cf7e2dc88bd503f9c5705e5cc73293cf3bdcf3c3fdf54b6d1b77ba7dc32cf6fa46720635b922e368aaf12a39339fcd DIST Botan-1.11.4.tbz 2346343 SHA256 ebbcc493ef2f13f536597b72e317462e1503c83f7e18e1fe10887f16b5f4da0f SHA512 c5c521a78b50de6c6e2bba912f0697e507a8432bd7f348e3e41856cc2ed60fea5877df4957d74887419208f8df63224a4c6726c94eef58fc1b255133b1f0ee22 WHIRLPOOL 41a024e3698fa2ede2a5124b6c5d2400e969f2cddfec6e7e9e43e549097dd606d105d6e02d6268e322d98e83300c76eb4f7783ee54699a7fa85addcf9adc3aa2 DIST Botan-1.11.8.tbz 2193897 SHA256 5c3a5485dd8f2b5e690bdc73d5848b1f436a090e7fc521c66920f34d6af68efd SHA512 2d3f5d77687ed56be39c88fe7ffdb27ebda573650f164b8681864cff0ca8b0a0bd56f9749f3695e4240a68bfa1483565c854ff4f9d8a7460de0883255a917e26 WHIRLPOOL c9eaeb2d2da10bc61eb704beb9025fada4f16ec4e82a7845cdc465295d05ad070e73d289abdc30fc96f5b43778c87f31ea4cb66c6706cb822ceb2adba0354d41 -DIST Botan-1.8.11.tbz 2808114 SHA256 c3b60a2c3dfcbe7b21626e8459e5134d3cbabe45b6d94f454860b99798739ba4 SHA512 03577a01e464841e7c985ce6323c4eeaf8d5fc968786d058139e8f965d81900ceb17c7e3f54c948b9dbb602717fec0eff153e1f140c4016aef97c7adb317e5d1 WHIRLPOOL a7f1283ca50d52ccff025a74c10cd7b973a196f873b8386e0efc73af84d0e765a127448f999be9e76e90e772dc20950bf0ae9972fad99840b0045caea41ee811 diff --git a/dev-libs/botan/botan-1.10.1.ebuild b/dev-libs/botan/botan-1.10.1.ebuild deleted file mode 100644 index 75935c5bbe11..000000000000 --- a/dev-libs/botan/botan-1.10.1.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.10.1.ebuild,v 1.2 2015/02/02 16:38:58 jer Exp $ - -EAPI="3" -#PYTHON_BDEPEND="2" - -inherit eutils multilib python toolchain-funcs - -MY_PN="Botan" -MY_P="${MY_PN}-${PV}" -DESCRIPTION="A C++ crypto library" -HOMEPAGE="http://botan.randombit.net/" -SRC_URI="http://files.randombit.net/botan/${MY_P}.tbz" - -KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~ppc-macos" -SLOT="0" -LICENSE="BSD" -IUSE="bzip2 gmp ssl threads zlib" - -S="${WORKDIR}/${MY_P}" - -RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.5 ) - zlib? ( >=sys-libs/zlib-1.2.3 ) - gmp? ( >=dev-libs/gmp-4.2.2 ) - ssl? ( >=dev-libs/openssl-0.9.8g )" -DEPEND="${RDEPEND} - =dev-lang/python-2*" - -pkg_setup() { - python_set_active_version 2 - python_pkg_setup -} - -src_prepare() { - # Install documentation in /usr/share/doc/${PF}. - sed -e "/^DOCDIR *=/s/Botan-\$(VERSION)/${PF}/" -i src/build-data/makefile/unix_shr.in || die "sed failed" -} - -src_configure() { - local disable_modules="proc_walk,unix_procs,cpu_counter" - - if ! use threads; then - disable_modules="${disable_modules},pthreads" - fi - - # Enable v9 instructions for sparc64 - if [[ "${PROFILE_ARCH}" = "sparc64" ]]; then - CHOSTARCH="sparc32-v9" - else - CHOSTARCH="${CHOST%%-*}" - fi - - cd "${S}" - elog "Disabling modules: ${disable_modules}" - - local myos= - case ${CHOST} in - *-darwin*) myos=darwin ;; - *) myos=linux ;; - esac - - # foobared buildsystem, --prefix translates into DESTDIR, see also make - # install in src_install, we need the correct live-system prefix here on - # Darwin for a shared lib with correct install_name - ./configure.py \ - --prefix="${EPREFIX}/usr" \ - --libdir=$(get_libdir) \ - --docdir=share/doc \ - --cc=gcc \ - --os=${myos} \ - --cpu=${CHOSTARCH} \ - --with-endian="$(tc-endian)" \ - --with-tr1=system \ - $(use_with bzip2) \ - $(use_with gmp gnump) \ - $(use_with ssl openssl) \ - $(use_with zlib) \ - --disable-modules=${disable_modules} \ - || die "configure.py failed" -} - -src_compile() { - emake CXX="$(tc-getCXX)" AR="$(tc-getAR) crs" LIB_OPT="${CXXFLAGS}" MACH_OPT="" || die "emake failed" -} - -src_test() { - chmod -R ugo+rX "${S}" - emake CXX="$(tc-getCXX)" CHECK_OPT="${CXXFLAGS}" check || die "emake check failed" - LD_LIBRARY_PATH="${S}" ./check --validate || die "Validation tests failed" -} - -src_install() { - emake DESTDIR="${ED}usr" install || die "emake install failed" -} diff --git a/dev-libs/botan/botan-1.10.3-r1.ebuild b/dev-libs/botan/botan-1.10.3-r1.ebuild deleted file mode 100644 index 9bd61c8c2d7b..000000000000 --- a/dev-libs/botan/botan-1.10.3-r1.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.10.3-r1.ebuild,v 1.6 2015/04/08 17:51:55 mgorny Exp $ - -EAPI="5" -PYTHON_COMPAT=( python{2_7,3_3} ) - -inherit eutils multilib python-r1 toolchain-funcs - -MY_PN="Botan" -MY_P="${MY_PN}-${PV}" -DESCRIPTION="A C++ crypto library" -HOMEPAGE="http://botan.randombit.net/" -SRC_URI="http://files.randombit.net/botan/${MY_P}.tbz" - -KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86 ~ppc-macos" -SLOT="0" -LICENSE="BSD" -IUSE="bindist doc python bzip2 gmp ssl threads zlib" - -S="${WORKDIR}/${MY_P}" - -RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.5 ) - zlib? ( >=sys-libs/zlib-1.2.3 ) - python? ( ${PYTHON_DEPS} >=dev-libs/boost-1.48[python,${PYTHON_USEDEP}] ) - gmp? ( >=dev-libs/gmp-4.2.2 ) - ssl? ( >=dev-libs/openssl-0.9.8g[bindist=] )" -DEPEND="${RDEPEND} - doc? ( dev-python/sphinx )" - -src_prepare() { - sed -e "s/-Wl,-soname,\$@ //" -i src/build-data/makefile/python.in || die "sed failed" - sed \ - -e "/DOCDIR/d" \ - -e "/^install:/s/ docs//" \ - -i src/build-data/makefile/unix_shr.in || die "sed failed" - - # Fix ImportError with Python 3. - sed -e "s/_botan/.&/" -i src/wrap/python/__init__.py || die "sed failed" - - use python && python_copy_sources -} - -src_configure() { - local disable_modules="proc_walk,unix_procs,cpu_counter" - use threads || disable_modules+=",pthreads" - use bindist && disable_modules+=",ecdsa" - elog "Disabling modules: ${disable_modules}" - - # Enable v9 instructions for sparc64 - if [[ "${PROFILE_ARCH}" = "sparc64" ]]; then - CHOSTARCH="sparc32-v9" - else - CHOSTARCH="${CHOST%%-*}" - fi - - local myos= - case ${CHOST} in - *-darwin*) myos=darwin ;; - *) myos=linux ;; - esac - - # foobared buildsystem, --prefix translates into DESTDIR, see also make - # install in src_install, we need the correct live-system prefix here on - # Darwin for a shared lib with correct install_name - ./configure.py \ - --prefix="${EPREFIX}/usr" \ - --libdir=$(get_libdir) \ - --docdir=share/doc \ - --cc=gcc \ - --os=${myos} \ - --cpu=${CHOSTARCH} \ - --with-endian="$(tc-endian)" \ - --without-sphinx \ - --with-tr1=system \ - $(use_with bzip2) \ - $(use_with gmp gnump) \ - $(use_with python boost-python) \ - $(use_with ssl openssl) \ - $(use_with zlib) \ - --disable-modules=${disable_modules} \ - || die "configure.py failed" -} - -src_compile() { - emake CXX="$(tc-getCXX)" AR="$(tc-getAR) crs" LIB_OPT="${CXXFLAGS}" MACH_OPT="" - - if use python; then - building() { - rm -fr build/python - ln -s "${BUILD_DIR}" build/python - cp Makefile.python build/python - sed -i \ - -e "s/-lboost_python/-lboost_python-$(echo ${EPYTHON} | sed 's/python//')/" \ - build/python/Makefile.python - emake -f build/python/Makefile.python \ - CXX="$(tc-getCXX)" \ - CFLAGS="${CXXFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - PYTHON_ROOT="/usr/$(get_libdir)" \ - PYTHON_INC="-I$(python_get_includedir)" - } - python_foreach_impl building - fi - - if use doc; then - einfo "Generation of documentation" - sphinx-build doc doc_output - fi -} - -src_test() { - chmod -R ugo+rX "${S}" - emake CXX="$(tc-getCXX)" CHECK_OPT="${CXXFLAGS}" check - LD_LIBRARY_PATH="${S}" ./check --validate || die "Validation tests failed" -} - -src_install() { - emake DESTDIR="${ED}usr" install - - # Add compatibility symlinks. - [[ -e "${ED}usr/bin/botan-config" ]] && die "Compatibility code no longer needed" - [[ -e "${ED}usr/$(get_libdir)/pkgconfig/botan.pc" ]] && die "Compatibility code no longer needed" - dosym botan-config-1.10 /usr/bin/botan-config - dosym botan-1.10.pc /usr/$(get_libdir)/pkgconfig/botan.pc - - if use python; then - installation() { - rm -fr build/python - ln -s "${BUILD_DIR}" build/python - emake -f Makefile.python \ - PYTHON_SITE_PACKAGE_DIR="${ED}$(python_get_sitedir)" \ - install - } - python_foreach_impl installation - fi - - if use doc; then - pushd doc_output > /dev/null - insinto /usr/share/doc/${PF}/html - doins -r [a-z]* _static - popd > /dev/null - fi -} diff --git a/dev-libs/botan/botan-1.10.3.ebuild b/dev-libs/botan/botan-1.10.3.ebuild deleted file mode 100644 index 72fc35424d62..000000000000 --- a/dev-libs/botan/botan-1.10.3.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.10.3.ebuild,v 1.6 2015/02/02 16:38:58 jer Exp $ - -EAPI="3" -#PYTHON_BDEPEND="2" - -inherit eutils multilib python toolchain-funcs - -MY_PN="Botan" -MY_P="${MY_PN}-${PV}" -DESCRIPTION="A C++ crypto library" -HOMEPAGE="http://botan.randombit.net/" -SRC_URI="http://files.randombit.net/botan/${MY_P}.tbz" - -KEYWORDS="amd64 ~hppa ~ia64 ppc ~sparc x86 ~ppc-macos" -SLOT="0" -LICENSE="BSD" -IUSE="bindist bzip2 gmp ssl threads zlib" - -S="${WORKDIR}/${MY_P}" - -RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.5 ) - zlib? ( >=sys-libs/zlib-1.2.3 ) - gmp? ( >=dev-libs/gmp-4.2.2 ) - ssl? ( >=dev-libs/openssl-0.9.8g[bindist=] )" -DEPEND="${RDEPEND} - =dev-lang/python-2*" - -pkg_setup() { - python_set_active_version 2 - python_pkg_setup -} - -src_prepare() { - # Install documentation in /usr/share/doc/${PF}. - sed -e "/^DOCDIR *=/s/Botan-\$(VERSION)/${PF}/" -i src/build-data/makefile/unix_shr.in || die "sed failed" -} - -src_configure() { - local disable_modules="proc_walk,unix_procs,cpu_counter" - - if ! use threads; then - disable_modules="${disable_modules},pthreads" - fi - - if use bindist; then - disable_modules="${disable_modules},ecdsa" - fi - - # Enable v9 instructions for sparc64 - if [[ "${PROFILE_ARCH}" = "sparc64" ]]; then - CHOSTARCH="sparc32-v9" - else - CHOSTARCH="${CHOST%%-*}" - fi - - cd "${S}" - elog "Disabling modules: ${disable_modules}" - - local myos= - case ${CHOST} in - *-darwin*) myos=darwin ;; - *) myos=linux ;; - esac - - # foobared buildsystem, --prefix translates into DESTDIR, see also make - # install in src_install, we need the correct live-system prefix here on - # Darwin for a shared lib with correct install_name - ./configure.py \ - --prefix="${EPREFIX}/usr" \ - --libdir=$(get_libdir) \ - --docdir=share/doc \ - --cc=gcc \ - --os=${myos} \ - --cpu=${CHOSTARCH} \ - --with-endian="$(tc-endian)" \ - --with-tr1=system \ - $(use_with bzip2) \ - $(use_with gmp gnump) \ - $(use_with ssl openssl) \ - $(use_with zlib) \ - --disable-modules=${disable_modules} \ - || die "configure.py failed" -} - -src_compile() { - emake CXX="$(tc-getCXX)" AR="$(tc-getAR) crs" LIB_OPT="${CXXFLAGS}" MACH_OPT="" || die "emake failed" -} - -src_test() { - chmod -R ugo+rX "${S}" - emake CXX="$(tc-getCXX)" CHECK_OPT="${CXXFLAGS}" check || die "emake check failed" - LD_LIBRARY_PATH="${S}" ./check --validate || die "Validation tests failed" -} - -src_install() { - emake DESTDIR="${ED}usr" install || die "emake install failed" -} diff --git a/dev-libs/botan/botan-1.10.5.ebuild b/dev-libs/botan/botan-1.10.5.ebuild index df2746186a36..141f5da9a731 100644 --- a/dev-libs/botan/botan-1.10.5.ebuild +++ b/dev-libs/botan/botan-1.10.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.10.5.ebuild,v 1.8 2015/04/08 17:51:55 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.10.5.ebuild,v 1.9 2015/04/19 06:52:31 pacho Exp $ EAPI="5" PYTHON_COMPAT=( python{2_7,3_3,3_4} ) @@ -13,7 +13,7 @@ DESCRIPTION="A C++ crypto library" HOMEPAGE="http://botan.randombit.net/" SRC_URI="http://files.randombit.net/botan/${MY_P}.tbz" -KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~sparc ~x86 ~ppc-macos" +KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~sparc x86 ~ppc-macos" SLOT="0" LICENSE="BSD" IUSE="bindist doc python bzip2 gmp ssl static-libs threads zlib" diff --git a/dev-libs/botan/botan-1.8.11.ebuild b/dev-libs/botan/botan-1.8.11.ebuild deleted file mode 100644 index 83bfd3c88363..000000000000 --- a/dev-libs/botan/botan-1.8.11.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.8.11.ebuild,v 1.5 2011/07/08 11:11:41 ssuominen Exp $ - -EAPI="3" -#PYTHON_BDEPEND="2" - -inherit eutils multilib python toolchain-funcs - -MY_PN="Botan" -MY_P="${MY_PN}-${PV}" -DESCRIPTION="A C++ crypto library" -HOMEPAGE="http://botan.randombit.net/" -SRC_URI="http://files.randombit.net/botan/${MY_P}.tbz" - -KEYWORDS="amd64 ~ia64 ppc ~sparc x86 ~ppc-macos" -SLOT="0" -LICENSE="BSD" -IUSE="bzip2 gmp ssl threads zlib" - -S="${WORKDIR}/${MY_P}" - -RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.5 ) - zlib? ( >=sys-libs/zlib-1.2.3 ) - gmp? ( >=dev-libs/gmp-4.2.2 ) - ssl? ( >=dev-libs/openssl-0.9.8g )" -DEPEND="${RDEPEND} - =dev-lang/python-2*" - -pkg_setup() { - python_set_active_version 2 - python_pkg_setup -} - -src_prepare() { - # Install documentation in /usr/share/doc/${PF}. - sed -e "/^DOCDIR *=/s/Botan-\$(VERSION)/${PF}/" -i src/build-data/makefile/unix_shr.in || die "sed failed" -} - -src_configure() { - local disable_modules="proc_walk,unix_procs,cpu_counter" - - if ! use threads; then - disable_modules="${disable_modules},pthreads" - fi - - # Enable v9 instructions for sparc64 - if [[ "${PROFILE_ARCH}" = "sparc64" ]]; then - CHOSTARCH="sparc32-v9" - else - CHOSTARCH="${CHOST%%-*}" - fi - - cd "${S}" - elog "Disabling modules: ${disable_modules}" - - local myos= - case ${CHOST} in - *-darwin*) myos=darwin ;; - *) myos=linux ;; - esac - - # foobared buildsystem, --prefix translates into DESTDIR, see also make - # install in src_install, we need the correct live-system prefix here on - # Darwin for a shared lib with correct install_name - ./configure.py \ - --prefix="${EPREFIX}/usr" \ - --libdir=$(get_libdir) \ - --docdir=share/doc \ - --cc=gcc \ - --os=${myos} \ - --cpu=${CHOSTARCH} \ - --with-endian="$(tc-endian)" \ - --with-tr1=system \ - $(use_with bzip2) \ - $(use_with gmp gnump) \ - $(use_with ssl openssl) \ - $(use_with zlib) \ - --disable-modules=${disable_modules} \ - || die "configure.py failed" -} - -src_compile() { - emake CXX="$(tc-getCXX)" AR="$(tc-getAR) crs" LIB_OPT="${CXXFLAGS}" MACH_OPT="" || die "emake failed" -} - -src_test() { - chmod -R ugo+rX "${S}" - emake CXX="$(tc-getCXX)" CHECK_OPT="${CXXFLAGS}" check || die "emake check failed" - LD_LIBRARY_PATH="${S}" ./check --validate || die "Validation tests failed" -} - -src_install() { - emake DESTDIR="${ED}usr" install || die "emake install failed" -} diff --git a/dev-libs/dbus-glib/dbus-glib-0.102.ebuild b/dev-libs/dbus-glib/dbus-glib-0.102.ebuild index 21cf1443372f..8c3dc2a289cf 100644 --- a/dev-libs/dbus-glib/dbus-glib-0.102.ebuild +++ b/dev-libs/dbus-glib/dbus-glib-0.102.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-glib/dbus-glib-0.102.ebuild,v 1.12 2015/04/14 10:54:30 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-glib/dbus-glib-0.102.ebuild,v 1.13 2015/04/19 09:49:09 ago Exp $ EAPI=5 inherit bash-completion-r1 eutils multilib-minimal @@ -11,7 +11,7 @@ SRC_URI="http://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz" LICENSE="|| ( GPL-2 AFL-2.1 )" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris" +KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris" IUSE="debug doc static-libs test" CDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] diff --git a/dev-libs/efl/efl-1.12.2.ebuild b/dev-libs/efl/efl-1.12.2.ebuild index eee79b579fdc..b14e76de09c0 100644 --- a/dev-libs/efl/efl-1.12.2.ebuild +++ b/dev-libs/efl/efl-1.12.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/efl-1.12.2.ebuild,v 1.6 2015/04/03 14:44:17 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/efl-1.12.2.ebuild,v 1.7 2015/04/19 09:48:04 pacho Exp $ EAPI="5" @@ -25,7 +25,7 @@ inherit autotools enlightenment DESCRIPTION="Enlightenment Foundation Libraries all-in-one package" LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB" -KEYWORDS="amd64 arm ~x86" +KEYWORDS="amd64 arm x86" IUSE="+bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus jpeg2k neon oldlua opengl ssl physics pixman +png +ppm +psd pulseaudio scim sdl sound systemd tga tiff tslib v4l2 wayland webp X xim xine xpm" REQUIRED_USE=" diff --git a/dev-libs/expat/expat-2.1.0-r4.ebuild b/dev-libs/expat/expat-2.1.0-r4.ebuild index 8d999d15a8b5..f546084982f8 100644 --- a/dev-libs/expat/expat-2.1.0-r4.ebuild +++ b/dev-libs/expat/expat-2.1.0-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/expat-2.1.0-r4.ebuild,v 1.6 2015/04/14 10:54:47 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/expat-2.1.0-r4.ebuild,v 1.7 2015/04/19 09:49:52 ago Exp $ EAPI=5 inherit eutils libtool multilib toolchain-funcs multilib-minimal @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/expat/${P}.tar.gz" LICENSE="MIT" 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="elibc_FreeBSD examples static-libs unicode" RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r6 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" diff --git a/dev-libs/geoip/geoip-1.6.5.ebuild b/dev-libs/geoip/geoip-1.6.5.ebuild index 80b5d7a06366..37f247d2b2e3 100644 --- a/dev-libs/geoip/geoip-1.6.5.ebuild +++ b/dev-libs/geoip/geoip-1.6.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/geoip-1.6.5.ebuild,v 1.5 2015/04/14 12:13:27 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/geoip-1.6.5.ebuild,v 1.6 2015/04/19 09:38:29 ago Exp $ EAPI=5 inherit autotools eutils @@ -14,7 +14,7 @@ SRC_URI=" # GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db LICENSE="LGPL-2.1 GPL-2 MaxMind2" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos" +KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos" IUSE="static-libs" RESTRICT="test" diff --git a/dev-libs/libchewing/libchewing-0.3.3-r1.ebuild b/dev-libs/libchewing/libchewing-0.3.3-r1.ebuild index 6d11533e562a..58f3a16f805a 100644 --- a/dev-libs/libchewing/libchewing-0.3.3-r1.ebuild +++ b/dev-libs/libchewing/libchewing-0.3.3-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libchewing/libchewing-0.3.3-r1.ebuild,v 1.1 2014/10/26 11:37:50 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libchewing/libchewing-0.3.3-r1.ebuild,v 1.2 2015/04/19 11:41:03 blueness Exp $ EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="http://chewing.csie.net/download/libchewing/${P}.tar.bz2" SLOT="0" LICENSE="GPL-2" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="static-libs test" DEPEND=" diff --git a/dev-libs/libchewing/libchewing-0.3.3.ebuild b/dev-libs/libchewing/libchewing-0.3.3.ebuild index 03ad07ae8fb6..b3b646120e42 100644 --- a/dev-libs/libchewing/libchewing-0.3.3.ebuild +++ b/dev-libs/libchewing/libchewing-0.3.3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libchewing/libchewing-0.3.3.ebuild,v 1.6 2012/10/04 22:35:30 naota Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libchewing/libchewing-0.3.3.ebuild,v 1.7 2015/04/19 11:41:03 blueness Exp $ EAPI=3 @@ -12,7 +12,7 @@ SRC_URI="http://chewing.csie.net/download/libchewing/${P}.tar.bz2" SLOT="0" LICENSE="GPL-2" -KEYWORDS="amd64 ppc x86" +KEYWORDS="amd64 ppc ~ppc64 x86" IUSE="debug test static-libs" RDEPEND="" diff --git a/dev-libs/libchewing/libchewing-0.4.0-r1.ebuild b/dev-libs/libchewing/libchewing-0.4.0-r1.ebuild index 80ff90ff2f1d..ee5286975637 100644 --- a/dev-libs/libchewing/libchewing-0.4.0-r1.ebuild +++ b/dev-libs/libchewing/libchewing-0.4.0-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libchewing/libchewing-0.4.0-r1.ebuild,v 1.2 2014/12/04 22:33:02 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libchewing/libchewing-0.4.0-r1.ebuild,v 1.3 2015/04/19 11:41:03 blueness Exp $ EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="https://github.com/chewing/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" SLOT="0" LICENSE="GPL-2" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="static-libs test" DEPEND=" diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-12.10.2-gtk2-signal-fix.patch b/dev-libs/libdbusmenu/files/libdbusmenu-12.10.2-gtk2-signal-fix.patch new file mode 100644 index 000000000000..6d270f1370bf --- /dev/null +++ b/dev-libs/libdbusmenu/files/libdbusmenu-12.10.2-gtk2-signal-fix.patch @@ -0,0 +1,36 @@ +=== modified file 'libdbusmenu-gtk/parser.c' +--- libdbusmenu-gtk/parser.c 2013-06-18 19:59:44 +0000 ++++ libdbusmenu-gtk/parser.c 2013-11-03 02:46:23 +0000 +@@ -97,9 +97,7 @@ + gpointer data); + static void item_inserted_cb (GtkContainer * menu, + GtkWidget * widget, +-#ifdef HAVE_GTK3 + gint position, +-#endif + gpointer data); + static void item_removed_cb (GtkContainer * menu, + GtkWidget * widget, +@@ -431,11 +429,7 @@ + + pdata->shell = menu; + pdata->item_inserted_handler_id = g_signal_connect (G_OBJECT (menu), +-#ifdef HAVE_GTK3 + "insert", +-#else +- "child-added", +-#endif + G_CALLBACK (item_inserted_cb), + mi); + pdata->item_removed_handler_id = g_signal_connect (G_OBJECT (menu), +@@ -1394,9 +1388,7 @@ + static void + item_inserted_cb (GtkContainer *menu, + GtkWidget *widget, +-#ifdef HAVE_GTK3 + gint position, +-#endif + gpointer data) + { + DbusmenuMenuitem *menuitem = (DbusmenuMenuitem *)data; + diff --git a/dev-libs/libdbusmenu/libdbusmenu-12.10.2-r2.ebuild b/dev-libs/libdbusmenu/libdbusmenu-12.10.2-r2.ebuild new file mode 100644 index 000000000000..68ff88ccfa7a --- /dev/null +++ b/dev-libs/libdbusmenu/libdbusmenu-12.10.2-r2.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu/libdbusmenu-12.10.2-r2.ebuild,v 1.1 2015/04/19 16:30:45 mgorny Exp $ + +EAPI=5 + +VALA_MIN_API_VERSION=0.16 +VALA_USE_DEPEND=vapigen +PYTHON_COMPAT=( python2_7 ) + +inherit eutils flag-o-matic multilib-minimal python-single-r1 vala + +DESCRIPTION="Library to pass menu structure across DBus" +HOMEPAGE="http://launchpad.net/dbusmenu" +SRC_URI="http://launchpad.net/${PN/lib}/${PV%.*}/${PV}/+download/${P}.tar.gz" + +LICENSE="LGPL-2.1 LGPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="debug gtk gtk3 +introspection" + +RDEPEND=" + >=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}] + >=dev-libs/json-glib-0.13.4[${MULTILIB_USEDEP}] + >=dev-libs/glib-2.32[${MULTILIB_USEDEP}] + dev-libs/libxml2[${MULTILIB_USEDEP}] + gtk? ( x11-libs/gtk+:2[introspection?,${MULTILIB_USEDEP}] ) + gtk3? ( >=x11-libs/gtk+-3.2:3[introspection?,${MULTILIB_USEDEP}] ) + introspection? ( >=dev-libs/gobject-introspection-1 ) + !<${CATEGORY}/${PN}-0.5.1-r200" +DEPEND="${RDEPEND} + app-text/gnome-doc-utils + dev-util/intltool + virtual/pkgconfig[${MULTILIB_USEDEP}] + introspection? ( $(vala_depend) )" + +src_prepare() { + if use introspection; then + vala_src_prepare + export VALA_API_GEN="${VAPIGEN}" + fi + python_fix_shebang tools + + # remove reliance on custom Ubuntu hacks in old GTK+2 + epatch "${FILESDIR}/${P}-gtk2-signal-fix.patch" + epatch_user +} + +multilib_src_configure() { + append-flags -Wno-error #414323 + + local myconf=( + --disable-gtk + --disable-static + --disable-silent-rules + --disable-scrollkeeper + # dumper extra tool is only for GTK+-2.x, tests use valgrind which is stupid + --disable-dumper + $(multilib_native_use_enable introspection) + $(multilib_native_use_enable introspection vala) + $(use_enable debug massivedebugging) + ) + local ECONF_SOURCE=${S} + econf "${myconf[@]}" + + GTK_VARIANTS=( $(usex gtk 2 '') $(usex gtk3 3 '') ) + local MULTIBUILD_VARIANTS=( "${GTK_VARIANTS[@]}" ) + local top_builddir=${BUILD_DIR} + + gtk_configure() { + local gtkconf=( + "${myconf[@]}" + --enable-gtk + --with-gtk="${MULTIBUILD_VARIANT}" + ) + mkdir -p "${BUILD_DIR}" || die + cd "${BUILD_DIR}" || die + econf "${gtkconf[@]}" + + rm -r libdbusmenu-glib || die + ln -s "${top_builddir}"/libdbusmenu-glib libdbusmenu-glib || die + } + [[ ${GTK_VARIANTS[@]} ]] && multibuild_foreach_variant gtk_configure +} + +gtk_emake() { + emake -C "${BUILD_DIR}"/libdbusmenu-gtk "${@}" + multilib_is_native_abi && \ + emake -C "${BUILD_DIR}"/docs/libdbusmenu-gtk "${@}" +} + +multilib_src_compile() { + emake + + local MULTIBUILD_VARIANTS=( "${GTK_VARIANTS[@]}" ) + [[ ${GTK_VARIANTS[@]} ]] && multibuild_foreach_variant \ + gtk_emake +} + +src_test() { :; } #440192 + +multilib_src_install() { + emake -j1 DESTDIR="${D}" install + + local MULTIBUILD_VARIANTS=( "${GTK_VARIANTS[@]}" ) + [[ ${GTK_VARIANTS[@]} ]] && multibuild_foreach_variant \ + gtk_emake -j1 install DESTDIR="${D}" +} + +multilib_src_install_all() { + einstalldocs + prune_libtool_files +} + +pkg_preinst() { + # kill old symlinks that Portage will preserve and break install + if [[ -L ${EROOT}/usr/share/gtk-doc/html/libdbusmenu-glib ]]; then + rm -v "${EROOT}/usr/share/gtk-doc/html/libdbusmenu-glib" || die + fi + if [[ -L ${EROOT}/usr/share/gtk-doc/html/libdbusmenu-gtk ]]; then + rm -v "${EROOT}/usr/share/gtk-doc/html/libdbusmenu-gtk" || die + fi +} diff --git a/dev-libs/libdbusmenu/metadata.xml b/dev-libs/libdbusmenu/metadata.xml index 9c2c8cfc52a2..6286860fb948 100644 --- a/dev-libs/libdbusmenu/metadata.xml +++ b/dev-libs/libdbusmenu/metadata.xml @@ -7,6 +7,7 @@ ayatana-bugs@gentoo.org + Enable support for GTK+2 Enable support for GTK+3 Use dev-libs/gobject-introspection for introspection diff --git a/dev-libs/libgcrypt/libgcrypt-1.5.4-r1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.5.4-r1.ebuild index 3017e0c9e9ed..866d506cd0a4 100644 --- a/dev-libs/libgcrypt/libgcrypt-1.5.4-r1.ebuild +++ b/dev-libs/libgcrypt/libgcrypt-1.5.4-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.5.4-r1.ebuild,v 1.7 2015/03/02 09:20:38 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.5.4-r1.ebuild,v 1.8 2015/04/19 16:06:08 jmorgan Exp $ EAPI=5 AUTOTOOLS_AUTORECONF=1 @@ -13,7 +13,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" LICENSE="LGPL-2.1 MIT" SLOT="0/11" # subslot = soname major version -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static-libs" RDEPEND=">=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}] diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest index 6f113d3bf50d..5935e1f717cd 100644 --- a/dev-libs/libgpg-error/Manifest +++ b/dev-libs/libgpg-error/Manifest @@ -1,5 +1,4 @@ DIST libgpg-error-1.12.tar.bz2 489266 SHA256 cafc9ed6a87c53a35175d5a1220a96ca386696eef2fa059cc0306211f246e55f SHA512 eff9ee101e8b48cab635ef22bb5546947e85a8e267cc87260166fb36793d983943a951bfe92dd5d87381d6eb2b9ff5315286db20c06de29aa6dd6e95533a0c14 WHIRLPOOL 006133cfd65d1cab188d964e74c3c1c806d8983b8aa980bd7cc45c30ebef0b61cecd527b42aec15b761cb56b50f07087023d23c572352f974916e3375c79c8d4 DIST libgpg-error-1.13.tar.bz2 489948 SHA256 f8aba9038d8a46cefe6a6c4a7e4527144c029eb4e3ca1ed27011b962102c9b0a SHA512 db35cff54f12fef121f62bd989147acb8a2bc0711564e7153c1d10c5542e3530d3b3e172210320d312a8438372a099977dc72905e1fcdc29eddfacf8d34998fe WHIRLPOOL 1460d2fe700d33d247090acd400e014162c179ae70f0b9ee432103a52928efe31f0c774da493d7ad468fe165c831e05aacc3959d6dcbf497791673c4959a4e29 -DIST libgpg-error-1.15.tar.bz2 546865 SHA256 b6083d027ca338f2a090ac9539983bc847596d36200f6baf3451f2688209797f SHA512 7ceb654b9690b27ea904861a47eb2da16d68da11f69e150cb413970b3dd756093d1fcf1fabeabb7aadc888bfa03edc64115dbc572a97428ddcf9f0af0c1b210b WHIRLPOOL 2eb3a03d0411db4aa19e77a910960d222aac7837782c599aabf85390d43c0dc78b2a22009411fbaab3df5e837633521ef3ea14cacf8b93c18da84d312b1c00eb -DIST libgpg-error-1.17.tar.bz2 669914 SHA256 3ff4e5a71116eb862cd14185fcd282850927b8608e3b4186834fd940fbef57b5 SHA512 44f3a708f2022a2baa3b9dce181cf508e15fcd92f73769e1d61a6c29ec1b92e16e29546a568368367006e809bf6ef23f9ef87ea84f0837518108c4fed121ea2b WHIRLPOOL 690f8aac758eda9b088cbd29c9aa513d6f3e557fb42c4d66514c9a16d31f94ad847adce44de7b27b2e3fdbd5a9ec67154e5e7746c25bd3b8d5712a2d75faf530 DIST libgpg-error-1.18.tar.bz2 718070 SHA256 9ff1d6e61d4cef7c1d0607ceef6d40dc33f3da7a3094170c3718c00153d80810 SHA512 0b434361b134af4d535f34879425ef1c8102da27ebeb307abc73371f4fc5e3636aaf89f7903f79a1019a8a29b866907bb15cc02c11bbcd589b339909fe80760d WHIRLPOOL f70138d2f236204afdbfa869c91fd24046432071e9cb1586fee69b2cde45aefb06569da148668a0d0ed7affd7820e88a96f7f4f858e5dadf60f7fe3b624e83fd +DIST libgpg-error-1.19.tar.bz2 761622 SHA256 53120e1333d5c5d28d87ff2854e9e98719c8e214152f17ad5291704d25c4978b SHA512 24ac1799260611f6fe3d0931fbb735f6e7e9d3a794190fba71c71d0324230f635655db96db134a1ddf56ea9c46654feb4ea2649c31e6ee31c9fd1ca41e86b56b WHIRLPOOL 479dbb813d5ff20fa232ece85a6321dd7daccb961851ef39fdc9d21a4f3250a4edc7c9e350bd880203bf7fa3b651ca9d9a862a7306c8f834c8879c8661fee2a5 diff --git a/dev-libs/libgpg-error/libgpg-error-1.15.ebuild b/dev-libs/libgpg-error/libgpg-error-1.15.ebuild deleted file mode 100644 index e1e30a9809be..000000000000 --- a/dev-libs/libgpg-error/libgpg-error-1.15.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgpg-error/libgpg-error-1.15.ebuild,v 1.2 2014/10/20 22:12:21 alonbl Exp $ - -EAPI=5 - -inherit eutils libtool multilib-minimal toolchain-funcs - -DESCRIPTION="Contains error handling functions used by GnuPG software" -HOMEPAGE="http://www.gnupg.org/related_software/libgpg-error" -SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2 LGPL-2.1" -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 ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="common-lisp nls static-libs" - -RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] ) - abi_x86_32? ( - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - !<=app-emulation/emul-linux-x86-baselibs-20131008-r12 - )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/gpg-error-config -) -MULTILIB_WRAPPED_HEADERS=( - /usr/include/gpg-error.h -) - -src_prepare() { - epatch_user - elibtoolize -} - -multilib_src_configure() { - local myeconfargs=( - CC_FOR_BUILD=$(tc-getBUILD_CC) - $(use_enable nls) - $(use_enable static-libs static) - $(use_enable common-lisp languages) - ) - - multilib_is_native_abi || myeconfargs+=( - --disable-languages - ) - - ECONF_SOURCE=${S} \ - econf "${myeconfargs[@]}" -} - -multilib_src_install_all() { - einstalldocs - - # library has no dependencies, so it does not need the .la file - prune_libtool_files --all -} diff --git a/dev-libs/libgpg-error/libgpg-error-1.17.ebuild b/dev-libs/libgpg-error/libgpg-error-1.19.ebuild similarity index 94% rename from dev-libs/libgpg-error/libgpg-error-1.17.ebuild rename to dev-libs/libgpg-error/libgpg-error-1.19.ebuild index 38bced52eba7..9348215c9560 100644 --- a/dev-libs/libgpg-error/libgpg-error-1.17.ebuild +++ b/dev-libs/libgpg-error/libgpg-error-1.19.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgpg-error/libgpg-error-1.17.ebuild,v 1.1 2014/11/24 15:37:30 k_f Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgpg-error/libgpg-error-1.19.ebuild,v 1.1 2015/04/19 17:05:02 k_f Exp $ EAPI=5 diff --git a/dev-libs/libgweather/Manifest b/dev-libs/libgweather/Manifest index cb71e744469e..8039b83c6186 100644 --- a/dev-libs/libgweather/Manifest +++ b/dev-libs/libgweather/Manifest @@ -1,3 +1,3 @@ DIST libgweather-3.12.3.tar.xz 3982352 SHA256 89f65b1ffb84775c2d73e8daa67dd97f930afe73bae57985ade1e9e37019b435 SHA512 30b0bf57a3ddc090156f3abacd19168f1a3e4eb661e4113eac15f5acb231eb369187806ec6b61518e330b5185d4d9269f5421be056d7502fa700a4379bd9294f WHIRLPOOL 181f51c2a4cafb69ccc7ace69ecff8c61dd9c98de4c1acddc3c460c561f3ee6289dbd9f13f51da7eb3e57bc9122723bdec14cd5acfea0cf1df6ead4bf7a84a95 -DIST libgweather-3.14.2.tar.xz 3543696 SHA256 aa0d03132fc6c446cf549df1d91e319e1abcc676f1d9f8bc1dc01f033dcff493 SHA512 ae488bfbe46b95ab874767a9d604f28307cc5138c58080b9aa7d7bf2c29abf3c0a285772a4681b5c1227176735c890a7f27ce9c46e6adf1fb308ebefc33d1a96 WHIRLPOOL 3bea7e42d93917fbbad8ee0d5b3664fc04113e02b7d1dc0610ebd5e66aebfad992db1fda5c0aea59e66915efadc114da86e40fc6b44ae99a4bcef1a624f1ba2c DIST libgweather-3.14.3.tar.xz 3467744 SHA256 04dd25064cdc7715c1bf5fc476c8596d640cbcb3551217867195cef16bbbbf6b SHA512 f6e82c1a1b26ccaf0f6feb533147ac4108210096a7462ec394aa4174d772ad74c92ecae16450875a5c965ee17c0d041bee25de98a6ee8b842091adb426bd1d01 WHIRLPOOL bdf76e024bd0d7d71f60d162f7cee5e8b407bff318a71e28112c2ee5b68c66c726eb1b9484c3e033b7f3c7d1b515dad3b5c91c1de53d8d10e2cef26e1cd9f66d +DIST libgweather-3.14.4.tar.xz 3471124 SHA256 e65555079fce545082ba2231ae9fdeb8ff1716286f36d86806834ab8b1274b18 SHA512 d72d2c1b0abf3a2a12f54d7f8d62dc6e3eda3cdf03012afb22b28ac751fe7a64811656ed82197212e55366547702e0e3e8d3984037c68b7bce036bd1a75c3366 WHIRLPOOL 5d6e977d31e74caa83b9de1d2ebc966f2d89f957e0768aa38735bf3c8e83fe407524c161374a00eba5dd446c3514c6cb785ca209b1884c09283c5e329f7c8557 diff --git a/dev-libs/libgweather/libgweather-3.14.2.ebuild b/dev-libs/libgweather/libgweather-3.14.4.ebuild similarity index 93% rename from dev-libs/libgweather/libgweather-3.14.2.ebuild rename to dev-libs/libgweather/libgweather-3.14.4.ebuild index 90f2f76afed2..96c369583ebd 100644 --- a/dev-libs/libgweather/libgweather-3.14.2.ebuild +++ b/dev-libs/libgweather/libgweather-3.14.4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgweather/libgweather-3.14.2.ebuild,v 1.1 2014/12/22 18:10:18 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgweather/libgweather-3.14.4.ebuild,v 1.1 2015/04/19 15:56:55 eva Exp $ EAPI="5" GCONF_DEBUG="no" diff --git a/dev-libs/libmba/libmba-0.9.1-r2.ebuild b/dev-libs/libmba/libmba-0.9.1-r2.ebuild deleted file mode 100644 index 9bf7eb66c956..000000000000 --- a/dev-libs/libmba/libmba-0.9.1-r2.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmba/libmba-0.9.1-r2.ebuild,v 1.1 2014/12/22 07:49:49 jer Exp $ - -EAPI=5 -inherit eutils multilib toolchain-funcs - -DESCRIPTION="A library of generic C modules" -LICENSE="MIT" -HOMEPAGE="http://www.ioplex.com/~miallen/libmba/" -SRC_URI="${HOMEPAGE}dl/${P}.tar.gz" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="static-libs" - -src_prepare() { - use static-libs && export STATIC="1" - epatch "${FILESDIR}"/${P}-qa.patch - - tc-export CC - sed -i -e "s:gcc:${CC}:g" mktool.c || die -} - -src_compile() { - emake LIBDIR="$(get_libdir)" -} - -src_install() { - emake DESTDIR="${D}" LIBDIR="$(get_libdir)" install - - dodoc README.txt docs/*.txt - dohtml -r docs/*.html docs/www/* docs/ref - - insinto /usr/share/doc/${PF}/examples - doins examples/* -} diff --git a/dev-libs/libmba/libmba-0.9.1-r3.ebuild b/dev-libs/libmba/libmba-0.9.1-r3.ebuild index 94741f72439c..203a7ccc74b2 100644 --- a/dev-libs/libmba/libmba-0.9.1-r3.ebuild +++ b/dev-libs/libmba/libmba-0.9.1-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmba/libmba-0.9.1-r3.ebuild,v 1.1 2015/01/07 10:28:50 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmba/libmba-0.9.1-r3.ebuild,v 1.3 2015/04/19 09:32:19 ago Exp $ EAPI=5 inherit eutils flag-o-matic multilib toolchain-funcs @@ -10,7 +10,7 @@ LICENSE="MIT" HOMEPAGE="http://www.ioplex.com/~miallen/libmba/" SRC_URI="${HOMEPAGE}dl/${P}.tar.gz" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="static-libs" src_prepare() { diff --git a/dev-libs/libtommath/Manifest b/dev-libs/libtommath/Manifest index 31f3756a9a92..741f0885a748 100644 --- a/dev-libs/libtommath/Manifest +++ b/dev-libs/libtommath/Manifest @@ -1 +1 @@ -DIST v0.42.0.tar.gz 1732144 SHA256 5246356ba18c1b6edf4a7bc836a3d223842b86914cdba6dd8c112bfc59e227c8 SHA512 d26e7737e5750530a7b96432502f0d458931e67af528872c46ad8dfc921b8f6ef4b3e05cb07d22bd13a8b24db65812928ae4c381250a4df95f6ca55efc3dae23 WHIRLPOOL beab5007a204042fd0a5b86ccc639ee37d82bb4afe2ceebcfe062deffaa259c8a699c81a52e804c2a79cb36914d805c81826a6e456523f729063240d1bfca9e6 +DIST libtommath-0.42.0.tar.gz 1732144 SHA256 5246356ba18c1b6edf4a7bc836a3d223842b86914cdba6dd8c112bfc59e227c8 SHA512 d26e7737e5750530a7b96432502f0d458931e67af528872c46ad8dfc921b8f6ef4b3e05cb07d22bd13a8b24db65812928ae4c381250a4df95f6ca55efc3dae23 WHIRLPOOL beab5007a204042fd0a5b86ccc639ee37d82bb4afe2ceebcfe062deffaa259c8a699c81a52e804c2a79cb36914d805c81826a6e456523f729063240d1bfca9e6 diff --git a/dev-libs/libtommath/libtommath-0.42.0-r1.ebuild b/dev-libs/libtommath/libtommath-0.42.0-r1.ebuild index 91a9b9788939..d4632aaaa1e5 100644 --- a/dev-libs/libtommath/libtommath-0.42.0-r1.ebuild +++ b/dev-libs/libtommath/libtommath-0.42.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtommath/libtommath-0.42.0-r1.ebuild,v 1.20 2015/02/17 01:30:59 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtommath/libtommath-0.42.0-r1.ebuild,v 1.21 2015/04/18 13:03:10 swegener Exp $ EAPI=4 @@ -8,7 +8,7 @@ inherit autotools eutils multilib toolchain-funcs DESCRIPTION="highly optimized and portable routines for integer based number theoretic applications" HOMEPAGE="https://github.com/libtom/libtommath" -SRC_URI="https://github.com/libtom/libtommath/archive/v${PV}.tar.gz" +SRC_URI="https://github.com/libtom/libtommath/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="WTFPL-2" SLOT="0" diff --git a/dev-libs/libxdg-basedir/Manifest b/dev-libs/libxdg-basedir/Manifest index d5148a905594..1db142556d0b 100644 --- a/dev-libs/libxdg-basedir/Manifest +++ b/dev-libs/libxdg-basedir/Manifest @@ -1,2 +1 @@ -DIST libxdg-basedir-1.1.1.tar.gz 316118 SHA256 2855b44619dc8d43ba7df995e538bf383f53b4276a26c7c26b7ec03c7b9be0ac SHA512 ece0c75ed1dee652ddc40e4262662dd89ff3365c015752b053cf89b42c4c4898d427128ac7883d80e595c6278c5a2c372ae83be80e503142de21c112872d6cc8 WHIRLPOOL 140f8684047bb0eb77e4ecb18ac969100abc98dbf55abe0f0abb4607f5a39a1fab018cda959321d9d587150f3e75c651d273f34db72bf252b5d386e7459d753c DIST libxdg-basedir-1.2.0.tar.gz 30159 SHA256 1c2b0032a539033313b5be2e48ddd0ae94c84faf21d93956d53562eef4614868 SHA512 8584405d45e0b57e570666b6eab6d99d70411d00f88965826c9ed0292372385668f190157a10ff536f3a5a59fd0031b332ecbb8a38ac64eda1b04a0603997406 WHIRLPOOL f8898e0063d8d9f99eb569a5f1fba81e4143a9c7b8c095f54b13a3960bdd297c57f5b534469166d52c5c7c03fe55bc8f8b246ec3c966f62507b220e8b4ad6d24 diff --git a/dev-libs/libxdg-basedir/libxdg-basedir-1.1.1.ebuild b/dev-libs/libxdg-basedir/libxdg-basedir-1.1.1.ebuild deleted file mode 100644 index 15b3c32a3360..000000000000 --- a/dev-libs/libxdg-basedir/libxdg-basedir-1.1.1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxdg-basedir/libxdg-basedir-1.1.1.ebuild,v 1.13 2014/01/25 03:55:12 creffett Exp $ - -EAPI=5 -inherit libtool - -DESCRIPTION="Small library to access XDG Base Directories Specification paths" -HOMEPAGE="http://n.ethz.ch/student/nevillm/download/libxdg-basedir/" -SRC_URI="http://n.ethz.ch/student/nevillm/download/libxdg-basedir/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-solaris" -IUSE="doc static-libs" - -RDEPEND="" -DEPEND="doc? ( app-doc/doxygen )" - -src_prepare() { - elibtoolize -} - -src_configure() { - econf \ - --disable-dependency-tracking \ - $(use_enable static-libs static) \ - $(use_enable doc doxygen-html) -} - -src_compile() { - emake || die - - if use doc; then - emake doxygen-doc - fi -} - -src_install() { - emake DESTDIR="${D}" install - - if use doc; then - dohtml -r doc/html/* - fi - - find "${D}" -name '*.la' -delete -} diff --git a/dev-libs/libxml2/files/libxml2-2.9.2-constant-memory.patch b/dev-libs/libxml2/files/libxml2-2.9.2-constant-memory.patch new file mode 100644 index 000000000000..dc944b6353ea --- /dev/null +++ b/dev-libs/libxml2/files/libxml2-2.9.2-constant-memory.patch @@ -0,0 +1,176 @@ +From 213f1fe0d76d30eaed6e5853057defc43e6df2c9 Mon Sep 17 00:00:00 2001 +From: Daniel Veillard +Date: Tue, 14 Apr 2015 17:41:48 +0800 +Subject: [PATCH] CVE-2015-1819 Enforce the reader to run in constant memory + +One of the operation on the reader could resolve entities +leading to the classic expansion issue. Make sure the +buffer used for xmlreader operation is bounded. +Introduce a new allocation type for the buffers for this effect. +--- + buf.c | 43 ++++++++++++++++++++++++++++++++++++++++++- + include/libxml/tree.h | 3 ++- + xmlreader.c | 20 +++++++++++++++++++- + 3 files changed, 63 insertions(+), 3 deletions(-) + +diff --git a/buf.c b/buf.c +index 6efc7b6..07922ff 100644 +--- a/buf.c ++++ b/buf.c +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include /* for XML_MAX_TEXT_LENGTH */ + #include "buf.h" + + #define WITH_BUFFER_COMPAT +@@ -299,7 +300,8 @@ xmlBufSetAllocationScheme(xmlBufPtr buf, + if ((scheme == XML_BUFFER_ALLOC_DOUBLEIT) || + (scheme == XML_BUFFER_ALLOC_EXACT) || + (scheme == XML_BUFFER_ALLOC_HYBRID) || +- (scheme == XML_BUFFER_ALLOC_IMMUTABLE)) { ++ (scheme == XML_BUFFER_ALLOC_IMMUTABLE) || ++ (scheme == XML_BUFFER_ALLOC_BOUNDED)) { + buf->alloc = scheme; + if (buf->buffer) + buf->buffer->alloc = scheme; +@@ -458,6 +460,18 @@ xmlBufGrowInternal(xmlBufPtr buf, size_t len) { + size = buf->use + len + 100; + #endif + ++ if (buf->alloc == XML_BUFFER_ALLOC_BOUNDED) { ++ /* ++ * Used to provide parsing limits ++ */ ++ if ((buf->use + len >= XML_MAX_TEXT_LENGTH) || ++ (buf->size >= XML_MAX_TEXT_LENGTH)) { ++ xmlBufMemoryError(buf, "buffer error: text too long\n"); ++ return(0); ++ } ++ if (size >= XML_MAX_TEXT_LENGTH) ++ size = XML_MAX_TEXT_LENGTH; ++ } + if ((buf->alloc == XML_BUFFER_ALLOC_IO) && (buf->contentIO != NULL)) { + size_t start_buf = buf->content - buf->contentIO; + +@@ -739,6 +753,15 @@ xmlBufResize(xmlBufPtr buf, size_t size) + CHECK_COMPAT(buf) + + if (buf->alloc == XML_BUFFER_ALLOC_IMMUTABLE) return(0); ++ if (buf->alloc == XML_BUFFER_ALLOC_BOUNDED) { ++ /* ++ * Used to provide parsing limits ++ */ ++ if (size >= XML_MAX_TEXT_LENGTH) { ++ xmlBufMemoryError(buf, "buffer error: text too long\n"); ++ return(0); ++ } ++ } + + /* Don't resize if we don't have to */ + if (size < buf->size) +@@ -867,6 +890,15 @@ xmlBufAdd(xmlBufPtr buf, const xmlChar *str, int len) { + + needSize = buf->use + len + 2; + if (needSize > buf->size){ ++ if (buf->alloc == XML_BUFFER_ALLOC_BOUNDED) { ++ /* ++ * Used to provide parsing limits ++ */ ++ if (needSize >= XML_MAX_TEXT_LENGTH) { ++ xmlBufMemoryError(buf, "buffer error: text too long\n"); ++ return(-1); ++ } ++ } + if (!xmlBufResize(buf, needSize)){ + xmlBufMemoryError(buf, "growing buffer"); + return XML_ERR_NO_MEMORY; +@@ -938,6 +970,15 @@ xmlBufAddHead(xmlBufPtr buf, const xmlChar *str, int len) { + } + needSize = buf->use + len + 2; + if (needSize > buf->size){ ++ if (buf->alloc == XML_BUFFER_ALLOC_BOUNDED) { ++ /* ++ * Used to provide parsing limits ++ */ ++ if (needSize >= XML_MAX_TEXT_LENGTH) { ++ xmlBufMemoryError(buf, "buffer error: text too long\n"); ++ return(-1); ++ } ++ } + if (!xmlBufResize(buf, needSize)){ + xmlBufMemoryError(buf, "growing buffer"); + return XML_ERR_NO_MEMORY; +diff --git a/include/libxml/tree.h b/include/libxml/tree.h +index 2f90717..4a9b3bc 100644 +--- a/include/libxml/tree.h ++++ b/include/libxml/tree.h +@@ -76,7 +76,8 @@ typedef enum { + XML_BUFFER_ALLOC_EXACT, /* grow only to the minimal size */ + XML_BUFFER_ALLOC_IMMUTABLE, /* immutable buffer */ + XML_BUFFER_ALLOC_IO, /* special allocation scheme used for I/O */ +- XML_BUFFER_ALLOC_HYBRID /* exact up to a threshold, and doubleit thereafter */ ++ XML_BUFFER_ALLOC_HYBRID, /* exact up to a threshold, and doubleit thereafter */ ++ XML_BUFFER_ALLOC_BOUNDED /* limit the upper size of the buffer */ + } xmlBufferAllocationScheme; + + /** +diff --git a/xmlreader.c b/xmlreader.c +index f19e123..471e7e2 100644 +--- a/xmlreader.c ++++ b/xmlreader.c +@@ -2091,6 +2091,9 @@ xmlNewTextReader(xmlParserInputBufferPtr input, const char *URI) { + "xmlNewTextReader : malloc failed\n"); + return(NULL); + } ++ /* no operation on a reader should require a huge buffer */ ++ xmlBufSetAllocationScheme(ret->buffer, ++ XML_BUFFER_ALLOC_BOUNDED); + ret->sax = (xmlSAXHandler *) xmlMalloc(sizeof(xmlSAXHandler)); + if (ret->sax == NULL) { + xmlBufFree(ret->buffer); +@@ -3616,6 +3619,7 @@ xmlTextReaderConstValue(xmlTextReaderPtr reader) { + return(((xmlNsPtr) node)->href); + case XML_ATTRIBUTE_NODE:{ + xmlAttrPtr attr = (xmlAttrPtr) node; ++ const xmlChar *ret; + + if ((attr->children != NULL) && + (attr->children->type == XML_TEXT_NODE) && +@@ -3629,10 +3633,21 @@ xmlTextReaderConstValue(xmlTextReaderPtr reader) { + "xmlTextReaderSetup : malloc failed\n"); + return (NULL); + } ++ xmlBufSetAllocationScheme(reader->buffer, ++ XML_BUFFER_ALLOC_BOUNDED); + } else + xmlBufEmpty(reader->buffer); + xmlBufGetNodeContent(reader->buffer, node); +- return(xmlBufContent(reader->buffer)); ++ ret = xmlBufContent(reader->buffer); ++ if (ret == NULL) { ++ /* error on the buffer best to reallocate */ ++ xmlBufFree(reader->buffer); ++ reader->buffer = xmlBufCreateSize(100); ++ xmlBufSetAllocationScheme(reader->buffer, ++ XML_BUFFER_ALLOC_BOUNDED); ++ ret = BAD_CAST ""; ++ } ++ return(ret); + } + break; + } +@@ -5131,6 +5146,9 @@ xmlTextReaderSetup(xmlTextReaderPtr reader, + "xmlTextReaderSetup : malloc failed\n"); + return (-1); + } ++ /* no operation on a reader should require a huge buffer */ ++ xmlBufSetAllocationScheme(reader->buffer, ++ XML_BUFFER_ALLOC_BOUNDED); + if (reader->sax == NULL) + reader->sax = (xmlSAXHandler *) xmlMalloc(sizeof(xmlSAXHandler)); + if (reader->sax == NULL) { +-- +2.3.5 + diff --git a/dev-libs/libxml2/files/libxml2-2.9.2-missing-entities.patch b/dev-libs/libxml2/files/libxml2-2.9.2-missing-entities.patch new file mode 100644 index 000000000000..7a10e206ad82 --- /dev/null +++ b/dev-libs/libxml2/files/libxml2-2.9.2-missing-entities.patch @@ -0,0 +1,31 @@ +From 72a46a519ce7326d9a00f0b6a7f2a8e958cd1675 Mon Sep 17 00:00:00 2001 +From: Daniel Veillard +Date: Thu, 23 Oct 2014 11:35:36 +0800 +Subject: [PATCH] Fix missing entities after CVE-2014-3660 fix + +For https://bugzilla.gnome.org/show_bug.cgi?id=738805 + +The fix for CVE-2014-3660 introduced a regression in some case +where entity substitution is required and the entity is used +first in anotther entity referenced from an attribute value +--- + parser.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/parser.c b/parser.c +index 67c9dfd..a8d1b67 100644 +--- a/parser.c ++++ b/parser.c +@@ -7235,7 +7235,8 @@ xmlParseReference(xmlParserCtxtPtr ctxt) { + * far more secure as the parser will only process data coming from + * the document entity by default. + */ +- if ((ent->checked == 0) && ++ if (((ent->checked == 0) || ++ ((ent->children == NULL) && (ctxt->options & XML_PARSE_NOENT))) && + ((ent->etype != XML_EXTERNAL_GENERAL_PARSED_ENTITY) || + (ctxt->options & (XML_PARSE_NOENT | XML_PARSE_DTDVALID)))) { + unsigned long oldnbent = ctxt->nbentities; +-- +2.3.5 + diff --git a/dev-libs/libxml2/files/libxml2-2.9.2-threads-declarations.patch b/dev-libs/libxml2/files/libxml2-2.9.2-threads-declarations.patch new file mode 100644 index 000000000000..1236f622d6a4 --- /dev/null +++ b/dev-libs/libxml2/files/libxml2-2.9.2-threads-declarations.patch @@ -0,0 +1,48 @@ +From fff8a6b87e05200a0ad0af6f86c2e859c7de9172 Mon Sep 17 00:00:00 2001 +From: Michael Heimpold +Date: Mon, 22 Dec 2014 11:12:12 +0800 +Subject: [PATCH] threads: use forward declarations only for glibc + +Fixes bug #704908 + +The declarations of pthread functions, used to generate weak references +to them, fail to suppress macros. Thus, if any pthread function has +been provided as a macro, compiling threads.c will fail. +This breaks on musl libc, which defines pthread_equal as a macro (in +addition to providing the function, as required). + +Prevent the declarations for e.g. musl libc by refining the condition. + +The idea for this solution was borrowed from the alpine linux guys, see +http://git.alpinelinux.org/cgit/aports/tree/main/libxml2/libxml2-pthread.patch + +Signed-off-by: Michael Heimpold +--- + threads.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/threads.c b/threads.c +index 8921204..78006a2 100644 +--- a/threads.c ++++ b/threads.c +@@ -47,7 +47,7 @@ + #ifdef HAVE_PTHREAD_H + + static int libxml_is_threaded = -1; +-#ifdef __GNUC__ ++#if defined(__GNUC__) && defined(__GLIBC__) + #ifdef linux + #if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || (__GNUC__ > 3) + extern int pthread_once (pthread_once_t *__once_control, +@@ -89,7 +89,7 @@ extern int pthread_cond_signal () + __attribute((weak)); + #endif + #endif /* linux */ +-#endif /* __GNUC__ */ ++#endif /* defined(__GNUC__) && defined(__GLIBC__) */ + #endif /* HAVE_PTHREAD_H */ + + /* +-- +2.3.5 + diff --git a/dev-libs/libxml2/files/libxml2-2.9.2-timsort.patch b/dev-libs/libxml2/files/libxml2-2.9.2-timsort.patch new file mode 100644 index 000000000000..c179d47ef2db --- /dev/null +++ b/dev-libs/libxml2/files/libxml2-2.9.2-timsort.patch @@ -0,0 +1,128 @@ +From 9b987f8c98763ee569bde90b5268b43474ca106c Mon Sep 17 00:00:00 2001 +From: Christopher Swenson +Date: Fri, 27 Feb 2015 14:55:49 +0800 +Subject: [PATCH] Fix timsort invariant loop re: Envisage article + +See http://envisage-project.eu/proving-android-java-and-python-sorting-algorithm-is-broken-and-how-to-fix-it/ + +We use a "runLen" array of size 128, so it should be nearly impossible +to have our implementation overflow. + +But in any case, the fix is relatively simple -- checking two extra +conditions in the invariant calculation. + +I also took this opportunity to remove some redundancy in the +left/right merge logic in the invariant loop. +--- + timsort.h | 74 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 39 insertions(+), 35 deletions(-) + +diff --git a/timsort.h b/timsort.h +index efa3aab..795f272 100644 +--- a/timsort.h ++++ b/timsort.h +@@ -392,62 +392,66 @@ static void TIM_SORT_MERGE(SORT_TYPE *dst, const TIM_SORT_RUN_T *stack, const in + + static int TIM_SORT_COLLAPSE(SORT_TYPE *dst, TIM_SORT_RUN_T *stack, int stack_curr, TEMP_STORAGE_T *store, const size_t size) + { +- while (1) +- { +- int64_t A, B, C; ++ while (1) { ++ int64_t A, B, C, D; ++ int ABC, BCD, BD, CD; ++ + /* if the stack only has one thing on it, we are done with the collapse */ +- if (stack_curr <= 1) break; ++ if (stack_curr <= 1) { ++ break; ++ } ++ + /* if this is the last merge, just do it */ +- if ((stack_curr == 2) && +- (stack[0].length + stack[1].length == (int64_t) size)) +- { ++ if ((stack_curr == 2) && (stack[0].length + stack[1].length == size)) { + TIM_SORT_MERGE(dst, stack, stack_curr, store); + stack[0].length += stack[1].length; + stack_curr--; + break; + } + /* check if the invariant is off for a stack of 2 elements */ +- else if ((stack_curr == 2) && (stack[0].length <= stack[1].length)) +- { ++ else if ((stack_curr == 2) && (stack[0].length <= stack[1].length)) { + TIM_SORT_MERGE(dst, stack, stack_curr, store); + stack[0].length += stack[1].length; + stack_curr--; + break; +- } +- else if (stack_curr == 2) ++ } else if (stack_curr == 2) { + break; ++ } + +- A = stack[stack_curr - 3].length; +- B = stack[stack_curr - 2].length; +- C = stack[stack_curr - 1].length; ++ B = stack[stack_curr - 3].length; ++ C = stack[stack_curr - 2].length; ++ D = stack[stack_curr - 1].length; + +- /* check first invariant */ +- if (A <= B + C) +- { +- if (A < C) +- { +- TIM_SORT_MERGE(dst, stack, stack_curr - 1, store); +- stack[stack_curr - 3].length += stack[stack_curr - 2].length; +- stack[stack_curr - 2] = stack[stack_curr - 1]; +- stack_curr--; +- } +- else +- { +- TIM_SORT_MERGE(dst, stack, stack_curr, store); +- stack[stack_curr - 2].length += stack[stack_curr - 1].length; +- stack_curr--; +- } ++ if (stack_curr >= 4) { ++ A = stack[stack_curr - 4].length; ++ ABC = (A <= B + C); ++ } else { ++ ABC = 0; + } +- /* check second invariant */ +- else if (B <= C) +- { ++ ++ BCD = (B <= C + D) || ABC; ++ CD = (C <= D); ++ BD = (B < D); ++ ++ /* Both invariants are good */ ++ if (!BCD && !CD) { ++ break; ++ } ++ ++ /* left merge */ ++ if (BCD && !CD) { ++ TIM_SORT_MERGE(dst, stack, stack_curr - 1, store); ++ stack[stack_curr - 3].length += stack[stack_curr - 2].length; ++ stack[stack_curr - 2] = stack[stack_curr - 1]; ++ stack_curr--; ++ } else { ++ /* right merge */ + TIM_SORT_MERGE(dst, stack, stack_curr, store); + stack[stack_curr - 2].length += stack[stack_curr - 1].length; + stack_curr--; + } +- else +- break; + } ++ + return stack_curr; + } + +-- +2.3.5 + diff --git a/dev-libs/libxml2/libxml2-2.9.2-r1.ebuild b/dev-libs/libxml2/libxml2-2.9.2-r1.ebuild new file mode 100644 index 000000000000..9c6add2a4dc2 --- /dev/null +++ b/dev-libs/libxml2/libxml2-2.9.2-r1.ebuild @@ -0,0 +1,212 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.9.2-r1.ebuild,v 1.1 2015/04/19 16:09:17 tetromino Exp $ + +EAPI="5" +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +PYTHON_REQ_USE="xml" + +inherit libtool flag-o-matic eutils python-r1 autotools prefix multilib-minimal + +DESCRIPTION="Version 2 of the library to manipulate XML files" +HOMEPAGE="http://www.xmlsoft.org/" + +LICENSE="MIT" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +IUSE="debug examples icu ipv6 lzma python readline static-libs test" + +XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite" +XSTS_NAME_1="xmlschema2002-01-16" +XSTS_NAME_2="xmlschema2004-01-14" +XSTS_TARBALL_1="xsts-2002-01-16.tar.gz" +XSTS_TARBALL_2="xsts-2004-01-14.tar.gz" +XMLCONF_TARBALL="xmlts20080827.tar.gz" + +SRC_URI="ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz + test? ( + ${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1} + ${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2} + http://www.w3.org/XML/Test/${XMLCONF_TARBALL} )" + +COMMON_DEPEND=" + >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] + icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] ) + lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] ) + python? ( ${PYTHON_DEPS} ) + readline? ( sys-libs/readline:= ) +" +RDEPEND="${COMMON_DEPEND} + abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r6 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) +" +DEPEND="${COMMON_DEPEND} + dev-util/gtk-doc-am + virtual/pkgconfig + hppa? ( >=sys-devel/binutils-2.15.92.0.2 ) +" + +S="${WORKDIR}/${PN}-${PV%_rc*}" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/xml2-config +) + +src_unpack() { + # ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR, + # as they are needed as tarballs in ${S}/xstc instead and not unpacked + unpack ${P/_rc/-rc}.tar.gz + cd "${S}" + + if use test; then + cp "${DISTDIR}/${XSTS_TARBALL_1}" \ + "${DISTDIR}/${XSTS_TARBALL_2}" \ + "${S}"/xstc/ \ + || die "Failed to install test tarballs" + unpack ${XMLCONF_TARBALL} + fi +} + +src_prepare() { + DOCS=( AUTHORS ChangeLog NEWS README* TODO* ) + + # Patches needed for prefix support + epatch "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch + epatch "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch + + eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c + +# epunt_cxx # if we don't eautoreconf + + # Important patches from master + epatch \ + "${FILESDIR}/${PN}-2.9.2-revert-missing-initialization.patch" \ + "${FILESDIR}/${PN}-2.9.2-missing-entities.patch" \ + "${FILESDIR}/${PN}-2.9.2-threads-declarations.patch" \ + "${FILESDIR}/${PN}-2.9.2-timsort.patch" \ + "${FILESDIR}/${PN}-2.9.2-constant-memory.patch" + + # Please do not remove, as else we get references to PORTAGE_TMPDIR + # in /usr/lib/python?.?/site-packages/libxml2mod.la among things. + # We now need to run eautoreconf at the end to prevent maintainer mode. +# elibtoolize + + # Use pkgconfig to find icu to properly support multilib, upstream bug #738751 + epatch "${FILESDIR}/${PN}-2.9.2-icu-pkgconfig.patch" + + eautoreconf +} + +multilib_src_configure() { + # filter seemingly problematic CFLAGS (#26320) + filter-flags -fprefetch-loop-arrays -funroll-loops + + # USE zlib support breaks gnome2 + # (libgnomeprint for instance fails to compile with + # fresh install, and existing) - (22 Dec 2002). + + # The meaning of the 'debug' USE flag does not apply to the --with-debug + # switch (enabling the libxml2 debug module). See bug #100898. + + # --with-mem-debug causes unusual segmentation faults (bug #105120). + + libxml2_configure() { + ECONF_SOURCE="${S}" econf \ + --with-html-subdir=${PF}/html \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + $(use_with debug run-debug) \ + $(use_with icu) \ + $(use_with lzma) \ + $(use_enable ipv6) \ + $(use_enable static-libs static) \ + $(multilib_native_use_with readline) \ + $(multilib_native_use_with readline history) \ + "$@" + } + + libxml2_py_configure() { + mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist + run_in_build_dir libxml2_configure "--with-python=${PYTHON}" # odd build system + } + + libxml2_configure --without-python # build python bindings separately + + if multilib_is_native_abi && use python; then + python_foreach_impl libxml2_py_configure + fi +} + +multilib_src_compile() { + default + if multilib_is_native_abi && use python; then + local native_builddir=${BUILD_DIR} + python_foreach_impl libxml2_py_emake top_builddir="${native_builddir}" all + fi +} + +multilib_src_test() { + default + multilib_is_native_abi && use python && python_foreach_impl libxml2_py_emake test +} + +multilib_src_install() { + emake DESTDIR="${D}" \ + EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples install + + if multilib_is_native_abi && use python; then + python_foreach_impl libxml2_py_emake DESTDIR="${D}" install + python_foreach_impl python_optimize + fi +} + +multilib_src_install_all() { + # on windows, xmllint is installed by interix libxml2 in parent prefix. + # this is the version to use. the native winnt version does not support + # symlinks, which makes repoman fail if the portage tree is linked in + # from another location (which is my default). -- mduft + if [[ ${CHOST} == *-winnt* ]]; then + rm -rf "${ED}"/usr/bin/xmllint + rm -rf "${ED}"/usr/bin/xmlcatalog + fi + + rm -rf "${ED}"/usr/share/doc/${P} + einstalldocs + + if ! use python; then + rm -rf "${ED}"/usr/share/doc/${PF}/python + rm -rf "${ED}"/usr/share/doc/${PN}-python-${PV} + fi + + if ! use examples; then + rm -rf "${ED}/usr/share/doc/${PF}/examples" + rm -rf "${ED}/usr/share/doc/${PF}/python/examples" + fi + + prune_libtool_files --modules +} + +pkg_postinst() { + # We don't want to do the xmlcatalog during stage1, as xmlcatalog will not + # be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887. + if [[ "${ROOT}" != "/" ]]; then + elog "Skipping XML catalog creation for stage building (bug #208887)." + else + # need an XML catalog, so no-one writes to a non-existent one + CATALOG="${EROOT}etc/xml/catalog" + + # we dont want to clobber an existing catalog though, + # only ensure that one is there + # + if [[ ! -e ${CATALOG} ]]; then + [[ -d "${EROOT}etc/xml" ]] || mkdir -p "${EROOT}etc/xml" + "${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}" + einfo "Created XML catalog in ${CATALOG}" + fi + fi +} + +libxml2_py_emake() { + pushd "${BUILD_DIR}/python" > /dev/null || die + emake "$@" + popd > /dev/null +} diff --git a/dev-libs/ltxml/Manifest b/dev-libs/ltxml/Manifest index 1cb1a347995c..73e31fdb1404 100644 --- a/dev-libs/ltxml/Manifest +++ b/dev-libs/ltxml/Manifest @@ -1,3 +1,2 @@ DIST ltxml-1.2.5.tar.gz 1081135 SHA256 5fd43d802a4f89be6f27ff47fb69f37a155911ad6580f39b26100e6afefd3762 SHA512 b8cb5a17a35748b3c3df25ea01b97d41443f34ae3e086fa8b13e46b10edb653ad66a236ec88350b85a1879135e899e097f067628afc4db294d04314d1fd85fcb WHIRLPOOL 26a80484fe3902b85ae3fa4ae67cb9fb02eebd30da25721ad10efbad3b08bad8a83665644e543d4ca43617dade007d44001c6cc46242a572aa9ac423b3709790 -DIST ltxml-1.2.6.tar.gz 1144896 SHA256 6e3a659d28a2f665cf62bc53e5d74b45c694b584f92694c386f78b3c3b602239 SHA512 a42e5355cdf20f5d9fc431d3b2969e8a2e94c20a1d6e0e4cb00314b501d64d68e7bb3dc3ba9b8c2504701b4b4225a12b2808b24842852d2c75c04c5b041423e3 WHIRLPOOL e5a6de80e81189597bdf139120213db56e3e9400afe71508ffc8cc0af06751fbc35c23a0b07ae0929fe0fb4bffa63686312b05932c4f08382ce2ff684ad5f861 DIST ltxml-1.2.9.tar.gz 304050 SHA256 bc28fcdf63be636e03076deeacba75255cd9281f40a3dfd65a8c04aa93242921 SHA512 1c0b965b7ed330069a23259bc937546a6a0eb639206a844b6c4d524acfaeb1ec6978467fa8e63c8430ca222cec04386368e7ce625ac829ea5be445e880b86ac9 WHIRLPOOL 5481ce9e5cff99efe1d6ed0d4dc35cd844fa450995cee63d078faca2b628ec6aae7b8014f62fa744a4662866f21b41d58db5bb539d52b259fb1dc66b404b519e diff --git a/dev-libs/ltxml/ltxml-1.2.6.ebuild b/dev-libs/ltxml/ltxml-1.2.6.ebuild deleted file mode 100644 index 51c6de39cb87..000000000000 --- a/dev-libs/ltxml/ltxml-1.2.6.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/ltxml/ltxml-1.2.6.ebuild,v 1.5 2008/01/02 10:56:32 armin76 Exp $ - -S="${WORKDIR}/${P}/XML" -DESCRIPTION="Integrated set of XML tools and a developers tool-kit with C API" -HOMEPAGE="http://www.ltg.ed.ac.uk/software/xml/" -SRC_URI=ftp://ftp.cogsci.ed.ac.uk/pub/LTXML/${P}.tar.gz -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~ia64 ~ppc ~x86" -IUSE="" -DEPEND="dev-lang/perl" -PV_MAJ="${PV:0:1}${PV:2:1}" - -src_compile() { - econf || die "configure failed" - emake all || die "make failed" -} - -src_install() { - einstall \ - datadir=${D}/usr/lib/${PN}${PV_MAJ} \ - MANDIR=${D}/usr/share/man \ - || die "make install failed" -} diff --git a/dev-libs/marisa/marisa-0.2.4.ebuild b/dev-libs/marisa/marisa-0.2.4.ebuild index 9cec01e0a91f..e291341c7476 100644 --- a/dev-libs/marisa/marisa-0.2.4.ebuild +++ b/dev-libs/marisa/marisa-0.2.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/marisa/marisa-0.2.4.ebuild,v 1.4 2015/03/03 06:37:21 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/marisa/marisa-0.2.4.ebuild,v 1.5 2015/04/19 11:28:43 blueness Exp $ EAPI=5 @@ -15,7 +15,7 @@ SRC_URI="https://marisa-trie.googlecode.com/files/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" IUSE="python doc static-libs cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_sse4a cpu_flags_x86_popcnt" DEPEND="python? ( dev-lang/swig ${PYTHON_DEPS} )" diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r4.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r4.ebuild index 738cf72a84e9..069dd069587b 100644 --- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r4.ebuild +++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r4.ebuild,v 1.9 2015/04/14 10:55:21 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r4.ebuild,v 1.10 2015/04/19 09:30:18 pacho Exp $ EAPI="5" @@ -23,7 +23,7 @@ SRC_URI="ftp://ftp.ossp.org/pkg/lib/uuid/${MY_P}.tar.gz" LICENSE="ISC" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos" IUSE="+cxx perl php static-libs" DEPEND="perl? ( dev-lang/perl:= )" diff --git a/dev-libs/pugixml/pugixml-1.5.ebuild b/dev-libs/pugixml/pugixml-1.5.ebuild index 34f6eaa01cf2..76350abc108d 100644 --- a/dev-libs/pugixml/pugixml-1.5.ebuild +++ b/dev-libs/pugixml/pugixml-1.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/pugixml/pugixml-1.5.ebuild,v 1.4 2015/03/31 07:47:29 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/pugixml/pugixml-1.5.ebuild,v 1.5 2015/04/19 09:50:12 ago Exp $ EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="https://github.com/zeux/${PN}/releases/download/v${PV}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ppc ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux" S=${WORKDIR}/${P}/scripts diff --git a/dev-libs/qrosscore/Manifest b/dev-libs/qrosscore/Manifest index 85e6373a0009..790c13ae132e 100644 --- a/dev-libs/qrosscore/Manifest +++ b/dev-libs/qrosscore/Manifest @@ -1,2 +1 @@ -DIST qross-0.2.2.tar.bz2 3099984 SHA256 02792ba25bdef11b444ca1d0b9f53fdd9aac9539307deb689b585967391a7c7b SHA512 b1c6a0af64651cd16985a81e9613e8a21c0e0a42999e0d4656a40aa21864d52f815e3825eec577fa9856146e12413a70edcf9a85f8a5fb094b6b7b7ff031a0fa WHIRLPOOL fd1714f4a2825ea304945353d3e808e0056b4374d8c575f49ead11c5577095dc0c5066fbf40d5e3fe0f30a107c968bce5bf59c2815e05ccff526a78722b9f13e DIST qrosscore-0.3.1.tar.gz 3963408 SHA256 0573ece8c78fc836544a87adbb3a61afb1b8821cc11b289935d4b650c2d6bc85 SHA512 0dba2257a18ad36ec5348dc9a298d264f5d3ca1cd08e1bfce50259da85ccf3ebec9bad5e578b99e870948888789e76ce33cc8aaf7538c7da6a732a5c76630be6 WHIRLPOOL ef1c9a6fa7fad7a49c9237ed47bc2e7694d1c89639e62bfcd21c5d253ab40147c8694546db778ed6a16ca06e08a551b5a7a5aacbcc192659291846d87df313d0 diff --git a/dev-libs/qrosscore/qrosscore-0.2.2.ebuild b/dev-libs/qrosscore/qrosscore-0.2.2.ebuild deleted file mode 100644 index 756166fc62d3..000000000000 --- a/dev-libs/qrosscore/qrosscore-0.2.2.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/qrosscore/qrosscore-0.2.2.ebuild,v 1.7 2013/12/27 15:06:51 maksbotan Exp $ - -EAPI=3 - -inherit cmake-utils - -DESCRIPTION="KDE-free version of Kross (core libraries and Qt Script backend)" -HOMEPAGE="http://github.com/0xd34df00d/Qross" -SRC_URI="mirror://github/0xd34df00d/Qross/qross-${PV}.tar.bz2" -S="${WORKDIR}/qross-${PV}/src/qross" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="debug" - -DEPEND="dev-qt/qtcore:4 - dev-qt/qtgui:4 - dev-qt/designer:4 - dev-qt/qtscript:4" -RDEPEND="${DEPEND}" diff --git a/dev-libs/qrosscore/qrosscore-0.3.1.ebuild b/dev-libs/qrosscore/qrosscore-0.3.1.ebuild index 1a97cec792b3..4858c89eb555 100644 --- a/dev-libs/qrosscore/qrosscore-0.3.1.ebuild +++ b/dev-libs/qrosscore/qrosscore-0.3.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/qrosscore/qrosscore-0.3.1.ebuild,v 1.3 2015/04/08 13:13:22 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/qrosscore/qrosscore-0.3.1.ebuild,v 1.4 2015/04/19 09:50:30 ago Exp $ EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="https://github.com/0xd34df00d/Qross/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="debug" RDEPEND=" diff --git a/dev-libs/uchardet/uchardet-0.0.1.ebuild b/dev-libs/uchardet/uchardet-0.0.1.ebuild index 30fe3111d0af..cb74091fe524 100644 --- a/dev-libs/uchardet/uchardet-0.0.1.ebuild +++ b/dev-libs/uchardet/uchardet-0.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/uchardet/uchardet-0.0.1.ebuild,v 1.2 2015/03/27 16:27:53 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/uchardet/uchardet-0.0.1.ebuild,v 1.3 2015/04/19 07:04:41 pacho Exp $ EAPI="5" @@ -12,7 +12,7 @@ SRC_URI="https://uchardet.googlecode.com/files/${P}.tar.gz" LICENSE="MPL-1.1" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="static-libs" DEPEND="" diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.2.19.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.2.19.ebuild index c00ef498c6b9..067e7f62bf12 100644 --- a/dev-libs/xapian-bindings/xapian-bindings-1.2.19.ebuild +++ b/dev-libs/xapian-bindings/xapian-bindings-1.2.19.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.19.ebuild,v 1.10 2015/04/14 10:53:43 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.19.ebuild,v 1.11 2015/04/19 06:56:05 pacho Exp $ EAPI="5" @@ -23,7 +23,7 @@ SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc ~x86" +KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86" #IUSE="java lua mono perl php python ruby tcl" #REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )" IUSE="java lua perl php python ruby tcl" diff --git a/dev-libs/xapian/xapian-1.2.19.ebuild b/dev-libs/xapian/xapian-1.2.19.ebuild index b1046562ee56..5b23cd6450e3 100644 --- a/dev-libs/xapian/xapian-1.2.19.ebuild +++ b/dev-libs/xapian/xapian-1.2.19.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/xapian-1.2.19.ebuild,v 1.10 2015/04/14 10:53:40 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/xapian-1.2.19.ebuild,v 1.11 2015/04/19 06:55:54 pacho Exp $ EAPI="5" @@ -12,7 +12,7 @@ SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc ~x86" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86" IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +brass +chert +inmemory" DEPEND="sys-libs/zlib" diff --git a/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.110.0-r1.ebuild b/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.110.0-r1.ebuild deleted file mode 100644 index f0c3c1348c58..000000000000 --- a/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.110.0-r1.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.110.0-r1.ebuild,v 1.1 2014/08/23 03:35:21 axs Exp $ - -EAPI=5 - -MODULE_AUTHOR=FLORA -MODULE_VERSION=0.11 -inherit perl-module - -DESCRIPTION="Execute code after a scope finished compilation" - -SLOT="0" -KEYWORDS="amd64 ppc x86 ~ppc-aix ~x64-macos" -IUSE="" - -RDEPEND=" - >=dev-perl/Variable-Magic-0.480.0 - dev-perl/Sub-Exporter -" -DEPEND="${RDEPEND}" - -SRC_TEST=do diff --git a/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.140.0.ebuild b/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.140.0.ebuild new file mode 100644 index 000000000000..dd21bf22df7f --- /dev/null +++ b/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.140.0.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.140.0.ebuild,v 1.1 2015/04/17 22:41:46 dilfridge Exp $ + +EAPI=5 + +MODULE_AUTHOR=ETHER +MODULE_VERSION=0.14 +inherit perl-module + +DESCRIPTION="Execute code after a scope finished compilation" + +SLOT="0" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86 ~ppc-aix ~x64-macos" +IUSE="test" + +RDEPEND=" + virtual/perl-Carp + virtual/perl-Scalar-List-Utils + >=dev-perl/Module-Implementation-0.50.0 + >=dev-perl/Module-Runtime-0.12.0 + >=dev-perl/Sub-Exporter-Progressive-0.1.6 +" +DEPEND="${RDEPEND} + >=virtual/perl-ExtUtils-CBuilder-0.260.0 + virtual/perl-ExtUtils-MakeMaker + test? ( + virtual/perl-File-Spec + >=virtual/perl-Test-Simple-0.880.0 + ) +" + +SRC_TEST=do diff --git a/dev-perl/B-Hooks-EndOfScope/Manifest b/dev-perl/B-Hooks-EndOfScope/Manifest index df97a9d200ef..b4fbcf093926 100644 --- a/dev-perl/B-Hooks-EndOfScope/Manifest +++ b/dev-perl/B-Hooks-EndOfScope/Manifest @@ -1,2 +1,2 @@ -DIST B-Hooks-EndOfScope-0.11.tar.gz 11727 SHA256 391958ded765a2323ddf672cc7bb56f5f9b9b92f39f7d7f826fe96caeb82fafc SHA512 fb6df174058e3f4be95ecb1f9dba1ed52a047fc4b8f1e82222aeea4a0a38141010cc3ab71f91abb000f153a5ab3677bec84facfc170a63ed68fd36b89b26eee2 WHIRLPOOL 52329158798ccb46e467d25ba22b191dbec900abd8065f895fba0bab5cb5f535c6aea76795d103fdd18739341f0f731e3070f55061bed4cfd323ecd7c760d75e DIST B-Hooks-EndOfScope-0.12.tar.gz 16361 SHA256 920e82022e8827caa7bbc0eba628c0fbea1a72dc9952461c997cc19f16b24fbd SHA512 9d1f744bee7df55ac7db7cfb5f19b08eb4d329c2a8c19a82f5fc406a9c565ade56a21f4a2dedb18f81ae6aef340a64fb2cf20f218006a7b027b3d41c0fad20f9 WHIRLPOOL b260f2398acb04a56d68ef7893b48267bc4730dfb3738e458a488bfd6bb56ee70948baee8631bed5ea080b67d697a9e6947a5117ad6e68de73f2d51915784870 +DIST B-Hooks-EndOfScope-0.14.tar.gz 30083 SHA256 dfec3f1282ce51566005bc5bc8793325d820ab25902d5ef765f50b678076552f SHA512 0e7e4f0f296914ac2b2eeb5d7725a7644c27f11e83cdf04f3f33762233ed68b79d731af1b8d1f5e3acb2add5cffcbdf06dd6ed623c20b739d5114f2549e49d0d WHIRLPOOL 960d546572d542181bc306a021df79b2850a06bfff4428796266c95f6bb95874f7aa1677633e29ceaec93d12a1a2786119fab3e400541856f576dff9d505f5ea diff --git a/dev-perl/B-Keywords/B-Keywords-1.140.0.ebuild b/dev-perl/B-Keywords/B-Keywords-1.140.0.ebuild new file mode 100644 index 000000000000..7eebf1171a0c --- /dev/null +++ b/dev-perl/B-Keywords/B-Keywords-1.140.0.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-perl/B-Keywords/B-Keywords-1.140.0.ebuild,v 1.1 2015/04/17 22:45:12 dilfridge Exp $ + +EAPI=5 + +MODULE_AUTHOR=RURBAN +MODULE_VERSION=1.14 +inherit perl-module + +DESCRIPTION="Lists of reserved barewords and symbol names" + +# GPL-2 - no later clause +LICENSE="|| ( Artistic GPL-2 )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" +IUSE="" + +SRC_TEST="do" + +DEPEND="virtual/perl-ExtUtils-MakeMaker" diff --git a/dev-perl/B-Keywords/Manifest b/dev-perl/B-Keywords/Manifest index 5579c06c5227..bef36b0fdeff 100644 --- a/dev-perl/B-Keywords/Manifest +++ b/dev-perl/B-Keywords/Manifest @@ -1 +1,2 @@ DIST B-Keywords-1.13.tar.gz 9739 SHA256 073eb916f69bd337261de6cb6cab8ccdb06f67415d8c7291453ebdfdfe0be405 SHA512 6176dbe7ff25a7d355a03d887b6ec52e49c6bce634c3aa8dd5a7126201ac11e9f8ee6c78f7cacc353a5a83dea688646d25d675570fdba80d160abb45248eb08b WHIRLPOOL ffb6275127dcd468df89221c6b7c18cb41ef69d1c28615505d6f633e0f1c38e7cc42d7ad772f0e0cdcbf9de4efff3363b62ccdd280852202395ffde43066cb62 +DIST B-Keywords-1.14.tar.gz 9981 SHA256 9c1662abbd573b408fdd13513e5cad7ef8fba28479d75e8dd33484633ac48ad2 SHA512 62e10e0f22fdce9855d7f4e1e96c8a2063a220d663ddc5ba0cb1a2e1b398b4f3a9d765dbc122797a66475535b5b6addf8eb655c8b27428355bc00e598930a5c4 WHIRLPOOL e8ca6175615955f144456187f88f02b12e858f4a756337b5b2e824c8b486b14b9f86c19b8b57eab31433531cb3ffca9681f369b55d5fe8374e01cc1ad3a14d58 diff --git a/dev-perl/Benchmark-Timer/Benchmark-Timer-0.7102.ebuild b/dev-perl/Benchmark-Timer/Benchmark-Timer-0.710.200.ebuild similarity index 77% rename from dev-perl/Benchmark-Timer/Benchmark-Timer-0.7102.ebuild rename to dev-perl/Benchmark-Timer/Benchmark-Timer-0.710.200.ebuild index fc04b6e61cdb..29dd47cf8586 100644 --- a/dev-perl/Benchmark-Timer/Benchmark-Timer-0.7102.ebuild +++ b/dev-perl/Benchmark-Timer/Benchmark-Timer-0.710.200.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-perl/Benchmark-Timer/Benchmark-Timer-0.7102.ebuild,v 1.2 2014/01/12 23:40:18 civil Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-perl/Benchmark-Timer/Benchmark-Timer-0.710.200.ebuild,v 1.1 2015/04/17 22:51:43 dilfridge Exp $ EAPI="5" diff --git a/dev-perl/Benchmark-Timer/Benchmark-Timer-0.710.400.ebuild b/dev-perl/Benchmark-Timer/Benchmark-Timer-0.710.400.ebuild new file mode 100644 index 000000000000..f45fa70eab24 --- /dev/null +++ b/dev-perl/Benchmark-Timer/Benchmark-Timer-0.710.400.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-perl/Benchmark-Timer/Benchmark-Timer-0.710.400.ebuild,v 1.1 2015/04/17 22:51:43 dilfridge Exp $ + +EAPI=5 + +MODULE_AUTHOR=DCOPPIT +MODULE_VERSION=0.7104 +inherit perl-module + +DESCRIPTION="Perl code benchmarking tool" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +RDEPEND=" + dev-perl/Statistics-TTest + virtual/perl-Time-HiRes +" + +DEPEND="${RDEPEND} + >=virtual/perl-ExtUtils-MakeMaker-6.360.0 + test? ( virtual/perl-Test-Simple ) +" + +SRC_TEST=do diff --git a/dev-perl/Benchmark-Timer/Manifest b/dev-perl/Benchmark-Timer/Manifest index 4eaa156e92b6..0db80a62b96b 100644 --- a/dev-perl/Benchmark-Timer/Manifest +++ b/dev-perl/Benchmark-Timer/Manifest @@ -1 +1,2 @@ DIST Benchmark-Timer-0.7102.tar.gz 31219 SHA256 01446699cc7fd56cbc631d16ad73e9158a2bf63a2b045d1a1d2a3e98eaf289be SHA512 f60c6bd259f63225b87892e5388ed111cd1ff23324d169dbd55a6bef4991463476ee4036ea1b845e8c40d75d69ed9ba8d80ff97cf16aa306c5e59d9329bee52a WHIRLPOOL e18d8b78b635bc114d7df8be90bd5bffb0de5f61c98e6395c90ec02fd9b10475aafe9038cb580849fd45de6ff62860bfb8f18c0e576421df42ad6e14b66c53c1 +DIST Benchmark-Timer-0.7104.tar.gz 42979 SHA256 9fd46d6a3ccbc7f9a230a056a28a2c7a492ca2037b356a8ff5d2652547ce9e4b SHA512 0b033982355b8bfd4a58f7234a3ee62f0800657148f26e83c5917abcf840194c9d1e0c002d974e308e48d944a722383b1d3e2d0f609cf03d1239429229a2c844 WHIRLPOOL 0253097dfe661bf5c19755777618645e6d5eefaafde0800c88ccbac098b9c8ed735a32b5bc4d449aca02ba7f1f85f4f706016d1e951700d1627ceecc3868700a diff --git a/dev-perl/BerkeleyDB/BerkeleyDB-0.530.0-r1.ebuild b/dev-perl/BerkeleyDB/BerkeleyDB-0.550.0.ebuild similarity index 78% rename from dev-perl/BerkeleyDB/BerkeleyDB-0.530.0-r1.ebuild rename to dev-perl/BerkeleyDB/BerkeleyDB-0.550.0.ebuild index a36d84b7251f..ff69ac5b5f83 100644 --- a/dev-perl/BerkeleyDB/BerkeleyDB-0.530.0-r1.ebuild +++ b/dev-perl/BerkeleyDB/BerkeleyDB-0.550.0.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-perl/BerkeleyDB/BerkeleyDB-0.530.0-r1.ebuild,v 1.1 2014/08/23 02:38:10 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-perl/BerkeleyDB/BerkeleyDB-0.550.0.ebuild,v 1.1 2015/04/17 22:56:45 dilfridge Exp $ EAPI=5 MODULE_AUTHOR=PMQS -MODULE_VERSION=0.53 +MODULE_VERSION=0.55 inherit perl-module eutils db-use DESCRIPTION="This module provides Berkeley DB interface for Perl" SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE="test" # Install DB_File if you want older support. BerkleyDB no longer @@ -19,6 +19,7 @@ IUSE="test" RDEPEND=">=sys-libs/db-2.0" DEPEND="${RDEPEND} + virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/Test-Pod )" SRC_TEST="do" diff --git a/dev-perl/BerkeleyDB/Manifest b/dev-perl/BerkeleyDB/Manifest index fe6dd327d9c8..67f0921ed52f 100644 --- a/dev-perl/BerkeleyDB/Manifest +++ b/dev-perl/BerkeleyDB/Manifest @@ -1,2 +1,2 @@ -DIST BerkeleyDB-0.53.tar.gz 202413 SHA256 f4b194e2ad5fa2eacdeca45d4e9836f9fff7da86ddc7e6f759963269779c739d SHA512 86df59c42235a8f7cde5425129cfae24afa9a746ea72998d7bbab5427e5425d170322ab4ee7999f500924ff60222da8289bb8dc520569ff8b6084734f87a01d6 WHIRLPOOL 9f64c07f5a3c6ceaf292ebd036f740e25e01429fbc49dd705536b336f37561f28da1ccc7e0b5a7358881dc010e8f442f6303379592e11fc3e575d0e5279f5e38 DIST BerkeleyDB-0.54.tar.gz 202422 SHA256 010e66d0034b93a8397c600da320611149aef7861eaf1f93b95e49ae37b825b8 SHA512 c9529f2682b269db1c5f5c5535b9497b5859530f7fb283003cf3f6990ae311b73221b14202fa9fd6870a0d3f5c66750cb1c4905a5599ba5313e752b5dba3b47c WHIRLPOOL a5c7dbcba424a6e13cb0c5bed4ff54db85bafaaeaa050e9b140342ee33222e3ce82e0be4ba2b5874393443769da642f5042a832aa2e43af1ccf7a1473afcda73 +DIST BerkeleyDB-0.55.tar.gz 203318 SHA256 6f28e141c7e2fbc455621bc809d6e7d84a3640cc77568b07798ae3933107e44f SHA512 a9bee92b0168918eaf6fb38b7b66005cfbb360ce89a9ae9feeb022e3d27fa7e627412b5c19233840571ed60568729d4bd83d279f84a0c7db921b8eed9f73afea WHIRLPOOL 3831b7dcce5249c1576bee608feaf552d0482360451a391fd5f13ebe7da0124ccfabf3d5ea74155fc9baac12dd99b1742a15eb06fdb440d24cd54a24fb201281 diff --git a/dev-perl/Bio-Graphics/Bio-Graphics-2.390.0.ebuild b/dev-perl/Bio-Graphics/Bio-Graphics-2.390.0.ebuild new file mode 100644 index 000000000000..6a695d8dd00f --- /dev/null +++ b/dev-perl/Bio-Graphics/Bio-Graphics-2.390.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-perl/Bio-Graphics/Bio-Graphics-2.390.0.ebuild,v 1.1 2015/04/18 18:13:04 dilfridge Exp $ + +EAPI=5 + +MODULE_AUTHOR=LDS +MODULE_VERSION=2.39 +inherit perl-module + +DESCRIPTION="Generate images from Bio::Seq objects for visualization purposes" + +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + >=dev-perl/GD-2.300.0 + >=dev-perl/Statistics-Descriptive-2.600.0 + >=sci-biology/bioperl-1.5.9.1 + +" +DEPEND="${RDEPEND} + >=virtual/perl-Module-Build-0.420.0 +" + +SRC_TEST=do diff --git a/dev-perl/Bio-Graphics/Manifest b/dev-perl/Bio-Graphics/Manifest index 377a06b3ef4d..d2bd441d724d 100644 --- a/dev-perl/Bio-Graphics/Manifest +++ b/dev-perl/Bio-Graphics/Manifest @@ -1 +1,2 @@ DIST Bio-Graphics-2.37.tar.gz 1081671 SHA256 d85716b3e773cc899b9cb5733203fa0fbb4ce7b1ac3ae36fef1bbb9000968c0f SHA512 f8858f018ece0cf174d6803f0fe1110099ba5b2b6f0a1452db361949320aeccb7738f588fe2ac5c642d2b9b5e449a0c7822c0da1ceda91e5f1ffbac07ce3fcbe WHIRLPOOL 4dda3d65472c5863820a88082daf5da05624067f4c518cf53918574c88c89e0610df94f33d1db004542290a1bedaa78ef4159c6810e6de9c4401bdecfafd7ca8 +DIST Bio-Graphics-2.39.tar.gz 1139511 SHA256 5602e56c469fba8be024d72bff7ec1502392d82ac0fde4d1399e02488d6bfd85 SHA512 4119c56a125df67a613833c06d7db94be7f19c39fcf908eb52c403e70652c04d91a3b7de768e2465423bff69dd900cb45f1044ed673eb6228a8ad7516a35471f WHIRLPOOL 30877d7f6c264b833ebcf69dfebc037fdaff66200a80cd7b9bf964b2f435d6d23db7a8f1228c010675955b7528f95fb1d9a018c48fa8a5456e4813d10d7ce76f diff --git a/dev-perl/Bio-SamTools/Bio-SamTools-1.410.0.ebuild b/dev-perl/Bio-SamTools/Bio-SamTools-1.410.0.ebuild new file mode 100644 index 000000000000..24d0eaee9b5e --- /dev/null +++ b/dev-perl/Bio-SamTools/Bio-SamTools-1.410.0.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-perl/Bio-SamTools/Bio-SamTools-1.410.0.ebuild,v 1.1 2015/04/18 18:48:04 dilfridge Exp $ + +EAPI=5 + +MODULE_AUTHOR=LDS +MODULE_VERSION=1.41 + +inherit perl-module toolchain-funcs + +DESCRIPTION="Read SAM/BAM database files" + +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + >=sci-biology/bioperl-1.6.9 + >=sci-biology/samtools-1 +" +DEPEND="${RDEPEND} + virtual/perl-ExtUtils-CBuilder + >=virtual/perl-Module-Build-0.420.0 +" + +SRC_TEST=skip +# cannot load its own library, fundamentally b0rken + +PATCHES=( + "${FILESDIR}"/${PN}-1.390.0-samtools-1.patch +) + +src_prepare() { + find . -type f -exec chmod +w '{}' + || die + sed \ + -e 's|my $HeaderFile = "bam.h";|my $HeaderFile = "bam/bam.h";|' \ + -e 's|my $LibFile = "libbam.a";|my $LibFile = "libbam.so";|' \ + -i Build.PL || die + sed \ + -e 's|#include "bam.h"|#include "bam/bam.h"|' \ + -e 's|#include "sam.h"|#include "bam/sam.h"|' \ + -e 's|#include "khash.h"|#include "htslib/khash.h"|' \ + -e 's|#include "faidx.h"|#include "htslib/faidx.h"|' \ + -i lib/Bio/DB/Sam.xs c_bin/bam2bedgraph.c || die + + perl-module_src_prepare + + tc-export CC +} diff --git a/dev-perl/Bio-SamTools/Manifest b/dev-perl/Bio-SamTools/Manifest index 49d4eae69aa8..bf52deb79454 100644 --- a/dev-perl/Bio-SamTools/Manifest +++ b/dev-perl/Bio-SamTools/Manifest @@ -1 +1,2 @@ DIST Bio-SamTools-1.39.tar.gz 331515 SHA256 a2baaa0f569c2b49e988978a121fb210fcb35200dcb2f183aa58bb03d711ef4f SHA512 aff502af24239cd64dec3a5a9cb6ab7280661f277cef066f79c87f608112d5870f46ffcc81f3bc2382f48d5247c7ab5de35e4afaa7ca4e286b0323978368d668 WHIRLPOOL db069d76fe386354b8cec60527de6612fc501428e9775e02574955cead3eba55db169697aaacc22c3b4df6475c6ecb72486b94c9b577da1deb42dc5c3791b04f +DIST Bio-SamTools-1.41.tar.gz 338745 SHA256 b5d7ca16c96cc9fbee5daceb3268f36011740fe4de92074c17a729bac57c3077 SHA512 6f822cd219ecf86e95bc3a6bde1aebbe5eb8284b21b07ca919618c1422c37e6d182285d1a5e77848c6d5cea0dc74a51705f6bc1a27d44aeeaaa69f1cea58f147 WHIRLPOOL b651ea5059ea46ab5e31d237d3e52d7936921470bbd04133be70f935a47b913dc7f3b154c14d1af52f0ba2f5afc6878a27d88e4bbf9d39023cf786bca70f6696 diff --git a/dev-perl/Bit-Vector/Bit-Vector-7.400.0.ebuild b/dev-perl/Bit-Vector/Bit-Vector-7.400.0.ebuild new file mode 100644 index 000000000000..daf5559bf424 --- /dev/null +++ b/dev-perl/Bit-Vector/Bit-Vector-7.400.0.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-perl/Bit-Vector/Bit-Vector-7.400.0.ebuild,v 1.1 2015/04/18 18:51:45 dilfridge Exp $ + +EAPI=5 + +MODULE_AUTHOR=STBEY +MODULE_VERSION=7.4 +inherit perl-module + +DESCRIPTION="Efficient bit vector, set of integers and big int math library" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="" + +RDEPEND=" + >=dev-perl/Carp-Clan-5.300.0 + >=virtual/perl-Storable-2.210.0 +" +DEPEND="${RDEPEND} + virtual/perl-ExtUtils-MakeMaker +" + +SRC_TEST="do" diff --git a/dev-perl/Bit-Vector/Manifest b/dev-perl/Bit-Vector/Manifest index 1427b9b860e5..61dbbf1f48f9 100644 --- a/dev-perl/Bit-Vector/Manifest +++ b/dev-perl/Bit-Vector/Manifest @@ -1,2 +1,3 @@ DIST Bit-Vector-7.2.tar.gz 137817 SHA256 6339f9e4376c623b411934cdfb52d7553c6c38457bfa376b953d40ca007807c2 SHA512 0344c2572e4a16259a4bb4b5f668c8f0ab32dc5a4eb0ab9e7da15ae86c1845036851095aa6353dcc9b1f9bf72ec5bd204e349c286ff5896869c36a4b7ff55955 WHIRLPOOL 219338151a816d055930878efe9c127f35ff3976c9e4c8a374bb821daace297fc6fee760d02b16225b5e7ceee45323a9b6ace0ef07a82ffb88d4f91e6d8bbd56 DIST Bit-Vector-7.3.tar.gz 130395 SHA256 5a76330bfb9b9083371484c960d01ac0ad0e129fe770bfb1e87a85384e088f3d SHA512 e6baa2385d366ee00449abe52c20c49dbd41d2396d7c8f0fd6222262b6c4399d75eb081f46c5d1e524d12dafe0e5e78249f273e7705d04bd03033703fd2e86c8 WHIRLPOOL f583160f314e9d1ef0715711620ae5037e9cd196550c5f7ff2397ea4770a2d85b288d1d948619b2c724cb9bb8004a452493b340fcb1e491d7d67b649811e7503 +DIST Bit-Vector-7.4.tar.gz 135965 SHA256 3c6daa671fecfbc35f92a9385b563d65f50dfc6bdc8b4805f9ef46c0d035a926 SHA512 80aa49aea8c31c60c14161198eab9d620d738530c3c209104b8ad8f1144822f80c3effb3303c569fc556b2457328659ae5d1aaf511d714c835618b84c722abc5 WHIRLPOOL 2953d658f769e511522d11322793dd60f71b95e3ce6b4cc1ef0ff154f5889d53c8c4bb2ca66533398b400010da426292fbf69d6b1f2da7b50ce3ce5fa204a998 diff --git a/dev-perl/Business-ISBN-Data/Business-ISBN-Data-20140910.2.0.ebuild b/dev-perl/Business-ISBN-Data/Business-ISBN-Data-20140910.2.0.ebuild new file mode 100644 index 000000000000..61ecee0c2f5a --- /dev/null +++ b/dev-perl/Business-ISBN-Data/Business-ISBN-Data-20140910.2.0.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-perl/Business-ISBN-Data/Business-ISBN-Data-20140910.2.0.ebuild,v 1.1 2015/04/18 18:55:11 dilfridge Exp $ + +EAPI=5 + +MODULE_AUTHOR=BDFOY +MODULE_VERSION=20140910.002 +inherit perl-module + +DESCRIPTION="Data pack for Business::ISBN" + +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +RDEPEND=" + virtual/perl-Carp + virtual/perl-File-Spec +" +DEPEND="${RDEPEND} + virtual/perl-ExtUtils-MakeMaker + test? ( + >=virtual/perl-Test-Simple-0.950.0 + dev-perl/Test-Pod + dev-perl/Test-Pod-Coverage + ) +" + +SRC_TEST=do diff --git a/dev-perl/Business-ISBN-Data/Manifest b/dev-perl/Business-ISBN-Data/Manifest index 403e569713fa..7d733f29d1dc 100644 --- a/dev-perl/Business-ISBN-Data/Manifest +++ b/dev-perl/Business-ISBN-Data/Manifest @@ -1 +1,2 @@ DIST Business-ISBN-Data-20120719.001.tar.gz 14745 SHA256 745f6bf8f7bd912c0a1865aa5f7e49343804de27783f544b2e2c714e14a704a3 SHA512 b688694bf99c65e072cbf5575de477dff607d1f66376f20b147f49896f4a2dd82a9a4b8dc1843c9d363ca93840df6683d989f794dcc7625e4f9b2c78ede2ded0 WHIRLPOOL e57618e9454b6e9ec212bc724961a945e73b7436b5f8758e73ddafcf494db01ae21e612aae2bc9654beec9fa2fb810052732e277b8b369a636581ea3387a92e1 +DIST Business-ISBN-Data-20140910.002.tar.gz 16522 SHA256 3e2413d6672f6cbbfad61caa2d6eb315382bb5bc09db5157c8107cbdc98ecbae SHA512 bbfa483490ac3037fba33ae6d038ce2fb9b537d67cd3d2cd1b91edd06306cee38badb6ca6da38983c9b16d98e57b855fef19a5addd21f31ea58eb0d24181c9b1 WHIRLPOOL e29dc6011a23c7874113af1fed680de55908c726f8607c168991ece2318acc50d699e3a60efc00e9b41ba963e317d675e422d8cac62c077ba7e4010d8a3775e6 diff --git a/dev-perl/Business-ISMN/Business-ISMN-1.130.0.ebuild b/dev-perl/Business-ISMN/Business-ISMN-1.130.0.ebuild new file mode 100644 index 000000000000..f473d793214e --- /dev/null +++ b/dev-perl/Business-ISMN/Business-ISMN-1.130.0.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-perl/Business-ISMN/Business-ISMN-1.130.0.ebuild,v 1.1 2015/04/18 18:59:26 dilfridge Exp $ + +EAPI=5 + +MODULE_AUTHOR=BDFOY +MODULE_VERSION=1.13 +inherit perl-module + +DESCRIPTION="International Standard Music Numbers" + +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +RDEPEND=" + dev-perl/Tie-Cycle + virtual/perl-Scalar-List-Utils +" +DEPEND="${RDEPEND} + test? ( + dev-perl/Test-Pod + dev-perl/Test-Pod-Coverage + ) +" + +SRC_TEST=do + +src_install() { + perl-module_src_install + rm -rf "${ED}"/usr/share/man || die +} diff --git a/dev-perl/Business-ISMN/Manifest b/dev-perl/Business-ISMN/Manifest index e8a9c8aa7146..664ab9509150 100644 --- a/dev-perl/Business-ISMN/Manifest +++ b/dev-perl/Business-ISMN/Manifest @@ -1 +1,2 @@ DIST Business-ISMN-1.11.tar.gz 9053 SHA256 76d5240a5672c7a8b1ba9e9ea8238a5c8882139911acbb67b7059b5ee3da342d SHA512 e5bbaf048b06ee133a95443227fe2bf0e49abbb2164330105f7ccd4360503ca97848e4ff6b663064ceb36a34d4e5f7b47209f0153e5fa6e88d8ae8a0c90bd41a WHIRLPOOL f780112fddb09ece0bd784e29cf23fca31ee135f582eabe0bbc3192efdf554bfa610d94c8d222b2eac766c0615b2ca8806e4f1f1707d9f6c6624c9bec4bae1a3 +DIST Business-ISMN-1.13.tar.gz 9703 SHA256 89b598dcde116732f8621b18660fec9a6989b1ad5bf96599b98fbcaecad9a132 SHA512 bad9fdfe16a6b62c823019af4162e0cb2f97dbda8cc5cad01ff3a6e80d22e5fa1d260ef410ad1393d03fc750f7976f06932ac948390cdeb995cc458e1d3cd984 WHIRLPOOL fe1bf9401fa4b973388028451d5cd06df8ac3ccc8887b6ef714b4a1f4e9c0e38a2c65ba8a5a500b55b59ffaa37067ad97e5724e47778a3642138cd6085c7cf55 diff --git a/dev-perl/CGI-Session/CGI-Session-4.480.0-r1.ebuild b/dev-perl/CGI-Session/CGI-Session-4.480.0-r1.ebuild index 9ff62774421d..1edf98ca4d36 100644 --- a/dev-perl/CGI-Session/CGI-Session-4.480.0-r1.ebuild +++ b/dev-perl/CGI-Session/CGI-Session-4.480.0-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-perl/CGI-Session/CGI-Session-4.480.0-r1.ebuild,v 1.1 2014/08/23 21:48:23 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-perl/CGI-Session/CGI-Session-4.480.0-r1.ebuild,v 1.2 2015/04/18 19:14:31 dilfridge Exp $ EAPI=5 @@ -23,7 +23,7 @@ DEPEND="${RDEPEND} >=virtual/perl-Module-Build-0.380.0 test? ( virtual/perl-Test-Simple - dev-perl/Cgi-Simple + dev-perl/CGI-Simple dev-perl/Test-Pod ) " diff --git a/dev-perl/Cgi-Simple/Cgi-Simple-1.113.0-r1.ebuild b/dev-perl/CGI-Simple/CGI-Simple-1.113.0-r1.ebuild similarity index 73% rename from dev-perl/Cgi-Simple/Cgi-Simple-1.113.0-r1.ebuild rename to dev-perl/CGI-Simple/CGI-Simple-1.113.0-r1.ebuild index a63459f76c46..d0a3ee929e38 100644 --- a/dev-perl/Cgi-Simple/Cgi-Simple-1.113.0-r1.ebuild +++ b/dev-perl/CGI-Simple/CGI-Simple-1.113.0-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-perl/Cgi-Simple/Cgi-Simple-1.113.0-r1.ebuild,v 1.1 2014/08/23 21:49:23 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-perl/CGI-Simple/CGI-Simple-1.113.0-r1.ebuild,v 1.1 2015/04/18 19:13:36 dilfridge Exp $ EAPI=5 diff --git a/dev-perl/CGI-Simple/CGI-Simple-1.115.0.ebuild b/dev-perl/CGI-Simple/CGI-Simple-1.115.0.ebuild new file mode 100644 index 000000000000..32dab908b6e0 --- /dev/null +++ b/dev-perl/CGI-Simple/CGI-Simple-1.115.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-perl/CGI-Simple/CGI-Simple-1.115.0.ebuild,v 1.1 2015/04/18 19:19:56 dilfridge Exp $ + +EAPI=5 + +MODULE_AUTHOR=SZABGAB +MODULE_VERSION=1.115 +inherit perl-module + +DESCRIPTION="A Simple totally OO CGI interface that is CGI.pm compliant" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="test" + +RDEPEND="" +DEPEND="virtual/perl-Module-Build + test? ( + dev-perl/libwww-perl + dev-perl/IO-stringy + dev-perl/Test-Pod + dev-perl/Test-Pod-Coverage + ) +" + +SRC_TEST="do" diff --git a/dev-perl/Cgi-Simple/Manifest b/dev-perl/CGI-Simple/Manifest similarity index 50% rename from dev-perl/Cgi-Simple/Manifest rename to dev-perl/CGI-Simple/Manifest index c7a62c700ee2..9159f92e4529 100644 --- a/dev-perl/Cgi-Simple/Manifest +++ b/dev-perl/CGI-Simple/Manifest @@ -1 +1,2 @@ DIST CGI-Simple-1.113.tar.gz 103884 SHA256 52e2881fd7f093ad159cfc87153d8ada67c782c2877c66cd0461cc769a041b3d SHA512 f2a21632ef11f2af81a3284c6f6181be15b512aa2574931bed567a4cecb44a08730193cabb2fe285e5033901838c1eebb67368af173a381bb4072f82cd32fbf0 WHIRLPOOL 12cf57ffe44eab63851403daba64d0cce59c62dc25676c860a715ddf0b490ca9bbe92aa362e422d0cab3d0762a06de5dd08a7e9d26cbee58985786ecfe8353cc +DIST CGI-Simple-1.115.tar.gz 85165 SHA256 4f873bc9d055afb7b213684b5bc22d305a456f43c651377d3f2497176a587eda SHA512 1b2531fde88c4544d17717fd80599fcc4e90a618839c352d1812ba2bf4dd6c3295637d6fe5f9604cb5da943f0d361972b75083c5967b3ab818254729793751e4 WHIRLPOOL bcd0463ec757cf5eaadb324dec505aaede383c03ef441e3ee0bc1771396919b4198d1ff4c7173c9aa6a2a5f79c1a0ac053f82b62691158f8dc8e5bb5940c5bbe diff --git a/dev-perl/Cgi-Simple/metadata.xml b/dev-perl/CGI-Simple/metadata.xml similarity index 100% rename from dev-perl/Cgi-Simple/metadata.xml rename to dev-perl/CGI-Simple/metadata.xml diff --git a/dev-perl/CHI/CHI-0.590.0.ebuild b/dev-perl/CHI/CHI-0.590.0.ebuild new file mode 100644 index 000000000000..bdf927c478ac --- /dev/null +++ b/dev-perl/CHI/CHI-0.590.0.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-perl/CHI/CHI-0.590.0.ebuild,v 1.1 2015/04/18 19:29:10 dilfridge Exp $ + +EAPI=5 + +MODULE_AUTHOR=JSWARTZ +MODULE_VERSION=0.59 +inherit perl-module + +DESCRIPTION="Unified cache handling interface" + +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +RDEPEND=" + >=dev-perl/Carp-Assert-0.200.0 + dev-perl/Class-Load + dev-perl/Data-UUID + dev-perl/Digest-JHash + virtual/perl-Digest-MD5 + >=virtual/perl-File-Spec-0.800.0 + dev-perl/Hash-MoreUtils + dev-perl/JSON + >=dev-perl/List-MoreUtils-0.130.0 + >=dev-perl/Log-Any-0.80.0 + >=dev-perl/Moo-1.3.0 + >=dev-perl/MooX-Types-MooseLike-0.230.0 + dev-perl/MooX-Types-MooseLike-Numeric + virtual/perl-Storable + dev-perl/String-RewritePrefix + dev-perl/Task-Weaken + >=dev-perl/Time-Duration-1.60.0 + >=dev-perl/Time-Duration-Parse-0.30.0 + virtual/perl-Time-HiRes + >=dev-perl/Try-Tiny-0.50.0 +" +DEPEND="${RDEPEND} + virtual/perl-ExtUtils-MakeMaker + test? ( + dev-perl/TimeDate + virtual/perl-Test-Simple + dev-perl/Test-Class + dev-perl/Test-Deep + dev-perl/Test-Exception + dev-perl/Test-Warn + ) +" + +SRC_TEST=do diff --git a/dev-perl/CHI/Manifest b/dev-perl/CHI/Manifest index 95c97c74e931..ba30b3e744a9 100644 --- a/dev-perl/CHI/Manifest +++ b/dev-perl/CHI/Manifest @@ -1,2 +1,3 @@ DIST CHI-0.56.tar.gz 85075 SHA256 7f40309d92faab3abef954097f28245bca47e9ecdc4f1ecfe9455de4c56b15c5 SHA512 f8eae8810f28129c5e5039a70f173d5d73ae7d755babaaff7f25b39bbc920bfa00f8b191aeb1af90ef76dd4003160e5ebd0a02701e616b653c9e5a3cef01137c WHIRLPOOL 9d95ebcfa2925cff009de460145ff3b1ea7d246a9676d3ff2cf3711e12633319926b0ae22083503eb1d39547a391a90ce4baf71e850a27b1893fb7a7dd414ae8 DIST CHI-0.58.tar.gz 84407 SHA256 6f7f62e7e993f3664daa2d953d2cf517c17a11a1097ddbefcde985c381393b84 SHA512 bcbb485c5160974efdf313a7f4b90062cfb343e3b91b6060d0888a1eae82f019cfaa8710220cf87fa1aa2d0bfed5d560c7192c3491cf0f2e145aee58f28ce60c WHIRLPOOL 65bedd21edb6b027f1fd50bd0d8743f40a17d6d785163cd4da2bcccfb6d160e786957796893004d13438ca1c1d65b99d414763932f98eb862bc33d590e842dc9 +DIST CHI-0.59.tar.gz 87978 SHA256 b465082ea2ff45fec7f2e34d8e7141464f7be05567e9e9a0c0bc0beb4b882056 SHA512 6208ef8a67520d5b1cfa78ce1b417da96ae514cf56ea16d32746c0029f46631ba7f9a6a8088e0830e22a6201f4a64171960239da44cc7de8cace00de2e5f9355 WHIRLPOOL f0bb056638dac81093ca5ffe2099b41eab38b0c866ed11a55b22b75246b549e8b6dad9d14906623f70daab8556c61e5011bfb64b3b65ecb47e6ff629d84b7bd4 diff --git a/dev-perl/Cairo/Cairo-1.105.0.ebuild b/dev-perl/Cairo/Cairo-1.105.0.ebuild new file mode 100644 index 000000000000..b78090bfe318 --- /dev/null +++ b/dev-perl/Cairo/Cairo-1.105.0.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-perl/Cairo/Cairo-1.105.0.ebuild,v 1.1 2015/04/18 19:03:27 dilfridge Exp $ + +EAPI=5 + +MODULE_AUTHOR=XAOC +MODULE_VERSION=1.105 +inherit perl-module + +DESCRIPTION="Perl interface to the cairo library" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" +IUSE="test" + +RDEPEND=" + >=x11-libs/cairo-1.0.0 +" +DEPEND="${RDEPEND} + virtual/perl-ExtUtils-MakeMaker + >=dev-perl/extutils-depends-0.200.0 + >=dev-perl/extutils-pkgconfig-1.0.0 + test? ( + dev-perl/Test-Number-Delta + ) +" + +SRC_TEST="do" + +src_prepare() { + perl-module_src_prepare + sed -i -e 's,exit 0,exit 1,' "${S}"/Makefile.PL || die +} diff --git a/dev-perl/Cairo/Manifest b/dev-perl/Cairo/Manifest index 95ec271ef7e9..8d0d18d370e4 100644 --- a/dev-perl/Cairo/Manifest +++ b/dev-perl/Cairo/Manifest @@ -1 +1,2 @@ DIST Cairo-1.103.tar.gz 108254 SHA256 eaebd9c3b9d66b4c41533ec7c736a2a4b73e0bf6ad207132a970d83a85827872 SHA512 d7e7488af7e52834762f0baef48687989fc64c44518c1b5c4312299bba4a3a0f69e5af05fac02440ae70fb1dd474fae9974f8913809c1b17fcabf7527bc68b46 WHIRLPOOL 79ff6d205be88167adac29303aac6c2219d9637671f4d4d707841bdac09803891861f37a46451eeef96746ffe1f22791af60146711a1eee8b5690faa66e5774f +DIST Cairo-1.105.tar.gz 108695 SHA256 98201dea8f31a369bbf9b276065425dd58b710a8d14478d6e1868ce07911a046 SHA512 45e2712aca89eedc68b205f6aa6baa7b4c44c8f09da91aef02b08f1b148594c4332a6f81976c53f561ba94b8d63de6ce227dadb25e11e0796ac77bf1a310fbbf WHIRLPOOL 65807dbb4e015ecff4600f8593b01cc20ba2cc120f1e99bb669ba7303a47a3e0b62cca1bbd6f1338f8631589c7656d5ce20715648382742682c9b6b167496528 diff --git a/dev-perl/Capture-Tiny/Capture-Tiny-0.280.0.ebuild b/dev-perl/Capture-Tiny/Capture-Tiny-0.280.0.ebuild new file mode 100644 index 000000000000..62ebe58aa0fa --- /dev/null +++ b/dev-perl/Capture-Tiny/Capture-Tiny-0.280.0.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-perl/Capture-Tiny/Capture-Tiny-0.280.0.ebuild,v 1.1 2015/04/18 19:07:01 dilfridge Exp $ + +EAPI=5 + +MODULE_AUTHOR=DAGOLDEN +MODULE_VERSION=0.28 +inherit perl-module + +DESCRIPTION="Capture STDOUT and STDERR from Perl, XS or external programs" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="test" + +RDEPEND=" + virtual/perl-Carp + virtual/perl-Exporter + virtual/perl-File-Spec + virtual/perl-File-Temp + virtual/perl-IO + virtual/perl-Scalar-List-Utils +" +DEPEND="${RDEPEND} + virtual/perl-ExtUtils-MakeMaker + test? ( + virtual/perl-Test-Simple + ) +" + +SRC_TEST=do diff --git a/dev-perl/Capture-Tiny/Manifest b/dev-perl/Capture-Tiny/Manifest index 8c7434ce3658..00b20fa0059c 100644 --- a/dev-perl/Capture-Tiny/Manifest +++ b/dev-perl/Capture-Tiny/Manifest @@ -1,2 +1,3 @@ DIST Capture-Tiny-0.24.tar.gz 33995 SHA256 9bcf6f8472f8ea50401536cb070ac0c7770837d155c4d6abe212759863aae065 SHA512 8df98fb84d877fed984e1e8fb89c71d2e94baa99eb0d5323f9e413d361a87072b417ce65b00444b5e543ccda05d88753334537534747381a59e5b75eef04eae7 WHIRLPOOL 3b3de2582c08584e20a15179094d3911b2cdb5ebbff73f7a9f47013e14fa2e43bb7df894e3aa96aebf549e9cddadd9a7ad62dff4ee1d287dae819187e50d3e95 DIST Capture-Tiny-0.27.tar.gz 34474 SHA256 ba54bc0305eb91ee2b0d769470d6bc62edb5b18d9c75b7ea709ea6b31e9bab21 SHA512 bc50c15aaa517d69ca10c594f2011c02c40370e5d09e96941059a28dc3a585e96d4af1f39a56ab8f4b97015c624537d94669cd14d0c375996c84026a23b1f86f WHIRLPOOL 7faad4f9786e225ab1c45cf86be237bb291d80df56c0cca352c415a7da7477118b85f17c05b72f8b0718261dd359ad77c9f0174a9cea589ec54b2d5e262c1eae +DIST Capture-Tiny-0.28.tar.gz 34455 SHA256 e394caddb0e1a46e8cc4bf499eaae6c265dd201d34cac46d2f3e507c23afef84 SHA512 0db8f593f2f18fde56483df7078a563df6155ce089c4f81081d596de08a1887d17926f2cbbdc437376258d8fbbb8860444aa28709bf6e174a8a88ef02a2c0b04 WHIRLPOOL edf1c05b5c654e0be595eb7accf4c1726df9d3617d7bc414c67d0d4d40df236fdf344168a5a41d42a460c8284d4c07fff2ea1593c6f435f645a1714472f63ad2 diff --git a/dev-perl/Carp-Assert/Carp-Assert-0.210.0.ebuild b/dev-perl/Carp-Assert/Carp-Assert-0.210.0.ebuild new file mode 100644 index 000000000000..01a1c827eefa --- /dev/null +++ b/dev-perl/Carp-Assert/Carp-Assert-0.210.0.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-perl/Carp-Assert/Carp-Assert-0.210.0.ebuild,v 1.1 2015/04/18 19:09:55 dilfridge Exp $ + +EAPI=5 + +MODULE_AUTHOR=NEILB +MODULE_VERSION=0.21 +inherit perl-module + +DESCRIPTION="Executable comments in carp" + +SLOT="0" +KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" +IUSE="test" + +RDEPEND=" + virtual/perl-Carp + virtual/perl-Exporter +" +DEPEND="${RDEPEND} + virtual/perl-ExtUtils-MakeMaker + test? ( >=virtual/perl-Test-Simple-0.880.0 ) +" + +SRC_TEST="do" diff --git a/dev-perl/Carp-Assert/Manifest b/dev-perl/Carp-Assert/Manifest index db774d48332c..7fe1b7d40a48 100644 --- a/dev-perl/Carp-Assert/Manifest +++ b/dev-perl/Carp-Assert/Manifest @@ -1 +1,2 @@ DIST Carp-Assert-0.20.tar.gz 10898 SHA256 0dd34a8b53a56d09da962a9fa629411de77c02a6bf98aa972f24f2cd3525fef3 SHA512 208e30f549c1d911623faa0685b87119d80b56caa2fee22b760ac1927d6174afb73124f16a769302783dcdddfb50e9f6538394eca9d0b139dfc06292e7025ec1 WHIRLPOOL f2669a462bca4a4e0ec75ccf26c6c8e9b08cc55833e45416596fbecb4d9e26def3c616aca83cd9c85d4d223a7d9da1dd3e44b94dac1f281d863fcaa41a4c21f4 +DIST Carp-Assert-0.21.tar.gz 11106 SHA256 924f8e2b4e3cb3d8b26246b5f9c07cdaa4b8800cef345fa0811d72930d73a54e SHA512 9fb96ebaf03a86edcd0262b5216b345839dc99e504738e52f883932e425cac33470fcb0e8e4653488c0d8e63e9904af311056213c63ae40bc3935eec4c0410a0 WHIRLPOOL 7832373c905e088b9673186918acea97f99e4728012019fe59e6aee208a299ef74c8c54df099558267966cb2e5a94458f7a4853c2ee8473a5e18f2e080aa6024 diff --git a/dev-perl/Search-Xapian/Search-Xapian-1.2.19.0.ebuild b/dev-perl/Search-Xapian/Search-Xapian-1.2.19.0.ebuild index 2ef7a6d50d98..39edb538c54f 100644 --- a/dev-perl/Search-Xapian/Search-Xapian-1.2.19.0.ebuild +++ b/dev-perl/Search-Xapian/Search-Xapian-1.2.19.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-perl/Search-Xapian/Search-Xapian-1.2.19.0.ebuild,v 1.7 2015/04/14 10:53:47 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-perl/Search-Xapian/Search-Xapian-1.2.19.0.ebuild,v 1.8 2015/04/19 06:56:14 pacho Exp $ EAPI="5" @@ -14,7 +14,7 @@ DESCRIPTION="Perl XS frontend to the Xapian C++ search library" LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )" SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc ~x86" +KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86" IUSE="examples" RDEPEND="~dev-libs/xapian-${VERSION} diff --git a/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.7.16.ebuild b/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.7.16.ebuild index eeb22a1ad285..672ae63b540f 100644 --- a/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.7.16.ebuild +++ b/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.7.16.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.7.16.ebuild,v 1.1 2015/02/19 17:42:29 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.7.16.ebuild,v 1.3 2015/04/19 09:26:12 ago Exp $ EAPI="5" inherit php-pear-r1 -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86" DESCRIPTION="Fast and safe little cache system" LICENSE="LGPL-2.1" SLOT="0" diff --git a/dev-php/PEAR-DB/PEAR-DB-1.8.2.ebuild b/dev-php/PEAR-DB/PEAR-DB-1.8.2.ebuild index e81794846a6b..d9623760bee5 100644 --- a/dev-php/PEAR-DB/PEAR-DB-1.8.2.ebuild +++ b/dev-php/PEAR-DB/PEAR-DB-1.8.2.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-DB/PEAR-DB-1.8.2.ebuild,v 1.1 2015/02/19 17:50:14 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-DB/PEAR-DB-1.8.2.ebuild,v 1.3 2015/04/19 09:27:24 ago Exp $ EAPI=5 inherit php-pear-r1 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86" DESCRIPTION="Database abstraction layer for PHP" LICENSE="PHP-3" diff --git a/dev-php/PEAR-Testing_Selenium/PEAR-Testing_Selenium-0.4.4-r1.ebuild b/dev-php/PEAR-Testing_Selenium/PEAR-Testing_Selenium-0.4.4-r1.ebuild index cd6a5fcdbee7..f07e48d6fcdc 100644 --- a/dev-php/PEAR-Testing_Selenium/PEAR-Testing_Selenium-0.4.4-r1.ebuild +++ b/dev-php/PEAR-Testing_Selenium/PEAR-Testing_Selenium-0.4.4-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Testing_Selenium/PEAR-Testing_Selenium-0.4.4-r1.ebuild,v 1.2 2015/04/15 04:31:44 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Testing_Selenium/PEAR-Testing_Selenium-0.4.4-r1.ebuild,v 1.3 2015/04/19 09:28:01 ago Exp $ EAPI=5 @@ -9,6 +9,6 @@ inherit php-pear-r1 DESCRIPTION="PHP Client for Selenium Remote Control" LICENSE="PHP-3" SLOT="0" -KEYWORDS="~alpha ~amd64 hppa ~ia64 ~sparc ~x86" +KEYWORDS="~alpha amd64 hppa ~ia64 ~sparc x86" IUSE="" RDEPEND=">=dev-lang/php-5.1.0" diff --git a/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.2.2.ebuild b/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.2.2.ebuild index a55b2948a0b4..1c4a12f4d897 100644 --- a/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.2.2.ebuild +++ b/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.2.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.2.2.ebuild,v 1.1 2015/01/16 20:33:56 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.2.2.ebuild,v 1.3 2015/04/19 09:30:04 ago Exp $ EAPI=5 @@ -9,7 +9,7 @@ inherit php-pear-r1 DESCRIPTION="Abstracts parsing and rendering rules for Wiki markup in structured plain text" LICENSE="LGPL-2.1 PHP-2.02" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86" IUSE="" # Pull from github as pear.php.net is not updated SRC_URI="https://github.com/pear/${PHP_PEAR_PKG_NAME}/archive/${PEAR_PV}.tar.gz -> ${P}.tar.gz" diff --git a/dev-php/php-openid/Manifest b/dev-php/php-openid/Manifest index 0a8be6ff1e46..73a6cc805479 100644 --- a/dev-php/php-openid/Manifest +++ b/dev-php/php-openid/Manifest @@ -1 +1 @@ -DIST fff9217fb1acda132702730b66b10981ea9d4cac.tar.gz 396390 SHA256 efeac8eaf8880f93d8fcc118e498b944e50a3d23536d5f3c6a7bb16cdfc0634f SHA512 930567426a5aa7d5967f4ef231f78c5719e174e6be7b78f62ecdd9e2bc2ec99e7c6051585ae3a92c6e005e05460d394d81b4c0cdb80ac0ffdfe5eaf6fdb9f625 WHIRLPOOL 6777d7cec562ebb8a4519e4ff451bfd0a8b54d6b881fe119d15de905c9db876e2c431815077d772cefeccc33f36be9d5c426f921c8bba63afd3bb29b0cfe0cb2 +DIST php-openid-fff9217fb1acda132702730b66b10981ea9d4cac.tar.gz 396390 SHA256 efeac8eaf8880f93d8fcc118e498b944e50a3d23536d5f3c6a7bb16cdfc0634f SHA512 930567426a5aa7d5967f4ef231f78c5719e174e6be7b78f62ecdd9e2bc2ec99e7c6051585ae3a92c6e005e05460d394d81b4c0cdb80ac0ffdfe5eaf6fdb9f625 WHIRLPOOL 6777d7cec562ebb8a4519e4ff451bfd0a8b54d6b881fe119d15de905c9db876e2c431815077d772cefeccc33f36be9d5c426f921c8bba63afd3bb29b0cfe0cb2 diff --git a/dev-php/php-openid/php-openid-2.2.3_pre20140423.ebuild b/dev-php/php-openid/php-openid-2.2.3_pre20140423.ebuild index 5642d3dc4c2f..718e44703d53 100644 --- a/dev-php/php-openid/php-openid-2.2.3_pre20140423.ebuild +++ b/dev-php/php-openid/php-openid-2.2.3_pre20140423.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php/php-openid/php-openid-2.2.3_pre20140423.ebuild,v 1.1 2014/10/07 13:39:46 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/php-openid/php-openid-2.2.3_pre20140423.ebuild,v 1.2 2015/04/18 13:01:30 swegener Exp $ EAPI=5 MY_PV="fff9217fb1acda132702730b66b10981ea9d4cac" @@ -9,7 +9,7 @@ MY_P="${PN}-${MY_PV}" PHP_LIB_NAME="Auth" DESCRIPTION="PHP OpenID implementation" HOMEPAGE="https://github.com/openid/php-openid" -SRC_URI="https://github.com/openid/${PN}/archive/${MY_PV}.tar.gz" +SRC_URI="https://github.com/openid/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" diff --git a/dev-php/php-redmine-api/Manifest b/dev-php/php-redmine-api/Manifest index 0947620d8b55..85edf3d2398e 100644 --- a/dev-php/php-redmine-api/Manifest +++ b/dev-php/php-redmine-api/Manifest @@ -1 +1 @@ -DIST v1.5.2.tar.gz 31126 SHA256 466a83703997793b0bc783c0b61aa83824c690e233a5278db2b9e7bd31108a43 SHA512 cf39a154edc3994d380901ef20f6d1f26dc948a45664c819fd98225d86e6aef440518fa70896ca72149ed7ed2a163df856f33f6e9b3b36858573f118b22f10e5 WHIRLPOOL afe4eba58769ab17e18f321bea887e45e1853343afa125c67b79c260e4875841cc321e541e54fcd73541f1c56ae14c2cbffa67834965ce25ac8fc948f94575bd +DIST php-redmine-api-1.5.2.tar.gz 31126 SHA256 466a83703997793b0bc783c0b61aa83824c690e233a5278db2b9e7bd31108a43 SHA512 cf39a154edc3994d380901ef20f6d1f26dc948a45664c819fd98225d86e6aef440518fa70896ca72149ed7ed2a163df856f33f6e9b3b36858573f118b22f10e5 WHIRLPOOL afe4eba58769ab17e18f321bea887e45e1853343afa125c67b79c260e4875841cc321e541e54fcd73541f1c56ae14c2cbffa67834965ce25ac8fc948f94575bd diff --git a/dev-php/php-redmine-api/php-redmine-api-1.5.2.ebuild b/dev-php/php-redmine-api/php-redmine-api-1.5.2.ebuild index 7bc581736b1a..d9403cedc41f 100644 --- a/dev-php/php-redmine-api/php-redmine-api-1.5.2.ebuild +++ b/dev-php/php-redmine-api/php-redmine-api-1.5.2.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php/php-redmine-api/php-redmine-api-1.5.2.ebuild,v 1.4 2015/04/14 18:09:46 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/php-redmine-api/php-redmine-api-1.5.2.ebuild,v 1.5 2015/04/18 13:00:14 swegener Exp $ EAPI=5 DESCRIPTION="A simple, object-oriented, PHP Redmine API client" HOMEPAGE="https://github.com/kbsali/${PN}" -SRC_URI="https://github.com/kbsali/${PN}/archive/v${PV}.tar.gz" +SRC_URI="https://github.com/kbsali/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" diff --git a/dev-python/Djblets/Djblets-0.7.30.ebuild b/dev-python/Djblets/Djblets-0.7.30.ebuild deleted file mode 100644 index 84a029b38bd4..000000000000 --- a/dev-python/Djblets/Djblets-0.7.30.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/Djblets/Djblets-0.7.30.ebuild,v 1.2 2015/04/08 08:05:05 mgorny Exp $ - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 versionator - -DESCRIPTION="A collection of useful extensions for Django" -HOMEPAGE="http://github.com/djblets/djblets" -SRC_URI="http://downloads.reviewboard.org/releases/${PN}/$(get_version_component_range 1-2)/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=dev-python/django-1.4.13[${PYTHON_USEDEP}] - =dev-python/django-pipeline-1.2.24[${PYTHON_USEDEP}] - >=dev-python/feedparser-5.1.2[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - dev-python/django-evolution[${PYTHON_USEDEP}]" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/Djblets/Manifest b/dev-python/Djblets/Manifest index 6a42b1d87522..732f56a82c88 100644 --- a/dev-python/Djblets/Manifest +++ b/dev-python/Djblets/Manifest @@ -1,2 +1 @@ -DIST Djblets-0.7.30.tar.gz 452072 SHA256 853b151b6002ddae58738a97629d6fd7745cf1837d7a19c0b3519a2da16618a5 SHA512 fe51267a154af111614a3ccd508622e0b31ff8defccd5f416e5494491ed5e8e3a81c3bd5ea8623e0aec1eafb8f82c7f47fa0214cf24d7e8e42c39a1381214230 WHIRLPOOL b52f2c731f94f86eca80420b7a308f85644f3f58b473c0e72cf7c4861cc47181861edf41528f52b9623a1d63b87d95de570cc8e0d2e536f3b8e322054ba2939f DIST Djblets-0.7.31.tar.gz 430369 SHA256 c6bdb1fed30ec1c77a8b07d670a170ecc55404363adf09b2860903a328909e12 SHA512 d0defd2a6e0caecd807e156d968b0128266d60aaf336303ec9ea3e01be1f01455bc763da02d639e677f1122f8eda8e039054ae16222879392eff332ec7b49969 WHIRLPOOL 7063209e5d3e55d89d4cc6fcfea584e24712d2427870448141eefedd29a94af0f4eb41df6097962d513ba09fa56b7cb1a1e5cf17a13646a2c3f046407b4f9977 diff --git a/dev-python/django-appconf/Manifest b/dev-python/django-appconf/Manifest index 4f5f92bffe0d..be65e5bb5787 100644 --- a/dev-python/django-appconf/Manifest +++ b/dev-python/django-appconf/Manifest @@ -1 +1 @@ -DIST v0.6.tar.gz 14072 SHA256 d3f4bcabcb3a9559775c5f4e94cef47f936b1df63703542bc8d912637452e75c SHA512 d2a4aea07eeabdc32ed85cf0625702f3e7861b82d1e47660f3761dedff42a3bd3bfcc54dc3d46072758bea1a34af160f7a908bf0925c05b7409f1224f4a7245d WHIRLPOOL f357a26a28476048ce97a1b85309c87382e750bb1ff9ea8552e194423e815b8945da5367200872096ede6177133094314e9a4a4ca4c5a058b273ab46aacb5091 +DIST django-appconf-0.6.tar.gz 14072 SHA256 d3f4bcabcb3a9559775c5f4e94cef47f936b1df63703542bc8d912637452e75c SHA512 d2a4aea07eeabdc32ed85cf0625702f3e7861b82d1e47660f3761dedff42a3bd3bfcc54dc3d46072758bea1a34af160f7a908bf0925c05b7409f1224f4a7245d WHIRLPOOL f357a26a28476048ce97a1b85309c87382e750bb1ff9ea8552e194423e815b8945da5367200872096ede6177133094314e9a4a4ca4c5a058b273ab46aacb5091 diff --git a/dev-python/django-appconf/django-appconf-0.6.ebuild b/dev-python/django-appconf/django-appconf-0.6.ebuild index e236d076a510..21ec36e85260 100644 --- a/dev-python/django-appconf/django-appconf-0.6.ebuild +++ b/dev-python/django-appconf/django-appconf-0.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/django-appconf/django-appconf-0.6.ebuild,v 1.8 2015/03/08 23:43:54 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/django-appconf/django-appconf-0.6.ebuild,v 1.9 2015/04/18 12:58:59 swegener Exp $ EAPI=5 PYTHON_COMPAT=( python{2_7,3_3,3_4} ) @@ -9,7 +9,7 @@ inherit distutils-r1 DESCRIPTION="A helper class for handling configuration defaults of packaged apps gracefully" HOMEPAGE="https://github.com/jezdez/django-appconf http://django-appconf.readthedocs.org/" -SRC_URI="https://github.com/jezdez/${PN}/archive/v${PV}.tar.gz" +SRC_URI="https://github.com/jezdez/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="amd64 x86" IUSE="doc test" diff --git a/dev-python/django-debug-toolbar/django-debug-toolbar-1.3.ebuild b/dev-python/django-debug-toolbar/django-debug-toolbar-1.3.ebuild index 921f384fc39d..7a9873e2b2ed 100644 --- a/dev-python/django-debug-toolbar/django-debug-toolbar-1.3.ebuild +++ b/dev-python/django-debug-toolbar/django-debug-toolbar-1.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/django-debug-toolbar/django-debug-toolbar-1.3.ebuild,v 1.2 2015/04/14 09:32:13 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/django-debug-toolbar/django-debug-toolbar-1.3.ebuild,v 1.3 2015/04/19 09:51:07 ago Exp $ EAPI=5 @@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" SLOT="0" LICENSE="BSD" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="doc examples" RDEPEND=" diff --git a/dev-python/django/django-1.7.7.ebuild b/dev-python/django/django-1.7.7.ebuild index ce9744d4d5f6..84044382ebd2 100644 --- a/dev-python/django/django-1.7.7.ebuild +++ b/dev-python/django/django-1.7.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.7.7.ebuild,v 1.2 2015/04/08 13:36:49 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.7.7.ebuild,v 1.3 2015/04/19 09:50:49 ago Exp $ EAPI=5 @@ -18,7 +18,7 @@ SRC_URI="https://www.djangoproject.com/m/releases/$(get_version_component_range LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="doc sqlite test" RDEPEND="" diff --git a/dev-python/enable/Manifest b/dev-python/enable/Manifest index 2ae15b779b9b..8be035dcb02f 100644 --- a/dev-python/enable/Manifest +++ b/dev-python/enable/Manifest @@ -1 +1 @@ -DIST 4.4.1.tar.gz 2507048 SHA256 6bdba2754410b89d6c0531482a20b930c2a3965d843f374eda7e1e1902a03bdb SHA512 72c879f19e26a4311b900cb4665969b9f806ce47b23c214a25e3ec308cc5300b6d71084a793215b05302fbeba09e13a4561e661c3bddb700d529bd31cfeb4dff WHIRLPOOL be172d97a979270b3a355436a323f72e00eb1fe1544cfd73091f6d56eded44b463198c48bbb8dbabc06e9a417cf24fdd898eecae316376cd1b9845cd4af03d02 +DIST enable-4.4.1.tar.gz 2507048 SHA256 6bdba2754410b89d6c0531482a20b930c2a3965d843f374eda7e1e1902a03bdb SHA512 72c879f19e26a4311b900cb4665969b9f806ce47b23c214a25e3ec308cc5300b6d71084a793215b05302fbeba09e13a4561e661c3bddb700d529bd31cfeb4dff WHIRLPOOL be172d97a979270b3a355436a323f72e00eb1fe1544cfd73091f6d56eded44b463198c48bbb8dbabc06e9a417cf24fdd898eecae316376cd1b9845cd4af03d02 diff --git a/dev-python/enable/enable-4.4.1.ebuild b/dev-python/enable/enable-4.4.1.ebuild index d25d854f6adc..4712dcb45c02 100644 --- a/dev-python/enable/enable-4.4.1.ebuild +++ b/dev-python/enable/enable-4.4.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/enable/enable-4.4.1.ebuild,v 1.4 2015/03/08 23:46:17 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/enable/enable-4.4.1.ebuild,v 1.5 2015/04/18 12:57:55 swegener Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) @@ -9,7 +9,7 @@ inherit distutils-r1 virtualx flag-o-matic DESCRIPTION="Enthought Tool Suite: Drawing and interaction packages" HOMEPAGE="http://code.enthought.com/projects/enable/ http://pypi.python.org/pypi/enable" -SRC_URI="https://github.com/enthought/${PN}/archive/${PV}.tar.gz" +SRC_URI="https://github.com/enthought/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" diff --git a/dev-python/fonttools/fonttools-2.4.ebuild b/dev-python/fonttools/fonttools-2.4.ebuild index 208007ac7581..a878bf97c556 100644 --- a/dev-python/fonttools/fonttools-2.4.ebuild +++ b/dev-python/fonttools/fonttools-2.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/fonttools/fonttools-2.4.ebuild,v 1.6 2015/04/14 10:55:38 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/fonttools/fonttools-2.4.ebuild,v 1.7 2015/04/19 09:37:27 pacho Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) @@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 arm ~arm64 ia64 ppc ~x86" +KEYWORDS="amd64 arm ~arm64 ia64 ppc x86" IUSE="" DEPEND=">=dev-python/numpy-1.0.2[${PYTHON_USEDEP}]" diff --git a/dev-python/fuse-python/files/fuse-python-0.2-fix-ctors.patch b/dev-python/fuse-python/files/fuse-python-0.2-fix-ctors.patch deleted file mode 100644 index 4ec50f2f3508..000000000000 --- a/dev-python/fuse-python/files/fuse-python-0.2-fix-ctors.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- fuse.py -+++ fuse.py -@@ -461,13 +462,14 @@ - FUSE, see ``fuse.h``). - """ - -- def __init__(self, name, **kw): -+ def __init__(self, name=None, **kw): - - self.l_type = None - self.l_start = None - self.l_len = None - self.l_pid = None - -+ kw['name'] = name - FuseStruct.__init__(self, **kw) - - -@@ -477,11 +479,12 @@ - http://www.opengroup.org/onlinepubs/009695399/basedefs/time.h.html - """ - -- def __init__(self, name, **kw): -+ def __init__(self, name=None, **kw): - - self.tv_sec = None - self.tv_nsec = None - -+ kw['name'] = name - FuseStruct.__init__(self, **kw) - - diff --git a/dev-python/fuse-python/files/fuse_python_accept_none.patch b/dev-python/fuse-python/files/fuse_python_accept_none.patch deleted file mode 100644 index 9f7180050b9c..000000000000 --- a/dev-python/fuse-python/files/fuse_python_accept_none.patch +++ /dev/null @@ -1,75 +0,0 @@ ---- fuseparts/_fusemodule.c.old 2007-06-18 16:20:09.000000000 +0200 -+++ fuseparts/_fusemodule.c 2008-04-08 01:18:43.000000000 +0200 -@@ -182,8 +182,50 @@ - * the getattr type functions. - */ - --#define fetchattr_soft_d(st, attr, defa) \ -- fetchattr_soft(st, attr) else st->attr = defa -+// (sorry ...) -+ -+#define good(attr) _GOOD_SPAGHETTI_ ## attr -+#define bad(attr) _BAD_SPAGHETTI_ ## attr -+ -+/* -+ * This macro checks whether an attribute is available and not None. -+ * Success --> set attribute and goto _GOOD_SPAGHETTI -+ * Failure --> goto _BAD_SPAGHETTI -+ * Error --> goto OUT_DECREF -+ */ -+#define fetchattr_soft_none_pre(st, attr) \ -+ if (PyObject_HasAttrString(v, #attr)) { \ -+ if (!(pytmp = PyObject_GetAttrString(v, #attr))) \ -+ goto OUT_DECREF; \ -+ else if (pytmp != Py_None) { \ -+ py2attr(st, attr) \ -+ goto good(attr); \ -+ } \ -+ else { \ -+ Py_DECREF(pytmp); \ -+ goto bad(attr); \ -+ } \ -+ } \ -+ goto bad(attr); -+ -+/** -+ * Calls fetchattr_soft_none_pre and ignores failure. -+ */ -+#define fetchattr_soft_none(st, attr) \ -+ fetchattr_soft_none_pre(st, attr); \ -+ good(attr): ; \ -+ bad(attr): ; -+ -+/** -+ * Calls fetchattr_soft_none_pre and sets a default value on failure. -+ */ -+#define fetchattr_soft_d(st, attr, defa) \ -+ fetchattr_soft_none_pre(st, attr); \ -+ bad(attr): \ -+ st->attr = defa; \ -+ good(attr): ; -+ -+// - - #define FETCH_STAT_DATA() \ - fetchattr(st, st_mode); \ -@@ -206,7 +248,7 @@ - * autotools so we just dare to throw these in as is. \ - */ \ - \ -- fetchattr_soft(st, st_rdev); \ -+ fetchattr_soft_none(st, st_rdev); \ - fetchattr_soft_d(st, st_blksize, 4096); \ - fetchattr_soft_d(st, st_blocks, (st->st_size + 511)/512) - -@@ -245,6 +287,10 @@ - #endif - - #undef fetchattr_soft_d -+#undef fetchattr_soft_none -+#undef fetchattr_soft_none_pre -+#undef good -+#undef bad - #undef FETCH_STAT_DATA - - static int diff --git a/dev-python/fuse-python/fuse-python-0.2.1-r1.ebuild b/dev-python/fuse-python/fuse-python-0.2.1-r1.ebuild index 041a30adbe80..89d51e8c6d9b 100644 --- a/dev-python/fuse-python/fuse-python-0.2.1-r1.ebuild +++ b/dev-python/fuse-python/fuse-python-0.2.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/fuse-python/fuse-python-0.2.1-r1.ebuild,v 1.3 2015/04/08 08:05:23 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/fuse-python/fuse-python-0.2.1-r1.ebuild,v 1.4 2015/04/19 09:37:40 pacho Exp $ EAPI=5 @@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 pypy ) inherit distutils-r1 -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" DESCRIPTION="Python FUSE bindings" HOMEPAGE="http://fuse.sourceforge.net/wiki/index.php/FusePython" diff --git a/dev-python/fuse-python/fuse-python-0.2.1.ebuild b/dev-python/fuse-python/fuse-python-0.2.1.ebuild deleted file mode 100644 index 29d01b19f65d..000000000000 --- a/dev-python/fuse-python/fuse-python-0.2.1.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/fuse-python/fuse-python-0.2.1.ebuild,v 1.4 2012/02/22 07:26:26 patrick Exp $ - -EAPI="2" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3.* *-jython" - -inherit eutils distutils - -KEYWORDS="amd64 x86" -DESCRIPTION="Python FUSE bindings" -HOMEPAGE="http://fuse.sourceforge.net/wiki/index.php/FusePython" - -SRC_URI="mirror://sourceforge/fuse/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -DEPEND=">=sys-fs/fuse-2.0" -RDEPEND="${DEPEND}" - -PYTHON_MODNAME="fuse.py fuseparts" diff --git a/dev-python/geoip-python/Manifest b/dev-python/geoip-python/Manifest index 12938c7df248..b9af7560b787 100644 --- a/dev-python/geoip-python/Manifest +++ b/dev-python/geoip-python/Manifest @@ -1,3 +1,3 @@ DIST GeoIP-Python-1.2.8.tar.gz 15595 SHA256 8b946307355b60cb0f2b0be8ac90c1231286e0e79917509763267fce01a50e73 SHA512 4c529252b7211d9762f3bd51c47e9456e9c7b8443b3c584623c65e84016ecf28b8a7f6a25cb7fc133182bbc1fe04de14014ab8963a4a91b477dd518cc7f82d29 WHIRLPOOL 272af16b95e9981bf6f0640aaf0ed348449aaac4a94ce3108d7fdc88381267647a59c95e2f1be94761451ca91ad78994a993cb97549d93803a17f9313b28ba18 -DIST v1.3.1.tar.gz 35343 SHA256 168efd45358faf0af23726753135a17aadad198eb63dfd79f627ac561f9b2461 SHA512 8a308ff6f3845a175ad21c4f3ea7d11c7dd01eaa0a7d78f4deb0252ffc7ff4e3414edc0fba63ce7b73edbd2d96bd7f393e34cfba8a3f16818730a68a031efcde WHIRLPOOL 6a0699116f402019e86b0580f483d56ccf2d2deb425b86f02fdca265d4e1d1b38f6e182b114134a57d8773674cbdb020473edaac9dc9d921648d9e4a40e57cdd -DIST v1.3.2.tar.gz 35674 SHA256 95e966e9d62b73a7933434b61b0e09fdf25190047ea4d3b92922e03a7e83034d SHA512 284209a6894d55ef95844c5c4c7aafff99ebcb13996e5ff64a0c31b38677e13c11d51fd8b0250d0fa097f15805c27b572d5aa12c2b217a839afe3cdd0851c414 WHIRLPOOL bd123b2417b2d0aa0e9d91e3b24276b806e470ce7bcd90977676fb3a52af5c5096932c542100221e0aed4723f93e00b5949fa3bc7970ef6f312b4a5512f3dc7d +DIST geoip-api-python-1.3.1.tar.gz 35343 SHA256 168efd45358faf0af23726753135a17aadad198eb63dfd79f627ac561f9b2461 SHA512 8a308ff6f3845a175ad21c4f3ea7d11c7dd01eaa0a7d78f4deb0252ffc7ff4e3414edc0fba63ce7b73edbd2d96bd7f393e34cfba8a3f16818730a68a031efcde WHIRLPOOL 6a0699116f402019e86b0580f483d56ccf2d2deb425b86f02fdca265d4e1d1b38f6e182b114134a57d8773674cbdb020473edaac9dc9d921648d9e4a40e57cdd +DIST geoip-api-python-1.3.2.tar.gz 35674 SHA256 95e966e9d62b73a7933434b61b0e09fdf25190047ea4d3b92922e03a7e83034d SHA512 284209a6894d55ef95844c5c4c7aafff99ebcb13996e5ff64a0c31b38677e13c11d51fd8b0250d0fa097f15805c27b572d5aa12c2b217a839afe3cdd0851c414 WHIRLPOOL bd123b2417b2d0aa0e9d91e3b24276b806e470ce7bcd90977676fb3a52af5c5096932c542100221e0aed4723f93e00b5949fa3bc7970ef6f312b4a5512f3dc7d diff --git a/dev-python/geoip-python/geoip-python-1.3.1.ebuild b/dev-python/geoip-python/geoip-python-1.3.1.ebuild index 14897d50f745..08f269254540 100644 --- a/dev-python/geoip-python/geoip-python-1.3.1.ebuild +++ b/dev-python/geoip-python/geoip-python-1.3.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/geoip-python/geoip-python-1.3.1.ebuild,v 1.2 2015/01/26 06:02:56 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/geoip-python/geoip-python-1.3.1.ebuild,v 1.3 2015/04/18 12:56:25 swegener Exp $ EAPI=5 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) @@ -12,7 +12,7 @@ MY_P="${MY_PN}-${PV}" DESCRIPTION="Python bindings for GeoIP" HOMEPAGE="https://github.com/maxmind/geoip-api-python" -SRC_URI="https://github.com/maxmind/${MY_PN}/archive/v${PV}.tar.gz" +SRC_URI="https://github.com/maxmind/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz" LICENSE="GPL-2+" SLOT="0" diff --git a/dev-python/geoip-python/geoip-python-1.3.2.ebuild b/dev-python/geoip-python/geoip-python-1.3.2.ebuild index 89e5400c3706..fefff0bb14a0 100644 --- a/dev-python/geoip-python/geoip-python-1.3.2.ebuild +++ b/dev-python/geoip-python/geoip-python-1.3.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/geoip-python/geoip-python-1.3.2.ebuild,v 1.2 2015/01/26 06:02:56 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/geoip-python/geoip-python-1.3.2.ebuild,v 1.3 2015/04/18 12:56:25 swegener Exp $ EAPI=5 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 ) @@ -12,7 +12,7 @@ MY_P="${MY_PN}-${PV}" DESCRIPTION="Python bindings for GeoIP" HOMEPAGE="https://github.com/maxmind/geoip-api-python" -SRC_URI="https://github.com/maxmind/${MY_PN}/archive/v${PV}.tar.gz" +SRC_URI="https://github.com/maxmind/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz" LICENSE="GPL-2+" SLOT="0" diff --git a/dev-python/graph-tool/Manifest b/dev-python/graph-tool/Manifest index 0668126e9170..0fd5edd46161 100644 --- a/dev-python/graph-tool/Manifest +++ b/dev-python/graph-tool/Manifest @@ -1,2 +1,3 @@ DIST graph-tool-2.2.36.tar.bz2 15050904 SHA256 e1e030306480393464501cbcf3f3c938c2105c95fd0d67a8fe8bb4296e0be872 SHA512 3867fed367b547f28147c3234cf391d5415e5cf4594bc495abab1e1f827ba89af44d9d2bc92ee604ed184ce48f1644076aa852a0035fa2f8cdb449157d6b32bc WHIRLPOOL 741091c5504234767ed2662f69307aeaffb344ec132f708b494288d03485ff1910a967b244c35f5e7b77bad0564b249fd7b80ddb39051928f9806310c4d7843e DIST graph-tool-2.2.38.tar.bz2 15050391 SHA256 7b4181184acb28e02e0c013858d69f42af4d7a6ed3327521f8eccc0be538012c SHA512 d6a4299dc0df4dbf1485656f9c2bdc3c00f37d342b313af4116f00bfbf31c7d425873aa98e4361115985b87695080fcac6cc97e7930e6903d50a9d61ccf81e60 WHIRLPOOL c03f82fe6b151361c4b6f6979117dd35e2fe4913caacc1e3ca0749c38a7e8a3c6034a7dbd676294a3e23926e2b42c7ead9ab38b19f5d37b278a773971d8e1fc1 +DIST graph-tool-2.2.40.tar.bz2 15058030 SHA256 5ccf2f174663c02d0d8548254d29dbc7f652655d13c1902dafc587c9a1c156e7 SHA512 db3bcbc49d724185d2da8c636c9c7f0aaae39fcae8ca6454bbad1c893dd77ea96eca5512f338d1f06f6ea4ef181f88a8095c5b40493d63b22174fb0fde8bfe83 WHIRLPOOL eeb8eaa1fae59de3d4d1c360a465bdb5e443823e3c0b703e7edee82c81992f443a8a744fd41c83516ea025de5b72c6bf89032d5a458bb112e2e3ea34393f9e74 diff --git a/dev-python/graph-tool/graph-tool-2.2.40.ebuild b/dev-python/graph-tool/graph-tool-2.2.40.ebuild new file mode 100644 index 000000000000..c53c5aabf816 --- /dev/null +++ b/dev-python/graph-tool/graph-tool-2.2.40.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/graph-tool/graph-tool-2.2.40.ebuild,v 1.1 2015/04/18 07:54:02 idella4 Exp $ + +EAPI=5 +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) + +inherit check-reqs toolchain-funcs python-r1 + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/count0/graph-tool.git" + inherit autotools git-r3 +else + SRC_URI="http://downloads.skewed.de/${PN}/${P}.tar.bz2" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="An efficient python module for manipulation and statistical analysis of graphs" +HOMEPAGE="http://graph-tool.skewed.de/" + +LICENSE="GPL-3" +SLOT="0" +IUSE="+cairo openmp" + +# Bug #536734; configure sets boostlib 1.53.0 but 1.54.0 is required +CDEPEND="${PYTHON_DEPS} + >=dev-libs/boost-1.54.0[python,${PYTHON_USEDEP}] + dev-libs/expat + dev-python/numpy[${PYTHON_USEDEP}] + sci-libs/scipy[${PYTHON_USEDEP}] + >=sci-mathematics/cgal-3.5 + cairo? ( + dev-cpp/cairomm + dev-python/pycairo[${PYTHON_USEDEP}] + )" +RDEPEND="${CDEPEND} + dev-python/matplotlib[${PYTHON_USEDEP}]" +DEPEND="${CDEPEND} + dev-cpp/sparsehash + virtual/pkgconfig" + +# most machines don't have enough ram for parallel builds +MAKEOPTS="${MAKEOPTS} -j1" + +# bug 453544 +CHECKREQS_DISK_BUILD="6G" + +pkg_pretend() { + if use openmp ; then + tc-has-openmp || die "Please switch to an openmp compatible compiler" + fi + check-reqs_pkg_pretend +} + +src_prepare() { + [[ ${PV} == "9999" ]] && eautoreconf + >py-compile + python_copy_sources +} + +src_configure() { + local threads + has_version dev-libs/boost[threads] && threads="-mt" + + configure() { + econf \ + --disable-static \ + --disable-optimization \ + $(use_enable openmp) \ + $(use_enable cairo) \ + --with-boost-python="${EPYTHON: -3}${threads}" + } + python_foreach_impl run_in_build_dir configure +} + +src_compile() { + python_foreach_impl run_in_build_dir default +} + +src_install() { + python_foreach_impl run_in_build_dir default + prune_libtool_files --modules + + # remove unwanted extra docs + rm -r "${ED}"/usr/share/doc/${PN} || die +} + +run_in_build_dir() { + pushd "${BUILD_DIR}" > /dev/null + "$@" + popd > /dev/null +} diff --git a/dev-python/html2text/Manifest b/dev-python/html2text/Manifest index bb52f0a3fe74..990fc0dd6bb1 100644 --- a/dev-python/html2text/Manifest +++ b/dev-python/html2text/Manifest @@ -1,2 +1 @@ DIST html2text-2014.4.5.tar.gz 30177 SHA256 b6f37556650a32cd625c56f2db3fa2ca2d57a7ff0a4be7a3b9118dd911c8efd6 SHA512 740750f838f0370c6b05bb1538d3de99cfd074acc95923440b14818b934e49df1ad0864bfe1a4fcf0b8fd3c9c402a4b2edaeabe992aa0870acc7ce3b6cd3924a WHIRLPOOL 502c08327cbd98ac08e19ff42b633cb7f08204123aa4a8d15826c4137976367cd7e7073660aa61788301d1817ade02be93a014caeb2ca6c53311df5fcf8adc55 -DIST html2text-3.200.3.tar.gz 21446 SHA256 040a4ace61446ab1e323e71e95e8ce16a5f0cc889027f17974ef8be1391721df SHA512 4e0d4a422c9aeae92431180ad3fb86ff37adf4dfb3d6bfff288a653b18f20d1b596fb201da0c60637d186700ca6cc84caf705f390bd3260e79a18938d81a93f1 WHIRLPOOL 0bac76c72f4d6cc233e9b8f938560b45df40c0ba891fc9f2bfcc83491d0cca77e12d31626c8e34735f1a3ce09683d6ea72e5833448af68918392275e0794b0cb diff --git a/dev-python/html2text/html2text-2014.4.5-r1.ebuild b/dev-python/html2text/html2text-2014.4.5-r1.ebuild index 26883974f28c..7b52e303df36 100644 --- a/dev-python/html2text/html2text-2014.4.5-r1.ebuild +++ b/dev-python/html2text/html2text-2014.4.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/html2text/html2text-2014.4.5-r1.ebuild,v 1.6 2015/03/27 16:26:47 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/html2text/html2text-2014.4.5-r1.ebuild,v 1.7 2015/04/19 07:02:14 pacho Exp $ EAPI=5 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) @@ -14,7 +14,7 @@ SRC_URI="https://github.com/Alir3z4/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" RDEPEND="dev-python/chardet[${PYTHON_USEDEP}] diff --git a/dev-python/html2text/html2text-3.200.3.ebuild b/dev-python/html2text/html2text-3.200.3.ebuild deleted file mode 100644 index dc18cc59a8c3..000000000000 --- a/dev-python/html2text/html2text-3.200.3.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/html2text/html2text-3.200.3.ebuild,v 1.5 2014/08/10 21:11:59 slyfox Exp $ - -EAPI=3 - -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="*-jython" - -inherit distutils - -DESCRIPTION="Turn HTML into equivalent Markdown-structured text" -HOMEPAGE="http://www.aaronsw.com/2002/html2text/ - https://github.com/aaronsw/html2text http://pypi.python.org/pypi/html2text" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND="dev-python/chardet - dev-python/feedparser - dev-python/setuptools" -DEPEND="${RDEPEND}" - -PYTHON_MODNAME="${PN}.py" diff --git a/dev-python/ipy/ipy-0.82a.ebuild b/dev-python/ipy/ipy-0.82a.ebuild index 0e21173c65e6..9ec0b9a7ab92 100644 --- a/dev-python/ipy/ipy-0.82a.ebuild +++ b/dev-python/ipy/ipy-0.82a.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/ipy/ipy-0.82a.ebuild,v 1.2 2015/04/13 07:55:54 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/ipy/ipy-0.82a.ebuild,v 1.3 2015/04/19 09:38:52 ago Exp $ EAPI="5" @@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86" IUSE="examples" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/msgpack/msgpack-0.4.2.ebuild b/dev-python/msgpack/msgpack-0.4.2.ebuild index f762406a0f1b..770b853a2dfc 100644 --- a/dev-python/msgpack/msgpack-0.4.2.ebuild +++ b/dev-python/msgpack/msgpack-0.4.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/msgpack/msgpack-0.4.2.ebuild,v 1.7 2015/01/31 14:09:43 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/msgpack/msgpack-0.4.2.ebuild,v 1.8 2015/04/19 09:41:22 pacho Exp $ EAPI=5 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) @@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm ~x86" +KEYWORDS="amd64 ~arm x86" IUSE="test" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest index 35076f1ae1d7..53ea331bf5c3 100644 --- a/dev-python/pygments/Manifest +++ b/dev-python/pygments/Manifest @@ -1,4 +1,5 @@ DIST Pygments-1.6.tar.gz 1423161 SHA256 799ed4caf77516e54440806d8d9cd82a7607dfdf4e4fb643815171a4b5c921c0 SHA512 552d0c2a1296773a5482122bd5cbec0ce91a497cd86ee105e1c5ddf2bfa9c206fcc7de504c6da480344c6e1bee30d7b26012fd061dcb2091d8b2b21bcd163bf0 WHIRLPOOL babf6e638529a902fab37c17fb1215aca3c04c3e2a00d00bdff7e8049ca6a46c238282c088e79816f7c6879fc9b13e3de9824ae93d3f184f4d9aae58af0c9c8d +DIST Pygments-2.0.1.tar.gz 2739480 SHA256 5e039e1d40d232981ed58914b6d1ac2e453a7e83ddea22ef9f3eeadd01de45cb SHA512 7c11c7dc09f6a5d964a512eb4c31f34fc0422b29e3124bd4ed0f4ab594c750d39f990e86f65287f499ea1051a27c1087e445332f6b23ad021d6e2d41c6092f3e WHIRLPOOL 7f5d31f86183b230f54d1f08b5e4cb942d38f28d8868ed94b4d129601aa845864cd0f45d5edb2102f655c2800b2e54335d6f4f61975b2f3a8ceeb0b7e5e13217 DIST Pygments-2.0.2.tar.gz 3462280 SHA256 7320919084e6dac8f4540638a46447a3bd730fca172afc17d2c03eed22cf4f51 SHA512 b58e2cc535ba3f1fda7cb147e12af128bc2755de56cf465f8f1d642730eaef50c06551cc4cc44f25f726b00f3f1c9c2078977233b11c0b6a7e1add6a4069c27e WHIRLPOOL 4c98134f27dd29c89e4d6157284bdeecaa81c53d823e089292be21a6c418ba4ccfd458ced50326d5a356a7b6cb761a1990440096f5f3d820f776bb19fc0da09d DIST pygments-1.6_p20140324.tar.gz 1641814 SHA256 f762d1104ab38a4e870824113e3be3fedc918900622f1e73b9c34386ee7be14a SHA512 de84977f346b41a60a849e681581b36787712d39010e0e23624cc2d9741cb5afbbb0a4e860b5120e3cb77eb5fc68ddf11d0f6c1d15e0bb4d7c56d800017b19bf WHIRLPOOL 7531e7a2483f3c043967d32848694324007c5a1a7e206472a17f5515eb6960dc1bec774851d75bc4ccc4615594db0c5218713da22da6c2d1cbfdf995827746be DIST pygments-2.0.1.tar.gz 1641814 SHA256 f762d1104ab38a4e870824113e3be3fedc918900622f1e73b9c34386ee7be14a SHA512 de84977f346b41a60a849e681581b36787712d39010e0e23624cc2d9741cb5afbbb0a4e860b5120e3cb77eb5fc68ddf11d0f6c1d15e0bb4d7c56d800017b19bf WHIRLPOOL 7531e7a2483f3c043967d32848694324007c5a1a7e206472a17f5515eb6960dc1bec774851d75bc4ccc4615594db0c5218713da22da6c2d1cbfdf995827746be diff --git a/dev-python/pygments/pygments-2.0.1-r1.ebuild b/dev-python/pygments/pygments-2.0.1-r1.ebuild new file mode 100644 index 000000000000..d86dc586f505 --- /dev/null +++ b/dev-python/pygments/pygments-2.0.1-r1.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/pygments/pygments-2.0.1-r1.ebuild,v 1.2 2015/04/19 13:44:07 floppym Exp $ + +EAPI=5 +PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 ) + +inherit distutils-r1 bash-completion-r1 vcs-snapshot + +MY_PN="Pygments" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Pygments is a syntax highlighting package written in Python" +HOMEPAGE="http://pygments.org/ http://pypi.python.org/pypi/Pygments" +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="doc test" + +RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) + test? ( + dev-python/nose[${PYTHON_USEDEP}] + virtual/ttf-fonts )" +# dev-texlive/texlive-latexrecommended +# Removing / commenting out this dep. I can find no mention of it in tests other than +# importing pygment's own tex module. If it's there and I missed it just uncomment and re-add +# Tests pass without it + +S="${WORKDIR}/${MY_P}" + +python_compile_all() { + use doc && emake -C doc html +} + +python_test() { + cp -r -l tests "${BUILD_DIR}"/ || die + # With pypy3 there is 1 error out of 1556 tests when run as is and + # (SKIP=8, errors=1, failures=1) when run with 2to3; meh + nosetests -w "${BUILD_DIR}"/tests || die "Tests fail with ${EPYTHON}" +} + +python_install_all() { + use doc && local HTML_DOCS=( doc/_build/html/. ) + + distutils-r1_python_install_all + newbashcomp external/pygments.bashcomp pygmentize +} diff --git a/dev-python/pyodbc/pyodbc-3.0.7-r1.ebuild b/dev-python/pyodbc/pyodbc-3.0.7-r1.ebuild index fe82f826f63b..4fe7157d8926 100644 --- a/dev-python/pyodbc/pyodbc-3.0.7-r1.ebuild +++ b/dev-python/pyodbc/pyodbc-3.0.7-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pyodbc/pyodbc-3.0.7-r1.ebuild,v 1.1 2014/11/30 16:33:00 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pyodbc/pyodbc-3.0.7-r1.ebuild,v 1.2 2015/04/18 23:43:58 floppym Exp $ EAPI=5 @@ -24,5 +24,5 @@ DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}]" python_configure_all() { - append-cflags -fno-strict-aliasing + append-cxxflags -fno-strict-aliasing } diff --git a/dev-python/pyrax/Manifest b/dev-python/pyrax/Manifest index 65ceca6057c5..8d0abb6195ae 100644 --- a/dev-python/pyrax/Manifest +++ b/dev-python/pyrax/Manifest @@ -1,3 +1,3 @@ -DIST pyrax-1.7.2.tar.gz 280406 SHA256 55cad6874029aecbd47018ac7fd5cda60256213d356cbce9b84d6ac2add470c6 SHA512 5484f64c1748f806de929d0085fcf3fef5c40e48bbb1772463f233393415357c1e2a481b2cc96e2259dc2c4f75b554a77b22c0a758a3c14010a5ae3bbae57702 WHIRLPOOL 55dab8eac6f37fca9d8427ce880265f1724f9b27d0d8edd89674086c67e511bbc90d8f521517388e3e557deec90b740b0d26174df43323633357e28b7f795762 DIST pyrax-1.9.2.tar.gz 311901 SHA256 1971dd941cc750815a0b51d3b0ed6a30cfa9f1dcc562bca808b0708b9ffed8ed SHA512 e095349c42709e5cc382f4d90de2711d6ac53b1d41dd34c3969ed4423f8c5534ff902d78cfae71f6cb7bb4200fd1ab66305ebf43ab03b0c928580b34c06bc1ef WHIRLPOOL eec8a1aa3f99f39f5a461e40e64b23854313ca4ae8a8ef76ab78e103ce4b62a07531f019246a459e65cf6b5a0f67d582f316af3f5ebbec9dbb307a2c589c5182 DIST pyrax-1.9.3.tar.gz 307959 SHA256 0a3026c67df7bb84720cf562eef0fb15ad67dce79b6fc5e8da46621489be26bb SHA512 8ffb641e46d2f9cda079f619303f92c65fd41cf2ad773c5e8da981257fe9d4aac94e9bc08fab53e3b0a9b63a661381ff7805cbfd34ddef3275cba2d69858aa69 WHIRLPOOL 9060febb5b9d90cea5b248acf73af162df7b4badd66462916fd7e63f875edacde046c83fced1f5f03e500a1ca9d9f74fd746927d1c42942a561d002caa316d3d +DIST pyrax-1.9.4.tar.gz 312608 SHA256 5cc27688cccd4137a4c53a69b6e0e877054a0bafec899f8170ccc0b58fbf95f3 SHA512 be84e558095a7f76998dd7909cfa5f1ef97a1d65a5a3fe168d70e3978a5974b4eb1592690aac7b0bd52b09faed79fca52006b17e5a22008850088a953d5bef72 WHIRLPOOL ae1c5ae01bbe704404e589a3a1bf1b12abc77817bbdf6e879301dd0716b1f84aa80903ec1d5b4035eacca81221680d8fd44cf0112081a5aff6f4abfbf5973b7d diff --git a/dev-python/pyrax/metadata.xml b/dev-python/pyrax/metadata.xml index b1dc02afd2c1..4d830c770fc0 100644 --- a/dev-python/pyrax/metadata.xml +++ b/dev-python/pyrax/metadata.xml @@ -15,8 +15,4 @@ pyrax should work with most OpenStack-based cloud deployments, though it specifically targets the Rackspace public cloud. - - adds support for the keyring auth backend - - diff --git a/dev-python/pyrax/pyrax-1.7.2.ebuild b/dev-python/pyrax/pyrax-1.7.2.ebuild deleted file mode 100644 index 89626e7b813a..000000000000 --- a/dev-python/pyrax/pyrax-1.7.2.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pyrax/pyrax-1.7.2.ebuild,v 1.1 2014/04/01 19:21:48 prometheanfire Exp $ - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 - -DESCRIPTION="Python SDK for OpenStack/Rackspace APIs" -HOMEPAGE="https://github.com/openstack/python-novaclient" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test keyring" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/mock[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - >=dev-python/six-1.5.2[${PYTHON_USEDEP}] - >=dev-python/requests-2.2.1[${PYTHON_USEDEP}] - keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) - >=dev-python/python-novaclient-2.13.0[${PYTHON_USEDEP}] - dev-python/rackspace-novaclient[${PYTHON_USEDEP}] - >=dev-python/python-swiftclient-1.5.0[${PYTHON_USEDEP}] )" -RDEPEND=">=dev-python/requests-2.2.1[${PYTHON_USEDEP}] - >=dev-python/six-1.5.2[${PYTHON_USEDEP}] - keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) - >=dev-python/python-novaclient-2.13.0[${PYTHON_USEDEP}] - >=dev-python/python-swiftclient-1.5.0[${PYTHON_USEDEP}] - dev-python/rackspace-novaclient[${PYTHON_USEDEP}]" - -python_test() { - "${PYTHON}" -m nose -v tests/unit --with-coverage --cover-package=pyrax || die -# "${PYTHON}" -m nose -w tests/unit || die -# nosetests --with-coverage --cover-package=pyrax --cover-erase -w tests/unit/ || die -} diff --git a/dev-python/pyrax/pyrax-1.9.4.ebuild b/dev-python/pyrax/pyrax-1.9.4.ebuild new file mode 100644 index 000000000000..0be400381c5f --- /dev/null +++ b/dev-python/pyrax/pyrax-1.9.4.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/pyrax/pyrax-1.9.4.ebuild,v 1.1 2015/04/18 15:11:00 alunduil Exp $ + +EAPI=5 +PYTHON_COMPAT=( python2_7 ) + +inherit distutils-r1 + +DESCRIPTION="Python language bindings for OpenStack Clouds" +HOMEPAGE="https://github.com/rackspace/pyrax" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="examples test" + +CDEPEND=" + dev-python/keyring[${PYTHON_USEDEP}] + dev-python/mock[${PYTHON_USEDEP}] + >=dev-python/python-novaclient-2.13.0[${PYTHON_USEDEP}] + dev-python/rackspace-novaclient[${PYTHON_USEDEP}] + >=dev-python/requests-2.2.1[${PYTHON_USEDEP}] + >=dev-python/six-1.9.0[${PYTHON_USEDEP}] +" +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + ${CDEPEND} + dev-python/nose[${PYTHON_USEDEP}] + dev-python/rax-scheduled-images-python-novaclient-ext[${PYTHON_USEDEP}] + ) +" +RDEPEND="${CDEPEND}" + +python_test() { + nosetests tests/unit || die "Tests failed under ${EPYTHON}" +} + +python_install_all() { + use examples && local EXAMPLES=( samples/. ) + + distutils-r1_python_install_all +} diff --git a/dev-python/python-debian/Manifest b/dev-python/python-debian/Manifest index 77b6939f843c..5f894bddda9b 100644 --- a/dev-python/python-debian/Manifest +++ b/dev-python/python-debian/Manifest @@ -1 +1,2 @@ DIST python-debian_0.1.26.tar.xz 289496 SHA256 601e2a096c1490669f35080544875857bdc54b5f43bf1a37f88fccbf3740b4f8 SHA512 c857bdeaf651626c1b9d1f0f114bae961d073771f0a38caaa06785323bd586cf15fd2bf662a7bdc3af148f387756260b9d81378fdd5044bfabf7388de79c4d5a WHIRLPOOL 1dcf9a855e75ed483551edffba72265878208f3e55adf9e206bb79ac8462c1186251231f97368b1673ff73a3c38f6c5cf37195480fe010b2b7199e829317a4d3 +DIST python-debian_0.1.27.tar.xz 289692 SHA256 3a21d07553d46c0cf7961b13483e62005d8793a3780e79d1191b357f50174eab SHA512 101f49ce2337266856f6cf8f6d33c42d9fa2a281194a7d6fb2328d6e5f46574a7b742b04c4250e2384c197c6e6886c0e9f7b504e8c2230afaa00777e1a0057ab WHIRLPOOL f8b867fbbd236d685acbdf880bf636efb59f033788365aeea52e898217735bd0117526c2f67cfe9205d3f31b5d8da68eb5e6e6ec1ad2920a2ed0d4d54616c38f diff --git a/dev-python/python-debian/python-debian-0.1.26.ebuild b/dev-python/python-debian/python-debian-0.1.26.ebuild index f72aa0e669da..8861ff0aae54 100644 --- a/dev-python/python-debian/python-debian-0.1.26.ebuild +++ b/dev-python/python-debian/python-debian-0.1.26.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/python-debian/python-debian-0.1.26.ebuild,v 1.1 2015/04/13 09:31:18 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/python-debian/python-debian-0.1.26.ebuild,v 1.2 2015/04/19 15:59:46 floppym Exp $ EAPI="5" @@ -35,11 +35,7 @@ python_compile_all() { python_test() { pushd tests > /dev/null || die - local t - for t in test_*.py ; do - einfo "Running ${t} using ${EPYTHON}" - "${PYTHON}" "${t}" || die "Testing failed with ${EPYTHON}" - done + "${PYTHON}" -m unittest discover || die "Testing failed with ${EPYTHON}" popd > /dev/null || die } diff --git a/dev-python/python-debian/python-debian-0.1.27.ebuild b/dev-python/python-debian/python-debian-0.1.27.ebuild new file mode 100644 index 000000000000..d8dd3a25b39d --- /dev/null +++ b/dev-python/python-debian/python-debian-0.1.27.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/python-debian/python-debian-0.1.27.ebuild,v 1.2 2015/04/19 16:37:26 floppym Exp $ + +EAPI="5" + +PYTHON_COMPAT=( python2_7 python3_{3,4} pypy ) + +inherit distutils-r1 + +DESCRIPTION="Python modules to work with Debian-related data formats" +HOMEPAGE="http://packages.debian.org/sid/python-debian" +SRC_URI="mirror://debian/pool/main/${P:0:1}/${PN}/${PN}_${PV}.tar.xz" + +LICENSE="GPL-2 GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="examples test" + +RDEPEND=" + dev-python/chardet[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( app-arch/dpkg )" + +PATCHES=( + "${FILESDIR}"/${PN}-0.1.26-fix-tests.patch + ) + +python_compile_all() { + "${PYTHON}" lib/debian/doc-debtags > README.debtags || die +} + +python_test() { + # Tests currently fail with >=app-crypt/gnupg-2.1 + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=782904 + pushd tests > /dev/null || die + "${PYTHON}" -m unittest discover || die "Testing failed with ${EPYTHON}" + popd > /dev/null || die +} + +python_install_all() { + use examples && local EXAMPLES=( examples/ ) + distutils-r1_python_install_all +} diff --git a/dev-python/pyutil/Manifest b/dev-python/pyutil/Manifest index 8446215f9af3..b3dcac6f8c8e 100644 --- a/dev-python/pyutil/Manifest +++ b/dev-python/pyutil/Manifest @@ -1,2 +1 @@ -DIST pyutil-1.9.7.tar.gz 206717 SHA256 0aaa2dad8f280bc26311799622d5fdda392a0ecd7ad1a1b80ec79fbf2fcfbd74 SHA512 467de9eb6a4b085bfcc11e1bab318220d440bbb1fd665ec32c4edf274599e53cc450a5a06fcd015e966acd597d5fcfa1b389f639aa6b3d6b0009a8eec6b11946 WHIRLPOOL d8d56d783f6d1ad5da4800adb218e4401c3e9f5d17de6abd78d75474d594bfba549d3e5ebe809a9981005ecf7fbd9d532d14481aba6e55745e6955b758edf25c DIST pyutil-2.0.0.tar.gz 125079 SHA256 0ca95cb85843c5b09f7b65b5bd6c42d1940e19667b076620585ac45abe4f4fbb SHA512 3704c028fdc3894ae635dabd2bace1af1e805f4158dc6d67eac0c38fa8e7959cd093ad39cb2f539e59dd74e957947464cc8c7aed727835e127311062ed27e60b WHIRLPOOL e8fcdbed85d324732b8216224167f7920cfaf557238f3f70d22ee9afc96d1f72731164b55e1f385b60b0f77f8f42faf4b4db3e3eb55917c92ad004ab7613d447 diff --git a/dev-python/pyutil/pyutil-1.9.7.ebuild b/dev-python/pyutil/pyutil-1.9.7.ebuild deleted file mode 100644 index f22331636c88..000000000000 --- a/dev-python/pyutil/pyutil-1.9.7.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pyutil/pyutil-1.9.7.ebuild,v 1.6 2015/04/08 08:05:03 mgorny Exp $ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -inherit distutils-r1 - -DESCRIPTION="A collection of utilities for Python programmers" -HOMEPAGE="https://pypi.python.org/pypi/pyutil" -SRC_URI="mirror://pypi/p/pyutil/pyutil-${PV}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -# dev-python/twisted-core[${PYTHON_USEDEP}] -RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}] - dev-python/twisted-core" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" - -src_install() { - distutils-r1_src_install - - rm -rf "${ED%/}"/usr/share/doc/${PN} -} diff --git a/dev-python/reportlab/reportlab-3.1.44-r1.ebuild b/dev-python/reportlab/reportlab-3.1.44-r1.ebuild index 5a416bd3e456..edab078a266b 100644 --- a/dev-python/reportlab/reportlab-3.1.44-r1.ebuild +++ b/dev-python/reportlab/reportlab-3.1.44-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/reportlab/reportlab-3.1.44-r1.ebuild,v 1.1 2015/01/13 02:55:17 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/reportlab/reportlab-3.1.44-r1.ebuild,v 1.4 2015/04/19 09:39:10 ago Exp $ EAPI="5" PYTHON_COMPAT=( python{2_7,3_3,3_4} ) @@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux" IUSE="doc examples" RDEPEND=" diff --git a/dev-python/sepolgen/Manifest b/dev-python/sepolgen/Manifest index d8ca42aecf1e..2d8159aed894 100644 --- a/dev-python/sepolgen/Manifest +++ b/dev-python/sepolgen/Manifest @@ -1,5 +1,3 @@ DIST patchbundle-sepolgen-1.2.1-r1.tar.gz 762 SHA256 f6c83b003df65cd2a11c689cb8a1f37e519bb706de17383fa0d9ff79e80adc11 SHA512 1eb83c118b4c6611c868213b802358c32e6863f2fc68cfed92d32f9e119de1ee9d128c3994bb1b71da1e36f1925d2fb71523498afb63cc3b5d2dd7c9290ebb8d WHIRLPOOL 37dd39a4ef28d8df3d6f2c031df556997ff836d8aa9962d69417dae2dc1ca82bd0d12d21df774231ce28b9f1ec2ecdfff710c452e69ee5de6dc0322b0b24f458 DIST sepolgen-1.2.1.tar.gz 366214 SHA256 438c246bdc6b3cf1b12116831f4c601aaae6e93decb007dddab212a3c88781b0 SHA512 ec71126eaf6ecb18d989821753c04f3325de2188bafe161deff5733ebb95c3589e06198666f0502169cfa7d3a2b8ec509ff62098dc11b66b4f0883e1d8703a6e WHIRLPOOL efdbbb9771f68921a5fd3824267c7716ca48ab1f40395aea5c27ac4f7f3b8bf71f718da5ada40eed6c1b2de5341f3d5f10c7ad6086b5ac017d4898136ded6fe0 -DIST sepolgen-1.2.2-rc6.tar.gz 366364 SHA256 b2dd51e6a0252505a120c2f80baa72848fd0478077894404c6b4a4d2536e96c6 SHA512 3c6b1fd51967b92bf2a36049ae65daa3647a5d2e101ab38b201c8bcfabd76101846812e8ee7a6edf5d7be34d881dc792e58b1ae32de088e8805e5c9f85776a38 WHIRLPOOL 864ee219e8a45abf5a003c8c33b008d4ba2eab2e48bcc895e760888d40720f7b37662bb46f32f8720eadc0817f7ea50a54286e16214c927f591c8c3a94d07eae -DIST sepolgen-1.2.2-rc7.tar.gz 366368 SHA256 f7262aa6fb1d391f90b412b04b186ce1cb27dcf9722f07a8c967f1fa231396b1 SHA512 4e782ed9d37ffb17d7bd6e9545d2565b09f92d7619487bbc1e916cde99b69000c5853cb77d395767bb6fc1d0002d56d51cfe950169e88bdfb8e8d5f299dba80f WHIRLPOOL 251d9a247d78351719adff7181d7849cc229ac802bd4c13a393c37b8d816a534d8b698bdb6919808d2020b5546a196a4a826cbb27c4cf41469a5c4376697d2c7 DIST sepolgen-1.2.2.tar.gz 366343 SHA256 bebda8eeb2d386d26823d724ea320508a02b50828d44aff47c3f907cf54c2324 SHA512 83d56c31a87da8e271d6f436878a61f21c508ed8e26fa71f57ef109f432b10e310520c45bdb027f89a1edae12568d827ce3159bd8b6b9cf07c572b9a7225acee WHIRLPOOL 449f540caf2aa653bf2b2638ef310d2b710503744e1387119a66d3039253f537ea7ba987b0e5887e004f76485b1ae2e4a84c192a2e0e3423c9c8e61d8bb0198b diff --git a/dev-python/sepolgen/sepolgen-1.2.1.ebuild b/dev-python/sepolgen/sepolgen-1.2.1.ebuild deleted file mode 100644 index c1e7227fcef0..000000000000 --- a/dev-python/sepolgen/sepolgen-1.2.1.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/sepolgen-1.2.1.ebuild,v 1.3 2014/09/21 10:25:53 swift Exp $ - -EAPI="5" -PYTHON_COMPAT=( python2_7 ) - -inherit python-r1 eutils - -DESCRIPTION="SELinux policy generation library" -HOMEPAGE="http://userspace.selinuxproject.org" -SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20140506/${P}.tar.gz - http://dev.gentoo.org/~swift/patches/sepolgen/patchbundle-${P}-r1.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND=">=sys-libs/libselinux-2.0[python] - app-admin/setools[python] - ${PYTHON_DEPS}" -RDEPEND="${DEPEND}" - -src_prepare() { - EPATCH_MULTI_MSG="Applying sepolgen patches ... " \ - EPATCH_SUFFIX="patch" \ - EPATCH_SOURCE="${WORKDIR}/gentoo-patches" \ - EPATCH_FORCE="yes" \ - epatch - - epatch_user - - python_copy_sources -} - -src_compile() { - : -} - -src_test() { - if has_version sec-policy/selinux-base-policy; then - invoke_sepolgen_test() { - emake test - } - python_foreach_impl invoke_sepolgen_test - else - ewarn "Sepolgen requires sec-policy/selinux-base-policy to run tests." - fi -} - -src_install() { - installation() { - emake DESTDIR="${D}" PYTHONLIBDIR="$(python_get_sitedir)" install - } - python_foreach_impl installation - - # Create sepolgen.conf with different devel location definition - if [[ -f /etc/selinux/config ]]; - then - local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config); - mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory"; - echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf; - else - local selinuxtype="${POLICY_TYPES%% *}"; - if [[ -n "${selinuxtype}" ]]; - then - echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf; - else - echo "SELINUX_DEVEL_PATH=/usr/share/selinux/strict/include:/usr/share/selinux/strict" > "${D}"/etc/selinux/sepolgen.conf; - fi - fi -} diff --git a/dev-python/sepolgen/sepolgen-1.2.2_rc6.ebuild b/dev-python/sepolgen/sepolgen-1.2.2_rc6.ebuild deleted file mode 100644 index 6c4eb3f2aba5..000000000000 --- a/dev-python/sepolgen/sepolgen-1.2.2_rc6.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/sepolgen-1.2.2_rc6.ebuild,v 1.1 2014/11/14 19:21:17 swift Exp $ - -EAPI="5" -PYTHON_COMPAT=( python2_7 ) - -inherit python-r1 eutils - -MY_P="${P//_/-}" - -PATCHBUNDLE="1" - -DESCRIPTION="SELinux policy generation library" -HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" -SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20140826/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND=">=sys-libs/libselinux-2.0[python] - app-admin/setools[python] - ${PYTHON_DEPS}" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - epatch "${FILESDIR}/0030-default-path-for-tests-also-needed-bug-467264.patch" - - epatch_user - - python_copy_sources -} - -src_compile() { - : -} - -src_test() { - if has_version sec-policy/selinux-base-policy; then - invoke_sepolgen_test() { - emake test - } - python_foreach_impl invoke_sepolgen_test - else - ewarn "Sepolgen requires sec-policy/selinux-base-policy to run tests." - fi -} - -src_install() { - installation() { - emake DESTDIR="${D}" PYTHONLIBDIR="$(python_get_sitedir)" install - } - python_foreach_impl installation - - # Create sepolgen.conf with different devel location definition - if [[ -f /etc/selinux/config ]]; - then - local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config); - mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory"; - echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf; - else - local selinuxtype="${POLICY_TYPES%% *}"; - if [[ -n "${selinuxtype}" ]]; - then - echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf; - else - echo "SELINUX_DEVEL_PATH=/usr/share/selinux/strict/include:/usr/share/selinux/strict" > "${D}"/etc/selinux/sepolgen.conf; - fi - fi -} diff --git a/dev-python/sepolgen/sepolgen-1.2.2_rc7.ebuild b/dev-python/sepolgen/sepolgen-1.2.2_rc7.ebuild deleted file mode 100644 index b0edafbb6582..000000000000 --- a/dev-python/sepolgen/sepolgen-1.2.2_rc7.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/sepolgen-1.2.2_rc7.ebuild,v 1.1 2014/12/06 23:32:02 perfinion Exp $ - -EAPI="5" -PYTHON_COMPAT=( python2_7 python3_4 ) - -inherit python-r1 eutils - -MY_P="${P//_/-}" - -DESCRIPTION="SELinux policy generation library" -HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" -SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20140826/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND=">=sys-libs/libselinux-2.0[python] - app-admin/setools[python] - ${PYTHON_DEPS}" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - epatch "${FILESDIR}/0030-default-path-for-tests-also-needed-bug-467264.patch" - - epatch_user - - python_copy_sources -} - -src_compile() { - : -} - -src_test() { - if has_version sec-policy/selinux-base-policy; then - invoke_sepolgen_test() { - emake test - } - python_foreach_impl invoke_sepolgen_test - else - ewarn "Sepolgen requires sec-policy/selinux-base-policy to run tests." - fi -} - -src_install() { - installation() { - emake DESTDIR="${D}" PYTHONLIBDIR="$(python_get_sitedir)" install - python_optimize - } - python_foreach_impl installation - - # Create sepolgen.conf with different devel location definition - if [[ -f /etc/selinux/config ]]; - then - local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config); - mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory"; - echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf; - else - local selinuxtype="${POLICY_TYPES%% *}"; - if [[ -n "${selinuxtype}" ]]; - then - echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf; - else - echo "SELINUX_DEVEL_PATH=/usr/share/selinux/strict/include:/usr/share/selinux/strict" > "${D}"/etc/selinux/sepolgen.conf; - fi - fi -} diff --git a/dev-python/sphinx/sphinx-1.3.1.ebuild b/dev-python/sphinx/sphinx-1.3.1.ebuild index aa6406e0aad4..b1185356bb0f 100644 --- a/dev-python/sphinx/sphinx-1.3.1.ebuild +++ b/dev-python/sphinx/sphinx-1.3.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/sphinx-1.3.1.ebuild,v 1.1 2015/04/08 10:50:54 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/sphinx-1.3.1.ebuild,v 1.3 2015/04/19 14:38:14 idella4 Exp $ EAPI=5 @@ -23,7 +23,7 @@ IUSE="doc latex test" RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] >=dev-python/docutils-0.11[${PYTHON_USEDEP}] >=dev-python/jinja-2.3[${PYTHON_USEDEP}] - >=dev-python/pygments-2.0[${PYTHON_USEDEP}] + >=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}] >=dev-python/six-1.4[${PYTHON_USEDEP}] >=dev-python/Babel-1.3[${PYTHON_USEDEP}] =dev-python/alabaster-0.7*[${PYTHON_USEDEP}] @@ -35,7 +35,6 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] )" DEPEND="${DEPEND} test? ( dev-python/nose[${PYTHON_USEDEP}] - dev-python/simplejson[${PYTHON_USEDEP}] $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy) )" S="${WORKDIR}/${MY_P}" diff --git a/dev-python/sqlalchemy/sqlalchemy-0.9.2.ebuild b/dev-python/sqlalchemy/sqlalchemy-0.9.2.ebuild index 8d871b98e53c..aa304f2de85f 100644 --- a/dev-python/sqlalchemy/sqlalchemy-0.9.2.ebuild +++ b/dev-python/sqlalchemy/sqlalchemy-0.9.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-0.9.2.ebuild,v 1.14 2015/04/08 08:04:59 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-0.9.2.ebuild,v 1.15 2015/04/18 20:37:32 pacho Exp $ EAPI=5 PYTHON_COMPAT=( python{2_7,3_3} pypy ) @@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="doc examples +sqlite test" REQUIRED_USE="test? ( sqlite )" diff --git a/dev-python/tdaemon/Manifest b/dev-python/tdaemon/Manifest index 3f6b0b8146e5..c6afc92ea5e6 100644 --- a/dev-python/tdaemon/Manifest +++ b/dev-python/tdaemon/Manifest @@ -1 +1 @@ -DIST v0.1.6.tar.gz 37206 SHA256 9f2ed243f1d4b20bd54da505912c82c65dd3cbaf3e247d17a15f42dd0a3e5d56 SHA512 b0d49cc3ca4acef8bdb38cde4c1d17cd973215a8cedeb5716831ea129e8fc69a0c890eda7740a35a238ce39272278d8a80c3e4fc26099317bd7b86e80b36def5 WHIRLPOOL 39f72d4e381cf836b1d288a4d2807383e095241268b52cc8450c2d118182ee3befda5f9b5138f0f3ed9e3998ef4b1718c1ac02c86529df44bd3c17f8a3771dc4 +DIST tdaemon-0.1.6.tar.gz 37206 SHA256 9f2ed243f1d4b20bd54da505912c82c65dd3cbaf3e247d17a15f42dd0a3e5d56 SHA512 b0d49cc3ca4acef8bdb38cde4c1d17cd973215a8cedeb5716831ea129e8fc69a0c890eda7740a35a238ce39272278d8a80c3e4fc26099317bd7b86e80b36def5 WHIRLPOOL 39f72d4e381cf836b1d288a4d2807383e095241268b52cc8450c2d118182ee3befda5f9b5138f0f3ed9e3998ef4b1718c1ac02c86529df44bd3c17f8a3771dc4 diff --git a/dev-python/tdaemon/tdaemon-0.1.6.ebuild b/dev-python/tdaemon/tdaemon-0.1.6.ebuild index 15cb092d0d90..0504b94483dc 100644 --- a/dev-python/tdaemon/tdaemon-0.1.6.ebuild +++ b/dev-python/tdaemon/tdaemon-0.1.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/tdaemon/tdaemon-0.1.6.ebuild,v 1.3 2015/04/08 08:05:20 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/tdaemon/tdaemon-0.1.6.ebuild,v 1.4 2015/04/18 12:53:33 swegener Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) @@ -9,7 +9,7 @@ inherit distutils-r1 DESCRIPTION="Test Daemon" HOMEPAGE="http://github.com/brunobord/tdaemon" -SRC_URI="https://github.com/tampakrap/tdaemon/archive/v${PV}.tar.gz" +SRC_URI="https://github.com/tampakrap/tdaemon/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" IUSE="coverage" diff --git a/dev-python/websockify/Manifest b/dev-python/websockify/Manifest index d75188a556fb..7d7f912b8c88 100644 --- a/dev-python/websockify/Manifest +++ b/dev-python/websockify/Manifest @@ -1 +1 @@ -DIST v0.6.0.zip 312980 SHA256 09fd696fc528fcc915e66d43006c4e73e4e009233724d45e365ada1f8b01251c SHA512 f7792b0140fd5170b39dd0cabdf176ea8db43b148068ec336ddf61b70e166f6f935411901675c13657efee7e9cdf4de78bc74b0e371ce91811098b16a11a2915 WHIRLPOOL 46199706a3c8988aa7aec6018ee5defe50a289023132f48bd5d48ed486e17317b7b3a1661e367b818e2cd9445eabd3672f25155f1117ddb641be9ecb9a54ca46 +DIST websockify-0.6.0.zip 312980 SHA256 09fd696fc528fcc915e66d43006c4e73e4e009233724d45e365ada1f8b01251c SHA512 f7792b0140fd5170b39dd0cabdf176ea8db43b148068ec336ddf61b70e166f6f935411901675c13657efee7e9cdf4de78bc74b0e371ce91811098b16a11a2915 WHIRLPOOL 46199706a3c8988aa7aec6018ee5defe50a289023132f48bd5d48ed486e17317b7b3a1661e367b818e2cd9445eabd3672f25155f1117ddb641be9ecb9a54ca46 diff --git a/dev-python/websockify/websockify-0.6.0.ebuild b/dev-python/websockify/websockify-0.6.0.ebuild index 1ba863d5adaf..9967e5b79b2e 100644 --- a/dev-python/websockify/websockify-0.6.0.ebuild +++ b/dev-python/websockify/websockify-0.6.0.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/websockify/websockify-0.6.0.ebuild,v 1.2 2015/01/16 11:11:12 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/websockify/websockify-0.6.0.ebuild,v 1.3 2015/04/18 12:52:24 swegener Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) inherit distutils-r1 -SRC_URI="https://github.com/kanaka/${PN}/archive/v${PV}.zip" +SRC_URI="https://github.com/kanaka/${PN}/archive/v${PV}.zip -> ${P}.zip" DESCRIPTION="WebSockets support for any application/server" HOMEPAGE="https://github.com/kanaka/websockify" diff --git a/dev-python/whoosh/Manifest b/dev-python/whoosh/Manifest index 6530e5cf3850..f842eddb744e 100644 --- a/dev-python/whoosh/Manifest +++ b/dev-python/whoosh/Manifest @@ -1 +1,2 @@ DIST Whoosh-2.6.0.zip 1193541 SHA256 7de7bc4d00a6d051dbb360b48eb7f3cd002373d87252fb0b284a3c9c453a7677 SHA512 e50e47ec0d1c65ad3c7d657586f5380a1be748945c1ce964305fa68b99379f0da676faef6f0ca45ef151df7be71150601162ee966f3aaf84047a20bca36f7e37 WHIRLPOOL c42e9760833db7186f3df5946f6dd071288cfccf2eaefba95520a2415ca377c49cf74307b3fa2c9e655f134b086ae637e5db06330248b4a27e12175920f3c7b8 +DIST Whoosh-2.7.0.zip 1080985 SHA256 733df1ad4142fcd1e8f3259070de0521d272d7685e2febc0f4fdd1668cfe0d48 SHA512 5126a9ed5ef50af391905347c7aa1c1cc7d100213c29f5a5f67fcfabab9cdcfcd14a6b75735df8e343f61254d1fec8610f0e1260167a321ab303a0a55b02673f WHIRLPOOL 6a35448280e3c6382b8a4b50432d5def3a910d9af95d35afc11544030b69f0103aae910bbf91cb5942ec80f10a848bbd32dbd828c71482f5e2fc15a9cd29c249 diff --git a/dev-python/whoosh/whoosh-2.7.0.ebuild b/dev-python/whoosh/whoosh-2.7.0.ebuild new file mode 100644 index 000000000000..4cd9a85ee1fb --- /dev/null +++ b/dev-python/whoosh/whoosh-2.7.0.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/whoosh/whoosh-2.7.0.ebuild,v 1.1 2015/04/19 09:10:44 idella4 Exp $ + +EAPI="5" + +PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) + +MY_PN="Whoosh" + +inherit distutils-r1 + +DESCRIPTION="Fast, pure-Python full text indexing, search and spell checking library" +HOMEPAGE="http://bitbucket.org/mchaput/whoosh/wiki/Home/ http://pypi.python.org/pypi/Whoosh/" +SRC_URI="mirror://pypi/W/${MY_PN}/${MY_PN}-${PV}.zip" + +DEPEND="app-arch/unzip + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( dev-python/pytest[${PYTHON_USEDEP}] )" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc test" + +S="${WORKDIR}/${MY_PN}-${PV}" + +python_prepare_all() { + # (backport from upstream) + sed -i -e '/cmdclass/s:pytest:PyTest:' setup.py || die + + # Prevent un-needed download during build + sed -e "/^ 'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die + + distutils-r1_python_prepare_all +} + +python_compile_all() { + # https://bitbucket.org/mchaput/whoosh/issue/403/ + use doc && sphinx-build -b html -c docs/source/ docs/source/ docs/source/build/html +} + +python_test() { + # https://bitbucket.org/mchaput/whoosh/issue/412/tarball-of-whoosh-270-pypi-missing-english + # tarball missing a file english-words.10.gz which when added sees all tests pass. + esetup.py test +} + +python_install_all() { + local DOCS=( README.txt ) + use doc && local HTML_DOCS=( docs/source/build/html/. ) + distutils-r1_python_install_all +} diff --git a/dev-python/wtf-peewee/Manifest b/dev-python/wtf-peewee/Manifest index f9754a4f4993..2291282d74fc 100644 --- a/dev-python/wtf-peewee/Manifest +++ b/dev-python/wtf-peewee/Manifest @@ -1 +1 @@ -DIST 0.2.3.tar.gz 60654 SHA256 d64bab9c8b9b247f21534e87a94b988afd9655d7abaa14dc7d2af0bea3a3b9da SHA512 0a8e4a6586a4521d99c35b907935286c20b9106214a9826960073e710fc0a91c68402b9812d2b0119263786f8e48bdcacf999044ade9f3a27afa9bc7fd058926 WHIRLPOOL b44d3480d274f26ff84993c8941c473e6104bab8cd65bd8befb903dc9f2d6fad16299d6b4fc5f3b8af822dbc6aa9781dbe9ba43da6fb2f2dcf929578d3eac7ea +DIST wtf-peewee-0.2.3.tar.gz 60654 SHA256 d64bab9c8b9b247f21534e87a94b988afd9655d7abaa14dc7d2af0bea3a3b9da SHA512 0a8e4a6586a4521d99c35b907935286c20b9106214a9826960073e710fc0a91c68402b9812d2b0119263786f8e48bdcacf999044ade9f3a27afa9bc7fd058926 WHIRLPOOL b44d3480d274f26ff84993c8941c473e6104bab8cd65bd8befb903dc9f2d6fad16299d6b4fc5f3b8af822dbc6aa9781dbe9ba43da6fb2f2dcf929578d3eac7ea diff --git a/dev-python/wtf-peewee/wtf-peewee-0.2.3.ebuild b/dev-python/wtf-peewee/wtf-peewee-0.2.3.ebuild index 00faee7fe091..d7538ff18394 100644 --- a/dev-python/wtf-peewee/wtf-peewee-0.2.3.ebuild +++ b/dev-python/wtf-peewee/wtf-peewee-0.2.3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/wtf-peewee/wtf-peewee-0.2.3.ebuild,v 1.2 2014/07/07 02:45:44 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/wtf-peewee/wtf-peewee-0.2.3.ebuild,v 1.3 2015/04/18 12:51:26 swegener Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) @@ -9,7 +9,7 @@ inherit distutils-r1 DESCRIPTION="Small python ORM" HOMEPAGE="https://github.com/coleifer/peewee/" -SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz" +SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" diff --git a/dev-ruby/astrolabe/astrolabe-1.3.0.ebuild b/dev-ruby/astrolabe/astrolabe-1.3.0.ebuild index dd15b9b6ed1a..138653393402 100644 --- a/dev-ruby/astrolabe/astrolabe-1.3.0.ebuild +++ b/dev-ruby/astrolabe/astrolabe-1.3.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/astrolabe/astrolabe-1.3.0.ebuild,v 1.1 2014/09/04 02:17:56 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/astrolabe/astrolabe-1.3.0.ebuild,v 1.2 2015/04/19 09:32:10 graaff Exp $ EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21" +USE_RUBY="ruby19 ruby20 ruby21 ruby22" RUBY_FAKEGEM_RECIPE_DOC="yard" RUBY_FAKEGEM_RECIPE_TEST="rspec" diff --git a/dev-ruby/barby/Manifest b/dev-ruby/barby/Manifest index 0421dd417edf..41079f3b931f 100644 --- a/dev-ruby/barby/Manifest +++ b/dev-ruby/barby/Manifest @@ -1,2 +1 @@ -DIST barby-0.5.0.tgz 150630 SHA256 ffd40c7fb3e370cae1f91f0b3292dbdf9222ae0a217cd3dde95392b80a461159 SHA512 443db592c4c2df43fc12425e7c6cd1522a4f5449c6d41b20622bb40a47573acb0b5dbc0ea720fc6dc7e5bbd11a12b2c1b95d292e611aed1fa4d62204b4caaee4 WHIRLPOOL 89236530ae590f9a81434d0d3e39cf078cbc86302335403bf1ceace769e1af0daee5bc821576b61e6b840273e04ff834bab6181ccb55182dad0b9ba71940c649 DIST barby-0.6.2.tgz 92842 SHA256 fd8be7db0d3214fc2e2f330cc62de7c8d1884311b0230501b9cc9a23ec7f5deb SHA512 bb1a0387cfcabe8e282b1624c09574778cf438a5aa9fddaafd413ffe06726e95a766bc3f8bbb51b39894c267b167ce8b3cfe3cbaf83896a90c3509b81478e3a6 WHIRLPOOL 55a9f2171373735fc6fa7bfff60c4faaa0e1a1ab97facfa9a0025a63f9575858177d2df3c5b39dc140a8d163e46c368e1ec2798351fb8208d58fb5c64e4b0c2b diff --git a/dev-ruby/barby/barby-0.5.0-r3.ebuild b/dev-ruby/barby/barby-0.5.0-r3.ebuild deleted file mode 100644 index fc5c67ac1879..000000000000 --- a/dev-ruby/barby/barby-0.5.0-r3.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/barby/barby-0.5.0-r3.ebuild,v 1.3 2014/08/05 16:00:46 mrueg Exp $ - -EAPI=4 - -USE_RUBY="jruby ruby19" - -RUBY_FAKEGEM_TASK_TEST="test" - -RUBY_FAKEGEM_TASK_DOC="doc" -RUBY_FAKEGEM_DOCDIR="site" - -RUBY_FAKEGEM_EXTRADOC="CHANGELOG README" - -RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" - -inherit ruby-fakegem - -DESCRIPTION="Ruby barcode generator that doesn't rely on 3rd party libraries" -HOMEPAGE="http://toretore.eu/barby/" - -GITHUB_USER="toretore" -SRC_URI="https://github.com/${GITHUB_USER}/${PN}/tarball/v${PV} -> ${P}.tgz" -RUBY_S="${GITHUB_USER}-${PN}-*" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test qrcode rmagick prawn png cairo" - -USE_RUBY="ruby19" \ - ruby_add_rdepend " - rmagick? ( dev-ruby/rmagick ) - cairo? ( dev-ruby/rcairo )" - -ruby_add_rdepend "qrcode? ( dev-ruby/rqrcode ) - png? ( dev-ruby/chunky_png ) - prawn? ( dev-ruby/prawn )" - -ruby_add_bdepend "test? ( dev-ruby/minitest )" - -# testing requires imagemagick capable of png output -DEPEND+=" test? ( media-gfx/imagemagick[png] )" - -# make sure that the various options require a compatible Ruby implementation -REQUIRE_USE+=" - rmagick? ( ruby_targets_ruby19 ) - cairo? ( ruby_targets_ruby19 ) -" - -# prawn breaks tests for some reasons, needs to be investigated; code -# still works though. -RESTRICT="prawn? ( test )" - -all_ruby_prepare() { - sed -i -e '/[bB]undler/s:^:#:' test/test_helper.rb -} - -each_ruby_prepare() { - if use datamatrix; then - sed -i -e '/^end/i s.add_dependency "semacode"' ${RUBY_FAKEGEM_GEMSPEC} - else - rm \ - lib/barby/barcode/data_matrix.rb \ - test/data_matrix_test.rb - fi - - if use pdf-writer; then - sed -i -e '/^end/i s.add_dependency "pdf-writer"' ${RUBY_FAKEGEM_GEMSPEC} - else - rm \ - lib/barby/outputter/pdfwriter_outputter.rb \ - test/outputter/pdfwriter_outputter_test.rb - fi - - if use qrcode; then - sed -i -e '/^end/i s.add_dependency "rqrcode"' ${RUBY_FAKEGEM_GEMSPEC} - else - rm \ - lib/barby/barcode/qr_code.rb \ - test/qr_code_test.rb - fi - - if use rmagick; then - sed -i -e '/^end/i s.add_dependency "rmagick"' ${RUBY_FAKEGEM_GEMSPEC} - else - rm \ - lib/barby/outputter/rmagick_outputter.rb \ - test/outputter/rmagick_outputter_test.rb - fi - - if use prawn; then - sed -i -e '/^end/i s.add_dependency "prawn"' ${RUBY_FAKEGEM_GEMSPEC} - else - rm \ - lib/barby/outputter/prawn_outputter.rb \ - test/outputter/prawn_outputter_test.rb - fi - - if use png; then - sed -i -e '/^end/i s.add_dependency "chunky_png"' ${RUBY_FAKEGEM_GEMSPEC} - else - rm \ - lib/barby/outputter/png_outputter.rb \ - test/outputter/png_outputter_test.rb - fi - - if use cairo; then - sed -i -e '/^end/i s.add_dependency "cairo"' ${RUBY_FAKEGEM_GEMSPEC} - else - rm \ - lib/barby/outputter/cairo_outputter.rb \ - test/outputter/cairo_outputter_test.rb - fi - - case ${RUBY} in - */ruby19) - rm -f \ - lib/barby/barcode/data_matrix.rb \ - test/data_matrix_test.rb \ - lib/barby/outputter/pdfwriter_outputter.rb \ - test/outputter/pdfwriter_outputter_test.rb - - sed -i \ - -e '/semacode/d' \ - -e '/pdf-writer/d' \ - ${RUBY_FAKEGEM_GEMSPEC} - ;; - */jruby) - rm -f \ - lib/barby/barcode/data_matrix.rb \ - test/data_matrix_test.rb \ - lib/barby/outputter/pdfwriter_outputter.rb \ - test/outputter/pdfwriter_outputter_test.rb \ - lib/barby/outputter/rmagick_outputter.rb \ - test/outputter/rmagick_outputter_test.rb \ - lib/barby/outputter/cairo_outputter.rb \ - test/outputter/cairo_outputter_test.rb - - sed -i \ - -e '/semacode/d' \ - -e '/pdf-writer/d' \ - -e '/rmagick/d' \ - -e '/cairo/d' \ - ${RUBY_FAKEGEM_GEMSPEC} - ;; - esac -} diff --git a/dev-ruby/bsearch/bsearch-1.5.0-r1.ebuild b/dev-ruby/bsearch/bsearch-1.5.0-r1.ebuild index 4b14457616bb..73e8fe2c7b76 100644 --- a/dev-ruby/bsearch/bsearch-1.5.0-r1.ebuild +++ b/dev-ruby/bsearch/bsearch-1.5.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bsearch/bsearch-1.5.0-r1.ebuild,v 1.10 2015/04/14 10:55:55 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bsearch/bsearch-1.5.0-r1.ebuild,v 1.11 2015/04/19 09:51:53 ago Exp $ EAPI=5 @@ -15,7 +15,7 @@ HOMEPAGE="http://0xcc.net/ruby-bsearch/" LICENSE="Ruby" SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="" all_ruby_prepare() { diff --git a/dev-ruby/coderay/Manifest b/dev-ruby/coderay/Manifest index 14b8c297613d..0d7ce75eaf24 100644 --- a/dev-ruby/coderay/Manifest +++ b/dev-ruby/coderay/Manifest @@ -1,3 +1,2 @@ -DIST coderay-1.0.9.tgz 249169 SHA256 4dc6f49cfa3428149e6fd80aa14b5a1efc5210e35dd85c07fd20958d031653a3 SHA512 629a27316cecb8a5e09f9d939b671a0d6b4bb187c16b85704ed781d5004c6bfd15fb10d00508d7c659a66e6095a428a0201f0ab5a64dd36df7d696d17e232d97 WHIRLPOOL 3b5bcca16ec6b226b793ce25b3ff637348112a6e44141f1093d4c99cc7963be49b5a9a245109020cdbdf2e3779d060f37caed00c3b1d4d42db8c834ee9159201 DIST coderay-1.1.0.tar.gz 242639 SHA256 a33f6490aacd1d035fa82e2c1fe88b0e2c9553c1f7d24b813ca2b4d73804342f SHA512 9443a629bf60b7f888198ebfc72f012cceda5c9cb3e14204b3d025807dc4cb0ca0896869ae1cc89f1aa87a7c0e84830cb03aee2c4da4fd80326606a0e22b2031 WHIRLPOOL 50c5b6d07e803bfd7e14c10b0f583657f2b95dc548a748a8d677b80c49480110e9e763bdd6fe376bf58b1992a61a93e88ba2b5476ce9437e41a8d1fc5addc745 DIST coderay-1.1.0.tgz 242639 SHA256 2e9fc7ac7ef9b14fc87f8467994bf436d3bc1e7fb6f768cc2c1049ea5c6cd96f SHA512 8bf57162f59a35a2c0df9e4925ce2313c77a8613849df6e18052c3d15c5a1a39f73ff0a090675711e274e269f271dc6f7c5a9ade25cdaa34080ee3e245e9d19a WHIRLPOOL 31bd461ce9fec3d402bed43103b43136dca4388cd27f226c16fb33b957117b14701dac147c0b0c61204fe806e4c7b2175f4c3908e673791a1f1f412f7879fd26 diff --git a/dev-ruby/coderay/coderay-1.0.9.ebuild b/dev-ruby/coderay/coderay-1.0.9.ebuild deleted file mode 100644 index a1cade9a3d57..000000000000 --- a/dev-ruby/coderay/coderay-1.0.9.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/coderay/coderay-1.0.9.ebuild,v 1.13 2014/08/05 16:00:34 mrueg Exp $ - -EAPI=4 - -USE_RUBY="ruby19 jruby" - -# The test target also contains test:exe but that requires -# shoulda-context which we do not have packaged yet. -RUBY_FAKEGEM_TASK_TEST="test:functional test:units" - -RUBY_FAKEGEM_TASK_DOC="doc" -RUBY_FAKEGEM_DOCDIR="doc" - -RUBY_FAKEGEM_EXTRADOC="Changes-pre-1.0.textile Changes.textile FOLDERS README_INDEX.rdoc README.textile" - -inherit ruby-fakegem - -DESCRIPTION="A Ruby library for syntax highlighting" -HOMEPAGE="http://coderay.rubychan.de/" -SRC_URI="https://github.com/rubychan/coderay/tarball/v${PV} -> ${P}.tgz" - -RUBY_S="rubychan-coderay-*" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -# Redcloth is optional but automagically tested, so we add this -# dependency to ensure that we get at least a version that works: bug -# 330621. We use this convoluted way because redcloth isn't available -# yet for jruby. -USE_RUBY="${USE_RUBY/jruby/}" ruby_add_bdepend "test? ( >=dev-ruby/redcloth-4.2.2 )" - -all_ruby_prepare() { - sed -i -e '/git ls-files/ s:^:#:' coderay.gemspec || die -} diff --git a/dev-ruby/crass/Manifest b/dev-ruby/crass/Manifest index 7c8b1a9bdc47..28e363536fea 100644 --- a/dev-ruby/crass/Manifest +++ b/dev-ruby/crass/Manifest @@ -1 +1,2 @@ DIST crass-1.0.1.gem 91648 SHA256 e52447e5c8e0e52d9a77e37ed85c69f46e80097730d5054d42046588125bf88d SHA512 1ab154b79630c2567f8e03a01c4fa4d46de7f8a535d2ed3c69da5490bd5ae18706dc699715b7565e0c21cafaf979d4e9bd8cee8a88a1dfff3edc044398c37d07 WHIRLPOOL ff54d631861e56a29931bb43092aafefe3a7e28002bf5bd7a121e904f7bcd03af528dd97c8e634e75d7b6aeb71bc20206745c6f08780a2428796e3d84a10c92b +DIST crass-1.0.2.gem 92160 SHA256 49c217d5cfbd6575836a53577f418cd6ee39f1933e0e8084f0a8d4f3503e67b0 SHA512 28ea16dea1ba8e46589489a60780195711304902b805bff0b362f99e8af9c9d2ecd0c11dcdf3e67e18e0997f37594012a4ceb312df352faf56eeb47d0441d289 WHIRLPOOL 5703c6c388c417a38f775b8849fab90c0cd9e0feb116827c90d78df492437958f9131b6aa0782cda7668d30dca3929f5987979456f44907e174f22969cea8af9 diff --git a/dev-ruby/crass/crass-1.0.2.ebuild b/dev-ruby/crass/crass-1.0.2.ebuild new file mode 100644 index 000000000000..5dd38e25db81 --- /dev/null +++ b/dev-ruby/crass/crass-1.0.2.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/crass/crass-1.0.2.ebuild,v 1.1 2015/04/19 05:36:04 graaff Exp $ + +EAPI=5 + +USE_RUBY="ruby19 ruby20 ruby21 ruby22" + +RUBY_FAKEGEM_RECIPE_DOC="rdoc" +RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.md" + +inherit ruby-fakegem + +DESCRIPTION="A Ruby CSS parser that's fully compliant with the CSS Syntax Level 3 specification" +HOMEPAGE="https://github.com/rgrove/crass/" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +ruby_add_bdepend ">=dev-ruby/minitest-5.0.8:5" + +all_ruby_prepare() { + sed -i -e '/bundler/I s:^:#:' Rakefile || die +} diff --git a/dev-ruby/daemon_controller/daemon_controller-1.2.0.ebuild b/dev-ruby/daemon_controller/daemon_controller-1.2.0.ebuild index 546d04382168..85fb2d32f7a9 100644 --- a/dev-ruby/daemon_controller/daemon_controller-1.2.0.ebuild +++ b/dev-ruby/daemon_controller/daemon_controller-1.2.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/daemon_controller/daemon_controller-1.2.0.ebuild,v 1.6 2015/04/14 09:32:26 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/daemon_controller/daemon_controller-1.2.0.ebuild,v 1.7 2015/04/19 10:16:53 ago Exp $ EAPI=5 @@ -19,7 +19,7 @@ HOMEPAGE="http://github.com/FooBarWidget/daemon_controller" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" all_ruby_prepare() { diff --git a/dev-ruby/domain_name/Manifest b/dev-ruby/domain_name/Manifest index 8eb0e429343c..079210c8dc00 100644 --- a/dev-ruby/domain_name/Manifest +++ b/dev-ruby/domain_name/Manifest @@ -1,2 +1,3 @@ DIST domain_name-0.5.22.gem 94720 SHA256 cb8bbf0f14f9fa97f0ae9de40fa785f3a6c0b26cdd903afef165af2821907364 SHA512 e859e8fe90c98eda90d038843544719e60f4d1a12c50e77b892cbdcd34ea9c46fa314a9799cce71eb9393e2ef2c956cc013c96a893cbec13e98a11a3768b6697 WHIRLPOOL bb398969cfa3b4fa3b72d75f94fa343ef1724be95b8330810cdd371b3b3b4da2b61c125877a13949985d92eb66b8899a9699dca1156ec71530b1f106b6182d7f DIST domain_name-0.5.23.gem 99328 SHA256 f1269404aa9611427e2733a75adcc0fc028a8143b7c9bdabbce58bad76a0b662 SHA512 a6693e952db042198935238b1609d2a497eb07d9c72458f5826be475b9d382c944f20bd912c4cda5135b8bb82a4dc4416bd65e23fd6196a20f5f2718c029bab2 WHIRLPOOL 2fd57ada46eb7c9e160d2605f19be1eb89fad0125e9a96687965a55a29663d72f357c46ab2ed753d824669d5ea5200b950ca57ebcbdd956d74a5c508afa237dc +DIST domain_name-0.5.24.gem 104448 SHA256 8cbd6aea8859823f89aefeec49232e9d4377456fd42d08accfbc0cc6b32a55f6 SHA512 46caf0be89c3b2f38f79180c14f4eaa1096f12f80feb881dafb394033d2c6118f481c898310d281d15acd5b9a54473c9d9ee8f0e77dda5b03c40a0d6f137f602 WHIRLPOOL df40be6b18f08f242bafeb985a93692e3286a3889b738790108c7df64eff90dfe28c874b06f7cefd7e8ee295753126ee2d32ceb89dca65c71b95721064301161 diff --git a/dev-ruby/domain_name/domain_name-0.5.24.ebuild b/dev-ruby/domain_name/domain_name-0.5.24.ebuild new file mode 100644 index 000000000000..644f5b9d89aa --- /dev/null +++ b/dev-ruby/domain_name/domain_name-0.5.24.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/domain_name/domain_name-0.5.24.ebuild,v 1.1 2015/04/18 15:37:25 mrueg Exp $ + +EAPI=5 + +USE_RUBY="ruby19 ruby20 ruby21 ruby22" + +RUBY_FAKEGEM_RECIPE_TEST="none" +RUBY_FAKEGEM_TASK_DOC="" +RUBY_FAKEGEM_EXTRADOC="README.md" + +RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" + +inherit ruby-fakegem + +DESCRIPTION="Domain Name manipulation library for Ruby" +HOMEPAGE="https://github.com/knu/ruby-domain_name" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" +IUSE="test" + +ruby_add_rdepend ">=dev-ruby/unf-0.0.5-r1:0" + +ruby_add_bdepend " + test? ( + >=dev-ruby/test-unit-2.5.5 + dev-ruby/shoulda + )" + +all_ruby_prepare() { + sed -i -e '/bundler/,/end/ d; i gem "unf"' test/helper.rb || die + rm Gemfile* || die + + # Remove development dependencies + sed -i -e '/dependency.*\(shoulda\|bundler\|jeweler\|rdoc\)/d' \ + ${RUBY_FAKEGEM_GEMSPEC} || die + + # Avoid dependency on git. + sed -i -e 's/`git ls-files`/""/' ${RUBY_FAKEGEM_GEMSPEC} || die +} + +each_ruby_test() { + ruby-ng_testrb-2 -Ilib:test test/test_*.rb +} diff --git a/dev-ruby/erubis/erubis-2.7.0-r1.ebuild b/dev-ruby/erubis/erubis-2.7.0-r1.ebuild index 3301ef1557e1..8c1d4a3ac1e1 100644 --- a/dev-ruby/erubis/erubis-2.7.0-r1.ebuild +++ b/dev-ruby/erubis/erubis-2.7.0-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/erubis/erubis-2.7.0-r1.ebuild,v 1.5 2014/06/14 11:19:35 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/erubis/erubis-2.7.0-r1.ebuild,v 1.6 2015/04/19 18:21:12 graaff Exp $ EAPI=5 -USE_RUBY="ruby19 ruby20 jruby" +USE_RUBY="ruby19 ruby20" RUBY_FAKEGEM_TASK_DOC="" RUBY_FAKEGEM_TASK_TEST="" diff --git a/dev-ruby/faraday/Manifest b/dev-ruby/faraday/Manifest index bd5a5d7e5c58..196aa9b642b3 100644 --- a/dev-ruby/faraday/Manifest +++ b/dev-ruby/faraday/Manifest @@ -1,2 +1,2 @@ -DIST v0.9.0.tar.gz 53998 SHA256 0b3503ca485e25082ae20d67ec1f3594d802dc28e5f61e857b741520216f2927 SHA512 d69db4fced6edb7f161078d2fb3d60f11d8bbc14785e08a6aae262915a23cd3fd1f1b871a269491738e623b6b804626e812223678a5e3cc133baafc485c87dd4 WHIRLPOOL 3924f408edb4cc1e3d5df35c0b052f1f12d2f575b1671a4d5aaf4eb7b33e925e3fc5683b564e6d58ab556675022594abace05cf984b83652948c0e0e5c18a313 -DIST v0.9.1.tar.gz 56944 SHA256 27c82ff6eb0b25da7077bd724edc545bc9438e25554fa259434f825ffeb20da5 SHA512 9686f8fd5adc4380dee0cefc3a18f3b8dbe9a7785bfea5e0332dbb6f4d3af4311698e87eb6ac7f070fd758d68fb5f9cf9beec81e86a05da7fe6a5ba6fded1a3b WHIRLPOOL 59f060c2bb1441de7fd55565050e8c47f826c3361b2ca37bac2f812d5f9ba4b49a639f37bb2bc73d49ed5c3e0c1633b7c82bd428fa0ebc01e5d68defbe0deb09 +DIST faraday-0.9.0.tar.gz 53998 SHA256 0b3503ca485e25082ae20d67ec1f3594d802dc28e5f61e857b741520216f2927 SHA512 d69db4fced6edb7f161078d2fb3d60f11d8bbc14785e08a6aae262915a23cd3fd1f1b871a269491738e623b6b804626e812223678a5e3cc133baafc485c87dd4 WHIRLPOOL 3924f408edb4cc1e3d5df35c0b052f1f12d2f575b1671a4d5aaf4eb7b33e925e3fc5683b564e6d58ab556675022594abace05cf984b83652948c0e0e5c18a313 +DIST faraday-0.9.1.tar.gz 56944 SHA256 27c82ff6eb0b25da7077bd724edc545bc9438e25554fa259434f825ffeb20da5 SHA512 9686f8fd5adc4380dee0cefc3a18f3b8dbe9a7785bfea5e0332dbb6f4d3af4311698e87eb6ac7f070fd758d68fb5f9cf9beec81e86a05da7fe6a5ba6fded1a3b WHIRLPOOL 59f060c2bb1441de7fd55565050e8c47f826c3361b2ca37bac2f812d5f9ba4b49a639f37bb2bc73d49ed5c3e0c1633b7c82bd428fa0ebc01e5d68defbe0deb09 diff --git a/dev-ruby/faraday/faraday-0.9.0.ebuild b/dev-ruby/faraday/faraday-0.9.0.ebuild index 6ad8d6c774ed..f2545eac46d9 100644 --- a/dev-ruby/faraday/faraday-0.9.0.ebuild +++ b/dev-ruby/faraday/faraday-0.9.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/faraday/faraday-0.9.0.ebuild,v 1.6 2014/08/15 14:03:56 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/faraday/faraday-0.9.0.ebuild,v 1.7 2015/04/18 12:50:14 swegener Exp $ EAPI=5 @@ -17,7 +17,7 @@ inherit ruby-fakegem eutils DESCRIPTION="HTTP/REST API client library with pluggable components" HOMEPAGE="http://github.com/lostisland/faraday" -SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz" +SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" diff --git a/dev-ruby/faraday/faraday-0.9.1.ebuild b/dev-ruby/faraday/faraday-0.9.1.ebuild index 66af72ba4208..2f68bd5102a1 100644 --- a/dev-ruby/faraday/faraday-0.9.1.ebuild +++ b/dev-ruby/faraday/faraday-0.9.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/faraday/faraday-0.9.1.ebuild,v 1.2 2015/04/03 13:38:50 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/faraday/faraday-0.9.1.ebuild,v 1.3 2015/04/18 12:50:14 swegener Exp $ EAPI=5 @@ -17,7 +17,7 @@ inherit ruby-fakegem eutils DESCRIPTION="HTTP/REST API client library with pluggable components" HOMEPAGE="http://github.com/lostisland/faraday" -SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz" +SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" diff --git a/dev-ruby/gruff/gruff-0.5.1-r1.ebuild b/dev-ruby/gruff/gruff-0.5.1-r1.ebuild index 6f4791a9a3a4..35885bd52937 100644 --- a/dev-ruby/gruff/gruff-0.5.1-r1.ebuild +++ b/dev-ruby/gruff/gruff-0.5.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gruff/gruff-0.5.1-r1.ebuild,v 1.2 2015/03/20 15:24:04 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gruff/gruff-0.5.1-r1.ebuild,v 1.3 2015/04/18 06:19:05 graaff Exp $ EAPI=5 USE_RUBY="ruby19 ruby20 ruby21 ruby22" @@ -33,10 +33,10 @@ RUBY_PATCHES=( ) # imagemagick is an indirect dependency through rmagick. However, for -# gruff to work properly imagemagick needs to be compiled with -# truetype support and this cannot be expressed in the rmagick -# dependency. Test also require imagemagick to have jpeg support. -DEPEND="${DEPEND} test? ( media-gfx/imagemagick[jpeg,truetype] )" +# gruff to work properly imagemagick needs to be compiled with truetype +# support and this cannot be expressed in the rmagick dependency. Tests +# also require imagemagick to have jpeg and png support. +DEPEND="${DEPEND} test? ( media-gfx/imagemagick[jpeg,png,truetype] )" RDEPEND="${RDEPEND} media-gfx/imagemagick[truetype]" ruby_add_bdepend "test? ( dev-ruby/test-unit )" diff --git a/dev-ruby/hiera-eyaml/hiera-eyaml-2.0.7.ebuild b/dev-ruby/hiera-eyaml/hiera-eyaml-2.0.7.ebuild index 82082fe69931..0d84709379bc 100644 --- a/dev-ruby/hiera-eyaml/hiera-eyaml-2.0.7.ebuild +++ b/dev-ruby/hiera-eyaml/hiera-eyaml-2.0.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hiera-eyaml/hiera-eyaml-2.0.7.ebuild,v 1.2 2015/04/07 18:42:49 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hiera-eyaml/hiera-eyaml-2.0.7.ebuild,v 1.3 2015/04/18 06:21:46 graaff Exp $ EAPI=5 USE_RUBY="ruby19 ruby20 ruby21" @@ -24,7 +24,7 @@ IUSE="test" ruby_add_rdepend ">=dev-ruby/highline-1.6.19" ruby_add_rdepend "dev-ruby/trollop:2" -ruby_add_bdepend "test? ( dev-util/cucumber dev-util/aruba dev-ruby/hiera-eyaml-plaintext )" +ruby_add_bdepend "test? ( dev-util/cucumber dev-util/aruba app-admin/puppet dev-ruby/hiera-eyaml-plaintext )" all_ruby_prepare() { # Fix highline dependency to be compatible with more versions. diff --git a/dev-ruby/hpricot/hpricot-0.8.6-r2.ebuild b/dev-ruby/hpricot/hpricot-0.8.6-r2.ebuild index 5e3e2b33505b..3c9ca8308655 100644 --- a/dev-ruby/hpricot/hpricot-0.8.6-r2.ebuild +++ b/dev-ruby/hpricot/hpricot-0.8.6-r2.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hpricot/hpricot-0.8.6-r2.ebuild,v 1.16 2015/01/17 19:39:57 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hpricot/hpricot-0.8.6-r2.ebuild,v 1.17 2015/04/19 18:22:49 graaff Exp $ EAPI=5 -USE_RUBY="ruby19 ruby20 jruby" +USE_RUBY="ruby19 ruby20" RUBY_FAKEGEM_DOCDIR="doc" RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md" @@ -29,8 +29,7 @@ USE_RUBY="${USE_RUBY/jruby/}" \ # Probably needs the same jdk as JRuby but I'm not sure how to express # that just yet. DEPEND+=" - dev-util/ragel - ruby_targets_jruby? ( >=virtual/jdk-1.5 )" + dev-util/ragel" all_ruby_prepare() { sed -i -e '/[Bb]undler/ s:^:#:' Rakefile || die diff --git a/dev-ruby/httparty/httparty-0.13.3.ebuild b/dev-ruby/httparty/httparty-0.13.3.ebuild index 36934ddc85b1..2b2ff95856da 100644 --- a/dev-ruby/httparty/httparty-0.13.3.ebuild +++ b/dev-ruby/httparty/httparty-0.13.3.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/httparty/httparty-0.13.3.ebuild,v 1.1 2014/11/13 22:07:24 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/httparty/httparty-0.13.3.ebuild,v 1.2 2015/04/18 06:27:24 graaff Exp $ EAPI=5 -# jruby → testsuite fails (seems like a testuite bug) USE_RUBY="ruby19 ruby20 ruby21" # We have a custom test function, but don't null this out so that the @@ -33,7 +32,9 @@ all_ruby_prepare() { rm Gemfile || die sed -i -e '/[Bb]undler/ s:^:#:' Rakefile || die -# sed -i -e '/git ls-files/ s:^:#:' ${PN}.gemspec || 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 } each_ruby_test() { diff --git a/dev-ruby/jeweler/jeweler-2.0.1-r1.ebuild b/dev-ruby/jeweler/jeweler-2.0.1-r1.ebuild index 0e5c2fd2b4eb..a0351d90fab6 100644 --- a/dev-ruby/jeweler/jeweler-2.0.1-r1.ebuild +++ b/dev-ruby/jeweler/jeweler-2.0.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/jeweler/jeweler-2.0.1-r1.ebuild,v 1.4 2015/03/04 11:19:26 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/jeweler/jeweler-2.0.1-r1.ebuild,v 1.5 2015/04/18 06:31:03 graaff Exp $ EAPI=5 USE_RUBY="ruby19 ruby20 ruby21" @@ -51,4 +51,7 @@ all_ruby_prepare() { # Use a non-deprecated version of construct sed -i -e 's/construct/test_construct/' -e 's/Construct/TestConstruct/' test/test_helper.rb || die + + # Avoid dependency on cucumber + sed -i -e '/cucumber/,$ s:^:#:' Rakefile || die } diff --git a/dev-ruby/json/json-1.8.0.ebuild b/dev-ruby/json/json-1.8.0.ebuild index 933c82a476a1..4646ea5e4b67 100644 --- a/dev-ruby/json/json-1.8.0.ebuild +++ b/dev-ruby/json/json-1.8.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/json-1.8.0.ebuild,v 1.13 2014/08/05 16:00:36 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/json-1.8.0.ebuild,v 1.14 2015/04/19 18:23:58 graaff Exp $ EAPI=5 -USE_RUBY="ruby19 ruby20 jruby" +USE_RUBY="ruby19 ruby20" RUBY_FAKEGEM_TASK_DOC="doc" RUBY_FAKEGEM_EXTRADOC="CHANGES TODO README.rdoc README-json-jruby.markdown" diff --git a/dev-ruby/magic/Manifest b/dev-ruby/magic/Manifest index 0f9234013d0f..0cfce86c57c2 100644 --- a/dev-ruby/magic/Manifest +++ b/dev-ruby/magic/Manifest @@ -1 +1,2 @@ DIST magic-0.2.8.tar.gz 11638 SHA256 91b919413fec02345628eed89054df2ee3e7ed55ecfa0730f0743db976a316c7 SHA512 0d9117eeefc98bac8f44c9a551e3b57d49097776d860b0e11a5ae64d3d228789fba2be7dd50478c53c68b2c3cca0652080d691b70acdce2f89dc82ae6313699d WHIRLPOOL 7252c86940003fa38d87d521613ad8f1ce4a3d1c136ad3c98b79d631368bac8ad1d5ca11ae371bd7b69c7b13c96da95d8db18c8659de4da6bb378f6f713c422b +DIST magic-0.2.9.tar.gz 11642 SHA256 dabc0278a8a22b2cc19195cbeca6de014be770de2864c0e800be266623feaeeb SHA512 5bc6d6e1b2646b12af7dad15273dc125db68be2d6e6c109484339c8f651349827a90ea81d8feb0441c5811567d85130cda35167e2dbb426842f952fc2ff8ea15 WHIRLPOOL 1ee21f1810df75470c678b6dbf4e39680e72394a7ec20cc687d03a16d6d77b86b87ff42b858eccefc42aa3e1a475bcd482c66dffcc45b46ac0bbba71c1d186ec diff --git a/dev-ruby/magic/magic-0.2.9.ebuild b/dev-ruby/magic/magic-0.2.9.ebuild new file mode 100644 index 000000000000..67751b339255 --- /dev/null +++ b/dev-ruby/magic/magic-0.2.9.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/magic/magic-0.2.9.ebuild,v 1.1 2015/04/18 05:41:30 graaff Exp $ + +EAPI=5 + +USE_RUBY="ruby19 ruby20 ruby21" + +RUBY_FAKEGEM_EXTRADOC="README.rdoc" +RUBY_FAKEGEM_RECIPE_DOC="rdoc" +RUBY_FAKEGEM_RECIPE_TEST="none" + +inherit ruby-fakegem + +SRC_URI="https://github.com/qoobaa/magic/archive/v${PV}.tar.gz -> ${P}.tar.gz" +DESCRIPTION="Ruby FFI bindings to libmagic" +HOMEPAGE="https://github.com/qoobaa/magic" + +IUSE="test" +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND+="sys-apps/file" +DEPEND+="test? ( sys-apps/file )" + +ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )" +ruby_add_rdepend "virtual/ruby-ffi" + +each_ruby_test() { + ${RUBY} -Ilib -Itest test/test_magic.rb || die +} diff --git a/dev-ruby/matchy/matchy-0.5.2-r1.ebuild b/dev-ruby/matchy/matchy-0.5.2-r1.ebuild index 1528616071d3..5faff35b0483 100644 --- a/dev-ruby/matchy/matchy-0.5.2-r1.ebuild +++ b/dev-ruby/matchy/matchy-0.5.2-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/matchy/matchy-0.5.2-r1.ebuild,v 1.6 2014/11/03 15:43:02 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/matchy/matchy-0.5.2-r1.ebuild,v 1.7 2015/04/18 07:09:42 graaff Exp $ EAPI=5 @@ -23,6 +23,10 @@ SLOT="0" KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" IUSE="" +all_ruby_prepare() { + sed -i -e 's:rake/rdoctask:rdoc/task:' Rakefile || die +} + # workaround for ruby 1.9.2, sent upstream after 0.5.2 each_ruby_test() { RUBYLIB="$(pwd)${RUBYLIB+:${RUBYLIB}}" each_fakegem_test diff --git a/dev-ruby/msgpack/msgpack-0.5.11.ebuild b/dev-ruby/msgpack/msgpack-0.5.11.ebuild index a9c9596a159f..fcbde77848b9 100644 --- a/dev-ruby/msgpack/msgpack-0.5.11.ebuild +++ b/dev-ruby/msgpack/msgpack-0.5.11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/msgpack/msgpack-0.5.11.ebuild,v 1.2 2015/04/06 16:54:56 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/msgpack/msgpack-0.5.11.ebuild,v 1.3 2015/04/18 07:23:02 graaff Exp $ EAPI=5 @@ -27,6 +27,8 @@ all_ruby_prepare() { # Remove jruby-specific specs that are run also for other rubies. rm -rf spec/jruby || die + + sed -i -e '/git ls-files/d' msgpack.gemspec || die } each_ruby_configure() { diff --git a/dev-ruby/multi_json/Manifest b/dev-ruby/multi_json/Manifest index 2d3d3173d83f..b78eac3d44de 100644 --- a/dev-ruby/multi_json/Manifest +++ b/dev-ruby/multi_json/Manifest @@ -1,2 +1,3 @@ DIST multi_json-1.10.1.gem 30720 SHA256 2c98979877e87df0b338ebf5c86091b390f53d62c11a8232bd51ca007e0b82d2 SHA512 50cc7a0b856b3313e7b9d5237f598eb8fa048072924fbe470d44276ae5e82e1abc6adc6ad1182116f1a16692e919960643b28bd6d4de6d0251b65a51a86940d0 WHIRLPOOL 935abd203fbdd80d9d2e89944ed85f3155263751d56e50847f7e37697e183fea49e5048b37e11705b455f260bd3cfb7e8795c980c89bdc252bc30a89f216aa4d +DIST multi_json-1.11.0.tar.gz 24606 SHA256 78d80aa456ad8e771e3362b24d7c985c61d96055bb582610ce0da0612ecd5e8d SHA512 1b1afda6f1b6c1a7b20f5975ecdac0c57ad60c8bb51d80b6a1c7dbad9a6288065b296fb41c7072ffef23e8d4835da720cc844612cb757a795ff5a124a82efb27 WHIRLPOOL 29e65e7724f24f1980fc6c2fe6fa2edaa7b12f1d51037ec50d3e2c0f60ea51cdbc896223df048f75867604399c083b986fec8131e280977144e2541c9104301a DIST multi_json-1.9.3.gem 30720 SHA256 631390d4b6c3d3753a3df0c28339c8e7840704083dfdcefb1323a22ab97b2281 SHA512 7f06747e760a63b6421dfda480522924f12bd00ad63f95414f6624173b9b9b255b139f9dc33d2d2a8d19b232f99a005033e00e3a0b223be992f73d142a55b8b5 WHIRLPOOL a96f1c1e53865e153bc83079fc70b69af6c941c4995f4215317ca53567532d1406adb174683fc8c5229fdc3563f5e8d3c2c662d77cf9d9d55367aab2df5b34f0 diff --git a/dev-ruby/multi_json/multi_json-1.11.0.ebuild b/dev-ruby/multi_json/multi_json-1.11.0.ebuild new file mode 100644 index 000000000000..0a395d5aa98b --- /dev/null +++ b/dev-ruby/multi_json/multi_json-1.11.0.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_json/multi_json-1.11.0.ebuild,v 1.1 2015/04/18 00:37:24 mrueg Exp $ + +EAPI=5 + +USE_RUBY="ruby19 ruby20 ruby21" + +RUBY_FAKEGEM_RECIPE_TEST="rspec" +RUBY_FAKEGEM_TASK_DOC="yard" + +RUBY_FAKEGEM_DOCDIR="rdoc" +RUBY_FAKEGEM_EXTRADOC="README.md" + +RUBY_FAKEGEM_GEMSPEC="multi_json.gemspec" + +inherit ruby-fakegem + +SRC_URI="https://github.com/intridea/multi_json/archive/v${PV}.tar.gz -> ${P}.tar.gz" +DESCRIPTION="A gem to provide swappable JSON backends" +HOMEPAGE="http://github.com/intridea/multi_json" +LICENSE="MIT" + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +SLOT="0" +IUSE="" + +ruby_add_rdepend "|| ( >=dev-ruby/json-1.4 >=dev-ruby/yajl-ruby-1.0 =dev-ruby/activesupport-3* )" + +ruby_add_bdepend "doc? ( dev-ruby/rspec:2 dev-ruby/yard )" + +ruby_add_bdepend "test? ( dev-ruby/json + dev-ruby/yajl-ruby )" + +all_ruby_prepare() { + sed -i -e '/[Bb]undler/d' Rakefile spec/spec_helper.rb || die "Unable to remove bundler." + + # Remove unimportant rspec options not supported by rspec 2.6. + rm .rspec || die + + # Remove specs specific to oj since we don't package oj yet. + sed -i -e '/defaults to the best available gem/,/^ end/ s:^:#:' \ + -e '/Oj does not create symbols on parse/,/^ end/ s:^:#:' \ + -e '/with Oj.default_settings/,/^ end/ s:^:#:' \ + -e '/using one-shot parser/,/^ end/ s:^:#:' \ + spec/multi_json_spec.rb + + # Avoid simplecov which only works with ruby 1.9 + sed -i -e '/simplecov/d' -e '/SimpleCov.formatter/,/SimpleCov.start/ d' spec/spec_helper.rb || die + + # Remove unpackaged and for our purposes unneeded coveralls + sed -i -e '/coveralls/d' spec/spec_helper.rb || die + + # Avoid testing unpackaged adapters + rm spec/{gson,jr_jackson,oj}_adapter_spec.rb || die +} + +each_ruby_test() { + for t in spec/*_spec.rb; do + ${RUBY} -S rspec ${t} || die + done +} diff --git a/dev-ruby/multi_xml/multi_xml-0.5.4-r2.ebuild b/dev-ruby/multi_xml/multi_xml-0.5.4-r2.ebuild index b63e9eb26c9a..84b747261052 100644 --- a/dev-ruby/multi_xml/multi_xml-0.5.4-r2.ebuild +++ b/dev-ruby/multi_xml/multi_xml-0.5.4-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_xml/multi_xml-0.5.4-r2.ebuild,v 1.2 2015/04/11 09:23:33 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_xml/multi_xml-0.5.4-r2.ebuild,v 1.3 2015/04/18 07:28:21 graaff Exp $ EAPI=5 @@ -26,6 +26,7 @@ ruby_add_bdepend "doc? ( dev-ruby/yard )" all_ruby_prepare() { sed -i -e '/simplecov/,/SimpleCov.start/ s:^:#:' spec/helper.rb || die + sed -i -e '/bundler/I s:^:#:' Rakefile || die } each_ruby_test() { diff --git a/dev-ruby/niceogiri/niceogiri-1.1.2.ebuild b/dev-ruby/niceogiri/niceogiri-1.1.2.ebuild index 4dd552aa53d8..ea0861caa5f9 100644 --- a/dev-ruby/niceogiri/niceogiri-1.1.2.ebuild +++ b/dev-ruby/niceogiri/niceogiri-1.1.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/niceogiri/niceogiri-1.1.2.ebuild,v 1.6 2015/03/24 16:18:35 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/niceogiri/niceogiri-1.1.2.ebuild,v 1.8 2015/04/18 07:31:39 graaff Exp $ EAPI=5 USE_RUBY="ruby19 ruby20 ruby21 ruby22" @@ -21,6 +21,8 @@ IUSE="" ruby_add_rdepend "dev-ruby/nokogiri" +ruby_add_bdepend "doc? ( dev-ruby/yard )" + all_ruby_prepare() { sed -i -e '/guard-rspec/d' ${PN}.gemspec || die sed -i -e '/[Bb]undler/d' Rakefile || die diff --git a/dev-ruby/oauth2/oauth2-1.0.0.ebuild b/dev-ruby/oauth2/oauth2-1.0.0.ebuild index 0fab6b48cb4a..e6e8ee5c4b94 100644 --- a/dev-ruby/oauth2/oauth2-1.0.0.ebuild +++ b/dev-ruby/oauth2/oauth2-1.0.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/oauth2/oauth2-1.0.0.ebuild,v 1.4 2014/08/25 14:17:03 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/oauth2/oauth2-1.0.0.ebuild,v 1.5 2015/04/18 07:36:47 graaff Exp $ EAPI=5 @@ -32,7 +32,8 @@ ruby_add_bdepend "test? ( >=dev-ruby/rspec-2.5.0:2 )" all_ruby_prepare() { sed -i -e '/simplecov/,/^end/ s:^:#:' spec/helper.rb || die - sed -i -e '/yardstick/,/^end/ s:^:#:' Rakefile || die + sed -i -e '/yardstick/,/^end/ s:^:#:' \ + -e '/bundler/I s:^:#:' Rakefile || die } each_ruby_test() { diff --git a/dev-ruby/parser/Manifest b/dev-ruby/parser/Manifest index 501bb178cda3..a467f38b52fb 100644 --- a/dev-ruby/parser/Manifest +++ b/dev-ruby/parser/Manifest @@ -1,2 +1,2 @@ -DIST parser-2.2.0.2.gem 367616 SHA256 9f26134fbe301e0f1b2896d6cf5d2831410f445d24f784935fd7e453badc0b11 SHA512 fe55c747c24b488e7b1679edf524b366c7f02c9f02c0a2c5aa2d5e98d6e651cef9151e12eef2dc7ba16d94c148a83e2a8f89a1cd99a2f151488f61ba78ccd1f4 WHIRLPOOL 108567c5042075c2b33a7a86178ad41d531a4c293d474a5dfc2bd618b138eaaae7cbef1b1dd29c370fe64fbbd5b620943038c690ca70943c53c1f085f8471378 DIST parser-2.2.0.3.gem 367616 SHA256 6eed465dea6529d68f3f9dee7f8cb075d369e7ca50a6dd2a23b40342ee9fcde2 SHA512 6fbddbe3ed6dc5cb604e21d52fb640ef344fb3ddf21fe3d492e40e6e06d482d969a6bc0719e3a880939798ef35a81fabc98a2ba561d43f14a8837cf3e8e47d0d WHIRLPOOL 6ab8a9bacb313f1a83afd09197b21519af4afc537b50c09d8061dfaeb92878c717be3124ce1c7eda47385e8fc5a74c96f60b928f775070b075d0297dff9ae2e6 +DIST parser-2.2.2.1.gem 368640 SHA256 0b834b05486b8310331df7b21eac7b4d3f9f806a2935e5a53c86930ec0717aae SHA512 1372b92ae30f7dedbed35af74373c09d3f8373d56582ecdb189d9560e750745451e960bfbb5dfafad9bc0d1ec99637410a87b178ff728bad5d4012b0423c846b WHIRLPOOL 15b24d1322ceb6ba253866c03c2dd743dbcdf6d5ee6cee422a99de059da7ba063aa38b0aade314aeeb66aa4fbbb28da911d360d733167a449a6f1b6f16a0358c diff --git a/dev-ruby/parser/parser-2.2.0.2.ebuild b/dev-ruby/parser/parser-2.2.2.1.ebuild similarity index 82% rename from dev-ruby/parser/parser-2.2.0.2.ebuild rename to dev-ruby/parser/parser-2.2.2.1.ebuild index 198189abb07a..dc973e180395 100644 --- a/dev-ruby/parser/parser-2.2.0.2.ebuild +++ b/dev-ruby/parser/parser-2.2.2.1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/parser/parser-2.2.0.2.ebuild,v 1.1 2015/01/10 22:14:18 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/parser/parser-2.2.2.1.ebuild,v 1.1 2015/04/18 15:39:21 mrueg Exp $ EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21" +USE_RUBY="ruby19 ruby20 ruby21 ruby22" RUBY_FAKEGEM_RECIPE_DOC="yard" RUBY_FAKEGEM_TASK_TEST="test" diff --git a/dev-ruby/patron/patron-0.4.20.ebuild b/dev-ruby/patron/patron-0.4.20.ebuild index 378359670e5b..6ce911924168 100644 --- a/dev-ruby/patron/patron-0.4.20.ebuild +++ b/dev-ruby/patron/patron-0.4.20.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/patron/patron-0.4.20.ebuild,v 1.1 2015/03/16 06:53:46 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/patron/patron-0.4.20.ebuild,v 1.2 2015/04/19 05:54:52 graaff Exp $ EAPI=5 USE_RUBY="ruby19 ruby20 ruby21 ruby22" @@ -25,7 +25,10 @@ all_ruby_prepare() { # Fix Rakefile sed -i -e 's:rake/rdoctask:rdoc/task:' \ -e 's/README.txt/README.md/' \ - -e '/bundler/I s:^:#:' Rakefile || die + -e '/bundler/I s:^:#:' \ + -e '/extensiontask/ s:^:#:' \ + -e '/ExtensionTask/,/^end/ s:^:#:' \ + Rakefile || die # Avoid specs with failures. We were not running any specs before. rm spec/session_ssl_spec.rb spec/session_spec.rb spec/response_spec.rb || die diff --git a/dev-ruby/pdf-reader/pdf-reader-1.3.3.ebuild b/dev-ruby/pdf-reader/pdf-reader-1.3.3.ebuild index b141cbe53a2d..892b2bd3fa11 100644 --- a/dev-ruby/pdf-reader/pdf-reader-1.3.3.ebuild +++ b/dev-ruby/pdf-reader/pdf-reader-1.3.3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/pdf-reader/pdf-reader-1.3.3.ebuild,v 1.5 2014/08/19 12:10:16 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/pdf-reader/pdf-reader-1.3.3.ebuild,v 1.6 2015/04/19 05:58:29 graaff Exp $ EAPI=5 @@ -8,7 +8,7 @@ GITHUB_USER=yob USE_RUBY="ruby19 ruby20 ruby21" -RUBY_FAKEGEM_TASK_TEST="spec" +RUBY_FAKEGEM_RECIPE_TEST="rspec" RUBY_FAKEGEM_TASK_DOC="doc" RUBY_FAKEGEM_DOCDIR="doc" diff --git a/dev-ruby/protected_attributes/protected_attributes-1.0.9.ebuild b/dev-ruby/protected_attributes/protected_attributes-1.0.9.ebuild index dbdcefaa7202..bef21bc17ccc 100644 --- a/dev-ruby/protected_attributes/protected_attributes-1.0.9.ebuild +++ b/dev-ruby/protected_attributes/protected_attributes-1.0.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/protected_attributes/protected_attributes-1.0.9.ebuild,v 1.1 2015/03/18 06:09:07 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/protected_attributes/protected_attributes-1.0.9.ebuild,v 1.2 2015/04/19 05:59:58 graaff Exp $ EAPI=5 USE_RUBY="ruby19 ruby20 ruby21" @@ -30,6 +30,7 @@ ruby_add_bdepend "test? ( dev-ruby/bundler =dev-ruby/actionpack-4* =dev-ruby/activerecord-4* + =dev-ruby/rails-4* dev-ruby/mocha dev-ruby/sqlite3 )" diff --git a/dev-ruby/rack-attack/rack-attack-4.2.0.ebuild b/dev-ruby/rack-attack/rack-attack-4.2.0.ebuild index 95b7ac713e97..acef4d9f36dd 100644 --- a/dev-ruby/rack-attack/rack-attack-4.2.0.ebuild +++ b/dev-ruby/rack-attack/rack-attack-4.2.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack-attack/rack-attack-4.2.0.ebuild,v 1.1 2014/10/27 07:06:31 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack-attack/rack-attack-4.2.0.ebuild,v 1.2 2015/04/19 06:06:50 graaff Exp $ EAPI=5 USE_RUBY="ruby19 ruby20 ruby21" @@ -28,5 +28,5 @@ ruby_add_bdepend "test? ( dev-ruby/activesupport dev-ruby/minitest )" all_ruby_prepare() { - sed -i -e '/bundler/d' spec/spec_helper.rb || die + sed -i -e '/bundler/d' Rakefile spec/spec_helper.rb || die } diff --git a/dev-ruby/rack/rack-1.6.0.ebuild b/dev-ruby/rack/rack-1.6.0.ebuild index 3e85b480efe3..76477745174d 100644 --- a/dev-ruby/rack/rack-1.6.0.ebuild +++ b/dev-ruby/rack/rack-1.6.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/rack-1.6.0.ebuild,v 1.3 2015/01/03 01:22:18 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/rack-1.6.0.ebuild,v 1.4 2015/04/19 06:05:27 graaff Exp $ EAPI=5 USE_RUBY="ruby19 ruby20 ruby21 ruby22" @@ -30,6 +30,12 @@ ruby_add_bdepend "test? ( dev-ruby/bacon )" # Block against versions in older slots that also try to install a binary. RDEPEND="${RDEPEND} !=dev-ruby/activerecord-3.1 + >=dev-ruby/activesupport-3.1" +ruby_add_bdepend "test? ( dev-ruby/sqlite3 )" + +all_ruby_prepare() { + sed -i -e '/bundler/d' spec/spec_helper.rb || die "sed failed" +} diff --git a/dev-ruby/stomp/Manifest b/dev-ruby/stomp/Manifest index b0c611c59c55..ce072f4a944a 100644 --- a/dev-ruby/stomp/Manifest +++ b/dev-ruby/stomp/Manifest @@ -1,2 +1,2 @@ -DIST stomp-1.2.16.gem 69120 SHA256 4afd279a6081324a3dadc347f07188352a27756299398df7e2767814b5a64ed2 SHA512 d7d974da86d5eb50e62355f2e61be8e54184dcc981fa9e5e275bd21a936c5ca1b1f9e73e0a33e13ab9ca897d8347d727cd273f1323bea03bffeedbabef97e675 WHIRLPOOL ae592fb7551dfc5b10a802fef972566f8e12aa5a317c4da002015248417f30e28c5bd6fb9fe6919a90bcb065bfb2a5bd8e35dd41c523a6675269e9c385187d53 DIST stomp-1.3.2.gem 75264 SHA256 37ed903900f7abfcad0a714c0153632c97cb65de7c247c2a34f955c07ce174b4 SHA512 69142c2dae059f63d3cc2ac2ae5d9ccaceda84aa6b69a880325cbfc90f18774bc413a150449acc30fe66d932224731508a20e097f8c3a8c3dae7f636c41dbf94 WHIRLPOOL ad914a64050eb41f07ba760489fb952e811c9f094f30847f4f43b47f600b2b55968b481d93590375eea8c43c17469a9a401dd5e9d01a2d11294b224c22095a70 +DIST stomp-1.3.4.gem 77824 SHA256 adc77e8760236bd6d751991e0a4fc2bfd5443fc45dd5cfedb0d8c99273bc5897 SHA512 f141593a36bf45bcfa7254379fd88b78a62630eeebd638cea9e6e125d6cf5006632c96bcbdd6c0def0cea8f5fe7af11925d372d1e1fb3f1ee802c1a1023e2f15 WHIRLPOOL e1ac18aa1272e3cc59ab98c415c55e719437dbeb1fe13d07692564c636b08516d0be60570baa31973adf80c52fcc3017d7a7490daba737cac9f229811d402eab diff --git a/dev-ruby/stomp/stomp-1.3.2-r1.ebuild b/dev-ruby/stomp/stomp-1.3.2-r1.ebuild new file mode 100644 index 000000000000..ad8de141a9f8 --- /dev/null +++ b/dev-ruby/stomp/stomp-1.3.2-r1.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/stomp/stomp-1.3.2-r1.ebuild,v 1.2 2015/04/19 11:28:25 mrueg Exp $ + +EAPI=5 + +USE_RUBY="ruby19 ruby20 ruby21 ruby22" + +RUBY_FAKEGEM_DOCDIR="doc" +RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.rdoc" + +RUBY_FAKEGEM_RECIPE_TEST="rspec" + +inherit ruby-fakegem + +DESCRIPTION="Ruby bindings for the stomp messaging protocol" +HOMEPAGE="https://github.com/stompgem/stomp" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" diff --git a/dev-ruby/stomp/stomp-1.3.2.ebuild b/dev-ruby/stomp/stomp-1.3.2.ebuild index 3199cc7f2b98..f46c5d48a37f 100644 --- a/dev-ruby/stomp/stomp-1.3.2.ebuild +++ b/dev-ruby/stomp/stomp-1.3.2.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/stomp/stomp-1.3.2.ebuild,v 1.5 2015/03/25 20:45:25 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/stomp/stomp-1.3.2.ebuild,v 1.9 2015/04/19 11:28:25 mrueg Exp $ EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21 ruby22" +USE_RUBY="ruby19 ruby20" RUBY_FAKEGEM_DOCDIR="doc" RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.rdoc" @@ -14,9 +14,9 @@ RUBY_FAKEGEM_RECIPE_TEST="rspec" inherit ruby-fakegem DESCRIPTION="Ruby bindings for the stomp messaging protocol" -HOMEPAGE="http://rubyforge.org/projects/stomp/" +HOMEPAGE="https://github.com/stompgem/stomp" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" diff --git a/dev-ruby/stomp/stomp-1.2.16.ebuild b/dev-ruby/stomp/stomp-1.3.4.ebuild similarity index 55% rename from dev-ruby/stomp/stomp-1.2.16.ebuild rename to dev-ruby/stomp/stomp-1.3.4.ebuild index 16ebd044a2cf..dc771270397a 100644 --- a/dev-ruby/stomp/stomp-1.2.16.ebuild +++ b/dev-ruby/stomp/stomp-1.3.4.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/stomp/stomp-1.2.16.ebuild,v 1.5 2014/11/11 11:04:16 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/stomp/stomp-1.3.4.ebuild,v 1.1 2015/04/19 11:28:25 mrueg Exp $ EAPI=5 -USE_RUBY="ruby19" +USE_RUBY="ruby19 ruby20 ruby21 ruby22" RUBY_FAKEGEM_DOCDIR="doc" RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.rdoc" @@ -14,9 +14,9 @@ RUBY_FAKEGEM_RECIPE_TEST="rspec" inherit ruby-fakegem DESCRIPTION="Ruby bindings for the stomp messaging protocol" -HOMEPAGE="http://rubyforge.org/projects/stomp/" +HOMEPAGE="https://github.com/stompgem/stomp" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" IUSE="" diff --git a/dev-ruby/systemu/Manifest b/dev-ruby/systemu/Manifest index ec19168243d6..dce4c81d871c 100644 --- a/dev-ruby/systemu/Manifest +++ b/dev-ruby/systemu/Manifest @@ -1,3 +1,2 @@ -DIST systemu-2.5.2.gem 12800 SHA256 19ba2254fad0c4017bb95b7604e243403a7951b22e8c2b63ee84a7d7a4220341 SHA512 8266bb7e6bc64ba0b2aafd0e2a83b60fdbc43c19adc8b3da456d41efc65d6586297331b1f887dd4b5af8a68274709185993c60d999a26a40382b5a02c43db91e WHIRLPOOL 471fa37b9532a0fb68b6cf93178113f3cc042cd25a3d1cae46d5b643f60e2ac5772fd0194d0ce70506cfbd5591dab239fc93ac519a0deaf0c94b962ad7482add DIST systemu-2.6.4.gem 14336 SHA256 5f8c38d0a483f1999aaacac3022bcea4dc6bf524537b93514939787dbf22699a SHA512 070a01b0d131f5d9d0582dd0ba62e02d1203d7cf01494ba2b8165f6fa07309614d33debbc53573dadb94d20d196d80cbb34d0e0274ec42b07a1bfa9efb08ab00 WHIRLPOOL c903e9b1f6653b4b235a9d306b711443670d7928c8f209fa4ccffe44ca29623b6090def690c8fe758f19c3b5ee3acf066c8455ca88c272cf1b2675beb37df106 DIST systemu-2.6.5.gem 15872 SHA256 01f7d014b1453b28e5781e15c4d7d63fc9221c29b174b7aae5253207a75ab33e SHA512 1755e1d24f6d93fd07578859873b94d3fbc855f86c94bf9eb0389959837e94e432883c638ed188e75254312c2ac66eee2041d8b13eff428b473ddf8a8105461f WHIRLPOOL f976734ad2ebc73f9f103b1b3deb652508373ef8b0209656f83052420e4ecd6330e87e893b0ce2e7c93cab34ba917a9355b87ebe352c17f6fc85356c59691443 diff --git a/dev-ruby/systemu/systemu-2.5.2.ebuild b/dev-ruby/systemu/systemu-2.5.2.ebuild deleted file mode 100644 index 04116c86fdb0..000000000000 --- a/dev-ruby/systemu/systemu-2.5.2.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/systemu/systemu-2.5.2.ebuild,v 1.4 2014/04/05 17:53:36 mrueg Exp $ - -EAPI=4 -# Test hangs on jruby -USE_RUBY="ruby19" - -RUBY_FAKEGEM_TASK_DOC="" - -RUBY_FAKEGEM_EXTRADOC="README" - -inherit ruby-fakegem - -DESCRIPTION="Universal capture of STDOUT and STDERR and handling of child process PID" -HOMEPAGE="http://codeforpeople.com/lib/ruby/systemu/" - -LICENSE="Ruby" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -all_ruby_install() { - all_fakegem_install - - insinto /usr/share/doc/${PF} - doins -r samples -} diff --git a/dev-ruby/systemu/systemu-2.6.4.ebuild b/dev-ruby/systemu/systemu-2.6.4.ebuild index 14263b83b05b..f9386285d135 100644 --- a/dev-ruby/systemu/systemu-2.6.4.ebuild +++ b/dev-ruby/systemu/systemu-2.6.4.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/systemu/systemu-2.6.4.ebuild,v 1.2 2014/04/05 17:53:36 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/systemu/systemu-2.6.4.ebuild,v 1.5 2015/04/19 09:52:28 ago Exp $ EAPI=5 # Test hangs on jruby -USE_RUBY="ruby19 ruby20 ruby21" +USE_RUBY="ruby19 ruby20" RUBY_FAKEGEM_TASK_DOC="" @@ -17,7 +17,7 @@ HOMEPAGE="http://codeforpeople.com/lib/ruby/systemu/" LICENSE="Ruby" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" all_ruby_install() { diff --git a/dev-ruby/test-unit/test-unit-2.5.5-r1.ebuild b/dev-ruby/test-unit/test-unit-2.5.5-r1.ebuild index 87ce53fc717d..f414170565b7 100644 --- a/dev-ruby/test-unit/test-unit-2.5.5-r1.ebuild +++ b/dev-ruby/test-unit/test-unit-2.5.5-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/test-unit/test-unit-2.5.5-r1.ebuild,v 1.12 2014/08/01 10:13:23 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/test-unit/test-unit-2.5.5-r1.ebuild,v 1.13 2015/04/19 18:26:28 graaff Exp $ EAPI=5 -USE_RUBY="ruby19 ruby20 jruby" +USE_RUBY="ruby19 ruby20" RUBY_FAKEGEM_TASK_DOC="" RUBY_FAKEGEM_DOCDIR="doc" @@ -20,7 +20,7 @@ USE_RUBY="${USE_RUBY/ruby20/}" ruby_add_bdepend "doc? ( dev-ruby/yard )" # jruby. Since we build documentation with the main ruby implementation # only we skip the dependency for jruby in this roundabout way, assuming # that jruby won't be the main ruby. -USE_RUBY="${USE_RUBY/ruby20 jruby/}" ruby_add_bdepend "doc? ( dev-ruby/redcloth )" +USE_RUBY="${USE_RUBY/ruby20/}" ruby_add_bdepend "doc? ( dev-ruby/redcloth )" DESCRIPTION="An improved version of the Test::Unit framework from Ruby 1.8" HOMEPAGE="http://test-unit.rubyforge.org/" diff --git a/dev-ruby/text-hyphen/text-hyphen-1.4.1-r1.ebuild b/dev-ruby/text-hyphen/text-hyphen-1.4.1-r1.ebuild index 3b362f85b4e6..0c30be956122 100644 --- a/dev-ruby/text-hyphen/text-hyphen-1.4.1-r1.ebuild +++ b/dev-ruby/text-hyphen/text-hyphen-1.4.1-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/text-hyphen/text-hyphen-1.4.1-r1.ebuild,v 1.4 2014/11/11 11:04:52 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/text-hyphen/text-hyphen-1.4.1-r1.ebuild,v 1.6 2015/04/19 09:52:45 ago Exp $ EAPI=5 USE_RUBY="ruby19 ruby20" @@ -16,7 +16,7 @@ HOMEPAGE="http://rubyforge.org/projects/text-format" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" IUSE="" ruby_add_bdepend " diff --git a/dev-ruby/tzinfo/Manifest b/dev-ruby/tzinfo/Manifest index 7ce97b3f2cef..8aafefe24fad 100644 --- a/dev-ruby/tzinfo/Manifest +++ b/dev-ruby/tzinfo/Manifest @@ -1,3 +1,2 @@ -DIST tzinfo-0.3.37.gem 314368 SHA256 6c8e551f2067b64c4edb00da70b1b85ac761e611cd73c7c937709ca797da225e SHA512 0007711e648dd1b44307d9b29bbcc93d1db2d77d599a4ef71e30ec03243078cb9f6b3618e548c215ad6f5dcf10366d5acbfecd0d81131fc002edce6df250b7e4 WHIRLPOOL 16568cc73d21936993d22e52b4ac6d5cb3489653adee58824c8de273dd8d06eaac93c3f9b945edf4905b3f46f71ec2760b9fc11fc1fe54b2e616d924cbdaa2f2 DIST tzinfo-0.3.43.gem 298496 SHA256 4df52124b359789ac13aa12f46b9665d562b189fc6e60c44b9aa6d997b100a70 SHA512 9f714708c389fe08c8606de093fba6e760b57d1196b8e4d5474d756048c820925b0ee755fe1700630f3d4f8e006f2898029847788e3c901b9ff3ba5861f9e2a1 WHIRLPOOL adb82b34609eb5fd375f3f2434016eff68b83f473d50a5d0fe42815a754eade5a5f18353d6e611db2040311b1b63a5990ecee762a150a291cf23c17b6d66f775 DIST tzinfo-1.2.2.gem 147456 SHA256 fdb1d3fdf2776d490c82a0e589a08e7cbde70ac1ae7d2b1f0b7e77f3e6b801b0 SHA512 717f5bda5a40e8225446c4ff413746a526682e5bb58e5047a2d1c8d0769cadaaca612d1f01c758fab5751f81f285156d77abbab08131de627a62def1a4e2eeb1 WHIRLPOOL f49a1b91f6765671043c4a7435df0cd6dfb4b5d55b9305b6fec0cde790708e90adf0d30c966000bf88908e4b2cf39c508d9a1f2dd1b352b689f2c0f4a2d2b6f7 diff --git a/dev-ruby/tzinfo/tzinfo-0.3.37.ebuild b/dev-ruby/tzinfo/tzinfo-0.3.37.ebuild deleted file mode 100644 index 43d049144b1e..000000000000 --- a/dev-ruby/tzinfo/tzinfo-0.3.37.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tzinfo/tzinfo-0.3.37.ebuild,v 1.8 2014/11/10 15:58:14 mrueg Exp $ - -EAPI=5 -USE_RUBY="ruby19" - -RUBY_FAKEGEM_RECIPE_DOC="rdoc" -RUBY_FAKEGEM_DOCDIR="doc" -RUBY_FAKEGEM_EXTRADOC="CHANGES README" - -inherit ruby-fakegem - -DESCRIPTION="Daylight-savings aware timezone library" -HOMEPAGE="http://tzinfo.github.io/" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -RDEPEND="" -DEPEND="" - -all_ruby_prepare() { - # With rubygems 1.3.1 we get the following warning - # warning: Insecure world writable dir /var/tmp in LOAD_PATH, mode 041777 - # when running the test_get_tainted_not_loaded test. - sed -i \ - -e '/^ def test_get_tainted_not_loaded/, /^ end/ s:^:#:' \ - "${S}"/test/tc_timezone.rb || die "unable to sed out the test" -} - -each_ruby_test() { - TZ='America/Los_Angeles' ${RUBY} -I. -S testrb test/tc_*.rb || die -} diff --git a/dev-ruby/tzinfo/tzinfo-0.3.43.ebuild b/dev-ruby/tzinfo/tzinfo-0.3.43.ebuild index 2c7f96fc33e1..5785f14ad5ec 100644 --- a/dev-ruby/tzinfo/tzinfo-0.3.43.ebuild +++ b/dev-ruby/tzinfo/tzinfo-0.3.43.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tzinfo/tzinfo-0.3.43.ebuild,v 1.5 2015/04/14 07:09:37 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tzinfo/tzinfo-0.3.43.ebuild,v 1.6 2015/04/19 09:53:08 ago Exp $ EAPI=5 USE_RUBY="ruby19 ruby20" @@ -16,7 +16,7 @@ HOMEPAGE="http://tzinfo.github.io/" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" RDEPEND="" diff --git a/dev-ruby/unf_ext/Manifest b/dev-ruby/unf_ext/Manifest index 5f03dc5aa37a..16ffa3ccba09 100644 --- a/dev-ruby/unf_ext/Manifest +++ b/dev-ruby/unf_ext/Manifest @@ -1 +1,2 @@ DIST unf_ext-0.0.6.gem 395264 SHA256 afcdba30a57665a4540c5d43b2833c6a3677a3296428fa70fbd7b4c8feaceb1f SHA512 ae6df02589e0ce4189127836bdc18f7cc2f1c7f7fd2647f0b8d0a80f1175ad1f682a983195527e4f0b50b685de0aaf9377b7c5e955dc49d802176b2db63fc869 WHIRLPOOL 25d54eb777e00b4c96c87079159e05a94c5507d1f165fec6803337f9f4c7f0b8069d578702f5dc2ab0ae05c89b6cbab8b28aa29fbd6d18082c903a0af6cc06df +DIST unf_ext-0.0.7.1.gem 392192 SHA256 ab58d1a808d38872817bea89fc3f055bfc250af48d9653425e35c7c18caec253 SHA512 06239dc5870ad0f345266b12ad6ed9508ab731dfd37b450d0e1eae1ef8e8301f8ad1ef7fffbbcf69b56b0af5aa257ea279dda3a252bdf397d11949e9885db3d4 WHIRLPOOL 4d5d8c6efb46bb46b65967101389b5b7414bfa507d591e29dfb9d8c354555b9b92a997f19b68e0d4aa58143bf836849f152dafc2936b13a11cac74d7063f3d16 diff --git a/dev-ruby/unf_ext/unf_ext-0.0.7.1.ebuild b/dev-ruby/unf_ext/unf_ext-0.0.7.1.ebuild new file mode 100644 index 000000000000..5e0f74b43fbf --- /dev/null +++ b/dev-ruby/unf_ext/unf_ext-0.0.7.1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/unf_ext/unf_ext-0.0.7.1.ebuild,v 1.1 2015/04/18 00:31:30 mrueg Exp $ + +EAPI=5 + +USE_RUBY="ruby19 ruby20 ruby21 ruby22" + +RUBY_FAKEGEM_RECIPE_TEST="none" + +RUBY_FAKEGEM_RECIPE_DOC="rdoc" +RUBY_FAKEGEM_DOCDIR="doc" + +RUBY_FAKEGEM_EXTRADOC="README.md" + +inherit ruby-fakegem multilib + +DESCRIPTION="Unicode Normalization Form support library for CRuby" +HOMEPAGE="http://sourceforge.jp/projects/unf/" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" +IUSE="doc test" + +ruby_add_bdepend " + test? ( + >=dev-ruby/test-unit-2.5.1-r1 + dev-ruby/shoulda + )" + +all_ruby_prepare() { + sed -i -e '/bundler/,/end/ s:^:#:' Rakefile test/helper.rb || die +} + +each_ruby_configure() { + ${RUBY} -Cext/unf_ext extconf.rb || die +} + +each_ruby_compile() { + emake -Cext/unf_ext CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}" V=1 + cp ext/unf_ext/*$(get_modname) lib/ || die +} + +each_ruby_test() { + ruby-ng_testrb-2 test/test_*.rb +} diff --git a/dev-tcltk/bwidget/bwidget-1.9.8.ebuild b/dev-tcltk/bwidget/bwidget-1.9.8.ebuild index a7b3358faae6..b9c8b478fd83 100644 --- a/dev-tcltk/bwidget/bwidget-1.9.8.ebuild +++ b/dev-tcltk/bwidget/bwidget-1.9.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/bwidget/bwidget-1.9.8.ebuild,v 1.4 2015/04/14 04:58:43 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/bwidget/bwidget-1.9.8.ebuild,v 1.5 2015/04/19 09:53:26 ago Exp $ EAPI=5 @@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/project/tcllib/${MY_PN}/${PV}/${P}.tar.gz" LICENSE="tcltk" SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="alpha amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86" IUSE="doc" DEPEND="dev-lang/tk" diff --git a/dev-tcltk/itk/itk-3.4.1.ebuild b/dev-tcltk/itk/itk-3.4.1.ebuild index 4ee2de104cc9..432bbfe3fd6c 100644 --- a/dev-tcltk/itk/itk-3.4.1.ebuild +++ b/dev-tcltk/itk/itk-3.4.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/itk/itk-3.4.1.ebuild,v 1.3 2015/04/14 10:56:29 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/itk/itk-3.4.1.ebuild,v 1.4 2015/04/19 09:53:43 ago Exp $ EAPI=5 @@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/project/incrtcl/%5BIncr%20Tcl_Tk%5D-source/${PV}/$ IUSE="" SLOT="0" LICENSE="BSD" -KEYWORDS="~alpha amd64 ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ia64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux" DEPEND=" =dev-ruby/rspec-2.13.0 + >=dev-ruby/nokogiri-1.5.2 + >=dev-ruby/syntax-1.0.0 + >=dev-util/aruba-0.5.2 + >=dev-ruby/json-1.7 + dev-ruby/bundler + >=dev-util/cucumber-1.3 + dev-ruby/rubyzip:0 + )" + +ruby_add_rdepend " + >=dev-ruby/builder-2.1.2 + >=dev-ruby/diff-lcs-1.1.3 + >=dev-ruby/gherkin-2.12.0:0 + >=dev-ruby/multi_json-1.7.5 + >=dev-ruby/multi_test-0.1.2 +" + +all_ruby_prepare() { + # Remove development dependencies from the gemspec that we don't + # need or can't satisfy. + sed -i -e '/\(spork\|simplecov\|bcat\|kramdown\|yard\|capybara\|rack-test\|ramaze\|sinatra\|webrat\|mime-types\|rubyzip\)/d' ${RUBY_FAKEGEM_GEMSPEC} || die + + # Fix too-strict test dependencies + sed -e '/nokogiri/ s/~> 1.5.2/>= 1.5.2/' \ + -e '/aruba/ s/= 0.5.2/~> 0.5/' \ + -e '/rake/ s/10.2/10.5/' -i ${RUBY_FAKEGEM_GEMSPEC} || die + + # Make sure spork is run in the right interpreter + sed -i -e 's/#{Spork::BINARY}/-S #{Spork::BINARY}/' features/support/env.rb || die + rm features/drb_server_integration.feature || die + + # Avoid json, they most likely fail due to multi_json weirdness. + rm features/json_formatter.feature || die + # Avoid features that break with newer rspec versions. + sed -i -e '369,398d' features/background.feature || die + + # Avoid dependency on git + sed -i -e '/git ls-files/d' cucumber.gemspec || die +} + +each_ruby_test() { + ruby-ng_rspec + RUBYLIB=lib ${RUBY} -Ilib bin/cucumber features || die "Features failed" +} + +all_ruby_install() { + all_fakegem_install + + if use examples; then + cp -pPR examples "${D}/usr/share/doc/${PF}" || die "Failed installing example files." + fi +} diff --git a/dev-util/egypt/Manifest b/dev-util/egypt/Manifest index 428f05899ec8..c006fe4ce46b 100644 --- a/dev-util/egypt/Manifest +++ b/dev-util/egypt/Manifest @@ -1,2 +1 @@ DIST egypt-1.10.tar.gz 4670 SHA256 b5586ad65a491c9cb35252fd45ebbd22b926fd3cc1947513a4dfa58fb6911c64 SHA512 81e98b3d379301f1c0919aeb46d45264772b7d9d77277cb842c8ed7b944d61918e530f4e9e2c56451445dc2c6a312fd76086a81e193540baa3d56f3bb56b438d WHIRLPOOL 4be11ef2bdca52fca70d3b3ef89d4d9215c86681361e90d11c2d18f60a571d792645d909d64897a83274796543af3180fecb62b94c9044cfff2ff9abe44c4903 -DIST egypt-1.9.tar.gz 4607 SHA256 f3be611a97373f92b63f286ea17e4aae23ad62d75938e009448e9b70d97791c7 SHA512 ac2317ed9b34b68a27dde96fb7f6c9230ad6014b761bb2179e26a8e06c588efbb7fe3977ee6b68d2801b117b62f4948bf1584bd4e2d415fb1f1a5c4ad4e06117 WHIRLPOOL 0a5b71bae148daebfca9e7bdb2ad73cba2f8a9d309fcdbb6e3d3de57c279f59af2b5c25d3b63ac33b751dcf5e3c81074e18d68a812903310a5e302274175b48c diff --git a/dev-util/egypt/egypt-1.9-r1.ebuild b/dev-util/egypt/egypt-1.9-r1.ebuild deleted file mode 100644 index aacd45ba75b2..000000000000 --- a/dev-util/egypt/egypt-1.9-r1.ebuild +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/egypt/egypt-1.9-r1.ebuild,v 1.1 2013/09/01 15:12:50 idella4 Exp $ - -EAPI=5 - -inherit perl-module - -DESCRIPTION="devilishly simple tool for creating call graphs of C programs" -HOMEPAGE="http://www.gson.org/egypt/" -SRC_URI="http://www.gson.org/egypt/download/${P}.tar.gz" - -LICENSE="|| ( Artistic GPL-1+ )" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" diff --git a/dev-util/gource/gource-0.43.ebuild b/dev-util/gource/gource-0.43.ebuild index a54f26438cd7..06ea3eaf04ca 100644 --- a/dev-util/gource/gource-0.43.ebuild +++ b/dev-util/gource/gource-0.43.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/gource/gource-0.43.ebuild,v 1.2 2015/04/14 09:32:38 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/gource/gource-0.43.ebuild,v 1.3 2015/04/19 10:14:29 ago Exp $ EAPI=5 @@ -16,7 +16,7 @@ SRC_URI="https://github.com/acaudwell/Gource/releases/download/${P}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" RDEPEND=" diff --git a/dev-util/splint/splint-3.1.2-r1.ebuild b/dev-util/splint/splint-3.1.2-r1.ebuild index e8a8ab9c032e..72e56733f7a4 100644 --- a/dev-util/splint/splint-3.1.2-r1.ebuild +++ b/dev-util/splint/splint-3.1.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/splint/splint-3.1.2-r1.ebuild,v 1.8 2015/04/01 08:29:04 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/splint/splint-3.1.2-r1.ebuild,v 1.9 2015/04/19 09:45:57 pacho Exp $ EAPI=5 inherit autotools @@ -11,7 +11,7 @@ SRC_URI="http://www.splint.org/downloads/${P}.src.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc ~x86" +KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86" DEPEND=" sys-devel/flex diff --git a/dev-util/uncrustify/Manifest b/dev-util/uncrustify/Manifest index 9d1da7ab22f9..e89da7794e50 100644 --- a/dev-util/uncrustify/Manifest +++ b/dev-util/uncrustify/Manifest @@ -1,2 +1,3 @@ DIST uncrustify-0.59.tar.gz 983822 SHA256 3f2ba1ca15f7ed1cd0871d54a5dd4ecf006fd167a0fa0fe1d5d76c91106238b5 SHA512 eb228ecb63f777e90ecca44bdef2312fbca2cdbdf9dd899e1f67e9917265667584796b983050138bae39773ab2627e3c3035e519f64dfe51475f207a0e3af900 WHIRLPOOL 85d702e2968d6fbbce7f15fb23d2bbb5e2131f462076e82adf109c684c9b09410c409aa0d75114e7d5b8951d1dfdee80186d483e48d57c1e183d4c3a27bfa8b5 DIST uncrustify-0.60.tar.gz 1037433 SHA256 4a7f3ed864f1902c875c7b6dc50c3d720e09033bbf23f3fcfaae2663e0a47cec SHA512 5ff3ac05d607420e6a140369b44407caae4b1dd4601d387375babeb0cfe0fe0501052a80acfc0a28bad53ee55f181f182cb9560f90d7735b2ba879a3a64b35fe WHIRLPOOL c528fb8b37c45df63c28608ad43f2567de5444f92c48eb77f2e78da643f9c586fdc4e51621a5f4742b53a55e0b0bd0db7ad2fac820fb60e760631d27583bca62 +DIST uncrustify-0.61.tar.gz 1143946 SHA256 1df0e5a2716e256f0a4993db12f23d10195b3030326fdf2e07f8e6421e172df9 SHA512 b6abd4ee2f22430c57cd47903674f0a5a37b86fe6604426248b24dda17f06fa2e6ca3877035874a31fa668fbf9c238f538813bcc7c1834bc349f94365714aedc WHIRLPOOL 1ad5dfc944910b6831f72f7be86b624273c44d535b359d13b017545c1259d3ed5d2eac7c2cb29f9abd2ecb24e26ea3b8cfd21c0454dd5562ac01a3274f104df7 diff --git a/dev-util/uncrustify/uncrustify-0.61.ebuild b/dev-util/uncrustify/uncrustify-0.61.ebuild new file mode 100644 index 000000000000..e66756653498 --- /dev/null +++ b/dev-util/uncrustify/uncrustify-0.61.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/uncrustify/uncrustify-0.61.ebuild,v 1.1 2015/04/19 07:42:27 grobian Exp $ + +EAPI="3" + +inherit eutils + +DESCRIPTION="C/C++/C#/D/Java/Pawn code indenter and beautifier" +HOMEPAGE="http://uncrustify.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris" +IUSE="test" + +DEPEND="test? ( =dev-lang/python-2* )" +RDEPEND="" + +src_test() { + cd tests + python2 run_tests.py || die "tests failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "Install failed" + dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed" +} diff --git a/dev-vcs/cvs/cvs-1.12.12-r10.ebuild b/dev-vcs/cvs/cvs-1.12.12-r10.ebuild index 81c033679a44..3ab41a3f5615 100644 --- a/dev-vcs/cvs/cvs-1.12.12-r10.ebuild +++ b/dev-vcs/cvs/cvs-1.12.12-r10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.12-r10.ebuild,v 1.14 2015/03/02 09:29:41 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.12-r10.ebuild,v 1.15 2015/04/18 20:37:12 pacho Exp $ EAPI=3 @@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2 LICENSE="GPL-2 LGPL-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 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="crypt doc kerberos nls pam server" RESTRICT='test' diff --git a/dev-vcs/rapidsvn/rapidsvn-0.12.1-r1.ebuild b/dev-vcs/rapidsvn/rapidsvn-0.12.1-r1.ebuild index 6773aa752f0a..809155d842d5 100644 --- a/dev-vcs/rapidsvn/rapidsvn-0.12.1-r1.ebuild +++ b/dev-vcs/rapidsvn/rapidsvn-0.12.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/rapidsvn/rapidsvn-0.12.1-r1.ebuild,v 1.7 2015/04/08 17:53:03 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/rapidsvn/rapidsvn-0.12.1-r1.ebuild,v 1.8 2015/04/18 20:39:49 pacho Exp $ EAPI=5 @@ -23,7 +23,7 @@ SRC_URI=" LICENSE="GPL-2 LGPL-2.1 FDL-1.2" SLOT="0" -KEYWORDS="amd64 arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux" IUSE="doc static-libs" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass index 97d5fcc6b83c..a45da6ca40a1 100644 --- a/eclass/gnome2.eclass +++ b/eclass/gnome2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.130 2015/02/23 10:59:44 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.131 2015/04/18 13:19:47 pacho Exp $ # @ECLASS: gnome2.eclass # @MAINTAINER: @@ -13,16 +13,6 @@ inherit eutils fdo-mime libtool gnome.org gnome2-utils case "${EAPI:-0}" in - 2|3) - eqawarn - eqawarn "${CATEGORY}/${PF}: EAPI 2/3 support is now deprecated." - eqawarn "If you are the package maintainer, please" - eqawarn "update this package to a newer EAPI." - eqawarn "Support for EAPIs 2 and 3 for gnome2.eclass will be dropped" - eqawarn "in a month (around 23rd March)." - eqawarn - EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_postrm - ;; 4|5) EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_postrm ;; @@ -39,7 +29,7 @@ G2CONF=${G2CONF:-""} # @DESCRIPTION: # Should we delete ALL the .la files? # NOT to be used without due consideration. -if has ${EAPI:-0} 2 3 4; then +if has ${EAPI:-0} 4; then GNOME2_LA_PUNT=${GNOME2_LA_PUNT:-"no"} else GNOME2_LA_PUNT=${GNOME2_LA_PUNT:-""} @@ -94,13 +84,8 @@ gnome2_src_prepare() { gnome2_disable_deprecation_warning # Run libtoolize - if has ${EAPI:-0} 2 3; then - elibtoolize ${ELTCONF} - else - # Everything is fatal EAPI 4 onwards - nonfatal elibtoolize ${ELTCONF} - fi - + # Everything is fatal EAPI 4 onwards + nonfatal elibtoolize ${ELTCONF} } # @FUNCTION: gnome2_src_configure @@ -122,7 +107,7 @@ gnome2_src_configure() { # rebuild docs. # Preserve old behavior for older EAPI. if grep -q "enable-gtk-doc" "${ECONF_SOURCE:-.}"/configure ; then - if has ${EAPI:-0} 2 3 4 && in_iuse doc ; then + if has ${EAPI:-0} 4 && in_iuse doc ; then G2CONF="$(use_enable doc gtk-doc) ${G2CONF}" else G2CONF="--disable-gtk-doc ${G2CONF}" @@ -141,7 +126,7 @@ gnome2_src_configure() { fi # Pass --disable-silent-rules when possible (not needed for eapi5), bug #429308 - if has ${EAPI:-0} 2 3 4; then + if has ${EAPI:-0} 4; then if grep -q "disable-silent-rules" "${ECONF_SOURCE:-.}"/configure; then G2CONF="--disable-silent-rules ${G2CONF}" fi @@ -177,7 +162,7 @@ gnome2_src_configure() { # @DESCRIPTION: # Only default src_compile for now gnome2_src_compile() { - emake || die "compile failure" + emake } # @FUNCTION: gnome2_src_install @@ -185,7 +170,6 @@ gnome2_src_compile() { # Gnome specific install. Handles typical GConf and scrollkeeper setup # in packages and removal of .la files if requested gnome2_src_install() { - has ${EAPI:-0} 2 && ! use prefix && ED="${D}" # if this is not present, scrollkeeper-update may segfault and # create bogus directories in /var/lib/ local sk_tmp_dir="/var/lib/scrollkeeper" @@ -200,7 +184,7 @@ gnome2_src_install() { unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL # Handle documentation as 'default' for eapi5 and newer, bug #373131 - if has ${EAPI:-0} 2 3 4; then + if has ${EAPI:-0} 4; then # Manual document installation if [[ -n "${DOCS}" ]]; then dodoc ${DOCS} || die "dodoc failed" @@ -221,7 +205,7 @@ gnome2_src_install() { rm -fr "${ED}/usr/share/applications/mimeinfo.cache" # Delete all .la files - if has ${EAPI:-0} 2 3 4; then + if has ${EAPI:-0} 4; then if [[ "${GNOME2_LA_PUNT}" != "no" ]]; then ebegin "Removing .la files" if ! use_if_iuse static-libs ; then diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 32263637d604..7d6570ad65aa 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.15 2015/04/01 18:45:04 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.16 2015/04/19 18:22:15 kensington Exp $ # @ECLASS: qt5-build.eclass # @MAINTAINER: @@ -469,7 +469,7 @@ qt5_symlink_tools_to_build_dir() { # Runs ./configure for modules belonging to qtbase. qt5_base_configure() { # setup toolchain variables used by configure - tc-export CC CXX RANLIB STRIP + tc-export AR CC CXX OBJDUMP RANLIB STRIP export LD="$(tc-getCXX)" # configure arguments @@ -534,6 +534,7 @@ qt5_base_configure() { -no-libpng -no-libjpeg -no-freetype -no-harfbuzz -no-openssl + $([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-libproxy) -no-xinput2 -no-xcb-xlib # always enable glib event loop support @@ -542,8 +543,8 @@ qt5_base_configure() { # disable everything to prevent automagic deps (part 2) -no-pulseaudio -no-alsa - # disable gtkstyle because it adds qt4 include paths to the compiler - # command line if x11-libs/cairo is built with USE=qt4 (bug 433826) + # override in qtgui and qtwidgets where x11-libs/cairo[qt4] is blocked + # to avoid adding qt4 include paths (bug 433826) -no-gtkstyle # exclude examples and tests from default build diff --git a/games-action/d1x-rebirth/d1x-rebirth-0.58.1.ebuild b/games-action/d1x-rebirth/d1x-rebirth-0.58.1.ebuild index f85ab0da8d25..690e559e59e8 100644 --- a/games-action/d1x-rebirth/d1x-rebirth-0.58.1.ebuild +++ b/games-action/d1x-rebirth/d1x-rebirth-0.58.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/d1x-rebirth/d1x-rebirth-0.58.1.ebuild,v 1.1 2015/01/27 07:45:13 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-action/d1x-rebirth/d1x-rebirth-0.58.1.ebuild,v 1.2 2015/04/19 09:47:40 pacho Exp $ EAPI=5 CDROM_OPTIONAL="yes" @@ -19,7 +19,7 @@ SRC_URI="http://www.dxx-rebirth.com/download/dxx/${MY_P}.tar.gz LICENSE="D1X GPL-2 public-domain" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 x86" IUSE="cdinstall debug demo ipv6 linguas_de +music opengl opl3-musicpack sc55-musicpack" REQUIRED_USE="?? ( cdinstall demo ) ?? ( opl3-musicpack sc55-musicpack ) diff --git a/games-action/minetest/minetest-0.4.10-r1.ebuild b/games-action/minetest/minetest-0.4.10-r1.ebuild index 1641a9a46c0c..2ded7248ecc3 100644 --- a/games-action/minetest/minetest-0.4.10-r1.ebuild +++ b/games-action/minetest/minetest-0.4.10-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/minetest/minetest-0.4.10-r1.ebuild,v 1.2 2014/10/15 11:45:30 nimiux Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-action/minetest/minetest-0.4.10-r1.ebuild,v 1.3 2015/04/19 06:58:54 pacho Exp $ EAPI=5 inherit eutils cmake-utils gnome2-utils vcs-snapshot user games @@ -11,7 +11,7 @@ SRC_URI="http://github.com/minetest/minetest/tarball/${PV} -> ${P}.tar.gz" LICENSE="LGPL-2.1+ CC-BY-SA-3.0" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="+curl dedicated leveldb luajit nls redis +server +sound +truetype" RDEPEND="dev-db/sqlite:3 diff --git a/games-action/minetest_game/minetest_game-0.4.10.ebuild b/games-action/minetest_game/minetest_game-0.4.10.ebuild index 69b27a84b381..23b94fd8c174 100644 --- a/games-action/minetest_game/minetest_game-0.4.10.ebuild +++ b/games-action/minetest_game/minetest_game-0.4.10.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/minetest_game/minetest_game-0.4.10.ebuild,v 1.2 2014/10/15 11:47:04 nimiux Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-action/minetest_game/minetest_game-0.4.10.ebuild,v 1.3 2015/04/19 06:59:01 pacho Exp $ EAPI=5 inherit vcs-snapshot games @@ -11,7 +11,7 @@ SRC_URI="http://github.com/minetest/minetest_game/tarball/${PV} -> ${P}.tar.gz" LICENSE="GPL-2 CC-BY-SA-3.0" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" RDEPEND="~games-action/minetest-${PV}[-dedicated]" diff --git a/games-arcade/berusky/berusky-1.7.1.ebuild b/games-arcade/berusky/berusky-1.7.1.ebuild index d901ac938e4c..f6524c9cfee8 100644 --- a/games-arcade/berusky/berusky-1.7.1.ebuild +++ b/games-arcade/berusky/berusky-1.7.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/berusky/berusky-1.7.1.ebuild,v 1.2 2015/04/08 13:36:13 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/berusky/berusky-1.7.1.ebuild,v 1.3 2015/04/19 10:06:38 ago Exp $ EAPI=5 inherit autotools eutils gnome2-utils games @@ -14,7 +14,7 @@ SRC_URI="http://www.anakreon.cz/download/${P}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" RDEPEND="media-libs/libsdl[X,video] diff --git a/games-arcade/gnujump/gnujump-1.0.8.ebuild b/games-arcade/gnujump/gnujump-1.0.8.ebuild index 9d19d9b58182..cae9486ef89d 100644 --- a/games-arcade/gnujump/gnujump-1.0.8.ebuild +++ b/games-arcade/gnujump/gnujump-1.0.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/gnujump/gnujump-1.0.8.ebuild,v 1.4 2015/01/06 10:49:25 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/gnujump/gnujump-1.0.8.ebuild,v 1.5 2015/04/18 15:53:37 pacho Exp $ EAPI=5 inherit eutils flag-o-matic games @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc x86" IUSE="" DEPEND="media-libs/libsdl[sound,video] diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest index 4c59ecfc152f..274759fd6627 100644 --- a/games-emulation/dolphin/Manifest +++ b/games-emulation/dolphin/Manifest @@ -1,3 +1,3 @@ -DIST 3.5.zip 28805192 SHA256 56a55060aa912562e6fac2b114b8ad8019deb419b784a1db555a158a01021037 SHA512 0f3f30084ca4cd72623a33d33fe212c113bb5034c2bfcdc85b7744da48deae63341a42b0eaf0ae7aca7a5ebcdc99ec5bf0c2e32b3badd567602d4fed7d3c8ff6 WHIRLPOOL b2b99ea310b2362c66480e934a8b10ce33b72be347474099f1fe932e26a6d3bc7634b3e8e527f0d1892e5a78af984f2762a92294fe0ea6e2e3cc59bbf953980b -DIST 4.0.2.zip 28261421 SHA256 90e49ccd92eddc019bcac3b914bf16ce8d49c59fc2bd165ee02a22ea1a0456da SHA512 cb0c788307e6a0048213a2d947ac44d96b5bab064e5be41ad83c308ab98d0126bb173dd0b8705664f898d02eb571f8cb6d5bd6bfd3bd5e00e70126d04dd1cb99 WHIRLPOOL 5ae2bb04513f91300954cd598555a65527356b5e09d85283cbd8dee1a57a5a068dae8938e25d9a0ac77d6956cd08b33ed12afc774b05208dd432d693e4e2c842 -DIST 4.0.zip 23439392 SHA256 a698caf05f47a55c30e09d0aab053a412df683de2e139a6348156b03c502a0ec SHA512 02e366c2fa95ab5f37b0a66b94a5b56a632ef81e13febd982d6385cfaf7fa3edb4364180d4b8312e82bc7b8f150d02cde10248996f6a12286a20d684024aca20 WHIRLPOOL 0cb7b28b911111f4b7bf93c56f2dd31d080e7e0418fb53d9cc9093ca995d2c99a1fa7d5d82111e2c8db363e2b07384be39ec0062ab0252233f480b8e45e9304e +DIST dolphin-3.5.zip 28805192 SHA256 56a55060aa912562e6fac2b114b8ad8019deb419b784a1db555a158a01021037 SHA512 0f3f30084ca4cd72623a33d33fe212c113bb5034c2bfcdc85b7744da48deae63341a42b0eaf0ae7aca7a5ebcdc99ec5bf0c2e32b3badd567602d4fed7d3c8ff6 WHIRLPOOL b2b99ea310b2362c66480e934a8b10ce33b72be347474099f1fe932e26a6d3bc7634b3e8e527f0d1892e5a78af984f2762a92294fe0ea6e2e3cc59bbf953980b +DIST dolphin-4.0.2.zip 28261421 SHA256 90e49ccd92eddc019bcac3b914bf16ce8d49c59fc2bd165ee02a22ea1a0456da SHA512 cb0c788307e6a0048213a2d947ac44d96b5bab064e5be41ad83c308ab98d0126bb173dd0b8705664f898d02eb571f8cb6d5bd6bfd3bd5e00e70126d04dd1cb99 WHIRLPOOL 5ae2bb04513f91300954cd598555a65527356b5e09d85283cbd8dee1a57a5a068dae8938e25d9a0ac77d6956cd08b33ed12afc774b05208dd432d693e4e2c842 +DIST dolphin-4.0.zip 23439392 SHA256 a698caf05f47a55c30e09d0aab053a412df683de2e139a6348156b03c502a0ec SHA512 02e366c2fa95ab5f37b0a66b94a5b56a632ef81e13febd982d6385cfaf7fa3edb4364180d4b8312e82bc7b8f150d02cde10248996f6a12286a20d684024aca20 WHIRLPOOL 0cb7b28b911111f4b7bf93c56f2dd31d080e7e0418fb53d9cc9093ca995d2c99a1fa7d5d82111e2c8db363e2b07384be39ec0062ab0252233f480b8e45e9304e diff --git a/games-emulation/dolphin/dolphin-3.5-r1.ebuild b/games-emulation/dolphin/dolphin-3.5-r1.ebuild index 9a3a1a7707ff..5e827d765f40 100644 --- a/games-emulation/dolphin/dolphin-3.5-r1.ebuild +++ b/games-emulation/dolphin/dolphin-3.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/dolphin/dolphin-3.5-r1.ebuild,v 1.1 2015/02/08 23:22:18 twitch153 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/dolphin/dolphin-3.5-r1.ebuild,v 1.2 2015/04/18 12:47:01 swegener Exp $ EAPI=5 @@ -10,7 +10,7 @@ inherit cmake-utils eutils flag-o-matic pax-utils toolchain-funcs versionator wx DESCRIPTION="Gamecube and Wii game emulator" HOMEPAGE="https://www.dolphin-emu.org/" -SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.zip" +SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.zip -> ${P}.zip" LICENSE="GPL-2" SLOT="0" diff --git a/games-emulation/dolphin/dolphin-4.0-r1.ebuild b/games-emulation/dolphin/dolphin-4.0-r1.ebuild index 46ccb836783f..92df7c72d37c 100644 --- a/games-emulation/dolphin/dolphin-4.0-r1.ebuild +++ b/games-emulation/dolphin/dolphin-4.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/dolphin/dolphin-4.0-r1.ebuild,v 1.1 2015/02/08 23:22:18 twitch153 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/dolphin/dolphin-4.0-r1.ebuild,v 1.2 2015/04/18 12:47:01 swegener Exp $ EAPI=5 @@ -8,7 +8,7 @@ WX_GTK_VER="2.9" inherit cmake-utils eutils pax-utils toolchain-funcs versionator wxwidgets games -SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.zip" +SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.zip -> ${P}.zip" KEYWORDS="~amd64" DESCRIPTION="Gamecube and Wii game emulator" diff --git a/games-emulation/dolphin/dolphin-4.0.2-r4.ebuild b/games-emulation/dolphin/dolphin-4.0.2-r4.ebuild index c227481210a2..9bb35a675fa1 100644 --- a/games-emulation/dolphin/dolphin-4.0.2-r4.ebuild +++ b/games-emulation/dolphin/dolphin-4.0.2-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/dolphin/dolphin-4.0.2-r4.ebuild,v 1.1 2015/02/09 00:00:07 twitch153 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/dolphin/dolphin-4.0.2-r4.ebuild,v 1.2 2015/04/18 12:47:01 swegener Exp $ EAPI=5 @@ -8,7 +8,7 @@ WX_GTK_VER="2.9" inherit cmake-utils eutils pax-utils toolchain-funcs versionator wxwidgets games -SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.zip" +SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.zip -> ${P}.zip" KEYWORDS="~amd64" DESCRIPTION="Gamecube and Wii game emulator" diff --git a/games-emulation/emutos/emutos-0.9.4.ebuild b/games-emulation/emutos/emutos-0.9.4.ebuild index 37a9ceadd41c..195af43ca1df 100644 --- a/games-emulation/emutos/emutos-0.9.4.ebuild +++ b/games-emulation/emutos/emutos-0.9.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/emutos/emutos-0.9.4.ebuild,v 1.2 2015/04/13 07:55:24 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/emutos/emutos-0.9.4.ebuild,v 1.3 2015/04/19 10:06:55 ago Exp $ EAPI=5 inherit games @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/emutos/emutos-src-0.9.3.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc x86" IUSE="" RDEPEND="" diff --git a/games-engines/solarus/solarus-1.3.1.ebuild b/games-engines/solarus/solarus-1.3.1.ebuild index 5bbea470719c..2164dd7fbae0 100644 --- a/games-engines/solarus/solarus-1.3.1.ebuild +++ b/games-engines/solarus/solarus-1.3.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-engines/solarus/solarus-1.3.1.ebuild,v 1.1 2014/08/26 01:31:39 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-engines/solarus/solarus-1.3.1.ebuild,v 1.2 2015/04/19 13:27:37 ago Exp $ EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="http://www.zelda-solarus.com/downloads/${PN}/${P}-src.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="doc luajit" RDEPEND=" diff --git a/games-fps/legends/legends-0.4.1.43-r1.ebuild b/games-fps/legends/legends-0.4.1.43-r1.ebuild index 6a8623cc192c..8de2753ae730 100644 --- a/games-fps/legends/legends-0.4.1.43-r1.ebuild +++ b/games-fps/legends/legends-0.4.1.43-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/legends/legends-0.4.1.43-r1.ebuild,v 1.2 2014/07/07 20:42:53 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/legends/legends-0.4.1.43-r1.ebuild,v 1.3 2015/04/19 10:40:02 ago Exp $ EAPI=5 inherit eutils unpacker games @@ -15,7 +15,7 @@ SRC_URI="http://legendsthegame.net/files/${MY_P}.run LICENSE="Legends LGPL-2.1+" SLOT="0" -KEYWORDS="-* ~amd64 ~x86" +KEYWORDS="-* amd64 ~x86" IUSE="+dedicated" RESTRICT="strip" diff --git a/games-fps/urbanterror/urbanterror-4.2.023.ebuild b/games-fps/urbanterror/urbanterror-4.2.023.ebuild index 4681933cd45e..a1411c2f791a 100644 --- a/games-fps/urbanterror/urbanterror-4.2.023.ebuild +++ b/games-fps/urbanterror/urbanterror-4.2.023.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/urbanterror-4.2.023.ebuild,v 1.4 2015/04/08 13:12:57 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/urbanterror-4.2.023.ebuild,v 1.5 2015/04/19 10:07:14 ago Exp $ EAPI=5 inherit check-reqs eutils gnome2-utils pax-utils games @@ -26,7 +26,7 @@ unset UPDATE_I LICENSE="GPL-2 Q3AEULA-20000111 urbanterror-4.2-maps" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="+altgamma +curl debug dedicated openal pax_kernel +sdl server smp vorbis" RESTRICT="mirror" diff --git a/games-kids/gcompris/gcompris-15.02.ebuild b/games-kids/gcompris/gcompris-15.02.ebuild index 216444125ec3..2775a8f1d915 100644 --- a/games-kids/gcompris/gcompris-15.02.ebuild +++ b/games-kids/gcompris/gcompris-15.02.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/gcompris-15.02.ebuild,v 1.2 2015/04/13 07:55:29 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/gcompris-15.02.ebuild,v 1.3 2015/04/19 10:07:32 ago Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) @@ -14,7 +14,7 @@ SRC_URI="http://gcompris.net/download/${P}.tar.bz2" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc x86" IUSE="gstreamer" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/games-roguelike/crossfire-client/crossfire-client-1.71.0.ebuild b/games-roguelike/crossfire-client/crossfire-client-1.71.0.ebuild index 64606c9269a7..49bb1355e9e3 100644 --- a/games-roguelike/crossfire-client/crossfire-client-1.71.0.ebuild +++ b/games-roguelike/crossfire-client/crossfire-client-1.71.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-roguelike/crossfire-client/crossfire-client-1.71.0.ebuild,v 1.2 2015/02/28 14:02:31 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-roguelike/crossfire-client/crossfire-client-1.71.0.ebuild,v 1.4 2015/04/19 10:07:49 ago Exp $ EAPI=5 inherit toolchain-funcs gnome2-utils games @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/crossfire/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc x86" IUSE="alsa lua opengl oss sdl" RDEPEND="alsa? ( media-libs/alsa-lib ) diff --git a/games-roguelike/dwarf-fortress/Manifest b/games-roguelike/dwarf-fortress/Manifest new file mode 100644 index 000000000000..9087367a8f73 --- /dev/null +++ b/games-roguelike/dwarf-fortress/Manifest @@ -0,0 +1 @@ +DIST df_40_24_linux.tar.bz2 12921246 SHA256 da37c6263a679123e6ac57fe0dd6def11f1d61efee3c5913de09495c88ce9234 SHA512 2242e471b7dbc996e819e2f74b2bbfda30a9a301755bc025ddcccdffdd3afe2e48bbedca31a332283ef829d023069398e57d6a87e26c582ddbce4a67ff7fd755 WHIRLPOOL 03cb652a2564d2b0c809be8252f7754d893f69ac1b95124ea108ed0fde9ac742c498d9e369339775695861e430a2ded0741b018f85551d48731730f98303dc69 diff --git a/games-roguelike/dwarf-fortress/dwarf-fortress-0.40.24.ebuild b/games-roguelike/dwarf-fortress/dwarf-fortress-0.40.24.ebuild new file mode 100644 index 000000000000..d096adab2b37 --- /dev/null +++ b/games-roguelike/dwarf-fortress/dwarf-fortress-0.40.24.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/games-roguelike/dwarf-fortress/dwarf-fortress-0.40.24.ebuild,v 1.1 2015/04/19 01:40:24 creffett Exp $ + +EAPI=5 + +inherit eutils games multilib versionator + +MY_PV=$(replace_all_version_separators _ "$(get_version_component_range 2-)") +MY_PN=df +MY_P=${MY_PN}_${MY_PV} + +DESCRIPTION="A single-player fantasy game" +HOMEPAGE="http://www.bay12games.com/dwarves" +SRC_URI="http://www.bay12games.com/dwarves/${MY_P}_linux.tar.bz2" + +LICENSE="free-noncomm BSD BitstreamVera" +SLOT="0" +KEYWORDS="~amd64 ~x86 -*" +IUSE="debug" + +RDEPEND="media-libs/glew[abi_x86_32(-)] + media-libs/libsdl[abi_x86_32(-),opengl,video,X] + media-libs/libsndfile[abi_x86_32(-),alsa] + media-libs/sdl-image[abi_x86_32(-),jpeg,png,tiff] + media-libs/sdl-ttf[abi_x86_32(-)] + sys-libs/zlib[abi_x86_32(-)] + virtual/glu[abi_x86_32(-)] + x11-libs/gtk+:2[abi_x86_32(-)]" +# Yup, openal and ncurses are only needed at compile-time; the code dlopens it at runtime +# if requested. +DEPEND="${RDEPEND} + media-libs/openal[abi_x86_32(-)] + sys-libs/ncurses[abi_x86_32(-),unicode] + virtual/pkgconfig + x11-proto/kbproto[abi_x86_32(-)] + x11-proto/xproto[abi_x86_32(-)]" + +S=${WORKDIR}/${MY_PN}_linux + +gamesdir="${GAMES_PREFIX_OPT}/${PN}" +QA_PRESTRIPPED="${gamesdir}/libs/Dwarf_Fortress" + +pkg_setup() { + games_pkg_setup + + multilib_toolchain_setup x86 +} + +src_prepare() { + rm libs/*.so* + cp "${FILESDIR}"/{dwarf-fortress,Makefile} . + epatch_user +} + +src_configure() { + tc-export CXX PKG_CONFIG + CXXFLAGS+=" -D$(use debug || echo N)DEBUG" +} + +src_compile() { + default + sed -i -e "s:^gamesdir=.*:gamesdir=${gamesdir}:" ${PN} || die +} + +src_install() { + # install data-files and libs + insinto "${gamesdir}" + doins -r raw data libs + + # install our wrapper + dogamesbin ${PN} + + # install docs + dodoc README.linux *.txt + + prepgamesdirs + + fperms 750 "${gamesdir}"/libs/Dwarf_Fortress +} + +pkg_postinst() { + elog "System-wide Dwarf Fortress has been installed to ${gamesdir}. This is" + elog "symlinked to ~/.dwarf-fortress when dwarf-fortress is run." + elog "For more information on what exactly is replaced, see ${GAMES_BINDIR}/${PN}." + elog "Note: This means that the primary entry point is ${GAMES_BINDIR}/${PN}." + elog "Do not run ${gamesdir}/libs/Dwarf_Fortress." + elog + elog "Optional runtime dependencies: install sys-libs/ncurses[$(use amd64 && echo "abi_x86_32,")unicode]" + elog "for [PRINT_MODE:TEXT]. Install media-libs/openal$(use amd64 && echo "[abi_x86_32]") for audio output." + elog + games_pkg_postinst +} diff --git a/games-roguelike/dwarf-fortress/files/Makefile b/games-roguelike/dwarf-fortress/files/Makefile new file mode 100644 index 000000000000..a0453a50f7c4 --- /dev/null +++ b/games-roguelike/dwarf-fortress/files/Makefile @@ -0,0 +1,32 @@ +# Copyright 2014-2015 Alex Xu (Hello71) +# Distributed under the terms of the GNU General Public License v2 + +PKG_CONFIG ?= pkg-config +PKG_CONFIG_PATH ?= /usr/lib32/pkgconfig:/usr/lib/pkgconfig +PKG_CONFIG := PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) + +SRCS := g_src/basics.cpp g_src/command_line.cpp g_src/enabler.cpp \ + g_src/files.cpp g_src/find_files_posix.cpp g_src/graphics.cpp \ + g_src/init.cpp g_src/interface.cpp g_src/keybindings.cpp \ + g_src/music_and_sound_openal.cpp g_src/random.cpp g_src/textlines.cpp \ + g_src/enabler_input.cpp g_src/KeybindingScreen.cpp \ + g_src/win32_compat.cpp g_src/textures.cpp g_src/resize++.cpp \ + g_src/renderer_offscreen.cpp g_src/ttf_manager.cpp +OBJS := $(SRCS:.cpp=.o) + +BLIBS := ncursesw openal sndfile +LIBS := glew glu gtk+-2.0 sdl SDL_image SDL_ttf zlib +CXXFLAGS ?= -O2 -pipe -Wall -Wextra +CXXFLAGS += -m32 $(shell $(PKG_CONFIG) --cflags $(BLIBS) $(LIBS)) -Dunix -Dlinux -fPIC -std=c++11 +LDLIBS := $(shell $(PKG_CONFIG) --libs $(LIBS)) + +LG := libs/libgraphics.so + +all: $(LG) +$(LG): $(OBJS) + $(LINK.cpp) -shared $^ $(LDLIBS) -o $@ + +clean: + $(RM) $(LG) $(OBJS) + +.PHONY: clean diff --git a/games-roguelike/dwarf-fortress/files/dwarf-fortress b/games-roguelike/dwarf-fortress/files/dwarf-fortress new file mode 100644 index 000000000000..8594e0bcefaf --- /dev/null +++ b/games-roguelike/dwarf-fortress/files/dwarf-fortress @@ -0,0 +1,24 @@ +#!/bin/sh + +gamesdir=/opt/dwarf-fortress +install="$HOME/.dwarf-fortress" + +do_install() { + cp -rn "$gamesdir"/data "$install"/ + # DF gets unhappy when this is out of sync + cp -f "$gamesdir"/data/index "$install"/data/ + cp -rsn "$gamesdir"/* "$install"/ +} + +if [[ -d "$install" ]]; then + # delete dangling symlinks + find -L "$install/" -type l -delete + # ignore "are the same file" errors + do_install 2>/dev/null +else + mkdir "$install" || exit + do_install || exit +fi + +cd "$install" || exit +exec ./libs/Dwarf_Fortress "$@" diff --git a/games-roguelike/dwarf-fortress/metadata.xml b/games-roguelike/dwarf-fortress/metadata.xml new file mode 100644 index 000000000000..c9a8db431846 --- /dev/null +++ b/games-roguelike/dwarf-fortress/metadata.xml @@ -0,0 +1,15 @@ + + + +proxy-maintainers + + alex_y_xu@yahoo.ca + Alex Xu + proxied maintainer, please assign bugs to + + + creffett@gentoo.org + Chris Reffett + maintainer, please CC on bugs + + diff --git a/games-rpg/draci-historie/draci-historie-2012.ebuild b/games-rpg/draci-historie/draci-historie-2012.ebuild index 758bbef360ce..e5f784a782bb 100644 --- a/games-rpg/draci-historie/draci-historie-2012.ebuild +++ b/games-rpg/draci-historie/draci-historie-2012.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-rpg/draci-historie/draci-historie-2012.ebuild,v 1.1 2015/03/17 21:38:16 calchan Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-rpg/draci-historie/draci-historie-2012.ebuild,v 1.3 2015/04/19 10:08:06 ago Exp $ EAPI=5 inherit unpacker eutils games @@ -16,7 +16,7 @@ SRC_URI="linguas_cs? ( ${BASE_URL}-cz-${PV}.zip ) LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="linguas_cs linguas_de linguas_en linguas_pl" RDEPEND=">=games-engines/scummvm-1.1" diff --git a/games-rpg/sumwars/Manifest b/games-rpg/sumwars/Manifest index 2a9b885f00ae..f5f277e13b6e 100644 --- a/games-rpg/sumwars/Manifest +++ b/games-rpg/sumwars/Manifest @@ -1,2 +1 @@ -DIST sumwars-0.5.6-src.tar.bz2 100407198 SHA256 d180ed30d7e78efef3d7169aea9abb3bb2a7df465de4487d7a99056a6b85810a SHA512 c876844235462f685327bd75048c6e387399e2b8f0a431cf118b61d03d8cf5f732fcb4453988b226f4f14aee223daff7f75c5fc47df0ac35a9f52eb28ecb9f6c WHIRLPOOL 24a182787194c9dc7a1da784898da1db1e946ca691be1135bd4f52894773c6e7dde4c306407e43dacc45d988a1687598bf8da9d5ff0d1b6857c9ff3628c6e7ee DIST sumwars-0.5.8-src.tar.bz2 107811288 SHA256 2f432d5f84708447507f6686b847b8538de373cd951f5842cfec5a09aba0aabf SHA512 ccf156f4484b0aeb8984631321d6691dc180ad63fdfa59d92aaa05ada3e871fc10656f32f9ba1b65abe7342e1481e14ca01f025ffc0ec5797cd8e91d97240cf1 WHIRLPOOL 18658095acc19856f5f70e992ec81e66e86fc52a4480dc0b3b161cab9ed589e12717394f1859682954b5a62edb2241d6c005170a1a6ac0cd6c558f0f29bc1723 diff --git a/games-rpg/sumwars/files/sumwars-0.5.6-build.patch b/games-rpg/sumwars/files/sumwars-0.5.6-build.patch deleted file mode 100644 index 2dbfc11e095c..000000000000 --- a/games-rpg/sumwars/files/sumwars-0.5.6-build.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- CMakeLists.txt -+++ CMakeLists.txt -@@ -496,7 +496,7 @@ - # RENAME "sumwars.png") - #endif() - --install(FILES "AUTHORS" "COPYING" "README" # we intentionally avoid installing "INSTALL" here -+install(FILES "AUTHORS" "README" # we intentionally avoid installing "INSTALL" here - DESTINATION "${SUMWARS_DOC_DIR}") - - install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/share/data" -@@ -516,7 +516,7 @@ - SEPARATE_ARGUMENTS(SUMWARS_LANGUAGES) - foreach(i ${SUMWARS_LANGUAGES}) - install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/share/translation/${i}" -- DESTINATION "${SUMWARS_SHARE_DIR}" -+ DESTINATION "${SUMWARS_SHARE_DIR}/translation" - FILES_MATCHING PATTERN "*.mo" - PATTERN ".hg" EXCLUDE - PATTERN "xmlgettext" EXCLUDE) # both pattern excludes are there to prevent the directories from being created diff --git a/games-rpg/sumwars/sumwars-0.5.6-r2.ebuild b/games-rpg/sumwars/sumwars-0.5.6-r2.ebuild deleted file mode 100644 index e9b170a72dd8..000000000000 --- a/games-rpg/sumwars/sumwars-0.5.6-r2.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-rpg/sumwars/sumwars-0.5.6-r2.ebuild,v 1.10 2013/08/17 20:30:45 calchan Exp $ - -EAPI=4 - -inherit cmake-utils eutils flag-o-matic gnome2-utils games - -DESCRIPTION="a multi-player, 3D action role-playing game" -HOMEPAGE="http://sumwars.org" -SRC_URI="mirror://sourceforge/sumwars/${P//_/-}-src.tar.bz2" - -LICENSE="GPL-3 CC-BY-SA-3.0" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="+tools debug" - -LANGS="de en it pl pt ru uk" -for L in ${LANGS} ; do - IUSE="${IUSE} linguas_${L}" -done -unset L - -RDEPEND=" - !=dev-games/ogre-1.7.4-r1[freeimage,opengl] - !>=dev-games/ogre-1.9 - dev-games/ois - dev-games/physfs - =dev-lang/lua-5.1* - >=dev-libs/tinyxml-2.6.2-r2 - media-libs/freealut - media-libs/openal - media-libs/libogg - media-libs/libvorbis - >=net-libs/enet-1.3.0 - x11-libs/libXrandr - tools? ( dev-libs/poco )" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${PN}-${PV%_*} - -src_prepare() { - epatch "${FILESDIR}"/${P}-build.patch -} - -src_configure() { - # QA - append-flags -fno-strict-aliasing - - use debug && CMAKE_BUILD_TYPE=Debug - - local l langs - for l in ${LANGS}; do - if use linguas_${l}; then - langs="${langs} ${l}" - fi - done - - [[ -z "${langs}" ]] && langs="en" - - # configure sumwars with cmake - local mycmakeargs=( - -DCMAKE_INSTALL_PREFIX="" - -DSUMWARS_LANGUAGES="${langs}" - -DSUMWARS_NO_TINYXML=ON - -DSUMWARS_NO_ENET=ON - -DSUMWARS_DOC_DIR="/usr/share/doc/${PF}" - -DSUMWARS_EXECUTABLE_DIR="${GAMES_BINDIR}" - -DSUMWARS_SHARE_DIR="${GAMES_DATADIR}/${PN}" - -DSUMWARS_STANDALONE_MODE=OFF - -DSUMWARS_POST_BUILD_COPY=OFF - -DSUMWARS_PORTABLE_MODE=OFF - -DSUMWARS_RANDOM_REGIONS=ON - $(cmake-utils_use tools SUMWARS_BUILD_TOOLS) - ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_install() { - cmake-utils_src_install - newicon -s 128 share/icon/SumWarsIcon_128x128.png ${PN}.png - make_desktop_entry ${PN} "Summoning Wars" - 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-rpg/sumwars/sumwars-0.5.8.ebuild b/games-rpg/sumwars/sumwars-0.5.8.ebuild index 9e211861dba6..384251e10ef7 100644 --- a/games-rpg/sumwars/sumwars-0.5.8.ebuild +++ b/games-rpg/sumwars/sumwars-0.5.8.ebuild @@ -1,9 +1,8 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-rpg/sumwars/sumwars-0.5.8.ebuild,v 1.2 2015/03/27 16:29:13 ago Exp $ - -EAPI=4 +# $Header: /var/cvsroot/gentoo-x86/games-rpg/sumwars/sumwars-0.5.8.ebuild,v 1.4 2015/04/18 16:00:51 mr_bones_ Exp $ +EAPI=5 inherit cmake-utils eutils flag-o-matic gnome2-utils games DESCRIPTION="a multi-player, 3D action role-playing game" @@ -12,7 +11,7 @@ SRC_URI="mirror://sourceforge/sumwars/${P//_/-}-src.tar.bz2" LICENSE="GPL-3 CC-BY-SA-3.0" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="+tools debug" LANGS="de en it pl pt ru uk" @@ -36,7 +35,7 @@ RDEPEND=" x11-libs/libX11 x11-libs/libXrandr tools? ( dev-libs/boost )" -DEPEND="${RDEPEND}" +DEPEND=${RDEPEND} S=${WORKDIR}/${PN}-${PV%_*} diff --git a/games-simulation/flightgear-data/flightgear-data-3.4.0.ebuild b/games-simulation/flightgear-data/flightgear-data-3.4.0.ebuild index 928042f8074b..bad3041c8ff4 100644 --- a/games-simulation/flightgear-data/flightgear-data-3.4.0.ebuild +++ b/games-simulation/flightgear-data/flightgear-data-3.4.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear-data/flightgear-data-3.4.0.ebuild,v 1.2 2015/04/08 15:17:54 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear-data/flightgear-data-3.4.0.ebuild,v 1.3 2015/04/19 10:16:05 ago Exp $ EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="mirror://flightgear/Shared/FlightGear-data-${PV}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc x86" IUSE="" # data files split to separate package since 2.10.0 diff --git a/games-simulation/flightgear/flightgear-3.4.0.ebuild b/games-simulation/flightgear/flightgear-3.4.0.ebuild index b5904c25a118..cc123e643611 100644 --- a/games-simulation/flightgear/flightgear-3.4.0.ebuild +++ b/games-simulation/flightgear/flightgear-3.4.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/flightgear-3.4.0.ebuild,v 1.3 2015/04/08 15:17:46 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/flightgear-3.4.0.ebuild,v 1.4 2015/04/19 10:15:59 ago Exp $ EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="mirror://flightgear/Source/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc x86" IUSE="dbus debug examples +jsbsim oldfdm qt5 test +udev +utils vim-syntax +yasim" COMMON_DEPEND=" diff --git a/games-sports/trigger/trigger-0.6.1.ebuild b/games-sports/trigger/trigger-0.6.1.ebuild index 9f5dc81e895b..dbe6f6798ab8 100644 --- a/games-sports/trigger/trigger-0.6.1.ebuild +++ b/games-sports/trigger/trigger-0.6.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-sports/trigger/trigger-0.6.1.ebuild,v 1.2 2015/04/13 07:56:19 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-sports/trigger/trigger-0.6.1.ebuild,v 1.3 2015/04/19 10:08:23 ago Exp $ EAPI=5 inherit eutils games @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc x86" IUSE="" RDEPEND="virtual/opengl diff --git a/games-sports/ultimatestunts/ultimatestunts-0.7.7.ebuild b/games-sports/ultimatestunts/ultimatestunts-0.7.7.ebuild index 0bcb7cd887a3..104d33890e8d 100644 --- a/games-sports/ultimatestunts/ultimatestunts-0.7.7.ebuild +++ b/games-sports/ultimatestunts/ultimatestunts-0.7.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-sports/ultimatestunts/ultimatestunts-0.7.7.ebuild,v 1.2 2015/04/13 07:56:09 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-sports/ultimatestunts/ultimatestunts-0.7.7.ebuild,v 1.3 2015/04/19 10:08:40 ago Exp $ EAPI=5 inherit eutils flag-o-matic versionator games @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/ultimatestunts/${MY_P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="nls" RDEPEND="media-libs/libsdl[joystick,opengl,video] diff --git a/games-util/gslist/gslist-0.8.11a.ebuild b/games-util/gslist/gslist-0.8.11a.ebuild index 1518834aa60d..12afb035a580 100644 --- a/games-util/gslist/gslist-0.8.11a.ebuild +++ b/games-util/gslist/gslist-0.8.11a.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-util/gslist/gslist-0.8.11a.ebuild,v 1.1 2015/03/16 15:52:16 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-util/gslist/gslist-0.8.11a.ebuild,v 1.3 2015/04/19 09:54:42 ago Exp $ EAPI=5 inherit eutils games @@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.zip" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~hppa ~x86" +KEYWORDS="amd64 ~hppa x86" IUSE="web" RDEPEND="dev-libs/geoip" diff --git a/games-util/lutris/lutris-0.3.6.2.ebuild b/games-util/lutris/lutris-0.3.6.2.ebuild index 3dd20efabff6..50086a215c25 100644 --- a/games-util/lutris/lutris-0.3.6.2.ebuild +++ b/games-util/lutris/lutris-0.3.6.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-util/lutris/lutris-0.3.6.2.ebuild,v 1.2 2015/04/13 07:55:39 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-util/lutris/lutris-0.3.6.2.ebuild,v 1.3 2015/04/19 10:08:58 ago Exp $ EAPI=5 @@ -15,7 +15,7 @@ SRC_URI="https://github.com/lutris/lutris/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" RDEPEND="dev-python/pygobject:3[${PYTHON_USEDEP}] diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest index e3d9d01ff5d4..8b7691745dca 100644 --- a/gnome-base/gdm/Manifest +++ b/gnome-base/gdm/Manifest @@ -1,3 +1,4 @@ DIST gdm-3.12.2.tar.xz 1522384 SHA256 cc91fff5afd2a7c3e712c960a0b60744774167dcfc16f486372e1eb3c0aa1cc4 SHA512 0c7f93fa12f1b2c4b6af71ea2767dc2b3367cc0330edfa106b1fe6c1ed6f112cc148f2319801bc44bc9ff6636d0b8cf5bd4be67999b48f1a7275c68ce9d5dbab WHIRLPOOL 3fd6ca8f53316a0cc167741b35a9ac402d00da12feae162c567e62d4b72cf63ef6f695725f7bc8a755c7c567daf0de0661bf8d96e22472da22fd6ba110880ed7 DIST gdm-3.14.1.tar.xz 1503232 SHA256 ed83498131bcea69ce60f882783c669c24b007d2b7e1219b4bdde18f6c94deb1 SHA512 73a9490aec122b3240d2e6c0b106821c10635e55c1a5f2570771b2504007a4ca3172d1378e102bd42105514e702441d6baa6a5edfd30fc7bd5f85d2707e7d911 WHIRLPOOL 87f206199a45413979f8d198774d96dd897b4969e13acde0ff19aee189fc464f1cf0276888215b74cc9a7b1140f0161ec68191dd756bc344de76fdcc9d75771a +DIST gdm-3.14.2.tar.xz 1490544 SHA256 e20eb61496161ad95b1058dbf8aea9b7b004df4d0ea6b0fab4401397d9db5930 SHA512 c9c0785a197da3313dc1879e325d5728ebec16934fa9adbe969beb09bea76666bcadfb3d1e9e56cfc614f553a2f23d258621463c0f97123a2b632c7d696dd866 WHIRLPOOL ba13de133df37c9858d01af43d551fa535921b656d31816e7bf4a45ffe11bea0c04adcef34d861e00a9071511fd737d0aa711036d1f5ac625fa3576d7008991c DIST tango-gentoo-v1.1.tar.gz 29322 SHA256 518efa4257c8e689488399db23397a89f4dcd5990ce537ef6215860ad5606eb0 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045 WHIRLPOOL 9e1635a505ea48f4fe8bdb3b8b3b43cfb9cf99e3204194c51361b198886e719921cfacbc15f9f6407aa7d0c4af178e24c74b998fc370fa2329040e5be1baf153 diff --git a/gnome-base/gdm/gdm-3.14.2.ebuild b/gnome-base/gdm/gdm-3.14.2.ebuild new file mode 100644 index 000000000000..e5e4a5c02785 --- /dev/null +++ b/gnome-base/gdm/gdm-3.14.2.ebuild @@ -0,0 +1,224 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.14.2.ebuild,v 1.1 2015/04/19 14:24:07 eva Exp $ + +EAPI="5" +GCONF_DEBUG="yes" +GNOME2_LA_PUNT="yes" + +inherit autotools eutils gnome2 pam readme.gentoo systemd user + +DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins" +HOMEPAGE="https://wiki.gnome.org/Projects/GDM" + +SRC_URI="${SRC_URI} + branding? ( http://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz ) +" + +LICENSE=" + GPL-2+ + branding? ( CC-Sampling-Plus-1.0 ) +" + +SLOT="0" +IUSE="accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard +systemd tcpd test wayland xinerama" +REQUIRED_USE="wayland? ( systemd )" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86" + +# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686 +# nspr used by smartcard extension +# dconf, dbus and g-s-d are needed at install time for dconf update +# We need either systemd or >=openrc-0.12 to restart gdm properly, bug #463784 +COMMON_DEPEND=" + app-text/iso-codes + >=dev-libs/glib-2.36:2 + >=x11-libs/gtk+-2.91.1:3 + >=gnome-base/dconf-0.20 + >=gnome-base/gnome-settings-daemon-3.1.4 + gnome-base/gsettings-desktop-schemas + >=media-libs/fontconfig-2.5.0 + >=media-libs/libcanberra-0.4[gtk3] + sys-apps/dbus + >=sys-apps/accountsservice-0.6.12 + + x11-apps/sessreg + x11-base/xorg-server + x11-libs/libXi + x11-libs/libXau + x11-libs/libX11 + x11-libs/libXdmcp + x11-libs/libXext + x11-libs/libXft + x11-libs/libXrandr + >=x11-misc/xdg-utils-1.0.2-r3 + + virtual/pam + systemd? ( >=sys-apps/systemd-186:0=[pam] ) + !systemd? ( + >=x11-base/xorg-server-1.14.3-r1 + >=sys-auth/consolekit-0.4.5_p20120320-r2 + !=dev-libs/gobject-introspection-0.9.12 ) + plymouth? ( sys-boot/plymouth ) + selinux? ( sys-libs/libselinux ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) + xinerama? ( x11-libs/libXinerama ) +" +# XXX: These deps are from session and desktop files in data/ directory +# fprintd is used via dbus by gdm-fingerprint-extension +# gnome-session-3.6 needed to avoid freezing with orca +RDEPEND="${COMMON_DEPEND} + >=gnome-base/gnome-session-3.6 + >=gnome-base/gnome-shell-3.1.90 + gnome-extra/polkit-gnome:0 + x11-apps/xhost + x11-themes/gnome-icon-theme-symbolic + + accessibility? ( + >=app-accessibility/orca-3.10 + app-accessibility/caribou + gnome-extra/mousetweaks ) + fprint? ( + sys-auth/fprintd + sys-auth/pam_fprint ) + + !gnome-extra/fast-user-switch-applet +" +DEPEND="${COMMON_DEPEND} + app-text/docbook-xml-dtd:4.1.2 + dev-util/gdbus-codegen + >=dev-util/intltool-0.40.0 + virtual/pkgconfig + x11-proto/inputproto + x11-proto/randrproto + test? ( >=dev-libs/check-0.9.4 ) + xinerama? ( x11-proto/xineramaproto ) +" + +DOC_CONTENTS=" + To make GDM start at boot, run:\n + # systemctl enable gdm.service\n + \n + For passwordless login to unlock your keyring, you need to install + sys-auth/pambase with USE=gnome-keyring and set an empty password + on your keyring. Use app-crypt/seahorse for that.\n + \n + You may need to install app-crypt/coolkey and sys-auth/pam_pkcs11 + for smartcard support +" + +pkg_setup() { + enewgroup gdm + enewgroup video # Just in case it hasn't been created yet + enewuser gdm -1 -1 /var/lib/gdm gdm,video + + # For compatibility with certain versions of nvidia-drivers, etc., need to + # ensure that gdm user is in the video group + if ! egetent group video | grep -q gdm; then + # FIXME XXX: is this at all portable, ldap-safe, etc.? + # XXX: egetent does not have a 1-argument form, so we can't use it to + # get the list of gdm's groups + local g=$(groups gdm) + elog "Adding user gdm to video group" + usermod -G video,${g// /,} gdm || die "Adding user gdm to video group failed" + fi +} + +src_prepare() { + # make custom session work, bug #216984, upstream bug #737578 + epatch "${FILESDIR}/${PN}-3.2.1.1-custom-session.patch" + + # ssh-agent handling must be done at xinitrc.d, bug #220603 + epatch "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch" + + # Gentoo does not have a fingerprint-auth pam stack + epatch "${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch" + + # Show logo when branding is enabled + use branding && epatch "${FILESDIR}/${PN}-3.8.4-logo.patch" + + eautoreconf + + gnome2_src_prepare +} + +src_configure() { + local myconf + # PAM is the only auth scheme supported + # even though configure lists shadow and crypt + # they don't have any corresponding code. + # --with-at-spi-registryd-directory= needs to be passed explicitly because + # of https://bugzilla.gnome.org/show_bug.cgi?id=607643#c4 + # Xevie is obsolete, bug #482304 + # --with-initial-vt=7 conflicts with plymouth, bug #453392 + ! use plymouth && myconf="${myconf} --with-initial-vt=7" + + gnome2_src_configure \ + --with-run-dir=/run/gdm \ + --localstatedir="${EPREFIX}"/var \ + --disable-static \ + --with-xdmcp=yes \ + --enable-authentication-scheme=pam \ + --with-default-pam-config=exherbo \ + --with-at-spi-registryd-directory="${EPREFIX}"/usr/libexec \ + --with-consolekit-directory="${EPREFIX}"/usr/lib/ConsoleKit \ + --without-xevie \ + $(use_with audit libaudit) \ + $(use_enable ipv6) \ + $(use_with plymouth) \ + $(use_with selinux) \ + $(use_with systemd) \ + $(use_with !systemd console-kit) \ + $(use_enable systemd systemd-journal) \ + $(systemd_with_unitdir) \ + $(use_with tcpd tcp-wrappers) \ + $(use_enable wayland wayland-support) \ + $(use_with xinerama) \ + ITSTOOL=$(type -P true) \ + ${myconf} +} + +src_install() { + gnome2_src_install + + if ! use accessibility ; then + rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die + fi + + exeinto /etc/X11/xinit/xinitrc.d + newexe "${FILESDIR}/49-keychain-r1" 49-keychain + newexe "${FILESDIR}/50-ssh-agent-r1" 50-ssh-agent + + # gdm user's home directory + keepdir /var/lib/gdm + fowners gdm:gdm /var/lib/gdm + + # install XDG_DATA_DIRS gdm changes + echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm + doenvd 99xdg-gdm + + use branding && newicon "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg" gentoo-gdm.svg + + readme.gentoo_create_doc +} + +pkg_postinst() { + local d ret + + gnome2_pkg_postinst + + # bug #436456; gdm crashes if /var/lib/gdm subdirs are not owned by gdm:gdm + ret=0 + ebegin "Fixing "${EROOT}"var/lib/gdm ownership" + chown gdm:gdm "${EROOT}var/lib/gdm" || ret=1 + for d in "${EROOT}var/lib/gdm/"{.cache,.config,.local}; do + [[ ! -e "${d}" ]] || chown -R gdm:gdm "${d}" || ret=1 + done + eend ${ret} + + readme.gentoo_print_elog +} diff --git a/gnome-base/gnome-shell/gnome-shell-3.14.3.ebuild b/gnome-base/gnome-shell/gnome-shell-3.14.3.ebuild index f10316292c8e..36f249d21d1d 100644 --- a/gnome-base/gnome-shell/gnome-shell-3.14.3.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-3.14.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.14.3.ebuild,v 1.6 2015/04/11 15:21:21 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.14.3.ebuild,v 1.8 2015/04/19 02:19:48 tetromino Exp $ EAPI="5" GCONF_DEBUG="no" @@ -44,6 +44,7 @@ COMMON_DEPEND=" >=x11-libs/libXfixes-5.0 x11-libs/libXtst >=x11-wm/mutter-3.14.3[introspection] + =x11-libs/startup-notification-0.11 ${PYTHON_DEPS} @@ -64,6 +65,7 @@ COMMON_DEPEND=" bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) networkmanager? ( app-crypt/libsecret + >=gnome-extra/nm-applet-0.9.8 >=net-misc/networkmanager-0.9.8[introspection] ) " # Runtime-only deps are probably incomplete and approximate. diff --git a/gnome-base/gnome-shell/gnome-shell-3.14.4.ebuild b/gnome-base/gnome-shell/gnome-shell-3.14.4.ebuild index b57506138fbc..f7090d42458f 100644 --- a/gnome-base/gnome-shell/gnome-shell-3.14.4.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-3.14.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.14.4.ebuild,v 1.2 2015/04/11 15:21:21 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.14.4.ebuild,v 1.4 2015/04/19 02:19:48 tetromino Exp $ EAPI="5" GCONF_DEBUG="no" @@ -44,6 +44,7 @@ COMMON_DEPEND=" >=x11-libs/libXfixes-5.0 x11-libs/libXtst >=x11-wm/mutter-3.14.4[introspection] + =x11-libs/startup-notification-0.11 ${PYTHON_DEPS} @@ -64,6 +65,7 @@ COMMON_DEPEND=" bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) networkmanager? ( app-crypt/libsecret + >=gnome-extra/nm-applet-0.9.8 >=net-misc/networkmanager-0.9.8[introspection] ) " # Runtime-only deps are probably incomplete and approximate. diff --git a/gnome-extra/gnome-tweak-tool/Manifest b/gnome-extra/gnome-tweak-tool/Manifest index c5717dd97b92..6a5f9a71a310 100644 --- a/gnome-extra/gnome-tweak-tool/Manifest +++ b/gnome-extra/gnome-tweak-tool/Manifest @@ -1,2 +1,3 @@ DIST gnome-tweak-tool-3.12.0.tar.xz 228648 SHA256 f8811d638797ef62500770a8dccc5bc689a427c8396a0dff8cbeddffdebf0e29 SHA512 e2735d3b8f0f0074eb1ec30e1ad683390a8610bcf1002dc1cc8c7b456de10848e4daaa1be56e2c87e1211c995d78f54a851b4d6be3bcd016407b0ed56af66e9b WHIRLPOOL 7dcd711f7f8cbbaff7db57e03e53844b4a3394895510538f7ecabf891294fae89be73e01b248b20069e1ff30d8efbfc8d9c59b227c22759efb9b4bc250fc691d DIST gnome-tweak-tool-3.14.2.tar.xz 242680 SHA256 f38dbfabc6f566561592900d17d1c106f22a50438f77d70f9ec4e1093284cb97 SHA512 079943ddaf66a2facb59164ca330485983edd79cf6c4e0f148ae41bc866196b39686f6eee7b5ee9bb0132bbccc12789c4adc96e06dc11b361429bc0398663d5c WHIRLPOOL e34043c603244c304b18bcfd8fdf893b6de755323bdb2d3ac008033da613cbc43731557dd475512799f0b631b3dbb4fc6c074c9be68d620f5862b18aa0766f52 +DIST gnome-tweak-tool-3.14.3.tar.xz 244632 SHA256 efbc1ea34d1a12b910d59b881c959af3b7cc0acbfcc3e284742dec0b5c474f2d SHA512 ea808733a31a268df03a8866539916cc9a96bcf35daa0425c287c9ffa86ece631a56a5e486d86bcb122d2ce78ed8193362f1cf4463fe2d6beabeabf483d7b9d5 WHIRLPOOL 1e2845903c0ab970f584ecb1d2d054aa868d7fddffc81c35acaa0eb1e4e17021ce80a6421d84ed13a9490bf681e993aac36d3a7cc1877c6124b3e4893013091d diff --git a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.14.3.ebuild b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.14.3.ebuild new file mode 100644 index 000000000000..0029a2573097 --- /dev/null +++ b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.14.3.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.14.3.ebuild,v 1.1 2015/04/19 13:59:49 eva Exp $ + +EAPI="5" +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" +PYTHON_COMPAT=( python2_7 ) + +inherit eutils gnome2 python-r1 + +DESCRIPTION="Tool to customize GNOME 3 options" +HOMEPAGE="https://wiki.gnome.org/action/show/Apps/GnomeTweakTool" + +LICENSE="GPL-2+" +SLOT="0" +IUSE="" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +# Newer pygobject needed due upstream bug #723951 +COMMON_DEPEND=" + ${PYTHON_DEPS} + >=gnome-base/gsettings-desktop-schemas-3.4 + >=dev-python/pygobject-3.10.2:3[${PYTHON_USEDEP}] +" +# g-s-d, gnome-desktop, gnome-shell etc. needed at runtime for the gsettings schemas +RDEPEND="${COMMON_DEPEND} + >=gnome-base/gnome-desktop-3.6.0.1:3=[introspection] + >=x11-libs/gtk+-3.12:3[introspection] + + net-libs/libsoup[introspection] + x11-libs/libnotify[introspection] + + >=gnome-base/gnome-settings-daemon-3 + gnome-base/gnome-shell + >=gnome-base/nautilus-3 +" +DEPEND="${COMMON_DEPEND} + >=dev-util/intltool-0.40.0 + virtual/pkgconfig +" + +src_prepare() { + # Add contents of Gentoo's cursor theme directory to cursor theme list + epatch "${FILESDIR}/${PN}-3.10.1-gentoo-cursor-themes.patch" + + # Prevent problems setting WM preferences, upstream bug #706834 + epatch "${FILESDIR}/${PN}-3.8.1-wm-preferences.patch" + + gnome2_src_prepare + python_copy_sources +} + +src_configure() { + python_foreach_impl run_in_build_dir gnome2_src_configure +} + +src_compile() { + python_foreach_impl run_in_build_dir gnome2_src_compile +} + +src_test() { + python_foreach_impl run_in_build_dir default +} + +src_install() { + install_python() { + gnome2_src_install + python_doscript gnome-tweak-tool || die + } + python_foreach_impl run_in_build_dir install_python +} diff --git a/gnome-extra/libgda/libgda-5.2.2.ebuild b/gnome-extra/libgda/libgda-5.2.2.ebuild index 3b6641181c49..6652851a58f9 100644 --- a/gnome-extra/libgda/libgda-5.2.2.ebuild +++ b/gnome-extra/libgda/libgda-5.2.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-5.2.2.ebuild,v 1.7 2015/04/08 17:56:31 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-5.2.2.ebuild,v 1.8 2015/04/18 08:08:07 pacho Exp $ EAPI="5" GNOME2_LA_PUNT="yes" @@ -61,6 +61,7 @@ RDEPEND=" # vala? ( dev-libs/libgee:0.8 ) DEPEND="${RDEPEND} >=app-text/gnome-doc-utils-0.9 + app-text/yelp-tools dev-util/gtk-doc-am >=dev-util/intltool-0.40.6 virtual/pkgconfig diff --git a/gnome-extra/nautilus-dropbox/Manifest b/gnome-extra/nautilus-dropbox/Manifest index 71455e1476a9..7b016e277d88 100644 --- a/gnome-extra/nautilus-dropbox/Manifest +++ b/gnome-extra/nautilus-dropbox/Manifest @@ -1,2 +1 @@ -DIST nautilus-dropbox-1.6.0.tar.bz2 354059 SHA256 602147653877e4a7bad6c95c4bf307951907b82fffb4ac69a131ebcf18feb9ed SHA512 2eded1f96e3b695984cdde3c7528282debcd774c6ab020c80cae45b581f77554442322cdfd6c551186acd6c088cc2fe1dfbe430c88ad06080e025e201131f0da WHIRLPOOL e163a459b635813e0e17e3ef5b722c13f50e22deffbbafec9b849419a76c582059f2ebe05ce10ac70b031ca366dfb9c2ae260fcd6dbcfdd12cca8b98cf9d9181 DIST nautilus-dropbox-1.6.2.tar.bz2 354408 SHA256 63d53109c7d0efc0e83f36ac47be3be923115eaf0be56cfc9a1aa8e2ecc633e4 SHA512 696808a7e5a1d8bbe06903b5ab075e0aa32d0b35c44363d7874fcdd48d339650bdf80190e37cba5782b31565ca9b233573a3d2ee74866add169ff5ea1d0b62d3 WHIRLPOOL b6e7f91674d5a9163ab7b46f95ffdcbdaa5815e9f7e16e37f8da38ab9028eaa09076afc49978465d8547bbf20971825b2dbd356766e99ed756ba96b79aeda649 diff --git a/gnome-extra/nautilus-dropbox/nautilus-dropbox-1.6.0.ebuild b/gnome-extra/nautilus-dropbox/nautilus-dropbox-1.6.0.ebuild deleted file mode 100644 index 8c0c3f0f2755..000000000000 --- a/gnome-extra/nautilus-dropbox/nautilus-dropbox-1.6.0.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-dropbox/nautilus-dropbox-1.6.0.ebuild,v 1.5 2015/04/08 17:56:31 mgorny Exp $ - -EAPI="5" - -GNOME2_LA_PUNT="yes" -PYTHON_COMPAT=( python2_7 ) - -inherit autotools eutils python-r1 linux-info gnome2 readme.gentoo user - -DESCRIPTION="Store, Sync and Share Files Online" -HOMEPAGE="http://www.dropbox.com/" -SRC_URI="http://www.dropbox.com/download?dl=packages/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -IUSE="debug" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - gnome-base/nautilus - dev-libs/glib:2 - dev-python/pygtk:2[${PYTHON_USEDEP}] - net-misc/dropbox - x11-libs/gtk+:2 - x11-libs/libnotify - x11-libs/libXinerama" - -DEPEND="${RDEPEND} - virtual/pkgconfig - dev-python/docutils[${PYTHON_USEDEP}]" - -CONFIG_CHECK="~INOTIFY_USER" - -pkg_setup () { - check_extra_config - enewgroup dropbox - - DOC_CONTENTS="Add any users who wish to have access to the dropbox nautilus - plugin to the group 'dropbox'. You need to setup a drobox account - before using this plugin. Visit ${HOMEPAGE} for more information." - - python_export_best -} - -src_prepare() { - G2CONF="${G2CONF} $(use_enable debug) --disable-static" - - gnome2_src_prepare - - # use sysem dropbox - sed \ - -e "s|~/[.]dropbox-dist|${EPREFIX}/opt/dropbox|" \ - -e "s|\(DROPBOXD_PATH = \).*|\1\"${EPREFIX}/opt/dropbox/dropboxd\"|" \ - -i dropbox.in || die - # us system rst2man - epatch "${FILESDIR}"/${PN}-0.7.0-system-rst2man.patch - sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in || die - AT_NOELIBTOOLIZE=yes eautoreconf -} - -src_install () { - gnome2_src_install - - local extensiondir="$(pkg-config --variable=extensiondir libnautilus-extension)" - [ -z ${extensiondir} ] && die "pkg-config unable to get nautilus extensions dir" - - # Strip $EPREFIX from $extensiondir as fowners/fperms act on $ED not $D - extensiondir="${extensiondir#${EPREFIX}}" - - use prefix || fowners root:dropbox "${extensiondir}"/libnautilus-dropbox.so - fperms o-rwx "${extensiondir}"/libnautilus-dropbox.so - - readme.gentoo_create_doc - - python_replicate_script "${ED}"/usr/bin/dropbox -} - -pkg_postinst () { - gnome2_pkg_postinst - readme.gentoo_print_elog -} diff --git a/gnome-extra/polkit-gnome/polkit-gnome-0.105-r1.ebuild b/gnome-extra/polkit-gnome/polkit-gnome-0.105-r1.ebuild index 3cbce569818c..a1f51273eacc 100644 --- a/gnome-extra/polkit-gnome/polkit-gnome-0.105-r1.ebuild +++ b/gnome-extra/polkit-gnome/polkit-gnome-0.105-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/polkit-gnome/polkit-gnome-0.105-r1.ebuild,v 1.6 2015/04/14 10:57:50 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/polkit-gnome/polkit-gnome-0.105-r1.ebuild,v 1.7 2015/04/19 09:54:59 ago Exp $ EAPI=4 inherit gnome.org @@ -10,7 +10,7 @@ HOMEPAGE="http://www.freedesktop.org/wiki/Software/PolicyKit" LICENSE="LGPL-2" SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd" IUSE="" RDEPEND=">=dev-libs/glib-2.30 diff --git a/mail-client/geary/Manifest b/mail-client/geary/Manifest index f682cdd20776..69e995047fa2 100644 --- a/mail-client/geary/Manifest +++ b/mail-client/geary/Manifest @@ -1,3 +1,2 @@ DIST geary-0.6.3.tar.xz 791248 SHA256 2fa2612bf3821f8ff74664463a430729776f6f9bf31795156be2ca7959b52eca SHA512 4a4f26b3e88032191f2b683d8ed0d48401b278c4d1cc69c09731d9ca878450847a35c0653a8b9907ce81b989e713d1a41a40b7b6193f6e84a6e6f4eb4d5053f4 WHIRLPOOL 83e4a648a792639a10fde6eccf78db2fb582ebea4f5f0806091e4cc9f8550387e976e46b383b33819b32a25ec665116cfecfa3417acb72950f1eba3ffa48d403 -DIST geary-0.7.2.tar.xz 811104 SHA256 a121c808d41a735b1d36c04bca742014a35baec423ebcfb97e43fd7bd9767b30 SHA512 151f20f064d88bc9c29ecef81c7c5a4c373929ea245b28108e152a91c729c1cfcf78794db443ef08bc594d2980f427dce16ddf8a630c8a44ce4b6f7b456f4c57 WHIRLPOOL 2e24c06d26ddf45ab94652800b6c5ab77f1243fd942e973deb51a6cc78a572d519fd92502d4c6f3f4e273465787205539d92966d37362882fef660eb0199acb2 DIST geary-0.8.2.tar.xz 833616 SHA256 3cfa626168935acf49c9415fad54c7849f17fd833026cfd3c224ba0fb892d641 SHA512 f6fa0583f4d78970e8f237f6df193ceb4bd353e263bcded5d6c27458502e7e299bdcd29c709c34e1dde26ccdad05ca95b6c3920e402c3796e5384308886e8924 WHIRLPOOL ce8723222ac8a756738903b757fed65c81a27d8e948907e4958cdc031cfb474ab675eeee65ec249271bb3a1bf7e0b2f5285f2920c6aab5ea502d62d004af3ce9 diff --git a/mail-client/geary/geary-0.7.2-r1.ebuild b/mail-client/geary/geary-0.7.2-r1.ebuild deleted file mode 100644 index 3e5e063a0444..000000000000 --- a/mail-client/geary/geary-0.7.2-r1.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/geary/geary-0.7.2-r1.ebuild,v 1.2 2014/12/24 16:37:21 leio Exp $ - -EAPI=5 - -VALA_MIN_API_VERSION=0.22 - -inherit eutils fdo-mime gnome2-utils vala cmake-utils - -MY_P=${P/_pre/pr} -DESCRIPTION="A lightweight, easy-to-use, feature-rich email client" -HOMEPAGE="http://www.yorba.org/projects/geary/" -SRC_URI="mirror://gnome/sources/geary/${PV:0:3}/${MY_P}.tar.xz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="nls" - -DEPEND=" - app-crypt/gcr[gtk,introspection,vala] - app-crypt/libsecret - dev-db/sqlite:3 - dev-libs/glib:2 - >=dev-libs/libgee-0.8.5:0.8 - dev-libs/libxml2:2 - dev-libs/gmime:2.6 - media-libs/libcanberra - >=net-libs/webkit-gtk-1.10.0:3[introspection] - >=x11-libs/gtk+-3.10.0:3[introspection] - x11-libs/libnotify" -RDEPEND="${DEPEND} - gnome-base/gsettings-desktop-schemas - nls? ( virtual/libintl )" -DEPEND="${DEPEND} - app-text/gnome-doc-utils - dev-util/desktop-file-utils - nls? ( sys-devel/gettext ) - $(vala_depend) - virtual/pkgconfig" - -DOCS=( AUTHORS MAINTAINERS README NEWS THANKS ) - -S=${WORKDIR}/${MY_P} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.7.2-cflags.patch \ - "${FILESDIR}"/${PN}-0.5.3-vapigen.patch \ - "${FILESDIR}"/${PN}-0.6.0-desktopfile.patch - - local i - if use nls ; then - if [[ -n "${LINGUAS+x}" ]] ; then - for i in $(cd po ; echo *.po) ; do - if ! has ${i%.po} ${LINGUAS} ; then - sed -i -e "/^${i%.po}$/d" po/LINGUAS || die - fi - done - fi - else - sed -i -e 's#add_subdirectory(po)##' CMakeLists.txt || die - fi - - cmake-utils_src_prepare - vala_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DDESKTOP_UPDATE=OFF - -DGSETTINGS_COMPILE=OFF - -DICON_UPDATE=OFF - -DVALA_EXECUTABLE="${VALAC}" - -DWITH_UNITY=OFF - -DDESKTOP_VALIDATE=OFF - ) - - cmake-utils_src_configure -} - -pkg_preinst() { - gnome2_icon_savelist - gnome2_schemas_savelist -} - -pkg_postinst() { - elog "For libnotify sounds you will need" - elog "\"alsa\" or \"pulseaudio\" useflag of media-libs/libcanberra" - elog "enabled." - - fdo-mime_desktop_database_update - gnome2_icon_cache_update - gnome2_schemas_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update - gnome2_schemas_update -} diff --git a/mail-filter/bogofilter/bogofilter-1.2.4-r1.ebuild b/mail-filter/bogofilter/bogofilter-1.2.4-r1.ebuild index 30927e4a5592..4a4eaf86a8db 100644 --- a/mail-filter/bogofilter/bogofilter-1.2.4-r1.ebuild +++ b/mail-filter/bogofilter/bogofilter-1.2.4-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/bogofilter/bogofilter-1.2.4-r1.ebuild,v 1.11 2014/08/13 09:32:57 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/bogofilter/bogofilter-1.2.4-r1.ebuild,v 1.12 2015/04/18 20:38:02 pacho Exp $ EAPI=5 inherit autotools db-use eutils flag-o-matic toolchain-funcs @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 ~sh sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd" IUSE="berkdb sqlite tokyocabinet" DEPEND="virtual/libiconv diff --git a/mail-filter/spamassassin/spamassassin-3.4.0.ebuild b/mail-filter/spamassassin/spamassassin-3.4.0.ebuild index a99a33a9cbe3..72cf4203aadd 100644 --- a/mail-filter/spamassassin/spamassassin-3.4.0.ebuild +++ b/mail-filter/spamassassin/spamassassin-3.4.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.4.0.ebuild,v 1.17 2015/04/13 09:47:32 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.4.0.ebuild,v 1.18 2015/04/19 09:52:42 pacho Exp $ EAPI=5 @@ -14,7 +14,7 @@ SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2" LICENSE="Apache-2.0 GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" IUSE="+berkdb qmail ssl doc ldap mysql postgres sqlite ipv6" REQUIRED_USE="|| ( berkdb mysql postgres sqlite )" diff --git a/media-gfx/dcraw/dcraw-9.24.4.ebuild b/media-gfx/dcraw/dcraw-9.24.4.ebuild index 4e571792bc69..0ab1cf7aaa61 100644 --- a/media-gfx/dcraw/dcraw-9.24.4.ebuild +++ b/media-gfx/dcraw/dcraw-9.24.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/dcraw/dcraw-9.24.4.ebuild,v 1.5 2015/04/14 10:58:26 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/dcraw/dcraw-9.24.4.ebuild,v 1.6 2015/04/19 09:55:20 ago Exp $ EAPI=5 inherit eutils readme.gentoo toolchain-funcs @@ -13,7 +13,7 @@ SRC_URI="http://www.cybercom.net/~dcoffin/dcraw/archive/${P}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" LANGS=" ca cs de da eo es fr hu it nl pl pt ru sv zh_CN zh_TW" IUSE="nls gimp jpeg jpeg2k lcms ${LANGS// / linguas_}" diff --git a/media-gfx/openexr_viewers/openexr_viewers-2.1.0.ebuild b/media-gfx/openexr_viewers/openexr_viewers-2.1.0.ebuild index fa7036df0644..a82e090c4364 100644 --- a/media-gfx/openexr_viewers/openexr_viewers-2.1.0.ebuild +++ b/media-gfx/openexr_viewers/openexr_viewers-2.1.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/openexr_viewers/openexr_viewers-2.1.0.ebuild,v 1.3 2015/02/12 11:13:01 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/openexr_viewers/openexr_viewers-2.1.0.ebuild,v 1.4 2015/04/19 07:01:28 pacho Exp $ EAPI=5 inherit autotools eutils flag-o-matic @@ -11,7 +11,7 @@ SRC_URI="http://download.savannah.gnu.org/releases/openexr/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd" IUSE="cg opengl" RDEPEND=">=media-libs/ilmbase-${PV}:= diff --git a/media-gfx/phototonic/Manifest b/media-gfx/phototonic/Manifest index f0f92df1dae1..ed05f31c6429 100644 --- a/media-gfx/phototonic/Manifest +++ b/media-gfx/phototonic/Manifest @@ -1,2 +1,2 @@ DIST phototonic-1.5.54.tar.xz 160716 SHA256 a84ec02cd03635fd5f2b19deea46eec0c74e6f9fabb24943fcf37bbece1c214e SHA512 a4ce914503a8452bb6d2a2c97cef6c5b4b69e0d8c5a349bd5a68680731b3a9e70a9afa7ff63cb2836aa8d970f074b058627687fa7cdcfb898da13c696c2d6df7 WHIRLPOOL a17369097cdf5ec9efac2cefaee582aafbdbfee0a22ee8395c2824aa16913c10c929e8359fcd70d508400e85d4f30b25fcba7b176fc135a29b43d0e009080883 -DIST v1.5.tar.gz 180706 SHA256 0356aa0dbcf015f33fc3ba7bd4c874712bac95aa296d31fd08428883183f97a4 SHA512 ed0b75e03a51f708aaa86443b4592d8e8baa16d24616a753c83e47bdcbed79d3478f6c97f1d597c597ec005762cb0b1891a4ebda45dc8316232c7e2e12e3823f WHIRLPOOL b81f4e4797f6f565eccaa1b8891d4a71efcef243ca6b2aff5b697f1dc556931fb57f0c8081c372e618a53a66526bb011e47693f4814b0b31cf72e252e8d67de5 +DIST phototonic-1.5.tar.gz 180706 SHA256 0356aa0dbcf015f33fc3ba7bd4c874712bac95aa296d31fd08428883183f97a4 SHA512 ed0b75e03a51f708aaa86443b4592d8e8baa16d24616a753c83e47bdcbed79d3478f6c97f1d597c597ec005762cb0b1891a4ebda45dc8316232c7e2e12e3823f WHIRLPOOL b81f4e4797f6f565eccaa1b8891d4a71efcef243ca6b2aff5b697f1dc556931fb57f0c8081c372e618a53a66526bb011e47693f4814b0b31cf72e252e8d67de5 diff --git a/media-gfx/phototonic/phototonic-1.5.ebuild b/media-gfx/phototonic/phototonic-1.5.ebuild index a25cc2f046b1..be08fe4b1dd5 100644 --- a/media-gfx/phototonic/phototonic-1.5.ebuild +++ b/media-gfx/phototonic/phototonic-1.5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/phototonic/phototonic-1.5.ebuild,v 1.2 2014/12/15 14:08:30 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/phototonic/phototonic-1.5.ebuild,v 1.3 2015/04/18 12:43:25 swegener Exp $ EAPI=5 inherit qmake-utils @@ -12,7 +12,7 @@ if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://github.com/oferkv/phototonic.git" KEYWORDS="" else - SRC_URI="https://github.com/oferkv/phototonic/archive/v${PV}.tar.gz" + SRC_URI="https://github.com/oferkv/phototonic/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" fi diff --git a/media-gfx/pydot/pydot-1.0.28-r2.ebuild b/media-gfx/pydot/pydot-1.0.28-r2.ebuild index 5f722037a6cd..f90e68347ddf 100644 --- a/media-gfx/pydot/pydot-1.0.28-r2.ebuild +++ b/media-gfx/pydot/pydot-1.0.28-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/pydot/pydot-1.0.28-r2.ebuild,v 1.8 2015/04/14 13:23:47 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/pydot/pydot-1.0.28-r2.ebuild,v 1.9 2015/04/19 09:37:15 pacho Exp $ EAPI=5 @@ -14,7 +14,7 @@ SRC_URI="http://pydot.googlecode.com/files/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris" +KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris" IUSE="" RDEPEND=" diff --git a/media-gfx/scantailor/scantailor-0.9.11.1.ebuild b/media-gfx/scantailor/scantailor-0.9.11.1.ebuild index e39aa025fc1e..4624fcedfb0e 100644 --- a/media-gfx/scantailor/scantailor-0.9.11.1.ebuild +++ b/media-gfx/scantailor/scantailor-0.9.11.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/scantailor/scantailor-0.9.11.1.ebuild,v 1.4 2014/10/19 09:38:51 nimiux Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/scantailor/scantailor-0.9.11.1.ebuild,v 1.5 2015/04/18 15:54:10 pacho Exp $ EAPI=4 inherit cmake-utils eutils virtualx toolchain-funcs @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2 GPL-3 public-domain" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="opengl" RDEPEND=">=media-libs/libpng-1.2.43 diff --git a/media-libs/elementary/elementary-1.12.2.ebuild b/media-libs/elementary/elementary-1.12.2.ebuild index 878746257457..125fbddeae3f 100644 --- a/media-libs/elementary/elementary-1.12.2.ebuild +++ b/media-libs/elementary/elementary-1.12.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/elementary/elementary-1.12.2.ebuild,v 1.3 2015/04/03 14:45:47 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/elementary/elementary-1.12.2.ebuild,v 1.4 2015/04/19 09:55:39 ago Exp $ EAPI=5 @@ -20,7 +20,7 @@ DESCRIPTION="Basic widget set, based on EFL for mobile touch-screen devices" HOMEPAGE="http://trac.enlightenment.org/e/wiki/Elementary" LICENSE="LGPL-2.1" -KEYWORDS="amd64 arm ~x86" +KEYWORDS="amd64 arm x86" IUSE="debug examples fbcon quicklaunch sdl wayland X static-libs" DEPEND=" diff --git a/media-libs/exempi/exempi-2.2.1.ebuild b/media-libs/exempi/exempi-2.2.1.ebuild index b4c6466fc307..c8c941adeb91 100644 --- a/media-libs/exempi/exempi-2.2.1.ebuild +++ b/media-libs/exempi/exempi-2.2.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/exempi/exempi-2.2.1.ebuild,v 1.5 2015/04/14 10:59:03 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/exempi/exempi-2.2.1.ebuild,v 1.6 2015/04/19 09:55:57 ago Exp $ EAPI=5 inherit autotools eutils @@ -11,7 +11,7 @@ SRC_URI="http://libopenraw.freedesktop.org/download/${P}.tar.gz" LICENSE="BSD" SLOT="2" -KEYWORDS="alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +KEYWORDS="alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd" IUSE="examples static-libs" RDEPEND=">=dev-libs/expat-2:= diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest index 0b867f329364..f076148037da 100644 --- a/media-libs/fontconfig/Manifest +++ b/media-libs/fontconfig/Manifest @@ -1,2 +1,2 @@ -DIST fontconfig-2.10.92.tar.bz2 1525585 SHA256 1162059927120f2321f12917189b524e6b2f09e11ac643278d0bb82634035b22 SHA512 b09996f1715a1d563cfc95a986847d0895fff96fb8a5db4b006a560764654db749675ed5d4ca2369296c0f6d2c21581e63892df2883d021ff6b92ede04788a1b WHIRLPOOL 75164908ce454c26583afde9575e4dac2985dd947f8abaf3a5173777fc738c11430c72674c342ae9445f2a749d0414b7d291032203f62e2cb5d6db5b119f14f5 DIST fontconfig-2.11.1.tar.bz2 1516095 SHA256 dc62447533bca844463a3c3fd4083b57c90f18a70506e7a9f4936b5a1e516a99 SHA512 acf4e6293e0e5521e4b8f29f4b48860ecd1d39744d0eab21c7332e56bfc3ccc63548e459243c5e425b8e5ef265f2cf065eece02460725e794041219d41188149 WHIRLPOOL 45009a1e0fcbbe2f532c6f642a0d57af35af3f6abfb50098c89fe39c71da96597078eb4babdd80a713ef4456e07481d70def7c1c18b7314452136d5b30a4858b +DIST fontconfig-2.11.93.tar.bz2 1565609 SHA256 381e7c14c7a8bc268a9c07589837f0ea24139abc15f46171b7f94751c969a0af SHA512 68e1728884e4c1bc236cd164fe0b8912c194e8b69bcbffdb3bc8a718737e640061d01a543d90d4198fb2a2d2df0d36b40fac40a27d9845579e1893428d3a22bd WHIRLPOOL b596c1e015e48945158d9d8ffe5e1bf91e6912ac9187fefa829960897fba5c9810ff73ec5ea255b6ca490adb768bd20a50ca0eda41763824cd59b180071600f2 diff --git a/media-libs/fontconfig/files/fontconfig-2.11.93-addfile.patch b/media-libs/fontconfig/files/fontconfig-2.11.93-addfile.patch new file mode 100644 index 000000000000..8b96da2e5946 --- /dev/null +++ b/media-libs/fontconfig/files/fontconfig-2.11.93-addfile.patch @@ -0,0 +1,109 @@ +From c965c9f67759585909fa03236bad826de85bd39c Mon Sep 17 00:00:00 2001 +From: Akira TAGOH +Date: Mon, 23 Mar 2015 13:30:59 +0900 +Subject: Bug 89617 - FcConfigAppFontAddFile() returns false on any font file + +Prior to the change of 32ac7c75e8db0135ef37cf86f92d8b9be000c8bb +FcConfigAppFontAddFile() always returned FcTrue no matter what +fonts was added. after that, it always returned FcFalse because +adding a font doesn't add any subdirs with FcFileScanConfig(). +so changing that to simply ignore it. + +Also fixing it to return FcFalse if non-fonts was added, i.e. +FcFreeTypeQuery() fails. + +https://bugs.freedesktop.org/show_bug.cgi?id=89617 + +diff --git a/src/fccfg.c b/src/fccfg.c +index b92270b..5467493 100644 +--- a/src/fccfg.c ++++ b/src/fccfg.c +@@ -2227,7 +2227,9 @@ FcConfigAppFontAddFile (FcConfig *config, + FcStrSetDestroy (subdirs); + return FcFalse; + } +- if ((sublist = FcStrListCreate (subdirs))) ++ if (subdirs->num == 0) ++ ret = FcTrue; ++ else if ((sublist = FcStrListCreate (subdirs))) + { + while ((subdir = FcStrListNext (sublist))) + { +diff --git a/src/fcdir.c b/src/fcdir.c +index 00dee72..2e7f0dc 100644 +--- a/src/fcdir.c ++++ b/src/fcdir.c +@@ -136,6 +136,8 @@ FcFileScanFontConfig (FcFontSet *set, + ret = FcFalse; + } + } ++ else ++ ret = FcFalse; + id++; + } while (font && ret && id < count); + return ret; +diff --git a/test/Makefile.am b/test/Makefile.am +index f270b50..bf1ec24 100644 +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -24,6 +24,13 @@ test_pthread_LDADD = $(top_builddir)/src/libfontconfig.la + # to meaningfully test anything, and we are not installed yet. + #TESTS += test-pthread + endif ++check_PROGRAMS += test-bz89617 ++test_bz89617_CFLAGS = \ ++ -DSRCDIR="\"$(abs_srcdir)\"" ++ ++test_bz89617_LDADD = $(top_builddir)/src/libfontconfig.la ++TESTS += test-bz89617 ++ + noinst_PROGRAMS = $(check_PROGRAMS) + + if !OS_WIN32 +diff --git a/test/test-bz89617.c b/test/test-bz89617.c +new file mode 100644 +index 0000000..389f470 +--- /dev/null ++++ b/test/test-bz89617.c +@@ -0,0 +1,38 @@ ++/* ++ * fontconfig/test/test-bz89617.c ++ * ++ * Copyright © 2000 Keith Packard ++ * Copyright © 2015 Akira TAGOH ++ * ++ * Permission to use, copy, modify, distribute, and sell this software and its ++ * documentation for any purpose is hereby granted without fee, provided that ++ * the above copyright notice appear in all copies and that both that ++ * copyright notice and this permission notice appear in supporting ++ * documentation, and that the name of the author(s) not be used in ++ * advertising or publicity pertaining to distribution of the software without ++ * specific, written prior permission. The authors make no ++ * representations about the suitability of this software for any purpose. It ++ * is provided "as is" without express or implied warranty. ++ * ++ * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++ * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++ * PERFORMANCE OF THIS SOFTWARE. ++ */ ++#include ++#include ++ ++int ++main (void) ++{ ++ FcConfig *config = FcConfigGetCurrent (); ++ ++ if (!FcConfigAppFontAddFile (config, SRCDIR "/4x6.pcf") || ++ FcConfigAppFontAddFile (config, "/dev/null")) ++ return 1; ++ ++ return 0; ++} +-- +cgit v0.10.2 + diff --git a/media-libs/fontconfig/files/fontconfig-2.11.93-fix-sigfpe.patch b/media-libs/fontconfig/files/fontconfig-2.11.93-fix-sigfpe.patch new file mode 100644 index 000000000000..e5a5558e2c49 --- /dev/null +++ b/media-libs/fontconfig/files/fontconfig-2.11.93-fix-sigfpe.patch @@ -0,0 +1,22 @@ +From 7bc07cf6c2a5685ab95f146f5af2b3bcd5f5864d Mon Sep 17 00:00:00 2001 +From: Akira TAGOH +Date: Mon, 30 Mar 2015 15:18:44 +0900 +Subject: Fix SIGFPE + + +diff --git a/src/fcrange.c b/src/fcrange.c +index 37cf067..9b1b67b 100644 +--- a/src/fcrange.c ++++ b/src/fcrange.c +@@ -204,7 +204,7 @@ FcRangeHash (const FcRange *r) + { + FcRange c = FcRangeCanonicalize (r); + int b = (int) (c.u.d.begin * 100); +- int e = (int) (c.u.d.end * 100); ++ int e = FcDoubleCmpEQ (c.u.d.end, DBL_MAX) ? INT_MAX : (int) (c.u.d.end * 100); + + return b ^ (b << 1) ^ (e << 9); + } +-- +cgit v0.10.2 + diff --git a/media-libs/fontconfig/files/fontconfig-2.11.93-latin-update.patch b/media-libs/fontconfig/files/fontconfig-2.11.93-latin-update.patch new file mode 100644 index 000000000000..033fe895bc10 --- /dev/null +++ b/media-libs/fontconfig/files/fontconfig-2.11.93-latin-update.patch @@ -0,0 +1,67 @@ +--- fontconfig-2.11.93.orig/conf.d/60-latin.conf 2015-04-18 20:06:06.070687989 +0800 ++++ fontconfig-2.11.93/conf.d/60-latin.conf 2015-04-18 20:14:15.245732796 +0800 +@@ -4,46 +4,49 @@ + + serif + +- Bitstream Vera Serif ++ Liberation Serif + DejaVu Serif + Times New Roman +- Thorndale AMT + Luxi Serif + Nimbus Roman No9 L + Nimbus Roman + Times ++ Thorndale AMT ++ Bitstream Vera Serif + + + + sans-serif + +- Bitstream Vera Sans ++ Liberation Sans + DejaVu Sans +- Verdana + Arial +- Albany AMT + Luxi Sans + Nimbus Sans L + Nimbus Sans + Helvetica + Lucida Sans Unicode + BPG Glaho International ++ Verdana + Tahoma ++ Albany AMT ++ Bitstream Vera Sans + + + + monospace + +- Bitstream Vera Sans Mono ++ Liberation Mono + DejaVu Sans Mono + Inconsolata + Andale Mono + Courier New +- Cumberland AMT + Luxi Mono + Nimbus Mono L + Nimbus Mono + Courier ++ Cumberland AMT ++ Bitstream Vera Sans Mono + + +