diff --git a/app-admin/rsyslog/rsyslog-8.4.1.ebuild b/app-admin/rsyslog/rsyslog-8.4.1.ebuild index 1bd885c739af..abe8ad6b53f3 100644 --- a/app-admin/rsyslog/rsyslog-8.4.1.ebuild +++ b/app-admin/rsyslog/rsyslog-8.4.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-8.4.1.ebuild,v 1.1 2014/09/30 13:09:39 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-8.4.1.ebuild,v 1.2 2014/10/01 10:58:52 jer Exp $ EAPI=5 AUTOTOOLS_AUTORECONF=1 @@ -15,7 +15,7 @@ SRC_URI=" " LICENSE="GPL-3 LGPL-3 Apache-2.0" -KEYWORDS="~amd64 ~arm ~hppa ~x86" +KEYWORDS="~amd64 ~arm hppa ~x86" SLOT="0" IUSE="dbi debug doc elasticsearch +gcrypt jemalloc kerberos mongodb mysql normalize omudpspoof oracle postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd usertools zeromq" diff --git a/app-arch/dump/files/dump-0.4.44-fix-pointers-aliasing.patch b/app-arch/dump/files/dump-0.4.44-fix-pointers-aliasing.patch index 59a2f653752c..6e3290085470 100644 --- a/app-arch/dump/files/dump-0.4.44-fix-pointers-aliasing.patch +++ b/app-arch/dump/files/dump-0.4.44-fix-pointers-aliasing.patch @@ -1,4 +1,4 @@ -https://sourceforge.net/tracker/?func=detail&aidhttps://sourceforge.net/tracker/?func=detail&aid=3322910&group_id=1306&atid=301306 +https://sourceforge.net/tracker/?func=detail&aid=3322910&group_id=1306&atid=301306 === modified file 'dump/tape.c' --- dump/tape.c 2011-06-20 07:22:40 +0000 @@ -120,4 +120,7 @@ https://sourceforge.net/tracker/?func=detail&aidhttps://sourceforge.net/tracker/ - comprbuf, &worklen2, NULL); + cresult = lzo1x_decompress((lzo_bytep)tpbin->buf, blocklen, + (lzo_bytep)comprbuf, &worklen2, NULL); - worklen = worklen2; \ No newline at end of file + worklen = worklen2; + output = comprbuf; + switch (cresult) { + diff --git a/app-misc/mediacrush-cli/Manifest b/app-misc/mediacrush-cli/Manifest index 19b6973db61b..374ae634efe6 100644 --- a/app-misc/mediacrush-cli/Manifest +++ b/app-misc/mediacrush-cli/Manifest @@ -1,2 +1 @@ DIST mediacrush-cli-1.1.2.tar.gz 3299 SHA256 eaa8f7f7999246bc5cb2fb356cfb35263009b5a0f386000488e638e81fb5a72a SHA512 fa4c905e75ffe1d16a83a6c3cc29dd2e28eb9097d1bc95742ece2356ab6e219c15c75bab7a09443c98b18e438d1e6690968d24c35eb7a3dd0877dff36574761c WHIRLPOOL 3614a7afacb6edcfd7c589f0bbe2769143c0a3638331d0b64c2e25f2d2b0fe89c32c1281e91da4ca315df3f8b9e15a47009e9bcb6d750721ec98345cdac4ed76 -DIST mediacrush-cli-1.1.2.tar.gz 3299 SHA256 eaa8f7f7999246bc5cb2fb356cfb35263009b5a0f386000488e638e81fb5a72a SHA512 fa4c905e75ffe1d16a83a6c3cc29dd2e28eb9097d1bc95742ece2356ab6e219c15c75bab7a09443c98b18e438d1e6690968d24c35eb7a3dd0877dff36574761c WHIRLPOOL 3614a7afacb6edcfd7c589f0bbe2769143c0a3638331d0b64c2e25f2d2b0fe89c32c1281e91da4ca315df3f8b9e15a47009e9bcb6d750721ec98345cdac4ed76 diff --git a/app-misc/metromap/Manifest b/app-misc/metromap/Manifest index a9c594b59c45..71f1fc7dbc17 100644 --- a/app-misc/metromap/Manifest +++ b/app-misc/metromap/Manifest @@ -1,2 +1 @@ DIST metromap-0.1.4.tar.bz2 3419243 SHA256 7fc3b7dd92443ace8944429895c27b2d9bc6444d1eef973b5608cdba72b38fba SHA512 16407c9c8f2d3f608e9188e40b38d20530f552254dbe0c59d7c94ed913b8cb61deae23ffc6180d17fee0d98091c269f24eb04e624dedbb37cc6ece85b46e93ec WHIRLPOOL 5acd843dfa35b87b804c4e879253843f60c4c6df4e0d1dfa5975006b3d9cfe2d58a418f2255b88ab35f1052eeb6a929ba6b00ba1ae75b51d8129021051ee2516 -DIST metromap-0.1.4.tar.bz2 3419243 SHA256 7fc3b7dd92443ace8944429895c27b2d9bc6444d1eef973b5608cdba72b38fba SHA512 16407c9c8f2d3f608e9188e40b38d20530f552254dbe0c59d7c94ed913b8cb61deae23ffc6180d17fee0d98091c269f24eb04e624dedbb37cc6ece85b46e93ec WHIRLPOOL 5acd843dfa35b87b804c4e879253843f60c4c6df4e0d1dfa5975006b3d9cfe2d58a418f2255b88ab35f1052eeb6a929ba6b00ba1ae75b51d8129021051ee2516 diff --git a/app-misc/sleepyhead/sleepyhead-0.9.2.2-r1.ebuild b/app-misc/sleepyhead/sleepyhead-0.9.2.2-r1.ebuild index cb6062f860ee..4ec9d6212c74 100644 --- a/app-misc/sleepyhead/sleepyhead-0.9.2.2-r1.ebuild +++ b/app-misc/sleepyhead/sleepyhead-0.9.2.2-r1.ebuild @@ -38,9 +38,16 @@ src_prepare() { epatch "${FILESDIR}/gitfix.patch" epatch "${FILESDIR}/prs1-64fix.patch" epatch "${FILESDIR}/prs1-code8fix.patch" - epatch "${FILESDIR}/common_gui# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/sleepyhead/sleepyhead-0.9.2.2-r1.ebuild,v 1.5 2014/08/10 18:08:51 slyfox Exp $ + epatch "${FILESDIR}/common_gui.patch" -EAPI=4 -inherit eutils \ No newline at end of file + sed -i '1i#define OF(x) x' quazip/ioapi.h quazip/unzip.c quazip/unzip.h \ + quazip/zip.c quazip/zip.h quazip/zlib.h + eqmake4 SleepyHeadQT.pro +} + +src_install() { + cd "{$S}" + dobin SleepyHead || die + dodoc README || die + dodoc docs/* || die +} diff --git a/app-misc/task/task-2.1.2.ebuild b/app-misc/task/task-2.1.2.ebuild index bca7002f915d..e304fe7bc173 100644 --- a/app-misc/task/task-2.1.2.ebuild +++ b/app-misc/task/task-2.1.2.ebuild @@ -31,22 +31,36 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-1.9.4-lua-automagic.patch } -src_# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/task/task-2.1.2.ebuild,v 1.3 2012/10/04 22:33:32 radhermit Exp $ +src_configure() { + mycmakeargs=( + $(cmake-utils_use_enable lua LUA) + -DTASK_DOCDIR=/usr/share/doc/${PF} + ) -EAPI=4 + cmake-utils_src_configure +} -inherit eutils cmake-utils bash-completion-r1 +src_install() { + cmake-utils_src_install -DESCRIPTION="Taskwarrior is a command-line todo list manager" -HOMEPAGE="http://taskwarrior.org/projects/show/taskwarrior/" -SRC_URI="http://taskwarrior.org/download/${P}.tar.gz" + newbashcomp scripts/bash/task.sh task -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="lua vim-syntax zsh-completion" + if use lua ; then + insinto /usr/share/${PN}/extensions + doins scripts/extensions/* + fi -DEPEND="lua? ( dev-lang/lua )" -RDEPEND="${DEPEND} \ No newline at end of file + if use vim-syntax ; then + rm scripts/vim/README + insinto /usr/share/vim/vimfiles + doins -r scripts/vim/* + fi + + if use zsh-completion ; then + insinto /usr/share/zsh/site-functions + doins scripts/zsh/* + fi + + exeinto /usr/share/${PN}/scripts + doexe scripts/add-ons/* +} diff --git a/app-mobilephone/obexftp/obexftp-0.23-r2.ebuild b/app-mobilephone/obexftp/obexftp-0.23-r2.ebuild index c4d752210f12..ce9e1127a5d4 100644 --- a/app-mobilephone/obexftp/obexftp-0.23-r2.ebuild +++ b/app-mobilephone/obexftp/obexftp-0.23-r2.ebuild @@ -61,35 +61,46 @@ src_compile() { if use python; then pushd swig/python/ - distutils# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/obexftp-0.23-r2.ebuild,v 1.5 2014/06/14 10:50:36 phajdan.jr Exp $ + distutils-r1_src_compile + popd + fi +} -EAPI="5" +src_install() { + # -j1 because "make -fMakefile.ruby install" fails + # upstream added -j1 to that command so it should be removed + # from here in the next version bump + emake -j1 DESTDIR="${D}" INSTALLDIRS=vendor install -PYTHON_COMPAT=( python{2_6,2_7} ) -GENTOO_DEPEND_ON_PERL=no + if use python; then + pushd swig/python/ + distutils-r1_src_install + popd + fi -inherit distutils-r1 eutils perl-module flag-o-matic autotools + dodoc AUTHORS ChangeLog NEWS README* THANKS TODO + dohtml doc/*.html -DESCRIPTION="File transfer over OBEX for mobile phones" -HOMEPAGE="http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp" -SRC_URI="mirror://sourceforge/openobex/${P}.tar.bz2" -SLOT="0" + # Install examples + insinto /usr/share/doc/${PF}/examples + doins examples/*.c + use perl && doins examples/*.pl + use python && doins examples/*.py + use ruby && doins examples/*.rb + use tcl && doins examples/*.tcl -LICENSE="GPL-2" -KEYWORDS="amd64 hppa ppc ~sparc x86" -IUSE="bluetooth debug perl python ruby tcl" + if use perl ; then + perl_delete_localpod + perl_delete_packlist + fi +} -RDEPEND="dev-libs/openobex - bluetooth? ( net-wireless/bluez ) - perl? ( dev-lang/perl ) - ruby? ( dev-lang/ruby:1.9 ) - tcl? ( dev-lang/tcl ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig -" +pkg_postinst() { + use perl && perl-module_pkg_postinst + use python && distutils-r1_pkg_postinst +} -src_prepare() { - epatch "${FILESDIR}"/${P}-fixruby.pat \ No newline at end of file +pkg_postrm() { + use perl && perl-module_pkg_postrm + use python && distutils-r1_pkg_postrm +} diff --git a/app-mobilephone/wammu/Manifest b/app-mobilephone/wammu/Manifest index d54851d41200..fd46156e79cd 100644 --- a/app-mobilephone/wammu/Manifest +++ b/app-mobilephone/wammu/Manifest @@ -1,4 +1,2 @@ DIST wammu-0.35.tar.bz2 572550 SHA256 fba70bb0a067f20bb5da5f16061e6cc70a49761ca11f49a897af678271666d7a SHA512 c9c24a170d0a1b1507799f77719d544a04b0c894172e0158efc782f25ec894eaa65e2a89b53db431a96b5f88ccadf4dddc5025ba84ac09d54aa5d37b2e658461 WHIRLPOOL 8b6b4edc77c46f20b449077f198d4e51ad81edd6846c69a4945ebf207ae01431a3cb31541e8f07c1b8c90fa37c2034acec771e5d563e0bf756aba1f175f93a9f DIST wammu-0.36.tar.bz2 581781 SHA256 8107d69438adc5c9c24565f455cac31ecd5b9ef754f26a6b5ebab03b49131696 SHA512 08caaeb7ade5877b441baad2f3f1f653ed1c25c3fab213e093213525fe326f09ee8ccda4db834f82b00a9d7e9b2cb235da7be7f328c091b6067543d9cdbfb14c WHIRLPOOL 6b4b8aff5363bbf39bb9b67765c9373600642592bc910d3b4d83d09d88d5b5ad4945d4f27f2c75c383ae55f66cc71e21756fcd93e1adee3dfeeef5a766f449c8 -DIST wammu-0.35.tar.bz2 572550 SHA256 fba70bb0a067f20bb5da5f16061e6cc70a49761ca11f49a897af678271666d7a SHA512 c9c24a170d0a1b1507799f77719d544a04b0c894172e0158efc782f25ec894eaa65e2a89b53db431a96b5f88ccadf4dddc5025ba84ac09d54aa5d37b2e658461 WHIRLPOOL 8b6b4edc77c46f20b449077f198d4e51ad81edd6846c69a4945ebf207ae01431a3cb31541e8f07c1b8c90fa37c2034acec771e5d563e0bf756aba1f175f93a9f -DIST wammu-0.36.tar.bz2 581781 SHA256 8107d69438adc5c9c24565f455cac31ecd5b9ef754f26a6b5ebab03b49131696 SHA512 08caaeb7ade5877b441baad2f3f1f653ed1c25c3fab213e093213525fe326f09ee8ccda4db834f82b00a9d7e9b2cb235da7be7f328c091b6067543d9cdbfb14c WHIRLPOOL 6b4b8aff5363bbf39bb9b67765c9373600642592bc910d3b4d83d09d88d5b5ad4945d4f27f2c75c383ae55f66cc71e21756fcd93e1adee3dfeeef5a766f449c8 diff --git a/app-office/geierlein/Manifest b/app-office/geierlein/Manifest index c21f8f3e86c4..c782c4bc1f99 100644 --- a/app-office/geierlein/Manifest +++ b/app-office/geierlein/Manifest @@ -1,4 +1,2 @@ DIST geierlein-0.6.1.tar.gz 994969 SHA256 f7f66b3c4fba41b071cc5c7339ec76854d12e515f45be185f83a84e2ab015474 SHA512 6810baed24999c069922488fd2efa6b0095174621088f48245927b8a3a89dd6a683db76016649ba143e3cc0cff29ff3699c3afa12a00fce067ddcab61197bfe3 WHIRLPOOL 3b1358f2c71bf337179a0dee4259e3358d963be832ec9d8e4e4d328530cf729478543a990351a1b98eb58e3c885c4d3c46515ce86cdd843c0af340109613be7c DIST geierlein-0.6.2.tar.gz 994962 SHA256 1a247c95122758f86fdebd5b3f55bcdd9c6c04cdf58d33eb874c9cc4cc7dc731 SHA512 3eacf273d85fb23bd763cea9db0e09fecbf410b6e75eec30fd0a44df68a43d478e1555b6f64468b4a3acf26bc6cb5a9c67f7a39ed30ef3a42255ff740a883c5c WHIRLPOOL acb5375d03547be8a49e58f71011c485c88cc65b640a16d630a5fc773056744b53ff38766dddc91d2bc86f198c85f647a3b39b7adcbc05dfe2edb84d8760f21c -DIST geierlein-0.6.1.tar.gz 994969 SHA256 f7f66b3c4fba41b071cc5c7339ec76854d12e515f45be185f83a84e2ab015474 SHA512 6810baed24999c069922488fd2efa6b0095174621088f48245927b8a3a89dd6a683db76016649ba143e3cc0cff29ff3699c3afa12a00fce067ddcab61197bfe3 WHIRLPOOL 3b1358f2c71bf337179a0dee4259e3358d963be832ec9d8e4e4d328530cf729478543a990351a1b98eb58e3c885c4d3c46515ce86cdd843c0af340109613be7c -DIST geierlein-0.6.2.tar.gz 994962 SHA256 1a247c95122758f86fdebd5b3f55bcdd9c6c04cdf58d33eb874c9cc4cc7dc731 SHA512 3eacf273d85fb23bd763cea9db0e09fecbf410b6e75eec30fd0a44df68a43d478e1555b6f64468b4a3acf26bc6cb5a9c67f7a39ed30ef3a42255ff740a883c5c WHIRLPOOL acb5375d03547be8a49e58f71011c485c88cc65b640a16d630a5fc773056744b53ff38766dddc91d2bc86f198c85f647a3b39b7adcbc05dfe2edb84d8760f21c diff --git a/app-office/glabels/Manifest b/app-office/glabels/Manifest index 70a062e0d905..e7c4a56b651f 100644 --- a/app-office/glabels/Manifest +++ b/app-office/glabels/Manifest @@ -1,2 +1 @@ -DIST glabels-3.2.0.tar.xz 3359392 SHA256 c4c5b2c911be7b6513ee5cfeda6cd78434623c24dd741bd29cc3573f90b374c9 SHA512 67faab8eb9f4128b532bce55a9fab34462c008d0990ba87e4d555359bec1bb162489d4bdf5efbb86c4fcfc708c92da4d88a91d-----BEGIN PGP SIGNED MESSAGE----- DIST glabels-3.2.0.tar.xz 3359392 SHA256 c4c5b2c911be7b6513ee5cfeda6cd78434623c24dd741bd29cc3573f90b374c9 SHA512 67faab8eb9f4128b532bce55a9fab34462c008d0990ba87e4d555359bec1bb162489d4bdf5efbb86c4fcfc708c92da4d88a91dd2a85f0989c9133af6b011c3ff WHIRLPOOL f79e3d15ba32041133654fd67c7e05c4bba9e8d899344c52b503c1232ddc5cce8efcec20937c2d21d4f7fa3164a6d4c5ff8f1d9a770dea59c24fcc524b460673 diff --git a/app-office/pybliographer/pybliographer-1.2.14.ebuild b/app-office/pybliographer/pybliographer-1.2.14.ebuild index 8fdaaef9c7ba..5440fd8feef7 100644 --- a/app-office/pybliographer/pybliographer-1.2.14.ebuild +++ b/app-office/pybliographer/pybliographer-1.2.14.ebuild @@ -43,27 +43,32 @@ src_prepare() { Makefile.am || die "sed failed" # Install Python modules into site-packages directories. - find -name Makefile.am # 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.14.ebuild,v 1.3 2012/04/17 16:06:21 ranger Exp $ - -EAPI="3" -PYTHON_DEPEND="2:2.6" - -inherit autotools gnome2 python + 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 +} -DESCRIPTION="Pybliographer is a tool for working with bibliographic databases" -HOMEPAGE="http://pybliographer.org/" -SRC_URI="mirror://sourceforge/pybliographer/${P}.tar.gz" +src_configure() { + gnome2_src_configure --disable-depchecks +} -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ppc x86" -IUSE="" +src_install() { + gnome2_src_install + python_convert_shebangs -r 2 "${ED}usr/bin" +} -DOCS="AUTHORS ChangeLog* NEWS TODO README" +pkg_postinst() { + gnome2_pkg_postinst + python_mod_optimize pybliographer +} -DEPEND=">=app-text/recode-3.6-r1 - app-text/scrollkeeper - dev-libs/glib:2 - dev-python/gconf-pyt \ No newline at end of file +pkg_postrm() { + gnome2_pkg_postrm + python_mod_cleanup pybliographer +} diff --git a/app-office/texmaker/texmaker-4.2.ebuild b/app-office/texmaker/texmaker-4.2.ebuild index 7ec792bedf17..20d79abd499c 100644 --- a/app-office/texmaker/texmaker-4.2.ebuild +++ b/app-office/texmaker/texmaker-4.2.ebuild @@ -6,14 +6,6 @@ EAPI=5 inherit qt4-r2 versionator -# The up# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-4.2.ebuild,v 1.1 2014/05/22 13:08:13 jlec Exp $ - -EAPI=5 - -inherit qt4-r2 versionator - # The upstream version numbering is bad, so we have to remove a dot in the # minor version number MAJOR="$(get_major_version)" @@ -83,4 +75,13 @@ src_prepare() { src_configure() { eqmake4 \ - ${PN} \ No newline at end of file + ${PN}.pro \ + PREFIX="${EPREFIX}/usr" \ + DESKTOPDIR="${EPREFIX}/usr/share/applications" \ + ICONDIR="${EPREFIX}/usr/share/pixmaps" +} + +pkg_postinst() { + elog "A user manual with many screenshots is available at:" + elog "${EPREFIX}/usr/share/${PN}/usermanual_en.html" +} diff --git a/app-portage/genlop/genlop-0.30.5.ebuild b/app-portage/genlop/genlop-0.30.5.ebuild index 4db5abb7c5ab..8f0df426409a 100644 --- a/app-portage/genlop/genlop-0.30.5.ebuild +++ b/app-portage/genlop/genlop-0.30.5.ebuild @@ -4,16 +4,22 @@ inherit bash-completion -DESCRIPTION="A nic# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/genlop/genlop-0.30.5.ebuild,v 1.12 2010/10/19 11:47:35 leio Exp $ - -inherit bash-completion - DESCRIPTION="A nice emerge.log parser" HOMEPAGE="http://pollycoke.org/genlop.html" SRC_URI="http://gelo.dolcetta.net/software/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc \ No newline at end of file +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" +IUSE="" + +DEPEND=">=dev-lang/perl-5.8.0-r12 + >=dev-perl/DateManip-5.40" +RDEPEND="${DEPEND}" + +src_install() { + dobin genlop || die + dodoc README Changelog + doman genlop.1 + dobashcompletion genlop.bash-completion genlop +} diff --git a/app-portage/porthole/porthole-0.6.1-r2.ebuild b/app-portage/porthole/porthole-0.6.1-r2.ebuild index 33167f6bbe1f..db888dcc5394 100644 --- a/app-portage/porthole/porthole-0.6.1-r2.ebuild +++ b/app-portage/porthole/porthole-0.6.1-r2.ebuild @@ -1,7 +1,5 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /v# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/app-portage/porthole/porthole-0.6.1-r2.ebuild,v 1.5 2013/01/11 19:21:12 zerochaos Exp $ EAPI="2" @@ -72,4 +70,7 @@ pkg_postinst() { einfo "In this new way the user needs to set any 'Settings' menu emerge options" einfo "Porthole automatically adds '--oneshot' for all upgrades selections" einfo "Other options recommended are '--noreplace' along with '--update'" - einfo "They allow for portage to skip any p \ No newline at end of file + einfo "They allow for portage to skip any packages that might have already" + einfo "been upgraded as a dependency of another previously upgraded package" + einfo +} diff --git a/app-text/an/Manifest b/app-text/an/Manifest index 57233e1a38d3..aa9d5dc82178 100644 --- a/app-text/an/Manifest +++ b/app-text/an/Manifest @@ -1,4 +1,2 @@ DIST an_1.1.orig.tar.bz2 13456 SHA256 4f7634b5b33daa1f5319ced3380d29de12f4b83486dc6a544949ac7c565a687f SHA512 12758bf38d5f2ea80d04449dab04b34b78dccea3512109cf73d6e0038d0483d245601c04a0d1bb90ff939e86ad1f88b3100070239607d9d6050523538f6714bb WHIRLPOOL 2cca4e3467e787f116a316383637c7c422c595a3d212dd1c3b979be4b7e4dfdcc4121eb1373642ff1f24ff2fb8c60df74dffdad0b5a915337d7db09596df8549 DIST an_1.2.orig.tar.xz 13196 SHA256 b925d57d80bd0d83b755f5b8d78e6d5bf05eb059ec84a7d8fbb77b18c73b17a5 SHA512 919c525aa1215e3c1b2200c6820a357c6406c19b7447147cc4243d339c554b9892bea11797769df0bf96dd72c89f61bf3d977769faf9bc7f9edf609a7daeac3d WHIRLPOOL 45f4f39a2560b5db5457ac352d7617d04667f3d3ca17cc6a91172fe479f537ac69723b9e47b2fadc8446b6bf20b81920beb61669370378239361333eeb2de7a1 -DIST an_1.1.orig.tar.bz2 13456 SHA256 4f7634b5b33daa1f5319ced3380d29de12f4b83486dc6a544949ac7c565a687f SHA512 12758bf38d5f2ea80d04449dab04b34b78dccea3512109cf73d6e0038d0483d245601c04a0d1bb90ff939e86ad1f88b3100070239607d9d6050523538f6714bb WHIRLPOOL 2cca4e3467e787f116a316383637c7c422c595a3d212dd1c3b979be4b7e4dfdcc4121eb1373642ff1f24ff2fb8c60df74dffdad0b5a915337d7db09596df8549 -DIST an_1.2.orig.tar.xz 13196 SHA256 b925d57d80bd0d83b755f5b8d78e6d5bf05eb059ec84a7d8fbb77b18c73b17a5 SHA512 919c525aa1215e3c1b2200c6820a357c6406c19b7447147cc4243d339c554b9892bea11797769df0bf96dd72c89f61bf3d977769faf9bc7f9edf609a7daeac3d WHIRLPOOL 45f4f39a2560b5db5457ac352d7617d04667f3d3ca17cc6a91172fe479f537ac69723b9e47b2fadc8446b6bf20b81920beb61669370378239361333eeb2de7a1 diff --git a/app-text/catdoc/catdoc-0.94.2-r2.ebuild b/app-text/catdoc/catdoc-0.94.2-r2.ebuild index 36228fff780c..a9b45a72cf3c 100644 --- a/app-text/catdoc/catdoc-0.94.2-r2.ebuild +++ b/app-text/catdoc/catdoc-0.94.2-r2.ebuild @@ -40,13 +40,13 @@ src_compile() { emake LIB_DIR="${EPREFIX}"/usr/share/catdoc || die } -src# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/catdoc/catdoc-0.94.2-r2.ebuild,v 1.3 2010/09/15 11:22:35 grobian Exp $ +src_install() { + emake -j1 mandir="${EPREFIX}"/usr/share/man/man1 install || die -EAPI=3 -WANT_AUTOMAKE=none + if [[ -e ${ED}/usr/bin/xls2csv ]]; then + einfo "Renaming xls2csv to xls2csv-${PN} because of bug 314657." + mv -vf "${ED}"/usr/bin/xls2csv "${ED}"/usr/bin/xls2csv-${PN} || die + fi -inherit autotools eutils - -DES \ No newline at end of file + dodoc ${DOCS} +} diff --git a/app-text/cmigemo/cmigemo-1.3c.ebuild b/app-text/cmigemo/cmigemo-1.3c.ebuild index 91a69c4f6ecb..ea1724beb86c 100644 --- a/app-text/cmigemo/cmigemo-1.3c.ebuild +++ b/app-text/cmigemo/cmigemo-1.3c.ebuild @@ -42,21 +42,24 @@ src_install() { rm -rf ${D}/usr/share/migemo/{cp932,euc-jp} if has_version 'app-editors/vim-core' ; then - insinto /usr/share/vim/vim# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/cmigemo/cmigemo-1.3c.ebuild,v 1.7 2009/09/23 16:31:00 patrick Exp $ - -inherit eutils - -DESCRIPTION="C/Migemo -- Migemo library implementation in C" -HOMEPAGE="http://www.kaoriya.net/#CMIGEMO" -SRC_URI="http://www.kaoriya.net/dist/var/${P}.tar.bz2" + insinto /usr/share/vim/vimfiles/plugin + doins tools/migemo.vim + fi -LICENSE="cmigemo" -SLOT="0" -KEYWORDS="x86 alpha ppc" # development branch -IUSE="emacs" + dodoc tools/migemo.vim + dodoc doc/{README_j,TODO_j,vimigemo}.txt +} -DEPEND="app-i18n/qkc - app-dicts/migemo-dict" -RDEPEND="app-dicts/mig \ No newline at end of file +pkg_postinst() { + if use emacs ; then + elog + elog "Please add to your ~/.emacs" + elog " (setq migemo-command \"cmigemo\")" + elog " (setq migemo-options '(\"-q\" \"--emacs\" \"-i\" \"\\\\a\"))" + elog " (setq migemo-dictionary \"/usr/share/migemo/migemo-dict\")" + elog " (setq migemo-user-dictionary nil)" + elog " (setq migemo-regex-dictionary nil)" + elog "to use cmigemo instead of migemo under emacs." + elog + fi +} diff --git a/app-text/convmv/Manifest b/app-text/convmv/Manifest index 71eaf31a60e8..b02a9080819c 100644 --- a/app-text/convmv/Manifest +++ b/app-text/convmv/Manifest @@ -1,2 +1 @@ DIST convmv-1.15.tar.gz 27180 SHA256 c315aec78490b588000467d1c51081b36e629de0537c5a17fd48b1acaf8a5135 SHA512 b809f103da48d43f9c7fb6cb3e08a88e1c9b2a2ad691f9fcc4422b4e597c247b86fd0446c777e4c9911b4fad551cdc9fc88eff3a1d8cb4b001e164cc8387b900 WHIRLPOOL d7c3e3fbe918472d96f1cbc40b70f280a179a3c99cef07953c0723dfcba0e81ff383d918382b196d0525724dde650c4a480e5cc91c07f9452308a3eebd1567cc -DIST convmv-1.15.tar.gz 27180 SHA256 c315aec78490b588000467d1c51081b36e629de0537c5a17fd48b1acaf8a5135 SHA512 b809f103da48d43f9c7fb6cb3e08a88e1c9b2a2ad691f9fcc4422b4e597c247b86fd0446c777e4c9911b4fad551cdc9fc88eff3a1d8cb4b001e164cc8387b900 WHIRLPOOL d7c3e3fbe918472d96f1cbc40b70f280a179a3c99cef07953c0723dfcba0e81ff383d918382b196d0525724dde650c4a480e5cc91c07f9452308a3eebd1567cc diff --git a/app-text/deplate/Manifest b/app-text/deplate/Manifest index fca73dd8e642..992f8de6d1a4 100644 --- a/app-text/deplate/Manifest +++ b/app-text/deplate/Manifest @@ -1,2 +1 @@ DIST deplate-0.8.5.gem 271360 SHA256 b1cc96083c752868e5559cd86e5c7a0c7765b127a8a39d6de239e47692a41c23 SHA512 52c0d323d19e08f9fa169eebd03871e4acc11539a73910bd6124a3328ccaeb077519d8a955a3d0035bbe5eea0479c44051e246944556dd1dea3ec4d7c451f840 WHIRLPOOL 29a539516fda86675c28fcb29f159d725a172d7578bc81c0b2dc707d544ed5162e1037db2e2b1c1aab4d6e80b8cc1dcfb4aabef3c590031118aeb243ad019cac -DIST deplate-0.8.5.gem 271360 SHA256 b1cc96083c752868e5559cd86e5c7a0c7765b127a8a39d6de239e47692a41c23 SHA512 52c0d323d19e08f9fa169eebd03871e4acc11539a73910bd6124a3328ccaeb077519d8a955a3d0035bbe5eea0479c44051e246944556dd1dea3ec4d7c451f840 WHIRLPOOL 29a539516fda86675c28fcb29f159d725a172d7578bc81c0b2dc707d544ed5162e1037db2e2b1c1aab4d6e80b8cc1dcfb4aabef3c590031118aeb243ad019cac diff --git a/app-text/dictd/dictd-1.12.1-r1.ebuild b/app-text/dictd/dictd-1.12.1-r1.ebuild index 7bf3bfdeb171..027f7e1d6f82 100644 --- a/app-text/dictd/dictd-1.12.1-r1.ebuild +++ b/app-text/dictd/dictd-1.12.1-r1.ebuild @@ -43,50 +43,65 @@ pkg_setup() { } src_prepare() { - epatch "${FILESDIR}"/dictd-1.10.11-colorit-nopp-# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/dictd-1.12.1-r1.ebuild,v 1.8 2014/01/18 20:03:11 ago Exp $ + epatch "${FILESDIR}"/dictd-1.10.11-colorit-nopp-fix.patch + epatch "${FILESDIR}"/dictd-1.12.0-build.patch -EAPI=5 -inherit eutils readme.gentoo systemd user + [[ ${CHOST} == *-darwin* ]] && \ + sed -i -e 's:libtool:glibtool:g' Makefile.in +} -DESCRIPTION="Dictionary Client/Server for the DICT protocol" -HOMEPAGE="http://www.dict.org/ http://sourceforge.net/projects/dict/" -SRC_URI="mirror://sourceforge/dict/${P}.tar.gz" +src_configure() { + econf \ + $(use_with dbi plugin-dbi) \ + $(use_with judy plugin-judy) \ + --sysconfdir="${EPREFIX}"/etc/dict +} -SLOT="0" -# We install rfc so - ISOC-rfc -LICENSE="GPL-2 ISOC-rfc" -KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" -IUSE="dbi judy minimal" +src_compile() { + if use minimal; then + emake dictfmt dictzip dictzip + else + emake + fi +} -# > makefiles/target.mk echo "UI_TYPE = qt4" >> makefiles/target.mk - sed -e 's:MOC = moc-qt4:MOC = /usr/bin/moc:' # Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/fbreader/fbreader-0.99.4-r2.ebuild,v 1.2 2014/08/06 07:09:31 patrick Exp $ + sed -e 's:MOC = moc-qt4:MOC = /usr/bin/moc:' \ + -i makefiles/arch/desktop.mk || die "updating desktop.mk failed" -EAPI=5 + if use debug; then + echo "TARGET_STATUS = debug" >> makefiles/target.mk + else + echo "TARGET_STATUS = release" >> makefiles/target.mk + fi -inherit eutils multilib + # bug #452636 + epatch "${FILESDIR}"/${P}.patch + # bug #515698 + epatch "${FILESDIR}"/${P}-qreal-cast.patch + # bug #516794 + epatch "${FILESDIR}"/${P}-mimetypes.patch +} -DESCRIPTION="E-Book Reader. Supports many e-book formats" -HOMEPAGE="http://www.fbreader.org/" -SRC_URI="http://www.fbreader.org/files/desktop/${PN}-sources-${PV}.tgz" +src_compile() { + # bug #484516 + emake -j1 +} -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86" -IUSE="deb \ No newline at end of file +src_install() { + default + dosym /usr/bin/FBReader /usr/bin/fbreader +} diff --git a/app-text/freepwing/Manifest b/app-text/freepwing/Manifest index a8cc25937639..c6886f8f2beb 100644 --- a/app-text/freepwing/Manifest +++ b/app-text/freepwing/Manifest @@ -1,2 +1 @@ DIST freepwing-1.4.3.tar.gz 129499 SHA256 34287268520b622ada5b1390dbec346e586e04509278eb2e3baad67f494f3796 SHA512 e363d2751410d6e39e786920faf63c4efee74e5004594f95157f700eb3a68a92a9e98635978f21f5da60f7bd9e1a3b4049f90c7b9da0b4bb0374081ab6738734 WHIRLPOOL 2133bba842d1c37139182ffd9aaf3b4d1a443edd296043dd5b9ffecd6e96e4d828748b4623f26d52404654bf37b277b655cd7dc70e552a32a30cee5c35808bd2 -DIST freepwing-1.4.3.tar.gz 129499 SHA256 34287268520b622ada5b1390dbec346e586e04509278eb2e3baad67f494f3796 SHA512 e363d2751410d6e39e786920faf63c4efee74e5004594f95157f700eb3a68a92a9e98635978f21f5da60f7bd9e1a3b4049f90c7b9da0b4bb0374081ab6738734 WHIRLPOOL 2133bba842d1c37139182ffd9aaf3b4d1a443edd296043dd5b9ffecd6e96e4d828748b4623f26d52404654bf37b277b655cd7dc70e552a32a30cee5c35808bd2 diff --git a/app-text/gv/Manifest b/app-text/gv/Manifest index 9a26b9463d5e..f824899434e4 100644 --- a/app-text/gv/Manifest +++ b/app-text/gv/Manifest @@ -1,3 +1,2 @@ -DIST gv-3.7.3.90.tar.gz 757506 SHA256 2824aefb0cbced31def7a815e1d6f00e17f47a4cb5ed1be93e4d259c7b64b63f SHA512 a80ff303fda1d6f13d66847f4b20aee4b364a05ec750bdb08267aa46470b201edf9762e16ad39dfe9da03118658598697f-----BEGIN PGP SIGNED MESSAGE----- DIST gv-3.7.3.90.tar.gz 757506 SHA256 2824aefb0cbced31def7a815e1d6f00e17f47a4cb5ed1be93e4d259c7b64b63f SHA512 a80ff303fda1d6f13d66847f4b20aee4b364a05ec750bdb08267aa46470b201edf9762e16ad39dfe9da03118658598697f411dc8c32ab8bbad05a1161e816c50 WHIRLPOOL b9f3465f15ed7a6696e32a49f55942f0b18fe7b61c4dbec39a4fd97e4ff926bb4a8891b49010563b5959adda8f72e5cb1b802392086fb8dc44fb7f8b482f1334 DIST gv-3.7.3.tar.gz 754282 SHA256 ee01ba96e3a5c319eb4658357372a118dbb0e231891b360edecbdebd449d1c2b SHA512 0c0339f023896016212bb1b8ef0185689dd669855c060d0491e1ac59c76ca19f3006b1b00b421cb40bb0beba8e2d35dad1da7d856ac9d33440cfbb07ff1e33c3 WHIRLPOOL 78e3e99a8065d42a84ba699256b8f1a366c74bc5c36eb5c79e0c7e0b6462e38711cd8eea6f474d9861feff92b4c84f38c5bf39b5df55f926443f3ce722cfb316 diff --git a/app-text/keepnote/files/keepnote-0.7.8-desktopfile.patch b/app-text/keepnote/files/keepnote-0.7.8-desktopfile.patch index f9fa166800a6..7c06aab2c91d 100644 --- a/app-text/keepnote/files/keepnote-0.7.8-desktopfile.patch +++ b/app-text/keepnote/files/keepnote-0.7.8-desktopfile.patch @@ -4,17 +4,27 @@ Subject: desktop file respect fd.o desktop entry spec -# desktop-file-validate keepnote.desktop -keepnote.desktop: warning: key "Encoding" in group "Desktop Entry" is deprecated -keepnote.desktop: warning: value "Note-taking Application" for key "Comment" in group "Desktop Entry" looks redundant with value "Note-taking Application" of key "GenericName" -keepnote.desktop: warning: value "Program na spr?vu pozn?mok" for key "Comment[sk]" in group "Desktop Entry" lookFrom: Julian Ospald -Date: Tue Aug 14 07:08:05 UTC 2012 -Subject: desktop file - -respect fd.o desktop entry spec - # desktop-file-validate keepnote.desktop keepnote.desktop: warning: key "Encoding" in group "Desktop Entry" is deprecated keepnote.desktop: warning: value "Note-taking Application" for key "Comment" in group "Desktop Entry" looks redundant with value "Note-taking Application" of key "GenericName" keepnote.desktop: warning: value "Program na spr?vu pozn?mok" for key "Comment[sk]" in group "Desktop Entry" looks redundant with value "Program na spr?vu pozn?mok" of key "GenericName[sk]" -keepnote.desktop: error: value \ No newline at end of file +keepnote.desktop: error: value "Office" for string list key "Categories" in group "Desktop Entry" does not have a semicolon (';') as trailing character + +--- desktop/keepnote.desktop ++++ desktop/keepnote.desktop +@@ -1,14 +1,11 @@ + [Desktop Entry] +-Encoding=UTF-8 + Type=Application + Name=KeepNote + GenericName=Note-taking Application + GenericName[sk]=Program na správu poznámok +-Comment=Note-taking Application +-Comment[sk]=Program na správu poznámok + Icon=keepnote + Exec=keepnote %f +-Categories=Office ++Categories=Office; + #MimeType= + Terminal=false + StartupNotify=false diff --git a/app-text/kpaste/Manifest b/app-text/kpaste/Manifest index 9e88fa57f602..5fc3b0deeea0 100644 --- a/app-text/kpaste/Manifest +++ b/app-text/kpaste/Manifest @@ -1,4 +1,2 @@ DIST kpaste-0.1.tar.gz 21031 SHA256 17d6d928dac531a310591d329ebc9ab335dadeea2f02f457eb9e38946359ebed SHA512 92afd613e94d413107a812ddd51de0a2b4de8ef2b6339ff236c822f15e93c1132cc8dbcfe6697f0d5083f8c168dae56b817e281b65f6d6a74d5fabd1484a56d1 WHIRLPOOL 65e2e6342bb08366894145308fcda3e98a611e10852aadff942c2ca45b778d58152a0dedace7e954c3bc7e02b8d9cfc747fa3373ae74a7136f29c6ef79b5b9f1 DIST kpaste-1.0.tar.bz2 19607 SHA256 3fda8aa0efa8231b81ab863f6884999d0c1fbbc729f64979fd49a48c1651e801 SHA512 ba1e2b10192e3f5a2f8fa11ca57ec274a6b277195ba8ec41c64ea0ea4552f477c785c7894ea653137094cf3a6d041f04260006326978993d00cab1edd6c93918 WHIRLPOOL 98fa7c4d9e2eb753f1d49bf9f62dca1f80a4042a84cc3795773133b109cce95c9abf42ae080d9d2fe66448ff02d833aa6d19770f770ece618269b30f19d9d861 -DIST kpaste-0.1.tar.gz 21031 SHA256 17d6d928dac531a310591d329ebc9ab335dadeea2f02f457eb9e38946359ebed SHA512 92afd613e94d413107a812ddd51de0a2b4de8ef2b6339ff236c822f15e93c1132cc8dbcfe6697f0d5083f8c168dae56b817e281b65f6d6a74d5fabd1484a56d1 WHIRLPOOL 65e2e6342bb08366894145308fcda3e98a611e10852aadff942c2ca45b778d58152a0dedace7e954c3bc7e02b8d9cfc747fa3373ae74a7136f29c6ef79b5b9f1 -DIST kpaste-1.0.tar.bz2 19607 SHA256 3fda8aa0efa8231b81ab863f6884999d0c1fbbc729f64979fd49a48c1651e801 SHA512 ba1e2b10192e3f5a \ No newline at end of file diff --git a/app-text/libpaper/Manifest b/app-text/libpaper/Manifest index 4d2d4e9346c9..6d27788eb8d7 100644 --- a/app-text/libpaper/Manifest +++ b/app-text/libpaper/Manifest @@ -1,2 +1 @@ DIST libpaper_1.1.24.tar.gz 355272 SHA256 38ac28114673d4b175a939d981e0477a0ed9bcaab27033522ecb2ca78ee90c7e SHA512 f90816723dafa9ce0aef652e027b13174d2430208003d3715d6f96226130bc66cfc36465f1a5a3f855697708c389f219b964a5534a64a8c98ac53662040df67b WHIRLPOOL 74a7cb6dec146104988dd5c5e0b4bf7fb776bde086c4fecf658d949e17d6701fa1b23511a7be43f01a01dcfd7c0340f23c3c9ec1c51fb7718d6b0dbf1761e75d -DIST libpaper_1.1.24.tar.gz 355272 SHA256 38ac28114673d4b175a939d981e0477a0ed9bcaab27033522ecb2ca78ee90c7e SHA512 f90816723dafa9ce0aef652e027b13174d2430208003d3715d6f96226130bc66cfc36465 \ No newline at end of file diff --git a/app-text/libspectre/Manifest b/app-text/libspectre/Manifest index d11c63e9991f..df02906932b3 100644 --- a/app-text/libspectre/Manifest +++ b/app-text/libspectre/Manifest @@ -1,4 +1,2 @@ DIST libspectre-0.2.6.tar.gz 358088 SHA256 2f637c62322c8040514284c00f63a5c310a28801e7dcfbe2ba2791be4fac0dd3 SHA512 4f99afe68293e188f70a5043f0c5199123d6ab0936f196b198f1c66eff980d54a6fba093be39839180dcef82db5fd9780a9d50887e453352d7b90b986829dfb6 WHIRLPOOL 0335575a7a5a5fa5724b35456105badcb845202b0d48b03a03f292aab10959e1a4ba9d94189c935667114878f20f7a5b8cbb892bf52533b4846a5afebb1eecb7 DIST libspectre-0.2.7.tar.gz 387947 SHA256 e81b822a106beed14cf0fec70f1b890c690c2ffa150fa2eee41dc26518a6c3ec SHA512 2e60905f7eeed9ac6ec3b5f8b47a7dad85178c8c35a63ba097ef6088dd334f7fde5797ecb05cf67532b759d07a65006427914d2cd6b09107ecc90620c9541794 WHIRLPOOL b59a1fea4ebd0cac13d4b5c7e76247de214761929bd71cf7879832acc4779786d764ddf2d38c5dea070f6e05c41f0d8460b8a8b11a51c35492827228740fb604 -DIST libspectre-0.2.6.tar.gz 358088 SHA256 2f637c62322c8040514284c00f63a5c310a28801e7dcfbe2ba2791be4fac0dd3 SHA512 4f99afe68293e188f70a5043f0c5199123d6ab0936f196b198f1c66eff980d54a6fba093be39839180dcef82db5fd9780a9d50887e453352d7b90b986829dfb6 WHIRLPOOL 0335575a7a5a5fa5724b35456105badcb845202b0d48b03a03f292aab10959e1a4ba9d94189c935667114878f20f7a5b8cbb892bf52533b4846a5afebb1eecb7 -DIST libspectre-0.2.7.tar.gz 387947 SHA256 e81b822a106beed14cf0fec70f1b890c690c2ffa150fa2eee41dc26518a6c3ec SHA512 2e60905f7eeed9ac6ec3b5f8b47a7dad85178c8c35a63ba097ef6088dd334f7fde5797ecb05cf67532b759d07a65006427914d2cd6b09107ecc90620c9541794 WHIRLPOOL b59a1fea4ebd0cac13d4b5c7e76247de214761929bd71cf7879832acc4779786d764ddf2d38c5dea070f6e05c41f0d8460b8a8b11a51c35492827228740fb604 diff --git a/app-text/linuxdoc-tools/Manifest b/app-text/linuxdoc-tools/Manifest index 443c43d5ab0b..e5c25c948f36 100644 --- a/app-text/linuxdoc-tools/Manifest +++ b/app-text/linuxdoc-tools/Manifest @@ -1 +1 @@ -DIST linuxdoc-tools_0.9.68.tar.gz 619242 SHA256 3b8611683d61480a60cdd2497132f15ca15fb583c9fe5543f6750d187a5dee67 \ No newline at end of file +DIST linuxdoc-tools_0.9.68.tar.gz 619242 SHA256 3b8611683d61480a60cdd2497132f15ca15fb583c9fe5543f6750d187a5dee67 SHA512 a78c662f4bf69b68530af0176fb6b35328c004a80cc73e7ed1151d46da3a7868e4a8a61094f8c4081a686f1ed0c58bd19c2c5ad5a2b6677ddc7c686e67a71df7 WHIRLPOOL 966e47e081bf5eb35de546f7cd0522396aba306d8afbeeba55afb91f360c196b196c3271b84ae8a98d7f9a4d0460558986a8a32a824940b0340236c705490676 diff --git a/app-text/llpp/llpp-15.ebuild b/app-text/llpp/llpp-15.ebuild index c716ea1ac269..3a50a7cb25c7 100644 --- a/app-text/llpp/llpp-15.ebuild +++ b/app-text/llpp/llpp-15.ebuild @@ -36,45 +36,6 @@ DEPEND="${RDEPEND} RESTRICT="!ocamlopt? ( strip )" -src_prepare() { - epatch "${FILESDIR}"/${PN}-11-WM_C# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-15.ebuild,v 1.11 2014/01/19 08:51:00 pacho Exp $ - -EAPI=5 - -inherit eutils multilib toolchain-funcs vcs-snapshot - -DESCRIPTION="a graphical PDF viewer which aims to superficially resemble less(1)" -HOMEPAGE="http://repo.or.cz/w/llpp.git" -SRC_URI="mirror://gentoo/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~ppc ~x86" -IUSE="+ocamlopt static" - -LIB_DEPEND="~app-text/mupdf-1.2:=[static-libs] - media-libs/openjpeg:0[static-libs] - media-libs/freetype:2[static-libs] - media-libs/jbig2dec[static-libs] - sys-libs/zlib[static-libs] - virtual/jpeg:0[static-libs] - x11-libs/libX11[static-libs]" -RDEPEND="x11-misc/xsel - !static? ( ${LIB_DEPEND//\[static-libs]} )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} - app-arch/bzip2[static-libs] - media-libs/libXcm[static-libs] - x11-libs/libXau[static-libs] - x11-libs/libXdmcp[static-libs] - x11-libs/libXmu[static-libs] ) - dev-lang/ocaml[ocamlopt?] - dev-ml/lablgl[glut,ocamlopt?]" - -RESTRICT="!ocamlopt? ( strip )" - src_prepare() { epatch "${FILESDIR}"/${PN}-11-WM_CLASS.patch } @@ -87,4 +48,39 @@ src_compile() { if use static ; then local cclib="" local slib="" - local spath=( ${EROOT}usr/$(get_libdir) $($(tc-getPKG_CONFIG) --libs-only-L --static mupdf x11 | sed 's:-L::g' \ No newline at end of file + local spath=( ${EROOT}usr/$(get_libdir) $($(tc-getPKG_CONFIG) --libs-only-L --static mupdf x11 | sed 's:-L::g') ) + for slib in $($(tc-getPKG_CONFIG) --libs-only-l --static mupdf x11) -ljpeg -ljbig2dec ; do + case ${slib} in + -lm|-ldl|-lpthread) + einfo "${slib}: shared" + cclib+="${slib} " ;; + *) + local ccnew=$(find ${spath} -name "lib${slib/-l}.a") + einfo "${slib}: use ${ccnew}" + cclib+="${ccnew} " ;; + esac + done + else + local cclib="$($(tc-getPKG_CONFIG) --libs mupdf x11) -lpthread" + fi + + verbose() { echo "$@" >&2 ; "$@" || die ; } + verbose ocaml str.cma keystoml.ml < KEYS > help.ml + verbose printf 'let version ="%s";;\n' ${PV} >> help.ml + verbose ${ocaml} -c -o link.o -ccopt "${ccopt}" link.c + verbose ${ocaml} -c -o help.${cmo} help.ml + verbose ${ocaml} -c -o utils.${cmo} utils.ml + verbose ${ocaml} -c -o wsi.cmi wsi.mli + verbose ${ocaml} -c -o wsi.${cmo} wsi.ml + verbose ${ocaml} -c -o parser.${cmo} parser.ml + verbose ${ocaml} -c -o main.${cmo} -I +lablGL main.ml + verbose ${ocaml} $(usex ocamlopt "" -custom) -o llpp -I +lablGL\ + str.${cma} unix.${cma} lablgl.${cma} link.o \ + -cclib "${cclib}" \ + help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} main.${cmo} +} + +src_install() { + dobin ${PN} + dodoc KEYS README Thanks fixme +} diff --git a/app-text/metadata.xml b/app-text/metadata.xml index 9b96bf685a39..fcbc7cd873ba 100644 --- a/app-text/metadata.xml +++ b/app-text/metadata.xml @@ -16,19 +16,19 @@ De app-text categorie bevat applicaties voor het werken met door mensen geschreven teksten. - - - - - The app-text category contains tools for working with human-language - text files. + + Nhóm app-text chứa các công cụ để làm việc với các tập + tin văn bản có thể đọc hiểu. - - Die Kategorie app-text enhält Werkzeuge für das Arbeiten mit menschenlesbaren - Textdokumenten. + + La categoria app-text contiene utilità per lavorare con file di testo. - - La categoría app-text contiene herramientas para trabajar con archivos - de texto en lenguaje humano. + + A categoria app-text contém ferramentas para trabalhar com + arquivos de texto em linguagens humanas. + + + Kategoria app-text zawiera narzędzia do pracy ze zwykłymi plikami tekstowymi. - + diff --git a/app-text/pandoc/files/pandoc-1.11.1-test.patch b/app-text/pandoc/files/pandoc-1.11.1-test.patch index f788d33b116a..d5d1e894d505 100644 --- a/app-text/pandoc/files/pandoc-1.11.1-test.patch +++ b/app-text/pandoc/files/pandoc-1.11.1-test.patch @@ -21,26 +21,22 @@ index 5f290a9..ea9e850 100644 extensible-exceptions >= 0.1 && < 0.2, @@ -251,7 +251,7 @@ Library tagsoup >= 0.12.5 && < 0.13, - base64-bytestring >= 0.1 && < 1.commit fa978e13658f76be109243224f7491550db74240 -Author: John MacFarlane -Date: Tue May 7 20:22:09 2013 -0700 - - Use latest highlighting-kate and texmath. - - Closes #849. - -diff --git a/pandoc.cabal b/pandoc.cabal -index 5f290a9..ea9e850 100644 ---- a/pandoc.cabal -+++ b/pandoc.cabal -@@ -241,7 +241,7 @@ Library - old-locale >= 1 && < 1.1, - time >= 1.2 && < 1.5, - HTTP >= 4000.0.5 && < 4000.3, -- texmath >= 0.6.1.3 && < 0.7, -+ texmath >= 0.6.1.5 && < 0.7, - xml >= 1.3.12 && < 1.4, - random >= 1 && < 1.1, - extensible-exceptions >= 0.1 && < 0.2, -@@ -251,7 +251,7 @@ Library - \ No newline at end of file + base64-bytestring >= 0.1 && < 1.1, + zlib >= 0.5 && < 0.6, +- highlighting-kate >= 0.5.3.7 && < 0.6, ++ highlighting-kate >= 0.5.3.9 && < 0.6, + data-default >= 0.4 && < 0.6, + temporary >= 1.1 && < 1.2, + blaze-html >= 0.5 && < 0.7, +diff --git a/tests/lhs-test.latex b/tests/lhs-test.latex +index 16e9a79..2a5025a 100644 +--- a/tests/lhs-test.latex ++++ b/tests/lhs-test.latex +@@ -22,6 +22,7 @@ + \IfFileExists{microtype.sty}{\usepackage{microtype}}{} + \usepackage{color} + \usepackage{fancyvrb} ++\newcommand{\VerbBar}{|} + \DefineShortVerb[commandchars=\\\{\}]{\|} + \DefineVerbatimEnvironment{Highlighting}{Verbatim}{commandchars=\\\{\}} + % Add ',fontsize=\small' for more characters per line diff --git a/app-text/pastebinit/pastebinit-1.3.1-r2.ebuild b/app-text/pastebinit/pastebinit-1.3.1-r2.ebuild index d46d38d6d405..f87e531b6c9d 100644 --- a/app-text/pastebinit/pastebinit-1.3.1-r2.ebuild +++ b/app-text/pastebinit/pastebinit-1.3.1-r2.ebuild @@ -8,19 +8,6 @@ PYTHON_REQ_USE="xml" inherit python-r1 -DESCRIPTION="A software that lets you send anything you want directly to a -pastebin from the command line." -HOMEPAGE="https://launchpad.net/pastebinit" -SRC_URI="https://lau# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/pastebinit/pastebinit-1.3.1-r2.ebuild,v 1.3 2013/12/24 12:56:08 ago Exp $ - -EAPI=5 -PYTHON_COMPAT=( python{2_6,2_7} ) -PYTHON_REQ_USE="xml" - -inherit python-r1 - DESCRIPTION="A software that lets you send anything you want directly to a pastebin from the command line." HOMEPAGE="https://launchpad.net/pastebinit" @@ -45,4 +32,25 @@ src_prepare() { fi done - sed -i -e "/^build-mo/s/:.*/:${mo} \ No newline at end of file + sed -i -e "/^build-mo/s/:.*/:${mo}/" po/Makefile +} + +src_compile() { + emake -C po + xsltproc --nonet \ + "${EROOT}"usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl \ + pastebinit.xml || die +} + +src_install() { + dobin pastebinit utils/pbput + python_replicate_script "${ED}usr/bin/${PN}" + dosym pbput /usr/bin/pbget + use crypt && dosym pbput /usr/bin/pbputs + dodoc README + doman pastebinit.1 utils/*.1 + insinto /usr/share/locale + [[ -d po/mo ]] && doins -r po/mo/* + insinto /usr/share + doins -r pastebin.d +} diff --git a/app-text/pdfminer/Manifest b/app-text/pdfminer/Manifest index c2327a3843f7..a2b17c76ca62 100644 --- a/app-text/pdfminer/Manifest +++ b/app-text/pdfminer/Manifest @@ -1,3 +1,2 @@ DIST pdfminer-20131113.tar.gz 4080763 SHA256 1016246265f9d48645229164ef44483e9b9a1b3e6902783782f9ae4e1024ea19 SHA512 be598f9ca5cb87fcde91190f72ee77209a6f8ca9db93588c914e6ec666b2a3cc69abedd92ca73a53e714c3660065b7f2c1e9c770e46c838f6d3d489dd637203e WHIRLPOOL 91980937f332332591d31241c558176dcd3cdc5da065fa9e748463d39f582facbef8e64c10155e691bdd938589c6616136c2cd63bf91ad1f54852e116edc5cee DIST pdfminer-20140328.tar.gz 4081233 SHA256 ba187b93056586a14edd5e630cf63ae96b1cc84b611f55dcddbc997316d9f262 SHA512 8abb2328f7824ee980df0ce42d758c15534e97379ea9213b4aa1d29864d24d73c9e2d6020964e9ab734c0c6f7d1ae70bccbd6605168eaadf83923718a1f4849a WHIRLPOOL 0f1e5e10936d2a6f02872699812e4b8449875330f1dbb668a15c5a85c94d3cb2cf5cb471fb280159df20fa454344b1256469180cdfb5ec3091df07e49c283264 -DIST pdfminer-20131113.tar.gz 4080763 SHA256 1016246265f9d48645229164ef44483e9b9a1b3e6902783782f9ae4e1024ea19 SHA512 be598f9ca5cb87fcde91190f72ee77209a6f8ca9db93588c914e6ec666b2a3cc69abedd92ca73a53 \ No newline at end of file diff --git a/app-text/pelican/pelican-3.4.0.ebuild b/app-text/pelican/pelican-3.4.0.ebuild index e38d720da8b2..9af01e64dd3b 100644 --- a/app-text/pelican/pelican-3.4.0.ebuild +++ b/app-text/pelican/pelican-3.4.0.ebuild @@ -16,23 +16,28 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="examples markdown" -DEPEND="dev-python/feedgenerator[${PYT# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/pelican/pelican-3.4.0.ebuild,v 1.3 2014/08/10 18:28:34 slyfox Exp $ - -EAPI=5 -PYTHON_COMPAT=( python{2_7,3_3} ) - -inherit distutils-r1 - -DESCRIPTION="A tool to generate a static blog, with restructured text (or markdown) input files" -HOMEPAGE="http://pelican.notmyidea.org/ http://pypi.python.org/pypi/pelican" -SRC_URI="https://github.com/getpelican/pelican/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="examples markdown" - DEPEND="dev-python/feedgenerator[${PYTHON_USEDEP}] - >=dev- \ No newline at end of file + >=dev-python/jinja-2.7[${PYTHON_USEDEP}] + dev-python/docutils[${PYTHON_USEDEP}] + dev-python/pygments[${PYTHON_USEDEP}] + dev-python/pytz[${PYTHON_USEDEP}] + dev-python/unidecode[${PYTHON_USEDEP}] + dev-python/blinker[${PYTHON_USEDEP}] + >=dev-python/six-1.4[${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] + markdown? ( dev-python/markdown[${PYTHON_USEDEP}] )" +RDEPEND="" + +DOCS=( README.rst ) + +python_install_all() { + use examples && local EXAMPLES=( samples/. ) + distutils-r1_python_install_all +} + +# no tests: tests/content not in tarball for 2.8.1 +# for 3.0, should be based on tox (refer to virtualenvwrapper) + +#python_test() { +# esetup.py test +#} diff --git a/app-text/podofo/Manifest b/app-text/podofo/Manifest index 27367c5b5606..ffa70c1b4793 100644 --- a/app-text/podofo/Manifest +++ b/app-text/podofo/Manifest @@ -1,4 +1,2 @@ DIST podofo-0.9.2-freetype251.patch 1106 SHA256 324889c99eccafb5e4732d65d325453470ca659c5b43b2e9265f7e5d3fd8bbeb SHA512 185d9e16587fec922720042e7a604ae4b1c5b36c115beebf08ff73a46bf2859b25b0dda6b858f31e2fab3dfa88c79265e5d4e0da30091e83b22dff2bdaa2b6da WHIRLPOOL b9fb89a41be7ed16f1b0ca78e0ec95427133077c8b7b5c120a713d38624bb51eb8fe5dd08d1c9bf1b2ed5fd077222b6e40d224583c6436c7ee117caf7e310dbf DIST podofo-0.9.2.tar.gz 1092131 SHA256 465191618c57da9ae9230e7919e1985a242ddc7d1045cfdb6fb066140ed0a3f3 SHA512 e0bda743b192edfd42f381498edc56f30e6d89f45e7abd2b4351e15fd672a432d07f067ab8ed5cf378b0ecbab6d98abb32c22c1ce860c0021e31235fc5683a21 WHIRLPOOL f22c5ec0c3de1ef661198e8c94b2ac9faab88c6b12ebe27da14642c6eaed154f2e1fbf4f404807d7e33f895ffb64663eb7e403ec8a9e0f87b32e3470b7f5acfb -DIST podofo-0.9.2-freetype251.patch 1106 SHA256 324889c99eccafb5e4732d65d325453470ca659c5b43b2e9265f7e5d3fd8bbeb SHA512 185d9e16587fec922720042e7a604ae4b1c5b36c115beebf08ff73a46bf2859b25b0dda6b858f31e2fab3dfa88c79265e5d4e0da30091e83b22dff2bdaa2b6da WHIRLPOOL b9fb89a41be7ed16f1b0ca78e0ec95427133077c8b7b5c120a713d38624bb51eb8fe5dd08d1c9bf1b2ed5fd077222b6e40d224583c6436c7ee117caf7e310dbf -DIST podofo-0.9.2.tar.gz 1092131 SHA256 465191618c57da9ae9230e7919e1985a242ddc7d1045cfdb6fb066140ed0a3f3 SHA512 e0bda743b192edfd42f381498edc56f30e6d89f45e7abd2b4351e15fd672a432d07f067ab8ed5cf378b0ecbab6d98abb32c22c1ce860c0021e31235fc5683a21 WHIRLPOOL f22c5ec0c3de1ef661198e8c94b2ac9faab88c6b12ebe27da14642c6eaed154f2e1fbf4f404807d7e33f895ffb64663eb7e403ec8a9e0f87b32e3470b7f5acfb diff --git a/app-text/poppler/poppler-0.24.5.ebuild b/app-text/poppler/poppler-0.24.5.ebuild index e59a22d9c57f..b9a32d9af1ca 100644 --- a/app-text/poppler/poppler-0.24.5.ebuild +++ b/app-text/poppler/poppler-0.24.5.ebuild @@ -18,38 +18,6 @@ IUSE="cairo cjk curl cxx debug doc +introspection +jpeg jpeg2k +lcms png qt4 tif # No test data provided RESTRICT="test" -COMMON_DEPEND=" - >=media-libs/fontconfig-2.6.0 - >=media-libs/freetype-2.3.9 - sys-libs/zlib - cairo? ( - dev-libs/glib:2 - >=x11-libs/cairo-1.10.0 - introspection? ( >=dev-libs/gobject-introspection-1.32.1 ) - ) - curl? ( net-misc/curl ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( media-libs/openjpeg:0 ) -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.24.5.ebuild,v 1.10 2014/01/12 13:15:31 ago Exp $ - -EAPI=5 - -inherit cmake-utils toolchain-funcs - -DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" -HOMEPAGE="http://poppler.freedesktop.org/" -SRC_URI="http://poppler.freedesktop.org/${P}.tar.xz" - -LICENSE="GPL-2" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -SLOT="0/44" -IUSE="cairo cjk curl cxx debug doc +introspection +jpeg jpeg2k +lcms png qt4 tiff +utils" - -# No test data provided -RESTRICT="test" - COMMON_DEPEND=" >=media-libs/fontconfig-2.6.0 >=media-libs/freetype-2.3.9 @@ -82,4 +50,46 @@ DOCS=(AUTHORS NEWS README README-XPDF TODO) src_configure() { # this is needed for multilib, see bug 459394 local ft_libdir ft_includedir - ft_libdir="$($(tc- \ No newline at end of file + ft_libdir="$($(tc-getPKG_CONFIG) freetype2 --variable=libdir)" + ft_includedir="$($(tc-getPKG_CONFIG) freetype2 --variable=includedir)" + export FREETYPE_DIR="${ft_libdir}:${ft_includedir%/include}" + einfo "Detected FreeType at ${FREETYPE_DIR}" + + mycmakeargs=( + -DBUILD_GTK_TESTS=OFF + -DBUILD_QT4_TESTS=OFF + -DBUILD_QT5_TESTS=OFF + -DBUILD_CPP_TESTS=OFF + -DENABLE_SPLASH=ON + -DENABLE_ZLIB=ON + -DENABLE_XPDF_HEADERS=ON + $(cmake-utils_use_enable curl LIBCURL) + $(cmake-utils_use_enable cxx CPP) + $(cmake-utils_use_enable jpeg2k LIBOPENJPEG) + $(cmake-utils_use_enable utils) + $(cmake-utils_use_with cairo) + $(cmake-utils_use_with introspection GObjectIntrospection) + $(cmake-utils_use_with jpeg) + $(cmake-utils_use_with png) + $(cmake-utils_use_with qt4) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Core=ON + $(cmake-utils_use_with tiff) + ) + if use lcms; then + mycmakeargs+=(-DENABLE_CMS=lcms2) + else + mycmakeargs+=(-DENABLE_CMS=) + fi + + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + + if use cairo && use doc; then + # For now install gtk-doc there + insinto /usr/share/gtk-doc/html/poppler + doins -r "${S}"/glib/reference/html/* + fi +} diff --git a/app-text/ps2pkm/Manifest b/app-text/ps2pkm/Manifest index 61da8162f9c2..ac982646944e 100644 --- a/app-text/ps2pkm/Manifest +++ b/app-text/ps2pkm/Manifest @@ -1,4 +1,2 @@ DIST texlive-20120701-source.tar.xz 131904044 SHA256 9666617d5dac3e82578e696835cc9f251ee0a56d162d86dff08659ac5dcb6c81 SHA512 0e8653aa21094e079900d17256f0768ac5514690a3725d96923d5fdc7633484d611441df1af8c674b38b9ce6a8845a9004976cd00635742dfc6837aa433caf5f WHIRLPOOL 9d570a1bd58cca8baed399ab53eb767c7c3db607c00363ce563e14dfccdd235703c538e6a651aa7f2934adf21f8477775f1547f9e7f3d957b89af644c89bcb57 DIST texlive-20130530-source.tar.xz 179963948 SHA256 a905832e4c04dd1cb16db4bb7baacb78fbc19682bd33ac2697a3a85ce78d79d4 SHA512 4aa85273a675af2453f09777b7cb348c18add77410d72f562c6586f6814d4e7c34b6f3690e3453020654fb0a265339fcabf590d9155367d52846224499af334c WHIRLPOOL 3affaf25d3936505d971599092964b0f0e97d107d22dbac6a85ad547e1d2726a6a09c5075fecb0c6ff8c88bc1bd09d78f95902f76eb76c608f8a7bc42dd6bc33 -DIST texlive-20120701-source.tar.xz 131904044 SHA256 9666617d5dac3e82578e696835cc9f251ee0a56d162d86dff08659ac5dcb6c81 SHA512 0e8653aa21094e079900d17256f0768ac5514690a3725d96923d5fdc7633484d611441df1af8c674b38b9ce6a8845a9004976cd00635742dfc6837aa433caf5f WHIRLPOOL 9d570a1bd58cca8baed399ab53eb767c7c3db607c00363ce563e14dfccdd235703c538e6a651aa7f2934adf21f8477775f1547f9e7f3d957b89af644c89bcb57 -DIST texlive-20130530-source.tar.xz 179963948 SHA256 a90583 \ No newline at end of file diff --git a/app-text/sgml-common/Manifest b/app-text/sgml-common/Manifest index ec31bcee7846..c0df298f9bcc 100644 --- a/app-text/sgml-common/Manifest +++ b/app-text/sgml-common/Manifest @@ -1,2 +1 @@ DIST sgml-common-0.6.3-gentoo.tar.gz 128903 SHA256 c5f6668cb19e230df5c5adaf2704fa5225da0aab090b42a23f4247224c6523ee SHA512 c8de573d707ccf524407c9be9a6e7740341eb88ecb6bee69d6d11a2658ef74e6acfb7495afa33c9983ab015c3c925aac98278a4e01ee217892a9fb99e60798ce WHIRLPOOL 18187f92fd4def6affdbb9e7c6de5f4a29f906b6f5199bb9db049ff106cc3fccd51144b83ad575caeb1ef8b6cb01d59db7a33563867fe14053019d93b9084772 -DIST sgml-common-0.6.3-gentoo.tar.gz 128903 SHA256 c5f6668cb19e230df5c5adaf2704fa5225da0aab090b42a23f4247224c6523ee SHA512 c8de573d707ccf524407c9be9a6e7740341eb88ecb6bee69d6d11a2658ef74e6acfb7495afa33c9983ab015c3c925aac98278a4e01ee217892a9fb99e60798ce WHIRLPOOL 18187f92fd4def6affdbb9e7c6de5f4a29f906b6f5199bb9db049ff106cc3fccd51144b83ad575caeb1ef8b6cb01d59db7a33563867fe14053019d93b9084772 diff --git a/app-text/sgmltools-lite/Manifest b/app-text/sgmltools-lite/Manifest index 19de879e907f..c935022b7e38 100644 --- a/app-text/sgmltools-lite/Manifest +++ b/app-text/sgmltools-lite/Manifest @@ -1,3 +1,2 @@ DIST nw-eps-icons-0.0.1.tar.gz 8733 SHA256 15295129f1ddd3bc1d09775296bf0aacef722799394189b0755acb3d1725c012 SHA512 597062e9882bb9bb73144bbdb056c3ccc2a6d99efc7da836f483ccd6f3799705bcbb897099cb1a580c8e22d936d281d95c3a875694f8e15b6989faf437f6cc7a WHIRLPOOL 8aba320641c652e38ad4e87a48ac5f5454ded681ec1d9fc4a2430e272e3a6b9d6f230c4ede9e02d8df2f4f711bee33b2e7929f96871a685d17aa52a5ef3cdbf5 DIST sgmltools-lite-3.0.3.tar.gz 61342 SHA256 eb9d2270f9ac5f17b8bd2d27f53ae700937365079413843fe5089c9568d0f1d8 SHA512 36709ba726859b734a7402c533ba7d2abc0546007bc97dba76ac824bc42f6f8ac7ef263b3740d0be51749cbc0982d010ba938646fca2006fa2c5094a296b3c81 WHIRLPOOL 46a94114a04c54a19f1d6a37a35bfb30804b1fde8defc931b9464980600b2707ca9ea970632d5d793dee1bbd0a388ef3e64a8be2806093e33dca4eb7bfd4c7d3 -DIST nw \ No newline at end of file diff --git a/app-text/sword/Manifest b/app-text/sword/Manifest index 56a0efe727d4..9251510ea3b7 100644 --- a/app-text/sword/Manifest +++ b/app-text/sword/Manifest @@ -1,3 +1,2 @@ -DIST sword-1.6.2.tar.gz 1965427 SHA256 af76c7d54135c444b09eeaafb49229ef5201a4e1d44539d9341dceaeb60a87b9 SHA512 3a62364ce528540a338a163d5fe48ce4a0263c8af6d5a955ab6b5182f122a65130683d6cc6a8eb9fe3a41661d3bd3fe5bf830aa8329c2b8a6d47f010461b32b4 WHIRLPOOL 50fc2cc6a18a269c7f1eca16ed2f659b84ed0a53d520b4e79-----BEGIN PGP SIGNED MESSAGE----- DIST sword-1.6.2.tar.gz 1965427 SHA256 af76c7d54135c444b09eeaafb49229ef5201a4e1d44539d9341dceaeb60a87b9 SHA512 3a62364ce528540a338a163d5fe48ce4a0263c8af6d5a955ab6b5182f122a65130683d6cc6a8eb9fe3a41661d3bd3fe5bf830aa8329c2b8a6d47f010461b32b4 WHIRLPOOL 50fc2cc6a18a269c7f1eca16ed2f659b84ed0a53d520b4e7935bf0af10c96e9c0b2f26c7e3088edf8311564620fb778fc1f63c0b78c449ad165fee9843fb753d DIST sword-1.7.2.tar.gz 2127944 SHA256 ac7aace0ecb7a405d4b4b211ee1ae5b2250bb5c57c9197179747c9e830787871 SHA512 1ee9565f36d113c9b21883a78004e895ab2f74d9c9f1909058c204e38647a96938de2e544a68858d2c4b048b67ba868049c1c09f0067bc9819a5a85f75285ebe WHIRLPOOL 894e4d96b2ff61ac19de853ff6b17aa2279fb7b5b571c1030ba18daefbea8997bd61d386ff3a1dff49d997c69d6acf2a83094ad6ec5c593acca3dc7fb1d488a0 diff --git a/app-vim/brainfuck-syntax/Manifest b/app-vim/brainfuck-syntax/Manifest index 0eb641ac008b..960ef49c93af 100644 --- a/app-vim/brainfuck-syntax/Manifest +++ b/app-vim/brainfuck-syntax/Manifest @@ -1,4 +1,2 @@ DIST brainfuck-syntax-1.0.1.tar.bz2 874 SHA256 86b25c5953e69cba70b310680f1a05465d90139352d97414566138b3f18d2a8d SHA512 2c18bffdb9255392f88d2155fe73300e13e50856d72a84424d52699572b7dbad658759d8e5ee16baa4eedd5ca666fcb0f8085d6cbd760c938b160b952999a29d WHIRLPOOL fd14de34633cd87a8cb3c5c807b6a87d62c39f8e06c62d421d71edbb11d607db97774401b93db981ffcd3779dddaf032050b3c480d6715923b87ab189d99c45e -DIST brainfuck-syntax-1.0.2.tar.bz2 916 SHA256 256a0f43be2da9af5a3f7bc8af34083a374cf711186d9ca921b63-----BEGIN PGP SIGNED MESSAGE----- -DIST brainfuck-syntax-1.0.1.tar.bz2 874 SHA256 86b25c5953e69cba70b310680f1a05465d90139352d97414566138b3f18d2a8d SHA512 2c18bffdb9255392f88d2155fe73300e13e50856d72a84424d52699572b7dbad658759d8e5ee16baa4eedd5ca666fcb0f8085d6cbd760c938b160b952999a29d WHIRLPOOL fd14de34633cd87a8cb3c5c807b6a87d62c39f8e06c62d421d71edbb11d607db97774401b93db981ffcd3779dddaf032050b3c480d6715923b87ab189d99c45e DIST brainfuck-syntax-1.0.2.tar.bz2 916 SHA256 256a0f43be2da9af5a3f7bc8af34083a374cf711186d9ca921b63a7dd5f9c84a SHA512 d01e544e45d4ada1c7ed8ca02e72d888fdcd374be8ee45c01d7797fc1e32457be94e0429dc3fc88f12fee063bd70d06af8ab4238795154a82793b6abb42dd974 WHIRLPOOL 71b8be951bd07d9df149a5ef4f205a196fb4153d33087414fc3df4d0436dae1526134a65de7dc6355ba3a34a25f92b3f2e82c02339f148b5076e4bf09f9bf9ed diff --git a/dev-ada/gtkada/gtkada-2.8.0.ebuild b/dev-ada/gtkada/gtkada-2.8.0.ebuild index b2d480231426..b53f456a5cbb 100644 --- a/dev-ada/gtkada/gtkada-2.8.0.ebuild +++ b/dev-ada/gtkada/gtkada-2.8.0.ebuild @@ -10,21 +10,6 @@ DESCRIPTION="Gtk+ bindings to the Ada language" HOMEPAGE="https://libre.adacore.com/GtkAda/" SRC_URI="mirror://gentoo/${Name}-${PV}.tgz" -LICENSE="GPL-2" -SLOT="2" -KEYWORDS="~amd64 ~x86 ~ppc" -IUSE="# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ada/gtkada/gtkada-2.8.0.ebuild,v 1.10 2009/08/01 22:56:55 flameeyes Exp $ - -inherit eutils gnat versionator - -Name="GtkAda-gpl" -MajorPV=$(get_version_component_range 1-2) -DESCRIPTION="Gtk+ bindings to the Ada language" -HOMEPAGE="https://libre.adacore.com/GtkAda/" -SRC_URI="mirror://gentoo/${Name}-${PV}.tgz" - LICENSE="GPL-2" SLOT="2" KEYWORDS="~amd64 ~x86 ~ppc" @@ -106,4 +91,20 @@ src_install() { ps2pdf gtkada_ug/gtkada_ug.ps ps2pdf gtkada_rm/gtkada_rm.ps cp gtkada_ug.pdf gtkada_rm.pdf "${D}/usr/share/doc/${PF}" - dohtml -r gtkada_ug/{gtkada_ug.html,boxes.gif,hierarchy.jpg} \ No newline at end of file + dohtml -r gtkada_ug/{gtkada_ug.html,boxes.gif,hierarchy.jpg} + cp -dPr gtkada_rm/gtkada_rm/ "${D}/usr/share/doc/${PF}/html" + + # utility stuff + cd "${S}" + dodir "${AdalibDataDir}/${PN}" + insinto "${AdalibDataDir}/${PN}" + doins -r xml/gtkada.xml projects/ +} + +pkg_postinst() { + eselect gnat update + einfo "The environment has been set up to make gnat automatically find files for" + einfo "GtkAda. In order to immediately activate these settings please do:" + einfo " env-update && source /etc/profile" + einfo "Otherwise the settings will become active next time you login" +} diff --git a/dev-cpp/glog/files/glog-0.3.2-avoid-inline-asm.patch b/dev-cpp/glog/files/glog-0.3.2-avoid-inline-asm.patch index b215f516ed9e..b6fa9cdb7374 100644 --- a/dev-cpp/glog/files/glog-0.3.2-avoid-inline-asm.patch +++ b/dev-cpp/glog/files/glog-0.3.2-avoid-inline-asm.patch @@ -45,15 +45,12 @@ make the code work with all gcc targets void *pc = non_inline_func(); const char *symbol = TrySymbolize(pc); CHECK(symbol != NULL); -@@ -314,7 +314,7 @@ void ATTRIBUTE_NOINLINEhttp://code.google.com/p/google-glog/issues/detail?id=130 - -make the code work with all gcc targets - ---- a/src/symbolize_unittest.cc -+++ b/src/symbolize_unittest.cc -@@ -60,9 +60,7 @@ using namespace GOOGLE_NAMESPACE; - # endif // __i386__ - # else - # endif // __GNUC__ >= 4 --# if defined(__i386__) || defined(__x86_64__) --# define TEST_X86_32_AND_64 \ No newline at end of file +@@ -314,7 +314,7 @@ void ATTRIBUTE_NOINLINE TestWithPCInsideNonInlineFunction() { + } + + void ATTRIBUTE_NOINLINE TestWithPCInsideInlineFunction() { +-#if defined(TEST_X86_32_AND_64) && defined(HAVE_ALWAYS_INLINE) ++#if defined(TEST_WITH_LABEL_ADDRESSES) && defined(HAVE_ALWAYS_INLINE) + void *pc = inline_func(); // Must be inlined. + const char *symbol = TrySymbolize(pc); + CHECK(symbol != NULL); diff --git a/dev-cpp/libbackend-elements/Manifest b/dev-cpp/libbackend-elements/Manifest index 82f3abd7c4d7..6270cd610be9 100644 --- a/dev-cpp/libbackend-elements/Manifest +++ b/dev-cpp/libbackend-elements/Manifest @@ -1,2 +1 @@ -DIST libbackend-elements-1.7.2.tar.bz2 22501 SHA256 803c5a9ff7422da04a6d2802214cee09c2eeddf7608866c34eb23e73bb92d3f7 SHA512 480563aa55c317a417bd3326ae108ee6bd8fbd9d3e6757f9387d5c407b8f2f4ae8194e2ee90c3ec05fa8d05113251d9850c176919e4e8b322409ff6625c29355 WHIRLPOOL fdba6955119b02b8b623d6d427593577049ee163389b0d42a0f45f0da7b816d49a267c18c6beab32f62b3adc414d8e752944ec31e6bd77781269d35e3272e843-----BEGIN PGP SIGNED MESSAGE----- DIST libbackend-elements-1.7.2.tar.bz2 22501 SHA256 803c5a9ff7422da04a6d2802214cee09c2eeddf7608866c34eb23e73bb92d3f7 SHA512 480563aa55c317a417bd3326ae108ee6bd8fbd9d3e6757f9387d5c407b8f2f4ae8194e2ee90c3ec05fa8d05113251d9850c176919e4e8b322409ff6625c29355 WHIRLPOOL fdba6955119b02b8b623d6d427593577049ee163389b0d42a0f45f0da7b816d49a267c18c6beab32f62b3adc414d8e752944ec31e6bd77781269d35e3272e843 diff --git a/dev-cpp/pangomm/Manifest b/dev-cpp/pangomm/Manifest index a39a8e1eafa0..36c3ae343340 100644 --- a/dev-cpp/pangomm/Manifest +++ b/dev-cpp/pangomm/Manifest @@ -1,4 +1,2 @@ DIST pangomm-2.28.4.tar.xz 796212 SHA256 778dcb66a793cbfd52a9f92ee5a71b888c3603a913fc1ddc48a30204de6d6c82 SHA512 85e327f5a85417c209cdffe52e5b776878233762e894d8bc6c353378cae9bec6d7f4181d21cf690c32d15ff7ac87272f1abd75352c3a73af9f98f1551df88a79 WHIRLPOOL 2b96088241a4430801d0811063a9710209522721fe83a66909bbf2ecca03304f894be9a544c2ed979dbee031d459cae9099d66c620934bec4842a94a35eda475 DIST pangomm-2.34.0.tar.xz 516028 SHA256 0e82bbff62f626692a00f3772d8b17169a1842b8cc54d5f2ddb1fec2cede9e41 SHA512 d8fddf52189da99a56289e3e1aa0579da2b48a62ffd00981db9da505ebc03a734c67151d8f4f3ca85dcd47c79218cdf503f23b8e69074fe99c052596320c8309 WHIRLPOOL 6ff34e0b71134ea4e40a9d103fbac03517f56ea323969dde290d632b87dd5d26013254ac3506ffbed5ec4b1a448815f630480ce179b6c6f070a0e277b56dba0e -DIST pangomm-2.28.4.tar.xz 796212 SHA256 778dcb66a793cbfd52a9f92ee5a71b888c3603a913fc1ddc48a30204de6d6c82 SHA512 85e327f5a85417c209cdffe52e5b776878233762e894d8bc6c353378cae9bec6d7f4181d21cf690c32d15ff7ac87272f1abd75352c3a73af9f98f1551df88a79 WHIRLPOOL 2b96088241a4430801d0811063a9710209522721fe83a66909bbf2ecca03304f894be9a544c2ed979dbee031d459cae9099d66c620934bec4842a94a35eda475 -DIST pangomm-2.34.0.tar.xz 516028 SHA256 0e82bbff62f626692a00f3772d8b17169a1842b8cc54d5f2ddb1fec2cede9e41 SHA512 d8fddf52189da99a56289e3e1aa0579da2b48a62ffd00981db9da505ebc03a734c67151d8f4f3ca85dcd47c79218cdf503f23b8e69074fe99c052596320c8309 WHIRLPOOL 6ff34e0b71134ea4e40a9d103fbac03517f56ea323969dde290d632b87dd5d26013254ac3506ffbed5ec4b1a448815f630480ce179b6c6f070a0e277b56dba0e diff --git a/dev-db/lib_mysqludf_fPROJ4/lib_mysqludf_fPROJ4-0.1.0.ebuild b/dev-db/lib_mysqludf_fPROJ4/lib_mysqludf_fPROJ4-0.1.0.ebuild index a0ff41b5182d..a124dc188004 100644 --- a/dev-db/lib_mysqludf_fPROJ4/lib_mysqludf_fPROJ4-0.1.0.ebuild +++ b/dev-db/lib_mysqludf_fPROJ4/lib_mysqludf_fPROJ4-0.1.0.ebuild @@ -37,18 +37,28 @@ src_prepare() { # fix doc (BOM, CR/LF, soname) sed -i -e '1 s|^\xEF\xBB\xBF||' \ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/lib_mysqludf_fPROJ4/lib_mysqludf_fPROJ4-0.1.0.ebuild,v 1.1 2011/10/19 12:12:02 sbriesen Exp $ - -EAPI=4 + -e "s|'\(${PN}\).*'|'\1.so'|g" ${PN}.sql + echo >> ${PN}.sql # add LF + edos2unix ${PN}.sql +} -inherit eutils toolchain-funcs +src_compile() { + _compile ${CFLAGS} -Wall -fPIC ${MYSQL_INCLUDE} -lproj \ + -shared ${LDFLAGS} -o ${PN}.so ${PN}.c +} -DESCRIPTION="MySQL UDFs which converts geographic/cartesian coordinates" -HOMEPAGE="http://www.mysqludf.org/lib_mysqludf_fPROJ4/" -SRC_URI="http://www.mysqludf.org/${PN}/${P}.tar.gz" +src_install() { + exeinto "${MYSQL_PLUGINDIR}" + doexe ${PN}.so + dodoc ${PN}.sql +} -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~ \ No newline at end of file +pkg_postinst() { + elog + elog "Please have a look at the documentation, how to" + elog "enable/disable the UDF functions of ${PN}." + elog + elog "The documentation is located here:" + elog "/usr/share/doc/${PF}" + elog +} diff --git a/dev-db/lib_mysqludf_stat/lib_mysqludf_stat-0.0.3.ebuild b/dev-db/lib_mysqludf_stat/lib_mysqludf_stat-0.0.3.ebuild index da20bdd7059e..d9565234644f 100644 --- a/dev-db/lib_mysqludf_stat/lib_mysqludf_stat-0.0.3.ebuild +++ b/dev-db/lib_mysqludf_stat/lib_mysqludf_stat-0.0.3.ebuild @@ -6,15 +6,6 @@ EAPI=4 inherit eutils toolchain-funcs -DESCRIPTION="MySQL UDFs with statistical functions" -HOMEPAGE="http://www.mysqludf.org/lib_mysqludf_stat/# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/lib_mysqludf_stat/lib_mysqludf_stat-0.0.3.ebuild,v 1.1 2011/10/19 12:19:53 sbriesen Exp $ - -EAPI=4 - -inherit eutils toolchain-funcs - DESCRIPTION="MySQL UDFs with statistical functions" HOMEPAGE="http://www.mysqludf.org/lib_mysqludf_stat/" SRC_URI="http://www.mysqludf.org/${PN}/${PN}_${PV}.tar.gz" @@ -48,4 +39,22 @@ src_prepare() { } src_compile() { - _compile \ No newline at end of file + _compile ${CFLAGS} -Wall -fPIC ${MYSQL_INCLUDE} \ + -shared ${LDFLAGS} -o ${PN}.so ${PN}.c +} + +src_install() { + exeinto "${MYSQL_PLUGINDIR}" + doexe ${PN}.so + dodoc ${PN}.sql +} + +pkg_postinst() { + elog + elog "Please have a look at the documentation, how to" + elog "enable/disable the UDF functions of ${PN}." + elog + elog "The documentation is located here:" + elog "/usr/share/doc/${PF}" + elog +} diff --git a/dev-db/lib_mysqludf_stem/Manifest b/dev-db/lib_mysqludf_stem/Manifest index 5a9a5a2a0ef5..7fcfd104bb8e 100644 --- a/dev-db/lib_mysqludf_stem/Manifest +++ b/dev-db/lib_mysqludf_stem/Manifest @@ -1,2 +1 @@ DIST lib_mysqludf_stem-0.9.1.tar.gz 953171 SHA256 a98394b8275ea91eae0bd34703c0a686c5b8c3df039128b0487db757646d1f37 SHA512 d15736da91dc5a6f2b0289694efeb531337ff6a001d39aafca02c9f165ba5901163855b8f03d13a50c2ab9bee58e7fc03d19e893d086ec0022de9dd6921f93b7 WHIRLPOOL 26c670424a092052d0ce33b25ba094afa67bb9e1fc6609a3467778f498bf15c0dfe59ce54c29f056a0c33785a32ff36b643217f1768acf624f304e5ef0c79f59 -DIST lib_mysqludf_stem-0.9.1.tar.gz 953171 SHA256 a98394b8275ea91eae0bd34703c0a686c5b8c3df039128b0487db757646d1f37 SHA512 d15736da91dc5a6 \ No newline at end of file diff --git a/dev-db/lib_mysqludf_str/Manifest b/dev-db/lib_mysqludf_str/Manifest index 47de89eb3a0a..de4f60392fa7 100644 --- a/dev-db/lib_mysqludf_str/Manifest +++ b/dev-db/lib_mysqludf_str/Manifest @@ -1,2 +1 @@ DIST lib_mysqludf_str-0.3.tar.gz 353717 SHA256 6a11bcfba19f97dfc696d0871779eba67e2a6badc20364403a9f68a9bb8a398b SHA512 a63ffbfd352db087da5a3e70f713845a88c6f4db47511a5b359bb8bcb466070d34b5e2b16d2bde38bd617ed209e2dc4553bbccfb406820e7669aa688652332b8 WHIRLPOOL 42712c9dc2948819680b1afb8f76f3ac3ad1b644c2215ae245afdc94c9f0be0eae5c27e799a336000a6865ac40cd467bf3e49b728ec27373698532b21416fb85 -DIST lib_mysqludf_str-0.3.tar.gz 353717 SHA256 6a11bcfba19f97dfc696d0871779eba67e2a6badc20364403a9f68a9bb8a398b SHA512 a63ffbfd352db087da5a3e70f713845a88c6f4db47511a5b359bb8bcb466070d34b5e2b16d2bde38bd617ed209e2dc4553bbccfb406820e7669aa688652332b8 WHIRLPOOL 42712c9dc2948819680b1afb8f76f3ac3ad1b644c2215ae245afdc94c9f0be0eae5c27e799a336000a6865ac40cd467bf3e49b728ec27373698532b21416fb85 diff --git a/dev-db/myodbc/myodbc-5.2.7.ebuild b/dev-db/myodbc/myodbc-5.2.7.ebuild index 54cc9006e178..8f853ade869d 100644 --- a/dev-db/myodbc/myodbc-5.2.7.ebuild +++ b/dev-db/myodbc/myodbc-5.2.7.ebuild @@ -9,18 +9,6 @@ MAJOR="$(get_version_component_range 1-2 $PV)" MY_PN="mysql-connector-odbc" MY_P="${MY_PN}-${PV/_p/r}-src" -DESCRIPTION="ODBC driver for MySQL" -HOMEPAGE="http://www.mysql# Copyright 1999-2014 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.ebuild,v 1.2 2014/08/20 18:52:50 grknight Exp $ - -EAPI=5 -inherit cmake-utils eutils flag-o-matic versionator - -MAJOR="$(get_version_component_range 1-2 $PV)" -MY_PN="mysql-connector-odbc" -MY_P="${MY_PN}-${PV/_p/r}-src" - DESCRIPTION="ODBC driver for MySQL" HOMEPAGE="http://www.mysql.com/products/myodbc/" SRC_URI="mirror://mysql/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz" @@ -109,4 +97,20 @@ pkg_config() { msg='sample MySQL ODBC DSN' if echo $sources | grep -vq "^\[${DRIVER_NAME}-test\]$"; then ebegin "Installing ${msg}" - /usr/bin/odbcinst -i -s -l -f /usr/share/${PN}-${SLOT}/odbc.in \ No newline at end of file + /usr/bin/odbcinst -i -s -l -f /usr/share/${PN}-${SLOT}/odbc.ini + rc=$? + eend $rc + [ $rc -ne 0 ] && die + else + einfo "Skipping already installed ${msg}" + fi +} + +pkg_postinst() { + + elog "If this is a new install, please run the following command" + elog "to configure the MySQL ODBC drivers and sources:" + elog "emerge --config =${CATEGORY}/${PF}" + elog "Please note that the driver name used to form the DSN now includes the SLOT." + elog "The myodbc-install utility is installed as myodbc-install-${MAJOR}" +} diff --git a/dev-db/mysql-init-scripts/files/mysql-5.1.53-conf.d b/dev-db/mysql-init-scripts/files/mysql-5.1.53-conf.d index 5695d93f9d3f..df4c3a467690 100644 --- a/dev-db/mysql-init-scripts/files/mysql-5.1.53-conf.d +++ b/dev-db/mysql-init-scripts/files/mysql-5.1.53-conf.d @@ -44,26 +44,36 @@ STOP_TIMEOUT=120 # Depending on your usage of MySQL, you may also wish to start it after some # other services are up. Uncomment the lines below as needed. If these aren't -# enough for you, we encourage you to file a bug, and help us und# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/files/mysql-5.1.53-conf.d,v 1.2 2011/01/15 17:54:31 robbat2 Exp $ +# enough for you, we encourage you to file a bug, and help us understand how +# you are using MySQL. -# If you want a non-stock location for the config file, uncomment or update -# either of these as needed. If you do use it, you must make sure that none of -# your socket, pidfile, datadir, logfiles, binary logs, relay logs or InnoDB -# files collide with each other. -MY_CNF="/etc/mysql/my.cnf" -#MY_CNF="${MY_CNF:-/etc/${SVCNAME}/my.cnf}" -#MY_CNF="${MY_CNF:-/etc/mysql/my-${SVCNAME/mysql.}.cnf}" +# Do your MySQL ACLs refer to hostnames not in your /etc/hosts? +# If so, you need DNS before you can accept connections. +# Avoid dependency circular loops if you use MySQL to power a local DNS server. +#rc_use="dns" +#rc_after="dns" -# Place any additional arguments here that you might need -# Common/useful options: -# --skip-slave-start=1 - For bringing up replication initially -# --server-id=NNN - Server ID for replication -# --skip-networking - lock it down to UNIX sockets only -MY_ARGS="" +# Does your MySQL bind to an IP on an interface other than net.lo? +# Alternatively you might wish to specify the exact interface here. +#rc_use="net" +#rc_after="net" -# This setting (in seconds) should be high enough to allow InnoDB to do a full -# checkpoint recovery. 900 is the default used in the upstream RPM startup -# scripts. 30 seconds should be sufficent if you just have a tiny <1GiB -# database. After the core startup is done, we wait this lon \ No newline at end of file +# Do you store your MySQL files on a SAN or other network filesystem, that is +# provided by the netmount init script? +#rc_need="netmount" + +# Or from NFS? P.S. This is not a good idea in most cases, but does have some +# valid usage cases, so we provide the option. +#rc_need="nfsmount" + +# Should any one of the instances satisfy the requirement for MySQL coming up? +# By default, we say no. +[ "${SVCNAME}" != mysql ] && rc_provide="!mysql" +# But uncomment this next instead if you think it should. +#rc_provide="mysql" + +# The conditional above has a false-positive "failure" return value as a +# side-effect, and since it's the last statement, without the next line, this +# script returns failure. +return 0 +# vim: ft=gentoo-conf-d et ts=4 sw=4: diff --git a/dev-db/odbtp/Manifest b/dev-db/odbtp/Manifest index 201b6918ba93..e6e267ae640a 100644 --- a/dev-db/odbtp/Manifest +++ b/dev-db/odbtp/Manifest @@ -1,2 +1 @@ -DIST odbtp-1.1.4.tar.gz 1049975 SHA256 c4f4e0b01610d0e547dfe70e9e2184fc35c8944a44be6a70ec8c8fc28dffe705 SHA512 4b87c8733fc1f017546024901874b0ea2f410646ef39f9581cc170773639077c3f885-----BEGIN PGP SIGNED MESSAGE----- DIST odbtp-1.1.4.tar.gz 1049975 SHA256 c4f4e0b01610d0e547dfe70e9e2184fc35c8944a44be6a70ec8c8fc28dffe705 SHA512 4b87c8733fc1f017546024901874b0ea2f410646ef39f9581cc170773639077c3f885813550422966e8797489c66b32b75de85fa658e3bb84da285b96c0a7b70 WHIRLPOOL b5443d5639e9d1f938d3708153cdc10a92ba6c2f8e4a1615c897ac05aebb88d59903ddde59092130373abcf8daefe59086c6eac9f686dce753be03cd68012d4a diff --git a/dev-db/opendbx/opendbx-1.4.6.ebuild b/dev-db/opendbx/opendbx-1.4.6.ebuild index d46bdb98def3..df2764086327 100644 --- a/dev-db/opendbx/opendbx-1.4.6.ebuild +++ b/dev-db/opendbx/opendbx-1.4.6.ebuild @@ -15,26 +15,6 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="bindist firebird +mysql oracle postgres sqlite sqlite3" -DEPEND="mysql? ( virtual/mysql ) - postgres? ( dev-db/postgresql-base ) - sqlite? ( =dev-util/gperf-2.7.2 sys-apps/gawk - >=sys-devel/bison-# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-server/virtuoso-server-6.1.6.ebuild,v 1.7 2014/03/07 03:28:22 creffett Exp $ + >=sys-devel/bison-2.3 + >=sys-devel/flex-2.5.33 + virtual/pkgconfig +" +RDEPEND="${COMMON_DEPEND} + ~dev-db/virtuoso-odbc-${PV}:${SLOT} +" -EAPI=4 +VOS_EXTRACT=" + libsrc/Dk + libsrc/Thread + libsrc/Tidy + libsrc/Wi + libsrc/Xml.new + libsrc/langfunc + libsrc/odbcsdk + libsrc/plugin + libsrc/util + binsrc/virtuoso + binsrc/tests +" -inherit virtuoso +DOCS=( AUTHORS ChangeLog CREDITS INSTALL NEWS README ) -DESCRIPTION="Server binaries for Virtuoso, high-performance object-relational SQL database" +PATCHES=( + "${FILESDIR}/${PN}-6.1.4-unbundle-minizip.patch" + "${FILESDIR}/${PN}-6.1.6-am_config_header.patch" +) -KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" -IUSE="kerberos ldap readline" +src_prepare() { + sed -e '/^lib_LTLIBRARIES\s*=.*/s/lib_/noinst_/' -i binsrc/virtuoso/Makefile.am \ + || die "failed to disable installation of static lib" -# Bug 305077 -RESTRICT="test" + virtuoso_src_prepare +} -# zeroconf support looks like broken - disabling - last checked around 5.0.12 -# mono support fetches mono source and compiles it manually - disabling for now -# mono? ( dev-lang/mono ) -COMMON_DEPEND=" - dev-libs/libxml2:2 - >=dev-libs/openssl-0.9.7i:0 - >=sys-libs/zlib-1.2.5.1-r2:0[minizip] - kerberos? ( app-crypt/mit-krb5 ) - ldap? ( net-nds/openldap ) - readline? ( sys-libs/readline:0 ) -" -DEPEND="${COMMON_DEPEND} - >=dev-util/gperf-2.7.2 - sys-apps/gawk - >=sys-devel/bison-2.3 - >=sys \ No newline at end of file +src_configure() { + myconf+=" + $(use_enable kerberos krb) + $(use_enable ldap openldap) + $(use_with readline) + --disable-static + --disable-hslookup + --disable-rendezvous + --without-iodbc + --program-transform-name="s/isql/isql-v/" + " + + virtuoso_src_configure +} + +src_install() { + default_src_install + + keepdir /var/lib/virtuoso/db +} diff --git a/dev-dotnet/atk-sharp/Manifest b/dev-dotnet/atk-sharp/Manifest index bd533d27491f..9bb6c8f4a547 100644 --- a/dev-dotnet/atk-sharp/Manifest +++ b/dev-dotnet/atk-sharp/Manifest @@ -1,3 +1,2 @@ DIST gtk-sharp-2.12.10.tar.bz2 1638263 SHA256 aaa53f7916f25f0f83760b6ffbf0d465d13ecfa55aa645603f1ca876b7d0f770 SHA512 232137dfef327f664a941e96edb8e87a18e7def8bccf64e352e846fbd14fe4b93a0725f43b1167c05d597de10ce50c546935810e28681457d5eaba172fc457e0 WHIRLPOOL 3a8a12744ba09ba5b30da8b51b35a9d9cfccfa52e0493bafd71935a7cb6af855bf5860477569a5c17a6416a495e9a9cd4f74c61b8d25b7aedeaab1119fb16cc1 -DIST gtk-sharp-2.12.7.patch.bz2 1069 SHA256 f9db539471450d7cd17406573db117584d10c76bdbc36e11147335e93d6d10c8 SHA512 900a0c63308881b09d51bbd319c917f79ee638e82d2bbc3f7ffad6c15ad21fa22593895907caf76330511c0aa232e44ab6540bb417a2fc1963ea449b2339e427 WHIRLPOOL d3ffbe7e7189516862f64cbb7119484cf8f0d2bd6fd92e3afc839091c525a9cc4e1f8b8981b6cf9bfc52af46156e3f4DIST gtk-sharp-2.12.10.tar.bz2 1638263 SHA256 aaa53f7916f25f0f83760b6ffbf0d465d13ecfa55aa645603f1ca876b7d0f770 SHA512 232137dfef327f664a941e96edb8e87a18e7def8bccf64e352e846fbd14fe4b93a0725f43b1167c05d597de10ce50c546935810e28681457d5eaba172fc457e0 WHIRLPOOL 3a8a12744ba09ba5b30da8b51b35a9d9cfccfa52e0493bafd71935a7cb6af855bf5860477569a5c17a6416a495e9a9cd4f74c61b8d25b7aedeaab1119fb16cc1 DIST gtk-sharp-2.12.7.patch.bz2 1069 SHA256 f9db539471450d7cd17406573db117584d10c76bdbc36e11147335e93d6d10c8 SHA512 900a0c63308881b09d51bbd319c917f79ee638e82d2bbc3f7ffad6c15ad21fa22593895907caf76330511c0aa232e44ab6540bb417a2fc1963ea449b2339e427 WHIRLPOOL d3ffbe7e7189516862f64cbb7119484cf8f0d2bd6fd92e3afc839091c525a9cc4e1f8b8981b6cf9bfc52af46156e3f43940536d812d4b68ffcf01559bd3dfb74 diff --git a/dev-dotnet/ikvm/files/ikvm-0.46.0.1-key.patch b/dev-dotnet/ikvm/files/ikvm-0.46.0.1-key.patch index 7b30926e9d32..cd45f6bf0da3 100644 --- a/dev-dotnet/ikvm/files/ikvm-0.46.0.1-key.patch +++ b/dev-dotnet/ikvm/files/ikvm-0.46.0.1-key.patch @@ -13,22 +13,6 @@ Index: ikvm/ikvm-0.46.0.1/CommonAssemblyInfo.cs.in #pragma warning disable 1699 - [assembly: AssemblyKeyName("ikvm-key")] + [assembly: AssemblyDelaySign(false)] -+ [assembly: AssemblyKeyFile("../mono.snk")] - #endif Author: Jo Shields -Description: This patch ensures that rather than trying to use the Mono Crypto -Description: Service Provider to retrieve a signing key (CSP is not safe to -Description: run with fakeroot), we simply hard-code the path to a bundled key -Description: file -Index: ikvm/ikvm-0.46.0.1/CommonAssemblyInfo.cs.in -=================================================================== ---- ikvm.orig/ikvm-0.46.0.1/CommonAssemblyInfo.cs.in 2011-07-05 01:24:45.000000000 +0100 -+++ ikvm/ikvm-0.46.0.1/CommonAssemblyInfo.cs.in 2011-07-05 01:28:22.000000000 +0100 -@@ -33,5 +33,6 @@ - - #if SIGNCODE - #pragma warning disable 1699 -- [assembly: AssemblyKeyName("ikvm-key")] -+ [assembly: AssemblyDelaySign(false)] + [assembly: AssemblyKeyFile("../mono.snk")] #endif Index: ikvm/ikvm-0.46.0.1/ikvm.build @@ -55,4 +39,23 @@ Index: ikvm/ikvm-0.46.0.1/runtime/runtime.build - -- \ No newline at end of file +- ++ ++ + + + +Index: ikvm/ikvm-0.46.0.1/tools/pubkey.cs +=================================================================== +--- ikvm.orig/ikvm-0.46.0.1/tools/pubkey.cs 2011-07-05 01:24:45.000000000 +0100 ++++ ikvm/ikvm-0.46.0.1/tools/pubkey.cs 2011-07-05 01:28:22.000000000 +0100 +@@ -29,7 +29,8 @@ + + #if SIGNCODE + #pragma warning disable 1699 +- [assembly: AssemblyKeyName("ikvm-key")] ++ [assembly: AssemblyDelaySign(false)] ++ [assembly: AssemblyKeyFile("../mono.snk")] + #endif + + class PublicKey diff --git a/dev-embedded/bitbake/bitbake-9999.ebuild b/dev-embedded/bitbake/bitbake-9999.ebuild index 50ff38db8560..f27f885a444d 100644 --- a/dev-embedded/bitbake/bitbake-9999.ebuild +++ b/dev-embedded/bitbake/bitbake-9999.ebuild @@ -25,14 +25,15 @@ SLOT="0" IUSE="doc" RDEPEND="dev-python/ply - dev-python/progress# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-embedded/bitbake/bitbake-9999.ebuild,v 1.14 2013/09/05 19:44:53 mgorny Exp $ - -EAPI="5" -PYTHON_COMPAT=( python{2_6,2_7} ) -PYTHON_REQ_USE="sqlite" - -inherit distutils-r1 vcs-snapshot - -if [[ ${PV} = \ No newline at end of file + dev-python/progressbar" +DEPEND="doc? ( dev-libs/libxslt )" + +src_prepare() { + if ! use doc ; then + sed -i -e 's:doctype = "html":doctype = "none":' \ + -e 's:("share/doc/bitbake-%s/manual.*))::' setup.py || die + echo "none:" >> doc/manual/Makefile || die + else + sed -i -e "s:\(share/doc/bitbake-%s.* %\) __version__:\1 \"${PV}\":" setup.py || die + fi +} diff --git a/dev-embedded/libftdi/libftdi-0.19.ebuild b/dev-embedded/libftdi/libftdi-0.19.ebuild index 9e38aaf77173..d5ee29f1c6fe 100644 --- a/dev-embedded/libftdi/libftdi-0.19.ebuild +++ b/dev-embedded/libftdi/libftdi-0.19.ebuild @@ -12,21 +12,6 @@ else KEYWORDS="amd64 arm ppc ppc64 sparc x86" fi -DESCRIPTION="Userspace access to FTDI USB interface chips" -HOMEPAGE="http://www.int# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-embedded/libftdi/libftdi-0.19.ebuild,v 1.3 2011/10/20 15:40:57 vapier Exp $ - -EAPI="2" - -if [[ ${PV} == 9999* ]] ; then - EGIT_REPO_URI="git://developer.intra2net.com/${PN}" - inherit git-2 autotools -else - SRC_URI="http://www.intra2net.com/en/developer/${PN}/download/${P}.tar.gz" - KEYWORDS="amd64 arm ppc ppc64 sparc x86" -fi - DESCRIPTION="Userspace access to FTDI USB interface chips" HOMEPAGE="http://www.intra2net.com/en/developer/libftdi/" @@ -38,4 +23,35 @@ RDEPEND="virtual/libusb:0 cxx? ( dev-libs/boost ) python? ( dev-lang/python )" DEPEND="${RDEPEND} - doc? ( app-d \ No newline at end of file + doc? ( app-doc/doxygen )" + +src_prepare() { + if [[ ${PV} == 9999* ]] ; then + mkdir -p m4 + eautoreconf + fi +} + +src_configure() { + econf \ + $(use_enable cxx libftdipp) \ + $(use_with doc docs) \ + $(use_with examples) \ + $(use_enable python python-binding) \ + $(use_enable static-libs static) +} + +src_install() { + emake DESTDIR="${D}" install || die + use static-libs || find "${D}" -name '*.la' -delete + dodoc ChangeLog README + + if use doc ; then + doman doc/man/man3/* + dohtml doc/html/* + fi + if use examples ; then + docinto examples + dodoc examples/*.c + fi +} diff --git a/dev-embedded/libftdi/libftdi-1.0.ebuild b/dev-embedded/libftdi/libftdi-1.0.ebuild index fdbd05a59ee4..47e937df86a9 100644 --- a/dev-embedded/libftdi/libftdi-1.0.ebuild +++ b/dev-embedded/libftdi/libftdi-1.0.ebuild @@ -56,6 +56,11 @@ src_install() { # Clean up crap man pages. #356369 rm -vf "${CMAKE_BUILD_DIR}"/doc/man/man3/{_,usb_,deprecated}* - doma# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-embedde \ No newline at end of file + doman "${CMAKE_BUILD_DIR}"/doc/man/man3/* + dohtml "${CMAKE_BUILD_DIR}"/doc/html/* + fi + if use examples ; then + docinto examples + dodoc examples/*.c + fi +} diff --git a/dev-embedded/lpc21isp/Manifest b/dev-embedded/lpc21isp/Manifest index 1b7edf4bf01f..7308bd072b0c 100644 --- a/dev-embedded/lpc21isp/Manifest +++ b/dev-embedded/lpc21isp/Manifest @@ -1,2 +1 @@ DIST lpc21isp_185.tar.gz 54735 SHA256 b85f10265fa83cdaab5b975e7bd53bb47289f1207b45e99cd753ea7a75fb7088 SHA512 585c8f02771fc68719c8a5e6cc4253854dce4f4e0047df8a1d57db273cb51c9d4fcbe1066b079aaec54d7ca189e90710647b95fdb320729753967c265b1ac954 WHIRLPOOL 2fe84d48d355b64939e291f0557f6d8023df5b1a1c8f4152659eb25a9341b809cddcd1d9ff97fa52d6f459ddd4b80972b894421495d8a9705b7bec211c55375a -DIST lpc21isp_185.tar.gz 54735 SHA256 b85f10265fa83cdaab5b975e7bd53bb47289f1207b45e99cd753ea7a75fb7088 SHA512 585c8f02771fc68719c8a5e6cc4253854dce4f4e0047df8a1d57db273cb51c9d4fcbe1066b079aaec54d7ca189e90710647b95fdb320729753967c265b1ac954 WHIRLPOOL 2fe84d48d355b64939e291f0557f6d8023df5b1a1c8f4152659eb25a9341b809cddcd1d9ff97fa52d6f459ddd4b80972b894421495d8a9705b7bec211c55375a diff --git a/dev-embedded/scratchbox2/files/scratchbox2-2.0-use-system-lua.patch b/dev-embedded/scratchbox2/files/scratchbox2-2.0-use-system-lua.patch index 1d104d4fd04b..d4c231c74db2 100644 --- a/dev-embedded/scratchbox2/files/scratchbox2-2.0-use-system-lua.patch +++ b/dev-embedded/scratchbox2/files/scratchbox2-2.0-use-system-lua.patch @@ -47,28 +47,31 @@ index 28e8885..5e1af6f 100644 luaif/libluaif.a: override LIBS := @@ -24,5 +24,5 @@ luaif/liblua.a: override CFLAGS := -O2 -g -fPIC -Wall -W $(CFLAGS) - luaif/liblua.a: override LDFLdiff --git a/Makefile b/Makefile -index c5b26cc..da48ea0 100644 ---- a/Makefile -+++ b/Makefile -@@ -60,7 +60,7 @@ subdirs = luaif preload utils - -include config.mak + luaif/liblua.a: override LDFLAGS := $(LDFLAGS) + luaif/liblua.a: override LIBS := - CFLAGS += -I$(OBJDIR)/include -I$(SRCDIR)/include --CFLAGS += -I$(SRCDIR)/luaif/lua-5.1.4/src -+# CFLAGS += -I$(SRCDIR)/luaif/lua-5.1.4/src - CFLAGS += -D_GNU_SOURCE=1 -D_LARGEFILE_SOURCE=1 -D_LARGEFILE64_SOURCE=1 - CFLAGS += -DSCRATCHBOX_ROOT="$(prefix)" - CFLAGS += $(MACH_CFLAG) -@@ -103,10 +103,7 @@ regular: .configure .version - @$(MAKE) -f $(SRCDIR)/Makefile --include-dir=$(SRCDIR) SRCDIR=$(SRCDIR) do-all +-targets := $(targets) $(D)/libluaif.a $(D)/liblua.a ++targets := $(targets) $(D)/libluaif.a - multilib: -- @mkdir -p obj-32 -- @mkdir -p obj-64 -- @$(MAKE) MACH_CFLAG=-m32 -C obj-32 --include-dir=.. -f ../Makefile SRCDIR=.. regular -- @$(MAKE) MACH_CFLAG=-m64 -C obj-64 --include-dir=.. -f ../Makefile SRCDIR=.. regular -+ @$(MAKE) MACH_CFLAG=-m64 regular +diff --git a/preload/Makefile b/preload/Makefile +index 9f785ba..5094dbc 100644 +--- a/preload/Makefile ++++ b/preload/Makefile +@@ -8,7 +8,7 @@ LIBSB2_LDFLAGS = -Wl,-soname=$(LIBSB2_SONAME) \ + # DO NOT add any libraries that depend on libpthread to + # LIBSB2_LIBS or LIBS!! see the comments in luaif.c. + +-LIBSB2_LIBS = ++LIBSB2_LIBS = -llua + SHLIBEXT = so + else + LIBSB2_LIBS = +@@ -17,7 +17,7 @@ endif - gcc_bins = addr2line ar as cc c++ c++filt \ No newline at end of file + $(D)/libsb2.$(SHLIBEXT): $(call O,$(objs)) +-$(D)/libsb2.$(SHLIBEXT): luaif/libluaif.a luaif/liblua.a ++$(D)/libsb2.$(SHLIBEXT): luaif/libluaif.a + $(D)/libsb2.$(SHLIBEXT): CFLAGS := $(CFLAGS) -fPIC -Wall -W \ + -I$(SRCDIR)/preload -Ipreload/ $(PROTOTYPEWARNINGS) + $(D)/libsb2.$(SHLIBEXT): LDFLAGS := $(LDFLAGS) $(LIBSB2_LDFLAGS) diff --git a/dev-embedded/sdcc/sdcc-2.6.0.ebuild b/dev-embedded/sdcc/sdcc-2.6.0.ebuild index 61982d7da382..2036782f1233 100644 --- a/dev-embedded/sdcc/sdcc-2.6.0.ebuild +++ b/dev-embedded/sdcc/sdcc-2.6.0.ebuild @@ -18,26 +18,6 @@ RDEPEND="!dev-embedded/sdcc-svn" S=${WORKDIR}/${PN} -sr# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/sdcc-2.6.0.ebuild,v 1.3 2014/08/10 20:06:17 slyfox Exp $ - -DESCRIPTION="Small device C compiler (for various microprocessors)" -HOMEPAGE="http://sdcc.sourceforge.net/" -SRC_URI="mirror://sourceforge/sdcc/${PN}-src-${PV}.tar.gz - doc? ( mirror://sourceforge/sdcc/${PN}-doc-${PV}.tar.gz )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="doc" - -DEPEND=">=dev-embedded/gputils-0.13.2 - dev-libs/boehm-gc" -RDEPEND="!dev-embedded/sdcc-svn" - -S=${WORKDIR}/${PN} - src_unpack() { unpack ${A} cd "${S}" @@ -45,4 +25,23 @@ src_unpack() { # Fix conflicting variable names between Gentoo and sdcc find ./ -type f -exec sed -i s:PORTDIR:PORTINGDIR:g {} \; || die "sed failed" find device/lib/pic*/ -type f -exec sed -i s:ARCH:SDCCARCH:g {} \; || die "sed failed" - find device/lib/pic/libdev/ -type f -exec sed -i s:CFLAGS:SDC \ No newline at end of file + find device/lib/pic/libdev/ -type f -exec sed -i s:CFLAGS:SDCCFLAGS:g {} \; || die "sed failed" + + # --as-needed fix : + sed -i -e "s/= @CURSES_LIBS@ @LIBS@/= @CURSES_LIBS@ @LIBS@ -lcurses/" sim/ucsim/gui.src/serio.src/Makefile.in || die "sed failed" +} + +src_compile() { + econf --enable-libgc docdir=/usr/share/doc/${PF} || die "configure failed" + emake || die "emake failed" +} + +src_install() { + make DESTDIR="${D}" install || die "Install failed" + dodoc ChangeLog + if use doc ; then + cp -pPR "${WORKDIR}"/doc/* "${D}"/usr/share/doc/${PF}/ + fi + find "${D}"/usr/share/doc/${PF}/ -name *.txt -exec gzip -f -9 {} \; + find "${D}"/usr/share/doc/${PF}/ -name */*.txt -exec gzip -f -9 {} \; +} diff --git a/dev-embedded/sdcc/sdcc-2.8.0.ebuild b/dev-embedded/sdcc/sdcc-2.8.0.ebuild index 0e6aeae9c045..efbd13972049 100644 --- a/dev-embedded/sdcc/sdcc-2.8.0.ebuild +++ b/dev-embedded/sdcc/sdcc-2.8.0.ebuild @@ -36,30 +36,40 @@ src_unpack() { # We'll install doc manually sed -i -e '/SDCC_DOC/d' Makefile.in || die "sed failed" sed -i -e 's/all install-doc/all/' as/Makefile.in || die "sed failed" - sed -i -e 's/ doc//' s# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/sdcc-2.8.0.ebuild,v 1.4 2014/08/10 20:06:17 slyfox Exp $ - -inherit eutils autotools - -DESCRIPTION="Small device C compiler (for various microprocessors)" -HOMEPAGE="http://sdcc.sourceforge.net/" -SRC_URI="mirror://sourceforge/sdcc/${PN}-src-${PV}.tar.bz2 - doc? ( mirror://sourceforge/sdcc/${PN}-doc-${PV}.tar.bz2 )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="boehm-gc doc" - -DEPEND=">=dev-embedded/gputils-0.13.2 - boehm-gc? ( dev-libs/boehm-gc )" -RDEPEND="!dev-embedded/sdcc-svn" - -S=${WORKDIR}/${PN} - -src_unpack() { - unpack ${A} - cd "${S}" - - # Fix conflicting variable names between Gent \ No newline at end of file + sed -i -e 's/ doc//' sim/ucsim/packages_in.mk || die "sed failed" + + eautoreconf +} + +src_compile() { + econf \ + $(use_enable boehm-gc libgc) \ + --disable-doc \ + || die "configure failed" + emake || die "emake failed" +} + +src_install() { + make DESTDIR="${D}" install || die "Install failed" + + insinto /usr/share/doc/${PF} + if use doc ; then + cd "${WORKDIR}"/doc + dohtml -r *.html ucsim + rm -rf *.html ucsim + dohtml as/asxhtm.html + rm -f as/asxhtm.html + rm -f INSTALL.txt + else + dohtml as/doc/asxhtm.html + rm -f as/doc/asxhtm.html + mv as/doc as/as || die "Failed to rename as/doc" + doins -r as/as + mv sim/ucsim/doc sim/ucsim/ucsim || die "Failed to rename sim/ucsim/doc" + dohtml -r sim/ucsim/ucsim + rm -f INSTALL.txt Makefile* *.mk + cd doc + fi + doins -r * + prepalldocs +} diff --git a/dev-embedded/sgpp-lite-arm-eabi-bin/Manifest b/dev-embedded/sgpp-lite-arm-eabi-bin/Manifest index 5df5bc890631..37a300562653 100644 --- a/dev-embedded/sgpp-lite-arm-eabi-bin/Manifest +++ b/dev-embedded/sgpp-lite-arm-eabi-bin/Manifest @@ -1,2 +1 @@ DIST arm-2010.09-51-arm-none-eabi-i686-pc-linux-gnu.tar.bz2 36851462 SHA256 d9d2bfa9eeeab3c6da808ca4ada18b75ddb29a62c3ac73016c89e0b8ef8116ed SHA512 0de319596f83e62be9a786ebf02fb2830d0ea97acb1f01ba4f7f99f4aadfa12731bd1121bc885a4d97a948bc8131b66c91c62614b4ea8223553bf9a60a551002 WHIRLPOOL c4779887fc6fcbe11ba514a4533287ff13bb1b75e6b420db2836443684027bb3c694ccb5b40c72eaccff06542a623854bfbbc11418c87cfc5490a07f7c7ed6ba -EBUILD sgpp-lite-arm-eabi-bin-2010.09.51.ebuild 1332 SHA256 6bfb5ec95b7838e3e714d7863603dabf005f9401ffd846ad5d0faee39c611c40 SHA512 521eea398893a60426914e03cad264c36b6cDIST arm-2010.09-51-arm-none-eabi-i686-pc-linux-gnu.tar.bz2 36851462 SHA256 d9d2bfa9eeeab3c6da808ca4ada18b75ddb29a62c3ac73016c89e0b8ef8116ed SHA512 0de319596f83e62be9a786ebf02fb2830d0ea97acb1f01ba4f7f99f4aadfa12731bd1121bc885a4d97a948bc8131b66c91c62614b4ea8223553bf9a60a551002 WHIRLPOOL c4779887fc6fcbe11ba514a4533287ff13bb1b75e6b420db2836443684027bb3c694ccb5b40c72eaccff06542a623854bfbbc11418c87cfc5490a07f7c7ed6ba diff --git a/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-add-S3C64xx-support.patch b/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-add-S3C64xx-support.patch index 2972b8ac33a3..5b615aeb119b 100644 --- a/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-add-S3C64xx-support.patch +++ b/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-add-S3C64xx-support.patch @@ -40,29 +40,27 @@ index 4e2d238..e76e607 100644 return 0; } -From ed9e5da97fdb40082aca7acbdce5286b530fb2ba Mon Sep 17 00:00:00 2001 -From: Maurus Cuelenaere -Date: Mon, 11 Jan 2010 01:55:34 +0100 -Subject: [PATCH] Add S3C64xx support - -Author: unknown -URL: http://dev.odroid.com/frs/download.php/22/Linux-dltool.tar.gz ---- - dltool/dltool.c | 19 ++++++++++++++----- - 1 files changed, 14 insertions(+), 5 deletions(-) - -diff --git a/dltool/dltool.c b/dltool/dltool.c -index 4e2d238..e76e607 100644 ---- a/dltool/dltool.c -+++ b/dltool/dltool.c -@@ -26,6 +26,8 @@ char *dl_file = "download.dat"; - char *dl_udev = NULL; - char *dl_ubus = NULL; +@@ -180,9 +188,9 @@ int main(int argc, char **argv) + usb_dev_handle *devh; + int ret; -+int ep_out = 0; -+ - #define DBG(x) if (debug) { printf x; } +- printf("SMDK42XX USB Download Tool\n"); ++ printf("SMDK42XX,S3C64XX USB Download Tool\n"); + printf("Version 0.20 (c) 2004,2005,2006" +- "Ben Dooks \n"); ++ " Ben Dooks \n"); + printf("\n"); - void write_u32(unsigned char *dp, unsigned long val) -@@ -120,9 +122,15 @@ int verify_device(struct usb_device *dev) - DBG(("\t=> idVe \ No newline at end of file + while (1) { +@@ -309,7 +317,8 @@ int main(int argc, char **argv) + write_header(dl_data, dl_addr, dl_size); + calc_cksum(dl_data, dl_size); + +- ret = usb_bulk_write(devh, 3, (void *)dl_data, dl_size, 5*1000*1000); ++ //ret = usb_bulk_write(devh, 3, (void *)dl_data, dl_size, 5*1000*1000); ++ ret = usb_bulk_write(devh, ep_out, (void *)dl_data, dl_size, 5*1000*1000); + printf("=> usb_bulk_write() returned %d\n", ret); + + if (ret != dl_size) { +-- +1.7.0.4 diff --git a/dev-games/mygui/files/mygui-3.2.0-build.patch b/dev-games/mygui/files/mygui-3.2.0-build.patch index 37b2941bd7bb..f1f0f1cc94e3 100644 --- a/dev-games/mygui/files/mygui-3.2.0-build.patch +++ b/dev-games/mygui/files/mygui-3.2.0-build.patch @@ -4,28 +4,6 @@ Date: Fri Jun 15 21:58:45 UTC 2012 use proper destinations and allow Gentoo build type rename demo targets to avoid confusion ---- CMake/Utils/MyGUIConfigTargets.cmake -+++ CMake/Utils/MyGUIConfigTargets.cmake -@@ -1,6 +1,8 @@ - # Configure settings and install targets - # FIXME: Copypasted from Ogre and need lots of changes - -+include(GNUInstallDirs) -+ - if (WIN32) - set(MYGUI_RELEASE_PATH "/Release") - set(MYGUI_RELWDBG_PATH "/RelWithDebInfo") -@@ -56,6 +58,12 @@ - # install targets according to current build type - function(mygui_install_target TARGETNAME SUFFIX) - install(TARGETS ${TARGETNAME} -+ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" CONFIGURATIONS Gentoo "" -+ From: Julian Ospald -Date: Fri Jun 15 21:58:45 UTC 2012 - -use proper destinations and allow Gentoo build type -rename demo targets to avoid confusion - --- CMake/Utils/MyGUIConfigTargets.cmake +++ CMake/Utils/MyGUIConfigTargets.cmake @@ -1,6 +1,8 @@ @@ -72,4 +50,23 @@ rename demo targets to avoid confusion -endfunction(mygui_config_sample) \ No newline at end of file +endfunction(mygui_config_sample) ---- CMake/Confi \ No newline at end of file +--- CMake/ConfigureBuild.cmake ++++ CMake/ConfigureBuild.cmake +@@ -4,6 +4,8 @@ + # also prepare package files for pkg-config and CMake. + ####################################################################### + ++include(GNUInstallDirs) ++ + # should we build static libs? + if (MYGUI_STATIC) + set(MYGUI_LIB_TYPE STATIC) +@@ -47,7 +49,7 @@ + else () + configure_file(${MYGUI_TEMPLATES_DIR}/MYGUI.pc.in ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc @ONLY) + endif () +- install(FILES ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc DESTINATION lib/pkgconfig) ++ install(FILES ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + + # configure additional packages + diff --git a/dev-haskell/atomic-primops/atomic-primops-0.4-r1.ebuild b/dev-haskell/atomic-primops/atomic-primops-0.4-r1.ebuild index 11e1e46a555f..9a2b384c0d16 100644 --- a/dev-haskell/atomic-primops/atomic-primops-0.4-r1.ebuild +++ b/dev-haskell/atomic-primops/atomic-primops-0.4-r1.ebuild @@ -1,7 +1,5 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gento# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-haskell/atomic-primops/atomic-primops-0.4-r1.ebuild,v 1.2 2014/07/25 09:16:30 slyfox Exp $ EAPI=5 @@ -25,4 +23,10 @@ RDEPEND="dev-haskell/bits-atomic:=[profile?] dev-haskell/primitive:=[profile?] >=dev-lang/ghc-7.4.1:=" DEPEND="${RDEPEND} - profile? \ No newline at end of file + profile? ( !=dev-haskell/cabal-1.8" + +src_configure() { + haskell-cabal_src_configure \ + $(cabal_flag debug debug) +} diff --git a/dev-haskell/attoparsec-conduit/attoparsec-conduit-1.0.1.2.ebuild b/dev-haskell/attoparsec-conduit/attoparsec-conduit-1.0.1.2.ebuild index 44ff3fdbb504..84f4339c281c 100644 --- a/dev-haskell/attoparsec-conduit/attoparsec-conduit-1.0.1.2.ebuild +++ b/dev-haskell/attoparsec-conduit/attoparsec-conduit-1.0.1.2.ebuild @@ -24,5 +24,8 @@ RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] =dev-lang/ghc-6.10.4:=" -DEP# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 \ No newline at end of file +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.8 + test? ( >=dev-haskell/hspec-1.3 + dev-haskell/resourcet + )" diff --git a/dev-haskell/basic-prelude/basic-prelude-0.3.5.0.ebuild b/dev-haskell/basic-prelude/basic-prelude-0.3.5.0.ebuild index ffd571ee274c..5701af93fc1b 100644 --- a/dev-haskell/basic-prelude/basic-prelude-0.3.5.0.ebuild +++ b/dev-haskell/basic-prelude/basic-prelude-0.3.5.0.ebuild @@ -11,16 +11,21 @@ inherit haskell-cabal DESCRIPTION="An enhanced core prelude; a common foundation for alternate preludes" HOMEPAGE="https://github.com/snoyberg/basic-prelude" -SRC_URI="mirror://hackage/packages/archive/${PN}/${P# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/basic-prelude/basic-prelude-0.3.5.0.ebuild,v 1.2 2014/07/25 09:16:39 slyfox Exp $ - -EAPI=5 - -# ebuild generated by hackport 0.3.2.9999 - -CABAL_FEATURES="lib profile haddock hoogle hscolour" -inherit haskell-cabal - -DESCRIPTION="An enhanced core prelude; a common foundation for alternate preludes" -HOMEPAGE="https://githu \ No newline at end of file +SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="dev-haskell/hashable:=[profile?] + dev-haskell/lifted-base:=[profile?] + =dev-haskell/readargs-1.2*:=[profile?] + =dev-haskell/system-filepath-0.4*:=[profile?] + dev-haskell/text:=[profile?] + dev-haskell/transformers:=[profile?] + dev-haskell/unordered-containers:=[profile?] + dev-haskell/vector:=[profile?] + >=dev-lang/ghc-6.10.4:=" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.8" diff --git a/dev-haskell/cmdlib/cmdlib-0.3.5-r1.ebuild b/dev-haskell/cmdlib/cmdlib-0.3.5-r1.ebuild index 96cf0df2d0a3..fdff293d7a23 100644 --- a/dev-haskell/cmdlib/cmdlib-0.3.5-r1.ebuild +++ b/dev-haskell/cmdlib/cmdlib-0.3.5-r1.ebuild @@ -19,12 +19,17 @@ KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86" IUSE="" RDEPEND=">=dev-haskell/mtl-2:=[profile?] - >=dev-haskell/# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cmdlib/cmdlib-0.3.5-r1.ebuild,v 1.8 2014/06/28 20:29:26 slyfox Exp $ - -EAPI=5 - -# ebuild generated by hackport 0.3.2.9999 - -CABAL_FEATURES="bin lib pr \ No newline at end of file + >=dev-haskell/transformers-0.2.2:=[profile?] + dev-haskell/split:=[profile?] + dev-haskell/syb:=[profile?] + >=dev-lang/ghc-6.10.4:=" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.6" + +PATCHES=("${FILESDIR}/${PN}-0.3.4-ghc-6.12.patch") + +src_configure() { + haskell-cabal_src_configure \ + --flag=mtl2 \ + --flag=-test +} diff --git a/dev-haskell/connection/Manifest b/dev-haskell/connection/Manifest index 72c5d161aa81..a246389fe250 100644 --- a/dev-haskell/connection/Manifest +++ b/dev-haskell/connection/Manifest @@ -1,5 +1,3 @@ DIST connection-0.1.3.1.tar.gz 6921 SHA256 dc84b6b9d068a0fd843e94e1cb3544a1c7fb9b5e6e29f2113d8f1a4380583bfd SHA512 556dbbc1ec3fc3af5ef9fdfbcf648bdef8a99e13061f515c32c95094c181aae7fc40e2b0aa6d57933d04998cb4aa9b20a2f7083286fa6046a81d4437ce05842f WHIRLPOOL 66221dedd6c97698890f60eadfc8b08dcac96c1f024737ceebca6f96feb19c4a5491c9fdfc8239c9661a030cc63dc8ab0a4e8f93e3de467366dc60078a4ff9b0 DIST connection-0.2.0.tar.gz 7017 SHA256 7782f6d5b96b7ef650b481db302836ee7269429f4f1d291becac6e25f39bdf9d SHA512 2b1e9fe18d4614b7acdd97d05f7b5aeed2f0af17575a45b10de5251b25ec75704c3502182a978a2a57532f5a87a474c5c7102768590218d7ff54460acd4e540f WHIRLPOOL f0a98bf859a529f46577bed3600a23ddfc978b3b7d01149fd6dc19d13bd27c90ffa323416ee3b2fecee40460f30059985dd7540b8a9390cb5ba7fab6c09c4512 DIST connection-0.2.1.tar.gz 7207 SHA256 9e771a5e0784fc68ab876cd04a52bae45ccc73fd7a4a664f9e7c344a1373b2f1 SHA512 6d162cac7934af067a1bdbbcf2b7210fb5820034cc712512f0e986a509b53557552e75fd391a528d37c2a008565ba30a7f039e0fab7a24b5f8555237ec51ee90 WHIRLPOOL 70f066ed774936f58bdcb61edddf8f53e308d4d87203ecb412271179b768dc91dbc4116c0869a0458229e98fb0f6952b42759175939f99a1e639e7032de56882 -DIST connection-0.1.3.1.tar.gz 6921 SHA256 dc84b6b9d068a0fd843e94e1cb3544a1c7fb9b5e6e29f2113d8f1a4380583bfd SHA512 556dbbc1ec3fc3af5ef9fdfbcf648bdef8a99e13061f515c32c95094c181aae7fc40e2b0aa6d57933d04998cb4aa9b20a2f7083286fa6046a81d4437ce05842f WHIRLPOOL 66221dedd6c97698890f60eadfc8b08dcac96c1f024737ceebca6f96feb19c4a5491c9fdfc8239c9661a030cc63dc8ab0a4e8f93e3de467366dc60078a4ff9b0 -DIST connection-0.2.0.tar.gz 7017 SHA256 7782f6d5b96b7ef650b481db302836ee7269429f4f1d291becac6e25f39bdf9d SHA512 2b1e9fe18d4614b7acdd97d05f7b5aeed2f0af17575a45b10de5251b25ec75704c3502182a978a2a57532f5a87a474c5c7102768590218d7ff54460acd4e540f WHIRLPOOL f0a98bf859a529f46577bed3600a23ddfc978b3b7d01149fd6dc19d13bd27c90ffa323416ee3b2fecee40460f30059985d \ No newline at end of file diff --git a/dev-haskell/curl/Manifest b/dev-haskell/curl/Manifest index de63de50acde..c1a8e5becb39 100644 --- a/dev-haskell/curl/Manifest +++ b/dev-haskell/curl/Manifest @@ -1,2 +1 @@ DIST curl-1.3.8.tar.gz 47704 SHA256 9087c936bfcdb865bad3166baa3f12bf37acf076fa76010e3b5f82a1d485446e SHA512 00012fc9b0a80b0d306f688bfb9cfbde8aa72045e6a139c0d8a0cdd7832b5e86ab06c6ea95803665f4bb8ec4e9af3dbc6e405f100985c2cfbaead8527ba7a382 WHIRLPOOL 2e4b8717836fe6c501d60866bb6f555625fc51e001039d08743d92bce082f469ee13591619d2aa0a6f3a2f3a37c35b66dce6798dbc98fcd4419ee474188210c7 -DIST curl-1.3.8.tar.gz 47704 SHA256 9087c936bfcdb865bad3166baa3f12bf37acf076fa76010e3b5f82a1d485446e SHA512 00012fc9b0a80b0d306f688bfb9cfbde8aa72045e6a139c0d8a0cdd7832b5e86ab06c6ea95803665f4bb8ec4e9af3dbc6e405f100985c2cfbaead8527ba7a382 WHIRLPOOL 2e4b8717836fe6c501d60866bb6f555625fc51e001039d08743d92bce082f469ee13591619d2aa0a6f3a2f3a37c35b66dce6798dbc98fcd4419ee474188210c7 diff --git a/dev-haskell/data-default-instances-old-locale/Manifest b/dev-haskell/data-default-instances-old-locale/Manifest index aedc4864c95c..4d719878c7d3 100644 --- a/dev-haskell/data-default-instances-old-locale/Manifest +++ b/dev-haskell/data-default-instances-old-locale/Manifest @@ -1,2 +1 @@ DIST data-default-instances-old-locale-0.0.1.tar.gz 1519 SHA256 60d3b02922958c4908d7bf2b24ddf61511665745f784227d206745784b0c0802 SHA512 bbaf4626c922820dca8cc230585fef80b6f6bd6278d335cc7abd4e5b7a857f0626ca9937ea95066e7655387dfcc684e6fbb0f6f5bc6905e539fbd1176ddd99ec WHIRLPOOL 0ddb2e72d5cb8e1a2617e6e259694398fc35b674d45b2721de4759ab1923c2c8439c0884019ecba61753aa0e8309276ad1e70634b52ddec1e437971826b46bbb -DIST data-default-instances-old-locale-0.0.1.tar.gz 1519 SHA256 60d3b02922958c4908d7bf2b24ddf61511665745f784227d206745784b0c0802 SHA512 bbaf4626c922820dca8cc230585fef80b6f6bd6278d335cc7abd4e5b7a857f0626ca9937ea95066e7655387dfcc684e6fbb0f6f5bc6905e539fbd1176ddd99ec WHIRLPOOL 0ddb2e72d5cb8e1a2617e6e259694398fc35b674d45b2721de4759ab1923c2c8439c0884019ecba61753aa0e8309276ad1e70634b52ddec1e437971826b46bbb diff --git a/dev-haskell/date-cache/Manifest b/dev-haskell/date-cache/Manifest index 9112dc930034..1f21e9c5b3cf 100644 --- a/dev-haskell/date-cache/Manifest +++ b/dev-haskell/date-cache/Manifest @@ -1,2 +1 @@ DIST date-cache-0.3.0.tar.gz 2126 SHA256 abce44f11dd9da4abaca9e33da2c74bd32b42fea027d171c03b6c10cda62303f SHA512 12e048dbd163929acf1b2e51eb81f83382dfbaee00f506a89c5477c0acccbcc29ec24c6d5d85340ea540430c2c1c4c62ad00d1f36196ae8a6fd3f9ae826f39be WHIRLPOOL 1990fad013069eb63817c4cc1c199a7361ec4b62c922e80faf41196dd3c0ac45bafe716ae6581a5cdc81b68c7133d32cdb9fa42a3a9e41def34cf8d7df55b6aa -DIST date-cache-0.3.0.tar.gz 2126 SHA256 abce44f11dd9da4abaca9e33da2c74bd32b42fea027d171c03b6c10cda62303f SHA512 12e048dbd163929acf1b2e51eb81f83382dfbaee00f506a89c5477c0acccbcc29ec24c6d5d85340ea540430c2c1c4c62ad00d1f36196ae8a6fd3f9ae826f39be WHIRLPOOL 1990fad013069eb63817c4cc1c199a7361ec4b62c922e80faf41196dd3c0ac45bafe716ae6581a5cdc81b68c7133d32cdb9fa42a3a9e41def34cf8d7df55b6aa diff --git a/dev-haskell/filesystem-conduit/filesystem-conduit-1.0.0.1.ebuild b/dev-haskell/filesystem-conduit/filesystem-conduit-1.0.0.1.ebuild index 29e40e3289c7..527bda598e5e 100644 --- a/dev-haskell/filesystem-conduit/filesystem-conduit-1.0.0.1.ebuild +++ b/dev-haskell/filesystem-conduit/filesystem-conduit-1.0.0.1.ebuild @@ -9,17 +9,6 @@ EAPI=5 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal -DESCRIPTION="Use system-filepath data t# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/filesystem-conduit/filesystem-conduit-1.0.0.1.ebuild,v 1.2 2014/07/25 09:16:43 slyfox Exp $ - -EAPI=5 - -# ebuild generated by hackport 0.3.2.9999 - -CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" -inherit haskell-cabal - DESCRIPTION="Use system-filepath data types with conduits" HOMEPAGE="http://github.com/snoyberg/conduit" SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" @@ -31,4 +20,16 @@ IUSE="" RDEPEND="=dev-haskell/conduit-1.0*:=[profile?] >=dev-haskell/system-fileio-0.3.3:=[profile?] - =dev-haskell/system-filepath-0.4.3:=[profile?] + =dev-haskell/text-0.11:=[profile?] + >=dev-haskell/transformers-0.2.2:=[profile?] + =dev-lang/ghc-6.10.4:=" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.8 + test? ( dev-haskell/blaze-builder + >=dev-haskell/hspec-1.3 + dev-haskell/quickcheck + )" diff --git a/dev-haskell/glib/glib-0.12.5.0-r1.ebuild b/dev-haskell/glib/glib-0.12.5.0-r1.ebuild index 9746ec97523e..d99036b64fc7 100644 --- a/dev-haskell/glib/glib-0.12.5.0-r1.ebuild +++ b/dev-haskell/glib/glib-0.12.5.0-r1.ebuild @@ -12,16 +12,23 @@ inherit haskell-cabal DESCRIPTION="Binding to the GLIB library for Gtk2Hs" HOMEPAGE="http://projects.haskell.org/gtk2hs/" -SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/$# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/glib/glib-0.12.5.0-r1.ebuild,v 1.2 2014/07/25 09:16:22 slyfox Exp $ - -EAPI=5 - -# ebuild generated by hackport 0.3.5.9999 - -#nocabaldep is for the fancy cabal-detection feature at build-time -CABAL_FEATURES="lib profile haddock hoogle hscolour nocabaldep" -inherit haskell-cabal - -DESCRIPTION="Binding to \ No newline at end of file +SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="+closure_signals" + +RDEPEND=">=dev-haskell/utf8-string-0.2:=[profile?] =dev-lang/ghc-6.10.4:= + dev-libs/glib:2 +" +DEPEND="${RDEPEND} + >=dev-haskell/gtk2hs-buildtools-0.12.5.1-r1:0= + virtual/pkgconfig +" + +src_configure() { + haskell-cabal_src_configure \ + $(cabal_flag closure_signals closure_signals) +} diff --git a/dev-haskell/groupoids/Manifest b/dev-haskell/groupoids/Manifest index 11168d2a80b9..e5c0839903fc 100644 --- a/dev-haskell/groupoids/Manifest +++ b/dev-haskell/groupoids/Manifest @@ -1,3 +1,2 @@ DIST groupoids-3.0.1.1.tar.gz 2935 SHA256 c35c27bdee4f43f86e649356a41635911e8c66c9701da19515a5b178b0979d64 SHA512 ebb8976a43f1486871a5ebcb5c3abef85bf95725e9f75e12396feadd8f9a883432f66bc65da5efe18b2455d8a6386e2b7e262f6c33467b0d22e2667312911e82 WHIRLPOOL 971d45bd16bf7393f84b025e8752548892001c7cb51911c23d89e593ef896d479aa8caa7b560350897b95efb7a594542f77a3b455eca178854706bf2b8e09009 DIST groupoids-4.0.tar.gz 2414 SHA256 6671953fa0970c13ac8014278fcd6227b4c07e1a69d5a23965e2df1418218a22 SHA512 d0aacc582a1d03ab42ce900992e9f9c3cec47da653c5a472934361c5656cbad6b81b18065cf3968ccc6c4d8f239329f7f0213745d2b0d78e2c74ad3d59bec289 WHIRLPOOL ada1bb75fefa84f14c699cddee974c10bb2712af56bb86bd4ee316635e3e68822702521b26b1aefac32b9957d6a117d9da80dd31955de35a197452cc98fb2388 -DIST groupoids-3.0.1.1.tar.gz 2935 SHA256 c35c27bdee4f4 \ No newline at end of file diff --git a/dev-haskell/libxml/Manifest b/dev-haskell/libxml/Manifest index d548d6e6197c..1537d06eeb2a 100644 --- a/dev-haskell/libxml/Manifest +++ b/dev-haskell/libxml/Manifest @@ -1,2 +1 @@ DIST libxml-0.1.1.tar.gz 3959 SHA256 d1e92affb41e7abe1c7b692aa24ae47dbcf3636f2753bb85a3469c370d9afb07 SHA512 59a52200e7c7ab17a60a89e4a3aefdf6356e868be6be53696e5708a4d30863ae879834404ccfecb91b6d4b93a7ce0e147a3cc04bc4d5838c2aa990a290af5c5c WHIRLPOOL 615582108edc8ad82c3d06bc54401689b7d28cb0562b1cdb7167d7d3ec0a888367a9fa8ce668eaca3eb4ec4bc951e7c7d9acfe113001d21dfbb67a4d3dc0cd2a -DIST libxml-0.1.1.tar.gz 3959 SHA256 d1e92affb41e7abe1c7b692aa24ae47dbcf3636f2753bb85a3469c370d9afb07 SHA512 59a52200e7c7ab17a60a89e4a3aefdf6356e868be6be53696e5708a4d30863ae879834404ccfecb91b6d4b93a7ce0e147a3cc04bc4d5838c2aa990a290af5c5c WHIRLPOOL 615582108edc8ad82c3d06bc54401689b7d28cb0562b1cdb7167d7d3ec0a888367a9fa8ce668eaca3eb4ec4bc951e7c7d9acfe113001d21dfbb67a4d3dc0cd2a diff --git a/dev-haskell/pem/pem-0.2.0.ebuild b/dev-haskell/pem/pem-0.2.0.ebuild index 8a53172d3592..223afa5b1ad1 100644 --- a/dev-haskell/pem/pem-0.2.0.ebuild +++ b/dev-haskell/pem/pem-0.2.0.ebuild @@ -28,4 +28,5 @@ DEPEND="${RDEPEND} >=dev-haskell/quickcheck-2.4.0.1 >=dev-haskell/test-framework-0.3.3 dev-haskell/test-framework-hunit - dev-haskell/test-framework-quic# Copyright \ No newline at end of file + dev-haskell/test-framework-quickcheck2 ) +" diff --git a/dev-haskell/persistent-template/persistent-template-1.3.1.1.ebuild b/dev-haskell/persistent-template/persistent-template-1.3.1.1.ebuild index 1efa7a0ef627..0e6dbd2a8fae 100644 --- a/dev-haskell/persistent-template/persistent-template-1.3.1.1.ebuild +++ b/dev-haskell/persistent-template/persistent-template-1.3.1.1.ebuild @@ -23,8 +23,12 @@ RDEPEND="dev-haskell/aeson:=[profile?] dev-haskell/monad-logger:=[profile?] >=dev-haskell/persistent-1.3:=[profile?] =dev-haskell/text-0.5:=[profile?] - >=dev-has# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/persistent-template/persistent-template-1.3.1.1.ebuild,v 1.2 2014/07/25 09:16:23 slyfox Exp $ - -EAPI=5 \ No newline at end of file + >=dev-haskell/transformers-0.2:=[profile?] =dev-lang/ghc-6.10.4:= +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.8 + test? ( >=dev-haskell/hspec-1.3 + dev-haskell/quickcheck ) +" diff --git a/dev-haskell/profunctor-extras/profunctor-extras-3.3.3.1.ebuild b/dev-haskell/profunctor-extras/profunctor-extras-3.3.3.1.ebuild index 003d34af29fa..2c2fd0a409ce 100644 --- a/dev-haskell/profunctor-extras/profunctor-extras-3.3.3.1.ebuild +++ b/dev-haskell/profunctor-extras/profunctor-extras-3.3.3.1.ebuild @@ -6,14 +6,6 @@ EAPI=5 # ebuild generated by hackport 0.3.3.9999 -CABAL_FEATURES="lib profile haddock hoogle hscol# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/profunctor-extras/profunctor-extras-3.3.3.1.ebuild,v 1.1 2013/08/26 10:35:25 qnikst Exp $ - -EAPI=5 - -# ebuild generated by hackport 0.3.3.9999 - CABAL_FEATURES="lib profile haddock hoogle hscolour" inherit haskell-cabal @@ -26,4 +18,13 @@ SLOT="0/${PV}" KEYWORDS="~amd64 ~x86" IUSE="" -RDEPEND=">=dev-haskell/comonad-3:=[profile \ No newline at end of file +RDEPEND=">=dev-haskell/comonad-3:=[profile?] + >=dev-haskell/profunctors-3.2:=[profile?] + >=dev-haskell/semigroupoid-extras-3:=[profile?] + >=dev-haskell/semigroupoids-3:=[profile?] + >=dev-haskell/tagged-0.4.4:=[profile?] + >=dev-haskell/transformers-0.2:=[profile?] + =dev-lang/ghc-6.10.4:=" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.6" diff --git a/dev-haskell/project-template/Manifest b/dev-haskell/project-template/Manifest index 192c11ecd1ff..d4bac77ac31f 100644 --- a/dev-haskell/project-template/Manifest +++ b/dev-haskell/project-template/Manifest @@ -1,3 +1,2 @@ DIST project-template-0.1.3.tar.gz 3930 SHA256 b5b6251ce85f1e2bcd3a99c7b85257e0a793eda61e72adbd05eda8a447244cdb SHA512 e39aad03bfee9b78ac0a0a59388cf0001dab941986ad284561a3ffbb6ce6aa0b8fc6ee20a676bb0bf4c1b5d452644e8dae4f10d5fe7070e074a5140fc6d292a0 WHIRLPOOL fefdd2bf92556ce327ba33071f63152dc02434a98ce4b36af818ea9984c20835fa9a3e047a600e7c60bb52c4da56e1aee7d320416060625ff3c37c62edd804ca DIST project-template-0.1.4.1.tar.gz 4483 SHA256 8b16b378f3852d9ba8f2531a8c97515a2a2bc6e762c1437c5b9cb53f89425def SHA512 bab39792688fec9f3c1d279dd5d24d75fed443d39da2126c05acd1ee98b736fbed87f7a0b342f0a4c1a3f55db1fbb2cd5f4be7ed646ea0202fe590705e342100 WHIRLPOOL cb8c13c0ebe7932e51ef02d1974e0e9b8ed4a2b4fc218c05becd4ee6eda5169a59bc6a29b93cbc7dbaca48422ee14a7700fdcf93f5be53291fea5ea647673467 -DIST project-template-0.1.3.tar.gz 3930 SHA256 b5b6251ce85f1e2bcd3a99c7b85257e0a793eda61e72adbd05eda8a447244cdb SHA512 e39aad03bfee9b78ac0a0a59388cf0001dab941986ad284561a3ffbb6ce6aa0b8fc6ee20a676bb0bf4c1b5d452644e8dae4f10d5fe7070e074a5140fc6d292a0 WHIRLPOOL fefdd2bf92556ce327ba33071f63152dc02434a98ce4b36af818ea9 \ No newline at end of file diff --git a/dev-haskell/quickcheck-instances/Manifest b/dev-haskell/quickcheck-instances/Manifest index 76b81e415373..c13652a8393f 100644 --- a/dev-haskell/quickcheck-instances/Manifest +++ b/dev-haskell/quickcheck-instances/Manifest @@ -1,2 +1 @@ DIST quickcheck-instances-0.3.8.tar.gz 5725 SHA256 6fbe5a3ec9358b3a0a159528b568af6c0541320caabfa754f80a86f8cf506204 SHA512 c8ec49fdc4cc34ea1538c0e49945ede7b6e65897b80c4b9bbc28b3da420458e2731259344e3df02ab0d1afb757a0416dd8697c165af56bf899388491117b6287 WHIRLPOOL 5888baf24fbd40886150ae40877bd179c4eb79b592e689f3c29d9eac3a9cf77c7aaf47bc1eb4a3a5dd79b65c93507999510de3c436cd186e18dd119308f7ac59 -DIST quickcheck-instances-0.3.8.tar.gz 5725 SHA256 6fbe5a3ec9358b3a0a159528b568af6c0541320caabfa754f80a86f8cf506204 SHA512 c8ec49fdc4cc34ea1538c0e49945ede7b6e65897b80c4b9bbc28b3da420458e2731259344e3df02ab0d1afb757a0416dd8697c165af56bf899388491117b6287 WHIRLPOOL 5888baf24fbd40886150ae40877bd179c4eb79b \ No newline at end of file diff --git a/dev-haskell/shakespeare/shakespeare-2.0.1.ebuild b/dev-haskell/shakespeare/shakespeare-2.0.1.ebuild index aa05360151de..d946a87dcb51 100644 --- a/dev-haskell/shakespeare/shakespeare-2.0.1.ebuild +++ b/dev-haskell/shakespeare/shakespeare-2.0.1.ebuild @@ -9,17 +9,6 @@ EAPI=5 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal -DESCRIPTION="A toolkit for making compile-time interpolated tem# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/shakespeare/shakespeare-2.0.1.ebuild,v 1.1 2014/07/02 13:33:17 gienah Exp $ - -EAPI=5 - -# ebuild generated by hackport 0.4.2.9999 - -CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" -inherit haskell-cabal - DESCRIPTION="A toolkit for making compile-time interpolated templates" HOMEPAGE="http://www.yesodweb.com/book/shakespearean-templates" SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" @@ -34,4 +23,21 @@ RDEPEND="dev-haskell/aeson:=[profile?] dev-haskell/blaze-markup:=[profile?] dev-haskell/exceptions:=[profile?] >=dev-haskell/parsec-2:=[profile?] =dev-haskell/system-fileio-0. \ No newline at end of file + >=dev-haskell/system-fileio-0.3:=[profile?] + >=dev-haskell/system-filepath-0.4:=[profile?] + >=dev-haskell/text-0.7:=[profile?] + dev-haskell/transformers:=[profile?] + >=dev-lang/ghc-7.4.1:= +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.8 + test? ( >=dev-haskell/hspec-1.3 + dev-haskell/hunit ) +" + +src_configure() { + haskell-cabal_src_configure \ + $(cabal_flag test_coffee test_coffee) \ + $(cabal_flag test_export test_export) \ + $(cabal_flag test_roy test_roy) +} diff --git a/dev-haskell/shelly/Manifest b/dev-haskell/shelly/Manifest index 8e07ecaabb7b..ee30113ad0f5 100644 --- a/dev-haskell/shelly/Manifest +++ b/dev-haskell/shelly/Manifest @@ -1,2 +1 @@ DIST shelly-1.5.4.1.tar.gz 27926 SHA256 62dd57cfa5ffb5280cbb9c77ec3307bcc8b622f7be65d58f6c4dbd36b7916840 SHA512 8c8519a8a1ac9f02e51211ce8c70aa60590cb6edb5a8de376cf3da2deb8e429ff7e4d31321971660b71f0778a7037fde4f9506efd028de6d8581fbc6b5afe310 WHIRLPOOL 04b6b128dff61e2c3ca8986509bab69a519bdc6a7e1f598c446460fd0922ba26fb5860bd28dcc23e2c69d178d22db2ac273f307f7d7786e4bedefb6e159b1466 -DIST shelly-1.5.4.1.tar.gz 27926 SHA256 62dd57cfa5ffb5280cbb9c77ec3307bcc8b622f7be65d58f6c4dbd36b7916840 SHA512 8c8519a8a1ac9f02e51211ce8c70aa60590cb6edb5a8de376cf3da2deb8e42 \ No newline at end of file diff --git a/dev-haskell/simple-sendfile/simple-sendfile-0.2.15.ebuild b/dev-haskell/simple-sendfile/simple-sendfile-0.2.15.ebuild index 4d18c0e6a95e..c6331d8bb590 100644 --- a/dev-haskell/simple-sendfile/simple-sendfile-0.2.15.ebuild +++ b/dev-haskell/simple-sendfile/simple-sendfile-0.2.15.ebuild @@ -6,15 +6,6 @@ EAPI=5 # ebuild generated by hackport 0.4.2.9999 -CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" -inherit haskell-cabal# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/simple-sendfile/simple-sendfile-0.2.15.ebuild,v 1.1 2014/07/02 13:39:26 gienah Exp $ - -EAPI=5 - -# ebuild generated by hackport 0.4.2.9999 - CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal @@ -27,4 +18,22 @@ SLOT="0/${PV}" KEYWORDS="~amd64 ~x86" IUSE="+allow-bsd" -RESTRICT=test # openBinaryFile: does not exist (No such file or director \ No newline at end of file +RESTRICT=test # openBinaryFile: does not exist (No such file or directory) + +RDEPEND="dev-haskell/network:=[profile?] + dev-haskell/resourcet:=[profile?] + >=dev-lang/ghc-7.4.1:= +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.10 + test? ( dev-haskell/conduit + dev-haskell/conduit-extra + >=dev-haskell/hspec-1.3 + dev-haskell/hunit + dev-haskell/network-conduit ) +" + +src_configure() { + haskell-cabal_src_configure \ + $(cabal_flag allow-bsd allow-bsd) +} diff --git a/dev-haskell/skein/skein-1.0.3.ebuild b/dev-haskell/skein/skein-1.0.3.ebuild index de6b1cdbc01f..b32b2c847577 100644 --- a/dev-haskell/skein/skein-1.0.3.ebuild +++ b/dev-haskell/skein/skein-1.0.3.ebuild @@ -9,23 +9,28 @@ EAPI=5 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal -DESCRIPTION="Skein, a family of cryptographic hash functions. Includes Skein-MAC as well" -HOMEPAGE="https://github.com/meteficha/skein" -SRC_URI="mirror://hackage/# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/skein/skein-1.0.3.ebuild,v 1.2 2014/07/25 09:16:17 slyfox Exp $ - -EAPI=5 - -# ebuild generated by hackport 0.3.2.9999 - -CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" -inherit haskell-cabal - DESCRIPTION="Skein, a family of cryptographic hash functions. Includes Skein-MAC as well" HOMEPAGE="https://github.com/meteficha/skein" SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -K \ No newline at end of file +KEYWORDS="~amd64 ~x86" +IUSE="big-endian force-endianness" + +RDEPEND="=dev-haskell/cereal-0.3*:=[profile?] + >=dev-haskell/crypto-api-0.6:=[profile?] + =dev-haskell/tagged-0.2:=[profile?] + =dev-lang/ghc-6.10.4:=" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.8 + test? ( >=dev-haskell/hspec-1.3 + )" + +src_configure() { + haskell-cabal_src_configure \ + $(cabal_flag big-endian big-endian) \ + $(cabal_flag force-endianness force-endianness) +} diff --git a/dev-haskell/streaming-commons/Manifest b/dev-haskell/streaming-commons/Manifest index e3c330f1e493..088a61d12bb5 100644 --- a/dev-haskell/streaming-commons/Manifest +++ b/dev-haskell/streaming-commons/Manifest @@ -1,2 +1 @@ DIST streaming-commons-0.1.3.tar.gz 75947 SHA256 0366bdbf4da59cf823f34a31cce93992771fc9fc6096deeb7aabec8a6902637f SHA512 bc08e52564cdc07163113105c61ce03828ad10b40ff10fcc12cc7181054cff7853bbb2e1aef543bbd8972ea2aad9ff293fddb238251d13114e2287f39682bf2b WHIRLPOOL 8d91fca02611b46a952b98456b154373154c84b2a18bb17512abf0368bb10ad36d653dbc5a46c0d203d12cb26d2f3cfb4647fea1e94a83164ff4111ade39b22b -DIST streaming-commons-0.1.3.tar.gz 75947 SHA256 0366bdbf4da59cf823f34a31cce93992771fc9fc6096deeb7aabec8a6902637f SHA512 bc08e52564cdc07163113105c61ce03828ad10b40ff10fcc12cc7181054cff7853bbb2e1aef543bbd8972ea2aad9ff293fddb238251d13114e2287f39682bf2b WHIRLPOOL 8d91fca02611b46a952b98456b154373154c84b2a18bb17512abf0368bb10ad36d653dbc5a46c0d203d12cb26d2f3cfb4647fea1e94a83164ff4111ade39b22b diff --git a/dev-haskell/tagstream-conduit/tagstream-conduit-0.5.4.1.ebuild b/dev-haskell/tagstream-conduit/tagstream-conduit-0.5.4.1.ebuild index d185d16d7b04..208f34924179 100644 --- a/dev-haskell/tagstream-conduit/tagstream-conduit-0.5.4.1.ebuild +++ b/dev-haskell/tagstream-conduit/tagstream-conduit-0.5.4.1.ebuild @@ -4,12 +4,6 @@ EAPI=5 -# ebuild generated # Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/tagstream-conduit/tagstream-conduit-0.5.4.1.ebuild,v 1.1 2013/12/11 06:30:32 gienah Exp $ - -EAPI=5 - # ebuild generated by hackport 0.3.4.9999 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" @@ -29,4 +23,14 @@ RDEPEND="dev-haskell/attoparsec:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/blaze-builder-conduit-0.5:=[profile?] =dev-haskell/conduit-0.5:=[pr \ No newline at end of file + >=dev-haskell/conduit-0.5:=[profile?] =dev-haskell/transformers-0.2:=[profile?] + >=dev-lang/ghc-6.10.4:= +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.8 + test? ( >=dev-haskell/hspec-1.3 + dev-haskell/hunit + dev-haskell/quickcheck ) +" diff --git a/dev-haskell/tasty-ant-xml/Manifest b/dev-haskell/tasty-ant-xml/Manifest index ab8d22a09d05..8c42fa154c97 100644 --- a/dev-haskell/tasty-ant-xml/Manifest +++ b/dev-haskell/tasty-ant-xml/Manifest @@ -1,2 +1 @@ DIST tasty-ant-xml-1.0.0.8.tar.gz 3761 SHA256 75fa0d386eefa41c6f06632912009e5bc55aa6b618b6c90d64c3dc6ed5e8124e SHA512 280acbd679c911932ee0e501db7621eaf777c70ddfcd42e80ddf4ed39d7c9f5bf917fa081ac47e55a4e2d5230984f553f7daf8a6651bab9b7e3ece83315a5006 WHIRLPOOL 02a83561107c82600b35d75813590b758554c8531eb58451665b24149c2a906a30464bcbb1a77c056e12d2b43c71904dd3cf080b6e7db78a38b42bb35cc72f97 -DIST tasty-ant-xml-1.0.0.8.tar.gz 3761 SHA256 75fa0d386eefa41c6f06632912009e5bc55aa6b618b6c90d64c3dc6ed5e8124e SHA512 280acbd679c911932ee0e501db7621eaf777c70ddfcd42e80ddf4ed39d7c9f5bf917fa081ac47e55a4e2d \ No newline at end of file diff --git a/dev-haskell/tasty-golden/Manifest b/dev-haskell/tasty-golden/Manifest index b748875f0ea1..5eaabb85e93f 100644 --- a/dev-haskell/tasty-golden/Manifest +++ b/dev-haskell/tasty-golden/Manifest @@ -1,2 +1 @@ DIST tasty-golden-2.2.2.3.tar.gz 6925 SHA256 5ca0186aae5b09bcb60dc393b57674cae442c104a923b8fb280ff485498df06e SHA512 34cc40a217d8bb34a2263a1eace31f49590698968aacc795e21dfed24a666388bf9536eb5a360e7b4e1a2228324470e9193e27f1cea0863e5ac13ba5ae7e673f WHIRLPOOL ebe9c9b6fc2f4753c0f64fda24a85fd5c3dbba76d5fdfe3caba7b18ea51f7f0cf064f50cb950afeb623468fefa350ea431ebc15a8808036cbe7fde22c9994615 -DIST tasty-golden-2.2.2.3.tar.gz 6925 SHA256 5ca0186aae5b09bcb60dc393b57674cae442c104a923b8fb280ff485498df06e SHA512 34cc40a217d8bb34a2263a1eace31f49590698968aacc795e21dfed24a666388bf9536eb5a360e7b4e1a2228324470e9193e27f1cea0863e5ac13ba5ae7e673f WHIRLPOOL \ No newline at end of file diff --git a/dev-haskell/terminfo/files/terminfo-0.3.2.5-tinfo.patch b/dev-haskell/terminfo/files/terminfo-0.3.2.5-tinfo.patch index ee55ad2e5fdc..ca10da2e03ae 100644 --- a/dev-haskell/terminfo/files/terminfo-0.3.2.5-tinfo.patch +++ b/dev-haskell/terminfo/files/terminfo-0.3.2.5-tinfo.patch @@ -1,12 +1,5 @@ http://bugs.gentoo.org/454216 -Mon Jan 7 16:34:47 FET 2013 Judah Jacobson - * Search for terminfo in libtinfo; fixes GHC #7281. - - Patch from Paul Johnson. -diff -rN -u old-terminfo/configure.ac new-terminfo/configure.ac ---- old-terminfo/configure.ac 2013-02http://bugs.gentoo.org/454216 - Mon Jan 7 16:34:47 FET 2013 Judah Jacobson * Search for terminfo in libtinfo; fixes GHC #7281. @@ -24,4 +17,9 @@ diff -rN -u old-terminfo/configure.ac new-terminfo/configure.ac - HaveLibCurses=NO; LibCurses=not-installed)])]) +AC_CHECK_LIB(tinfo, setupterm, HaveLibCurses=YES; LibCurses=tinfo, + [AC_CHECK_LIB(ncursesw, setupterm, HaveLibCurses=YES; LibCurses=ncursesw, -+ [AC_CHECK_LIB(ncurses, setupterm, HaveLibCur \ No newline at end of file ++ [AC_CHECK_LIB(ncurses, setupterm, HaveLibCurses=YES; LibCurses=ncurses, ++ [AC_CHECK_LIB(curses, setupterm, HaveLibCurses=YES; LibCurses=curses, ++ HaveLibCurses=NO; LibCurses=not-installed)])])]) + + if test "x$HaveLibCurses" = "xNO" ; then + AC_MSG_FAILURE([curses library not found, so this package cannot be built]) diff --git a/dev-haskell/test-framework-th/Manifest b/dev-haskell/test-framework-th/Manifest index e6011c6724a9..b368dbb87366 100644 --- a/dev-haskell/test-framework-th/Manifest +++ b/dev-haskell/test-framework-th/Manifest @@ -1,2 +1 @@ DIST test-framework-th-0.2.4.tar.gz 2977 SHA256 8b780d9e3edd8d91e24f72d9fa1f80420e52959428ad7c22d0694901a43f9c8a SHA512 0e8b6898eb7bf481bafb0c9ff9caa615dbf768e538e26b15ab899c5c9a1ad6bd6ed76ef93cf9a823706046d41f49fbb0cbe660bf846e59a608a0e5d21e89686b WHIRLPOOL 37718161ec8be33a7dda311beb4de15eeecec2712bdfd16c848830149d4aec5df47f0d402d9967b0f4552eb1602277efe2a6d7f7d2279063dbd9986501155dc5 -DIST test-framework-th-0.2.4.tar.gz 2977 SHA256 8b780d9e3edd8d91e24f72d9fa1f80420e52959428ad7c22d0694901a43f9c8a SHA512 0e8b6898eb7bf481bafb0c9ff9caa615dbf768e538e26b15ab899c5c9a1ad6bd6ed76ef93cf9a823706046d41f49fbb0cbe660bf846e59a608a0e5d21e89686b WHIRLPOOL 37718161ec8be33a7dda311beb4de15eeecec2712bdfd16c848830149d4aec5df47f0d402d9967b0f4552eb1602277efe2a6d7f7d2279063dbd9986501155dc5 diff --git a/dev-haskell/test-framework/test-framework-0.8.ebuild b/dev-haskell/test-framework/test-framework-0.8.ebuild index 38cec4670171..6f4183a196a7 100644 --- a/dev-haskell/test-framework/test-framework-0.8.ebuild +++ b/dev-haskell/test-framework/test-framework-0.8.ebuild @@ -9,17 +9,6 @@ EAPI=5 CABAL_FEATURES="bin lib profile haddock hoogle hscolour" inherit haskell-cabal -DESCR# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/test-framework/test-framework-0.8.ebuild,v 1.8 2013/08/03 07:30:21 ago Exp $ - -EAPI=5 - -# ebuild generated by hackport 0.3.1.9999 - -CABAL_FEATURES="bin lib profile haddock hoogle hscolour" -inherit haskell-cabal - DESCRIPTION="Framework for running and organising tests, with HUnit and QuickCheck support" HOMEPAGE="http://batterseapower.github.com/test-framework/" SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" @@ -29,4 +18,13 @@ SLOT="0/${PV}" KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd" IUSE="" -RDEPEND=">=dev-haskell/ansi-te \ No newline at end of file +RDEPEND=">=dev-haskell/ansi-terminal-0.4.0:=[profile?] + >=dev-haskell/ansi-wl-pprint-0.5.1:=[profile?] + >=dev-haskell/extensible-exceptions-0.1.1:=[profile?] + >=dev-haskell/hostname-1.0:=[profile?] + >=dev-haskell/random-1.0:=[profile?] + >=dev-haskell/regex-posix-0.72:=[profile?] + >=dev-haskell/xml-1.3.5:=[profile?] + >=dev-lang/ghc-6.12.1:=" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.2.3" diff --git a/dev-haskell/text/metadata.xml b/dev-haskell/text/metadata.xml index c6f6f5f49770..e89fb2b386a9 100644 --- a/dev-haskell/text/metadata.xml +++ b/dev-haskell/text/metadata.xml @@ -17,18 +17,21 @@ provides a range of functions for converting 'Text' values to and from 'ByteStrings', using several standard encodings. - Efficient locale-sensitive - - - haskell - + Efficient locale-sensitive support for text IO is also supported. - An efficient packed, immutable Unicode text type (both strict and - lazy), with a powerful loop fusion optimization framework. + These modules are intended to be imported qualified, to avoid name + clashes with Prelude functions, e.g. - The 'Text' type represents Unicode character strings, in a time and - space-efficient manner. This package provides text processing - capabilities that are optimized for performance critical use, both - in terms of large data quantities and high speed. + > import qualified Data.Text as T + + To use an extended and very rich family of functions for working + with Unicode text (including normalization, regular expressions, + non-standard encodings, text breaking, and locales), see + the @text-icu@ package: + <http://hackage.haskell.org/package/text-icu> - The 'Text' type provides c \ No newline at end of file + + + operate in developer mode + + diff --git a/dev-haskell/text/text-1.1.0.1.ebuild b/dev-haskell/text/text-1.1.0.1.ebuild index a8c87dd5c9d4..f3fe5cd69e3a 100644 --- a/dev-haskell/text/text-1.1.0.1.ebuild +++ b/dev-haskell/text/text-1.1.0.1.ebuild @@ -27,6 +27,11 @@ DEPEND="${RDEPEND} >=dev-haskell/quickcheck-2.4 dev-haskell/random >=dev-haskell/test-framework-0.4 - >=dev# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/text/text-1.1.0.1.e \ No newline at end of file + >=dev-haskell/test-framework-hunit-0.2 + >=dev-haskell/test-framework-quickcheck2-0.2 ) +" + +src_configure() { + haskell-cabal_src_configure \ + $(cabal_flag developer developer) +} diff --git a/dev-haskell/timezone-olson/timezone-olson-0.1.2-r2.ebuild b/dev-haskell/timezone-olson/timezone-olson-0.1.2-r2.ebuild index f5568dd6d0d2..986a605794ed 100644 --- a/dev-haskell/timezone-olson/timezone-olson-0.1.2-r2.ebuild +++ b/dev-haskell/timezone-olson/timezone-olson-0.1.2-r2.ebuild @@ -26,5 +26,9 @@ RDEPEND=">=dev-haskell/binary-0.4.1:=[profile?] =dev-lang/ghc-6.10.4:=" DEPEND="${RDEPEND} - >=dev-haskel# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License \ No newline at end of file + >=dev-haskell/cabal-1.2" + +src_prepare() { + cabal_chdeps \ + 'binary >= 0.4.1 && < 0.6' 'binary >= 0.4.1 && < 0.8' +} diff --git a/dev-haskell/tls/tls-1.2.7.ebuild b/dev-haskell/tls/tls-1.2.7.ebuild index a8e3debf3b86..cfd30f2ebde7 100644 --- a/dev-haskell/tls/tls-1.2.7.ebuild +++ b/dev-haskell/tls/tls-1.2.7.ebuild @@ -30,24 +30,25 @@ RDEPEND="dev-haskell/asn1-encoding:=[profile?] >=dev-haskell/crypto-random-0.0:=[profile?] =dev-haskell/cryptohash-0.6:=[profile?] dev-haskell/data-default-class:=[profile?] - dev-haskell/mtl:=[profi# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/tls/tls-1.2.7.ebuild,v 1.1 2014/05/10 11:45:51 slyfox Exp $ - -EAPI=5 - -# ebuild generated by hackport 0.4.9999 - -CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" -inherit haskell-cabal - -DESCRIPTION="TLS/SSL protocol native implementation (Server and Client)" -HOMEPAGE="http://github.com/vincenthz/hs-tls" -SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="+compat" - -RDEPEND="dev-h \ No newline at end of file + dev-haskell/mtl:=[profile?] + dev-haskell/network:=[profile?] + >=dev-haskell/x509-1.4.3:=[profile?] =dev-haskell/x509-store-1.4.4:=[profile?] + >=dev-haskell/x509-validation-1.5.0:=[profile?] =dev-lang/ghc-7.4.1:= +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.8 + test? ( >=dev-haskell/cprng-aes-0.5 + dev-haskell/crypto-random + >=dev-haskell/quickcheck-2 + dev-haskell/test-framework + dev-haskell/test-framework-quickcheck2 + dev-haskell/x509 + dev-haskell/x509-validation ) +" + +src_configure() { + haskell-cabal_src_configure \ + $(cabal_flag compat compat) +} diff --git a/dev-haskell/uniplate/metadata.xml b/dev-haskell/uniplate/metadata.xml index a747d8ddf619..97b35877856d 100644 --- a/dev-haskell/uniplate/metadata.xml +++ b/dev-haskell/uniplate/metadata.xml @@ -11,19 +11,6 @@ To get started with Uniplate you should import one of the three following modules: - * "Data.Generics.Uniplate.Data" - to quickly start writing gene - - - haskell - - Uniplate is library for writing simple and concise generic operations. - Uniplate has similar goals to the original Scrap Your Boilerplate work, - but is substantially simpler and faster. The Uniplate manual is available at - <http://community.haskell.org/~ndm/darcs/uniplate/uniplate.htm>. - - To get started with Uniplate you should import one of the three following - modules: - * "Data.Generics.Uniplate.Data" - to quickly start writing generic functions. Most users should start by importing this module. @@ -31,4 +18,18 @@ with substantially higher performance (around 5 times), but requires writing instance declarations. - * "Data.Generics.Uniplate.Operations" - defini \ No newline at end of file + * "Data.Generics.Uniplate.Operations" - definitions of all the operations defined + by Uniplate. Both the above two modules re-export this module. + + In addition, some users may want to make use of the following modules: + + * "Data.Generics.Uniplate.Zipper" - a zipper built on top of Uniplate instances. + + * "Data.Generics.SYB" - users transitioning from the Scrap Your Boilerplate library. + + * "Data.Generics.Compos" - users transitioning from the Compos library. + + * "Data.Generics.Uniplate.DataOnly" - users making use of both @Data@ and @Direct@ + to avoid getting instance conflicts. + + diff --git a/dev-haskell/unordered-containers/unordered-containers-0.2.3.2.ebuild b/dev-haskell/unordered-containers/unordered-containers-0.2.3.2.ebuild index d7226827e085..28b9516fe0ef 100644 --- a/dev-haskell/unordered-containers/unordered-containers-0.2.3.2.ebuild +++ b/dev-haskell/unordered-containers/unordered-containers-0.2.3.2.ebuild @@ -26,6 +26,13 @@ DEPEND="${RDEPEND} >=dev-haskell/cabal-1.8 test? ( dev-haskell/chasingbottoms dev-haskell/hunit - >=dev-haskell/quickcheck-# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/unordered-containers/unordered-containers-0.2.3.2.ebuild,v \ No newline at end of file + >=dev-haskell/quickcheck-2.4.0.1 + >=dev-haskell/test-framework-0.3.3 + dev-haskell/test-framework-hunit + >=dev-haskell/test-framework-quickcheck2-0.2.9 ) +" + +src_configure() { + haskell-cabal_src_configure \ + $(cabal_flag debug debug) +} diff --git a/dev-haskell/url/Manifest b/dev-haskell/url/Manifest index 197d0b669a4d..6e0cf75895d7 100644 --- a/dev-haskell/url/Manifest +++ b/dev-haskell/url/Manifest @@ -1,2 +1 @@ DIST url-2.1.3.tar.gz 4180 SHA256 5af27e3f8c0a27e52d0dcb98ef06a0fdd01efe8bb21242c29432e1bc380a4f61 SHA512 53ee2aabc877c91d06c7e029ff807057f88bb4ce712ad02d47655d43869ad83af9032eea85d0ecddf3cad19839827bb723c9bf0a17b580ee7018f4b08c691cd8 WHIRLPOOL 5c75d2f4cbcb00370f0e6e45a0b861a24cfa86422548e90bca56739ad2ae03a303909e2a7a73ddb22bc4390e8713df6f964a58959ba813da3272936996b540a4 -DIST url-2.1.3.tar.gz 4180 SHA256 5af27e3f8c0a27e52d0dcb98ef06a0fdd01efe8bb21242c29432e1bc380a4f61 SHA512 53ee2aabc877c91d06c7e029ff807057f88bb4ce712ad02d47655d43869ad83af9032eea85d0ecddf3cad19839827bb723c9bf0a17b580ee7018f4b08c691cd8 WHIRLPOOL 5c75d2f4cbcb00370f0e6e45a0b861a24cfa86422548e90bca56739ad2ae03a303909e2a7a73ddb22bc4390e8713df6f964a58959ba813da3272936996b540a4 diff --git a/dev-haskell/uuid/uuid-1.2.14.ebuild b/dev-haskell/uuid/uuid-1.2.14.ebuild index 47841916f510..37247e12752b 100644 --- a/dev-haskell/uuid/uuid-1.2.14.ebuild +++ b/dev-haskell/uuid/uuid-1.2.14.ebuild @@ -33,4 +33,5 @@ DEPEND="${RDEPEND} >=dev-haskell/quickcheck-2.4 =dev-haskell/test-framework-0.8 =dev-haskell/test-framework-hunit-0.3 =dev-haskell/test-framework-quickcheck2-0.3 =dev-haskell/test-framework-quickcheck2-0.3 = 0.13.1' 'wxcore >= 0.13.1 && < 0.90' \ + 'wxcore >= 0.12.1.6' 'wxcore >= 0.12.1.6 && < 0.90' +} diff --git a/dev-haskell/xml-conduit/xml-conduit-1.1.0.9.ebuild b/dev-haskell/xml-conduit/xml-conduit-1.1.0.9.ebuild index 364f658060f9..ada877ff20ef 100644 --- a/dev-haskell/xml-conduit/xml-conduit-1.1.0.9.ebuild +++ b/dev-haskell/xml-conduit/xml-conduit-1.1.0.9.ebuild @@ -27,17 +27,16 @@ RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/conduit-1.0:=[profile?] =dev-haskell/failure-0.1:=[profile?] =dev-haskell/monad-control-0.3# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/xml-conduit/xml-conduit-1.1.0.9.ebuild,v 1.2 2014/07/25 09:16:13 slyfox Exp $ - -EAPI=5 - -# ebuild generated by hackport 0.3.5.9999 - -CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" -inherit haskell-cabal - -DESCRIPTION="Pure-Haskell utilities for dealing with XML with the conduit package" -HOMEPAGE="http://github.com/snoyberg/xml" -SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar \ No newline at end of file + >=dev-haskell/monad-control-0.3:=[profile?] =dev-haskell/resourcet-0.3:=[profile?] =dev-haskell/system-filepath-0.4:=[profile?] =dev-haskell/text-0.7:=[profile?] + >=dev-haskell/transformers-0.2:=[profile?] =dev-haskell/xml-types-0.3.4:=[profile?] =dev-lang/ghc-7.4.1:= +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.8 + test? ( >=dev-haskell/hspec-1.3 + dev-haskell/hunit ) +" diff --git a/dev-haskell/yesod-auth/yesod-auth-1.1.7.ebuild b/dev-haskell/yesod-auth/yesod-auth-1.1.7.ebuild index 7686beea6e02..60e4d7f4d136 100644 --- a/dev-haskell/yesod-auth/yesod-auth-1.1.7.ebuild +++ b/dev-haskell/yesod-auth/yesod-auth-1.1.7.ebuild @@ -18,34 +18,6 @@ SLOT="0/${PV}" KEYWORDS="~amd64 ~x86" IUSE="" -RDEPEND=">=dev-haskell/aeson-0.5:=[profile?] - >=dev-haskell/authenticate-1.3:=[profile?] - >=dev-haskell/blaze-html-0.5:=[profile?] - >=dev-haskell/blaze-markup-0.5.1:=[profile?] - dev-haskell/file-embed:=[profile?] - =dev-haskell/hamlet-1.1*:=[profile?] - >=dev-haskell/http-conduit-1.5:=[profile?] - dev-haskell/http-types:=[profile?] - >=dev-haskell/lifte# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/yesod-auth/yesod-auth-1.1.7.ebuild,v 1.2 2014/07/25 09:16:29 slyfox Exp $ - -EAPI=5 - -# ebuild generated by hackport 0.3.2.9999 - -CABAL_FEATURES="lib profile haddock hoogle hscolour" -inherit haskell-cabal - -DESCRIPTION="Authentication for Yesod" -HOMEPAGE="http://www.yesodweb.com/" -SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" - RDEPEND=">=dev-haskell/aeson-0.5:=[profile?] >=dev-haskell/authenticate-1.3:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] @@ -57,4 +29,26 @@ RDEPEND=">=dev-haskell/aeson-0.5:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/mime-mail-0.3:=[profile?] dev-haskell/network:=[profile?] - >=dev-haskell/persistent-1.0:=[profile? \ No newline at end of file + >=dev-haskell/persistent-1.0:=[profile?] + =dev-haskell/persistent-template-1.0:=[profile?] + =dev-haskell/puremd5-2.0:=[profile?] + >=dev-haskell/pwstore-fast-2.2:=[profile?] + >=dev-haskell/random-1.0.0.2:=[profile?] + >=dev-haskell/sha-1.4.1.3:=[profile?] + =dev-haskell/shakespeare-css-1.0*:=[profile?] + >=dev-haskell/shakespeare-js-1.0.2:=[profile?] + =dev-haskell/text-0.7:=[profile?] + >=dev-haskell/transformers-0.2.2:=[profile?] + dev-haskell/unordered-containers:=[profile?] + >=dev-haskell/wai-1.3:=[profile?] + =dev-haskell/yesod-core-1.1*:=[profile?] + >=dev-haskell/yesod-form-1.1:=[profile?] + =dev-haskell/yesod-persistent-1.1:=[profile?] + >=dev-lang/ghc-6.10.4:=" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.6.0" diff --git a/dev-java/absolutelayout/Manifest b/dev-java/absolutelayout/Manifest index 7bc7c50ca73a..afacb66b7121 100644 --- a/dev-java/absolutelayout/Manifest +++ b/dev-java/absolutelayout/Manifest @@ -1,2 +1 @@ DIST absolutelayout-6.7_beta.tar.bz2 3359 SHA256 2abee4256899275124026c128a78a61045e1aa8a8eb16338cc439b1f7b8ac777 SHA512 2e14300fca85d2d81533147de4dbfa13660749a46134d9a80facd992948ed18147e02fcf2ca3590154823342201bd99f6e84eb251176ae1906c09477718a36e3 WHIRLPOOL 56930c4d46c7f3abe90548cdcd66bb92e931a088dbe594016d201a4b6aa3648ec24414d6f537546ed21e3459fb5a3515ba5d9e7a72f16bc402cd5e7b519ab957 -DIST absolutelayout-6.7_beta.tar.bz2 3359 SHA256 2abee4256899275124026c128a78a61045e1aa8a8eb16338cc439b1f7b8ac777 SHA512 2e14300fca85d2d81533147de4dbfa13660749a46134d9a80facd992948ed18147e02fcf2ca3590154823342201bd99f6e84eb251176ae1906c09477718a36e3 WHIRLPOOL 56930c4d46c7f3abe90548cdcd66bb92e931a088dbe594016d201a4b6aa3648ec24414d6f537546ed21e3459fb5a3515ba5d9e7a72f16bc402cd5e7b519ab957 diff --git a/dev-java/annogen/Manifest b/dev-java/annogen/Manifest index 6cd773380167..91ba65df251a 100644 --- a/dev-java/annogen/Manifest +++ b/dev-java/annogen/Manifest @@ -1,2 +1 @@ DIST annogen-0.1.0.zip 1008931 SHA256 60cf2bed2bc90d366b2c8ad9f83cc4f4a8b205298bdf55c85fadcc4cd4e05246 SHA512 f5c4eeb92ef8c87874df6619ef701b99dace01bd3ebc87f201ee3ab523fe612b6d143da2646c280d4831bc8e3051887514aa06b8bad6928b68ddd6cd6357fa16 WHIRLPOOL 02c7bae1a7f06d6348bcf060c1e81896cc6e2861c2066323dd4a0716f8413321d8a4248040ab2b9924ca383022f06d66af79c408596ef19c002becbd9992e802 -DIST annogen-0.1.0.zip 1008931 SHA256 60cf2bed2bc90d366b2c8ad9f83cc4f4a8b205298bdf55c85fadcc4cd4e05246 SHA512 f5c4eeb92ef8c87874df6619ef701b99dace01bd3ebc87f201ee3ab523fe612b6d143da2646c280d4831bc8e3051887514aa06b8bad6928b68ddd6cd6357fa16 WHIRLPOOL 02c7bae1a7f06d6348bcf060c1e81896cc6e2861c2066323dd4a0716f8413321d8a4248040ab2b9924ca383022f06d66af79c408596ef19c002becbd9992e802 diff --git a/dev-java/ant-contrib/Manifest b/dev-java/ant-contrib/Manifest index 6d318182c465..5b36966779dc 100644 --- a/dev-java/ant-contrib/Manifest +++ b/dev-java/ant-contrib/Manifest @@ -1,4 +1,2 @@ DIST ant-contrib-1.0b2-src.tar.bz2 118216 SHA256 29bdd00ee0df1d7b24e55b08bfff5641edf3f805e45a278641d42c0bf0ce9269 SHA512 5245ed1458c9c4892ab8196a8acdf8678aab0d45fc58fcd8ca446e3589f378a9a02de8e608abb75d24fa190cdcbe209454a703eec8d4e563b7690d6d58ea9af8 WHIRLPOOL 3247772090ab6b1cab556c0b4442ad4ecc4a9f15b7ffb6117f8c8f95ac4267215a741f3ecb45ed335657f1e881a933b1f3cf607a34602834fe7bdb37b30ccf65 DIST ant-contrib-1.0b3-src.tar.bz2 3298187 SHA256 5c180feaca2704d914054a1e6b453673cc9b65cfb3da307aff17439a9aa09d6b SHA512 8147ed51612eed9d41515c00ef2bb7210ebd50dba8b471abfadf8a56c67b53c030602ce9e49e9070d72d383de61f290e941a76c282e223330fee606f3633b0a8 WHIRLPOOL e87fe9d07a97a1a8ccf4f4d0984f02ab967c5b8f6a11d6171f235fa3b9fa243dc7243953d9b14e72cbfece91d41ac264babee0241429090b1868e948a855fd3e -DIST ant-contrib-1.0b2-src.tar.bz2 118216 SHA256 29bdd00ee0df1d7b24e55b08bfff5641edf3f805e45a278641d42c0bf0ce9269 SHA512 5245ed1458c9c4892ab8196a8acdf8678aab0d45fc58fcd8ca446e3589f378a9a02de8e608abb75d24fa190cdcbe209454a703eec8d4e563b7690d6d58ea9af8 WHIRLPOOL 3247772090ab6b1cab556c0b4442ad4ecc4a9f15b7ffb6117f8c8f95ac4267215a741f3ecb45ed335657f1e881a933b1f3cf607a34602834fe7bdb37b30ccf65 -DIST ant-contrib-1.0b3-src.tar.bz2 3298187 SHA256 5c180feaca2704d914054a1e6b453673cc9b65cfb3da307aff17439a9aa09d6b SHA512 8147ed51612eed9d41515c00ef2bb7210ebd50dba8b471abfadf8a56c67b53c030602ce9e49e9070d72d383de61f290e941a76c282e223330fee606f3633b0a8 WHIRLPOOL e87fe9d07a97a1a8ccf4f4d0984f02ab967c5b8f6a11d6171f23 \ No newline at end of file diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta3-r1.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta3-r1.ebuild index 7fa5f17c49f0..284739179e73 100644 --- a/dev-java/ant-contrib/ant-contrib-1.0_beta3-r1.ebuild +++ b/dev-java/ant-contrib/ant-contrib-1.0_beta3-r1.ebuild @@ -35,36 +35,44 @@ S="${WORKDIR}/${PN}" rewrite_build_xml() { python < /dev/null + fi + sed -e "s|@prefix@|/usr/|" \ + -e 's|@exec_prefix@|${prefix}|' \ + -e "s|@libdir@|\$\{exec_prefix\}/$(get_libdir)/antlr|" \ + -e 's|@libs@|-r:\$\{libdir\}/antlr.astframe.dll -r:\$\{libdir\}/antlr.runtime.dll|' \ + -e "s|@VERSION@|${PV}|" \ + "${FILESDIR}"/antlr.pc.in > "${S}"/antlr.pc +} + +src_install() { + exeinto /usr/bin + doexe "${S}"/scripts/antlr-config + + if use cxx ; then + cd "${S}"/lib/cpp + einstall || die "failed to install C++ files" + dolib.so src/libantlr.so* || die + dosym libantlr.so.$(get_major_version) /usr/$(get_libdir)/libantlr.so + use static-libs && dolib.a src/libantlr.a + fi + + if use java ; then + java-pkg_dojar "${S}"/antlr/antlr.jar + + use script && java-pkg_dolauncher antlr --main antlr.Tool + + use source && java-pkg_dosrc "${S}"/antlr + use doc && java-pkg_dohtml -r "${S}"/doc/* + fi + + if use mono ; then + cd "${S}"/lib + + dodir /usr/$(get_libdir)/antlr/ + insinto /usr/$(get_libdir)/antlr/ + + doins antlr.astframe.dll + doins antlr.runtime.dll + + insinto /usr/$(get_libdir)/pkgconfig + doins "${S}"/antlr.pc + fi + + if use python ; then + cd "${S}"/lib/python + distutils_src_install + fi + + if use examples ; then + find "${S}"/examples -iname Makefile\* -exec rm \{\} \; + + dodir /usr/share/doc/${PF}/examples + insinto /usr/share/doc/${PF}/examples + + use cxx && doins -r "${S}"/examples/cpp + use java && doins -r "${S}"/examples/java + use mono && doins -r "${S}"/examples/csharp + use python && doins -r "${S}"/examples/python + fi + + newdoc "${S}"/README.txt README || die +} + +pkg_postinst() { + use python && distutils_pkg_postinst +} + +pkg_postrm() { + use python && distutils_pkg_postrm +} diff --git a/dev-java/antlr/antlr-3.1.3-r3.ebuild b/dev-java/antlr/antlr-3.1.3-r3.ebuild index dc39069dca45..95a74d21dc45 100644 --- a/dev-java/antlr/antlr-3.1.3-r3.ebuild +++ b/dev-java/antlr/antlr-3.1.3-r3.ebuild @@ -49,52 +49,67 @@ antlr3() { org.antlr.Tool "${@}" || die "building v3 grammars failed" } -build_antlr()# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-3.1.3-r3.ebuild,v 1.1 2013/09/03 21:01:33 tomwij Exp $ - -EAPI="2" -JAVA_PKG_IUSE="source" - -inherit eutils java-pkg-2 java-ant-2 - -DESCRIPTION="A parser generator for C++, C#, Java, and Python" -HOMEPAGE="http://www.antlr.org/" -# You need to generate v3 grammars so that boostrapping works -SRC_URI="http://www.antlr.org/download/${P}.tar.gz - mirror://gentoo/${P}-generated.tar.bz2" -LICENSE="BSD" -SLOT="3" -KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="gunit" - -COMMON_DEPEND=">=dev-java/stringtemplate-3.2:0 - >=dev-java/antlr-2.7.7:0[java] - gunit? ( dev-java/junit:4 )" +build_antlr() { + cd "${S}" + local dest="${1}" + # runtime + find runtime -name "*.java" > "${T}/sources" || die + # tool + find tool/src/main -name "*.java" >> "${T}/sources" || die + ejavac -d "${dest}" -cp $(java-pkg_getjars antlr,stringtemplate) "@${T}/sources" +} -RDEPEND=">=virtual/jre-1.5 - ${COMMON_DEPEND}" +# Uses maven so let's just do things manully for now +# when bumping use jardiff and apicheck to make sure +# produced jars are good +src_compile() { + einfo "Bootstrapping antlr3 with bundled sources" + cd tool/src/main/antlr2/org/antlr/grammar/v2/ || die + # the command line only takes one at a time + for grammar in *.g; do + antlr2 ${grammar} || die + done + + cd "${S}" || die + mkdir bootstrap || die + build_antlr bootstrap + + einfo "Building v3 grammars with boostrapped antlr" + local v3dir=tool/src/main/antlr/org/antlr/grammar/v3/ + rm -v "${v3dir}"/*.java || die + antlr3 "${v3dir}"/*.g + + mkdir build || die + cp -r "${S}"/tool/src/main/resources/* build || die + build_antlr build + + if use gunit; then + einfo "building gunit" + antlr3 gunit/src/main/antlr3/org/antlr/gunit/*.g + + find gunit -name "*.java" > "${T}/gunit" || die + ejavac -d build -cp $(java-pkg_getjars stringtemplate,junit-4):build \ + "@${T}/gunit" + + cp -vr gunit/src/main/resources/org build || die + fi + + # jar things up + cd build + find -type f >> "${T}/classes" || die + jar cf ${PN}3.jar "@${T}/classes" || die "jar failed" +} -DEPEND="${RDEPEND} - >=virtual/jdk-1.5" +src_install() { + # Single jar like upstream + java-pkg_dojar build/antlr3.jar + java-pkg_dolauncher antlr3 --main org.antlr.Tool + use gunit && java-pkg_dolauncher gunit --main org.antlr.gunit.Interp -java_prepare() { - rm -v lib/*.jar lib/.*.jar || die - rm -v runtime/ActionScript/project/lib/*.jar || die - # We must bundle this as we can't depend on ourselves - cp -v "${WORKDIR}"/*.java tool/src/main/antlr/org/antlr/grammar/v3 || die - local version="${PV} $(date '+%B %d, %Y %T')" - local propertyfile="tool/src/main/resources/org/antlr/antlr.properties" - [[ $(egrep "^[^#]" ${propertyfile} | wc -l) != 1 ]] \ - && die "Unknown property found" - sed -i "s/^\(antlr.version\)=.*$/\1=${version}/" ${propertyfile} || die + use source && java-pkg_dosrc tool/src/main/org \ + runtime/Java/src/main/java/org/ } -antlr2() { - java -cp $(java-pkg_getjars antlr) antlr.Tool "${@}" || die "antlr2 failed" +pkg_postinst() { + elog "Currently the ebuild only has support for the Java backend." } - -antlr3() { - local cp="${S}/bootstrap:${S}/tool/src/main/resources/" - java -cp "${cp}":$(java-pkg_getjars antlr,stringtemplate) \ - org.antlr.Tool "$ \ No newline at end of file diff --git a/dev-java/cglib/files/cglib-3.0-build.xml.patch b/dev-java/cglib/files/cglib-3.0-build.xml.patch index 17412d5118b3..a40c169d8016 100644 --- a/dev-java/cglib/files/cglib-3.0-build.xml.patch +++ b/dev-java/cglib/files/cglib-3.0-build.xml.patch @@ -22,11 +22,15 @@ diff -Nru /tmp/cglib-3.0.orig/build.xml ./build.xml - - - - diff -Nru /tmp/cglib-3.0.orig/build.xml ./build.xml ---- /tmp/cglib-3.0.orig/build.xml 2012-08-17 19:21:37.387574672 +0300 -+++ ./build.xml 2012-08-17 19:26:58.982564260 +0300 -@@ -73,7 +73,7 @@ - - +@@ -246,7 +238,7 @@ + + + +- ++ + + + diff --git a/dev-java/classworlds/Manifest b/dev-java/classworlds/Manifest index 91cc480bd21e..c791013db6c0 100644 --- a/dev-java/classworlds/Manifest +++ b/dev-java/classworlds/Manifest @@ -1,2 +1 @@ DIST classworlds-1.0-src.tar.gz 32611 SHA256 0b96924b672fc656a84bbbd50f9988c8dfc7b8bda92721c70ab83fe71d9ce061 SHA512 19c60fec69c72a199be400059bc39fbd3da3c06099d8af6ba14aa09a078c00f147363f3238d08c139dc3748a2c07bbfde90e145bfcb8c9fb0150c0b4c012fc23 WHIRLPOOL a8ee830420ef7f76f201ccfacd6a39f14eda1a9cb81074fab999c5b4fdefd987b696a08a52ef4a29ccd69666f6b9ed9a56da0acf810d7fe01f3890f8d7eca4b4 -DIST classworlds-1.0-src.tar.gz 32611 SHA256 0b96924b672fc656a84bbbd50f9988c8dfc7b8bda92721c70ab83fe71d9ce061 SHA512 19c60fec69c72a199be400059bc39fbd3da3c06099d8af6ba14aa09a078c00f147363f3238d08c139dc3748a2c07bbfde90e145bfcb8c9fb0150c0b4c012fc23 WHIRLPOOL a8ee830420ef7f76f201ccfacd6a39f14eda1a9cb81074fab999c5b4fdefd987b696a08a52ef4a29ccd69666f6b9ed9a56 \ No newline at end of file diff --git a/dev-java/cldc-api/cldc-api-1.1-r1.ebuild b/dev-java/cldc-api/cldc-api-1.1-r1.ebuild index a018e3467cbd..c83e91632e3c 100644 --- a/dev-java/cldc-api/cldc-api-1.1-r1.ebuild +++ b/dev-java/cldc-api/cldc-api-1.1-r1.ebuild @@ -15,12 +15,15 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2" # mkdir cldc-api-1.1 && cd cldc-api-1.1 # you need a login on dev.java.net - use --username username if different from your local login # svn export https://phoneme.dev.java.net/svn/phoneme/components/cldc/trunk/src/javaapi/cldc1.1 -# svn export https://phoneme.dev.java.ne# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/cldc-api/cldc-api-1.1-r1.ebuild,v 1.1 2014/09/06 07:34:41 ercpe Exp $ - -EAPI=5 - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 \ No newline at end of file +# svn export https://phoneme.dev.java.net/svn/phoneme/components/cldc/trunk/src/javaapi/share +# cd .. +# tar -cjf cldc-api-1.1.tar.bz2 cldc-api-1.1 +# move tarball to distdir, scp to d.g.o... + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +SLOT="1.1" +IUSE="" + +RDEPEND=">=virtual/jre-1.4" +DEPEND=">=virtual/jdk-1.4" diff --git a/dev-java/commons-attributes/Manifest b/dev-java/commons-attributes/Manifest index c7aa00a48dd6..f612f144d4ae 100644 --- a/dev-java/commons-attributes/Manifest +++ b/dev-java/commons-attributes/Manifest @@ -1,2 +1 @@ DIST commons-attributes-2.2-src.tar.gz 98307 SHA256 f24acddd1b82db16052672c255bd57add05107bbb1220264aec6ba10091e7713 SHA512 6030af498f085c56b313f473d3f44fc063608b9e0d7442e2f7fd0ee73c320b84cc334dd75038ab3aaac4b72a54cf12f3e3bddfb7faf3610f0f080c389f370e07 WHIRLPOOL b5a03da8126f8df02977a4318dd7cd6e1ebdb0b15f6932e344abb4b44dc1ee8e98214f3ff01fc0eeaf6b4ff6f47eeb67b4f7b6bc692407283c10f510947b4faf -DIST commons-attributes-2.2-src.tar.gz 98307 SHA256 f24acddd1b82db16052672c255bd57add05107bbb1220264aec6ba10091e7713 SHA512 6030af498f085c56b313f473d3f44fc063608b9e0d7442e2f7fd0ee73c320b84cc334dd75038ab3aaac4b72a54cf12f3e3bddfb7faf3610f0f080c389f370e07 WHIRLPOOL b5a03da8126f8df02977a4318dd7cd6e1ebdb0b15f6932e344abb4b44dc1ee8e98214f3ff01fc0eeaf6b4ff6f47eeb67b4f7b6bc692407283c10f510947b4faf diff --git a/dev-java/diablo-jre-bin/Manifest b/dev-java/diablo-jre-bin/Manifest index 07ef185f745b..b2639012fff6 100644 --- a/dev-java/diablo-jre-bin/Manifest +++ b/dev-java/diablo-jre-bin/Manifest @@ -1,2 +1 @@ DIST diablo-latte-freebsd7-i386-1.6.0_07-b02.tar.bz2 28718252 RMD160 c76d577fad063b43ee6c46965225544a2f01fb44 SHA1 2832083c2b974f05cdedf1c8693816d1c1ef9664 SHA256 d4cfbdaa0a8d8f819b54b8f4005686ff1a62b59107ef02619fd2366ad0abf4d4 -DIST diablo-latte-freebsd7-i386-1.6.0_07-b02.tar.bz2 28718252 RMD160 c76d577fad063b43ee6c46965225544a2f01fb44 SHA1 2832083c2b974f05cdedf1c8693816d1c1ef9664 SHA256 d4cfbdaa0a8d8f819b54b8f4005686ff1a62b59107ef02619fd2366ad0abf4d4 diff --git a/dev-java/dom4j/Manifest b/dev-java/dom4j/Manifest index 3af67b6daa00..fed26d1479da 100644 --- a/dev-java/dom4j/Manifest +++ b/dev-java/dom4j/Manifest @@ -1,3 +1,2 @@ DIST dom4j-1.6.1-java5.patch.bz2 2900 SHA256 5e7361eac5332c3380420bd88c2d3a2d4dde30984486c6d4f7e4621940abb42d SHA512 38da606d77b62976366cd089e5194a922e348ec396e7b9af4dceb0a536c47f66e0900cfa59c91df04aade6076630077a8f88c713b9c20224d69316109b293a96 WHIRLPOOL c3e56098f9a75340243e554f11e8cddbbf3e56cd13f0dc9650151ed5ec2b3914e33921174ad275f089188033f95d33386cd4642196bdc7cc6d9bce980c0251c8 DIST dom4j-1.6.1.tar.gz 9687211 SHA256 01b4abf86bce337a2a900bf121b3107320ba63b4c0f352e1922fbec6e0736c6f SHA512 95c5a7105a81734f77b4bf27f8bb0af116bf43d8ad5297a0902a6687a54109a87dffe2953cf430d14947cdaa590aa0fdf083b46a91d1d98d48431cfae4459d94 WHIRLPOOL 3edd7c8f629465add6fcbb944eadd75b1e8fd84120c1adf2fa24d43ae04856162d18652892697a2605c1006f1e7d3e5837e30a13e01ab7d1a101614b6dc4f8d0 -DIST dom4j-1.6.1-java5.patch.bz2 2900 SHA256 5e7361eac5332c3380420bd88c2d3a2d4dde30984486c6d4f7e4621940a \ No newline at end of file diff --git a/dev-java/dom4j/dom4j-1.6.1-r4.ebuild b/dev-java/dom4j/dom4j-1.6.1-r4.ebuild index 7bb497795eb0..f495233441e4 100644 --- a/dev-java/dom4j/dom4j-1.6.1-r4.ebuild +++ b/dev-java/dom4j/dom4j-1.6.1-r4.ebuild @@ -57,12 +57,15 @@ src_test() { # Needs X11 rm -v src/test/org/dom4j/bean/BeansTest.java || die # Fails with a 1.6 JDK for some reason - rm -v src/test/or# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/dom4j-1.6.1-r4.ebuild,v 1.8 2013/06/27 21:54:01 aballier Exp $ - -EAPI=4 + rm -v src/test/org/dom4j/io/StaxTest.java || die + # Fails with a 1.7 JDK for some reason + rm -v src/test/org/dom4j/rule/RuleTest.java || die -JAVA_PKG_IUSE="doc source test" + java-pkg-2_src_test +} -inherit java-pkg-2 java \ No newline at end of file +src_install() { + java-pkg_dojar build/${PN}.jar + use doc && java-pkg_dojavadoc build/doc/api + use source && java-pkg_dosrc src/java/* +} diff --git a/dev-java/dtdparser/Manifest b/dev-java/dtdparser/Manifest index be29fe4b6794..88adaa137184 100644 --- a/dev-java/dtdparser/Manifest +++ b/dev-java/dtdparser/Manifest @@ -1,2 +1 @@ DIST dtdparser-1.21.tgz 138335 SHA256 67fb4af8aa48733b027724c1244e614d9621724efa47e2c9ddb69edecc8dd034 SHA512 1b96991a2a2486fbbf0a9847fec3f1528153508f5380c3066ba34b410a9d42a480c4b821535ea2304d6c674526229cf74e6d28a32312df431aa852a9436c03aa WHIRLPOOL 94721ab2021efcdce97e21357f951a55dc7105a7d7a41cbf8735302babd20637a3c0195af3f266a16d25d73987441d043b8812c7da1009c8bb81e2ec87febf54 -DIST dtdparser-1.21.tgz 138335 SHA256 67fb4af8aa48733b027724c1244e614d962 \ No newline at end of file diff --git a/dev-java/dynalang/Manifest b/dev-java/dynalang/Manifest index 207878d5a1d8..4f53b81ce23b 100644 --- a/dev-java/dynalang/Manifest +++ b/dev-java/dynalang/Manifest @@ -1,2 +1 @@ DIST dynalang-mop-0.4.tgz 227338 SHA256 b241b763d8178f7ba74123ed6145df4f255f78df39757665f3569e3ccd11d5cb SHA512 b7501fbc44ae29e10cf3eb55002420d88d83226f790861f43f59aaddc0cd1bd5021fed207d831d5c3adb14ceab01dc17ff53cd31cb6a93c0fc00240b8e3e9797 WHIRLPOOL ad5f558a105a78625d7c7c55b1c7f7b185aae30fb7ab917e27aedfa083ee99191223fb76ea22f3f573da576655d8612ccf21bba807a6488ae5344ce9705c22d4 -DIST dynalang-mop-0.4.tgz 227338 SHA256 b241b763d8178f7ba74123ed6145df4f255f78df39757665f3569e3ccd11d5cb SHA512 b7501fbc44ae29e10cf3eb55002420d88d83226f790861f43f59aaddc0cd1bd5021fed207d831d5c3adb14ceab01dc17ff53cd31cb6a93c0fc00240b8e3e9797 WHIRLPOOL ad5f558a105a78625d7c7c55b1c7f7b185aae30fb7ab917e27aedfa083ee99191223fb76ea22f3f573da576655d8612ccf21bba807a6488ae5344ce9705c22d4 diff --git a/dev-java/echo2/Manifest b/dev-java/echo2/Manifest index 2e5992e3e83a..a5903c7ac382 100644 --- a/dev-java/echo2/Manifest +++ b/dev-java/echo2/Manifest @@ -1 +1 @@ -DIST NextApp_Echo2-2.1.1.tgz 5372814 SHA256 73c0325d019a7df92270c0f3eebef07c2a4fa42a58e588d3bb2cfbd7c186DIST NextApp_Echo2-2.1.1.tgz 5372814 SHA256 73c0325d019a7df92270c0f3eebef07c2a4fa42a58e588d3bb2cfbd7c1869ce2 SHA512 bad6d9a6411c6a6fe24edbd88960a5e1179f65e95a26e51610eb0b601e3941dcc82b052a385c6fd429291c524bb722a081f39bf3704b7b403ad98582c8273f26 WHIRLPOOL dac80215f7c2d33ab790b9a5a56b9f2b360e42942676faec58061f55cada7e9b530bc6bea24188b9cb6d15638898705e4dffd54c45e757d97d4e272c292530f6 +DIST NextApp_Echo2-2.1.1.tgz 5372814 SHA256 73c0325d019a7df92270c0f3eebef07c2a4fa42a58e588d3bb2cfbd7c1869ce2 SHA512 bad6d9a6411c6a6fe24edbd88960a5e1179f65e95a26e51610eb0b601e3941dcc82b052a385c6fd429291c524bb722a081f39bf3704b7b403ad98582c8273f26 WHIRLPOOL dac80215f7c2d33ab790b9a5a56b9f2b360e42942676faec58061f55cada7e9b530bc6bea24188b9cb6d15638898705e4dffd54c45e757d97d4e272c292530f6 diff --git a/dev-java/eclipsito/Manifest b/dev-java/eclipsito/Manifest index a293df4eed6a..ae8c8fdc309b 100644 --- a/dev-java/eclipsito/Manifest +++ b/dev-java/eclipsito/Manifest @@ -1,2 +1 @@ -DIST eclipsito-0_pre20130713.tar.xz 162972 SHA256 2ac637b26a30263777d2c92912e0607a26d379f14a9c1a4a3cd28a9960b15c10 SHA512 b238692950bc930-----BEGIN PGP SIGNED MESSAGE----- DIST eclipsito-0_pre20130713.tar.xz 162972 SHA256 2ac637b26a30263777d2c92912e0607a26d379f14a9c1a4a3cd28a9960b15c10 SHA512 b238692950bc93059fb16df8e6301669583185976ae4f12519d1917a13fea2b53c5b3462f2da61d63025019eee10037a3a96b2ac742545d61b80f2ab7964d41b WHIRLPOOL b2dbecf2d0c80f851d0c4253c6aa8b9657e5f39802a30d5385231c985c406702ebeca92645969c8bbf6cf11fb3ebb2fa77b755a46a3e99fd26f45b40efedee48 diff --git a/dev-java/glassfish-xmlrpc-api/Manifest b/dev-java/glassfish-xmlrpc-api/Manifest index d4d467af00f9..b509251c5154 100644 --- a/dev-java/glassfish-xmlrpc-api/Manifest +++ b/dev-java/glassfish-xmlrpc-api/Manifest @@ -1,2 +1 @@ DIST glassfish-xmlrpc-api-1.1.1.tar.xz 35180 SHA256 ca8531a5d39b80ba94e13e048fb2bf9e2441910ccc992af6c0d3dd738892fc89 SHA512 7de8d5959c0f9f09cca6a169d4e4293fca378aa497389e9a9a0af953b698322b9bbae6288b8cba2cd34abf58a0d0f4272294dcdf201a84ba5cc14d426843daa8 WHIRLPOOL 830df242d38e29a8a3eade55d5d80f683ac610d355db2725a8a6b7fd74e19d566ea868a90dcb6e824f758a5c163f36d7d053c6759c896b953279ba2c48628475 -DIST glassfish-xmlrpc-api-1.1.1.tar.xz 35180 SHA256 ca8531a5d39b80ba94e13e048fb2bf9e2441910ccc992af6c0d3dd738892fc89 SHA512 7de8d5959c0f9f09cca6a169d4e4293fca378aa497389e9a9a0af953b698322b9bbae6288b8cba2cd34abf58a0d0f4272294dcdf201a84ba5cc14d426843daa8 WHIRLPOOL 830df242d38e29a8a3eade55d5d80f683ac610d355db2725a8a6b7fd74e19d566ea868a90dcb6e824f758a5c163f36d7d053c6759c896b953279ba2c48628475 diff --git a/dev-java/hamcrest-library/Manifest b/dev-java/hamcrest-library/Manifest index c3af999ac3c8..780ede82b9f7 100644 --- a/dev-java/hamcrest-library/Manifest +++ b/dev-java/hamcrest-library/Manifest @@ -1,3 +1,2 @@ -DIST hamcrest-1.1.tgz 1670123 SHA256 a76cca2dbb38ac185f51f8551c964a356009c7adf1a19b5407f87352e2e438c8 SHA512 07b55c539ffcd3b1d33e94bec518164b95cefa39d96e0c3d02fc97c0a20f71bd8d1dea90a59ffd163e748ed1007b087c3d0d355876a68a429e8e564d0cfd3595 WHIRLPOOL 937d4fcde43a36eb19efb1b45e255389dcd18a853f90c-----BEGIN PGP SIGNED MESSAGE----- DIST hamcrest-1.1.tgz 1670123 SHA256 a76cca2dbb38ac185f51f8551c964a356009c7adf1a19b5407f87352e2e438c8 SHA512 07b55c539ffcd3b1d33e94bec518164b95cefa39d96e0c3d02fc97c0a20f71bd8d1dea90a59ffd163e748ed1007b087c3d0d355876a68a429e8e564d0cfd3595 WHIRLPOOL 937d4fcde43a36eb19efb1b45e255389dcd18a853f90cc96e6421cec4db176708047e4c6de53ad7f3c11b29e4bc77725c3b70992239d9da420fa95c682615011 DIST hamcrest-1.3.tgz 3686096 SHA256 c6428e40d069fff3f99780efaae96c35ebdbf7cbfd475504254ebffcc19620c2 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2 WHIRLPOOL 9edc85f8d988ba9e7d080e3240d02956775bb73857903a2ec2a72e80d5a1b8570111c97d7b9906951273a1a1db6213a77de9cc2c55a6c73246d45157fed11ed9 diff --git a/dev-java/istack-commons-buildtools/istack-commons-buildtools-20090620.ebuild b/dev-java/istack-commons-buildtools/istack-commons-buildtools-20090620.ebuild index 8e223aae621e..cdecf6880955 100644 --- a/dev-java/istack-commons-buildtools/istack-commons-buildtools-20090620.ebuild +++ b/dev-java/istack-commons-buildtools/istack-commons-buildtools-20090620.ebuild @@ -45,11 +45,15 @@ java_prepare() { epatch "${FILESDIR}/${PROJ_PN}-20090620-less-maven.patch" java-ant_bsfix_one "${S}/build-common.xml" libdir="${S}/${SUB_PN}/lib" - mkdir -p "${libdir}" || # Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/istack-commons-buildtools/istack-commons-buildtools-20090620.ebuild,v 1.2 2012/04/13 18:07:27 ulm Exp $ + mkdir -p "${libdir}" || die + java-pkg_jar-from --into "${libdir}" ant-core + java-pkg_jar-from --into "${libdir}" codemodel-2 + java-pkg_jar-from --into "${libdir}" istack-commons-runtime-1.1 +} -EAPI=2 -JAVA_PKG_IUSE="source" +EANT_BUILD_XML="${SUB_PN}/build.xml" -inherit java-pkg-2 java-an \ No newline at end of file +src_install() { + java-pkg_dojar ${SUB_PN}/build/${PN}.jar + use source && java-pkg_dosrc ${SUB_PN}/src/* +} diff --git a/dev-java/jackson-databind/jackson-databind-2.3.1.ebuild b/dev-java/jackson-databind/jackson-databind-2.3.1.ebuild index 75da96cd7476..974a68f7ff79 100644 --- a/dev-java/jackson-databind/jackson-databind-2.3.1.ebuild +++ b/dev-java/jackson-databind/jackson-databind-2.3.1.ebuild @@ -12,20 +12,6 @@ DESCRIPTION="High-performance JSON processor" HOMEPAGE="http://jackson.codehaus.org" SRC_URI="https://github.com/FasterXML/${PN}/archive/${PN}-${PV}.tar.gz" -LICENSE="|| # Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jackson-databind/jackson-databind-2.3.1.ebuild,v 1.1 2014/01/12 18:53:43 ercpe Exp $ - -EAPI="5" - -JAVA_PKG_IUSE="source" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="High-performance JSON processor" -HOMEPAGE="http://jackson.codehaus.org" -SRC_URI="https://github.com/FasterXML/${PN}/archive/${PN}-${PV}.tar.gz" - LICENSE="|| ( Apache-2.0 LGPL-2.1 )" SLOT="2" KEYWORDS="~amd64 ~x86" @@ -47,4 +33,15 @@ S="${WORKDIR}/${PN}-${PN}-${PV}" java_prepare() { cp "${FILESDIR}"/${PV}-build.xml "${S}"/build.xml || die - s \ No newline at end of file + sed -e 's:@package@:com.fasterxml.jackson.databind.cfg:g' \ + -e "s:@projectversion@:${PV}:g" \ + -e 's:@projectgroupid@:com.fasterxml.jackson.core:g' \ + -e 's:@projectartifactid@:jackson-databind:g' \ + "${S}/src/main/java/com/fasterxml/jackson/databind/cfg/PackageVersion.java.in" \ + > "${S}/src/main/java/com/fasterxml/jackson/databind/cfg/PackageVersion.java" || die +} + +src_install() { + java-pkg_dojar target/${PN}.jar + use source && java-pkg_dosrc src/main/java/* +} diff --git a/dev-java/jade/Manifest b/dev-java/jade/Manifest index aee3440246dd..f2ce758493c7 100644 --- a/dev-java/jade/Manifest +++ b/dev-java/jade/Manifest @@ -1,2 +1 @@ DIST JADE-src-3.3.zip 1677444 SHA256 f16314c6b514bb4318668990788116c8c90005fb5393f7d7b3785c0b66020606 SHA512 b191de5d5406276cc5ad382f4b0627f2f2b9eef3aba46d8c23e3bb4f6489808450755e6f360a2d39a1eed88c22cd4dd2d35ab140e55ffe8f021e89709a094562 WHIRLPOOL bbbcd9c5a4f4d0f75282c22f4d88ae091c735cd58dda7bc08e017579c8da6fb1fa6204980067f311c5e3545cfacb5feac00bb887161d9db818116cf42748a9f7 -DIST JADE-src-3.3.zip 1677444 SHA256 f16314c6b514bb4318668990788116c8c90005fb5393f7d7b3785c0b66020606 SHA512 b191de5d5406276cc5ad382f4b0627f2f2b9eef3aba46d8c23e3bb4f6489808450755e6f360a2d39a1eed88c22cd4dd2d35ab140e55ffe8f021e89709a094562 WHIRLPOOL bbbcd9c5a4f4d0f75282c22f4d88ae091c735cd58dda7bc08e017579c8da6fb1fa6204980067f311c5e3545cfacb5feac00bb887161d9db818116cf42748a9f7 diff --git a/dev-java/jaffl/jaffl-0.5.11.ebuild b/dev-java/jaffl/jaffl-0.5.11.ebuild index b67f14859c4f..2cbf77555bf5 100644 --- a/dev-java/jaffl/jaffl-0.5.11.ebuild +++ b/dev-java/jaffl/jaffl-0.5.11.ebuild @@ -18,42 +18,6 @@ LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -CDEPEND="dev-java/jffi:0.4 - dev-java/jnr-x86asm:0 - dev-java/asm:3" - -RDEPEND=">=virtual/jre-1.5 - ${CDEPEND}" - -DEPEND=">=virtual/jdk-1.5 - app-arch/unzip - ${CDEPEND} - test? ( - dev-java/junit:4 - dev-java/ant-junit4:0 - dev-java/hamcrest-core:0 - )" - -JA# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jaffl/jaffl-0.5.11.ebuild,v 1.2 2013/07/23 17:23:33 vincent Exp $ - -EAPI="5" - -JAVA_PKG_IUSE="doc source test" - -WANT_ANT_TASKS="ant-nodeps" - -inherit java-pkg-2 java-ant-2 versionator - -DESCRIPTION="An abstracted interface to invoking native functions from java" -HOMEPAGE="http://kenai.com/projects/jaffl" -SRC_URI="http://github.com/jnr/jnr-ffi/tarball/${PV} -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" - CDEPEND="dev-java/jffi:0.4 dev-java/jnr-x86asm:0 dev-java/asm:3" @@ -87,4 +51,29 @@ java_prepare() { java-pkg_jar-from --into lib jnr-x86asm java-pkg_jar-from --into lib asm-3 asm.jar asm-3.2.jar java-pkg_jar-from --into lib asm-3 asm-analysis.jar asm-analysis-3.2.jar - java-pkg_jar-from --into lib asm-3 asm-commons.jar asm \ No newline at end of file + java-pkg_jar-from --into lib asm-3 asm-commons.jar asm-commons-3.2.jar + java-pkg_jar-from --into lib asm-3 asm-tree.jar asm-tree-3.2.jar + java-pkg_jar-from --into lib asm-3 asm-util.jar asm-utils-3.2.jar + java-pkg_jar-from --into lib asm-3 asm-xml.jar asm-xml-3.2.jar +} + +EANT_EXTRA_ARGS="-Dreference.jffi.jar=lib/jffi.jar \ + -Dreference.jnr-x86asm.jar=lib/jnr-x86asm.jar \ + -Dproject.jffi=\"${S}\" \ + -Dproject.jnr-x86asm=\"${S}\" + -D\"already.built.${S}\"=true" + +src_test() { + local paths="$(java-config -di jnr-x86asm,jffi-0.4):${S}/build" + + ANT_TASKS="ant-junit4 ant-nodeps" eant test \ + -Drun.jvmargs="-Djava.library.path=${paths}" \ + -Dlibs.junit_4.classpath="$(java-pkg_getjars junit-4,hamcrest-core)" ${EANT_EXTRA_ARGS} +} + +src_install() { + java-pkg_newjar dist/${PN}-${JAR_VERSION}.jar + + use doc && java-pkg_dojavadoc dist/javadoc + use source && java-pkg_dosrc src/* +} diff --git a/dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r2.ebuild b/dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r2.ebuild index caa9396bf94c..c436632e1584 100644 --- a/dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r2.ebuild +++ b/dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r2.ebuild @@ -2,12 +2,6 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r2.ebuild,v 1.4 2010/02/09 19:04:10 josejx Exp $ -EAPI=2 -JAVA_PKG_IUSE="doc examples source" -JAVA_PKG_WANT_BOOTCL# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r2.ebuild,v 1.4 2010/02/09 19:04:10 josejx Exp $ - EAPI=2 JAVA_PKG_IUSE="doc examples source" JAVA_PKG_WANT_BOOTCLASSPATH="1.5" @@ -58,4 +52,13 @@ java_prepare() { } EANT_BUILD_TARGET="build" -EANT_DOC_TARGE \ No newline at end of file +EANT_DOC_TARGET="javadoc-dist" +EANT_TEST_TARGET="run.junit" + +src_install() { + java-pkg_dojar "${S}"/../build/standard/standard/lib/*.jar + + use doc && java-pkg_dohtml -r "${S}"/doc/web/* "${S}"/../dist/standard/javadoc/ + use examples && java-pkg_doexamples examples + use source && java-pkg_dosrc "${S}"/src/* +} diff --git a/dev-java/jansi/Manifest b/dev-java/jansi/Manifest index cb7f986936b8..be073ec56bce 100644 --- a/dev-java/jansi/Manifest +++ b/dev-java/jansi/Manifest @@ -1,4 +1,2 @@ DIST jansi-1.1-sources.jar 18401 SHA256 c347970cb7e74832ddc7a37966ec9e1697965200eaaadcf4f1f3f407ad965ce4 SHA512 6f731c3e87b3662ce03a951bea837aa02822cb21ad477e458f8a6ce11b6943fba88d5b6c3786bf47fb9e48d4d30debb4527812fa6c58fe973244ace459b6031d WHIRLPOOL 532adaac74483967079676569c446cfe903a7b22dabffddd4be69dac0c7c4c45ea9bad21fcd5658f5768be68650fe971773a549bcbb6973768a0cd912ba00329 DIST jansi-1.11.tar.gz 252095 SHA256 e5c7bd4d9ccba7a2f191380111960c7bd699a7ffee370891b2ef7f905047cccf SHA512 4a19d52055da3ce08b6d797fb8e8241af86f1b9b30e12f4de24655edbd72d256b310d58fc6e106cae1384f9b0ab99cd7f2128d53296875fba5422bfc0e8410f1 WHIRLPOOL 30bc2f3bcf1f74ed5b939e9cfb2c16e54f41e679a97c9983643207b264ddd8fdaf9a898c188f12ea2e84742c45942946f59dda97de1b76f39da050329ef91c24 -DIST jansi-1.1-sources.jar 18401 SHA256 c347970cb7e74832ddc7a37966ec9e1697965200eaaadcf4f1f3f407ad965ce4 SHA512 6f731c3e87b3662ce03a951bea837aa02822cb21ad477e458f8a6ce11b6943fba88d5b6c3786bf47fb9e48d4d30debb4527812fa6c58fe973244ace459b6031d WHIRLPOOL 532adaac74483967079676569c446cfe903a7b22dabffddd4be69dac0c7c4c45ea9bad21fcd5658f5768be68650fe971773a549bcbb6973768a0cd912ba00329 -DIST jansi-1.11.tar.gz 252095 SHA256 e5c7bd4d9ccba7a2f191380111960c7bd699a7ffee370891b2ef7f905047cccf SHA512 4a19d52055da3ce08b6d797fb8e8241af86f1b9b30e12f4de24655edbd72d256b310d58fc6e106cae1384f9b0ab99cd7f2128d53296875fba5422bfc0e8410f1 WHIRLPOOL 30bc2f3bcf1f74ed5b939e9cfb2c16e54f41e679a97c9983643207b264ddd8fdaf9a898c188f12ea2e84742c45942946f59dda97de1b76f39da050329ef91c24 diff --git a/dev-java/jaxb-tools/Manifest b/dev-java/jaxb-tools/Manifest index efc40aaf9d10..472c8dfabc59 100644 --- a/dev-java/jaxb-tools/Manifest +++ b/dev-java/jaxb-tools/Manifest @@ -1,2 +1 @@ DIST JAXB2_src_20070125.jar 3089194 SHA256 26bec14fa220b111b7153f9889926b86a9cdc8a73aa2541149dadd7d7151afa1 SHA512 5d6c3dec6d7d9010ec6eed1785211338ce781eb13e492fcc7417d9acab6a0259abc7d23e22dc749d201793f632cfabff3f065e422b99f0af9395d881afea81bf WHIRLPOOL 4a7bcfd66383081a831ac4c1dd5fbff3e46dd1247dc59c6840e7bd029d9780b94d0d3f35f836b5d5b596b808970a41d48fbfc49770db9924a797a5766b540123 -DIST JAXB2_src_20070125.jar 3089194 SHA256 26bec14fa220b111b7153f9889926b86a9cdc8a73aa2541149dadd7d7151afa1 SHA512 5d6c3dec6d7d9010ec6eed1785211338ce781eb13e492fcc7417d9acab6a0259abc7d23e22dc749d201793f632cfabff3f065e422b99f0af9395d881afea81bf WHIRLPOOL 4a7bcfd663830 \ No newline at end of file diff --git a/dev-java/jaxp/Manifest b/dev-java/jaxp/Manifest index 564045bbd1e2..40d270ab3ad7 100644 --- a/dev-java/jaxp/Manifest +++ b/dev-java/jaxp/Manifest @@ -1,2 +1 @@ -DIST jaxp-1.4.tar.bz2 644928 SHA256 bc516f8d0673014ed9532eeda67d876996440f7a578f0e4fb464d9aa7d1bb3fe SHA512 d9a0a61a46ec3661eec63fc5a3ff32bde1bba8bc17653c8e05a54f4e36063e9a8b06cf9ce47686f76f08c3858ce4951ff2a85e2fb997cd82088338e2ee519e73 WHIRLPOOL 1afe192d4deed29b5fbc93f5f11f71097c9b9319c68c213988499a525d0e89c6bdd97e8643e1afc560cafd06028179ffAUX build.xml-1.4 458 SHA256 8c2c00c17923070530bfd92f6e8dccce617f121e181024d804cb74f2a259aa66 SHA512 39641a2c61f6d11afb6705cd1a005728a2d81e8b4398babd23c08b90ec5ebd6e18d6c2da98bc095666c58dfc0e9558d21ebf0d9dda72c3c7be873bbf89810fce WHIRLPOOL 72d46c663b3b16dc88001bb30161c9536f583c80132cf284070eb518b00da32878b9d468ec2225f2c126fdc51c0a95d3875f068e66fe0a97fbb48ae939341d4a DIST jaxp-1.4.tar.bz2 644928 SHA256 bc516f8d0673014ed9532eeda67d876996440f7a578f0e4fb464d9aa7d1bb3fe SHA512 d9a0a61a46ec3661eec63fc5a3ff32bde1bba8bc17653c8e05a54f4e36063e9a8b06cf9ce47686f76f08c3858ce4951ff2a85e2fb997cd82088338e2ee519e73 WHIRLPOOL 1afe192d4deed29b5fbc93f5f11f71097c9b9319c68c213988499a525d0e89c6bdd97e8643e1afc560cafd06028179ff23aac317244cadae5aa06a794c8da375 diff --git a/dev-java/jcommon/Manifest b/dev-java/jcommon/Manifest index a9bc2c3aef60..19cbf664f8de 100644 --- a/dev-java/jcommon/Manifest +++ b/dev-java/jcommon/Manifest @@ -1,4 +1,2 @@ DIST jcommon-1.0.16.tar.gz 1130148 SHA256 033fd5506d10dcfc7814180b09627e66232fd1ee29b769fc283aa936d7dd607d SHA512 81152e6d19f10eec2abe7704c8bb138448c25f39dcf42a9379e488e9163db041dec18b9407fca4c94e514801af5373c698d3867facc9887f98fb7d8e18086fae WHIRLPOOL e87eaec68455a89ac538ce9fcd3ccbea70efe6f2e5ccb0033c77b823ca5499686b3aaf7b13b29c4187b8b2c9e864cf1ecca2794d5fa37f6dde40da774c94c2c1 DIST jcommon-1.0.18.tar.gz 1133961 SHA256 a4daf9ed40712bfe9564dcd6eb8392711325aec78fa7c03e57c195f63413e3fd SHA512 83a4dfe7c7f631ee251cd1c133726060d8d380366ba0b39b043327c20e8128fd882b7374448738dcad3e1b6eadc0221242588c15c6feaa3c06101beafe2e79bb WHIRLPOOL cae9c1ff0d3658199378baf2ce58d25710aac17b7bca4d5e31136133868ebb41c6a71fd384a3ba1da2e800d364dd0bf5e70ef768148bbb56d440c78b8fe1e6d4 -DIST jcommon-1.0.16.tar.gz 1130148 SHA256 033fd5506d10dcfc7814180b09627e66232fd1ee29b769fc283aa936d7dd607d SHA512 81152e6d19f10eec2abe7704c8bb138448c25f39dcf42a9379e488e9163db041dec18b9407fca4c94e514801af5373c698d3867facc9887f98fb7d8e18086fae WHIRLPOOL e87eaec68455a89ac538ce9fcd3ccbea70efe6f2e5ccb0033c77b823ca5499686b3aaf7b13b29c4187b8b2c9e864cf1ecca2794d5fa37f6dde40da774c94c2c1 -DIST jcommon-1.0.18.tar.gz 1133961 SHA256 a4daf9ed40712bfe9564dcd6eb8392711325aec78fa7c03e57c195f63413e3fd SHA512 83a4dfe7c7f631ee251cd1c133726060d8d380366ba0b39b043327c20e8128fd882b7374448738dcad3e1b6eadc0221242588c15c6feaa3c06101beafe2e79bb WHIRLPOOL cae9c1ff0d3658199378baf2ce58d25710aac17b7bca4d5e31136133868ebb41c6a71fd384a3ba1da2e800d364dd0bf5e70ef768148bbb56d440c78b8fe1e6d4 diff --git a/dev-java/jigsaw/jigsaw-2.2.6.ebuild b/dev-java/jigsaw/jigsaw-2.2.6.ebuild index c6c81c5ad4c6..69077e3509da 100644 --- a/dev-java/jigsaw/jigsaw-2.2.6.ebuild +++ b/dev-java/jigsaw/jigsaw-2.2.6.ebuild @@ -43,12 +43,20 @@ src_prepare() { epatch "${FILESDIR}/${P}-build.xml.patch" java-pkg_jar-from --into jars/ jakarta-oro-2.0 - java-pkg_jar-from --into jars/ servl# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jigsaw/jigsaw-2.2.6.ebuild,v 1.1 2012/02/23 20:28:22 nelchael Exp $ + java-pkg_jar-from --into jars/ servlet-api-2.3 + java-pkg_jar-from --into jars/ xerces-2 + java-pkg_jar-from --into jars/ jtidy -EAPI=4 + cd jars/ + ln -s $(java-config --tools) +} -JAVA_PKG_IUSE="doc source" +src_install() { + java-pkg_dojar classes/jigsaw.jar + java-pkg_dojar classes/jigadmin.jar + java-pkg_dojar classes/jigedit.jar -# Jigsaw is actually a WWW server, it would be nice to package it as such, not + use doc && java-pkg_dojavadoc ant.build/javadocs + + dodoc ANNOUNCE README +} diff --git a/dev-java/jjtraveler/Manifest b/dev-java/jjtraveler/Manifest index bb72cdcd061b..5e89abbe922a 100644 --- a/dev-java/jjtraveler/Manifest +++ b/dev-java/jjtraveler/Manifest @@ -1,2 +1 @@ DIST JJTraveler-0.4.3.tar.gz 219594 SHA256 e873a57e59661b557bd73181c398c88efa1898dbb277df791cebc6ba6c8a1ad0 SHA512 fcaa2bbc736af95a0477f1d9a39d7d1410505c02214759baf3bed77b45d8bc9667cacbb7fdd954925038b6c67535bcf7af6c264347af18b150240d9796372c32 WHIRLPOOL 1ab5857492393843c7ba44024a165b8dd6a022c04a7a8e71ac3f02d98ac6e86b82c9b05efbfefd124a898a598eb80462606f3829d0a13027e6b6118ac902e94c -DIST JJTraveler-0.4.3.tar.gz 219594 SHA256 e873a57e59661b557bd73181c398c88efa1898dbb277df791cebc6ba6c8a1ad0 SHA512 fcaa2bbc736af95a0477f1d9a39d7d1410505c02214759baf3bed77b45d8bc9667cacbb7fdd954925038b6c67535bcf7af6c264347af18b150240d9796372c32 WHIRLPOOL 1ab5857492393843c7ba44024a165b8dd6a022c04a7a8e71ac3f02d98ac6e86b82c \ No newline at end of file diff --git a/dev-java/jlibeps/Manifest b/dev-java/jlibeps/Manifest index 2663fe2fc079..273339114298 100644 --- a/dev-java/jlibeps/Manifest +++ b/dev-java/jlibeps/Manifest @@ -1,2 +1 @@ DIST jlibeps-0.1-src.zip 85686 SHA256 078fcf9ed6720f693f6eaa669e340e84ab67b938d9cd92357783194596017d44 SHA512 ce28d31d8aafaac2e493fecf8cf95e84ff5076fde7e4d2be8abcca5d849b823ab2b31303fa4f24450ce29aa1bc71f451c880213f820343a98f1aff0036693b5a WHIRLPOOL 0802ba9d4e0560b5bca9ba97112cadaac8d6911acf5774afad98adb106201d1624349d1e84a445c1d818c3bff9319204a5ddb87f4880a3595fe2eac3eedce871 -DIST jlibeps-0.1-src.zip 85686 SHA256 078fcf9ed6720f693f6eaa669e340e84ab67b938d9cd92357783194596017d44 SHA512 ce28d31d8aafaac2e493fecf8cf95e84ff5076fde7e4d2be8abcca5d849b823ab2b31303fa4f24450ce29aa1bc71f451c880213f820343a98f1aff0036693b5a WHIRLPOOL 0802ba9d4e0560b5bca9ba97112cadaac8d6911acf5774afa \ No newline at end of file diff --git a/dev-java/jta/Manifest b/dev-java/jta/Manifest index a9fa87aab444..5ca06c44c759 100644 --- a/dev-java/jta/Manifest +++ b/dev-java/jta/Manifest @@ -1,2 +1 @@ DIST jta-1_0_1B-classes.zip 8812 RMD160 52d00783bc3041dc11b2c21b6e30d038e7860074 SHA1 3dd157a4f4fe115ac5d165d6c21463d0ce9e3c7b SHA256 5bc89d0a1caecd25e9323144624fd26df4326c84da8658f08f5cc588ee25cca9 -MISC ChangeLog 2414 SHA256 c15bc0097f1ca49823865c769f8309781a54b09a273909c3ce44518157e354fa SHA512 75a2fdda4a35a34ab09b750fa861ecdee64bf0faa7303c5d8f0883aea6b92890284c089260677617aaab1f805df0a9316bb3bad065c0243f24e03b9fe249fbfc WHIRLPOOL e3bcd660fc7a2dbbce2a2c81d391b134cf8fa7817533155dc913360dDIST jta-1_0_1B-classes.zip 8812 RMD160 52d00783bc3041dc11b2c21b6e30d038e7860074 SHA1 3dd157a4f4fe115ac5d165d6c21463d0ce9e3c7b SHA256 5bc89d0a1caecd25e9323144624fd26df4326c84da8658f08f5cc588ee25cca9 diff --git a/dev-java/jump/Manifest b/dev-java/jump/Manifest index 837a58cfd13a..2ad6c12d6444 100644 --- a/dev-java/jump/Manifest +++ b/dev-java/jump/Manifest @@ -1,2 +1 @@ DIST jump-0.5.tar.gz 31266 SHA256 608c3ea156cca8ce6890f593467a8b5b41b257479a84178bff8b957ed56ddac0 SHA512 9772ea61e921c4342f0e25a951d74850b9dbdd2bde5de9fabad4d55ddb82b6d09debd478f92f3f8c02a05425244b7eaf12d7b3d7d2876263234bafa27783bba8 WHIRLPOOL 6f32af4aabe2964edc9a450c06d01d7f3d69873cf8d7988826941fa9838e841dd04ea584eca59dd3d1c4dec263f62762ad72a090324f411a63915acd1d8f3140 -DIST jump-0.5.tar.gz 31266 SHA256 608c3ea156cca8ce6890f593467a8b5b41b257479a84178bff8b957ed56ddac0 SHA512 9772ea61e921c4342f0e25a951d74850b9dbdd2bde5de9fabad4d55ddb82b6d09debd478f92f3f8c02a05425244b7eaf12d7b3d7d2876263234bafa27783bba8 WHIRLPOOL 6f32af4aabe2964edc9a450c06d01d7f3d69873cf8d7988826941fa9838e841dd04ea584eca59dd3d1c4dec263f62762ad72a090324f411a63915acd1d8f3140 diff --git a/dev-java/junit-addons/Manifest b/dev-java/junit-addons/Manifest index e86f8ce848f9..dd9340e88aec 100644 --- a/dev-java/junit-addons/Manifest +++ b/dev-java/junit-addons/Manifest @@ -1,2 +1 @@ DIST junit-addons-1.4.zip 293750 SHA256 8a7456eaabf1c3528b8e73c15df1b8a467386cbf3905b1d5df536201f1981990 SHA512 0ddc9a95d80190417c92e86697669020a2947e2211d2394334b80d76bca5397f132d90e00d0c679bf48607fbadf8d1d6e97d3770d06c35cab78c6cada198434a WHIRLPOOL 2bf3c99b31d0eac1d76e8d6bcd8fbd45f668712798d4ba6ecb019762dbdb045ad877497140a83317bfe1439af33a0637e7964023472ae776d7f457c69cc66be3 -DIST junit-addons-1.4.zip 293750 SHA256 8a7456eaabf1c3528b8e73c15df1b8a467386cbf3905b1d5df536201f1981990 SHA512 0ddc9a95d80190417c92e86697669020a2947e2211d2394334b80d76bca5397f132d90e00d0c679bf48607fbadf8d1d6e97d3770d06c35cab78c6cada198434a WHIRLPOOL 2bf3c99b31d0eac1d76e8d6bcd8fbd45f668712798d4ba6ecb019762dbdb045ad877497140a83317bfe1439af33a0637e7964023472ae776d7f457c69cc66be3 diff --git a/dev-java/junit/junit-4.10.ebuild b/dev-java/junit/junit-4.10.ebuild index ac69be244a9b..72570236b407 100644 --- a/dev-java/junit/junit-4.10.ebuild +++ b/dev-java/junit/junit-4.10.ebuild @@ -60,20 +60,28 @@ java_prepare() { # Add Gentoo manifest information to generated JAR files java-ant_xml-rewrite -f build.xml -c \ - -e jar -a manifest -v # Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/junit-4.10.ebuild,v 1.7 2013/06/14 19:51:49 aballier Exp $ + -e jar -a manifest -v "gentoo-manifest.mf" +} -# WARNING: JUNIT.JAR IS _NOT_ SYMLINKED TO ANT-CORE LIB FOLDER AS JUNIT3 IS +src_test() { + mkdir classes || die "Unable to create build directory for tests" -EAPI="3" -JAVA_PKG_IUSE="doc examples source test" + local cp=$(java-pkg_getjars hamcrest-core):${S}/${PN}${PV}/${PN}-dep-${PV}.jar + ejavac -classpath ${cp} -d classes $(find junit/tests org/junit/tests -name "*.java") -inherit java-pkg-2 java-ant-2 + java -classpath ${cp}:classes org.junit.runner.JUnitCore junit.tests.AllTests \ + || die "Tests failed." +} -DESCRIPTION="Simple framework to write repeatable tests" -SRC_URI="mirror://github/KentBeck/${PN}/${PN}${PV}.zip" -HOMEPAGE="http://www.junit.org/" -LICENSE="CPL-1.0" -SLOT="4" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solar \ No newline at end of file +src_install() { + java-pkg_newjar ${PN}${PV}/${PN}-dep-${PV}.jar + dodoc README.html doc/ReleaseNotes${PV}.txt || die + + use examples && java-pkg_doexamples org/junit/samples + use source && java-pkg_dosrc src/main/java/org src/main/java/junit + + if use doc; then + dohtml -r doc/* + java-pkg_dojavadoc ${PN}${PV}/javadoc + fi +} diff --git a/dev-java/jython/files/jython-2.5.2-distutils_byte_compilation.patch b/dev-java/jython/files/jython-2.5.2-distutils_byte_compilation.patch index b3e7537c114d..db90e834f46c 100644 --- a/dev-java/jython/files/jython-2.5.2-distutils_byte_compilation.patch +++ b/dev-java/jython/files/jython-2.5.2-distutils_byte_compilation.patch @@ -41,46 +41,45 @@ it set to None. """ + # nothing is done if PYTHONDONTWRITEBYTECODE environment variable is set -+ if os.environ.get("PYTHONDONTWRITEBYTECODE--- Lib/distutils/tests/test_build_py.py -+++ Lib/distutils/tests/test_build_py.py -@@ -92,6 +92,25 @@ - os.chdir(cwd) - sys.stdout = sys.__stdout__ ++ if os.environ.get("PYTHONDONTWRITEBYTECODE") is not None: ++ raise DistutilsByteCompileError('byte-compiling is disabled.') -+ def test_dont_write_bytecode(self): -+ # makes sure byte_compile is not used -+ pkg_dir, dist = self.create_dist() -+ cmd = build_py(dist) -+ cmd.compile = 1 -+ cmd.optimize = 1 -+ -+ old_dont_write_bytecode = os.environ.get("PYTHONDONTWRITEBYTECODE") -+ os.environ["PYTHONDONTWRITEBYTECODE"] = "1" -+ try: -+ cmd.byte_compile([]) -+ finally: -+ if old_dont_write_bytecode is None: -+ del os.environ["PYTHONDONTWRITEBYTECODE"] -+ else: -+ os.environ["PYTHONDONTWRITEBYTECODE"] = old_dont_write_bytecode + # First, if the caller didn't force us into direct or indirect mode, + # figure out which mode we should be in. We take a conservative +--- Lib/distutils/command/build_py.py ++++ Lib/distutils/command/build_py.py +@@ -418,6 +418,10 @@ + + + def byte_compile (self, files): ++ if os.environ.get("PYTHONDONTWRITEBYTECODE") is not None: ++ self.warn('byte-compiling is disabled, skipping.') ++ return + -+ self.assertTrue('byte-compiling is disabled' in self.logs[0][1]) + from distutils.util import byte_compile + prefix = self.build_lib + if prefix[-1] != os.sep: +--- Lib/distutils/command/install_lib.py ++++ Lib/distutils/command/install_lib.py +@@ -121,6 +121,10 @@ + return outfiles + + def byte_compile (self, files): ++ if os.environ.get("PYTHONDONTWRITEBYTECODE") is not None: ++ self.warn('byte-compiling is disabled, skipping.') ++ return + - def test_suite(): - return unittest.makeSuite(BuildPyTestCase) + from distutils.util import byte_compile ---- Lib/distutils/util.py -+++ Lib/distutils/util.py -@@ -11,6 +11,7 @@ - from distutils.dep_util import newer - from distutils.spawn import spawn - from distutils import log -+from distutils.errors import DistutilsByteCompileError + # Get the "--root" directory supplied to the "install" command, +--- Lib/distutils/errors.py ++++ Lib/distutils/errors.py +@@ -76,6 +76,8 @@ + class DistutilsTemplateError (DistutilsError): + """Syntax error in a file list template.""" - def get_platform (): - """Return a string that identifies the current platform. This is used -@@ -397,6 +398,9 @@ - generated in indirect mode; unless you know what you're doing, leave - it set to None. - """ -+ # nothing is done if PYTHONDONTWRITEBYTECODE envir \ No newline at end of file ++class DistutilsByteCompileError(DistutilsError): ++ """Byte compile error.""" + + # Exception classes used by the CCompiler implementation classes + class CCompilerError (Exception): diff --git a/dev-java/jython/jython-2.1-r11.ebuild b/dev-java/jython/jython-2.1-r11.ebuild index e116fea41242..c201522f937c 100644 --- a/dev-java/jython/jython-2.1-r11.ebuild +++ b/dev-java/jython/jython-2.1-r11.ebuild @@ -53,68 +53,57 @@ src_compile() { ejavac -classpath ${cp} -nowarn $(find org -name "*.java" ${exclude}) - find org -name "*.cla# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.1-r11.ebuild,v 1.11 2012/01/01 12:24:17 sera Exp $ - -inherit base java-pkg-2 + find org -name "*.class" | xargs jar cf ${PN}.jar -DESCRIPTION="An implementation of Python written in Java" -HOMEPAGE="http://www.jython.org" -MY_PV="21" -#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.class" -SRC_URI="mirror://gentoo/${P}.tar.bz2" -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd" -IUSE="readline source doc" -# servlet + # bug 115551 + cd Lib/jxxload_help + ejavac -classpath ${S}/${PN}.jar -nowarn *.java + rm -f *.java Makefile +} -CDEPEND="=dev-java/jakarta-oro-2.0* - readline? ( >=dev-java/libreadline-java-0.8.0 )" -# servlet? ( >=www-servers/tomcat-5.0 ) -RDEPEND=">=virtual/jre-1.4 - ${CDEPEND}" -DEPEND=">=virtual/jdk-1.4 - source? ( app-arch/zip ) - ${CDEPEND}" +src_install() { + java-pkg_dojar ${PN}.jar -src_unpack() { - unpack ${A} - cd ${S} + dodoc README.txt NEWS ACKNOWLEDGMENTS + use doc && java-pkg_dohtml -A .css .jpg .gif -r Doc/* - epatch ${FILESDIR}/${PV}-assert.patch - epatch ${FILESDIR}/${PV}-assert-SimpleCompiler.py.patch + java-pkg_dolauncher jythonc \ + --main "org.python.util.jython" \ + --java_args "-Dpython.home=/usr/share/jython" \ + --pkg_args "/usr/share/jython/tools/jythonc/jythonc.py" - # bug #160861 - rm -rf org/apache -} + java-pkg_dolauncher jython \ + --main "org.python.util.jython" \ + --java_args "-Dpython.home=/usr/share/jython" -src_compile() { - local cp="$(java-pkg_getjars jakarta-oro-2.0)" - local exclude="" + dodir /usr/share/jython/cachedir + chmod a+rw ${D}/usr/share/jython/cachedir - if use readline ; then - cp=${cp}:$(java-pkg_getjars libreadline-java) - else - exclude="${exclude} ! -name ReadlineConsole.java" - fi + rm Demo/jreload/example.jar + insinto /usr/share/${PN} + doins -r Lib Demo registry - #if use servlet; then - # cp=${cp}:$(java-pkg_getjars servlet) - #else - exclude="${exclude} ! -name PyServlet.java" - #fi + insinto /usr/share/${PN}/tools + doins -r Tools/* - ejavac -classpath ${cp} -nowarn $(find org -name "*.java" ${exclude}) + use source && java-pkg_dosrc com org +} - find org -name "*.class" | xargs jar cf ${PN}.jar +pkg_postinst() { + if use readline; then + elog "To use readline you need to add the following to your registry" + elog + elog "python.console=org.python.util.ReadlineConsole" + elog "python.console.readlinelib=GnuReadline" + elog + elog "The global registry can be found in /usr/share/${PN}/registry" + elog "User registry in \$HOME/.jython" + elog "See http://www.jython.org/docs/registry.html for more information" + elog "" + fi - # bug 115551 - cd Lib/jxxload_help - ejavac -classpath ${S}/${PN}.jar -nowarn *.java - rm -f *.java Makefile + elog "This revision renames org.python.core.Py.assert to assert_." + elog "This is the solution that upstream will use in the next release." + elog "Just note that this revision is not API compatible with vanilla 2.1." + elog "https://bugs.gentoo.org/show_bug.cgi?id=142099" } - -src_install() { - java-pkg_ \ No newline at end of file diff --git a/dev-java/mina-core/mina-core-1.1.7.ebuild b/dev-java/mina-core/mina-core-1.1.7.ebuild index 8758218452d3..450175673467 100644 --- a/dev-java/mina-core/mina-core-1.1.7.ebuild +++ b/dev-java/mina-core/mina-core-1.1.7.ebuild @@ -18,8 +18,19 @@ RDEPEND=">=virtual/jre-1.5 dev-java/slf4j-api" DEPEND=">=virtual/jdk-1.5 dev-java/slf4j-api - app-arch/unzi# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/mina-core/mina-core-1.1.7.ebuild,v 1.6 2011/03/25 19:28:22 xarthisius Exp $ + app-arch/unzip" + +S="${WORKDIR}" + +EANT_GENTOO_CLASSPATH="slf4j-api" + +src_unpack() { + unpack ${A} + cp -v "${FILESDIR}"/build.xml . || die +} -JAVA_PKG_IUS \ No newline at end of file +src_install() { + java-pkg_dojar ${PN}.jar + use doc && java-pkg_dojavadoc docs + use source && java-pkg_dosrc org +} diff --git a/dev-java/mockito/mockito-1.9.5-r1.ebuild b/dev-java/mockito/mockito-1.9.5-r1.ebuild index 03bdecc0b670..ac67f9a95548 100644 --- a/dev-java/mockito/mockito-1.9.5-r1.ebuild +++ b/dev-java/mockito/mockito-1.9.5-r1.ebuild @@ -8,17 +8,6 @@ JAVA_PKG_IUSE="doc source" inherit java-pkg-2 java-pkg-simple -DESCRIPTION="A mocking framework for Java" -HOMEPAGE="https://code.google.com/p/m# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/mockito/mockito-1.9.5-r1.ebuild,v 1.1 2013/11/30 17:39:59 ercpe Exp $ - -EAPI="5" - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-pkg-simple - DESCRIPTION="A mocking framework for Java" HOMEPAGE="https://code.google.com/p/mockito/" SRC_URI="https://${PN}.googlecode.com/files/${P}.zip" @@ -32,4 +21,23 @@ IUSE="" CDEPEND="dev-java/junit:4 dev-java/objenesis:0 dev-java/hamcrest-core:0 - \ No newline at end of file + dev-java/ant-core:0" +RDEPEND=">=virtual/jre-1.5 + ${CDEPEND}" +DEPEND=">=virtual/jdk-1.5 + app-arch/unzip + ${CDEPEND}" + +S="${WORKDIR}" + +JAVA_SRC_DIR="src" +JAVA_GENTOO_CLASSPATH="junit-4,objenesis,hamcrest-core,ant-core" + +src_unpack() { + unpack ${A} + unzip "${S}"/sources/${PN}-core-${PV}-sources.jar -d src/ || die +} + +java_prepare() { + find "${S}" -name "*.jar" -delete || die +} diff --git a/dev-java/mockmaker/Manifest b/dev-java/mockmaker/Manifest index 3e3dec9d00a4..c70119525a31 100644 --- a/dev-java/mockmaker/Manifest +++ b/dev-java/mockmaker/Manifest @@ -1,2 +1 @@ DIST mockmaker-1.12.0_p20050104.tar.bz2 263986 SHA256 5feef7ca748e2e167da64459262b08b3824c7f0323419d01820ea1e99add31a9 SHA512 a116f02594a8a1a44ebf0174597c40a441b60dc37cfe077c74afd561ddbe8cc2d6ea1e2b24a37dfea5fe3e85307acddf87d5dbcbdb0a962d43d30fdbe9696373 WHIRLPOOL 7652591f0c05cb14b1504a878afbea4ca24a101d8f87b8d43e0b3b9c6f98974276d73074ae3b0e55b9fabd3a1561f0bf3d598ad79d88c0c1aa65ca4fcc49f66d -DIST mockmaker-1.12.0_p20050104.tar.bz2 263986 SHA256 5feef7ca748e2e167da64459262b08b3824c7f0323419d01820ea1e99add31a9 SHA512 a116f02594a8a1a44ebf0174597c40a441b60dc37cfe077c74afd561ddbe8cc2d6ea1e2b24a37dfea5fe3e85307acddf87d5dbcbdb0a962d43d30fdbe9696373 WHIRLPOOL 7652591f0c05cb14b1504a878afbea4ca24a101d8f87b8d43e0b3b9c6f98974276d73074ae3b0e55b9fabd3a1561f0bf3d598ad79d88c0c1aa65ca4fcc49f66d diff --git a/dev-java/msv/msv-20050627-r2.ebuild b/dev-java/msv/msv-20050627-r2.ebuild index 0c600557d51f..4d3f43c807f3 100644 --- a/dev-java/msv/msv-20050627-r2.ebuild +++ b/dev-java/msv/msv-20050627-r2.ebuild @@ -13,22 +13,38 @@ SRC_URI="mirror://gentoo/${PN}.${PV}.zip" LICENSE="BSD Apache-1.1" SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/msv/msv-20050627-r2.ebuild,v 1.10 2012/01/01 15:35:16 sera Exp $ +KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="" -EAPI=1 -JAVA_PKG_IUSE="doc source" +RDEPEND=">=virtual/jre-1.4 + dev-java/iso-relax:0 + dev-java/relaxng-datatype:0 + dev-java/xml-commons-resolver:0 + dev-java/xerces:2 + dev-java/xsdlib:0" +DEPEND=">=virtual/jdk-1.4 + app-arch/unzip + ${RDEPEND}" -inherit java-pkg-2 eutils java-ant-2 +JAVA_PKG_FILTER_COMPILER="jikes" -DESCRIPTION="Multi-Schema XML Validator, a Java tool for validating XML documents" -HOMEPAGE="http://www.sun.com/software/xml/developers/multischema/ https://msv.dev.java.net/" -SRC_URI="mirror://gentoo/${PN}.${PV}.zip" +src_unpack() { + unpack ${A} + cd "${S}" + cp -i "${FILESDIR}/build-${PVR}.xml" build.xml || die + rm -v *.jar || die -LICENSE="BSD Apache-1.1" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="" + mkdir lib && cd lib + java-pkg_jar-from iso-relax,relaxng-datatype,xerces-2,xml-commons-resolver,xsdlib +} + +EANT_EXTRA_ARGS="-Dproject.name=${PN}" + +src_install() { + java-pkg_dojar dist/${PN}.jar + + dodoc README.txt ChangeLog.txt || die -RDEPEND=">=virtual/jre-1 \ No newline at end of file + use doc && java-pkg_dojavadoc dist/doc/api + use source && java-pkg_dosrc src/* +} diff --git a/dev-java/mx4j-core/files/mx4j-core-3.0.2-split-javadoc-build.patch b/dev-java/mx4j-core/files/mx4j-core-3.0.2-split-javadoc-build.patch index 2b6986edd9e7..9fba649e1f45 100644 --- a/dev-java/mx4j-core/files/mx4j-core-3.0.2-split-javadoc-build.patch +++ b/dev-java/mx4j-core/files/mx4j-core-3.0.2-split-javadoc-build.patch @@ -23,25 +23,23 @@ diff -Nru mx4j-3.0.2.vanilla/build/build.xml mx4j-3.0.2/build/build.xml + -+ - - - - -+ -+ -+ ++ use="true" ++ windowtitle="MX4J API" ++ classpathref="classpath"> ++ + -+ -+ ++ + + + +@@ -468,7 +485,7 @@ + + + +- ++ + + + diff --git a/dev-java/mx4j-core/mx4j-core-3.0.2.ebuild b/dev-java/mx4j-core/mx4j-core-3.0.2.ebuild index a2e3721e533c..c85f5132d792 100644 --- a/dev-java/mx4j-core/mx4j-core-3.0.2.ebuild +++ b/dev-java/mx4j-core/mx4j-core-3.0.2.ebuild @@ -27,24 +27,35 @@ RDEPEND="${RDEPEND} LICENSE="Apache-1.1" SLOT="3.0" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="doc sou# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j-core/mx4j-core-3.0.2.ebuild,v 1.4 2012/12/02 08:29:18 ulm Exp $ - -inherit eutils java-pkg-2 java-ant-2 - -MY_PN="${PN/-core/}" -MY_P="${MY_PN}-${PV}" -DESCRIPTION="Open Source implementation of the JMX and JMX Remote API (JSR 160) specifications" -HOMEPAGE="http://mx4j.sourceforge.net/" -SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}-src.tar.gz" - -# The ${S}/BUILD-HOWTO is a good source for dependencies -# This package could also be built with jdk-1.3; see special -# handling instructions in ${S}/BUILD-HOWTO. - -RDEPEND="dev-java/bcel - dev-java/commons-logging - dev-java/log4j" -DEPEND="${RDEPEND} - \ No newline at end of file +IUSE="doc source" + +S="${WORKDIR}/${MY_P}" + +src_unpack() { + unpack ${A} + + cd "${S}" + epatch "${FILESDIR}/${P}-split-javadoc-build.patch" + + cd "${S}/lib" + java-pkg_jar-from bcel bcel.jar + java-pkg_jar-from commons-logging commons-logging.jar + java-pkg_jar-from log4j +} + +src_compile() { + eant -f build/build.xml compile.jmx compile.rjmx $(use_doc javadocs.core) +} + +src_install() { + java-pkg_dojar dist/lib/*.jar + dodoc README.txt + use doc && java-pkg_dojavadoc dist/docs/api + use source && java-pkg_dosrc "${S}/src/core/*" +} + +pkg_postinst() { + elog "This is a a new split ebuild for just the core jmx to reduce" + elog "dependencies for packages that only require the core. You can" + elog "find the examples in dev-java/mx4j and the tools in dev-java/mx4j-tools" +} diff --git a/dev-java/nachocalendar/Manifest b/dev-java/nachocalendar/Manifest index 220d41e93f29..a050faa22d25 100644 --- a/dev-java/nachocalendar/Manifest +++ b/dev-java/nachocalendar/Manifest @@ -1,2 +1 @@ DIST nachocalendar-src-0.23.tar.bz2 412489 SHA256 e276b0e7bd7abdeb37feebfc72343f48b617dde3644b20ca5f18ad72dac226c0 SHA512 a7b34d1caab2fb26856bd668a80b7f5c57f192be0729f4f9063600866160c26a4163389bf0136c3f101911f4547c5f474800c8e3d96cc77de6febd589564e98b WHIRLPOOL 1657f1c6c47ef7cd7476ce30b033311e2e56f041e2676ec256f81e9b5381716235a3cec45fd6aee98cef769d5ccc18e1fb356414d2bf901218673a17082cfabe -EBUILD nachocalendar-0.23.ebuild 1470 SHA256 78aec9bd05e55d682f6c6bd8eab7746ff29c7f46fce7a065be4fa66275bfc28f SHA512 8f91f964f9c7c39dfeb5c9be217eecc7c9b58304213f95fbaabc6e70d3ce0857491b4536ceb48af6277469380be0159c9696257a5d7edfb787cabac6435a2180 WHIRLPOOL 947fcc954b90305807464e528a898d9ec6597ed948b1b6741c4689776fDIST nachocalendar-src-0.23.tar.bz2 412489 SHA256 e276b0e7bd7abdeb37feebfc72343f48b617dde3644b20ca5f18ad72dac226c0 SHA512 a7b34d1caab2fb26856bd668a80b7f5c57f192be0729f4f9063600866160c26a4163389bf0136c3f101911f4547c5f474800c8e3d96cc77de6febd589564e98b WHIRLPOOL 1657f1c6c47ef7cd7476ce30b033311e2e56f041e2676ec256f81e9b5381716235a3cec45fd6aee98cef769d5ccc18e1fb356414d2bf901218673a17082cfabe diff --git a/dev-java/nailgun/nailgun-0.7.1-r1.ebuild b/dev-java/nailgun/nailgun-0.7.1-r1.ebuild index 29dbda99788a..5260b69b845e 100644 --- a/dev-java/nailgun/nailgun-0.7.1-r1.ebuild +++ b/dev-java/nailgun/nailgun-0.7.1-r1.ebuild @@ -17,31 +17,6 @@ SLOT="0" KEYWORDS="amd64 ~ppc x86" IUSE="test" -RDEPEND=">=virtual/jre-1.4 - !app-editors/ng" -DEPEND=">=virtual/jdk-1.4 - dev-java/java-getopt:1 - dev-java/bcel:0 - dev-java/jakarta-oro:2.0 - dev# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/nailgun/nailgun-0.7.1-r1.ebuild,v 1.3 2012/06/25 05:57:35 jdhore Exp $ - -EAPI="2" - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="a client, protocol, and server for running Java apps without incurring the JVM startup overhead" -HOMEPAGE="http://martiansoftware.com/nailgun/index.html" -SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.zip" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="test" - RDEPEND=">=virtual/jre-1.4 !app-editors/ng" DEPEND=">=virtual/jdk-1.4 @@ -65,4 +40,28 @@ java_prepare() { epatch "${FILESDIR}/${PV}-r1-Makefile.patch" sed -i '//dev/null || die + + insinto ${INSTALL_DIR} + grep -E "/websvccommon$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die + doins -r * + + popd >/dev/null || die + + dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/websvccommon +} diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-7.3.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-7.3.ebuild index 5adf43464918..381111a96180 100644 --- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-7.3.ebuild +++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-7.3.ebuild @@ -17,25 +17,6 @@ KEYWORDS="~amd64 ~x86" IUSE="" S="${WORKDIR}" -CDEPEN# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-websvccommon/netbeans-websvccommon-7.3.ebuild,v 1.1 2013/02/21 15:54:07 fordfrog Exp $ - -EAPI="4" -WANT_ANT_TASKS="ant-nodeps" -inherit eutils java-pkg-2 java-ant-2 - -DESCRIPTION="Netbeans Web Services Common Cluster" -HOMEPAGE="http://netbeans.org/" -SLOT="7.3" -SOURCE_URL="http://download.netbeans.org/netbeans/7.3/final/zip/netbeans-7.3-201302132200-src.zip" -SRC_URI="${SOURCE_URL} - http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.3-build.xml.patch.bz2" -LICENSE="|| ( CDDL GPL-2-with-linking-exception )" -KEYWORDS="~amd64 ~x86" -IUSE="" -S="${WORKDIR}" - CDEPEND="~dev-java/netbeans-platform-${PV} ~dev-java/netbeans-ide-${PV}" DEPEND="virtual/jdk:1.6 @@ -88,4 +69,27 @@ src_prepare() { mkdir "${S}"/nbbuild/netbeans || die pushd "${S}"/nbbuild/netbeans >/dev/null || die - ln -s /usr/shar \ No newline at end of file + ln -s /usr/share/netbeans-platform-${SLOT} platform || die + cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die + touch nb.cluster.platform.built + + ln -s /usr/share/netbeans-ide-${SLOT} ide || die + cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die + touch nb.cluster.ide.built + + popd >/dev/null || die + + java-pkg-2_src_prepare +} + +src_install() { + pushd nbbuild/netbeans/websvccommon >/dev/null || die + + insinto ${INSTALL_DIR} + grep -E "/websvccommon$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die + doins -r * + + popd >/dev/null || die + + dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/websvccommon +} diff --git a/dev-java/relaxng-datatype/files/relaxng-datatype-1.0-build_xml.patch b/dev-java/relaxng-datatype/files/relaxng-datatype-1.0-build_xml.patch index ef9baf8f1967..c77438f5581f 100644 --- a/dev-java/relaxng-datatype/files/relaxng-datatype-1.0-build_xml.patch +++ b/dev-java/relaxng-datatype/files/relaxng-datatype-1.0-build_xml.patch @@ -33,36 +33,39 @@ diff -ru relaxngDatatype-1.0/build.xml relaxngDatatype-1.0-patched/build.xml - - -- -+ - - -- -- -- - -+ - - + manifest="MANIFEST.MF"> + + + -+ - - Manifest-Version: 1.0 - -@@ -24,25 +24,28 @@ - Implementation-Vendor: relaxng.sourceforge.net + ++ + + + ++ - -- + + + + + ++ ++ ++ ++ ++ ++ ++ + diff --git a/dev-java/snappy/files/1.1.0.1-unbundle-snappy.patch b/dev-java/snappy/files/1.1.0.1-unbundle-snappy.patch index 7f6a7145eff9..17fb2e1583ed 100644 --- a/dev-java/snappy/files/1.1.0.1-unbundle-snappy.patch +++ b/dev-java/snappy/files/1.1.0.1-unbundle-snappy.patch @@ -26,19 +26,26 @@ index 0821c87..04f0435 100644 $(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ) -- $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFdiff --git a/Makefile b/Makefile -index 0821c87..04f0435 100644 ---- a/Makefile -+++ b/Makefile -@@ -7,7 +7,8 @@ all: snappy +- $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) ++ $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy + $(STRIP) $@ - SNAPPY_OUT:=$(TARGET)/$(snappy)-$(os_arch) - SNAPPY_ARCHIVE:=$(TARGET)/snappy-$(VERSION).tar.gz --SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy.cc -+#SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy.cc -+SNAPPY_CC:= - SNAPPY_SRC_DIR:=$(TARGET)/snappy-$(VERSION) - SNAPPY_SRC:=$(addprefix $(SNAPPY_SRC_DIR)/,$(SNAPPY_CC)) - SNAPPY_OBJ:=$(addprefix $(SNAPPY_OUT)/,$(patsubst %.cc,%.o,$(SNAPPY_CC)) SnappyNative.o) -@@ -46,7 +47,8 @@ src/main/resources/org/xerial/snappy/SnappyNativeLoader.bytecode: src/main/resou - $(JAVAC) -so \ No newline at end of file + clean-native: +@@ -73,14 +75,15 @@ NATIVE_DLL:=$(NATIVE_DIR)/$(LIBNAME) + + snappy-jar-version:=snappy-java-$(shell $(JAVA) -jar lib/silk-weaver.jar find 'project(artifactId, version)' pom.xml | grep snappy-java | awk '{ print $$2; }') + +-native: $(SNAPPY_UNPACKED) $(NATIVE_DLL) +-snappy: native $(TARGET)/$(snappy-jar-version).jar ++native: $(NATIVE_DLL) ++snappy: native + + $(NATIVE_DLL): $(SNAPPY_OUT)/$(LIBNAME) + @mkdir -p $(@D) + cp $< $@ + @mkdir -p $(NATIVE_TARGET_DIR) + cp $< $(NATIVE_TARGET_DIR)/$(LIBNAME) ++ cp $< $(TARGET)/ + + + $(TARGET)/$(snappy-jar-version).jar: native $(NATIVE_DLL) diff --git a/dev-java/sun-jaf/Manifest b/dev-java/sun-jaf/Manifest index f5d3450f2275..a1a273a87b0a 100644 --- a/dev-java/sun-jaf/Manifest +++ b/dev-java/sun-jaf/Manifest @@ -1,2 +1 @@ DIST sun-jaf-1.1.1.tar.bz2 125305 SHA256 3c61b1390a92b0116c7c43434d1a81eedfcfed7b95017110ba0d9c9ee31b731d SHA512 c7287056514324aa5feeed3d4afaf861869974dd565f7810e0161fe590f070ec894e7005ffac4dd42cf075313237027d7d7c88cbf583e28e05df361536d73001 WHIRLPOOL 2f2fcb4c0b4f649ab6f42ffdf9075b11416e4a09f75760775055ed5dbf0c0a6a633f51738011f87b257dbe552e3aefaba1269ccc8e5fb4d23883432ea08e9856 -MISC ChangeLog 2293 SHA256 cfad40e1641126c26f00adeef38dba3776ff28f58b00bf6ca906920eb3c2b208 SHA512 23403006a7d1a4874b22f2747cc21355b65c099c0ce62a16540125e3fe94ae6e3df52a0fed3e44adc5baeaf36576ecb10a18b228f896d712ade257015db54a53 WHIRLPOOL 7DIST sun-jaf-1.1.1.tar.bz2 125305 SHA256 3c61b1390a92b0116c7c43434d1a81eedfcfed7b95017110ba0d9c9ee31b731d SHA512 c7287056514324aa5feeed3d4afaf861869974dd565f7810e0161fe590f070ec894e7005ffac4dd42cf075313237027d7d7c88cbf583e28e05df361536d73001 WHIRLPOOL 2f2fcb4c0b4f649ab6f42ffdf9075b11416e4a09f75760775055ed5dbf0c0a6a633f51738011f87b257dbe552e3aefaba1269ccc8e5fb4d23883432ea08e9856 diff --git a/dev-java/sun-javamail/sun-javamail-1.4.3.ebuild b/dev-java/sun-javamail/sun-javamail-1.4.3.ebuild index 0b779cba0d52..9b5b65a38ebe 100644 --- a/dev-java/sun-javamail/sun-javamail-1.4.3.ebuild +++ b/dev-java/sun-javamail/sun-javamail-1.4.3.ebuild @@ -36,15 +36,23 @@ src_unpack() { # build.xml expects it here mkdir -p legal/src/main/resources/META-INF || die - cp mail/src/main/resources/META-INF/LICENSE.t# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-javamail/sun-javamail-1.4.3.ebuild,v 1.12 2014/08/10 20:24:39 slyfox Exp $ + cp mail/src/main/resources/META-INF/LICENSE.txt \ + legal/src/main/resources/META-INF || die +} -EAPI=2 -JAVA_PKG_IUSE="doc source" -inherit java-pkg-2 java-ant-2 +java_prepare() { + java-pkg_jar-from --virtual jaf +} -DESCRIPTION="A Java-based framework to build multiplatform mail and messaging applications" -HOMEPAGE="http://java.sun.com/products/javamail/index.html" +EANT_DOC_TARGET="docs" +EANT_EXTRA_ARGS="-Djavaee.jar=activation.jar -Dspec.dir=doc/spec" + +src_install() { + java-pkg_dojar target/release/mail.jar + + dodoc doc/release/{CHANGES,COMPAT,NOTES,README,SSLNOTES,distributionREADME}.txt || die + dohtml -r doc/release/{*.html,images} || die -# error 500 without the double slash, wonder wha \ No newline at end of file + use doc && java-pkg_dojavadoc target/release/docs/javadocs + use source && java-pkg_dosrc mail/src/main/java +} diff --git a/dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild b/dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild index 41751ebacb36..93826489c4a3 100644 --- a/dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild +++ b/dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild @@ -45,5 +45,7 @@ src_install() { java-pkg_dojar lib/*.jar if use doc; then java-pkg_dojavadoc doc/api - java-p# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General \ No newline at end of file + java-pkg_dohtml -r doc/doc doc/index.html + fi + use examples && java-pkg_doexamples examples +} diff --git a/dev-java/swidgets/Manifest b/dev-java/swidgets/Manifest index 37964e3da73a..46503a2b5da5 100644 --- a/dev-java/swidgets/Manifest +++ b/dev-java/swidgets/Manifest @@ -1,2 +1 @@ DIST swidgets-0.1.1-src.zip 60925 SHA256 adee6311304c67cba2ab9238112b941656c0ca6a9b3a3f0c526d5ef8abec0f5c SHA512 2dcc7e1ffefadb1df96e8d5c7d134b0496169689d1fd9bbcb38af7d0e0be3fa4b358901f4871155afe23f7be8cc097d88752c1f6d2816c8aac507795859eb9db WHIRLPOOL a3743769776b2305552c7925dfdaa488cc9d80fae1de4988f837ad0a1422edb7a775033a64c6dd78775e6f9cf0678813adccf6954142010075b34f4f515268ce -DIST swidgets-0.1.1-src.zip 60925 SHA256 adee6311304c67cba2ab9238112b941656c0ca6a9b3a3f0c526d5ef8abec0f5c SHA512 2dcc7e1ffefadb1df96e8d5c7d134b0496169689d1fd9bbcb38af7d0e0be3fa4b358901f4871155afe23f7be8cc097d88752c1f6d2816c8aac507795859eb9db WHIRLPOOL a3743769776b2305552c7925dfdaa488cc9d80fae1de4988f837ad0a1422edb7a775033a64c6dd78775e6f9cf0678813adccf6954142010075b34f4f515268ce diff --git a/dev-java/swing-worker/Manifest b/dev-java/swing-worker/Manifest index 0c6006a3681e..578147585bb8 100644 --- a/dev-java/swing-worker/Manifest +++ b/dev-java/swing-worker/Manifest @@ -1,2 +1 @@ DIST swing-worker-src-1.1.zip 26379 SHA256 d412b64b45914a2d26b54840e9eeb3f807c9da32d2d2c832cd72e5767df9e8e7 SHA512 58f963bb9d2960fe886afeec8f945a80253244b940ec58df186026dcff7f20be84035ad87093b72a54447010dd1dc55d4d4237c3a1e000c20bf0644bf7374994 WHIRLPOOL 60ec5806639fe07bc02c53164c23298e7f48f904c229bd2ab420b2a7ffe5ab1a31b75d2d53e45954142403ed54dbaba2037bad58b31336e9204d71db320ca850 -MISC metadata.xml 313 SHA256 e02d012c99cdc0bad8a8d44e99426f380e82856c09ac06218d3f0a621a889cad SHA512 294f0027f6bcd55dbe64ddfb84c9f8168101ca4320b8324668d8f2a32b4a9014e0c7674be386f9ceDIST swing-worker-src-1.1.zip 26379 SHA256 d412b64b45914a2d26b54840e9eeb3f807c9da32d2d2c832cd72e5767df9e8e7 SHA512 58f963bb9d2960fe886afeec8f945a80253244b940ec58df186026dcff7f20be84035ad87 \ No newline at end of file diff --git a/dev-java/swingx/Manifest b/dev-java/swingx/Manifest index 3049dc0b8f3b..6f3390918230 100644 --- a/dev-java/swingx/Manifest +++ b/dev-java/swingx/Manifest @@ -1,4 +1,2 @@ DIST swingx-all-1.6.4-sources.jar 1296323 SHA256 e6ce0e1ac0ef16776a55f32fac17a39219577437ace6fa7f1eb96e885e1a6bf5 SHA512 d58964507b3e11b74089040f07699076c84520ab46feb8cb6aeea3e0f23c0cdb14f66d2c019ff8f7f0e911599efe543a47c103f7b1fc4829a483d65458f3fb55 WHIRLPOOL 780c0e19b733a1a2b45f9c50a3de99b4b251a4bf90b3622142e6b37507ae5155f014e7e3e886c4f104638c7fea7eb667ccdaef1346dedbae529812c12323187a DIST swingx-mavensupport-1.6.4-sources.jar 2793 SHA256 4ca7f1a31e84e2f92581505c453c8d2236260da9ebe15e2b864416fb686b34a0 SHA512 48fde1b0367373516e549919912f08e751fc4e0f964a9f8ae86d9d93813006253782ce2097e54663dd5eb639ab82dbf59fe61defedecd64a0e36e25a14a40d45 WHIRLPOOL 217ab4b5d8014dbb3ad536d376411e47ab32b6e1f4e91bceb3d4fc58f6fff1804b035a4d080a078a59c39c0af990d7400ee7eedb18593d236f4f88effb7bd8cc -DIST swingx-all-1.6.4-sources.jar 1296323 SHA256 e6ce0e1ac0ef16776a55f32fac17a39219577437ace6fa7f1eb96e885e1a6bf5 SHA512 d58964507b3e11b74089040f07699076c84520ab46feb8cb6aeea3e0f23c0cdb14f66d2c019ff8f7f0e911599efe543a47c103f7b1fc4829a483d65458f3fb55 WHIRLPOOL 780c0e19b733a1a2b45f9c50a3de99b4b251a4bf90b3622142e6b37507ae5155f014e7e3e886c4f104638c7fea7eb667ccdaef1346dedbae529812c12323187a -DIST swingx-mavensupport-1.6.4-sources.jar 2793 SHA256 4ca7f1a31e84e2f92581505c453c8d2236260da9ebe15e2b864416fb68 \ No newline at end of file diff --git a/dev-java/xstream/Manifest b/dev-java/xstream/Manifest index ee8dd0590008..7b2a3d2133da 100644 --- a/dev-java/xstream/Manifest +++ b/dev-java/xstream/Manifest @@ -1,2 +1 @@ DIST xstream-distribution-1.3.1-src.zip 7505723 SHA256 df645ea4e2e16c4a149fb45966ea50d48b54776ead4727837348195daad94f6b SHA512 c8c92879a26599d7444fce0638ba13d185fd3c1f42962b92fe1b984d2ea41f8e434acb6af5613ac9f44354816fb7abc60f751f864f36deb9c2413b0caec5c2ac WHIRLPOOL 13ac006402bbecbf6d3ff9fe30662cc6e3807cdf3a391255f878cea37800842adc929914f2e4aace3a7788294809afb26edd64181f85a7e5dc46f3e1f9c0e9b6 -DIST xstream-distribution-1.3.1-src.zip 7505723 SHA256 df645ea4e2e16c4a149fb45966ea50d48b54776ead4727837348195daad94f6b SHA512 c8c92879a26599d7444fce0638ba13d185fd3c1f42962b92fe1b984d2ea41f8e434acb6af5613ac9f44354816fb7abc60f751f864f36deb9c2413b0caec5c2ac WHIRLPOOL 13ac006402bbecbf6d3ff9fe30662 \ No newline at end of file diff --git a/dev-java/yanfs/Manifest b/dev-java/yanfs/Manifest index 05929780bdb8..f671d043edee 100644 --- a/dev-java/yanfs/Manifest +++ b/dev-java/yanfs/Manifest @@ -1,2 +1 @@ DIST yanfs-1.0.tar.bz2 107232 SHA256 b1332f97391cf91e544c2668e2a1d81e4d4c76d3bd84b348bbe448eb58a7b719 SHA512 e7031ba630360240de136f588c337a3a4b551320f5e121c1910fc58ba08c7b7c6fe95fb87b57263c19e00a3e44fe81c36d9e8e8971d4fdf910bb3797c0a1eeeb WHIRLPOOL 05ecf92100f3fa760ba694659e8f401e69adbbef8ba31e5dbf36bfd81b387afc1bfc2d335dfe6d0f321579813fd0f9a60ead5db7b7450b3e71e80579ddd89713 -DIST yanfs-1.0.tar.bz2 107232 SHA256 b1332f97391cf91e544c2668e2a1d81e4d4c76d3bd84b348bbe448eb58a7b719 SHA512 e7031ba630360240de136f588c337a3a4b551320f5e121c1910fc58ba08c7b7c6fe95fb87b57263c19e00a3e44fe81c36d9e8e8971d4fdf910bb3797c0a1eeeb WHIRLPOOL 05ecf92100f3fa760ba694659e8f401e69adbbef8ba31e5dbf36bfd81b387afc1bfc2d335dfe6d0f321579813fd0f9a60ead5db7b7450b3e71e80579ddd89713 diff --git a/dev-lang/gnat-gcc/gnat-gcc-4.3.5.ebuild b/dev-lang/gnat-gcc/gnat-gcc-4.3.5.ebuild index 44ba32dd560a..739880529d91 100644 --- a/dev-lang/gnat-gcc/gnat-gcc-4.3.5.ebuild +++ b/dev-lang/gnat-gcc/gnat-gcc-4.3.5.ebuild @@ -41,29 +41,30 @@ src_unpack() { # newly added zlib dir is processed by configure even with # --with-systtem-zlib passed, causing toruble on multilib - rm -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat-gcc/gnat-gcc-4.3.5.ebuild,v 1.7 2014/08/05 11:42:10 armin76 Exp $ - -# Need to let configure know where to find stddef.h -#EXTRA_CONFGCC="${WORKDIR}/usr/lib/include/" - -inherit gnatbuild - -DESCRIPTION="GNAT Ada Compiler - gcc version" -HOMEPAGE="http://gcc.gnu.org/" -LICENSE="GMGPL" - -IUSE="" - -# using new bootstrap -BOOT_SLOT="4.3" - -# SLOT is set in gnatbuild.eclass, depends only on PV (basically SLOT=GCCBRANCH) -# so the URI's are static. -SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/gcc-${PV}/gcc-core-${PV}.tar.bz2 - ftp://gcc.gnu.org/pub/gcc/releases/gcc-${PV}/gcc-ada-${PV}.tar.bz2 - amd64? ( http://dev.gentoo.org/~george/src/gnatboot-${BOOT_SLOT}-amd64.tar.bz2 ) - sparc? ( http://dev.gentoo.org/~george/src/gnatboot-${BOOT_SLOT}-sparc.tar.bz2 ) - x86? ( http://dev.gentoo.org/~george/src/gnatboot-${BOOT_SLOT}-i686.tar.bz2 ) - ppc? \ No newline at end of file + rm -rf "${S}"/zlib + + #fixup some hardwired flags + cd "${S}"/gcc/ada + + # universal gcc -> gnatgcc substitution occasionally produces lines too long + # and then build halts on the style check. + # + # The sed in makegpr.adb is actually not for the line length but rather to + # "undo" the fixing, Last3 is matching just that - the last three characters + # of the compiler name. + sed -i -e 's:(Last3 = "gnatgcc"):(Last3 = "gcc"):' makegpr.adb && + sed -i -e 's:and Nam is "gnatgcc":and Nam is "gcc":' osint.ads || + die "reversing [gnat]gcc substitution in comments failed" + + # looks like wrapper has problems with all the quotation + sed -i -e "/-DREVISION/d" -e "/-DDEVPHASE/d" \ + -e "s: -DDATESTAMP=\$(DATESTAMP_s)::" "${S}"/gcc/Makefile.in + sed -i -e "s: DATESTAMP DEVPHASE REVISION::" \ + -e "s:PKGVERSION:\"\":" "${S}"/gcc/version.c +} + +src_compile() { + # looks like gnatlib_and_tools and gnatlib_shared have become part of + # bootstrap + gnatbuild_src_compile configure make-tools bootstrap +} diff --git a/dev-lang/gwydion-dylan-bin/Manifest b/dev-lang/gwydion-dylan-bin/Manifest index adf1bf718370..7ce67e0276d5 100644 --- a/dev-lang/gwydion-dylan-bin/Manifest +++ b/dev-lang/gwydion-dylan-bin/Manifest @@ -1,2 +1 @@ DIST gwydion-dylan-bin-2.4.0-x86.tbz2 5846864 SHA256 2767f0bfa127eb57cc8cd52fa0446e43ec71d2bfc584a7d39b03c12f8c3ca0db SHA512 878c68f922fd02a2f5d6a64d94706d878502c143a02e34dc325e68f3881fcbea2a71a81f000ee0d40d494f6e7cf3f4aeef5208ea2efb62b24e6b7afdf7d87070 WHIRLPOOL 765f89606bd1b99cd40836a6dd42c844888a50f239ab0c94acdc001c7e3a465be218b6ca51efbe3d7db6c7ac67fce34036c547d74529d01fc7888d7270d01d43 -DIST gwydion-dylan-bin-2.4.0-x86.tbz2 5846864 SHA256 2767f0bfa127eb57cc8cd52fa0446e43ec71d2bfc584a7d39b03c12f8c3ca0db SHA512 878c68f922fd02a2f5d6a64d94706d878502c143a02e34dc325e68f3881fcbea2a71a81f000ee0d40d494f6e7cf3f4aeef5208ea2efb62b24e6b7afdf7d87070 WHIRLPOOL 765f89606bd1b99cd40836a6dd42c844888a50f239ab0c94acdc001c7e3a465be218b6ca51efbe3d7db6c7ac67fce34036c547d74529d01fc7888d7270d01d43 diff --git a/dev-lang/helium/Manifest b/dev-lang/helium/Manifest index 80dde5c24632..e0dd6c155d09 100644 --- a/dev-lang/helium/Manifest +++ b/dev-lang/helium/Manifest @@ -1,3 +1,2 @@ -DIST helium-1.6-ghc.patch.bz2 34579 SHA256 da463fe2a27689ec702eaf7c687446272f983845228cbb45d0fa91e1542cd7ab SHA512 ac86750a98d3c87cb00e8777ad0e5a838df9d87ebdd8540d1c5a297a8488c810acbecf4d665ef7754da0f99729785f48fb77d24fc09f3c963fe972e06dc952c8 WHIRLPOOL 516bba56AUX helium-1.6-respect-cflags-ldflags-nostrip.patch 1847 SHA256 333b77e13e38d7639e79251d32346c9f1857d2b6585ec2c85ec2b325c13ca34e SHA512 cd3f176f618cc32bb4feb1b693e9b281e388897380172c85645b478d6be79b164e57754b5c7cb58bc55b956644323900bb6bca5bfa74b28857a69f9eeeb52635 WHIRLPOOL 406de1a3a23c089e9bc4936f487522c9df81eab741ec5cb52c2885e295398984d5a734993fc4665de4faedd1d853810de798ed4811547ada34fe171c5067e813 DIST helium-1.6-ghc.patch.bz2 34579 SHA256 da463fe2a27689ec702eaf7c687446272f983845228cbb45d0fa91e1542cd7ab SHA512 ac86750a98d3c87cb00e8777ad0e5a838df9d87ebdd8540d1c5a297a8488c810acbecf4d665ef7754da0f99729785f48fb77d24fc09f3c963fe972e06dc952c8 WHIRLPOOL 516bba56183eeeede84d3974c725024d90df92f280692ba921cea627044fe95dc2fd93eb20aea94f3476569a68a7ea6fc4141274e3f5d38abd5637fe85a86e93 DIST helium-1.6-src.tar.gz 960254 SHA256 a93632d031a16c0ea516f4fa7ce63acd0950543c74265e22abd0993856a0a053 SHA512 f102c5a4f669cb0b7fecdf3efdf9dacf0cddb97e9bf5cbdebd0801169802dbfefbe3de08d3f36c1c66a3839a3b080e241840f5135eea40860a91157815026a95 WHIRLPOOL c1f76f87e37d8bcf41a8c919ee5306dc9067a09af55b7bbd66363d14865eddf010d04d5fb9e01a15c71b2bcd6fea44cfb0399758e79aad905d72f879aec80a50 diff --git a/dev-lang/icon/Manifest b/dev-lang/icon/Manifest index 0982bf0717c6..178e7a808893 100644 --- a/dev-lang/icon/Manifest +++ b/dev-lang/icon/Manifest @@ -1,3 +1,2 @@ -DIST icon-v950src.tgz 3115766 SHA256 ceb558bcf5b2edc3252b2d1d4ed640d2a218196f73d299b052f1e0c50e9b1557 SHA512 32f01ca65863525d92846b505ea61f6fbad5a11991d0476c5e79647459dee12746b4448f8d32f2766c198b6713587e48eb0f7f2a942ce42a929f080a85039fa3 WHIRLPOOL 641db3d8d6cc384772649-----BEGIN PGP SIGNED MESSAGE----- DIST icon-v950src.tgz 3115766 SHA256 ceb558bcf5b2edc3252b2d1d4ed640d2a218196f73d299b052f1e0c50e9b1557 SHA512 32f01ca65863525d92846b505ea61f6fbad5a11991d0476c5e79647459dee12746b4448f8d32f2766c198b6713587e48eb0f7f2a942ce42a929f080a85039fa3 WHIRLPOOL 641db3d8d6cc384772649cd0a80884ea9bbb7027df772b19ea6216f164bc589ffc1331cc80447483455e05f54405ed18af0ce69d9d48d4ea7d42ff1b341811c0 DIST icon.v943src.tgz 3218627 SHA256 d6b6dc508922251748c4ceefbc3a96b54a9f488e260f9f517b5e08dc21615bff SHA512 9f89c7f1aaea1caea586aeb1ef74346a0f258c26ae74581a9ce7b59c2b590eb79316bdb9530b70d9af59ad06e6c444eec92016d0e5b015f4d467bde0baac2695 WHIRLPOOL e776f088ed6a4db10f9defc11a71187cdef4c6ca50b89f80c035b2981c650999cc27bebeab57b99b495653d42af2e34ea5827d6744d4b8f265c7d1883e864437 diff --git a/dev-lang/parrot/parrot-6.3.0.ebuild b/dev-lang/parrot/parrot-6.3.0.ebuild index 2686145ab55c..e6d1f074f8d6 100644 --- a/dev-lang/parrot/parrot-6.3.0.ebuild +++ b/dev-lang/parrot/parrot-6.3.0.ebuild @@ -38,40 +38,45 @@ src_configure() { use gdbm || myconf+=" --without-gdbm" use nls || myconf+=" --without-gettext" use gmp || myconf+=" --without-gmp" - # Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/parrot-6.3.0.ebuild,v 1.1 2014/04/18 02:52:04 patrick Exp $ - -EAPI=5 - -inherit eutils multilib - -# weird failures -RESTRICT="test" - -DESCRIPTION="Virtual machine designed to efficiently compile and execute bytecode for dynamic languages" -HOMEPAGE="http://www.parrot.org/" -SRC_URI="ftp://ftp.parrot.org/pub/parrot/releases/all/${PV}/${P}.tar.gz" - -LICENSE="Artistic-2" -SLOT="0/6.1.0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="opengl nls doc examples gdbm gmp ssl +unicode pcre" - -RDEPEND="sys-libs/readline - opengl? ( media-libs/freeglut ) - nls? ( sys-devel/gettext ) - unicode? ( >=dev-libs/icu-2.6:= ) - gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) - gmp? ( >=dev-libs/gmp-4.1.4 ) - ssl? ( dev-libs/openssl ) - pcre? ( dev-libs/libpcre ) - doc? ( dev-perl/JSON )" - -DEPEND="dev-lang/perl[doc?] - ${RDEPEND}" - -src_configure() { - myconf="--disable-rpath" - use unicode || myconf+=" --without-icu" - use ssl || myconf+=" --without-crypto" + use opengl || myconf+=" --without-opengl" + use pcre || myconf+=" --without-pcre" + + perl Configure.pl \ + --ccflags="${CFLAGS}" \ + --linkflags="${LDFLAGS}" \ + --prefix="${EPREFIX}"/usr \ + --libdir="${EPREFIX}"/usr/$(get_libdir) \ + --mandir="${EPREFIX}"/usr/share/man \ + --sysconfdir="${EPREFIX}"/etc \ + --sharedstatedir="${EPREFIX}"/var/lib/parrot \ + $myconf || die +} + +src_compile() { + export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"${S}"/blib/lib + # occasionally dies in parallel make + emake -j1 || die + if use doc ; then + emake -j1 html || die + fi +} + +src_test() { + emake -j1 test || die +} + +src_install() { + emake -j1 install-dev DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" || die + dodoc CREDITS DONORS.pod PBC_COMPAT PLATFORMS RESPONSIBLE_PARTIES TODO || die + if use examples; then + insinto "/usr/share/doc/${PF}/examples" + doins -r examples/* || die + fi + if use doc; then + insinto "/usr/share/doc/${PF}/editor" + doins -r editor || die + cd docs/html + dohtml -r developer.html DONORS.pod.html index.html ops.html parrotbug.html pdds.html \ + pmc.html tools.html docs src tools || die + fi +} diff --git a/dev-lang/parrot/parrot-6.5.0.ebuild b/dev-lang/parrot/parrot-6.5.0.ebuild index 8307f746397a..da4704d5f347 100644 --- a/dev-lang/parrot/parrot-6.5.0.ebuild +++ b/dev-lang/parrot/parrot-6.5.0.ebuild @@ -9,17 +9,6 @@ inherit eutils multilib # weird failures RESTRICT="test" -DESCRIPTION="Virtual machine designed to e# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/parrot-6.5.0.ebuild,v 1.1 2014/06/27 06:34:08 patrick Exp $ - -EAPI=5 - -inherit eutils multilib - -# weird failures -RESTRICT="test" - DESCRIPTION="Virtual machine designed to efficiently compile and execute bytecode for dynamic languages" HOMEPAGE="http://www.parrot.org/" SRC_URI="ftp://ftp.parrot.org/pub/parrot/releases/all/${PV}/${P}.tar.gz" @@ -79,4 +68,15 @@ src_test() { src_install() { emake -j1 install-dev DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" || die dodoc CREDITS DONORS.pod PBC_COMPAT PLATFORMS RESPONSIBLE_PARTIES TODO || die - if use e \ No newline at end of file + if use examples; then + insinto "/usr/share/doc/${PF}/examples" + doins -r examples/* || die + fi + if use doc; then + insinto "/usr/share/doc/${PF}/editor" + doins -r editor || die + cd docs/html + dohtml -r developer.html DONORS.pod.html index.html ops.html parrotbug.html pdds.html \ + pmc.html tools.html docs src tools || die + fi +} diff --git a/dev-lang/path64/path64-1.0.0_pre20120223.ebuild b/dev-lang/path64/path64-1.0.0_pre20120223.ebuild index 6704acfd82a6..22120bd1ce9d 100644 --- a/dev-lang/path64/path64-1.0.0_pre20120223.ebuild +++ b/dev-lang/path64/path64-1.0.0_pre20120223.ebuild @@ -8,21 +8,6 @@ MY_MIRROR=http://dev.gentoo.org/~xarthisius/distfiles inherit cmake-utils multilib toolchain-funcs -DESCRIPTION="Path64 Compiler Suite Community Edition" -HOMEPAGE="http://www.pathscale.com/ekopath-compiler-suite" -SRC_URI="${MY_MIRROR}/${PN}-suite-${PV}.tbz2 - ${MY_MIRROR}/${PN}-compiler-${PV}.tbz2 - assembler? ( ${MY_MIRROR}/${PN}-assembler-${PV}.tbz2 ) - debugger? ( ${MY_MI# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/path64/path64-1.0.0_pre20120223.ebuild,v 1.1 2012/02/23 12:57:51 xarthisius Exp $ - -EAPI=4 -CMAKE_VERBOSE=1 -MY_MIRROR=http://dev.gentoo.org/~xarthisius/distfiles - -inherit cmake-utils multilib toolchain-funcs - DESCRIPTION="Path64 Compiler Suite Community Edition" HOMEPAGE="http://www.pathscale.com/ekopath-compiler-suite" SRC_URI="${MY_MIRROR}/${PN}-suite-${PV}.tbz2 @@ -86,4 +71,24 @@ src_configure() { -DPATH64_ENABLE_TARGETS="x86_64" -DPATH64_ENABLE_PROFILING=ON -DPATH64_ENABLE_MATHLIBS=ON - -DPATH64_ENABLE_PATHOP \ No newline at end of file + -DPATH64_ENABLE_PATHOPT2=OFF + $(cmake-utils_use assembler PATH64_ENABLE_PATHAS) + $(cmake-utils_use assembler PATH64_ENABLE_DEFAULT_PATHAS) + $(cmake-utils_use fortran PATH64_ENABLE_FORTRAN) + $(cmake-utils_use openmp PATH64_ENABLE_OPENMP) + $(cmake-utils_use debugger PATH64_ENABLE_PATHDB) + $(cmake-utils_use valgrind PATH64_ENABLE_VALGRIND) + -DPSC_CRT_PATH_x86_64=/usr/$(get_libdir) + -DPSC_CRTBEGIN_PATH=$(dirname ${libgcc}) + -DPSC_DYNAMIC_LINKER_x86_64=${linker} + -DCMAKE_C_COMPILER="$(tc-getCC)" + -DCMAKE_CXX_COMPILER="$(tc-getCXX)" + "${flags[@]}" + ) + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + doenvd "98${PN}" +} diff --git a/dev-lang/pike/Manifest b/dev-lang/pike/Manifest index 168d2cb1cef6..3dfd419a9640 100644 --- a/dev-lang/pike/Manifest +++ b/dev-lang/pike/Manifest @@ -1,4 +1,2 @@ DIST Pike-v7.6.86.tar.gz 14996353 SHA256 d81cd34cb0dd7a8077ef46d3d3718d2eb642380157b36943d87b6258c8429a5f SHA512 993c8fc9b7a0527c64f51460428f9afadd9ebbc1648d9f8a117a0f2e2d2bba8f2101d6d0cb24013e84750b705cf816a9c0cdf8c0d2324ce3b8b77b38818b979d WHIRLPOOL 69a0759ed142a35721c12b055d72d0f4a4382586a06b5e043878528a4c4443dfb8a78f25aeecf26b2d180110584b7dc53dd62c16228e170cb997eebffd2af79b -DIST Pike-v7.8.352.tar.gz 14073178 SHA256 d7b12baf0f6a7e9fabd369380814bcc946ca2c3d0992f9a181718fc97ed52d37 SHA512 f33f636de73592e0280ee757e8affd5d7497bd6711d382b5c64e0f958873759474bf49094dd1d3273879bce1550-----BEGIN PGP SIGNED MESSAGE----- -DIST Pike-v7.6.86.tar.gz 14996353 SHA256 d81cd34cb0dd7a8077ef46d3d3718d2eb642380157b36943d87b6258c8429a5f SHA512 993c8fc9b7a0527c64f51460428f9afadd9ebbc1648d9f8a117a0f2e2d2bba8f2101d6d0cb24013e84750b705cf816a9c0cdf8c0d2324ce3b8b77b38818b979d WHIRLPOOL 69a0759ed142a35721c12b055d72d0f4a4382586a06b5e043878528a4c4443dfb8a78f25aeecf26b2d180110584b7dc53dd62c16228e170cb997eebffd2af79b DIST Pike-v7.8.352.tar.gz 14073178 SHA256 d7b12baf0f6a7e9fabd369380814bcc946ca2c3d0992f9a181718fc97ed52d37 SHA512 f33f636de73592e0280ee757e8affd5d7497bd6711d382b5c64e0f958873759474bf49094dd1d3273879bce1550461be154c80166398fa0cc4d4ea14fd722ef5 WHIRLPOOL b1546c3e45e0756a8cb8b407ff6b420d7bc3b8b990246271d3e9c21b3556fbcffacec18b75fcbce67305553ae3ed4786d0761404771477280e9310a48982465d diff --git a/dev-lang/yap/yap-6.2.2.ebuild b/dev-lang/yap/yap-6.2.2.ebuild index 9721a70b9cf5..a7cd4ecdebca 100644 --- a/dev-lang/yap/yap-6.2.2.ebuild +++ b/dev-lang/yap/yap-6.2.2.ebuild @@ -88,19 +88,19 @@ src_install() { insinto /usr/share/doc/${PF}/examples/clib doins packages/clib/demo/* || die insinto /usr/share/doc/${PF}/examples/http -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-6.2.2.ebuild,v 1.10 2014/08/10 20:32:33 slyfox Exp $ - -EAPI=2 - -inherit eutils flag-o-matic java-pkg-opt-2 multilib - -PATCHSET_VER="2" - -DESCRIPTION="YAP is a high-performance Prolog compiler" -HOMEPAGE="http://www.dcc.fc.up.pt/~vsc/Yap/" -SRC_URI="http://www.dcc.fc.up.pt/~vsc/Yap/${P}.tar.gz - mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz" - -LICENSE="Artistic LGPL-2" \ No newline at end of file + doins -r packages/http/examples/* || die + insinto /usr/share/doc/${PF}/examples/plunit + doins packages/plunit/examples/* || die + if use java ; then + insinto /usr/share/doc/${PF}/examples/jpl/prolog + doins packages/jpl/examples/prolog/* || die + insinto /usr/share/doc/${PF}/examples/jpl/java + doins packages/jpl/examples/java/README || die + doins -r packages/jpl/examples/java/*/*.{java,pl} || die + fi + if use mpi ; then + insinto /usr/share/doc/${PF}/examples/mpi + doins library/mpi/examples/*.pl || die + fi + fi +} diff --git a/dev-libs/bglibs/files/bglibs-1.104-parallel-fix.patch b/dev-libs/bglibs/files/bglibs-1.104-parallel-fix.patch index 28013bf538fa..d0717c2dd0f3 100644 --- a/dev-libs/bglibs/files/bglibs-1.104-parallel-fix.patch +++ b/dev-libs/bglibs/files/bglibs-1.104-parallel-fix.patch @@ -1,4 +1,4 @@ -Fixes for parallFixes for parallel compile. +Fixes for parallel compile. - Redirection straight to an output target that is later used for dependancies is not safe. The output file must be come into existence atomically. @@ -84,4 +84,4 @@ Signed-off-by: Robin H. Johnson +libraries: libs-shared libs-static libvmailmgr.a: makelib vmailmgr/req_arg.o vmailmgr/req_init.o vmailmgr/req_write.o vmailmgr/resp_read.o vmailmgr/vpwentry_export.o vmailmgr/vpwentry_free.o vmailmgr/vpwentry_import.o - ./makelib libvmailmgr.a vmailmgr/req_arg.o vmailmgr/req_init.o vmailmgr/req_write.o vmailmgr/resp_read.o vmailmgr/vpwentry_export.o vmailmgr/vpwentry_free.o vmailmgr/vp \ No newline at end of file + ./makelib libvmailmgr.a vmailmgr/req_arg.o vmailmgr/req_init.o vmailmgr/req_write.o vmailmgr/resp_read.o vmailmgr/vpwentry_export.o vmailmgr/vpwentry_free.o vmailmgr/vpwentry_import.o diff --git a/dev-libs/btparse/btparse-0.35.ebuild b/dev-libs/btparse/btparse-0.35.ebuild index 5aac03f343dc..a24b70c3e4dd 100644 --- a/dev-libs/btparse/btparse-0.35.ebuild +++ b/dev-libs/btparse/btparse-0.35.ebuild @@ -3,8 +3,16 @@ # $Header: /var/cvsroot/gentoo-x86/dev-libs/btparse/btparse-0.35.ebuild,v 1.4 2012/04/23 17:39:25 mgorny Exp $ DESCRIPTION="A C library to parse Bibtex files" -HOMEP# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/btparse/btparse-0.35.ebuild,v 1.4 2012/04/23 17:39:25 mgorny Exp $ +HOMEPAGE="http://www.gerg.ca/software/btOOL/" +SRC_URI="mirror://cpan/authors/id/A/AM/AMBS/btparse/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~sparc ~x86" +IUSE="" + +DEPEND="" -DESCRIPTION="A C library to parse Bibtex \ No newline at end of file +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" +} diff --git a/dev-libs/check/check-0.9.11.ebuild b/dev-libs/check/check-0.9.11.ebuild index 61ac2e40ce77..d1261b73d95c 100644 --- a/dev-libs/check/check-0.9.11.ebuild +++ b/dev-libs/check/check-0.9.11.ebuild @@ -12,22 +12,6 @@ DESCRIPTION="A unit test framework for C" HOMEPAGE="http://sourceforge.net/projects/check/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux # Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/check/check-0.9.11.ebuild,v 1.11 2014/03/14 10:03:05 ago Exp $ - -EAPI=4 - -AUTOTOOLS_PRUNE_LIBTOOL_FILES="all" - -inherit autotools autotools-multilib eutils - -DESCRIPTION="A unit test framework for C" -HOMEPAGE="http://sourceforge.net/projects/check/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" @@ -40,3 +24,30 @@ src_prepare() { epatch \ "${FILESDIR}"/${PN}-0.9.10-AM_PATH_CHECK.patch + sed -i -e '/^docdir =/d' {.,doc}/Makefile.am || die + + # fix out-of-sourcedir build having inconsistent check.h files, for + # example breaks USE=subunit. + rm src/check.h || die + + # Fix automake warnings being treated as errors, bug #420373 + sed -i -e s/-Werror// configure.ac || die + + eautoreconf +} + +src_configure() { + local myeconfargs=( + --disable-dependency-tracking + $(use_enable subunit) + --docdir="${EPREFIX}"/usr/share/doc/${PF} + ) + autotools-multilib_src_configure +} + +src_install() { + autotools-multilib_src_install + dodoc AUTHORS *ChangeLog* NEWS README THANKS TODO + + rm -f "${ED}"/usr/share/doc/${PF}/COPYING* || die +} diff --git a/dev-libs/check/check-0.9.8-r1.ebuild b/dev-libs/check/check-0.9.8-r1.ebuild index 9fdc566c291e..ae309a402884 100644 --- a/dev-libs/check/check-0.9.8-r1.ebuild +++ b/dev-libs/check/check-0.9.8-r1.ebuild @@ -48,4 +48,5 @@ src_install() { dodoc AUTHORS *ChangeLog* NEWS README THANKS TODO rm -f "${ED}"/usr/share/doc/${PF}/COPYING* || die - find "${ED}" -nam# Copyright 1999-2014 Gentoo Founda \ No newline at end of file + find "${ED}" -name '*.la' -exec rm -f {} + || die +} diff --git a/dev-libs/g-wrap/g-wrap-1.9.13.ebuild b/dev-libs/g-wrap/g-wrap-1.9.13.ebuild index 8f3d59dcf6ad..bcc28373ac8a 100644 --- a/dev-libs/g-wrap/g-wrap-1.9.13.ebuild +++ b/dev-libs/g-wrap/g-wrap-1.9.13.ebuild @@ -27,4 +27,5 @@ DEPEND="${RDEPEND} MAKEOPTS+=" -j1" src_configure() { - econf --disab# Copyright 1999-2012 Ge \ No newline at end of file + econf --disable-Werror --with-glib +} diff --git a/dev-libs/gmime/gmime-2.4.33.ebuild b/dev-libs/gmime/gmime-2.4.33.ebuild index 2edf2c8e78a8..70f2ba8fc45b 100644 --- a/dev-libs/gmime/gmime-2.4.33.ebuild +++ b/dev-libs/gmime/gmime-2.4.33.ebuild @@ -47,5 +47,10 @@ src_compile() { src_install() { GACUTIL_FLAGS="/root '${ED}/usr/$(get_libdir)' /gacdir '${EPREFIX}/usr/$(get_libdir)' /package ${PN}" \ - gnome2# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU Genera \ No newline at end of file + gnome2_src_install + + if use doc ; then + docinto tutorial + dodoc docs/tutorial/html/* + fi +} diff --git a/dev-libs/gmp/gmp-5.0.1.ebuild b/dev-libs/gmp/gmp-5.0.1.ebuild index 33a4bc2ac571..15be29ba272c 100644 --- a/dev-libs/gmp/gmp-5.0.1.ebuild +++ b/dev-libs/gmp/gmp-5.0.1.ebuild @@ -44,28 +44,44 @@ src_unpack() { } src_compile() { - # Because of# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-5.0.1.ebuild,v 1.11 2011/11/13 20:03:31 vapier Exp $ + # Because of our 32-bit userland, 1.0 is the only HPPA ABI that works + # http://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613) + if [[ ${CHOST} == hppa2.0-* ]] ; then + export GMPABI="1.0" + fi -inherit flag-o-matic eutils libtool toolchain-funcs + # ABI mappings (needs all architectures supported) + case ${ABI} in + 32|x86) GMPABI=32;; + 64|amd64|n64) GMPABI=64;; + o32|n32) GMPABI=${ABI};; + esac + export GMPABI -DESCRIPTION="Library for arithmetic on arbitrary precision integers, rational numbers, and floating-point numbers" -HOMEPAGE="http://gmplib.org/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2" -# doc? ( http://www.nada.kth.se/~tege/${PN}-man-${PV}.pdf )" + tc-export CC + econf \ + --localstatedir=/var/state/gmp \ + --disable-mpbsd \ + $(use_enable cxx) \ + || die "configure failed" -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" -IUSE="cxx" #doc + emake || die "emake failed" +} -DEPEND="sys-devel/m4" -RDEPEND="" +src_install() { + emake DESTDIR="${D}" install || die "make install failed" -src_unpack() { - unpack ${A} - cd "${S}" - [[ -d ${FILESDIR}/${PV} ]] && EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch "${FILESDIR}"/${PV} - epatch "${FILESDIR}"/${PN}-4.1.4-noexecstack.patch - epatch "${FILESDIR}"/${P}-perfpow-test \ No newline at end of file + dodoc AUTHORS ChangeLog NEWS README + dodoc doc/configuration doc/isa_abi_headache + dohtml -r doc + + #use doc && cp "${DISTDIR}"/gmp-man-${PV}.pdf "${D}"/usr/share/doc/${PF}/ +} + +pkg_preinst() { + preserve_old_lib /usr/$(get_libdir)/libgmp.so.3 +} + +pkg_postinst() { + preserve_old_lib_notify /usr/$(get_libdir)/libgmp.so.3 +} diff --git a/dev-libs/grok/Manifest b/dev-libs/grok/Manifest index deb7e805ecf0..03070642cae1 100644 --- a/dev-libs/grok/Manifest +++ b/dev-libs/grok/Manifest @@ -1,2 +1 @@ DIST grok-0.9.2.tar.gz 243554 SHA256 40edbdba488ff9145832c7adb04b27630ca2617384fbef2af014d0e5a76ef636 SHA512 91d410259e89de6fbab011691cf56497158bc7a508194e6d17a2b32c8b70650be3b40c4792390589929b0f553a92b81cd3981e84ddcbe6a6ea80ab8fcdb38b2e WHIRLPOOL 90d0fb5418491435b57335792626d633edc50f348ba4a211a53f3c9acd46f5633b19b9d77642e787dd50e5feed57c2a5bbc78aeea1288c1b146a47e32c62317c -DIST grok-0.9.2.tar.gz 243554 SHA256 40edbdba488ff9145832c7adb04b27630ca2617384fbef2af014d0e5a76ef636 SHA512 91d410259e89de6fbab011691cf56497158bc7a508194e6d17a2b32c8b70650be3b40c4792390589929b0f553a92b81cd3981e84ddcbe6a6ea80ab8fcdb38b2e WHIRLPOOL 90d0fb5418491435b57335792626d633edc50f348ba4a211a53f3c9acd46f5633b19b9d77642e787dd50e5feed57c2a5bbc78aeea1288c1b14 \ No newline at end of file diff --git a/dev-libs/libatomic_ops/libatomic_ops-1.2.ebuild b/dev-libs/libatomic_ops/libatomic_ops-1.2.ebuild index b26a687bfe27..a078917596c7 100644 --- a/dev-libs/libatomic_ops/libatomic_ops-1.2.ebuild +++ b/dev-libs/libatomic_ops/libatomic_ops-1.2.ebuild @@ -1,7 +1,5 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libatomic_ops/libatomic_ops-1.2.ebuild,v # Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-libs/libatomic_ops/libatomic_ops-1.2.ebuild,v 1.8 2012/12/16 16:31:21 ulm Exp $ inherit eutils @@ -16,4 +14,14 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" IUSE="" DEPEND="" -RD \ No newline at end of file +RDEPEND="" + +src_unpack(){ + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-ppc64-load_acquire.patch +} + +src_install() { + emake pkgdatadir="/usr/share/doc/${PF}" DESTDIR="${D}" install || die +} diff --git a/dev-libs/libatomic_ops/libatomic_ops-7.2d.ebuild b/dev-libs/libatomic_ops/libatomic_ops-7.2d.ebuild index a26ff5bd826f..fb7a088f77af 100644 --- a/dev-libs/libatomic_ops/libatomic_ops-7.2d.ebuild +++ b/dev-libs/libatomic_ops/libatomic_ops-7.2d.ebuild @@ -30,5 +30,5 @@ src_compile() { src_install() { default - find "${ED}" '(' -name COPY# Copyright 1999-2013 Gentoo Foundation -# \ No newline at end of file + find "${ED}" '(' -name COPYING -o -name LICENSING.txt ')' -delete +} diff --git a/dev-libs/libcaldav/Manifest b/dev-libs/libcaldav/Manifest index 3982255a0710..84ae26f17c52 100644 --- a/dev-libs/libcaldav/Manifest +++ b/dev-libs/libcaldav/Manifest @@ -1,2 +1 @@ DIST libcaldav-0.6.2.tar.gz 513852 SHA256 3d73db7cb31179dac2eeec850f8d770b8c8df283691a5bed2572c0fa71602d02 SHA512 a6d9c70f0cb7699644504e88934f7942b0840e81e89304ada50200d778e51e95dca08d0a0748636455295a03535a52559a07f58a15dd5ef1d4520dd3b0fc1aba WHIRLPOOL 64411fd93866a2bb206ed8e6041dd442f7d8870a5946f9b8e0a3e0f4a8ac78eae16516c35d38d9f607f8bc4a01109b034400d4e860ecfca21a3da389773db703 -DIST libcaldav-0.6.2.tar.gz 513852 SHA256 3d73db7cb31179dac2eeec850f8d770b8c8df283691a5bed2572c0fa71602d02 SHA512 a6d9c70f0cb7699644504e88934f7942b0840e81e89304ada50200d778e51e95dca08d0a0748636455295a03535a52559a07f58a15dd5ef1d4520dd3b0fc1aba WHIRLPOOL 64411fd93866a2bb206ed8e6041dd442f7d8870a5946f9b8e0a3e0f4a8ac78eae16516c35d38d9f607f8bc4a01109b034400d4e860ecfca21a3da3897 \ No newline at end of file diff --git a/dev-libs/libcdio/Manifest b/dev-libs/libcdio/Manifest index 6af0947263d6..acc1798e3638 100644 --- a/dev-libs/libcdio/Manifest +++ b/dev-libs/libcdio/Manifest @@ -1,2 +1 @@ DIST libcdio-0.92.tar.gz 2710084 SHA256 3336bf352aff43b5023e41a6d23525172a3b4ee433c467bd0fab5b8becb33fad SHA512 aeeb51c87f966683a1f10960e4d000098603adfbd8036cff17f62afa5de08a2dbe4f8df7d1bc1fd0438c0ac5f868b2950ed9379ea17b7d98fbd23ef023777747 WHIRLPOOL 051ba189fef5f28ae8ac98caab7bdb7468423f53d7b423e1a2416a8741339ff5aed76115a665f91d406254462c87cf84274a1b777a8f39064624fe908ff1fb0c -DIST libcdio-0.92.tar.gz 2710084 SHA256 3336bf352aff43b5023e41a6d23525172a3b4ee433c467bd0fab5b8becb33fad SHA512 aeeb51c87f966683a1f10960e4d000098603adfbd8036cff17f62afa5de08a2dbe4f8df7d1bc1fd0438c0ac5f868b2950ed9379ea17b7d98fbd23ef023777747 WHIRLPOOL 051ba189fef5f28ae8ac98caab7bdb7468423f53d7b423e1a2416a8741339ff5aed76115a665f91d406254462c87cf84274a1b777a8f39064624fe908ff1fb0c diff --git a/dev-libs/libdnet/Manifest b/dev-libs/libdnet/Manifest index 9375c4ec4775..ad547671ffca 100644 --- a/dev-libs/libdnet/Manifest +++ b/dev-libs/libdnet/Manifest @@ -1,4 +1,2 @@ DIST libdnet-1.12.ipv6-1.patch.gz 5124 SHA256 5e646901ae13d8aa47f0c5c063b86ecccb90780f9e3734cdbabf7a2d472c39ac SHA512 fa2380e41548ecdd978722930ecf90dffabd15cf06cbae0e113285072fe98a066f1e686b6d79e2d8b9f8adcf29783f313d61933b9e1e74e71da8dc7d741f815a WHIRLPOOL 27f356053749e1abdab24bd420f22e380e0970f7a2926474482a2e2532d1d8561f4b48d0eb243b5a62777543b3644adafd3cead4cc09f21d6cb5391a0b7e00f2 DIST libdnet-1.12.tgz 970125 SHA256 83b33039787cf99990e977cef7f18a5d5e7aaffc4505548a83d31bd3515eb026 SHA512 b763d2caa77b8d16b531142a5bce3b862ed20198406a00e1fe7f3b45ce308b97d638b0c7f03bd8593fdd206cc1645952839bc340b77537298a3df88599835bf3 WHIRLPOOL 9e5b3a217bfef840ca0ed936dbc3573e51a9283a5a7d3ffd43606b98e8760586196261f34a2508cdcf9f868ccd08c9fd1d499252c9a43bb2f71a5b7b2c00c13e -DIST libdnet-1.12.ipv6-1.patch.gz 5124 SHA256 5e646901ae13d8aa47f0c5c063b86ecccb90780f9e3734cdbabf7a2d472c39ac SHA512 fa2380e41548ecdd978722930ecf90dffabd15cf06cbae0e113285072fe98a066f1e686b6d79e2d8b9f8adcf29783f313d61933b9e1e74e71da8dc7d741f815a WHIRLPOOL 27f356053749e1abdab24bd420f22e380e0970f7a2926474482a2e2532d1d8561f4b48d0eb243b5a62777543b3644adafd3cead4cc09f21d6cb5391a0b7e00f2 -DIST libdnet-1.12.tgz 970125 SHA256 83b33039787cf99990e977cef7f18a5d5e7aaffc4505548a83d31bd3515eb026 SHA512 b763d2caa77b8d16b531142a5bce3b862ed20198406a00e1fe7f3b45ce308b97d638b0c7f03bd8593fdd206cc1645952839bc340b77537298a3df88599835bf3 WHIRLPOOL 9e5b3a217bfef840ca0ed936dbc3573e51a9283a5a7d3ffd43606b98e8760586196261f34a2508cdcf9f868ccd08c9fd1d499252c9a43bb2f71a5b7b2c00c13e diff --git a/dev-libs/libgamin/files/libgamin-0.1.10-armel-features.patch b/dev-libs/libgamin/files/libgamin-0.1.10-armel-features.patch index 548ab6096b9a..fdfcbd7e6db6 100644 --- a/dev-libs/libgamin/files/libgamin-0.1.10-armel-features.patch +++ b/dev-libs/libgamin/files/libgamin-0.1.10-armel-features.patch @@ -22,24 +22,26 @@ index b0bbaec..e4b684e 100644 AM_CONDITIONAL(ENABLE_INOTIFY, test x$inotify = xtrue) -if test x$os = xlinux-gnu; then -+if test x$os = xlinux-gnu -o x$os = xlinux-gnFrom 05dcfcd69848e119c6a30d363bc41e896029f8af Mon Sep 17 00:00:00 2001 -From: Sebastian Dröge -Date: Tue, 15 Dec 2009 12:24:25 +0000 -Subject: Bug 588338 - Enable linux specific features on armel - ---- -diff --git a/configure.in b/configure.in -index b0bbaec..e4b684e 100644 ---- a/configure.in -+++ b/configure.in -@@ -176,7 +176,7 @@ fi - - dnl check what OS we're on - #AM_CONDITIONAL(HAVE_LINUX, test x$target_os = xlinux-gnu) --if test x$target_os = xlinux-gnu; then -+if test x$target_os = xlinux-gnu -o x$target_os = xlinux-gnueabi; then - AC_DEFINE([HAVE_LINUX],[],[Whether we are using linux or not]) ++if test x$os = xlinux-gnu -o x$os = xlinux-gnueabi; then + AC_ARG_ENABLE(dnotify, + AC_HELP_STRING([--disable-dnotify], [Disable the DNotify backend]), + [dnotify="${enableval}"], [dnotify=true]) +@@ -297,10 +297,12 @@ else fi -@@ -223,7 +223,7 @@ fi - dnl check if inotif \ No newline at end of file + dnl Use weak symbols on linux/gcc to avoid imposing libpthreads to apps +-if test x$os = xlinux-gnu -a x$WITH_THREADS = x1 ; then +- if test "${CC}" = "gcc" ; then +- echo Use weak symbols ! +- THREAD_LIBS= ++if test x$os = xlinux-gnu -o x$os = xlinux-gnueabi ; then ++ if test x$WITH_THREADS = x1 ; then ++ if test "${CC}" = "gcc" ; then ++ echo Use weak symbols ! ++ THREAD_LIBS= ++ fi + fi + fi + AC_SUBST(THREAD_LIBS) +-- +cgit v0.9.0.2 diff --git a/dev-libs/libgit2/libgit2-0.20.0-r1.ebuild b/dev-libs/libgit2/libgit2-0.20.0-r1.ebuild index bd5b6d925156..c2c7585528a2 100644 --- a/dev-libs/libgit2/libgit2-0.20.0-r1.ebuild +++ b/dev-libs/libgit2/libgit2-0.20.0-r1.ebuild @@ -58,6 +58,8 @@ src_install() { cmake-utils_src_install if use examples ; then - f# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: \ No newline at end of file + find examples -name .gitignore -delete || die + dodoc -r examples + docompress -x /usr/share/doc/${PF}/examples + fi +} diff --git a/dev-libs/libhtmlparse/Manifest b/dev-libs/libhtmlparse/Manifest index 99aba7ed97f6..c475c0ee8361 100644 --- a/dev-libs/libhtmlparse/Manifest +++ b/dev-libs/libhtmlparse/Manifest @@ -1,2 +1 @@ DIST libhtmlparse-0.1.13.tar.gz 202176 SHA256 d8259d8b07691dff589741c20161c32be45ac5ee43d4ba8d5caa6901e430f4ad SHA512 51366b24ebf5cc1e494f146ec996f9327d20a41cd425ccade23c45bc95eaf76dc5e339aee6a459c794f527a55d7cf96502832dbe88281ee7c7e2b3c14d3a53aa WHIRLPOOL c23ca68cd8c5449039a11d1a939afc7a5805aeb7cacb742f4d160ca52158c3aca88f034fc128c0f73582acc9ef34451efb4e39575af67fb178aa7737a4437b1e -DIST libhtmlparse-0.1.13.tar.gz 202176 SHA256 d8259d8b07691dff589741c20161c32be45ac5ee43d4ba8d5caa6901e430f4ad SHA512 51366b24ebf5cc1e494f146ec996f9327d20a41cd425ccade23c45bc95eaf76dc5e339aee6a459c794f527a55d7cf96502832dbe88281ee7c7e2b3c14d3a53aa WHIRLPOOL c23ca68cd8c5449039a11d1a939afc7a5805aeb7cacb742f4d160ca52158c3aca88f034fc128c0f73582acc9ef34451efb4e39575af67fb178aa7737a4437b1e diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest index 677c60b41364..6e189e7f18a1 100644 --- a/dev-libs/libical/Manifest +++ b/dev-libs/libical/Manifest @@ -1,4 +1,2 @@ DIST libical-0.48.tar.gz 1173620 SHA256 2ae78b0757f0dd13431acf42a9a8d038339fd4767fd5134e650bf60ee0b4dff0 SHA512 d48b4b5ba78504ec81989b0ca00cac4130ece7e6363af5a0220871b6ad36835c5787a2f17fc871ef51f5950b977be0b87a2e43684ccc7396b0511424e9289d4b WHIRLPOOL f0ecea10bd5dcf18c92da771d65c051caa11d87990cfdaf708e05ddd6408965337f02e329eca73c5ed41ea384547c4f03a1498d459b1b790b9e8b4c20df79eae DIST libical-1.0.tar.gz 1199483 SHA256 7c39b3448e4927a2de2775d853f52b3aaeb42400970a3db0b01a78987e6ec0b7 SHA512 4764b08c9a57e867884aae4eb9b9dce53df7abebbbde7190caf4d62bdb223eed57945ac8233029b1d253afc173437363264ce8f75ccbfb2af0bb64dafdd3cec4 WHIRLPOOL 4883c639d3cd6931088efc5880858ce6789f829cec902ad82225a7d06726ca89b65325846d1e19e7afc1ea582cbe0affefd1f92986709b3bc765e6c6f9236e70 -DIST libical-0.48.tar.gz 1173620 SHA256 2ae78b0757f0dd13431acf42a9a8d038339fd4767fd5134e650bf60ee0b4dff0 SHA512 d48b4b5ba78504ec81989b0ca00cac4130ece7e6363af5a0220871b6ad36835c5787a2f17fc871ef51f5950b977be0b87a2e43684ccc7396b0511424e9289d4b WHIRLPOOL f0ecea10bd5dcf18c92da771d65c051caa11d87990cfdaf708e05ddd6408965337f02e329eca73c5ed41ea384547c4f03a1498d459b1b790b9e8b4c20df79eae -DIST libical-1.0.tar.gz 1199483 SHA256 7c39b3448e4927a2de2775d853f52b3aaeb42400970a3db0b01a78987e6ec0b7 SHA512 4764b08c9a57e867884aae4eb9b9dce53df7abebbbde7190caf4d62bdb223eed57945ac8233029b1d253afc173437363264ce8f75ccbfb2af0bb64dafdd3cec4 WHIRLPOOL 4883c639d3cd6931088efc5880858ce6789f829cec902ad82225a7d06726ca89b65325846d1e19e7afc1ea582cbe0affefd1f92986709b3bc765e6c6f9236e70 diff --git a/dev-libs/liblogging/liblogging-1.0.4.ebuild b/dev-libs/liblogging/liblogging-1.0.4.ebuild index 92a97d7ee653..f59dd5971233 100644 --- a/dev-libs/liblogging/liblogging-1.0.4.ebuild +++ b/dev-libs/liblogging/liblogging-1.0.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/liblogging/liblogging-1.0.4.ebuild,v 1.2 2014/08/10 20:36:02 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/liblogging/liblogging-1.0.4.ebuild,v 1.3 2014/10/01 10:56:16 jer Exp $ EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="http://download.rsyslog.com/liblogging/${P}.tar.gz" LICENSE="BSD-2" SLOT="0/0" -KEYWORDS="~amd64 ~arm ~hppa ~x86" +KEYWORDS="~amd64 ~arm hppa ~x86" IUSE="rfc3195 static-libs +stdlog systemd" RDEPEND="systemd? ( sys-apps/systemd )" diff --git a/dev-libs/liblognorm/liblognorm-1.0.1.ebuild b/dev-libs/liblognorm/liblognorm-1.0.1.ebuild index 78abcc5c034b..6f3d7d514333 100644 --- a/dev-libs/liblognorm/liblognorm-1.0.1.ebuild +++ b/dev-libs/liblognorm/liblognorm-1.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/liblognorm/liblognorm-1.0.1.ebuild,v 1.2 2014/09/30 12:46:59 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/liblognorm/liblognorm-1.0.1.ebuild,v 1.3 2014/10/01 10:55:19 jer Exp $ EAPI=5 @@ -15,7 +15,7 @@ SRC_URI="http://www.liblognorm.com/files/download/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0/1" -KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux" +KEYWORDS="~amd64 ~arm hppa ~x86 ~amd64-linux" #IUSE="debug static-libs" - "debug" USE flag disabled due to https://github.com/rsyslog/liblognorm/issues/5 IUSE="static-libs" diff --git a/dev-libs/libmodbus/libmodbus-3.1.1.ebuild b/dev-libs/libmodbus/libmodbus-3.1.1.ebuild index 75e99c021a02..9ba1ea67fbc9 100644 --- a/dev-libs/libmodbus/libmodbus-3.1.1.ebuild +++ b/dev-libs/libmodbus/libmodbus-3.1.1.ebuild @@ -11,10 +11,16 @@ SRC_URI="http://libmodbus.org/releases/${P}.tar.gz" LICENSE="LGPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="static-# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmodbus/libmodbus-3.1.1.ebuild,v 1.1 2014/07/10 15:59:24 xmw Exp $ +IUSE="static-libs" -EAPI=4 +src_configure() { + econf \ + --disable-silent-rules \ + $(use_enable static-libs static) +} -DESCRIP \ No newline at end of file +src_install() { + emake install DESTDIR="${D}" + dodoc AUTHORS MIGRATION NEWS README.md + use static-libs || rm "${D}"/usr/*/libmodbus.la +} diff --git a/dev-libs/libmoe/libmoe-1.5.8-r2.ebuild b/dev-libs/libmoe/libmoe-1.5.8-r2.ebuild index 7d95af78c4be..eb7d58aa05c2 100644 --- a/dev-libs/libmoe/libmoe-1.5.8-r2.ebuild +++ b/dev-libs/libmoe/libmoe-1.5.8-r2.ebuild @@ -20,12 +20,22 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}/${P}-gentoo.patch" - epatch "${FILESDIR}/${P}-make# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmoe/libmoe-1.5.8-r2.ebuild,v 1.7 2013/10/03 07:55:17 naota Exp $ - -inherit eutils multilib toolchain-funcs - -DESCRIPTION="multi octet character encoding handling library" -HOMEPAGE="http://pub.ks-and-ks.ne.jp/prog/libmoe/" -SRC_URI="http:// \ No newline at end of file + epatch "${FILESDIR}/${P}-makefile.patch" + + sed -i \ + -e "/^PREFIX=/s:=.*:=/usr:" \ + -e "/^LIBSODIR=/s:=.*:=/usr/$(get_libdir):" \ + -e "/^MANDIR=/s:=.*:=/usr/share/man:" \ + -e "/^CF=/s:=:=${CFLAGS} :" \ + -e "/^LF=/s:=:=${LDFLAGS} :" \ + -e "s:=gcc:=$(tc-getCC):" \ + -e "/^AR=/s:=ar:=$(tc-getAR):" \ + Makefile || die +} + +src_install() { + emake DESTDIR="${D}" install || die + + dodoc ChangeLog + dohtml libmoe.shtml +} diff --git a/dev-libs/libmongo-client/libmongo-client-0.1.7.ebuild b/dev-libs/libmongo-client/libmongo-client-0.1.7.ebuild index 5cf9d738fa08..7ec16d7e8cda 100644 --- a/dev-libs/libmongo-client/libmongo-client-0.1.7.ebuild +++ b/dev-libs/libmongo-client/libmongo-client-0.1.7.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmongo-client/libmongo-client-0.1.7.ebuild,v 1.4 2013/12/31 08:43:43 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmongo-client/libmongo-client-0.1.7.ebuild,v 1.5 2014/10/01 10:57:41 jer Exp $ EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="https://github.com/algernon/${PN}/archive/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~x86" +KEYWORDS="~amd64 ~arm hppa ~x86" IUSE="doc" DEPEND="${RDEPEND} @@ -27,6 +27,13 @@ src_prepare() { eautoreconf } -src_co# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmongo \ No newline at end of file +src_compile() { + default + use doc && emake DESTDIR="${D}" doxygen +} + +src_install() { + default + find "${ED}" -name '*.la' -delete + use doc && dohtml -r docs/html/* +} diff --git a/dev-libs/libmowgli/libmowgli-1.0.0.ebuild b/dev-libs/libmowgli/libmowgli-1.0.0.ebuild index ea87634ffa97..c36e857353b8 100644 --- a/dev-libs/libmowgli/libmowgli-1.0.0.ebuild +++ b/dev-libs/libmowgli/libmowgli-1.0.0.ebuild @@ -14,5 +14,6 @@ SLOT="0" KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" src_install() { - emake DESTDIR="${D}" insta# Copyright 1999-2014 Gentoo Foundation -# Distributed under the ter \ No newline at end of file + emake DESTDIR="${D}" install || die "emake install failed" + dodoc AUTHORS README doc/BOOST +} diff --git a/dev-libs/librelp/librelp-1.2.7-r1.ebuild b/dev-libs/librelp/librelp-1.2.7-r1.ebuild index 4fb2cae5474a..8927e59165b2 100644 --- a/dev-libs/librelp/librelp-1.2.7-r1.ebuild +++ b/dev-libs/librelp/librelp-1.2.7-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/librelp/librelp-1.2.7-r1.ebuild,v 1.2 2014/08/10 20:37:44 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/librelp/librelp-1.2.7-r1.ebuild,v 1.3 2014/10/01 10:57:03 jer Exp $ EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="http://download.rsyslog.com/${PN}/${P}.tar.gz" LICENSE="GPL-3 doc? ( FDL-1.3 )" SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~sparc ~x86" +KEYWORDS="~amd64 ~arm hppa ~sparc ~x86" IUSE="debug doc +ssl static-libs" RDEPEND=" diff --git a/dev-libs/librep/Manifest b/dev-libs/librep/Manifest index a1b1919bc059..fcafb6f6bccb 100644 --- a/dev-libs/librep/Manifest +++ b/dev-libs/librep/Manifest @@ -1,3 +1,2 @@ -DIST librep-0.92.2.1.tar.xz 608988 SHA256 47bb628a377e2c7cb6e22f3e691a88d88af83570ca99b0d7300a5fbcb46b6663 SHA512 7535fbf3af3b6775dfe740623abd09ff48a38641c3be52bbe84ef0b14d37455aa73f3a9941b3a814b04f203664c0e18f1add2111ac968fbf1f59fa4253f6a974 WHIRLPOOL ff59301e924b176e6944a79-----BEGIN PGP SIGNED MESSAGE----- DIST librep-0.92.2.1.tar.xz 608988 SHA256 47bb628a377e2c7cb6e22f3e691a88d88af83570ca99b0d7300a5fbcb46b6663 SHA512 7535fbf3af3b6775dfe740623abd09ff48a38641c3be52bbe84ef0b14d37455aa73f3a9941b3a814b04f203664c0e18f1add2111ac968fbf1f59fa4253f6a974 WHIRLPOOL ff59301e924b176e6944a79c1be5635d7d8845a89a06c811cdc891f9edcc4179f555ebbd8092ff0e2194763ab2f554fa224b41b5ec2515468fcfb211b887f747 DIST librep-0.92.3.tar.xz 607128 SHA256 45c98a5bbdfde4f1d98e3839b319d9ae15857d2d1ae8e3838d9a18d53f3e8b85 SHA512 d65b7a418a2782307c7afa74bba1cc9b690c0fe37938151e7ead3da08cba52d2f5bd2803de22f426b75a353f50287a5ce727c98fc23abbabf9e54b3389f04103 WHIRLPOOL 1ae547f4d795377d77f0fedc67cf3cffc2daf49295798aad088152cdef454c74226e9e9e7f703b0506cd4e1c6cd2b2f321ab8f4cd81f691e1d2d11612cf2c132 diff --git a/dev-libs/libuv/files/01-libuv-0.11.25-tests.patch b/dev-libs/libuv/files/01-libuv-0.11.25-tests.patch index 1743cace0ba0..12eabc213f57 100644 --- a/dev-libs/libuv/files/01-libuv-0.11.25-tests.patch +++ b/dev-libs/libuv/files/01-libuv-0.11.25-tests.patch @@ -78,4 +78,7 @@ index 0eb9438..36457f4 100644 + int err = inet_pton4(curtok, tp); if (err == 0) { tp += sizeof(struct in_addr); - From f58b02f2cf068e1bed10bf9f632bad39 \ No newline at end of file + seen_xdigits = 0; +-- +1.9.3 + diff --git a/dev-libs/libvolume_id/Manifest b/dev-libs/libvolume_id/Manifest index 73e81ade5057..44aeebd137b4 100644 --- a/dev-libs/libvolume_id/Manifest +++ b/dev-libs/libvolume_id/Manifest @@ -1,3 +1,2 @@ DIST libvolume_id-0.81.0.tar.bz2 23274 SHA256 2f6b685893a15d2d4d578bd41692e3091dcfcf88973a23bb0c6b02b266b8f5b6 SHA512 46f51bd130d1240518c6ffd97dc45017ebf623ea1ca4d5e518c19a040b1537d8a721a40e147277df0a530ac9d2d045dd399c037b08943c4b96e35ad025e94d85 WHIRLPOOL bb707c91885c749b1e42f34f2193f65d2627f92991a291149e474aeba0273463c509b9bba15f19606dd3ef2778d33431dd3d1223298868d8bda84803768a652b DIST libvolume_id-0.81.1.tar.bz2 23399 SHA256 45bb18e80b456499d26a5d2f2fc222be990d256590a7cafc4354f7de36013f09 SHA512 a30c08fcdb020e8b7d0e5350d996d7007040d72e3c1caf3244cf7c6e08cc7d5eee9b94edbc04a073519243884be8b27e61c33a3f61c25e7bfb42eb96785d992f WHIRLPOOL d3c7fa7f73871873fd429b8ff68b3109a6f8a50a18f5e197189a22885c8939ea3e2dd5d05d61f78fe8b5813b9f5e7e098ebb76debf6ebdc95fdb528e10b3d4b1 -MISC metadata.xml 280 SHA256 e3c5f6246f368ea54e1c58d0b81c57b97738d287b9529d239d1a69d72db8ceb2 SHA512 89697653f652b01b9e268fa23951ba042b1869e0531c17DIST libvolume_id-0.81.0.tar.bz2 23274 SHA256 2f6b685893a15d2d4d578bd41692e3091dcfcf88973a23bb0c6b02b266b8f5b6 SHA512 46f51bd130d1240518c6ffd97dc45017ebf623ea1ca4d5e518c19a040b1537d8a721a40e147277df0a530ac9d2d045dd399c037b \ No newline at end of file diff --git a/dev-libs/libwacom/files/libwacom-0.5-eraser-bamboo.patch b/dev-libs/libwacom/files/libwacom-0.5-eraser-bamboo.patch index c2e97af5b5cc..25f722e57878 100644 --- a/dev-libs/libwacom/files/libwacom-0.5-eraser-bamboo.patch +++ b/dev-libs/libwacom/files/libwacom-0.5-eraser-bamboo.patch @@ -9,17 +9,27 @@ Crashes gnome-control-center without it. current stylus ID 0x0 for tablet 'Wacom Bamboo Pen & Touch', no general pen found wacom-cc-panel:ERROR:gsd-wacom-device.c:1491:gsd_wacom_device_set_current_stylus: -assertion failed: (device->priv->sFrom f2845accd942e44238edf030f6bd918f9d88838e Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Thu, 3 May 2012 09:24:32 +1000 -Subject: [PATCH] data: add generic eraser to Bamboo Pen & Touch +assertion failed: (device->priv->styli) -Crashes gnome-control-center without it. +Signed-off-by: Peter Hutterer +Reviewed-by: Ping Cheng +--- + data/bamboo-pen-and-touch.tablet | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) -(gnome-control-center:18115): wacom-cc-panel-WARNING **: Could not set the -current stylus ID 0x0 for tablet 'Wacom Bamboo Pen & Touch', no general pen -found -wacom-cc-panel:ERROR:gsd-wacom-device.c:1491:gsd_wacom_device_set_current_stylus: -assertion failed: (device->priv->styli) +diff --git a/data/bamboo-pen-and-touch.tablet b/data/bamboo-pen-and-touch.tablet +index 125db37..3fff338 100644 +--- a/data/bamboo-pen-and-touch.tablet ++++ b/data/bamboo-pen-and-touch.tablet +@@ -13,7 +13,7 @@ Width=6 + Height=4 + + # The other stylusses don't match it, it has two buttons and an eraser. +-Styli=0xfffff ++Styli=0xfffff;0xffffe; + + [Features] + Stylus=true +-- +1.7.8.6 -Signed-off-by: Peter Hutterer Increase performance, allocate more RAM. Recommended to disable on Raspberry Pi Raspberry Pi GPU support Enable screen-sharing through RDP - - - -x11 - - Enable support for clients - Allow setting color managment - Enable drm compositor support - Install wayland-editor example application - Enable egl acceleration - Enable f \ No newline at end of file + Enable simple-clients + Enable interface for tablets + Enable libunwind usage for backtraces + Install wayland-view example application + Enable Wayland compositor support + Enable X11 compositor support + Enable ability support native X11 applications + + diff --git a/dev-libs/xalan-c/xalan-c-1.11.0_pre797991.ebuild b/dev-libs/xalan-c/xalan-c-1.11.0_pre797991.ebuild index 8191526c9789..9b69be26f6ab 100644 --- a/dev-libs/xalan-c/xalan-c-1.11.0_pre797991.ebuild +++ b/dev-libs/xalan-c/xalan-c-1.11.0_pre797991.ebuild @@ -50,45 +50,58 @@ src_configure() { export XERCESCROOT="/usr" local target="linux" - ## Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/xalan-c/xalan-c-1.11.0_pre797991.ebuild,v 1.7 2011/12/18 17:26:24 armin76 Exp $ + # add more if needed, see xerces-c-2.8.0-r1 ebuild -EAPI="2" + local mloader="inmemory" + use nls && mloader="nls" +# use icu && mloader="icu" -inherit toolchain-funcs eutils flag-o-matic multilib + local transcoder="default" +# use icu && transcoder="icu" -DESCRIPTION="XSLT processor for transforming XML into HTML, text, or other XML types" -HOMEPAGE="http://xml.apache.org/xalan-c/" -SRC_URI="mirror://gentoo/Xalan-C_r${PV#*_pre}-src.tar.gz" + local thread="none" + use threads && thread="pthread" -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="doc examples nls threads" + local bitstobuild="32" + $(has_m64) && bitstobuild="64" -RDEPEND=">=dev-libs/xerces-c-2.8.0" -# icu? ( dev-libs/icu )" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen )" + ./runConfigure -p ${target} -c "$(tc-getCC)" -x "$(tc-getCXX)" \ + -m ${mloader} -t ${transcoder} \ + -r ${thread} -b ${bitstobuild} > configure.vars || die "runConfigure failed" -S="${WORKDIR}/xml-xalan/c" + eval $(grep export configure.vars) -pkg_setup() { -# export ICUROOT="/usr" - export XALANCROOT="${S}" + default } -src_prepare() { - epatch \ - "${FILESDIR}/${PV}-as-needed.patch" \ - "${FILESDIR}/${PV}-bugfixes.patch" \ - "${FILESDIR}/${PV}-parallel-build.patch" +src_compile() { + emake || die - # - do not run configure in runConfigure - # - echo the export commands instead exporting the vars - # - remove -O3 - # - make sure our {C,CXX}FLAGS get respected - sed -i \ - -e '/\/configure/d' \ - -e 's/^export \([a-zA-Z_]*\)/ec \ No newline at end of file + if use doc ; then + mkdir build + cd "${S}/xdocs" + doxygen DoxyfileXalan + fi +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + + if use doc ; then + dodir /usr/share/doc/${PF} + dohtml -r build/docs/apiDocs/* + fi + + if use examples ; then + insinto /usr/share/doc/${PF}/examples + doins -r samples/* + fi +} + +pkg_postinst() { + ewarn "If you are upgrading you should run" + ewarn " revdep-rebuild --library=libxalan-c.so.110" + ewarn "if using portage or" + ewarn " reconcilio --library libxalan-c.so.110" + ewarn "if using paludis as your package manager." +} diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest index 230c77728c3a..f6049ea0b21f 100644 --- a/dev-libs/xmlsec/Manifest +++ b/dev-libs/xmlsec/Manifest @@ -1,4 +1,2 @@ DIST xmlsec1-1.2.18.tar.gz 1731099 SHA256 c93c3816db79daf339bf0418a39e07560590cb5ad7eb0306c3ffe0fcb09cd777 SHA512 09788a35691c0fc3b4c8bc9c78a31caf3c056c270abdf642c17d74fd7ce33a1f32edd505650aaf14339ff4e9ffd38b9df67bbf7c60f982494f19bdb6592a780c WHIRLPOOL 4bc0851b6e3f68639a852be4a5b20849ccfd9a2b01716c87a293a8f13fafc6ef99411dbaa3bacc7d0169648559b39ccbe4a262df607ad8d2d76ee8f5d3029a5f DIST xmlsec1-1.2.19.tar.gz 1766298 SHA256 2fc8f7c9fadb0f6c565bf304de798a875fc719005c20169f8e88028b20c8aac0 SHA512 9d391658902e163261a61474fc0415ee0f25732dc4a98d2012459294674f7984212607febc10cdf5f5b6255932c4ad51a23d0a7b868990439812f5e276fd1a89 WHIRLPOOL 57795d4ac05727867680f7f81d50203fe7603d4a804650db7fafcbe48f8af1c5ef10a021218b3edaebc1dcc06653536f8545d2601a61e32c699701716e3353c5 -DIST xmlsec1-1.2.18.tar.gz 1731099 SHA256 c93c3816db79daf339bf0418a39e07560590cb5ad7eb0306c3ffe0fcb09cd777 SHA512 09788a35691c0fc3b4c8bc9c78a31caf3c056c270abdf642c17d74fd7ce33a1f32edd505650aaf14339ff4e9ffd38b9df67bbf7c60f982494f19bdb6592a780c WHIRLPOOL 4bc0851b6e3f68639a852be4a5b20849ccfd9a2b01716c87a293a8f13fafc6ef99411dbaa3bacc7d0169648559b39ccbe4a262df607ad8d2d76ee8f5d3029a5f -DIST xmlsec1-1.2.19.tar.gz 1766298 SHA256 2fc8f7c9fadb0f6c565bf304de798a875fc719005c20169f8e88028b20c8aac0 SHA512 9d391658902e163261a61474fc0415ee0f25732dc4a98d2012459294674f7984212607febc10cdf5f5b6255932c4ad51a23d0a7b868990439812f5e276fd1a89 WHIRLPOOL 57795d4ac05727867680f7f81d50203fe7603d4a804650db7fafcbe48f8af1c5ef10a021218b3edaebc1dcc06653536f8545d2601a61e32c699701716e3353c5 diff --git a/dev-lisp/cmucl/files/19c/herald-save.lisp-gentoo.patch b/dev-lisp/cmucl/files/19c/herald-save.lisp-gentoo.patch index d868384d1669..adecda7f3e4f 100644 --- a/dev-lisp/cmucl/files/19c/herald-save.lisp-gentoo.patch +++ b/dev-lisp/cmucl/files/19c/herald-save.lisp-gentoo.patch @@ -8,7 +8,11 @@ diff -ur cmucl-19c-release-20051115.orig.orig/src/code/save.lisp cmucl-19c-relea - '("For support see http://www.cons.org/cmucl/support.html Send bug reports to the debian BTS." - terpri - "or to " -- "pvaneynd@debian.org" tdiff -ur cmucl-19c-release-20051115.orig.orig/src/code/save.lisp cmucl-19c-release-20051115.orig/src/code/save.lisp ---- cmucl-19c-release-20051115.orig.orig/src/code/save.lisp 2005-12-07 12:27:38.000000000 -0600 -+++ cmucl-19c-release-20051115.orig/src/code/save.lisp 2005-12-07 12:29:30.000000000 -0600 -@@ -297 \ No newline at end of file +- "pvaneynd@debian.org" terpri +- "type (help) for help, (quit) to exit, and (demo) to see the demos" terpri ++ '("For support see http://www.cons.org/cmucl/support.html" terpri ++ "Send bug reports to http://bugs.gentoo.org" terpri ++ "Type (help) for help or (quit) to exit." terpri + terpri + "Loaded subsystems:")) + diff --git a/dev-lisp/sbcl/files/sbcl-1.0.55_no_doc_install.patch b/dev-lisp/sbcl/files/sbcl-1.0.55_no_doc_install.patch index 306af6f686d5..458c637124d7 100644 --- a/dev-lisp/sbcl/files/sbcl-1.0.55_no_doc_install.patch +++ b/dev-lisp/sbcl/files/sbcl-1.0.55_no_doc_install.patch @@ -36,21 +36,26 @@ diff -uNr a/install.sh b/install.sh - -# pdf -for pdf in doc/manual/*.pdf -#Patch by Jesus Rivero -#Added: Mar 26, 2012 -#Gentoo Specific, not sent upstream - -diff -uNr a/install.sh b/install.sh ---- a/install.sh 2012-03-26 07:17:28.000000000 -0400 -+++ b/install.sh 2012-03-26 07:17:56.000000000 -0400 -@@ -101,52 +101,3 @@ - # share/man/ manpages, should be the same as man/ - # share/info/ info files - # share/doc/ misc documentation +-do +- cp $pdf "$BUILD_ROOT$DOC_DIR"/ \ +- && echo " pdf $BUILD_ROOT$DOC_DIR/`basename $pdf`" +-done - --echo --echo "Documentation:" +-# html +-for html in doc/manual/sbcl doc/manual/asdf +-do +- test -d $html && cp -R -L $html "$BUILD_ROOT$DOC_DIR"/html \ +- && echo " html $BUILD_ROOT$DOC_DIR/html/`basename $html`/index.html" +-done - --# man --cp doc/sbcl.1 "$BUILD_ROOT$MAN_DIR"/man1/ && echo " man $BUILD_ROOT$MAN_DIR/man1/sbcl.1" --cp doc/sbcl-asdf-install.1 \ No newline at end of file +-for html in doc/manual/sbcl.html doc/manual/asdf.html +-do +- cp $html "$BUILD_ROOT$DOC_DIR"/ \ +- && echo " html $BUILD_ROOT$DOC_DIR/`basename $html`" +-done +- +-for f in BUGS CREDITS COPYING NEWS +-do +- cp $f "$BUILD_ROOT$DOC_DIR"/ +-done + diff --git a/dev-ml/iTeML/Manifest b/dev-ml/iTeML/Manifest index aef987cd61e3..59755f72fbba 100644 --- a/dev-ml/iTeML/Manifest +++ b/dev-ml/iTeML/Manifest @@ -1,2 +1 @@ DIST iTeML-2.0.1.tar.gz 38387 SHA256 ae6ff9d0fcc20b8e96a44517fb3641d5193c63169aae33f0c1912db8e14bef1f SHA512 1f72ed8320a7589206daa16232199f33012cac397cf21a60fd8afccb7e8aad6f9125e8b4ac494866f699d0a47569bbd0486584a299786e0ef7a3a2c234f0ac2b WHIRLPOOL c23392412b4fcead6dd5958739802d895cdee3a86f333038ad03639d28a5439858de411bea19ce25df1bce72482b07d3047e8862a89fb49e24cfe0956d45d768 -DIST iTeML-2.0.1.tar.gz 38387 SHA256 ae6ff9d0fcc20b8e96a44517fb3641d5193c63169aae33f0c1912db8e14bef1f SHA512 1f72ed8320a7589206daa16232199f33012cac397cf21a60fd8afccb7e8aad6f9125e8b4ac494866f699d0a47569bbd0486584a299786e0ef7a3a2c234f0ac2b WHIRLPOOL c23392412b4fcead6dd5958739802d895cdee3a86f333038ad03639d28a5439858de411bea19ce25df1bce72482b07d3047e8862a89fb49e24cfe0956d45d768 diff --git a/dev-ml/lambda-term/Manifest b/dev-ml/lambda-term/Manifest index 9da165ad520d..57757fce3ba0 100644 --- a/dev-ml/lambda-term/Manifest +++ b/dev-ml/lambda-term/Manifest @@ -1,2 +1 @@ DIST lambda-term-1.4.tar.gz 143650 SHA256 7c77abab49993e2a168f45943e6a6b83e8d580c905c2c8c24a28b30561fd77fb SHA512 3d09c33518830b9fe6da17c99e973286844fd514dbe2dc4201f8cdd9f66d80db19acb6404c33945860b4c6c440386f28accc518f5ab1f47b828d1c146801ffda WHIRLPOOL 3a09c3f3653bd48d75f5a11126d5f1e7e854575423b01666c0e260df6c4a3ee16dffbd716a137db73f66d6f3fe9064aad9ffaec16a55a1af0e95cb10b3b6ead3 -DIST lambda-term-1.4.tar.gz 143650 SHA256 7c77abab49993e2a168f45943e6a6b83e8d580c905c2c8c24a28b30561fd77fb SHA512 3d09c33518830b9fe6da17c99e973286844fd514dbe2dc4201f8cdd9f66d80db19acb6404c33945860b4c6c440386f28accc518f5ab1f47b828d1c146801ffda WHIRLPOOL 3a09c3f3653bd48d75f5a11126d5f1e7e854575423b01666c0e260df6c4a3ee16dffbd716a13 \ No newline at end of file diff --git a/dev-perl/Apache-Session/metadata.xml b/dev-perl/Apache-Session/metadata.xml index f1a9d4b179ac..a09926dabfc8 100644 --- a/dev-perl/Apache-Session/metadata.xml +++ b/dev-perl/Apache-Session/metadata.xml @@ -1,19 +1,5 @@ - - perl - - Apache-Session - Apache::Session - Apache::Session::DB_File - Apache::Session::File - Apache::Session::Flex - Apache::Session::Generate::MD5 - Apache::Session::Generate::ModUniqueId - Apache::Session::Generate::ModUsertrack - Apache::Session::Informix - - perl @@ -36,4 +22,16 @@ Apache::Session::Postgres Apache::Session::Serialize::Base64 Apache::Session::Serialize::Storable - Apache::Session::Serialize:: \ No newline at end of file + Apache::Session::Serialize::Sybase + Apache::Session::Serialize::UUEncode + Apache::Session::Store::DBI + Apache::Session::Store::DB_File + Apache::Session::Store::File + Apache::Session::Store::Informix + Apache::Session::Store::MySQL + Apache::Session::Store::Oracle + Apache::Session::Store::Postgres + Apache::Session::Store::Sybase + Apache::Session::Sybase + + diff --git a/dev-perl/Cache-Memcached-Fast/Manifest b/dev-perl/Cache-Memcached-Fast/Manifest index 98ec3b9661fb..d96d2876a32f 100644 --- a/dev-perl/Cache-Memcached-Fast/Manifest +++ b/dev-perl/Cache-Memcached-Fast/Manifest @@ -1,4 +1,2 @@ DIST Cache-Memcached-Fast-0.19.tar.gz 93883 SHA256 75340f00302b39562211b37909ef2d73fd99f28ba7c90b4af205de506affd82c SHA512 f1d5f95edfbd6b33354afa7eb9f242ffd1101a2052b1132d42a982067c5167430b7ecb0b78991d8d8f3d5f1c48d0ccba6ecb17623a9cba994b094e8ef9ad6dac WHIRLPOOL 7dc322711ff119d2486a07cd928a59483677512cdd4b1b831510fc298b127e180d0be3f5cd26b9440dc0018965cae9a8fb3575221579d6892eb11cacd103f369 -DIST Cache-Memcached-Fast-0.21.tar.gz 95139 SHA256 b17c2bc65f886dcd3a8b822d76a50de2f8addfd0b5a857988967adaffc9c7c53 SHA512 e81c2c0dc57e0823dc2df4f6ee5fc62bb53af248def15d8e7693631b615ebb896950cf5d12b22aa34132ff9e12a8f53727849522b839a-----BEGIN PGP SIGNED MESSAGE----- -DIST Cache-Memcached-Fast-0.19.tar.gz 93883 SHA256 75340f00302b39562211b37909ef2d73fd99f28ba7c90b4af205de506affd82c SHA512 f1d5f95edfbd6b33354afa7eb9f242ffd1101a2052b1132d42a982067c5167430b7ecb0b78991d8d8f3d5f1c48d0ccba6ecb17623a9cba994b094e8ef9ad6dac WHIRLPOOL 7dc322711ff119d2486a07cd928a59483677512cdd4b1b831510fc298b127e180d0be3f5cd26b9440dc0018965cae9a8fb3575221579d6892eb11cacd103f369 DIST Cache-Memcached-Fast-0.21.tar.gz 95139 SHA256 b17c2bc65f886dcd3a8b822d76a50de2f8addfd0b5a857988967adaffc9c7c53 SHA512 e81c2c0dc57e0823dc2df4f6ee5fc62bb53af248def15d8e7693631b615ebb896950cf5d12b22aa34132ff9e12a8f53727849522b839aca4f7dd080addc90202 WHIRLPOOL cd17f8fd029cc0ccf1bee2b49591367faef827f47cf0f09ca08969edfec8f63838082d5a47ac3482534ee6c9c2fa6757c490fddc5c6df338295ec3cc12035520 diff --git a/dev-perl/Class-XSAccessor/Manifest b/dev-perl/Class-XSAccessor/Manifest index c357535661ba..cc30027f9aaf 100644 --- a/dev-perl/Class-XSAccessor/Manifest +++ b/dev-perl/Class-XSAccessor/Manifest @@ -1,3 +1,2 @@ -DIST Class-XSAccessor-1.18.tar.gz 82326 SHA256 0a3d25f5261f449e2e1711e53a659244cb314322d2d70abf37c81cd6d853c995 SHA512 4ef49c9eb6a44a42380e8f4a440e9c0b8ae22b58e3f5fdc703420c1f195d89df574c50a33e0deba264619aaec36d2693b62f16b4cd5958b8f108da91743b233e-----BEGIN PGP SIGNED MESSAGE----- DIST Class-XSAccessor-1.18.tar.gz 82326 SHA256 0a3d25f5261f449e2e1711e53a659244cb314322d2d70abf37c81cd6d853c995 SHA512 4ef49c9eb6a44a42380e8f4a440e9c0b8ae22b58e3f5fdc703420c1f195d89df574c50a33e0deba264619aaec36d2693b62f16b4cd5958b8f108da91743b233e WHIRLPOOL d70d2ef5e9bb3f360dc81bc082fa2150d0c12da4fc3b12125f814e4bf3e78276c3b8d2c7742918b2311502359c003d216bd64e6aae9b2db81acc855d0d8b1116 DIST Class-XSAccessor-1.19.tar.gz 80786 SHA256 99c56b395f1239af19901f2feeb125d9ecb4e351a0d80daa9529211a4700a6f2 SHA512 58855bb2108b60cc90ae1d1c4d6a011da7bac2d063c7c953ff8610ae164ba60731a664f0fbddf148e1eabb60042913a17633a9c9a8936a23a59130b381bf63f8 WHIRLPOOL cdc9c34f522ee2472a8b0eaa9588901251057577bb727636e09af5a65b1c90d7e38a545b22f040568af38cc3e4649a41af84adec828e044a81659c22cdffe4f2 diff --git a/dev-perl/Crypt-PasswdMD5/Manifest b/dev-perl/Crypt-PasswdMD5/Manifest index b3fe2bf93722..cb3c23d0803a 100644 --- a/dev-perl/Crypt-PasswdMD5/Manifest +++ b/dev-perl/Crypt-PasswdMD5/Manifest @@ -1,4 +1,2 @@ DIST Crypt-PasswdMD5-1.3.tar.gz 4820 SHA256 a44c3811d948ee9380f552610184fbf611b31099442b0f25c200f507a3d9408e SHA512 aab35765f73e342d401dcbec46118b23ac1fc8c1f83d7fe3f9f5513fd98043a0e4da281a045a52d108bd48a3f8df6f2b436836b7990a07d75c9e02eb3d83bda0 WHIRLPOOL 016913cbc5c07292574108e0118c09a355b3134fd969637ea97577c7eaee94e403b48bcabd836a6a421fe5c99e2a95f5b187b499980896c4c0f72194fc9b9c12 DIST Crypt-PasswdMD5-1.40.tgz 6683 SHA256 b77d6aeea25301af7be679f7452e894ca88af9710bffd6e01d665a141c391948 SHA512 c00f76210a9c07ad610b4698b15d142c3859100a13af620919e32bf046ab2febf8ebedafcffa4dde62f7e9af0e9ff137dae623e0bab60380fca003f7b35bfc77 WHIRLPOOL cd67d73152a049fefda50c05166cb9c0481daab2bbdf3702a3f27892e202b0eeda773be1a6646210804633fcedaf1610107b6fd6108c7223d6c257853b33de82 -DIST Crypt-PasswdMD5-1.3.tar.gz 4820 SHA256 a44c3811d948ee9380f552610184fbf611b31099442b0f25c200f507a3d9408e SHA512 aab35765f73e342d401dcbec46118b23ac1fc8c1f83d7fe3f9f5513fd98043a0e4da281a045a52d108bd48a3f8df6f2b436836b7990a07d75c9e02eb3d83bda0 WHIRLPOOL 016913cbc5c07292574108e0118c09a355b3134fd969637ea97577c7eaee94e403b48bcabd836a6a421fe5c99e2a95f5b187b499980896c4c0f72194fc9b9c12 -DIST Crypt-PasswdMD5-1.40.tgz 6683 SHA256 b77d6aeea25301af7be679f7452e894ca88af9710bffd6e01d665a141c391948 SHA512 c00f76210a9c07ad610b4698b15d142c3859100a13af620919e32bf046ab2febf8ebedafcffa4dde62f7e9af0e9ff137dae623e0bab60380fca003f7b35bfc77 WHIRLPOOL cd67d73152a049fefda50c05166cb9c0481daab2bbdf3702a3f27892e202b0eeda773be1a6646210804633fcedaf1610107b6fd6108c7223d6c257853b33de82 diff --git a/dev-perl/Crypt-Simple/Manifest b/dev-perl/Crypt-Simple/Manifest index 014abfe63f2c..f740e1d2040e 100644 --- a/dev-perl/Crypt-Simple/Manifest +++ b/dev-perl/Crypt-Simple/Manifest @@ -1,2 +1 @@ DIST Crypt-Simple-0.06.tar.gz 4336 SHA256 3db6e7754eaa425ab2d958d40b62d2026b0b186cd576ee352b4c172fb52d8e17 SHA512 6e72bb3aeea1337fd12dc1064a43dc02dff641675472a88d638e28685612ca966eb7806ad45e263b36a1dd84302b5338c0c1e9eab612e69727ffce667eb34cae WHIRLPOOL 946b6a91840e79ae0b2ad3ec0521307c590fbdeeb691237aff921ef42c38ab3a20de2722dd769ef0fb6d819c10ab529a79817906e323fe658a7a8cf3ed6ca733 -DIST Crypt-Simple-0.06.tar.gz 4336 SHA256 3db6e7754eaa425ab2d958d40b62d2026b0b186cd576ee352b4c172fb52d8e17 SHA512 6e72bb3aeea1337fd12dc1064a43dc02dff641675472a88d638e28685612ca966eb7806ad45e263b36a1dd84302b5338c0c1e9eab612e69727ffce667eb34cae WHIRLPOOL 946b6a91840e79ae0b2ad3ec0521307c590fbdeeb691237aff921ef42c38ab3a20de2722dd769ef0fb6d819c10ab529a79817906e323fe658a7a8cf3ed6ca733 diff --git a/dev-perl/Curses-UI/Manifest b/dev-perl/Curses-UI/Manifest index 2e46309856d0..c5154e7c5094 100644 --- a/dev-perl/Curses-UI/Manifest +++ b/dev-perl/Curses-UI/Manifest @@ -1,2 +1 @@ -DIST Curses-UI-0.9609.tar.gz 155842 SHA256 0ab827a513b6e14403184fb065a8ea1d2ebda122d2178cbf45c781f311240eaf SHA512 b92bf34b3d6b9434b948bb8c4a490e4fca4f4edc7289fd5be9fddf4af68424b12ade9c9096ab6e9b292d1863522a1b743b0f68aabec745300092a3d59e43762a WHIRLPOOL d15d068bf22c8178bba4e6748b824a08d127107e9d57ae8a5-----BEGIN PGP SIGNED MESSAGE----- DIST Curses-UI-0.9609.tar.gz 155842 SHA256 0ab827a513b6e14403184fb065a8ea1d2ebda122d2178cbf45c781f311240eaf SHA512 b92bf34b3d6b9434b948bb8c4a490e4fca4f4edc7289fd5be9fddf4af68424b12ade9c9096ab6e9b292d1863522a1b743b0f68aabec745300092a3d59e43762a WHIRLPOOL d15d068bf22c8178bba4e6748b824a08d127107e9d57ae8a5f9e8fd3dd16ecda12eecafc125719cbf2368298f0bba9127d7c496f1f0dc65fd7369f230b051a17 diff --git a/dev-perl/Curses/Manifest b/dev-perl/Curses/Manifest index f6c92c497db5..bd64e90788fa 100644 --- a/dev-perl/Curses/Manifest +++ b/dev-perl/Curses/Manifest @@ -1,2 +1 @@ DIST Curses-1.28.tgz 127412 SHA256 613b73c4b6075b1550592812214e4fc0e2205d3afcf234e3fa90f208fb8de892 SHA512 75664b39174c9875f7f779801bddb08f89ace029ea99857b561e8f8eec167f6f9059a32bc51265145b84bca1316e6d2f90a576b280cfcc7e050225f28730dff2 WHIRLPOOL dbfb87c59a236fef47e5b03735c92d109b2b4bf4a35ae69691c465f832d4122b5d48663ae4707ec6d79e6e5f892f3fdf6991400605f996e712863b3fca1a14c0 -DIST Curses-1.28.tgz 127412 SHA256 613b73c4b6075b1550592812214e4fc0e2205d3afcf234e3fa90f208fb8de892 SHA512 75664b39174c9875f7f779801bddb08f89ace029ea99857b561e8f8eec167f6f9059a32bc51265145b84bca1316e6d2f90a576b280cfcc7e050225f28730dff2 WHIRLPOOL dbfb87c59a236fef47e5b03735c92d109b2b4bf4a35ae69691c465f832d4122b5d48663ae4707ec6d79e6e5f892f3fdf6991400605f996e712863b3fca1a14c0 diff --git a/dev-perl/DBD-Pg/Manifest b/dev-perl/DBD-Pg/Manifest index 8041d8b70b8a..3bbbaf5dec71 100644 --- a/dev-perl/DBD-Pg/Manifest +++ b/dev-perl/DBD-Pg/Manifest @@ -1,4 +1,2 @@ DIST DBD-Pg-2.19.3.tar.gz 237399 SHA256 37350d134b7fa88fb3b9432d92991e0a73f405bf5b3a4ee53430439280b8262a SHA512 e1183fda7abcd2ee05491fe269172e5fb09dba6cb329c6f6f1a5abb9dc9a98c414a0b67f3465b938b197bbe34e3ebc9ec6a4e810e1f9e2316753845ac5416fec WHIRLPOOL 427b1705a3d8e69032b2db5d7ad1d1c6de6353c44b5b6294352abfb28f100f2f572356a2402e285bfbb373384bff18fef7355c545ceb21fbffea07d5de75ec24 DIST DBD-Pg-3.3.0.tar.gz 251408 SHA256 52f43de5b2d916d447d7ed252b127f728b226dc88db57d4fe9712e21d3586ffe SHA512 eb8fbc2e9ad3a846ee4ee580ad2d18cb99b8df48b1c30595d0ffc6ab6e0ff91c36f61e98120968285bd3818f0e565a43189066eda8f93a2972e1df3258ed4f8e WHIRLPOOL b0143c95422ca7e8566b7bf7b63ff8d83e5304a0a83b93a5acff30a3d2140243fb580fa36ac70aeebf8226d7990d56fd85b0ae942310944c21564b7b933b662a -DIST DBD-Pg-2.19.3.tar.gz 237399 SHA256 37350d134b7fa88fb3b9432d92991e0a73f405bf5b3a4ee53430439280b8262a SHA512 e1183fda7abcd2ee05491fe269172e5fb09dba6cb329c6f6f1a5abb9dc9a98c414a0b67f3465b938b197bbe34e3ebc9ec6a4e810e1f9e2316753845ac5416fec WHIRLPOOL 427b1705a3d8e69032b2db5d7ad1d1c6de6353c44b5b6294352abfb28f100f2f572356a2402e285bfbb373384bff18fef7355c545ceb21fbffea07d5de75ec24 -DIST DBD-Pg-3.3.0.tar.gz 251408 SHA256 52f43de5b2d916d447d7ed252b127f728b226dc88db57d4fe9712e21d3586ffe SHA512 eb8fbc2e9ad3a846ee4ee580ad2d18cb99b8df48b1c30595d0ffc6ab6e0ff91c36f61e98120968285bd3818f0e565a43189066eda8f93a2972e1df3258ed4f8e WHIRLPOOL b0143c95422ca7e8566b7bf7b63ff8d83e5304a0a83b93a5acff30a3d2140243fb580fa36ac70aeebf8226d7990d56fd85b0ae942310944c21564b7b933b662a diff --git a/dev-perl/DBIx-Class-InflateColumn-Boolean/Manifest b/dev-perl/DBIx-Class-InflateColumn-Boolean/Manifest index 870f82d933aa..0d8c2c86c4e5 100644 --- a/dev-perl/DBIx-Class-InflateColumn-Boolean/Manifest +++ b/dev-perl/DBIx-Class-InflateColumn-Boolean/Manifest @@ -1,2 +1 @@ -DIST DBIx-Class-InflateColumn-Boolean-0.002000.tar.gz 30427 SHA256 8b2862916842d4c570e8f198a8db9ebf857d1530c31d728b8c4299d559d29d76 SHA512 05c83bfb6d704f567425492504980332b8f8c85e07f3ca3fbe90fa1f262079d0fff70f45b3946b1fa6b5570e0e201f3901623c07f9baafeefcd404d1610b3cf1 WHIRLPOOL 0520afecebf6b47f4deb881dbeb36ece9b310e4cd-----BEGIN PGP SIGNED MESSAGE----- DIST DBIx-Class-InflateColumn-Boolean-0.002000.tar.gz 30427 SHA256 8b2862916842d4c570e8f198a8db9ebf857d1530c31d728b8c4299d559d29d76 SHA512 05c83bfb6d704f567425492504980332b8f8c85e07f3ca3fbe90fa1f262079d0fff70f45b3946b1fa6b5570e0e201f3901623c07f9baafeefcd404d1610b3cf1 WHIRLPOOL 0520afecebf6b47f4deb881dbeb36ece9b310e4cdf362624c1ce3cc8f092ceea45bebe3015f4973472df3b9d45e2c338b4acd17e1140dd4639b7e6cacf2c9119 diff --git a/dev-perl/Data-Page/Manifest b/dev-perl/Data-Page/Manifest index 76d8a0f1661c..bd056369e5e6 100644 --- a/dev-perl/Data-Page/Manifest +++ b/dev-perl/Data-Page/Manifest @@ -1,2 +1 @@ DIST Data-Page-2.02.tar.gz 8189 SHA256 a414bd2e6f9ba8982017b3fbeaa460da8fbadee1cf5ec37c7e560948984871c3 SHA512 22b5b8b80672bfd20a1552ee9d41e5150262eb37be6d903d67465be472d1802668ac898b9172b76fe2747f25ff9ad2025257b215f763f2ba5793abb46eb2343f WHIRLPOOL d75c18051ff476a39382a870f05cb521beebe9f9ea411b2f35c9a20a3e67a0ac6e1c59b4c792a4e9477bbd072d8fd3b4522e2889d8ba6f675e71f8bfa3de6431 -DIST Data-Page-2.02.tar.gz 8189 SHA256 a414bd2e6f9ba8982017b3fbeaa460da8fbadee1cf5ec37c7e560948984871c3 SHA512 22b5b8b80672bfd20a1552ee9d41e5150262eb37be6d903d67465be472d1802668ac898b9172b76fe2747f25ff9ad2025257b215f763f2ba5793abb46eb2343f WHIRLPOOL d75c18051ff476a39382a870f05cb521beebe9f9ea411b2f35c9a20a3e67a0ac6e1c59b4c792a4e9477bbd072d8fd3b4522e2889d8ba6f675e71f8bfa3de6431 diff --git a/dev-perl/Import-Into/Manifest b/dev-perl/Import-Into/Manifest index 25194549b5ac..948134aedaa3 100644 --- a/dev-perl/Import-Into/Manifest +++ b/dev-perl/Import-Into/Manifest @@ -1,3 +1,2 @@ -DIST Import-Into-1.001000.tar.gz 4762 SHA256 340d5fefa73428804dd45adfedb43e9bfa9a5337b9d2717c5b5fb1e637402c27 SHA512 1c62e0ce9b85f897d498f7035c7c30df2df6c549563e9729b807617609bcff75919c4002601130a836944d42b9be8d9eaf97f9d0f433262aca25d5af5c4e0dc7 WHIRLPOOL a7e0eea03cc41e2b027805c44718bab17082d1e-----BEGIN PGP SIGNED MESSAGE----- DIST Import-Into-1.001000.tar.gz 4762 SHA256 340d5fefa73428804dd45adfedb43e9bfa9a5337b9d2717c5b5fb1e637402c27 SHA512 1c62e0ce9b85f897d498f7035c7c30df2df6c549563e9729b807617609bcff75919c4002601130a836944d42b9be8d9eaf97f9d0f433262aca25d5af5c4e0dc7 WHIRLPOOL a7e0eea03cc41e2b027805c44718bab17082d1e50ea43d402184ee16d5ece95e50c783096068d871eb36dfbd44c30f46bbb08823ae91f6bcac3801c4645ad852 DIST Import-Into-1.002000.tar.gz 6483 SHA256 122277b33b42a1232681b457440309a031489bdb73a97d3c33b6bda9b1d8adbf SHA512 a36a59850adccd8cd2e25d4565627695c129a8e2a4097accb8afa90144c26f3f2e214679c35ac5ee269a672b352c9c9f1e1f49e35d17f08da257eef5e528bedd WHIRLPOOL 91571abc0e8f1dd4abb4020b8cb25d658bc68dd7c0771a1e6201259745b83bdd0ae4820d5a56ba3f1290b6f299926e99398221af7e323e435dd0077db57618d8 diff --git a/dev-perl/JSON-Any/Manifest b/dev-perl/JSON-Any/Manifest index 0c93416a3d24..84433e03ed4c 100644 --- a/dev-perl/JSON-Any/Manifest +++ b/dev-perl/JSON-Any/Manifest @@ -1,4 +1,2 @@ DIST JSON-Any-1.29.tar.gz 37017 SHA256 42cfb992ee310494cf0ffdf2eee10ae6fbf5bf7dd5da7c34c927a3025b926297 SHA512 d4015fd0053c00afe855513c7982db1fbfe2f494f53bfaad41eb8e917ea00d292db146a505df8f77fa423d3a1c6b59befd76790bc09a5b3e82bd3d5f36dcd5ce WHIRLPOOL d37e78351a4047f7574acc0957c12713c19e16b37f65b72ebeaa53fcda2e088c6d58cad6fece5494a34f322998143c08db13a0792107c3af968c67eefa365005 DIST JSON-Any-1.30.tar.gz 19612 SHA256 40fcace8ef117cd98f1369237465b2f28331a8ae83558751705e63678b6f6a60 SHA512 d789e1e40781b0a3dd5b70e0c69fc86ff199b3f51fcc52314ac6c50a2906080743ad47b77166fd3b259f112b5e08b712f5f12f7dbd69d4b1c2c6cea9978ca903 WHIRLPOOL fdb8ac151fedc31e669d388c60cc6b0a113241e6d62779215fca11afd227c489b469549bf005a45da9e7666ff239a2baaaf2baa273091d4df696a5ef695ef683 -DIST JSON-Any-1.29.tar.gz 37017 SHA256 42cfb992ee310494cf0ffdf2eee10ae6fbf5bf7dd5da7c34c927a3025b926297 SHA512 d4015fd0053c00afe855513c7982db1fbfe2f494f53bfaad41eb8e917ea00d292db146a505df8f77fa423d3a1c6b59befd76790bc09a5b3e82bd3d5f36dcd5ce WHIRLPOOL d37e78351a4047f7574acc0957c12713c19e16b37f65b72ebeaa53fcda2e088c6d58cad6fece5494a34f322998143c08db13a0792107c3af968c67eefa365005 -DIST JSON-Any-1.30.tar.gz 19612 SHA256 40fcace8ef117cd98f1369237465b2f28331a8ae83558751705e63678b6f6a60 SHA512 d789e1e40781b0a3dd5b70e0c69fc86ff199b3f51fcc52314ac6c50a2906080743ad47b77166fd3b259f112b5e08b712f5f12f7dbd69d4b1c2c6cea9978ca903 WHIRLPOOL fdb8ac151fedc31e669d388c60cc6b0a113241e6d62779215fca11afd227c489b469549bf005a45da9e7666ff239a2baaaf2baa273091d4df696a5ef695ef683 diff --git a/dev-perl/JSON-XS/Manifest b/dev-perl/JSON-XS/Manifest index 9b9894029cf9..f806aeb438d5 100644 --- a/dev-perl/JSON-XS/Manifest +++ b/dev-perl/JSON-XS/Manifest @@ -1,4 +1,2 @@ DIST JSON-XS-2.33.tar.gz 74514 SHA256 b4391c98ad25a4a546c14d0eddf3212734d28b8c8bfce61313bd9bdf0b72c85c SHA512 bd446034f17818576205a67f5ae319b57e6fa833a0624ac402660a3c9f3e03d902cc9fadf599dc2a3c55cc99df1768810ca3f1f11617abdc50c76af6e3d71bf9 WHIRLPOOL 40e3db67f8074143e7e690d29564cdbc83d5a960756101902aa0b910ec70ea53d2a3cadc1917795561e654174d0ee09c1884258d0db980dcbad3e160b219b91a -DIST JSON-XS-2.34.tar.gz 75468 SHA256 a62fdf2777b9ae206aef382dbb62c9a126ce2ceef0229edacee3f6a9c78900ea SHA512 0deed8cfa6c55b551a1327cf3a9c7460b00e9737116b801a79167862dc0b0aba5ceb99aaf3013b879fa3ffb67206587-----BEGIN PGP SIGNED MESSAGE----- -DIST JSON-XS-2.33.tar.gz 74514 SHA256 b4391c98ad25a4a546c14d0eddf3212734d28b8c8bfce61313bd9bdf0b72c85c SHA512 bd446034f17818576205a67f5ae319b57e6fa833a0624ac402660a3c9f3e03d902cc9fadf599dc2a3c55cc99df1768810ca3f1f11617abdc50c76af6e3d71bf9 WHIRLPOOL 40e3db67f8074143e7e690d29564cdbc83d5a960756101902aa0b910ec70ea53d2a3cadc1917795561e654174d0ee09c1884258d0db980dcbad3e160b219b91a DIST JSON-XS-2.34.tar.gz 75468 SHA256 a62fdf2777b9ae206aef382dbb62c9a126ce2ceef0229edacee3f6a9c78900ea SHA512 0deed8cfa6c55b551a1327cf3a9c7460b00e9737116b801a79167862dc0b0aba5ceb99aaf3013b879fa3ffb67206587308f843b8b868f282ffa8a5fccca3c825 WHIRLPOOL 6f1ac43cace605b454b56bb0f0fddfd46ff7b02bb0e2498080cbacd072b6089ba0bb49c893ce94775f9b6d9dc18c30c26eb8408a521a4958405ce0ceff2a6803 diff --git a/dev-perl/JSON/Manifest b/dev-perl/JSON/Manifest index 10d3fdcb9623..eb8eba2fc092 100644 --- a/dev-perl/JSON/Manifest +++ b/dev-perl/JSON/Manifest @@ -1,3 +1,2 @@ -DIST JSON-2.53.tar.gz 84391 SHA256 90de181e583d105a1086da4fe961ceacf39217f5ea7b3c8d886a5ed04ed0d565 SHA512 fd35090f90c7d6658f7398ba8b2fb3815e0493e147964bc127f2e4f9692b67334d213b7417e3049e5837ca309e04-----BEGIN PGP SIGNED MESSAGE----- DIST JSON-2.53.tar.gz 84391 SHA256 90de181e583d105a1086da4fe961ceacf39217f5ea7b3c8d886a5ed04ed0d565 SHA512 fd35090f90c7d6658f7398ba8b2fb3815e0493e147964bc127f2e4f9692b67334d213b7417e3049e5837ca309e04d28b6d2bb1558d31d8295fa54724ce5d2548 WHIRLPOOL a9c27e59d516688e76668564a89a2c65148cbca307bf4edae46e55b8161e8a6838995f44f3ed2bc3b93c62756746c5db45c7d768c61a0229d6d23acdc2d539a5 DIST JSON-2.59.tar.gz 83997 SHA256 349b191b624474245648f4e8810463433ac8065cc7a44171634902ba113cda6d SHA512 141003524e5b5187abdcf935bf16807dfab6d770add373cc571b8b137015f9e29966e5836a38f523147259d573534b1f50048acac712389939de6e67cb1e78f9 WHIRLPOOL 7a47e4d59dc5f848405349588a750a99847848f7673d194521b2bd6788b4aeb6fccd973678790a97ce3fc058576e04e43c12c50177af2865ef533a0c1be73d12 diff --git a/dev-perl/List-AllUtils/List-AllUtils-0.80.0.ebuild b/dev-perl/List-AllUtils/List-AllUtils-0.80.0.ebuild new file mode 100644 index 000000000000..ebaed9e45f3d --- /dev/null +++ b/dev-perl/List-AllUtils/List-AllUtils-0.80.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-perl/List-AllUtils/List-AllUtils-0.80.0.ebuild,v 1.1 2014/10/01 11:44:15 zlogene Exp $ + +EAPI=5 + +MODULE_AUTHOR=DROLSKY +MODULE_VERSION=0.08 +inherit perl-module + +DESCRIPTION='Combines List::Util and List::MoreUtils in one bite-sized package' + +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + >=dev-perl/List-MoreUtils-0.280.0 + >=virtual/perl-Scalar-List-Utils-1.190.0 +" +DEPEND="${RDEPEND}" + +SRC_TEST="do" diff --git a/dev-perl/List-AllUtils/Manifest b/dev-perl/List-AllUtils/Manifest index 96082e6cb000..09ba3eb7f43f 100644 --- a/dev-perl/List-AllUtils/Manifest +++ b/dev-perl/List-AllUtils/Manifest @@ -1 +1,2 @@ DIST List-AllUtils-0.03.tar.gz 14355 SHA256 4806cc718c5b7530d0bec48d3f7682e7f55a489be4014519d68f937c11c2a115 SHA512 b2b9165df393d8c8e9f19ab46aa6ede0c5b80eda59fd6800932ee342d34f20ee9ef7ae89f78f90c31131fe4352800eb93b6e631bce9adf2e4aa41730d6e8a98f WHIRLPOOL 32bcf02fa4ac198c46f852553c74d97dc5f38b5d0988386d4060c1452519cc01bd81f86adec35405e974385ec05fcd86bf0d52474039a2ca2ad608f9c9d475e2 +DIST List-AllUtils-0.08.tar.gz 19283 SHA256 27ddc2f0d47656cd3e08846ffe19f765bbd6c1d0e3c751ce4bb704e2b0b7ad1f SHA512 112591ad2c0ecfdbe2757e96827d5ea8f6d2b47491ace9ba406270fb6d15626a28da2381ef27231c61b7b4b42dc1bdeb323defa751d9a5cd20ca2cf489cd28e3 WHIRLPOOL e8191107c7f1a7beaf43e08fabd84ace25c4a6b5859e1eefb8c0b4a378abcf3620f2c0fd15f3b2a412dc5a9d757f6d905b2e849461e5d833662eb3cdc13d91a5 diff --git a/dev-perl/Module-Install/Manifest b/dev-perl/Module-Install/Manifest index 73a545384100..c472195ffb0e 100644 --- a/dev-perl/Module-Install/Manifest +++ b/dev-perl/Module-Install/Manifest @@ -1 +1,2 @@ DIST Module-Install-1.06.tar.gz 135467 SHA256 de9ec8395b3b497d6d9629859b54086643c3911dff80cc7e0e22b380cb194519 SHA512 0bc90ee5e53923af7d1bf0359587762c4a79cc35608ff38e9c4a3bb0e3fb122a596a29c3cc6e91c75e7c7670d65683ce9cb2510ca39d889676fb88c038e444fa WHIRLPOOL 022e7668c8a3190f23720d7b9f0bbe8c4a6e4f79a498d7edefe3e55f796c819f2ca3695ede05bfa61b7c2986cb8dbcc710c80e67048f6616cd7102ddba2ac1c6 +DIST Module-Install-1.12.tar.gz 128175 SHA256 3ba58f4ab7dea442501550372dfa1a72f6a6652af6fbea8a04b31adb181d5503 SHA512 b988e6cf66a592319e441210574ecdd616849b44ce02dacf03f9186122905e1e9eace6dbc35c04539beab233bc9f7783d73121711893dcc1113617c4723ec351 WHIRLPOOL 61bf310b284c6c58a8b7bd836dbbcfd4c132857018f6be559c23b6ff700a38149d624500a7d09da9d1d9f4fd24adc87817e6eaeffdbe6b72e7ec8d5fa50fc26a diff --git a/dev-perl/Module-Install/Module-Install-1.120.0.ebuild b/dev-perl/Module-Install/Module-Install-1.120.0.ebuild new file mode 100644 index 000000000000..b7305f766111 --- /dev/null +++ b/dev-perl/Module-Install/Module-Install-1.120.0.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-perl/Module-Install/Module-Install-1.120.0.ebuild,v 1.2 2014/10/01 11:36:06 zlogene Exp $ + +EAPI=5 + +MODULE_AUTHOR=BINGOS +MODULE_VERSION=1.12 +inherit perl-module + +DESCRIPTION="Standalone, extensible Perl module installer" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="test" + +RDEPEND=">=virtual/perl-File-Spec-3.28 + >=virtual/perl-Archive-Tar-1.44 + >=virtual/perl-ExtUtils-MakeMaker-6.590.0 + >=virtual/perl-ExtUtils-ParseXS-2.19 + >=virtual/perl-Module-Build-0.33 + >=virtual/perl-Module-CoreList-2.17 + >=virtual/perl-Parse-CPAN-Meta-1.39 + >=dev-perl/libwww-perl-5.812 + >=dev-perl/File-Remove-1.42 + >=dev-perl/JSON-2.14 + >=dev-perl/Module-ScanDeps-0.89 + >=dev-perl/PAR-Dist-0.29 + >=dev-perl/YAML-Tiny-1.38" +DEPEND="${RDEPEND} + test? ( >=virtual/perl-Test-Harness-3.13 + >=virtual/perl-Test-Simple-0.86 )" + +SRC_TEST=do diff --git a/dev-perl/Module-Install/Module-Install-1.60.0-r1.ebuild b/dev-perl/Module-Install/Module-Install-1.60.0-r1.ebuild index 8b8d24452f34..6c099c6c9343 100644 --- a/dev-perl/Module-Install/Module-Install-1.60.0-r1.ebuild +++ b/dev-perl/Module-Install/Module-Install-1.60.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-perl/Module-Install/Module-Install-1.60.0-r1.ebuild,v 1.5 2014/08/31 16:17:45 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-perl/Module-Install/Module-Install-1.60.0-r1.ebuild,v 1.6 2014/10/01 11:36:06 zlogene Exp $ EAPI=5 @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="Standalone, extensible Perl module installer" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="test" RDEPEND=">=virtual/perl-File-Spec-3.28 diff --git a/dev-perl/MooseX-Types-Path-Tiny/Manifest b/dev-perl/MooseX-Types-Path-Tiny/Manifest index 5c192cf00f0c..d9d9a62cc584 100644 --- a/dev-perl/MooseX-Types-Path-Tiny/Manifest +++ b/dev-perl/MooseX-Types-Path-Tiny/Manifest @@ -1,4 +1,2 @@ DIST MooseX-Types-Path-Tiny-0.001.tar.gz 11863 SHA256 fb49c65290beec84afe559d4e855352ae513a8838d12a38368cad60f842eeae3 SHA512 11786287242a583327efa8355db59a520e38542c6cd820b93666300da7197bfcd5edb08ca25f66a46816c9af7679f4d461fd538c7726e54adeaabf602d492c9d WHIRLPOOL 2c9b6bbccffae630bf2eedee8fc7d6ac7d69c0dc9f2cbe160dfd47f9c4c3b56e9dd864e150cdabd73ed35dc9a41d615bdb5170cf986be2d8bd3e82fc441205b7 DIST MooseX-Types-Path-Tiny-0.002.tar.gz 12703 SHA256 656939c6a2abcbbeab6a28dff4f488e31004c558f2b4daa72c3925a31a9454bb SHA512 371dcbf7a77187a242f9a020e5bfdb4e9919f05bc975f29bfefbda63653e293f206c9e285f4191a5f94c56ca35a9f9c46409d29db8d445f80cc9cadcea2387d9 WHIRLPOOL ba6a72e7c1c30d9b6091a51333b2572f4f62355ce80cee4bd27a60d362a79026ce42656f5e8666847af9606d5117d3f2078f1b6e02f3424310351a612beb8123 -DIST MooseX-Types-Path-Tiny-0.001.tar.gz 11863 SHA256 fb49c65290beec84afe559d4e855352ae513a8838d12a38368cad60f842eeae3 SHA512 11786287242a583327efa8355db59a520e38542c6cd820b93666300da7197bfcd5edb08ca25f66a46816c9af7679f4d461fd538c7726e54adeaabf602d492c9d WHIRLPOOL 2c9b6bbccffae630bf2eedee8fc7d6ac7d69c0dc9f2cbe160dfd47f9c4c3b56e9dd864e150cdabd73ed35dc9a41d615bdb5170cf986be2d8bd3e82fc441205b7 -DIST MooseX-Types-Path-Tiny-0.002.tar.gz 12703 SHA256 656939c6a2abcbbeab6a28dff4f488e31004c558f2b4daa72c3925a31a9454bb SHA512 371dcbf7a77187a242f9a020e5bfdb4e9919f05bc975f29bfefbda63653e293f206c9e285f4191a5f94c56ca35a9f9c46409d29db8d445f80cc9cadcea2387d9 WHIRLPOOL ba6a72e7c1c30d9b6091a51333b2572f4f62355ce80cee4bd27a60d362a79026ce42656f5e8666847af9606d5117d3f2078f1b6e02f3424310351a612beb8123 diff --git a/dev-perl/MooseX-Types/Manifest b/dev-perl/MooseX-Types/Manifest index 911e009eec0e..05ea1f3a8ec7 100644 --- a/dev-perl/MooseX-Types/Manifest +++ b/dev-perl/MooseX-Types/Manifest @@ -1,4 +1,2 @@ DIST MooseX-Types-0.35.tar.gz 32495 SHA256 0a75eae63eeb8d1316d892d4c6e548802955827d0c1cb99747627079d3abca86 SHA512 a3ad136054ac8f5b17d034e0d1a5319deafca1e932bc0ccc8ea56f6109cee9a24705c6f490fde6d894034227ed7fe8d1919e2a4ccb924c231863585226c6dc87 WHIRLPOOL e6bd8dea7ee5f0a5dc0ef5af9e3b3601ae4488cd5348c42b96d46cf585c73b2e4229cd7cc464399bed2700d799df2c4755d135579180a593e48e13ab00aa0a99 DIST MooseX-Types-0.36.tar.gz 55122 SHA256 cf73a14fa67ca3070b76e071a933fae87b8daf1dbc48970d8461884ee9f8e9aa SHA512 970938bbe9fa484e0623e30f611e84145bc4a1ded442c1c777ec5df20129a7af05612084228fe2073ff14e4acc7a94e797a509021344b006acbcf414277d30f9 WHIRLPOOL 382e2e3de8d0ea4a6a7f69d0859f70abcd86583842491dcbbce1c5f24ce95cedb35525ba2a86653576fdc432ba65b1a4b9d706a6900b8911dd7d0e9fed685abe -DIST MooseX-Types-0.35.tar.gz 32495 SHA256 0a75eae63eeb8d1316d892d4c6e548802955827d0c1cb99747627079d3abca86 SHA512 a3ad136054ac8f5b17d034e0d1a5319deafca1e932bc0ccc8ea56f6109cee9a24705c6f490fde6d894034227ed7fe8d1919e2a4ccb924c231863585226c6dc87 WHIRLPOOL e6bd8dea7ee5f0a5dc0ef5af9e3b3601ae4488cd5348c42b96d46cf585c73b2e4229cd7cc464399bed2700d799df2c4755d135579180a593e48e13ab00aa0a99 -DIST MooseX-Types-0.36.tar.gz 55122 SHA256 cf73a14fa67ca3070b76e071a933fae87b8daf1dbc48970d8461884ee9f8e9aa SHA512 970938bbe9fa484e0623e30f611e84145bc4a1ded442c1c777ec5df20129a7af05612084228fe2073ff14e4acc7a94e797a509021344b006acbcf414277d30f9 WHIRLPOOL 382e2e3de8d0ea4a6a7f69d0859f70abcd86583842491dcbbce1c5f24ce95cedb35525ba2a86653576fdc432ba65b1a4b9d706a6900b8911dd7d0e9fed685abe diff --git a/dev-perl/Test-ClassAPI/Test-ClassAPI-1.60.0-r1.ebuild b/dev-perl/Test-ClassAPI/Test-ClassAPI-1.60.0-r1.ebuild index 36932d46371c..b74deb333ee9 100644 --- a/dev-perl/Test-ClassAPI/Test-ClassAPI-1.60.0-r1.ebuild +++ b/dev-perl/Test-ClassAPI/Test-ClassAPI-1.60.0-r1.ebuild @@ -19,4 +19,6 @@ RDEPEND=">=virtual/perl-File-Spec-0.83 >=dev-perl/Class-Inspector-1.12 dev-perl/Config-Tiny >=dev-perl/Params-Util-1.00" -DEPEN# Copyright 1999-2014 Gentoo \ No newline at end of file +DEPEND="${RDEPEND}" + +SRC_TEST=do diff --git a/dev-perl/Test-Command/Manifest b/dev-perl/Test-Command/Manifest index 368d1d89516b..c94b6a2db763 100644 --- a/dev-perl/Test-Command/Manifest +++ b/dev-perl/Test-Command/Manifest @@ -1,2 +1 @@ DIST Test-Command-0.08.tar.gz 9967 SHA256 5c46f5eab3f2c6bbfde4b3ceb01fb78eb7468f381b913355ca84c61a9cf76788 SHA512 b163cf13fb0c12b9aa5fb505143e5fa5e65e2c7be4bfa9e7801a2fb2c735f148fd692e8e7020acbf63cae6ef62cf10f2ec7c5a536a06afd4ad7184c2b5339745 WHIRLPOOL 0abe0afc2cd31d58fa99506d86eadca1c60223b9704390bb5e06980f044790805ff43c7a368ccef6b195652e2dcd56500b856c114baf1ea7a4856cc1d15b22a5 -DIST Test-Command-0.08. \ No newline at end of file diff --git a/dev-perl/YAML-Tiny/Manifest b/dev-perl/YAML-Tiny/Manifest index 246e3bf57672..488c1c7ed40a 100644 --- a/dev-perl/YAML-Tiny/Manifest +++ b/dev-perl/YAML-Tiny/Manifest @@ -1,2 +1 @@ DIST YAML-Tiny-1.51.tar.gz 43342 SHA256 5c6e9b3d9e558fc428d8b8710da49ff3bcb9fb606decb63c24816da01c9f8b4d SHA512 7e40871458f538909df0192a3da2d44efda593fd05305f77c30647abe3ad4acbc50fa2dd4aac2b2264dc711c6472b788326bc396f828b4ab2c8891d4692c3af7 WHIRLPOOL da1a37b9afccb5ee726dd339f674adeb9b005f5c54b3ac1b1400c6d1e583928ed05751ce0115a65d22fb8fcaf0fe7758cdb2ea5bd927bd752c9c8a5d26936d2b -DIST YAML-T \ No newline at end of file diff --git a/dev-perl/libwww-perl/metadata.xml b/dev-perl/libwww-perl/metadata.xml index c872991dd5cb..b7fba106c514 100644 --- a/dev-perl/libwww-perl/metadata.xml +++ b/dev-perl/libwww-perl/metadata.xml @@ -28,5 +28,7 @@ LWP::Protocol::nntp LWP::Protocol::nogo LWP::RobotUA - LWP::Simple< -LWP::Simple + LWP::UserAgent + + diff --git a/dev-perl/libxml-perl/metadata.xml b/dev-perl/libxml-perl/metadata.xml index be990a79d02d..63ead5b1c27a 100644 --- a/dev-perl/libxml-perl/metadata.xml +++ b/dev-perl/libxml-perl/metadata.xml @@ -18,10 +18,9 @@ XML::PatAct::ACTION XML::PatAct::Amsterdam XML::PatAct::MatchName - XML::PatA - - - perl - - libxml-perl - \ No newline at end of file + XML::PatAct::PATTERN + XML::PatAct::ToObjects + XML::Perl2SAX + XML::SAX2Perl + + diff --git a/dev-php/PEAR-Benchmark/Manifest b/dev-php/PEAR-Benchmark/Manifest index 6da5475a6833..ca06965a9fdb 100644 --- a/dev-php/PEAR-Benchmark/Manifest +++ b/dev-php/PEAR-Benchmark/Manifest @@ -1,2 +1 @@ DIST Benchmark-1.2.9.tgz 8696 SHA256 b68c6ca9bfb3ba79e095117ff5e3e674ed9583692f4722b0196e8b3874a9c468 SHA512 18064e6f435e053a2aa9a2f27f3c4cecc26847829e7ee86619748faa7fc1cd0a6ce3d3a419f742d05007875db3fbbfbf05e4732c9f1ba76dbeb983cbc908e516 WHIRLPOOL b3d35f04d1c35a305099f281aadae38d4fc2a64074eeeea6ff54665f1d3645ce34d436397504d57f11ed5e36981a0e3f631784e8c7dc6504570ddc458bbff4fd -DIST Benchmark-1.2.9.tgz 8696 SHA256 b68c6ca9bfb3ba79e095117ff5e3e674ed9583692f4722b0196e8b3874a \ No newline at end of file diff --git a/dev-php/PEAR-File/Manifest b/dev-php/PEAR-File/Manifest index 7922c238398c..0161e6364189 100644 --- a/dev-php/PEAR-File/Manifest +++ b/dev-php/PEAR-File/Manifest @@ -1,5 +1,3 @@ DIST File-1.3.0.tgz 25727 SHA256 543b9e83d69a44300ac389ab64da1cbd8d0a3ea1d01d7fe51bfaf5e2302ca0f6 SHA512 e739ff0b8fdc26d7e2bfbd5ee37a50bff4f4d19900849717551e3188745bbfd31b4a1399fc25bad1b503bbdf468915cb0a4ae4ef50cc2e5c1cdb27a550c4309a WHIRLPOOL 181fc6908166e8a5323006b661e9662dc7e689d3e4071527b676b875014448efd6a1b0f528be8c466af7611b63ea417c367dff0c222b28f84d459ab52c480e5b DIST File-1.4.0.tgz 8120 SHA256 d2cb6395822c0d869e7efa1312cd6d9cfea50ebf75c7b78a031fe1cbfae2a727 SHA512 53e6891f9f19036002ddabb1c070041eeb6a93b288f14241f0ff1fb609a59b261c0f17205dde186d4c5b575af7b9bfcc292f7da364928986d6c9e7a4ed4d2016 WHIRLPOOL bf9bed8a335f57a79968e1767f0772f8e365e0b05ea75f3c84a8d6063dd1d21a528f1c35dc4c9c4c2d5c9a5d7631a848cee2fbb8e3e6e35fd159cd25700aa754 DIST File-1.4.1.tgz 8164 SHA256 f9b7e03dced7c7b6575531fbc73bc479ae4849d80c764862eeeec9b90f74a4d0 SHA512 78dbe4f80296f3c16df89de2f0d332b442d4787be4f7a3bb78259b0e0a0eb719bbadecba6571609ea6b6a488124ff36b6de08061e88268d5f2805fb8a3be05b0 WHIRLPOOL 417ad2e633ca78a96d430acb8c4b9ce064954edc7c297defaec6456c09e7d7116bc1cca39f4ec7947f59030fc370b8d3aa8bdc70210d90dade2e8d38bc97eabf -DIST File-1.3.0.tgz 25727 SHA256 543b9e83d69a44300ac389ab64da1cbd8d0a3ea1d01d7fe51bfaf5e2302ca0f6 SHA512 e739ff0b8fdc26d7e2bfbd5ee37a50bff4f4d19900849717551e3188745bbfd31b4a1399fc25bad1b503bbdf468915cb0a4ae4ef50cc2e5c1cdb27a550c4309a WHIRLPOOL 181fc6908166e8a5323006b661e9662dc7e689d3e4071527b676b875014448efd6a1b0f528be8c466af7611b63ea417c367dff0c222b28f84d459ab52c480e5b -DIST File-1.4. \ No newline at end of file diff --git a/dev-php/PEAR-File_Archive/PEAR-File_Archive-1.5.5.ebuild b/dev-php/PEAR-File_Archive/PEAR-File_Archive-1.5.5.ebuild index 77ebe5ea8999..bfe250306601 100644 --- a/dev-php/PEAR-File_Archive/PEAR-File_Archive-1.5.5.ebuild +++ b/dev-php/PEAR-File_Archive/PEAR-File_Archive-1.5.5.ebuild @@ -14,5 +14,5 @@ IUSE="minimal" RDEPEND="dev-lang/php[bzip2,zlib] dev-php/PEAR-MIME_Type !minimal? ( dev-php/PEAR-Mail_Mime - dev-ph# Copyright 1999-2014 Gentoo Foundation -# Distrib \ No newline at end of file + dev-php/PEAR-Mail + >=dev-php/PEAR-Cache_Lite-1.5.0 )" diff --git a/dev-php/PEAR-File_SMBPasswd/PEAR-File_SMBPasswd-1.0.3.ebuild b/dev-php/PEAR-File_SMBPasswd/PEAR-File_SMBPasswd-1.0.3.ebuild index b90fbbbbf563..49fe89148332 100644 --- a/dev-php/PEAR-File_SMBPasswd/PEAR-File_SMBPasswd-1.0.3.ebuild +++ b/dev-php/PEAR-File_SMBPasswd/PEAR-File_SMBPasswd-1.0.3.ebuild @@ -5,6 +5,10 @@ EAPI="2" inherit php-pear-r1 -DESCRIPTION="Class for managing SAMBA s# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-File_SMBPasswd/PEAR-File_SMBPasswd-1.0.3.ebui \ No newline at end of file +DESCRIPTION="Class for managing SAMBA style password files" +LICENSE="BSD" +SLOT="0" +KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86" +IUSE="" +RDEPEND="|| ( =dev-lang/php-5.3 ) + >=dev-php/PEAR-Crypt_CHAP-1.0.0" diff --git a/dev-php/adodb-ext/Manifest b/dev-php/adodb-ext/Manifest index dfb112d1e738..174b735571c9 100644 --- a/dev-php/adodb-ext/Manifest +++ b/dev-php/adodb-ext/Manifest @@ -1,2 +1 @@ DIST adodb-ext-504.zip 46159 SHA256 e067a73cccc5151843e364f9a0da7807ba9c8e411aaea773f53a811cae586b9f SHA512 eaeb2682454ffc957eba605595a4b388ea6bd6f2f4498118b3cce11679890fdec108c4b6d8e0373972ce940d21b9a198b1016784d574ba9ddc2b65f53fb306c3 WHIRLPOOL 0801b94a7da2a8e09941713b650069f9852bc65aa7bea883cb9e9768d41220746541894f232f2157c6643e8a8807e403f35fd49b403869e9152e47606c13067c -DIST adodb-ext-504.zip 46159 SHA256 e067a73cccc5151843e364f9a0da7807ba9c8e411aaea773f53a811cae586b9f SHA512 eaeb2682454ffc957eba605595a4b388ea6bd6f2f4498118b3cce11679890fdec108c4b6d8e0373972ce940d21b9a198b1016784d574ba9d \ No newline at end of file diff --git a/dev-php/libchart/Manifest b/dev-php/libchart/Manifest index 147d17775281..4732d7248b36 100644 --- a/dev-php/libchart/Manifest +++ b/dev-php/libchart/Manifest @@ -1,4 +1,2 @@ DIST libchart-1.2.2.tar.gz 103063 SHA256 3a369f3d0caf18cb2fa25db9744f2d7986c5020a474ca6b42ef807785bd78166 SHA512 6b86be1afdf4492e911c7c4bb08045d4f4f7229204a53c77339a8a7c5aa896c221e7bd9fe6bac2be05f97de653372689e22827ec1c13ee63402e9058818969bf WHIRLPOOL 033297a4d323729579240c17559d2765fb910e951c71f07b6a8f6f19dc98c84e2fd0f6e62489c7fa6f18da1229903bd51889e4c079088d529bea16d36c4797df DIST libchart-1.3.tar.gz 106204 SHA256 ab3bdf1ccdb008a7ca9f7908d7ed8698163ab6679eaaf4bc37d5229471f38ac2 SHA512 5d2a0b014546487029f552f225fa83de856210a997e69bb5b129e99790f5acfdcfff904077126c42f82974d10f81e7e0342991221af5f108902b2792df24d586 WHIRLPOOL e4bb9b86939592a97bec0b00ebc26046a599a9b6d1ed266db9ad7b6b4a653cca21fdb7aa31078ba2d0957ddc0cc0c5741fd1d62a80b229b55f78dda81c2acca9 -DIST libchart-1.2.2.tar.gz 103063 SHA256 3a369f3d0caf18cb2fa25db9744f2d7986c5020a474ca6b42ef807785bd78166 SHA512 6b86be1afdf4492e911c7c4bb08045d4f4f7229204a53c77339a8a7c5aa896c221e7bd9fe6bac2be05f97de653372689e22827ec1c13ee63402e9058818969bf WHIRLPOOL 033297a4d323729579240c17559d2765fb910e951c71f07b6a8f6f19dc98c84e2fd0f6e62489c7fa6f18da1229903bd51889e4c079088d529bea16d36c4797df -DIST libchart-1.3.tar.gz 106204 SHA256 ab3bdf1ccdb008a7ca9f7908d7ed8698163ab6679eaaf4bc37d5229471f38ac2 SHA512 5d2a0b014546487029f552f225fa83de856210a997e69bb5b129e99790f5acfdcfff904077126c42f82974d10f81e7e0342991221af5f108902b2792df24d586 WHIRLPOOL e4bb9b86939592a97bec0b00ebc26046a599a9b6d1ed266db9ad7b6b4a653cca21fdb7aa31078ba2d0957ddc0cc0c5741fd1d62a80b229b55f78dda81c2acca9 diff --git a/dev-php/pecl-crack/Manifest b/dev-php/pecl-crack/Manifest index 5a46839fd9da..eb6e3a225f11 100644 --- a/dev-php/pecl-crack/Manifest +++ b/dev-php/pecl-crack/Manifest @@ -1,2 +1 @@ DIST crack-0.4.tgz 25524 SHA256 00a5250a6c82b39c1aefcb6e1ce0980da5df49c9bfc6ade9a8e867d89e87f560 SHA512 0dec64d1ce859bb3d7e2b834e4bcc4ef8c6f3e88e5b61884e40dddc366a992a7c85bfad4227224d4401aad7f26843678709f29acd2dcc75563658040b8067d7f WHIRLPOOL 2b6d26cf65912f6fac72733711ed48e0c859df28a3c7a2b351e607edcc51f15fea7cfef01419b3fd56267ddf9c57f4a75f93e64015c0db9d14e5799ac1a411c7 -DIST crack-0.4.tgz 25524 SHA256 00a5250a6c82b39c1aefcb6e1ce0980da5df49c9bfc6ade9a8e867d89e87f560 SHA512 0dec64d1ce859bb3d7e2b834e4bcc4ef8c6f3e88e5b61884e40dddc366a992a7c85bfad4227224d4401aad7f26843678709f29acd2dcc75563658040b8067d7f WHIRLPOOL 2b6d26cf65912f6fac72733711ed48e0c859df28a3c7a2b351e607edcc51f15fea7cfef01419b3fd56267ddf9c57f4a75f93e64015c0db9d14e5799ac1a411c7 diff --git a/dev-python/autobahn/Manifest b/dev-python/autobahn/Manifest index 4d1466b2d09a..7c286bd26a9a 100644 --- a/dev-python/autobahn/Manifest +++ b/dev-python/autobahn/Manifest @@ -1,2 +1 @@ DIST autobahn-0.7.4.zip 143447 SHA256 b0c3900bab665638c6c3e117815c4ef8cf563beda059c102e4b6a6d4496be8d7 SHA512 51233127dced6a32d6e7ed7bbcede54c3afb47c4a729f154bb35cafd74b8913387ac85ec3d9fa6d09e808160efcb6c4f18086a51fbf8cfcb9142c7168939bfcf WHIRLPOOL b578b27df01dd0b880a46cffbf51203daf0f55fadae792237bfe954c109cf91939ba1276a5c89bedb15ee358afd77b31117e8475335628644b916800225d7ce6 -DIST autobahn-0.7.4.zip 143447 SHA256 b0c3900bab665638c6c3e117815c4ef8cf563beda059c102e4b6a6d4496be8d7 SHA512 51233127dced6a32d6e7ed7bbcede54c3afb47c4a729f154bb35cafd74b8913387ac85ec3d9fa6d09e808160efcb6c4f18086a51fbf8cfcb9142c7168939bfcf WHIRLPOOL b578b27df01dd0b880a46cffbf51203daf0f55fadae792237bfe954c109cf91939ba1276a5c89bedb15ee358afd77b31117e8475335628644b916800225d7ce6 diff --git a/dev-python/bsddb3/bsddb3-6.0.0.ebuild b/dev-python/bsddb3/bsddb3-6.0.0.ebuild index bd21691c5013..88fa9b322f31 100644 --- a/dev-python/bsddb3/bsddb3-6.0.0.ebuild +++ b/dev-python/bsddb3/bsddb3-6.0.0.ebuild @@ -7,16 +7,6 @@ PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} ) inherit db-use distutils-r1 multilib -DESCRIPTION="Python bindings for Berkeley DB" -HOMEPAGE="http://www.jcea.es/programacion/pybsddb.htm http://pypi# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/bsddb3-6.0.0.ebuild,v 1.9 2014/01/15 12:41:37 ago Exp $ - -EAPI=5 -PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} ) - -inherit db-use distutils-r1 multilib - DESCRIPTION="Python bindings for Berkeley DB" HOMEPAGE="http://www.jcea.es/programacion/pybsddb.htm http://pypi.python.org/pypi/bsddb3" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" @@ -63,4 +53,23 @@ python_test() { if [[ "${EPYTHON}" == 'python3.3' ]]; then einfo "py3.3 has an internal problem within this ebuild but is known to pass tests" else - "${PYT \ No newline at end of file + "${PYTHON}" setup.py build + einfo "all 500 tests are run silently and may take a number of minutes to complete" + "${PYTHON}" -v test3.py || die + fi + fi +} + +python_install() { + rm -fr "${ED}$(python_get_sitedir)/bsddb3/tests" + + if use doc; then + dohtml -r docs/html/* || die "dohtml failed" + fi + distutils-r1_python_install +} + +python_install_all() { + local HTML_DOCS=( docs/html/. ) + distutils-r1_python_install_all +} diff --git a/dev-python/bsddb3/bsddb3-6.1.0.ebuild b/dev-python/bsddb3/bsddb3-6.1.0.ebuild index 4fa7a0b8a6f6..1ebf8011a563 100644 --- a/dev-python/bsddb3/bsddb3-6.1.0.ebuild +++ b/dev-python/bsddb3/bsddb3-6.1.0.ebuild @@ -7,16 +7,6 @@ PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} ) inherit db-use distutils-r1 multilib -DESCRIPTION="Python bindings for Berkeley DB" -HOMEPAGE="http://www.jcea.es/programa# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/bsddb3-6.1.0.ebuild,v 1.7 2014/08/04 23:46:36 floppym Exp $ - -EAPI=5 -PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} ) - -inherit db-use distutils-r1 multilib - DESCRIPTION="Python bindings for Berkeley DB" HOMEPAGE="http://www.jcea.es/programacion/pybsddb.htm http://pypi.python.org/pypi/bsddb3" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" @@ -65,4 +55,20 @@ src_configure() { python_compile() { if ! python_is_python3; then - local -x CFLAG \ No newline at end of file + local -x CFLAGS="${CFLAGS} -fno-strict-aliasing" + fi + distutils-r1_python_compile +} + +python_test() { + if python_is_python3; then + PYTHONPATH=Lib3 "${PYTHON}" test3.py -v || die "Testing failed with ${EPYTHON}" + else + PYTHONPATH=Lib "${PYTHON}" test.py -v || die "Testing failed with ${EPYTHON}" + fi +} + +python_install_all() { + use doc && local HTML_DOCS=( docs/html/. ) + distutils-r1_python_install_all +} diff --git a/dev-python/bug-buddy-python/Manifest b/dev-python/bug-buddy-python/Manifest index 1785f294cb1d..b3c5fb4b1ca1 100644 --- a/dev-python/bug-buddy-python/Manifest +++ b/dev-python/bug-buddy-python/Manifest @@ -1,2 +1 @@ DIST gnome-python-desktop-2.32.0.tar.bz2 621277 SHA256 09dbd580bf3b0ef60f91b090eafe6d08ddcc50a609e2b425a7f8eca46d4e0ee9 SHA512 51beefd21fa3aa6242ba4c66e57d940372fbf4a84ffe34063339f6e7e7c22e76d281b25d5f113de3780a0dbf733c7e07142f05a285056cda26736323b4185d18 WHIRLPOOL 5713353291a34e0a03152ad76c46391e3ab246efc17b63193fc0b26b02176eb78ce134c8d0cabcb3480bd2dbb3446b7b6b301cffbfac3ce915e21a974947e37e -DIST gnome-python-desktop-2.32.0.tar.bz2 621277 SHA256 09dbd580bf3b0ef60f91b090eafe6d08ddcc50a609e2b425a7f8eca46d4e0ee9 SHA512 51beefd21fa3aa6242ba4c66e57d940372fbf4a84ffe34063339f6e7e7c22e76d281b25d5f113de3780a0dbf733c7e07142f05a285056cda26736323b4185d18 WHIRLPOOL 5713353291a34e0a03152ad76c46391e3ab246efc17b63193fc0b26b02176eb78ce134c8d0cabcb3480bd2dbb3446b7b6b301cffbfac3ce915e21a974947e37e diff --git a/dev-python/celery/celery-3.1.14.ebuild b/dev-python/celery/celery-3.1.14.ebuild index 7f7208034990..c2f7635462cb 100644 --- a/dev-python/celery/celery-3.1.14.ebuild +++ b/dev-python/celery/celery-3.1.14.ebuild @@ -28,36 +28,47 @@ RDEPEND="=dev-python/mock-1.0.1[${PYTHON_USEDEP}] + dev-python/pyopenssl[${PYTHON_USEDEP}] + dev-python/nose-cover3[${PYTHON_USEDEP}] + dev-python/sqlalchemy[${PYTHON_USEDEP}] + dev-python/pymongo[${PYTHON_USEDEP}] + redis? ( dev-python/redis-py[${PYTHON_USEDEP}] + >=dev-db/redis-2.8.0 ) + ) + doc? ( + dev-python/docutils[${PYTHON_USEDEP}] + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/jinja[${PYTHON_USEDEP}] + dev-python/sqlalchemy[${PYTHON_USEDEP}] )" -EAPI=5 +PATCHES=( "${FILESDIR}"/celery-docs.patch + "${FILESDIR}"/${PN}-3.1.11-test.patch ) +# testsuite needs it own source +DISTUTILS_IN_SOURCE_BUILD=1 -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +python_compile_all() { + if use doc; then + mkdir docs/.build || die + emake -C docs html + fi +} -inherit distutils-r1 +python_test() { + nosetests || die "Tests failed with ${EPYTHON}" +} -DESCRIPTION="Celery is an open source asynchronous task queue/job queue based on distributed message passing" -HOMEPAGE="http://celeryproject.org/ http://pypi.python.org/pypi/celery" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" +python_install_all() { + # Main celeryd init.d and conf.d + newinitd "${FILESDIR}/celery.initd-r1" celery + newconfd "${FILESDIR}/celery.confd-r1" celery -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc examples redis test" + use examples && local EXAMPLES=( examples/. ) -PY2_USEDEP=$(python_gen_usedep python2_7) -RDEPEND="=dev-python/kombu-3.0.21[${PYTHON_USEDEP}] - >=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}] - >=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}] - dev-python/pyparsing[${PYTHON_USEDEP}] - >=dev-python/billiard-3.3.0.18[${PYTHON_USEDEP}] - 0.2.0) + sed -i -e '/enthought.debug.api/d' enamldoc/sphinx_ext.py || die +} + +python_compile_all() { + use doc && emake -C docs html +} + +python_test() { + export ETS_TOOLKIT=qt4 + export QT_API=pyside + VIRTUALX_COMMAND="nosetests -v" virtualmake +} + +python_install_all() { + use doc && local HTML_DOCS=( docs/build/html/. ) + use examples && local EXAMPLES=( examples/. ) + distutils-r1_python_install_all +} diff --git a/dev-python/fabric/fabric-1.10.0.ebuild b/dev-python/fabric/fabric-1.10.0.ebuild index 9d1c9a5b88a5..609ba80abc56 100644 --- a/dev-python/fabric/fabric-1.10.0.ebuild +++ b/dev-python/fabric/fabric-1.10.0.ebuild @@ -30,34 +30,39 @@ DEPEND="${RDEPEND} =1.10' is what we have in portage, paramiko can be set unversioned -RDEPEND="dev-python/paramiko[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] - >=dev-python/python-docs-2.7.6-r1:2.7 - dev-python/alabaster[${PYTHON_USEDEP}] ) - test? ( dev-python/nose[${PYTHON_USEDEP}] - feedparser/_feedparser_sgmllib.py + fi + } + python_execute_function -s preparation +} + +src_test() { + testing() { + cd feedparser || return 1 + "$(PYTHON)" feedparsertest.py + } + python_execute_function -s testing +} diff --git a/dev-python/flake8/flake8-2.1.0.ebuild b/dev-python/flake8/flake8-2.1.0.ebuild index 78d4498f842e..643289604b76 100644 --- a/dev-python/flake8/flake8-2.1.0.ebuild +++ b/dev-python/flake8/flake8-2.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Fou# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-python/flake8/flake8-2.1.0.ebuild,v 1.8 2014/08/20 20:30:48 blueness Exp $ @@ -33,4 +33,6 @@ python_prepare_all() { distutils-r1_python_prepare_all } -py \ No newline at end of file +python_test() { + esetup.py test +} diff --git a/dev-python/flask-babel/Manifest b/dev-python/flask-babel/Manifest index 4a21c0fbff71..5f0e2693202b 100644 --- a/dev-python/flask-babel/Manifest +++ b/dev-python/flask-babel/Manifest @@ -1,4 +1,2 @@ DIST Flask-Babel-0.8.tar.gz 44520 SHA256 a255d77910ddfbebc6318c618d9a23cda5d018c86c7e0dea64dc860a16cb3daa SHA512 76e34df0748ec0ee2c0964ab07e85dd708c38601e55626fcc40b5a6064e5f2065c1969c4f888827225daf0ce2bf0a41670ba020f7d52b93915f4120cc478798d WHIRLPOOL 35f914bc4e765e03ccf699bbba696980b1ea48e07491d9e401c9ac76ce701575e8d0d69a63c144ad45fd2df76c7d3948b15cadfdbbc7ffd528ee5eca73e0bd31 DIST Flask-Babel-0.9.tar.gz 38881 SHA256 4afd150f360434b00684ba7848358f7961072fd0658a6e81aaa578522699fb4c SHA512 c667c8a532332bb3dd0d694932d17f7f9b2b51f68151767624116853b2e71f2a6b4c47164d17a6f368b67a5cabce97495b18147655fb36aee5034c058d3b9a89 WHIRLPOOL 28309a4a27bfd0fbe30be52613ee9eef5110e3cc38e863c6de200cced579476870e01b92edaeb08fd29e0deabcaa13d14742d188960742d61cf8ba5384476cd1 -DIST Flask-Babel-0.8.tar.gz 44520 SHA256 a255d77910ddfbebc6318c618d9a23cda5d018c86c7e0dea64dc860a16cb3daa SHA512 76e34df0748ec0ee2c0964ab07e85dd708c38601e55626fcc40b5a6064e5f2065c1969c4f888827225daf0ce2bf0a41670ba020f7d52b93915f4120cc478798d WHIRLPOOL 35f914bc4e765e03ccf699bbba696980b1ea48e07491d9e401c9ac76ce701575e8d0d69a63c144ad45fd2df76c7d3948b15cadfdbbc7ffd528ee5eca73e0bd31 -DIST Flask-Babel-0.9.tar.gz 38881 SHA256 4afd150f360434b00684ba7848358f7961072fd0658a6e81aaa578522699fb4c SHA512 c667c8a532332bb3dd0d694932d17f7f9b2b51f68151767624116853b2e71f2a6b4c47164d17a6f368b67a5cabce97495b18147655fb36aee5034c058d3b9a89 WHIRLPOOL 28309a4a27bfd0fbe30be52613ee9eef5110e3cc38e863c6de200cced579476870e01b92edaeb08fd29e0deabcaa13d14742d188960742d61cf8ba5384476cd1 diff --git a/dev-python/flask-restless/flask-restless-0.12.0.ebuild b/dev-python/flask-restless/flask-restless-0.12.0.ebuild index 80fd37499f36..b2f3bbbdef8d 100644 --- a/dev-python/flask-restless/flask-restless-0.12.0.ebuild +++ b/dev-python/flask-restless/flask-restless-0.12.0.ebuild @@ -31,26 +31,29 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}"/docbuild.patch ) -python_compile_all()# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-restless/flask-restless-0.12.0.ebuild,v 1.3 2014/07/06 12:41:46 mgorny Exp $ - -EAPI=5 -PYTHON_COMPAT=( python{2_6,2_7} ) - -inherit distutils-r1 - -DESCRIPTION="Flask extension for easy ReSTful API generation" -HOMEPAGE="http://packages.python.org/Flask-Restless/" -SRC_URI="https://github.com/jfinkels/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="|| ( AGPL-3 BSD )" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="doc examples test" - -RDEPEND=">=dev-python/flask-0.7[${PYTHON_USEDEP}] - dev-python/flask-sqlalchemy[${PYTHON_USEDEP}] - dev-python/sqlalchemy[${PYTHON_USEDEP}] - dev-python/python-dateutil:0[${PYTHON_USED \ No newline at end of file +python_compile_all() { + if use doc; then + if ! "${PYTHON}" -c "import flask_restless"; then + eerror "flask-restless is not installed. Building of the docs" + eerror "requires flask-restless to already be installed." + eerror "Firstly emerge without USE=doc, then re-emerge with USE=doc" + eerror "" + die + fi + # Changes connect to read issues @ github + rm -f docs/changelog.rst + einfo "Generating html docs for ${PN}" + PYTHONPATH=${PYTHONPATH}"${S}"/docs emake -C docs html \ + || die "Generating html docs for ${PN} failed" + fi +} + +python_test() { + nosetests tests/test_*.py || die "Tests failed under ${EPYTHON}" +} + +python_install_all() { + use doc && local HTML_DOCS=( docs/_build/html/. ) + use examples && local EXAMPLES=( examples/. ) + distutils-r1_python_install_all +} diff --git a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.8.ebuild b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.8.ebuild index f5a81760cfbc..674fb10bf8d2 100644 --- a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.8.ebuild +++ b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.8.ebuild @@ -12,15 +12,21 @@ HOMEPAGE="https://pypi.python.org/pypi/gcs-oauth2-boto-plugin" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="Apache-2.0" -SLOT# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.8.ebuild,v 1.1 2014/09/09 22:46:47 vapier Exp $ - -EAPI="5" -PYTHON_COMPAT=( python2_7 ) +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" -inherit distutils-r1 +PATCHES=( + "${FILESDIR}/${P}-use-friendy-version-checks.patch" +) -DESCRIPTION="auth plugin allowing use the use of OAuth 2.0 credentials for Google Cloud Storage in the Boto library" -HOMEPAGE="https://pypi.python.org/pypi/gcs-oauth2-boto-plugin" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/$ \ No newline at end of file +# Keep versions in sync with setup.py. +RDEPEND="${PYTHON_DEPS}" +DEPEND="${RDEPEND} + >=dev-python/boto-2.29.1[${PYTHON_USEDEP}] + >=dev-python/httplib2-0.8[${PYTHON_USEDEP}] + >=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}] + >=dev-python/google-api-python-client-1.1[${PYTHON_USEDEP}] + >=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + >=dev-python/socksipy-1.01[${PYTHON_USEDEP}]" diff --git a/dev-python/gevent-socketio/Manifest b/dev-python/gevent-socketio/Manifest index 65e0ab697931..8a18f265081f 100644 --- a/dev-python/gevent-socketio/Manifest +++ b/dev-python/gevent-socketio/Manifest @@ -1,2 +1 @@ DIST gevent-socketio-0.3.5-rc2.tar.gz 22210 SHA256 ab38b6b97b369626cfa87eb4d2e1cfddf67c45e138e9bc61321e30f32e85facd SHA512 22a7c4c03b527eecb929ea896d8fdcfd2b299a06707cd30772f6762ecfc45e35f0c39053a57fb1ae06748aa58f3c246a1b9c9c3d917851d63f1275a70a7c14b3 WHIRLPOOL f7c2ab35e5036adaeda141c9ec75eb5767db5711c4ba6af8ba1698fa81142c21435c5b694f25cf9af55ff822a7f1a3a9b630c39e659b7f06bd270747318bc778 -DIST gevent-socketio-0.3.5-rc2.tar.gz 22210 SHA256 ab38b6b97b369626cfa87eb4d2e1cfddf67c45e138e9bc61321e30f32e85facd SHA512 22a7c4c03b527eecb929ea896d8fdcfd2b299a06707cd30772f6762ecfc45e35f0c39053a57fb1ae06748aa58f3c246a1b9c9c3d917851d63f1275a70a7c14b3 WHIRLPOOL f7c2ab35e5036adaeda141c9ec75eb5767db5711c4ba6af8ba1698fa81142c21435c5b694f25cf9af55ff822a7f1a3a9b630c39e659b7f06bd270747318bc778 diff --git a/dev-python/gevent-zeromq/Manifest b/dev-python/gevent-zeromq/Manifest index 236b43f00e10..36692c9ac17a 100644 --- a/dev-python/gevent-zeromq/Manifest +++ b/dev-python/gevent-zeromq/Manifest @@ -1,2 +1 @@ DIST gevent_zeromq-0.2.5.tar.gz 5901 SHA256 4c479568e8fbc92260e06d2f9042c9888d1d42e90ef52673a65288f19394f669 SHA512 c7bbeae927e078b9833d6e9b265a11dfd93e27261491c54c1a28ce7d0a87be15a4fc002732f816bce08f47a997a89dd42289501d6bd1d380d4cbfb198c1c763d WHIRLPOOL 2190f24ae9bb026f032805dc5f5867a09b96c816379e8bd428dcb0f107fe7380192a05232ebfac236ab820c53d2d6bd291bb3ccd544fdf78399011ebeb99c9c6 -DIST gevent_zeromq-0.2.5.tar.gz 5901 SHA256 4c479568e8fbc92260e06d2f9042c9888d1d42e90ef52673a65288f19394f669 SHA512 c7bbeae927e078b9833d6e9b265a11dfd93e27261491c54c1a28ce7d0a87be15a4fc002732f816bce08f47a997a89dd42289501d6bd1d380d4cbfb198c1c763d WHIRLPOOL 2190f24ae9bb026f032805dc5f5867a09b96c816379e8bd428dcb0f107fe7380192a05232ebfac236ab820c53d2d6bd291bb3ccd544fdf78399011ebeb99c9c6 diff --git a/dev-python/gitdb/Manifest b/dev-python/gitdb/Manifest index 83f17f3768ab..900abbe263f7 100644 --- a/dev-python/gitdb/Manifest +++ b/dev-python/gitdb/Manifest @@ -1,2 +1 @@ DIST gitdb-0.5.4.tar.gz 50258 SHA256 de5d2dac0daec4a9cd7bb1ae1cd42d53510dcf597397c608c12a154b69ad3783 SHA512 0ee1bb8c818ddb4c7801c62e4dcde4f4b39d0df9b344624c647f9b35cb7667e37bc6e0c61d163f4c4a6fb6e4c3da27ca088cba60d65ae0cf7e3473946bd2d353 WHIRLPOOL 2c00eda2a38e6d2621a9c079e726f5038460dd7b557da1b80a25c767e2e795a4eafd603f3db9d0c8b3b7ca48795782360e9223891b6b2c2ffbe78e371c1e5bf9 -DIST gitdb-0.5.4.tar.gz 50258 SHA256 de5d2dac0daec4a9cd7bb1ae1cd42d53510dcf597397c608c12a154b69ad3783 SHA512 0ee1bb8c818ddb4c7801c62e4dcde4f4b39d0df9b344624c647f9b35cb7667e37bc6e0c61d163f4c4a6fb6e4c3da27ca088cba60d65ae0cf7e3473946bd2d353 WHIRLPOOL 2c00eda2a38e6d2621a9c079e726f5038460dd7b557 \ No newline at end of file diff --git a/dev-python/gnome-keyring-python/Manifest b/dev-python/gnome-keyring-python/Manifest index 1785f294cb1d..b3c5fb4b1ca1 100644 --- a/dev-python/gnome-keyring-python/Manifest +++ b/dev-python/gnome-keyring-python/Manifest @@ -1,2 +1 @@ DIST gnome-python-desktop-2.32.0.tar.bz2 621277 SHA256 09dbd580bf3b0ef60f91b090eafe6d08ddcc50a609e2b425a7f8eca46d4e0ee9 SHA512 51beefd21fa3aa6242ba4c66e57d940372fbf4a84ffe34063339f6e7e7c22e76d281b25d5f113de3780a0dbf733c7e07142f05a285056cda26736323b4185d18 WHIRLPOOL 5713353291a34e0a03152ad76c46391e3ab246efc17b63193fc0b26b02176eb78ce134c8d0cabcb3480bd2dbb3446b7b6b301cffbfac3ce915e21a974947e37e -DIST gnome-python-desktop-2.32.0.tar.bz2 621277 SHA256 09dbd580bf3b0ef60f91b090eafe6d08ddcc50a609e2b425a7f8eca46d4e0ee9 SHA512 51beefd21fa3aa6242ba4c66e57d940372fbf4a84ffe34063339f6e7e7c22e76d281b25d5f113de3780a0dbf733c7e07142f05a285056cda26736323b4185d18 WHIRLPOOL 5713353291a34e0a03152ad76c46391e3ab246efc17b63193fc0b26b02176eb78ce134c8d0cabcb3480bd2dbb3446b7b6b301cffbfac3ce915e21a974947e37e diff --git a/dev-python/gnome-python-base/Manifest b/dev-python/gnome-python-base/Manifest index f02024a13ac8..a5edcb54102c 100644 --- a/dev-python/gnome-python-base/Manifest +++ b/dev-python/gnome-python-base/Manifest @@ -1,2 +1 @@ DIST gnome-python-2.28.1.tar.bz2 562220 SHA256 759ce9344cbf89cf7f8449d945822a0c9f317a494f56787782a901e4119b96d8 SHA512 632d91d416f8209c2bc8d576d1229069e00f2cfeedb3441a5f151e12973ed740c0bb26d18d5c16cfeeb64ca35933537997277450001cffd96d8d5077027d45f2 WHIRLPOOL cd4ea19fabd26c55866d8789628fdc3c834e73932381431216d65c5e9b42ad529e83f74d498951f07f060d3049f1739b6db99dbdbe34575eed469ceb23a51c5b -DIST gnome-python-2.28.1.tar.bz2 562220 SHA256 759ce9344cbf89cf7f8449d945822a0c9f317a494f56787782a901e4119b96d8 SHA512 632d91d416f8209c2bc8d576d1229069e00f2cfeedb3441a5f151e12973ed740c0bb26d18d5c16cfeeb64ca35933537997277450001cffd96d8d5077027d45f2 WHIRLPOOL cd4ea19fabd26c55866d8789628fdc3c834e73932381431216d65c5e9b42ad529e83f74d498951f07f060d3049f1739b6db99dbdbe34575eed469ceb23a51c5b diff --git a/dev-python/imapclient/imapclient-0.11.ebuild b/dev-python/imapclient/imapclient-0.11.ebuild index 104694b8d221..8cad58bb78bd 100644 --- a/dev-python/imapclient/imapclient-0.11.ebuild +++ b/dev-python/imapclient/imapclient-0.11.ebuild @@ -21,32 +21,6 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="doc examples test" -RDEPEND="dev-python/six[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - t# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/imapclient/imapclient-0.11.ebuild,v 1.1 2014/05/31 03:59:35 idella4 Exp $ - -EAPI=5 -# "Python versions 2.6, 2.7, 3.2 and 3.3 are officially supported" therefore -# NOT adding py3.4 since it doesn't testsuite desn't even get started since it's clearly not ready -PYTHON_COMPAT=( python{2_7,3_2,3_3} pypy ) - -inherit distutils-r1 - -MY_PN="IMAPClient" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="easy-to-use, pythonic, and complete IMAP client library" -HOMEPAGE="http://imapclient.freshfoo.com/" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc examples test" - RDEPEND="dev-python/six[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}] @@ -58,4 +32,33 @@ python_prepare_all() { # use system setuptools sed -i '/use_setuptools/d' setup.py || die - # drop expl \ No newline at end of file + # drop explicit mock version test dep + sed -i "/tests_require/s:'mock==.\+':'mock':" setup.py || die + + # use system six library. patch proven less preferable to use of sed (< maintenance) + # but a copy of the working hunks from prior version works fine for now. + rm imapclient/six.py || die + epatch "${FILESDIR}"/${P}-system-six.patch + sed -e 's:from .six:from six:g' \ + -e 's:from . import six:import six:g' \ + -i ${PN}/*.py || die + + distutils-r1_python_prepare_all +} + +python_test() { + esetup.py test +} + +python_install() { + distutils-r1_python_install + # don't install examples and tests in module dir + rm -r "${ED}"$(python_get_sitedir)/imapclient/{examples,test} || die +} + +python_install_all() { + local DOCS=( AUTHORS HACKING.rst NEWS.rst README.rst THANKS ) + use doc && local HTML_DOCS=( doc/html/. ) + distutils-r1_python_install_all + use examples && dodoc -r ${PN}/examples +} diff --git a/dev-python/mwlib/mwlib-0.15.10.ebuild b/dev-python/mwlib/mwlib-0.15.10.ebuild index 6b7beaf6b915..f58ea575c779 100644 --- a/dev-python/mwlib/mwlib-0.15.10.ebuild +++ b/dev-python/mwlib/mwlib-0.15.10.ebuild @@ -17,37 +17,6 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="doc server" -RDEPEND="dev-python/lxml[${PYTHON_USEDEP}] - >=dev-python/odfpy-0.9[${PYTHON_USEDEP}] - =dev-python/pyPdf-1.12[${PYTHON_USEDEP}] - >=dev-python/pyparsing-1.5.5 - =dev-python/timelib-0.2[${PYTHON_USEDEP}] - virtual/latex-base - >=dev-python/simplejson-2.3[${PYTHON_USEDEP}] - dev-python/gevent[${PYTHON_USEDEP}] - >=dev-python/bottle-0.10[${PYTHON_USEDEP}] - >=dev-python/apipkg-1.2[${PYTHON_USEDEP}] - >=dev-python/qserve-0.2.7[${# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/mwlib/mwlib-0.15.10.ebuild,v 1.1 2013/07/26 14:25:40 idella4 Exp $ - -EAPI=5 - -PYTHON_COMPAT=( python{2_6,2_7} ) - -inherit distutils-r1 user - -DESCRIPTION="Tools for parsing Mediawiki content to other formats" -HOMEPAGE="http://code.pediapress.com/wiki/wiki http://pypi.python.org/pypi/mwlib" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc server" - RDEPEND="dev-python/lxml[${PYTHON_USEDEP}] >=dev-python/odfpy-0.9[${PYTHON_USEDEP}] =${PY_VER}" setup.py || die "Incorrect dev-python/py dependency" + distutils-r1_python_prepare_all + + epatch "${FILESDIR}"/${P}-unicode.patch +} + +python_compile_all() { + if use doc; then + mkdir doc/en/.build || die + emake -C doc/en html + fi +} + +python_test() { + "${PYTHON}" "${BUILD_DIR}"/lib/pytest.py || die "tests failed with ${EPYTHON}" +} + +python_install_all() { + use doc && dohtml -r doc/en/_build/html/ +} diff --git a/dev-python/pytest/pytest-2.4.2.ebuild b/dev-python/pytest/pytest-2.4.2.ebuild index fe3a32e4f399..e04740269323 100644 --- a/dev-python/pytest/pytest-2.4.2.ebuild +++ b/dev-python/pytest/pytest-2.4.2.ebuild @@ -27,22 +27,34 @@ DEPEND="${RDEPEND} $(python_gen_cond_dep 'dev-python/pexpect[${PYTHON_USEDEP}]' 'python*') dev-python/pyyaml[${PYTHON_USEDEP}] ) - doc? ( dev-python/sphinx[${PYTHON_USEDEP}# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/pytest-2.4.2.ebuild,v 1.16 2014/08/07 09:02:18 jer Exp $ - -EAPI="5" - -PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 ) -inherit distutils-r1 eutils - -DESCRIPTION="py.test: simple powerful testing with Python" -HOMEPAGE="http://pytest.org/ http://pypi.python.org/pypi/pytest" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${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 ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="doc test" - -# When bumping, please check setup.py for the proper \ No newline at end of file + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )" + +PATCHES=( + "${FILESDIR}/pytest-2.4.2-pexpect-3.0.patch" +) + +python_prepare_all() { + # Disable versioning of py.test script to avoid collision with + # versioning performed by the eclass. + sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed" + grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency" + distutils-r1_python_prepare_all +} + +python_compile_all() { + if use doc; then + mkdir doc/en/.build || die + emake -C doc/en html + fi +} + +python_test() { + "${PYTHON}" "${BUILD_DIR}"/lib/pytest.py \ + --ignore=doc/en/example/nonpython/test_simple.yml \ + || die "tests failed with ${EPYTHON}" +} + +python_install_all() { + use doc && dohtml -r doc/en/_build/html/ + distutils-r1_python_install_all +} diff --git a/dev-python/python-dateutil/Manifest b/dev-python/python-dateutil/Manifest index a3960255b6cd..89c34b276951 100644 --- a/dev-python/python-dateutil/Manifest +++ b/dev-python/python-dateutil/Manifest @@ -1,4 +1,2 @@ DIST python-dateutil-2.1.tar.gz 152334 SHA256 4c44ec3f9ff057b8c7b4c78beca5fdd8710600ea9a1df42f31bfcbae2f059dee SHA512 017e054f22886814763f6ab0c5c3ee411ce3d59a0d07e26fdf9afdab2500d689aa67a6c4c617b8960755272cb800ff449caedcb180c3a58631ac3cec3ffb89cc WHIRLPOOL f77bb35f5d8706e0909e5e522380f77a8f2bea1f183bdbd8bd41250fc3414730d327ccbab728bf67b5f80e34e672b8d9b346595d1b6c5694bff24a64b43a7454 -DIST python-dateutil-2.2.tar.gz 259085 SHA256 eec865307-----BEGIN PGP SIGNED MESSAGE----- -DIST python-dateutil-2.1.tar.gz 152334 SHA256 4c44ec3f9ff057b8c7b4c78beca5fdd8710600ea9a1df42f31bfcbae2f059dee SHA512 017e054f22886814763f6ab0c5c3ee411ce3d59a0d07e26fdf9afdab2500d689aa67a6c4c617b8960755272cb800ff449caedcb180c3a58631ac3cec3ffb89cc WHIRLPOOL f77bb35f5d8706e0909e5e522380f77a8f2bea1f183bdbd8bd41250fc3414730d327ccbab728bf67b5f80e34e672b8d9b346595d1b6c5694bff24a64b43a7454 DIST python-dateutil-2.2.tar.gz 259085 SHA256 eec865307ebe7f329a6a9945c15453265a449cdaaf3710340828a1934d53e468 SHA512 cb278b8e18da3b991c6415ff59e9f3aa87cfb2e52048b3f74a9e3d183e0cc5bf71595123c644d0aea75084e653a885cbfa70c8ddd8b6a888bb13183624fcb46b WHIRLPOOL 545495d466cbea8f750b7e997699e2466131ce780ed73e18a880934a5255f759cee470b6f85a16a44f62bacaad14490e72a212c4cf6e53f0fe69b87492f9d055 diff --git a/dev-python/pyx/Manifest b/dev-python/pyx/Manifest index cb605483ff0c..94011edd4801 100644 --- a/dev-python/pyx/Manifest +++ b/dev-python/pyx/Manifest @@ -1,4 +1,2 @@ DIST PyX-0.12.1.tar.gz 561989 SHA256 e837b26a8b1c27524cf3f3dd6c0d563451249159edaa2e366d87e7143a867e8e SHA512 4941f5aa21aff3743546495fb073c10d2657ff42b2aff401903498638093d0e31e344cce778980f28a7170c6d29eab72ac074277b9d4088376e8692dc71e55c1 WHIRLPOOL a4d4a21e78b72841ca38dea87296d21f0bc8255e428cb0733fbee9d71c3bfb031d8a9f9fff988dbf0e2af7222553918a9aa924769891c50beb607c6ce3fe2fa4 -DIST PyX-0.13.tar.gz 1237082 SHA256 1952962c965000d8e04a00d1b85c600cdef4588cea88c9face2adbedf21d42c6 SHA512 cab0c22f0862ae20cff92504ededf4fcf5820d5773130fb258de1a95d295ca4fe657b85d5ccd52021a4f84403e6db8eebe9f676fa405781738502456123eb05c WHIRLPOOL 0a6159cd5f2683c70b33aac71278ad6f0df3ae54897d0ab-----BEGIN PGP SIGNED MESSAGE----- -DIST PyX-0.12.1.tar.gz 561989 SHA256 e837b26a8b1c27524cf3f3dd6c0d563451249159edaa2e366d87e7143a867e8e SHA512 4941f5aa21aff3743546495fb073c10d2657ff42b2aff401903498638093d0e31e344cce778980f28a7170c6d29eab72ac074277b9d4088376e8692dc71e55c1 WHIRLPOOL a4d4a21e78b72841ca38dea87296d21f0bc8255e428cb0733fbee9d71c3bfb031d8a9f9fff988dbf0e2af7222553918a9aa924769891c50beb607c6ce3fe2fa4 DIST PyX-0.13.tar.gz 1237082 SHA256 1952962c965000d8e04a00d1b85c600cdef4588cea88c9face2adbedf21d42c6 SHA512 cab0c22f0862ae20cff92504ededf4fcf5820d5773130fb258de1a95d295ca4fe657b85d5ccd52021a4f84403e6db8eebe9f676fa405781738502456123eb05c WHIRLPOOL 0a6159cd5f2683c70b33aac71278ad6f0df3ae54897d0ab31a9b61897be9b4e531cc41c7772a60a152b3b7a39d383ba669be7401c503704f14cbbf3ceca25c41 diff --git a/dev-python/testscenarios/testscenarios-0.4.ebuild b/dev-python/testscenarios/testscenarios-0.4.ebuild index 43ab627fc4ee..043175bf2f82 100644 --- a/dev-python/testscenarios/testscenarios-0.4.ebuild +++ b/dev-python/testscenarios/testscenarios-0.4.ebuild @@ -24,4 +24,5 @@ RDEPEND="" python_test() { # https://bugs.launchpad.net/testscenarios/+bug/1260573 - nosetests || die "Tests failed under# Copyright 199 \ No newline at end of file + nosetests || die "Tests failed under ${EPYTHON}" +} diff --git a/dev-python/traits/traits-4.4.0.ebuild b/dev-python/traits/traits-4.4.0.ebuild index 287fac7316b7..b863049645b0 100644 --- a/dev-python/traits/traits-4.4.0.ebuild +++ b/dev-python/traits/traits-4.4.0.ebuild @@ -18,14 +18,20 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" IUSE="test" RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]" -DEPEND="dev-py# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/traits/traits-4.4.0.ebuild,v 1.1 2014/01/29 16:58:57 bicatali Exp $ - -EAPI=5 - -PYTHON_COMPAT=( python{2_6,2_7} ) - -inherit distutils-r1 virtualx - -DESCRIPTION="Enthought Tool Suite: Explicitly typed attributes for Python" \ No newline at end of file +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] + test? ( dev-python/numpy[${PYTHON_USEDEP}] )" + +python_prepare_all() { + sed -i -e "s/'-O3'//g" setup.py || die + distutils-r1_python_prepare_all +} + +python_compile() { + python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing" + distutils-r1_python_compile +} + +python_test() { + cd "${BUILD_DIR}"/lib || die + nosetests || die +} diff --git a/dev-python/twisted-web/twisted-web-13.0.0-r1.ebuild b/dev-python/twisted-web/twisted-web-13.0.0-r1.ebuild index e6fd9646be6d..5b4624dda18a 100644 --- a/dev-python/twisted-web/twisted-web-13.0.0-r1.ebuild +++ b/dev-python/twisted-web/twisted-web-13.0.0-r1.ebuild @@ -7,15 +7,6 @@ PYTHON_COMPAT=( python{2_6,2_7} ) inherit twisted-r1 -DESCRIPTION="Twi# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-web/twisted-web-13.0.0-r1.ebuild,v 1.11 2014/09/15 08:19:46 ago Exp $ - -EAPI="5" -PYTHON_COMPAT=( python{2_6,2_7} ) - -inherit twisted-r1 - DESCRIPTION="Twisted web server, programmable in Python" KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" @@ -23,4 +14,14 @@ IUSE="soap" DEPEND="=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}] soap? ( dev-python/soappy[${PYTHON_USEDEP}] )" -RDEPEN \ No newline at end of file +RDEPEND="${DEPEND}" + +python_prepare_all() { + if [[ "${EUID}" -eq 0 ]]; then + # Disable tests failing with root permissions. + sed -e "s/test_forbiddenResource/_&/" -i twisted/web/test/test_static.py + sed -e "s/testDownloadPageError3/_&/" -i twisted/web/test/test_webclient.py + fi + + distutils-r1_python_prepare_all +} diff --git a/dev-python/twisted-web/twisted-web-14.0.0.ebuild b/dev-python/twisted-web/twisted-web-14.0.0.ebuild index 00f3f130bfd2..8eaaab0f2cb7 100644 --- a/dev-python/twisted-web/twisted-web-14.0.0.ebuild +++ b/dev-python/twisted-web/twisted-web-14.0.0.ebuild @@ -13,19 +13,19 @@ DESCRIPTION="Twisted web server, programmable in Python" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="soap" -DEPEND="=dev-pyth# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-web/twisted-web-14.0.0.ebuild,v 1.3 2014/06/03 20:48:37 jer Exp $ - -EAPI="5" -PYTHON_COMPAT=( python{2_6,2_7} ) - -inherit twisted-r1 - -MY_PN="TwistedWeb" -DESCRIPTION="Twisted web server, programmable in Python" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="soap" - -DEPEND \ No newline at end of file +DEPEND="=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}] + dev-python/pyopenssl[${PYTHON_USEDEP}] + soap? ( dev-python/soappy[${PYTHON_USEDEP}] )" +RDEPEND="${DEPEND}" + +python_prepare_all() { + if [[ "${EUID}" -eq 0 ]]; then + # Disable tests failing with root permissions. + sed -e "s/test_forbiddenResource/_&/" -i twisted/web/test/test_static.py + sed -e "s/testDownloadPageError3/_&/" -i twisted/web/test/test_webclient.py + fi + + distutils-r1_python_prepare_all +} +# testsuite has a PYTHONPATH oddity, currently appears to require a system install to effectively import, +# putting in question as to whether it is a testsuite diff --git a/dev-python/twistedsnmp/twistedsnmp-0.3.13.ebuild b/dev-python/twistedsnmp/twistedsnmp-0.3.13.ebuild index 1df657a99a04..6b41fbb0eae9 100644 --- a/dev-python/twistedsnmp/twistedsnmp-0.3.13.ebuild +++ b/dev-python/twistedsnmp/twistedsnmp-0.3.13.ebuild @@ -2,11 +2,6 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-python/twistedsnmp/twistedsnmp-0.3.13.ebuild,v 1.3 2013/08/03 09:45:50 mgorny Exp $ -EAPI="2" -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/twistedsnmp/twistedsnmp-0.3.13.ebuild,v 1.3 2013/08/03 09:45:50 mgorny Exp $ - EAPI="2" SUPPORT_PYTHON_ABIS="1" @@ -40,3 +35,14 @@ src_prepare() { src_test() { testing() { + PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" test/test.py + } + python_execute_function testing +} + +src_install() { + distutils_src_install + dohtml doc/index.html + insinto /usr/share/doc/${PF}/html/style/ + doins doc/style/sitestyle.css +} diff --git a/dev-python/ujson/files/ujson-1.33-test-py3.patch b/dev-python/ujson/files/ujson-1.33-test-py3.patch index 7750a6ff032d..e497f396792c 100644 --- a/dev-python/ujson/files/ujson-1.33-test-py3.patch +++ b/dev-python/ujson/files/ujson-1.33-test-py3.patch @@ -33,7 +33,6 @@ index d210bc6..71f8074 100644 - #@unittest.skipIf(_python_ver(3), "No exception in Python 3") def test_encodeUnicode4BytesUTF8Fail(self): + _skip_if_python_ver(3) - tests/tests.py | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --gi \ No newline at end of file + input = "\xfd\xbf\xbf\xbf\xbf\xbf" + try: + enc = ujson.encode(input) diff --git a/dev-python/urllib3/urllib3-1.9.ebuild b/dev-python/urllib3/urllib3-1.9.ebuild index ec696416c5de..bb3fca0a133f 100644 --- a/dev-python/urllib3/urllib3-1.9.ebuild +++ b/dev-python/urllib3/urllib3-1.9.ebuild @@ -7,15 +7,6 @@ PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy ) inherit distutils-r1 -DESCRI# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/urllib3/urllib3-1.9.ebuild,v 1.1 2014/07/16 14:16:45 idella4 Exp $ - -EAPI=5 -PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy ) - -inherit distutils-r1 - DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more" HOMEPAGE="https://github.com/shazow/urllib3" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" @@ -41,4 +32,17 @@ python_prepare_all() { # Replace bundled copy of dev-python/six cat > urllib3/packages/six.py <<-EOF from __future__ import absolute_import - from six impo \ No newline at end of file + from six import * + EOF + + sed -i 's:cover-min-percentage = 100::' setup.cfg || die + # Fix tests + sed -i 's/urllib3.packages.six/six/' test/test_retry.py || die + sed -i '/clear_warnings/d' test/test_util.py || die + + distutils-r1_python_prepare_all +} + +python_test() { + nosetests -v || die "Tests fail with ${EPYTHON}" +} diff --git a/dev-python/venusian/Manifest b/dev-python/venusian/Manifest index 3760af8e0474..dbc9dc565d2b 100644 --- a/dev-python/venusian/Manifest +++ b/dev-python/venusian/Manifest @@ -1,4 +1,2 @@ DIST venusian-1.0.tar.gz 45747 SHA256 1720cff2ca9c369c840c1d685a7c7a21da1afa687bfe62edd93cae4bf429ca5a SHA512 770780c4e4532b16e119365d3c9531e85aede9c2be2e3a333cfe43856271c7b232ce1b27c1379f677a7191c24e8736bf5307be7a926b613f7b81644d404e8453 WHIRLPOOL 1eedda1a8d6e15caf4af136ddd08298c7201342a841b267a489b8fb483d3d97b330e3adbe75e5bd28fcd3b62d6b6b5de57f5a520923d05195560afbfb682315d DIST venusian-1.0a8.tar.gz 42845 SHA256 a1b054d4ccf0859a76d900c49f419645279298d5316be3a65a1c00a40719bce0 SHA512 d10577aa8c439fed3d689538695d6e0f8db299ddcefef75e3d224b637398489e55853d124be3edffc168db485df25180fe0c4685172d64587ae07c5b80ca3f6f WHIRLPOOL a3a62d29b0a8246b4e6fe3b429a6ef6c2deb294d868dac3ce1cc3544e23e63303cced09a81aa49bc5146ebb21572e561d0c0e8e0920485bc7012f02a4b08da5a -DIST venusian-1.0.tar.gz 45747 SHA256 1720cff2ca9c369c840c1d685a7c7a21da1afa687bfe62edd93cae4bf429ca5a SHA512 770780c4e4532b16e119365d3c9531e85aede9c2be2e3a333cfe43856271c7b232ce1b27c1379f677a7191c24e8736bf5307be7a926b613f7b81644d404e8453 WHIRLPOOL 1eedda1a8d6e15caf4af136ddd08298c7201342a841b267a489b8fb483d3d97b330e3adbe75e5bd28fcd3b62d6b6b5de57f5a520923d05195560afbfb682315d -DIST venusian-1.0a8.tar.gz 42845 SHA256 a1b054d4ccf0859a76d900c49f419645279298d5316be3a65a1c00a40719bce0 SHA512 d10577aa8c439fed3d689538695d6e0f8db299ddcefef75e3d224b637398489e55853d124be3edffc168db485df25180fe0c4685172d64587ae07c5b80ca3f6f WHIRLPOOL a3a62d29b0a8246b4e6fe3b429a6ef6c2deb294d868dac3ce1cc3544e23e63303cced09a81aa49bc5146ebb21572e561d0c0e8e0920485bc7012f02a4b08da5a diff --git a/dev-python/weasyprint/Manifest b/dev-python/weasyprint/Manifest index 63274a31a2fd..e939e65d7742 100644 --- a/dev-python/weasyprint/Manifest +++ b/dev-python/weasyprint/Manifest @@ -1,6 +1,3 @@ DIST WeasyPrint-0.21.tar.gz 333898 SHA256 312af72805fd5207ccd58d1c59022bf1e9cf8e6c839825e654bb0d0789d66048 SHA512 6455e17c317e8d25f33e6e497e232b96e907ba569d15d333e7b3d3de2b41af7d593e385c24a8ad3f6877c1a3af4266f95e723277e3ca3194cc884c04c58374e3 WHIRLPOOL 165a3194e9fb92699dd9b00d3f0539d686322f09a3a4d2fa395b1070140bbec4a535648d86d70632ba5b094aa16969491ddd42a5711a4d9e56833dc25aea61d1 DIST WeasyPrint-0.22.tar.gz 342786 SHA256 78874291649d8013b60462c39456fea8d1097e55bb45907f6c3e30ffe4822bf1 SHA512 f5b7189a9c5408d052cde995a9ff6aa2df04cbf97297c8f2c03d8f12aa84833f7a82b63eac700032570c289a8ce0dbab687d0127518b6743fd95dfb60cbf5993 WHIRLPOOL e2f6efc58a3344c655814b0fcb9b6541e8a3f8e8e4e82240ea34580517095d7622f434bd83da6071184270df6c94cc7771376b87743439a1c3e9a357d72520a6 DIST WeasyPrint-0.23.tar.gz 343614 SHA256 4c3539b8bf6145f6ae9de657eb4b008ccf29066d876f948ecbcfa753a5b0eae4 SHA512 bd9e4da6bd9ffc63e6acedbf821d2fa7b791f9d28c61e465effa0596665b5b76fec1a4bef2dd8f2c98ee768884ef84f842fc67664b41f84d4a0c22d86e032d71 WHIRLPOOL 1a9f0e0d442b7487ffa039c726f41fa80fdce06df4f3d2d931eda3974ce4b4da69dea929d018c9c95a9dc02ff0d5cf9158059bc7ce3293a4997fa2550d5f755f -EBUILD weasyprint-0.21DIST WeasyPrint-0.21.tar.gz 333898 SHA256 312af72805fd5207ccd58d1c59022bf1e9cf8e6c839825e654bb0d0789d66048 SHA512 6455e17c317e8d25f33e6e497e232b96e907ba569d15d333e7b3d3de2b41af7d593e385c24a8ad3f6877c1a3af4266f95e723277e3ca3194cc884c04c58374e3 WHIRLPOOL 165a3194e9fb92699dd9b00d3f0539d686322f09a3a4d2fa395b1070140bbec4a535648d86d70632ba5b094aa16969491ddd42a5711a4d9e56833dc25aea61d1 -DIST WeasyPrint-0.22.tar.gz 342786 SHA256 78874291649d8013b60462c39456fea8d1097e55bb45907f6c3e30ffe4822bf1 SHA512 f5b7189a9c5408d052cde995a9ff6aa2df04cbf97297c8f2c03d8f12aa84833f7a82b63eac700032570c289a8ce0dbab687d0127518b6743fd95dfb60cbf5993 WHIRLPOOL e2f6efc58a3344c655814b0fcb9b6541e8a3f8e8e4e82240ea34580517095d7622f434bd83da6071184270df6c94cc7771376b87743439a1c3e9a357d72520a6 -DIST WeasyPrint-0.23.tar.gz 343614 SHA256 4c3539b8bf6145f6ae9de657eb4b008ccf29066d876f948ecbcfa753a5b0eae4 SHA512 bd9e4da6bd9ffc63e6acedbf821d2fa7b791f9d28c61e465effa0596665b5b76fec1a4bef2dd8f2c98ee768884ef84f842fc67664b41f84d4a0c22d86e032d71 WHIRLPOOL 1a9f0e0d442b7487ffa039c726f41fa80fdce06df4f3d2d931eda3974ce4b4da69dea929d018c9c95a9dc02ff0d5cf9158059bc7ce3293a4997fa2550d5f755f diff --git a/dev-python/webassets/Manifest b/dev-python/webassets/Manifest index 512617c031ef..7f4f797484bd 100644 --- a/dev-python/webassets/Manifest +++ b/dev-python/webassets/Manifest @@ -1,2 +1 @@ DIST webassets-0.10.1.tar.gz 171666 SHA256 8e7dedd8032a963ef7e55e670cc109927e1f153b35cf8e9634617d0c6ee93329 SHA512 2879630608c3bd6904bc9f7ab6eceae899df967856e6d7b6dd125106ca27635993bf34309e320a0deacdb3b31020b69d59b4f85afdeae259b4915557c5ae6134 WHIRLPOOL 315e0a0e836683d4750e176ce89fb929e4027f8a32dcf941d0c5faf3c356923ff7db9b8b19d41bd6741ba41c68fd9c96a8f16d7af98b8efdabcf2afeadbd4953 -DIST webassets-0.10.1.tar.gz 171666 SHA256 8e7dedd8032a963ef7e55e670cc109927e1f153b35cf8e9634617d0c6ee93329 SHA512 2879630608c3bd6904bc9f7ab6eceae899df967856e6d7b6dd125106ca27635993bf34309e320a0deacdb3b31020b69d59b4f85afdeae259b4915557c5ae6134 WHIRLPOOL 315e0a0e836683d4750e176ce89fb929e4027f8a32dcf941d0c5faf3c356923ff7db9b8b19d41bd6741ba41c68fd9c96a8f16d7af98b8efdabcf2afeadbd4953 diff --git a/dev-python/xmpppy/files/xmpppy-hashlib_ssl_deprecation.patch b/dev-python/xmpppy/files/xmpppy-hashlib_ssl_deprecation.patch index 17377f88012b..489de037a488 100644 --- a/dev-python/xmpppy/files/xmpppy-hashlib_ssl_deprecation.patch +++ b/dev-python/xmpppy/files/xmpppy-hashlib_ssl_deprecation.patch @@ -36,42 +36,34 @@ - hash = sha.new(sha.new(self.password).hexdigest()+token).hexdigest() - for foo in xrange(int(seq)): hash = sha.new(hash).hexdigest() + hash = sha1(sha1(self.password).hexdigest()+token).hexdigest() -+ for foo i--- xmpp/auth.py -+++ xmpp/auth.py -@@ -21,11 +21,16 @@ - - from protocol import * ++ for foo in xrange(int(seq)): hash = sha1(hash).hexdigest() + query.setTagData('hash',hash) + method='0k' + else: +@@ -81,7 +86,7 @@ + def authComponent(self,owner): + """ Authenticate component. Send handshake stanza and wait for result. Returns "ok" on success. """ + self.handshake=0 +- owner.send(Node(NS_COMPONENT_ACCEPT+' handshake',payload=[sha.new(owner.Dispatcher.Stream._document_attrs['id']+self.password).hexdigest()])) ++ owner.send(Node(NS_COMPONENT_ACCEPT+' handshake',payload=[sha1(owner.Dispatcher.Stream._document_attrs['id']+self.password).hexdigest()])) + owner.RegisterHandler('handshake',self.handshakeHandler,xmlns=NS_COMPONENT_ACCEPT) + while not self.handshake: + self.DEBUG("waiting on handshake",'notify') +--- xmpp/transports.py ++++ xmpp/transports.py +@@ -31,6 +31,7 @@ + from simplexml import ustr from client import PlugIn --import sha,base64,random,dispatcher,re -+import base64,random,dispatcher,re - --import md5 --def HH(some): return md5.new(some).hexdigest() --def H(some): return md5.new(some).digest() -+try: -+ from hashlib import md5, sha1 -+except ImportError: -+ from md5 import new as md5 -+ from sha import new as sha1 -+ -+def HH(some): return md5(some).hexdigest() -+def H(some): return md5(some).digest() - def C(some): return ':'.join(some) - - class NonSASL(PlugIn): -@@ -54,15 +59,15 @@ + from protocol import * ++import warnings - if query.getTag('digest'): - self.DEBUG("Performing digest authentication",'ok') -- query.setTagData('digest',sha.new(owner.Dispatcher.Stream._document_attrs['id']+self.password).hexdigest()) -+ query.setTagData('digest',sha1(owner.Dispatcher.Stream._document_attrs['id']+self.password).hexdigest()) - if query.getTag('password'): query.delChild('password') - method='digest' - elif query.getTag('token'): - token=query.getTagData('token') - seq=query.getTagData('sequence') - self.DEBUG("Performing zero-k authentication",'ok') -- hash = sha.new(sha.new(self.password).hexdigest()+token).hexdigest() -- for foo in xrange(int(seq)): hash = sha.new(hash).hexdigest() -+ hash = sha1(sha1(self.password).hexdigest()+token).hexdigest() -+ for foo in xrange(int(seq)): hash = sha1(hash).hexdiges \ No newline at end of file + # determine which DNS resolution library is available + HAVE_DNSPYTHON = False +@@ -312,6 +313,7 @@ + """ Immidiatedly switch socket to TLS mode. Used internally.""" + """ Here we should switch pending_data to hint mode.""" + tcpsock=self._owner.Connection ++ warnings.filterwarnings("ignore", "socket\.ssl.*ssl\.wrap_socket", DeprecationWarning) + tcpsock._sslObj = socket.ssl(tcpsock._sock, None, None) + tcpsock._sslIssuer = tcpsock._sslObj.issuer() + tcpsock._sslServer = tcpsock._sslObj.server() diff --git a/dev-qt/qdbus/Manifest b/dev-qt/qdbus/Manifest index 59a526cb5838..110ba9bd0d4d 100644 --- a/dev-qt/qdbus/Manifest +++ b/dev-qt/qdbus/Manifest @@ -1,2 +1 @@ DIST qttools-opensource-src-5.3.2.tar.xz 8993140 SHA256 5d39cdc63d43ae1f954517e517d9a5c24f2b2c91e22dab3ae6b5b81deb49983e SHA512 f250e8c309e47cd5196ccc89fb5a0d384b40bbefb243f2ad9dafc6b9096bd5fa540cd471322e3601afd0b88906eebcdf03097df079c80f3816d99d5a46b473cc WHIRLPOOL da5b6ad57dc0ecf6c67d46f91b0fca0df797a92918389b385819677abaa0d8d7866acb0b4ccdcb2a326cbf679f67f0de05fb9de497d5e8c2fa8c4ea83cbf1c68 -DIST qttools-opensource-src-5.3.2.tar.xz 8993140 SHA256 5d39cdc63d43ae1f954517e517d9a5c24f2b2c91e22dab3ae6b5b81deb49983e SHA512 f250e8c309e47cd5196ccc89fb5a0d384b40bbefb243f2ad9dafc6b9096bd5fa540cd471322e3601afd0b88906eebcdf03097df079c80f3816d99d5a46b473cc WHIRLPOOL da5b6ad57dc0ecf6c67d46f91b0fca0df797a92918389b385819677abaa0d8d7866acb0b4ccdcb2a326cbf679f67f0de05fb9de497d5e8c2fa8c4ea83cbf1c68 diff --git a/dev-qt/qdoc/Manifest b/dev-qt/qdoc/Manifest index e78c53d72e78..6b6d35908e9e 100644 --- a/dev-qt/qdoc/Manifest +++ b/dev-qt/qdoc/Manifest @@ -1,2 +1 @@ DIST qtbase-opensource-src-5.3.2.tar.xz 46694044 SHA256 9a16095ac46dae99d6ddab8bc07065fbe1c36501ed194a3191d07347d7826cb8 SHA512 c92438ced758557bd3a19aa1ae5b5d1a2c85d8584d7e7279662eda51daf40ec58f1cb4a38d1c98a43c39cb3225a620a9daaec7f89e68a7d8e3e5240bf70210ea WHIRLPOOL b53f71e8980af5e1e176ba9671c6307f7f455bcf73a76f20a777b0e6f6a5e0ba60af1937a3ce9ebc81a60f82ab64f8b3f31ae786653e2213510d0101ec35a210 -DIST qtbase-opensource-src-5.3.2.tar.xz 46694044 SHA256 9a16095ac46dae99d6ddab8bc07065fbe1c36501ed194a3191d07347d7826cb8 SHA512 c92438ced758557bd3a19aa1ae5b5d1a2c85d8584d7e7279662eda51daf40ec58f1cb4a38d1c98a43c39cb3225a620a9daaec7f89e68a7d8e3e5240bf70210ea WHIRLPOOL b53f71e8980af5e1e176ba9671c6307f7f455bcf73a76f20a777b0e6f6a5e0ba60af1937a3ce9ebc81a60f82ab64f8b3f31ae786653e2213510d0101ec35a210 diff --git a/dev-qt/qtconcurrent/Manifest b/dev-qt/qtconcurrent/Manifest index e78c53d72e78..6b6d35908e9e 100644 --- a/dev-qt/qtconcurrent/Manifest +++ b/dev-qt/qtconcurrent/Manifest @@ -1,2 +1 @@ DIST qtbase-opensource-src-5.3.2.tar.xz 46694044 SHA256 9a16095ac46dae99d6ddab8bc07065fbe1c36501ed194a3191d07347d7826cb8 SHA512 c92438ced758557bd3a19aa1ae5b5d1a2c85d8584d7e7279662eda51daf40ec58f1cb4a38d1c98a43c39cb3225a620a9daaec7f89e68a7d8e3e5240bf70210ea WHIRLPOOL b53f71e8980af5e1e176ba9671c6307f7f455bcf73a76f20a777b0e6f6a5e0ba60af1937a3ce9ebc81a60f82ab64f8b3f31ae786653e2213510d0101ec35a210 -DIST qtbase-opensource-src-5.3.2.tar.xz 46694044 SHA256 9a16095ac46dae99d6ddab8bc07065fbe1c36501ed194a3191d07347d7826cb8 SHA512 c92438ced758557bd3a19aa1ae5b5d1a2c85d8584d7e7279662eda51daf40ec58f1cb4a38d1c98a43c39cb3225a620a9daaec7f89e68a7d8e3e5240bf70210ea WHIRLPOOL b53f71e8980af5e1e176ba9671c6307f7f455bcf73a76f20a777b0e6f6a5e0ba60af1937a3ce9ebc81a60f82ab64f8b3f31ae786653e2213510d0101ec35a210 diff --git a/dev-ruby/actionpack/actionpack-3.2.19.ebuild b/dev-ruby/actionpack/actionpack-3.2.19.ebuild index 13083933a171..d75321b637e7 100644 --- a/dev-ruby/actionpack/actionpack-3.2.19.ebuild +++ b/dev-ruby/actionpack/actionpack-3.2.19.ebuild @@ -70,4 +70,5 @@ all_ruby_prepare() { sed -i -e '/test_locals_option_to_assert_template_is_not_supported/,/end/ s:^:#:' test/controller/render_test.rb || die # Avoid test broken by security updates in i18n. - sed -i -e '/test_number_to_i18n_currency/,/end/ s:^:#:' test/template/number_helper_i18n_# Copyright 1999- \ No newline at end of file + sed -i -e '/test_number_to_i18n_currency/,/end/ s:^:#:' test/template/number_helper_i18n_test.rb || die +} diff --git a/dev-ruby/activemodel/activemodel-3.2.19.ebuild b/dev-ruby/activemodel/activemodel-3.2.19.ebuild index 4d8ef5bea307..39cb66a34bb3 100644 --- a/dev-ruby/activemodel/activemodel-3.2.19.ebuild +++ b/dev-ruby/activemodel/activemodel-3.2.19.ebuild @@ -20,26 +20,31 @@ SRC_URI="http://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz" LICENSE="MIT" SLOT="$(get_version_component_range 1-2)" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activemodel/activemodel-3.2.19.ebuild,v 1.3 2014/08/06 06:19:52 mrueg Exp $ - -EAPI=5 - -USE_RUBY="ruby19 ruby20 ruby21" - -RUBY_FAKEGEM_TASK_DOC="" -RUBY_FAKEGEM_DOCDIR="" -RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc" - -RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec" - -inherit ruby-fakegem versionator - -DESCRIPTION="A toolkit for building modeling frameworks like Active Record and Active Resource" -HOMEPAGE="http://github.com/rails/rails" -SRC_URI="http://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz" - -LICENSE="MIT" -SLOT="$(get_version_component_range 1-2)" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x8 \ No newline at end of file +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +RUBY_S="rails-${PV}/${PN}" + +ruby_add_rdepend " + ~dev-ruby/activesupport-${PV} + >=dev-ruby/builder-3.0.0:3 + >=dev-ruby/bcrypt-ruby-3.0.0" + +ruby_add_bdepend " + test? ( + dev-ruby/test-unit:2 + >=dev-ruby/mocha-0.13.0:0.13 + )" + +all_ruby_prepare() { + # Set test environment to our hand. + rm "${S}/../Gemfile" || die "Unable to remove Gemfile" + sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths" + + # Make sure we use the test-unit gem since ruby18 does not provide + # all the test-unit features needed. + sed -i -e '1igem "test-unit"' test/cases/helper.rb || die + + # Fix bcrypt dependency since bcrypt uses semantic versioning. + sed -i -e '/bcrypt-ruby/ s/3.0.0/3.0/' lib/active_model/secure_password.rb || die +} diff --git a/dev-ruby/addressable/addressable-2.3.5.ebuild b/dev-ruby/addressable/addressable-2.3.5.ebuild index bebc04871f3b..5d9283481e26 100644 --- a/dev-ruby/addressable/addressable-2.3.5.ebuild +++ b/dev-ruby/addressable/addressable-2.3.5.ebuild @@ -16,22 +16,24 @@ RUBY_FAKEGEM_EXTRAINSTALL="data" inherit ruby-fakegem DESCRIPTION="A replacement for the URI implementation that is part of Ruby's standard library" -HOMEPAGE="https://rubygems.org/gems/addressable https://github.com/sporkm# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/addressable/addressable-2.3.5.ebuild,v 1.8 2014/08/20 13:32:02 mrueg Exp $ - -EAPI=5 -USE_RUBY="ruby19 jruby" +HOMEPAGE="https://rubygems.org/gems/addressable https://github.com/sporkmonger/addressable" -RUBY_FAKEGEM_TASK_DOC="doc:yard" -RUBY_FAKEGEM_RECIPE_TEST="rspec" +LICENSE="Apache-2.0" -RAKE_FAKEGEM_DOCDIR="doc" -RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md" +SLOT="0" +KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +IUSE="doc test" -RUBY_FAKEGEM_EXTRAINSTALL="data" +ruby_add_bdepend "doc? ( dev-ruby/yard )" +ruby_add_bdepend "test? ( dev-ruby/rspec:2 )" -inherit ruby-fakegem +all_ruby_prepare() { + # Remove spec-related tasks so that we don't need to require rspec + # just to build the documentation, bug 383611. + sed -i -e '/spectask/d' Rakefile || die + rm tasks/rspec.rake || die + sed -i -e '/[Cc]overalls/d' spec/spec_helper.rb || die -DESCRIPTION="A replacement for the URI implementation that is part of Ruby's standard library" -HOMEPAGE="https://rubygems.org/gems/addressable https://github.com/sporkmonger/address \ No newline at end of file + # Remove specs requiring network connectivity + rm spec/addressable/net_http_compat_spec.rb || die +} diff --git a/dev-ruby/ae/Manifest b/dev-ruby/ae/Manifest index 95bfabafda79..1c148840d4a8 100644 --- a/dev-ruby/ae/Manifest +++ b/dev-ruby/ae/Manifest @@ -1,2 +1 @@ DIST ae-1.8.2.gem 29696 SHA256 bf97832a0f9aa11f3f88d703f18fa7911c087f39975994d7f4e4b683f8656957 SHA512 4a01c294ebfe8bf0064fa1496804e44999d0f78b2951d23fe0c5bda8a3220ff8225a895fc119f2a282802fbcd87b24769bf1ab46afc0d4ca0b5a885f75371967 WHIRLPOOL 263d839848374db01b4a3a529e594516e748c9b4a104cd06fccf535212d95009082047e68339d1ab4b46e5f39ad51a9332f7f25362d361d337aa3aa30c90f439 -DIST ae-1.8.2.gem 29696 SHA256 bf97832a0f9aa11f3f88d703f18fa7911c087f39975994d7f4e4b683f8656957 SHA512 4a01c294ebfe8bf0064fa1496804e44999d0f78b2951d23fe0c5bda8a3220ff8225a895fc119f2a282802fbcd87b24769bf1ab46afc0d4ca0b5a885f75371967 WHIRLPOOL 263d839848374db01b4a3a529e594516e748c9b4a104cd06fccf535212d95009082047e68339d1ab4b46e5f39ad51a9332f7f25362d361d337aa3aa30c90f439 diff --git a/dev-ruby/async_sinatra/async_sinatra-1.1.0.ebuild b/dev-ruby/async_sinatra/async_sinatra-1.1.0.ebuild index 4be11c268ff5..1ea9497e6b3e 100644 --- a/dev-ruby/async_sinatra/async_sinatra-1.1.0.ebuild +++ b/dev-ruby/async_sinatra/async_sinatra-1.1.0.ebuild @@ -32,8 +32,13 @@ ruby_add_rdepend ">=dev-ruby/sinatra-1.3.2 >=dev-ruby/rack-1.4.1" all_ruby_prepare() { - # Remove development dependencies tha# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/async_sinatra/async_sinatra-1.1.0.ebuild,v 1.2 2014/05/15 01:22:48 mrueg Exp $ + # Remove development dependencies that we don't have from the gemspec + sed -i -e '/\(hoe\|rdoc\|rubyforge\)/d' async_sinatra.gemspec || die +} + +all_ruby_install() { + all_fakegem_install -EAPI=5 \ No newline at end of file + insinto /usr/share/doc/${PF}/ + doins -r examples || die "Failed to install examples" +} diff --git a/dev-ruby/bitescript/Manifest b/dev-ruby/bitescript/Manifest index 6149245f29ea..981ecfed150f 100644 --- a/dev-ruby/bitescript/Manifest +++ b/dev-ruby/bitescript/Manifest @@ -1,2 +1 @@ DIST bitescript-0.0.9.gem 30720 SHA256 6531625d82ea5a474db0197927c18a57c9b3ba2564e5649421db5fe1131629db SHA512 9ce3f29ee796c495c23d1a13fcdea74ff9ff6770dfc4ede290e5ad3fd266915746eba0b61248924fe067c185864aee50fd12620de81c1cd6814a01863ea6478f WHIRLPOOL cce8eb784a276322af13e8d77f0e2918b707478c45ee50ac7509621da776c61293e7fef04b59e1ecb0b9e345b8ee10eff52a6c4c85687009a492e5f4e78ad463 -MISC ChangeLog 1539 SHA256 76ea7aa1323fb2cce3f4a87a289dc9d8a697f473854776299e8f633ddfa48f9d SHA512 d54d50ffe348ac69186d3a2084ceDIST bitescript-0.0.9.gem 30720 SHA256 6531625d82ea5a474db0197927c18a57c9b3ba2564e5649421db5fe1131629db SHA512 9ce3f29ee796c495c23d1a13fcdea74ff9ff6770dfc4ede290e5ad3fd266915746eba0b61248924fe067c185864aee50fd12620de81c1cd6814a01863ea6478f WHIRLPOOL cce8eb784a276322af13e8d77f0e2918b707478c45ee50ac7509621da776c61293e7fef04b59e1ecb0b9e345b8ee10eff52a6c4c85687009a492e5f4e78ad463 diff --git a/dev-ruby/coffee-script-source/Manifest b/dev-ruby/coffee-script-source/Manifest index ff57f7b55c79..1fa999babf81 100644 --- a/dev-ruby/coffee-script-source/Manifest +++ b/dev-ruby/coffee-script-source/Manifest @@ -1,5 +1,3 @@ DIST coffee-script-source-1.7.0.gem 54272 SHA256 acae7508d3f8c8a39f681eab73a1e43d1c1a564e6580122884e049ae761d1157 SHA512 692c001d03feb938d333fb9d4adb504e4f72b0603baae570b0f479787b07cddcda5a90c17c2d83355f9754808af6cd890338d5302b8d915e3f33c1857b29ed7c WHIRLPOOL b959aaabfcc199ed848b8513e96bdbdbacc9f1b452dcce603785e7727264902f74645f8c82a96473ed9c2ceae8421b972753768fa452ed3991773003d55f1399 DIST coffee-script-source-1.7.1.gem 54272 SHA256 509b3ed091e2cdaf09f23b4fe2c4137a7c3d3959af4f081ecc552a229ac8fa41 SHA512 86896054d2edcf00bd81827f00bea1d22973486bafb0b4dbcf09720727365b22ee756fcb5e92dd0bd8f5e84eca486540afe2459f28808976646afcaa0775e31f WHIRLPOOL 1628af327f509cce2773651925c58f8e7cc48c34018fe8a93e012383032779d82ebdb5f7236142c16ce98d3aea6371462d66dab66b1959bbae4975031640b34e DIST coffee-script-source-1.8.0.gem 54272 SHA256 08552c3dda5052f3fbc1198584eef2c376a1417a76ff3a8dc633fd415a472911 SHA512 be1c77aa93d155548c23fc8e8b19bcbc05ea79bd81fe9a619e040f0342f160e14868b83bd090c9171a16a34e91d69b0195cc5948361f7c1067228d88a4ae2840 WHIRLPOOL e8651d0d10fb8186e4ada8268add997fb22b5bace4eaa428d96ea71c42c4930ea6d8fb559e0dc3f154db946d307fc396165eb7d192da386a5aefe1b2dbeb95d6 -DIST coffee-script-source-1.7.0.gem 54272 SHA256 acae7508d3f8c8a39f681eab73a1e43d1c1a564e6580122884e049ae761d1157 SHA512 692c001d03feb938d333fb9d4adb504e4f72b0603baae570b0f479787b07cddcda5a90c17c2d83355f9754808af6cd890338d5302b8d915e3f33c1857b29ed7c WHIRLPOOL b959aaabfcc199ed848b8513e96bdbdbacc9f1b452dcce603785e7727264902f74645f8c82a96473ed9c2ceae8421b972753768fa452ed3991773003d55f1399 -DIST coffee-script-source-1.7.1.gem 54272 SHA256 509b3ed091e2cdaf09f23b4fe2c4137a7c3d3959af4f081ecc552a229ac8fa41 SHA512 86896054d2edcf00bd81827f00bea1d22973486bafb0b4dbcf09720727365b22ee756fcb5e92dd0bd8f5e84eca486540afe2459f28808976646afcaa0775e31f WHIRLPOOL 1628af327f509cce2773651925c58f8e7cc48c34018fe8 \ No newline at end of file diff --git a/dev-ruby/compass/compass-0.12.6-r1.ebuild b/dev-ruby/compass/compass-0.12.6-r1.ebuild index c562ce90c002..797dc51cd9e2 100644 --- a/dev-ruby/compass/compass-0.12.6-r1.ebuild +++ b/dev-ruby/compass/compass-0.12.6-r1.ebuild @@ -24,26 +24,22 @@ ruby_add_bdepend " >=dev-ruby/sass-3.2.19:0 >=dev-ruby/chunky_png-1.2 >=dev-ruby/fssm-0.2.7 - test# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/compass/compass-0.12.6-r1.ebuild,v 1.1 2014/05/20 18:13:13 graaff Exp $ - -EAPI=5 - -USE_RUBY="ruby19" - -RUBY_FAKEGEM_TASK_TEST="-Ilib test features" -RUBY_FAKEGEM_EXTRAINSTALL="frameworks" -RUBY_FAKEGEM_RECIPE_DOC="rdoc" - -inherit ruby-fakegem - -DESCRIPTION="Sass-based Stylesheet Framework" -HOMEPAGE="http://compass-style.org/" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" - -ruby_a \ No newline at end of file + test? ( + dev-ruby/mocha:0.13 + dev-ruby/css_parser + dev-util/cucumber + ) +" + +all_ruby_prepare() { + sed -e '/.*[Bb]undler.*/d' \ + -i Rakefile || die "sed failed" + sed -e '/require \"mocha\/test_unit\"/d' \ + -i test/test_helper.rb || die "sed failed" + + sed -i -e '1igem "mocha", "~> 0.13.0"' test/test_helper.rb || die + + sed -i -e "s:/tmp:${TMPDIR}:" features/step_definitions/command_line_steps.rb || die + # This scenario fails, not clear yet why. + sed -i -e '/Watching a project for changes/,/^$/ d' features/command_line.feature || die +} diff --git a/dev-ruby/crack/Manifest b/dev-ruby/crack/Manifest index c5c806fb1e6f..70991e4c8760 100644 --- a/dev-ruby/crack/Manifest +++ b/dev-ruby/crack/Manifest @@ -1,4 +1,2 @@ DIST crack-0.3.2.gem 35328 SHA256 e7d4f68502e9ee41ce193589e65f47f280850f17202709c9bac9aa1266f3fe82 SHA512 dd23bcf17cd78a705fcab8dcabf87e109bf70dc22440b56483d8dd05fa0b23e72e39652bc8cef678478b04bd479f103b8ab817b3df5a636bef9f883ca1777392 WHIRLPOOL b97ecb92bc47269ac08c8630b98ad2e1792f5bca41b4b9f70b2c0fb1209afa6cf373e6c0820e7f9d4e361a69d53d37b8f294508d4df086e2bea2f866a5ca2173 DIST crack-0.4.2.gem 37376 SHA256 ea4c34f052106f571235f627f561d28309151c09b841130bb7627c2d522589c6 SHA512 0c1adfe9cbcf6c5bdabba20819c7ed7dce0a8e360695564927bab447c3d66d786bd9267066efb08732b0fc4687d9dc3ac74c650eb8cec17575926aa9a24f7723 WHIRLPOOL 71ef6176576f897ab46ae431bafba512cacdeb5fbfdf1bcafbef24c9d4dcb8abb242b8722a75ae4db891fb8c86dd7a9e7d05a0fdcb86958ac5d0a6d4a873a49f -DIST crack-0.3.2.gem 35328 SHA256 e7d4f68502e9ee41ce193589e65f47f280850f17202709c9bac9aa1266f3fe82 SHA512 dd23bcf17cd78a705fcab8dcabf87e109bf70dc22440b56483d8dd05fa0b23e72e39652bc8cef678478b04bd479f103b8ab817b3df5a636bef9f883ca1777392 WHIRLPOOL b97ecb92bc47269ac08c8630b98ad2e1792f5bca41b4b9f70b2c0fb1209afa6cf373e6c0820e7f9d4e361a69d53d37b8f294508d4df086e2bea2f866a5ca2173 -DIST crack-0.4.2.gem 37376 SHA256 ea4c34f052106f571235f627f561d283 \ No newline at end of file diff --git a/dev-ruby/deprecated/Manifest b/dev-ruby/deprecated/Manifest index 815cb4ff253d..c546a915245a 100644 --- a/dev-ruby/deprecated/Manifest +++ b/dev-ruby/deprecated/Manifest @@ -1,3 +1,2 @@ DIST deprecated-3.0.0.gem 6144 SHA256 cf09d59afc58de6d6054502f7d59b1855285fd5cf50c5adb504abbc00ef18c5c SHA512 b102af5a3f2eed37f9353c616442a00f16008accbd647ec1d532f4bc8e058694635fe24834e07d35ea7ac0134954132b7311cd73cb0dfc23b6c101ecfd617cda WHIRLPOOL 9193f86e514403a119fd51d205bdcee9884478f72d7f3be80c09e82ab01d008a253d162c818e24530fa977676134e09aac48ffe021b22c28129258424ac81cec DIST deprecated-3.0.1.gem 6144 SHA256 032cc3b7367275bebd2b46c0fa23f70447f65e7f34f0d68977b0c9243c07c2cf SHA512 c4280f8bd6914a6b073cbc443db5dd5232379abb7870d90cd0146c08312f82aa8fd8c042b48c2b9b26c4120dc8afb326070a1256c51355f1cfa898905ec59e51 WHIRLPOOL 383fc0a4736861cc56720c7307e40c7db09d626d6d61cad278c7793a969ab5061574b02d181f92c90d0f906977bd34ef0ea2f5929aab78a4f8e002c169e4a56b -DIST deprecated-3.0.0.gem 6144 SHA256 cf09d59afc58de6d6054502f7d59b1855285fd5cf50c5adb504abbc00e \ No newline at end of file diff --git a/dev-ruby/fakefs/fakefs-0.5.2-r1.ebuild b/dev-ruby/fakefs/fakefs-0.5.2-r1.ebuild index fdbbe42335bc..33a59105ed0f 100644 --- a/dev-ruby/fakefs/fakefs-0.5.2-r1.ebuild +++ b/dev-ruby/fakefs/fakefs-0.5.2-r1.ebuild @@ -37,6 +37,16 @@ all_ruby_prepare() { each_ruby_prepare() { case ${RUBY} in *jruby) - # Ignore failing tests: upstream is aware and # Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fakefs/fakefs-0.5.2-r1.ebuild,v 1.3 2014/08/1 \ No newline at end of file + # Ignore failing tests: upstream is aware and doing the same + # on Travis. + rm test/fakefs_test.rb test/file/stat_test.rb || die + ;; + *) + ;; + esac +} + +each_ruby_test() { + ruby-ng_rspec + ruby-ng_testrb-2 -Ilib:test test/**/*_test.rb +} diff --git a/dev-ruby/gettext_i18n_rails/Manifest b/dev-ruby/gettext_i18n_rails/Manifest index 52b3c0255d4a..42c71cb7f989 100644 --- a/dev-ruby/gettext_i18n_rails/Manifest +++ b/dev-ruby/gettext_i18n_rails/Manifest @@ -1,5 +1,3 @@ DIST gettext_i18n_rails-0.10.0.gem 22528 SHA256 d8f1e2ee37646e050327fe75d79d6a01a139811973ec0bbf87d67d89c0ce5b35 SHA512 f0519a84f51a3efbe6b2ea79d274c3659f71dbcb946ef0bed451c657c6a16b143e633c8ce8c1410f32881cf93a0c7bfc19b26010e3279d7eeb86ea83a5194dde WHIRLPOOL 50067d21fc3ff386834ef986302aeea6aae40a95c9f673f1cb1d6a1bfe52468931b7fb04e9ac87eb8c851f231f59814157281a1bc4e1581ae814b91c4b82043b DIST gettext_i18n_rails-1.0.5.tar.gz 20335 SHA256 1179dd6c71356ccfa0a764bb9bb7605bc9b43c000aafd2aaf54972da5e8da386 SHA512 28c53f47473382de08a7bee56432f965b13aa9c5097442ed4f3fad3252b6e65f112d63119ca418f64c03c602b13db0a46277080f24874e027e453ce3ae08e360 WHIRLPOOL e7217c3ba3ec9c94829c38040f9baa840fa7061fc1678975c6689b3441d3752e81cc3cf8a522f795b8b34289684ab11b7313d7569034ab780037e345622edbca DIST gettext_i18n_rails-1.1.0.tar.gz 19581 SHA256 ae0910ac2d343a06b1c3ea4346272096834c4f792448e0c0a3f13ca102fd5a33 SHA512 61f628b1fd13ecb85f34d87475ee30a05f5de567ca097763e6d765fefc1a8715e72fba1361bc8717dff66b2baaea143525c5349159e8f02ee9aa010115d0e9a7 WHIRLPOOL 7d3fa603f5ec812d0fcb9daf36b27880d9f114b243ab956ca6da13722ee09370e78811acefab206e5826a4f933a0a19e115376dddcf1a6ab14487a279fd36ea6 -DIST gettext_i18n_rails-0.10.0.gem 22528 SHA256 d8f1e2ee37646e050327fe75d79d6a01a139811973ec0bbf87d67d89c0ce5b35 SHA512 f0519a84f51a3efbe6b2ea79d274c3659f71dbcb946ef0bed451c657c6a16b143e633c8ce8c1410f32881cf93a0c7bfc19b26010e3279d7eeb86ea83a5194dde WHIRLPOOL 50067d21fc3ff386834ef986302aeea6aae40a95c9f673f1cb1d6a1bfe52468931b7fb04e9ac87eb8c851f231f59814157281a1bc4e1581ae814b91c4b82043b -DIST gettext_i18n_rails-1.0.5.tar.gz 20335 SHA256 1179dd6c71356ccfa0a764bb9bb7605bc9b43c000aafd2aaf54972da5e8da386 SHA512 28c53f47473382de08a7bee56432f965b13aa9c5097442ed4f3fad3252b6e65f112d63119ca418f64c03c602b13db0a46277080f24874e027e453ce3ae08 \ No newline at end of file diff --git a/dev-ruby/highline/Manifest b/dev-ruby/highline/Manifest index 4214e31242e3..f7484699e79e 100644 --- a/dev-ruby/highline/Manifest +++ b/dev-ruby/highline/Manifest @@ -1,3 +1,2 @@ DIST highline-1.6.19.gem 220672 SHA256 ad6b0a497b1bdb511f5d20866c8820ad1ec440c7a223fabe7e5cabc6c4b7d43f SHA512 c50c954667511a8ae97dc6814a37383494f5df0a76c5de2e37b21b61850df9a0ddca5362495d180edb9d1335256ceb7635b7ffbd15e3cf92e6cfc65fa29fb97c WHIRLPOOL 5da70d5d3364d1f727dd0f3f957b6338b7db74901ce575fced9f48cb874436d7548ed67b56e1fd5bf1c7e6f78fbd93933800dfc44760e1550d68641e6c8eaa1b DIST highline-1.6.21.gem 221184 SHA256 c136298eee86ceff87baadc71d764ea07986f89805636e4a6a305b2d5da07519 SHA512 520f319816453a576ed14294d38bbace80c6a70d79c5500eca47e612449b7b5c99d5d28f401457e981a2b511cbd28a8fdf6f3e1dd30113aff59f134ae89d1111 WHIRLPOOL 14289aef26079419f6f93c88cc022bd830c848c438b6958e9c52a59c8d5ce760633fba5007a651c17770ea4e69c354d3c119c2c97c11b4dad95bcf101cab22c1 -MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae3DIST highline-1.6.19.gem 220672 SHA256 ad6b0a497b1bdb511f5d20866c8820ad1ec440c7a223fabe7e5cabc6c4b7d43f SHA512 c50c954667511a8ae97dc6814a37383494f5df0a76c5de2e37b21b61850d \ No newline at end of file diff --git a/dev-ruby/hoe-seattlerb/Manifest b/dev-ruby/hoe-seattlerb/Manifest index 6a2b80a3942d..9ee68f28fc21 100644 --- a/dev-ruby/hoe-seattlerb/Manifest +++ b/dev-ruby/hoe-seattlerb/Manifest @@ -1,5 +1,3 @@ DIST hoe-seattlerb-1.2.8.gem 11264 SHA256 f7a6d839551a4ef66a67c230666dd1d8cce945ee34527d8e9f6290d2eb56cf5b SHA512 e3aebdc8015d510cf0547fa9033be5c4cd07dedf71c20204d59b06bf0b79ee624d3a21a8a6af1de46a964899185c7c78661b9ec32d68bc2a8fbf9ce486dd216c WHIRLPOOL 6e3620f8d78c9bb29efe4056cac9e0d4f623985f6e4afe4ab623f5800cdd15a387e9213c76e599063b8b865d5e6bfee6229e091b45bc05bfc82a9f394a830a96 DIST hoe-seattlerb-1.3.2.gem 12288 SHA256 0a1be5e97fcbf4dc5972fe3c440b096e58325d3dc01b2e8a21559939d72d140e SHA512 24077c570d0030742bc7690c063ab14dcadefea7649821a147ee91a887c649a5ee560ae9c8935de870bcd5366958bbcfd04a1cba1ad0d79550bb4e1a8117e1b8 WHIRLPOOL 07dea3ecb7d24e957d44ee77bd7f85d224e7acd77f7de99cdf2ca87e654eb9ddddf3947f116983d326f42299ef83d056949531b77e21694e839c2912d08cb9e0 DIST hoe-seattlerb-1.3.3.gem 14336 SHA256 e19db4ce70375aa0f71b9e38f06d97411b71ed2be99ceb5d328b2d56555dceba SHA512 35f335a3582d8941518df7e37c7e591535f86197b1e03674bf1ec8c7f3cdec5d980639f0e082c1453bf074c4d80127412d328686044803a09401cccbe667945b WHIRLPOOL 01f9813746c1430e65ea4a592aeee701eeb1cb372a549c3d7243604bfbb2e7f67cc6a974ffa557b358efc51efcefe46c8d4ba57393cddfb2f147b23e1e2a2dd7 -DIST hoe-seattlerb-1.2.8.gem 11264 SHA256 f7a6d839551a4ef66a67c230666dd1d8cce945ee34527d8e9f6290d2eb56cf5b SHA512 e3aebdc8015d510cf0547fa9033be5c4cd07dedf71c20204d59b06bf0b79ee624d3a21a8a6af1de46a964899185c7c78661b9ec32d68bc2a8fbf9ce486dd216c WHIRLPOOL 6e3620f8d78c9bb29efe4056cac9e0d4f623985f6e4afe4ab623f5800cdd15a387e9213c76e599063b8b865d5e6bfee6229e091b45bc05bfc82a9f394a830a96 -DIST hoe-seattlerb-1.3.2.gem 12288 SHA256 0a1be5e97fcbf4dc5972fe3c440b096e58325d3dc01b2e8a21559939d72d140e SHA512 24077c570d0030742bc7690c063ab14dcadefea7649821a147ee91a887c649a5ee560ae9c8935de870bcd5366 \ No newline at end of file diff --git a/dev-ruby/json_pure/json_pure-1.8.1.ebuild b/dev-ruby/json_pure/json_pure-1.8.1.ebuild index d0629a7e7203..735baf3b97f6 100644 --- a/dev-ruby/json_pure/json_pure-1.8.1.ebuild +++ b/dev-ruby/json_pure/json_pure-1.8.1.ebuild @@ -24,17 +24,18 @@ ruby_add_bdepend "test? ( )" each_ruby_configure() { - $# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json_pure/json_pure-1.8.1.ebuild,v 1.1 2013/12/27 01:13:22 naota Exp $ - -EAPI=5 - -USE_RUBY="ruby19 ruby20" -RUBY_FAKEGEM_RECIPE_TEST="rake" -RUBY_FAKEGEM_RECIPE_DOC="rdoc" - -inherit multilib ruby-fakegem - -DESCRIPTION="a JSON implementation in pure Ruby" -HOMEPAGE="http://flori.github.co \ No newline at end of file + ${RUBY} -Cext/json/ext/generator extconf.rb || die + ${RUBY} -Cext/json/ext/parser extconf.rb || die +} + +each_ruby_compile() { + emake V=1 -Cext/json/ext/generator + emake V=1 -Cext/json/ext/parser + cp ext/json/ext/generator/generator$(get_modname) lib/ || die + cp ext/json/ext/parser/parser$(get_modname) lib/ || die +} + +each_ruby_test() { + env JSON=pure ${RUBY} -S rake test_pure || die + env JSON=ext ${RUBY} -S rake test_ext || die +} diff --git a/dev-ruby/mocha/mocha-0.11.4.ebuild b/dev-ruby/mocha/mocha-0.11.4.ebuild index 102aefe5115a..be6fbc042fbd 100644 --- a/dev-ruby/mocha/mocha-0.11.4.ebuild +++ b/dev-ruby/mocha/mocha-0.11.4.ebuild @@ -29,13 +29,24 @@ ruby_add_bdepend " ruby_add_rdepend "dev-ruby/metaclass" #metaclass ~> 0.0.1 all_ruby_prepare() { - sed -i -e '/[Bb]undler/ s:# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mocha/mocha-0.11.4.ebuild,v 1.17 2014/04/22 03:29:30 mrueg Exp $ + sed -i -e '/[Bb]undler/ s:^:#:' -e '1iload "lib/mocha/version.rb"' Rakefile || die +} -EAPI=4 -USE_RUBY="ruby19 jruby" +all_ruby_compile() { + all_fakegem_compile -RUBY_FAKEGEM_TASK_TEST="test:units" + if use doc; then + rake examples || die + fi +} + +each_ruby_test() { + ${RUBY} -Ilib -S testrb test/unit/* || die +} + +all_ruby_install() { + all_fakegem_install -RUBY_FAKEGEM_TASK_DOC= \ No newline at end of file + docinto examples + dodoc examples/*.rb || die +} diff --git a/dev-ruby/mongo/mongo-1.6.2.ebuild b/dev-ruby/mongo/mongo-1.6.2.ebuild index 21e08706795c..e1ca5523d5eb 100644 --- a/dev-ruby/mongo/mongo-1.6.2.ebuild +++ b/dev-ruby/mongo/mongo-1.6.2.ebuild @@ -29,14 +29,18 @@ SLOT="0" KEYWORDS="~amd64" IUSE="test" -# This is the same source package a# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mongo/mongo-1.6.2.ebuild,v 1.4 2014/08/05 16:00:35 mrueg Exp $ - -EAPI=4 - -USE_RUBY="ruby19" - -RUBY_FAKEGEM_TASK_TEST="test:unit" - -RUBY_FAKEGEM_TASK_DOC="r \ No newline at end of file +# This is the same source package as bson, so keep them the same +# version, but not revision +ruby_add_rdepend "~dev-ruby/bson-${PV}" + +ruby_add_bdepend \ + "test? ( + dev-ruby/rake + dev-ruby/shoulda + dev-ruby/mocha + )" + +all_ruby_prepare() { + # remove the stuff that is actually part of dev-ruby/bson + rm -rf lib/bson* bin/{b2j,j2b}son +} diff --git a/dev-ruby/net-sftp/net-sftp-2.0.5-r1.ebuild b/dev-ruby/net-sftp/net-sftp-2.0.5-r1.ebuild index 8faf81b1370b..6e1da8c98c73 100644 --- a/dev-ruby/net-sftp/net-sftp-2.0.5-r1.ebuild +++ b/dev-ruby/net-sftp/net-sftp-2.0.5-r1.ebuild @@ -36,5 +36,8 @@ each_ruby_test() { *) # Ignore tests since they hang, mostl likely due to bad # interaction with net-ssh: - # https://github.com/net-ssh/net-sftp# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public Lice \ No newline at end of file + # https://github.com/net-ssh/net-sftp/issues/16 This seems + # fixed in newer net-ssh versions but these are ruby19 only. + ;; + esac +} diff --git a/dev-ruby/net-ssh/net-ssh-2.4.0.ebuild b/dev-ruby/net-ssh/net-ssh-2.4.0.ebuild index 7e6fa5010096..fad3087daa81 100644 --- a/dev-ruby/net-ssh/net-ssh-2.4.0.ebuild +++ b/dev-ruby/net-ssh/net-ssh-2.4.0.ebuild @@ -20,9 +20,12 @@ RUBY_S="${PN}-${PN}-*" LICENSE="GPL-2" SLOT="2" -KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~pp# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/net-ssh/net-ssh-2.4.0.ebuild,v 1.6 2014/04/05 13:52:56 mrueg Exp $ +KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris" +IUSE="test" -EAPI=4 -USE_RUBY="ruby19 \ No newline at end of file +ruby_add_rdepend "virtual/ruby-ssl" +ruby_add_bdepend "test? ( dev-ruby/test-unit:2 dev-ruby/mocha )" + +each_ruby_test() { + ${RUBY} -Ilib:test test/test_all.rb || die "Tests failed." +} diff --git a/dev-ruby/oauth2/oauth2-0.9.4.ebuild b/dev-ruby/oauth2/oauth2-0.9.4.ebuild index e86e4c7ce2d8..e0ddfcec6240 100644 --- a/dev-ruby/oauth2/oauth2-0.9.4.ebuild +++ b/dev-ruby/oauth2/oauth2-0.9.4.ebuild @@ -23,16 +23,18 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="" ruby_add_rdepend ">=dev-ruby/faraday-0.8 - ># Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/oauth2/oauth2-0.9.4.ebuild,v 1.3 2014/08/15 14:14:47 blueness Exp $ - -EAPI=5 + >=dev-ruby/jwt-0.1.8 + >=dev-ruby/multi_json-1.0.3 + >=dev-ruby/multi_xml-0.5 + >=dev-ruby/rack-1.2" +ruby_add_bdepend "test? ( >=dev-ruby/rspec-2.5.0:2 )" -USE_RUBY="ruby19 ruby20" +all_ruby_prepare() { + sed -i -e '/simplecov/,/^end/ s:^:#:' spec/helper.rb || die -RUBY_FAKEGEM_TASK_TEST="none" -RUBY_FAKEGEM_TASK_DOC="doc:rdoc" + sed -i -e '/yardstick/,/^end/ s:^:#:' Rakefile || die +} -RUBY_FAKEGEM_DOCDIR="rdoc" -RUBY_FA \ No newline at end of file +each_ruby_test() { + CI=true ${RUBY} -S rspec spec || die +} diff --git a/dev-ruby/packetfu/Manifest b/dev-ruby/packetfu/Manifest index 48631daf47ee..fe57e8bd21ef 100644 --- a/dev-ruby/packetfu/Manifest +++ b/dev-ruby/packetfu/Manifest @@ -1,3 +1,2 @@ DIST packetfu-1.1.10.gem 750080 SHA256 7c929b03255b4320598a9bed7c86076435cedb9b7292cb1acab05c4d085c5b22 SHA512 6912d8923eaf596fccb5881025259f8df2494c5ff424a9fe2d4fc28b135c26a89afa8e663dcca97f42ead0c0da14f659611f12472dabe29b26e202c4f79737f9 WHIRLPOOL ccbe1aace3a954972b1e4ff55fcf37e6b686c6074df08f853aa02693b35627a44d01be6e43f0d8ee85a1585b230fde62ba265dade7aabd197430f15a9940d648 DIST packetfu-1.1.9.gem 750592 SHA256 dc035e2be9312bc6e78ac75951c7af8358304a7b4efa6f82fc07821bf30bd409 SHA512 c032ee9f90d03b5cc588d712f3c1dfe9f797c7c7799fae22c565915cf3ff90962927cb9986cc10b4901549a39a6515a4b2d33f67e7eb23b6a7e0ae3cce750442 WHIRLPOOL 1b58159d54c7df134509065012a4fbf6350d6d3c6c35f1ee44c0fedf7d98925bdb289e07ae44c32e1e9cd5257faff6906c59cc0af31f46cf919fe39900c9b490 -DIST packetfu-1.1.10.gem 750080 SHA256 7c929b03255b4320598a9bed7c86076435cedb9b7292cb1acab0 \ No newline at end of file diff --git a/dev-ruby/priorityqueue/priorityqueue-0.1.2.ebuild b/dev-ruby/priorityqueue/priorityqueue-0.1.2.ebuild index e7296e41c285..4f215692db03 100644 --- a/dev-ruby/priorityqueue/priorityqueue-0.1.2.ebuild +++ b/dev-ruby/priorityqueue/priorityqueue-0.1.2.ebuild @@ -34,4 +34,5 @@ each_ruby_compile() { } each_ruby_test() { - ${RUBY} -Ilib test/priority_queue_test.rb || die# C \ No newline at end of file + ${RUBY} -Ilib test/priority_queue_test.rb || die +} diff --git a/dev-ruby/rack-attack/Manifest b/dev-ruby/rack-attack/Manifest index 48731a745e91..d9f53b54db9a 100644 --- a/dev-ruby/rack-attack/Manifest +++ b/dev-ruby/rack-attack/Manifest @@ -1,5 +1,3 @@ DIST rack-attack-2.3.0.gem 13312 SHA256 f910e5d0a54b7cc7e086bf111481a0e455260caf8184a33bbb9e96f8064ef49c SHA512 4add5fdf4fbc92a88a7448248df72e755fde7e3a5222ee2df788eb5f2e86689ed2ba925b420ee1873997c11c13ce4f6d5bf1e405a9c42f025ecc731b26490d38 WHIRLPOOL 3ded4c62c5f0058e1f8443c2dd574734e28dfe1021efdcca76afa1dcfdd219b50f975261d4987dafc996771990944c5ad63e59303ffaa3b290c967f1fa5eff7b DIST rack-attack-4.1.0.gem 14848 SHA256 6c28ec2cb3e234e75ffe9306e7b75a86c22b9861c03c3ecbb12d38b6f630f5ae SHA512 3e23e48b1c39a9e84c9ba4d10ab71d570690bf37901a3cdf6f46a6df54de5005490523df7f33818f723ab25dcfb1e935e7209d061d66f0f5c48cbdfdbd7dc220 WHIRLPOOL ea25c308a42be5c39983d9507d63301e76a7ff77653d61f1bf97ed813ab5fbc74b644e47660db999898ee072ba2f781b07da3748650018faebec9ca9d9635030 DIST rack-attack-4.1.1.gem 14848 SHA256 b713eaa3d3377c227c2637398a84978c0ab4021b4b5b2c4dbdbc2b68d448814c SHA512 06bf682b5fbbe3996197d14337963abcf6cfb7f8f1edbcf40f65650508655c92f43ba97189d22394b821acc4fe7cd6b27f70859020632ec6c9c5da04ac8cc807 WHIRLPOOL 8d37a9619f21a29459a7bd745ea0a783a01780da4df766e9657007c1459fcf02a05123296d26ed9da0ffdd3371f1245840b6dd9347794b76bf0ae00d9180e416 -MISC ChangeLog 610 SHA256 2e869af65d2f723bca881000e7c89d1b40c1b061a0456ad6d936c9e016efbdd6 SHA512 56e769be76e99e9d082f0da12679bc93a33cc8173797c877435b82579d5ab0c37c4288b4d7e66a513af147494251d32476b7626bf1f50d0260389312112a32a9 WHIRLPOOL 07d88f2fdff2865b80DIST rack-attack-2.3.0.gem 13312 SHA256 f910e5d0a54b7cc7e086bf111481a0e455260caf8184a33bbb9e96f8064ef49c SHA512 4add5fdf4fbc92a88a7448248df72e755fde7e3a5222ee2df788eb5f2e86689ed2ba925b420ee1873997c11c13ce4f6d5bf1e405a9c42f025ecc731b26490d38 WHIRLPOOL 3ded4c62c5f0058e1f8443c2dd574734e28dfe1021efdcca76afa1dcfdd219b50f975261d4987dafc996771990944c5ad63e59303ffaa3b290c967f1fa5eff7b -DIST rack-attack-4.1.0.gem 14848 SHA256 6c28ec2cb3e234e75ffe9306e7b75a86c22b9861c03c3ecbb12d38b6f630 \ No newline at end of file diff --git a/dev-ruby/rack-test/Manifest b/dev-ruby/rack-test/Manifest index 7b43c8e1d07d..dd61ac5d9fe0 100644 --- a/dev-ruby/rack-test/Manifest +++ b/dev-ruby/rack-test/Manifest @@ -1,2 +1 @@ DIST rack-test-0.6.2.gem 22528 SHA256 7e920b6aac888e4a3846e5997fb1cbf456bdb5846322b58dc31697a54a38b306 SHA512 9c14d75eafea93afb02c4e8fc438f7c653cfe816058560a458a092591214a7fd185b2d76eed7b398e16d72f763e8c7ae0a869c3a29df075102845074568d8ef0 WHIRLPOOL b29abfc46a091aa4ded7bcdc2c68c79720aa42889246bb4df0b52bedf5415ee72f09592bf9af41477544ce34d452e4a7b3c56d9431879a99b58cda7729622865 -EBUILD rack-test-0.6.2-r1.ebuild 1002 SHA256 9c5fc0d3bfd724df94c6cfa5a28d505e89e6104ed7f891f0448b2a884bba019c SHA512 aee8f836c5233e64f74f881c78375f9a2954f5ebed71bebad37bf46f0e6e26fa9e4f7d502419b702f26683f54075015087ad83fcf83624497904e893262f7c2f WHIRLPOOL 2c6e9272a6bc5fd2bae95c164ba800065b50559cd3d2bd4dc25c5b36011b8861b72bd1dc673b85099360edc8f60cd18f20786ea237edc6c8e596ecDIST rack-test-0.6.2.gem 22528 SHA256 7e920b6aac888e4a3846e5997fb1cbf456bdb5846322b58dc31697a54a38b306 SHA512 9c14d75eafea93afb02c4e8fc438f7c653cfe816058560a458a092591214a7fd185b2d76eed7b398e16d72f763e8c7ae0a869c3a29df075102845074568d8ef0 WHIRLPOOL b29abfc46a091aa4ded7bcdc2c68c79720aa42889246bb4df0b52bedf5415ee72f09592bf9af41477544ce34d452e4a7b3c56d9431879a99b58cda7729622865 diff --git a/dev-ruby/rails/rails-4.0.10.ebuild b/dev-ruby/rails/rails-4.0.10.ebuild index 7c22a9e1b0c8..89946a074ccf 100644 --- a/dev-ruby/rails/rails-4.0.10.ebuild +++ b/dev-ruby/rails/rails-4.0.10.ebuild @@ -19,21 +19,24 @@ DESCRIPTION="ruby on rails is a web-application and persistance framework" HOMEPAGE="http://www.rubyonrails.org" LICENSE="MIT" -SL# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/rails-4.0.10.ebuild,v 1.1 2014/09/12 05:56:16 graaff Exp $ - -EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21" - -RUBY_FAKEGEM_BINWRAP="" - -# The guides are now here but we'd need to rebuilt them first. -RUBY_FAKEGEM_TASK_DOC="" -RUBY_FAKEGEM_TASK_TEST="" - -RUBY_FAKEGEM_EXTRADOC="README.md guides/CHANGELOG.md" - -inherit ruby-fakegem versionator - -DESCRIPTION="ruby on rails is a web-a \ No newline at end of file +SLOT="$(get_version_component_range 1-2)" +KEYWORDS="~amd64 ~arm ~x86" + +IUSE="+asset-pipeline" + +ruby_add_rdepend " + ~dev-ruby/actionmailer-${PV} + ~dev-ruby/actionpack-${PV} + ~dev-ruby/activerecord-${PV} + ~dev-ruby/activesupport-${PV} + ~dev-ruby/railties-${PV} + >=dev-ruby/bundler-1.3 =dev-ruby/bundler-1* + >=dev-ruby/sprockets-rails-2.0.0:2.0 + asset-pipeline? ( + dev-ruby/jquery-rails + >=dev-ruby/sass-rails-4.0.0:4.0 + >=dev-ruby/uglifier-1.3.0 + >=dev-ruby/coffee-rails-4.0.0:4.0 + )" + +# also: turbolinks, >=jbuilder-1.2:1 diff --git a/dev-ruby/rails/rails-4.1.6.ebuild b/dev-ruby/rails/rails-4.1.6.ebuild index 626d7e6362dd..1a8bb6eea1e6 100644 --- a/dev-ruby/rails/rails-4.1.6.ebuild +++ b/dev-ruby/rails/rails-4.1.6.ebuild @@ -31,11 +31,14 @@ ruby_add_rdepend " ~dev-ruby/activemodel-${PV} ~dev-ruby/activerecord-${PV} ~dev-ruby/activesupport-${PV} - ~dev-ruby/rai# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/rails-4.1.6.ebuild,v 1.1 2014/09/12 06:27:56 graaff Exp $ - -EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21" - -RUBY_FAKEGEM_B \ No newline at end of file + ~dev-ruby/railties-${PV} + >=dev-ruby/bundler-1.3 =dev-ruby/bundler-1* + =dev-ruby/sprockets-rails-2* + asset-pipeline? ( + dev-ruby/jquery-rails + >=dev-ruby/sass-rails-4.0.3:4.0 + >=dev-ruby/uglifier-1.3.0 + >=dev-ruby/coffee-rails-4.0.0:4.0 + )" + +# also: turbolinks, >=jbuilder-1.2:1 diff --git a/dev-ruby/rmagick/Manifest b/dev-ruby/rmagick/Manifest index c441a641dfb7..099499dbb849 100644 --- a/dev-ruby/rmagick/Manifest +++ b/dev-ruby/rmagick/Manifest @@ -1,5 +1,3 @@ DIST RMagick-2.13.2.tar.bz2 1208478 SHA256 a8c2df101549f74c66f687eceada6b703183234d7ce67dc84d85d16745a638e3 SHA512 b7e9111b9221467f827e57e1d3113d714dcc5cfd32483a2a3aefc5a59fe7f98efae612145db097c3837ef55c2acd0cdde6638a94ffb595a0fba412edeb469530 WHIRLPOOL 4d89bd1a1fa341b83b539437b8a4893f955d2b196e4469d106acb49b6eac28f6777a82e4120f6a88ffc06e0d2d84e40531f713cd39388584d70ff992422b2a75 DIST rmagick-2.13.2.gem 1305088 SHA256 e4f3b4c6ef6d6e89d8183080ee17093f42860c960f854608f4aa44ec8bce85bb SHA512 ad9c8821eb25f081b1265ee1c378bc0cd12f7e702bc83cd8f9139fea8241d147662cb715a24e1b51047ac83fa5f3425349026c5f782baf787f7020e8695ac890 WHIRLPOOL c68e8ec11a12491876b72195f2b64081531acefe423a6c0a289515094369d4dbc6444562830d55f5aa999439e142281bd440a0f385ecc62610287c54f8ce5d86 DIST rmagick-2.13.3.gem 3089920 SHA256 109f3b8be90afdea9abbdd2a79a955cd808b5cad65d937ed12676da22870d3b4 SHA512 331f80a0a5966c3283d519249ec2160c9212e18095228fee4c6d5378409070fbd0073195b02119d019af68cac0f8dc853dbada54febd6006fb4b95411ffbbcec WHIRLPOOL 80eb7d51e8ed620e6f02d8013f19cd58021fd9f2abd5b742bde88db993149af4c859ed48c04db6dd10366c033065dbed2bc83ccd1bf0a23f523d901e2674ffc4 -DIST RMagick-2.13.2.tar.bz2 1208478 SHA256 a8c2df101549f74c66f687eceada6b703183234d7ce67dc84d85d16745a638e3 SHA512 b7e9111b9221467f827e57e1d3113d714dcc5cfd32483a2a3aefc5a59fe7f98efae612145db097c3837ef55c2acd0cdde6638a94ffb595a0fba412edeb469530 WHIRLPOOL 4d89bd1a1fa341b83b539437b8a4893f955d2b196e4469d106acb49b6eac28f6777a82e4120f6a88ffc06e0d2d84e40531f713cd39388584d70ff992422b2a75 -DIST rmagick-2.13.2.gem 1305088 SHA256 e4f3b4c6ef6d6e89d8183080ee17093f42860c960f854608f4aa44ec8bce85bb SHA512 ad9c8821eb25f081b1265ee1c378bc0cd12f7e702bc83cd8f9139fea8241d147662cb715a24e1b51047ac83fa5f3425349026c5f782baf787f7020e8695ac890 WHIRLPOOL c68e8ec11a12491876b72195f2b64081531acefe423a6c0a289515094369d4dbc6444562830d55f5aa999439e142281bd440 \ No newline at end of file diff --git a/dev-ruby/rspec-core/rspec-core-2.99.2.ebuild b/dev-ruby/rspec-core/rspec-core-2.99.2.ebuild index 57f58d9e9015..c07c98086c30 100644 --- a/dev-ruby/rspec-core/rspec-core-2.99.2.ebuild +++ b/dev-ruby/rspec-core/rspec-core-2.99.2.ebuild @@ -26,41 +26,6 @@ SLOT="2" 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" IUSE="" -ruby_add_bdepend "test? ( - >=dev-ruby/nokogiri-1.5.2 - dev-ruby/syntax - >=dev-ruby/zentest-4.6.2 - >=dev-ruby/rspec-expectations-2.14.0:2 - >=dev-ruby/rspec-mocks-2.99.0:2 - )" -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/rspec-core-2.99.2.ebuild,v 1.1 2014/08/20 05:40:55 graaff Exp $ - -EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21 jruby" - -RUBY_FAKEGEM_TASK_TEST="none" -RUBY_FAKEGEM_TASK_DOC="none" - -RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md" - -# Also install this custom path since internal paths depend on it. -RUBY_FAKEGEM_EXTRAINSTALL="exe" - -RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec" - -inherit ruby-fakegem - -DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby" -HOMEPAGE="http://rspec.rubyforge.org/" -SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz" - -LICENSE="MIT" -SLOT="2" -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" -IUSE="" - ruby_add_bdepend "test? ( >=dev-ruby/nokogiri-1.5.2 dev-ruby/syntax @@ -75,4 +40,41 @@ USE_RUBY=${USE_RUBY/ruby20/} ruby_add_bdepend "doc? ( dev-ruby/yard )" all_ruby_prepare() { # Don't set up bundler: it doesn't understand our setup. - \ No newline at end of file + sed -i -e '/[Bb]undler/d' Rakefile || die + + # Avoid dependency on cucumber since we can't run the features anyway. + sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die + + # Duplicate exe also in bin. We can't change it since internal stuff + # also depends on this and fixing that is going to be fragile. This + # way we can at least install proper bin scripts. + cp -R exe bin || die + + # Avoid unneeded dependency on git. + sed -i -e '/git ls-files/ s:^:#:' rspec-core.gemspec || die + + # Avoid aruba dependency so that we don't end up in dependency hell. + sed -i -e '/aruba/ s:^:#:' -e '/Aruba/,/}/ s:^:#:' spec/spec_helper.rb || die + rm spec/command_line/order_spec.rb || die +} + +each_ruby_prepare() { + sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die + + case ${RUBY} in + *jruby) + # Avoid tests specific to jruby but without jruby 1.6 support. + sed -e '/JRUBY_VERSION/ s:^:#:' -i spec/rspec/core/filter_manager_spec.rb || die + ;; + esac +} + +all_ruby_compile() { + if use doc ; then + yardoc || die + fi +} + +each_ruby_test() { + PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed." +} diff --git a/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild index ca9e4f379e5b..2286bfc932c9 100644 --- a/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild +++ b/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild @@ -7,16 +7,6 @@ USE_RUBY="ruby19 ruby20 ruby21 jruby" RUBY_FAKEGEM_RECIPE_TEST="rspec" -RUBY_FAKEGEM_TASK_DOC="" -RUBY_FAKEGEM_EXTRADOC="Changelog.md README.# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild,v 1.3 2014/08/13 18:32:48 armin76 Exp $ - -EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21 jruby" - -RUBY_FAKEGEM_RECIPE_TEST="rspec" - RUBY_FAKEGEM_TASK_DOC="" RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md" @@ -55,4 +45,17 @@ all_ruby_prepare() { sed -i \ -e '/git ls/d' \ -e '/add_development_dependency/d' \ - "${RUBY_FAKEGEM_GEMSPEC}" \ No newline at end of file + "${RUBY_FAKEGEM_GEMSPEC}" || die + + # Avoid a weird, and failing, test testing already installed code. + sed -e '/has an up-to-date caller_filter file/,/end/ s:^:#:' -i spec/rspec/expectations_spec.rb || die +} + +each_ruby_prepare() { + case ${RUBY} in + *jruby) + # Avoid a test failing on backtrace details. + sed -e '/when the root file is loaded/,/end/ s:^:#:' -i spec/rspec/expectations_spec.rb || die + ;; + esac +} diff --git a/dev-ruby/ruby-beautify/Manifest b/dev-ruby/ruby-beautify/Manifest index 81226c6344e9..a3c59086d046 100644 --- a/dev-ruby/ruby-beautify/Manifest +++ b/dev-ruby/ruby-beautify/Manifest @@ -1,2 +1 @@ DIST ruby-beautify-0.92.2.gem 15872 SHA256 8f547e6be9612d492ae44ddf937b0049ad520147b9b8dbe0384a312919c2157d SHA512 e654fd6595fcc0a191eb1b7d5b6aa0fee0093723e17da6657dd0418e809e1e6d5c38933b07c18b126dac89dabfc215eff6e8a7e94331941b73b24c63fe1756d8 WHIRLPOOL 01dde532574a19558708c6c53edb12487f609354f9c3e14ffebef03642ea193122f95118150fa3c24f4a15aafec79a95cb36b6766909339de5bc661ad95c21af -DIST ruby-beautify-0.92.2.gem 15872 SHA256 8f547e6be9612d492ae44ddf937b0049ad520147b9b8dbe0384a312919c2157d SHA512 e654fd6595fcc0a191eb1b7d5b6aa0fee0093723e17da6657dd0418e809e1e6d5c38933b07c18b126dac89dabfc215eff6e8a7e94331941b73b24c63fe1756d8 WHIRLPOOL 01dde532574a19558708c6c53edb12487f609354f9c3e14ffebef03642ea193122f95118150fa3c24f4a15aafec79a95cb36b6766909339de5bc661ad95c21af diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.1.2.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.1.2.ebuild index d753af6a8d9d..7d18661f548c 100644 --- a/dev-ruby/ruby-gettext/ruby-gettext-3.1.2.ebuild +++ b/dev-ruby/ruby-gettext/ruby-gettext-3.1.2.ebuild @@ -46,13 +46,18 @@ all_ruby_prepare() { -e 's/helper.gemspec/Gem::Specification.new/' Rakefile || die # Avoid dependency on developer-specific tools. - sed -i -e '/notif# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gettext/ruby-gettext-3.1.2.ebuild,v 1.6 2014/08/25 16:01:34 mrueg Exp $ + sed -i -e '/notify/ s:^:#:' test/run-test.rb || die +} -EAPI=5 +each_ruby_test() { + # Upstream tries to daisy-chain rake calls but they fail badly + # with our setup, so run it manually. + ${RUBY} test/run-test.rb || die "tests failed" +} -USE_RUBY="ruby19 ruby20" +all_ruby_install() { + all_fakegem_install -RUBY_FAKEGEM_NAME="${PN/ruby-/}" -RUBY_FAK \ No newline at end of file + insinto /usr/share/doc/${PF} + doins -r samples +} diff --git a/dev-ruby/ruby-ldap/Manifest b/dev-ruby/ruby-ldap/Manifest index e8ad8c06bc60..eaf240ac84d5 100644 --- a/dev-ruby/ruby-ldap/Manifest +++ b/dev-ruby/ruby-ldap/Manifest @@ -1,4 +1,2 @@ DIST ruby-ldap-0.9.12.gem 71680 SHA256 e1530586f9b528d6dd17a8cea49099c1b21d561f96490941cb6d0c9f42cb9798 SHA512 99aedf75fa8922481049a62616443899df7fce85b1b843a4f82b0fc992860f19bb3dba3836c0851e0a74a7c595fca7a044043400d01a064027147ec902b4c84d WHIRLPOOL a0ce15fceb5d42aed69b09b40eb7b0ab9eecfd3432431796a084b54d1eed720f856d5796bb87c68f5f6631c54519e09413b0bdb38ad304f257bc63b3836613f4 DIST ruby-ldap-0.9.16.gem 65024 SHA256 a068e0b0d52621c2a72583e07211f4795b3cd9496dd6b5cf7a2c8a746018ce21 SHA512 b81a9b24f29a7c40b5d1c020008bfd14666a15c3b407e5495ac7b12e470783d696c8ad25c9a508b9933829695a8ac3fcb52a209fdb4fb7de499308af61a4b832 WHIRLPOOL dea6d8f4c716f3c0408ca2ba11e4fd411916f9afd07a497deb91fe38c2f0440482a893527b8976801a41742da15f3cacc7330c85a26ec1c948e49e0a99a1f432 -DIST ruby-ldap-0.9.12.gem 71680 SHA256 e1530586f9b528d6dd17a8cea49099c1b21d561f96490941cb6d0c9f42cb9798 SHA512 99aedf75fa8922481049a62616443899df7fce85b1b843a4f82b0fc992860f19bb3dba3836c0851e0a74a7c595fca7a044043400d01a064027147ec902b4c84d WHIRLPOOL a0ce15fceb5d42aed69b09b40eb7b0ab9eecfd3432431796a084b54d1eed720f856d5796bb87c68f5f6631c54519e09413b0bdb38ad304f257bc63b3836613f4 -DIST ruby-ldap-0.9.16.gem 65024 SHA256 a068e0b0d52621c2a72583e07211f4795b3cd9496dd6b5cf7a2c8a746018ce21 SHA512 b81a9b24f29a7c40b5d1c020008bfd14666a15c3b407e5495ac7b12e470783d696c8ad25c9a508b9933829695a8ac3fcb52a209fdb4fb7de499308af61a4b832 WHIRLPOOL dea6d8f4c716f3c0408ca2ba11e4fd411916f9afd07a497deb91fe38c2f0440482a893527b8976801a41742da15f3cacc7330c85a26ec1c948e49e0a99a1f432 diff --git a/dev-scheme/gauche-gl/Manifest b/dev-scheme/gauche-gl/Manifest index b02a599dd70a..71ec9c2cd472 100644 --- a/dev-scheme/gauche-gl/Manifest +++ b/dev-scheme/gauche-gl/Manifest @@ -1,2 +1 @@ -DIST Gauche-gl-0.5.1.tgz 1161233 SHA256 7f17f1d31afba83d374f31e49f025149d-----BEGIN PGP SIGNED MESSAGE----- DIST Gauche-gl-0.5.1.tgz 1161233 SHA256 7f17f1d31afba83d374f31e49f025149dcec271b4d56279cd0f871b814176c68 SHA512 7b3834e46e4789f6dcd6a2e01b2d5cfc8fa29aa69c5969e8bb9d9e2af9fe4f82af23a5f13677f27e8ae7ba63855f833dfcdac6f285a0c56041d0eaef48c8a94b WHIRLPOOL ca0751304f2ec30793ca91c2f5e4c08e730621177ca852f263f3f92b4efa1d237fd8df2ce10a03184699dfab78b0274964e5fb2bc08bd8bf8ad8a6d77d8142e6 diff --git a/dev-scheme/gauche-gtk/files/gauche-gtk-gtk-lib.hints.diff b/dev-scheme/gauche-gtk/files/gauche-gtk-gtk-lib.hints.diff index e4a7aa95087e..be54ee550ba7 100644 --- a/dev-scheme/gauche-gtk/files/gauche-gtk-gtk-lib.hints.diff +++ b/dev-scheme/gauche-gtk/files/gauche-gtk-gtk-lib.hints.diff @@ -9,25 +9,6 @@ +(define-cproc-fix gtk-entry-get-text + (fix-arguments! '(entry::)) + (fix-body! -+ "SCM_RETURN(SCM_MAKE_STR_COPYING(gtk_entry_get_text(entry)));")) - - ;;================================================================== - ;; gtkfilesel.h -@@ -539,8 +541,10 @@ SCM_RETURN(Scm_Values2(Scm_MakeInteger(n_properties), h));" - ;; gtk_file_selection_get_filename returns mbstr encoded by the current - ;; locale. We canonicalize it to utf8. The Scheme glue code converts - ;; it to Gauche's internal encoding. --(define-cproc gtk-file-selection-get-filename (sel::) -- "SCM_RETURN(SCM_MAKE_STR_COPYING(gtk_entry_get_text(entry)));") -+(define-cproc-fix gtk-entry-get-text -+ (fix-arguments! '(entry::)) -+ (fix-body! + "SCM_RETURN(SCM_MAKE_STR_COPYING(gtk_entry_get_text(entry)));")) ;;================================================================== @@ -63,4 +44,28 @@ -(define-cproc gtk-label-get-label (label::) - "SCM_RETURN(SCM_MAKE_STR_COPYING(gtk_label_get_label(label)));") +(define-cproc-fix gtk-label-get-text -+ \ No newline at end of file ++ (fix-arguments! '(label::)) ++ (fix-body! ++ "SCM_RETURN(SCM_MAKE_STR_COPYING(gtk_label_get_text(label)));")) ++(define-cproc-fix gtk-label-get-label ++ (fix-arguments! '(label::)) ++ (fix-body! ++ "SCM_RETURN(SCM_MAKE_STR_COPYING(gtk_label_get_label(label)));")) + + (define-cproc-fix gtk-label-get-seleciton-bounds + (fix-arguments! '(label::)) +@@ -1121,9 +1129,11 @@ return SCM_MAKE_STR_COPYING((char*)string);")) + + (input-file "gtkprogressbar.h") + +-(define-cproc gtk-progress-bar-get-text (pbar::) +- "gchar *g = gtk_progress_bar_get_text(pbar); +- SCM_RETURN(SCM_MAKE_STR_COPYING_SAFELY(g));") ++(define-cproc-fix gtk-progress-bar-get-text ++ (fix-arguments! '(pbar::)) ++ (fix-body! ++ "gchar *g = gtk_progress_bar_get_text(pbar); ++ SCM_RETURN(SCM_MAKE_STR_COPYING_SAFELY(g));")) + + ;;================================================================== + ;; gtkradiobutton diff --git a/dev-scheme/scm/scm-5.5.6.ebuild b/dev-scheme/scm/scm-5.5.6.ebuild index f20e53fd24e8..dca494c95e15 100644 --- a/dev-scheme/scm/scm-5.5.6.ebuild +++ b/dev-scheme/scm/scm-5.5.6.ebuild @@ -1,7 +1,5 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsro# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-scheme/scm/scm-5.5.6.ebuild,v 1.6 2012/06/07 20:36:43 zmedico Exp $ EAPI="3" @@ -153,4 +151,11 @@ src_install() { doinfo hobbit.info } -pkg_postins \ No newline at end of file +pkg_postinst() { + [ "${ROOT}" == "/" ] && pkg_config +} + +pkg_config() { + einfo "Regenerating catalog..." + scm -e "(require 'new-catalog)" +} diff --git a/dev-tex/catdvi/Manifest b/dev-tex/catdvi/Manifest index 076312b15fee..4fc493a86a88 100644 --- a/dev-tex/catdvi/Manifest +++ b/dev-tex/catdvi/Manifest @@ -1,2 +1 @@ DIST catdvi-0.14.tar.gz 160661 SHA256 6bface4e8a86f861d8de8ba56483ed2ace69fc0eb12c2c6d0e51e869a46b30a8 SHA512 82ea6130ec702b49ed2d2f08b968ca4d5bee6b16c7973500ceae2d412b209f38a6e63a9e80dd8d2866f190340a7758aa23ee31bed76beb35065016fea109982d WHIRLPOOL 0c4be28f029a38f456e065e52323b44c53f00c761fa3e7b4aea8539d7b9305ca386fc91094c69ea162920ba1caa5096d6d45d9b3cdd04d4cfe808e6c10e6687f -DIST catdvi-0.14.tar.gz 160661 SHA256 6bface4e8a86f861d8de8ba56483ed2ace69fc0eb12c2c6d0e51e869a46b30a8 SHA512 82ea6130ec702b49ed2d2f08b968ca4d5bee6b16c7973500ceae2d412b209f38a6e63a9e80dd8d2866f190340a7758aa23ee31bed76beb35065016fea109982d WHIRLPOOL 0c4be28f029a38f456e065e52323b44c53f00c761fa3e7b4aea8539d7b9305ca386fc91094c69ea162920ba1caa5096d6d45d9b3cdd04d4cfe808e6c10e6687f diff --git a/dev-tex/cpp2latex/cpp2latex-2.3.ebuild b/dev-tex/cpp2latex/cpp2latex-2.3.ebuild index f4446d08130f..fbaab061bb17 100644 --- a/dev-tex/cpp2latex/cpp2latex-2.3.ebuild +++ b/dev-tex/cpp2latex/cpp2latex-2.3.ebuild @@ -6,10 +6,25 @@ DESCRIPTION="A program to convert C++ code to LaTeX source" HOMEPAGE="http://www.arnoldarts.de/drupal/?q=Cpp2LaTeX" -SRC_URI="http://www.arnoldarts# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-tex/cpp2latex/cpp2latex-2.3.ebuild,v 1.7 2007/02/06 16:45:54 nattfodd Exp $ +SRC_URI="http://www.arnoldarts.de/drupal/files/downloads/cpp2latex/${P}.tar.gz" +LICENSE="GPL-2" -# eutils is in portage proper now, no need to inherit +IUSE="" +SLOT="0" +KEYWORDS="x86 ppc amd64 sparc" + +# although it makes sense to have tex installed, it is +# neither a compile or runtime dependency + +src_compile() { + + econf || die + emake || die + +} + +src_install() { + + make install DESTDIR=${D} || die -DESCRIPTION="A program to convert C++ c \ No newline at end of file +} diff --git a/dev-tex/latex2html/latex2html-2008-r1.ebuild b/dev-tex/latex2html/latex2html-2008-r1.ebuild index 395ef1752851..20d0f042f80e 100644 --- a/dev-tex/latex2html/latex2html-2008-r1.ebuild +++ b/dev-tex/latex2html/latex2html-2008-r1.ebuild @@ -52,30 +52,34 @@ src_configure() { --enable-wrapper \ --with-texpath="${EPREFIX}"/usr/share/texmf-site/tex/latex/html \ --without-mktexlsr \ - $(# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-tex/latex2html/latex2html-2008-r1.ebuild,v 1.3 2013/08/27 20:42:14 aballier Exp $ + $(use_enable gif) \ + $(use_enable png) \ + ${myconf} || die "econf failed" +} -EAPI=4 +src_install() { + emake DESTDIR="${D}" install || die "make install failed" -inherit base eutils multilib + dodoc BUGS Changes FAQ LICENSE.orig MANIFEST README* TODO -DESCRIPTION="convertor written in Perl that converts LATEX documents to HTML" -SRC_URI="http://saftsack.fs.uni-bayreuth.de/~latex2ht/current/${P}.tar.gz - http://dev.gentoo.org/~dilfridge/distfiles/${PN}-match-multiline.patch.bz2" -HOMEPAGE="http://www.latex2html.org/" + # make /usr/share/latex2html sticky + keepdir /usr/share/latex2html -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="gif png" + # clean the perl scripts up to remove references to the sandbox + einfo "fixing sandbox references" + # pstoimg isn't built unless gif or png useflags are enabled + { use png || use gif ; } && sed -i -e "s:${T}:/tmp:g" "${ED}/usr/$(get_libdir)/latex2html/pstoimg.pl" + sed -i -e "s:${S}::g" "${ED}/usr/$(get_libdir)/latex2html/latex2html.pl" || die + sed -i -e "s:${T}:/tmp:g" "${ED}/usr/$(get_libdir)/latex2html/cfgcache.pm" || die + sed -i -e "s:${T}:/tmp:g" "${ED}/usr/$(get_libdir)/latex2html/l2hconf.pm" || die +} -DEPEND="app-text/ghostscript-gpl - virtual/latex-base - media-libs/netpbm - dev-lang/perl - gif? ( media-libs/giflib ) - png? ( media-libs/libpng )" -RDEPEND="${DEPEND}" +pkg_postinst() { + einfo "Running ${EROOT}usr/bin/mktexlsr to rebuild ls-R database...." + "${EROOT}"usr/bin/mktexlsr +} -PATCHES=( "${FILESDIR}/${PN}"-{convert-length,perl_name,extract-major-versi \ No newline at end of file +pkg_postrm() { + einfo "Running ${EROOT}usr/bin/mktexlsr to rebuild ls-R database...." + "${EROOT}"usr/bin/mktexlsr +} diff --git a/dev-tex/metapost/metapost-1.212.ebuild b/dev-tex/metapost/metapost-1.212.ebuild index c7ff7e530ee7..49f7c6ac5d1e 100644 --- a/dev-tex/metapost/metapost-1.212.ebuild +++ b/dev-tex/metapost/metapost-1.212.ebuild @@ -19,37 +19,6 @@ RDEPEND="${DEPEND}" S=${WORKDIR}/${P}/source -src_configure() { - econf \ - --enable-cxx-runtime-hack \ - --disable-afm2pl \ - --disable-aleph \ - --disable-bibtex \ - --disable-bibtex8 \ - --disable-cfftot1 \ - --disable-cjkutils \ - --disable-detex \ - # Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-tex/metapost/metapost-1.212.ebuild,v 1.1 2011/01/09 20:15:09 aballier Exp $ - -EAPI=3 - -DESCRIPTION="System for producing graphics" -HOMEPAGE="http://tug.org/metapost.html" -SRC_URI="http://foundry.supelec.fr/gf/download/frsrelease/383/1651/${P}-src.tar.bz2" - -LICENSE="GPL-2 LGPL-3" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -DEPEND="dev-libs/kpathsea - >=app-admin/eselect-mpost-0.3" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${P}/source - src_configure() { econf \ --enable-cxx-runtime-hack \ @@ -105,4 +74,42 @@ src_configure() { --disable-web-progs \ --disable-xdv2pdf \ --disable-xdvipdfmx \ - --disable-xetex \ No newline at end of file + --disable-xetex \ + --with-system-kpathsea \ + --with-system-freetype2 \ + --with-system-gd \ + --with-system-libpng \ + --with-system-teckit \ + --with-system-zlib \ + --with-system-t1lib \ + --disable-shared \ + --disable-largefile \ + --disable-native-texlive-build \ + --without-mf-x-toolkit --without-x +} + +src_compile() { + emake SHELL=/bin/sh || die + cd "${S}/texk/web2c" + emake mpost || die +} + +src_install() { + cd "${S}/texk/web2c" + emake DESTDIR="${D}" \ + SUBDIRS="" \ + bin_PROGRAMS="mpost" \ + nodist_man_MANS="" \ + dist_man_MANS="" \ + install-binPROGRAMS || die + # Rename it + mv "${D}/usr/bin/mpost" "${D}/usr/bin/mpost-${P}" || die "renaming failed" + + cd "${WORKDIR}/${P}" + dodoc README CHANGES || die +} + +pkg_postinst(){ + einfo "Calling eselect mpost update" + eselect mpost update +} diff --git a/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2012.ebuild b/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2012.ebuild index be89e2efceb3..30f996e9f90e 100644 --- a/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2012.ebuild +++ b/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2012.ebuild @@ -4,12 +4,6 @@ EAPI="4" -TEXLIVE_MODULE_CONTENTS="anysize booktabs caption cite cmap crop ctable ec eso-pic euler# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2012.ebuild,v 1.2 2012/10/03 18:22:16 ulm Exp $ - -EAPI="4" - TEXLIVE_MODULE_CONTENTS="anysize booktabs caption cite cmap crop ctable ec eso-pic euler extsizes fancybox fancyref fancyvrb float fontspec fp index jknapltx koma-script l3kernel l3packages l3experimental listings mdwtools memoir metalogo mh microtype ms ntgclass parskip pdfpages powerdot psfrag rcs rotating sansmath section seminar sepnum setspace subfig textcase thumbpdf typehtml underscore url xkeyval collection-latexrecommended " TEXLIVE_MODULE_DOC_CONTENTS="anysize.doc booktabs.doc caption.doc cite.doc cmap.doc crop.doc ctable.doc ec.doc eso-pic.doc euler.doc extsizes.doc fancybox.doc fancyref.doc fancyvrb.doc float.doc fontspec.doc fp.doc index.doc jknapltx.doc l3kernel.doc l3packages.doc l3experimental.doc listings.doc mdwtools.doc memoir.doc metalogo.doc mh.doc microtype.doc ms.doc ntgclass.doc parskip.doc pdfpages.doc powerdot.doc psfrag.doc rcs.doc rotating.doc sansmath.doc section.doc seminar.doc sepnum.doc setspace.doc subfig.doc textcase.doc thumbpdf.doc typehtml.doc underscore.doc url.doc xkeyval.doc " @@ -23,4 +17,15 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 IUSE="" DEPEND=">=dev-texlive/texlive-latex-2012 >=dev-texlive/texlive-latex-2012 ->=de \ No newline at end of file +>=dev-texlive/texlive-latex-2012 +!dev-tex/xkeyval +!dev-tex/memoir +!dev-tex/listings +! +- + #if defined(__hpux) + # define _BOOL_DEFINED + # include diff --git a/dev-util/crow-designer/crow-designer-2.21.0.ebuild b/dev-util/crow-designer/crow-designer-2.21.0.ebuild index c4857e83c1a2..99fab45b7cba 100644 --- a/dev-util/crow-designer/crow-designer-2.21.0.ebuild +++ b/dev-util/crow-designer/crow-designer-2.21.0.ebuild @@ -18,12 +18,23 @@ LANGS="ru" RDEPEND=">=dev-libs/guiloader-2.21 >=dev-libs/guiloader-c++-2.21 dev-cpp/gtkmm:2.4 - >=dev-libs/d# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/crow-designer/crow-designer-2.21.0.ebuild,v 1.4 2012/05/04 17:51:44 jdhore Exp $ + >=dev-libs/dbus-glib-0.86" +DEPEND="${RDEPEND} + dev-libs/boost + virtual/pkgconfig + nls? ( >=sys-devel/gettext-0.18 )" -EAPI="3" +S=${WORKDIR}/crow-${PV} -DESCRIPTION="GTK+ GUI building tool" -HOMEPAGE="http://www.crowdesigner.org" -SRC_URI="http://nothing-personal.googlecode.com/files/crow-${PV}.tar.bz2" +for x in ${LANGS}; do + IUSE="${IUSE} linguas_${x}" +done + +src_configure() { + econf $(use_enable nls) +} + +src_install() { + emake DESTDIR="${D}" install || die "make install failed" + dodoc doc/{authors.txt,news.{en,ru}.txt,readme.{en,ru}.txt,readme.ru.txt} || die +} diff --git a/dev-util/debhelper/debhelper-9.20140613.ebuild b/dev-util/debhelper/debhelper-9.20140613.ebuild index 2af88ab2d52d..b89697451f91 100644 --- a/dev-util/debhelper/debhelper-9.20140613.ebuild +++ b/dev-util/debhelper/debhelper-9.20140613.ebuild @@ -28,23 +28,43 @@ RDEPEND=" " DEPEND="${RDEPEND} ${NLS_DEPEND} - test? ( dev-perl/Test-Pod # Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/debhelper-9.20140613.ebuild,v 1.1 2014/06/14 00:06:46 jer Exp $ + test? ( dev-perl/Test-Pod ) +" -EAPI=5 -inherit eutils toolchain-funcs +S=${WORKDIR}/${PN} -DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules" -HOMEPAGE="http://packages.qa.debian.org/d/debhelper.html http://joeyh.name/code/debhelper/" -SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.gz" +src_compile() { + tc-export CC -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux" -IUSE="test" -DH_LINGUAS=( de es fr ) -IUSE+=" ${DH_LINGUAS[@]/#/linguas_}" + local LANGS="" USE_NLS=no lingua + for lingua in ${DH_LINGUAS[@]}; do + if use linguas_${lingua}; then + LANGS+=" ${lingua}" + USE_NLS=yes + fi + done -NLS_DEPEND=$( - printf "lin \ No newline at end of file + emake USE_NLS="${USE_NLS}" LANGS="${LANGS}" build +} + +src_install() { + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install + dodoc doc/* debian/changelog + docinto examples + dodoc examples/* + local lingua + for manfile in *.1 *.7 ; do + for lingua in ${DH_LINGUAS[@]}; do + case ${manfile} in + *.${lingua}.?) + use linguas_${lingua} \ + && cp ${manfile} "${T}"/${manfile/.${lingua}/} \ + && doman -i18n=${lingua} "${T}"/${manfile/.${lingua}/} + ;; + *) + doman ${manfile} + ;; + esac + done + done +} diff --git a/dev-util/debootstrap/debootstrap-1.0.56.ebuild b/dev-util/debootstrap/debootstrap-1.0.56.ebuild index 4f0ed1c90010..0fc0b35fa49d 100644 --- a/dev-util/debootstrap/debootstrap-1.0.56.ebuild +++ b/dev-util/debootstrap/debootstrap-1.0.56.ebuild @@ -39,5 +39,7 @@ src_install() { pkg_postinst() { if ! has_version ${CATEGORY}/${PN} && ! has_version app-crypt/gnupg; then - elog "To check Release files again# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the \ No newline at end of file + elog "To check Release files against a keyring" + elog " (--keyring=K), please install app-crypt/gnupg." + fi +} diff --git a/dev-util/dejagnu/files/dejagnu-ignore-libwarning.patch b/dev-util/dejagnu/files/dejagnu-ignore-libwarning.patch index c446eea7277b..f4af06e6ff89 100644 --- a/dev-util/dejagnu/files/dejagnu-ignore-libwarning.patch +++ b/dev-util/dejagnu/files/dejagnu-ignore-libwarning.patch @@ -2,18 +2,6 @@ dejagnu/ChangeLog * lib/target.exp (prune_warnings): Correct pic/PIC regexp. Ignore incompatible library warning. -Index: dejagnu/lib/target.exp -=================================================================== -RCS file: /cvs/src/src/dejagnu/lib/target.exp,v -retrieving revision 1.12 -diff -u -p -r1.12 target.exp ---- dejagnu/lib/target.exp 21 Apr 2002 08:47:07 -0000 1.12 -+++ dejagnu/lib/target.exp 9 Jun 2003 07:34:06 -0000 -@@ -279,7 +279,10 @@ proc prune_warnings { text } { - regsub -all "(^|\n)\[^\n\]*: warnidejagnu/ChangeLog - * lib/target.exp (prune_warnings): Correct pic/PIC regexp. - Ignore incompatible library warning. - Index: dejagnu/lib/target.exp =================================================================== RCS file: /cvs/src/src/dejagnu/lib/target.exp,v @@ -24,4 +12,12 @@ diff -u -p -r1.12 target.exp @@ -279,7 +279,10 @@ proc prune_warnings { text } { regsub -all "(^|\n)\[^\n\]*: warning: as it has already been specified\[^\n\]*" $text "" text - # Cygwin cc1 warns a \ No newline at end of file + # Cygwin cc1 warns about -fpic and -fPIC +- regsub -all ".*: warning: -f(pic|PIC) ignored for target .*" $text "" text ++ regsub -all "(^|\n)\[^\n\]*: warning: -f(pic|PIC) ignored for target \[^\n\]*" $text "" text ++ ++ # Ignore linker warning when searching 64bit libraries in /lib. ++ regsub -all "(^|\n)\[^\n\]*: skipping incompatible \[^\n\]* when searching for \[^\n\]*" $text "" text + + # It might be tempting to get carried away and delete blank lines, etc. + # Just delete *exactly* what we're ask to, and that's it. diff --git a/dev-util/ext4_utils/files/Makefile b/dev-util/ext4_utils/files/Makefile index 18e22154b6ca..b2ce05365b80 100644 --- a/dev-util/ext4_utils/files/Makefile +++ b/dev-util/ext4_utils/files/Makefile @@ -88,19 +88,15 @@ make_ext4fs: libext4_utils.a $(make_ext4fs_obj_files) ext2simg: libext4_utils.a $(ext2simg_obj_files) $(CC) $(LDFLAGS) $(ext2simg_obj_files) -o $@ $(libraries) -AR ?= ar -CC ?= gcc -CFLAGS := $(CFLAGS) -I. -Iinclude -DHOST -DANDROID -fPIC -LDFLAGS := $(LDFLAGS) -L. -PREFIX ?= /usr/ -BINDIR ?= $(PREFIX)/bin -INCLUDEDIR ?= $(PREFIX)/include -LIBDIR ?= $(PREFIX)/lib +ext4fixup: libext4_utils.a $(ext4fixup_obj_files) + $(CC) $(LDFLAGS) $(ext4fixup_obj_files) -o $@ $(libraries) -libext4_utils_src_files := make_ext4fs.c \ - ext4fixup.c \ - ext4_utils.c \ - allocate.c \ - contents.c \ - ex \ No newline at end of file +.PHONY: clean install + +clean: + rm -rf *.o *.so $(executables) src/*.o + +install: all + install -d $(DESTDIR)/$(BINDIR) $(DESTDIR)/$(LIBDIR) $(DESTDIR)/$(INCLUDEDIR)/sparse + install mkuserimg.sh $(executables) $(DESTDIR)/$(BINDIR) diff --git a/dev-util/fatrace/Manifest b/dev-util/fatrace/Manifest index 39c617a2402e..6ab16812b83d 100644 --- a/dev-util/fatrace/Manifest +++ b/dev-util/fatrace/Manifest @@ -1,3 +1,2 @@ DIST fatrace-0.4.tar.bz2 18155 SHA256 8abd5d382610e3284f4057dc202f565ff653a5432f3bbc65463be61647e2ef94 SHA512 bd2e31a16f79127294a9599094c41043a612609241653f33fdb8adef17da99a781b5029f6b1af1731b7c939e7ae3c1d2c19f985dde72c9f409e6945d4dc1f7ce WHIRLPOOL c28337e5ca3d14b045704bb23ce386034c5a71559f8ed1a5bb471b4f4202af87088120d7e8e3de76ceae1d860b47179aceead09f277297895753c75ebfc2186e DIST fatrace-0.5.tar.bz2 18310 SHA256 de7e04df5650d84da9b1cecd60b0f1dade50adf7cff57835a8617bc94f2becf0 SHA512 e0357e6e74683f4d6ffaa958a704bca996823406a77b92c36537ff2bb4a47b39dd909186b0f0a5cb46672bf48d0ba64c07288d9a1f7fc83bc3928bce5bf91b2d WHIRLPOOL 0bf8ddf1370e9ab95945ed4a5df5f37c3c81e3cff7f22b05f23a86ec48507dc16541e30f58871f426624877df8afafaec3f925ed010745ef0313647bb7134efc -DIST fatrace-0.4.tar.bz2 18155 SHA256 8abd5d382610e3284f4057dc202f565ff653a5432f3bbc65463be61647e2ef94 SHA512 bd2e31a16f79127294a9599094c41043a612609241653f33fdb8adef17da99a781b5029f6b1af1731b7c939e7ae3c1d2c19f985dde72c9f409e6945d4dc1f7ce WHIRLPOOL c28337e5ca3d14b045704bb23ce386034c5a71559f8ed1a5bb471b4f4202af87088120d7e8e3de76ce \ No newline at end of file diff --git a/dev-util/fhist/fhist-1.16.ebuild b/dev-util/fhist/fhist-1.16.ebuild index 95393a4b1f26..eea49aacd7b0 100644 --- a/dev-util/fhist/fhist-1.16.ebuild +++ b/dev-util/fhist/fhist-1.16.ebuild @@ -21,10 +21,24 @@ MAKEOPTS+=" -j1" src_compile() { econf - emake || d# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/fhist/fhist-1.16.ebuild,v 1.7 2012/10/27 17:18:55 armin76 Exp $ + emake || die "emake failed" +} -DESCRIPTION="File history and comparison tools" -HOMEPAGE="http://fhist.sourceforge.net/fhist.html" -SRC_URI="http://fhist.sourceforge \ No newline at end of file +src_test() { + emake sure || die "src_test failed" +} + +src_install () { + emake \ + RPM_BUILD_ROOT="${D}" \ + NLSDIR="${D}/usr/share/locale" \ + install || die "make install failed" + + dodoc lib/en/*.txt || die + dodoc lib/en/*.ps || die + + # remove duplicate docs etc. + rm -r "${D}"/usr/share/fhist + + dodoc MANIFEST README || die +} diff --git a/dev-util/glade/glade-3.8.4.ebuild b/dev-util/glade/glade-3.8.4.ebuild index cac545ba33ea..06a32469cc3e 100644 --- a/dev-util/glade/glade-3.8.4.ebuild +++ b/dev-util/glade/glade-3.8.4.ebuild @@ -17,21 +17,36 @@ LICENSE="GPL-2+ FDL-1.1+" SLOT="3/11" # subslot = suffix of libgladeui-1.so KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd" IUSE="gnome python" -REQUIRED_USE="python? ( ${PYTHON_REQUIRE# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-3.8.4.ebuild,v 1.12 2014/05/02 08:45:51 pacho Exp $ - -EAPI="5" -GCONF_DEBUG="yes" -GNOME_ORG_MODULE="glade3" -GNOME2_LA_PUNT="yes" -PYTHON_COMPAT=( python2_{6,7} ) - -inherit eutils gnome2 python-single-r1 - -DESCRIPTION="A user interface designer for GTK+ and GNOME" -HOMEPAGE="http://glade.gnome.org/" - -LICENSE="GPL-2+ FDL-1.1+" -SLOT="3/11" # subslot = suffix of libgladeui-1.so -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~amd \ No newline at end of file +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + >=dev-libs/glib-2.8:2 + >=x11-libs/gtk+-2.24:2 + >=dev-libs/libxml2-2.4:2 + gnome? ( + >=gnome-base/libgnomeui-2 + >=gnome-base/libbonoboui-2 ) + python? ( + ${PYTHON_DEPS} + >=dev-python/pygtk-2.10:2 ) +" +DEPEND="${RDEPEND} + dev-util/gtk-doc-am + >=dev-util/intltool-0.35 + virtual/pkgconfig + sys-devel/gettext + app-text/scrollkeeper + >=app-text/gnome-doc-utils-0.9 + app-text/docbook-xml-dtd:4.1.2 +" + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_configure() { + gnome2_src_configure \ + --enable-libtool-lock \ + $(use_enable gnome) \ + $(use_enable python) +} diff --git a/dev-util/hxd/files/hxd-0.70.02-prll-flags.patch b/dev-util/hxd/files/hxd-0.70.02-prll-flags.patch index 008404e5d39f..f08f2eb18063 100644 --- a/dev-util/hxd/files/hxd-0.70.02-prll-flags.patch +++ b/dev-util/hxd/files/hxd-0.70.02-prll-flags.patch @@ -51,5 +51,6 @@ index e3711cd..d5b00cb 100644 install -m 0644 -o root -g root $(MAN_DUMP) $(INSTALLDIR_MAN_DUMP) - install -s -m 0755 -o root -g root $(PRG_UNDUMP) $(INSTALLDIR_BIN_UNDUMP) + install -m 0755 -o root -g root $(PRG_UNDUMP) $(INSTALLDIR_BIN_UNDUMP) - install Makefile.Linux | 23 +++++++++++++++-------- - 1 files changed, 15 inser \ No newline at end of file + install -m 0644 -o root -g root $(MAN_UNDUMP) $(INSTALLDIR_MAN_UNDUMP) + + clean: diff --git a/dev-util/idutils/idutils-4.5.ebuild b/dev-util/idutils/idutils-4.5.ebuild index 3f12e5bd7408..3944f2ce9f45 100644 --- a/dev-util/idutils/idutils-4.5.ebuild +++ b/dev-util/idutils/idutils-4.5.ebuild @@ -34,6 +34,12 @@ src_unpack() { src_compile() { use emacs || export EMACS=no econf \ - $(use# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/idutils/idutils-4.5.ebuild,v 1.1 2012/02/21 08:57:58 robbat \ No newline at end of file + $(use_enable nls) \ + "$(use_with emacs lispdir "${SITELISP}/${PN}")" + emake || die +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc NEWS README* ChangeLog AUTHORS THANKS TODO +} diff --git a/dev-util/include-what-you-use/include-what-you-use-3.3-r1.ebuild b/dev-util/include-what-you-use/include-what-you-use-3.3-r1.ebuild index 04c8b3967459..e85cf07fe3e3 100644 --- a/dev-util/include-what-you-use/include-what-you-use-3.3-r1.ebuild +++ b/dev-util/include-what-you-use/include-what-you-use-3.3-r1.ebuild @@ -20,6 +20,16 @@ DEPEND="${RDEPEND}" S=${WORKDIR}/${PN} -src_p# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/include-what-you-use/include-what-you-use-3.3-r1.ebuild,v 1.2 2013/10/03 06:17:19 s \ No newline at end of file +src_prepare() { + epatch "${FILESDIR}"/${P}-issue-110-elaboration.patch + epatch_user +} + +src_configure() { + append-ldflags -L$(llvm-config --libdir) + + local mycmakeargs=( + -DLLVM_PATH=$(llvm-config --libdir) + ) + cmake-utils_src_configure +} diff --git a/dev-util/itstool/Manifest b/dev-util/itstool/Manifest index 8cf17f49cb40..e97bda2eb23b 100644 --- a/dev-util/itstool/Manifest +++ b/dev-util/itstool/Manifest @@ -1,4 +1,2 @@ DIST itstool-1.2.0.tar.bz2 82479 SHA256 46fed63fb89c72dbfc03097b4477084ff05ad6f171212d8f1f1546ea543978aa SHA512 d738c8d2ba610e723b241a02c3f15fea038df54361abd4b63350887d9a14ce3306e05d7389388f898ec37ef25afc29601810e9fe4ff1f010502a081c13f1a8a6 WHIRLPOOL f241b15f60af8b309278092e6ff7670f00d5f2b0b2f251a733268abdddff2d0ccee702e042e8583f5b112e258a425d0f2a0df912aa32e2f43907e4dd76ef2bc6 DIST itstool-2.0.2.tar.bz2 96748 SHA256 bf909fb59b11a646681a8534d5700fec99be83bb2c57badf8c1844512227033a SHA512 b7915c4d463fe5969e282029c2080730c78e18d2d5878da53c6a370f471056b51a7b3f3c08417b801212ba674f55548a112a12a9d81634f60d1e52a8a47a4aa2 WHIRLPOOL 9e027e9e01cdfd5d4e14b83d2cf85e2c6b9778f5f966de50fe501e56547a4c014b68cc242b33f073756cdf8d217f0171baaff5a8f1b86c47aab1f31437b4773e -DIST itstool-1.2.0.tar.bz2 82479 SHA256 46fed63fb89c72dbfc03097b4477084ff05ad6f171212d8f1f1546ea543978aa SHA512 d738c8d2ba610e723b241a02c3f15fea038df54361abd4b63350887d9a14ce3306e05d7389388f898ec37ef25afc29601810e9fe4ff1f010502a081c13f1a8a6 WHIRLPOOL f241b15f60af8b309278092e6ff7670f00d5f2b0b2f251a733268abdddff2d0ccee702e042e8583f5b112e258a425d0f2a0df912aa32e2f43907e4dd76ef2bc6 -DIST itstool-2.0.2.tar.bz2 96748 SHA256 bf909fb59b11a646681a8534d5700fec99be83bb2c57badf8c1844512227033a SHA512 b7915c4d463fe5969e282029c2080730c78e18d2d5878da53c6a370f471056b51a7b3f3c08417b801212ba674f55548a112a12a9d81634f60d1e52a8a47a4aa2 WHIRLPOOL 9e027e9e01cdfd5d4e14b83d2cf85e2c6b9778f5f966de50fe501 \ No newline at end of file diff --git a/dev-util/kbuild/files/kbuild-glibc-2.10.patch b/dev-util/kbuild/files/kbuild-glibc-2.10.patch index 394579267ec4..a1d17d7d6497 100644 --- a/dev-util/kbuild/files/kbuild-glibc-2.10.patch +++ b/dev-util/kbuild/files/kbuild-glibc-2.10.patch @@ -5,25 +5,6 @@ diff -ruN kBuild-0.1.5-orig/src/ash/output.c kBuild-0.1.5/src/ash/output.c va_end(ap); } -+#if 0 - void - dprintf(const char *fmt, ...) - { -@@ -240,6 +241,7 @@ - va_end(ap); - flushout(out2); - } -+#endif - - void - fmtstr(char *outbuf, size_t length, const char *fmt, ...) -diff -ruN kBuild-0.1.5-orig/src/ash/diff -ruN kBuild-0.1.5-orig/src/ash/output.c kBuild-0.1.5/src/ash/output.c ---- kBuild-0.1.5-orig/src/ash/output.c 2009-04-08 18:21:26.000000000 -0400 -+++ kBuild-0.1.5/src/ash/output.c 2009-05-22 20:11:49.000000000 -0400 -@@ -230,6 +230,7 @@ - va_end(ap); - } - +#if 0 void dprintf(const char *fmt, ...) @@ -38,4 +19,15 @@ diff -ruN kBuild-0.1.5-orig/src/ash/diff -ruN kBuild-0.1.5-orig/src/ash/output.c fmtstr(char *outbuf, size_t length, const char *fmt, ...) diff -ruN kBuild-0.1.5-orig/src/ash/output.h kBuild-0.1.5/src/ash/output.h --- kBuild-0.1.5-orig/src/ash/output.h 2009-04-08 18:21:26.000000000 -0400 -++ \ No newline at end of file ++++ kBuild-0.1.5/src/ash/output.h 2009-05-22 20:12:28.000000000 -0400 +@@ -65,8 +65,10 @@ + __attribute__((__format__(__printf__,2,3))); + void out1fmt(const char *, ...) + __attribute__((__format__(__printf__,1,2))); ++#if 0 + void dprintf(const char *, ...) + __attribute__((__format__(__printf__,1,2))); ++#endif + void fmtstr(char *, size_t, const char *, ...) + __attribute__((__format__(__printf__,3,4))); + void doformat(struct output *, const char *, va_list); diff --git a/dev-util/ketchup/Manifest b/dev-util/ketchup/Manifest index d151733f96f5..5d71dafc337a 100644 --- a/dev-util/ketchup/Manifest +++ b/dev-util/ketchup/Manifest @@ -1,5 +1,3 @@ DIST ketchup-0.9.8.tar.bz2 7678 SHA256 4be84243d03bed168a754c1dde8ef19e6898e67c55cd7aca340f09c138a964f8 SHA512 8f14cf4c6b8b8697da638230960a8fb947af8927218daefb092e1bad5a274cd769ab46d997884e43126394531ede7b81a19d42849db707935d4f3f717dbbc492 WHIRLPOOL e09f411ec90b53b71121d4f6564cdee2665b511a539df8b8148769eb75a60719458bae7073e8a29526772502091f9be30c2383be351ae89593a65ae4b56b9b1a DIST ketchup-1.0.tar.xz 7652 SHA256 9781e2a5e30e48ce73b1464a2ab562ea8d40258d6c81a57a3a3aca1171b8db44 SHA512 44b1ed07e49112f670bf1402d276c1fa92ced89ad39caff5de33cb4dda0549c189ee19d567ce7f299db8c65df85412b3d7bd9d909b9929bd3a5fae3054b49255 WHIRLPOOL dac0c6b19b4a4a7a62d5333f67fd2eb8b3a9f8d26e86aa19ef5fde23983653b61ce0e8d0c4f3fb2a304c8dd0f033045bcd32635780d67c6a3e13768399d1e720 DIST ketchup-1.1_beta3.tar.gz 10142 SHA256 6bc2de9088adbe7379f7b6b0e85afd4d3ae6da987dbd8ad6b677ce4ead68e306 SHA512 3b5a660704ab4f850f2574baa04d87be026beff4c87c5a7b740f320a78b8a76b8df3705d6e5491aa0e86f933e2542e9211a567a8a8002f3e1c42698070da712c WHIRLPOOL ceb4de15df4a24a9b1dcf1cd6ba8a30c8b4abf8ea9729c023279b8e9209b9c38fae1db5039d2e180b3c1596256592a3156f5265faed15444beaa93505af1e2f1 -MISC ChangeLog 4385 SHA256 493952efdbdc48b06b9b21b31526ded188b6f814c6f3b9240964c0c53c4c3abe SHA512 7dd56b9081c75df939c2370e3b80210a0a34b721c4ff037b5c6618454532f3393ff8e8DIST ketchup-0.9.8.tar.bz2 7678 SHA256 4be84243d03bed168a754c1dde8ef19e6898e67c55cd7aca340f09c138a964f8 SHA512 8f14cf4c6b8b8697da638230960a8fb947af8927218daefb092e1bad5a274cd769ab46d997884e43126394531ede7b81a19d42849db707935d4f3f717dbbc492 WHIRLPOOL e09f411ec90b53b71121d4f6564cdee2665b511a539df8b8148769eb75a60719458bae7073e8a29526772502091f9be30c2383be351ae89593a65ae4b56b9b1a -DIST ketchup-1.0.tar.xz 7652 SHA256 9781e2a5e30e48ce73b1464a2ab562ea8d40258d6c81a57a3a3aca1171b8db44 SHA512 44b1ed07e49112f670bf1402d276c1fa92ced89ad39caff5de33cb4dda0549c189ee19d567ce7f29 \ No newline at end of file diff --git a/dev-util/kscope/files/kscope-1.9.4-actions.patch b/dev-util/kscope/files/kscope-1.9.4-actions.patch index 69a9eb8746bb..d333efb0ab09 100644 --- a/dev-util/kscope/files/kscope-1.9.4-actions.patch +++ b/dev-util/kscope/files/kscope-1.9.4-actions.patch @@ -80,10 +80,11 @@ // Show local tags. action = new QAction(tr("Local &Tags"), this); -@@ -348,6--- trunk/app/actions.cpp 2009/08/26 13:17:03 203 -+++ trunk/app/actions.cpp 2009/09/07 19:58:30 204 -@@ -264,69 +264,58 @@ - QActionGroup* queryGroup = new QActionGroup(this); - connect(queryGroup, SIGNAL(triggered(QAction*)), this, - SLOT(query(QAction*))); -+ connect(P \ No newline at end of file +@@ -348,6 +337,7 @@ + action->setStatusTip(tr("Create a call tree")); + connect(action, SIGNAL(triggered()), mainWnd(), SLOT(promptCallTree())); + menu->addAction(action); ++ projectGroup->addAction(action); + + // Settings menu. + menu = mainWnd()->menuBar()->addMenu(tr("&Settings")); diff --git a/dev-util/ltrace/ltrace-0.7.2.ebuild b/dev-util/ltrace/ltrace-0.7.2.ebuild index 55753aad941a..859efb238fd1 100644 --- a/dev-util/ltrace/ltrace-0.7.2.ebuild +++ b/dev-util/ltrace/ltrace-0.7.2.ebuild @@ -24,12 +24,15 @@ DEPEND="${RDEPEND} test? ( dev-util/dejagnu )" src_prepare() { - sed -i '/^dist_doc_DATA/d' Makef# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/ltrace/ltrace-0.7.2.ebuild,v 1.5 2014/08/27 12:39:46 ago Exp $ - -EAPI=5 - -inherit eutils autotools - -N \ No newline at end of file + sed -i '/^dist_doc_DATA/d' Makefile.am || die + eautoreconf +} + +src_configure() { + ac_cv_header_selinux_selinux_h=$(usex selinux) \ + ac_cv_lib_selinux_security_get_boolean_active=$(usex selinux) \ + econf \ + --disable-werror \ + $(use_enable debug) \ + $(use_with unwind libunwind) +} diff --git a/dev-util/mingw-runtime/mingw-runtime-3.20.ebuild b/dev-util/mingw-runtime/mingw-runtime-3.20.ebuild index 73e737aeeb5a..ede6c900d60e 100644 --- a/dev-util/mingw-runtime/mingw-runtime-3.20.ebuild +++ b/dev-util/mingw-runtime/mingw-runtime-3.20.ebuild @@ -64,13 +64,14 @@ src_install() { doins -r include/* || die else local insdir - is_# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/mingw-runtime/mingw-runtime-3.20.ebuild,v 1.5 2013/05/10 09:38:39 patrick Exp $ - -EAPI="4" - -export CBUILD=${CBUILD:-${CHOST}} -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY/cr \ No newline at end of file + is_crosscompile \ + && insdir="${D}/usr/${CTARGET}" \ + || insdir="${D}" + emake install DESTDIR="${insdir}" || die + env -uRESTRICT CHOST=${CTARGET} prepallstrip + rm -rf "${insdir}"/usr/doc + docinto ${CTARGET} # Avoid collisions with other cross-compilers. + dodoc CONTRIBUTORS ChangeLog README TODO readme.txt + fi + is_crosscompile && dosym usr /usr/${CTARGET}/mingw +} diff --git a/dev-util/monodevelop/files/monodevelop-3.0.2-pc-fix.patch b/dev-util/monodevelop/files/monodevelop-3.0.2-pc-fix.patch index c538cb53c602..6d55329d880b 100644 --- a/dev-util/monodevelop/files/monodevelop-3.0.2-pc-fix.patch +++ b/dev-util/monodevelop/files/monodevelop-3.0.2-pc-fix.patch @@ -5,4 +5,4 @@ Description: MonoDevelop Core Add-ins Version: @VERSION@ -Libs: -r:${libdir}/AddIns/VersionControl/MonoDevelop.VersionControl.dll -r:${libdir}/AddIns/NUnit/MonoDevelop.NUnit.dll -r:${libdir}/AddIns/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.dll -r:${libdir}/AddIns/MonoDevelop.AspNet/MonoDevelop.AspNet.dll -r:${libdir}/AddIns/DisplayBindings/Gettext/MonoDevelop.Gettext.dll -r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.dll -r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.Linux.dll -r:${libdir}/AddIns/MonoDevelop.GtkCore/MonoDevelop.GtkCore.dll -r:${libdir}/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.VBNetBinding.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.CBinding.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.CSharpBinding.dll -r:${libdir}/AddIns/MonoDevelop.Autotools/MonoDevelop.Autotools.dll -r:${libdir}/AddIns/DisplayBindings/SourceEditor/MonoDevelop.SourceEditor2.dll -r:${libdir}/AddIns/MonoDevelop.Debugger/MonoDevelop.Debugger.dll -r:${libdir}/AddIns/MonoDevelop.Refactoring/MonoDevelop.Refactoring.dll -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft.dll -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.dll -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/Mono.Debugger.Soft.dll -+Libs: -r:${libdir}/AddIns/VersionControl/MonoDevelop.VersionControl.dll -r:${libdir}/AddIns/NUnit/MonoDevelop.NUnit.dll -r:${libdir}/AddIns/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.dll -r:${libdir}/AddIns/MonoDevelop.AspNet/MonoDevelop.AspNet.dll -r:${libdir}/AddIns/MonoDevelop.Gettext/MonoDevelop.Gettext.dll -r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.dll -r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.Linux.dll -r:${libdir}/AddIns/MonoDevelop.GtkCore/MonoDevelop.GtkCore.dll -r:${libdir}/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.VBNetBinding.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.CBinding.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.CSharpBinding.dll -r:${libdir}/AddIns/MonoDevelop.Autotools/MonoDevelop.Autotools.dll -r:${libdir}/AddIns/MonoDevelop.SourceEditor2.dll -r:${libdir}/AddIns/MonoDevelop.Debugger/MonoDevelop.Debugger.dll -r:${libdir}/AddIns/MonoDevelop.Refactoring/MonoDevelop.Refactoring.dll -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft.dll -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.dll -r:${libdir}/AddI--- monodevelop-3.0.2/monodevelop-core-addins.pc.in \ No newline at end of file ++Libs: -r:${libdir}/AddIns/VersionControl/MonoDevelop.VersionControl.dll -r:${libdir}/AddIns/NUnit/MonoDevelop.NUnit.dll -r:${libdir}/AddIns/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.dll -r:${libdir}/AddIns/MonoDevelop.AspNet/MonoDevelop.AspNet.dll -r:${libdir}/AddIns/MonoDevelop.Gettext/MonoDevelop.Gettext.dll -r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.dll -r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.Linux.dll -r:${libdir}/AddIns/MonoDevelop.GtkCore/MonoDevelop.GtkCore.dll -r:${libdir}/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.VBNetBinding.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.CBinding.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.CSharpBinding.dll -r:${libdir}/AddIns/MonoDevelop.Autotools/MonoDevelop.Autotools.dll -r:${libdir}/AddIns/MonoDevelop.SourceEditor2.dll -r:${libdir}/AddIns/MonoDevelop.Debugger/MonoDevelop.Debugger.dll -r:${libdir}/AddIns/MonoDevelop.Refactoring/MonoDevelop.Refactoring.dll -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft.dll -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.dll -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/Mono.Debugger.Soft.dll diff --git a/dev-vcs/cvs/files/cvs-1.12.12-cvs-gnulib-vasnprintf.patch b/dev-vcs/cvs/files/cvs-1.12.12-cvs-gnulib-vasnprintf.patch index ead48a4ef509..d7d6e6bb8a65 100644 --- a/dev-vcs/cvs/files/cvs-1.12.12-cvs-gnulib-vasnprintf.patch +++ b/dev-vcs/cvs/files/cvs-1.12.12-cvs-gnulib-vasnprintf.patch @@ -23,13 +23,12 @@ index f563823..5d818aa 100644 + ones - we know that snprintf's returns value conforms to + ISO C 99: the gl_SNPRINTF_DIRECTIVE_N test passes. + Therefore we can avoid using %n in this situation. -+ On glibc2 systems fromhttp://bugs.gentoo.org/213833 - -commit 913c09becd9df89dbd9b9f386e7f35c240d5efe8 -Author: Bruno Haible -Date: Fri Oct 19 01:50:42 2007 +0200 - - Don't use %n on glibc >= 2.3 systems. - -diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c -in \ No newline at end of file ++ On glibc2 systems from 2004-10-18 or newer, the use of %n ++ in format strings in writable memory may crash the program ++ (if compiled with _FORTIFY_SOURCE=2), so we should avoid it ++ in this situation. */ ++ p[1] = '\0'; ++# endif + #else + p[1] = '\0'; + #endif diff --git a/dev-vcs/cvsps/cvsps-2.2_beta1.ebuild b/dev-vcs/cvsps/cvsps-2.2_beta1.ebuild index 684abaaa4c54..59ccd28a2de8 100644 --- a/dev-vcs/cvsps/cvsps-2.2_beta1.ebuild +++ b/dev-vcs/cvsps/cvsps-2.2_beta1.ebuild @@ -21,13 +21,18 @@ DEPEND="${RDEPEND}" S="${WORKDIR}/${MY_P}" -src_pre# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvsps/cvsps-2.2_beta1.ebuild,v 1.3 2014/09/03 17:20:45 ottxor Exp $ - -EAPI="4" - -inherit eutils toolchain-funcs - -MY_P="${P/_beta/b}" -DESCRIPTION="Generates patchse \ No newline at end of file +src_prepare() { + epatch "${FILESDIR}"/${PN}-2.1-build.patch + epatch "${FILESDIR}"/${P}-solaris.patch + # no configure around + if [[ ${CHOST} == *-solaris* ]] ; then + sed -i -e '/^LDLIBS+=/s/$/ -lsocket/' Makefile || die + fi + tc-export CC +} + +src_install() { + dobin cvsps || die + doman cvsps.1 + dodoc README CHANGELOG +} diff --git a/dev-vcs/cvsq/Manifest b/dev-vcs/cvsq/Manifest index 3f05704dd3ee..7dfc5455caaf 100644 --- a/dev-vcs/cvsq/Manifest +++ b/dev-vcs/cvsq/Manifest @@ -1,3 +1,2 @@ DIST cvsq-0.4.3.tar.gz 3687 SHA256 f1b0372cd778bea6b31fc78657447a3aadfb4f4beca043c37ca2db8cf0b99b91 SHA512 b0977da580e879332c3683fdf26a3fd17795516da62198cb4d6489499c3d77917ae6a60a397a402bb0016bcb6421ccb267f1dad1b2834ff06dd094cc606c163f WHIRLPOOL b6491e73d1e935803d07d8d02d43d3d48431c9d398c8216f277b51858bb5be971ea9d33d2466215c0d27352380d3b2c7bc2976245704239804b5293db513408e DIST cvsq-0.4.4.tar.gz 3717 SHA256 9759fa87c4f81db187989ffa6ef2d9f610a2cc8fc74b2466849ca0b069c72eae SHA512 137f09f42f5213853b327f23c3d23914116851b2d8d7f17752257f6ab0b2f62e4526f95b7d005fbf49746ea17591fbb38cfc58ccbe55a976b36339df13e44f8f WHIRLPOOL b53286475eccc0e327cd937f6aaf09ead73145585f5cb0a6dd6ba76115b60119fcfab02ef03cfb64d07e46b15e2d2b17cb66d2787a96b23d3c4e9c81844c91ad -DIST cvsq-0.4.3.tar.gz 3687 SHA256 f1b0372cd778bea6b31fc78657447a3aadfb4f4beca043c37ca2db8cf0b99b91 SHA512 b0977da580e879332c3683fdf26a3fd17795516da62198cb4d6489499c3d77917ae6a60a397a402bb0016bcb \ No newline at end of file diff --git a/dev-vcs/darcs/files/darcs-2.8.4-issue2364-part-2.patch b/dev-vcs/darcs/files/darcs-2.8.4-issue2364-part-2.patch index 88211629a229..6164a4a00074 100644 --- a/dev-vcs/darcs/files/darcs-2.8.4-issue2364-part-2.patch +++ b/dev-vcs/darcs/files/darcs-2.8.4-issue2364-part-2.patch @@ -29,21 +29,24 @@ Tue May 13 22:07:19 FET 2014 Sergei Trofimovich As a side-effect building darcs with -O0 produced seemingly working darcs. Reported-by: Ivan Miljenovic -diff -rN -u old-darcs.net/src/Darcs/Util/GlTue May 13 22:07:19 FET 2014 Sergei Trofimovich - * resolve issue2364: don't break list of 'bad sources' - - This time the bug manifested on a simple operation: - $ darcs record -a -m "something" - - Attempt to write a patch resulted in something like: - Failed to record patch 'hello' - - HINT: I could not reach the following repositories: - http://repetae.net/repos/jhc - /home/st/.darcs/cache - /home/st/.cache/darcs - /home/st/dev/darcs/jhc - If you're not using them, you should probably delete - - The sequence should be the following: - 1. store patch t \ No newline at end of file +diff -rN -u old-darcs.net/src/Darcs/Util/Global.hs new-darcs.net/src/Darcs/Util/Global.hs +--- old-darcs.net/src/Darcs/Global.hs 2014-05-13 22:23:29.897329750 +0300 ++++ new-darcs.net/src/Darcs/Global.hs 2014-05-13 22:23:29.979329754 +0300 +@@ -135,7 +135,7 @@ + + _badSourcesList :: IORef [String] + _badSourcesList = unsafePerformIO $ newIORef [] +-{- NOINLINE _badSourcesList -} ++{-# NOINLINE _badSourcesList #-} + + + addBadSource :: String -> IO () +@@ -154,7 +154,7 @@ + + _reachableSourcesList :: IORef [String] + _reachableSourcesList = unsafePerformIO $ newIORef [] +-{- NOINLINE _reachableSourcesList -} ++{-# NOINLINE _reachableSourcesList #-} + + + addReachableSource :: String -> IO () diff --git a/dev-vcs/git-cola/git-cola-1.8.2.ebuild b/dev-vcs/git-cola/git-cola-1.8.2.ebuild index e95b919ccb66..43d8af4a1b36 100644 --- a/dev-vcs/git-cola/git-cola-1.8.2.ebuild +++ b/dev-vcs/git-cola/git-cola-1.8.2.ebuild @@ -84,10 +84,7 @@ python_test() { } pkg_postinst() { - elog# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/git-cola-1.8.2.ebuild,v 1.6 2013/06/25 15:03:45 ago Exp $ - -EAPI=5 - -PYTHON_COMPAT=( pyth \ No newline at end of file + elog "Please make sure you have either a SSH key management installed and activated or" + elog "installed a SSH askpass app like net-misc/x11-ssh-askpass." + elog "Otherwise ${PN} may hang when pushing/pulling from remote git repositories via SSH. " +} diff --git a/dev-vcs/git-crypt/Manifest b/dev-vcs/git-crypt/Manifest index d3dfed3f1f69..e6b172547f63 100644 --- a/dev-vcs/git-crypt/Manifest +++ b/dev-vcs/git-crypt/Manifest @@ -1,2 +1 @@ DIST git-crypt-0.3.tar.gz 20660 SHA256 6b2a03d28240c06ce4c06c3fc73ecd88f61b638e42f8534a9f2d1dbd17132755 SHA512 526630e58a2e74bffe954bc2f489311fb2261337092a1c4462788d9412b7fa7b1aa744402558bba39fe776cfa6333700c4e0ad651d262a7ca14d920485192adc WHIRLPOOL 80a2c9129a0c6bba05418469163a6c32242e84fff1bef4179cf8b60b2bea3f01c6921fa97459e23c3bd08223cfe18f6cf1363f01b5244f0f94689d55954cfa90 -MISC metadata.xml 233 SHA256 65209e280ca6de32a92e1a57301ff69fb3472e55ba07848d6f80405d35e92d47 SHA512 0d30bfb39315a04767e07896409f5d3954f8e954e20fcbac7b92bb9a636c9f61c50b1b2cf55e6c1db9a199a0edc159b5c8cc8f541efb9c4adafa28e3652cff7b WHIRLPOOL 027c5101e1cbc665c9d2DIST git-crypt-0.3.tar.gz 20660 SHA256 6b2a03d28240c06ce4c06c3fc73ecd88f61b638e42f8534a9f2d1dbd17132755 SHA51 \ No newline at end of file diff --git a/dev-vcs/gitinspector/Manifest b/dev-vcs/gitinspector/Manifest index 15a42f70abbc..44d4ed0eea3b 100644 --- a/dev-vcs/gitinspector/Manifest +++ b/dev-vcs/gitinspector/Manifest @@ -1,4 +1,2 @@ DIST gitinspector_0.3.1.zip 235252 SHA256 0081f142e507ff49cb4f5ca1119eb11f66655af1bfb327aa4670c31245e608d0 SHA512 f7ba3b4ebededc8ff80e440de26c3e858c4e413dd02c516aa442c05ef27875e0eb78e6430018717890aa390ef5a1011a33da28e0748a07c59830df6ffeb35c63 WHIRLPOOL 95d80614a5f2c38c9c01e5958f778eb72935f81e3aa44bd831332047f633625587f75f598112c005b0709c7b209a732286c1da578c07c74c22066c65d31d2964 DIST gitinspector_0.3.2.zip 254971 SHA256 3778e60514f5067f8f2628da5cacbce12db99af6517fcf448afb2964bce963a7 SHA512 2a6a48f2b1b7f7add11be034addca727845aa50860286ea50a4fff0a84b14f840c2776dd679b8c2f11d528b93712c7384aa318ffb08bb01f69faf436b6bcaa5a WHIRLPOOL df6f808ea3bd1b04bcf99416d2f5abb3b6241c6212d22676058ed73e9406c39a517881c01c3f73f26e880b648de131422134a1112f7dfd81ebc30837eb0166b7 -DIST gitinspector_0.3.1.zip 235252 SHA256 0081f142e507ff49cb4f5ca1119eb11f66655af1bfb327aa4670c31245e608d0 SHA512 f7ba3b4ebededc8ff80e440de26c3e858c4e413dd02c516aa442c05ef27875e0eb78e6430018717890aa390ef5a1011a33da28e0748a07c59830df6ffeb35c63 WHIRLPOOL 95d80614a5f2c38c9c01e5958f778eb72935f81e3aa44bd831332047f633625587f75f598112c005b0709c7b209a732286c1da578c07c74c22066c65d31d2964 -DIST gitinspector_0.3.2.zip 254971 SHA256 3778e60514f5067f8f2628da5cacbce12db99af6517fcf448afb2964bce963a7 SHA512 2a6a48f2b1b7f7add11be034addca727845aa50860286ea50a4fff0a84b14f840c2776dd679b8c2f11d528b93712c7384aa318ffb08bb01f69faf436b6bcaa5a WHIRLPOOL df6f808ea3bd1b04bcf99416d2f5abb3b6241c6212d22676058ed73e9406c39a517881c01c3f73f26e880b648de131422134a1112f7dfd81ebc30837eb0166b7 diff --git a/dev-vcs/gitolite/gitolite-3.5.3.1.ebuild b/dev-vcs/gitolite/gitolite-3.5.3.1.ebuild index d04dd4f5a1b5..d1ba46b74417 100644 --- a/dev-vcs/gitolite/gitolite-3.5.3.1.ebuild +++ b/dev-vcs/gitolite/gitolite-3.5.3.1.ebuild @@ -6,15 +6,6 @@ EAPI=5 inherit perl-module user versionator -DESCRIPTION="Highly flexible server for git directory version tracker" -HOMEPAGE="http://github.com/s# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/gitolite-3.5.3.1.ebuild,v 1.4 2014/01/19 16:48:26 idl0r Exp $ - -EAPI=5 - -inherit perl-module user versionator - DESCRIPTION="Highly flexible server for git directory version tracker" HOMEPAGE="http://github.com/sitaramc/gitolite" SRC_URI="https://github.com/sitaramc/gitolite/archive/v${PV}.tar.gz -> ${P}.tar.gz" @@ -78,4 +69,14 @@ src_install() { pkg_postinst() { if [ "$(get_major_version $REPLACING_VERSIONS)" = "2" ]; then - \ No newline at end of file + ewarn + elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!" + elog "Please read http://sitaramc.github.com/gitolite/install.html#migr first!" + fi + + # bug 352291 + ewarn + elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)." + elog "Especially if you're migrating from gitosis." + ewarn +} diff --git a/games-action/cs2d/cs2d-0123.ebuild b/games-action/cs2d/cs2d-0123.ebuild index 88637f39c091..231799ad19b8 100644 --- a/games-action/cs2d/cs2d-0123.ebuild +++ b/games-action/cs2d/cs2d-0123.ebuild @@ -6,17 +6,6 @@ EAPI=5 inherit eutils games -DESCRIPTION="Counter-Strike 2D is freeware clone of Counter-Strike with some added features in gameplay" -HOMEPAGE="http://www.cs2d.com/" -SRC_URI="http://dev.gentoo.org/~maksbotan/cs2d/cs2d_${PV}_linux.zip - http://dev.gentoo.org/~maksbotan/cs2d/cs2d_# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/cs2d/cs2d-0123.ebuild,v 1.4 2014/08/10 21:21:50 slyfox Exp $ - -EAPI=5 - -inherit eutils games - DESCRIPTION="Counter-Strike 2D is freeware clone of Counter-Strike with some added features in gameplay" HOMEPAGE="http://www.cs2d.com/" SRC_URI="http://dev.gentoo.org/~maksbotan/cs2d/cs2d_${PV}_linux.zip @@ -75,4 +64,18 @@ src_install() { # avoid file collision with untracked file rm -f "${ED%/}/${GAMES_PREFIX_OPT}"/${PN}/sys/core/started.cfg - make_desktop_entry CounterStrike2D "Cou \ No newline at end of file + make_desktop_entry CounterStrike2D "Counter Strike 2D" + make_desktop_entry "CounterStrike2D -fullscreen -24bit" "Counter Strike 2D - FULLSCREEN" + games_make_wrapper CounterStrike2D ./CounterStrike2D \ + "${GAMES_PREFIX_OPT}"/${PN} "${GAMES_PREFIX_OPT}"/${PN} + + doicon "${DISTDIR}"/${PN}.png + + prepgamesdirs + + # fixing permissions + fperms -R g+w "${GAMES_PREFIX_OPT}"/${PN}/maps + fperms -R g+w "${GAMES_PREFIX_OPT}"/${PN}/screens + fperms -R g+w "${GAMES_PREFIX_OPT}"/${PN}/sys + fperms ug+x "${GAMES_PREFIX_OPT}"/${PN}/CounterStrike2D +} diff --git a/games-action/descent3-demo/Manifest b/games-action/descent3-demo/Manifest index 6cccf8989888..ec5774ba32d3 100644 --- a/games-action/descent3-demo/Manifest +++ b/games-action/descent3-demo/Manifest @@ -1,2 +1 @@ DIST descent3-demo.run 45118289 SHA256 9304dff200a062bb5bd1fa69517b5cc6c19db0a63c06b2084f05c98c9eca786c SHA512 8f5e790257d0477e4238aae8fb5b4b1f21e23f188775cb53a5197baf0c174017d821e3a8dd696f9c0fd27838e08cff4bde0d6f5a9dca87a7e8af29cdc627d29c WHIRLPOOL 42d4aabadf185fe88e9e2dff91595a8895a2f51e212e7efbdcaccb9b55d380c10a3fbb0e4c5c2814d3017e0d90ba46c70a2d770bc7a8cbe25b6fc210a0a4204c -DIST descent3-demo.run 45118289 SHA256 9304dff200a062bb5bd1fa69517b5cc6c19db0a63c06b2084f05c98c9eca786c SHA512 8f5e790257d0477e4238aae8fb5b4b1f21e23f188775cb53a5197baf0c174017d821e3a8dd696f9c0fd27838e08cff4bde0d6f5a9dca87a7e8af29cdc627d29c WHIRLPOOL 42d4aabadf185fe88e9e2dff91595a8895a2f51e212e7efbdcaccb9b55d380c10a3fbb0e4c5c2814d3017e0d90ba46c70a2d770bc7a8cbe25b6fc210a0a4204c diff --git a/games-action/hotline-miami/hotline-miami-1.0.9a_p20140221.ebuild b/games-action/hotline-miami/hotline-miami-1.0.9a_p20140221.ebuild index 7eb32f844321..4a42a47ff114 100644 --- a/games-action/hotline-miami/hotline-miami-1.0.9a_p20140221.ebuild +++ b/games-action/hotline-miami/hotline-miami-1.0.9a_p20140221.ebuild @@ -13,24 +13,6 @@ DESCRIPTION="High-octane action game overflowing with raw brutality" HOMEPAGE="http://www.devolverdigital.com/games/view/hotline-miami" SRC_URI="HotlineMiami_linux_1392944501.tar.gz" -LICENSE="all-rights-reserved" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="bundl# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/hotline-miami/hotline-miami-1.0.9a_p20140221.ebuild,v 1.3 2014/06/25 13:03:31 mgorny Exp $ - -# TODO: unbundle Qt5 -# remove emul-linux-x86* deps (bug 484060) - -EAPI=5 - -inherit eutils games - -DESCRIPTION="High-octane action game overflowing with raw brutality" -HOMEPAGE="http://www.devolverdigital.com/games/view/hotline-miami" -SRC_URI="HotlineMiami_linux_1392944501.tar.gz" - LICENSE="all-rights-reserved" SLOT="0" KEYWORDS="~amd64 ~x86" @@ -93,4 +75,28 @@ S=${WORKDIR} pkg_nofetch() { einfo "Please buy & download ${SRC_URI} from:" - einfo " https://www.humblebundle.co \ No newline at end of file + einfo " https://www.humblebundle.com/store" + einfo "and move it to ${DISTDIR}" +} + +src_install() { + insinto "${MYGAMEDIR}" + doins HotlineMiami_GL.wad *.ogg + + exeinto "${MYGAMEDIR}" + doexe Hotline + use launcher && doexe hotline_launcher + + exeinto "${MYGAMEDIR}/lib" + use launcher && doexe lib/libQt5* + use bundled-libs && doexe libCg* libopenal* + + games_make_wrapper ${PN} "./Hotline" "${MYGAMEDIR}" "${MYGAMEDIR}/lib" + make_desktop_entry ${PN} + if use launcher ; then + games_make_wrapper ${PN}-launcher "./hotline_launcher" "${MYGAMEDIR}" "${MYGAMEDIR}/lib" + make_desktop_entry ${PN}-launcher "${PN} (launcher)" + fi + + prepgamesdirs +} diff --git a/games-action/intrusion2/Manifest b/games-action/intrusion2/Manifest index bd646695fb34..745607a50499 100644 --- a/games-action/intrusion2/Manifest +++ b/games-action/intrusion2/Manifest @@ -1,2 +1 @@ DIST intrusion2-1370288626-bin 88713512 SHA256 03fd442816119c5c9e10112b5ac13ae43af3853f0a879dc8ec6f693541ad4841 SHA512 ce3fc5c9dc388cd777e978c54b6696d102870f8111122e646637e12cb336767c60ffa8864ffa634012868f2b9ca231598e89438f226ca4465d8c4e936d492b06 WHIRLPOOL bb75c60b07eb91bf8c0f3f47fb2d91403ea8b8376ed88c53e9cf57ca8c829f55a574e7355572cd4ace6ddcf3f0aae10a73f2d5f021c94893bde5b4fcc9c4243e -DIST intrusion2-1370288626-bin 88713512 SHA256 03fd442816119c5c9e10112b5ac13ae43af3853f0a879dc8ec6f693541ad4841 SHA512 ce3fc5c9dc388cd777e978c54b6696d102870f8111122e646637e12cb336767c60ffa8864ffa634012868f2b9ca231598e89438f226ca4465d8c4e936d492b06 WHIRLPOOL bb75c60b07eb91bf8c0f3f47fb2d91403ea8b8376ed88c53e9cf57ca8c829f55a574e7355572cd4ace6ddcf3f0aae10a73f2d5f021c94893bde5b4fcc9c4243e diff --git a/games-action/spacearyarya-kxl/Manifest b/games-action/spacearyarya-kxl/Manifest index c35a91ff56e0..741e3ef9a2f3 100644 --- a/games-action/spacearyarya-kxl/Manifest +++ b/games-action/spacearyarya-kxl/Manifest @@ -1,2 +1 @@ DIST SpaceAryarya-KXL-1.0.2.tar.gz 279894 SHA256 54cdcbd299fc5cc618ed88d7729db1a64dd48edefbfe569d5352289a9f11ce63 SHA512 1109606741bab6c290395cdfd8d19cf12e68cfef41f50164586c316fc425a32232e0f8dd822207d969c27c3f7a8478d1a65f36fe5468f3cfa8932c99ab3cb125 WHIRLPOOL d26f387bb70610cfe84b9c45d464035b4e6c9b30d9d26690484e90b1dfd68f24397203bf16f3a10940547d45f8ec3eea139ded584c1fffd8dde6aaec448011d4 -DIST SpaceAryarya-KXL-1.0.2.tar.gz 279894 SHA256 54cdcbd299fc5cc618ed88d7729db1a64dd48edefbfe569d5352289a9f11ce63 SHA512 1109606741bab6c290395cdfd8d19cf12e68cfef41f50164586c316fc425a32232e0f8dd822207d969c27c3f7a8478d1a65f36fe5468f3cfa8932c99ab3cb125 WHIRLPOOL d26f387bb70610cfe84b9c45d464035b4e6c9b30d9d26690484e90b1dfd68f24397203bf16f3a10940547d45f8ec3eea139ded584c1fffd8dde6aaec448011d4 diff --git a/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-gentoo-paths.patch b/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-gentoo-paths.patch index 1b607eacb04e..197dae5e926f 100644 --- a/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-gentoo-paths.patch +++ b/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-gentoo-paths.patch @@ -18,30 +18,6 @@ + DATA_PATH=$datadir/SpaceAryarya/data + BMP_PATH=$datadir/SpaceAryarya/bmp + WAV_PATH=$datadir/SpaceAryarya/wav -+ SCORE_PATH=$localstatedir/SpaceAryarya - fi - AC_DEFINE_UNQUOTED(DATA_PATH,"$DATA_PATH") - AC_DEFINE_UNQUOTED(BMP_PATH,"$BMP_PATH") - AC_DEFINE_UNQUOTED(WAV_PAT--- bmp/Makefile.am -+++ bmp/Makefile.am -@@ -1,4 +1,4 @@ --bmpdir = $(prefix)/share/SpaceAryarya/bmp -+bmpdir = $(BMP_PATH) - bmp_DATA = my.bmp enemy1.bmp shot.bmp bomb.bmp\ - enemy2.bmp kage.bmp wall.bmp wall2.bmp eshot.bmp\ - boss1_b.bmp boss1_do.bmp boss1_f.bmp\ ---- configure.in -+++ configure.in -@@ -25,17 +25,20 @@ - BMP_PATH=/usr/local/share/SpaceAryarya/bmp - WAV_PATH=/usr/local/share/SpaceAryarya/wav - else -- DATA_PATH=$prefix/share/SpaceAryarya/data -- BMP_PATH=$prefix/share/SpaceAryarya/bmp -- WAV_PATH=$prefix/share/SpaceAryarya/wav -+ DATA_PATH=$datadir/SpaceAryarya/data -+ BMP_PATH=$datadir/SpaceAryarya/bmp -+ WAV_PATH=$datadir/SpaceAryarya/wav + SCORE_PATH=$localstatedir/SpaceAryarya fi AC_DEFINE_UNQUOTED(DATA_PATH,"$DATA_PATH") @@ -67,4 +43,32 @@ -install: - $(INSTALL) -c -m 666 ./.score $(DESTDIR)$(DATA_PATH) +install-data-local: -+ $(mk \ No newline at end of file ++ $(mkinstalldirs) $(DESTDIR)$(SCORE_PATH) ++ $(INSTALL) -m 660 .score $(DESTDIR)$(SCORE_PATH) +--- src/ranking.c ++++ src/ranking.c +@@ -36,7 +36,7 @@ + FILE *fp; + Uint16 i; + +- if ((fp = fopen(DATA_PATH "/.score", "r"))) { ++ if ((fp = fopen(SCORE_PATH "/.score", "r"))) { + fscanf(fp, "%d", &(Root->HiScore)); + for (i = 0; i < 5; i ++) + fscanf(fp, "%d %d %s", +@@ -65,7 +65,7 @@ + FILE *fp; + Uint16 i; + +- if ((fp = fopen(DATA_PATH "/.score", "w"))) { ++ if ((fp = fopen(SCORE_PATH "/.score", "w"))) { + fprintf(fp, "%d\n", Root->HiScore); + for (i = 0; i < 5; i ++) + fprintf(fp, "%d %d %s\n", +--- wav/Makefile.am ++++ wav/Makefile.am +@@ -1,3 +1,3 @@ +-wavdir = $(prefix)/share/SpaceAryarya/wav ++wavdir = $(WAV_PATH) + wav_DATA = bgm1.wav bomb.wav hit.wav fire.wav die.wav boss.wav + EXTRA_DIST = bgm1.wav bomb.wav hit.wav fire.wav die.wav boss.wav diff --git a/games-action/wordwarvi/files/wordwarvi-1.00-sound.patch b/games-action/wordwarvi/files/wordwarvi-1.00-sound.patch index 6b5474154dc8..5ad7bc8440b9 100644 --- a/games-action/wordwarvi/files/wordwarvi-1.00-sound.patch +++ b/games-action/wordwarvi/files/wordwarvi-1.00-sound.patch @@ -49,45 +49,32 @@ diff -ru wordwarvi-1.00.orig/Makefile wordwarvi-1.00/Makefile rumble.o: rumble.c rumble.h Makefile - $(CC) ${DEBUG} ${PROFILE_FLAG} ${OPTIMIZE_FLAG} `pkg-config --cflags vorbisfile` \ + $(CC) ${DEBUG} ${PROFILE_FLAG} ${CFLAGS} `pkg-config --cflags vorbisfile` \ - -pthreadiff -ru wordwarvi-1.00.orig/Makefile wordwarvi-1.00/Makefile ---- wordwarvi-1.00.orig/Makefile 2011-06-09 00:06:22.000000000 -0400 -+++ wordwarvi-1.00/Makefile 2011-06-11 19:57:55.609619777 -0400 -@@ -1,5 +1,5 @@ - PREFIX=/usr --DATADIR=${PREFIX}/share/wordwarvi -+DATADIR?=${PREFIX}/share/wordwarvi - MANDIR?=${PREFIX}/share/man - MANPAGEDIR=${MANDIR}/man6 + -pthread -Wall -c rumble.c -@@ -24,18 +24,6 @@ - CC ?= gcc - BUILD_CC ?= gcc + wwvi_font.o: wwvi_font.c wwvi_font.h my_point.h Makefile +- $(CC) ${DEBUG} ${PROFILE_FLAG} ${OPTIMIZE_FLAG} -pthread -Wall -c wwvi_font.c ++ $(CC) ${DEBUG} ${PROFILE_FLAG} ${CFLAGS} -pthread -Wall -c wwvi_font.c --# DEBUG=-g --# DEBUG= --# PROFILE_FLAG=-pg --#PROFILE_FLAG= --#OPTIMIZE_FLAG= --# OPTIMIZE_FLAG=-O3 --#OPTIMIZE_FLAG=-O3 -pedantic -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security --OPTIMIZE_FLAG=-O3 -pedantic -- -- --LDFLAGS=${PROFILE_FLAG} -- - DEFINES=${SNDFLAGS} -DDATADIR=\"${DATADIR}/\" - - all: wordwarvi wordwarvi.6.gz -@@ -53,24 +41,24 @@ - endif - - joystick.o: joystick.c joystick.h Makefile -- $(CC) ${DEBUG} ${PROFILE_FLAG} ${OPTIMIZE_FLAG} -pthread -Wall -c joystick.c -+ $(CC) ${DEBUG} ${PROFILE_FLAG} ${CFLAGS} -pthread -Wall -c joystick.c - - ogg_to_pcm.o: ogg_to_pcm.c ogg_to_pcm.h Makefile -- $(CC) ${DEBUG} ${PROFILE_FLAG} ${OPTIMIZE_FLAG} `pkg-config --cflags vorbisfile` \ -+ $(CC) ${DEBUG} ${PROFILE_FLAG} ${CFLAGS} `pkg-config --cflags vorbisfile` \ - -pthread -Wall -c ogg_to_pcm.c + stamp: stamp.c + $(BUILD_CC) -o stamp stamp.c +@@ -78,7 +66,7 @@ + wordwarvi: wordwarvi.c joystick.o rumble.o ${OGGOBJ} wwviaudio.o wwvi_font.o \ + Makefile version.h stamp levels.h rumble.h + ./stamp > stamp.h +- $(CC) ${DEBUG} ${PROFILE_FLAG} ${OPTIMIZE_FLAG} ${SCREENSAVERFLAG} -pthread -Wall ${DEFINES} \ ++ $(CC) $(LDFLAGS) ${DEBUG} ${PROFILE_FLAG} ${CFLAGS} ${SCREENSAVERFLAG} -pthread -Wall ${DEFINES} \ + joystick.o \ + rumble.o \ + wwvi_font.o \ +diff -ru wordwarvi-1.00.orig/wwviaudio.c wordwarvi-1.00/wwviaudio.c +--- wordwarvi-1.00.orig/wwviaudio.c 2011-06-09 00:06:22.000000000 -0400 ++++ wordwarvi-1.00/wwviaudio.c 2011-06-11 19:57:17.394274660 -0400 +@@ -121,7 +121,7 @@ + if (clipnum >= max_sound_clips || clipnum < 0) + return -1; - wwviaudio.o: w \ No newline at end of file +- snprintf(filebuf, PATH_MAX, "%s/%s", DATADIR, filename); ++ snprintf(filebuf, PATH_MAX, "GENTOO_DATADIR/%s", DATADIR, filename); + rc = stat(filebuf, &statbuf); + if (rc != 0) { + strncpy(filebuf, filename, PATH_MAX); diff --git a/games-arcade/burgerspace/Manifest b/games-arcade/burgerspace/Manifest index 93bcb59f1b81..458d0ab61f77 100644 --- a/games-arcade/burgerspace/Manifest +++ b/games-arcade/burgerspace/Manifest @@ -1,2 +1 @@ DIST burgerspace-1.9.2.tar.gz 505314 SHA256 34b0feccf543b11f9f9a182203d67cd453675255fed4b745e4e74c121b211bf2 SHA512 b2af53d6fcf1d52164870147aa8a5b08941ecb62f3d9bbce5c2872885923057481c21bc34f1e19b8aeb8a76acadd9a11c11fa7b6304438610e8a23e043b7deee WHIRLPOOL a164c6a8a6c7e0aaad1e427bd88103a03260fa77b4d05ee8d9af72d468f7744c7cf212f2e8431b7529c82106ce3334eaff75983e7a437fa5658f1d9d7d96010d -MISC metadata.xml 236 SHA256 c381421aa105bd6f350cDIST burgerspace-1.9.2.tar.gz 505314 SHA256 34b0feccf543b11f9f9a182203d67cd453675255fed4b745e4e74c121b211bf2 SHA512 b2af53d6fcf1d52164870147aa8a5b08941ecb62f3d9bbce5c2872885923057481c21bc34f1e19b8aeb8a76acadd9a11c11fa7b6304438610e8a23e043b7deee WHIRLPOOL a164c6a8a6c7e0aaad1e427bd88103a03260fa77b4d05ee8d9af72d468f7744c7 \ No newline at end of file diff --git a/games-arcade/ceferino/Manifest b/games-arcade/ceferino/Manifest index f4045a7f131c..909382b2973c 100644 --- a/games-arcade/ceferino/Manifest +++ b/games-arcade/ceferino/Manifest @@ -1,2 +1 @@ DIST ceferino-0.97.8.tar.gz 2380632 SHA256 6f0f2674a8a968950498570b89123e341dca50499d255e7bcdf3703a85aa3074 -DIST ceferino-0.97.8.tar.gz 2380632 SHA256 6f0f2674a8a968950498570b89123e341dca50499d255e7bcdf3703a85aa3074 diff --git a/games-arcade/commandergenius/commandergenius-1.7.3.0.ebuild b/games-arcade/commandergenius/commandergenius-1.7.3.0.ebuild index 27a85def514e..24736ccf6569 100644 --- a/games-arcade/commandergenius/commandergenius-1.7.3.0.ebuild +++ b/games-arcade/commandergenius/commandergenius-1.7.3.0.ebuild @@ -67,14 +67,16 @@ src_install() { newicon CGLogo.png ${PN}.png newgamesbin "${FILESDIR}"/commandergenius-wrapper commandergenius make_desktop_entry commandergenius -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/commandergenius/commandergenius-1.7.3.0.ebuild,v 1.2 2014/05/15 12:35:12 ulm Exp $ - -EAPI=5 - -CMAKE_IN_SOURCE_BUILD=1 -inherit cmake-utils eutils games + prepgamesdirs +} -MY_P=CGenius-${PV}-Release-src -DESCRIPTION="Open Source Commander Keen clone (needs origin \ No newline at end of file +pkg_postinst() { + games_pkg_postinst + elog "Check your settings in ~/.CommanderGenius/cgenius.cfg" + elog "after you have started the game for the first time." + use opengl && elog "You may also want to set \"OpenGL = true\"" + elog + elog "Run the game via:" + elog " 'commandergenius [path-to-keen-data]'" + elog "or add your keen data dir to the search paths in cgenius.cfg" +} diff --git a/games-arcade/monkey-bubble/files/monkey-bubble-0.4.0-gnome-doc.patch b/games-arcade/monkey-bubble/files/monkey-bubble-0.4.0-gnome-doc.patch index 0f74737f921c..801ae84d9bab 100644 --- a/games-arcade/monkey-bubble/files/monkey-bubble-0.4.0-gnome-doc.patch +++ b/games-arcade/monkey-bubble/files/monkey-bubble-0.4.0-gnome-doc.patch @@ -24,21 +24,15 @@ - -+ - Thomas - CataldoGNOME Documentation Project - - -- + Thomas Cataldo -@@ -55,6 +55,7 @@ - manual, follow the directions in the - GNOME Feedback Page. +@@ -47,6 +47,7 @@ + Votre avis + Pour signaler un problème ou faire une suggestion concernant l'application Monkey Bubble ou le présent manuel, procédez comme indiquéà la GNOME Feedback Page. -+ Monkey Bubble manual + + + diff --git a/games-arcade/notpacman/Manifest b/games-arcade/notpacman/Manifest index bc1507f8e768..4223046be9c3 100644 --- a/games-arcade/notpacman/Manifest +++ b/games-arcade/notpacman/Manifest @@ -1,4 +1,2 @@ DIST notpacman-1.0.4.zip 439775 SHA256 9ec13bb0737d69c8954a5012ab3c84917f8db6285f74605c6faac7592a7ef2fc SHA512 c64d74cad972c22fe7674b55c0155fcd6e0176c580f53645a0cef7ae1e2c3453807f13fd9bbc9992cdc1176bc1687800f957ef5c11034a2ffe0774ec0118a863 WHIRLPOOL 94fa5c3a865b3fea736a41cb9000522cfdd36cfd63703f0a811743bd9fdc082f98c85407b9248a3e066f06c34cd44b15a7c2ace0956fc72a4541b933169b1457 DIST notpacman.png 1556 SHA256 79e3d47abc08c4e07d70a410fd841fbccf0289443fa5f6f09d74ec674ff86d3a SHA512 38fca81429255a5857476cbbcccb188ae4cc7fae4c044b45d82206ffcb41da5737e20135be2a6ab15ec1ff5faa74e5208a33a4966b3e9e99293c0ccb276b0c1b WHIRLPOOL bd0a91e87c410d1901f6839df88e5a70ca6c193cda842fff878f055a384cbc667b2e688b2e3c7015cdfd862545dda1a38e55e91aa2d23e9ca9b8b67eb780dbf3 -DIST notpacman-1.0.4.zip 439775 SHA256 9ec13bb0737d69c8954a5012ab3c84917f8db6285f74605c6faac7592a7ef2fc SHA512 c64d74cad972c22fe7674b55c0155fcd6e0176c580f53645a0cef7ae1e2c3453807f13fd9bbc9992cdc1176bc1687800f957ef5c11034a2ffe0774ec0118a863 WHIRLPOOL 94fa5c3a865b3fea736a41cb9000522cfdd36cfd63703f0a811743bd9fdc082f98c85407b9248a3e066f06c34cd44b15a7c2ace0956fc72a4541b933169b1457 -DIST notpacman.png 1556 SHA256 79e3d47abc08c4e07d70a410fd841fbccf0289443fa5f6f09d74ec674ff86d3a SHA512 38fca81429255a5857476 \ No newline at end of file diff --git a/games-arcade/nottetris2/Manifest b/games-arcade/nottetris2/Manifest index 78847435a2f4..54e3a153709d 100644 --- a/games-arcade/nottetris2/Manifest +++ b/games-arcade/nottetris2/Manifest @@ -1,2 +1 @@ DIST nottetris2-1.zip 2774048 SHA256 e2b8737e1e761174bbb0cdea403a2b7558732b682f5a1e32ea3ee956192ea88c SHA512 63478640fadf91134dec86f88d6422a317b4523ececff836e40984500f2771d564012cbd587a46b300e084c3c64531f3758c648edf3d683b136c9da69924a187 WHIRLPOOL e665708a202dc83923de462f2624dfa273a7a7016e4acf253ef080aac956ded50c1973d258511434943b8f328b06bd36b69db110d4c7aed2d0aa40bf4069e714 -DIST nottetris2-1.zip 2774048 SHA256 e2b8737e1e761174bbb0cdea403a2b7558732b682f5a1e32ea3ee956192ea88c SHA512 63478640fadf91134dec86f88d6422a317b4523ececff836e40984500f2771d564012cbd587a46b300e084c3c64531f3758c648edf3d683b136c9da69924a187 WHIRLPOOL e665708a202dc83923de462f2624dfa273a7a7016e4acf253ef080aac956ded50c1973d258511434943b8f328b06bd36b69db110d4c7aed2d0aa40bf4069e714 diff --git a/games-arcade/orthorobot/Manifest b/games-arcade/orthorobot/Manifest index 7c87d598d661..38593d0fc85e 100644 --- a/games-arcade/orthorobot/Manifest +++ b/games-arcade/orthorobot/Manifest @@ -1,2 +1 @@ DIST orthorobot-0.zip 3429026 SHA256 744d70b492b9f9ebc8adf43f9131be3f9957d378ae1a8e18f1754dc9ff607608 SHA512 cf73bfd7d136c0d408dcee80db1193c4ae1d418128b8879a67c5fbfc013ce33ffab4255c0ea2e7d2a70f22301192fb77bd5b3105d69ff511d2d5a5b99fbd0cf0 WHIRLPOOL 4ee2364943cf835b84d5ad0daca1f3d204254ae8df4f272cc773da3d7d6561b92804cf26a99158a27622eee61e6f77eebcf50a10152583d8eb4b2d600e7c1e86 -DIST orthorobot-0.zip 3429026 SHA256 744d70b492b9f9ebc8adf43f9131be3f9957d378ae1a8e18f1754dc9ff607608 SHA512 cf73bfd7d136c0d408dcee80db1193c4ae1d418128b8879a67c5fbfc013ce33ffab4255c0ea2e7d2a70f22301192fb77bd5b3105d69ff511d2d5a5b99fbd0cf0 WHIRLPOOL 4ee2364943cf835b84d5ad0daca1f3d204254ae8df4f272cc773da3d7d6561b92804cf26a99158a27622eee61e6f77eebcf50a10152583d8eb4b2d600e7c1e86 diff --git a/games-board/chessdb/chessdb-3.6.18.ebuild b/games-board/chessdb/chessdb-3.6.18.ebuild index 33da82c9f7eb..c9ed8e2b78cd 100644 --- a/games-board/chessdb/chessdb-3.6.18.ebuild +++ b/games-board/chessdb/chessdb-3.6.18.ebuild @@ -39,26 +39,30 @@ src_configure() { LINK="$(tc-getCXX) ${LDFLAGS}" \ OPTIMIZE="${CXXFLAGS}" \ SHAREDIR="${GAMES_DATADIR}/${PN}" \ - S# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-board/chessdb/chessdb-3.6.18.ebuild,v 1.7 2010/10/18 09:45:08 tupone Exp $ + SOUNDSDIR="${GAMES_DATADIR}/${PN}/sounds" \ + TBDIR="${GAMES_DATADIR}/${PN}/tablebases" \ + MANDIR="/usr/share/man" \ + WARNINGS="" || die "econf failed" +} -EAPI=2 -inherit toolchain-funcs eutils games +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" -MY_PN=ChessDB -MY_P=${MY_PN}-${PV} -DESCRIPTION="A free Chess Database" -HOMEPAGE="http://chessdb.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz - tb4? ( mirror://sourceforge/${PN}/4-piece-tablebases.zip )" + if use tb4; then + insinto "${GAMES_DATADIR}/${PN}"/tablebases + doins ../*.emd || die "doins failed" + fi -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="tb4" + dodoc BUGS CONTRIBUTORS ChangeLog NEWS README THANKS THANKS.Shane TODO + dohtml -r html-help/* -RDEPEND="!games-board/scid - dev-lang/tk" -DEPEND="${RDEPEND} - tb4? ( app-arch/ \ No newline at end of file + doicon ${PN}.ico + make_desktop_entry ${PN} ChessDB /usr/share/pixmaps/${PN}.ico + + prepgamesdirs +} + +pkg_postinst() { + games_pkg_postinst + elog "To enable speech, just emerge dev-tcltk/snack" +} diff --git a/games-board/domination/Manifest b/games-board/domination/Manifest index 9c1d303f77d2..3d3e3fdff812 100644 --- a/games-board/domination/Manifest +++ b/games-board/domination/Manifest @@ -1,2 +1 @@ DIST Domination_1.1.1.5.zip 6390032 SHA256 6e0dd1c869679cc80c7904d6512cf9f6fc858a985b60c5a33f3f3291d716f740 SHA512 116d96aded29f60e71eacc8069c6b9ad3b2e8b7e44ed06c730cdaf8e1de4b95650e928e1876feb6bcb08697cd6eaedf1529cf323855e2da652855d07e8337360 WHIRLPOOL cd3de0950075f6330931f0847bd048d9919afc6009bfe99b7f3f6bed09a1b7ade30ad918af23139db2b15baacfe79845d3ce75c42463c5aa59603d141639b251 -EBUILD domination-1.1.1.5.ebuild 1263 SHA256 4449e12445a60d2a9a6f89c70926976fcff9f29a6878e41d090879b3a2018e96 SHA512 6b2d41f9c3d7286d1c6b746ee2ccc804581d6109ad2da4a4ee19b30051479b0b4aa5DIST Domination_1.1.1.5.zip 6390032 SHA256 6e0dd1c869679cc80c7904d6512cf9f6fc858a985b60c5a33f3f3291d716f740 SHA512 116d96aded29f60e71eacc8069c6b9ad3b2e8b7e44ed06c730cdaf8e1de4b95650e928e1876feb6bcb08697cd6eaedf1529cf323855e2da652855d07e8337360 WHIRLPOOL cd3de0950075f6330931f0847bd048d9919afc6009bfe99b7f3f6bed09a1b7ade30ad918af23139db2b15baacfe79845d3ce75c42463c5aa59603d141639b251 diff --git a/games-board/eboard/Manifest b/games-board/eboard/Manifest index be863e3be286..0743a7e748d8 100644 --- a/games-board/eboard/Manifest +++ b/games-board/eboard/Manifest @@ -1,4 +1,4 @@ DIST eboard-1.1.1.tar.bz2 462386 RMD160 13bdfe6d33a143d619c6c5be8d849ced9b95e2c4 SHA1 029cf1e7503fc2a862b9880da9ea6ab91e5614cd SHA256 ad971086697c0d5a1c8a64401f6675339e832acb386dc96fa4e17da1832ca26e -DIST eboard-extras-1pl2.tar.gz 361237 RMD160 342b1b48091958f5b0e4613e1c9de8b6c23d5b67 SHA1 aac0f4ec4cc83f2e76726fcbe54c707bd0ebe44a SHA256 6849cc104e454167db8b8e9aeAUX eboard-1.1.1-as-needed.patch 726 RMD160 9c7451fdc76d8d1599c6fae35aa2b6335493de0a SHA1 59307c52cc7be479dcffaf070c2334912e908900 SHA256 2a4831e85706579059886baa73e87561dae2af87a280e7cb8d0e905227347008 -DIST eboard-1.1.1.tar.bz2 462386 RMD160 13bdfe6d33a143d619c6c5be8d849ced9b95e2c4 SHA1 029cf1e7503fc2a862b9880da9ea6ab91e5614cd SHA256 ad971086697c0d5a1c8a64401f6675339e832acb386dc96fa4e17da1832ca26e -DIST eboard-ex \ No newline at end of file +DIST eboard-extras-1pl2.tar.gz 361237 RMD160 342b1b48091958f5b0e4613e1c9de8b6c23d5b67 SHA1 aac0f4ec4cc83f2e76726fcbe54c707bd0ebe44a SHA256 6849cc104e454167db8b8e9ae0573accade5c941a140b47e58b601164e99fcc3 +DIST eboard-extras-2.tar.gz 598909 RMD160 d6b7b9f39167752301018048010fee312acb97c0 SHA1 6b2a88ada8a5b009e7fb97950c0596e23030d161 SHA256 0b98bd4c90b2e275f8535186c3e7cbeeef9c9bb611a7febfcd866486a9f41a9c +DIST eboard_1.1.1-4.1.diff.gz 17247 RMD160 3e32c44274a83fa1978ed341fb940a9ea2dfea12 SHA1 bce48ec2d4eb4e5817e45579a217e6e7f635d3ba SHA256 9be0e7fb3cc59edec3fd5c0c2c562eb56fea36afd3c23ac21c1f3ada6acf3617 diff --git a/games-board/freedoko/freedoko-0.7.11.ebuild b/games-board/freedoko/freedoko-0.7.11.ebuild index 8d5df0d9e91b..a3de56922722 100644 --- a/games-board/freedoko/freedoko-0.7.11.ebuild +++ b/games-board/freedoko/freedoko-0.7.11.ebuild @@ -48,37 +48,55 @@ src_unpack() { cd "${S}"/data/cardsets unpack_cards xskatcards xskat.zip - # Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-board/freedoko/freedoko-0.7.11.ebuild,v 1.4 2013/12/24 12:47:38 ago Exp $ + unpack_cards kdecards kdecarddecks.zip + unpack_cards pysolcards pysol.zip + unpack_cards gnomecards gnome-games.zip + unpack_cards openclipartcards openclipart.zip + [ $cards ] || unpack xskat.zip # fall back to xskat -EAPI=5 -inherit eutils gnome2-utils games + if use backgrounds ; then + cd "${S}"/data/backgrounds + unpack ${PN}-backgrounds.zip + fi +} -DESCRIPTION="FreeDoko is a Doppelkopf-game" -HOMEPAGE="http://free-doko.sourceforge.net" -SRC_URI="mirror://sourceforge/free-doko/FreeDoko_${PV}.src.zip - doc? ( mirror://sourceforge/free-doko/FreeDoko_${PV}.manual.zip ) - backgrounds? ( mirror://sourceforge/free-doko/backgrounds.zip -> ${PN}-backgrounds.zip ) - kdecards? ( mirror://sourceforge/free-doko/kdecarddecks.zip ) - xskatcards? ( mirror://sourceforge/free-doko/xskat.zip ) - pysolcards? ( mirror://sourceforge/free-doko/pysol.zip ) - gnomecards? ( mirror://sourceforge/free-doko/gnome-games.zip ) - openclipartcards? ( mirror://sourceforge/free-doko/openclipart.zip ) - !xskatcards? ( - !kdecards? ( - !gnomecards? ( - !openclipartcards? ( - !pysolcards? ( - mirror://sourceforge/free-doko/xskat.zip ) ) ) ) )" +PATCHES=( + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${P}-gcc47.patch +) -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="+xskatcards +gnomecards +kdecards +openclipartcards +pysolcards +backgrounds net doc" +src_compile() { + export CPPFLAGS="-DPUBLIC_DATA_DIRECTORY_VALUE='\"${GAMES_DATADIR}/${PN}\"'" + export CPPFLAGS+=" -DMANUAL_DIRECTORY_VALUE='\"/usr/share/doc/${PF}/html\"'" + export OSTYPE=Linux + export USE_NETWORK=$(use net && echo true || echo false) + export USE_SOUND_ALUT=false # still marked experimental + emake Version + emake -C src FreeDoko +} -RDEPEND="net? ( net-libs/gnet dev-libs/glib:2 ) - >=dev-cpp/gtkmm-2.4:2.4" -DEPEND="${RDEPEND} - app-arch/unzip - virtual/pkg \ No newline at end of file +src_install() { + newgamesbin src/FreeDoko freedoko + insinto "${GAMES_DATADIR}"/${PN}/ + doins -r data/{ai,cardsets,backgrounds,rules,sounds,translations,*png} + find "${D}${GAMES_DATADIR}"/${PN} -name Makefile -delete + dodoc AUTHORS README ChangeLog + use doc && dohtml -r doc/manual/ + newicon -s 32 src/FreeDoko.png ${PN}.png + make_desktop_entry ${PN} FreeDoko + 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-board/gmchess/Manifest b/games-board/gmchess/Manifest index b47196bb1516..c149ca97bdbd 100644 --- a/games-board/gmchess/Manifest +++ b/games-board/gmchess/Manifest @@ -1,2 +1 @@ -DIST gmchess-0.29.6.tar.bz2 1437904 SHA256 2d2b150747e92AUX gmchess-0.29.6-gentoo.patch 1769 SHA256 7af36778162693cad7f916a7eb9bc011548afee46de7a50b16029eabda8bb49a SHA512 30af30cbf861d0ebc00608a62462685d7805c767e523c8c49c655e42f9677023330f6ae68b9d65366ba10cb98d9eb05138ee4592ec2323aae5567a2dd3765900 WHIRLPOOL 0abe44be125f0269cd4e8d668e9f6603719a2d06ab6b4dfb5d2a9575391faccc885da19626f317ecc8c99be43cd6be67ac0caf5da41727a5f6b6cc0dd1a1689a DIST gmchess-0.29.6.tar.bz2 1437904 SHA256 2d2b150747e92045e42f7a300f7d0de34eb9c0f89e7c8cbbe18c220201dd230b SHA512 b6af5205dc087c9fdea4cee81f9002c5dd56282be10b09c99f6f4105730676abff8d036843b7c0232937f43d87d222555a0b9c86e192a5ac8c039509841467a6 WHIRLPOOL cbcaac2b7aacdbf97b40be211aeda26710708c871f3eb53bb5db3b695ace353aa92c28f08735dc95915f4c57908b5e8482be31cb7d8b12c51a97f4c41069777d diff --git a/games-emulation/vbam/files/vbam-1.8.0.1228-ffmpeg2.patch b/games-emulation/vbam/files/vbam-1.8.0.1228-ffmpeg2.patch index 5bdecc8823a7..f2f9085f4a7f 100644 --- a/games-emulation/vbam/files/vbam-1.8.0.1228-ffmpeg2.patch +++ b/games-emulation/vbam/files/vbam-1.8.0.1228-ffmpeg2.patch @@ -31,5 +31,4 @@ +#endif if(dp == -1) dp = codec->pix_fmts[0]; - --- vbam-1.8.0.1228/src/common/ffmpeg.cpp -++ \ No newline at end of file + if(!(convpic = avcodec_alloc_frame()) || diff --git a/games-emulation/yabause/yabause-0.9.12.ebuild b/games-emulation/yabause/yabause-0.9.12.ebuild index 4d09b1227e9f..4d9c52351eb0 100644 --- a/games-emulation/yabause/yabause-0.9.12.ebuild +++ b/games-emulation/yabause/yabause-0.9.12.ebuild @@ -59,5 +59,6 @@ src_compile() { src_install() { cmake-utils_src_install - dodoc AUTHORS Chang# Copyright 1999-2013 Gentoo Foundation -# Dist \ No newline at end of file + dodoc AUTHORS ChangeLog GOALS README README.LIN + prepgamesdirs +} diff --git a/games-mud/crystal/metadata.xml b/games-mud/crystal/metadata.xml index 62fe92b9633e..d3c2cc926f0b 100644 --- a/games-mud/crystal/metadata.xml +++ b/games-mud/crystal/metadata.xml @@ -1,4 +1,5 @@ - + -games + diff --git a/games-puzzle/gfifteen/Manifest b/games-puzzle/gfifteen/Manifest index 24ef816d8ede..6fa1c5653afa 100644 --- a/games-puzzle/gfifteen/Manifest +++ b/games-puzzle/gfifteen/Manifest @@ -1,2 +1 @@ DIST gfifteen-1.0.3.tar.gz 525454 SHA256 049eec9eec2f857823f185a72c831d9bd8a1368a9965bd04796e1fe0553f5e6f SHA512 a3699a2484ec3334ec9489c6ae6d8b332e41a769c72ea2971684197f8eb9e6c30431232f3423aaa85ded0fa57410929d432b2efe4370409bdcc63f2fb0b31ae4 WHIRLPOOL 9dadd31972efd3bbf474c582aea4129dfe7105d10f5df2f93614df1b5e552a6754aea2cedfb3f8c2e05e2c0c97c75a78ce24b262f800da884d4bcdce0cc3eeb2 -DIST gfifteen-1.0.3.tar.gz 525454 SHA256 049eec9eec2f857823f185a72c831d9bd8a1368a9965bd04796e1fe0553f5e6f SHA512 a3699a2484ec3334ec9489c6ae6d8b332e41a769c72ea2971684197f8eb9e6c30431232f3423aaa85ded0fa57410929d432b2efe4370409bdcc63f2fb0b31ae4 WHIRLPOOL 9dadd31972efd3bbf474c582aea4129dfe7105d10f5df2f93614df1b5e552a6754aea2cedfb3f8c2e05e2c0c97c75a78ce24b262f800da884d4bcdce0cc3eeb2 diff --git a/games-puzzle/gnurobbo/gnurobbo-0.66.ebuild b/games-puzzle/gnurobbo/gnurobbo-0.66.ebuild index 45e17b453709..83454318c60d 100644 --- a/games-puzzle/gnurobbo/gnurobbo-0.66.ebuild +++ b/games-puzzle/gnurobbo/gnurobbo-0.66.ebuild @@ -30,11 +30,11 @@ src_compile() { } src_install() { - dogamesbin gnurobbo# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/gnurobbo/gnurobbo-0.66.ebuild,v 1.6 2014/05/15 16:51:43 ulm Exp $ - -EAPI=2 -inherit eutils games - -DESCRI \ No newline at end of file + dogamesbin gnurobbo || die "dogamesbin failed" + insinto "${GAMES_DATADIR}/${PN}" + doins -r data/{levels,skins,locales,rob,sounds} || die "doins failed" + dodoc AUTHORS Bugs ChangeLog README TODO + newicon icon32.png ${PN}.png + make_desktop_entry ${PN} Gnurobbo + prepgamesdirs +} diff --git a/games-puzzle/hexalate/Manifest b/games-puzzle/hexalate/Manifest index d35833ac5801..dfafd1ccd8e4 100644 --- a/games-puzzle/hexalate/Manifest +++ b/games-puzzle/hexalate/Manifest @@ -1,4 +1,2 @@ DIST hexalate-1.0.1-src.tar.bz2 48423 SHA256 11de0ed0d0952fc8b86670dd4d7fc3d703166373bb88b73a6ef40e46f65aac75 DIST hexalate-1.0.3-src.tar.bz2 336589 SHA256 a391ba44aa0f5bd618385dbe17e059947b829b85315aecb19edd1c863b3ebe3c SHA512 582e41ef298788e73e4f39976dbf334fdb514518e53556b77bd2a7f49d82f66617e21ab5ff24a298313e529aa147e80703fe9eb40318d9b74673dd6fcf32d909 WHIRLPOOL 4ce78bf4cb37346b4722f647e4dbda4fe3c88138264b8ad758302152cc199d7374f0cfadb8497ad767aae678345910701bc30f12ef7eb1b0e691a1df73fc40bf -DIST hexalate-1.0.1-src.tar.bz2 48423 SHA256 11de0ed0d0952fc8b86670dd4d7fc3d703166373bb88b73a6ef40e46f65aac75 -DIST hexalate-1.0.3-src.tar.bz2 336589 SHA256 a391ba44aa0f5bd618385dbe17e059947b829b85315aecb19edd1c863b3ebe3c SHA512 582e41ef298788e73e4f39976dbf334fdb514518e53556b77bd2a7f49d82f66617e21ab5ff24a298313e529aa147e80703fe9eb40318d9b74673dd6fcf32d909 WHIRLPOOL 4ce78bf4cb37346b4722f647e4dbda4fe3c88138264b8ad758302152cc199d7374f0cfadb8497ad767aae678345910701bc30f12ef7eb1b0e691a1df73fc40bf diff --git a/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-gcc41.patch b/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-gcc41.patch index 63ae31511d2c..c962a2121596 100644 --- a/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-gcc41.patch +++ b/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-gcc41.patch @@ -10,30 +10,6 @@ Index: krystaldrop/Sources/KDpp/Tools/FilePath.h + void PrefixDirectory(const string &path); - /** -Index: krystaldrop/Sources/KDpp/Video/Color.h -=================================================================== ---- krystaldrop.orig/Sources/KDpp/Video/Color.h -+++ krystaldrop/Sources/KDpp/Video/Color.h -@@ -38,7 +38,7 @@ public: - KD_Color operator*( float lambda ); - - // Multiply by another color -- KD_Color KD_Color::operator*( const KD_Color &other ); -+ KD_Color operator*( const KD_Color &other ); - - // Sets all the Index: krystaldrop/Sources/KDpp/Tools/FilePath.h -=================================================================== ---- krystaldrop.orig/Sources/KDpp/Tools/FilePath.h -+++ krystaldrop/Sources/KDpp/Tools/FilePath.h -@@ -75,7 +75,7 @@ public: - /** - Adds a directory before the filePath.... - */ -- void KD_FilePath::PrefixDirectory(const string &path); -+ void PrefixDirectory(const string &path); - - /** Index: krystaldrop/Sources/KDpp/Video/Color.h =================================================================== @@ -69,4 +45,34 @@ Index: krystaldrop/Sources/KrystalDrop/Game/Table.h /** Sets the sprites for the border of the field. */ -- v \ No newline at end of file +- void KD_Table::setAllBorders(KD_Sprite *spr[KD_NB_SPRITE_FOR_BORDER]); ++ void setAllBorders(KD_Sprite *spr[KD_NB_SPRITE_FOR_BORDER]); + void setHorizontalBar(KD_Sprite *spr); + void setVerticalBar(KD_Sprite *spr); + void setUpperLeftBar(KD_Sprite *spr); +Index: krystaldrop/Sources/Makefile +=================================================================== +--- krystaldrop.orig/Sources/Makefile ++++ krystaldrop/Sources/Makefile +@@ -35,7 +35,7 @@ ACC_ZLIB_SUPPORT=yes + export + VERSION=0_7_2 + +-CC=g++ -Werror ++CC=g++ + LINK=g++ + MAKE=make + +Index: krystaldrop/Sources/Makefile.lib +=================================================================== +--- krystaldrop.orig/Sources/Makefile.lib ++++ krystaldrop/Sources/Makefile.lib +@@ -30,7 +30,7 @@ STATIC_LIBRARY=no + export + VERSION=0_7 + +-CC=g++ -Werror ++CC=g++ + LINK=g++ + MAKE=make + diff --git a/games-puzzle/ltris/Manifest b/games-puzzle/ltris/Manifest index 5464125bb846..095fb902abe0 100644 --- a/games-puzzle/ltris/Manifest +++ b/games-puzzle/ltris/Manifest @@ -1,4 +1,2 @@ DIST ltris-1.0.18.tar.gz 856016 SHA256 3cba90365d50e79601368499af77d54cb03c0cf2544324e5df246eb1eeaa0e30 -DIST ltris-1.0.19.taAUX ltris-1.0.18-gentoo.patch 1769 SHA256 0dcab40caeb7b039728c54a5c1f2c9605be9fa4d17f4a35637d173bcf7cf9594 SHA512 c0040258b95252efba67cc9da7e598ee2c2cb92b97702b14487d6b0c796bf25022af05350459540a95caf84249b95245d80d5da4be09bff6670f15ca754505a6 WHIRLPOOL 680d5e23a8f0cd5d35780eb1cefc60b831c7707ca32c79964dfb97f878474d037d1bbd1cbee9e4f199f1b964c68509107044476bb2bf2656cd7e7462f559165c -DIST ltris-1.0.18.tar.gz 856016 SHA256 3cba90365d50e79601368499af77d54cb03c0cf2544324e5df246eb1eeaa0e30 DIST ltris-1.0.19.tar.gz 883543 SHA256 8f6a9e7719d22004aee153db29ffd9ca41c7a6cd87fc791591994eecc2e625a1 SHA512 ab43b3d8f04ab40016be5b5c414f8679bee4f5f344ef9cab52c3628d48017458b84b0fbc0bcaecdfab43853a1ef628ee1cabf3a1373ea108650d4e76015881c5 WHIRLPOOL 9f9b12b5374a686affdf0243cad0220332150655202835f4a254a6febfcd3aab76d8f2331f832e8e891d4616f55190bb0b77f713dfe7ec96cf4df6a56084c003 diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild b/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild index 0f389d76fac1..7c92810b1d0a 100644 --- a/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild +++ b/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild @@ -56,16 +56,22 @@ src_install() { local file name for file in *.R ; do [[ ${file} == "nullgame.R" ]] && continue - name=$# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild,v 1.5 2012/05/04 04:45:28 jdhore Exp $ + name=$(sed -n 's/^[a-z]*\.exe://p' "${file}") + file=${file%.R} + if [[ ${PV} -lt 99999999 ]] ; then + newicon icons/${file}-48d24.png ${PN}-${file}.png || die + make_desktop_entry "${GAMES_BINDIR}/${file}" "${name}" "${PN}-${file}" + else + # No icons with the live version + make_desktop_entry "${GAMES_BINDIR}/${file}" "${name}" + fi + done -EAPI=2 -inherit eutils toolchain-funcs games -if [[ ${PV} == "99999999" ]] ; then - ESVN_REPO_URI="svn://svn.tartarus.org/sgt/puzzles" - inherit subversion - SRC_URI="" - KEYWORDS="" -else - SRC_URI="http://www.chiark.greenend.org.uk/~sgtatham/puzzl \ No newline at end of file + if use doc ; then + dohtml *.html + doinfo puzzles.info + dodoc puzzles.pdf puzzles.ps puzzles.txt puzzles.chm + fi + + prepgamesdirs +} diff --git a/games-puzzle/splice/Manifest b/games-puzzle/splice/Manifest index 7d87457570fe..dde80364af67 100644 --- a/games-puzzle/splice/Manifest +++ b/games-puzzle/splice/Manifest @@ -1,2 +1 @@ DIST splice-linux-1353389454.tar.gz 305838859 SHA256 5016610688f06fcc478b8669a0537614478e68077e044f21530066649830d331 SHA512 67a83a30bdb8ff0eecf9097bb4615053fcdb073daada4a24b61ae239ed56b7d2192247e80989c67554dcfcc1069c2105a6083f9fafffa4bbd66bbf29edad6a44 WHIRLPOOL 9139a3077c78331989128bfe6771c8bfe8c7f8af57712139df8ffd60d295a7bed8dd9dca0a09a35f96cb70407505f7d7b8137caa619f99d226735e37477fc1d6 -DIST splice-linux-1353389454.tar.gz 305838859 SHA256 5016610688f06fcc478b8669a0537614478e68077e044f21530066649830d331 SHA512 67a83a30bdb8ff0eecf9097bb4615053fcdb073daada4a24b61ae239ed56b7d2192247e80989c67554dcfcc1069c2105a6083f9fafffa4bbd66bbf29edad6a44 WHIRLPOOL 9139a3077c78331989128bfe6771c8bfe8c7f8af57712139df8ffd60d295a7bed8dd9dca0a09a35f96cb70407505f7d7b8137caa619f99d226735e37477fc1d6 diff --git a/games-puzzle/toppler/Manifest b/games-puzzle/toppler/Manifest index 29d8f036c23d..9cf51fc67f1a 100644 --- a/games-puzzle/toppler/Manifest +++ b/games-puzzle/toppler/Manifest @@ -1,2 +1 @@ DIST toppler-1.1.6.tar.gz 2117137 SHA256 7dbc2905389c2adba0f8c459f3319cf04045ba53ed407e273a50a3a67564cc45 SHA512 e0f6b7b72e38ba3402ba3608116fb51bf36cad129fb5591db62489829f4ed1ec49a4a3b7b1db4aaa34cd1561ee5228d91577f550aad2d55520ccefdff9bda9e9 WHIRLPOOL 06c8dedb4f93289e067514c7592d4e002ac1b315fa5d52769fe05de0f9e31b2a14a4b9ab543736d9b580d6af79af4a09f64a1946a14f4f5bed9538b24b7285ff -DIST toppler-1.1.6.tar.gz 2117137 SHA256 7dbc2905389c2adba0f8c459f3319cf04045ba53ed407e273a50a3a67564cc45 SHA512 e0f6b7b72e38ba3402ba3608116fb51bf36cad129fb5591db62489829f4ed1ec49a4a3b7b1db4aaa34cd1561ee5228d91577f550aad2d55520ccefdff9bda9e9 WHIRLPOOL 06c8dedb4f93289e067514c7592d4e002ac1b315fa5d52769fe05de0f9e31b2a14a4b9ab543736d9b580d6af79af4a09f64a1946a14f4f5bed9538b24b7285ff diff --git a/games-puzzle/trimines/Manifest b/games-puzzle/trimines/Manifest index 2ef8294730b1..04937244c11a 100644 --- a/games-puzzle/trimines/Manifest +++ b/games-puzzle/trimines/Manifest @@ -1,2 +1 @@ DIST trimines-1.3.0.tar.gz 78590 SHA256 87e6d48b474cf8097c0fac83f700fc098f8f4e65240ceaf0da81b5e644f7d65a SHA512 9a9c5e741460eff29a024aab85ee00d7ccc6111460dab50a8036c638afb9185fb6ffa728914bda7963a80b9b70c7a5f4a1125e08ddf4d90e220d9cfe6683548e WHIRLPOOL 9a5f6f59e957fd829fa4c9058d00d29f1d5549694e7734f49f56b4ccfaf144c3bae824d0bb378251ebd5004fcbb3fd510d83492d326bbdabc38b17b2e3063584 -DIST trimines-1.3.0.tar.gz 78590 SHA256 87e6d48b474cf8097c0fac83f700fc098f8f4e65240ceaf0da81b5e644f7d65a SHA512 9a9c5e741460eff29a024aab85ee00d7ccc6111460dab50a8036c638afb9185fb6ffa728914bda7963a80b9b70c7a5f4a1125e08ddf4d90e220d9cfe6683548e WHIRLPOOL 9a5f6f59e957fd829fa4c9058d00d29f1d5549694e7734f49f56b4ccfaf144c3bae824d0bb378251ebd5004fcbb3fd510d83492d326bbdabc38b17b2e3063584 diff --git a/games-puzzle/triptych-demo/Manifest b/games-puzzle/triptych-demo/Manifest index 3171f2ab717c..00ce2a83a240 100644 --- a/games-puzzle/triptych-demo/Manifest +++ b/games-puzzle/triptych-demo/Manifest @@ -1,2 +1 @@ DIST triptych.tar.gz 1748316 SHA256 2d583edc1b974fc346087ab73adb24d476cee040fb59912e28fbf7a8467db5a8 SHA512 614de78c9f90dd2145ff3dfa6f7a799a069c5add80bc8b0494a752346a163ab0eff7b707292b815adbffa34e4fec446035cfb65df4dd6cf284f270bb732b6daa WHIRLPOOL 53fb746b02c91a4434042a21b5b36f27b17528ac51ea9a3dcf4339cdf75c3ff93db2ffe71fb0c3123e3fbe9720264a18e183558cfda14c0320440e010c21b78d -DIST triptych.tar.gz 1748316 SHA256 2d583edc1b974fc346087ab73adb24d476cee040fb59912e28fbf7a8467db5a8 SHA512 614de78c9f90dd2145ff3dfa6f7a799a069c5add80bc8b0494a752346a163ab0eff7b707292b815adbffa34e4fec446035cfb65df4dd6cf284f270bb732b6daa WHIRLPOOL 53fb746b02c91a4434042a21b5b36f27b17528ac51ea9a3dcf4339cdf75c3ff93db2ffe71fb0c3123e3fbe9720264a18e183558cfda14c0320440e010c21b78d diff --git a/games-rpg/freedink/Manifest b/games-rpg/freedink/Manifest index 9a1bc29ebed2..da555bbf025c 100644 --- a/games-rpg/freedink/Manifest +++ b/games-rpg/freedink/Manifest @@ -1,4 +1,2 @@ DIST freedink-1.08.20121209.tar.gz 1853822 SHA256 196bfcc7b874c2fb9ac94d663f14fb759e644cc2400f77f734a098ca568dbda7 SHA512 40d1322908e429f59a97c79bbcc6d39b51c58fc36f36d612ec189add1aa586b01e929b59ada0da62ca418db6fa81131d282c03aa10d1b69de8224cceba9b0747 WHIRLPOOL 43fccb628bcd788621927d409b38635875ab47202ce9fdf2c3d3706bac87f2939fdcb5ef362109e3bbbdd90f58648da5db3d6ea7629b407c6ffd4059307d8a59 DIST freedink-108.2.tar.gz 1882677 SHA256 ecfbe2c534a85daa6651d975704a39e5af9c911ad2639bc728d536a80c46c9a4 SHA512 ece9cbe9a6186ddc05d993912bae42bc343a93e67d57d376893b6642d32c7328970b87e73c62c538f603119d73bb0e76b50ba6043e2d4831fe7a164bad12cd43 WHIRLPOOL d94876ea2517f949cd45d21958f6c2479f16269e3a5f318f9f6ee131d8242a1f33e04092d3a1cabe0a8b975cbd38d8f82f363ec0149f62193864a7846a4b2709 -DIST freedink-1.08.20121209.tar.gz 1853822 SHA256 196bfcc7b874c2fb9ac94d663f14fb759e644cc2400f77f734a098ca568dbda7 SHA512 40d1322908e429f59a97c79bbcc6d39b51c58fc36f36d612ec189add1aa586b01e929b59ada0da62ca418db6fa81131d282c03aa10d1b69de8224cceba9b0747 WHIRLPOOL 43fccb628bcd788621927d409b38635875ab47202ce9fdf2c3d3706bac87f2939fdcb5ef362109e3bbbdd90f58648da5db3d6ea7629b407c6ffd4059307d8a59 -DIST freedink-108.2.tar.gz 1882677 SHA256 ecfbe2c534a85daa6651d975704a39e5af9c911ad2639bc728d536a80c46c9a4 SHA512 ece9cbe9a6186ddc05d993912bae42bc343a93e67d57d376893b6642d32c7328970b87e73c62c538f603119d73bb0e76b50ba6043e2d4831fe7a164bad12cd43 WHIRLPOOL d94876ea2517f949cd45d21958f6c2479f16269e3a5f318f9f6ee131d8242a1f33e04092d3a1cabe0a8b975cbd38d8f82f363ec0149f62193864a7846a4b2709 diff --git a/games-simulation/flightgear/flightgear-3.0.0.ebuild b/games-simulation/flightgear/flightgear-3.0.0.ebuild index 65a9dbeb3f0b..23791283f2ac 100644 --- a/games-simulation/flightgear/flightgear-3.0.0.ebuild +++ b/games-simulation/flightgear/flightgear-3.0.0.ebuild @@ -1,7 +1,5 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-simulation/f# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/flightgear-3.0.0.ebuild,v 1.3 2014/06/07 19:24:28 ago Exp $ EAPI=5 @@ -86,4 +84,10 @@ src_install() { doicon -s ${s} icons/${s}x${s}/apps/${PN}.png use utils && doicon -s ${s} icons/${s}x${s}/apps/fgcom.png done - doicon \ No newline at end of file + doicon -s scalable icons/scalable/${PN}.svg + use utils && doicon -s scalable icons/scalable/fgcom.svg + + newmenu package/${PN}.desktop ${PN}.desktop + + prepgamesdirs +} diff --git a/games-strategy/coldwar-demo/coldwar-demo-1-r2.ebuild b/games-strategy/coldwar-demo/coldwar-demo-1-r2.ebuild index c9c4a5d1f480..8e306f5b3e08 100644 --- a/games-strategy/coldwar-demo/coldwar-demo-1-r2.ebuild +++ b/games-strategy/coldwar-demo/coldwar-demo-1-r2.ebuild @@ -80,4 +80,5 @@ pkg_postinst() { elog "The instruction manual is available as:" elog " http://demofiles.linuxgamepublishing.com/coldwar/manual.pdf" echo - einfo "To pla# Copyright 1999-2014 Gent \ No newline at end of file + einfo "To play the game, run: ${PN}" +} diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest index 07ff4003bb1f..bd2edbd59020 100644 --- a/games-strategy/freeorion/Manifest +++ b/games-strategy/freeorion/Manifest @@ -1,2 +1 @@ DIST freeorion-0.4.3.tar.bz2 171281552 SHA256 f0a61a42ba09ed2c8b453b734af7320582f8711913b741c5f9d86cad214bf7cf SHA512 87a73c97af14c0c81cfa19023aec410dd785988cab1edafb0e696305e6203fb431faddcc6ca2c4040e5ef0e8a228c2fda6ccf0f0ef93b47aa48ccd0758ecbe02 WHIRLPOOL 1761c2bf6d67fc93bb8e15b60c2dc23b1145e3d101fb1fde85996f94b83875a57d0c7e518e7b404a6d2098d6909feb8458b2630b6d6415c48fd6cc709165d9df -DIST freeorion-0.4.3.tar.bz2 171281552 SHA256 f0a61a42ba09ed2c8b453b734af7320582f8711913b741c5f9d86cad214bf7cf SHA512 87a73c97af14c0c81cfa19023aec410dd785988cab1edafb0e696305e6203fb431faddcc6ca2c4040e5ef0e8a228c2fda6ccf0f0ef93b47aa48ccd0758ecbe02 WHIRLPOOL 1761c2bf6d67fc93bb8e15b60c2dc23b1145e3d101fb1fde85996f94b83875a57d0c7e518e7b404a6d2098d6909feb8458b2630b6d6415c48fd6cc709165d9df diff --git a/games-strategy/freesynd/Manifest b/games-strategy/freesynd/Manifest index 063f3a2c76c3..7b2fae699435 100644 --- a/games-strategy/freesynd/Manifest +++ b/games-strategy/freesynd/Manifest @@ -1,4 +1,2 @@ DIST freesynd-0.7.1.tar.gz 2576695 SHA256 e55b0b3386cdace81fdcd8e33943535abf19ba0797b78c404689bcdd2c55f7de SHA512 b87e6adaf71206532b4f90cd230ca6be00438fe26f000c5a0bfebf2839fea80d78d98ddc27331a2224874338c3e14ffbfa58b8c5bdbdc53c93bba8d6a9e6b7b4 WHIRLPOOL c6b49b4971a4b6404006e3579fba23342cdb98119836f0db489d05db10ed8b45f8d4282f16b9cd726a810ec9eb6d06be95d3e0f67985e993a4010d97c715cf14 DIST freesynd-0.7.tar.gz 2567796 SHA256 7b21d55cd9f8b1113c578814081a35f66b403799024395ab9ec928fdaffbd216 SHA512 3a5c50770aeec2cebb80a1234368e9f2c8c7e5e5a1c32e57d7943341c18d0544ff3818580e3f10b70f95a36769ed735ccaa943d00ef9c1e58fae292b67648843 WHIRLPOOL 1c0f29fc7db1abdb9bfe6cf98afce48a10e8756193867725c1d4c15980cc42cce8789554ce4aa346295e7c410cd0c35059bc67bc7bfc535bddf76346c265cee8 -DIST freesynd-0.7.1.tar.gz 2576695 SHA256 e55b0b3386cdace81fdcd8e33943535abf19ba0797b78c404689bcdd2c55f7de SHA512 b87e6adaf71206532b4f90cd230ca6be00438fe26f000c5a0bfebf2839fea80d78d98ddc27331a2224874338c3e14ffbfa58b8c5bdbdc53c93bba8d6a9e6b7b4 WHIRLPOOL c6b49b4971a4b6404006e3579fba23342cdb98119836f0db489d05db10ed8b45f8d4282f16b9cd726a810ec9eb6d06be95d3e0f67985e993a4010d97c715cf14 -DIST freesynd-0.7.tar.gz 2567796 SHA256 7b21d55cd9f8b1113c578814081a35f66b403799024395ab9ec928fdaffbd216 SHA512 3a5c50770aee \ No newline at end of file diff --git a/games-strategy/gorky17-demo/Manifest b/games-strategy/gorky17-demo/Manifest index 28d872975fb8..dee44049db68 100644 --- a/games-strategy/gorky17-demo/Manifest +++ b/games-strategy/gorky17-demo/Manifest @@ -1,4 +1,2 @@ DIST gorky17-demo-1.0-1.0.1-x86.run 955547 SHA256 557bd97400101da9b557a5bfc5e6b9d352a9f10f79c927f31d74581ba7acc16b SHA512 ffd054aa1b169de5cca3c85d58ce2cba127f0caca533f8d4f0046ce63e5505a0ea25c3bbea9a2dde863a8fecefb7f8d322968f90ab3f688dee70a2f0d44826ba WHIRLPOOL c133f6175cfaf5e71c183687fa78b49ab7df1816f6ec9ee8696f9be0c7d5ea2b4e0d39decbb7561db9a7e5ceacb78958e11072fbc5812f7c6627b58dde03cf4a DIST gorky17_demo.run 158781516 SHA256 35cf62e06747bfe3445c1d3a61ad1644922528c264ff2ec7b5b510f9bc9dd51a SHA512 7e7bf2a6a9f815381381ef5c50135232db7c6ec734300b807794107ab1b902d659f55569ea03c7d68c3e6dbf98e366de8bca4fd13dac3c688ba48d2f244e9f00 WHIRLPOOL 5e4188d85efb60f3abaa56941a1005c14de26ba4a458cfb2dd3753cde825a1f3945351a06c82b934b4f1c94c9dacf1e2d9b00d17852eb1e140166131dab66192 -EBUILD gorky17-demo-1.0.1.0.1-r1.ebuild 2261 SHA256 e4768fb3764932c8fa4850909afed56b8025783b522de129d2a6ada41ffd7ea5 SHA512 ca3e503b27f41d9c46a241bbd0ac34b1af361f1eb91c37e031e398f6993f407f24dce0a1ddf154e0858d3a186f81414c10709f997b95ca12121735fdcfd88ca1 WHIRLPOOL d31102e46be5625b27501bb9e0893c36d1b86d852404cd70bb5e96281aaed9ae908ab5012ad3ad24DIST gorky17-demo-1.0-1.0.1-x86.run 955547 SHA256 557bd97400101da9b557a5bfc5e6b9d352a9f10f79c927f31d74581ba7acc16b SHA512 ffd054aa1b169de5cca3c85d58ce2cba127f0caca533f8d4f0046ce63e5505a0ea25c3bbea9a2dde863a8fecefb7f8d322968f90ab3f688dee70a2f0d44826ba WHIRLPOOL c133f6175cfaf5e71c183687fa78b49ab7df1816f6ec9ee8696f9be0c7d5ea2b4e0d39decbb7561db9a7e5ceacb78958e11072fbc5812f7c6627b58dde03cf4a -DIST gorky17_demo.run 158781516 SHA256 35cf62e06747bfe3445c1d3a61ad1644922528c264ff2ec7b5b510f9bc9dd51a SHA512 7e7bf2a6a9f815381381ef5c50135232db7c6ec734300b807794107ab1b902d659f55569ea03c7d68c3e6dbf98e366de8bca4fd13dac3c688ba48d2f244e9f00 WHIRLPOOL 5e4188d85efb60f3abaa56941a1005c14de26ba4a458cfb2dd3753cde825a1f3945351a06c82b934b4f1c94c9dacf1e2d9b00d17852eb1e140166131dab66192 diff --git a/games-strategy/hedgewars/hedgewars-0.9.20.5.ebuild b/games-strategy/hedgewars/hedgewars-0.9.20.5.ebuild index b413f3bb0057..478535f8531c 100644 --- a/games-strategy/hedgewars/hedgewars-0.9.20.5.ebuild +++ b/games-strategy/hedgewars/hedgewars-0.9.20.5.ebuild @@ -68,5 +68,7 @@ src_install() { dosym /usr/share/fonts/wqy-zenhei/wqy-zenhei.ttc \ "${GAMES_DATADIR}"/hedgewars/Data/Fonts/wqy-zenhei.ttc doicon misc/hedgewars.png - make_desktop_e# Copyright 1999-2014 Gentoo Foundation -# Distributed und \ No newline at end of file + make_desktop_entry ${PN} Hedgewars + doman man/${PN}.6 + prepgamesdirs +} diff --git a/games-strategy/heroes3/Manifest b/games-strategy/heroes3/Manifest index 96dbda5d3a72..7a9fbeb30a28 100644 --- a/games-strategy/heroes3/Manifest +++ b/games-strategy/heroes3/Manifest @@ -1,4 +1,2 @@ DIST heroes3-1.3.1a-cdrom-x86.run 3012188 SHA256 f87d78e09278e2f05cb15e2f79dfeaae2cef8fb147b83185dd4f818c0ab7759e DIST heroes3-1.3.1a-ppc.run 2643068 SHA256 b14eeb8eef705b20dbf54eb308b2232d6110f4ec568cb82d9ea9fb7f9cca3137 -DIST heroes3-1.3.1a-cdrom-x86.run 3012188 SHA256 f87d78e09278e2f05cb15e2f79dfeaae2cef8fb147b83185dd4f818c0ab7759e -DIST heroes3-1.3.1a-ppc.run 2643068 SHA256 b14eeb8eef705b20dbf54eb308b2232d6110f4ec568cb82d9ea9fb7f9cca3137 diff --git a/games-util/nml/files/nml-0.2.4-pillow.patch b/games-util/nml/files/nml-0.2.4-pillow.patch index d38d3efdadbb..648cfac54016 100644 --- a/games-util/nml/files/nml-0.2.4-pillow.patch +++ b/games-util/nml/files/nml-0.2.4-pillow.patch @@ -35,23 +35,33 @@ index cbee6d2..abbecda 100644 try: - import Image -+ from PIL import diff --git a/nml/actions/real_sprite.py b/nml/actions/real_sprite.py -index 6e03473..5ae2f26 100644 ---- a/nml/actions/real_sprite.py -+++ b/nml/actions/real_sprite.py -@@ -16,7 +16,8 @@ with NML; if not, write to the Free Software Foundation, Inc., - from nml import generic, expression - from nml.actions import base_action - from nml.ast import assignment --import os, Image -+import os -+from PIL import Image ++ from PIL import Image + except ImportError: + pass - palmap_d2w = [ - 0, 215, 216, 136, 88, 106, 32, 33, # 0..7 -diff --git a/nml/ast/alt_sprites.py b/nml/ast/alt_sprites.py -index 163bb23..fb12d0a 100644 ---- a/nml/ast/alt_sprites.py -+++ b/nml/ast/alt_sprites.py -@@ -16,7 +16,8 @@ with NML; if not, write to the Free Software Foundation, Inc., - from nml import expression, generic, global_consta \ No newline at end of file +diff --git a/nml/output_grf.py b/nml/output_grf.py +index 8f116aa..b5c05a8 100644 +--- a/nml/output_grf.py ++++ b/nml/output_grf.py +@@ -18,7 +18,7 @@ from nml import generic, palette, output_base, lz77, grfstrings + from nml.actions.real_sprite import palmap_w2d + + try: +- import Image ++ from PIL import Image + except ImportError: + pass + +diff --git a/nml/version_info.py b/nml/version_info.py +index da0ff94..b077baf 100644 +--- a/nml/version_info.py ++++ b/nml/version_info.py +@@ -45,7 +45,7 @@ def get_lib_versions(): + versions = {} + #PIL + try: +- import Image ++ from PIL import Image + versions["PIL"] = Image.VERSION + except ImportError: + versions["PIL"] = "Not found!" diff --git a/games-util/pyfa/files/pyfa-1.1.8-html-export-path.patch b/games-util/pyfa/files/pyfa-1.1.8-html-export-path.patch index 05b0891997a7..e7614d21aa4d 100644 --- a/games-util/pyfa/files/pyfa-1.1.8-html-export-path.patch +++ b/games-util/pyfa/files/pyfa-1.1.8-html-export-path.patch @@ -24,7 +24,10 @@ index 8f6e3a8..5ac386d 100644 def __init__(self): - serviceHTMLExportDefaultSettings = {"enabled": False, "path": config.pyfaPath + os.sep + 'pyfaFits.html' } -+ serviceHTMLExportDefaultSettings = {"enabled": False, "path": unicode(os.path.expanduser(os.path.join('~', 'pyfaFits.html')), sys.getfilesystemeFrom 017938391c5b67327c489a5c3a6fc720d4204609 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Mon, 16 Jul 2012 05:43:38 -0400 -Subject: [PATCH] Export fits to home directory, not \ No newline at end of file ++ serviceHTMLExportDefaultSettings = {"enabled": False, "path": unicode(os.path.expanduser(os.path.join('~', 'pyfaFits.html')), sys.getfilesystemencoding()) } + self.serviceHTMLExportSettings = SettingsProvider.getInstance().getSettings("pyfaServiceHTMLExportSettings", serviceHTMLExportDefaultSettings) + + def getEnabled(self): +-- +1.7.8.6 + diff --git a/games-util/uglygs/Manifest b/games-util/uglygs/Manifest index 00dc6239f42e..2d3c1abff16b 100644 --- a/games-util/uglygs/Manifest +++ b/games-util/uglygs/Manifest @@ -1,2 +1 @@ DIST uglygs-rc11.tar.gz 9066873 SHA256 a304e01e0a570ba5dcac3ac3f9d4ade23b7fbe3e40222f9d9510df14ae8e09f0 SHA512 2a57eb7a4562525c00c69a7874d32fa52d5f12cb2926dffcf4bc8ad74e5847a962c464426b476412bff369963ee40120c3dfc9c0b506606f8a4668bca88d1970 WHIRLPOOL 84cb1923886425dd35366370102660e6bca80c685dcd2ea9bbe94c25c83f9f6da30ea64972a3b35bff92c15b3d42cf418fe0579bbf0615d9a1a7f30b9058aabc -DIST uglygs-rc11.tar.gz 9066873 SHA256 a304e01e0a570ba5dcac3ac3f9d4ade23b7fbe3e40222f9d9510df14ae8e09f0 SHA512 2a57eb7a4562525c00c69 \ No newline at end of file diff --git a/games-util/xboxdrv/Manifest b/games-util/xboxdrv/Manifest index 312e5643cf7e..4f53fe707bcc 100644 --- a/games-util/xboxdrv/Manifest +++ b/games-util/xboxdrv/Manifest @@ -1 +1 @@ -DIST xboxdrv-linux-0.8.5.tar.bz2 265805 SHA256 411195c4f5310a1a5f21f015daaf00b277f75da89df710308f8abfcf8f337e78 SHA512 954a3664462dfeff63a455f3dfea4bc14f8c3e07fa9b0c299bb523b4089faad7f8d634511eb66c023bd289adbbf18e96ce26cbcf5b8ffc9bb3088f1afe532601 WHIRLPOOL f47cdbcf40bd237715ff2b55354c6570ebbccd9cd0beb09b91869fa37db247c57019593b \ No newline at end of file +DIST xboxdrv-linux-0.8.5.tar.bz2 265805 SHA256 411195c4f5310a1a5f21f015daaf00b277f75da89df710308f8abfcf8f337e78 SHA512 954a3664462dfeff63a455f3dfea4bc14f8c3e07fa9b0c299bb523b4089faad7f8d634511eb66c023bd289adbbf18e96ce26cbcf5b8ffc9bb3088f1afe532601 WHIRLPOOL f47cdbcf40bd237715ff2b55354c6570ebbccd9cd0beb09b91869fa37db247c57019593b317d2acd767044fe92019defa01c9592bb3b63d2283103ff10dae844 diff --git a/gnome-base/gnome-light/gnome-light-3.12.0.ebuild b/gnome-base/gnome-light/gnome-light-3.12.0.ebuild index b712e80a775c..4ef85240e52c 100644 --- a/gnome-base/gnome-light/gnome-light-3.12.0.ebuild +++ b/gnome-base/gnome-light/gnome-light-3.12.0.ebuild @@ -39,10 +39,13 @@ RDEPEND="!gnome-base/gnome >=x11-terms/gnome-terminal-${PV} " DEPEND="" -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-3.12.0.ebuild,v 1.3 2014/07/23 15:16:59 ago Exp $ - -EAPI="5" - -DESCRIPTION="Meta package for GNOME \ No newline at end of file +PDEPEND=">=gnome-base/gvfs-1.20.0" +S="${WORKDIR}" + +pkg_pretend() { + if ! use gnome-shell; then + # Users probably want to use e16, sawfish, etc + ewarn "You're installing neither GNOME Shell" + ewarn "You will have to install and manage a window manager by yourself" + fi +} diff --git a/gnome-base/libglade/libglade-2.6.4.ebuild b/gnome-base/libglade/libglade-2.6.4.ebuild index 2468cd0009cd..f6f5cb4217a3 100644 --- a/gnome-base/libglade/libglade-2.6.4.ebuild +++ b/gnome-base/libglade/libglade-2.6.4.ebuild @@ -2,12 +2,6 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/gnome-base/libglade/libglade-2.6.4.ebuild,v 1.17 2013/02/23 02:19:26 zmedico Exp $ -EAPI="3" -GCONF_DEBUG="no" -GNOME2_LA_PU# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/libglade/libglade-2.6.4.ebuild,v 1.17 2013/02/23 02:19:26 zmedico Exp $ - EAPI="3" GCONF_DEBUG="no" GNOME2_LA_PUNT="yes" @@ -76,4 +70,13 @@ pkg_postinst() { echo ">>> Updating XML catalog" "${EPREFIX}"/usr/bin/xmlcatalog --noout --add "system" \ "http://glade.gnome.org/glade-2.0.dtd" \ - "${EPREFIX}"/usr/share/xml/libg \ No newline at end of file + "${EPREFIX}"/usr/share/xml/libglade/glade-2.0.dtd /etc/xml/catalog + gnome2_pkg_postinst +} + +pkg_postrm() { + gnome2_pkg_postrm + echo ">>> removing entries from the XML catalog" + "${EPREFIX}"/usr/bin/xmlcatalog --noout --del \ + "${EPREFIX}"/usr/share/xml/libglade/glade-2.0.dtd /etc/xml/catalog +} diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.12.4.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.12.4.ebuild index 2a3299156c40..7a562f73a357 100644 --- a/gnome-extra/evolution-data-server/evolution-data-server-3.12.4.ebuild +++ b/gnome-extra/evolution-data-server/evolution-data-server-3.12.4.ebuild @@ -20,28 +20,6 @@ SLOT="0/49" # subslot = libcamel-1.2 soname version IUSE="api-doc-extras +gnome-online-accounts +gtk +introspection ipv6 ldap kerberos vala +weather" REQUIRED_USE="vala? ( introspection )" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-l# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.12.4.ebuild,v 1.3 2014/07/23 15:17:53 ago Exp $ - -EAPI="5" -GCONF_DEBUG="no" -# python3 not really supported, bug #478678 -PYTHON_COMPAT=( python2_7 pypy pypy2_0 ) -VALA_MIN_API_VERSION="0.18" -VALA_USE_DEPEND="vapigen" - -inherit db-use flag-o-matic gnome2 python-any-r1 vala virtualx - -DESCRIPTION="Evolution groupware backend" -HOMEPAGE="https://wiki.gnome.org/Apps/Evolution" - -# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+". -LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat" -SLOT="0/49" # subslot = libcamel-1.2 soname version -IUSE="api-doc-extras +gnome-online-accounts +gtk +introspection ipv6 ldap kerberos vala +weather" -REQUIRED_USE="vala? ( introspection )" - KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris" RDEPEND=" @@ -108,4 +86,43 @@ src_prepare() { src_configure() { # /usr/include/db.h is always db-1 on FreeBSD # so include the right dir in CPPFLAGS - appe \ No newline at end of file + append-cppflags "-I$(db_includedir)" + + # phonenumber does not exist in tree + gnome2_src_configure \ + $(use_enable api-doc-extras gtk-doc) \ + $(use_with api-doc-extras private-docs) \ + $(use_enable gnome-online-accounts goa) \ + $(use_enable gtk) \ + $(use_enable introspection) \ + $(use_enable ipv6) \ + $(use_with kerberos krb5 "${EPREFIX}"/usr) \ + $(use_with ldap openldap) \ + $(use_enable vala vala-bindings) \ + $(use_enable weather) \ + --enable-google \ + --enable-largefile \ + --enable-smime \ + --with-libdb="${EPREFIX}"/usr \ + --without-phonenumber \ + --disable-examples \ + --disable-uoa +} + +src_install() { + gnome2_src_install + + if use ldap; then + insinto /etc/openldap/schema + doins "${FILESDIR}"/calentry.schema + dosym /usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema + fi +} + +src_test() { + unset DBUS_SESSION_BUS_ADDRESS + unset ORBIT_SOCKETDIR + unset SESSION_MANAGER + unset DISPLAY + Xemake check +} diff --git a/gnome-extra/gnome-do/files/gnome-do-0.8.3.1-mono-2.8.patch b/gnome-extra/gnome-do/files/gnome-do-0.8.3.1-mono-2.8.patch index e32b73c38c96..2e492a87edde 100644 --- a/gnome-extra/gnome-do/files/gnome-do-0.8.3.1-mono-2.8.patch +++ b/gnome-extra/gnome-do/files/gnome-do-0.8.3.1-mono-2.8.patch @@ -3,32 +3,6 @@ https://bugs.launchpad.net/do/+bug/634550 Patches by Andrew Jorgensen ---- Do.Interface.Linux.Docky/src/Docky.Interface/TextRenderContext.cs 2009-06-28 18:19:29.000000000 -0600 -+++ Do.Interface.Linux.Docky/src/Docky.Interface/TextRenderContext.cs 2010-09-01 13:11:53.000000000 -0600 -@@ -45,12 +45,12 @@ - - public TextRenderContext (Cairo.Context cr, string text, int width) - { -- Context = cr; -- Text = text; -- Alignment = Alignment.Left; -- MaximumWidth = width; -- WrapMode = WrapMode.WordChar; -- EllipsizeMode = EllipsizeMode.End; -+ this.Context = cr; -+ this.Text = text; -+ this.Alignment = Alignment.Left; -+ this.MaximumWidth = width; -+ this.WrapMode = WrapMode.WordChar; -+ this.EllipsizeMode = EllipsizeMode.End; - } - } - } ---- Do/gtk-gui/Do.UI.ColorConfigurationWidget.cs 2009-06-28 18:19:29.000https://bugs.launchpad.net/do/+bug/634556 -https://bugs.launchpad.net/do/+bug/634550 - -Patches by Andrew Jorgensen - --- Do.Interface.Linux.Docky/src/Docky.Interface/TextRenderContext.cs 2009-06-28 18:19:29.000000000 -0600 +++ Do.Interface.Linux.Docky/src/Docky.Interface/TextRenderContext.cs 2010-09-01 13:11:53.000000000 -0600 @@ -45,12 +45,12 @@ @@ -79,4 +53,18 @@ Patches by Andrew Jorgensen // Widget Do.UI.KeybindingsPreferencesWidget Stetic.BinContainer.Attach(this); - this.Name = "Do.UI.KeybindingsPreferencesWidget"; -+ base.Name = "Do \ No newline at end of file ++ base.Name = "Do.UI.KeybindingsPreferencesWidget"; + // Container child Do.UI.KeybindingsPreferencesWidget.Gtk.Container+ContainerChild + this.vbox2 = new Gtk.VBox(); + this.vbox2.Name = "vbox2"; +--- Do/gtk-gui/Do.UI.ManagePluginsPreferencesWidget.cs 2009-06-28 18:19:29.000000000 -0600 ++++ Do/gtk-gui/Do.UI.ManagePluginsPreferencesWidget.cs 2010-09-01 13:59:19.000000000 -0600 +@@ -43,7 +43,7 @@ + Stetic.Gui.Initialize(this); + // Widget Do.UI.ManagePluginsPreferencesWidget + Stetic.BinContainer.Attach(this); +- this.Name = "Do.UI.ManagePluginsPreferencesWidget"; ++ base.Name = "Do.UI.ManagePluginsPreferencesWidget"; + // Container child Do.UI.ManagePluginsPreferencesWidget.Gtk.Container+ContainerChild + this.vbox3 = new Gtk.VBox(); + this.vbox3.Name = "vbox3"; diff --git a/gnustep-apps/gspdf/Manifest b/gnustep-apps/gspdf/Manifest index 5535a9a842a8..760b4d0870a6 100644 --- a/gnustep-apps/gspdf/Manifest +++ b/gnustep-apps/gspdf/Manifest @@ -1,4 +1,2 @@ DIST GSPdf-0.4.tar.gz 42251 RMD160 c152bc1ac549fd07b6448154908b4394a7dc0f5d SHA1 4e4d5aa339bb0709d13735be21a8c55ddd29cd45 SHA256 22b84a573c5ef9f7409dbc834d37e1052675b09ff90127584ebca3fee560a8d6 -DIST GSPdf-0.5.tar.gz 44357 RMD160 e499aa802904855175a9fda1e06fed133f-----BEGIN PGP SIGNED MESSAGE----- -DIST GSPdf-0.4.tar.gz 42251 RMD160 c152bc1ac549fd07b6448154908b4394a7dc0f5d SHA1 4e4d5aa339bb0709d13735be21a8c55ddd29cd45 SHA256 22b84a573c5ef9f7409dbc834d37e1052675b09ff90127584ebca3fee560a8d6 DIST GSPdf-0.5.tar.gz 44357 RMD160 e499aa802904855175a9fda1e06fed133f91eafc SHA1 eb20296a151ddaeb716aee502bd58e7fef536f94 SHA256 b85e2184e90a46aa054d1bf6577fb19f0c3bd953f0e4ff1b8656528d0dfcf88b diff --git a/gnustep-apps/mpdcon/Manifest b/gnustep-apps/mpdcon/Manifest index 73fe42305133..8b4f7f69ad3f 100644 --- a/gnustep-apps/mpdcon/Manifest +++ b/gnustep-apps/mpdcon/Manifest @@ -1,2 +1 @@ DIST MPDCon-1.5.1.tar.gz 90845 SHA256 24afca2f8bee967849e28d046dcfc364e26d2dd26ab3c027de2987c89b7ee8da SHA512 b47c6d603938ace1561fc01ef400a4f217035692eeb2552d59bc924ba20f3e67508a0e6da0e6805ef3ec67e19ba33a5028721ec9294a67419d9ce97c5d4ce6c1 WHIRLPOOL 684941e96d43f537cf4c97a464387b1a91bdc92f2f433eb0da54922e80f7e5330b708ac92b5178898d506bb60c557b1251424d32f984d17c7b470f111ff8362e -DIST MPDCon-1.5.1.tar.gz 90845 SHA256 24afca2f8bee967849e28d046dcfc364e26d2dd26ab3c027de2987c89b7ee8da SHA512 b47c6d603938ace1561fc01ef400a4f217035692eeb2552d59bc924ba20f3e67508a0e6da0e6805ef3ec67e19ba33a5028721ec9294a67419d9ce97c5d4ce6c1 WHIRLPOOL 684941e96d43f537cf4c97a464387b1a91bdc92f2f433eb0da54922e80f7e5330b708ac92b5178898d506bb60c557b1251424d32f984d17c7b470f111ff8362e diff --git a/gnustep-base/gnustep-back-art/gnustep-back-art-0.23.0.ebuild b/gnustep-base/gnustep-back-art/gnustep-back-art-0.23.0.ebuild index 022fe7c88ad7..d0eca6c0c48e 100644 --- a/gnustep-base/gnustep-back-art/gnustep-back-art-0.23.0.ebuild +++ b/gnustep-base/gnustep-back-art/gnustep-back-art-0.23.0.ebuild @@ -14,36 +14,6 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" IUSE="opengl xim" -RDEPEND="${GNUSTEP_CORE_DEPEND} - =gnustep-base/gnustep-gui-${PV%.*}* - opengl? ( virtual/opengl virtual/glu ) - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXmu - x11-libs/libXt - x11-libs/libXft - x11-libs/libXrender - >=media-libs/freetype-2.1.9 - - >=media-libs/libar# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-art/gnustep-back-art-0.23.0.ebuild,v 1.1 2013/03/08 15:43:29 voyageur Exp $ - -EAPI=5 -inherit gnustep-base - -DESCRIPTION="libart_lgpl back-end component for the GNUstep GUI Library" -HOMEPAGE="http://www.gnustep.org" -SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${PV}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="opengl xim" - RDEPEND="${GNUSTEP_CORE_DEPEND} =gnustep-base/gnustep-gui-${PV%.*}* opengl? ( virtual/opengl virtual/glu ) @@ -80,4 +50,35 @@ src_configure() { } src_compile() { - gnustep-base_src_compi \ No newline at end of file + gnustep-base_src_compile + + # Create font lists for DejaVu + einfo "Generating nfonts support files" + ( + cd Fonts + export "${GS_ENV[@]}" + ${GNUSTEP_SYSTEM_TOOLS}/mknfonts \ + $(fc-list : file|grep -v '\.gz'|cut -d: -f1) \ + || die "nfonts support files creation failed" + # Trim whitepsaces + for fdir in *\ */; do + mv "$fdir" `echo $fdir | tr -d [:space:]` + done + ) +} + +src_install() { + gnustep-base_src_install + + mkdir -p "${D}/${GNUSTEP_SYSTEM_LIBRARY}/Fonts" + cp -pPR Fonts/*.nfont "${D}/${GNUSTEP_SYSTEM_LIBRARY}/Fonts" +} + +gnustep_config_script() { + echo "echo ' * setting normal font to DejaVuSans'" + echo "defaults write NSGlobalDomain NSFont DejaVuSans" + echo "echo ' * setting bold font to DejaVuSans-Bold'" + echo "defaults write NSGlobalDomain NSBoldFont DejaVuSans-Bold" + echo "echo ' * setting fixed font to DejaVuSansMono'" + echo "defaults write NSGlobalDomain NSUserFixedPitchFont DejaVuSansMono" +} diff --git a/gnustep-libs/performance/Manifest b/gnustep-libs/performance/Manifest index e4d9ea61f9d3..31761711e417 100644 --- a/gnustep-libs/performance/Manifest +++ b/gnustep-libs/performance/Manifest @@ -1,2 +1 @@ DIST Performance-0.4.0.tar.gz 48527 SHA256 e55c1a8d9e6f1e3ba146490d1b0cf7b84e124410a50070ab3b27ecfc4aab6a1c SHA512 0c590508f2c58501969e8a1233663521274833d0915a671b1f81daf283770b0e98892e5ec447a07e0ede767b1c4f2bf2f2ac52bc6c48b413ff02085ced34a22c WHIRLPOOL 9b353d649fb7c280c370ed76d467b7dea1d70c6ed5dd265c56987744c0029a89cba1aebd17802e595cbd9338f6a36de62f97013df9eed211f4ebcfad18e06c9d -DIST Performance-0.4.0.tar.gz 48527 SHA256 e55c1a8d9e6f1e3ba146490d1b0cf7b84e124410a50070ab3b27ecfc4aab6a1c SHA512 0c590508f2c58501969e8a1233663521274833d0915a671b1f81daf283770b0e98892e5ec447a07e0ede767b \ No newline at end of file diff --git a/kde-base/dolphin/dolphin-4.12.5.ebuild b/kde-base/dolphin/dolphin-4.12.5.ebuild index a885c1cea2b0..642fbfe0c248 100644 --- a/kde-base/dolphin/dolphin-4.12.5.ebuild +++ b/kde-base/dolphin/dolphin-4.12.5.ebuild @@ -13,23 +13,6 @@ HOMEPAGE="http://dolphin.kde.org http://www.kde.org/applications/system/dolphin" KEYWORDS=" amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux" IUSE="debug semantic-desktop thumbnail" -DEPEND=" - $(add_kdebase_dep kactivities) - $(add_kdebase_dep kdelibs 'semant# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/dolphin-4.12.5.ebuild,v 1.6 2014/05/12 01:51:33 reavertm Exp $ - -EAPI=5 - -KDE_HANDBOOK="optional" -KMNAME="kde-baseapps" -inherit kde4-meta - -DESCRIPTION="A KDE filemanager focusing on usability" -HOMEPAGE="http://dolphin.kde.org http://www.kde.org/applications/system/dolphin" -KEYWORDS=" amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="debug semantic-desktop thumbnail" - DEPEND=" $(add_kdebase_dep kactivities) $(add_kdebase_dep kdelibs 'semantic-desktop?') @@ -39,4 +22,37 @@ DEPEND=" >=dev-libs/shared-desktop-ontologies-0.11.0 dev-libs/soprano $(add_kdebase_dep nepomuk-core) - $(add_kdebase_dep nepomuk-widget \ No newline at end of file + $(add_kdebase_dep nepomuk-widgets) + ) +" +RDEPEND="${DEPEND} + $(add_kdebase_dep kfind) + thumbnail? ( + $(add_kdebase_dep thumbnailers) + || ( + $(add_kdebase_dep ffmpegthumbs) + $(add_kdebase_dep mplayerthumbs) + ) + ) +" + +RESTRICT="test" +# bug 393129 + +src_configure() { + mycmakeargs=( + $(cmake-utils_use_with semantic-desktop NepomukCore) + $(cmake-utils_use_with semantic-desktop NepomukWidgets) + $(cmake-utils_use_with semantic-desktop Soprano) + ) + + kde4-meta_src_configure +} + +pkg_postinst() { + kde4-base_pkg_postinst + + if ! has_version media-gfx/icoutils ; then + elog "For .exe file preview support, install media-gfx/icoutils." + fi +} diff --git a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.12.5.ebuild b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.12.5.ebuild index 2b4cf4b17ee5..c718f30c4cee 100644 --- a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.12.5.ebuild +++ b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.12.5.ebuild @@ -31,10 +31,16 @@ DEPEND="${RDEPEND} " PATCHES=( "${FILESDIR}/${PN}-xscreensaver.patch" - "${FILESDI# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.12.5.ebuild,v 1.5 2014/05/08 07:32:54 ago Exp $ + "${FILESDIR}/${PN}-4.5.95-webcollage.patch" ) -EAPI=5 +src_configure() { + mycmakeargs=( + -DKSCREENSAVER_SOUND_SUPPORT=ON + -DOPENGL=ON + $(cmake-utils_use_with eigen Eigen2) + $(cmake-utils_use_with kexiv2) + $(cmake-utils_use_with xscreensaver) + ) -KM \ No newline at end of file + kde4-meta_src_configure +} diff --git a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.13.3.ebuild b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.13.3.ebuild index b0b2ef08763a..34bf751d83ad 100644 --- a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.13.3.ebuild +++ b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.13.3.ebuild @@ -23,24 +23,26 @@ RDEPEND=" $(add_kdebase_dep kdontchangethehostname) $(add_kdebase_dep keditfiletype) $(add_kdebase_dep kfile) - $(add_kdebase_d# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.13.3.ebuild,v 1.1 2014/07/16 17:41:00 johu Exp $ - -EAPI=5 -inherit kde4-meta-pkg - -DESCRIPTION="Merge this to pull in all kdebase-runtime-derived packages" -KEYWORDS=" ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="+crash-reporter +handbook nepomuk" - -RDEPEND=" - $(add_kdebase_dep attica) - $(add_kdebase_dep kcmshell) - $(add_kdebase_dep kcontrol) - $(add_kdebase_dep kdebase-data) - $(add_kdebase_dep kdebase-desktoptheme) - $(add_kdebase_dep kdebase-kioslaves) - $(add_kdebase_dep kdebase-menu) - $(add_kdebase_dep kdebase-menu-icons) - $ \ No newline at end of file + $(add_kdebase_dep kglobalaccel) + $(add_kdebase_dep kiconfinder) + $(add_kdebase_dep kimgio) + $(add_kdebase_dep kioclient) + $(add_kdebase_dep kmimetypefinder) + $(add_kdebase_dep knetattach) + $(add_kdebase_dep knewstuff) + $(add_kdebase_dep kpasswdserver) + $(add_kdebase_dep kquitapp) + $(add_kdebase_dep kstart) + $(add_kdebase_dep ktimezoned) + $(add_kdebase_dep ktraderclient) + $(add_kdebase_dep kuiserver) + $(add_kdebase_dep kurifilter-plugins) + $(add_kdebase_dep kwalletd) + $(add_kdebase_dep kwalletmanager) + $(add_kdebase_dep plasma-runtime) + $(add_kdebase_dep renamedlg-plugins) + $(add_kdebase_dep solid-runtime) + crash-reporter? ( $(add_kdebase_dep drkonqi ) ) + handbook? ( $(add_kdebase_dep khelpcenter) ) + nepomuk? ( $(add_kdebase_dep nepomuk) ) +" diff --git a/kde-base/kdegames-meta/kdegames-meta-4.13.3.ebuild b/kde-base/kdegames-meta/kdegames-meta-4.13.3.ebuild index e209ace256ba..30a59976a989 100644 --- a/kde-base/kdegames-meta/kdegames-meta-4.13.3.ebuild +++ b/kde-base/kdegames-meta/kdegames-meta-4.13.3.ebuild @@ -26,27 +26,30 @@ RDEPEND=" $(add_kdebase_dep killbots) $(add_kdebase_dep kigo) $(add_kdebase_dep kiriki) - $(add_kdebase_de# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames-meta/kdegames-meta-4.13.3.ebuild,v 1.1 2014/07/16 17:40:34 johu Exp $ - -EAPI=5 -inherit kde4-meta-pkg - -DESCRIPTION="kdegames - merge this to pull in all kdegames-derived packages" -HOMEPAGE="http://games.kde.org/" -KEYWORDS=" ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="opengl python" - -RDEPEND=" - $(add_kdebase_dep bomber) - $(add_kdebase_dep bovo) - $(add_kdebase_dep granatier) - $(add_kdebase_dep kapman) - $(add_kdebase_dep katomic) - $(add_kdebase_dep kblackbox) - $(add_kdebase_dep kblocks) - $(add_kdebase_dep kbounce) - $(add_kdebase_dep kbreakout) - $(add_kdebase_dep kdiamond) - $(add_kdeb \ No newline at end of file + $(add_kdebase_dep kjumpingcube) + $(add_kdebase_dep klickety) + $(add_kdebase_dep klines) + $(add_kdebase_dep kmahjongg) + $(add_kdebase_dep kmines) + $(add_kdebase_dep knavalbattle) + $(add_kdebase_dep knetwalk) + $(add_kdebase_dep kolf) + $(add_kdebase_dep kollision) + $(add_kdebase_dep konquest) + $(add_kdebase_dep kpat) + $(add_kdebase_dep kreversi) + $(add_kdebase_dep kshisen) + $(add_kdebase_dep ksirk) + $(add_kdebase_dep ksnakeduel) + $(add_kdebase_dep kspaceduel) + $(add_kdebase_dep ksquares) + $(add_kdebase_dep ktuberling) + $(add_kdebase_dep kubrick) + $(add_kdebase_dep libkdegames) + $(add_kdebase_dep libkmahjongg) + $(add_kdebase_dep lskat) + $(add_kdebase_dep palapeli) + $(add_kdebase_dep picmi) + opengl? ( $(add_kdebase_dep ksudoku) ) + python? ( $(add_kdebase_dep kajongg) ) +" diff --git a/kde-base/kdepim-runtime/files/4.4/0001-Less-warnings-when-building-against-a-new-kdepimlibs.patch b/kde-base/kdepim-runtime/files/4.4/0001-Less-warnings-when-building-against-a-new-kdepimlibs.patch index 84ca04cd18b8..662f38f17261 100644 --- a/kde-base/kdepim-runtime/files/4.4/0001-Less-warnings-when-building-against-a-new-kdepimlibs.patch +++ b/kde-base/kdepim-runtime/files/4.4/0001-Less-warnings-when-building-against-a-new-kdepimlibs.patch @@ -16,7 +16,9 @@ index 9fd1b37..a746796 100644 +add_definitions(-DWANT_DEPRECATED_KCAL_API) +add_definitions(-DWANT_DEPRECATED_KABC_API) +add_definitions(-DWANT_DEPRECATED_KRESOURCE_API) - include_direcFrom ab29b74fe8ec830c6d4c896900939c98d22c0e96 Mon Sep 17 00:00:00 2001 -From: Thomas McGuire -Date: Mon, 25 Apr 2011 00:36:43 +0100 -Subject: [PATCH 1/2] Less warnings when building against a new kdepimlibs \ No newline at end of file + include_directories (${kdepim-runtime_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} ${QT_QTDBUS_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/shared) + + # include (ConfigureChecks.cmake) +-- +1.7.9.2 + diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.12.5.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.12.5.ebuild index 5caf828f19b8..e2a516b88257 100644 --- a/kde-base/kdepim-runtime/kdepim-runtime-4.12.5.ebuild +++ b/kde-base/kdepim-runtime/kdepim-runtime-4.12.5.ebuild @@ -7,16 +7,6 @@ EAPI=5 KMNAME="kdepim-runtime" inherit kde4-base -DESCRIPTION="KDE PIM runtime plugin collection" -KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/kdepim-runtime-4.12.5.ebuild,v 1.5 2014/05/08 07:32:07 ago Exp $ - -EAPI=5 - -KMNAME="kdepim-runtime" -inherit kde4-base - DESCRIPTION="KDE PIM runtime plugin collection" KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux" IUSE="debug facebook google kolab" @@ -35,4 +25,20 @@ DEPEND=" x11-misc/shared-mime-info facebook? ( net-libs/libkfbapi ) google? ( >=net-libs/libkgapi-2.0 ) - kol \ No newline at end of file + kolab? ( net-libs/libkolab ) +" +RDEPEND="${DEPEND} + $(add_kdebase_dep kdepim-icons) + !kde-misc/akonadi-google +" + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package facebook LibKFbAPI) + $(cmake-utils_use_find_package google LibKGAPI2) + $(cmake-utils_use_find_package kolab Libkolab) + $(cmake-utils_use_find_package kolab Libkolabxml) + ) + + kde4-base_src_configure +} diff --git a/kde-base/korundum/korundum-4.14.0.ebuild b/kde-base/korundum/korundum-4.14.0.ebuild index 0f22fdd23bd7..16c385fad4ee 100644 --- a/kde-base/korundum/korundum-4.14.0.ebuild +++ b/kde-base/korundum/korundum-4.14.0.ebuild @@ -54,12 +54,19 @@ each_ruby_configure() { $(cmake-utils_use_with akonadi) $(cmake-utils_use_with akonadi KdepimLibs) $(cmake-utils_use_with nepomuk) - $(cmake-util# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/korundum/korundum-4.14.0.ebuild,v 1.1 2014/08/20 16:02:51 johu Exp $ - -EAPI=5 + $(cmake-utils_use_with nepomuk Soprano) + $(cmake-utils_use_disable kate) + $(cmake-utils_use_with okular) + ) + kde4-base_src_configure +} -OPENGL_REQUIRED="always" +each_ruby_compile() { + CMAKE_USE_DIR=${S} + kde4-base_src_compile +} -USE_RU \ No newline at end of file +each_ruby_install() { + CMAKE_USE_DIR=${S} + kde4-base_src_install +} diff --git a/kde-base/libkdepim/Manifest b/kde-base/libkdepim/Manifest index 970a2f4cb8f0..03fb79a041d3 100644 --- a/kde-base/libkdepim/Manifest +++ b/kde-base/libkdepim/Manifest @@ -1,2 +1 @@ DIST kdepim-4.4.11.1.tar.bz2 8964708 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf SHA512 7450ba9985c5583847d1fc3d214940cef130150a3591c3cbb73bc15624ee0298805d5dc25f3cd3a135091c1d0491b865961d52aa8feef623219eed9364dd86bf WHIRLPOOL 349a72c5c6859c7cafb1aefdf80b80482102c8b1d6e0123c6c410d262c3908b9572daa1950e2fb41e6bc727430fc91bb57b7276e345553ed15d792fa63aba5ec -DIST kdepim-4.4.11.1.tar.bz2 8964708 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf SHA512 7450ba9985c5583847d1fc3d214940cef130150a3591c3cbb73bc15624ee0298805d5dc25f3cd3a135091c1d0491b865961d52aa8feef623219eed9364dd86bf WHIRLPOOL 349a72c5c6859c7cafb1aefdf80b80482102c8b1d6e0123c6c410d262c3908b9572daa1950e2fb41e6bc727430fc91bb57b7276e345553ed15d792fa63aba5ec diff --git a/kde-base/libkpgp/Manifest b/kde-base/libkpgp/Manifest index b894a6611c5c..03fb79a041d3 100644 --- a/kde-base/libkpgp/Manifest +++ b/kde-base/libkpgp/Manifest @@ -1,2 +1 @@ DIST kdepim-4.4.11.1.tar.bz2 8964708 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf SHA512 7450ba9985c5583847d1fc3d214940cef130150a3591c3cbb73bc15624ee0298805d5dc25f3cd3a135091c1d0491b865961d52aa8feef623219eed9364dd86bf WHIRLPOOL 349a72c5c6859c7cafb1aefdf80b80482102c8b1d6e0123c6c410d262c3908b9572daa1950e2fb41e6bc727430fc91bb57b7276e345553ed15d792fa63aba5ec -DIST kdepim-4.4.11.1.tar.bz2 8964708 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf SHA512 7450ba9985c5583847d1fc3d214940cef130150a3591c3cbb73bc15624ee0298805d5dc25f3cd3a135091c1d0491b865961d52aa8feef623219eed9364dd86bf WHIRLPOOL 349a72c5c6859c \ No newline at end of file diff --git a/kde-base/okular/okular-4.14.1.ebuild b/kde-base/okular/okular-4.14.1.ebuild index 5c4549ccba42..7103e945320c 100644 --- a/kde-base/okular/okular-4.14.1.ebuild +++ b/kde-base/okular/okular-4.14.1.ebuild @@ -41,19 +41,17 @@ src_configure() { local mycmakeargs=( $(cmake-utils_use_with chm) $(cmake-utils_use_with crypt QCA2) -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/okular-4.14.1.ebuild,v 1.1 2014/09/16 18:17:30 johu Exp $ - -EAPI=5 - -KDE_HANDBOOK="optional" - -#VIRTUALX_REQUIRED=test -RESTRICT=test -# test 2: parttest hangs - -inherit kde4-base + $(cmake-utils_use_with djvu DjVuLibre) + $(cmake-utils_use_with dpi LibKScreen) + $(cmake-utils_use_with ebook EPub) + $(cmake-utils_use_with jpeg) + $(cmake-utils_use_with jpeg Kexiv2) + $(cmake-utils_use_with mobi QMobiPocket) + $(cmake-utils_use_with postscript LibSpectre) + $(cmake-utils_use_with pdf PopplerQt4) + $(cmake-utils_use_with pdf Poppler) + $(cmake-utils_use_with tiff) + ) -DESCRIPTION="Okular is a universal document viewer based on KPDF for KDE 4" -HOMEPAGE="h \ No newline at end of file + kde4-base_src_configure +} diff --git a/kde-base/smokeqt/smokeqt-4.12.5.ebuild b/kde-base/smokeqt/smokeqt-4.12.5.ebuild index 0099d9c1a33c..f965a8d8de40 100644 --- a/kde-base/smokeqt/smokeqt-4.12.5.ebuild +++ b/kde-base/smokeqt/smokeqt-4.12.5.ebuild @@ -4,12 +4,6 @@ EAPI=5 -DECLARATIVE_REQUIRED="# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/smokeqt/smokeqt-4.12.5.ebuild,v 1.5 2014/05/08 07:32:23 ago Exp $ - -EAPI=5 - DECLARATIVE_REQUIRED="optional" MULTIMEDIA_REQUIRED="optional" QTHELP_REQUIRED="optional" @@ -49,4 +43,11 @@ src_configure() { $(cmake-utils_use_disable multimedia QtMultimedia) $(cmake-utils_use_disable opengl QtOpenGL) $(cmake-utils_use_with phonon) - $(cm \ No newline at end of file + $(cmake-utils_use_with qimageblitz QImageBlitz) + $(cmake-utils_use_with qscintilla QScintilla) + $(cmake-utils_use_disable qthelp QtHelp) + $(cmake-utils_use_disable qwt Qwt5) + $(cmake-utils_use_disable webkit QtWebKit) + ) + kde4-base_src_configure +} diff --git a/kde-base/smokeqt/smokeqt-4.14.0.ebuild b/kde-base/smokeqt/smokeqt-4.14.0.ebuild index 0bdc27d2ae29..23211e08270d 100644 --- a/kde-base/smokeqt/smokeqt-4.14.0.ebuild +++ b/kde-base/smokeqt/smokeqt-4.14.0.ebuild @@ -25,28 +25,29 @@ DEPEND=" || ( ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 ) notice: Copyright (c) 1992 by I. Lee Hetherington, all rights reserved. Permission is hereby granted to use, modify, and distribute this program - for any purpose provided this copyright noticThe following copyright notice applies \ No newline at end of file + for any purpose provided this copyright notice and the one below remain + intact. + diff --git a/lxqt-base/lxqt-policykit/Manifest b/lxqt-base/lxqt-policykit/Manifest index ee3f03b403ad..1cfbc0810f5c 100644 --- a/lxqt-base/lxqt-policykit/Manifest +++ b/lxqt-base/lxqt-policykit/Manifest @@ -1,2 +1 @@ DIST lxqt-policykit-0.7.0.tar.xz 15772 SHA256 1b93a2e5e9f70246f16198a07a49b3c2d16089d6ea413bdff25e4ec763763d86 SHA512 8e5ff42d4e74d648ad9b159d6140afeaffd8094bd3a92c30b5faf2d5aa8e719cb9b1c8345ed6ee92f603c7f7b88224873a791b2300bca4b49a1f53b4586f26c9 WHIRLPOOL 971eec6ef31937af95927a2abb666293a2d57bcc365f68696c288ce7dbe7473804352468d48bc40675ca8d6723b5591881cbce6987092589e703ce0a7cc2401c -MISC metadata.xml 263 SHA256 d23df106b61ed123144d9d24eea822badfbe6cb7d8d4ec61215af73b4c8f1fc6 SHA512 9f99b13f568e1cDIST lxqt-policykit-0.7.0.tar.xz 15772 SHA256 1b93a2e5e9f70246f16198a07a49b3c2d16089d6ea413bdff25e4ec763763d86 SHA512 8e5ff42d4e74d648ad9b159d6140afeaffd8094bd3a92c30b5faf2d5aa8e719cb9b1c8345ed6ee92f603c7f7b88224873a791b2300bca4b49a1f53b4586f26c9 WHIRLPO \ No newline at end of file diff --git a/lxqt-base/lxqt-powermanagement/Manifest b/lxqt-base/lxqt-powermanagement/Manifest index a4f8fed1a01c..b6289f7c2e21 100644 --- a/lxqt-base/lxqt-powermanagement/Manifest +++ b/lxqt-base/lxqt-powermanagement/Manifest @@ -1,2 +1 @@ DIST lxqt-powermanagement-0.7.0.tar.xz 29336 SHA256 7f0456b9bcf416adb1e1c5c797a688bcd276680f0821e165b346364cd2926f87 SHA512 973332d331d3a8b794d06523e623650a38b019f03c40bff8519036c314c9835101e51fafe34a76e755c5e7e85d963e481d4b3562e4d2f4a08fab4c3f60b7fbde WHIRLPOOL 6156238d287ead2a83743552bdd030f5a60b30cd0dc2d19f183b878fb9e31fbdb77b101d14c4e0d9e37d2a95f5958b22e21a1376fe2d8345c9f9fe1ae032901e -DIST lxqt-powermanagement-0.7.0.tar.xz 29336 SHA256 7f0456b9bcf416adb1e1c5c797a688bcd276680f0821e165b346364cd2926f87 SHA512 973332d331d3a8b794d06523e623650a38b019f03c40bff8519036c314c9835101e51fafe34a76e755c5e7e85d963e481d4b3562e4d2f4a08fab4c3f60b7fbde WHIRLPOOL 6156238d287ead2a83743552bdd030f5a60b30cd0dc2d19f183b878fb9e31fbdb77b101d14c4e0d9e37d2a95f5958b22e21a1376fe2d8345c9f9fe1ae032901e diff --git a/lxqt-base/lxqt-qtplugin/Manifest b/lxqt-base/lxqt-qtplugin/Manifest index 09364a309a70..843e5a33b838 100644 --- a/lxqt-base/lxqt-qtplugin/Manifest +++ b/lxqt-base/lxqt-qtplugin/Manifest @@ -1,2 +1 @@ DIST lxqt-qtplugin-0.7.0.tar.xz 11980 SHA256 fb9780ff79f2cd02bc75329d26e1b78a72447cc31d19ee85c079bd175293f7c9 SHA512 15a738b3d79320cd01fbe108f83ceb1fdfad9fc03e3647b3436e8d7936063b47f80f0eacf920420404e0d10046568a859e98a66d747b3fa0f1ff2be3e8920bf2 WHIRLPOOL fe46394ff1e2f7967f2cdac0b7a5357bb6b7ea6accfdb4d651e54932d6cec348acd26f76f23bd3cbf58bc06ff0fb7ab2537fa5aacd23d897a9f878c71103c6e5 -MISC metadata.xml 263 SHA256 d23df106b61ed123144d9d24eea822badfbe6cb7d8d4ec61215af73b4c8f1fc6 SHA512 9f99b13f568e1cfda82dc35cd0bDIST lxqt-qtplugin-0.7.0.tar.xz 11980 SHA256 fb9780ff79f2cd02bc75329d26e1b78a72447cc31d19ee85c079bd175293f7c9 SHA512 15a738b3d79320cd01fbe108f83ceb1fdfad9fc03e3647b3436e8d7936063b47f80f0eacf920420404e0d10046568a859e98a66d747b3fa0f1ff2be3e892 \ No newline at end of file diff --git a/lxqt-base/lxqt-session/Manifest b/lxqt-base/lxqt-session/Manifest index 4614dd90d1cd..8fe39168e8c2 100644 --- a/lxqt-base/lxqt-session/Manifest +++ b/lxqt-base/lxqt-session/Manifest @@ -1,2 +1 @@ DIST lxqt-session-0.7.0.tar.xz 68208 SHA256 d6af28a6054555acf1a2e47c839d6802e5a88b237cdcd8d2ee3155661bbdd6d6 SHA512 0a1fcdf9669295c5651ce21ee377997c5dbea147576bd26bd146642a23ecec1a402e209a0244a8798e481567f38499a6cc56887193b1b4bea07d746a15e5f94a WHIRLPOOL 0c20d15631ba575609f5b76a3d1054c048d721571e2b3fa9992e4b7e3fb8cf1d9642bf4268bad0ad3d00acede18c9bc5eff27f4a43ef3013bfb1570668a07364 -DIST lxqt-session-0.7.0.tar.xz 68208 SHA256 d6af28a6054555acf1a2e47c839d6802e5a88b237cdcd8d2ee3155661bbdd6d6 SHA512 0a1fcdf9669295c5651ce21ee377997c5dbea147576bd26bd146642a23ecec1a402e209a0244a8798e481567f38499a6cc56887193b1b4bea07d746a15e5f94a WHIRLPOOL 0c20d15631ba575609f5b76a3d1054c048d721571e2b3fa9992e4b7e3fb8cf1d9642bf4268bad0ad3d00acede18c9bc5eff27f4a43ef3013bfb1570668a07364 diff --git a/mail-filter/anubis/anubis-4.1.1.ebuild b/mail-filter/anubis/anubis-4.1.1.ebuild index 1c2fc9245ee3..89b091d59e1e 100644 --- a/mail-filter/anubis/anubis-4.1.1.ebuild +++ b/mail-filter/anubis/anubis-4.1.1.ebuild @@ -54,25 +54,41 @@ src_configure() { fi econf --with-unprivileged-user=anubis \ --disable-rpath \ - $(use_with my# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/anubis/anubis-4.1.1.ebuild,v 1.5 2014/08/10 21:15:20 slyfox Exp $ + $(use_with mysql) \ + $(use_with postgres) \ + $(use_with pam) \ + $(use_with pcre) \ + $(use_enable nls) \ + $(use_with guile) \ + $(use_with sasl gsasl) \ + $(use_with gnutls) \ + $(use_with tcpd tcp-wrappers) \ + $(use_with socks5 socks-proxy) \ + ${myconf} +} -EAPI=4 -inherit eutils autotools pam user +src_compile() { + # parallel make fails + emake -j1 +} -DESCRIPTION="GNU Anubis is an outgoing mail processor" -HOMEPAGE="http://www.gnu.org/software/anubis/" +src_test() { + cd "${S}/testsuite" + emake -j1 check +} -SRC_URI="mirror://gnu/anubis/${P}.tar.gz" -LICENSE="GPL-2" +src_install() { + emake DESTDIR="${D}" install -SLOT="0" -KEYWORDS="ppc x86" -IUSE="crypt guile mysql postgres nls pam pcre sasl socks5 +gnutls tcpd test" + dodoc AUTHORS ChangeLog INSTALL NEWS README* THANKS TODO + docinto examples + dodoc examples/*anubis* + docinto guile + dodoc guile/*.scm -RDEPEND="sys-libs/gdbm - crypt? ( >=app-crypt/gpgme-0.9.0 ) - guile? ( >=dev-scheme/guile-1.8 ) - mysql? ( virtual/mysql ) - \ No newline at end of file + if use pam ; then + pamd_mimic system-auth anubis auth account session + fi + + rm -rf "${D}"/usr/share/anubis +} diff --git a/mail-filter/imapfilter/imapfilter-2.5.4.ebuild b/mail-filter/imapfilter/imapfilter-2.5.4.ebuild index 97a9025c0d96..65db002a4d9f 100644 --- a/mail-filter/imapfilter/imapfilter-2.5.4.ebuild +++ b/mail-filter/imapfilter/imapfilter-2.5.4.ebuild @@ -6,15 +6,6 @@ EAPI=5 inherit toolchain-funcs -DESCRIPTION="An IMAP mail filtering utility" -HOMEPAGE="http://imapfil# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/imapfilter/imapfilter-2.5.4.ebuild,v 1.4 2013/05/20 12:47:27 ago Exp $ - -EAPI=5 - -inherit toolchain-funcs - DESCRIPTION="An IMAP mail filtering utility" HOMEPAGE="http://imapfilter.hellug.gr" SRC_URI="https://github.com/lefcha/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" @@ -28,4 +19,21 @@ RDEPEND="dev-libs/openssl >=dev-lang/lua-5.1" DEPEND="${RDEPEND}" -DOCS="AUTHORS NEWS README \ No newline at end of file +DOCS="AUTHORS NEWS README samples/*" + +src_prepare() { + sed -i -e "/^PREFIX/s:/local::" \ + -e "/^MANDIR/s:man:share/man:" \ + -e "/^CFLAGS/s:CFLAGS =:CFLAGS +=:" \ + -e "/^CFLAGS/s/-O//" \ + src/Makefile || die +} + +src_compile() { + emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" +} + +src_install() { + default + doman doc/imapfilter.1 doc/imapfilter_config.5 +} diff --git a/mail-filter/libmilter/files/libmilter-sharedlib.patch b/mail-filter/libmilter/files/libmilter-sharedlib.patch index 44b9d9e775fd..43ec78612190 100644 --- a/mail-filter/libmilter/files/libmilter-sharedlib.patch +++ b/mail-filter/libmilter/files/libmilter-sharedlib.patch @@ -46,6 +46,10 @@ diff -Nru sendmail-8.14.3.orig/libmilter/Makefile.m4 sendmail-8.14.3/libmilter/M +++ sendmail-8.14.3/libmilter/Makefile.m4 2009-08-22 21:53:35.000000000 +0200 @@ -9,7 +9,7 @@ SMSRCDIR=ifdef(`confSMSRCDIR', `confSMSRCDIR', `${SRCDIR}/sendmail') - PREPENDDEF(`confINCdiff -Nru sendmail-8.14.3.orig/devtools/M4/UNIX/milterlibrary.m4 sendmail-8.14.3/devtools/M4/UNIX/milterlibrary.m4 ---- sendmail-8.14.3.orig/devtools/M4/UNIX/milterlibrary.m4 1970-01-01 01:00:00.000000000 +0100 -+++ sendmail-8.14.3/devtools/M4/UNIX/milterlibrary.m4 200 \ No newline at end of file + PREPENDDEF(`confINCDIRS', `-I${SMSRCDIR} ') + +-bldPRODUCT_START(`library', `libmilter') ++bldPRODUCT_START(`milterlibrary', `libmilter') + define(`bldINSTALLABLE', `true') + define(`LIBMILTER_EXTRAS', `errstring.c strl.c') + APPENDDEF(`confENVDEF', `-DNOT_SENDMAIL -Dsm_snprintf=snprintf') diff --git a/mail-filter/milter-regex/files/milter-regex-init b/mail-filter/milter-regex/files/milter-regex-init index 27ab882565e5..d1b1dae546a5 100644 --- a/mail-filter/milter-regex/files/milter-regex-init +++ b/mail-filter/milter-regex/files/milter-regex-init @@ -36,6 +36,7 @@ start() { } stop() { - ebegin "Stopping milt#!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation -# Distributed unde \ No newline at end of file + ebegin "Stopping milter-regex" + start-stop-daemon --stop --exec /usr/bin/milter-regex + eend $? +} diff --git a/mail-filter/policyd/files/policyd-makefile.patch b/mail-filter/policyd/files/policyd-makefile.patch index 8845154b7b21..94e3edb1c193 100644 --- a/mail-filter/policyd/files/policyd-makefile.patch +++ b/mail-filter/policyd/files/policyd-makefile.patch @@ -20,22 +20,20 @@ index ded74ce..6f2afd1 100644 - @$(CC) $(CFLAGS) $(CPPFLAGS) \ + @$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) \ syslog.o policyd.o generic.o mysql.o greylist.o throttle.o sockets.o cidr.o spamtrap.o blacklist.o blacklist_helo.o \ - whitelist.o diff --git a/Makefile b/Makefile -index ded74ce..6f2afd1 100644 ---- a/Makefile -+++ b/Makefile -@@ -16,8 +16,8 @@ lib += -L/usr/local/mysql - + whitelist.o throttle_host.o throttle_sasl.o throttle_from.o throttle_rcpt.o helo.o \ + $(LDLIBS) -o policyd - CC := gcc --CPPFLAGS := -O $(inc) --CFLAGS := -g -W -Wall -DMAXFDS=4096 -+CPPFLAGS := $(inc) ${CPPFLAGS} -+CFLAGS := -g -W -Wall -DMAXFDS=`ulimit -n` ${CFLAGS} - OS_NAME := $(shell uname | tr [A-Z] [a-z]) - LDLIBS = $(lib) -lmysqlclient -lz + cleanup: syslog.o cidr.o cleanup.o generic.o sockets.o mysql.o + @echo "[*] Linking cleanup*" +- @$(CC) $(CFLAGS) $(CPPFLAGS) \ ++ @$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) \ + syslog.o cidr.o cleanup.o generic.o sockets.o mysql.o \ + $(LDLIBS) -o cleanup -@@ -50,20 +50,20 @@ policyd: syslog.o policyd.o generic.o mysql.o greylist.o throttle.o sockets.o ci - whitelist.o throttle_host.o throttle_sasl.o throttle_from.o throttle_rcpt.o helo.o + stats: cidr.o syslog.o stats.o generic.o sockets.o mysql.o + @echo "[*] Linking stats*" +- @$(CC) $(CFLAGS) $(CPPFLAGS) \ ++ @$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) \ + cidr.o syslog.o stats.o generic.o sockets.o mysql.o \ + $(LDLIBS) -o stats @echo "" - @echo "[*] Link \ No newline at end of file diff --git a/mail-filter/postfwd/files/postfwd.init b/mail-filter/postfwd/files/postfwd.init index c59cbe8598cf..5f932b96fc88 100644 --- a/mail-filter/postfwd/files/postfwd.init +++ b/mail-filter/postfwd/files/postfwd.init @@ -14,9 +14,15 @@ start() { start-stop-daemon --start --quiet --background \ --pidfile ${PIDFILE} \ --exec /usr/sbin/postfwd2 -- --daemon --file ${POSTFWD_CONFIG} \ - --i#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/postfwd/files/postfwd.init,v 1.1 2014/07/15 00:19:41 mschiff Exp $ + --interface=${POSTFWD_LISTEN} --port=${POSTFWD_PORT} \ + --user=${POSTFWD_USER} --group=${POSTFWD_GROUP} \ + --pidfile ${PIDFILE} + ${POSTFWD_OPTS} + eend $? +} -PIDFILE=/var/run/postfw \ No newline at end of file +stop() { + ebegin "Stopping postfwd" + start-stop-daemon --stop --quiet --pidfile ${PIDFILE} + eend $? +} diff --git a/mail-filter/postfwd/metadata.xml b/mail-filter/postfwd/metadata.xml index afa4795c6449..479f2356d963 100644 --- a/mail-filter/postfwd/metadata.xml +++ b/mail-filter/postfwd/metadata.xml @@ -18,21 +18,14 @@ http://www.postfwd.org/postfwd2.CHANGELOG - p - - - - mschiff@gentoo.org - Marc Schiffbauer - - - cr@sys4.de - Christian Roessner - Proxy-Maintainer. Assign bugs to him - - - - info@postfwd.org - Jan Peter Kessler - - + + Install additional tools for testing postfwd + + diff --git a/mail-filter/procmail-lib/procmail-lib-20081108.ebuild b/mail-filter/procmail-lib/procmail-lib-20081108.ebuild index 436b0756cdd1..7a76c6ce17dc 100644 --- a/mail-filter/procmail-lib/procmail-lib-20081108.ebuild +++ b/mail-filter/procmail-lib/procmail-lib-20081108.ebuild @@ -20,5 +20,5 @@ S="${WORKDIR}/${PN}-${MY_PV}" src_install() { emake DESTDIR="${D}" prefix=/usr install || die "make install failed" - mv "# Copyright 1999-2012 Gentoo Foundation -# Distributed under \ No newline at end of file + mv "${D}"/usr/share/doc/"${PN}" "${D}"/usr/share/doc/"${PF}" +} diff --git a/mail-filter/pypolicyd-spf/pypolicyd-spf-1.1.ebuild b/mail-filter/pypolicyd-spf/pypolicyd-spf-1.1.ebuild index f395beb06898..62aff42c4b40 100644 --- a/mail-filter/pypolicyd-spf/pypolicyd-spf-1.1.ebuild +++ b/mail-filter/pypolicyd-spf/pypolicyd-spf-1.1.ebuild @@ -20,5 +20,6 @@ IUSE="" DEPEND=">=dev-python/pyspf-2.0.3" RDEPEND="${DEPEND} - dev-python/authr# Copyright 1999-2013 Gentoo Foundation -# Distributed unde \ No newline at end of file + dev-python/authres" + +PYTHON_MODNAME="policydspfsupp.py policydspfuser.py" diff --git a/mail-filter/sieve-connect/Manifest b/mail-filter/sieve-connect/Manifest index a59183e7a238..bb4381d072a1 100644 --- a/mail-filter/sieve-connect/Manifest +++ b/mail-filter/sieve-connect/Manifest @@ -1,3 +1,2 @@ DIST sieve-connect-0.86.tar.bz2 36292 SHA256 e5c06573d97c90baf90b119fba9779463a10596b2b8fb67ecf43e597d878498c SHA512 b432b17fbc48761535f8149a5a54be920684e8de1f8ee49d225aed7a114b2b4579c8d551d544606b98e618cb385553a016b26e5f7630d664e52ddb7538b661f6 WHIRLPOOL 9d856d9ca86e2c3bc12bac16d92f096526c3f15d599b305399588d30198d922acc341583ee74d9eb44499093baf105635e107109e20fc00ab5b56177cf161a7f DIST sieve-connect-0.87.tar.bz2 40023 SHA256 e3de80ab34994de0277fc7bf53b7c08e82db1a1f2762ddac4311d8191cea6c49 SHA512 28ed4f5cd929ee5edb420afcbac238399463beecf551643b9ee5ea41debbb1e5401a619b39b6422ec47885ea3cc207866e09da2e46a65bcc3d4f3ca5bdbf016a WHIRLPOOL 73e05f2829ad9d16e414ae5578cb02e2ec1f654fdb8c355daa4339849fefb7d5a302115dd67cab78c82e6a93bd282f6f0889cdbcf19d2dac4ed702cbf909ecd8 -DIST sieve-connect-0.86.tar.bz2 36292 SHA256 e5c06573d97c90baf90b119fba9779463a10596b2b8fb67ecf43e597d878498c SHA512 b432b17fbc48761535f8149a5a54be920684e8de1f8ee49d225aed7a114b2b4579c8d551d544606b98e618cb385553a016b26e5f7630d664e52ddb7538b661f6 WHIRLPOOL 9d856d9ca86e2c3bc12bac16d92f096526c3f15d599b305399588d30198d922acc341583ee74d9eb444990 \ No newline at end of file diff --git a/media-fonts/alee-fonts/Manifest b/media-fonts/alee-fonts/Manifest index 5b884815ac3a..963bea675dce 100644 --- a/media-fonts/alee-fonts/Manifest +++ b/media-fonts/alee-fonts/Manifest @@ -1,4 +1,2 @@ DIST ttf-alee_12.tar.gz 776652 SHA256 a0d0e4dab2c0f592c7709dbadebda18232a75ca0dc17b3238d0397fe79e7c841 DIST ttf-alee_13.tar.gz 702378 SHA256 a36b92e520483195780db7d36da9d86c221a7e7a78621b020cc5023b140ab85a SHA512 2f72067ccb3264c5847639d9b9db4c820ad65bf2b2bfef710fbc42463e4b091dedc004281d05694a92680fde01c56edeb40ca78cd2a659533e22b17bd14b4b2c WHIRLPOOL 36195163c1c9debac81cfb40efb845b443811952c134125abcfc76307c1cf7108d9fc9b6b987ffce278df3bbf2daf8dd35fe1ad096abffcd12b8e72c38fc81c8 -DIST ttf-alee_12.tar.gz 776652 SHA256 a0d0e4dab2c0f592c7709dbadebda18232a75ca0dc17b3238d0397fe79e7c841 -DIST ttf-alee_13.tar.gz 702378 SHA256 a36b92e520483195780db7d36da9d86c221a7e7a78621b020cc5023b140ab85a SHA512 2f72067ccb3264c5847639d9b9db4c820ad65bf2b2bfef710fbc42463e4b091dedc004281d05694a92680fde01c56edeb40ca78cd2a659533e22b17bd14b4b2c WHIRLPOOL 36195163c1c9debac81cfb40efb845b443811952c134125abcfc76307c1cf7108d9fc9b6b987ffce278df3bbf2daf8dd35fe1ad096abffcd12b8e72c38fc81c8 diff --git a/media-fonts/dejavu/dejavu-2.34.ebuild b/media-fonts/dejavu/dejavu-2.34.ebuild index bb794e7fd745..df364daca11f 100644 --- a/media-fonts/dejavu/dejavu-2.34.ebuild +++ b/media-fonts/dejavu/dejavu-2.34.ebuild @@ -18,29 +18,6 @@ snapv=${snapv/./-} MY_BP=${PN}-fonts-ttf-${MY_PV} MY_SP=${PN}-fonts-${MY_PV} -if [ -z ${snapv} ] -then - SRC_URI="!fontforge? ( mirror://sourceforge/${PN}/${MY_BP}.tar.bz2 ) - # Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-fonts/dejavu/dejavu-2.34.ebuild,v 1.2 2014/01/18 12:18:43 vapier Exp $ - -EAPI="4" - -inherit font versionator - -DESCRIPTION="DejaVu fonts, bitstream vera with ISO-8859-2 characters" -HOMEPAGE="http://dejavu.sourceforge.net/" -LICENSE="BitstreamVera" - -# If you want to test snapshot from dejavu.sf.net/snapshots/ -# just rename ebuild to dejavu-2.22.20071220.2156.ebuild -MY_PV=$(get_version_component_range 1-2) -snapv=$(get_version_component_range 3-4) -snapv=${snapv/./-} -MY_BP=${PN}-fonts-ttf-${MY_PV} -MY_SP=${PN}-fonts-${MY_PV} - if [ -z ${snapv} ] then SRC_URI="!fontforge? ( mirror://sourceforge/${PN}/${MY_BP}.tar.bz2 ) @@ -67,4 +44,39 @@ RDEPEND="" if use fontforge then S=${WORKDIR}/${MY_SP} - FONT_S=${S \ No newline at end of file + FONT_S=${S}/build +else + S=${WORKDIR}/${MY_BP} + FONT_S=${S}/ttf +fi + +FONT_CONF=( + "${S}"/fontconfig/20-unhint-small-dejavu-sans-mono.conf + "${S}"/fontconfig/20-unhint-small-dejavu-sans.conf + "${S}"/fontconfig/20-unhint-small-dejavu-serif.conf + "${S}"/fontconfig/57-dejavu-sans-mono.conf + "${S}"/fontconfig/57-dejavu-sans.conf + "${S}"/fontconfig/57-dejavu-serif.conf ) + +FONT_SUFFIX="ttf" +DOCS="AUTHORS NEWS README status.txt langcover.txt unicover.txt" + +src_compile() { + if use fontforge + then + emake -j1 \ + BLOCKS=/usr/share/unicode-data/Blocks.txt \ + UNICODEDATA=/usr/share/unicode-data/UnicodeData.txt \ + FC-LANG=/usr/share/fc-lang \ + full sans \ + || die "emake failed" + fi +} + +src_install() { + font_src_install + if use fontforge + then + dodoc build/*.txt + fi +} diff --git a/media-fonts/encodings/Manifest b/media-fonts/encodings/Manifest index 86fbeeb7fb31..306936a738f6 100644 --- a/media-fonts/encodings/Manifest +++ b/media-fonts/encodings/Manifest @@ -1,2 +1 @@ DIST encodings-1.0.4.tar.bz2 665087 SHA256 ced6312988a45d23812c2ac708b4595f63fd7a49c4dcd9f66bdcd50d1057d539 SHA512 838d1c9489e9880bf1982dc14d34a48b624b7bc2c0fffbf28e2c24e1546b0602357ca31afef100053481d6a18e357085ef74ac7a82261daa1ac1398bc1e05d17 WHIRLPOOL b006a8fd1bbfd50f33084203b23bb56e05bf1c3ca8407eb4bb62033154f10226774f93f800c915d35472542c6ae11a2a0ae124d821e34d06e2ab04e6818e1301 -DIST encodings-1.0.4.tar.bz2 665087 SHA256 ced6312988a45d23812c2ac708b4595f63fd7a49c4dcd9f66bdcd50d1057d539 SHA512 838d1c9489e9880bf1982dc14d34a48b624b7bc2c0fffbf28e2c24e1546b0602357ca31afef100053481d6a18e357085ef74ac7a82261daa1ac1398bc1e05d17 WHIRLPOOL b006a8fd1bbfd50f33084203b23bb56e05bf1c3ca8407eb4bb62033154f10226774f93f800c915d35472542c6ae11a2a0ae124d821e34d06e2ab04e6818e1301 diff --git a/media-fonts/font-bh-ttf/Manifest b/media-fonts/font-bh-ttf/Manifest index c3e42cd94676..83f93176c37a 100644 --- a/media-fonts/font-bh-ttf/Manifest +++ b/media-fonts/font-bh-ttf/Manifest @@ -1,2 +1 @@ DIST font-bh-ttf-1.0.3.tar.bz2 465351 SHA256 1b4bea63271b4db0726b5b52c97994c3313b6023510349226908090501abd25f -DIST font-bh-ttf-1.0.3.tar.bz2 465351 SHA256 1b4bea63271b4db0726b5b52c97994c3313b6023510349226908090501abd25f diff --git a/media-fonts/font-bh-type1/Manifest b/media-fonts/font-bh-type1/Manifest index 9bdee477be78..ab2ceb66cd85 100644 --- a/media-fonts/font-bh-type1/Manifest +++ b/media-fonts/font-bh-type1/Manifest @@ -1,2 +1 @@ DIST font-bh-type1-1.0.3.tar.bz2 637337 SHA256 761455a297486f3927a85d919b5c948d1d324181d4bea6c95d542504b68a63c1 -DIST font-bh-type1-1.0.3.tar.bz2 637337 SHA256 761455a297486f3927a85d919b5c948d1d324181d4bea6c95d542504b68a63c1 diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml index f1e2117f49bf..f2841cfbe2ea 100644 --- a/media-gfx/blender/metadata.xml +++ b/media-gfx/blender/metadata.xml @@ -37,32 +37,28 @@ Build the Blender Player. THis requires the Game engine. - - - - graphics - - - hasufell@gentoo.org - Julian Ospald - - - - lu_zero@gentoo.org - Luca Barbato - - - - Blender, the open source software for 3D modeling, animation, - rendering, post-production, interactive creation and playback. - - - - - Adds Game Engine support to Blender. + Adds surface fluid simulation to Blender using El'Beem library. - - Add support for Collada interchange format through - media-libs/opencollada. + + Build C and Python API documentation directly from the source code. + + + This flag add support for RED CODE camera digital format (5K HD + images *.r3d) - EXPERIMENTAL. + + + Enable features depending on boost. - < \ No newline at end of file + + Enable Bullet (Physics Engine). + + + Enable OpenColorIO color management. + + + Enable NDOF input devices (SpaceNavigator and friends). + + Enable OpenImageIO Support + Enable use of Open Numerical Library + + diff --git a/media-gfx/comix/comix-4.0.4.ebuild b/media-gfx/comix/comix-4.0.4.ebuild index cbca2e60a99e..a6d98709664e 100644 --- a/media-gfx/comix/comix-4.0.4.ebuild +++ b/media-gfx/comix/comix-4.0.4.ebuild @@ -12,20 +12,6 @@ DESCRIPTION="A GTK image viewer specifically designed to handle comic books" HOMEPAGE="http://comix.sourceforge.net" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" -L# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/comix/comix-4.0.4.ebuild,v 1.3 2014/08/10 21:13:44 slyfox Exp $ - -EAPI=4 - -PYTHON_DEPEND="2:2.6" - -inherit python - -DESCRIPTION="A GTK image viewer specifically designed to handle comic books" -HOMEPAGE="http://comix.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd" @@ -46,4 +32,24 @@ src_prepare() { local pythondir="$(python_get_sitedir)/comix" pythondir="${pythondir/\/usr\/}" sed -i -e "s:share/comix/src:${pythondir}:g" install.py || die - pyth \ No newline at end of file + python_convert_shebangs -r 2 install.py mime/comicthumb src/comix.py +} + +src_install() { + dodir /usr + python2 install.py install --no-mime --dir "${D}"usr || die + + insinto /usr/share/mime/packages + doins mime/comix.xml + + insinto /etc/gconf/schemas + doins mime/comicbook.schemas + + dobin mime/comicthumb + dodoc ChangeLog README + + local lang + for lang in ${LANGS} ; do + use linguas_${lang} || rm -r "${D}"/usr/share/locale/${lang} + done +} diff --git a/media-gfx/darktable/darktable-1.2.3.ebuild b/media-gfx/darktable/darktable-1.2.3.ebuild index dab9b9f45369..e5c618c665d2 100644 --- a/media-gfx/darktable/darktable-1.2.3.ebuild +++ b/media-gfx/darktable/darktable-1.2.3.ebuild @@ -63,53 +63,58 @@ pkg_pretend() { src_prepare() { sed -e "s:\(/share/doc/\)darktable:\1${PF}:" \ -e "s:LICENSE::" \ - -i doc/# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/darktable-1.2.3.ebuild,v 1.3 2014/01/12 11:25:14 maekke Exp $ + -i doc/CMakeLists.txt || die -EAPI=5 + epatch_user +} -inherit cmake-utils toolchain-funcs gnome2-utils fdo-mime pax-utils eutils +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_use colord COLORD) + $(cmake-utils_use_use flickr FLICKR) + $(cmake-utils_use_use geo GEO) + $(cmake-utils_use_use gnome-keyring GNOME_KEYRING) + $(cmake-utils_use_use gphoto2 CAMERA_SUPPORT) + $(cmake-utils_use_use graphicsmagick GRAPHICSMAGICK) + $(cmake-utils_use_use jpeg2k OPENJPEG) + $(cmake-utils_use_use nls NLS) + $(cmake-utils_use_use opencl OPENCL) + $(cmake-utils_use_use openmp OPENMP) + $(cmake-utils_use !rawspeed DONT_USE_RAWSPEED) + $(cmake-utils_use_use squish SQUISH) + $(cmake-utils_use_build slideshow SLIDESHOW) + $(cmake-utils_use_use web-services GLIBJSON) + -DCUSTOM_CFLAGS=ON + -DINSTALL_IOP_EXPERIMENTAL=ON + -DINSTALL_IOP_LEGACY=ON + ) + cmake-utils_src_configure +} -DESCRIPTION="A virtual lighttable and darkroom for photographers" -HOMEPAGE="http://www.darktable.org/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz - doc? ( mirror://sourceforge/${PN}/${PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${PV}.pdf )" +src_install() { + cmake-utils_src_install + use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${PV}.pdf -LICENSE="GPL-3 CC-BY-3.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="colord doc flickr geo gnome-keyring gphoto2 graphicsmagick jpeg2k kde -nls opencl openmp pax_kernel +rawspeed +slideshow +squish web-services" + if use pax_kernel && use opencl ; then + pax-mark Cm "${ED}"/usr/bin/${PN} || die + eqawarn "USE=pax_kernel is set meaning that ${PN} will be run" + eqawarn "under a PaX enabled kernel. To do so, the ${PN} binary" + eqawarn "must be modified and this *may* lead to breakage! If" + eqawarn "you suspect that ${PN} is broken by this modification," + eqawarn "please open a bug." + fi +} -CDEPEND=" - dev-db/sqlite:3 - >=dev-libs/glib-2.28:2 - dev-libs/libxml2:2 - colord? ( x11-misc/colord ) - flickr? ( media-libs/flickcurl ) - geo? ( net-libs/libsoup:2.4 ) - gnome-keyring? ( gnome-base/gnome-keyring ) - gnome-base/librsvg:2 - gphoto2? ( media-libs/libgphoto2:= ) - graphicsmagick? ( media-gfx/graphicsmagick ) - jpeg2k? ( media-libs/openjpeg:0 ) - media-gfx/exiv2[xmp] - media-libs/lcms:2 - >=media-libs/lensfun-0.2.3 - media-libs/libpng:0= - media-libs/openexr - media-libs/tiff:0 - net-misc/curl - opencl? ( virtual/opencl ) - slideshow? ( - media-libs/libsdl - virtual/glu - virtual/opengl - ) - virtual/jpeg - web-services? ( dev-libs/json-glib ) - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:2 - x11-libs/p \ No newline at end of file +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + gnome2_icon_cache_update + fdo-mime_desktop_database_update +} + +pkg_postrm() { + gnome2_icon_cache_update + fdo-mime_desktop_database_update +} diff --git a/media-gfx/dpic/Manifest b/media-gfx/dpic/Manifest index d57bd288bc56..50ec416763fa 100644 --- a/media-gfx/dpic/Manifest +++ b/media-gfx/dpic/Manifest @@ -1,4 +1,2 @@ DIST dpic-20090713.tar.gz 301085 SHA256 2cb4ef4434c88ffd73910bf97e657a976ed6b0f243f0fc7bd77a4bb9f79cfc6c SHA512 d587a5f9abab4d29d479c2d7faab8364ce3e1631c0212732accdefa3702f4d06070af0fad7b58999035ade524b9d1e77c031d7f83089ee253320d9818500abc1 WHIRLPOOL e37a05cd2ce3e54ed132f75343e1b972ed615f7f7768287f023c7bebdd78cb52e3222e6e040cb0e8864b4711a973f46cb1248347912ca6ce85db202171e3ce54 DIST dpic-2013.03.10.tar.gz 583366 SHA256 3ba961675f23ee2b9c035b60e43ce672007ad29a8ab810404f64a4098edcdac1 SHA512 a1c29f32bddeabfcfba1e0253ab502ca2c32c9ad4d490c8b2a7569643972a65ebdc26215888aaba7b2954b217e1667b469d49affb0a771832e98aa5ad25dd9f5 WHIRLPOOL e01915a94a6cd587945e12dc15eed23607914e219f4ef8586d8c221201d6073fff749dfd0838c8adc23848db59b1015e01cffad0f802b386e20a671391a96780 -DIST dpic-20090713.tar.gz 301085 SHA256 2cb4ef4434c88ffd73910bf97e657a976ed6b0f243f0fc7bd77a4bb9f79cfc6c SHA512 d587a5f9abab4d29d479c2d7faab8364ce3e1631c0212732accdefa3702f4d06070af0fad7b58999035ade524b9d1e77c031d7f83089ee253320d9818500abc1 WHIRLPOOL e37a05cd2ce3e54ed132f75343e1b972ed615f7f7768287f023c7bebdd78cb52e3222e6e040cb0e8864b4711a973f46cb1248347912ca6ce85db202171e3ce54 -DIST dpic-2013.03.10.tar.gz 583366 SHA256 3ba961675f23ee2b9c035b60e43ce672007ad29a8ab810404f64a4098edcdac1 SHA512 a1c29f32bddeabfcfba1e0253ab502ca2c32c9ad4d490c8b2a7569643972a65ebdc26215888aaba7b2954b217e1667b469d49affb0a771832e98aa5ad25dd9f5 WHIRLPOOL e01915a94a6cd587945e12dc15eed23607914e219f4ef8586d8c221201d6073fff749dfd0838c8adc23848db59b1015e01cffad0f802b386e20a671391a96780 diff --git a/media-gfx/enblend/Manifest b/media-gfx/enblend/Manifest index 3c7ad8f119af..8e9dbf3333a7 100644 --- a/media-gfx/enblend/Manifest +++ b/media-gfx/enblend/Manifest @@ -1,6 +1,3 @@ DIST enblend-enfuse-4.1.1.tar.gz 850214 SHA256 9d0947633ebaa0dc1211331b31009408de6fe2108751ad4190760e3a9f181bc9 SHA512 dd4c8f205986beef1268210a8ccad10107125fc15a45b2e7266f250d36a294356f557d577b80e923e04b5f14ed5f6070201793c067cc3a2e7d6020cf5669a61f WHIRLPOOL c9938499116f26f3bfe6eae874414722a15380cbda959c82315bb124cb7b58456550174b0d43355d924cb6e107ef3ee4d1b83f8adc82d7144d974b66207ff965 DIST enblend-enfuse-4.1.2.tar.gz 869265 SHA256 6dc2682d366776ff771fd6c9ae709bcfef0b7b00cac9e620b56d13bf81faaf6e SHA512 8d4fa80bb455276e79e7ee4e757c8774bb0380fa2ef56835e18a02fda12b710eaad0a90f2849dc2297eb7cd477dc7134a90a61708373928463595d726ded0259 WHIRLPOOL e0834b7e9461ae3d29e52cd21cd8c41384356026f3e62b7c60cbb60ba02edc23c844862afac001cb20b5da828a11ec7f9bd4d604ab77177ca318e400ccf70650 DIST enblend-enfuse-4.1.3.tar.gz 862079 SHA256 1c00ae95cd05502759d7d47f99e6ba1150f8807f8f4f46c800cd46c5ad0df9ac SHA512 0a3487783afadee896b84411330898393cda4be4cbb79d36013daa98c17ab88f97a298c21a5c398b7cb2ce83e8dc4519a80e18be472c5fec10c3114037b6db73 WHIRLPOOL ab33a8ca5c38d9a5dca6aaeed7cbc806f7c34c5642f9e568a90d14789ecede896c0da888e5fe7e7d30e586778e0734495d06055fc189732e55bc0c013e699b48 -DIST enblend-enfuse-4.1.1.tar.gz 850214 SHA256 9d0947633ebaa0dc1211331b31009408de6fe2108751ad4190760e3a9f181bc9 SHA512 dd4c8f205986beef1268210a8ccad10107125fc15a45b2e7266f250d36a294356f557d577b80e923e04b5f14ed5f6070201793c067cc3a2e7d6020cf5669a61f WHIRLPOOL c9938499116f26f3bfe6eae874414722a15380cbda959c82315bb124cb7b58456550174b0d43355d924cb6e107ef3ee4d1b83f8adc82d7144d974b66207ff965 -DIST enblend-enfuse-4.1.2.tar.gz 869265 SHA256 6dc2682d366776ff771fd6c9ae709bcfef0b7b00cac9e620b56d13bf81faaf6e SHA512 8d4fa80bb455276e79e7ee4e757c8774bb0380fa2ef56835e18a02fda12b710eaad0a90f2849dc2297eb7cd477dc7134a90a61708373928463595d726ded0259 WHIRLPOOL e0834b7e9461ae3d29e52cd21cd8c41384356026f3e62b7c60cbb60ba02edc23c844862afac001cb20b5da828a11ec7f9bd4d604ab77177ca318e400ccf70650 -DIST enblend-enfuse-4.1.3.tar.gz 862079 SHA256 1c00ae95cd05502759d7d47f99e6ba1150f8807f8f4f46c800cd46c5ad0df9ac SHA512 0a3487783afadee896b84411330898393cda4be4cbb79d36013daa98c17ab88f97a298c21a5c398b7cb2ce83e8dc4519a80e18be472c5fec10c3114037b6db73 WHIRLPOOL ab33a8ca5c38d9a5dca6aaeed7cbc806f7c34c5642f9e568a90d14789ecede896c0da888e5fe7e7d30e586778e0734495d06055fc189732e55bc0c013e699b48 diff --git a/media-gfx/fontforge/fontforge-20100501.ebuild b/media-gfx/fontforge/fontforge-20100501.ebuild index 64162d069c7f..07f0e7110d5f 100644 --- a/media-gfx/fontforge/fontforge-20100501.ebuild +++ b/media-gfx/fontforge/fontforge-20100501.ebuild @@ -78,15 +78,39 @@ src_configure() { $(use_enable pasteafter) \ $(use_with X x) \ $(use_enable cjk gb12345) \ - $(# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20100501.ebuild,v 1.12 2014/03/23 17:26:35 kensington Exp $ + $(use_enable tilepath) \ + $(use_enable debug debug-raw-points) \ + $(use_with pango) \ + $(use_with cairo) +} -# Some notes for maintainers this package: -# 1. README-unix: freetype headers are required to make use of truetype debugger -# in fontforge. -# 2. --enable-{double,longdouble} these just make ff use more storage space. In -# normal fonts neither is useful. Leave off. -# 3. FontForge autodetects libraries but does not link with them. They are -# dynamically loaded at run time if fontforge found them at build time. -# --with-regular-link disables \ No newline at end of file +src_install() { + emake install DESTDIR="${D}" || die + dodoc AUTHORS README* + + if use cjk; then #129518 + insinto /usr/share/fontforge + doins "${WORKDIR}"/*.cidmap + fi + + doicon Packaging/fontforge.png + domenu Packaging/fontforge.desktop + insinto /usr/share/mime/application + doins Packaging/fontforge.xml + + if use doc; then + insinto /usr/share/doc/${PN} + cd "${WORKDIR}/html/" + doins -r * + fi +} + +pkg_postrm() { + fdo-mime_desktop_database_update + fdo-mime_mime_database_update +} + +pkg_postinst() { + fdo-mime_desktop_database_update + fdo-mime_mime_database_update +} diff --git a/media-gfx/k3d/k3d-0.7.11.0-r1.ebuild b/media-gfx/k3d/k3d-0.7.11.0-r1.ebuild index 4f54aa2646f0..0c4d3956aafe 100644 --- a/media-gfx/k3d/k3d-0.7.11.0-r1.ebuild +++ b/media-gfx/k3d/k3d-0.7.11.0-r1.ebuild @@ -97,15 +97,16 @@ src_configure() { $(k3d_use_module graphviz GRAPHVIZ) $(k3d_use_module gts GTS) $(k3d_use_module gts GTS_IO) - $# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/k3d-0.7.11.0-r1.ebuild,v 1.14 2013/08/31 14:07:29 pacho Exp $ - -EAPI="2" - -inherit eutils cmake-utils flag-o-matic - -MY_P="${PN}-source-${PV}" - -DESCRIPTION="A free 3D modeling, animation, and rendering system" -HOMEPAGE="http://www.k-3d. \ No newline at end of file + $(k3d_use_module imagemagick IMAGEMAGICK_IO) + $(k3d_use_module jpeg JPEG_IO) + $(k3d_use_enable nls NLS) + $(k3d_use_module openexr OPENEXR_IO) + $(k3d_use_module png PNG_IO) + $(k3d_use_module python PYTHON) + $(k3d_use_module python PYUI) + $(k3d_use_module python NGUI_PYTHON_SHELL) + $(k3d_use_module tiff TIFF_IO) + $(k3d_use_module truetype FREETYPE2)" + + cmake-utils_src_configure +} diff --git a/media-gfx/kxstitch/Manifest b/media-gfx/kxstitch/Manifest index 8dd95436f422..0c19aefc525c 100644 --- a/media-gfx/kxstitch/Manifest +++ b/media-gfx/kxstitch/Manifest @@ -1,2 +1 @@ DIST kxstitch-1.2.0.tar.bz2 1995295 SHA256 12946cdba1278bc68d3ca11c0db1963dbe3363d0f6aa814cb9e8d6e49f5132da SHA512 bd1bf32cb1cf188e03c17ddc3f3aa9e19e5551f0f3c58afa7951975b9a149f164b6d19f6c9011770c8d40724b9056c8d42202a4bd8712dda995439159c84c5f5 WHIRLPOOL b19a595f4a1fe08707d8ce122beae169ed8607ca81286d0d63359ff79aef10f446f3b23a3fb9f40dfaa455f879011f78138c516704e961c3901c76eb88b56992 -DIST kxstitch-1.2.0.tar.bz2 1995295 SHA256 12946cdba1278bc68d3ca11c0db1963dbe3363d0f6aa814cb9e8d6e49f5132da SHA512 bd1bf32cb1cf188e03c17ddc3f3aa9e19e5551f0f3c58afa7951975b9a149f164b6d19f6c9011770c8d40724b9056c8d42202a4bd8712dda995439159c84c5f5 WHIRLPOOL b19a595f4a1fe08707d8ce122beae169ed8607ca81286d0d63359ff79aef10f446f3b23a3fb9f40dfaa455f879011f78138c516704e961c3901c76eb88b56992 diff --git a/media-gfx/mate-image-viewer/Manifest b/media-gfx/mate-image-viewer/Manifest index 61472b064fa4..903f3632a13d 100644 --- a/media-gfx/mate-image-viewer/Manifest +++ b/media-gfx/mate-image-viewer/Manifest @@ -1,2 +1 @@ DIST mate-image-viewer-1.6.2.tar.xz 2188516 SHA256 90881621f1efb0c327ecf52160dd3d14295219204dd847dc3307894a166260ee SHA512 b5959cef20f6e160640c664a0982389f1780bd8dad0e75d69544b920b415714084bc9ff44df8754b633cf9a2f35e723f4cee6f626a64c22c1a282715afa616b8 WHIRLPOOL 4fc7a258abd064fafd80bd5e98e20f0daa6ef169951eec0561a9904fc7df80dbd0bf095499be73556f292bfc4858cf50751f5566b8e675caee98a090403ed2e3 -DIST mate-image-viewer-1.6.2.tar.xz 2188516 SHA256 90881621f1efb0c327ecf52160dd3d14295219204dd847dc3307894a166260ee SHA512 b5959cef20f6e160640c664a0982389f1780bd8dad0e75d69544b920b415714084bc9ff44df8754b633cf9a2f35e723f4cee6f626a64c22c1a282715afa616b8 WHIRLPOOL 4fc7a258abd064fafd80bd5e98e20f0daa6ef169951eec0561a9904fc7df80dbd0bf095499be73556f292bfc4858cf50751f5566b8e675caee98a090403ed2e3 diff --git a/media-gfx/peps/peps-2.0.ebuild b/media-gfx/peps/peps-2.0.ebuild index 34bddbe7d606..8fcfeecc82bb 100644 --- a/media-gfx/peps/peps-2.0.ebuild +++ b/media-gfx/peps/peps-2.0.ebuild @@ -50,4 +50,5 @@ src_install() { doins peps.mime # copy PDF so it won't be compressed - cp peps.pdf "${D}usr/share/doc/${P# Copy \ No newline at end of file + cp peps.pdf "${D}usr/share/doc/${PF}" +} diff --git a/media-gfx/photivo/photivo-9999.ebuild b/media-gfx/photivo/photivo-9999.ebuild index 19950adfae7b..365808c92543 100644 --- a/media-gfx/photivo/photivo-9999.ebuild +++ b/media-gfx/photivo/photivo-9999.ebuild @@ -33,22 +33,31 @@ src_prepare() { local File for File in $(find "${S}" -type f); do if grep -sq ccache ${File}; then - sed# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/photivo/photivo-9999.ebuild,v 1.7 2013/12/17 21:13:39 hwoarang Exp $ - -EAPI=4 - -inherit qt4-r2 mercurial - -DESCRIPTION="Photo processor for RAW and Bitmap images" -HOMEPAGE="http://www.photivo.org" -EHG_REPO_URI="https://photivo.googlecode.com/hg/" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="" -IUSE="gimp" - -RDEPEND="dev-qt/qtcore:4 - dev-qt/ \ No newline at end of file + sed -e 's/ccache//' -i "${File}" + fi + done + + # useless check (no pkgconfig file is provided) + sed -e "/PKGCONFIG += CImg/d" \ + -i photivoProject/photivoProject.pro || die + qt4-r2_src_prepare +} + +src_configure() { + local config="WithSystemCImg" + if use gimp ; then + config+=" WithGimp" + fi + + eqmake4 "CONFIG+=${config}" +} + +src_install() { + qt4-r2_src_install + + if use gimp; then + exeinto $(gimptool-2.0 --gimpplugindir)/plug-ins + doexe ptGimp + doexe "mm extern photivo.py" + fi +} diff --git a/media-gfx/photo/Manifest b/media-gfx/photo/Manifest index 1fc58d5ee14f..4ca0ef36cff9 100644 --- a/media-gfx/photo/Manifest +++ b/media-gfx/photo/Manifest @@ -1,2 +1 @@ DIST photo-0.8.tar.gz 241142 SHA256 123f8cfa8e86dd131147b58e1c94a138bb9d3e5873f29b550cc960e83b2c4f5f SHA512 b5b8700a4f15e4ce880c5558247cc0e96e59df21c0674f57e202b5d6474e1ef0a251d5be391e795b230c4959251e194ec4a1c87e75075ee9ae501d3e18c4e32f WHIRLPOOL c6ff5a3a41cdfac0c54593dfbabb35bcb903b592809f698cf7d7c56bce05b1a29c31d8db7031392819481188f563bcf67e997cec24acd0a0842a311efaa76529 -DIST photo-0.8.tar.gz 241142 SHA256 123f8cfa8e86dd131147b58e1c94a138bb9d3e5873f29b550cc960e83b2c4f5f SHA512 b5b8700a4f15e4ce880c5558247cc0e96e59 \ No newline at end of file diff --git a/media-gfx/picturewall/picturewall-1.0-r1.ebuild b/media-gfx/picturewall/picturewall-1.0-r1.ebuild index 865056729fed..764145d9a1e5 100644 --- a/media-gfx/picturewall/picturewall-1.0-r1.ebuild +++ b/media-gfx/picturewall/picturewall-1.0-r1.ebuild @@ -29,4 +29,5 @@ src_install(){ dobin bin/${PN} dodoc ReadMe use doc && dohtml -r doc/html/* - make_desktop_entry ${PN} ${MY_P# Cop \ No newline at end of file + make_desktop_entry ${PN} ${MY_PN} +} diff --git a/media-gfx/pixie/files/pixie-2.2.6-zlib-1.2.5.2.patch b/media-gfx/pixie/files/pixie-2.2.6-zlib-1.2.5.2.patch index fbde4c7d108c..6d022f02fdb1 100644 --- a/media-gfx/pixie/files/pixie-2.2.6-zlib-1.2.5.2.patch +++ b/media-gfx/pixie/files/pixie-2.2.6-zlib-1.2.5.2.patch @@ -68,6 +68,6 @@ http://bugs.gentoo.org/406899 #ifdef HAVE_ZLIB - gzclose(ribin); + gzclose((gzFile)ribin); - #http://bugs.gentoo.org/406899 - -- \ No newline at end of file + #else + fclose(ribin); + #endif diff --git a/media-gfx/pixie/pixie-2.2.6-r1.ebuild b/media-gfx/pixie/pixie-2.2.6-r1.ebuild index fb9dc1d7596f..5f6d359432c0 100644 --- a/media-gfx/pixie/pixie-2.2.6-r1.ebuild +++ b/media-gfx/pixie/pixie-2.2.6-r1.ebuild @@ -68,45 +68,33 @@ src_configure() { --with-docdir=/usr/share/doc/${PF}/html \ --with-shaderdir=/usr/share/Pixie/shaders \ --with-ribdir=/usr/share/Pixie/ribs \ - --with-texturedir=/usr/share/Pixie/text# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/pixie-2.2.6-r1.ebuild,v 1.10 2012/03/10 09:19:20 ssuominen Exp $ + --with-texturedir=/usr/share/Pixie/textures \ + --with-displaysdir=/usr/$(get_libdir)/pixie/displays \ + --with-modulesdir=/usr/$(get_libdir)/pixie/modules \ + --enable-openexr-threads \ + --disable-static-fltk \ + --mandir=/usr/share/man \ + --bindir=/usr/bin \ + --program-transform-name="s/show/pixie-show/" +} -EAPI="2" +src_compile() { + emake || die "emake failed" -WANT_AUTOMAKE="1.10" + # regenerating Pixie shaders - see upstream bug report: + # https://sf.net/tracker/?func=detail&aid=2923407&group_id=59462&atid=491094 + einfo "Re-building Pixie Shaders for v${PV} format" + emake -f "${FILESDIR}/Makefile.shaders" -C "${S}/shaders" || die "shaders rebuild failed" +} -inherit eutils multilib autotools +src_install() { + emake DESTDIR="${D}" install || die "installation failed." -MY_PN="Pixie" -S="${WORKDIR}/${MY_PN}" + insinto /usr/share/Pixie/textures + doins "${S}"/textures/* -DESCRIPTION="RenderMan like photorealistic renderer" -HOMEPAGE="http://pixie.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-src-${PV}.tgz" + # remove useless .la files + find "${D}" -name '*.la' -delete || die "removal of libtool archive files failed" -LICENSE="GPL-2" -IUSE="X static-libs" -SLOT="0" -KEYWORDS="amd64 ~ppc sparc x86" - -RDEPEND="virtual/jpeg - media-libs/tiff - media-libs/libpng - x11-libs/fltk:1[opengl] - media-libs/openexr - virtual/opengl - sys-libs/zlib - X? ( - x11-libs/libXext - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libxcb - x11-libs/libXdmcp - x11-libs/libXi - x11-libs/libXmu - x11-libs/libXt - )" -DEPEND \ No newline at end of file + dodoc README AUTHORS ChangeLog || die +} diff --git a/media-gfx/qrencode-python/Manifest b/media-gfx/qrencode-python/Manifest index e4bf849a477f..ad69a6dd31f9 100644 --- a/media-gfx/qrencode-python/Manifest +++ b/media-gfx/qrencode-python/Manifest @@ -1,3 +1,2 @@ -DIST qrencode-python-1.01.tar.gz 2456 SHA256 fd8cdabd743e2db7a1ad332d4f0fe037e5a7807cb2f1d32da3e39439088bb610 SHA512 fc0514038dc78556335744872ad94d48eb68991118f204a6547f2979d62694441d28c5eb67a8a34a096cd686a9ae10ce5f95753a0e3f676f6ad53b3792f6946c WHIRLPOOL d9a0e833437cf1640d6cf-----BEGIN PGP SIGNED MESSAGE----- DIST qrencode-python-1.01.tar.gz 2456 SHA256 fd8cdabd743e2db7a1ad332d4f0fe037e5a7807cb2f1d32da3e39439088bb610 SHA512 fc0514038dc78556335744872ad94d48eb68991118f204a6547f2979d62694441d28c5eb67a8a34a096cd686a9ae10ce5f95753a0e3f676f6ad53b3792f6946c WHIRLPOOL d9a0e833437cf1640d6cfb4f84debef936898d88c0c3f5565499a4ef848be45a5c5b1eeeaf2cc8a098c4898183395db688152154d93314c1db693eaccaa285ce DIST qrencode-python-1.02_pre140921.tar.gz 2084 SHA256 8c3d5d2c5479f10aa1462a9bf95390b78b47043bf56e0f581ed61a3eb9507ccf SHA512 231c61f98f064d282611d14194de7b3c0a18faff0ed856722e39a6cc25f744442d77bd43418aec117c6e39ddd78a6ea770edee8992aa4e3cfce50254ac6526aa WHIRLPOOL 44009c565bff4c330a416653e7c3863a33b25290a71e4a800f920240b11428fa945ae1c854af5f5c9b5d1d508a915f97bfdbd7c15eee791b27628912f0edd452 diff --git a/media-gfx/rawstudio/files/rawstudio-2.0-icon.patch b/media-gfx/rawstudio/files/rawstudio-2.0-icon.patch index 8eece3146b41..eb8b61945a17 100644 --- a/media-gfx/rawstudio/files/rawstudio-2.0-icon.patch +++ b/media-gfx/rawstudio/files/rawstudio-2.0-icon.patch @@ -21,44 +21,6 @@ http://bugs.gentoo.org/389397 + rawstudio.png --EXTRA_DIST = $(icon_DATA) $(rawstudio_DATA) artwork.license -+EXTRA_DIST = $(rawstudio_DATA) artwork.license ---- src/gtk-interface.c -+++ src/gtk-interface.c -@@ -1393,7 +1393,7 @@ gui_init(int argc, char **argv, RS_BLOB *rs) - GtkWidget *valuefield[3]; - - -- gtk_window_set_default_icon_from_file(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "icons" G_DIR_SEPARATOR_S PACKAGE ".png", NULL); -+ gtk_window_set_default_icon_from_file(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S PACKAGE ".png", NULL); - rs->window = gui_window_make(rs); - gtk_widget_show(rs->window); - ---- src/rs-store.c -+++ src/rs-store.c -@@ -1174,$(datadir)/icons/ is reserved for freedesktop.org specification compatible themes with index.theme file, -use $(datadir)/pixmaps/ instead - -http://bugs.gentoo.org/389397 - ---- pixmaps/Makefile.am -+++ pixmaps/Makefile.am -@@ -1,6 +1,3 @@ --icondir = $(datadir)/icons --icon_DATA = rawstudio.png -- - rawstudiodir = $(datadir)/pixmaps/rawstudio - rawstudio_DATA = overlay_deleted.png \ - overlay_priority1.png \ -@@ -18,7 +15,8 @@ rawstudio_DATA = overlay_deleted.png \ - cursor-rotate.png \ - tool-color-picker.png \ - tool-crop.png \ -- tool-rotate.png -+ tool-rotate.png \ -+ rawstudio.png - - -EXTRA_DIST = $(icon_DATA) $(rawstudio_DATA) artwork.license +EXTRA_DIST = $(rawstudio_DATA) artwork.license --- src/gtk-interface.c @@ -79,4 +41,28 @@ http://bugs.gentoo.org/389397 /* Global default icon */ if (!icon_default) - icon_default = gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "icons" G_DIR_SEPARATOR_S PACKAGE ".png", NULL); -+ icon_default = gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR G_DIR_SEPARATOR_ \ No newline at end of file ++ icon_default = gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S PACKAGE ".png", NULL); + + /* Add file to store */ + gdk_threads_enter(); +--- librawstudio/rs-utils.c ++++ librawstudio/rs-utils.c +@@ -603,7 +603,7 @@ void + check_install(void) + { + #define TEST_FILE_ACCESS(path) do { if (g_access(path, R_OK)!=0) g_debug("Cannot access %s\n", path);} while (0) +- TEST_FILE_ACCESS(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "icons" G_DIR_SEPARATOR_S PACKAGE ".png"); ++ TEST_FILE_ACCESS(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S PACKAGE ".png"); + TEST_FILE_ACCESS(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "overlay_priority1.png"); + TEST_FILE_ACCESS(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "overlay_priority2.png"); + TEST_FILE_ACCESS(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "overlay_priority3.png"); +--- rawstudio.desktop ++++ rawstudio.desktop +@@ -25,6 +25,5 @@ + Comment[sv]=Läs, bearbeta och konvertera råbilder från digitalkameror + Exec=rawstudio %F + StartupNotify=true +-Icon=rawstudio ++Icon=/usr/share/pixmaps/rawstudio/rawstudio.png + MimeType=image/x-dcraw; +- diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.24-unused-cups.patch b/media-gfx/sane-backends/files/sane-backends-1.0.24-unused-cups.patch index 883b175b8e70..c8ed34e88ff0 100644 --- a/media-gfx/sane-backends/files/sane-backends-1.0.24-unused-cups.patch +++ b/media-gfx/sane-backends/files/sane-backends-1.0.24-unused-cups.patch @@ -29,19 +29,14 @@ index e13888c..4365868 100644 +dnl with_cups="no" +dnl fi - dnl added by llagendijk 12/7/2012 to detect diff --git a/configure.in b/configure.in -index e13888c..4365868 100644 ---- a/configure.in -+++ b/configure.in -@@ -332,17 +332,17 @@ if test -c /dev/urandom ; then - AC_DEFINE(HAVE_DEV_URANDOM, 1, [Is /dev/urandom available?]) - fi - --dnl added by PN 3/2/12 to detect cups --$as_echo "checking for cups" --if test -e /usr/include/cups/cups.h ; then -- AC_DEFINE(HAVE_CUPS, 1, [Is /usr/include/cups/cups.h available?]) -- with_cups="yes" -- LIBS="-lcups $LIBS" --else -- $as_echo "cups. \ No newline at end of file + dnl added by llagendijk 12/7/2012 to detect systemd for saned + $as_echo_n "Checking for systemd..." +@@ -816,7 +816,7 @@ fi + echo "IPv6 support: `eval eval echo ${ipv6}`" + echo "Avahi support: `eval eval echo ${enable_avahi}`" + echo "SNMP support: `eval eval echo ${with_snmp}`" +-echo "CUPS support: `eval eval echo ${with_cups}`" ++dnl echo "CUPS support: `eval eval echo ${with_cups}`" commented out 15/10/13 + echo "-> The following backends will be built:" + for backend in ${BACKENDS} ; do + echo $ECHO_N "${backend} " diff --git a/media-libs/aalib/aalib-1.4_rc5-r6.ebuild b/media-libs/aalib/aalib-1.4_rc5-r6.ebuild index 1761ff8f2922..373551f3625c 100644 --- a/media-libs/aalib/aalib-1.4_rc5-r6.ebuild +++ b/media-libs/aalib/aalib-1.4_rc5-r6.ebuild @@ -57,6 +57,11 @@ src_configure() { $(use_enable static-libs static) ) - PKG_CONFIG=$(tc-# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-li \ No newline at end of file + PKG_CONFIG=$(tc-getPKG_CONFIG) \ + autotools-multilib_src_configure +} + +src_install() { + autotools-multilib_src_install + use static-libs || prune_libtool_files --all +} diff --git a/media-libs/adplug/adplug-2.2.ebuild b/media-libs/adplug/adplug-2.2.ebuild index 2e9492f61375..ff1423032f58 100644 --- a/media-libs/adplug/adplug-2.2.ebuild +++ b/media-libs/adplug/adplug-2.2.ebuild @@ -19,6 +19,10 @@ DEPEND="${RDEPEND} src_compile() { econf --disable-dependency-tracking $(use_enable debug) - emake || die "emake# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x \ No newline at end of file + emake || die "emake failed." +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed." + dodoc AUTHORS BUGS ChangeLog NEWS README TODO +} diff --git a/media-libs/alsa-lib/alsa-lib-1.0.28.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.28.ebuild index d158e65c405f..e705b67206e7 100644 --- a/media-libs/alsa-lib/alsa-lib-1.0.28.ebuild +++ b/media-libs/alsa-lib/alsa-lib-1.0.28.ebuild @@ -41,30 +41,47 @@ src_prepare() { } multilib_src_configure() { - loc# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.28.ebuild,v 1.5 2014/09/21 19:50:24 maekke Exp $ - -EAPI=5 - -# no support for python3_2 or above yet wrt #471326 -PYTHON_COMPAT=( python2_7 ) + local myconf + # enable Python only on final ABI + if multilib_is_native_abi; then + myconf="$(use_enable python)" + else + myconf="--disable-python" + fi + use elibc_uclibc && myconf+=" --without-versioned" + + ECONF_SOURCE=${S} \ + econf \ + --disable-maintainer-mode \ + --enable-shared \ + --disable-resmgr \ + --enable-rawmidi \ + --enable-seq \ + --enable-aload \ + $(use_with debug) \ + $(use_enable alisp) \ + ${myconf} +} -inherit autotools eutils multilib multilib-minimal python-single-r1 +multilib_src_compile() { + emake -DESCRIPTION="Advanced Linux Sound Architecture Library" -HOMEPAGE="http://www.alsa-project.org/" -SRC_URI="mirror://alsaproject/lib/${P}.tar.bz2" + if multilib_is_native_abi && use doc; then + emake doc + fgrep -Zrl "${S}" doc/doxygen/html | \ + xargs -0 sed -i -e "s:${S}::" + fi +} -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="alisp debug doc elibc_uclibc python" +multilib_src_install() { + emake DESTDIR="${D}" install + if multilib_is_native_abi && use doc; then + dohtml -r doc/doxygen/html/. + fi +} -RDEPEND="python? ( ${PYTHON_DEPS} ) - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-soundlibs-20130224-r1 - !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] - )" -DEPEND="${RDEPEND} - doc? ( >=app- \ No newline at end of file +multilib_src_install_all() { + prune_libtool_files --all + find "${ED}"/usr/$(get_libdir)/alsa-lib -name '*.a' -exec rm -f {} + + dodoc ChangeLog doc/asoundrc.txt NOTES TODO +} diff --git a/media-libs/alsa-oss/Manifest b/media-libs/alsa-oss/Manifest index 07be67266ff2..7c481712a7f2 100644 --- a/media-libs/alsa-oss/Manifest +++ b/media-libs/alsa-oss/Manifest @@ -1,4 +1,2 @@ DIST alsa-oss-1.0.25.tar.bz2 253409 SHA256 ed823b8e42599951d896c1709615d4cf7cb1cb3a7c55c75ccee82e24ccaf28e3 SHA512 5380e5acf588dd56384f53afedc7704bfc5e3a7b886853061c53236f86312a8f0ca9b9adf6e69019569a3eb6fd3e89acfb715bb16101f50dcf961e84269c3cd2 WHIRLPOOL 27f19ae9b43d6941fdafb8e51ef0e7cd2667a6a6a8babf58303a0468bad02a33fd2562e91e5c92941083f7a0b2b4e17d4a001c41370bf6cddd29182b17ee4ca0 DIST alsa-oss-1.0.28.tar.bz2 291500 SHA256 3ae62caa88a0bc7b30ed836dcb794dc6ef4d3650439e2260db54cace7d5c6ad5 SHA512 7069b7d4d4c0b840608dcca99a660aae1f81f6ef45dcf48fc66553b05de260d033105aa685c8ca05fd4d157d12d83860746a05afdab4f310919c34fa235ab03e WHIRLPOOL 02c7dfadbd30baaf86094a0ffff996eec5bf67aed7f49dc915d29b9a0318345415a1bd9c776967e1dc9da3c9dd180169f61950fd1454fa28837e35631cb83efe -DIST alsa-oss-1.0.25.tar.bz2 253409 SHA256 ed823b8e42599951d896c1709615d4cf7cb1cb3a7c55c75ccee82e24ccaf28e3 SHA512 5380e5acf588dd56384f53afedc7704bfc5e3a7b886853061c53236f86312a8f0ca9b9adf6e69019569a3eb6fd3e89acfb715bb16101f50dcf961e84269c3cd2 WHIRLPOOL 27f19ae9b43d6941fdafb8e51ef0e7cd2667a6a6a8babf58303a0468bad02a33fd2562e91e5c92941083f7a0b2b4e17d4a001c41370bf6cddd29182b17ee4ca0 -DIST alsa-oss-1.0.28.tar.bz2 291500 SHA256 3ae62caa88a0bc7b30ed836dcb794dc6ef4d3650439e2260db54cace7d5c6ad5 SHA512 7069b7d4d4c0b840608dcca99a660aae1f81f6ef45dcf48fc66553b05de260d033105a \ No newline at end of file diff --git a/media-libs/aubio/aubio-0.3.2-r2.ebuild b/media-libs/aubio/aubio-0.3.2-r2.ebuild index 306004a38504..35e1bc73b7c4 100644 --- a/media-libs/aubio/aubio-0.3.2-r2.ebuild +++ b/media-libs/aubio/aubio-0.3.2-r2.ebuild @@ -17,38 +17,6 @@ SLOT="0" KEYWORDS="amd64 ~ppc ppc64 sparc x86" IUSE="alsa doc examples jack lash static-libs" -RDEPEND="sci-libs/fftw:3.0 - media-libs/libsndfile - media-libs/libsamplerate - alsa? ( media-libs/alsa-lib ) - jack? ( media-sound/jack-audio-connection-kit ) - lash? ( media-sound/lash )" -DEPEND="${RDEPEND} - >=dev-lang/swig-1.3.0 - virtual/pkgconfig - doc? ( app-doc/doxygen virtual/latex-base )" - -pkg_setup() { - DOCS=( AUTHORS ChangeLog README TODO ) -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/aubio/aubio-0.3.2-r2.ebuild,v 1.9 2014/03/14 10:04:20 ago Exp $ - -EAPI=3 - -PYTHON_DEPEND="2:2.6" - -inherit autotools eutils python - -DESCRIPTION="Library for audio labelling" -HOMEPAGE="http://aubio.piem.org" -SRC_URI="http://aubio.piem.org/pub/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc ppc64 sparc x86" -IUSE="alsa doc examples jack lash static-libs" - RDEPEND="sci-libs/fftw:3.0 media-libs/libsndfile media-libs/libsamplerate @@ -90,4 +58,39 @@ src_compile() { default if use doc; then - export VARTEXFONTS="${T \ No newline at end of file + export VARTEXFONTS="${T}/fonts" + cd "${S}"/doc + doxygen user.cfg + doxygen devel.cfg + doxygen examples.cfg + fi +} + +src_install() { + # `default` would be enough here if python.eclass supported EAPI=4 + emake DESTDIR="${D}" install || die + dodoc "${DOCS[@]}" + + doman doc/*.1 + if use doc; then + mv doc/user/html doc/user/user + dohtml -r doc/user/user + mv doc/devel/html doc/devel/devel + dohtml -r doc/devel/devel + mv doc/examples/html doc/examples/examples + dohtml -r doc/examples/examples + fi + + if use examples; then + # install dist_noinst_SCRIPTS from Makefile.am + insinto /usr/share/doc/${PF}/examples + doins python/aubio{compare-onset,plot-notes,filter-notes,web.py} || die + docinto examples + newdoc python/README README.examples + fi + + find "${ED}"usr -name '*.la' -exec rm -f {} + +} + +pkg_postinst() { python_mod_optimize aubio; } +pkg_postrm() { python_mod_cleanup aubio; } diff --git a/media-libs/cimg/Manifest b/media-libs/cimg/Manifest index fa493b0dd826..1912343137df 100644 --- a/media-libs/cimg/Manifest +++ b/media-libs/cimg/Manifest @@ -1,2 +1 @@ -DIST CImg-1.5.2.zip 12824193 SHA256 4c6939d7d3c57752bb347362eca26eafb497571246d0d4c5f22d49721f8-----BEGIN PGP SIGNED MESSAGE----- DIST CImg-1.5.2.zip 12824193 SHA256 4c6939d7d3c57752bb347362eca26eafb497571246d0d4c5f22d49721f8bc63f SHA512 a6927cecb524da128a58de9d655c2bb948bb61f654d6f95c7fe2690d39a521fea5313326610c2b56b370f76139f753469b7e4366196dd83db18c5a0c3b307b52 WHIRLPOOL f5141eac762a2e6124fd6f88d0c54da4398321b043640d83665bd0e66af51067846d2d61be309b45efbddc111ffa79c61d4569268d504cb10ffa60b96acffb82 diff --git a/media-libs/clutter/Manifest b/media-libs/clutter/Manifest index 350706bc2ebd..64df106a8774 100644 --- a/media-libs/clutter/Manifest +++ b/media-libs/clutter/Manifest @@ -1,4 +1,2 @@ DIST clutter-1.18.2.tar.xz 5215180 SHA256 f9fe12e6148426063c90e67dfaeb56013bf1aea224ef502223d13eab6c1add63 SHA512 d7cf0d523dfd95f62910376d3958d50b9fd0debee0fd2e0c7c284500c78b5899fb0bb30dd279c638b4bc1cefaf63af376328f5e1c476d38c34ce4a79bd772b18 WHIRLPOOL e52c97e7c429b2a428e3749e8a6cafb2c9e5174a8437cd1f427b5c24c9df91f911a7ce76614d5131f6e6028504d5b23bf70ccf8b3e9b63a90af5a87329366f19 -DIST clutter-1.18.4.tar.xz 5237900 SHA256 4eea1015cd6d4b4945cb5d4a60e52275b0d70e13852d6d99c9abc0cd4deeb60c SHA512 a2ef71c3114cda5861cc88a3c826e6144dc44b8e63a1ece58d2bb7999e731cea612231c1f67af85f2bdddf02bbd80d27e5e35b4867fb378d6698c7b1b654aa62 WH-----BEGIN PGP SIGNED MESSAGE----- -DIST clutter-1.18.2.tar.xz 5215180 SHA256 f9fe12e6148426063c90e67dfaeb56013bf1aea224ef502223d13eab6c1add63 SHA512 d7cf0d523dfd95f62910376d3958d50b9fd0debee0fd2e0c7c284500c78b5899fb0bb30dd279c638b4bc1cefaf63af376328f5e1c476d38c34ce4a79bd772b18 WHIRLPOOL e52c97e7c429b2a428e3749e8a6cafb2c9e5174a8437cd1f427b5c24c9df91f911a7ce76614d5131f6e6028504d5b23bf70ccf8b3e9b63a90af5a87329366f19 DIST clutter-1.18.4.tar.xz 5237900 SHA256 4eea1015cd6d4b4945cb5d4a60e52275b0d70e13852d6d99c9abc0cd4deeb60c SHA512 a2ef71c3114cda5861cc88a3c826e6144dc44b8e63a1ece58d2bb7999e731cea612231c1f67af85f2bdddf02bbd80d27e5e35b4867fb378d6698c7b1b654aa62 WHIRLPOOL f03d6aaeca310da29b03b273a0695cd3407a9b76507195a6eca64d60bc4f0de6fac3f01eaf16b71dc1f0e04c0c40dd2e08caeb6dd44d47728ad7ceb2903146e5 diff --git a/media-libs/freetype/metadata.xml b/media-libs/freetype/metadata.xml index 723900235c68..28c85b3d1ee3 100644 --- a/media-libs/freetype/metadata.xml +++ b/media-libs/freetype/metadata.xml @@ -1,13 +1,5 @@ - - fonts - - yngwin@gentoo.org - Ben de Groot - - - fonts @@ -34,4 +26,11 @@ USE=truetype-debugger) Use media-libs/harfbuzz for auto-hinting OpenType fonts. WARNING: may trigger circular dependencies! - Enable infinality options for improved LCD + filtering + Install utilities and examples from ft2demos + + + cpe:/a:freetype:freetype + + diff --git a/media-libs/freeverb3/freeverb3-2.6.6.ebuild b/media-libs/freeverb3/freeverb3-2.6.6.ebuild index 7bff6276a435..a0fac2b38b23 100644 --- a/media-libs/freeverb3/freeverb3-2.6.6.ebuild +++ b/media-libs/freeverb3/freeverb3-2.6.6.ebuild @@ -36,13 +36,23 @@ src_configure() { $(use_enable 3dnow) \ $(use_enable sse) \ $(use_enable sse2) \ - $(use_enable sse3) \# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freeverb3/freeverb3-2.6.6.ebuild,v 1.1 2012/07/22 22:54:58 sping Exp $ - -EAPI=2 -inherit multilib versionator - -DESCRIPTION="High Quality Reverb and Impulse Response Convolution library including XMMS/Audacious Effect plugins" -HOMEPAGE="http://freeverb3.sourceforge.net/" -SRC_URI="mirror: \ No newline at end of file + $(use_enable sse3) \ + $(use_enable sse4) \ + $(use_enable avx) \ + --disable-fma \ + --disable-fma4 \ + $(use_enable forcefpu) \ + || die "econf failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc ChangeLog README || die 'dodoc failed' + + if use audacious ; then + find "${D}/usr/$(get_libdir)/audacious/" -name '*.la' -print -delete || die + fi + + insinto /usr/share/${PN}/samples/IR + doins samples/IR/*.wav || die +} diff --git a/media-libs/freeverb3/freeverb3-3.0.2.ebuild b/media-libs/freeverb3/freeverb3-3.0.2.ebuild index a41a99b11f16..af280ad7d00f 100644 --- a/media-libs/freeverb3/freeverb3-3.0.2.ebuild +++ b/media-libs/freeverb3/freeverb3-3.0.2.ebuild @@ -45,18 +45,27 @@ src_configure() { $(use_enable sse2) \ $(use_enable sse3) \ $(use_enable sse4) \ - $(use_ena# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freeverb3/freeverb3-3.0.2.ebuild,v 1.1 2013/11/19 21:31:08 sping Exp $ + $(use_enable avx) \ + --disable-fma \ + --disable-fma4 \ + $(use_enable openmp omp) \ + --disable-sample \ + $(use_enable jack) \ + $(use_enable audacious) \ + --disable-srcnewcoeffs \ + $(use_enable plugdouble) \ + --disable-pluginit \ + || die "econf failed" +} -EAPI=5 -inherit multilib versionator +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc ChangeLog README || die 'dodoc failed' -DESCRIPTION="High Quality Reverb and Impulse Response Convolution library including XMMS/Audacious Effect plugins" -HOMEPAGE="http://freeverb3.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" + if use audacious ; then + find "${D}/usr/$(get_libdir)/audacious/" -name '*.la' -print -delete || die + fi -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -_IUSE_INSTRUCTION_SETS="3dnow avx ss \ No newline at end of file + insinto /usr/share/${PN}/samples/IR + doins samples/IR/*.wav || die +} diff --git a/media-libs/freeverb3/freeverb3-3.1.1.ebuild b/media-libs/freeverb3/freeverb3-3.1.1.ebuild index fa528af739de..a0ae83fbd3c6 100644 --- a/media-libs/freeverb3/freeverb3-3.1.1.ebuild +++ b/media-libs/freeverb3/freeverb3-3.1.1.ebuild @@ -44,18 +44,28 @@ src_configure() { $(use_enable sse) \ $(use_enable sse2) \ $(use_enable sse3) \ - $(use_enab# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freeverb3/freeverb3-3.1.1.ebuild,v 1.1 2014/08/22 17:43:26 sping Exp $ + $(use_enable sse4) \ + $(use_enable avx) \ + --disable-fma \ + --disable-fma4 \ + $(use_enable openmp omp) \ + --disable-sample \ + $(use_enable jack) \ + $(use_enable audacious) \ + --disable-srcnewcoeffs \ + $(use_enable plugdouble) \ + --disable-pluginit \ + || die "econf failed" +} -EAPI=5 -inherit multilib versionator +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc ChangeLog README || die 'dodoc failed' -DESCRIPTION="High Quality Reverb and Impulse Response Convolution library including XMMS/Audacious Effect plugins" -HOMEPAGE="https://savannah.nongnu.org/projects/freeverb3" -SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz" + if use audacious ; then + find "${D}/usr/$(get_libdir)/audacious/" -name '*.la' -print -delete || die + fi -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -_IUSE_INSTRUCTION_SETS="3dnow avx sse sse2 sse3 ss \ No newline at end of file + insinto /usr/share/${PN}/samples/IR + doins samples/IR/*.wav || die +} diff --git a/media-libs/glm/Manifest b/media-libs/glm/Manifest index 91188eb4dbb0..434a8350ff8d 100644 --- a/media-libs/glm/Manifest +++ b/media-libs/glm/Manifest @@ -1,6 +1,3 @@ DIST glm-0.9.2.4.zip 3462705 SHA256 1ec0e08c15c3f7e67d646ffae57777836c64431ddbf6bdcda4b73fb584b2542c DIST glm-0.9.3.2.zip 6451695 SHA256 ee66ab8336b9b6b3dff69268c497688268cf5a9d2b3a14e1aa6fbd7f48c911be SHA512 7e446cb32c62254f6c44d4bc350a691312d33866bcb42865ee750342a22437e3df791007574582e9c0152f66d86d891cc433e8474c6167432f1604123b33ea51 WHIRLPOOL 9da6e38528ee7f3823983a0c4967e1528b05c7775adc548021bca36e908d987828f023e983a24bd46be48ad6a6e64c00b0c9fdb7f50abc97e1a9dbf9a0e15cd9 DIST glm-0.9.5.1.zip 4071873 SHA256 4f621657a3a7e73e2062f0c9b4366ba5e14a3c3b3c04928378f37fdd70bd0bf5 SHA512 9644e7d76dda057fb25c3c387316c551e964a179662baf095cc2519ec84693499fd1f9c8d614ed617c3a0e406843aad7a01cbbc9399e86d52cdd8cf72f1b9194 WHIRLPOOL 5a5e2e64c4236f46d97f286b6675fd01b92905fa86c02fe9812d272d0dd0319a1bff8ab0c8d27d1bb706b0033ba08b49085bd83264b72954ca7704fe7260333c -DIST glm-0.9.2.4.zip 3462705 SHA256 1ec0e08c15c3f7e67d646ffae57777836c64431ddbf6bdcda4b73fb584b2542c -DIST glm-0.9.3.2.zip 6451695 SHA256 ee66ab8336b9b6b3dff69268c497688268cf5a9d2b3a14e1aa6fbd7f48c911be SHA512 7e446cb32c62254f6c44d4bc350a691312d33866bcb42865ee750342a22437e3df791007574582e9c0152f66d86d891cc433e8474c6167432f1604123b33ea51 WHIRLPOOL 9da6e38528ee7f3823983a0c4967e1528b05c7775adc548021bca36e908d987828f023e983a24bd46be48ad6a6e64c00b0c9fdb7f50abc97e1a9dbf9a0e15cd9 -DIST glm-0.9.5.1.zip 4071873 SHA256 4f621657a3a7e73e2062f0c9b4366ba5e14a3c3b3c04928378f37fdd70bd0bf5 SHA512 9644e7d76dda057fb25c3c387316c551e964a179662baf095cc2519ec84693499fd1f9c8d614ed617c3a0e406843aad7a01cbbc9399e86d52cdd8cf72f1b9194 WHIRLPOOL 5a5e2e64c4236f46d97f286b6675fd01b92905fa86c02fe9812d272d0dd0319a1bff8ab0c8d27d1bb706b0033ba08b49085bd83264b72954ca7704fe7260333c diff --git a/media-libs/jpeg/jpeg-8d-r1.ebuild b/media-libs/jpeg/jpeg-8d-r1.ebuild index 1662e27aaed1..9e6c04b9d3c2 100644 --- a/media-libs/jpeg/jpeg-8d-r1.ebuild +++ b/media-libs/jpeg/jpeg-8d-r1.ebuild @@ -31,18 +31,39 @@ multilib_src_configure() { # Fix building against this library on eg. Solaris and DragonFly BSD, see: # http://mail-index.netbsd.org/pkgsrc-bugs/2010/01/18/msg035644.html local ldverscript= - [[ ${CHOST} # Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-8d-r1.ebuild,v 1.17 2014/06/09 23:22:38 vapier Exp $ + [[ ${CHOST} == *-solaris* ]] && ldverscript="--disable-ld-version-script" -EAPI=5 -inherit eutils libtool toolchain-funcs multilib-minimal + ECONF_SOURCE=${S} \ + econf \ + $(use_enable static-libs static) \ + --enable-maxmem=64 \ + ${ldverscript} +} -DESCRIPTION="Library to load, handle and manipulate images in the JPEG format" -HOMEPAGE="http://jpegclub.org/ http://www.ijg.org/" -SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz - mirror://debian/pool/main/libj/lib${PN}8/lib${PN}8_8d-1.debian.tar.gz" +multilib_src_compile() { + emake -LICENSE="IJG" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x6 \ No newline at end of file + if multilib_is_native_abi; then + # Build exifautotran and jpegexiforient + cd ../debian/extra + emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}" + fi +} + +multilib_src_install() { + emake DESTDIR="${D}" install +} + +multilib_src_install_all() { + prune_libtool_files + + dodoc change.log example.c README *.txt + + # Install exifautotran and jpegexiforient + newdoc ../debian/changelog changelog.debian + cd ../debian/extra + emake \ + DESTDIR="${D}" prefix="${EPREFIX}"/usr \ + INSTALL="install -m755" INSTALLDIR="install -d -m755" \ + install +} diff --git a/media-libs/jpeg/jpeg-9a.ebuild b/media-libs/jpeg/jpeg-9a.ebuild index 26cce2919770..1f1ded5eb72d 100644 --- a/media-libs/jpeg/jpeg-9a.ebuild +++ b/media-libs/jpeg/jpeg-9a.ebuild @@ -31,18 +31,37 @@ multilib_src_configure() { local ldverscript= [[ ${CHOST} == *-solaris* ]] && ldverscript="--disable-ld-version-script" - ECONF_SOURCE=$# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-9a.ebuild,v 1.4 2014/06/09 23:22:19 vapier Exp $ + ECONF_SOURCE=${S} \ + econf \ + $(use_enable static-libs static) \ + --enable-maxmem=64 \ + ${ldverscript} +} -EAPI=5 -inherit eutils libtool toolchain-funcs multilib-minimal +multilib_src_compile() { + emake -DESCRIPTION="Library to load, handle and manipulate images in the JPEG format" -HOMEPAGE="http://jpegclub.org/ http://www.ijg.org/" -SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz - mirror://debian/pool/main/libj/lib${PN}8/lib${PN}8_8d-1.debian.tar.gz" + if multilib_is_native_abi; then + # Build exifautotran and jpegexiforient + cd ../debian/extra + emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}" + fi +} -LICENSE="IJG" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd \ No newline at end of file +multilib_src_install() { + emake DESTDIR="${D}" install +} + +multilib_src_install_all() { + prune_libtool_files + + dodoc change.log example.c README *.txt + + # Install exifautotran and jpegexiforient + newdoc ../debian/changelog changelog.debian + cd ../debian/extra + emake \ + DESTDIR="${D}" prefix="${EPREFIX}"/usr \ + INSTALL="install -m755" INSTALLDIR="install -d -m755" \ + install +} diff --git a/media-libs/ladspa-cmt/ladspa-cmt-1.16-r2.ebuild b/media-libs/ladspa-cmt/ladspa-cmt-1.16-r2.ebuild index 57114a7b7891..a1ffa6e453fd 100644 --- a/media-libs/ladspa-cmt/ladspa-cmt-1.16-r2.ebuild +++ b/media-libs/ladspa-cmt/ladspa-cmt-1.16-r2.ebuild @@ -44,6 +44,14 @@ src_compile() { emake || die "emake failed" } -src_inst# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/ladspa-cmt/ladspa-cmt-1.16- \ No newline at end of file +src_install() { + insinto /usr/share/ladspa/rdf/ + doins "${FILESDIR}/cmt.rdf" + + insopts -m755 + insinto /usr/$(get_libdir)/ladspa + doins ../plugins/*.so + + dodoc ../README + dohtml ../doc/* +} diff --git a/media-libs/ladspa-cmt/ladspa-cmt-1.16.ebuild b/media-libs/ladspa-cmt/ladspa-cmt-1.16.ebuild index 4430c1ba41ab..0bf9bf0e0198 100644 --- a/media-libs/ladspa-cmt/ladspa-cmt-1.16.ebuild +++ b/media-libs/ladspa-cmt/ladspa-cmt-1.16.ebuild @@ -17,26 +17,6 @@ KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd" LICENSE="LGPL-2.1" SLOT="0" -DEPEND="media-libs/ladspa-sdk - >=sys-apps/# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/ladspa-cmt/ladspa-cmt-1.16.ebuild,v 1.14 2012/11/27 11:55:17 aballier Exp $ - -inherit eutils multilib toolchain-funcs - -IUSE="" - -S="${WORKDIR}/cmt/src" -MY_P="cmt_src_${PV}" - -DESCRIPTION="CMT (computer music toolkit) Lasdpa library plugins" -HOMEPAGE="http://www.ladspa.org/" -SRC_URI="http://www.ladspa.org/download/${MY_P}.tgz" - -KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd" -LICENSE="LGPL-2.1" -SLOT="0" - DEPEND="media-libs/ladspa-sdk >=sys-apps/sed-4" RDEPEND="" @@ -49,4 +29,26 @@ src_unpack() { -e "/^CFLAGS/ s/-O3/${CFLAGS}/" \ -e 's|/usr/local/include||g' \ -e 's|/usr/local/lib||g' makefile \ - || die "sed \ No newline at end of file + || die "sed makefile failed" + sed -i -e "s/^CXXFLAGS*/CXXFLAGS = ${CXXFLAGS} \$(INCLUDES) -Wall -fPIC\n#/" \ + "${S}/makefile" || die "sed makefile failed (CXXFLAGS)" + + cd "${S}" + epatch "${FILESDIR}/${P}-mallocstdlib.patch" + use userland_Darwin && epatch "${FILESDIR}/${P}-darwin.patch" +} + +src_compile() { + tc-export CXX + emake || die "emake failed" +} + +src_install() { + insinto /usr/share/ladspa/rdf/ + doins "${FILESDIR}/cmt.rdf" + insopts -m755 + insinto /usr/$(get_libdir)/ladspa + doins ../plugins/*.so || die "doins failed" + dodoc ../README || die "dodoc failed" + dohtml ../doc/* || die "dohtml failed" +} diff --git a/media-libs/ladspa-sdk/ladspa-sdk-1.13-r2.ebuild b/media-libs/ladspa-sdk/ladspa-sdk-1.13-r2.ebuild index ecfe755d5e1b..f1a158847102 100644 --- a/media-libs/ladspa-sdk/ladspa-sdk-1.13-r2.ebuild +++ b/media-libs/ladspa-sdk/ladspa-sdk-1.13-r2.ebuild @@ -32,25 +32,40 @@ src_prepare() { "${FILESDIR}"/${P}-no-LD.patch sed -i -e 's:-sndfile-play*:@echo Disabled \0:' \ - makefile || die "sed # Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/ladspa-sdk/ladspa-sdk-1.13-r2.ebuild,v 1.9 2014/01/26 12:14:13 ago Exp $ + makefile || die "sed makefile failed (sound playing tests)" -EAPI=5 + cd "${S}" + multilib_copy_sources +} -inherit eutils multilib toolchain-funcs portability flag-o-matic multilib-minimal +multilib_src_compile() { + cd src + emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ + DYNAMIC_LD_LIBS="$(dlopen_lib)" \ + CC="$(tc-getCC)" CXX="$(tc-getCXX)" \ + targets +} -MY_PN=${PN/-/_} -MY_P=${MY_PN}_${PV} +multilib_src_test() { + cd src + emake test +} -DESCRIPTION="The Linux Audio Developer's Simple Plugin API" -HOMEPAGE="http://www.ladspa.org/" -SRC_URI="http://www.ladspa.org/download/${MY_P}.tgz" +multilib_src_install() { + cd src + emake INSTALL_PLUGINS_DIR="/usr/$(get_libdir)/ladspa" \ + DESTDIR="${D}" \ + MKDIR_P="mkdir -p" \ + install +} -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="" +multilib_src_install_all() { + einstalldocs + dohtml doc/*.html -RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r2 - !app-emulation/emul-linux-x86-soun \ No newline at end of file + # Needed for apps like rezound + # emul-linux-soundlibs doesnt seem to install this, so keep it only for the + # default abi. + dodir /etc/env.d + echo "LADSPA_PATH=/usr/$(get_libdir)/ladspa" > "${D}/etc/env.d/60ladspa" +} diff --git a/media-libs/libfishsound/libfishsound-1.0.0.ebuild b/media-libs/libfishsound/libfishsound-1.0.0.ebuild index 83e6ae8e58e5..d9eee050147e 100644 --- a/media-libs/libfishsound/libfishsound-1.0.0.ebuild +++ b/media-libs/libfishsound/libfishsound-1.0.0.ebuild @@ -42,5 +42,7 @@ src_configure() { } src_install() { - emake D# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public Licen \ No newline at end of file + emake DESTDIR="${D}" \ + docdir="${D}/usr/share/doc/${PF}" install || die + dodoc AUTHORS ChangeLog README +} diff --git a/media-libs/liboggz/Manifest b/media-libs/liboggz/Manifest index e50922f61612..aadfcef4af77 100644 --- a/media-libs/liboggz/Manifest +++ b/media-libs/liboggz/Manifest @@ -1,2 +1 @@ -DIST liboggz-1.1.1.tar.gz 702261 RMD160 e85073131bc8ec021b1529487ef21802d01b0260 SHA1 3540190c8c9a31d834aa7794AUX liboggz-1.1.1-destdir.patch 546 RMD160 60caa969f4502d461f4b8eabf5127e2e9da18a99 SHA1 e81e868bc6b889dedf8d950f20f2a38de18bc87c SHA256 efbcc7b3b1084acf5f2ee34e7291e8ba9144c894ebca59285edeff5dd75f4a03 DIST liboggz-1.1.1.tar.gz 702261 RMD160 e85073131bc8ec021b1529487ef21802d01b0260 SHA1 3540190c8c9a31d834aa7794ef991bbab699f4de SHA256 6bafadb1e0a9ae4ac83304f38621a5621b8e8e32927889e65a98706d213d415a diff --git a/media-libs/libpng/libpng-1.5.18-r1.ebuild b/media-libs/libpng/libpng-1.5.18-r1.ebuild index c469bdcddde9..0ed8ef494be6 100644 --- a/media-libs/libpng/libpng-1.5.18-r1.ebuild +++ b/media-libs/libpng/libpng-1.5.18-r1.ebuild @@ -47,5 +47,9 @@ multilib_src_configure() { } multilib_src_compile() { - emake # Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Pu \ No newline at end of file + emake libpng15.la +} + +multilib_src_install() { + newlib.so .libs/libpng15.so.15.* libpng15.so.15 +} diff --git a/media-libs/memphis/memphis-0.2.3.ebuild b/media-libs/memphis/memphis-0.2.3.ebuild index 7568d6111386..57311db296f8 100644 --- a/media-libs/memphis/memphis-0.2.3.ebuild +++ b/media-libs/memphis/memphis-0.2.3.ebuild @@ -4,12 +4,6 @@ EAPI=4 -WANT_AUTOMAK# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/memphis/memphis-0.2.3.ebuild,v 1.23 2014/01/15 12:58:16 ago Exp $ - -EAPI=4 - WANT_AUTOMAKE=1.11 AUTOTOOLS_AUTORECONF=true @@ -43,4 +37,17 @@ PATCHES=( "${FILESDIR}"/${P}-link_gobject.patch ) src_prepare() { unset VALAC - use vala && vala_src \ No newline at end of file + use vala && vala_src_prepare + autotools-utils_src_prepare +} + +src_configure() { + local myeconfargs=( + $(use_enable debug) + $(use_enable doc gtk-doc) + $(use_enable introspection) + $(use_enable vala) + ) + CFLAGS="${CFLAGS}" \ + autotools-utils_src_configure +} diff --git a/media-libs/nas/nas-1.9.4.ebuild b/media-libs/nas/nas-1.9.4.ebuild index ec110853d353..f1e11c4ec17b 100644 --- a/media-libs/nas/nas-1.9.4.ebuild +++ b/media-libs/nas/nas-1.9.4.ebuild @@ -84,9 +84,16 @@ multilib_src_install() { multilib_src_install_all() { einstalldocs if use doc; then - docin# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/nas-1.9.4.ebuild,v 1.11 2014/06/18 19:52:13 mgorny Exp $ + docinto doc + dodoc doc/{actions,protocol.txt,README} + docinto pdf + dodoc doc/pdf/*.pdf + fi -EAPI=5 -inherit eutils multilib toolchain-funcs multilib- \ No newline at end of file + mv -vf "${D}"/etc/nas/nasd.conf{.eg,} || die + + newconfd "${FILESDIR}"/nas.conf.d nas + newinitd "${FILESDIR}"/nas.init.d nas + + use static-libs || rm -f "${D}"/usr/lib*/libaudio.a +} diff --git a/media-libs/sg/files/1.4-opengl.patch b/media-libs/sg/files/1.4-opengl.patch index 3efade6cbc1f..f6b32cf1d286 100644 --- a/media-libs/sg/files/1.4-opengl.patch +++ b/media-libs/sg/files/1.4-opengl.patch @@ -56,33 +56,43 @@ index 10efb6b..0d5b8b7 100644 clean-local: diff --git a/src/aaa_lib/Makefile.am b/src/aaa_lib/Makefile.am -index bb93779..0512diff --git a/configure.ac b/configure.ac -index 68ff24a..a2cd6b5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -844,9 +844,6 @@ AC_OUTPUT([ +index bb93779..0512c45 100644 +--- a/src/aaa_lib/Makefile.am ++++ b/src/aaa_lib/Makefile.am +@@ -41,32 +41,16 @@ BASE_LIBS = ../base/libbase.la + OGL_LIBS = ../ogl/libogl.la + VGL_LIBS = ../vgl/libvgl.la - src/base/Makefile +-GL_LIBS = ../gl/libGL.la +-if BUILD_GL +-LIBGL = libGL.la +-else +-LIBGL = +-endif ++GL_LIBS = ${libdir}/libGL.la -- src/gl/Makefile -- src/glu/Makefile -- src/glw/Makefile - src/ogl/Makefile - src/vgl/Makefile +-GLU_LIBS = ../glu/libGLU.la +-if BUILD_GLU +-LIBGLU = libGLU.la +-else +-LIBGLU = +-endif ++GLU_LIBS = ${libdir}/libGLU.la -diff --git a/src/Makefile.am b/src/Makefile.am -index ad9562f..7d5173c 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -35,5 +35,5 @@ - AUTOMAKE_OPTIONS = no-dependencies - SUFFIXES = .y .l .H .h .m .C .cc .c .f .java .o - always_built_SUBDIRS = ogl vgl --SUBDIRS = base @gl@ @glu@ @glw@ $(always_built_SUBDIRS) aaa_inc aaa_lib . -+SUBDIRS = base $(always_built_SUBDIRS) aaa_inc aaa_lib . +-GLW_LIBS = ../glw/libGLw.la +-if BUILD_GLW +-LIBGLW = libGLw.la +-else +-LIBGLW = +-endif ++GLW_LIBS = ${libdir}/libGLw.la -diff --git a/src/aaa_inc/GL/Makefile.am b/src/aaa_inc/GL/Makefile.am -index 10efb6b..0d5b8b7 100644 ---- a/src/aaa_inc/GL/Makefile.am -+++ b/src/aaa_inc/GL/Makefile.am -@@ -37,27 +37,6 @@ SUFFIXES = .y .l .H .h .m .C .cc . \ No newline at end of file +-libdir = ${prefix}/lib + lib_LTLIBRARIES = libsg.la ${LIBGL} ${LIBGLU} ${LIBGLW} + + libsg_la_SOURCES = +-libsg_la_LIBADD = ${BASE_LIBS} ${OGL_LIBS} ${VGL_LIBS} ++libsg_la_LIBADD = ${BASE_LIBS} ${OGL_LIBS} ${VGL_LIBS} -lGL -lGLU -lGLw -lXm -lmaloc -lXaw + libsg_la_LDFLAGS = -version-info ${FETK_VERSION} + + libGL_la_SOURCES = diff --git a/media-libs/taglib/taglib-1.9.1-r2.ebuild b/media-libs/taglib/taglib-1.9.1-r2.ebuild index dc6255355b72..dec00e6274dc 100644 --- a/media-libs/taglib/taglib-1.9.1-r2.ebuild +++ b/media-libs/taglib/taglib-1.9.1-r2.ebuild @@ -51,14 +51,16 @@ multilib_src_configure() { multilib_src_test() { # ctest does not work - emake# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/taglib/taglib-1.9.1-r2.ebuild,v 1.11 2014/08/27 09:05:26 ssuominen Exp $ - -EAPI=5 - -inherit cmake-multilib + emake -C "${BUILD_DIR}" check +} -DESCRIPTION="A library for reading and editing audio meta data" -HOMEPAGE="http://developer.kde.org/~wheeler/taglib.html" -SRC_URI= \ No newline at end of file +pkg_postinst() { + if ! use asf; then + elog "You've chosen to disable the asf use flag, thus taglib won't include" + elog "support for Microsoft's 'advanced systems format' media container" + fi + if ! use mp4; then + elog "You've chosen to disable the mp4 use flag, thus taglib won't include" + elog "support for the MPEG-4 part 14 / MP4 media container" + fi +} diff --git a/media-libs/x264/files/x264-0.0.20130731-cflags.patch b/media-libs/x264/files/x264-0.0.20130731-cflags.patch index b84d02282bc7..3014b47eca8e 100644 --- a/media-libs/x264/files/x264-0.0.20130731-cflags.patch +++ b/media-libs/x264/files/x264-0.0.20130731-cflags.patch @@ -38,22 +38,25 @@ Index: x264-9999/configure # only the GNU toolchain is inconsistent in prefixing function names with _ @@ -602,7 +592,11 @@ case $host_cpu in [ $compiler = GNU ] && LDFLAGS="$LDFLAGS -Wl,--nxcompat -Wl,--dynamicbase" - [ $compilhttps://bugs.gentoo.org/420241 for x32 stuff -initial x32 support -- no asm code, just pure C - -avoid messing too much with CFLAGS. -https://bugs.gentoo.org/show_bug.cgi?id=351219 -https://bugs.gentoo.org/show_bug.cgi?id=413661 - - -Index: x264-9999/configure -=================================================================== ---- x264-9999.orig/configure -+++ x264-9999/configure -@@ -553,11 +553,6 @@ case $host_cpu in - if [[ "$asm" == auto && "$CFLAGS" != *-march* ]]; then - CFLAGS="$CFLAGS -march=i686" - fi -- if [[ "$asm" == auto && "$CFLAGS" != *-mfpmath* ]]; then -- CFLAGS="$CFLAGS -mfpmath=sse -msse" -- \ No newline at end of file + [ $compiler = GNU ] && RCFLAGS="--target=pe-x86-64 $RCFLAGS" + else +- ASFLAGS="$ASFLAGS -f elf -m amd64" ++ if cpp_check "" "" "__ILP32__" ; then ++ ASFLAGS="$ASFLAGS -f elf -m x32" ++ else ++ ASFLAGS="$ASFLAGS -f elf -m amd64" ++ fi + fi + ;; + powerpc|powerpc64) +@@ -964,10 +958,6 @@ if [ "$pic" = "yes" ] ; then + [ $SYS = SunOS -a "$ARCH" = "X86" ] && SOFLAGS="$SOFLAGS -mimpure-text" + fi + +-if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then +- CFLAGS="$CFLAGS -fomit-frame-pointer" +-fi +- + if [ "$strip" = "yes" ]; then + CFLAGS="$CFLAGS -s" + LDFLAGS="$LDFLAGS -s" diff --git a/media-libs/x264/x264-0.0.20120327.ebuild b/media-libs/x264/x264-0.0.20120327.ebuild index 2c0e63a91753..6a9273edf4c4 100644 --- a/media-libs/x264/x264-0.0.20120327.ebuild +++ b/media-libs/x264/x264-0.0.20120327.ebuild @@ -24,37 +24,6 @@ else SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2" fi -LICENSE="GPL-2" -SLOT="0" -if [ "${PV#9999}" != "${PV}" ]; then - KEYWORDS="" -else - KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-0.0.20120327.ebuild,v 1.2 2012/05/15 13:12:19 aballier Exp $ - -EAPI=4 - -if [ "${PV#9999}" != "${PV}" ] ; then - V_ECLASS="git-2" -else - V_ECLASS="versionator" -fi - -inherit multilib toolchain-funcs flag-o-matic ${V_ECLASS} - -if [ "${PV#9999}" = "${PV}" ]; then - MY_P="x264-snapshot-$(get_version_component_range 3)-2245" -fi -DESCRIPTION="A free library for encoding X264/AVC streams" -HOMEPAGE="http://www.videolan.org/developers/x264.html" -if [ "${PV#9999}" != "${PV}" ] ; then - EGIT_REPO_URI="git://git.videolan.org/x264.git" - SRC_URI="" -else - SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2" -fi - LICENSE="GPL-2" SLOT="0" if [ "${PV#9999}" != "${PV}" ]; then @@ -81,4 +50,39 @@ src_configure() { local myconf="" use 10bit && myconf+=" --bit-depth=10" use debug && myconf+=" --enable-debug" - use interlaced || myconf+=" --dis \ No newline at end of file + use interlaced || myconf+=" --disable-interlaced" + use static-libs && myconf+=" --enable-static" + use threads || myconf+=" --disable-thread" + + # let upstream pick the optimization level by default + use custom-cflags || filter-flags -O? + + if use x86 && use pic; then + myconf+=" --disable-asm" + fi + + ./configure \ + --prefix="${EPREFIX}"/usr \ + --libdir="${EPREFIX}"/usr/$(get_libdir) \ + --disable-cli \ + --disable-avs \ + --disable-lavf \ + --disable-swscale \ + --disable-ffms \ + --disable-gpac \ + --enable-pic \ + --enable-shared \ + --host="${CHOST}" \ + ${myconf} || die + + # this is a nasty workaround for bug #376925 as upstream doesn't like us + # fiddling with their CFLAGS + if use custom-cflags; then + local cflags + cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')" + cflags="${cflags//$(get-flag O)/}" + cflags="${cflags//-O? /$(get-flag O) }" + cflags="${cflags//-g /}" + sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak + fi +} diff --git a/media-plugins/swh-plugins/swh-plugins-0.4.15-r3.ebuild b/media-plugins/swh-plugins/swh-plugins-0.4.15-r3.ebuild index 01ec11f8a945..975a25872597 100644 --- a/media-plugins/swh-plugins/swh-plugins-0.4.15-r3.ebuild +++ b/media-plugins/swh-plugins/swh-plugins-0.4.15-r3.ebuild @@ -47,23 +47,28 @@ src_prepare() { rm -f missing # old shipped version breaks multilib build #475022 - rm# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/swh-plugins/swh-plugins-0.4.15-r3.ebuild,v 1.3 2014/06/18 20:26:22 mgorny Exp $ - -EAPI=5 - -inherit eutils autotools multilib-minimal - -DESCRIPTION="Large collection of LADSPA audio plugins/effects" -HOMEPAGE="http://plugin.org.uk" -SRC_URI="http://plugin.org.uk/releases/${PV}/${P}.tar.gz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="3dnow nls sse" - -RDEPEND=" - >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] - >= \ No newline at end of file + rm -f config.h + + # Fix build with automake 1.13 + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in || die + + eautoreconf + elibtoolize +} + +multilib_src_configure() { + ECONF_SOURCE="${S}" econf \ + $(use_enable sse) \ + $(use_enable 3dnow) \ + $(use_enable nls) \ + --enable-fast-install \ + --disable-dependency-tracking +} + +pkg_postinst() { + ewarn "WARNING: You have to be careful when using the" + ewarn "swh plugins. Be sure to lower your sound volume" + ewarn "and then play around a bit with the plugins so" + ewarn "you get a feeling for it. Otherwise your speakers" + ewarn "won't like that." +} diff --git a/media-plugins/tap-plugins/metadata.xml b/media-plugins/tap-plugins/metadata.xml index 7ab31a72ac19..8883efd702be 100644 --- a/media-plugins/tap-plugins/metadata.xml +++ b/media-plugins/tap-plugins/metadata.xml @@ -5,13 +5,6 @@ TAP-plugins is short for Tom's Audio Processing plugins. It is a bunch of LADSPA plugins for digital audio processing, intended for use in a -professional DAW environment such as Ardour. These plugins should compi - - -proaudio - -TAP-plugins is short for Tom's Audio Processing plugins. It is a bunch of -LADSPA plugins for digital audio processing, intended for use in a professional DAW environment such as Ardour. These plugins should compile and run on any recent (that is, not seriously outdated) GNU/Linux system. They don't require any special libraries besides the standard GNU C and math @@ -24,4 +17,10 @@ during computations. The plugins have been tested with sample rates 44.1 kHz and 96 kHz, as the author uses these values in his studio. Please note that although all plugins should be essentially functional at virtually any sample rate, the audio fidelity depends slightly on the actual sample rate -used. \ No newline at end of file +used. Higher sample rate is better, of course. This means that an equalizer +or reverberator plugin will produce higher quality output, and will sound a +bit smoother at 96 kHz compared to, say, 44.1 kHz. This is a natural effect +that results from the fundamental properties of digital signal processing, +but you should be aware of it nevertheless. + + diff --git a/media-plugins/vdr-alcd/Manifest b/media-plugins/vdr-alcd/Manifest index 9b03edbc823f..7d94fa9be22e 100644 --- a/media-plugins/vdr-alcd/Manifest +++ b/media-plugins/vdr-alcd/Manifest @@ -1,2 +1 @@ DIST vdr-alcd-1.5.1.tgz 40104 SHA256 9643d9f1214c33c8e5743e715b0e8c9a476e2df6f41f077bcf297ab03a33fe49 -DIST vdr-alcd-1.5.1.tgz 40104 SHA256 9643d9f1214c33c8e5743e715b0e8c9a476e2df6f41f077bcf297ab03a33fe49 diff --git a/media-plugins/vdr-cdplayer/Manifest b/media-plugins/vdr-cdplayer/Manifest index d12be926cdab..bd48e2e81aba 100644 --- a/media-plugins/vdr-cdplayer/Manifest +++ b/media-plugins/vdr-cdplayer/Manifest @@ -1,4 +1,2 @@ DIST vdr-cdplayer-1.2.0.tgz 175851 SHA256 20303ceb1cc8c64ea2c3cd9e8ab7e39e3edbb64fad9c238ed92baa45615de351 SHA512 03dda4389347a43bf20fa15ef4b754aa15c7af965dbc56b7cf054ff0c7d8eb987d77dbec3e8cc513ab7b4a773e0848a58fa72664016d8f6cce9c3aa3fe25674c WHIRLPOOL 06462ac2445aa2344f3181994ecdc7c3cbd21763d8b39e75b8ce59441690d43b998fc18a93270672aa551cb18d72b1129098be9a583e70d063be81ea62ce948f -DIST vdr-cdplayer-----BEGIN PGP SIGNED MESSAGE----- -DIST vdr-cdplayer-1.2.0.tgz 175851 SHA256 20303ceb1cc8c64ea2c3cd9e8ab7e39e3edbb64fad9c238ed92baa45615de351 SHA512 03dda4389347a43bf20fa15ef4b754aa15c7af965dbc56b7cf054ff0c7d8eb987d77dbec3e8cc513ab7b4a773e0848a58fa72664016d8f6cce9c3aa3fe25674c WHIRLPOOL 06462ac2445aa2344f3181994ecdc7c3cbd21763d8b39e75b8ce59441690d43b998fc18a93270672aa551cb18d72b1129098be9a583e70d063be81ea62ce948f DIST vdr-cdplayer-1.2.1.tgz 180240 SHA256 f6b6c2828404bf1519d1adb3434a370393d7b0ab4bea145dc0d296f4656f6a8e SHA512 64b502a7f07d977c95e10a86353bc45351a43b178e8edcbfa783fcc6a5ae985e405b4f86ac783bc15d8795c8b77d59955570f4ab2e89a426f28c343216dc7768 WHIRLPOOL 8227df6fb47bd5a9da5004c3e12364c9d6ed484705e8868a7e034f65c916e304b56dc7b0bd88391745bf6bc6d98f141982fbd67dab514e788e76869b5fc730b6 diff --git a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.7_makefile.diff b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.7_makefile.diff index bb15a454a625..f638be630069 100644 --- a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.7_makefile.diff +++ b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.7_makefile.diff @@ -3,12 +3,6 @@ Matthias Schwarzott 23 Okt 2009 diff -Naur graphtft-24.orig/Makefile graphtft-24/Makefile --- graphtft-24.orig/Makefile 2009-10-21 21:53:56.000000000 +0200 +++ graphtft-24/Makefile 2009-10-21 21:57:24.000000000 +0200 -@@ -158,10 +158,10 @@ - DEFINES += -D_GNJoerg Bornkessel 22 Okt 2009 -Matthias Schwarzott 23 Okt 2009 -diff -Naur graphtft-24.orig/Makefile graphtft-24/Makefile ---- graphtft-24.orig/Makefile 2009-10-21 21:53:56.000000000 +0200 -+++ graphtft-24/Makefile 2009-10-21 21:57:24.000000000 +0200 @@ -158,10 +158,10 @@ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' @@ -59,4 +53,15 @@ diff -Naur graphtft-24.orig/graphtft-fe/Makefile graphtft-24/graphtft-fe/Makefil AR = ar TARGET = graphtft-fe -diff -Naur graphtft-24.orig/graphtft-fe/Makefil \ No newline at end of file +diff -Naur graphtft-24.orig/graphtft-fe/Makefile graphtft-24/graphtft-fe/Makefile +--- graphtft-24.orig/graphtft-fe/Makefile 2009-10-23 16:20:43.000000000 +0200 ++++ graphtft-24/graphtft-fe/Makefile 2009-10-23 16:21:20.000000000 +0200 +@@ -17,7 +17,7 @@ + + all: + echo Build graphTFT Frontend +- @(make $(TARGET)) ++ @$(MAKE) $(TARGET) + + + $(TARGET): $(OBJECTS) diff --git a/media-plugins/vdr-skinnopacity/vdr-skinnopacity-1.1.3.ebuild b/media-plugins/vdr-skinnopacity/vdr-skinnopacity-1.1.3.ebuild index 748135964df9..ae6642f036c6 100644 --- a/media-plugins/vdr-skinnopacity/vdr-skinnopacity-1.1.3.ebuild +++ b/media-plugins/vdr-skinnopacity/vdr-skinnopacity-1.1.3.ebuild @@ -36,6 +36,9 @@ src_prepare() { fi } -pk# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-skinnopacity/vdr-skin \ No newline at end of file +pkg_postinst() { + vdr-plugin-2_pkg_postinst + + einfo "See http://projects.vdr-developer.org/projects/skin-nopacity/wiki" + einfo "for more information about how to use channel logos" +} diff --git a/media-plugins/vdr-skinsoppalusikka/metadata.xml b/media-plugins/vdr-skinsoppalusikka/metadata.xml index 4ac9c9cb3277..4cbd0a3e5ea4 100644 --- a/media-plugins/vdr-skinsoppalusikka/metadata.xml +++ b/media-plugins/vdr-skinsoppalusikka/metadata.xml @@ -1,11 +1,12 @@ - - media-tv vdr@gentoo.org Gentoo VDR Project - \ No newline at end of file + + The "Soppalusikka" is a standalone skin is based on "enElchi" text2skin addon. + + diff --git a/media-sound/alsamixer-app/alsamixer-app-0.1.ebuild b/media-sound/alsamixer-app/alsamixer-app-0.1.ebuild index ae51053a7827..018c77db7797 100644 --- a/media-sound/alsamixer-app/alsamixer-app-0.1.ebuild +++ b/media-sound/alsamixer-app/alsamixer-app-0.1.ebuild @@ -14,14 +14,29 @@ SRC_URI="http://dockapps.windowmaker.org/download.php/id/517/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE=# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/alsamixer-app/alsamixer-app-0.1.ebuild,v 1.3 2012/02/15 09:28:29 voyageur Exp $ +IUSE="" -inherit eutils toolchain-funcs +RDEPEND="x11-libs/libX11 + x11-libs/libXpm + x11-libs/libXext + media-libs/alsa-lib" +DEPEND="${RDEPEND} + x11-proto/xextproto" -MY_PN=AlsaMixer.app -MY_P=${MY_PN}-${PV} +S=${WORKDIR}/${MY_P} -DESCRIPTION="AlsaMixer.app is a simple mixer dockapp" -HOMEPAG \ No newline at end of file +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-Makefile.patch +} + +src_compile() { + tc-export CXX + emake || die "emake failed." +} + +src_install() { + dobin ${MY_PN} || die "dobin failed." + dodoc README +} diff --git a/media-sound/amsynth/Manifest b/media-sound/amsynth/Manifest index e8d2074b64ff..1e6a74692f63 100644 --- a/media-sound/amsynth/Manifest +++ b/media-sound/amsynth/Manifest @@ -1,4 +1,2 @@ DIST amSynth-1.2.3.tar.gz 622565 SHA256 c5bbb62dcbfe2470d1c31f65e88794a9230978bc962786794303f5b6c29a6f85 SHA512 fc429a6d69752812618dfade1b05b38895cc163f58f04e68d841bebf710dde03cff5953acad2ff7983c240d1b966c9d1dcf767b47a636873bdd4b96bd2ed7e6d WHIRLPOOL c7848ecd8b5ab9a2a55fdc717d6c47c5a54076144b805a79a75ce5ac9a3fea7b5cc92dfe5f8ab978d0bd3d4cb8674c35a111a3d0ec063b435b592e3e5293a9a9 DIST amSynth-1.3.2.tar.gz 635901 SHA256 3ad50c20d690865ea0fdef6745cd04a9f758e9ae654ad874902d3da896e0fa75 SHA512 c5f312fd1fa5335ccd2c1e7a81a7c0f9094faabec633fe654f04650e5604bb6d05f1348f6ce3c305e840692e2012ac9501ca83f5e5018a0218d9c35a99678e80 WHIRLPOOL 3b93486378a140ce7feb0789cc46a74375920ae717d38910e0b75011e4f1c827749f795ce38b7408d72adb4abfab090a104fc23f001977c68576bde05e1fa260 -DIST amSynth-1.2.3.tar.gz 622565 SHA256 c5bbb62dcbfe2470d1c31f65e88794a9230978bc962786794303f5b6c29a6f85 SHA512 fc429a6d69752812618dfade1b05b38895cc163f58f04e68d841bebf710dde03cff5953acad2ff7983c240d1b966c9d1dcf767b47a636873bdd4b96bd2ed7e6d WHIRLPOOL c7848ecd8b5ab9a2a55fdc717d6c47c5a54076144b805a79a75ce5ac9a3fea7b5cc92dfe5f8ab978d0bd3d4cb8674c35a111a3d0ec063b435b592e3e5293a9a9 -DIST amSynth-1.3.2.tar.gz 635901 SHA256 3ad50c20d690865ea0fdef6745cd04a9f758e9ae654ad874902d3da896e0fa75 SHA512 c5f312fd1fa5335ccd2c1e7a81a7c0f9094faabec633fe654f04650e5604bb6d05f1348f6ce3c305e840 \ No newline at end of file diff --git a/media-sound/audacity/audacity-2.0.0.ebuild b/media-sound/audacity/audacity-2.0.0.ebuild index cc0788d8b3b4..119ff9b39c9a 100644 --- a/media-sound/audacity/audacity-2.0.0.ebuild +++ b/media-sound/audacity/audacity-2.0.0.ebuild @@ -19,37 +19,6 @@ KEYWORDS="amd64 ~mips ppc ppc64 x86" IUSE="alsa ffmpeg flac id3tag jack ladspa libsamplerate midi mp3 soundtouch twolame vamp vorbis" RESTRICT="test" -COMMON_DEPEND="x11-libs/wxGTK:2.8[X] - >=app-arch/zip-2.3 - >=media-libs/libsndfile-1.0.0 - dev-libs/expat - libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) - vorbis? ( >=media-libs/libvorbis-1.0 ) - mp3? ( >=media-libs/libmad-0.14.2b ) - flac? ( >=media-libs/flac-1.2.0[cxx] ) - id3tag? ( media-libs/libid3tag ) - soundtouch? ( >=media-libs/libsoundtouch-1.3.1 ) - vamp? ( # Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-2.0.0.ebuild,v 1.7 2012/06/03 14:01:04 blueness Exp $ - -EAPI=4 - -inherit eutils wxwidgets autotools versionator - -MY_PV=$(replace_version_separator 3 -) -MY_P="${PN}-src-${MY_PV}" -MY_T="${PN}-minsrc-${MY_PV}" -DESCRIPTION="Free crossplatform audio editor" -HOMEPAGE="http://audacity.sourceforge.net/" -SRC_URI="http://${PN}.googlecode.com/files/${MY_T}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~mips ppc ppc64 x86" -IUSE="alsa ffmpeg flac id3tag jack ladspa libsamplerate midi mp3 soundtouch twolame vamp vorbis" -RESTRICT="test" - COMMON_DEPEND="x11-libs/wxGTK:2.8[X] >=app-arch/zip-2.3 >=media-libs/libsndfile-1.0.0 @@ -80,3 +49,48 @@ REQUIRED_USE="soundtouch? ( midi )" S=${WORKDIR}/${MY_P} src_prepare() { + epatch "${FILESDIR}"/${PN}-1.3.13-automagic.patch + epatch "${FILESDIR}"/${PN}-1.3.14-typecast.patch + AT_M4DIR="${S}/m4" eautoreconf +} + +src_configure() { + WX_GTK_VER="2.8" + need-wxwidgets unicode + + # * always use system libraries if possible + # * options listed in the order that configure --help lists them + # * if libsamplerate not requested, use libresample instead. + econf \ + --enable-unicode \ + --enable-nyquist \ + $(use_enable ladspa) \ + --with-libsndfile=system \ + --with-expat=system \ + $(use_with libsamplerate) \ + $(use_with !libsamplerate libresample) \ + $(use_with vorbis libvorbis) \ + $(use_with mp3 libmad) \ + $(use_with flac libflac) \ + $(use_with id3tag libid3tag) \ + $(use_with soundtouch) \ + $(use_with vamp libvamp) \ + $(use_with twolame libtwolame) \ + $(use_with ffmpeg) \ + $(use_with midi) \ + $(use_with alsa) \ + $(use_with jack) +} + +# $(use_with lv2 slv2) \ +# $(use_with ladspa liblrdf) \ + +src_install() { + emake DESTDIR="${D}" install + + # Remove bad doc install + rm -rf "${D}"/usr/share/doc + + # Install our docs + dodoc README.txt +} diff --git a/media-sound/audacity/audacity-2.0.3.ebuild b/media-sound/audacity/audacity-2.0.3.ebuild index f50cb267864f..e7bfabb46056 100644 --- a/media-sound/audacity/audacity-2.0.3.ebuild +++ b/media-sound/audacity/audacity-2.0.3.ebuild @@ -19,27 +19,6 @@ KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86" IUSE="alsa ffmpeg flac id3tag jack ladspa libsamplerate +libsoxr midi mp3 sbsms soundtouch twolame vamp vorbis" RESTRICT="test" -COMM# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-2.0.3.ebuild,v 1.3 2013/07/11 19:25:22 vincent Exp $ - -EAPI=4 - -inherit eutils wxwidgets autotools versionator - -MY_PV=$(replace_version_separator 3 -) -MY_P="${PN}-src-${MY_PV}" -MY_T="${PN}-minsrc-${MY_PV}" -DESCRIPTION="Free crossplatform audio editor" -HOMEPAGE="http://audacity.sourceforge.net/" -SRC_URI="http://audacity.googlecode.com/files/${MY_T}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86" -IUSE="alsa ffmpeg flac id3tag jack ladspa libsamplerate +libsoxr midi mp3 sbsms soundtouch twolame vamp vorbis" -RESTRICT="test" - COMMON_DEPEND="x11-libs/wxGTK:2.8[X] >=app-arch/zip-2.3 >=media-libs/libsndfile-1.0.0 @@ -87,4 +66,37 @@ src_configure() { # * if libsamplerate not requested, use libresample instead. econf \ --enable-unicode \ - --enable-nyquist \ \ No newline at end of file + --enable-nyquist \ + --disable-dynamic-loading \ + $(use_enable ladspa) \ + --with-libsndfile=system \ + --with-expat=system \ + $(use_with libsamplerate) \ + $(use_with !libsamplerate libresample) \ + $(use_with libsoxr) \ + $(use_with vorbis libvorbis) \ + $(use_with mp3 libmad) \ + $(use_with flac libflac) \ + $(use_with id3tag libid3tag) \ + $(use_with sbsms) \ + $(use_with soundtouch) \ + $(use_with vamp libvamp) \ + $(use_with twolame libtwolame) \ + $(use_with ffmpeg) \ + $(use_with midi) \ + $(use_with alsa) \ + $(use_with jack) +} + +# $(use_with lv2 slv2) \ +# $(use_with ladspa liblrdf) \ + +src_install() { + emake DESTDIR="${D}" install + + # Remove bad doc install + rm -rf "${D}"/usr/share/doc + + # Install our docs + dodoc README.txt +} diff --git a/media-sound/coquillo/Manifest b/media-sound/coquillo/Manifest index f76fb1b57d05..b45a0da37c74 100644 --- a/media-sound/coquillo/Manifest +++ b/media-sound/coquillo/Manifest @@ -1,2 +1 @@ DIST coquillo-1.12-src.tar.gz 570833 SHA256 5c1a46786e25dc3bb10ac063314aed173350cf6bc0436f181ad666d01899cd7d SHA512 4d0b7dad811019aa488baa27f0d655dc2ee126fa81c5944aa7de9093306c170863bd323de6f0233efef38e96b21b10f4a04239c0e277d42993667213e2bd2817 WHIRLPOOL 46046e32813cc46289694a8c010d026217143d59a19f0ccabdc356913fdf57867518fcf3ad61baebea7c1cc98568d9b6de619dbf3148ab10595954e9829f3cb5 -DIST coquillo-1.12-src.tar.gz 570833 SHA256 5c1a46786e25dc3bb10ac063314aed173350cf6bc0436f181ad666d01899cd7d SHA512 4d0b \ No newline at end of file diff --git a/media-sound/dcaenc/Manifest b/media-sound/dcaenc/Manifest index 3a7fd90a5de7..b6afc6c4b5b2 100644 --- a/media-sound/dcaenc/Manifest +++ b/media-sound/dcaenc/Manifest @@ -1,2 +1 @@ DIST dcaenc-2.tar.gz 351199 SHA256 1054e6113cd1304f35ca830f027a53e9efd989530fe6523f732a0a9cd4110199 SHA512 0029f7c3b06199fb8100ce933827013fdc58e5fddf984ddf1744849e5d6cc24ce76e09b868eef19a49e1036a142419c3304c1822492f64301ed4feaa6bea4910 WHIRLPOOL 6e806bbf2194a9380c5f0bab186be3f14d4163b0b029fc44328cbbce4e6b209d4faf07f0a5fb809214c90aeaaff332e47f187ff13b597876fbc6fd664b1d0019 -DIST dcaenc-2.tar.gz 351199 SHA256 1054e6113cd1304f35ca830f027a53e9efd989530fe6523f732a0a9cd4110199 SHA512 0029f7c3b06199fb8100ce933827013fdc58e5fddf984ddf1744849e5d6cc24ce76e09b868eef19a49e1036a142419c3304c1822492f64301ed4feaa6bea4910 WHIRLPOOL 6e806bbf2194a9380c5f0bab186be3f14d4163b0b029fc44328cbbce4e6b209d4faf07f0a5fb809214c90aeaaff332e47f187ff13b597876fbc6fd664b1d0019 diff --git a/media-sound/gnaural/Manifest b/media-sound/gnaural/Manifest index 8bedd233976b..ab3e3f16fcc7 100644 --- a/media-sound/gnaural/Manifest +++ b/media-sound/gnaural/Manifest @@ -1,2 +1 @@ DIST gnaural-1.0.20110606.tar.gz 414028 SHA256 c5efe082a10290cc0d5ed51a3abe67cfcbf6f77827c86bb709ae5719be56395d SHA512 328704fc082d826cf5a681ace8a32c426a3560046f8133ca5c726ad3a4e0071fffa81ffe4ccb4df2b6dad4cfcde6ad40ebea8aeb01e20a494bb7b965116a64c9 WHIRLPOOL 9461bf21aa2a67636742f90a25617bb87e876a7efe2cc4591d83eb97c4d527f0f6bd00e06a26dc309dce30d1deec9854961a2f9d2ab318a76124bbb329a8f8fa -DIST gnaural-1.0.20110606.tar.gz 414028 SHA256 c5efe082a10290cc0d5ed51a3abe67cfcbf6f77827c86bb709ae5719be56395d SHA512 328704fc082d826cf5a681ace8a32c426a3560046f8133ca5c726ad3a4e0071fffa81ffe4ccb4df2b6dad4cfcde6ad40e \ No newline at end of file diff --git a/media-sound/gnomad/Manifest b/media-sound/gnomad/Manifest index 18ee0a0b115b..87ea50d357f5 100644 --- a/media-sound/gnomad/Manifest +++ b/media-sound/gnomad/Manifest @@ -1,2 +1 @@ DIST gnomad2-2.9.6.tar.gz 318431 SHA256 74d423f4df1e71933ae31eb66724bed8027d7c4ca174a0221f6a1499e3735c9a SHA512 10f025ac38089ebc4a063ac25a262d3e2f6b72336c4566877fae311a873923b55d532d210fd2ec8a29013c06c806ddacc50f042546e4aaa5cf23228d09d854a1 WHIRLPOOL e09a00f86aa46ab36326bba69dde82c00e90b2f394306a0fa57f72b8cd4f34f59dcf7517efc145224186d5e0a91c6d233a189fa6186ccac69ba6169c85c7f71e -DIST gnomad2-2.9.6.tar.gz 318431 SHA256 74d423f4df1e71933ae31eb66724bed8027d7c4ca174a0221f6a1499e3735c9a SHA512 10f025ac38089ebc4a063ac25a262d3e2f6b72336c4566877fae311a873923b55d532d210fd2ec8a29013c06c806ddacc50f042546e4aaa5cf23228d09d854a1 WHIRLPOOL e09a \ No newline at end of file diff --git a/media-sound/gpodder/gpodder-3.7.0.ebuild b/media-sound/gpodder/gpodder-3.7.0.ebuild index 15484d224c4d..6eacac084d0b 100644 --- a/media-sound/gpodder/gpodder-3.7.0.ebuild +++ b/media-sound/gpodder/gpodder-3.7.0.ebuild @@ -52,6 +52,17 @@ src_install() { } src_test() { - emake # Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/med \ No newline at end of file + emake releasetest +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + gnome2_icon_cache_update +} + +pkg_postrm() { + gnome2_icon_cache_update +} diff --git a/media-sound/gqradio/Manifest b/media-sound/gqradio/Manifest index 31c30409cd6d..2ae483d7c902 100644 --- a/media-sound/gqradio/Manifest +++ b/media-sound/gqradio/Manifest @@ -1,2 +1 @@ DIST gqradio-1.9.2.tar.gz 444114 SHA256 8c00b589c2faab3fdb5053f8d47abc883ee9fc44702a34bd049ebde8a1adcfef SHA512 7b749f03ff110b78a644fc6b574f5a9d9d3a6db22976c4c8871b8f5c781515d29112745df5b5a4a70e4c48ba3cc9fd4921af64de39415ac179f57a26d33a4e5a WHIRLPOOL 4589bec806e43290eb0efda1038afec69b27d9c71f517bd8c0fdae0d99477f335282b017deccac023e63f0adf46b4a12ceb11f38477983b115e179c20f351ac7 -DIST gqradio-1.9.2.tar.gz 444114 SHA256 8c00b589c2faab3fdb5053f8d47abc883ee9fc44702a34bd049ebde8a1adcfef SHA512 7b749f03ff110b78a644fc6b574f5a9d9d3a6db22976c4c8871b8f5c781515d29112745df5b5a4a70e4c48ba3cc9fd4921af64de39415ac179f57a26d33a4e5a WHIRLPOOL 4589bec806e43290eb0efda1038afec69b27d9c71f517bd8c0fdae0d99477f335282b017deccac023e63f0adf46b4a12ceb11f38477983b115e179c20f351ac7 diff --git a/media-sound/gramofile/files/gramofile-1.6-strlen_and_exit.patch b/media-sound/gramofile/files/gramofile-1.6-strlen_and_exit.patch index 9cd3ac725f56..0b6c4dcb999d 100644 --- a/media-sound/gramofile/files/gramofile-1.6-strlen_and_exit.patch +++ b/media-sound/gramofile/files/gramofile-1.6-strlen_and_exit.patch @@ -54,4 +54,7 @@ diff -ur gramofile-1.6.orig/signpr_cmf3.c gramofile-1.6/signpr_cmf3.c #include #include #include -diff -ur gramofile-1.6.orig/bplaysrc/Makefile gramofile-1.6/bplaysrc/M \ No newline at end of file ++#include + #ifndef OLD_CURSES + #include + #else diff --git a/media-sound/grip/grip-3.3.1-r3.ebuild b/media-sound/grip/grip-3.3.1-r3.ebuild index 43f74a73a7bf..de29b87ad69c 100644 --- a/media-sound/grip/grip-3.3.1-r3.ebuild +++ b/media-sound/grip/grip-3.3.1-r3.ebuild @@ -14,27 +14,6 @@ SLOT="0" KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd" IUSE="nls vorbis" -RDEPEND=">=x11-libs/gtk+-2.2:2 - x11-libs/vte:0 - media-sound/lame - media-sound/cdparanoia - >=media-libs/id3lib-3.8.3 - >=gn# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/grip/grip-3.3.1-r3.ebuild,v 1.11 2012/11/22 15:31:19 polynomial-c Exp $ - -EAPI=2 -inherit eutils flag-o-matic toolchain-funcs libtool - -DESCRIPTION="GTK+ based Audio CD Player/Ripper" -HOMEPAGE="http://sourceforge.net/projects/grip/" -SRC_URI="mirror://sourceforge/grip/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="nls vorbis" - RDEPEND=">=x11-libs/gtk+-2.2:2 x11-libs/vte:0 media-sound/lame @@ -46,4 +25,29 @@ RDEPEND=">=x11-libs/gtk+-2.2:2 vorbis? ( media-sound/vorbis-tools )" # gnome-extra/yelp, see bug 416843 DEPEND="${RDEPEND} - vi \ No newline at end of file + virtual/pkgconfig + nls? ( sys-devel/gettext )" + +src_prepare() { + epatch "${FILESDIR}"/${P}-implicit-declaration.patch + epatch "${FILESDIR}"/${P}-invalid-genre-size.patch #285105 + # fix include syntax for newer versions of bash + sed -i '/[.] conftest[.]id3/s: c: ./c:' configure || die + elibtoolize +} + +src_configure() { + # Bug #69536 + [[ $(tc-arch) == "x86" ]] && append-flags "-mno-sse" + + strip-linguas be bg ca de en en_CA en_GB en_US es fi fr hu it ja nl pl_PL pt_BR ru zh_CN zh_HK zh_TW + + econf \ + --disable-dependency-tracking \ + $(use_enable nls) +} + +src_install () { + emake DESTDIR="${D}" install || die + dodoc AUTHORS CREDITS ChangeLog README TODO +} diff --git a/media-sound/gsm/gsm-1.0.13.ebuild b/media-sound/gsm/gsm-1.0.13.ebuild index 65d2456ae21a..0355ea8afcd7 100644 --- a/media-sound/gsm/gsm-1.0.13.ebuild +++ b/media-sound/gsm/gsm-1.0.13.ebuild @@ -39,6 +39,11 @@ src_install() { GSM_INSTALL_INC="${D}"/usr/include/gsm \ GSM_INSTALL_MAN="${D}"/usr/share/man/man3 \ TOAST_INSTALL_MAN="${D}"/usr/share/man/man1 \ - install || d# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/m \ No newline at end of file + install || die "emake install failed." + + dolib lib/libgsm.so* + + dosym ../gsm/gsm.h /usr/include/libgsm/gsm.h + + dodoc ChangeLog* MACHINES MANIFEST README +} diff --git a/media-sound/herrie/Manifest b/media-sound/herrie/Manifest index 9811c5feb981..18e1eacc29d0 100644 --- a/media-sound/herrie/Manifest +++ b/media-sound/herrie/Manifest @@ -1,2 +1 @@ DIST herrie-2.2.tar.bz2 71596 SHA256 142341072920f86b6eb570b8f13bf5fd87c06cf801543dc7d1a819e39eb9fb2b -DIST herrie-2.2.tar.bz2 71596 SHA256 142341072920f86b6eb570b8f13bf5fd87c06cf801543dc7d1a819e39eb9fb2b diff --git a/media-sound/mimd/Manifest b/media-sound/mimd/Manifest index 4d5f24666bf7..08f2e6383318 100644 --- a/media-sound/mimd/Manifest +++ b/media-sound/mimd/Manifest @@ -1,2 +1 @@ DIST mimd-0.30.1.tar.bz2 16853 SHA256 c1ee0c19163b412dede0cf7d302050931498f2d34fe2e1e9c580d609c8c91924 -DIST mimd-0.30.1.tar.bz2 16853 SHA256 c1ee0c19163b412dede0cf7d302050931498f2d34fe2e1e9c580d609c8c91924 diff --git a/media-sound/moc/Manifest b/media-sound/moc/Manifest index dc98b8f22c32..594d3821e5fd 100644 --- a/media-sound/moc/Manifest +++ b/media-sound/moc/Manifest @@ -1,4 +1,2 @@ DIST moc-2.5.0-beta1.tar.bz2 570468 SHA256 076816da9c6d1e61a386a1dda5f63ee2fc84bc31e9011ef70acc1d391d4c46a6 SHA512 16f1cf35706bbf410197651fd4398114ae2c95103773886629f0e1884900f2b865b9b6354da507a57af021a7d6599cd2e1d7e338791dc4a6f55e6c6c193800f2 WHIRLPOOL 793fa9bdd23da14cc558262335b81560aa82a86c641b2a163af64d80659b652ada83193b0ed2888bfbe0d0b43cb35447ad0b0fa8de394742c0e162d3050520de DIST moc-2.5.0.tar.bz2 594532 SHA256 d29ea52240af76c4aa56fa293553da9d66675823e689249cee5f8a60657a6091 SHA512 ca6cfd4d1d13030bd561df8ab671399a17dfb675c360ecc95a2491c6a85764d0f72259ac33665405b197f370f4fd7ef59d9a485706f8a882bff30d0fafcf252c WHIRLPOOL 770d4024451c9f153fe16b60819392f677171c1ba08c8d95d9dfd5e1be1a19bfd5a7d9f771aa4ded8c40c0f042865f6e693727fce261464261d4311860fcff58 -DIST moc-2.5.0-beta1.tar.bz2 570468 SHA256 076816da9c6d1e61a386a1dda5f63ee2fc84bc31e9011ef70acc1d391d4c46a6 SHA512 16f1cf35706bbf410197651fd4398114ae2c95103773886629f0e1884900f2b865b9b6354da507a57af021a7d6599cd2e1d7e338791dc4a6f55e6c6c193800f2 WHIRLPOOL 793fa9bdd23da14cc558262335b81560aa82a86c641b2a163af64d80659b652ada83193b0ed2888bfbe0d0b43cb35447ad0b0fa8de394742c0e162d3050520de -DIST moc-2.5.0.tar.bz2 594532 SHA256 d29ea52240af76c4aa56fa293553da9d66675823e689249cee5f8a60657a6091 SHA512 ca6cfd4d1d13030bd561df8ab671399a17dfb675c360ecc95a2491c6a85764d0f72259ac33665405b197f370f4fd7ef59d9a485706f8a882bff30d0fafcf252c WHIRLPOOL 770d4024451c9f153fe16b60819392f677171c1ba08c8d95d9dfd5e1be1a19bfd5a7d9f771aa4ded8c40c0f042865f6e693727fce261464261d4311860fcff58 diff --git a/media-sound/mumble/mumble-1.2.6.ebuild b/media-sound/mumble/mumble-1.2.6.ebuild index 8db7e7e443e6..3e418ad51079 100644 --- a/media-sound/mumble/mumble-1.2.6.ebuild +++ b/media-sound/mumble/mumble-1.2.6.ebuild @@ -122,5 +122,6 @@ src_install() { pkg_postinst() { echo elog "Visit http://mumble.sourceforge.net/ for futher configuration instructions." - elog "Run mumble-overlay to start the# Copyright 1999-2014 Gentoo Foundation -# Distribu \ No newline at end of file + elog "Run mumble-overlay to start the OpenGL overlay (after starting mumble)." + echo +} diff --git a/media-sound/mup/mup-5.4.ebuild b/media-sound/mup/mup-5.4.ebuild index 44fa1bfc728b..5f54f4468d6e 100644 --- a/media-sound/mup/mup-5.4.ebuild +++ b/media-sound/mup/mup-5.4.ebuild @@ -25,13 +25,18 @@ DEPEND="${RDEPEND} src_prepare() { epatch "${FILESDIR}"/${P}-Makefile.patch - sed -i -e "s:/lib# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mup/mup-5.4.ebuild,v 1.10 2012/01/19 09:13:24 ssuominen Exp $ + sed -i -e "s:/lib:/$(get_libdir):g" Makefile || die "sed failed" +} -EAPI=2 -inherit eutils multilib toolchain-funcs +src_compile() { + emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" \ + CFLAGS="${CFLAGS}" || die "emake failed" +} -DESCRIPTION="Program for printing music scores" -HOMEPAGE="http://www.arkkra.com/" -SRC_URI="ftp \ No newline at end of file +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc docs/{*.txt,README0} + dohtml docs/{*.html,uguide/*} + docinto sample + dodoc docs/{*.mup,*.ps} +} diff --git a/media-sound/qmpdclient/qmpdclient-1.2.2-r1.ebuild b/media-sound/qmpdclient/qmpdclient-1.2.2-r1.ebuild index add5d58821f9..24bf8055ab2a 100644 --- a/media-sound/qmpdclient/qmpdclient-1.2.2-r1.ebuild +++ b/media-sound/qmpdclient/qmpdclient-1.2.2-r1.ebuild @@ -32,6 +32,9 @@ src_prepare() { } src_configure() { -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/qmpdclient/qmpdclient \ No newline at end of file + local mycmakeargs=( "-DVERSION=${PV}" ) + cmake-utils_src_configure +} + +pkg_postinst() { fdo-mime_desktop_database_update; } +pkg_postrm() { fdo-mime_desktop_database_update; } diff --git a/media-sound/quodlibet/quodlibet-2.6.3.ebuild b/media-sound/quodlibet/quodlibet-2.6.3.ebuild index bd0f59c8fba8..b6e90603b19c 100644 --- a/media-sound/quodlibet/quodlibet-2.6.3.ebuild +++ b/media-sound/quodlibet/quodlibet-2.6.3.ebuild @@ -43,13 +43,29 @@ src_prepare() { local qlconfig=${PN}/config.py if ! use gstreamer; then - sed -i -e '/backend/s# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/quodlibet-2.6.3.ebuild,v 1.1 2014/02/17 19:52:24 ssuominen Exp $ + sed -i -e '/backend/s:gstbe:xinebe:' ${qlconfig} || die + fi -EAPI=5 -PYTHON_COMPAT=( python2_7 ) -inherit distutils-r1 gnome2-utils fdo-mime + sed -i -e '/gst_pipeline/s:"":"alsasink":' ${qlconfig} || die -DESCRIPTION="audio library tagger, manager, and player for GTK+" -HOMEPAGE="http://code \ No newline at end of file + distutils-r1_src_prepare +} + +src_install() { + distutils-r1_src_install + dodoc NEWS README +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + fdo-mime_desktop_database_update + gnome2_icon_cache_update +} + +pkg_postrm() { + fdo-mime_desktop_database_update + gnome2_icon_cache_update +} diff --git a/media-sound/ripperx/Manifest b/media-sound/ripperx/Manifest index f2c660e383c4..5cd6e0e0962d 100644 --- a/media-sound/ripperx/Manifest +++ b/media-sound/ripperx/Manifest @@ -1,2 +1 @@ -DIST ripperX-2.7.3.tar.gz 536059 SHA256 7d58f95d9fc3b43890db4c09eafa3880e45880c9385524ce8786024fc5d2198c SHA512 fad4d8ee5e7ea37608b827230446f213c871d425920d0ffae5b0151e2270b36ca67156a78a530a3267141f8c5d0577a17647e4342468662472ea0f88bda69cea WHIRLPOOL 57a6acfad3e3e0701592f77a97980ad2db305c59e8cba4a28031c18e41bc4d67fef4-----BEGIN PGP SIGNED MESSAGE----- DIST ripperX-2.7.3.tar.gz 536059 SHA256 7d58f95d9fc3b43890db4c09eafa3880e45880c9385524ce8786024fc5d2198c SHA512 fad4d8ee5e7ea37608b827230446f213c871d425920d0ffae5b0151e2270b36ca67156a78a530a3267141f8c5d0577a17647e4342468662472ea0f88bda69cea WHIRLPOOL 57a6acfad3e3e0701592f77a97980ad2db305c59e8cba4a28031c18e41bc4d67fef49534b2c7c8b469c9d036357dec077a20334c121e116cd36892dbd6295db7 diff --git a/media-sound/soundconverter/Manifest b/media-sound/soundconverter/Manifest index c77c3cd24c28..257a9edfd51e 100644 --- a/media-sound/soundconverter/Manifest +++ b/media-sound/soundconverter/Manifest @@ -1,3 +1,2 @@ DIST soundconverter-2.0.4.tar.xz 188072 SHA256 6112fcd61119f830838a8763ccafffd760f1d47541b416810d9394a0505742c8 SHA512 af1c00143b0dd5f78fa7343b0ca4959bc39fb9c2428ba6217e420a711ea10eefa6b6283fe183088fa4945dbae50b59347314da9e40a02275b0a092859475ca37 WHIRLPOOL 579fefe8500261a7bb1f5f66422f0c0fc81879be66ac02139d8e4c476d7223a399df31a7ea682d36cbab9206a8ad8e5b0cd2529e531502f6030c1c7a6c0ee168 DIST soundconverter-2.1.3.tar.xz 193176 SHA256 26a78f14210af911c12b71f3452a77bceb5fc6b1f6b626de4d4c961299a76cd1 SHA512 0768630d0fb7e89d37cba793e150eda81b98edd536a41f529e99812451ae8134b7257da7c97ceb3d8780ae640d9c8d23665103d0c08ef0811bbc01ec07ee41d0 WHIRLPOOL 823839018b1f6bb1a914354fd02fcb9c0721d3727b747e908cd97899ef4b6f773d2d98cd724bb15b2b7be0316c9a6e7c3e4e9829db65163a77ef9290168fdc04 -DIST soundconverter-2.0.4.tar.xz 188072 SHA256 6112fcd61119f830838a8763ccafffd760f1d47541b416810d9394a0505742c8 SHA512 af1c00143b0dd5f78fa7343b0ca4959bc39fb9c2428ba6217e420a711ea10eefa6b6283fe183088fa4945dbae50b59347314da9e40a02275b0a092859475ca37 WHIRLPO \ No newline at end of file diff --git a/media-sound/soundconverter/soundconverter-2.1.3.ebuild b/media-sound/soundconverter/soundconverter-2.1.3.ebuild index 53d945620a00..7ec73f08e7c1 100644 --- a/media-sound/soundconverter/soundconverter-2.1.3.ebuild +++ b/media-sound/soundconverter/soundconverter-2.1.3.ebuild @@ -52,6 +52,17 @@ RDEPEND="${PYTHON_DEPS} " DEPEND="${RDEPEND} app-arch/xz-utils - dev-util/# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/soundconverter/soundconverter-2.1.3.ebuild,v 1.3 2014/07/23 15 \ No newline at end of file + dev-util/intltool + virtual/pkgconfig + sys-devel/gettext +" + +src_prepare() { + python_fix_shebang . + gnome2_src_prepare +} + +src_install() { + gnome2_src_install + python_optimize "${ED%/}"/usr/$(get_libdir)/soundconverter/python +} diff --git a/media-sound/sox/sox-14.4.1.ebuild b/media-sound/sox/sox-14.4.1.ebuild index 600612068ee3..877f0e4c6759 100644 --- a/media-sound/sox/sox-14.4.1.ebuild +++ b/media-sound/sox/sox-14.4.1.ebuild @@ -77,12 +77,15 @@ src_configure() { $(use_with png) \ $(use_with pulseaudio) \ $(use_with sndfile) \ - $(use_enable stati# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-14.4.1.ebuild,v 1.11 2014/02/03 16:06:22 hattya Exp $ - -EAPI=4 -inherit eutils flag-o-matic autotools + $(use_enable static-libs static) \ + $(use_with twolame) \ + $(use_with wavpack) \ + --with-distro="Gentoo" +} -DESCRIPTION="The swiss army knife of sound processing programs" -HOMEP \ No newline at end of file +src_install() { + default + # libltdl is used for loading plugins, keeping libtool files with empty + # dependency_libs what otherwise would be -exec rm -f {} + + find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + +} diff --git a/media-sound/split2flac/split2flac-114.ebuild b/media-sound/split2flac/split2flac-114.ebuild index b483be3c1d1f..3cea87bd37d0 100644 --- a/media-sound/split2flac/split2flac-114.ebuild +++ b/media-sound/split2flac/split2flac-114.ebuild @@ -29,15 +29,27 @@ RDEPEND=" flake? ( media-sound/flake ) mp3? ( media-sound/lame || ( media-libs/mutagen media-libs/id3lib ) ) mp4? ( media-libs/faac media-libs/libmp4v2:0[utils] ) - # Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/split2flac/split2flac-114.ebuild,v 1.1 2013/12/06 18:44:57 maksbotan Exp $ - -EAPI="5" - -EGIT_REPO_URI="https://github.com/ftrvxmtrx/split2flac.git" - -inherit bash-completion-r1 -[[ ${PV} == *9999* ]] && inherit git-2 - -DESCRIPTION="sh script to split one big APE/FLAC/WV/WAV audio image with CUE sheet into tracks" \ No newline at end of file + ogg? ( media-sound/vorbis-tools ) + wavpack? ( media-sound/wavpack ) + replaygain? ( + mp3? ( media-sound/mp3gain ) + mp4? ( media-sound/aacgain ) + ogg? ( media-sound/vorbisgain ) + ) + imagemagick? ( media-gfx/imagemagick ) +" + +src_configure() { :; } + +src_compile() { :; } + +src_install() { + dobin ${PN} + newbashcomp ${PN}-bash-completion.sh ${PN} + + dosym ${PN} /usr/bin/split2wav + for i in mp3 mp4 ogg + do + use $i && dosym ${PN} /usr/bin/split2${i/mp4/m4a} + done +} diff --git a/media-tv/ivtvplayer/Manifest b/media-tv/ivtvplayer/Manifest index 3bbf49c35d5e..2fe51f34f44d 100644 --- a/media-tv/ivtvplayer/Manifest +++ b/media-tv/ivtvplayer/Manifest @@ -1,2 +1 @@ DIST ivtvplayer-0.1.3.tar.gz 24159 SHA256 4727057b97a5e527e9617cd14e6ee9d892532fbb5e455d70166af07c1724aa17 -DIST ivtvplayer-0.1.3.tar.gz 24159 SHA256 4727057b97a5e527e9617cd14e6ee9d892532fbb5e455d70166af07c1724aa17 diff --git a/media-tv/shoutcast2vdr/Manifest b/media-tv/shoutcast2vdr/Manifest index b32d29dcadf7..2a270638a50f 100644 --- a/media-tv/shoutcast2vdr/Manifest +++ b/media-tv/shoutcast2vdr/Manifest @@ -1,2 +1 @@ DIST shoutcast2vdr-0.0.8.gz 3538 SHA256 fa63f656ea5a0f25794337e26aac0bedf74f2758bef65bf51ffb750c326bb227 SHA512 ae5ce60c993ff85b3ac9ab3567be55a22ad1929b98a035b323583fa6166b21a96bd7e7017917865d4a339790e7d6c1113820d7230787225d97c68e2174f02c37 WHIRLPOOL 322ea24c91ca63e1629656d0df05400a56296854305aa41274211eabc8a1143bd766d571c4b7922193df23dc8be65830df6970457b18f451f6ede8443c9007b5 -DIST shoutcast2vdr-0.0.8.gz 3538 SHA256 fa63f656ea5a0f25794337e26aac0bedf74f2758bef65bf51ffb750c326bb227 SHA512 ae5ce60c993ff85b3ac9ab3567be55a22ad1929b98a035b323583fa6166b21a96bd7e7017917865d4a339790e7d6c1113820d7230787225d97c68e2174f02c37 WHIRLPOOL 322ea24c91ca63e1629656d0df05400a56296854305aa41274211eabc8a1143bd766d571c4b7922193df23dc8be65830df6970457b18f451f6ede8443c9007b5 diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild index 68326b0155dc..320d2846ddd2 100644 --- a/media-tv/tvheadend/tvheadend-9999.ebuild +++ b/media-tv/tvheadend/tvheadend-9999.ebuild @@ -1,7 +1,5 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/tvheadend/tvheadend-9999.ebuild,v 1.2 2014/06/22 # Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/media-tv/tvheadend/tvheadend-9999.ebuild,v 1.2 2014/06/22 20:05:06 prometheanfire Exp $ EAPI=5 @@ -76,4 +74,10 @@ src_install() { } pkg_postinst() { - elog "The Tvheadend web interface can be r \ No newline at end of file + elog "The Tvheadend web interface can be reached at:" + elog "http://localhost:9981/" + elog + elog "Make sure that you change the default username" + elog "and password via the Configuration / Access control" + elog "tab in the web interface." +} diff --git a/media-tv/wis-go7007/wis-go7007-0.9.8-r3.ebuild b/media-tv/wis-go7007/wis-go7007-0.9.8-r3.ebuild index eaf7dc203c72..6261e00f84f1 100644 --- a/media-tv/wis-go7007/wis-go7007-0.9.8-r3.ebuild +++ b/media-tv/wis-go7007/wis-go7007-0.9.8-r3.ebuild @@ -56,46 +56,51 @@ src_unpack() { fi } -src_compile(# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/wis-go7007/wis-go7007-0.9.8-r3.ebuild,v 1.5 2013/01/21 22:34:15 ssuominen Exp $ - -inherit eutils linux-mod udev - -MY_PN=${PN}-linux -DESCRIPTION="Linux drivers for go7007 chipsets (Plextor ConvertX PVR)" -HOMEPAGE="http://oss.wischip.com/ http://home.comcast.net/~bender647/go7007/" -SRC_URI="http://oss.wischip.com/${MY_PN}-${PV}.tar.bz2" -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" -IUSE="alsa" -DEPEND="virtual/udev - sys-apps/fxload" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${MY_PN}-${PV} - -pkg_setup() { - BUILD_TARGETS="all" - BUILD_PARAMS="KERNELSRC=${KERNEL_DIR}" - CONFIG_CHECK="HOTPLUG MODULES KMOD FW_LOADER I2C VIDEO_DEV SOUND SND USB - USB_DEVICEFS USB_EHCI_HCD" - - if use alsa; then - CONFIG_CHECK="${CONFIG_CHECK} SND_MIXER_OSS SND_PCM_OSS" - fi +src_compile() { + linux-mod_src_compile || die "failed to build driver " +} - if ! kernel_is ge 2 6 26; then - eerror "This ebuild version will only work with a 2.6.26 kernel" - die "Needs a different kernel" - fi +src_install() { + cd "${S}/apps" + make KERNELDIR="${KERNEL_DIR}" DESTDIR="${D}" PREFIX=/usr install || die "failed to install" + cd "${S}" + dodir "/lib/modules" + insinto "/lib/modules" + dodoc README README.saa7134 RELEASE-NOTES + cd "${S}/kernel" + linux-mod_src_install || die "failed to install modules" + + insinto "${KERNEL_DIR}/include/linux" + doins "${S}/include/*.h" + insinto "/lib/firmware" + doins "${S}/firmware/*.bin" + insinto "/lib/firmware/ezusb" + doins "${S}/firmware/ezusb/*.hex" + udev_dorules "${S}/udev/wis-ezusb.rules" + + exeinto "/usr/bin" + use alsa && doexe "${S}/apps/gorecord" + doexe "${S}/apps/modet" +} - linux-mod_pkg_setup - MODULE_NAMES="go7007(extra:${S}:${S}/kernel) - go7007-usb(extra:${S}:${S}/kernel) - snd-go7007(extra:${S}:${S}/kernel) - wis-ov7640(extra:${S}:${S}/kernel) - wis-sony-tuner(extra:${S}:${S}/kernel) - wis-tw9903(extra:${S}:${S}/kernel) - wis-uda1342(extra \ No newline at end of file +pkg_postinst() { + linux-mod_pkg_postinst + + elog "" + elog "For more information on how to use the Plextor devices with Gentoo" + elog "you can follow this thread for tips and tricks:" + elog "http://forums.gentoo.org/viewtopic-t-306559-highlight-.html" + elog "" + elog "Also, the unofficial Gentoo wiki has a HOWTO page:" + elog "http://gentoo-wiki.com/HARDWARE_go7007" + elog "" + ewarn "Don't forget to add your modules to /etc/modules.autoload.d/kernel.2.6" + ewarn "so they will load on startup:" + ewarn "" + ewarn "snd_go7007" + ewarn "go7007" + ewarn "go7007_usb" + ewarn "wis_saa7115" + ewarn "wis_uda1342" + ewarn "wis_sony_tuner" +} diff --git a/media-video/chaplin/files/chaplin-1.10-asneeded.patch b/media-video/chaplin/files/chaplin-1.10-asneeded.patch index 8a21cdc41e7a..f7cb499407a8 100644 --- a/media-video/chaplin/files/chaplin-1.10-asneeded.patch +++ b/media-video/chaplin/files/chaplin-1.10-asneeded.patch @@ -9,10 +9,7 @@ debug: - gcc -Wall -I$(LIBDVDREAD)/include -L$(LIBDVDREAD)/lib -ldvdread -Wl,-rpath,$(LIBDVDREAD)/lib -o chaplin chaplin.c -lm -+ $(CC) $(CFLAGS) $(LDFLAGS) -Wall -I$(LIBDVDREAD)/include -Wl,-rpath,$(LIBDVD--- chaplin.orig/Makefile 2004-03-21 18:44:18.000000000 +0100 -+++ chaplin/Makefile 2009-10-25 18:34:26.082229887 +0100 -@@ -6,10 +6,10 @@ - all: build ++ $(CC) $(CFLAGS) $(LDFLAGS) -Wall -I$(LIBDVDREAD)/include -Wl,-rpath,$(LIBDVDREAD)/lib -o chaplin chaplin.c -L$(LIBDVDREAD)/lib -ldvdread -lm - build: -- gcc -DNDEBUG -Wall \ No newline at end of file + dist: + cd .. ; tar cvfz chaplin.tgz chaplin/Makefile chaplin/chaplin.c chaplin/chaplin-genmenu chaplin/chaplin diff --git a/media-video/cheese/Manifest b/media-video/cheese/Manifest index 943be35b0932..0ad38e9248b8 100644 --- a/media-video/cheese/Manifest +++ b/media-video/cheese/Manifest @@ -1,4 +1,3 @@ DIST cheese-2.32.0.tar.bz2 5303805 SHA256 8debc47113d9889247f411d256a8eca0d8da49e5ab5909c200923945b8d5e087 SHA512 c7332d436776698034013758d044f6f87e9eddd8e9bc5df90db323f61a680ff98fb4bc8c7375a2f10c74bb6961099035771a3282731b9f11b0369f5fc3b7c700 WHIRLPOOL e9a9d25c2d72b74d5f28d9eb1ceb38d34e765256e7db4df6cf1964dd9bb5111135b25aa31823e60ac14a070de5cd0e7e98136e3267ed92193ffdeb954d3e52b8 DIST cheese-3.10.2.tar.xz 3686660 SHA256 3e5f4ac078bac60571ff61bc2cd451349d78e01ecaaff031da16fe29ff094945 SHA512 5eb4642013fdc9559fec9679845046b3a6d2e1d29ca2d61731e67b735495f64525fdf8f6f4a2e3b829243d8c304b3d31649e00b7dc684a5f847fb66a650d7f20 WHIRLPOOL 3b989828f7502263fbc5f64265223fb2ad5e3c1cc4f7e755c876ead4c35206259a3017f4a352f0b058be3ebbd0bba192a34b5be26931fda9cfec931713e40c7a DIST cheese-3.12.2.tar.xz 1777924 SHA256 a7b45369e75e222e3bd5e9a4408a0e6c230be0c49d359a387d36a42e17e3bc64 SHA512 4548ac903cc435f8ab5e55fbf684239d9a8da2413448506a1bfd6a387348e9b8b08dc3f292e8eff5bab3491ff079cadcb901f82fd42dadd75b801e154a15cdf3 WHIRLPOOL a8312e428771059cbdc982e458bb119af507e2a667f2af9743cdfe2ed6a25829432e7ea7a5dca27932999b7f3ab1cf16f99a0b31cec8f9094fd9941b85b57dfb -DIST cheese-2.32.0.tar.bz2 5303805 SHA256 8debc47113d9889247f411d256a8eca0d8da49e5ab5909c200923945b8d5e087 SHA512 c7332d436776698034013758d044f6f87e9eddd8e9bc5df90db323f61a680ff98fb4bc8c7375a2f10c74bb6961099035771a3282731b9f11b0369f5fc3b7c700 WHIRLPOOL e9a9 \ No newline at end of file diff --git a/media-video/cheese/cheese-3.10.2.ebuild b/media-video/cheese/cheese-3.10.2.ebuild index 3389142f5023..02095bfc902d 100644 --- a/media-video/cheese/cheese-3.10.2.ebuild +++ b/media-video/cheese/cheese-3.10.2.ebuild @@ -57,15 +57,26 @@ DEPEND="${COMMON_DEPEND} >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.50 virtual/pkgconfig - x11-proto/xf86vidmodeproto# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/cheese/cheese-3.10.2.ebuild,v 1.5 2014/07/24 18:53:20 ssuominen Exp $ + x11-proto/xf86vidmodeproto + test? ( dev-libs/glib:2[utils] ) +" -EAPI="5" -GCONF_DEBUG="no" -VALA_MIN_API_VERSION="0.18" +src_configure() { + gnome2_src_configure \ + GST_INSPECT=$(type -P true) \ + $(use_enable introspection) \ + --disable-lcov \ + --disable-static \ + ITSTOOL=$(type -P true) +} -inherit gnome2 vala virtualx +src_compile() { + # Clutter-related sandbox violations when USE="doc introspection" and + # FEATURES="-userpriv" (see bug #385917). + unset DISPLAY + gnome2_src_compile +} -DESCRIPTION="A cheesy program to take pictures and videos from your webcam" -HOMEPAGE="http://project \ No newline at end of file +src_test() { + Xemake check +} diff --git a/media-video/clive/clive-2.3.0.1.ebuild b/media-video/clive/clive-2.3.0.1.ebuild index 350d1dbc4660..65d1577a5861 100644 --- a/media-video/clive/clive-2.3.0.1.ebuild +++ b/media-video/clive/clive-2.3.0.1.ebuild @@ -41,18 +41,18 @@ src_install() { dodir /etc/clive cat <<-EOF > "${ED}"/etc/clive/config || die --quvi "quvi %u" - --get-with "if type -P wge# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/clive/clive-2.3.0.1.ebuild,v 1.3 2014/07/27 17:00:13 ssuominen Exp $ - -EAPI=5 -inherit perl-app - -DESCRIPTION="Command line tool for extracting videos from various websites" -HOMEPAGE="http://clive.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${PV:0:3}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~ppc ~ppc64 x86" -IUSE="cli \ No newline at end of file + --get-with "if type -P wget >/dev/null 2>&1; then wget -c -O %f %u; else curl -L -C - -o %f %u; fi" + --filename-format "%t.%s" + EOF +} + +src_test() { + if [ -z "${I_WANT_CLIVE_HOSTS_TESTS}" ] ; then + elog "If you wish to run the full testsuite of ${PN}" + elog "Please set the variable 'I_WANT_CLIVE_HOSTS_TESTS' variable" + elog "Note that the tests try to download some videos from various websites" + elog "and thus may randomly fail depending on the site's status." + export NO_INTERNET=1 + fi + perl-module_src_test +} diff --git a/media-video/dfbsee/files/dfbsee-0.7.4-gcc4.patch b/media-video/dfbsee/files/dfbsee-0.7.4-gcc4.patch index 1bde2bf69fc2..5f17937b85e3 100644 --- a/media-video/dfbsee/files/dfbsee-0.7.4-gcc4.patch +++ b/media-video/dfbsee/files/dfbsee-0.7.4-gcc4.patch @@ -50,19 +50,16 @@ diff -Nru orig-DFBSee-0.7.4/src/rotate.c DFBSee-0.7.4/src/rotate.c - (__u8*)src += src_pitch;\ - (__u8*)dest -= dest_pitch;\ + src = ((void*) src) - src_pitch;\ -+diff -Nru orig-DFBSee-0.7.4/src/rotate.c DFBSee-0.7.4/src/rotate.c ---- orig-DFBSee-0.7.4/src/rotate.c 2005-12-05 15:37:52.000000000 +0800 -+++ DFBSee-0.7.4/src/rotate.c 2005-12-05 15:38:10.000000000 +0800 -@@ -43,9 +43,9 @@ - {\ - *d = *s;\ - s++;\ -- (__u8*)d += dest_pitch;\ -+ d = ((void*) d) + dest_pitch;\ - }\ -- (__u8*)src += src_pitch;\ -+ src = ((void*) src) + src_pitch;\ ++ dest = ((void*) dest) + dest_pitch;\ }\ }\ -@@ \ No newline at end of file +@@ -172,7 +172,7 @@ + source->Lock (source, DSLF_READ, &src, &src_pitch); + destination->Lock (destination, DSLF_READ, &dest, &dest_pitch); + +- (__u8 *) dest += dest_pitch * y + DFB_BYTES_PER_PIXEL (pixelformat) * x; ++ dest += dest_pitch * y + DFB_BYTES_PER_PIXEL (pixelformat) * x; + + rotate (dest, dest_pitch, + src, src_pitch, width, height, DFB_BYTES_PER_PIXEL (pixelformat), diff --git a/media-video/dirac/Manifest b/media-video/dirac/Manifest index 932e66d37bfc..6fa4368f18e9 100644 --- a/media-video/dirac/Manifest +++ b/media-video/dirac/Manifest @@ -1,2 +1 @@ DIST dirac-1.0.2.tar.gz 918366 SHA256 816b16f18d235ff8ccd40d95fc5b4fad61ae47583e86607932929d70bf1f00fd SHA512 71d49fe17da4069ea28581565d5a4c4f64565848b51d04b39a646bdaa9afc899a265e9ace34af57fba64b03562e8c2259f882f6f17c1e49d1057cd8e69d1250c WHIRLPOOL bb01f8a444f79cd194300ff83cae484bd0ff7be58c712cdaf5f525524f68474a89e093999df770d469d38fedae84559f8fab0b087cb448c52dc21daeaeb29ce8 -DIST dirac-1.0.2.tar.gz 918366 SHA256 816b16f18d235ff8ccd40d95fc5b4fad61ae47583e86607932929d70bf1f00fd SHA512 71d49fe17da4069ea28581565d5a4c4f64565848b51d04b39a646bdaa9afc899a265e9ace34af57fba64b03562e8c2259f882f6f17c1e49d1057cd8e69d1250c WHIRLPOOL bb01f8a444f79cd194300ff83cae484bd0ff7be58c712cdaf5f525524f68474a89e093999df770d469d38fedae84559f8fab0b087cb448c52dc21daeaeb29ce8 diff --git a/media-video/dvbackup/Manifest b/media-video/dvbackup/Manifest index bf6a962d8c20..9305bd080fef 100644 --- a/media-video/dvbackup/Manifest +++ b/media-video/dvbackup/Manifest @@ -1,2 +1 @@ DIST dvbackup-0.0.4.tar.gz 115303 SHA256 0020cd05d9985f5fcf80d49315373265d6d6a755efb0e18d337254f2aea249e1 -DIST dvbackup-0.0.4.tar.gz 115303 SHA256 0020cd05d9985f5fcf80d49315373265d6d6a755efb0e18d337254f2aea249e1 diff --git a/media-video/makemkv/makemkv-1.8.10.ebuild b/media-video/makemkv/makemkv-1.8.10.ebuild index b942a745977d..cf7f21ad144c 100644 --- a/media-video/makemkv/makemkv-1.8.10.ebuild +++ b/media-video/makemkv/makemkv-1.8.10.ebuild @@ -100,6 +100,9 @@ pkg_postinst() { elog "Note that beta license may have an expiration date and you will" elog "need to check for newer licenses/releases. " elog "" - elog "If this is a new install, remember to copy the default pr# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/med \ No newline at end of file + elog "If this is a new install, remember to copy the default profile" + elog "to the config directory:" + elog "cp /usr/share/MakeMKV/default.mmcp.xml ~/.MakeMKV/" +} + +pkg_postrm() { gnome2_icon_cache_update; } diff --git a/media-video/matroxset/matroxset-0.4.ebuild b/media-video/matroxset/matroxset-0.4.ebuild index 52d926b561ad..a21e91214476 100644 --- a/media-video/matroxset/matroxset-0.4.ebuild +++ b/media-video/matroxset/matroxset-0.4.ebuild @@ -24,14 +24,22 @@ doecho() { src_compile() { doecho $(tc-getCC) -o ${PN} \ - # Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/matroxset/matroxset-0.4.ebuild,v 1.6 2009/06/02 10:29:45 flameeyes Exp $ + ${CFLAGS} ${LDFLAGS} \ + ${PN}.c -lncurses \ + || die "build failed" + + #prepare small README + cat >> "${S}"/README << _EOF_ +This utility has been created by Petr Vandrovec + +Not much info here, but here are some pointers +http://davedina.apestaart.org/download/doc/Matrox-TVOUT-HOWTO-0.1.txt +http://www.netnode.de/howto/matrox-fb.html +_EOF_ +} -inherit toolchain-funcs +src_install() { + dobin matroxset || die -IUSE="" - -DESCRIPTION="Matrox utility to switch output modes (activate tvout)" -HOMEPAGE="ftp://platan.vc.cvut.cz/pub/linux/matrox-latest/" -SRC_URI="ftp:// \ No newline at end of file + dodoc README || die +} diff --git a/media-video/mjpg-streamer/mjpg-streamer-0_pre20120421.ebuild b/media-video/mjpg-streamer/mjpg-streamer-0_pre20120421.ebuild index 6007a619d061..173913061340 100644 --- a/media-video/mjpg-streamer/mjpg-streamer-0_pre20120421.ebuild +++ b/media-video/mjpg-streamer/mjpg-streamer-0_pre20120421.ebuild @@ -55,12 +55,18 @@ src_install() { doins -r www fi - dodoc RE# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mjpg-streamer/mjpg-streamer-0_pre20120421.ebuild,v 1.2 2012/06/28 07:31:28 aidecoe Exp $ + dodoc README TODO -EAPI=4 + newinitd "${FILESDIR}"/${PN}.initd ${PN} + newconfd "${FILESDIR}"/${PN}.confd ${PN} +} -inherit eutils +pkg_postinst() { + elog "Remember to set an input and output plugin for mjpg-streamer." -DESCRIPTION="MJPG-streamer takes JPGs from Linux-UVC compatib \ No newline at end of file + if use www ; then + echo + elog "An example webinterface has been installed into" + elog "/usr/share/mjpg-streamer/www for your usage." + fi +} diff --git a/media-video/motiontrack/motiontrack-0.1.3.ebuild b/media-video/motiontrack/motiontrack-0.1.3.ebuild index e2ee7cc27481..464fb3dde852 100644 --- a/media-video/motiontrack/motiontrack-0.1.3.ebuild +++ b/media-video/motiontrack/motiontrack-0.1.3.ebuild @@ -73,5 +73,6 @@ src_compile() { } src_install() { - m# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU Ge \ No newline at end of file + make DESTDIR="${D}" install || die "install failed" + dodoc README src/TheCode.txt +} diff --git a/media-video/tivodecode/Manifest b/media-video/tivodecode/Manifest index 84e6f31dbad1..9b08a146fd32 100644 --- a/media-video/tivodecode/Manifest +++ b/media-video/tivodecode/Manifest @@ -1,2 +1 @@ DIST tivodecode-0.2pre4.tar.gz 124685 RMD160 ebd31816e02c50808fce88606c0b359a431d94b7 SHA1 efabe4aee461e6da90ddc52abe9ae025c4185032 SHA256 788839cc4ad66f5b20792e166514411705e8564f9f050584c54c3f1f452e9cdf -DIST tivodecode-0.2pre4.tar.gz 124685 RMD160 ebd31816e02c50808fce88606c0b359a431d94b7 SHA1 efabe4aee461e6da90ddc52abe9ae025c4185032 SHA256 788839cc4ad66f5b20792e16 \ No newline at end of file diff --git a/media-video/tovid/Manifest b/media-video/tovid/Manifest index 2183e72be7a2..b3d128e79f8a 100644 --- a/media-video/tovid/Manifest +++ b/media-video/tovid/Manifest @@ -1,4 +1,2 @@ DIST tovid-0.34.tar.gz 512950 SHA256 f95d14ffbd2bd491751b529b09fb27ae45e24af1ad44c87b25bac9c1a184f4ee SHA512 4a8e25d6c579dc1b2fd34c467d7421faaf4fcaebdb25282856e25a05a00ad200385fea3c2bc0393ca85761cf12d70e760165f653911cf93ff7a22e85398e0593 WHIRLPOOL 282b20e94843428c2644190448f8e3a28ccdb914805914d5b6a8b33199285b60d7887afe32bf45eda879858f2f720d8c3555b689d5f8d16d34348c23e7acb9a0 DIST tovid-0.34_p20120123.tar.gz 1008271 SHA256 941d3ca7aeb68fe306fb41aa1e97d4524f3ce8e340e83a249257f11755084186 SHA512 5ea57e4e87d86a48da1be5c5e82a3878ad358e431a14cfc79c2483f2df5469588d9d75e478eafa5a134e724f4737987007ae59e8afa66a215dfe954bbf5651b3 WHIRLPOOL 0480fe7855cd7bf0c54189db009a5f229f92bc838035f66f4acb7b577ddc3be4a023308336fdf365cbcba0d000f8f4eb45c79211fb1bb030c98c9b882e235007 -DIST tovid-0.34.tar.gz 512950 SHA256 f95d14ffbd2bd491751b529b09fb27ae45e24af1ad44c87b25bac9c1a184f4ee SHA512 4a8e25d6c579dc1b2fd34c467d7421faaf4fcaebdb25282856e25a05a00ad200385fea3c2bc0393ca85761cf12d70e760165f653911cf93ff7a22e85398e0593 WHIRLPOOL 282b20e94843428c2644190448f8e3a28ccdb914805914d5b6a8b33199285b60d7887afe32bf45eda879858f2f720d8c3555b689d5f8d16d34348c23e7acb9a0 -DIST tovid-0.34_p20120123.tar.gz 1008271 SHA256 941d3ca7aeb68fe306fb41aa1e97d4524f3ce8e340e83a249257f11755084186 SHA512 5ea57e4e87d86a48da1be5c5e82a3878ad358e431a14cfc79c2483f2df5469588d9d75e478eafa5a134e724f4737987007ae59e8afa66a215dfe954bbf5651b3 WHIRLPOOL 0480fe7855cd7bf0c54189db009a5f229f92bc838035f66f4acb7b577ddc3be4a023308336fdf365cbcba0d000f \ No newline at end of file diff --git a/media-video/ushare/ushare-1.1a-r5.ebuild b/media-video/ushare/ushare-1.1a-r5.ebuild index 0679960898f0..1ba3af10ba37 100644 --- a/media-video/ushare/ushare-1.1a-r5.ebuild +++ b/media-video/ushare/ushare-1.1a-r5.ebuild @@ -23,29 +23,34 @@ src_prepare() { EPATCH_SOURCE="${FILESDIR}" EPATCH_SUFFIX="patch" \ EPATCH_OPTS="-p1" epatch -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ushare/ushare-1.1a-r5.ebuild,v 1.5 2013/02/16 08:36:16 pacho Exp $ - -EAPI=4 -inherit eutils multilib readme.gentoo toolchain-funcs user - -DESCRIPTION="uShare is a UPnP (TM) A/V & DLNA Media Server" -HOMEPAGE="http://ushare.geexbox.org/" -SRC_URI="http://ushare.geexbox.org/releases/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="dlna nls" - -RDEPEND=">=net-libs/libupnp-1.6.14 - dlna? ( >=media-libs/libdlna-0.2.4 )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - EPATCH_SOURCE="${FILESDIR}" EPATCH_SUFFIX="patch" \ - EPATCH_OPTS="-p1" epatch - - DOC_CONTENTS="Please edit /etc/conf.d/ushare to set the shared d \ No newline at end of file + DOC_CONTENTS="Please edit /etc/conf.d/ushare to set the shared directories + and other important settings. Check system log if ushare is + not booting." +} + +src_configure() { + local myconf + myconf="--prefix=/usr --disable-sysconf --disable-strip $(use_enable dlna)" + # nls can only be disabled, on by default. + use nls || myconf="${myconf} --disable-nls" + + # I can't use econf + # --host is not implemented in ./configure file + tc-export CC CXX + + ./configure ${myconf} || die "./configure failed" +} + +src_install() { + emake DESTDIR="${D}" install + doman src/ushare.1 + newconfd "${FILESDIR}"/ushare.conf.d ushare + newinitd "${FILESDIR}"/ushare.init.d ushare + dodoc NEWS README TODO THANKS AUTHORS + readme.gentoo_create_doc +} + +pkg_postinst() { + enewuser ushare + readme.gentoo_print_elog +} diff --git a/media-video/vdr2jpeg/files/vdr2jpeg-0.1.9-libav9.patch b/media-video/vdr2jpeg/files/vdr2jpeg-0.1.9-libav9.patch index 62f09e17269d..c984cfc4cff5 100644 --- a/media-video/vdr2jpeg/files/vdr2jpeg-0.1.9-libav9.patch +++ b/media-video/vdr2jpeg/files/vdr2jpeg-0.1.9-libav9.patch @@ -25,17 +25,30 @@ - ret = av_find_stream_info(ic); + ret = avformat_find_stream_info(ic, NULL); if (ret < 0 && verbose >= 0) { - fprintf(stderr, "%s: co--- ffm.cpp.old 2013-06-22 20:12:27.972712290 +0200 -+++ ffm.cpp 2013-06-22 20:13:33.586709956 +0200 -@@ -672,7 +672,7 @@ - ost->file_index, ost->index); - return false; - } -- if (avcodec_open(ost->st->codec, codec) < 0) { -+ if (avcodec_open2(ost->st->codec, codec, NULL) < 0) { - fprintf(stderr, "Error while opening codec for output stream #%d.%d - maybe incorrect parameters such as bit_rate, rate, width or height\n", - ost->file_index, ost->index); - return false; -@@ -691,7 +691,7 @@ - ist->st->codec->codec_id, ist->file_index, ist->index); - return fal \ No newline at end of file + fprintf(stderr, "%s: could not find codec parameters\n", filename); + return false; +@@ -1034,12 +1034,13 @@ + AVCodecContext *video_enc; + CodecID codec_id; + +- st = av_new_stream(oc, oc->nb_streams); ++ st = avformat_new_stream(oc, NULL); + if (!st) { + fprintf(stderr, "Could not alloc stream\n"); + return false; + } +- avcodec_get_context_defaults2(st->codec, AVMEDIA_TYPE_VIDEO); ++ st->id = oc->nb_streams; ++ avcodec_get_context_defaults3(st->codec, NULL); + + video_enc = st->codec; + +@@ -1204,7 +1205,7 @@ + { + av_log_set_level(verbose); + av_register_all(); +- avctx_opts= avcodec_alloc_context(); ++ avctx_opts= avcodec_alloc_context3(NULL); + } + + void ffm_deinitalize(void) diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk index 39d568b5ad23..c1833a64bcb9 100644 --- a/metadata/dtd/timestamp.chk +++ b/metadata/dtd/timestamp.chk @@ -1 +1 @@ -Wed, 01 Oct 2014 08:37:05 +0000 +Wed, 01 Oct 2014 12:07:02 +0000 diff --git a/metadata/glsa/glsa-200312-07.xml b/metadata/glsa/glsa-200312-07.xml index 7e6dfd6fa43d..1f6b5efc8c1b 100644 --- a/metadata/glsa/glsa-200312-07.xml +++ b/metadata/glsa/glsa-200312-07.xml @@ -3,15 +3,6 @@ - - Two buffer overflows in lftp - - Two buffer overflow problems are found in lftp that, in case the user visits - a malicious ftp serve - - - - Two buffer overflows in lftp @@ -70,4 +61,16 @@

- All Gentoo users who have net-ftp/lftp ins \ No newline at end of file + All Gentoo users who have net-ftp/lftp installed should update to use + version 2.6.0 or higher using these commands: +

+ + # emerge sync + # emerge -pv '>=net-ftp/lftp-2.6.10' + # emerge '>=net-ftp/lftp-2.6.10' + # emerge clean + + + Initial report by Ulf Harnhammar + + diff --git a/metadata/glsa/glsa-200408-27.xml b/metadata/glsa/glsa-200408-27.xml index 62a7f2b6486a..9556a59005b8 100644 --- a/metadata/glsa/glsa-200408-27.xml +++ b/metadata/glsa/glsa-200408-27.xml @@ -3,25 +3,6 @@ - - Gaim: New vulnerabilities - - Gaim contains several security issues that might allow an attacker to - execute arbitrary code or commands. - - Gaim - August 27, 2004 - May 22, 2006: 02 - 61457 - remote - - - 0.81-r5 - 0.81-r5 - - - - Gaim: New vulnerabilities @@ -84,4 +65,19 @@ # emerge sync # emerge -pv ">=net-im/gaim-0.81-r5" - # emerge ">=net-im/gaim-0.81-r \ No newline at end of file + # emerge ">=net-im/gaim-0.81-r5" + + + Gaim security issues + CVE-2004-0500 + CVE-2004-0754 + CVE-2004-0784 + CVE-2004-0785 + + + jaervosz + + + jaervosz + + diff --git a/metadata/glsa/glsa-200409-18.xml b/metadata/glsa/glsa-200409-18.xml index 1475343d3e53..802c527b7df2 100644 --- a/metadata/glsa/glsa-200409-18.xml +++ b/metadata/glsa/glsa-200409-18.xml @@ -1,7 +1,5 @@ - - @@ -69,4 +67,10 @@ jaervosz - + koon + + + jaervosz + + diff --git a/metadata/glsa/glsa-200501-23.xml b/metadata/glsa/glsa-200501-23.xml index 5c9760e7d0ff..67853b70b218 100644 --- a/metadata/glsa/glsa-200501-23.xml +++ b/metadata/glsa/glsa-200501-23.xml @@ -3,11 +3,6 @@ - - - - - Exim: Two buffer overflows @@ -67,4 +62,13 @@ CAN-2005-0021 CAN-2005-0022 - + koon + + + vorlon078 + + + koon + + diff --git a/metadata/glsa/glsa-200501-32.xml b/metadata/glsa/glsa-200501-32.xml index 01b3101b1cfd..2917e6b35861 100644 --- a/metadata/glsa/glsa-200501-32.xml +++ b/metadata/glsa/glsa-200501-32.xml @@ -3,42 +3,6 @@ - - KPdf, KOffice: Stack overflow in included Xpdf code - - KPdf and KOffice both include vulnerable Xpdf code to handle PDF files, - making them vulnerable to the execution of arbitrary code. - - kpdf, koffice - January 23, 2005 - January 23, 2005: 01 - 78619 - 78620 - remote - - - 1.3.5-r2 - 1.3.5-r2 - - - 3.3.2-r2 - 3.2.3-r4 - 3.3.2-r2 - - - -

- KPdf is a KDE-based PDF viewer included in the kdegraphics - package. KOffice is an integrated office suite for KDE. -

- - -

- KPdf and KOffice both include Xpdf code to handle PDF files - - - - KPdf, KOffice: Stack overflow in included Xpdf code @@ -76,4 +40,41 @@

- An attacker could entice a user \ No newline at end of file + An attacker could entice a user to open a specially-crafted PDF + file, potentially resulting in the execution of arbitrary code with the + rights of the user running the affected application. +

+ + +

+ There is no known workaround at this time. +

+ + +

+ All KPdf users should upgrade to the latest version of + kdegraphics: +

+ + # emerge --sync + # emerge --ask --oneshot --verbose kde-base/kdegraphics +

+ All KOffice users should upgrade to the latest version: +

+ + # emerge --sync + # emerge --ask --oneshot --verbose app-office/koffice + + + GLSA 200501-18 + CAN-2005-0064 + KDE Security Advisory: kpdf Buffer Overflow Vulnerability + KDE Security Advisory: KOffice PDF Import Filter Vulnerability + + + jaervosz + + + koon + + diff --git a/metadata/glsa/glsa-200508-04.xml b/metadata/glsa/glsa-200508-04.xml index 790e1177aed9..849c257d56a6 100644 --- a/metadata/glsa/glsa-200508-04.xml +++ b/metadata/glsa/glsa-200508-04.xml @@ -3,19 +3,6 @@ - - Netpbm: Arbitrary code execution in pstopnm - - The pstopnm utility, part of the Netpbm tools, contains a vulnerability - which can potentially result in the execution of arbitrary code. - - Netpbm - August 05, 2005 - May 28, 2009: - - - - Netpbm: Arbitrary code execution in pstopnm @@ -74,4 +61,19 @@

# emerge --sync - # emer \ No newline at end of file + # emerge --ask --oneshot --verbose media-libs/netpbm + + + CAN-2005-2471 + Secunia Advisory SA16184 + + + koon + + + adir + + + koon + + diff --git a/metadata/glsa/glsa-200511-16.xml b/metadata/glsa/glsa-200511-16.xml index 05c7302db231..6bb85b2e7c55 100644 --- a/metadata/glsa/glsa-200511-16.xml +++ b/metadata/glsa/glsa-200511-16.xml @@ -3,25 +3,6 @@ - - GNUMP3d: Directory traversal and insecure temporary file creation - - Two vulnerabilities have been identified in GNUMP3d allowing for limited - directory traversal and insecure temporary file creation. - - GNUMP3d - November 21, 2005 - August 21, 2007: 02 - 111990 - remote - - - 2.9_pre7 - 2.9_pre7 - - - - GNUMP3d: Directory traversal and insecure temporary file creation @@ -70,4 +51,25 @@

- \ No newline at end of file +

+ All GNUMP3d users should upgrade to the latest version: +

+ + # emerge --sync + # emerge --ask --oneshot --verbose ">=media-sound/gnump3d-2.9_pre7" + + + CVE-2005-3349 + CVE-2005-3355 + GNUMP3d Changelog + + + koon + + + koon + + + shellsage + + diff --git a/metadata/glsa/glsa-200511-23.xml b/metadata/glsa/glsa-200511-23.xml index 9f8a720b8dc9..3c950d4631b9 100644 --- a/metadata/glsa/glsa-200511-23.xml +++ b/metadata/glsa/glsa-200511-23.xml @@ -3,15 +3,6 @@ - - chmlib, KchmViewer: Stack-based buffer overflow - - chmlib and KchmViewer contain a buffer overflow vulnerability which may - lead to the execution of arbitrary code - - - - chmlib, KchmViewer: Stack-based buffer overflow @@ -73,4 +64,17 @@ # emerge --sync # emerge --ask --oneshot --verbose ">=app-text/kchmviewer-1.1" - + + CVE-2005-3318 + + + koon + + + adir + + + adir + + diff --git a/metadata/glsa/glsa-200601-06.xml b/metadata/glsa/glsa-200601-06.xml index 9bd6f0cc3622..cc9486a0bc56 100644 --- a/metadata/glsa/glsa-200601-06.xml +++ b/metadata/glsa/glsa-200601-06.xml @@ -3,17 +3,6 @@ - - xine-lib, FFmpeg: Heap-based buffer overflow - - xine-lib and FFmpeg are vulnerable to a buffer overflow that may be - exploited by attackers to execute arbitrary code. - - xine-lib ffmp - - - - xine-lib, FFmpeg: Heap-based buffer overflow @@ -79,4 +68,16 @@ # emerge --ask --oneshot --verbose ">=media-video/ffmpeg-0.4.9_p20051216" - CVE-2005-4048 + Original advisory + + + koon + + + adir + + + DerCorny + + diff --git a/metadata/glsa/glsa-200602-03.xml b/metadata/glsa/glsa-200602-03.xml index 5751ad9dd53c..0159108680dd 100644 --- a/metadata/glsa/glsa-200602-03.xml +++ b/metadata/glsa/glsa-200602-03.xml @@ -3,36 +3,6 @@ - - Apache: Multiple vulnerabilities - - Apache can be exploited for cross-site scripting attacks and is vulnerable - to a Denial of Service attack. - - Apache - February 06, 2006 - December 30, 2007: 03 - 115324 - 118875 - remote - - - 2.0.55-r1 - 2.0.54-r16 - 1.3.34-r2 - 1.3.34-r11 - 1.3.37 - 2.0.55-r1 - - - -

- The Apache HTTP server is one of the most popular web servers on the - Internet - - - - Apache: Multiple vulnerabilities @@ -95,3 +65,37 @@

# emerge --sync + # emerge --ask --oneshot --verbose ">=www-servers/apache-2.0.55-r1" +

+ 2.0.x users, old style config: +

+ + # emerge --sync + # emerge --ask --oneshot --verbose "=www-servers/apache-2.0.54-r16" +

+ 1.x users, new style config: +

+ + # emerge --sync + # emerge --ask --oneshot --verbose "=www-servers/apache-1.3.34-r11" +

+ 1.x users, old style config: +

+ + # emerge --sync + # emerge --ask --oneshot --verbose "=www-servers/apache-1.3.34-r2" + + + CVE-2005-3352 + CVE-2005-3357 + + + koon + + + frilled + + + jaervosz + + diff --git a/metadata/glsa/glsa-200607-04.xml b/metadata/glsa/glsa-200607-04.xml index 38dcdd3f4728..6a48a6d75060 100644 --- a/metadata/glsa/glsa-200607-04.xml +++ b/metadata/glsa/glsa-200607-04.xml @@ -38,45 +38,42 @@

- An attacker could execu - - - - - - PostgreSQL: SQL injection - - A flaw in the multibyte character handling allows execution of arbitrary - SQL statements. - - postgresql - July 09, 2006 - June 26, 2007: 03 - 134168 - remote - - - 8.0.8 - 7.4* - 8.0.8 - 7.4.13 - - - + An attacker could execute arbitrary SQL statements on the PostgreSQL + server. Be aware that web applications using PostgreSQL as a database + back-end might be used to exploit this vulnerability. +

+ +

- PostgreSQL is an open source object-relational database management - system. + There is no known workaround at this time.

- - + +

- PostgreSQL contains a flaw in the string parsing routines that allows - certain backslash-escaped characters to be bypassed with some multibyte - character encodings. This vulnerability was discovered by Akio Ishida - and Yasuo Ohgaki. + All PostgreSQL users should upgrade to the latest version in the + respective branch they are using:

- - + + # emerge --sync + # emerge --ask --oneshot --verbose dev-db/postgresql

- An attacker could execute arbitrary SQL statements on the PostgreSQL - se \ No newline at end of file + Note: While a fix exists for the 7.3 branch it doesn't currently work + on Gentoo. All 7.3.x users of PostgreSQL should consider updating their + installations to the 7.4 (or higher) branch as soon as possible! +

+ + + PostgreSQL technical information + CVE-2006-2313 + CVE-2006-2314 + + + falco + + + frilled + + + jaervosz + + diff --git a/metadata/glsa/glsa-200608-26.xml b/metadata/glsa/glsa-200608-26.xml index 1e2a4e3285b6..92af92829d22 100644 --- a/metadata/glsa/glsa-200608-26.xml +++ b/metadata/glsa/glsa-200608-26.xml @@ -3,20 +3,6 @@ - - Wireshark: Multiple vulnerabilities - - Wireshark is vulnerable to several security issues that may lead to a - Denial of Service and/or the execution of arbitrary code. - - wireshark - August 29, 2006 - August 29, 2006: 01 - - - - - Wireshark: Multiple vulnerabilities @@ -75,4 +61,17 @@ CVE-2006-4330 CVE-2006-4331 - CVE-2006-4332 + CVE-2006-4333 + Wireshark official advisory + + + jaervosz + + + falco + + + falco + + diff --git a/metadata/glsa/glsa-200609-07.xml b/metadata/glsa/glsa-200609-07.xml index 43d2e447c7a7..2e12744cca7a 100644 --- a/metadata/glsa/glsa-200609-07.xml +++ b/metadata/glsa/glsa-200609-07.xml @@ -3,24 +3,6 @@ - - LibXfont, monolithic X.org: Multiple integer overflows - - Some buffer overflows were discovered in the CID font parser, potentially - resulting in the execution of arbitrary code with elevated privileges. - - libxfont - September 13, 2006 - September 13, 2006: 01 - 145513 - local and remote - - - 1.2.1 - - - - LibXfont, monolithic X.org: Multiple integer overflows @@ -70,4 +52,26 @@

- All libXfont users \ No newline at end of file + All libXfont users should upgrade to the latest version: +

+ + # emerge --sync + # emerge --ask --oneshot --verbose ">=x11-libs/libXfont-1.2.1" +

+ All monolithic X.org users are advised to migrate to modular X.org. +

+ + + CVE-2006-3739 + CVE-2006-3740 + + + frilled + + + jaervosz + + + jaervosz + + diff --git a/metadata/glsa/glsa-200610-06.xml b/metadata/glsa/glsa-200610-06.xml index 2c19e259cc32..d8bed6527f0e 100644 --- a/metadata/glsa/glsa-200610-06.xml +++ b/metadata/glsa/glsa-200610-06.xml @@ -3,18 +3,6 @@ - - Mozilla Network Security Service (NSS): RSA signature forgery - - NSS fails to properly validate PKCS #1 v1.5 signatures. - - nss - October 17, 2006 - October 17, 2006: 0 - - - - Mozilla Network Security Service (NSS): RSA signature forgery @@ -72,4 +60,16 @@

- \ No newline at end of file + CVE-2006-4339 + CVE-2006-4340 + + + frilled + + + vorlon078 + + + frilled + + diff --git a/metadata/glsa/glsa-200611-26.xml b/metadata/glsa/glsa-200611-26.xml index 14c2e37386b4..345d3ef85e88 100644 --- a/metadata/glsa/glsa-200611-26.xml +++ b/metadata/glsa/glsa-200611-26.xml @@ -3,21 +3,6 @@ - - ProFTPD: Remote execution of arbitrary code - - ProFTPD is affected by mutiple vulnerabilities allowing for the remote - execution of arbitrary code. - - proftpd - November 30, 2006 - November 30, 2006: 01 - 154650 - re - - - - ProFTPD: Remote execution of arbitrary code @@ -77,4 +62,17 @@ # emerge --ask --oneshot --verbose ">=net-ftp/proftpd-1.3.0a" - CVE-2006-5815 + CVE-2006-6170 + CVE-2006-6171 (disputed) + + + falco + + + aetius + + + falco + + diff --git a/metadata/glsa/glsa-200612-20.xml b/metadata/glsa/glsa-200612-20.xml index 911b04b44916..a3153d5bb5e5 100644 --- a/metadata/glsa/glsa-200612-20.xml +++ b/metadata/glsa/glsa-200612-20.xml @@ -34,42 +34,41 @@ loader_pnm.c and an out-of-bounds memory read access in loader_tga.c.

- - - - - - - imlib2: Multiple vulnerabilities - - imlib2 contains several vulnerabilities that could lead to the remote - execution of arbitrary code or a Denial of Service. - - imlib2 - December 20, 2006 - December 20, 2006: 01 - 154216 - remote - - - 1.3.0 - 1.3.0 - - - +

- imlib2 is an advanced replacement for image manipulation libraries such - as libXpm. It is utilized by numerous programs, including gkrellm and - several window managers, to display images. + An attacker can entice a user to process a specially crafted JPG, ARGB, + PNG, LBM, PNM, TIFF, or TGA image with an "imlib2*" binary or another + application using the imlib2 libraries. Successful exploitation of the + buffer overflows causes the execution of arbitrary code with the + permissions of the user running the application.

- - + +

- M. Joonas Pihlaja discovered several buffer overflows in loader_argb.c, - loader_png.c, loader_lbm.c, loader_jpeg.c, loader_tiff.c, loader_tga.c, - loader_pnm.c and an out-of-bounds memory read access in loader_tga.c. + There is no known workaround at this time.

- - + +

- An attacker can entice a user to process a specia \ No newline at end of file + All imlib2 users should upgrade to the latest version: +

+ + # emerge --sync + # emerge --ask --oneshot --verbose ">=media-libs/imlib2-1.3.0" + + + CVE-2006-4806 + CVE-2006-4807 + CVE-2006-4808 + CVE-2006-4809 + + + jaervosz + + + vorlon + + + falco + + diff --git a/metadata/glsa/glsa-200702-10.xml b/metadata/glsa/glsa-200702-10.xml index c3a58b68883d..9a588640a3d7 100644 --- a/metadata/glsa/glsa-200702-10.xml +++ b/metadata/glsa/glsa-200702-10.xml @@ -3,36 +3,6 @@ - - UFO2000: Multiple vulnerabilities - - Multiple vulnerabilities have been found in the network components of - UFO2000 that could result in the remote execution of arbitrary code. - - ufo2000 - February 25, 2007 - February 25, 2007: 01 - 142392 - remote - - - 0.7.1062 - 0.7.1062 - - - -

- UFO2000 is a multi-player, turn-based tactical simulation. -

- - -

- Five vulnerabilities were found: a buffer overflow in recv_add_unit(); - a problem with improperly trusting user-supplie - - - - UFO2000: Multiple vulnerabilities @@ -82,4 +52,28 @@

UFO2000 currently depends on the dumb-0.9.2 library, which has been removed from portage due to security problems (GLSA 200608-14) . - Because of this, UFO20 \ No newline at end of file + Because of this, UFO2000 has been masked, and we recommend unmerging + the package until the next beta release can remove the dependency on + dumb. +

+ + # emerge --ask --verbose --unmerge ufo2000 + + + CVE-2006-3788 + CVE-2006-3789 + CVE-2006-3790 + CVE-2006-3791 + CVE-2006-3792 + GLSA 200608-14 + + + falco + + + aetius + + + falco + + diff --git a/metadata/glsa/glsa-200705-20.xml b/metadata/glsa/glsa-200705-20.xml index ec282694f20e..f843658160e9 100644 --- a/metadata/glsa/glsa-200705-20.xml +++ b/metadata/glsa/glsa-200705-20.xml @@ -3,40 +3,6 @@ - - Blackdown Java: Applet privilege escalation - - The Blackdown JDK and the Blackdown JRE suffer from the multiple - unspecified vulnerabilities that already affected the Sun JDK and JRE. - - blackdown-jdk,blackdown-jre - May 26, 2007 - May 26, 2007: 01 - 161835 - remote - - - 1.4.2.03-r14 - 1.4.2.03-r14 - - - 1.4.2.03-r14 - 1.4.2.03-r14 - - - -

- Blackdown provides implementations of the Java Development Kit (JDK) - and the Java Runtime Environment (JRE). -

- - -

- Chris Evans has discovered mul - - - - Blackdown Java: Applet privilege escalation @@ -94,4 +60,31 @@

- Since there is no \ No newline at end of file + Since there is no fixed update from Blackdown and since the flaw only + occurs in the applets, the "nsplugin" USE flag has been masked in the + portage tree. Emerge the ebuild again in order to fix the + vulnerability. Another solution is to switch to another Java + implementation such as the Sun implementation (dev-java/sun-jdk and + dev-java/sun-jre-bin). +

+ + # emerge --sync + # emerge --ask --oneshot --verbose "dev-java/blackdown-jdk" + # emerge --ask --oneshot --verbose "dev-java/blackdown-jre" + + + CVE-2006-6731 + CVE-2006-6736 + CVE-2006-6737 + CVE-2006-6745 + + + jaervosz + + + falco + + + falco + + diff --git a/metadata/glsa/glsa-200710-29.xml b/metadata/glsa/glsa-200710-29.xml index 0f938f2aa1f9..7be5d5a8b680 100644 --- a/metadata/glsa/glsa-200710-29.xml +++ b/metadata/glsa/glsa-200710-29.xml @@ -3,14 +3,6 @@ - - Sylpheed, Claws Mail: User-assisted remote execution of arbitrary code - - A format string error has been disco - - - - Sylpheed, Claws Mail: User-assisted remote execution of arbitrary code @@ -71,4 +63,15 @@ # emerge --ask --oneshot --verbose ">=mail-client/claws-mail-3.0.0" - CVE-2007-2958 + + + rbu + + + rbu + + + p-y + + diff --git a/metadata/glsa/glsa-200712-17.xml b/metadata/glsa/glsa-200712-17.xml index 57ad011182a9..43e5157fbefc 100644 --- a/metadata/glsa/glsa-200712-17.xml +++ b/metadata/glsa/glsa-200712-17.xml @@ -3,19 +3,6 @@ - - exiftags: Multiple vulnerabilities - - Multiple vulnerabilities in exiftags possibly allow for the execution of - arbitrary code or a Denial of Service. - - exiftags - December 29, 2007 - - - - - exiftags: Multiple vulnerabilities @@ -73,4 +60,17 @@ # emerge --ask --oneshot --verbose ">=media-gfx/exiftags-1.01" - CVE-2007-6354 + CVE-2007-6355 + CVE-2007-6356 + + + rbu + + + rbu + + + rbu + + diff --git a/metadata/glsa/glsa-200712-25.xml b/metadata/glsa/glsa-200712-25.xml index 8b6fc25be7f7..7425aa453dd0 100644 --- a/metadata/glsa/glsa-200712-25.xml +++ b/metadata/glsa/glsa-200712-25.xml @@ -3,24 +3,6 @@ - - OpenOffice.org: User-assisted arbitrary code execution - - An unspecified vulnerability has been reported in OpenOffice.org, possibly - allowing for the execution of arbitrary code. - - openoffice openoffice-bin hsqldb - December 30, 2007 - December 30, 2007: 01 - 200771 - 201799 - remote - - - - - - OpenOffice.org: User-assisted arbitrary code execution @@ -84,4 +66,24 @@

# emerge --sync - \ No newline at end of file + # emerge --ask --oneshot --verbose ">=app-office/openoffice-bin-2.3.1" +

+ All HSQLDB users should upgrade to the latest version: +

+ + # emerge --sync + # emerge --ask --oneshot --verbose ">=dev-db/hsqldb-1.8.0.9" + + + CVE-2007-4575 + + + p-y + + + p-y + + + p-y + + diff --git a/metadata/glsa/glsa-200801-11.xml b/metadata/glsa/glsa-200801-11.xml index b1a911be6904..abfd4361384a 100644 --- a/metadata/glsa/glsa-200801-11.xml +++ b/metadata/glsa/glsa-200801-11.xml @@ -3,26 +3,6 @@ - - CherryPy: Directory traversal vulnerability - - CherryPy is vulnerable to a directory traversal that could allow attackers - to read and write arbitrary files. - - cherrypy - January 27, 2008 - January 27, 2008: 01 - 204829 - remote - - - 2.2.1-r2 - 3.0.2-r1 - - - - - CherryPy: Directory traversal vulnerability @@ -69,4 +49,28 @@

- All CherryPy 2.2 users should upg \ No newline at end of file + All CherryPy 2.2 users should upgrade to the latest version: +

+ + # emerge --sync + # emerge --ask --oneshot --verbose ">=dev-python/cherrypy-2.2.1-r2" +

+ All CherryPy 3.0 users should upgrade to the latest version: +

+ + # emerge --sync + # emerge --ask --oneshot --verbose ">=dev-python/cherrypy-3.0.2-r1" + + + CVE-2008-0252 + + + rbu + + + rbu + + + p-y + + diff --git a/metadata/glsa/glsa-200803-08.xml b/metadata/glsa/glsa-200803-08.xml index 0a3654e09f59..58fa06bd8c42 100644 --- a/metadata/glsa/glsa-200803-08.xml +++ b/metadata/glsa/glsa-200803-08.xml @@ -3,43 +3,6 @@ - - Win32 binary codecs: Multiple vulnerabilities - - Multiple vulnerabilities in the Win32 codecs for Linux may result in the - remote execution of arbitrary code. - - win32codecs - March 04, 2008 - March 04, 2008: 01 - 150288 - remote - - - 20071007-r2 - 20071007-r2 - - - -

- Win32 binary codecs provide support for video and audio playback. -

- - -

- Multiple buffer overflow, heap overflow, and integer overflow - vulnerabilities were discovered in the Quicktime plugin when processing - MOV, FLC, SGI, H.264 and FPX files. -

- - -

- A remote attacker could entice a user to open a specially crafted video - file, possibly resulting in the remote execution of arbitrar - - - - Win32 binary codecs: Multiple vulnerabilities @@ -88,4 +51,30 @@ # emerge --sync # emerge --ask --oneshot --verbose ">=media-libs/win32codecs-20071007-r2" -

\ No newline at end of file +

+ Note: Since no updated binary versions have been released, the + Quicktime libraries have been removed from the package. Please use the + free alternative Quicktime implementations within VLC, MPlayer or Xine + for playback. +

+ + + CVE-2006-4382 + CVE-2006-4384 + CVE-2006-4385 + CVE-2006-4386 + CVE-2006-4388 + CVE-2006-4389 + CVE-2007-4674 + CVE-2007-6166 + + + p-y + + + p-y + + + p-y + + diff --git a/metadata/glsa/glsa-200809-02.xml b/metadata/glsa/glsa-200809-02.xml index c30c984c4aa2..e5f2418f1e9d 100644 --- a/metadata/glsa/glsa-200809-02.xml +++ b/metadata/glsa/glsa-200809-02.xml @@ -3,27 +3,6 @@ - - dnsmasq: Denial of Service and DNS spoofing - - Two vulnerabilities in dnsmasq might allow for a Denial of Service or - spoofing of DNS replies. - - dnsmasq - September 04, 2008 - September 04, 2008: 01 - 231282 - 232523 - remote - - - 2.45 - 2.45 - < - - - - dnsmasq: Denial of Service and DNS spoofing @@ -73,4 +52,28 @@

- There is no kn \ No newline at end of file + There is no known workaround at this time. +

+ + +

+ All dnsmasq users should upgrade to the latest version: +

+ + # emerge --sync + # emerge --ask --oneshot --verbose ">=net-dns/dnsmasq-2.45" + + + CVE-2008-3350 + CVE-2008-1447 + + + p-y + + + rbu + + + rbu + + diff --git a/metadata/glsa/glsa-200810-02.xml b/metadata/glsa/glsa-200810-02.xml index be25aeaf6ae2..d729542a9103 100644 --- a/metadata/glsa/glsa-200810-02.xml +++ b/metadata/glsa/glsa-200810-02.xml @@ -1,7 +1,5 @@ -< - @@ -71,4 +69,7 @@ rbu - + rbu + + diff --git a/metadata/glsa/glsa-200812-13.xml b/metadata/glsa/glsa-200812-13.xml index 89df93aaf879..5de43c50a4d3 100644 --- a/metadata/glsa/glsa-200812-13.xml +++ b/metadata/glsa/glsa-200812-13.xml @@ -3,34 +3,6 @@ - - OpenOffice.org: Multiple vulnerabilities - - Multiple vulnerabilities in OpenOffice.org might allow for user-assisted - execution of arbitrary code or symlink attacks. - - openoffice openoffice-bin - December 12, 2008 - December 12, 2008: 01 - 235824 - 244995 - local, remote - - - 3.0.0 - 3.0.0 - - - 3.0.0 - 3.0.0 - - - - - - - - OpenOffice.org: Multiple vulnerabilities @@ -83,3 +55,31 @@

+

+ All OpenOffice.org users should upgrade to the latest version: +

+ + # emerge --sync + # emerge --ask --oneshot --verbose ">=app-office/openoffice-3.0.0" +

+ All OpenOffice.org binary users should upgrade to the latest version: +

+ + # emerge --sync + # emerge --ask --oneshot --verbose ">=app-office/openoffice-bin-3.0.0" + + + CVE-2008-2237 + CVE-2008-2238 + CVE-2008-4937 + + + keytoaster + + + keytoaster + + + p-y + + diff --git a/metadata/glsa/glsa-200901-13.xml b/metadata/glsa/glsa-200901-13.xml index c47f7437efd9..0debc868e4cc 100644 --- a/metadata/glsa/glsa-200901-13.xml +++ b/metadata/glsa/glsa-200901-13.xml @@ -3,44 +3,6 @@ - - Pidgin: Multiple vulnerabilities - - Multiple vulnerabilities have been discovered in Pidgin, allowing for - remote arbitrary code execution, Denial of Service and service spoofing. - - pidgin - January 20, 2009 - January 20, 2009: 01 - 230045 - 234135 - remote - - - 2.5.1 - 2.5.1 - - - -

- Pidgin (formerly Gaim) is an instant messaging client for a variety of - instant messaging protocols. It is based on the libpurple instant - messaging library. -

- - -

- Multiple vulnerabilities have been discovered in Pidgin and the - libpurple library: -

-
  • - A participant to the TippingPoint ZDI reported multiple integer - overflows in the msn_slplink_process_msg() function in the MSN protocol - imp - - - - Pidgin: Multiple vulnerabilities @@ -95,4 +57,39 @@

    A remote attacker could send specially crafted messages or files using - the MSN protocol which could result \ No newline at end of file + the MSN protocol which could result in the execution of arbitrary code + or crash Pidgin. NOTE: Successful exploitation might require the + victim's interaction. Furthermore, an attacker could conduct + man-in-the-middle attacks to obtain sensitive information using bad + certificates and cause memory and disk resources to exhaust. +

    +     + +

    + There is no known workaround at this time. +

    +     + +

    + All Pidgin users should upgrade to the latest version: +

    + + # emerge --sync + # emerge --ask --oneshot --verbose ">=net-im/pidgin-2.5.1" +     + + CVE-2008-2927 + CVE-2008-2955 + CVE-2008-2957 + CVE-2008-3532 + + + p-y + + + a3li + + + rbu + +     diff --git a/metadata/glsa/glsa-200908-01.xml b/metadata/glsa/glsa-200908-01.xml index 7c1825f0d40b..5617dd177b8b 100644 --- a/metadata/glsa/glsa-200908-01.xml +++ b/metadata/glsa/glsa-200908-01.xml @@ -3,35 +3,6 @@ - - OpenSC: Multiple vulnerabilities - - Multiple vulnerabilities were found in OpenSC. - - opensc - August 01, 2009 - August 01, 2009: 01 - 260514 - 269920 - local - - - 0.11.8 - 0.11.8 - - - -

    - OpenSC provides a set of libraries and utilities to access smart cards. -

    -     - -

    - Multiple vulnerabilities we - - - - OpenSC: Multiple vulnerabilities @@ -82,4 +53,29 @@

    - There is no known workaround \ No newline at end of file + There is no known workaround at this time. +

    + + +

    + All OpenSC users should upgrade to the latest version: +

    + + # emerge --sync + # emerge --ask --oneshot --verbose ">=dev-libs/opensc-0.11.8" +     + + CVE-2009-0368 + CVE-2009-1603 + OpenSC Security Advisory + + + keytoaster + + + keytoaster + + + keytoaster + +     diff --git a/metadata/glsa/glsa-200909-18.xml b/metadata/glsa/glsa-200909-18.xml index edbc08bd668a..5ecfc5340de8 100644 --- a/metadata/glsa/glsa-200909-18.xml +++ b/metadata/glsa/glsa-200909-18.xml @@ -3,28 +3,6 @@ - - nginx: Remote execution of arbitrary code - - A buffer underflow vulnerability in the request URI processing of nginx - might enable remote attackers to execute arbitrary code or cause a Denial - of Service. - - nginx - September 18, 2009 - September 18, 2009: 01 - 285162 - remote - - - 0.5.38 - 0.6.39 - 0.7.62 - - - - - nginx: Remote execution of arbitrary code @@ -77,4 +55,30 @@

    # emerge --sync - # emerge --ask --oneshot --verbose \ No newline at end of file + # emerge --ask --oneshot --verbose ">=www-servers/nginx-0.5.38" +

    + All nginx 0.6.x users should upgrade to the latest version: +

    + + # emerge --sync + # emerge --ask --oneshot --verbose ">=www-servers/nginx-0.6.39" +

    + All nginx 0.7.x users should upgrade to the latest version: +

    + + # emerge --sync + # emerge --ask --oneshot --verbose ">=www-servers/nginx-0.7.62" + + + CVE-2009-2629 + + + a3li + + + a3li + + + a3li + +     diff --git a/metadata/glsa/glsa-201001-02.xml b/metadata/glsa/glsa-201001-02.xml index edf2792d7293..4d68d073388b 100644 --- a/metadata/glsa/glsa-201001-02.xml +++ b/metadata/glsa/glsa-201001-02.xml @@ -3,36 +3,6 @@ - - Adobe Flash Player: Multiple vulnerabilities - - Multiple vulnerabilities in Adobe Flash Player might allow remote attackers - to execute arbitrary code or cause a Denial of Service. - - adobe-flash - January 03, 2010 - January 03, 2010: 01 - 296407 - remote - - - 10.0.42.34 - 10.0.42.34 - - - -

    - The Adobe Flash Player is a renderer for the SWF file format, which is - commonly used to provide interactive websites. -

    -     - -

    - Multiple vulnera - - - - Adobe Flash Player: Multiple vulnerabilities @@ -89,4 +59,27 @@

    - All Adobe Flash Player users should upgrade to the l \ No newline at end of file + All Adobe Flash Player users should upgrade to the latest version: +

    + + # emerge --sync + # emerge --ask --oneshot --verbose ">=www-plugins/adobe-flash-10.0.42.34" + + + CVE-2009-3794 + CVE-2009-3796 + CVE-2009-3797 + CVE-2009-3798 + CVE-2009-3799 + CVE-2009-3800 + + + craig + + + a3li + + + a3li + +     diff --git a/metadata/glsa/glsa-201006-01.xml b/metadata/glsa/glsa-201006-01.xml index 23a928d02020..ce4d8c8d9d5b 100644 --- a/metadata/glsa/glsa-201006-01.xml +++ b/metadata/glsa/glsa-201006-01.xml @@ -3,35 +3,6 @@ - - FreeType 1: User-assisted execution of arbitrary code - - Multiple vulnerabilities in FreeType might result in the remote execution - of arbitrary code. - - freetype - June 01, 2010 - June 01, 2010: 01 - 271234 - remote - - - 1.4_pre20080316-r2 - 1.4_pre20080316-r2 - - - -

    - FreeType is a True Type Font rendering library. -

    -     - -

    - Multiple issues found in FreeType 2 were also - - - - FreeType 1: User-assisted execution of arbitrary code @@ -78,4 +49,27 @@ All FreeType 1 users should upgrade to an unaffected version:

    - # emerge --s \ No newline at end of file + # emerge --sync + # emerge --ask --oneshot --verbose ">=media-libs/freetype-1.4_pre20080316-r2" +

    + NOTE: This is a legacy GLSA. Updates for all affected architectures are + available since May 27, 2009. It is likely that your system is already + no longer affected by this issue. +

    + + + CVE-2006-1861 + CVE-2007-2754 + GLSA 200607-02 + GLSA 200705-22 + + + keytoaster + + + a3li + + + a3li + +     diff --git a/metadata/glsa/glsa-201201-05.xml b/metadata/glsa/glsa-201201-05.xml index 59ea2d5e08e6..7b27bc796520 100644 --- a/metadata/glsa/glsa-201201-05.xml +++ b/metadata/glsa/glsa-201201-05.xml @@ -2,18 +2,6 @@ - - mDNSResponder: Multiple vulnerabilities - Multiple vulnerabilities have been found in mDNSResponder, which - could lead to execution of arbitrary code with root privileges. - - mDNSResponder - January 22, 2012 - January 22, 2012: 1 - 290 - - - mDNSResponder: Multiple vulnerabilities Multiple vulnerabilities have been found in mDNSResponder, which @@ -63,4 +51,14 @@ CVE-2007-2386 - CVE-2007-3744 + CVE-2007-3828 + CVE-2008-0989 + CVE-2008-2326 + CVE-2008-3630 + + + underling + + ackle + diff --git a/metadata/glsa/glsa-201201-10.xml b/metadata/glsa/glsa-201201-10.xml index 3ab1f0876620..e3db4137a2a2 100644 --- a/metadata/glsa/glsa-201201-10.xml +++ b/metadata/glsa/glsa-201201-10.xml @@ -2,19 +2,6 @@ - - JasPer: User-assisted execution of arbitrary code - Multiple memory management errors in JasPer could result in - execution of arbitrary code or a Denial of Service. - - JasPer - January 23, 2012 - January 23, 2012: 1 - 394879 - - - - JasPer: User-assisted execution of arbitrary code Multiple memory management errors in JasPer could result in @@ -62,4 +49,20 @@

    There is no known workaround at this time.

    -

    All JasPer users \ No newline at end of file +

    All JasPer users should upgrade to the latest version:

    + + + # emerge --sync + # emerge --ask --oneshot --verbose ">=media-libs/jasper-1.900.1-r4" + + +     + + CVE-2011-4516 + CVE-2011-4517 + + + underling + + ackle +     diff --git a/metadata/glsa/glsa-201202-02.xml b/metadata/glsa/glsa-201202-02.xml index 3cdc28d98e85..e8c5845dd376 100644 --- a/metadata/glsa/glsa-201202-02.xml +++ b/metadata/glsa/glsa-201202-02.xml @@ -2,41 +2,6 @@ - - Quagga: Multiple vulnerabilities - Multiple vulnerabilities were found in Quagga, the worst of which - leading to remote execution of arbitrary code. - - Quagga - February 21, 2012 - February 21, 2012: 2 - 334303 - 359903 - 384651 - remote - - - 0.99.20 - 0.99.20 - - - -

    Quagga is a free routing daemon replacing Zebra supporting RIP, OSPF and - BGP. -

    -     - -

    Multiple vulnerabilities have been discovered in Quagga. Please review - the CVE identifiers referenced below for details. -

    -     - -

    A BGP peer could send a Route-Refresh message with specially-crafted ORF - record, which can cause Quagga's bgpd to crash or possibly execute - arbitrary code with th - - - Quagga: Multiple vulnerabilities Multiple vulnerabilities were found in Quagga, the worst of which @@ -76,4 +41,34 @@ be exploited to cause a heap-based buffer overflow resulting in a crash of the daemon and disruption of IPv4 routing, two errors in ospf6d and ospfd can - each be exploited to crash the daemon and \ No newline at end of file + each be exploited to crash the daemon and disrupt IP routing. +

    +     + +

    There is no known workaround at this time.

    +     + +

    All Quagga users should upgrade to the latest version:

    + + + # emerge --sync + # emerge --ask --oneshot --verbose ">=net-misc/quagga-0.99.20" + + +     + + CVE-2010-1674 + CVE-2010-1675 + CVE-2010-2948 + CVE-2010-2949 + CVE-2011-3323 + CVE-2011-3324 + CVE-2011-3325 + CVE-2011-3326 + CVE-2011-3327 + + + underling + + a3li +     diff --git a/metadata/glsa/glsa-201204-03.xml b/metadata/glsa/glsa-201204-03.xml index 0389da6c0811..558bc29f80c6 100644 --- a/metadata/glsa/glsa-201204-03.xml +++ b/metadata/glsa/glsa-201204-03.xml @@ -2,31 +2,6 @@ - - Chromium: Multiple vulnerabilities - Multiple vulnerabilities have been reported in Chromium, some of - which may allow execution of arbitrary code. - - chromium - April 10, 2012 - April 10, 2012: 1 - 410963 - remote - - - 18.0.1025.151 - 18.0.1025.151 - - - -

    Chromium is an open source web browser project.

    -     - -

    Multiple vulnerabilities have been discovered in Chromium. Please review - - - - Chromium: Multiple vulnerabilities Multiple vulnerabilities have been reported in Chromium, some of @@ -90,4 +65,32 @@ CVE-2011-3071 - + CVE-2011-3072 + + + CVE-2011-3073 + + + CVE-2011-3074 + + + CVE-2011-3075 + + + CVE-2011-3076 + + + CVE-2011-3077 + + + Release Notes 18.0.1025.151 + + + + phajdan.jr + + + phajdan.jr + + diff --git a/metadata/glsa/glsa-201206-18.xml b/metadata/glsa/glsa-201206-18.xml index 3d5124bc7b23..968853a044a0 100644 --- a/metadata/glsa/glsa-201206-18.xml +++ b/metadata/glsa/glsa-201206-18.xml @@ -2,25 +2,6 @@ - - GnuTLS: Multiple vulnerabilities - Multiple vulnerabilities have been found in GnuTLS, allowing a - remote attacker to perform man-in-the-middle or Denial of Service attacks. - - GnuTLS - June 23, 2012 - June 23, 2012: 1 - 281224 - 292025 - 389947 - 409287 - remote - - - - - - GnuTLS: Multiple vulnerabilities Multiple vulnerabilities have been found in GnuTLS, allowing a @@ -72,4 +53,21 @@

    There is no known workaround at this time.

    - +

    All GnuTLS users should upgrade to the latest version:

    + + + # emerge --sync + # emerge --ask --oneshot --verbose ">=net-libs/gnutls-2.12.18" + + + + + CVE-2009-2730 + CVE-2009-3555 + CVE-2011-4128 + CVE-2012-1573 + + ackle + ackle +     diff --git a/metadata/glsa/glsa-201208-02.xml b/metadata/glsa/glsa-201208-02.xml index c6abfbba9dd1..e96ff85c89c8 100644 --- a/metadata/glsa/glsa-201208-02.xml +++ b/metadata/glsa/glsa-201208-02.xml @@ -24,40 +24,6 @@

    Multiple vulnerabilities have been found in Puppet:

    -
      -
    • Puppet uses predictable file names for temporary files - (CVE-2012-1906). -
      • -
    • REST requests for a file in a remote filebucket are not handled - properly by overriding filebucket storage locations (CVE-2012-1986). -
      • -
    • REST requests for a file in a remote filebucket are not handled - pr - - - - - Puppet: Multiple vulnerabilities - Multiple vulnerabilities have been found in Puppet, the worst of - which could lead to execution of arbitrary code. - - Puppet - August 14, 2012 - August 14, 2012: 1 - 410857 - local - - - 2.7.13 - 2.7.13 - - - -

      Puppet is a system configuration management tool written in Ruby.

      -       - -

      Multiple vulnerabilities have been found in Puppet:

      -
      • Puppet uses predictable file names for temporary files (CVE-2012-1906). @@ -72,4 +38,37 @@
      • File name paths are not properly sanitized from bucket requests (CVE-2012-1988).
        • -
      • The Telnet utility in Puppet does not handle temporary files \ No newline at end of file +
      • The Telnet utility in Puppet does not handle temporary files securely + (CVE-2012-1989). +
        • +
      +       + +

      A local attacker with access to agent SSL keys could possibly execute + arbitrary code with the privileges of the process, cause a Denial of + Service condition, or perform symlink attacks to overwrite or read + arbitrary files on the Puppet master. +

      +       + +

      There is no known workaround at this time.

      +       + +

      All Puppet users should upgrade to the latest version:

      + + + # emerge --sync + # emerge --ask --oneshot --verbose ">=app-admin/puppet-2.7.13" + + +       + + CVE-2012-1906 + CVE-2012-1986 + CVE-2012-1987 + CVE-2012-1988 + CVE-2012-1989 + + ackle + ackle +       diff --git a/metadata/glsa/glsa-201210-02.xml b/metadata/glsa/glsa-201210-02.xml index aca811bf6a77..ea0bfc0bcf0a 100644 --- a/metadata/glsa/glsa-201210-02.xml +++ b/metadata/glsa/glsa-201210-02.xml @@ -2,36 +2,6 @@ - - MoinMoin: Multiple vulnerabilities - Multiple vulnerabilities have been found in MoinMoin, the worst of - which allowing for injection of arbitrary web script or HTML. - - MoinMoin - October 18, 2012 - October 18, 2012: 1 - 305663 - 339295 - remote - - - 1.9.4 - 1.9.4 - - - -

      MoinMoin is a Python WikiEngine.

      -       - -

      Multiple vulnerabilities have been discovered in MoinMoin. Please review - the CVE identifiers referenced below for details. -

      -       - -

      These vulnerabilities in MoinMo - - - MoinMoin: Multiple vulnerabilities Multiple vulnerabilities have been found in MoinMoin, the worst of @@ -69,4 +39,25 @@

      There is no known workaround at this time.

      -

      All MoinMoin users should upgrade to the la \ No newline at end of file +

      All MoinMoin users should upgrade to the latest version:

      + + + # emerge --sync + # emerge --ask --oneshot --verbose ">=www-apps/moinmoin-1.9.4" + + +       + + CVE-2010-0668 + CVE-2010-0669 + CVE-2010-0717 + CVE-2010-0828 + CVE-2010-1238 + CVE-2010-2487 + CVE-2010-2969 + CVE-2010-2970 + CVE-2011-1058 + + craig + craig +       diff --git a/metadata/glsa/glsa-201309-11.xml b/metadata/glsa/glsa-201309-11.xml index fd93e6f0740b..d0fb1cec2aed 100644 --- a/metadata/glsa/glsa-201309-11.xml +++ b/metadata/glsa/glsa-201309-11.xml @@ -2,31 +2,6 @@ - - Subversion: Multiple vulnerabilities - Multiple vulnerabilities have been found in Subversion, allowing - attackers to cause a Denial of Service, escalate privileges, or obtain - sensitive information. - - subversion - September 23, 2013 - September 23, 2013: 1 - 350166 - 356741 - 369065 - 463728 - 463860 - 472202 - 482166 - local, remote - - - 1.7.13 - 1.7.13 - - - - Subversion: Multiple vulnerabilities Multiple vulnerabilities have been found in Subversion, allowing @@ -83,4 +58,18 @@ CVE-2011-1783 CVE-2011-1921 CVE-2013-1845 - CVE-2013-1846 + CVE-2013-1847 + CVE-2013-1849 + CVE-2013-1884 + CVE-2013-1968 + CVE-2013-2088 + CVE-2013-2112 + CVE-2013-4131 + CVE-2013-4277 + + + underling + + ackle + diff --git a/metadata/glsa/glsa-201401-13.xml b/metadata/glsa/glsa-201401-13.xml index 9ae80b872fe2..36c264d6eac3 100644 --- a/metadata/glsa/glsa-201401-13.xml +++ b/metadata/glsa/glsa-201401-13.xml @@ -2,29 +2,6 @@ - - VirtualBox: Multiple Vulnerabilities - Multiple vulnerabilities have been found in VirtualBox, allowing - local attackers to escalate their privileges or cause a Denial of Service - condition. - - virtualbox - January 20, 2014 - January 20, 2014: 1 - 434872 - 498166 - local - - - 4.2.22 - 4.2.22 - - - 4.2.22 - 4. - - - VirtualBox: Multiple Vulnerabilities Multiple vulnerabilities have been found in VirtualBox, allowing @@ -68,4 +45,28 @@ # emerge --sync - # emerge --ask --oneshot --verbose ">=app-emulation/virtualb \ No newline at end of file + # emerge --ask --oneshot --verbose ">=app-emulation/virtualbox-4.2.22" + + +

      All virtualbox-bin users should upgrade to the latest version:

      + + + # emerge --sync + # emerge --ask --oneshot --verbose + ">=app-emulation/virtualbox-bin-4.2.22" + + + + + CVE-2012-3221 + CVE-2013-5892 + CVE-2014-0404 + CVE-2014-0405 + CVE-2014-0406 + CVE-2014-0407 + + + underling + + ackle +       diff --git a/metadata/glsa/glsa-201404-07.xml b/metadata/glsa/glsa-201404-07.xml index ed7777e46252..866de014246b 100644 --- a/metadata/glsa/glsa-201404-07.xml +++ b/metadata/glsa/glsa-201404-07.xml @@ -2,30 +2,6 @@ - - OpenSSL: Information Disclosure - Multiple Information Disclosure vulnerabilities in OpenSSL allow - remote attackers to obtain sensitive information via various vectors. - - openssl - April 08, 2014 - July 07, 2014: 3 - 505278 - 507074 - remote - - - 1.0.1g - 0.9.8y - 0.9.8z_p1 - 0.9.8z_p2 - 0.9.8z_p3 - 0.9.8z_p4 - 0.9.8z_p5 - - - - OpenSSL: Information Disclosure Multiple Information Disclosure vulnerabilities in OpenSSL allow @@ -77,4 +53,31 @@

      Disabling the tls-heartbeat USE flag (enabled by default) provides a - workaround for the CVE-2014-016 \ No newline at end of file + workaround for the CVE-2014-0160 issue. +

      +       + +

      All OpenSSL users should upgrade to the latest version:

      + + + # emerge --sync + # emerge --ask --oneshot --verbose ">=dev-libs/openssl-1.0.1g" + + +

      Note: All services using OpenSSL to provide TLS connections have to be + restarted for the update to take effect. Utilities like + app-admin/lib_users can aid in identifying programs using OpenSSL. +

      + +

      As private keys may have been compromised using the Heartbleed attack, + it is recommended to regenerate them. +

      +       + + CVE-2014-0076 + CVE-2014-0160 + Heartbleed bug website + + a3li + a3li +       diff --git a/metadata/glsa/glsa-201406-19.xml b/metadata/glsa/glsa-201406-19.xml index 57d93a41daea..2327a4134520 100644 --- a/metadata/glsa/glsa-201406-19.xml +++ b/metadata/glsa/glsa-201406-19.xml @@ -2,25 +2,6 @@ - - Mozilla Network Security Service: Multiple vulnerabilities - Multiple vulnerabilities have been discovered in Mozilla Network - Security Service, the worst of which could lead to Denial of Service. - - nss - June 21, 2014 - June 21, 2014: 1 - 455558 - 486114 - 491234 - remote - - - 3.15.3 - - - - Mozilla Network Security Service: Multiple vulnerabilities Multiple vulnerabilities have been discovered in Mozilla Network @@ -72,4 +53,16 @@

      - CVE-2013-1620 + CVE-2013-1739 + CVE-2013-1741 + CVE-2013-2566 + CVE-2013-5605 + CVE-2013-5606 + CVE-2013-5607 + + + BlueKnight + + K_F +       diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk index 39d568b5ad23..c1833a64bcb9 100644 --- a/metadata/glsa/timestamp.chk +++ b/metadata/glsa/timestamp.chk @@ -1 +1 @@ -Wed, 01 Oct 2014 08:37:05 +0000 +Wed, 01 Oct 2014 12:07:02 +0000 diff --git a/metadata/md5-cache/app-admin/rsyslog-8.4.1 b/metadata/md5-cache/app-admin/rsyslog-8.4.1 index 8920b0b5970e..7b10ef262e24 100644 --- a/metadata/md5-cache/app-admin/rsyslog-8.4.1 +++ b/metadata/md5-cache/app-admin/rsyslog-8.4.1 @@ -4,11 +4,11 @@ DESCRIPTION=An enhanced multi-threaded syslogd with database support and more EAPI=5 HOMEPAGE=http://www.rsyslog.com/ IUSE=dbi debug doc elasticsearch +gcrypt jemalloc kerberos mongodb mysql normalize omudpspoof oracle postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd usertools zeromq -KEYWORDS=~amd64 ~arm ~hppa ~x86 +KEYWORDS=~amd64 ~arm hppa ~x86 LICENSE=GPL-3 LGPL-3 Apache-2.0 RDEPEND=>=dev-libs/json-c-0.11:= >=dev-libs/libestr-0.1.9 >=dev-libs/liblogging-1.0.1:=[stdlog] >=sys-libs/zlib-1.2.5 dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) jemalloc? ( >=dev-libs/jemalloc-3.3.1 ) kerberos? ( virtual/krb5 ) mongodb? ( >=dev-libs/libmongo-client-0.1.4 ) mysql? ( virtual/mysql ) normalize? ( >=dev-libs/libee-0.4.0 >=dev-libs/liblognorm-1.0.0:= ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) oracle? ( >=dev-db/oracle-instantclient-basic-10.2 ) postgres? ( >=dev-db/postgresql-base-8.4.20 ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0 ) redis? ( >=dev-libs/hiredis-0.11.0 ) relp? ( >=dev-libs/librelp-1.2.5 ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( >=dev-libs/openssl-0.9.8y ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( >=net-libs/gnutls-2.12.23 ) systemd? ( >=sys-apps/systemd-208 ) zeromq? ( >=net-libs/czmq-1.2.0 ) RESTRICT=test SLOT=0 SRC_URI=http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.4.1.tar.gz doc? ( http://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.4.1.tar.gz ) _eclasses_=autotools ebea507d219855923e3438c953cf4ab8 autotools-utils 3727db64c7b960903d5033280f108080 eutils 32548a82e42dc26e3312581476d2f20c libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 0f1760274637a138b99bb649202ea402 -_md5_=0cdbc2ff6993b8b074aaf32b0d3bd637 +_md5_=04b5e33cbdab04abfbf94e02cfd5e88a diff --git a/metadata/md5-cache/dev-libs/liblogging-1.0.4 b/metadata/md5-cache/dev-libs/liblogging-1.0.4 index 1f2e7835671a..b6990687fa56 100644 --- a/metadata/md5-cache/dev-libs/liblogging-1.0.4 +++ b/metadata/md5-cache/dev-libs/liblogging-1.0.4 @@ -4,10 +4,10 @@ DESCRIPTION=Liblogging is an easy to use, portable, open source library for syst EAPI=5 HOMEPAGE=http://www.liblogging.org IUSE=rfc3195 static-libs +stdlog systemd -KEYWORDS=~amd64 ~arm ~hppa ~x86 +KEYWORDS=~amd64 ~arm hppa ~x86 LICENSE=BSD-2 RDEPEND=systemd? ( sys-apps/systemd ) SLOT=0/0 SRC_URI=http://download.rsyslog.com/liblogging/liblogging-1.0.4.tar.gz _eclasses_=autotools ebea507d219855923e3438c953cf4ab8 autotools-utils 3727db64c7b960903d5033280f108080 eutils 32548a82e42dc26e3312581476d2f20c libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402 -_md5_=875b460baacd8df0476525f5f8a7a48b +_md5_=7f856800fb0b92e2aab065059dd43822 diff --git a/metadata/md5-cache/dev-libs/liblognorm-1.0.1 b/metadata/md5-cache/dev-libs/liblognorm-1.0.1 index f2beab5b0c93..28fe9dcbf21a 100644 --- a/metadata/md5-cache/dev-libs/liblognorm-1.0.1 +++ b/metadata/md5-cache/dev-libs/liblognorm-1.0.1 @@ -4,10 +4,10 @@ DESCRIPTION=Fast samples-based log normalization library EAPI=5 HOMEPAGE=http://www.liblognorm.com IUSE=static-libs -KEYWORDS=~amd64 ~arm ~hppa ~x86 ~amd64-linux +KEYWORDS=~amd64 ~arm hppa ~x86 ~amd64-linux LICENSE=LGPL-2.1 RDEPEND=>=dev-libs/libestr-0.1.3 >=dev-libs/json-c-0.11:= SLOT=0/1 SRC_URI=http://www.liblognorm.com/files/download/liblognorm-1.0.1.tar.gz _eclasses_=autotools ebea507d219855923e3438c953cf4ab8 autotools-utils 3727db64c7b960903d5033280f108080 eutils 32548a82e42dc26e3312581476d2f20c libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402 -_md5_=81f22690deab35e4277601d8df160dac +_md5_=985efb3a4f45a4125d16144bbc47c934 diff --git a/metadata/md5-cache/dev-libs/libmongo-client-0.1.7 b/metadata/md5-cache/dev-libs/libmongo-client-0.1.7 index c4c33ae5a93a..5be4e68701b8 100644 --- a/metadata/md5-cache/dev-libs/libmongo-client-0.1.7 +++ b/metadata/md5-cache/dev-libs/libmongo-client-0.1.7 @@ -4,10 +4,10 @@ DESCRIPTION=The alternative C driver for MongoDB EAPI=5 HOMEPAGE=https://github.com/algernon/libmongo-client IUSE=doc -KEYWORDS=~amd64 ~arm ~hppa ~x86 +KEYWORDS=~amd64 ~arm hppa ~x86 LICENSE=Apache-2.0 RDEPEND=dev-libs/glib SLOT=0 SRC_URI=https://github.com/algernon/libmongo-client/archive/libmongo-client-0.1.7.tar.gz _eclasses_=autotools ebea507d219855923e3438c953cf4ab8 eutils 32548a82e42dc26e3312581476d2f20c libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402 -_md5_=324e8c8ab1315dc6ecbd013c0030621d +_md5_=eaa495681913be53f4a9ea763b7db4e0 diff --git a/metadata/md5-cache/dev-libs/librelp-1.2.7-r1 b/metadata/md5-cache/dev-libs/librelp-1.2.7-r1 index 7280df242985..abd0c001eb3d 100644 --- a/metadata/md5-cache/dev-libs/librelp-1.2.7-r1 +++ b/metadata/md5-cache/dev-libs/librelp-1.2.7-r1 @@ -4,10 +4,10 @@ DESCRIPTION=An easy to use library for the RELP protocol EAPI=5 HOMEPAGE=http://www.librelp.com/ IUSE=debug doc +ssl static-libs -KEYWORDS=~amd64 ~arm ~hppa ~sparc ~x86 +KEYWORDS=~amd64 ~arm hppa ~sparc ~x86 LICENSE=GPL-3 doc? ( FDL-1.3 ) RDEPEND=ssl? ( >=net-libs/gnutls-2.12.23-r1 ) SLOT=0 SRC_URI=http://download.rsyslog.com/librelp/librelp-1.2.7.tar.gz _eclasses_=autotools ebea507d219855923e3438c953cf4ab8 autotools-utils 3727db64c7b960903d5033280f108080 eutils 32548a82e42dc26e3312581476d2f20c libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402 -_md5_=7e04ad284f6b9d48f79373badb9cb6a9 +_md5_=66f3720475bc15b8d337bce59c08bcfa diff --git a/metadata/md5-cache/dev-perl/List-AllUtils-0.80.0 b/metadata/md5-cache/dev-perl/List-AllUtils-0.80.0 new file mode 100644 index 000000000000..34dc29eaa676 --- /dev/null +++ b/metadata/md5-cache/dev-perl/List-AllUtils-0.80.0 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure install prepare test unpack +DEPEND=>=dev-perl/List-MoreUtils-0.280.0 >=virtual/perl-Scalar-List-Utils-1.190.0 dev-lang/perl:=[-build(-)] +DESCRIPTION=Combines List::Util and List::MoreUtils in one bite-sized package +EAPI=5 +HOMEPAGE=http://search.cpan.org/dist/List-AllUtils/ +KEYWORDS=~amd64 ~x86 +LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 ) +RDEPEND=>=dev-perl/List-MoreUtils-0.280.0 >=virtual/perl-Scalar-List-Utils-1.190.0 dev-lang/perl:=[-build(-)] +SLOT=0 +SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/List-AllUtils-0.08.tar.gz +_eclasses_=eutils 32548a82e42dc26e3312581476d2f20c multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 perl-module f889e8437ffc64d766053d029c422c4e toolchain-funcs 0f1760274637a138b99bb649202ea402 unpacker f300a7ca9131b1024a79762e8edd3c52 +_md5_=75185c2840c232f8dba2fc897804ff3c diff --git a/metadata/md5-cache/dev-perl/Module-Install-1.120.0 b/metadata/md5-cache/dev-perl/Module-Install-1.120.0 new file mode 100644 index 000000000000..9d900374217e --- /dev/null +++ b/metadata/md5-cache/dev-perl/Module-Install-1.120.0 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare test unpack +DEPEND=>=virtual/perl-File-Spec-3.28 >=virtual/perl-Archive-Tar-1.44 >=virtual/perl-ExtUtils-MakeMaker-6.590.0 >=virtual/perl-ExtUtils-ParseXS-2.19 >=virtual/perl-Module-Build-0.33 >=virtual/perl-Module-CoreList-2.17 >=virtual/perl-Parse-CPAN-Meta-1.39 >=dev-perl/libwww-perl-5.812 >=dev-perl/File-Remove-1.42 >=dev-perl/JSON-2.14 >=dev-perl/Module-ScanDeps-0.89 >=dev-perl/PAR-Dist-0.29 >=dev-perl/YAML-Tiny-1.38 test? ( >=virtual/perl-Test-Harness-3.13 >=virtual/perl-Test-Simple-0.86 ) dev-lang/perl:=[-build(-)] +DESCRIPTION=Standalone, extensible Perl module installer +EAPI=5 +HOMEPAGE=http://search.cpan.org/dist/Module-Install/ +IUSE=test +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos +LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 ) +RDEPEND=>=virtual/perl-File-Spec-3.28 >=virtual/perl-Archive-Tar-1.44 >=virtual/perl-ExtUtils-MakeMaker-6.590.0 >=virtual/perl-ExtUtils-ParseXS-2.19 >=virtual/perl-Module-Build-0.33 >=virtual/perl-Module-CoreList-2.17 >=virtual/perl-Parse-CPAN-Meta-1.39 >=dev-perl/libwww-perl-5.812 >=dev-perl/File-Remove-1.42 >=dev-perl/JSON-2.14 >=dev-perl/Module-ScanDeps-0.89 >=dev-perl/PAR-Dist-0.29 >=dev-perl/YAML-Tiny-1.38 dev-lang/perl:=[-build(-)] +SLOT=0 +SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/Module-Install-1.12.tar.gz +_eclasses_=eutils 32548a82e42dc26e3312581476d2f20c multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 perl-module f889e8437ffc64d766053d029c422c4e toolchain-funcs 0f1760274637a138b99bb649202ea402 unpacker f300a7ca9131b1024a79762e8edd3c52 +_md5_=9457ad5c2c133540bf7f58e7d586c643 diff --git a/metadata/md5-cache/dev-perl/Module-Install-1.60.0-r1 b/metadata/md5-cache/dev-perl/Module-Install-1.60.0-r1 index 25e0daeb5bea..bcf838c40cca 100644 --- a/metadata/md5-cache/dev-perl/Module-Install-1.60.0-r1 +++ b/metadata/md5-cache/dev-perl/Module-Install-1.60.0-r1 @@ -4,10 +4,10 @@ DESCRIPTION=Standalone, extensible Perl module installer EAPI=5 HOMEPAGE=http://search.cpan.org/dist/Module-Install/ IUSE=test -KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos +KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 ) RDEPEND=>=virtual/perl-File-Spec-3.28 >=virtual/perl-Archive-Tar-1.44 >=virtual/perl-ExtUtils-MakeMaker-6.590.0 >=virtual/perl-ExtUtils-ParseXS-2.19 >=virtual/perl-Module-Build-0.33 >=virtual/perl-Module-CoreList-2.17 >=virtual/perl-Parse-CPAN-Meta-1.39 >=dev-perl/libwww-perl-5.812 >=dev-perl/File-Remove-1.42 >=dev-perl/JSON-2.14 >=dev-perl/Module-ScanDeps-0.89 >=dev-perl/PAR-Dist-0.29 >=dev-perl/YAML-Tiny-1.38 dev-lang/perl:=[-build(-)] SLOT=0 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Module-Install-1.06.tar.gz _eclasses_=eutils 32548a82e42dc26e3312581476d2f20c multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 perl-module f889e8437ffc64d766053d029c422c4e toolchain-funcs 0f1760274637a138b99bb649202ea402 unpacker f300a7ca9131b1024a79762e8edd3c52 -_md5_=afef95affe0dcf1658e42d9acecb3125 +_md5_=6c9c5e0cac4eacdaee721ff988924b19 diff --git a/metadata/md5-cache/net-analyzer/greenbone-security-assistant-5.0.3-r1 b/metadata/md5-cache/net-analyzer/greenbone-security-assistant-5.0.3-r1 new file mode 100644 index 000000000000..2a4e70905dfa --- /dev/null +++ b/metadata/md5-cache/net-analyzer/greenbone-security-assistant-5.0.3-r1 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure install postinst prepare test +DEPEND=>=net-analyzer/openvas-libraries-7.0.4 dev-libs/libxslt net-libs/libmicrohttpd[messages] virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) virtual/pkgconfig +DESCRIPTION=Greenbone Security Assistant for openvas +EAPI=5 +HOMEPAGE=http://www.openvas.org/ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=GPL-2 +RDEPEND=>=net-analyzer/openvas-libraries-7.0.4 dev-libs/libxslt net-libs/libmicrohttpd[messages] +SLOT=0 +SRC_URI=http://wald.intevation.org/frs/download.php/1734/greenbone-security-assistant-5.0.3.tar.gz +_eclasses_=cmake-utils da2974fcb060ec927e93a17c835afa67 eutils 32548a82e42dc26e3312581476d2f20c flag-o-matic 75e24bac8423c515dd9c5717f08feb83 multilib 3bf24e6abb9b76d9f6c20600f0b716bf systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 0f1760274637a138b99bb649202ea402 +_md5_=46fb59769ab50882c83e63222a1613ce diff --git a/metadata/md5-cache/net-analyzer/openvas-cli-1.3.0-r1 b/metadata/md5-cache/net-analyzer/openvas-cli-1.3.0-r1 new file mode 100644 index 000000000000..518b31c9755a --- /dev/null +++ b/metadata/md5-cache/net-analyzer/openvas-cli-1.3.0-r1 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure install prepare test +DEPEND=>=net-analyzer/openvas-libraries-7.0.2 !net-analyzer/openvas-client virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) +DESCRIPTION=A remote security scanner for Linux (openvas-cli) +EAPI=5 +HOMEPAGE=http://www.openvas.org/ +KEYWORDS=~amd64 ~arm ~ppc ~x86 +LICENSE=GPL-2 +RDEPEND=>=net-analyzer/openvas-libraries-7.0.2 !net-analyzer/openvas-client +SLOT=0 +SRC_URI=http://wald.intevation.org/frs/download.php/1633/openvas-cli-1.3.0.tar.gz +_eclasses_=cmake-utils da2974fcb060ec927e93a17c835afa67 eutils 32548a82e42dc26e3312581476d2f20c flag-o-matic 75e24bac8423c515dd9c5717f08feb83 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 +_md5_=3134a9df716e44c8879ed2f8a27af0d7 diff --git a/metadata/md5-cache/net-analyzer/openvas-manager-5.0.4-r1 b/metadata/md5-cache/net-analyzer/openvas-manager-5.0.4-r1 new file mode 100644 index 000000000000..56f4e881e4d2 --- /dev/null +++ b/metadata/md5-cache/net-analyzer/openvas-manager-5.0.4-r1 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure install prepare test +DEPEND=>=net-analyzer/openvas-libraries-7.0.4 >=dev-db/sqlite-3 !net-analyzer/openvas-administrator virtual/pkgconfig dev-util/cmake sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) virtual/pkgconfig +DESCRIPTION=A remote security scanner for Linux (openvas-manager) +EAPI=5 +HOMEPAGE=http://www.openvas.org/ +KEYWORDS=~amd64 ~arm ~ppc ~x86 +LICENSE=GPL-2 +RDEPEND=>=net-analyzer/openvas-libraries-7.0.4 >=dev-db/sqlite-3 !net-analyzer/openvas-administrator +SLOT=0 +SRC_URI=http://wald.intevation.org/frs/download.php/1730/openvas-manager-5.0.4.tar.gz +_eclasses_=cmake-utils da2974fcb060ec927e93a17c835afa67 eutils 32548a82e42dc26e3312581476d2f20c flag-o-matic 75e24bac8423c515dd9c5717f08feb83 multilib 3bf24e6abb9b76d9f6c20600f0b716bf systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 0f1760274637a138b99bb649202ea402 +_md5_=05e2a13e615c844b4fc470adfe3d3960 diff --git a/metadata/md5-cache/net-analyzer/openvas-manager-5.0.4-r2 b/metadata/md5-cache/net-analyzer/openvas-manager-5.0.4-r2 new file mode 100644 index 000000000000..a0172ccfb4a9 --- /dev/null +++ b/metadata/md5-cache/net-analyzer/openvas-manager-5.0.4-r2 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure install prepare test +DEPEND=>=net-analyzer/openvas-libraries-7.0.4 >=dev-db/sqlite-3 !net-analyzer/openvas-administrator virtual/pkgconfig dev-util/cmake sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) virtual/pkgconfig +DESCRIPTION=A remote security scanner for Linux (openvas-manager) +EAPI=5 +HOMEPAGE=http://www.openvas.org/ +KEYWORDS=~amd64 ~arm ~ppc ~x86 +LICENSE=GPL-2 +RDEPEND=>=net-analyzer/openvas-libraries-7.0.4 >=dev-db/sqlite-3 !net-analyzer/openvas-administrator +SLOT=0 +SRC_URI=http://wald.intevation.org/frs/download.php/1730/openvas-manager-5.0.4.tar.gz +_eclasses_=cmake-utils da2974fcb060ec927e93a17c835afa67 eutils 32548a82e42dc26e3312581476d2f20c flag-o-matic 75e24bac8423c515dd9c5717f08feb83 multilib 3bf24e6abb9b76d9f6c20600f0b716bf systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 0f1760274637a138b99bb649202ea402 +_md5_=d77fa7483b17b9694740235fd107878e diff --git a/metadata/md5-cache/net-analyzer/openvas-scanner-4.0.3-r2 b/metadata/md5-cache/net-analyzer/openvas-scanner-4.0.3-r2 index 9983ea425b31..84255e397edd 100644 --- a/metadata/md5-cache/net-analyzer/openvas-scanner-4.0.3-r2 +++ b/metadata/md5-cache/net-analyzer/openvas-scanner-4.0.3-r2 @@ -1,5 +1,5 @@ DEFINED_PHASES=compile configure install postinst prepare test -DEPEND=>=net-analyzer/openvas-libraries-7.0.4 !net-analyzer/openvas-plugins !net-analyzer/openvas-server virtual/pkgconfig dev-util/cmake sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) virtual/pkgconfig +DEPEND=>=net-analyzer/openvas-libraries-7.0.4 !net-analyzer/openvas-plugins !net-analyzer/openvas-server virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) virtual/pkgconfig DESCRIPTION=A remote security scanner for Linux (OpenVAS-scanner) EAPI=5 HOMEPAGE=http://www.openvas.org/ @@ -9,4 +9,4 @@ RDEPEND=>=net-analyzer/openvas-libraries-7.0.4 !net-analyzer/openvas-plugins !ne SLOT=0 SRC_URI=http://wald.intevation.org/frs/download.php/1726/openvas-scanner-4.0.3.tar.gz _eclasses_=cmake-utils da2974fcb060ec927e93a17c835afa67 eutils 32548a82e42dc26e3312581476d2f20c flag-o-matic 75e24bac8423c515dd9c5717f08feb83 multilib 3bf24e6abb9b76d9f6c20600f0b716bf systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 0f1760274637a138b99bb649202ea402 -_md5_=66e6181195265181d8ebd3a26c474323 +_md5_=0eebaacbcd03240178f02b014100696d diff --git a/metadata/md5-cache/net-analyzer/openvas-tools-0_pre20512 b/metadata/md5-cache/net-analyzer/openvas-tools-0_pre20512 new file mode 100644 index 000000000000..2debad98d331 --- /dev/null +++ b/metadata/md5-cache/net-analyzer/openvas-tools-0_pre20512 @@ -0,0 +1,10 @@ +DEFINED_PHASES=install +DESCRIPTION=A remote security scanner for Linux (extra tools) +EAPI=5 +HOMEPAGE=http://www.openvas.org/ +KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux +LICENSE=GPL-2 +SLOT=0 +SRC_URI=http://dev.gentoo.org/~jlec/distfiles/openvas-tools-0_pre20512.tar.xz +_eclasses_=multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 +_md5_=79e0897128e1410b6343db839173f8e4 diff --git a/metadata/md5-cache/net-libs/rabbitmq-c-0.5.0 b/metadata/md5-cache/net-libs/rabbitmq-c-0.5.0 index 92e415ab5080..a49c1c37b0b2 100644 --- a/metadata/md5-cache/net-libs/rabbitmq-c-0.5.0 +++ b/metadata/md5-cache/net-libs/rabbitmq-c-0.5.0 @@ -4,9 +4,9 @@ DESCRIPTION=RabbitMQ C client EAPI=5 HOMEPAGE=https://github.com/alanxz/rabbitmq-c IUSE=tools -KEYWORDS=~amd64 ~arm ~hppa ~x86 +KEYWORDS=~amd64 ~arm hppa ~x86 LICENSE=MIT SLOT=0 SRC_URI=https://github.com/alanxz/rabbitmq-c/archive/v0.5.0.zip -> rabbitmq-c-v0.5.0.zip _eclasses_=cmake-utils da2974fcb060ec927e93a17c835afa67 eutils 32548a82e42dc26e3312581476d2f20c flag-o-matic 75e24bac8423c515dd9c5717f08feb83 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 -_md5_=5b71e95e8fc1c098bf85b2900e3285d4 +_md5_=6886bfbab882fd520acd6abffc1c12dc diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-343.13-r1 b/metadata/md5-cache/x11-drivers/nvidia-drivers-340.46 similarity index 82% rename from metadata/md5-cache/x11-drivers/nvidia-drivers-343.13-r1 rename to metadata/md5-cache/x11-drivers/nvidia-drivers-340.46 index d6aca7ed5944..d178997a9ce0 100644 --- a/metadata/md5-cache/x11-drivers/nvidia-drivers-343.13-r1 +++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-340.46 @@ -10,6 +10,6 @@ RDEPEND=app-admin/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) X? ( > REQUIRED_USE=tools? ( X ) RESTRICT=bindist mirror strip SLOT=0 -SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/343.13/NVIDIA-FreeBSD-x86_64-343.13.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/343.13/NVIDIA-Linux-x86_64-343.13.run ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/343.13/NVIDIA-FreeBSD-x86-343.13.tar.gz ) x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/343.13/NVIDIA-Linux-x86-343.13.run ) +SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/340.46/NVIDIA-FreeBSD-x86_64-340.46.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/340.46/NVIDIA-Linux-x86_64-340.46.run ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/340.46/NVIDIA-FreeBSD-x86-340.46.tar.gz ) x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/340.46/NVIDIA-Linux-x86-340.46.run ) _eclasses_=eutils 32548a82e42dc26e3312581476d2f20c flag-o-matic 75e24bac8423c515dd9c5717f08feb83 linux-info 2b8c53f6065bdee2d757472215a3088f linux-mod 101302d4b7b694ea9622bbffb187d0de multilib 3bf24e6abb9b76d9f6c20600f0b716bf nvidia-driver 800f567ff607d5d5171a8149456e294e portability a45c088f246ef5091e029f6285d7ce42 readme.gentoo 106edea5533517715013de909a333abd toolchain-funcs 0f1760274637a138b99bb649202ea402 udev da001465a2e939c93f7ae16947ce3438 unpacker f300a7ca9131b1024a79762e8edd3c52 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f -_md5_=a5fb583bd6cdcee82ec06b790287a019 +_md5_=5dce30943924aa97765181ad7368dc17 diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-343.22 b/metadata/md5-cache/x11-drivers/nvidia-drivers-343.22 deleted file mode 100644 index 83dd9da44973..000000000000 --- a/metadata/md5-cache/x11-drivers/nvidia-drivers-343.22 +++ /dev/null @@ -1,15 +0,0 @@ -DEFINED_PHASES=compile install postinst postrm preinst prepare prerm pretend setup unpack -DEPEND=app-admin/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) X? ( >=app-admin/eselect-opengl-1.0.9 ) app-arch/xz-utils kernel_linux? ( virtual/linux-sources ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) sys-apps/pciutils virtual/pkgconfig -DESCRIPTION=NVIDIA Accelerated Graphics Driver -EAPI=5 -HOMEPAGE=http://www.nvidia.com/ -IUSE=acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X uvm kernel_linux -KEYWORDS=-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd -LICENSE=GPL-2 NVIDIA-r2 -RDEPEND=app-admin/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) X? ( >=app-admin/eselect-opengl-1.0.9 ) acpi? ( sys-power/acpid ) tools? ( dev-libs/atk dev-libs/glib x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.4:2 x11-libs/libX11 x11-libs/libXext x11-libs/pango[X] ) X? ( =x11-libs/libvdpau-0.3-r1 multilib? ( || ( ( >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] ) app-emulation/emul-linux-x86-xlibs ) ) ) kernel_linux? ( virtual/modutils ) -REQUIRED_USE=tools? ( X ) -RESTRICT=bindist mirror strip -SLOT=0 -SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/343.22/NVIDIA-FreeBSD-x86_64-343.22.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/343.22/NVIDIA-Linux-x86_64-343.22.run ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/343.22/NVIDIA-FreeBSD-x86-343.22.tar.gz ) x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/343.22/NVIDIA-Linux-x86-343.22.run ) -_eclasses_=eutils 32548a82e42dc26e3312581476d2f20c flag-o-matic 75e24bac8423c515dd9c5717f08feb83 linux-info 2b8c53f6065bdee2d757472215a3088f linux-mod 101302d4b7b694ea9622bbffb187d0de multilib 3bf24e6abb9b76d9f6c20600f0b716bf nvidia-driver 800f567ff607d5d5171a8149456e294e portability a45c088f246ef5091e029f6285d7ce42 readme.gentoo 106edea5533517715013de909a333abd toolchain-funcs 0f1760274637a138b99bb649202ea402 udev da001465a2e939c93f7ae16947ce3438 unpacker f300a7ca9131b1024a79762e8edd3c52 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f -_md5_=b133a873636b7ad058f63662e8793cdd diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-343.22-r2 b/metadata/md5-cache/x11-drivers/nvidia-drivers-343.22-r2 index bcec00fca8a0..3bbae511212e 100644 --- a/metadata/md5-cache/x11-drivers/nvidia-drivers-343.22-r2 +++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-343.22-r2 @@ -4,7 +4,7 @@ DESCRIPTION=NVIDIA Accelerated Graphics Driver EAPI=5 HOMEPAGE=http://www.nvidia.com/ IUSE=acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X uvm kernel_linux -KEYWORDS=-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd +KEYWORDS=-* amd64 x86 ~amd64-fbsd ~x86-fbsd LICENSE=GPL-2 NVIDIA-r2 RDEPEND=app-admin/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) X? ( >=app-admin/eselect-opengl-1.0.9 ) acpi? ( sys-power/acpid ) tools? ( dev-libs/atk dev-libs/glib x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.4:2 x11-libs/libX11 x11-libs/libXext x11-libs/pango[X] ) X? ( =x11-libs/libvdpau-0.3-r1 multilib? ( || ( ( >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] ) app-emulation/emul-linux-x86-xlibs ) ) ) kernel_linux? ( virtual/modutils ) REQUIRED_USE=tools? ( X ) @@ -12,4 +12,4 @@ RESTRICT=bindist mirror strip SLOT=0 SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/343.22/NVIDIA-FreeBSD-x86_64-343.22.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/343.22/NVIDIA-Linux-x86_64-343.22.run ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/343.22/NVIDIA-FreeBSD-x86-343.22.tar.gz ) x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/343.22/NVIDIA-Linux-x86-343.22.run ) _eclasses_=eutils 32548a82e42dc26e3312581476d2f20c flag-o-matic 75e24bac8423c515dd9c5717f08feb83 linux-info 2b8c53f6065bdee2d757472215a3088f linux-mod 101302d4b7b694ea9622bbffb187d0de multilib 3bf24e6abb9b76d9f6c20600f0b716bf nvidia-driver 800f567ff607d5d5171a8149456e294e portability a45c088f246ef5091e029f6285d7ce42 readme.gentoo 106edea5533517715013de909a333abd toolchain-funcs 0f1760274637a138b99bb649202ea402 udev da001465a2e939c93f7ae16947ce3438 unpacker f300a7ca9131b1024a79762e8edd3c52 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f -_md5_=50d97434eb9d561c58a7b22d010067ee +_md5_=df2c78c437f1413fb23e6d0cbfd4f86e diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk index a2db1fc1ae06..0ce5edc8faa5 100644 --- a/metadata/news/timestamp.chk +++ b/metadata/news/timestamp.chk @@ -1 +1 @@ -Wed, 01 Oct 2014 08:37:08 +0000 +Wed, 01 Oct 2014 12:07:05 +0000 diff --git a/metadata/timestamp b/metadata/timestamp index cbb3093328cb..e7f5fbfcaf70 100644 --- a/metadata/timestamp +++ b/metadata/timestamp @@ -1 +1 @@ -Wed Oct 1 08:37:05 UTC 2014 +Wed Oct 1 12:07:02 UTC 2014 diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk index f35ef62e38fb..60e97f2587b7 100644 --- a/metadata/timestamp.chk +++ b/metadata/timestamp.chk @@ -1 +1 @@ -Wed, 01 Oct 2014 09:00:01 +0000 +Wed, 01 Oct 2014 12:30:01 +0000 diff --git a/metadata/timestamp.x b/metadata/timestamp.x index 15214f535c51..da94c0198ce6 100644 --- a/metadata/timestamp.x +++ b/metadata/timestamp.x @@ -1 +1 @@ -1412152501 Wed 01 Oct 2014 08:35:01 AM UTC UTC +1412165101 Wed 01 Oct 2014 12:05:01 PM UTC UTC diff --git a/net-analyzer/bwbar/Manifest b/net-analyzer/bwbar/Manifest index 47303630e2df..d9ab4bd216dc 100644 --- a/net-analyzer/bwbar/Manifest +++ b/net-analyzer/bwbar/Manifest @@ -1,2 +1 @@ DIST bwbar-1.2.3.tar.bz2 30202 SHA256 d82f8ba7defbdb9ae6671cbd7a064597a2a717ee6eeb32df6093403e8a86d1c1 SHA512 cb534f50007db6e39aa134d0d9a08ec6935c8a393f8dd5ab80f3c6ef94048821e065cd6c1be80657a2d6338fd16a73dcc0f89f5b15aba9e3bd38f0737a6d43c4 WHIRLPOOL acc5b09305f1d4f827bdf11098f23c8e3b2353343b83166b6168e9d39c5233acdd10fbfa9b302346f02c42073e0196dc8593bdfc03c25cabcc75264bf178e679 -DIST bwbar-1.2.3.tar.bz2 30202 SHA256 d82f8ba7defbdb9ae6671cbd7a064597a2a717ee6eeb32df6093403e8a86d1c1 SHA512 cb534f50007db6e39aa134d0d9a08ec6935c8a393f8dd5ab80f3c6ef94048821e065cd6c1be80657a2d6338fd16a73dcc0f89f5b15aba9e3bd38f0737a6d43c4 WHIRLPOOL acc5b09305f1d4f827bdf11098f23c8e3b2353343b83166b6168e9d39c5233acdd10fbfa9b302346f02c42073e0196dc8593bdfc03c25cabcc75264bf178e679 diff --git a/net-analyzer/ettercap/Manifest b/net-analyzer/ettercap/Manifest index adaec45ee038..60bf50090eec 100644 --- a/net-analyzer/ettercap/Manifest +++ b/net-analyzer/ettercap/Manifest @@ -1,2 +1 @@ DIST ettercap-0.8.0.tar.gz 7069131 SHA256 8013e2bbfc69af2939d8a40e6b31de5016fe75401e4b73207a0a8ac9053ac9bc SHA512 6d32b229378af5aea1dc82537f84a36c557021a01ccf40f228e69f6e39baa3f3becbb6138417bcad2951811d9ea57e89f960f7bb132fc09502e0b08f7a4ca813 WHIRLPOOL 87fc8ffbfa8ebe67b382888b2b9e5aa5ef9059bc5c46c52628e13f62bb4f519362834d865ec4e51ed5b3db7de5832dc0756a708768dc040dd6aa0264db2f474b -DIST ettercap-0.8.0.tar.gz 7069131 SHA256 8013e2bbfc69af2939d8a40e6b31de5016fe75401e4b73207a0a8ac9053ac9bc SHA5 \ No newline at end of file diff --git a/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-syslog.patch b/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-syslog.patch index 23e03e6af2e6..cb17471072bc 100644 --- a/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-syslog.patch +++ b/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-syslog.patch @@ -30,17 +30,18 @@ @@ -183,7 +183,7 @@ } - if (fterr_flags & FTERR_SYSLO--- a/lib/fterr.c -+++ b/lib/fterr.c -@@ -112,7 +112,7 @@ - fprintf(((fterr_file) ? fterr_file : stderr), "%s\n", buf2); - if (fterr_flags & FTERR_SYSLOG) - syslog(LOG_INFO, buf); + syslog(LOG_INFO, "%s", buf); - } /* fterr_info */ + } /* fterr_warnx */ -@@ -134,7 +134,7 @@ +@@ -205,7 +205,7 @@ + + if (fterr_flags & FTERR_SYSLOG) { + snprintf(buf2, 1024, "%s: %s", buf, strerror(errno)); +- syslog(LOG_INFO, buf2); ++ syslog(LOG_INFO, "%s", buf2); + } - if (fterr_flags & FTERR_SYSLO \ No newline at end of file + } /* fterr_warn */ diff --git a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r4.ebuild b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r4.ebuild index c39521466ada..3a6de28f5df3 100644 --- a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r4.ebuild +++ b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r4.ebuild @@ -57,9 +57,16 @@ src_install() { newinitd "${FILESDIR}/flowcapture.initd" flowcapture newconfd "${FILESDIR}/flowcapture.confd" flowcapture -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/flow-tools-0.68.5.1-r4.ebuild,v 1.1 2014/08/23 09:35:02 jer Exp $ -EAPI=5 -inherit eutils use \ No newline at end of file + fowners flows:flows /var/lib/flows + fowners flows:flows /var/lib/flows/bin + fowners flows:flows /var/lib/flows/ft + + fperms 0755 /var/lib/flows + fperms 0755 /var/lib/flows/bin +} + +pkg_preinst() { + enewgroup flows + enewuser flows -1 -1 /var/lib/flows flows +} diff --git a/net-analyzer/fwlogwatch/fwlogwatch-1.4.ebuild b/net-analyzer/fwlogwatch/fwlogwatch-1.4.ebuild index f3964040aa6c..bdde33bd3c89 100644 --- a/net-analyzer/fwlogwatch/fwlogwatch-1.4.ebuild +++ b/net-analyzer/fwlogwatch/fwlogwatch-1.4.ebuild @@ -24,32 +24,6 @@ DEPEND=" nls? ( sys-devel/gettext ) " -src_prepare(# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fwlogwatch/fwlogwatch-1.4.ebuild,v 1.4 2014/08/30 12:04:23 nimiux Exp $ - -EAPI=5 - -inherit eutils flag-o-matic toolchain-funcs - -DESCRIPTION="A packet filter and firewall log analyzer" -HOMEPAGE="http://fwlogwatch.inside-security.de/" -SRC_URI="${HOMEPAGE}sw/${P}.tar.bz2" - -KEYWORDS="amd64 ~ppc ~sparc x86" -LICENSE="GPL-1" -SLOT="0" -IUSE="nls zlib" - -RDEPEND=" - zlib? ( sys-libs/zlib ) -" -DEPEND=" - ${RDEPEND} - sys-devel/flex - nls? ( sys-devel/gettext ) -" - src_prepare() { if use nls; then strip-linguas -i po/ @@ -76,3 +50,38 @@ src_configure() { sed -i Makefile -e '/^LIBS/ s|-lz||g' || die else append-cflags -DHAVE_ZLIB + fi + + use nls && append-cflags -DHAVE_GETTEXT +} + +src_compile() { + emake \ + CC=$(tc-getCC) \ + CFLAGS="${CFLAGS}" \ + LDFLAGS="${LDFLAGS}" + use nls && emake -C po +} + +src_install() { + emake \ + LOCALE_DIR="${D}/usr" INSTALL_DIR="${D}/usr" \ + install + use nls && emake \ + LOCALE_DIR="${D}/usr" INSTALL_DIR="${D}/usr" \ + install-i18n + + dosbin contrib/fwlw_notify + dosbin contrib/fwlw_respond + + dodoc AUTHORS ChangeLog CREDITS README + + insinto /usr/share/fwlogwatch/contrib + + doins contrib/fwlogsummary.cgi + doins contrib/fwlogsummary_small.cgi + doins contrib/fwlogwatch.php + + insinto /etc + doins fwlogwatch.config +} diff --git a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-5.0.3-run.patch b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-5.0.3-run.patch new file mode 100644 index 000000000000..ec5ee92fd73b --- /dev/null +++ b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-5.0.3-run.patch @@ -0,0 +1,16 @@ + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 67cf344..c15f785 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -272,7 +272,7 @@ endif (NOT DATADIR) + + set (OPENVAS_STATE_DIR "${LOCALSTATEDIR}/lib/openvas") + set (OPENVAS_LOG_DIR "${LOCALSTATEDIR}/log/openvas") +-set (GSAD_PID_DIR "${LOCALSTATEDIR}/run") ++set (GSAD_PID_DIR "/run") + set (GSA_DATA_DIR "${DATADIR}/openvas/gsa") + + # TODO: Eventually use own certificates diff --git a/net-analyzer/greenbone-security-assistant/files/gsad-daemon.conf b/net-analyzer/greenbone-security-assistant/files/gsad-daemon.conf new file mode 100644 index 000000000000..0de530635122 --- /dev/null +++ b/net-analyzer/greenbone-security-assistant/files/gsad-daemon.conf @@ -0,0 +1,14 @@ +#Listen on given address - by default assistant listens on all addresses +# ASSISTANT_LISTEN=--listen=127.0.0.1 + +#Listen on given port - by default 9391 +#ASSISTANT_PORT=--port=9392 + +#Contact manager on given address +#MANAGER_LISTEN=--mlisten=127.0.0.1 + +#Manager listens on given port - by default 9390 +#MANAGER_PORT=--mport=9390 + +# Additional arguments +# ASSISTANT_EXTRA_ARGS="" diff --git a/net-analyzer/greenbone-security-assistant/files/gsad.init b/net-analyzer/greenbone-security-assistant/files/gsad.init new file mode 100644 index 000000000000..dbc26c597ce9 --- /dev/null +++ b/net-analyzer/greenbone-security-assistant/files/gsad.init @@ -0,0 +1,14 @@ +#!/sbin/runscript +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/greenbone-security-assistant/files/gsad.init,v 1.2 2014/10/01 11:13:53 jlec Exp $ + +name="Greenbone Security Assistant Daemon" +command="/usr/sbin/gsad" +command_args="${ASSISTANT_LISTEN} ${ASSISTANT_PORT} ${MANAGER_LISTEN} ${MANAGER_PORT} ${ASSISTANT_EXTRA_ARGS}" +pidfile="/run/gsad.pid" + +depend() { + after bootmisc + need localmount net openvasmd +} diff --git a/net-analyzer/greenbone-security-assistant/files/gsad.logrotate b/net-analyzer/greenbone-security-assistant/files/gsad.logrotate new file mode 100644 index 000000000000..f0948cbea1f5 --- /dev/null +++ b/net-analyzer/greenbone-security-assistant/files/gsad.logrotate @@ -0,0 +1,11 @@ +# logrotate for openvas +/var/log/openvas/gsad.log { + rotate 4 + weekly + compress + delaycompress + missingok + postrotate + /bin/kill -HUP `pidof gsad` + endscript +} diff --git a/net-analyzer/greenbone-security-assistant/files/gsad.service b/net-analyzer/greenbone-security-assistant/files/gsad.service new file mode 100644 index 000000000000..8825f52f0949 --- /dev/null +++ b/net-analyzer/greenbone-security-assistant/files/gsad.service @@ -0,0 +1,16 @@ +[Unit] +Description=Greenbone Security Assistant Daemon +After=network.target +Before=openvasmd.service + +[Service] +EnvironmentFile=-/etc/openvas/gsad-daemon.conf +ExecStart=/usr/sbin/gsad -f ${ASSISTANT_LISTEN} ${ASSISTANT_PORT} ${MANAGER_LISTEN} ${MANAGER_PORT} ${ASSISTANT_EXTRA_ARGS} +Restart=always +RestartSec=1 +User=root +Group=root +TimeoutSec=1200 + +[Install] +WantedBy=multi-user.target diff --git a/net-analyzer/greenbone-security-assistant/files/gsad.tmpfiles.d b/net-analyzer/greenbone-security-assistant/files/gsad.tmpfiles.d new file mode 100644 index 000000000000..18e820caec1b --- /dev/null +++ b/net-analyzer/greenbone-security-assistant/files/gsad.tmpfiles.d @@ -0,0 +1 @@ +d /var/cache/openvassd 0775 diff --git a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-5.0.3-r1.ebuild b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-5.0.3-r1.ebuild new file mode 100644 index 000000000000..4cbff6cfa8e5 --- /dev/null +++ b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-5.0.3-r1.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-5.0.3-r1.ebuild,v 1.1 2014/10/01 09:33:11 jlec Exp $ + +EAPI=5 + +inherit cmake-utils systemd + +MY_PN=gsad + +DESCRIPTION="Greenbone Security Assistant for openvas" +HOMEPAGE="http://www.openvas.org/" +SRC_URI="http://wald.intevation.org/frs/download.php/1734/${P}.tar.gz" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +RDEPEND=" + >=net-analyzer/openvas-libraries-7.0.4 + dev-libs/libxslt + net-libs/libmicrohttpd[messages]" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-run.patch + ) + +src_prepare() { + sed \ + -e '/^install.*OPENVAS_CACHE_DIR.*/d' \ + -i CMakeLists.txt || die + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + "-DLOCALSTATEDIR=${EPREFIX}/var" + "-DSYSCONFDIR=${EPREFIX}/etc" + ) + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN} + + insinto /etc/openvas + doins "${FILESDIR}"/${MY_PN}-daemon.conf + dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${PN} + + insinto /etc/logrotate.d + doins "${FILESDIR}"/${MY_PN}.logrotate + + systemd_newtmpfilesd "${FILESDIR}"/${MY_PN}.tmpfiles.d ${MY_PN}.conf + systemd_dounit "${FILESDIR}"/${MY_PN}.service +} + +pkg_postinst() { + elog "To use ${MY_PN}, you first need to:" + elog "1. Call 'openvas-nvt-sync' to download/update plugins" + elog "2. Call 'openvas-mkcert' to generate a server certificate" +} diff --git a/net-analyzer/lilac/Manifest b/net-analyzer/lilac/Manifest index aefbb2fb918e..ff375822c400 100644 --- a/net-analyzer/lilac/Manifest +++ b/net-analyzer/lilac/Manifest @@ -1,2 +1 @@ DIST lilac-1.0.3.tar.gz 1794493 SHA256 af684cf91fd850705837ee95e3a222c56fc71fd4ab5165e08b98a5fb913d13fa SHA512 bee9ddb7f4adc2199ee804db2d5758bb172f7f18a868206774d54d2ad7b9741a16152dbdd8c8c7cd82e6375428c9d0466bd38e3affdab55bcb574914f0fb813c WHIRLPOOL 3d01715ad25cf07688d19f190480791c73224e7c311f14a79204a1cbedd6808def6a4bcb6cf51dd597e8cc00ef5811db925a379c8fbfc13fecce2b9af35c7b39 -DIST lilac-1.0.3.tar.gz 1794493 SHA256 af684cf91fd850705837ee95e3a222c56fc71fd4ab5165e08b98a5fb913d13fa SHA512 bee9ddb7f4adc2199ee804db2d5758bb172f7f18a868206774d54d2ad7b9741a16152dbdd8c8c7cd82e6375428c9d0466bd38e3affdab55bcb574914f0fb813c WHIRLPOOL 3d01715ad25cf07688d19f190480791c73224e7c311f14a79204a1cbedd6808def6a4bcb6cf51dd597e8cc00ef5811db925a379c8fbfc13fecce2b9af35c7b39 diff --git a/net-analyzer/linkchecker/linkchecker-7.9.ebuild b/net-analyzer/linkchecker/linkchecker-7.9.ebuild index cc7d0475d757..664df9a116ed 100644 --- a/net-analyzer/linkchecker/linkchecker-7.9.ebuild +++ b/net-analyzer/linkchecker/linkchecker-7.9.ebuild @@ -71,6 +71,12 @@ src_install() { delete_gui() { rm -rf \ "${ED}"/usr/bin/linkchecker-gui* \ - "${ED}"/$(python_get_sitedir)/l# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/linkchecker \ No newline at end of file + "${ED}"/$(python_get_sitedir)/linkcheck/gui* || die + } + python_execute_function -q delete_gui + fi + if use doc; then + dohtml doc/html/* + fi + use bash-completion && dobashcomp config/linkchecker-completion +} diff --git a/net-analyzer/linkchecker/linkchecker-9.2.ebuild b/net-analyzer/linkchecker/linkchecker-9.2.ebuild index 2a99e83f8bd4..20eb641d8ed0 100644 --- a/net-analyzer/linkchecker/linkchecker-9.2.ebuild +++ b/net-analyzer/linkchecker/linkchecker-9.2.ebuild @@ -69,5 +69,6 @@ python_install_all() { } python_foreach_impl delete_gui fi - # Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU Gene \ No newline at end of file + dohtml doc/html/* + use bash-completion && dobashcomp config/linkchecker-completion +} diff --git a/net-analyzer/mate-netspeed/Manifest b/net-analyzer/mate-netspeed/Manifest index 976fafc8f5d3..bd57761def36 100644 --- a/net-analyzer/mate-netspeed/Manifest +++ b/net-analyzer/mate-netspeed/Manifest @@ -1,4 +1,2 @@ DIST mate-netspeed-1.6.1.tar.xz 561872 SHA256 a7bf106612d4ee87afc32cce4eb76539dcdc4afbede0feb5461f833236a64671 SHA512 36c11daa36c2fe7764295a3dca2b112836cd88868dd475ab52dfa8ae6d78cfeaac516e163d603ad3f9d2e6e8d6565c9979ab40816259ef439cfedaa604e2d04e WHIRLPOOL 2b6c6a9aba80411a89763be2e413de4483525e0b8f2781d1a9b5b2addfabe49a414d0d5a0ba3ed4261dc1347fd3b451282da48fb30f616e19f6f577cc6d7f48e DIST mate-netspeed-1.8.0.tar.xz 567724 SHA256 991be6016800ed4b7db35b5157f176fee033e376a9480a94ef5f5fce63c1759f SHA512 e957fd3d63e87ddf3e9eb51c595611208d81ccbd4b7281814518ae36f016fe80931cfb62df62731a0dce7102e25c4d48427f45787bacc7f8018a8682725c7a8b WHIRLPOOL 50f32654520c7090d8b66cd64519bf83bd4c281f996ecbccac8a271fb715242b5a6c895f0d4156b7e23cd512a384a415a4fce05926f69d17ffe38405711094f4 -DIST mate-netspeed-1.6.1.tar.xz 561872 SHA256 a7bf106612d4ee87afc32cce4eb76539dcdc4afbede0feb5461f833236a64671 SHA512 36c11daa36c2fe7764295a3dca2b112836cd88868dd475ab52dfa8ae6d78cfeaac516e163d603ad3f9d2e6e8d6565c9979ab40816259ef439cfedaa604e2d04e WHIRLPOOL 2b6c6a9aba80411a89763be2e413de4483525e0b8f2781d1a9b5b2addfabe49a414d0d5a0ba3ed4261dc1347fd3b451282da48fb30f616e19f6f577cc6d7f48e -DIST mate-netspeed-1.8.0.tar.xz 567724 SHA256 991be6016800e \ No newline at end of file diff --git a/net-analyzer/mrtg-ping-probe/Manifest b/net-analyzer/mrtg-ping-probe/Manifest index 2961fbe1a0ad..53203f13b6ab 100644 --- a/net-analyzer/mrtg-ping-probe/Manifest +++ b/net-analyzer/mrtg-ping-probe/Manifest @@ -1,2 +1 @@ DIST mrtg-ping-probe-2.2.0.tar.gz 36923 SHA256 2708459c1beb5ab482fa28ff62720f6a2d5707475d40e53a2829927572c96a0e SHA512 efc86ed732547359d8b2d94da367946d8b573e2b4d1b3d240b8eb7c5bfff17971848ad62c1448cdc0305393193d969361328448d9c9b25ae54866f71614b7cea WHIRLPOOL 22efb23198783551bdd65d5f23a5311958865440f78927743509555a5e44b157ed90b55ddfe6e334c02c2938d7b667144e126113eb3d52a610b25746e83f0335 -DIST mrtg-ping-probe-2.2.0.tar.gz 36923 SHA256 2708459c1beb5ab482fa28ff62720f6a2d5707475d40e53a2829927572c96a0e SHA512 efc86ed732547359d8b2d94da367946d8b573e2b4d1b3d240b8eb7c5bfff17971848ad62c1448cdc0305393193d969361328448d9c9b25ae54866f71614b7cea WHIRLPOOL 22efb23198783551bdd65d5f23a5311958865440f78927743509555a5e44b157ed90b55ddfe6e334c02c2938d7b667144e126113eb3d52a610b25746e83f0335 diff --git a/net-analyzer/nagios-check_openvpn-simple/Manifest b/net-analyzer/nagios-check_openvpn-simple/Manifest index 15e571ced447..7766d1544be2 100644 --- a/net-analyzer/nagios-check_openvpn-simple/Manifest +++ b/net-analyzer/nagios-check_openvpn-simple/Manifest @@ -1,2 +1 @@ DIST check_openvpn-simple-0.0.1.tar.gz 13597 SHA256 f761c7e5c4673b62ef50bb67be61efe178791fc5aa54c62695c5fee7f4a50fae SHA512 186575e4de4fd5f27f9701b5e5a56d8b6eae454bfefd8b13e6cbcee9da795833a567fc7a4fc5331a1498f6c0428599f0ec895acecb410e95e37ed43df58abc8f WHIRLPOOL 8441b69f83526bbda730d61a26fe3ce62bb70963ce5220c77c60e19c5772adb3508ba73f768b02e5640b8e8e1e42c5a1c70b6bdbb14d18417c406bb5d885deba -DIST check_openvpn-simple-0.0.1.tar.gz 13597 SHA256 f761c7e5c4673b62ef50bb67be61efe178791fc5aa54c62695c5fee7f4a50fae SHA512 186575e4de4fd5f27f9701b5e5a56d8b6eae454bfefd8b13e6cbcee9da795833a567fc7a4fc5331a1498f6c0428599f0ec895acecb410e95e37ed43df58abc8f WHIRLPOOL 8441b69f83526bbda730d61a26fe3ce62bb70963ce5220c77c60e19c5772adb3508ba73f768b02e5640b8e8e1e42c5a1c70b6bdbb14d18417c406bb5d885deba diff --git a/net-analyzer/nagios-sap-ccms-plugin/Manifest b/net-analyzer/nagios-sap-ccms-plugin/Manifest index 96f785433c14..f0259271ba74 100644 --- a/net-analyzer/nagios-sap-ccms-plugin/Manifest +++ b/net-analyzer/nagios-sap-ccms-plugin/Manifest @@ -1,4 +1,2 @@ DIST sap-ccms-plugin-0.7.3.tar.gz 2948020 SHA256 ce3831bc8156f5fafe8fb4366bd9d4b2df4c85d55c92d4b38c41f10f701206eb DIST sap-ccms-plugin-0.8.tar.bz2 10143558 SHA256 6af24e4ac2f3dddc435394e49f491a32c1c1c447025479190e710f1132a708ee -DIST sap-ccms-plugin-0.7.3.tar.gz 2948020 SHA256 ce3831bc8156f5fafe8fb4366bd9d4b2df4c85d55c92d4b38c41f10f701206eb -DIST sap-ccms-plugin-0.8.tar.bz2 10143558 SHA256 6af24e4ac2f3dddc435394e49f491a32c1c1c447025479190e710f1132a708ee diff --git a/net-analyzer/nagvis/nagvis-1.6.6.ebuild b/net-analyzer/nagvis/nagvis-1.6.6.ebuild index a6e435a23791..2564e00396af 100644 --- a/net-analyzer/nagvis/nagvis-1.6.6.ebuild +++ b/net-analyzer/nagvis/nagvis-1.6.6.ebuild @@ -25,35 +25,6 @@ RDEPEND="|| ( net-analyzer/nagios net-analyzer/icinga ) need_php_httpd want_apache2 -pkg_setup() { - confutils_require_built_with_all dev-lang/php gd nls json session pdo sqlite3 sockets mysql unicode xml - depe# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagvis/nagvis-1.6.6.ebuild,v 1.4 2014/08/10 20:58:48 slyfox Exp $ - -EAPI=4 - -inherit eutils confutils depend.php depend.apache - -DESCRIPTION="NagVis is a visualization addon for the well known network managment system Nagios" -HOMEPAGE="http://www.nagvis.org/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="apache2 automap" - -DEPEND="" -RDEPEND="|| ( net-analyzer/nagios net-analyzer/icinga ) - automap? ( >=media-gfx/graphviz-2.14 ) - apache2? ( dev-lang/php[apache2] ) - net-analyzer/mk-livestatus - dev-lang/php[gd,nls,json,session,pdo,sqlite,sockets,mysql,unicode,xml]" - -need_php_httpd -want_apache2 - pkg_setup() { confutils_require_built_with_all dev-lang/php gd nls json session pdo sqlite3 sockets mysql unicode xml depend.apache_pkg_setup @@ -92,4 +63,30 @@ src_install() { dosym /etc/nagvis /usr/share/nagvis/etc diropts -o apache -g root -m0775 - insopts -o apache -g roo \ No newline at end of file + insopts -o apache -g root -m0664 + doins -r etc/maps + diropts + insopts + + # move image maps dir from usr to var and symlink it back + dodir /var/nagvis/userfiles/images + mv "${D}"/usr/share/nagvis/userfiles/images/maps "${D}"/var/nagvis/userfiles/images/ ||die + fowners apache:root /var/nagvis/userfiles/images/maps + dosym /var/nagvis/userfiles/images/maps /usr/share/nagvis/userfiles/images/maps +} + +pkg_postinst() { + elog "Before running NagVis for the first time, you will need to set up" + elog "/etc/nagvis/nagvis.ini.php" + elog "A sample is in" + elog "/etc/nagvis/nagvis.ini.php-sample" + if use apache2 ; then + elog + elog "For web interface make sure to add -D NAGVIS to APACHE2_OPTS in" + elog "/etc/conf.d/apache2 and to restart apache2. A default configuration" + elog "has been placed at /etc/apache2/modules.d/98_${PN}.conf" + fi + elog "" + elog "Default user/password are: nagiosadmin/nagiosadmin" + elog " guest/guest" +} diff --git a/net-analyzer/neti/neti-2.0.ebuild b/net-analyzer/neti/neti-2.0.ebuild index 7de8ffa056d3..1da55493ca7d 100644 --- a/net-analyzer/neti/neti-2.0.ebuild +++ b/net-analyzer/neti/neti-2.0.ebuild @@ -44,5 +44,6 @@ src_install() { fperms ugo+x /usr/bin/NETIMap fi - dodoc README A# Copyright 1999-2009 Gentoo Foundation -# Distrib \ No newline at end of file + dodoc README AUTHORS + newinitd "${FILESDIR}"/neti-init2 neti +} diff --git a/net-analyzer/netperf/netperf-2.6.0-r1.ebuild b/net-analyzer/netperf/netperf-2.6.0-r1.ebuild index 290c6a406a50..b18ed5b6d38a 100644 --- a/net-analyzer/netperf/netperf-2.6.0-r1.ebuild +++ b/net-analyzer/netperf/netperf-2.6.0-r1.ebuild @@ -55,6 +55,9 @@ src_install () { newinitd "${FILESDIR}"/${PN}-2.2-init netperf newconfd "${FILESDIR}"/${PN}-2.2-conf netperf - # documentation and example scr# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/netperf-2.6.0-r1.ebuild,v 1.10 2014/09/14 07:28 \ No newline at end of file + # documentation and example scripts + dodoc AUTHORS ChangeLog NEWS README Release_Notes + dodir /usr/share/doc/${PF}/examples + #Scripts no longer get installed by einstall + cp doc/examples/*_script "${D}"/usr/share/doc/${PF}/examples || die +} diff --git a/net-analyzer/openvas-cli/openvas-cli-1.3.0-r1.ebuild b/net-analyzer/openvas-cli/openvas-cli-1.3.0-r1.ebuild new file mode 100644 index 000000000000..e29568f1bad8 --- /dev/null +++ b/net-analyzer/openvas-cli/openvas-cli-1.3.0-r1.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-cli/openvas-cli-1.3.0-r1.ebuild,v 1.1 2014/10/01 11:30:13 jlec Exp $ + +EAPI=5 + +inherit cmake-utils + +DESCRIPTION="A remote security scanner for Linux (openvas-cli)" +HOMEPAGE="http://www.openvas.org/" +SRC_URI="http://wald.intevation.org/frs/download.php/1633/${P}.tar.gz" +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~arm ~ppc ~x86" +IUSE="" + +RDEPEND=" + >=net-analyzer/openvas-libraries-7.0.2 + !net-analyzer/openvas-client" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +src_configure() { + local mycmakeargs=( + -DLOCALSTATEDIR="${EPREFIX}"/var + -DSYSCONFDIR="${EPREFIX}"/etc + ) + cmake-utils_src_configure +} diff --git a/net-analyzer/openvas-manager/files/openvas-manager-5.0.4-run.patch b/net-analyzer/openvas-manager/files/openvas-manager-5.0.4-run.patch new file mode 100644 index 000000000000..f6ff60a3b1de --- /dev/null +++ b/net-analyzer/openvas-manager/files/openvas-manager-5.0.4-run.patch @@ -0,0 +1,16 @@ + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 80f5bd2..33f0562 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -161,7 +161,7 @@ endif (NOT INCLUDEDIR) + set (OPENVAS_DATA_DIR "${DATADIR}/openvas") + set (OPENVAS_STATE_DIR "${LOCALSTATEDIR}/lib/openvas") + set (OPENVAS_LOG_DIR "${LOCALSTATEDIR}/log/openvas") +-set (OPENVAS_PID_DIR "${LOCALSTATEDIR}/run") ++set (OPENVAS_PID_DIR "/run") + set (OPENVAS_SYSCONF_DIR "${SYSCONFDIR}/openvas") + set (OPENVAS_SCAP_RES_DIR "${OPENVAS_DATA_DIR}/scap") + set (OPENVAS_SCAP_DATA_DIR "${OPENVAS_STATE_DIR}/scap-data") diff --git a/net-analyzer/openvas-manager/files/openvasmd-daemon.conf b/net-analyzer/openvas-manager/files/openvasmd-daemon.conf index d294159b017f..d69698eecbb9 100644 --- a/net-analyzer/openvas-manager/files/openvasmd-daemon.conf +++ b/net-analyzer/openvas-manager/files/openvasmd-daemon.conf @@ -4,8 +4,7 @@ #Manager listens on given port - by default 9390 MANAGER_PORT=--port=9390 -#Enable Manager to server OTP too -MANAGER_OTP=--otp +MANAGER_EXTRA_ARGS="" #Contact scanner on given address SCANNER_LISTEN=--slisten=127.0.0.1 diff --git a/net-analyzer/openvas-manager/files/openvasmd.init b/net-analyzer/openvas-manager/files/openvasmd.init index 55c6c375d2ef..eb315e8d9e0c 100644 --- a/net-analyzer/openvas-manager/files/openvasmd.init +++ b/net-analyzer/openvas-manager/files/openvasmd.init @@ -5,8 +5,14 @@ name="OpenVAS Manager" command=/usr/sbin/openvasmd -command_args="${MANAGER_LISTEN} ${MANAGER_PORT} ${SCANNER_LISTEN} ${SCANNER_PORT} ${MANAGER_OTP}" +command_args="${MANAGER_LISTEN} ${MANAGER_PORT} ${SCANNER_LISTEN} ${SCANNER_PORT} ${MANAGER_EXTRA_ARGS}" +pidfile="/run/openvasmd.pid" depend() { - need net openvassd + after bootmisc + need localmount net openvassd +} + +start_pre() { + checkpath --directory --mode 0775 --quiet /var/cache/openvas } diff --git a/net-analyzer/openvas-manager/files/openvasmd.service b/net-analyzer/openvas-manager/files/openvasmd.service index f9b160a0d7d5..91edb0087bc4 100644 --- a/net-analyzer/openvas-manager/files/openvasmd.service +++ b/net-analyzer/openvas-manager/files/openvasmd.service @@ -5,7 +5,7 @@ After=openvassd.service [Service] EnvironmentFile=-/etc/openvas/openvasmd.conf -ExecStart=/usr/sbin/openvasmd -f $MANAGER_LISTEN $MANAGER_PORT $SCANNER_LISTEN $SCANNER_PORT $MANAGER_OTP +ExecStart=/usr/sbin/openvasmd -f ${MANAGER_LISTEN} ${MANAGER_PORT} ${SCANNER_LISTEN} ${SCANNER_PORT} ${MANAGER_EXTRA_ARGS} Restart=always RestartSec=1 User=root diff --git a/net-analyzer/openvas-manager/openvas-manager-5.0.4-r1.ebuild b/net-analyzer/openvas-manager/openvas-manager-5.0.4-r1.ebuild new file mode 100644 index 000000000000..962da6cc5d4f --- /dev/null +++ b/net-analyzer/openvas-manager/openvas-manager-5.0.4-r1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-manager/openvas-manager-5.0.4-r1.ebuild,v 1.1 2014/10/01 10:58:58 jlec Exp $ + +EAPI=5 + +inherit cmake-utils systemd + +MY_PN=openvasmd + +DESCRIPTION="A remote security scanner for Linux (openvas-manager)" +HOMEPAGE="http://www.openvas.org/" +SRC_URI="http://wald.intevation.org/frs/download.php/1730/${P}.tar.gz" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~arm ~ppc ~x86" +IUSE="" + +RDEPEND=" + >=net-analyzer/openvas-libraries-7.0.4 + >=dev-db/sqlite-3 + !net-analyzer/openvas-administrator" +DEPEND="${RDEPEND} + virtual/pkgconfig + dev-util/cmake" + +PATCHES=( + "${FILESDIR}"/${P}-gpgerror.patch + "${FILESDIR}"/${P}-bsdsource.patch + "${FILESDIR}"/${P}-run.patch + ) + +src_prepare() { + sed \ + -e '/^install.*OPENVAS_CACHE_DIR.*/d' \ + -i CMakeLists.txt || die + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DLOCALSTATEDIR="${EPREFIX}/var" + -DSYSCONFDIR="${EPREFIX}/etc" + ) + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + + insinto /etc/openvas/ + doins "${FILESDIR}"/${MY_PN}-daemon.conf + dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${PN} + + insinto /etc/logrotate.d + newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN} + + newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN} + systemd_dounit "${FILESDIR}"/${MY_PN}.service +} diff --git a/net-analyzer/openvas-manager/openvas-manager-5.0.4-r2.ebuild b/net-analyzer/openvas-manager/openvas-manager-5.0.4-r2.ebuild new file mode 100644 index 000000000000..f1b4e0ca5b30 --- /dev/null +++ b/net-analyzer/openvas-manager/openvas-manager-5.0.4-r2.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-manager/openvas-manager-5.0.4-r2.ebuild,v 1.1 2014/10/01 11:12:44 jlec Exp $ + +EAPI=5 + +inherit cmake-utils systemd + +MY_PN=openvasmd + +DESCRIPTION="A remote security scanner for Linux (openvas-manager)" +HOMEPAGE="http://www.openvas.org/" +SRC_URI="http://wald.intevation.org/frs/download.php/1730/${P}.tar.gz" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~arm ~ppc ~x86" +IUSE="" + +RDEPEND=" + >=net-analyzer/openvas-libraries-7.0.4 + >=dev-db/sqlite-3 + !net-analyzer/openvas-administrator" +DEPEND="${RDEPEND} + virtual/pkgconfig + dev-util/cmake" + +PATCHES=( + "${FILESDIR}"/${P}-gpgerror.patch + "${FILESDIR}"/${P}-bsdsource.patch + "${FILESDIR}"/${P}-run.patch + ) + +src_prepare() { + sed \ + -e '/^install.*OPENVAS_CACHE_DIR.*/d' \ + -i CMakeLists.txt || die + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DLOCALSTATEDIR="${EPREFIX}/var" + -DSYSCONFDIR="${EPREFIX}/etc" + ) + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + + insinto /etc/openvas/ + doins "${FILESDIR}"/${MY_PN}-daemon.conf + dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${PN} + + insinto /etc/logrotate.d + newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN} + + newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN} + systemd_dounit "${FILESDIR}"/${MY_PN}.service +} diff --git a/net-analyzer/openvas-scanner/openvas-scanner-4.0.3-r2.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-4.0.3-r2.ebuild index 5b013ba00994..0827b1a73bd6 100644 --- a/net-analyzer/openvas-scanner/openvas-scanner-4.0.3-r2.ebuild +++ b/net-analyzer/openvas-scanner/openvas-scanner-4.0.3-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-scanner/openvas-scanner-4.0.3-r2.ebuild,v 1.1 2014/09/30 16:03:10 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-scanner/openvas-scanner-4.0.3-r2.ebuild,v 1.2 2014/10/01 11:02:39 jlec Exp $ EAPI=5 @@ -22,8 +22,7 @@ RDEPEND=" !net-analyzer/openvas-plugins !net-analyzer/openvas-server" DEPEND="${RDEPEND} - virtual/pkgconfig - dev-util/cmake" + virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${P}-bsdsource.patch @@ -40,7 +39,10 @@ src_prepare() { } src_configure() { - local mycmakeargs=( -DLOCALSTATEDIR=/var -DSYSCONFDIR=/etc ) + local mycmakeargs=( + "-DLOCALSTATEDIR=${EPREFIX}/var" + "-DSYSCONFDIR=${EPREFIX}/etc" + ) cmake-utils_src_configure } diff --git a/net-analyzer/openvas-tools/Manifest b/net-analyzer/openvas-tools/Manifest new file mode 100644 index 000000000000..15c1a6ab248c --- /dev/null +++ b/net-analyzer/openvas-tools/Manifest @@ -0,0 +1 @@ +DIST openvas-tools-0_pre20512.tar.xz 46100 SHA256 78557005110b22e617b3ce82b73b934f743558cdd9247f0fd5bdbcfd7b9f4a09 SHA512 ab524c18a9c9cbfbc742d19c55c7eacc99c39d9209d3f915a6e0070c662f9761cc55b1166dfb48cdaab2607a07ea0640ff9f0a3d48a364409e516a3142f96cbb WHIRLPOOL 35130567b3060823ea2c1a6c1323f5b77e5446eaa7b62cabfe1068d14bec66d647cef2ea5d98cf5fa483e242f4aca84179d41f5ff2b5c729cc9fa7634018e8a6 diff --git a/net-analyzer/openvas-tools/metadata.xml b/net-analyzer/openvas-tools/metadata.xml new file mode 100644 index 000000000000..4a00a64b40ae --- /dev/null +++ b/net-analyzer/openvas-tools/metadata.xml @@ -0,0 +1,7 @@ + + + + + jlec@gentoo.org + + diff --git a/net-analyzer/openvas-tools/openvas-tools-0_pre20512.ebuild b/net-analyzer/openvas-tools/openvas-tools-0_pre20512.ebuild new file mode 100644 index 000000000000..65e13cd4c796 --- /dev/null +++ b/net-analyzer/openvas-tools/openvas-tools-0_pre20512.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-tools/openvas-tools-0_pre20512.ebuild,v 1.1 2014/10/01 11:24:01 jlec Exp $ + +EAPI=5 + +inherit multilib + +DESCRIPTION="A remote security scanner for Linux (extra tools)" +HOMEPAGE="http://www.openvas.org/" +SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +S="${WORKDIR}"/tools + +src_install() { + insinto /usr/$(get_libdir)/nagios/plugins/ + doins nagios/* + + dosbin openvas-check-setup + + insinto /usr/share/vim/vimfiles/syntax + doins nasl.vim +} diff --git a/net-analyzer/ostinato/ostinato-0.5.1.ebuild b/net-analyzer/ostinato/ostinato-0.5.1.ebuild index a81123944ee0..0fcc4232e809 100644 --- a/net-analyzer/ostinato/ostinato-0.5.1.ebuild +++ b/net-analyzer/ostinato/ostinato-0.5.1.ebuild @@ -21,4 +21,6 @@ DEPEND="dev-libs/protobuf:= dev-qt/qtscript:4" RDEPEND="${DEPEND}" -src_configure(# Copyright 1999-2014 Gentoo Found \ No newline at end of file +src_configure(){ + eqmake4 PREFIX=/usr ost.pro +} diff --git a/net-analyzer/pathload/pathload-1.3.2.ebuild b/net-analyzer/pathload/pathload-1.3.2.ebuild index 7864572c16b5..3ecb9c07fa27 100644 --- a/net-analyzer/pathload/pathload-1.3.2.ebuild +++ b/net-analyzer/pathload/pathload-1.3.2.ebuild @@ -22,4 +22,5 @@ src_prepare() { src_install() { dobin ${PN}_snd ${PN}_rcv - do# Copyright 1999-2014 Gentoo Fo \ No newline at end of file + dodoc CHANGELOG CHANGES README +} diff --git a/net-analyzer/pinger/pinger-0.32e.ebuild b/net-analyzer/pinger/pinger-0.32e.ebuild index 02b065f2a421..13c345074cff 100644 --- a/net-analyzer/pinger/pinger-0.32e.ebuild +++ b/net-analyzer/pinger/pinger-0.32e.ebuild @@ -45,4 +45,5 @@ src_prepare() { src_configure() { append-cppflags -D_GNU_SOURCE - econf $(use_enable gtk) $(use_enable ncurses)# Copyright 1999-2014 \ No newline at end of file + econf $(use_enable gtk) $(use_enable ncurses) $(use_enable nls) +} diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.21.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.21.ebuild index e6f4441f6bfa..78d1d86574b1 100644 --- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.21.ebuild +++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.21.ebuild @@ -50,39 +50,36 @@ src_configure() { econf \ --sysconfdir=/etc/pnp \ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/pnp4nagios-0.6.21.ebuild,v 1.6 2014/07/15 17:52:24 jer Exp $ - -EAPI="5" - -inherit depend.apache eutils - -DESCRIPTION="A performance data analyzer for nagios" -HOMEPAGE="http://www.pnp4nagios.org" - -SRC_URI="mirror://sourceforge/${PN}/PNP-0.6/${P}.tar.gz" + --datarootdir=/usr/share/pnp \ + --mandir=/usr/share/man \ + --with-perfdata-dir=${var_dir}/perfdata \ + --with-nagios-user=${user_group} \ + --with-nagios-group=${user_group} \ + --with-perfdata-logfile=${var_dir}/perfdata.log \ + --with-perfdata-spool-dir=/var/spool/pnp +} -LICENSE="GPL-2" -SLOT="0" -IUSE="" -KEYWORDS="amd64 ppc ppc64 ~sparc x86" +src_compile() { + # The default target just shows a help + emake all +} -DEPEND="dev-lang/php[json,simplexml,zlib,xml,filter] - >=dev-lang/php-5.3 - >=net-analyzer/rrdtool-1.2[graph,perl] - || ( net-analyzer/nagios-core net-analyzer/icinga )" -RDEPEND="${DEPEND} - virtual/perl-Getopt-Long - virtual/perl-Time-HiRes - media-fonts/dejavu - apache2? ( www-servers/apache[apache2_modules_rewrite] )" +src_install() { + emake DESTDIR="${D}" install install-config || die "emake install failed" + newinitd "${FILESDIR}/npcd.initd" npcd + rm "${D}/usr/share/pnp/install.php" -want_apache2 + if use apache2 ; then + insinto "${APACHE_MODULES_CONFDIR}" + doins "${FILESDIR}"/98_pnp4nagios.conf + fi -pkg_setup() { - depend.apache_pkg_setup + # Bug 430358 - CVE-2012-3457 + find "${D}/etc/pnp" -type f -exec chmod 0640 {} \; + find "${D}/etc/pnp" -type d -exec chmod 0750 {} \; } -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.6.1 \ No newline at end of file +pkg_postinst() { + elog "Please make sure to enable URL rewriting in Apache or any other" + elog "webserver you're using, to get pnp4nagios running!" +} diff --git a/net-analyzer/portbunny/Manifest b/net-analyzer/portbunny/Manifest index 238380e40060..a3f83e6657bd 100644 --- a/net-analyzer/portbunny/Manifest +++ b/net-analyzer/portbunny/Manifest @@ -1,4 +1,2 @@ DIST PortBunny-1.0.tar.gz 213855 SHA256 cfe1e5b84b66577299d920dd6f1a1637e948dd4fb2a75ab5265de273ffb6287c DIST PortBunny230408.tar.gz 224753 SHA256 ace967834ffe36a0e2f073a46b3a81b48671cc78e2d2cca6eb2ca6a63d05ead3 -DIST PortBunny-1.0.tar.gz 213855 SHA256 cfe1e5b84b66577299d920dd6f1a1637e948dd4fb2a75ab5265de273ffb6287c -DIST PortBunny230408.tar.gz 224753 SHA256 ace967834ffe36a0e2f073a46b3a81b48671cc78e2d2cca6eb2ca6a63d05ead3 diff --git a/net-analyzer/portmon/Manifest b/net-analyzer/portmon/Manifest index a86f25ae4aaf..1cb7f8a867f3 100644 --- a/net-analyzer/portmon/Manifest +++ b/net-analyzer/portmon/Manifest @@ -1,2 +1 @@ DIST portmon-2.0.tar.gz 107246 SHA256 b2f2129ff02080e4f828c16617e52141bec3cc5582db5cebed3951418225e816 SHA512 1feafd1a8701d269c2f2e36f46ef51eeda8975aeca85d6f720cf5805e3f8bd031eb681117fa9414e775ea46c543066deb3532e7cc7d26c655daf6163fac77e25 WHIRLPOOL f453f8034581fad4554a8fbcf93a5cd472712cdf96b30c558bd590ef598f63557fdf84b675a481110e6e32565cadb81eba79587376fafb9a50c6dea6e56e2b69 -DIST portmon-2.0.tar.gz 107246 SHA256 b2f2129ff02080e4f828c16617e52141bec3cc5582db5cebed3951418225e816 SHA512 1feafd1a8701d269c2f2e36f46ef51eeda8975aeca85d6f720cf5805e3f8bd031eb681117fa9414e775ea46c543066deb3532e7cc7d26c655daf6163fac77e25 WHIRLPOOL f453f8034581fad4554a8fbcf93a5cd472712cdf96b30c558bd590ef598f63557fdf84b675a481110e6e32565cadb81eba79587376fafb9a50c6dea6e56e2b69 diff --git a/net-analyzer/snortsam/snortsam-2.50-r1.ebuild b/net-analyzer/snortsam/snortsam-2.50-r1.ebuild index 82c141515aa1..aa1420199aad 100644 --- a/net-analyzer/snortsam/snortsam-2.50-r1.ebuild +++ b/net-analyzer/snortsam/snortsam-2.50-r1.ebuild @@ -1,7 +1,5 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortsam/snortsam-2.50-r1.ebuild,v 1.13 2014/07/17 14:28:47 jer Exp $ inherit eutils toolchain-funcs @@ -43,4 +41,8 @@ src_install() { pkg_postinst() { elog - elog "To use snortsam with snort, you'll have to compil \ No newline at end of file + elog "To use snortsam with snort, you'll have to compile snort with USE=snortsam." + elog "Read the INSTALL file to configure snort for snortsam, and configure" + elog "snortsam for your particular firewall." + elog +} diff --git a/net-analyzer/softflowd/files/softflowd.initd b/net-analyzer/softflowd/files/softflowd.initd index f75e08692546..e02169763d5f 100644 --- a/net-analyzer/softflowd/files/softflowd.initd +++ b/net-analyzer/softflowd/files/softflowd.initd @@ -7,16 +7,6 @@ depend() { need net } -softflowd_checkconfig() { - SOFTFLOWD_INTER#!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/softflowd/files/softflowd.initd,v 1.2 2012/03/21 07:52:49 robbat2 Exp $ - -depend() { - need net -} - softflowd_checkconfig() { SOFTFLOWD_INTERFACE=${SVCNAME#*.} if [ ${SOFTFLOWD_INTERFACE} = ${SVCNAME} ]; then @@ -48,4 +38,17 @@ start() { -n "${SOFTFLOWD_COLLECTOR}" \ -p "${SOFTFLOWD_PIDFILE}" \ -c "${SOFTFLOWD_CTLFILE}" \ - -t "${SOFTFLOWD_TIMEO \ No newline at end of file + -t "${SOFTFLOWD_TIMEOUTS-maxlife=600}" \ + -m "${SOFTFLOWD_MAXFLOWS-17000}" \ + ${SOFTFLOWD_EXTRA} + eend $? +} + +stop() { + softflowd_checkconfig || return 1 + + ebegin "Stopping softflowd on interface ${SOFTFLOWD_INTERFACE}" + # use softflowd's own way to shut it down + /usr/sbin/softflowctl -c ${SOFTFLOWD_CTLFILE} shutdown + eend $? +} diff --git a/net-analyzer/speedtest-cli/Manifest b/net-analyzer/speedtest-cli/Manifest index 14bdd6b2064d..ef0b97c0120a 100644 --- a/net-analyzer/speedtest-cli/Manifest +++ b/net-analyzer/speedtest-cli/Manifest @@ -1,4 +1,2 @@ DIST speedtest-cli-0.2.4.tar.gz 10573 SHA256 be53386d0ea697aff192984a4f06bcf9b5c4e287b8ac13d68f5fb8d0fc5317f1 SHA512 d85ec7036ae183ef0906f4bf8ebec54ae2f27878a60165153602d7eff8b2b036aa343a91f94edc6777131c36fceed83901ee6a565ecb3ad6a46a2a96c158f352 WHIRLPOOL f0493907a51e1879f3d4df9a00dcb4ef181f0b2465d635d618075854ce6a0c61e4adb5adf95a4f5dff5dcdbacf982e4b578d53b087995b230b3898407aedd9e0 DIST speedtest-cli-0.2.5.tar.gz 11786 SHA256 1fafa6d808823da17a6f4c75d802f13b42ad954d60f4cd18ba30d2bb1424e538 SHA512 d844fed185af9ace7fb6ec1b3ea33f4dcd841a47e0bc0e75577d5e40be57a4cbfeedc4180b5bf68649c8242ab5749c778c9941c056fe17d0cb9f6597d14c50ac WHIRLPOOL d179a7793a4a8e985e537e6bc5df9253fc16ccc68480d0c6231a016df4b71acdfb42cd23e0c6ebe0d35664d20d4aa2d4fb1b24baaa5afa85ac4b1b2e7c967e43 -DIST speedtest-cli-0.2.4.tar.gz 10573 SHA256 be53386d0ea697aff192984a4f06bcf9b5c4e287b8ac13d68f5fb8d0fc5317f1 SHA512 d85ec7036ae183ef0906f4bf8ebec54ae2f27878a60165153602d7eff8b2b036aa343a91f94edc6777131c36fceed83901ee6a565ecb3ad6a46a2a96c158f352 WHIRLPOOL f0493907a51e1879f3d4df9a00dcb4ef181f0b2465d635d618075854ce6a0c61e4adb5adf95a4f5dff5dcdbacf982e4b578d53b087995b230b3898407aedd9e0 -DIST speedtest-cli-0.2.5.tar.gz 11786 SHA256 1fafa6d808823da17a6f4c75d802f13b42ad954d60f4cd18ba30d2bb1424e538 SHA512 d844fed185af9ace7fb6ec1b3ea33f4dcd841a47e0bc0e75577d5e40be57a4cbfeedc4180b5bf68649c8242ab5749c778c9941c056fe17d0cb9f6597d14c50ac WHIRLPOOL d179a7793a4a8e985e537e6bc5df9253fc16ccc68480d0c6231a016df4b71acdfb42cd23e0c6ebe0d35664d20d4aa2d4fb1b24baaa5afa85ac4b1b2e7c967e43 diff --git a/net-analyzer/symon/symon-2.86-r1.ebuild b/net-analyzer/symon/symon-2.86-r1.ebuild index 93b8a6969e35..2d1ea9ec9e7f 100644 --- a/net-analyzer/symon/symon-2.86-r1.ebuild +++ b/net-analyzer/symon/symon-2.86-r1.ebuild @@ -52,47 +52,61 @@ src_configure() { use perl && [[ -z ${USE_SYMON} ]] && ! use symux && zap_subdir lib ! use perl && zap_subdir client ! use symux && zap_subdir symux - [[ -z ${USE_SYMON} ]] && zap# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/symon/symon-2.86-r1.ebuild,v 1.2 2014/07/30 14:49:12 jer Exp $ + [[ -z ${USE_SYMON} ]] && zap_subdir symon +} -EAPI=5 +src_compile() { + pmake CC="$(tc-getCC)" CFLAGS+="${CFLAGS}" STRIP=true || die "pmake failed" +} -inherit eutils perl-module toolchain-funcs +src_install() { + if [[ -n ${USE_SYMON} ]]; then + insinto /etc + doins "${FILESDIR}"/symon.conf -DESCRIPTION="Performance and information monitoring tool" -HOMEPAGE="http://www.xs4all.nl/~wpd/symon/" -SRC_URI="http://www.xs4all.nl/~wpd/symon/philes/${P}.tar.gz" + newinitd "${FILESDIR}"/symon-init.d symon -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~amd64 ~sparc ~x86" -IUSE="perl +symon symux" + dodoc CHANGELOG HACKERS TODO -RDEPEND="perl? ( dev-lang/perl ) - symux? ( net-analyzer/rrdtool )" -DEPEND="${RDEPEND} - virtual/pmake" + doman symon/symon.8 + dosbin symon/symon + fi -S=${WORKDIR}/${PN} + if use perl; then + dobin client/getsymonitem.pl -# Deletes the directory passed as an argument from the internal pmake -# variable SUBDIR. -zap_subdir() { - sed -i "/^SUBDIR/s|$1||" Makefile || die -} + perlinfo + insinto ${VENDOR_LIB} + doins client/SymuxClient.pm + fi -pkg_setup() { - use symon && USE_SYMON=1 && return + if use symux; then + insinto /etc + doins "${FILESDIR}"/symux.conf - if ! use perl && ! use symon && ! use symux; then - ewarn "You have all available USE flags disabled. Therefore, only the" - ewarn "system monitor will be emerged. Please, enable at least one USE" - ewarn "flag to avoid this message." - USE_SYMON=1 + newinitd "${FILESDIR}"/symux-init.d symux + + doman symux/symux.8 + dosbin symux/symux + + dodir /usr/share/symon + insinto /usr/share/symon + doins symux/c_smrrds.sh + fperms a+x /usr/share/symon/c_smrrds.sh + + dodir /var/lib/symon/rrds/localhost fi } -src_prepare() { - sed -i \ - -e '/^[ \t]*${CC}.*\${LIBS}/s:\${CC}:$(CC) $(LDFLAGS):' \ No newline at end of file +pkg_postinst() { + use perl && perl-module_pkg_postinst + + if use symux; then + elog "The RRDs files can be obtained by running" + elog "/usr/share/symon/c_smrrds.sh all." + elog "For information about migrating RRDs from a previous" + elog "symux version read the LEGACY FORMATS section of symux(8)." + elog "To view the rrdtool pictures of the stored data, emerge" + elog "net-analyzer/syweb." + fi +} diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest index 47145bb725aa..72fa0abcdc95 100644 --- a/net-analyzer/vnstat/Manifest +++ b/net-analyzer/vnstat/Manifest @@ -1,3 +1,2 @@ -DIST vnstat-1.11.tar.gz 79075 SHA256 b71876d817bbb6a16d31b4236e22a2eb6c39666a7f7bfea581f5ff441cade026 SHA512 f16a0cc5065665c46de9781b6d92e96f0966520e5448fc529150ced886574fe07d0695df5051828b58183d06a707b7b2e94562b06db1898dacb858517a5485b1 WHIRLPOOL bc93704b8f9c39830f1ba8c2d39cc7ba7d0b317d35941547870bd5cf8c2f374050cdbae7c8ce444765cd5fb22c78d28e6099f32b06aee9d836451b399216e6-----BEGIN PGP SIGNED MESSAGE----- DIST vnstat-1.11.tar.gz 79075 SHA256 b71876d817bbb6a16d31b4236e22a2eb6c39666a7f7bfea581f5ff441cade026 SHA512 f16a0cc5065665c46de9781b6d92e96f0966520e5448fc529150ced886574fe07d0695df5051828b58183d06a707b7b2e94562b06db1898dacb858517a5485b1 WHIRLPOOL bc93704b8f9c39830f1ba8c2d39cc7ba7d0b317d35941547870bd5cf8c2f374050cdbae7c8ce444765cd5fb22c78d28e6099f32b06aee9d836451b399216e6ef DIST vnstat-1.12.tar.gz 98435 SHA256 af1050d9c1b22d4b9742fe0d1818de9eb1037b8e7f9ba67b962e108d8527be69 SHA512 0d6b5f362bbcbb4a104f82b8e350f5d8b071e974a3fdfb100333c3d8e5a096a71a97360543d2594fd3f2108df8bb03ffffc4c52d396f28723005a5d1bf605eb1 WHIRLPOOL 590197dc62b077268e0814d7ce15f5f519d53328a68e57743c1a3375082410239d75e28674094dbb7d14b27d17769f7de6d0eccd716a05d50d86f5d06274c9a0 diff --git a/net-analyzer/vnstat/vnstat-1.11-r2.ebuild b/net-analyzer/vnstat/vnstat-1.11-r2.ebuild index 8d9018e9f863..1a5f999dad50 100644 --- a/net-analyzer/vnstat/vnstat-1.11-r2.ebuild +++ b/net-analyzer/vnstat/vnstat-1.11-r2.ebuild @@ -49,44 +49,30 @@ src_install() { use gd && doman man/vnstati.1 doman man/vnstat.1 man/vnstatd.1 - newdoc examples/vnstat# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/vnstat/vnstat-1.11-r2.ebuild,v 1.12 2014/07/23 01:03:46 mrueg Exp $ - -EAPI=5 -inherit toolchain-funcs user - -DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage" -HOMEPAGE="http://humdi.net/vnstat/" -SRC_URI="http://humdi.net/vnstat/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm hppa ppc ppc64 sparc x86" -IUSE="gd" - -DEPEND=" - gd? ( media-libs/gd[png] )" -RDEPEND="${DEPEND}" - -pkg_setup() { - enewgroup vnstat - enewuser vnstat -1 -1 /dev/null vnstat + newdoc examples/vnstat_ip-up ip-up.example + newdoc examples/vnstat_ip-down ip-down.example + newdoc INSTALL README.setup + dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi } -src_compile() { - sed -i 's:vnstat[.]log:vnstatd.log:' cfg/vnstat.conf || die - sed -i 's:vnstat[.]pid:vnstatd/vnstatd.pid:' cfg/vnstat.conf || die - - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" $(usex gd all '') +pkg_postinst() { + # Workaround feature/bug #141619 + chown -R vnstat:vnstat "${ROOT}"/var/lib/vnstat + chown vnstat:vnstat "${ROOT}"/var/run/vnstatd + ewarn "vnStat db files owning user and group has been changed to \"vnstat\"." + + elog + elog "Repeat the following command for every interface you" + elog "wish to monitor (replace eth0):" + elog " vnstat -u -i eth0" + elog "and set correct permissions after that, e.g." + elog " chown -R vnstat:vnstat /var/lib/vnstat" + elog + elog "Note: if an interface transfers more than ~4GB in" + elog "the time between cron runs, you may miss traffic" + elog + elog "To update the interfaces database automatically with cron, uncomment" + elog "lines in /etc/cron.hourly/vnstat and set cron job to run it as" + elog "frequently as required. Alternatively you can use vnstatd. Init script" + elog "was installed into /etc/init.d/vnstatd for your convenience." } - -src_install() { - use gd && dobin src/vnstati - dobin src/vnstat src/vnstatd - exeinto /etc/cron.hourly - newexe "${FILESDIR}"/vnstat.cron vnstat - - insinto /etc - doins cfg/vnstat.conf - fow \ No newline at end of file diff --git a/net-dialup/drdsl/Manifest b/net-dialup/drdsl/Manifest index 92548a612521..6bdd1d25106c 100644 --- a/net-dialup/drdsl/Manifest +++ b/net-dialup/drdsl/Manifest @@ -1,4 +1,2 @@ DIST drdsl-1.0-1.i586.rpm 25869 RMD160 61234b7a325bb0633b02837fef1923137ca5e05f SHA1 1b435450d4658e2733e8761ad8a1953569298303 SHA256 e4c4e1e246521b080ff61d08de9c6b584897c7d952c956e13803a6f8f905b750 DIST drdsl-1.0-1.x86_64.rpm 30406 RMD160 7d8baa6dbf19a60e6ed1b76e9196901a2f3eafc7 SHA1 5ea5ee52cfb8d69544649fe52919cdfb4dc6b73b SHA256 7690a76942efa7f0218faeb8f6d59b4c9c4df04a73abcc900834e7ba273ce960 -DIST drdsl-1.0-1.i586.rpm 25869 RMD160 61234b7a325bb0633b02837fef1923137ca5e05f SHA1 1b435450d4658e2733e8761ad8a1953569298303 SHA256 e4c4e1e246521b080ff61d08de9c6b584897c7d952c956e13803a6f8f905b750 -DIST drdsl-1.0-1.x86_64.rpm 30406 RMD160 7d8baa6dbf19a60e6ed1b76e9196901a2f3eafc7 SHA1 5ea5ee52cfb8d69544649fe52919cdfb4dc6b73b SHA256 7690a76942efa7f0218faeb8f6d59b4c9c4df04 \ No newline at end of file diff --git a/net-dialup/globespan-adsl/files/globespan-adsl-0.11-synch.patch b/net-dialup/globespan-adsl/files/globespan-adsl-0.11-synch.patch index 4b48a5209cf9..344ec3ddbd28 100644 --- a/net-dialup/globespan-adsl/files/globespan-adsl-0.11-synch.patch +++ b/net-dialup/globespan-adsl/files/globespan-adsl-0.11-synch.patch @@ -62,28 +62,24 @@ index 79b7545..b5bf1dd 100644 +} + +int pusb_endpoint_read_int(pusb_endpoint_t ep, -+ unsigned char* buf, diff --git a/eciadsl-synch.c b/eciadsl-synch.c -index 27c1f34..31c51dc 100644 ---- a/eciadsl-synch.c -+++ b/eciadsl-synch.c -@@ -322,7 +322,7 @@ void read_endpoint(pusb_endpoint_t ep_int, int epnum){ - device. So we revert to the old behaviour : NO TIMEOUTS ... - */ - -- ret = pusb_endpoint_read(ep_int, lbuf, sizeof(lbuf), 0); -+ ret = pusb_endpoint_read_int(ep_int, lbuf, sizeof(lbuf)); - - if (ret < 0) - { -diff --git a/pusb-linux.c b/pusb-linux.c -index 79b7545..b5bf1dd 100644 ---- a/pusb-linux.c -+++ b/pusb-linux.c -@@ -340,6 +340,54 @@ int pusb_endpoint_rw_no_timeout(int fd, int ep, - return(purb->actual_length); - } - -+int pusb_endpoint_read_int_no_timeout(int fd, int ep, -+ unsigned char* buf, int size) ++ unsigned char* buf, int size) +{ -+ struct usbdevfs_urb urb, * \ No newline at end of file ++ return(pusb_endpoint_read_int_no_timeout(ep->fd, ep->ep|USB_DIR_IN, buf, size)); ++} ++ + int pusb_endpoint_rw(int fd, int ep, unsigned char* buf, int size, int timeout) + { + struct usbdevfs_bulktransfer bulk; +diff --git a/pusb.h b/pusb.h +index 921543b..112e41f 100644 +--- a/pusb.h ++++ b/pusb.h +@@ -30,6 +30,8 @@ int pusb_release_interface(pusb_device_t dev,int interface); + pusb_endpoint_t pusb_endpoint_open(pusb_device_t dev, int epnum, int flags); + int pusb_endpoint_read(pusb_endpoint_t ep, + unsigned char *buf, int size, int timeout); ++int pusb_endpoint_read_int(pusb_endpoint_t ep, ++ unsigned char *buf, int size); + int pusb_endpoint_write(pusb_endpoint_t ep, + const unsigned char *buf, int size, int timeout); + diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.8-autoheader.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.8-autoheader.patch index 1a48118b55ca..1c902600afcc 100644 --- a/net-dialup/rp-pppoe/files/rp-pppoe-3.8-autoheader.patch +++ b/net-dialup/rp-pppoe/files/rp-pppoe-3.8-autoheader.patch @@ -25,15 +25,22 @@ diff -Nru rp-pppoe-3.8.orig/src/configure.in rp-pppoe-3.8/src/configure.in LINUX_KERNELMODE_PLUGIN=rp-pppoe.so - AC_DEFINE(HAVE_LINUX_KERNEL_PPPOE) + AC_DEFINE(HAVE_LINUX_KERNEL_PPPOE, 1, [Define if you have kernel-mode PPPoE in Linux file]) - PPPD_INCDIR=$acdiff -Nru rp-pppoe-3.8.orig/src/configure.in rp-pppoe-3.8/src/configure.in ---- rp-pppoe-3.8.orig/src/configure.in 2008-06-15 16:59:01.000000000 +0300 -+++ rp-pppoe-3.8/src/configure.in 2008-06-15 17:12:02.000000000 +0300 -@@ -44,7 +44,7 @@ - AC_MSG_RESULT($ac_cv_struct_sockaddr_ll) + PPPD_INCDIR=$ac_cv_pluginpath + fi + fi - if test "$ac_cv_struct_sockaddr_ll" = yes ; then --AC_DEFINE(HAVE_STRUCT_SOCKADDR_LL) -+AC_DEFINE(HAVE_STRUCT_SOCKADDR_LL, 1, [Define if you have struct sockaddr_ll]) + if test "$ac_cv_debugging" = "yes" ; then +- AC_DEFINE(DEBUGGING_ENABLED) ++ AC_DEFINE(DEBUGGING_ENABLED, 1, [Define to include debugging code]) fi - dnl Check for N_HDLC l \ No newline at end of file + AC_SUBST(LINUX_KERNELMODE_PLUGIN) +@@ -248,7 +248,7 @@ + + if test "$rpppoe_cv_pack_bitfields" = "rev" ; then + AC_MSG_RESULT(reversed) +- AC_DEFINE(PACK_BITFIELDS_REVERSED) ++ AC_DEFINE(PACK_BITFIELDS_REVERSED, 1, [Define if bitfields are packed in reverse order]) + else + AC_MSG_RESULT(normal) + fi diff --git a/net-dns/maradns/maradns-2.0.09.ebuild b/net-dns/maradns/maradns-2.0.09.ebuild index e5cf45e5f7d5..450fd5964831 100644 --- a/net-dns/maradns/maradns-2.0.09.ebuild +++ b/net-dns/maradns/maradns-2.0.09.ebuild @@ -1,7 +1,5 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/maradns/maradns-2.# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/net-dns/maradns/maradns-2.0.09.ebuild,v 1.3 2014/02/28 09:54:31 pinkbyte Exp $ EAPI="5" @@ -93,4 +91,8 @@ src_install() { # systemd unit # please keep paths in sync! - sed -e "s^@bindir@^${EPR \ No newline at end of file + sed -e "s^@bindir@^${EPREFIX}/usr/sbin^" \ + -e "s^@sysconfdir@^${EPREFIX}/etc/maradns^" \ + "${FILESDIR}"/maradns.service.in > "${T}"/maradns.service + systemd_dounit "${T}"/maradns.service +} diff --git a/net-firewall/ebtables/ebtables-2.0.10.2.ebuild b/net-firewall/ebtables/ebtables-2.0.10.2.ebuild index 9036af1bdb4a..020d43e10f4f 100644 --- a/net-firewall/ebtables/ebtables-2.0.10.2.ebuild +++ b/net-firewall/ebtables/ebtables-2.0.10.2.ebuild @@ -56,6 +56,13 @@ src_install() { if ! use static; then make DESTDIR="${D}" install keepdir /var/lib/ebtables/ - newinitd "${FILE# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ebtables-2.0.10.2.ebuild,v 1.2 201 \ No newline at end of file + newinitd "${FILESDIR}"/ebtables.initd-r1 ebtables + newconfd "${FILESDIR}"/ebtables.confd-r1 ebtables + else + into / + newsbin static ebtables + insinto /etc + doins ethertypes + fi + dodoc ChangeLog THANKS || die +} diff --git a/net-firewall/ebtables/ebtables-2.0.9.2-r2.ebuild b/net-firewall/ebtables/ebtables-2.0.9.2-r2.ebuild index d63bddd93675..34056c989f77 100644 --- a/net-firewall/ebtables/ebtables-2.0.9.2-r2.ebuild +++ b/net-firewall/ebtables/ebtables-2.0.9.2-r2.ebuild @@ -44,19 +44,28 @@ src_prepare() { src_compile() { # This package uses _init functions to initialise extensions. With # --as-needed this will not work. - append-# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ebtables-2.0.9.2-r2.ebuild,v 1.6 2014/08/10 20:55:27 slyfox Exp $ - -EAPI="4" - -inherit versionator eutils toolchain-funcs multilib flag-o-matic - -MY_PV=$(replace_version_separator 3 '-' ) -MY_P=${PN}-v${MY_PV} - -DESCRIPTION="Utility that enables basic Ethernet frame filtering on a Linux bridge, MAC NAT and brouting" -HOMEPAGE="http://ebtables.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" + append-ldflags $(no-as-needed) + # This package correctly aliases pointers, but gcc is unable to know that: + # unsigned char ip[4]; + # if (*((uint32_t*)ip) == 0) { + append-cflags -Wno-strict-aliasing + emake \ + CC="$(tc-getCC)" \ + CFLAGS="${CFLAGS}" \ + $(use static && echo static) +} -KEYWORDS="amd64 ppc \ No newline at end of file +src_install() { + if ! use static; then + make DESTDIR="${D}" install + keepdir /var/lib/ebtables/ + newinitd "${FILESDIR}"/ebtables.initd-r1 ebtables + newconfd "${FILESDIR}"/ebtables.confd-r1 ebtables + else + into / + newsbin static ebtables + insinto /etc + doins ethertypes + fi + dodoc ChangeLog THANKS || die +} diff --git a/net-firewall/firehol/files/firehol-1.273-CVE-2008-4953.patch b/net-firewall/firehol/files/firehol-1.273-CVE-2008-4953.patch index 3b6afa63250e..99a958aa701f 100644 --- a/net-firewall/firehol/files/firehol-1.273-CVE-2008-4953.patch +++ b/net-firewall/firehol/files/firehol-1.273-CVE-2008-4953.patch @@ -3,29 +3,6 @@ From: Robert Buchholz Date: Tue, 6 Jan 2009 23:26:00 +0100 Subject: [PATCH] Use mktemp instead of relying that $$-$RANDOM-$RANDOM does not exist. -References: -* CVE-2008-4953 -* https://bugs.gentoo.org/246013 ---- - firehol.sh | 25 +++++++++---------------- - 1 files changed, 9 insertions(+), 16 deletions(-) - -diff --git a/firehol.sh b/firehol.sh -index 6acb497..f5dba16 100755 ---- a/firehol.sh -+++ b/firehol.sh -@@ -238,8 +238,15 @@ ${IPTABLES_CMD} -nxvL >/dev/null 2>&1 - # ---------------------------------------------------------------------- - # Directories and files - --# These files will be created and deleted during our run. --FIREHOL_DIR="/tmp/.firehol-tmp-$$-${RANDOM}-${RANDOM}" -+# Create an empty temporary directory we need for this run. -+if From 545db8cd292957158bf3fa1c1c370e4be83c6688 Mon Sep 17 00:00:00 2001 -From: Robert Buchholz -Date: Tue, 6 Jan 2009 23:26:00 +0100 -Subject: [PATCH] Use mktemp instead of relying that $$-$RANDOM-$RANDOM does not exist. - References: * CVE-2008-4953 * https://bugs.gentoo.org/246013 @@ -45,4 +22,37 @@ index 6acb497..f5dba16 100755 -FIREHOL_DIR="/tmp/.firehol-tmp-$$-${RANDOM}-${RANDOM}" +# Create an empty temporary directory we need for this run. +if ! FIREHOL_DIR="`mktemp -d -t .firehol-tmp-XXXXXX`" -+th \ No newline at end of file ++then ++ echo >&2 ++ echo >&2 ++ echo >&2 "Cannot create temporary directory." ++ echo >&2 ++ exit 1 ++fi + FIREHOL_CHAINS_DIR="${FIREHOL_DIR}/chains" + FIREHOL_OUTPUT="${FIREHOL_DIR}/firehol-out.sh" + FIREHOL_SAVED="${FIREHOL_DIR}/firehol-save.sh" +@@ -329,20 +336,6 @@ then + "${CHMOD_CMD}" 700 "${FIREHOL_CONFIG_DIR}/services" + fi + +-# Remove any old directories that might be there. +-if [ -d "${FIREHOL_DIR}" ] +-then +- "${RM_CMD}" -rf "${FIREHOL_DIR}" +- if [ $? -ne 0 -o -e "${FIREHOL_DIR}" ] +- then +- echo >&2 +- echo >&2 +- echo >&2 "Cannot clean temporary directory '${FIREHOL_DIR}'." +- echo >&2 +- exit 1 +- fi +-fi +-"${MKDIR_CMD}" "${FIREHOL_DIR}" || exit 1 + "${MKDIR_CMD}" "${FIREHOL_CHAINS_DIR}" || exit 1 + + # prepare the file that will hold all modules to be loaded. +-- +1.6.0.4 + diff --git a/net-firewall/firehol/files/firehol.initrd.1 b/net-firewall/firehol/files/firehol.initrd.1 index 5e0d08eb618b..ab697f281c51 100644 --- a/net-firewall/firehol/files/firehol.initrd.1 +++ b/net-firewall/firehol/files/firehol.initrd.1 @@ -61,6 +61,7 @@ panic() { } save() { -#!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation -# Distributed un \ No newline at end of file + ebegin "Saving FireHOL configuration" + /usr/sbin/firehol save + eend $? +} diff --git a/net-firewall/firewalld/firewalld-0.2.12.ebuild b/net-firewall/firewalld/firewalld-0.2.12.ebuild index df4a9bebb8cc..18833fa98608 100644 --- a/net-firewall/firewalld/firewalld-0.2.12.ebuild +++ b/net-firewall/firewalld/firewalld-0.2.12.ebuild @@ -53,26 +53,38 @@ src_configure() { "$(systemd_with_unitdir 'systemd-unitdir')" } -src# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/firewalld/firewalld-0.2.12.ebuild,v 1.1 2013/02/19 04:52:25 cardoe Exp $ +src_install() { + python_foreach_impl \ + emake DESTDIR="${ED}" pythondir="$(python_get_sitedir)" install -EAPI=5 -PYTHON_COMPAT=( python{2_6,2_7} ) -#BACKPORTS=190680ba + # Get rid of junk + rm -f "${ED}/etc/rc.d/init.d/firewalld" + rm -f "${ED}/etc/sysconfig/firewalld" + rm -rf "${ED}/etc/rc.d/" + rm -rf "${ED}/etc/sysconfig/" -inherit autotools eutils gnome2-utils python-r1 systemd multilib + # For non-gui installs we need to remove GUI bits + if ! use gui; then + rm -f "${ED}/usr/bin/firewall-applet" + rm -f "${ED}/usr/bin/firewall-config" + rm -rf "${ED}/usr/share/icons" + rm -rf "${ED}/usr/share/applications" + fi -DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall" -HOMEPAGE="http://fedorahosted.org/firewalld" -SRC_URI="https://fedorahosted.org/released/firewalld/${P}.tar.bz2 - ${BACKPORTS:+http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}" + newinitd "${FILESDIR}"/firewalld.init firewalld +} -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="gui" +pkg_preinst() { + gnome2_icon_savelist + gnome2_schemas_savelist +} -RDEPEND="${PYTHON_DEPS} - dev-python/dbus-python - \ No newline at end of file +pkg_postinst() { + gnome2_icon_cache_update + gnome2_schemas_update +} + +pkg_postrm() { + gnome2_icon_cache_update + gnome2_schemas_update +} diff --git a/net-firewall/fwbuilder/fwbuilder-5.0.1.3592-r1.ebuild b/net-firewall/fwbuilder/fwbuilder-5.0.1.3592-r1.ebuild index 0c2428fead80..7b7bc3f76102 100644 --- a/net-firewall/fwbuilder/fwbuilder-5.0.1.3592-r1.ebuild +++ b/net-firewall/fwbuilder/fwbuilder-5.0.1.3592-r1.ebuild @@ -19,31 +19,35 @@ DEPEND=">=dev-qt/qtgui-4.3:4 dev-libs/elfutils" RDEPEND="${DEPEND}" -PATCHES=( - "${FILESDIR}/${PN}-5.0# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-5.0.1.3592-r1.ebuild,v 1.8 2013/03/02 22:49:59 hwoarang Exp $ - -EAPI="4" - -inherit eutils base qt4-r2 multilib autotools - -DESCRIPTION="A firewall GUI" -HOMEPAGE="http://www.fwbuilder.org/" -SRC_URI="mirror://sourceforge/fwbuilder/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" -IUSE="" - -DEPEND=">=dev-qt/qtgui-4.3:4 - dev-libs/openssl - dev-libs/elfutils" -RDEPEND="${DEPEND}" - PATCHES=( "${FILESDIR}/${PN}-5.0.0.3568-ldflags.patch" "${FILESDIR}/${PN}-5.0.1.3592-gcc47.patch" ) -sr \ No newline at end of file +src_prepare() { + # Fix a compile bug that affects some x86_64 platforms. + # Addressed in the upcoming 5.0.2.3596 release. + # Closes #395151. + epatch "${FILESDIR}/${P}-stdc-format-macros.patch" + + qt4-r2_src_prepare + sed -i -e '/dnl.*AM_INIT_AUTOMAKE/d' configure.in || die #398743 + eautoreconf +} + +src_configure() { + eqmake4 + # portage handles ccache/distcc itself + econf --without-{ccache,distcc} +} + +src_install() { + emake INSTALL_ROOT="${D}" install +} + +pkg_postinst() { + validate_desktop_entries + + elog "You need to emerge sys-apps/iproute2 on the machine" + elog "that will run the firewall script." +} diff --git a/net-firewall/gshield/Manifest b/net-firewall/gshield/Manifest index 93e8d3ae04de..df8e8810553e 100644 --- a/net-firewall/gshield/Manifest +++ b/net-firewall/gshield/Manifest @@ -1,2 +1 @@ DIST gShield-2.8.tgz 47346 SHA256 19b04059ac4a6ad28f8653d804376779a83516ba4e0b5b041fe45d422ef68b85 SHA512 f91ef18267817e3296c795b3f1629dad9ade269e12aba7f95d39b7ae39aaf76dc15e0046747281dc44859241a18b2ce7ac03e276984aee11af15e28cf80f736c WHIRLPOOL 3e834f39be912d039112971c57e62ca2b645afc33672bdb140f77b4c2cb16227b07f82fd2983dddb492381d798c4f7567d6b1fe61ad0f67554968c937c7d5e2b -DIST gShield-2.8.tgz 47346 SHA256 19b04059ac4a6ad28f8653d804376779a83516ba4e0b5b041fe45d422ef68b85 SHA512 f91ef18267817e3296c795b3f1629dad9ade269e12aba7f95d39b7ae39aaf76dc15e0046747281dc44859241a18b2ce7ac03e276984aee11af15e28cf80f736c WHIRLPOOL 3e834f39be912d039112971c57e62ca2b645afc33672bdb140f77b4c2cb16227b07f82fd2983dddb492381d798c4f7567d6b1fe61ad0f67554968c937c7d5e2b diff --git a/net-firewall/ipkungfu/ipkungfu-0.6.1.ebuild b/net-firewall/ipkungfu/ipkungfu-0.6.1.ebuild index 2435a7b6efc2..88364301c53c 100644 --- a/net-firewall/ipkungfu/ipkungfu-0.6.1.ebuild +++ b/net-firewall/ipkungfu/ipkungfu-0.6.1.ebuild @@ -43,5 +43,6 @@ pkg_postinst() { echo einfo "Also, be sure to run ipkungfu prior to rebooting," einfo "especially if you you're updating from <0.6.0 to >=0.6.0." - einfo "There are some signif# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General \ No newline at end of file + einfo "There are some significant configuration changes on this" + einfo "release covered by the ipkungfu script." +} diff --git a/net-firewall/ipset/files/ipset.initd-r2 b/net-firewall/ipset/files/ipset.initd-r2 index 4353e5f01077..defe75b1c8e8 100644 --- a/net-firewall/ipset/files/ipset.initd-r2 +++ b/net-firewall/ipset/files/ipset.initd-r2 @@ -11,21 +11,6 @@ depend() { before iptables ip6tables } -checkconfig() { - if [ ! -f "${IPSET_SAVE}" ] ; then - #!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/files/ipset.initd-r2,v 1.2 2013/12/01 19:16:15 robbat2 Exp $ - -extra_commands="save" - -IPSET_SAVE=${IPSET_SAVE:-/var/lib/ipset/rules-save} - -depend() { - before iptables ip6tables -} - checkconfig() { if [ ! -f "${IPSET_SAVE}" ] ; then eerror "Not starting ${SVCNAME}. First create some rules then run:" @@ -50,4 +35,26 @@ stop() { ($1 == "Type:" && $2 == "list:set") { set = 1 } (scan) { if ($0 != "") setcnt++; else { scan = 0; set = 0 } } (set && $1 == "Members:") {scan = 1} - END { if ( \ No newline at end of file + END { if ((refcnt - setcnt) > 0) exit 1 } + '; then + eerror "ipset is in use, can't stop" + return 1 + fi + + if [ "${SAVE_ON_STOP}" = "yes" ] ; then + save || return 1 + fi + + ebegin "Removing kernel IP sets" + ipset flush + ipset destroy + eend $? +} + +save() { + ebegin "Saving ipset session" + touch "${IPSET_SAVE}" + chmod 0600 "${IPSET_SAVE}" + ipset save > "${IPSET_SAVE}" + eend $? +} diff --git a/net-firewall/ipset/ipset-6.15.ebuild b/net-firewall/ipset/ipset-6.15.ebuild index c3d5ee6ec42d..a9c3e89c388f 100644 --- a/net-firewall/ipset/ipset-6.15.ebuild +++ b/net-firewall/ipset/ipset-6.15.ebuild @@ -66,31 +66,47 @@ pkg_setup() { die "Nonmodular kernel detected, will not build kernel modules" fi fi - [[ ${build_modules} -eq 1 ]] &&# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-6.15.ebuild,v 1.5 2014/08/10 20:55:50 slyfox Exp $ + [[ ${build_modules} -eq 1 ]] && linux-mod_pkg_setup +} -EAPI="4" -inherit autotools linux-info linux-mod +src_prepare() { + [[ ${build_modules} -eq 1 ]] && check_header_patch + eautoreconf +} -DESCRIPTION="IPset tool for iptables, successor to ippool" -HOMEPAGE="http://ipset.netfilter.org/" -SRC_URI="http://ipset.netfilter.org/${P}.tar.bz2" +src_configure() { + econf \ + $(use_with modules kmod) \ + --disable-static \ + --with-maxsets=${IP_NF_SET_MAX} \ + --libdir="${EPREFIX}/$(get_libdir)" \ + --with-ksource="${KV_DIR}" \ + --with-kbuild="${KV_OUT_DIR}" \ + --disable-silent-rules +} -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="modules" +src_compile() { + einfo "Building userspace" + emake -RDEPEND=">=net-firewall/iptables-1.4.7 - net-libs/libmnl" -DEPEND="${RDEPEND}" + if [[ ${build_modules} -eq 1 ]]; then + einfo "Building kernel modules" + set_arch_to_kernel + emake modules + fi +} -DOCS=( ChangeLog INSTALL README UPGRADE ) +src_install() { + einfo "Installing userspace" + default + prune_libtool_files -# configurable from outside, e.g. /etc/make.conf -IP_NF_SET_MAX=${IP_NF_SET_MAX:-256} + newinitd "${FILESDIR}"/ipset.initd-r2 ${PN} + newconfd "${FILESDIR}"/ipset.confd ${PN} + keepdir /var/lib/ipset -BUILD_TARGETS="modules" -MODULE_NAMES_ARG="kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/ipset" -MODULE_NAMES="xt_set(ke \ No newline at end of file + if [[ ${build_modules} -eq 1 ]]; then + einfo "Installing kernel modules" + linux-mod_src_install + fi +} diff --git a/net-firewall/iptables/iptables-1.4.12.1.ebuild b/net-firewall/iptables/iptables-1.4.12.1.ebuild index dc1ce6783896..12a27bf4be8c 100644 --- a/net-firewall/iptables/iptables-1.4.12.1.ebuild +++ b/net-firewall/iptables/iptables-1.4.12.1.ebuild @@ -56,40 +56,32 @@ src_compile() { emake V=1 } -sr# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.12.1.ebuild,v 1.8 2012/06/26 04:36:01 zmedico Exp $ - -EAPI="4" - -# Force users doing their own patches to install their own tools -AUTOTOOLS_AUTO_DEPEND=no - -inherit eutils multilib toolchain-funcs autotools - -DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools" -HOMEPAGE="http://www.iptables.org/" -SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" -IUSE="ipv6 netlink" - -COMMON_DEPEND=" - netlink? ( net-libs/libnfnetlink ) -" -DEPEND=" - ${COMMON_DEPEND} - virtual/os-headers - sys-devel/automake -" -RDEPEND=" - ${COMMON_DEPEND} -" - -src_prepare() { - epatch "${FILESDIR}/iptables-1.4.12.1-lm.patch" - eautomake - - # Only run \ No newline at end of file +src_install() { + emake install DESTDIR="${D}" + dodoc INCOMPATIBILITIES iptables/iptables.xslt + + # all the iptables binaries are in /sbin, so might as well + # put these small files in with them + into / + dosbin iptables/iptables-apply + dosym iptables-apply /sbin/ip6tables-apply + doman iptables/iptables-apply.8 + + insinto /usr/include + doins include/iptables.h $(use ipv6 && echo include/ip6tables.h) + insinto /usr/include/iptables + doins include/iptables/internal.h + + keepdir /var/lib/iptables + newinitd "${FILESDIR}"/${PN}-1.4.11.init iptables + newconfd "${FILESDIR}"/${PN}-1.3.2.confd iptables + if use ipv6 ; then + keepdir /var/lib/ip6tables + newinitd "${FILESDIR}"/iptables-1.4.11.init ip6tables + newconfd "${FILESDIR}"/ip6tables-1.3.2.confd ip6tables + fi + + # Move important libs to /lib + gen_usr_ldscript -a ip{4,6}tc ipq iptc xtables + find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed" +} diff --git a/net-firewall/iptables/iptables-1.4.6.ebuild b/net-firewall/iptables/iptables-1.4.6.ebuild index 38f93066f276..05f3f62c33a7 100644 --- a/net-firewall/iptables/iptables-1.4.6.ebuild +++ b/net-firewall/iptables/iptables-1.4.6.ebuild @@ -28,23 +28,27 @@ src_compile() { --sbindir=/sbin \ --libexecdir=/$(get_libdir) \ --enable-devel \ - --e# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.6.ebuild,v 1.9 2012/06/26 04:36:01 zmedico Exp $ - -inherit eutils multilib toolchain-funcs - -DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools" -HOMEPAGE="http://www.iptables.org/" -SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" -IUSE="ipv6" - -DEPEND="virtual/os-headers - !>=sys-kernel/linux-headers-2.6.33" -RDEPEND="" + --enable-libipq \ + --enable-shared \ + --enable-static \ + $(use_enable ipv6) + emake V=1 || die +} -src_unp \ No newline at end of file +src_install() { + emake install DESTDIR="${D}" || die + + insinto /usr/include + doins include/iptables.h $(use ipv6 && echo include/ip6tables.h) || die + insinto /usr/include/iptables + doins include/iptables/internal.h || die + + keepdir /var/lib/iptables + newinitd "${FILESDIR}"/${PN}-1.3.2.init iptables || die + newconfd "${FILESDIR}"/${PN}-1.3.2.confd iptables || die + if use ipv6 ; then + keepdir /var/lib/ip6tables + newinitd "${FILESDIR}"/iptables-1.3.2.init ip6tables || die + newconfd "${FILESDIR}"/ip6tables-1.3.2.confd ip6tables || die + fi +} diff --git a/net-firewall/pftop/pftop-0.7-r2.ebuild b/net-firewall/pftop/pftop-0.7-r2.ebuild index 4e0b7c9d2c9a..a979d6eb2211 100644 --- a/net-firewall/pftop/pftop-0.7-r2.ebuild +++ b/net-firewall/pftop/pftop-0.7-r2.ebuild @@ -7,17 +7,6 @@ PATCH_PV=3 inherit bsdmk flag-o-matic eutils -DESCRIPTION="Pftop: curses-based utility for real-time display of active states and rule statistics for pf" -HOMEPAGE="http://www.eee.metu.edu.tr/~canacar/pftop/" -SRC_URI="http://w# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/pftop/pftop-0.7-r2.ebuild,v 1.1 2012/07/22 00:01:31 the_paya Exp $ - -EAPI=4 -PATCH_PV=3 - -inherit bsdmk flag-o-matic eutils - DESCRIPTION="Pftop: curses-based utility for real-time display of active states and rule statistics for pf" HOMEPAGE="http://www.eee.metu.edu.tr/~canacar/pftop/" SRC_URI="http://www.eee.metu.edu.tr/~canacar/${P}.tar.gz @@ -43,4 +32,19 @@ src_compile() { *-openbsd*) local obsdver=${CHOST/*-openbsd/} OSLEVEL=${obsdver//.} - \ No newline at end of file + ;; + *-freebsd[78]*) OSLEVEL=41 ;; + *-freebsd9*) OSLEVEL=45 ;; + *) + die "Your OS/Version is not supported (${CHOST}), please report." + ;; + esac + append-flags "-DHAVE_SNPRINTF -DHAVE_VSNPRINTF -DOS_LEVEL=${OSLEVEL}" + use altq && append-flags "-DHAVE_ALTQ" + mkmake LOCALBASE="/usr" CFLAGS="${CFLAGS}" || die "pmake failed" +} + +src_install() { + mkinstall DESTDIR="${D}" LOCALBASE="/usr" MANDIR="/usr/share/man/man" \ + NO_MANCOMPRESS= install || die +} diff --git a/net-firewall/psad/Manifest b/net-firewall/psad/Manifest index f898cd208b78..ccd18a7adb10 100644 --- a/net-firewall/psad/Manifest +++ b/net-firewall/psad/Manifest @@ -1,4 +1,2 @@ DIST psad-2.2.2.tar.bz2 1251478 SHA256 e65ad95cbc276957841df2bfaef80625ad1670cae620f09af1e56ad802f5f43e SHA512 dc0d61833d33e9f15d2507b4ddc72212eb087f010abd6bf086a44ae1760b7174588ac78c3f84eba005456d01fced1795709b9bcd29f01d863fb249f10677e734 WHIRLPOOL c50fcf3a89e1570f02e7d92298155d913ed73f1043bbe4b2e8d7bd60b81b29e65abe55f269d9fbea3de297cd9fae54cdc534f7c5475ca20d6c5436426d9449e9 DIST psad-2.2.3.tar.bz2 1253488 SHA256 2d6976c395cdf2d7372bb06d85608fed0c91d54a63737d7d2671f90b44cdbc1e SHA512 1cc424252d287cf8f120e9e097a174c19da218f3efaaec1d9249c6b5cb976c5ab8fce70e7cf8a770366919e83c99f9b5462d44f9919645ea1fc9312e757f904a WHIRLPOOL 377563f32a43655d1d0989166783369e8071808e9746795dbaafdcb7c9c673756e379a9ee5a2ee30751223b6ee41e8dbbc730a925464cc1632021359e94e3071 -DIST psad-2.2.2.tar.bz2 1251478 SHA256 e65ad95cbc276957841df2bfaef80625ad1670cae620f09af1e56ad802f5f43e SHA512 dc0d61833d33e9f15d2507b4ddc72212eb087f010abd6bf086a44ae1760b7174588ac78c3f84eba005456d01fced1795709b9bcd29f01d863fb249f10677e734 WHIRLPOOL c50fcf3a89e1570f02e7d92298155d913ed73f1043bbe4b2e8d7bd60b81b29e65abe55f269d9fbea3de297cd9fae54cdc534f7c5475ca20d6c5436426d9449e9 -DIST psad-2.2.3.tar.bz2 1253488 SHA256 2d6976c395cdf2d7372bb06d85608fed0c91d54a63737d7d2671f90b44cdbc1e SHA512 1cc424252d287cf8f120e9e097a174c19da218f3efaaec1d9249c6b5cb976c5ab8fce70e7cf8a770366919e83c99f9b5462d44f9919645ea1fc9312e757f904a WHIRLPOOL 377563f32a43655d1d0989166783369e8071808e9746795dbaafdcb7c9c673756e379a9ee5a2ee30 \ No newline at end of file diff --git a/net-firewall/rtsp-conntrack/Manifest b/net-firewall/rtsp-conntrack/Manifest index 10544a0aea89..ecb90044c22c 100644 --- a/net-firewall/rtsp-conntrack/Manifest +++ b/net-firewall/rtsp-conntrack/Manifest @@ -1,2 +1 @@ DIST rtsp-module-3.7.tar.gz 11474 SHA256 a8333924e9553ec25ed0707b8e78637bf055e654a888ff7e40634f356102068a SHA512 480316f41f7e9a2a75b73b3edcbbdc98bf293f013a5549c6829659e601d2d1ec0ac94f7a2519cd6e40d41cbd02cf64f81fe2a371c703c3b0ba36d200fe29a3c1 WHIRLPOOL c76f20fb016a11c036d452998a6892af055247dccb7fa6e35c5c4bd2954fcc2a7b2d1403612d05c19d278ff4222faaaaa31284e81d7c135ed7cac47f2b3c69d3 -DIST rtsp-module-3.7.tar.gz 11474 SHA256 a8333924e9553ec25ed0707b8e78637bf055e654a888ff7e40634f356102068a SHA512 480316f41f7e9a2a75b73b3edcbbdc98bf293f013a5549c6829659e601d2d1ec0ac94f7a2519cd6e40d41cbd02cf64f81fe2a371c703c3b0ba36d200fe29a3c1 WHIRLPOOL c76f20fb016a11c036d452998a6892af055247dccb7fa6e35c5c4bd2954fcc2a7b2d1403612d05c19d278ff4222faaaaa31284e81d7c135ed7cac47f2b3c69d3 diff --git a/net-firewall/sanewall/sanewall-1.1.3.ebuild b/net-firewall/sanewall/sanewall-1.1.3.ebuild index 80d01671fd15..dc542338ace6 100644 --- a/net-firewall/sanewall/sanewall-1.1.3.ebuild +++ b/net-firewall/sanewall/sanewall-1.1.3.ebuild @@ -14,33 +14,6 @@ LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" -DEPEND="app-arch/xz-utils" -RDEPEND="net-firewall/iptables - sys-apps/iproute2[-minimal] - virtual/modutils - || ( - net-misc/wget - net-misc/curl - )" - -pkg_setup() { - local KCONFIG_OPTS="~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_MARK ~NF_NAT ~NF_NAT_FTP ~NF_NAT_IRC \ - ~IP_NF_IP# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/sanewall/sanewall-1.1.3.ebuild,v 1.1 2013/06/15 11:07:43 radhermit Exp $ - -EAPI=5 - -inherit linux-info - -DESCRIPTION="iptables firewall generator (fork of firehol)" -HOMEPAGE="http://www.sanewall.org/" -SRC_URI="http://download.sanewall.org/releases/${PV}/${P}.tar.xz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" - DEPEND="app-arch/xz-utils" RDEPEND="net-firewall/iptables sys-apps/iproute2[-minimal] @@ -53,4 +26,32 @@ RDEPEND="net-firewall/iptables pkg_setup() { local KCONFIG_OPTS="~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_MARK ~NF_NAT ~NF_NAT_FTP ~NF_NAT_IRC \ ~IP_NF_IPTABLES ~IP_NF_FILTER ~IP_NF_TARGET_REJECT ~IP_NF_TARGET_LOG ~IP_NF_TARGET_ULOG \ - ~IP_NF_TARGET_MASQUERADE ~IP_NF_TARGET_REDIRECT ~IP_NF_ \ No newline at end of file + ~IP_NF_TARGET_MASQUERADE ~IP_NF_TARGET_REDIRECT ~IP_NF_MANGLE \ + ~NETFILTER_XT_MATCH_LIMIT ~NETFILTER_XT_MATCH_STATE ~NETFILTER_XT_MATCH_OWNER" + + get_version + if [[ ${KV_PATCH} -ge 25 ]] ; then + CONFIG_CHECK="~NF_CONNTRACK ${KCONFIG_OPTS}" + else + CONFIG_CHECK="~NF_CONNTRACK_ENABLED ${KCONFIG_OPTS}" + fi + linux-info_pkg_setup +} + +src_configure() { + econf --docdir="/usr/share/doc/${PF}" +} + +src_install() { + default + newconfd "${FILESDIR}"/${PN}.confd ${PN} + newinitd "${FILESDIR}"/${PN}.initd ${PN} +} + +pkg_postinst() { + # install default configuration if it doesn't exist + if [[ ! -e "${ROOT}"/etc/${PN}/${PN}.conf ]] ; then + einfo "Installing a sample configuration to ${ROOT}/etc/${PN}/${PN}.conf" + cp "${ROOT}"/etc/${PN}/${PN}.conf.example "${ROOT}"/etc/${PN}/${PN}.conf || die + fi +} diff --git a/net-firewall/shapecfg/files/README.shaper b/net-firewall/shapecfg/files/README.shaper index 909649e9dff3..60c2b4d6afb6 100644 --- a/net-firewall/shapecfg/files/README.shaper +++ b/net-firewall/shapecfg/files/README.shaper @@ -34,26 +34,17 @@ Gotchas: shape received traffic except at the end (or a router) transmitting it. Gated/routed/rwhod/mrouted all see the shaper as an additional device -an -Traffic Shaper For Linux +and will treat it as such unless patched. Note that for mrouted you can run +mrouted tunnels via a traffic shaper to control bandwidth usage. -This is the current ALPHA release of the traffic shaper for Linux. It works -within the following limits: + The shaper is device/route based. This makes it very easy to use +with any setup BUT less flexible. You may well want to combine this patch +with Mike McLagan 's patch to allow routes to be +specified by source/destination pairs. -o Minimum shaping speed is currently about 9600 baud (it can only - shape down to 1 byte per clock tick) + There is no "borrowing" or "sharing" scheme. This is a simple +traffic limiter. I'd like to implement Van Jacobson and Sally Floyd's CBQ +architecture into Linux one day (maybe in 2.1 sometime) and do this with +style. -o Maximum is about 256K, it will go above this but get a bit blocky. - -o If you ifconfig the master device that a shaper is attached to down - then your machine will follow. - -o The shaper must be a module. - - -Setup: - -A shaper device is configured using the shapeconfig program. -Typically you will do something like this -shapecfg attach shaper \ No newline at end of file diff --git a/net-firewall/shorewall-core/shorewall-core-4.5.21.9.ebuild b/net-firewall/shorewall-core/shorewall-core-4.5.21.9.ebuild index 3c2f15446d86..ba10a49673a9 100644 --- a/net-firewall/shorewall-core/shorewall-core-4.5.21.9.ebuild +++ b/net-firewall/shorewall-core/shorewall-core-4.5.21.9.ebuild @@ -31,36 +31,44 @@ KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86" IUSE="selinux" DEPEND=" - >=dev-lang/perl-5.10# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-core/shorewall-core-4.5.21.9.ebuild,v 1.8 2014/09/19 09:17:43 ago Exp $ - -EAPI="5" - -inherit eutils prefix versionator - -MY_URL_PREFIX= -case ${P} in - *_beta* | \ - *_rc*) - MY_URL_PREFIX='development/' - ;; -esac - -MY_PV=${PV/_rc/-RC} -MY_PV=${MY_PV/_beta/-Beta} -MY_P=${PN}-${MY_PV} - -MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2) -MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3) - -DESCRIPTION="Core libraries of shorewall / shorewall(6)-lite" -HOMEPAGE="http://www.shorewall.net/" -SRC_URI="http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86" -IUSE="selinux" - -DEPEND=" \ No newline at end of file + >=dev-lang/perl-5.10 + virtual/perl-Digest-SHA + !=sec-policy/selinux-shorewall-2.20130424-r2 ) +" +RDEPEND=" + ${DEPEND} + >=net-firewall/iptables-1.4.20 + >=sys-apps/iproute2-3.8.0[-minimal] + >=sys-devel/bc-1.06.95 + >=sys-apps/coreutils-8.20 +" + +DOCS=( changelog.txt releasenotes.txt ) + +S=${WORKDIR}/${PN}-${MY_PV} + +src_prepare() { + cp "${FILESDIR}"/${PVR}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed" + eprefixify "${S}"/shorewallrc.gentoo + + epatch_user +} + +src_configure() { + :; +} + +src_install() { + DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed" + default +} + +pkg_postinst() { + if ! has_version sys-apps/net-tools; then + elog "It is recommended to install sys-apps/net-tools which will provide the" + elog "the 'arp' utility which will give you a better 'shorewall-lite dump' output:" + elog "" + elog " # emerge sys-apps/net-tools" + fi +} diff --git a/net-firewall/shorewall-init/files/4.5.21.10/shorewallrc b/net-firewall/shorewall-init/files/4.5.21.10/shorewallrc index 21bd154625dd..46f5eb9a3603 100644 --- a/net-firewall/shorewall-init/files/4.5.21.10/shorewallrc +++ b/net-firewall/shorewall-init/files/4.5.21.10/shorewallrc @@ -13,15 +13,11 @@ MANDIR=${PREFIX}/share/man #Directory where manpages are installed. INITDIR=${CONFDIR}/init.d #Directory where SysV init scripts are installed. INITFILE=${PRODUCT} #Name of the product's installed SysV init script INITSOURCE=init.gentoo.sh #Name of the distributed file to be installed as the SysV init script -ANNOTATED= # -# Gentoo Shorewall 4.5 rc file -# -BUILD= #Default is to detect the build system -HOST=gentoo #Gentoo GNU Linux -PREFIX=@GENTOO_PORTAGE_EPREFIX@/usr #Top-level directory for shared files, libraries, etc. -SHAREDIR=${PREFIX}/share #Directory for arch-neutral files. -LIBEXECDIR=${PREFIX}/share #Directory for executable scripts. -PERLLIBDIR=${PREFIX}/share/shorewall #Directory to install Shorewall Perl module directory -CONFDIR=@GENTOO_PORTAGE_EPREFIX@/etc #Directory where subsystem configurations are installed -SBINDIR=@GENTOO_PORTAGE_EPREFIX@/sbin #Directory where system administration programs are installed -MANDIR=${PREFIX}/share/man #Directory where \ No newline at end of file +ANNOTATED= #If non-zero, annotated configuration files are installed +SYSTEMD=@GENTOO_PORTAGE_EPREFIX@/usr/lib/systemd/system #Directory where .service files are installed (systems running systemd only) +SERVICEFILE=gentoo.service #Name of the distributed file to be installed as systemd service file +SYSCONFFILE=default.gentoo #Name of the distributed file to be installed in $SYSCONFDIR +SYSCONFDIR=${CONFDIR}/conf.d #Directory where SysV init parameter files are installed +SPARSE= #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR +VARLIB=@GENTOO_PORTAGE_EPREFIX@/var/lib #Directory where product variable data is stored. +VARDIR=${VARLIB}/${PRODUCT} #Directory where product variable data is stored. diff --git a/net-firewall/shorewall-init/files/4.5.21.9/README.Gentoo.txt b/net-firewall/shorewall-init/files/4.5.21.9/README.Gentoo.txt index 48ff66d5decc..f7b13fed3de6 100644 --- a/net-firewall/shorewall-init/files/4.5.21.9/README.Gentoo.txt +++ b/net-firewall/shorewall-init/files/4.5.21.9/README.Gentoo.txt @@ -14,16 +14,17 @@ if-{up,down}.d folder like other distributions do. If you would want to use such a feature, you would have to add a custom action to /etc/conf.d/net (please refer to the Gentoo Linux Handbook [2] for more information). If you are able to add your custom {pre,post}{up,down} action, your are -also able to specify what shorewall{6,-lishorewall-init from upstream offers two features (taken from [1]): +also able to specify what shorewall{6,-lite,6-lite} should do, so there is +no need for upstream's scripts in Gentoo. - 1. It can 'close' the firewall before the network interfaces are - brought up during boot. - - 2. It can change the firewall state as the result of interfaces - being brought up or taken down. +If you disagree with us, feel free to open a bug [3] and contribute your +solution for Gentoo. -On Gentoo we only support the first feature -- the firewall lockdown during -boot. +Upstream's original init script also supports saving and restoring of +ipsets. Please use the init script from net-firewall/ipset if you need +such a feature. -We do not support the second feature, because Gentoo doesn't support a -if-{up,down}.d folder like other distributions do. If you wou \ No newline at end of file + +[1] http://www.shorewall.net/Shorewall-init.html +[2] http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=4&chap=5 +[3] https://bugs.gentoo.org diff --git a/net-firewall/shorewall/shorewall-4.5.18-r1.ebuild b/net-firewall/shorewall/shorewall-4.5.18-r1.ebuild index d02817a3981b..dda79113e663 100644 --- a/net-firewall/shorewall/shorewall-4.5.18-r1.ebuild +++ b/net-firewall/shorewall/shorewall-4.5.18-r1.ebuild @@ -30,20 +30,34 @@ DEPEND=">=net-firewall/iptables-1.2.4 RDEPEND="${DEPEND}" src_prepare() { - cp "${FILESDIR}"/${PVR}/shorewallrc_new "${S}"/shorewallrc.gen# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.5.18-r1.ebuild,v 1.9 2014/06/12 14:02:16 tomwij Exp $ + cp "${FILESDIR}"/${PVR}/shorewallrc_new "${S}"/shorewallrc.gentoo || die "Copying shorewallrc_new failed" + eprefixify "${S}"/shorewallrc.gentoo -EAPI="5" + cp "${FILESDIR}"/${PVR}/${PN}.initd "${S}"/init.gentoo.sh || die "Copying shorewall.initd failed" -inherit eutils prefix systemd versionator + epatch "${FILESDIR}"/${PVR}/shorewall.conf-SUBSYSLOCK.patch + epatch_user +} -# Select version (stable, RC, Beta): -MY_PV_TREE=$(get_version_component_range 1-2) # for devel versions use "development/$(get_version_component_range 1-2)" -MY_PV_BASE=$(get_version_component_range 1-3) +src_configure() { + :; +} -MY_P="${PN}-${MY_PV_BASE}" -MY_P_DOCS="${P/${PN}/${PN}-docs-html}" +src_compile() { + :; +} -DESCRIPTION="Shoreline Firewall is an iptables-based firewall for Linux" -HOMEPAGE="http://www.s \ No newline at end of file +src_install() { + keepdir /var/lib/shorewall + + cd "${WORKDIR}/${P}" + DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed" + systemd_newunit "${FILESDIR}"/${PVR}/shorewall.systemd 'shorewall.service' + + dodoc changelog.txt releasenotes.txt + if use doc; then + dodoc -r Samples + cd "${WORKDIR}/${MY_P_DOCS}" + dohtml -r * + fi +} diff --git a/net-firewall/shorewall6-lite/files/4.5.21.10/shorewall6-lite.initd b/net-firewall/shorewall6-lite/files/4.5.21.10/shorewall6-lite.initd index 7951808863b9..7f1ba44d1d72 100644 --- a/net-firewall/shorewall6-lite/files/4.5.21.10/shorewall6-lite.initd +++ b/net-firewall/shorewall6-lite/files/4.5.21.10/shorewall6-lite.initd @@ -49,28 +49,34 @@ stop() { } restart() { - # shorewall comes with its own control script tha#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/files/4.5.21.10/shorewall6-lite.initd,v 1.1 2014/06/12 14:32:38 tomwij Exp $ + # shorewall comes with its own control script that includes a + # restart function, so refrain from calling svc_stop/svc_start + # here. Note that this comment is required to fix bug 55576; + # runscript.sh greps this script... (09 Jul 2004 agriffis) -description='The Shoreline Firewall 6 Lite, more commonly known as "Shorewall6 Lite", is' -description="${description} a high-level tool for configuring Netfilter." + ebegin "Restarting shorewall6-lite" + /sbin/shorewall6-lite status 1>/dev/null + if [ $? != 0 ] ; then + svc_start + else + /sbin/shorewall6-lite ${OPTIONS} restart ${RESTARTOPTIONS} 1>/dev/null + fi + eend $? +} -extra_commands="clear" -extra_started_commands="reset" +clear() { + # clear will remove all the rules and bring the system to an unfirewalled + # state. (21 Nov 2004 eldad) -description_clear="Clear will remove all rules and chains installed by" -description_clear="${description_clear} Shorewall6 Lite. The firewall is" -description_clear="${description_clear} then wide open and unprotected." + ebegin "Clearing all shorewall6-lite rules and setting policy to ACCEPT" + /sbin/shorewall6-lite ${OPTIONS} clear 1>/dev/null + eend $? +} -description_reset="All the packet and byte counters in the firewall are reset." +reset() { + # reset the packet and byte counters in the firewall -depend() { - need net - provide firewall - after ulogd + ebegin "Resetting the packet and byte counters in shorewall6-lite" + /sbin/shorewall6-lite ${OPTIONS} reset 1>/dev/null + eend $? } - -status() { - local \ No newline at end of file diff --git a/net-firewall/ufw-frontends/files/ufw-frontends-0.3.2-no-log-crash.patch b/net-firewall/ufw-frontends/files/ufw-frontends-0.3.2-no-log-crash.patch index f4bca93851a5..f4adb49826ec 100644 --- a/net-firewall/ufw-frontends/files/ufw-frontends-0.3.2-no-log-crash.patch +++ b/net-firewall/ufw-frontends/files/ufw-frontends-0.3.2-no-log-crash.patch @@ -52,7 +52,10 @@ index 75ebb33..75dfde0 100644 self.ui.events_model.append(data) - self._notifier = Notifier(callback) + self._notifier = Notifier(callback, -+ lambda: self.ui.events_view.set_seFrom e7bcf87788588c3a38ce18c9a8d69bbe156860e9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?S=C5=82awomir=20Nizio?= -Date: Mon, 3 Mar 2014 08:31:47 +0100 -Subject: [PATCH \ No newline at end of file ++ lambda: self.ui.events_view.set_sensitive(False)) + self.ui.main_window.show_all() + ## FIXME: for the 0.3.0 release, hide the tab for the connections view + page = self.ui.view.get_nth_page(2) +-- +1.9.0 + diff --git a/net-firewall/ufw/files/ufw-0.33-dont-check-iptables.patch b/net-firewall/ufw/files/ufw-0.33-dont-check-iptables.patch index 68b6ca0d847f..b7eae3595cb5 100644 --- a/net-firewall/ufw/files/ufw-0.33-dont-check-iptables.patch +++ b/net-firewall/ufw/files/ufw-0.33-dont-check-iptables.patch @@ -5,25 +5,6 @@ diff -ur ufw-0.32/setup.py ufw-0.32.new/setup.py os.unlink(os.path.join('staging', 'ufw-init')) os.unlink(os.path.join('staging', 'ufw-init-functions')) --iptables_exe = '' --iptables_dir = '' -- --for e in ['iptables']: -- for dir in ['/sbin', '/bin', '/usr/sbin', '/usr/bin', '/usr/local/sbin', \ -- '/usr/local/bin']: -- if e == "iptables": -- if os.path.exists(os.path.join(dir, e)): -- iptables_dir = dir -- iptables_exe = os.path.join(iptables_dir, "iptables") -- print("Found '%s'" % iptables_exe) -- else: -- contdiff -ur ufw-0.32/setup.py ufw-0.32.new/setup.py ---- ufw-0.32/setup.py 2012-07-06 17:46:29.000000000 +0200 -+++ ufw-0.32.new/setup.py 2012-07-30 15:28:31.874547818 +0200 -@@ -225,41 +225,7 @@ - os.unlink(os.path.join('staging', 'ufw-init')) - os.unlink(os.path.join('staging', 'ufw-init-functions')) - -iptables_exe = '' -iptables_dir = '' - @@ -43,4 +24,23 @@ diff -ur ufw-0.32/setup.py ufw-0.32.new/setup.py - - -if iptables_exe == '': -- print("ERROR: could not find required binary 'ip \ No newline at end of file +- print("ERROR: could not find required binary 'iptables'", file=sys.stderr) +- sys.exit(1) +- +-for e in ['ip6tables', 'iptables-restore', 'ip6tables-restore']: +- if not os.path.exists(os.path.join(iptables_dir, e)): +- print("ERROR: could not find required binary '%s'" % (e), file=sys.stderr) +- sys.exit(1) +- +-(rc, out) = cmd([iptables_exe, '-V']) +-if rc != 0: +- raise OSError(errno.ENOENT, "Could not find version for '%s'" % \ +- (iptables_exe)) +-version = re.sub('^v', '', re.split('\s', str(out))[1]) +-print("Found '%s' version '%s'" % (iptables_exe, version)) +-if version < "1.4": +- print("WARN: version '%s' has limited IPv6 support. See README for details." % (version), file=sys.stderr) ++iptables_dir = '/sbin' + + setup (name='ufw', + version=ufw_version, diff --git a/net-fs/davfs2/Manifest b/net-fs/davfs2/Manifest index dfb60f185ba2..2904835f7e7a 100644 --- a/net-fs/davfs2/Manifest +++ b/net-fs/davfs2/Manifest @@ -1,3 +1,2 @@ -DIST davfs2-1.4.5.tar.gz 429635 SHA256 28f0ce00ddaf1ab93aa9f39db8d9f932d194c676bc21c3c8c3e2bea7f21274de SHA512 0fd20e8aba8d236feec06b3f2184388691ee19a4e993cf543a-----BEGIN PGP SIGNED MESSAGE----- DIST davfs2-1.4.5.tar.gz 429635 SHA256 28f0ce00ddaf1ab93aa9f39db8d9f932d194c676bc21c3c8c3e2bea7f21274de SHA512 0fd20e8aba8d236feec06b3f2184388691ee19a4e993cf543a2356feb9c25e1de41521c462bd01497f89ff4d16d0d3defb3227a64c0a490db2c0647e1391c9d1 WHIRLPOOL 955d98c0a2b49d5400971b9381d05f87c21420a5b52a4ef1ec330cfd6d4f451e56a6fa884164ed84dabae06aa29010df66ccd6e048e932d30e01545257152e31 DIST davfs2-1.4.7.tar.gz 444398 SHA256 50c0ee2a12e8d09fc6a852d32bdfebb1f784939433a85f05254bc7ef28cff044 SHA512 6754d08cdfcceea47a4248fb05a6f5a1907acbc9a6c0ab175dce640b160ee24b7efdf9da38be1cc8bd6dbb0825c88a7017a3534a7c3188860dcd1bef12a5d4ae WHIRLPOOL f4c44ccc1fbd146f563605b2290068b549f6dcf247224685f2efaf9cda91a947a45dceed17d3d585407dc8e4ffa85c933d6eb5b4e78e0f00bd18cfbd53f52c7d diff --git a/net-fs/wdfs/Manifest b/net-fs/wdfs/Manifest index 98dfca0b542e..e700cf7f352c 100644 --- a/net-fs/wdfs/Manifest +++ b/net-fs/wdfs/Manifest @@ -1,2 +1 @@ DIST wdfs-1.4.2.tar.gz 109315 SHA256 fcf2e1584568b07c7f3683a983a9be26fae6534b8109e09167e5dff9114ba2e5 -DIST wdfs-1.4.2.tar.gz 109315 SHA256 fcf2e1584568b07c7f3683a983a9be26fae6534b8109e09167e5dff9114ba2e5 diff --git a/net-im/ejabberd/metadata.xml b/net-im/ejabberd/metadata.xml index d14c8141681a..0dd5b42ea3ab 100644 --- a/net-im/ejabberd/metadata.xml +++ b/net-im/ejabberd/metadata.xml @@ -1,4 +1,4 @@ - + net-im @@ -17,4 +17,6 @@ Enable web admin interface Support for CAPTCHA Forms (XEP-158) Support for SOCKS5 Bytestreams (XEP-0065) - Measures several statistics, and provides a new section in ejabberd Web Admin to view them. \ No newline at end of file + Measures several statistics, and provides a new section in ejabberd Web Admin to view them. + + diff --git a/net-im/ekg/ekg-1.8_rc1-r1.ebuild b/net-im/ekg/ekg-1.8_rc1-r1.ebuild index 2234f5256306..5039ee52652c 100644 --- a/net-im/ekg/ekg-1.8_rc1-r1.ebuild +++ b/net-im/ekg/ekg-1.8_rc1-r1.ebuild @@ -38,25 +38,37 @@ src_prepare() { "${FILESDIR}/"${P}-gtk.patch \ "${FILESDIR}/"${P}-libgif.patch \ "${FILESDIR}/"${P}-missing-prototypes.patch - sed -i -e 's/ioctld.c -o/$(LDFLAGS) # Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/ekg/ekg-1.8_rc1-r1.ebuild,v 1.3 2014/09/19 16:50:54 jer Exp $ - -EAPI=2 -inherit autotools eutils - -IUSE="gif gtk jpeg ncurses python readline spell ssl zlib" + sed -i -e 's/ioctld.c -o/$(LDFLAGS) ioctld.c -o/' \ + src/Makefile.in || die #333797 + eautoreconf +} -DESCRIPTION="EKG (Eksperymentalny Klient Gadu-Gadu) - a text client for Polish instant messaging system Gadu-Gadu" -HOMEPAGE="http://ekg.chmurka.net/" -SRC_URI="http://ekg.chmurka.net/${P/_/}.tar.gz" +src_configure() { + local myconf="--enable-ioctld" # --disable-static --enable-dynamic" + if use ncurses; then + myconf="$myconf --enable-force-ncurses" + else + myconf="$myconf --disable-ui-ncurses" + fi + use readline && myconf="$myconf --enable-ui-readline" -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86" + econf ${myconf} \ + `use_with python` \ + `use_with jpeg libjpeg` \ + `use_with zlib` \ + `use_with gif libgif` \ + `use_enable spell aspell` \ + `use_with ssl openssl` \ + `use_enable ssl openssl` \ + `use_enable gtk ui-gtk` \ + || die +} -S="${WORKDIR}/${P/_/}" +src_compile() { + emake || die +} -RDEPEND="net-libs/libgadu - ssl? ( >=dev-libs/openssl-0.9.6 ) - ncurses? ( sys-libs/nc \ No newline at end of file +src_install() { + make DESTDIR="${D}" install || die + dodoc docs/{*.txt,ULOTKA,TODO,README,FAQ} +} diff --git a/net-im/empathy/files/empathy-2.34.0-CVE-2011-3635.patch b/net-im/empathy/files/empathy-2.34.0-CVE-2011-3635.patch index 981ed87fa112..6040778e73d5 100644 --- a/net-im/empathy/files/empathy-2.34.0-CVE-2011-3635.patch +++ b/net-im/empathy/files/empathy-2.34.0-CVE-2011-3635.patch @@ -8,26 +8,6 @@ Not doing so can lead to nasty HTML injection from hostile users. https://bugzilla.gnome.org/show_bug.cgi?id=662035 -[Alexandre Rostovtsev : backport to 2.32, and for - good measure, escape alias on /me-type events too] ---- - libempathy-gtk/empathy-theme-adium.c | 9 ++++++--- - 1 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c -index 8c6301e..08f79b4 100644 ---- a/libempathy-gtk/empathy-theme-adium.c -+++ b/libempathy-gtk/empathy-theme-adium.c -@@ -436,7 +436,7 @@ theme_adium_appenFrom 192ce4dacc108f1b62e8ef752eeb5a2bee3d337f Mon Sep 17 00:00:00 2001 -From: Guillaume Desmottes -Date: Tue, 18 Oct 2011 18:32:52 +0200 -Subject: [PATCH] theme_adium_append_message: escape alias before displaying - it - -Not doing so can lead to nasty HTML injection from hostile users. - -https://bugzilla.gnome.org/show_bug.cgi?id=662035 - [Alexandre Rostovtsev : backport to 2.32, and for good measure, escape alias on /me-type events too] --- @@ -55,4 +35,36 @@ index 8c6301e..08f79b4 100644 contact_id = empathy_contact_get_id (sender); /* If this is a /me, append an event */ - if (empathy_message_get_tptype (msg) == TP_CHANNEL_TEXT_MESSA \ No newline at end of file + if (empathy_message_get_tptype (msg) == TP_CHANNEL_TEXT_MESSAGE_TYPE_ACTION) { + gchar *str; + +- str = g_strdup_printf ("%s %s", name, body_escaped); ++ str = g_strdup_printf ("%s %s", name_escaped, body_escaped); + theme_adium_append_event_escaped (view, str); + + g_free (str); + g_free (body_escaped); ++ g_free (name_escaped); + return; + } + +@@ -600,7 +602,7 @@ theme_adium_append_message (EmpathyChatView *view, + + if (html != NULL) { + theme_adium_append_html (theme, func, html, len, body_escaped, +- avatar_filename, name, contact_id, ++ avatar_filename, name_escaped, contact_id, + service_name, message_classes->str, + timestamp, is_backlog); + } else { +@@ -616,6 +618,7 @@ theme_adium_append_message (EmpathyChatView *view, + priv->last_is_backlog = is_backlog; + + g_free (body_escaped); ++ g_free (name_escaped); + g_string_free (message_classes, TRUE); + } + +-- +1.7.7 + diff --git a/net-im/err/err-1.7.1.ebuild b/net-im/err/err-1.7.1.ebuild index 66033a3a32f9..381043582105 100644 --- a/net-im/err/err-1.7.1.ebuild +++ b/net-im/err/err-1.7.1.ebuild @@ -37,42 +37,54 @@ RESTRICT="test" # NOTES: # 1. It has bundled libs - for example exrex(see 'errbot/bundled' subfolder) -# 2. Need to add PYTHON_USED# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/err/err-1.7.1.ebuild,v 1.2 2014/08/05 18:34:16 mrueg Exp $ +# 2. Need to add PYTHON_USEDEP to remaining dev-python/ deps +# 3. Support for BOT_SENTRY option is missing, cause +# we do not have apropriate packages in portage yet +# 4. Internal web server is broken(dunno why :-() -EAPI=5 +pkg_setup() { + ebegin "Creating err group and user" + enewgroup 'err' + enewuser 'err' -1 -1 -1 'err' + eend ${?} +} -PYTHON_COMPAT=( python2_7 ) -inherit distutils-r1 eutils user +python_prepare_all() { + # Remove configparser and config from requirements as they are NOT needed + sed -i \ + -e "/install_requires/s/'configparser', //" \ + -e "/install_requires/s/, 'config'//" \ + setup.py || die -DESCRIPTION="Plugin based XMPP chatbot designed to be easily deployable, extensible and maintainable" -HOMEPAGE="http://gbin.github.com/err/" + # Tests are broken and should not be installed + rm -r tests || die -SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz" -KEYWORDS="~amd64 ~x86" -LICENSE="GPL-3" -SLOT="0" -IUSE="irc qt4 +plugins" + distutils-r1_python_prepare_all +} -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND="dev-python/dnspython[${PYTHON_USEDEP}] - dev-python/flask[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/pyfire[${PYTHON_USEDEP}] - dev-python/python-daemon[${PYTHON_USEDEP}] - dev-python/xmpppy - dev-python/yapsy[${PYTHON_USEDEP}] - irc? ( - dev-python/pyopenssl[${PYTHON_USEDEP}] - dev-python/twisted-core[${PYTHON_USEDEP}] - dev-python/twisted-words[${PYTHON_USEDEP}] - ) - qt4? ( dev-python/pyside[${PYTHON_USEDEP},X,webkit] ) - plugins? ( dev-vcs/git )" +python_install_all() { + distutils-r1_python_install_all -# Testsuite is broken since 1.6.3 -RESTRICT="test" + newinitd "${FILESDIR}"/errd.initd errd + newconfd "${FILESDIR}"/errd.confd errd -# NOTES: -# 1. It has bundled libs - for example exrex(see 'errbot/bundled' subfolder) + dodir /etc/${PN} + dodir /var/lib/${PN} + keepdir /var/log/${PN} + fowners -R err:err /var/lib/${PN} + fowners -R err:err /var/log/${PN} + + insinto /etc/${PN} + newins errbot/config-template.py config.py +} + +python_install() { + distutils-r1_python_install + + # Upstream requires images to be in site-packages directory, + # but does not install them at all! + if use qt4; then + local python_moduleroot=errbot + python_domodule errbot/*.svg + fi +} diff --git a/net-im/gajim/files/gajim-0.15.2-CVE-2012-5524.patch b/net-im/gajim/files/gajim-0.15.2-CVE-2012-5524.patch index 07617a4c2c17..b0b8882bdc32 100644 --- a/net-im/gajim/files/gajim-0.15.2-CVE-2012-5524.patch +++ b/net-im/gajim/files/gajim-0.15.2-CVE-2012-5524.patch @@ -24,29 +24,29 @@ index 8240652..6d3037a 100644 - gajim.nec.push_incoming_event(SSLErrorEvent(None, conn=self, - error_text=text, error_num=errnum, - cert=con.Connection.ssl_cert_pem, -- fingerprint=con.Connection.ssl_fingerpr src/common/connection.py | 50 +++++++++++++++++++++++++++--------------------- - 1 file changed, 28 insertions(+), 22 deletions(-) - -diff --git a/src/common/connection.py b/src/common/connection.py -index 8240652..6d3037a 100644 ---- a/src/common/connection.py -+++ b/src/common/connection.py -@@ -1309,25 +1309,28 @@ class Connection(CommonConnection, ConnectionHandlers): - hostname = gajim.config.get_per('accounts', self.name, 'hostname') - self.connection = con - try: -- errnum = con.Connection.ssl_errnum -+ errnum = [con.Connection.ssl_errnum] - except AttributeError: -- errnum = -1 # we don't have an errnum -- if errnum > 0 and str(errnum) not in gajim.config.get_per('accounts', -- self.name, 'ignore_ssl_errors').split(): -- text = _('The authenticity of the %s certificate could be invalid.' -- ) % hostname -- if errnum in ssl_error: -- text += _('\nSSL Error: %s') % ssl_error[errnum] -- else: -- text += _('\nUnknown SSL error: %d') % errnum -- gajim.nec.push_incoming_event(SSLErrorEvent(None, conn=self, -- error_text=text, error_num=errnum, -- cert=con.Connection.ssl_c \ No newline at end of file +- fingerprint=con.Connection.ssl_fingerprint_sha1, +- certificate=con.Connection.ssl_certificate)) +- return True ++ errnum = [] # we don't have an errnum ++ i = 0 ++ for er in errnum: ++ if er > 0 and str(er) not in gajim.config.get_per('accounts', ++ self.name, 'ignore_ssl_errors').split(): ++ text = _('The authenticity of the %s certificate could be ' ++ 'invalid.') % hostname ++ if er in ssl_error: ++ text += _('\nSSL Error: %s') % ssl_error[er] ++ else: ++ text += _('\nUnknown SSL error: %d') % er ++ gajim.nec.push_incoming_event(SSLErrorEvent(None, conn=self, ++ error_text=text, error_num=er, ++ cert=con.Connection.ssl_cert_pem[i], ++ fingerprint=con.Connection.ssl_fingerprint_sha1[i], ++ certificate=con.Connection.ssl_certificate[i])) ++ return True ++ i += 1 + if hasattr(con.Connection, 'ssl_fingerprint_sha1'): + saved_fingerprint = gajim.config.get_per('accounts', self.name, + 'ssl_fingerprint_sha1') + if saved_fingerprint: + # Check sha1 fingerprint diff --git a/net-im/gajim/gajim-0.15.4.ebuild b/net-im/gajim/gajim-0.15.4.ebuild index a214437c3f25..5094005365f3 100644 --- a/net-im/gajim/gajim-0.15.4.ebuild +++ b/net-im/gajim/gajim-0.15.4.ebuild @@ -58,47 +58,67 @@ RDEPEND="${COMMON_DEPEND} ) idle? ( x11-libs/libXScrnSaver ) jingle? ( net-libs/farstream:0.1[python] ) - kde? ( kde-base/kwalletmanage# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.15.4.ebuild,v 1.14 2014/05/17 13:57:45 ago Exp $ - -EAPI=5 - -PYTHON_COMPAT=( python{2_6,2_7} ) -PYTHON_REQ_USE="sqlite,xml" - -AUTOTOOLS_AUTORECONF=true - -inherit autotools-utils python-r1 versionator - -DESCRIPTION="Jabber client written in PyGTK" -HOMEPAGE="http://www.gajim.org/" -SRC_URI=" - http://www.gajim.org/downloads/$(get_version_component_range 1-2)/${P}.tar.bz2" -# test? ( http://dev.gentoo.org/~jlec/distfiles/${PN}-tests-${PV}.tar.xz )" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="avahi crypt dbus gnome gnome-keyring kde idle jingle libnotify networkmanager nls spell +srv test X xhtml" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - libnotify? ( dbus ) - avahi? ( dbus ) - gnome? ( gnome-keyring )" - -COMMON_DEPEND=" - ${PYTHON_DEPS} - dev-python/pygtk:2[${PYTHON_USEDEP}] - x11-libs/gtk+:2" -DEPEND="${COMMON_DEPEND} - >=dev-util/intltool-0.40.1 - virtual/pkgconfig - >=sys-devel/gettext-0.17-r1" -RDEPEND="${COMMON_DEPEND} - dev-python/pyasn1[${PYTHON_USEDEP}] - dev-python/pyopenssl[${PYTHON_USEDEP}] - crypt? ( - app-crypt/gnupg - dev-python/pyc \ No newline at end of file + kde? ( kde-base/kwalletmanager ) + networkmanager? ( + dev-python/dbus-python[${PYTHON_USEDEP}] + net-misc/networkmanager + ) + spell? ( app-text/gtkspell:2 ) + srv? ( + || ( + dev-python/libasyncns-python + net-dns/bind-tools ) + ) + xhtml? ( dev-python/docutils )" + +RESTRICT="test" + +PATCHES=( + "${FILESDIR}"/${PN}-0.15.3-roster.patch + ) + +src_prepare() { + echo "src/command_system/mapping.py" >> po/POTFILES.in + echo '#!/bin/sh' > config/py-compile + autotools-utils_src_prepare + python_copy_sources +} + +src_configure() { + configuration() { + local myeconfargs=( + $(use_enable nls) + $(use_with X x) + --docdir="/usr/share/doc/${PF}" + --libdir="$(python_get_sitedir)" + --enable-site-packages + ) + run_in_build_dir autotools-utils_src_configure + } + python_foreach_impl configuration +} + +src_compile() { + compilation() { + run_in_build_dir autotools-utils_src_compile + } + python_foreach_impl compilation +} + +src_test() { + testing() { + run_in_build_dir ${PYTHON} test/runtests.py --verbose 3 || die + } + python_foreach_impl testing +} + +src_install() { + installation() { + run_in_build_dir autotools-utils_src_install + python_optimize "${ED}"/$(python_get_sitedir) + } + python_foreach_impl installation + + rm "${D}/usr/share/doc/${PF}/README.html" || die + dohtml README.html +} diff --git a/net-im/ktp-filetransfer-handler/Manifest b/net-im/ktp-filetransfer-handler/Manifest index 4a5e53a5df10..258b7d125ba7 100644 --- a/net-im/ktp-filetransfer-handler/Manifest +++ b/net-im/ktp-filetransfer-handler/Manifest @@ -1,2 +1 @@ -DIST ktp-filetransfer-handler-0.8.1.tar.bz2 47689 SHA256 851cf4ba3cf45c199d434fdf1d53db3de8d0e63266e3a67b9872c47f9b29531b SHA512 207e0431da993b0f0d42ea1daee16cdf9ff65dca283a557a3ae70f7c225dfa0b828a62a27f0dfba246395a60df5d3987acf91c5c21e10bcf7f1aecd6731a5868 WHIRLPOOL 5d60cfe55f2-----BEGIN PGP SIGNED MESSAGE----- DIST ktp-filetransfer-handler-0.8.1.tar.bz2 47689 SHA256 851cf4ba3cf45c199d434fdf1d53db3de8d0e63266e3a67b9872c47f9b29531b SHA512 207e0431da993b0f0d42ea1daee16cdf9ff65dca283a557a3ae70f7c225dfa0b828a62a27f0dfba246395a60df5d3987acf91c5c21e10bcf7f1aecd6731a5868 WHIRLPOOL 5d60cfe55f27ac2ff22ab245fcd258c2310a962e6f8a45f7d0a6cfed1d3af505ba6aca2f9f6bb08646dc3f2a2a0489ebe8d5ef7f459dea00a0cf2642401c6864 diff --git a/net-im/ktp-kded-module/Manifest b/net-im/ktp-kded-module/Manifest index 55e66c98eddb..204e24f8c096 100644 --- a/net-im/ktp-kded-module/Manifest +++ b/net-im/ktp-kded-module/Manifest @@ -1,2 +1 @@ DIST ktp-kded-integration-module-0.8.1.tar.bz2 77573 SHA256 c4698d4dffce52721e8a710d40630c3e2318cb387708cf14a770d5d13a73bbee SHA512 47094c87c6c9c5d3711f16ba9302837bfaf564c3224c38bc81af65ba10710d95480689ee5790b53f0c865d94249bfc3f60a8d736294d8b301096ed5ef26d9d91 WHIRLPOOL f5d8860fb930887ff056160225ee273497d7b9a9bcde52c101bc5e783ef31cb8e4fe34bd88972012d147ee54c5449cca0fac30995e68070c6772234077fb5b02 -DIST ktp-kded-integration-module-0.8.1.tar.bz2 77573 SHA256 c4698d4dffce52721e8a710d40630c3e2318cb387708cf14a770d5d13a73bbee SHA512 47094c87c6c9c5d3711f16ba9302837bfaf564c3224c38bc81af65ba10710d95480689ee5790b53f0c865d94249bfc3f60a8d736294d8b301096ed5ef26d9d91 WHIRLPOOL f5d8860fb930887ff056160225ee273497d7b9a9bcde52c101bc5e783ef31cb8e4fe34bd88972012d147ee54c5449cca0fac30995e68070c6772234077fb5b02 diff --git a/net-im/ktp-send-file/Manifest b/net-im/ktp-send-file/Manifest index 5be87bc9ec6b..b74cbd16052d 100644 --- a/net-im/ktp-send-file/Manifest +++ b/net-im/ktp-send-file/Manifest @@ -1,2 +1 @@ DIST ktp-send-file-0.8.1.tar.bz2 29356 SHA256 c874e5e07543923388544e2875c94db4df3a8cbe4938367a97489c72f8f519bf SHA512 e21f5d4a8bc79f0b3af16edebb0c6f1f5569f867b01574c9ce4fae281204d21416adf5f99395cccf5a6ab8d9fad76391226d6cffaea1e3d0b15eceed78c55243 WHIRLPOOL 6d5befe2da185e66fb343a1976eaaa4ac596f35a97c77c86df68bc676e5fc57cad1d16ce504b5c8e0bd982eca5393092bd147c951e59e5e26ad496e05ebd9c7f -DIST ktp-send-file-0.8.1.tar.bz2 29356 SHA256 c874e5e07543923388544e2875c94db4df3a8cbe4938367a97489c72f8f519bf SHA512 e21f5d4a8bc79f0b3af16edebb0c6f1f5569f867b01574c9ce4fae281204d21416adf5f99395cccf5a6ab8d9fad76391226d6cffaea1e3d0b15eceed78c55243 WHIRLPOOL 6d5befe2da185e66fb343a1976eaaa4ac596f35a97c77c86df68bc676e5fc57cad1d16ce504b5c8e0bd982eca5393092bd147c951e59e5e26ad496e05ebd9c7f diff --git a/net-im/ktp-text-ui/Manifest b/net-im/ktp-text-ui/Manifest index 3b80d875348a..8c9b1c5c114a 100644 --- a/net-im/ktp-text-ui/Manifest +++ b/net-im/ktp-text-ui/Manifest @@ -1,2 +1 @@ DIST ktp-text-ui-0.8.1.tar.bz2 310580 SHA256 afd1a0d4fbebb6f255ebecbe79796721d02de7ad2c40f0cafef7733407a7c6c2 SHA512 159bff3bcf1fbeed140108840c4e9a13e8578f46a502727b58594ae5a9fd7721d86927850efe1ef49a7e8ec90a59e6308b39e5e9d511563bcf499834c84c9a22 WHIRLPOOL 68deed6c5d0273491245995ab04f47da7755743a22e539d90b4fc2ceda51f91f77d96c84cb3350d0592949310745c3b99cd7bf33387fa35864147f4f486a9d86 -DIST ktp-text-ui-0.8.1.tar.bz2 310580 SHA256 afd1a0d4fbebb6f255ebecbe79796721d02de7ad2c40f0cafef7733407a7c6c2 SHA512 159bff3bcf1fbeed140108840c4e9a13e8578f46a502727b58594ae5a9fd7721d86927850efe1ef49a7e8ec90a59e6308b39e5e9d511563bcf499834c84c9a22 WHIRLPOOL 68deed6c5d0273491245995ab04f47da7755743a22e539d90b4fc2ceda51f91f77d96c84cb3350d0592949310745c3b99cd7bf33387fa35864147f4f486a9d86 diff --git a/net-irc/bobotpp/files/bobotpp-2.2.2-asneeded.patch b/net-irc/bobotpp/files/bobotpp-2.2.2-asneeded.patch index 73fd0a64269e..e960e008f187 100644 --- a/net-irc/bobotpp/files/bobotpp-2.2.2-asneeded.patch +++ b/net-irc/bobotpp/files/bobotpp-2.2.2-asneeded.patch @@ -6,10 +6,10 @@ dnl Checks for libraries. -AC_CHECK_LIB(crypt, crypt, [LDFLAGS="-lcrypt $LDFLAGS]") -AC_CHECK_LIB(socket, socket, [LDFLAGS="-lsocket $LDFLAGS]") --AC_CHECK_LIB(nsl, connect, [LDFLAG--- bobotpp-2.2.2.orig/configure.ac 2006-06-29 02:02:46.000000000 +0200 -+++ bobotpp-2.2.2/configure.ac 2009-10-15 19:31:42.058285332 +0200 -@@ -58,9 +58,9 @@ - AC_CPP_STL_IOSBASE +-AC_CHECK_LIB(nsl, connect, [LDFLAGS="-lnsl $LDFLAGS]") ++AC_CHECK_LIB(crypt, crypt) ++AC_CHECK_LIB(socket, socket) ++AC_CHECK_LIB(nsl, connect) - dnl Checks for libraries. --A \ No newline at end of file + dnl CC++ is special (no function to check_lib on + dnl AC_CHECK_PROG(CCGNU_FOUND, [ccgnu2-config], diff --git a/net-irc/eggdrop/eggdrop-1.6.21.ebuild b/net-irc/eggdrop/eggdrop-1.6.21.ebuild index e95e4423d1f9..cbe8a38fe275 100644 --- a/net-irc/eggdrop/eggdrop-1.6.21.ebuild +++ b/net-irc/eggdrop/eggdrop-1.6.21.ebuild @@ -44,50 +44,61 @@ src_prepare() { } src_configure() { - use mysql || ( echo mysql ; echo mystats ) >>disabled_modules# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/eggdrop/eggdrop-1.6.21.ebuild,v 1.4 2012/10/08 16:59:53 blueness Exp $ + use mysql || ( echo mysql ; echo mystats ) >>disabled_modules + use postgres || echo pgstats >>disabled_modules + use static && ( echo rijndael ; echo twofish ) >>disabled_modules -EAPI=4 + econf $(use_with ssl) -inherit eutils + emake config +} -MY_P="eggdrop${PV}" -PATCHSET_V="1.0" +src_compile() { + local target="" -DESCRIPTION="An IRC bot extensible with C or TCL" -HOMEPAGE="http://www.eggheads.org/" -SRC_URI="ftp://ftp.eggheads.org/pub/eggdrop/source/1.6/${MY_P}.tar.bz2 - http://dev.gentoo.org/~binki/distfiles/${CATEGORY}/${PN}/${P}-patches-${PATCHSET_V}.tar.bz2" + if use static && use debug; then + target="sdebug" + elif use static; then + target="static" + elif use debug; then + target="debug" + fi -KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86" -LICENSE="GPL-2" -SLOT="0" -IUSE="debug mysql postgres ssl static vanilla" -REQUIRED_USE="vanilla? ( !mysql !postgres !ssl )" + emake ${target} +} -DEPEND="dev-lang/tcl - !vanilla? ( - mysql? ( virtual/mysql ) - postgres? ( dev-db/postgresql-server ) - ssl? ( dev-libs/openssl ) - )" -RDEPEND="${DEPEND}" +src_install() { + local a b + emake DEST="${D}"/opt/eggdrop install -S=${WORKDIR}/${MY_P} + for a in doc/*; do + [ -f ${a} ] && dodoc ${a} + done -src_prepare() { - if use vanilla; then - rm -f "${WORKDIR}"/patch/[1-6]*.patch || die - fi + for a in src/mod/*.mod; do + for b in README UPDATES INSTALL TODO CONTENTS; do + [[ -f ${a}/${b} ]] && newdoc ${a}/${b} ${b}.${a##*/} + done + done - EPATCH_SUFFIX="patch" epatch + dodoc text/motd.* - # fix bug #335230 - sed -i \ - -e '/\$(LD)/s/-o/$(CFLAGS) $(LDFLAGS) &/' \ - src/mod/*.mod/Makefile* src/Makefile.in || die + use vanilla || dodoc \ + src/mod/botnetop.mod/botnetop.conf \ + src/mod/gseen.mod/gseen.conf \ + src/mod/mc_greet.mod/mc_greet.conf \ + src/mod/stats.mod/stats.conf \ + src/mod/away.mod/away.doc \ + src/mod/rcon.mod/matchbot.tcl \ + src/mod/mystats.mod/tools/mystats.{conf,sql} \ + src/mod/pgstats.mod/tools/{pgstats.conf,setup.sql} + + dohtml doc/html/*.html + + dobin "${FILESDIR}"/eggdrop-installer + doman doc/man1/eggdrop.1 } -src_configure() { - use mysql | \ No newline at end of file +pkg_postinst() { + elog "Please run /usr/bin/eggdrop-installer to install your eggdrop bot." +} diff --git a/net-irc/inspircd/inspircd-2.0.16.ebuild b/net-irc/inspircd/inspircd-2.0.16.ebuild index 0095535aef39..d5eb7fd753ee 100644 --- a/net-irc/inspircd/inspircd-2.0.16.ebuild +++ b/net-irc/inspircd/inspircd-2.0.16.ebuild @@ -6,16 +6,6 @@ EAPI=5 inherit eutils multilib toolchain-funcs user -DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd" -HOMEPAGE="http://inspircd.github.com/" -SRC_URI="http://www.github.com/inspircd/in# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/inspircd-2.0.16.ebuild,v 1.3 2014/07/27 10:44:19 phajdan.jr Exp $ - -EAPI=5 - -inherit eutils multilib toolchain-funcs user - DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd" HOMEPAGE="http://inspircd.github.com/" SRC_URI="http://www.github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> ${P}.tar.gz" @@ -101,4 +91,19 @@ src_install() { insinto "/usr/include/${PN}" doins include/* - diropts -o"${PN}" \ No newline at end of file + diropts -o"${PN}" -g"${PN}" -m0700 + dodir "/var/lib/${PN}" + dodir "/var/lib/${PN}/data" + + newinitd "${FILESDIR}/${P}-init" "${PN}" + keepdir "/var/log/${PN}"/ +} + +pkg_postinst() { + elog "Before starting ${PN} the first time, you should create" + elog "the /etc/${PN}/${PN}.conf file." + elog "You can find example configuration files under /etc/${PN}" + elog "Read the ${PN}.conf.example file carefully before " + elog "(re)starting the service." + elog +} diff --git a/net-libs/gupnp-av/gupnp-av-0.12.5.ebuild b/net-libs/gupnp-av/gupnp-av-0.12.5.ebuild index 5115ca421aef..514969244e83 100644 --- a/net-libs/gupnp-av/gupnp-av-0.12.5.ebuild +++ b/net-libs/gupnp-av/gupnp-av-0.12.5.ebuild @@ -19,19 +19,26 @@ IUSE="+introspection" RDEPEND=" >=dev-libs/glib-2.16:2 - >=net-libs/gssdp-# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/gupnp-av/gupnp-av-0.12.5.ebuild,v 1.5 2014/03/09 12:03:14 pacho Exp $ - -EAPI="5" -GCONF_DEBUG="no" -VALA_MIN_API_VERSION="0.14" -VALA_USE_DEPEND="vapigen" - -inherit eutils gnome2 vala - -DESCRIPTION="Utility library aiming to ease the handling UPnP A/V profiles" -HOMEPAGE="http://gupnp.org/" - -LICENSE="LGPL-2" -SLOT="0/2" # subslot: soname ver \ No newline at end of file + >=net-libs/gssdp-0.9.2[introspection?] + >=net-libs/libsoup-2.28.2:2.4[introspection?] + dev-libs/libxml2 + >=net-libs/gupnp-0.19[introspection?] + introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) + !net-libs/gupnp-vala +" +DEPEND="${RDEPEND} + >=dev-util/gtk-doc-am-1.10 + virtual/pkgconfig + introspection? ( $(vala_depend) ) +" + +src_prepare() { + use introspection && vala_src_prepare + gnome2_src_prepare +} + +src_configure() { + gnome2_src_configure \ + $(use_enable introspection) \ + --disable-static +} diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild b/net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild index ee1c30652e7f..f7fdbab4b00c 100644 --- a/net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild +++ b/net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild @@ -70,15 +70,24 @@ src_compile() { building() { cd "${BUILD_DIR}"/python || die emake \ - PYTHON_INCLUDES="-I$(python# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild,v 1.11 2014/04/26 06:35:33 pacho Exp $ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -AUTOTOOLS_AUTORECONF=true + PYTHON_INCLUDES="-I$(python_get_includedir)" \ + pyexecdir="$(python_get_sitedir)" + } + python_foreach_impl building + fi +} -inherit autotools-utils gnome.org python-r1 +src_install() { + autotools-utils_src_install -DESCRIPTION="Li \ No newline at end of file + if use python; then + installation() { + cd "${BUILD_DIR}"/python || die + emake \ + DESTDIR="${D}" \ + pyexecdir="$(python_get_sitedir)" \ + install + } + python_foreach_impl installation + fi +} diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.3.ebuild b/net-libs/gupnp-igd/gupnp-igd-0.2.3.ebuild index 1bf26d8d78cb..5bd9a2ce149f 100644 --- a/net-libs/gupnp-igd/gupnp-igd-0.2.3.ebuild +++ b/net-libs/gupnp-igd/gupnp-igd-0.2.3.ebuild @@ -42,30 +42,48 @@ PATCHES=( src_prepare() { # Python bindings are built/installed manually. if use python; then - sed -e "/PYTHON_SUBDIR =/s/ pytho# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/gupnp-igd/gupnp-igd-0.2.3.ebuild,v 1.1 2014/02/06 22:14:39 eva Exp $ + sed -e "/PYTHON_SUBDIR =/s/ python//" -i Makefile.am Makefile.in || die + fi + autotools-utils_src_prepare +} -EAPI=5 +src_configure() { + local myeconfargs=( + --disable-static + --disable-gtk-doc + $(use_enable introspection) + $(use_enable python) + ) + autotools-utils_src_configure +} -PYTHON_COMPAT=( python2_7 ) -AUTOTOOLS_AUTORECONF=true +src_compile() { + autotools-utils_src_compile -inherit autotools-utils gnome.org python-r1 + if use python; then + python_copy_sources -DESCRIPTION="Library to handle UPnP IGD port mapping for GUPnP" -HOMEPAGE="http://gupnp.org" + building() { + cd "${BUILD_DIR}"/python || die + emake \ + PYTHON_INCLUDES="-I$(python_get_includedir)" \ + pyexecdir="$(python_get_sitedir)" + } + python_foreach_impl building + fi +} -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="+introspection python" +src_install() { + autotools-utils_src_install -RDEPEND=" - >=dev-libs/glib-2.26:2 - net-libs/gssdp - >=net-libs/gupnp-0.18 - introspection? ( >=dev-libs/gobject-introspection-0.10 ) - python? ( - >=dev-libs/gobject-introspection-0.10 - >=dev-python/pygobject-2.16:2[${PYTHON_USEDEP}] \ No newline at end of file + if use python; then + installation() { + cd "${BUILD_DIR}"/python || die + emake \ + DESTDIR="${D}" \ + pyexecdir="$(python_get_sitedir)" \ + install + } + python_foreach_impl installation + fi +} diff --git a/net-libs/jreen/jreen-1.2.0.ebuild b/net-libs/jreen/jreen-1.2.0.ebuild index de3665531472..9ad815e60a3c 100644 --- a/net-libs/jreen/jreen-1.2.0.ebuild +++ b/net-libs/jreen/jreen-1.2.0.ebuild @@ -24,35 +24,6 @@ IUSE="debug +qt4 qt5" REQUIRED_USE="|| ( qt4 qt5 )" -DEPEND=" - media-libs/speex - net-libs/libgsasl - sys-libs/zl# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/jreen/jreen-1.2.0.ebuild,v 1.4 2014/07/18 11:42:25 nimiux Exp $ - -EAPI=5 - -if [[ ${PV} != *9999* ]]; then - SRC_URI="https://github.com/euroelessar/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~ppc x86" -else - GIT_ECLASS="git-r3" - EGIT_REPO_URI=( "git://github.com/euroelessar/${PN}" ) - KEYWORDS="" -fi - -inherit cmake-utils multibuild ${GIT_ECLASS} - -DESCRIPTION="Qt XMPP library" -HOMEPAGE="https://github.com/euroelessar/jreen" - -LICENSE="GPL-2" -SLOT="0" -IUSE="debug +qt4 qt5" - -REQUIRED_USE="|| ( qt4 qt5 )" - DEPEND=" media-libs/speex net-libs/libgsasl @@ -65,4 +36,46 @@ DEPEND=" dev-qt/qtcore:5 dev-qt/qtnetwork:5 ) -" \ No newline at end of file +" +RDEPEND="${DEPEND}" + +DOCS=( AUTHORS ChangeLog README ) + +pkg_setup() { + MULTIBUILD_VARIANTS=() + if use qt4; then + MULTIBUILD_VARIANTS+=( qt4 ) + fi + if use qt5; then + MULTIBUILD_VARIANTS+=( qt5 ) + fi +} + +src_configure() { + myconfigure() { + local mycmakeargs=() + + if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then + mycmakeargs+=( -DJREEN_FORCE_QT4=ON ) + fi + if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then + mycmakeargs+=( -DJREEN_FORCE_QT4=OFF ) + fi + + cmake-utils_src_configure + } + + multibuild_foreach_variant myconfigure +} + +src_compile() { + multibuild_foreach_variant cmake-utils_src_compile +} + +src_install() { + multibuild_foreach_variant cmake-utils_src_install +} + +src_test() { + multibuild_foreach_variant cmake-utils_src_test +} diff --git a/net-libs/ldns/ldns-1.6.16-r1.ebuild b/net-libs/ldns/ldns-1.6.16-r1.ebuild index efd03870bd06..4b56375a8103 100644 --- a/net-libs/ldns/ldns-1.6.16-r1.ebuild +++ b/net-libs/ldns/ldns-1.6.16-r1.ebuild @@ -11,22 +11,6 @@ DESCRIPTION="a library with the aim to simplify DNS programming in C" HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/" SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz" -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="doc# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/ldns/ldns-1.6.16-r1.ebuild,v 1.3 2014/07/09 17:03:04 mgorny Exp $ - -EAPI="5" -PYTHON_COMPAT=( python2_7 ) - -inherit eutils multilib-minimal python-single-r1 - -DESCRIPTION="a library with the aim to simplify DNS programming in C" -HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/" -SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz" - LICENSE="BSD" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x64-solaris" @@ -62,4 +46,41 @@ multilib_src_configure() { $(use_enable ssl sha2) \ $(use_enable static-libs static) \ $(use_with ssl ssl "${EPREFIX}"/usr) \ - $(mul \ No newline at end of file + $(multilib_native_use_with python pyldns) \ + $(multilib_native_use_with python pyldnsx) \ + --without-drill \ + --without-examples \ + --disable-rpath +} + +multilib_src_compile() { + default + + if multilib_is_native_abi && use doc ; then + emake doxygen + fi +} + +multilib_src_install() { + default + + if multilib_is_native_abi && use doc ; then + dohtml -r doc/html/. + fi +} + +multilib_src_install_all() { + dodoc Changelog README* + + prune_libtool_files --modules + use python && python_optimize + + if use vim-syntax ; then + insinto /usr/share/vim/vimfiles/ftdetect + doins libdns.vim + fi + + einfo + elog "Install net-dns/ldns-utils if you want drill and examples" + einfo +} diff --git a/net-libs/libasr/Manifest b/net-libs/libasr/Manifest index 4a1d7c62c0a9..e02d776de72c 100644 --- a/net-libs/libasr/Manifest +++ b/net-libs/libasr/Manifest @@ -1,2 +1 @@ DIST libasr-201407111828.tar.gz 432580 SHA256 e3a524ff24ad2352197638d1522b7cd4ca38f8865700145c503480cb59e9f005 SHA512 61755d12de4ca59077c4a7abd6abc7c7f461b7164e8fff71e6df50e20192009db19c96c93cbf50450bba62c6c9b1e99fb906a78bed4f67a304cbb2f7e61c97aa WHIRLPOOL 993119752c98cf2ec338e74bf3690b6bddc7e613952ed7772293019e59fd5e9cf67483167723343cab1b60dd298398b98855fbe0ecc16339ad4574d8c00be30e -DIST libasr-201407111828.tar.gz 432580 SHA256 e3a524ff24ad2352197638d1522b7cd4ca38f8865700145c503480cb59e9f005 SHA512 61755d12de4ca59077c4a7abd6abc7c7f461b7164e8fff71e6df50e20192009db19c96c93cbf50450bba62c6c9b1e99fb906a78bed4f67a304cbb2f7e61c97aa WHIRLPOOL 993119752c98cf2ec338e74bf3690b6bddc7e613952ed7772293019e59fd5e9cf67483167723343cab1b60dd298398b98855fbe0ecc16339ad4574d8c00be30e diff --git a/net-libs/libasyncns/Manifest b/net-libs/libasyncns/Manifest index a9e05465c33f..6a6341e79516 100644 --- a/net-libs/libasyncns/Manifest +++ b/net-libs/libasyncns/Manifest @@ -1,2 +1 @@ DIST libasyncns-0.8.tar.gz 341591 SHA256 4f1a66e746cbe54ff3c2fbada5843df4fbbbe7481d80be003e8d11161935ab74 SHA512 2daad3a2d9eb875e0575843d9e9e2787be6cbba89211fd073fa8898ff80e0a891c7da1a7b0ef70f306318cb3a963ecd65d53d24d08b5f6b98e7cd2a3b3bdcda7 WHIRLPOOL b57b449bf96584667e0d411f4b491c2e52f0fd9c129ad579f82878e3ec612bec636f1a4792f9c63c3174e30938acbc1ed70eb81391903259ea63b79dfaa7e0d8 -DIST libasyncns-0.8.tar.gz 341591 SHA256 4f1a66e746cbe54ff3c2fbada5843df4fbbbe7481d80be003e8d11161935ab74 SHA512 2daad3a2d9eb875e0575843d9e9e2787be6cbba89211fd073fa8898ff80e0a891c7da1a7b0ef70f306318cb3a963ecd65d53d24d08b5f6b98e7cd2a3b3bdcda7 WHIRLPOOL b57b449bf96584667e0d411f4b491c2e52f0fd9c129ad579f82878e3ec612b \ No newline at end of file diff --git a/net-libs/libblkmaker/Manifest b/net-libs/libblkmaker/Manifest index a3870b0c4dae..68d7b6b5de99 100644 --- a/net-libs/libblkmaker/Manifest +++ b/net-libs/libblkmaker/Manifest @@ -1,4 +1,2 @@ DIST libblkmaker-0.3.2.tgz 17893 SHA256 161dc59400eaaff210a0910b7b4c4feadad3b151422ec2ffc927ef183f8cf661 SHA512 e45c50c11676995171f6fb27346a42843a2c035c391ab84b5e565f5fff109a4ced6cdafb6c662572eb7243b25d2014400e9516cdbbd0d65f4ea31da7d0e74bdf WHIRLPOOL d1704692e844e59a5dac5760c96ab2b5d5c1df2bac6ac3e448e918ec88630cd281ef489e36d7559801608537ee9e761eb687b48c01dc5d31439dc533fedb3af7 DIST libblkmaker-0.5.0.tgz 13574 SHA256 2a67894c9a06b728de32f8040a5b9c3d3826e4d40c685e6522429d2f272deda8 SHA512 3e9afd68a3629f04cf5e8c1497307e3d184b363c4c47841f7a173b0e5834e15d586aaac13322ddcef6e96f6e55acbb0116f071993013d40737b0af52b00f137f WHIRLPOOL 2ca06d9f2dfd0b71943f239b89697e192934f582fc85613747982ba268f0bbe9292b8fc8033203d1b9526f2f2d10b91691681c6c48abf154c5200108992c8606 -DIST libblkmaker-0.3.2.tgz 17893 SHA256 161dc59400eaaff210a0910b7b4c4feadad3b151422ec2ffc927ef183f8cf661 SHA512 e45c50c11676995171f6fb27346a42843a2c035c391ab84b5e565f5fff109a4ced6cdafb6c662572eb7243b25d2014400e9516cdbbd0d65f4ea31da7d0e74bdf WHIRLPOOL d1704692e844e59a5dac5760c96ab2b5d5c1df2bac6ac3e448e918ec88630cd281ef489e36d7559801608537ee9e761eb687b48c01dc5d31439dc533fedb3af7 -DIST libblkmaker-0.5.0.tgz 13574 SHA256 2a67894c9a06b728de32f8040a5b9c3d3826e4d40c685e6522429d2f272deda8 SHA512 3e9afd68a3629f04cf5e8c1497307e3d184b363c4c47841f7a173b0e5834e15d586aaac13322ddcef6e96f6e55acbb0116f071993013d40737b0af52b00f137f WHIRLPOOL 2ca06d9f2dfd0b71943f239b89697e192934f582fc85613747982ba268f0bbe9292b8fc8033203d1b9526f2f2d10b91691681c6c48abf154c5200108992c8606 diff --git a/net-libs/libbtbb/libbtbb-2014.02.2.ebuild b/net-libs/libbtbb/libbtbb-2014.02.2.ebuild index bd9f633c96c9..e488cfd85056 100644 --- a/net-libs/libbtbb/libbtbb-2014.02.2.ebuild +++ b/net-libs/libbtbb/libbtbb-2014.02.2.ebuild @@ -44,62 +44,78 @@ src_prepare(){ if use wireshark-plugins; then for i in btbb btle btsm do - sed -i 's#column_info#packet#' wireshark/plugins/${i}/cmake/FindWireshark.cm# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libbtbb/libbtbb-2014.02.2.ebuild,v 1.2 2014/07/04 21:30:36 zerochaos Exp $ - -EAPI=5 - -inherit multilib cmake-utils - -DESCRIPTION="A library to decode Bluetooth baseband packets" -HOMEPAGE="http://libbtbb.sourceforge.net/" + sed -i 's#column_info#packet#' wireshark/plugins/${i}/cmake/FindWireshark.cmake || die + CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} + BUILD_DIR="${WORKDIR}"/${i}_build + cmake-utils_src_prepare + done + fi +} -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/greatscottgadgets/libbtbb.git" - inherit git-r3 - KEYWORDS="" -else - MY_PV=${PV/\./-} - MY_PV=${MY_PV/./-R} - S=${WORKDIR}/${PN}-${MY_PV} - SRC_URI="https://github.com/greatscottgadgets/${PN}/archive/${MY_PV}.tar.gz" - KEYWORDS="~amd64 ~arm ~x86" -fi +src_configure() { + CMAKE_USE_DIR="${S}" + BUILD_DIR="${S}"_build + local mycmakeargs=( + -DDISABLE_PYTHON=true + -DPACKAGE_MANAGER=true + $(cmake-utils_use pcap PCAPDUMP) + ) + cmake-utils_src_configure -LICENSE="GPL-2" -SLOT="0/${PV}" -IUSE="+pcap +wireshark-plugins" + if use wireshark-plugins; then + for i in btbb btle btsm + do + CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} + BUILD_DIR="${WORKDIR}"/${i}_build + local mycmakeargs=( + -DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)" + ) + cmake-utils_src_configure + done + fi +} -RDEPEND=" - wireshark-plugins? ( - dev-libs/glib - >=net-analyzer/wireshark-1.8.3-r1:= - ) -" -DEPEND="${RDEPEND} - wireshark-plugins? ( virtual/pkgconfig )" +src_compile(){ + CMAKE_USE_DIR="${S}" + BUILD_DIR="${S}"_build + cmake-utils_src_compile -get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; pv=${pv//_}; echo ${pv}; } + if use wireshark-plugins; then + for i in btbb btle btsm + do + CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} + BUILD_DIR="${WORKDIR}"/${i}_build + cmake-utils_src_compile + done + fi +} -src_prepare(){ +src_test(){ CMAKE_USE_DIR="${S}" BUILD_DIR="${S}"_build - cmake-utils_src_prepare + cmake-utils_src_test if use wireshark-plugins; then for i in btbb btle btsm do - sed -i 's#column_info#packet#' wireshark/plugins/${i}/cmake/FindWireshark.cmake || die CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} BUILD_DIR="${WORKDIR}"/${i}_build - cmake-utils_src_prepare + cmake-utils_src_test done fi } -src_configure() { +src_install(){ CMAKE_USE_DIR="${S}" BUILD_DIR="${S}"_build - local mycmakeargs=( - -DDISABLE_PYTHON=t \ No newline at end of file + cmake-utils_src_install + + if use wireshark-plugins; then + for i in btbb btle btsm + do + CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} + BUILD_DIR="${WORKDIR}"/${i}_build + cmake-utils_src_install + done + fi +} diff --git a/net-libs/libesmtp/Manifest b/net-libs/libesmtp/Manifest index fb55d2021c2e..d947fb770f8a 100644 --- a/net-libs/libesmtp/Manifest +++ b/net-libs/libesmtp/Manifest @@ -1,2 +1 @@ DIST libesmtp-1.0.6.tar.bz2 365506 SHA256 d0a61a5c52d99fa7ce7d00ed0a07e341dbda67101dbed1ab0cdae3f37db4eb0b SHA512 c122fc5995b76771cce2db58c9e59597cc3a76d273feb6fc26b869f118e91bdf98a5721ee2d1de8175c376af018b5806b0379bbeba2f5da95108916028fd8dda WHIRLPOOL 6bce1e05ca48c300917c1d079ce31f95d2e0d7b2339af9d69a126e63af94ff9585d5add3b6ab9d22c6e889fd2bb5ce50af32adbb246ed67ecd7a340b97f7d97f -DIST libesmtp-1.0.6.tar.bz2 365506 SHA256 d0a61a5c52d99fa7ce7d00ed0a07e341dbda67101dbed1ab0cdae3f37db4eb0b SHA512 c122fc5995b76771cce2db58c9e59597cc3a76d273feb6fc26b869f118e91bdf98a5721ee2d1de8175c376af018b5806b0379bbeba2f5da95108916028fd8dda WHIRLPOOL 6bce1e05ca48c300917c1d079ce31f95d2e0d7b2339af9d69a126e63af94ff9585d5add3b6ab9d22c6e889fd2bb5ce50af32adbb246ed67ecd7a340b97f7d97f diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.34.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.34.ebuild index ab72c92e7cb7..14b95810ab39 100644 --- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.34.ebuild +++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.34.ebuild @@ -38,6 +38,13 @@ src_configure() { $(use_enable test curl) \ $(use_enable messages) \ $(use_enable messages postprocessor) \ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libmicrohttpd/libmicrohttpd-0.9.3 \ No newline at end of file + $(use_enable ssl https) \ + $(use_with ssl gnutls) \ + $(use_enable static-libs static) +} + +src_install() { + default + + use static-libs || find "${ED}" -name '*.la' -exec rm -f {} + +} diff --git a/net-libs/libmnl/libmnl-1.0.3-r1.ebuild b/net-libs/libmnl/libmnl-1.0.3-r1.ebuild index 32cc39f70810..295441a67971 100644 --- a/net-libs/libmnl/libmnl-1.0.3-r1.ebuild +++ b/net-libs/libmnl/libmnl-1.0.3-r1.ebuild @@ -25,5 +25,8 @@ src_install() { prune_libtool_files if use examples; then - find examples/ -name 'Make# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General \ No newline at end of file + find examples/ -name 'Makefile*' -delete + dodoc -r examples/ + docompress -x /usr/share/doc/${PF}/examples + fi +} diff --git a/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.2.ebuild b/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.2.ebuild index af863ee0b26e..dcbc342b3cd7 100644 --- a/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.2.ebuild +++ b/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.2.ebuild @@ -38,6 +38,10 @@ src_install() { mv "${ED}"/{,usr/}$(get_libdir)/pkgconfig/${PN}.pc || die if use examples; then - find examples/ -name "Makefile*" -exec rm -f '{}' + || d# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $H \ No newline at end of file + find examples/ -name "Makefile*" -exec rm -f '{}' + || die 'find failed' + dodoc -r examples/ + docompress -x /usr/share/doc/${P}/examples + fi + + prune_libtool_files +} diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.3.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.3.ebuild index 1237f18bfaa5..866590aeb781 100644 --- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.3.ebuild +++ b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.3.ebuild @@ -11,13 +11,33 @@ SRC_URI="http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 # Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.3.ebuild,v 1.10 2013/07/06 17:05:04 ago Exp $ +KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86" +IUSE="static-libs" -EAPI=5 -inherit autotools-utils linux-info +RDEPEND=" + >=net-libs/libmnl-1.0.3 + >=net-libs/libnfnetlink-1.0.0 +" +DEPEND=" + ${RDEPEND} + virtual/pkgconfig +" -DESCRIPTION="programming interface (API) to the in-kernel connection tracking state table" -HOMEPAGE="http://www.netfilter.org/projects/libnetfilter_conntrack/" -SRC_URI="http://www.netfilter.org/projects/$ \ No newline at end of file +DOCS=( README ) + +pkg_setup() { + linux-info_pkg_setup + + if kernel_is lt 2 6 18 ; then + die "${PN} requires at least 2.6.18 kernel version" + fi + + #netfilter core team has changed some option names with kernel 2.6.20 + if kernel_is lt 2 6 20 ; then + CONFIG_CHECK="~IP_NF_CONNTRACK_NETLINK" + else + CONFIG_CHECK="~NF_CT_NETLINK" + fi + + check_extra_config +} diff --git a/net-libs/libnetfilter_cthelper/Manifest b/net-libs/libnetfilter_cthelper/Manifest index 5e40b4795a57..8f16f0dd3844 100644 --- a/net-libs/libnetfilter_cthelper/Manifest +++ b/net-libs/libnetfilter_cthelper/Manifest @@ -1,2 +1 @@ DIST libnetfilter_cthelper-1.0.0.tar.bz2 275229 SHA256 07618e71c4d9a6b6b3dc1986540486ee310a9838ba754926c7d14a17d8fccf3d SHA512 f0372daee0edbf4c27ee80eadd4ce786a4b67b39c0b9d22e88bc9adcbdffd6676eb9df01b933ee64d2fcea9c05a9ca9070c94e907277d69acbd22ae9a3c74e45 WHIRLPOOL a94915f51b0dd4dbf165c195fff2291ad414147ad068ed3eec4d29bf4850d128c83f6f75b94853bd840334e77f68c7a74dbc7aa50d7745ff9a0074621385afc0 -DIST libnetfilter_cthelper-1.0.0.tar.bz2 275229 SHA256 07618e71c4d9a6b6b3dc1986540486ee310a9838ba754926c7d14a17d8fccf3d SHA512 f0372daee0edbf4c27ee80eadd4ce786a4b67b39c0b9d22e88bc9adcbdffd6676eb9df01b933ee64d2fcea9c05a9ca9070c94e907277d69acbd22ae9a3c74e45 WHIRLPOOL a94915f51b0dd4dbf165c195fff2291ad414147ad068ed3eec4d29bf4850d128c83f6f75b94853bd840334e77f68c7a74dbc7aa50d7745ff9a0074621385afc0 diff --git a/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild b/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild index 1e346100ea7b..ea93d63b332c 100644 --- a/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild +++ b/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild @@ -23,17 +23,24 @@ pkg_setup() { ewarn "${PN} requires at least 2.6.18 kernel version" fi - #netf# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild,v 1.9 2014/08/01 18:48:38 tgall Exp $ + #netfilter core team has changed some option names with kernel 2.6.20 + error_common=' is not set when it should be. You can activate it in the Core Netfilter Configuration' + if kernel_is lt 2 6 20 ; then + CONFIG_CHECK="~IP_NF_CONNTRACK_NETLINK" + ERROR_IP_NF_CONNTRACK_NETLINK="CONFIG_IP_NF_CONNTRACK_NETLINK:\t${error_common}" + else + CONFIG_CHECK="~NF_CT_NETLINK" + ERROR_NF_CT_NETLINK="CONFIG_NF_CT_NETLINK:\t${error_common}" + fi -EAPI=4 -inherit linux-info eutils + check_extra_config +} -DESCRIPTION="the low-level library for netfilter related kernel/userspace communication" -HOMEPAGE="http://www.netfilter.org/projects/libnfnetlink/" -SRC_URI="http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2" +src_configure() { + econf $(use_enable static-libs static) +} -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc \ No newline at end of file +src_install() { + default + prune_libtool_files +} diff --git a/net-libs/libnice/Manifest b/net-libs/libnice/Manifest index f91c1bd48816..184c8ed87796 100644 --- a/net-libs/libnice/Manifest +++ b/net-libs/libnice/Manifest @@ -1,4 +1,2 @@ DIST libnice-0.1.4.tar.gz 712256 SHA256 44e517de9c01203158f2a3d59f058706299a4ae41dfe1a7eeb72c290fcc8bf57 SHA512 ee0029e641c3dc15e5d7f878985f7d87b06e6f033fd14827094171299165120b3b1ffedc6bd036c998768cc9059d7e5dce2322799aa843b0f38487b7243bd40f WHIRLPOOL 1856bdcfe961d391a98d357c56bbbb22a8a110cfcf69deb9af2269a8a133c6657202231844b9ebd86a59e36ad0d68f5f6bffde9ab8bfb965a8a349935b40cc67 DIST libnice-0.1.7.tar.gz 827258 SHA256 4ed165aa2203136dce548c7cef735d8becf5d9869793f96b99dcbbaa9acf78d8 SHA512 1976eba51b01ea7c7f8cf956afdf656538d15f19e04fdc1707f305b61b571fcaeba8688961a117559c02675610c341b3a88192f3e4eb8fa05fc63abb8891b424 WHIRLPOOL 873ebbc6d9cc172affccaad64af2ddae5226853efee76d7875927a9186dccfdd3663e4aea8ce664a695cf1667a3dbe7b6fb3be3628674d36a4d798c3f2746e61 -DIST libnice-0.1.4.tar.gz 712256 SHA256 44e517de9c01203158f2a3d59f058706299a4ae41dfe1a7eeb72c290fcc8bf57 SHA512 ee0029e641c3dc15e5d7f878985f7d87b06e6f033fd14827094171299165120b3b1ffedc6bd036c998768cc9059d7e5dce2322799aa843b0f38487b7243bd40f WHIRLPOOL 1856bdcfe961d391a98d357c56bbbb22a8a110cfcf69deb9af2269a8a133c6657202231844b9ebd86a59e36ad0d68f5f6bffde9ab8bfb965a8a349935b40cc67 -DIST libnice-0.1.7.tar.gz 827258 SHA256 4ed165aa2203136dce548c7cef735d8becf5d9869793f96b99dcbbaa9acf78d8 SHA512 1976eba51b01ea7c7f8cf956afdf656538d15f19e04fdc1707f305b61b571fcaeba8688961a117559c02675610c341b3a88192f3e4eb8fa05fc63abb8891b424 WHIRLPOOL 873ebbc6d9cc172affccaad64af2ddae5226853efee76d7875927a9186dccfdd3663e4aea8ce664a695cf1667a3dbe7b6fb3be3628674d36a4d798c3f2746e61 diff --git a/net-libs/libnice/libnice-0.1.7.ebuild b/net-libs/libnice/libnice-0.1.7.ebuild index 44947cf64bdb..eb85320a1479 100644 --- a/net-libs/libnice/libnice-0.1.7.ebuild +++ b/net-libs/libnice/libnice-0.1.7.ebuild @@ -15,17 +15,28 @@ KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux IUSE="+upnp" RDEPEND=" - >=dev-libs/glib-2.34.3:2[${MU# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libnice/libnice-0.1.7.ebuild,v 1.9 2014/09/15 08:23:30 ago Exp $ + >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] + upnp? ( >=net-libs/gupnp-igd-0.2.2-r1:=[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND} + dev-util/gtk-doc-am + >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] +" -EAPI=5 -inherit eutils multilib-minimal +multilib_src_configure() { + # gstreamer plugin split off into media-plugins/gst-plugins-libnice + ECONF_SOURCE=${S} \ + econf --disable-static \ + --without-gstreamer \ + --without-gstreamer-0.10 \ + $(use_enable upnp gupnp) -DESCRIPTION="An implementation of the Interactice Connectivity Establishment standard (ICE)" -HOMEPAGE="http://nice.freedesktop.org/wiki/" -SRC_URI="http://nice.freedesktop.org/releases/${P}.tar.gz" + if multilib_is_native_abi; then + ln -s {"${S}"/,}docs/reference/libnice/html || die + fi +} -LICENSE="|| ( MPL-1.1 LGPL-2.1 )" -SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-l \ No newline at end of file +multilib_src_install_all() { + einstalldocs + prune_libtool_files --modules +} diff --git a/net-libs/liboauth/Manifest b/net-libs/liboauth/Manifest index 9de349dab9bd..37cf335fb29d 100644 --- a/net-libs/liboauth/Manifest +++ b/net-libs/liboauth/Manifest @@ -1,2 +1 @@ DIST liboauth-1.0.1.tar.gz 501706 SHA256 5087d32fe1db7b588246a7de64fc0c2464c95efdebb2c7fe6f482d9b00e68d8b SHA512 5d84699ece179a3b17eae8b7113eeadd7bd24df953f7070a6a0e303923b1661d82174894bf64ef6abc6dc344042013256fb2b1ab4fae12ab2778fa15446aa06c WHIRLPOOL 41b83bfc578b74c65018df7a73ba58695352a6e9e53a8a69434dc033c8bea1664417b2e3691dd2f1dd99ce2d55d48bde0fb4d29727294f59b5436720294236ed -DIST liboauth-1.0.1.tar.gz 501706 SHA256 5087d32fe1db7b588246a7de64fc0c2464c95efdebb2c7fe6f482d9b00e68d8b SHA512 5d84699ece179a3b17eae8b7113eeadd7bd24df953f7070a6a0e303923b1661d82174894bf64ef6abc6dc344042013256fb2b1ab4fae12ab2778fa15446aa06c WHIRLPOOL 41b83bfc578b74c65018df7a73ba58695352a6e9e53a8a69434dc033c8bea1664417b2e3691dd2f1dd99ce2d55d48bde0fb4d29727294f59b5436720294236ed diff --git a/net-libs/libosip/Manifest b/net-libs/libosip/Manifest index ed75433bf191..b9c1c1b5d854 100644 --- a/net-libs/libosip/Manifest +++ b/net-libs/libosip/Manifest @@ -1,4 +1,2 @@ DIST libosip2-3.6.0.tar.gz 598496 SHA256 c9a18b0c760506d150017cdb1fa5c1cefe12b8dcbbf9a7e784eb75af376e96cd SHA512 58109fdc643673e811ce576374194d6d33b930ecec3221f31834471f52f5f2b2b30e5e331e245e33b2aafbff1aaa411d3a7657c25f3bb0b9d6cda0ae766fd538 WHIRLPOOL 7ba0050963aa2c997ee3dd3769bbcc7910586818c7fd76037044be9843cb47481fd024b9f77f3a99b6958e42ec3f68004063d7cf8b7713fd7c60a5eab6b17ef3 DIST libosip2-4.0.0.tar.gz 644958 SHA256 bb2d228a41750fab397480002b0865f305f83a3840b1aa84851593593491b015 SHA512 995fc67c9a7536628ebaec9f4500bafa8a2f88081531bbae5194372b51102d556de28aea7d121e20cfda82b302a8a4ceb6488dbad61676930fdc13accb12b961 WHIRLPOOL 1c5df05f5317f6daaa7623f9868ed057ea3f07d84523088038bba366bdb955424b615a5bfb96754c89e046523e5db44075529a552439dc961a490d4e2eb57198 -DIST libosip2-3.6.0.tar.gz 598496 SHA256 c9a18b0c760506d150017cdb1fa5c1cefe12b8dcbbf9a7e784eb75af376e96cd SHA512 58109fdc643673e811ce576374194d6d33b930ecec3221f31834471f52f5f2b2b30e5e331e245e33b2aafbff1aaa411d3a7657c25f3bb0b9d6cda0ae766fd538 WHIRLPOOL 7ba0050963aa2c997ee3dd3769bbcc7910586818c7fd76037044be9843cb47481fd024b9f77f3a99b6958e42ec3f68004063d7cf8b7713fd7c60a5eab6b17ef3 -DIST libosip2-4.0.0.tar.gz 644958 SHA256 bb2d228a41750fab397480002b0865f305f83a3840b1aa84851593593491b015 SHA512 995fc67c9a7536628ebaec9f4500bafa8a2f88081531bbae5194372b51102d556de28aea7d121e20cfda82b302a8a4ceb6488dbad61676930fdc13accb12b961 WHIRLPOOL 1c5df05f5317f6daaa7623f9868ed057ea3f07d84523088038bba366bdb955424b615a5bfb96754c89e046523e5db44075529a552439dc961a490d4e2eb57198 diff --git a/net-libs/libosmo-dsp/Manifest b/net-libs/libosmo-dsp/Manifest index d7c9b058fdcf..a156f30ff3f0 100644 --- a/net-libs/libosmo-dsp/Manifest +++ b/net-libs/libosmo-dsp/Manifest @@ -1,2 +1 @@ DIST libosmo-dsp-0.3.tar.xz 106792 SHA256 7e1bdcb7860aa85a532fc91147b93e1ad174c569519b349716f8cf5fd43f3cc8 SHA512 079316bb882859787ee26143e3b105aa260c89022b81a38b29713cde39093dc430abea406468774649dd14232c969b2806c47634b64f940f78fa20cb90ffade5 WHIRLPOOL c58c5fe48289a230c93215ca7e92ec8c78a35abe78094b105d21875637f8cb7b63ccad5334b5b3d26fdcc45c22e2f3a384539019fe1c3ca64858f0892dbc8774 -DIST libosmo-dsp-0.3.tar.xz 106792 SHA256 7e1bdcb7860aa85a532fc91147b93e1ad174c569519b349716f8cf5fd43f3cc8 SHA512 079316bb882859787ee26143e3b105aa260c89022b81a38b29713cde39093dc430abea406468774649dd14232c969b2806c47634b64f940f78fa20cb90ffade5 WHIRLPOOL c58c5fe48289a230c93215ca7e92ec8c78a35abe78094b105d21875637f8cb7b63ccad5334b5b3d26fdcc45c22e2f3a384539019fe1c3ca64858f0892dbc8774 diff --git a/net-libs/pjsip/pjsip-1.14.ebuild b/net-libs/pjsip/pjsip-1.14.ebuild index 45fe317da8d2..cd5f42b761e5 100644 --- a/net-libs/pjsip/pjsip-1.14.ebuild +++ b/net-libs/pjsip/pjsip-1.14.ebuild @@ -95,4 +95,5 @@ src_install() { # Remove files that pjproject should not install rm -r "${D}/usr/lib/libportaudio.a" \ - "${D}/usr/# Copyright 1999- \ No newline at end of file + "${D}/usr/lib/libsrtp.a" +} diff --git a/net-libs/rabbitmq-c/rabbitmq-c-0.5.0.ebuild b/net-libs/rabbitmq-c/rabbitmq-c-0.5.0.ebuild index 27c89af058e3..53398b51a728 100644 --- a/net-libs/rabbitmq-c/rabbitmq-c-0.5.0.ebuild +++ b/net-libs/rabbitmq-c/rabbitmq-c-0.5.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/rabbitmq-c/rabbitmq-c-0.5.0.ebuild,v 1.3 2014/06/16 02:26:31 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/rabbitmq-c/rabbitmq-c-0.5.0.ebuild,v 1.4 2014/10/01 10:58:37 jer Exp $ EAPI="5" @@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="git://github.com/alanxz/rabbitmq-c.git" else SRC_URI="https://github.com/alanxz/rabbitmq-c/archive/v${PV}.zip -> ${PN}-v${PV}.zip" - KEYWORDS="~amd64 ~arm ~hppa ~x86" + KEYWORDS="~amd64 ~arm hppa ~x86" fi LICENSE="MIT" diff --git a/net-libs/telepathy-farsight/Manifest b/net-libs/telepathy-farsight/Manifest index 10db2a729cad..abc60f0a684e 100644 --- a/net-libs/telepathy-farsight/Manifest +++ b/net-libs/telepathy-farsight/Manifest @@ -1,2 +1 @@ DIST telepathy-farsight-0.0.19.tar.gz 585743 SHA256 2c89b8b259f91df33f93703eab1de493b193b163c32facb532ec2710b8f05269 SHA512 e2a7055d5a6babb4e255b7b1dde4a7aa9acd6a28942da1c538ca7284291f5c8927fb8f1c0465a681ee385ca554c5ff786957072f1b38a39c3edde94a528b26c0 WHIRLPOOL e3dd68c1d65660ba6f5f2e7b09b25c4dc963a8ef3b4fbb2d6cd6e8b9f75ed40f0da90b5fa971a9f030a745eb8496b4d6b9cad5c2ccfca9545cc7b1161ca3d7c8 -DIST telepathy-farsight-0.0.19.tar.gz 585743 SHA256 2c89b8b259f91df33f93703eab1de493b193b163c32facb532ec2710b8f05269 SHA512 e2a7055d5a6babb4e255b7b1dde4a7aa9acd6a28942da1c538ca7284291f5c8927fb8f1c0465a681ee385ca554c5ff786957072f1b38a39c3edde94a528b26c0 WHIRLPOOL e3dd68c1d65660ba6f5f2e7b09b25c4dc963a8ef3b4fbb2d6cd6e8b9f75ed40f0da90b5fa971a9f030a745eb8496b4d6b9cad5c2ccfca9545cc7b1161ca3d7c8 diff --git a/net-libs/txtorcon/Manifest b/net-libs/txtorcon/Manifest index 06e10c86150e..e59adc7c4a9b 100644 --- a/net-libs/txtorcon/Manifest +++ b/net-libs/txtorcon/Manifest @@ -1,4 +1,2 @@ DIST txtorcon-0.10.1.tar.gz 196853 SHA256 7a6e8fab71fd05c223d866b60b998cf308661ef1fc87d94e06c3b51f4ada4a6a SHA512 ee0bfd13e08a736de2f6fdb5b3f653a33c9fd561411e0ab0b9c75a938f6085e69b856171f602708a1a11e9c87b93b3c868a3d74f77af329a026db9785a637ac3 WHIRLPOOL 43730e2b33980b80f3cb1dd2f14102b84b8f3695fc3f3d192291f3fae8130657e7baa06db01149b4d2f97fe52b54794f7f3b6c144e0c9a2e994a996e01c98937 DIST txtorcon-0.11.0.tar.gz 197872 SHA256 ecb7cc8ee002ead5481c17fd62576521862e93081c58d7118f53cf3c8817f857 SHA512 7adf2428ad4cad2f2e30a9c724f85e3830d2d759c8e7e8e015f1550c1469fa98ab9355521ad39c35608fe91f9925ea4a964c026d4b2cb5d8a8fc231db1836ae5 WHIRLPOOL e781703efa10afcf933a9b4efb05f954d63df783a7f8d1dec7ebf4f5fb80dbab243761eb6a8771f3f86fcd61d3e9c46bf5a2292219e33edd540cf5abbf1cf9fc -EBUILD txtorcon-0.11.0.ebuild 878 SHA25DIST txtorcon-0.10.1.tar.gz 196853 SHA256 7a6e8fab71fd05c223d866b60b998cf308661ef1fc87d94e06c3b51f4ada4a6a SHA512 ee0bfd13e08a736de2f6fdb5b3f653a33c9fd561411e0ab0b9c75a938f6085e69b856171f602708a1a11e9c87b93b3c868a3d74f77af329a026db9785a637ac3 WHIRLPOOL 43730e2b33980b80f3cb1dd2f14102b84b8f3695fc3f3d192291f3fae8130657e7baa06db01149b4d2f97fe52b54794f7f3b6c144e0c9a2e994a996e01c98937 -DIST txtorcon-0.11.0.tar.gz 197872 SHA256 ecb7cc8ee002ead5481c17fd62576521862e93081c58d7118f53cf3c8817f857 SHA512 7adf2428ad4cad2f2e30a9c724f85e3830d2d759c8e7e8e015f1550c1469fa98ab9355521ad39c35608fe91f9925ea4a964c026d4b2cb5d8a8fc231db1836ae5 WHIRLPOOL e781703efa10afcf933a9b4efb05f954d63df783a7f8d1dec7ebf4f5fb80dbab243761eb6a8771f3f86fcd61d3e9c46bf5a2292219e33edd540cf5abbf1cf9fc diff --git a/net-mail/checkpw/Manifest b/net-mail/checkpw/Manifest index e7dfac39e221..a5a6d7f6216e 100644 --- a/net-mail/checkpw/Manifest +++ b/net-mail/checkpw/Manifest @@ -1,2 +1 @@ DIST checkpw-1.02.tar.gz 28631 SHA256 685a7fd4f4c783d0dcee342d109b0e492d3251e3c0cbc0ef77d33613cac6bced -DIST checkpw-1.02.tar.gz 28631 SHA256 685a7fd4f4c783d0dcee342d109b0e492d3251e3c0cbc0ef77d33613cac6bced diff --git a/net-mail/ezmlm-idx/ezmlm-idx-0.40-r2.ebuild b/net-mail/ezmlm-idx/ezmlm-idx-0.40-r2.ebuild index d6e80c4025ce..d44e7c3ed5e4 100644 --- a/net-mail/ezmlm-idx/ezmlm-idx-0.40-r2.ebuild +++ b/net-mail/ezmlm-idx/ezmlm-idx-0.40-r2.ebuild @@ -25,35 +25,6 @@ IUSE="" DEPEND="sys-apps/grep sys-apps/groff" RDEPEND="virtual/qmail" -if [ "$PN" = "${PB}-pgsql" ] -then - DEPEND="$DEPEND dev-db/postgresql-se# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/ezmlm-idx/ezmlm-idx-0.40-r2.ebuild,v 1.22 2014/08/10 20:44:47 slyfox Exp $ - -# NOTE: ezmlm-idx, ezmlm-idx-mysql and ezmlm-idx-pgsql all supported by this single ebuild -# (Please keep them in sync) - -inherit eutils fixheadtails - -PB=ezmlm-idx -EZMLM_P=ezmlm-0.53 - -S2=${WORKDIR}/${PB}-${PV} -S=${WORKDIR}/${EZMLM_P} -DESCRIPTION="Simple yet powerful mailing list manager for qmail" -SRC_URI=" - http://gd.tuwien.ac.at/infosys/mail/qmail/ezmlm-patches/${PB}-${PV}.tar.gz - http://cr.yp.to/software/${EZMLM_P}.tar.gz -" -HOMEPAGE="http://www.ezmlm.org" -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="alpha amd64 hppa ~mips ppc sparc x86" -IUSE="" -DEPEND="sys-apps/grep sys-apps/groff" -RDEPEND="virtual/qmail" - if [ "$PN" = "${PB}-pgsql" ] then DEPEND="$DEPEND dev-db/postgresql-server" @@ -82,4 +53,32 @@ src_unpack() { cp Makefile Makefile.orig sed -e "s:/install.*conf-bin\`\":/install ${D}usr/bin:" \ -e "s:/install.*conf-man\`\":/install ${D}usr/share/man:" Makefile.orig > Makefile - #apply patch from \ No newline at end of file + #apply patch from Ed Korthof (edk@collab.net) that allows ezmlm-issub and ezmlm-gate + #to check against the From: header as well as qmail's SENDER variable, which is set + #from the envelope sender and often reflects the local MTA rather than the user's + #"official" email address... enable this option by using "-f" with ezmlm-issub and/or + #ezmlm-gate. + cp ${FILESDIR}/get_header.[ch] . || die + patch < ${FILESDIR}/from-header.patch || die + echo ">>> Successfully applied Ed Korthof's From: header patch." + epatch ${FILESDIR}/${EZMLM_P}-errno.patch + ht_fix_file default.do ezmlm-test.sh setup.do auto_qmail.c.do auto_bin.c.do Makefile +} + +src_compile() { + cd ${S} + if [ "$PN" = "${PB}-pgsql" ] + then + make pgsql + elif [ "$PN" = "${PB}-mysql" ] + then + make mysql + fi + emake || die +} + +src_install () { + install -d ${D}/usr/bin ${D}/usr/share/man ${D}/etc/ezmlm + make setup || die + mv ${D}/usr/bin/ez*rc ${D}/etc/ezmlm +} diff --git a/net-mail/mpop/mpop-1.0.27.ebuild b/net-mail/mpop/mpop-1.0.27.ebuild index 775524af0e2e..71c613c8f0b9 100644 --- a/net-mail/mpop/mpop-1.0.27.ebuild +++ b/net-mail/mpop/mpop-1.0.27.ebuild @@ -42,27 +42,36 @@ src_prepare() { src_configure() { econf \ $(use_with gnome-keyring ) \ - $(use_with i# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/mpop/mpop-1.0.27.ebuild,v 1.2 2012/05/03 04:18:36 jdhore Exp $ + $(use_with idn libidn) \ + $(use_enable nls) \ + $(use_with sasl libgsasl) \ + $(use_with ssl ssl $(use gnutls && echo "gnutls" || echo "openssl")) +} -EAPI="4" +src_install() { + default -inherit python + if use gnome-keyring ; then + src_install_contrib mpop-gnome-tool mpop-gnome-tool.py README + fi -DESCRIPTION="A small, fast, and portable POP3 client" -HOMEPAGE="http://mpop.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="gnome-keyring gnutls idn nls sasl ssl vim-syntax" + if use vim-syntax ; then + insinto /usr/share/vim/vimfiles/syntax + doins scripts/vim/mpop.vim + fi +} -RDEPEND=" - gnome-keyring? ( - dev-python/gnome-keyring-python - gnome-base/libgnome-keyring - ) - idn? ( net-dns/libidn ) - nls \ No newline at end of file +src_install_contrib() { + subdir="$1" + bins="$2" + docs="$3" + local dir=/usr/share/${PN}/$subdir + insinto ${dir} + exeinto ${dir} + for i in $bins ; do + doexe scripts/$subdir/$i + done + for i in $docs ; do + newdoc scripts/$subdir/$i $subdir.$i + done +} diff --git a/net-mail/mpop/mpop-1.0.29.ebuild b/net-mail/mpop/mpop-1.0.29.ebuild index af01132d1b7f..4b2f2ff6246d 100644 --- a/net-mail/mpop/mpop-1.0.29.ebuild +++ b/net-mail/mpop/mpop-1.0.29.ebuild @@ -61,9 +61,17 @@ src_install() { fi } -src_# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/mpop/mpop-1.0.29.ebuild,v 1.1 2014/03/09 22:05:28 radhermit Exp $ - -EAPI=5 -PYTHON_COMPAT=( pyth \ No newline at end of file +src_install_contrib() { + subdir="$1" + bins="$2" + docs="$3" + local dir=/usr/share/${PN}/$subdir + insinto ${dir} + exeinto ${dir} + for i in $bins ; do + doexe scripts/$subdir/$i + done + for i in $docs ; do + newdoc scripts/$subdir/$i $subdir.$i + done +} diff --git a/net-mail/mu/mu-0.9.9.ebuild b/net-mail/mu/mu-0.9.9.ebuild index e0d34aeede33..06cb43347e44 100644 --- a/net-mail/mu/mu-0.9.9.ebuild +++ b/net-mail/mu/mu-0.9.9.ebuild @@ -63,23 +63,33 @@ src_install () { if use gui; then dobin toys/mug/mug || die fi - dodoc A# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/mu/mu-0.9.9.ebuild,v 1.7 2012/12/06 04:37:52 phajdan.jr Exp $ + dodoc AUTHORS HACKING NEWS TODO README ChangeLog INSTALL + if use doc; then + dodoc mu4e-manual-${PV}.pdf + fi + if use emacs; then + elisp-install ${PN} mu4e/*.el mu4e/*.elc + elisp-site-file-install "${FILESDIR}/${SITEFILE}" + fi +} -EAPI=4 +src_test () { + emake check +} -inherit base elisp-common +pkg_postinst() { + if use emacs; then + einfo "To use mu4e you need to configure it in your .emacs file" + einfo "See the manual for more information:" + einfo "http://www.djcbsoftware.nl/code/mu/mu4e/Getting-started.html" + fi -DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing" -HOMEPAGE="http://www.djcbsoftware.nl/code/mu/" -SRC_URI="http://mu0.googlecode.com/files/${P}.tar.gz - doc? ( http://mu0.googlecode.com/files/mu4e-manual-${PV}.pdf )" + elog "If you upgrade from an older major version," + elog "then you need to rebuild your mail index." -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="doc emacs gui" + use emacs && elisp-site-regen +} -# Without webkit-gtk there is no pdf-preview functionality, everything -# else works as of 0.9. \ No newline at end of file +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/net-mail/offlineimap/offlineimap-6.5.5.ebuild b/net-mail/offlineimap/offlineimap-6.5.5.ebuild index 2f5a46475287..f534ee2a9bb7 100644 --- a/net-mail/offlineimap/offlineimap-6.5.5.ebuild +++ b/net-mail/offlineimap/offlineimap-6.5.5.ebuild @@ -69,17 +69,14 @@ pkg_postinst() { elog "Sample configurations are in /usr/share/doc/${PF}/" elog "" elog "If you connect via ssl/tls and don't use CA cert checking, it will" - elog "display the server's cert fingerprint and require you to add# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/offlineimap/offlineimap-6.5.5.ebuild,v 1.4 2014/01/14 15:10:17 ago Exp $ - -EAPI=5 - -# Normally you need only one version of this. -DISTUTILS_SINGLE_IMPL=1 -PYTHON_COMPAT=( python{2_6,2_7} ) -PYTHON_REQ_USE="threads,sqlite?,ssl?" - -inherit eutils distutils-r1 + elog "display the server's cert fingerprint and require you to add it to the" + elog "configuration file to be sure it connects to the same server every" + elog "time. This serves to help fixing CVE-2010-4532 (offlineimap doesn't" + elog "check SSL server certificate) in cases where you have no CA cert." + elog "" -DESCRIPTION="Pow \ No newline at end of file + if use sqlite ; then + elog "The sqlite USE flag only enables a dependency on sqlite. To use" + elog "the sqlite backend you need to enable it in your .offlineimaprc" + fi +} diff --git a/net-mail/popa3d/Manifest b/net-mail/popa3d/Manifest index 3ad40e9282d8..b10b6824ae53 100644 --- a/net-mail/popa3d/Manifest +++ b/net-mail/popa3d/Manifest @@ -1,6 +1,3 @@ DIST popa3d-0.5.9-maildir-2.diff.gz 3227 SHA256 f3402a4dd462b8564456c65582dc10cbe620f112f11936a88b978696f35b73e1 SHA512 7d2ab786e6249acfaadaa544adf49dca42b5628f50aa9f52fd1caa80127adc83afa4623824170c9f3b761a39949fcf3c90edbdbb9fdfbf4e06afaa67cdfbaac3 WHIRLPOOL e3b99f33bda8b0b631fa49e9cd3f78e2d55ca61d4c80596db2192efaad937b51c59475d5940db9484fd2439d3a41a077f42e38a532bcb2a9de26dab07fc5cd8f DIST popa3d-0.6.3-vname-2.diff.gz 947 SHA256 12c157142650801cf4ca534350b332eeb5d16ca329bce06f3fca5b5f0e13d7c2 SHA512 eba7df6d03d2745272505b62053d0db56ea326a716e43a9133257465f78fc5030cb09b48d79e86f6a982f7d8e9d18ee64aadf261e60a4f0a56357a4a2517a30a WHIRLPOOL ce3e458a60a97b34b94a40d105f7b278151e386d65f9f188e64053a7476f90e6413cd4c5f4c62dcae9541e4d5867f93be935acef6a57572c115c9595dd39fa24 -DIST popa3d-1.0.2.tar.gz 32848 SHA256 e7034336c1e4b6ed1ddff7c92851292d396d011237acb2268492f44cedbb7a7f SHA512 e577297b4dafb4091110886a5db07184707475651a8ee3b6369f4cab5676852d7286a3729da46fff9161bc3cd46bdc0d032205dc5609bfb38be-----BEGIN PGP SIGNED MESSAGE----- -DIST popa3d-0.5.9-maildir-2.diff.gz 3227 SHA256 f3402a4dd462b8564456c65582dc10cbe620f112f11936a88b978696f35b73e1 SHA512 7d2ab786e6249acfaadaa544adf49dca42b5628f50aa9f52fd1caa80127adc83afa4623824170c9f3b761a39949fcf3c90edbdbb9fdfbf4e06afaa67cdfbaac3 WHIRLPOOL e3b99f33bda8b0b631fa49e9cd3f78e2d55ca61d4c80596db2192efaad937b51c59475d5940db9484fd2439d3a41a077f42e38a532bcb2a9de26dab07fc5cd8f -DIST popa3d-0.6.3-vname-2.diff.gz 947 SHA256 12c157142650801cf4ca534350b332eeb5d16ca329bce06f3fca5b5f0e13d7c2 SHA512 eba7df6d03d2745272505b62053d0db56ea326a716e43a9133257465f78fc5030cb09b48d79e86f6a982f7d8e9d18ee64aadf261e60a4f0a56357a4a2517a30a WHIRLPOOL ce3e458a60a97b34b94a40d105f7b278151e386d65f9f188e64053a7476f90e6413cd4c5f4c62dcae9541e4d5867f93be935acef6a57572c115c9595dd39fa24 -DIST popa3d-1.0.2.tar.gz 32848 SHA256 e7034336c1e4b6ed1ddff7c92851292d396d011237acb2268492f44cedbb7a7f SHA512 e577297b4dafb4091110886a5db07184707475651a8ee3b6369f4cab5676852d7286a3729da46fff9161bc3cd46bdc0d032205dc5609bfb38be69eaeab068906 WHIRLPOOL e27820a95126 \ No newline at end of file +DIST popa3d-1.0.2.tar.gz 32848 SHA256 e7034336c1e4b6ed1ddff7c92851292d396d011237acb2268492f44cedbb7a7f SHA512 e577297b4dafb4091110886a5db07184707475651a8ee3b6369f4cab5676852d7286a3729da46fff9161bc3cd46bdc0d032205dc5609bfb38be69eaeab068906 WHIRLPOOL e27820a951261170afe514d63e9860bd267d3c123710e6bb2d72fdc3ef6285a22534a4d42d197fe502db2d9e575970aa03bd3902746accbdea172d8edb524bd0 diff --git a/net-mail/serialmail/serialmail-0.75-r4.ebuild b/net-mail/serialmail/serialmail-0.75-r4.ebuild index a16ebbf1e33a..653e663d6840 100644 --- a/net-mail/serialmail/serialmail-0.75-r4.ebuild +++ b/net-mail/serialmail/serialmail-0.75-r4.ebuild @@ -42,6 +42,9 @@ src_compile() { src_install() { dobin serialsmtp serialqmtp maildirsmtp maildirserial maildirqmtp - dodoc AUTOTURN CHANGES # Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/serialmail/ser \ No newline at end of file + dodoc AUTOTURN CHANGES FROMISP SYSDEPS THANKS TOISP \ + BLURB FILES INSTALL README TARGETS TODO VERSION + + doman maildirqmtp.1 maildirserial.1 maildirsmtp.1 \ + serialqmtp.1 serialsmtp.1 +} diff --git a/net-mail/swaks/swaks-20130209.0-r1.ebuild b/net-mail/swaks/swaks-20130209.0-r1.ebuild index 80b1cd118abf..780f2d41dbbb 100644 --- a/net-mail/swaks/swaks-20130209.0-r1.ebuild +++ b/net-mail/swaks/swaks-20130209.0-r1.ebuild @@ -1,7 +1,5 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/swaks/swaks-20130# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/net-mail/swaks/swaks-20130209.0-r1.ebuild,v 1.2 2014/07/29 16:00:20 dilfridge Exp $ EAPI=5 @@ -34,4 +32,11 @@ src_prepare() { } src_compile() { - /usr/bin/pod2man -s 1 doc/re \ No newline at end of file + /usr/bin/pod2man -s 1 doc/ref.pod swaks.1 || die "man page compulation failed" +} + +src_install() { + newbin swaks swaks || die "newbin failed" + doman swaks.1 || die + dodoc README doc/*.txt || die +} diff --git a/net-misc/asterisk/metadata.xml b/net-misc/asterisk/metadata.xml index 927d547583ab..ddf03212a3cc 100644 --- a/net-misc/asterisk/metadata.xml +++ b/net-misc/asterisk/metadata.xml @@ -15,8 +15,7 @@ Support clustering using the Application Interface Specification framework Support secure peering using the Open Settlement Protocol Enable embedded web server - Enable - - - - chainsaw@gentoo.o \ No newline at end of file + Enable high-availability support through the Corosync Cluster Engine + Enable the Internet Low Bitrate Codec (iLBC) + + diff --git a/net-misc/axel/axel-2.3-r1.ebuild b/net-misc/axel/axel-2.3-r1.ebuild index 854166e81be0..e52c23226244 100644 --- a/net-misc/axel/axel-2.3-r1.ebuild +++ b/net-misc/axel/axel-2.3-r1.ebuild @@ -13,24 +13,6 @@ SLOT="0" KEYWORDS="amd64 ~hppa ppc ~ppc64 sparc x86 ~x86-fbsd" IUSE="debug nls" -RDEPEND="nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" -RD# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/axel/axel-2.3-r1.ebuild,v 1.8 2011/02/26 18:14:47 xarthisius Exp $ - -inherit eutils toolchain-funcs - -DESCRIPTION="light Unix download accelerator" -HOMEPAGE="http://axel.alioth.debian.org/" -SRC_URI="http://alioth.debian.org/frs/download.php/2718/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~hppa ppc ~ppc64 sparc x86 ~x86-fbsd" -IUSE="debug nls" - RDEPEND="nls? ( virtual/libintl )" DEPEND="${RDEPEND} nls? ( sys-devel/gettext )" @@ -48,4 +30,25 @@ src_unpack() { src_compile() { local myconf - use debug && my \ No newline at end of file + use debug && myconf="--debug=1" + use nls && myconf="--i18n=1" + econf \ + --strip=0 \ + --etcdir=/etc \ + ${myconf} \ + || die + + emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc API CHANGES CREDITS README axelrc.example +} + +pkg_postinst() { + einfo 'To use axel with portage, try these settings in your make.conf' + einfo + einfo ' FETCHCOMMAND='\''/usr/bin/axel -a -o "\${DISTDIR}/\${FILE}.axel" "\${URI}" && mv "\${DISTDIR}/\${FILE}.axel" "\${DISTDIR}/\${FILE}"'\' + einfo ' RESUMECOMMAND="${FETCHCOMMAND}"' +} diff --git a/net-misc/badvpn/metadata.xml b/net-misc/badvpn/metadata.xml index 53fd2705c551..4d2e0e47e694 100644 --- a/net-misc/badvpn/metadata.xml +++ b/net-misc/badvpn/metadata.xml @@ -32,28 +32,21 @@ Build the badvpn-server program, a central server that manages the VPN network. Build NCD, a lightweight scripting language - especially suited for network configurations. - - - proxy-maintainers - - hasufell@gentoo.org - Julian Ospald - Maintainer, assign bugs to him - - - williamh@gentoo.org - backup Maintainer, CC him on bugs - - - ambrop7@gmail.com - Ambroz Bizjak - Proxy maintainer. CC him on bugs - - - - ambrop7@gmail.com - Ambroz Bizjak - - https://code.google.com/p/badvpn/w/list - ht \ No newline at end of file + especially suited for network configurations. + Build tun2socks, a program which implements + a TUN device that forwards TCP traffic through a SOCKS5 + server. + Build udpgw, a small daemon which allows tun2socks to forward UDP traffic. + + BadVPN is an open-source peer-to-peer VPN system. It provides a + Layer 2 (Ethernet) network between the peers (VPN nodes). The peers + connect to a central server which acts as a chat server for them to + establish direct connections between each other (data connections). + These connections are used for transferring network data (Ethernet + frames), and can be secured with a multitude of mechanisms. + + The BadVPN package also includes other network-related software, + like tun2socks and NCD. + + + diff --git a/net-misc/bgpq3/Manifest b/net-misc/bgpq3/Manifest index c9e8ea14f769..bf394bb931cb 100644 --- a/net-misc/bgpq3/Manifest +++ b/net-misc/bgpq3/Manifest @@ -1,2 +1 @@ DIST bgpq3-0.1.19.tgz 60308 SHA256 f919ae9aa0cab12c991569178f938ee18267e754298710e1a0f28c36ea211086 SHA512 dc7a3a3e679797316129d10662741d2b94f91631b729712d20a1b6386b567d29b5f6024c0b28c6bf872dab624160069c5b911ab4281415f03e6faab3076499fe WHIRLPOOL 0ae476afafea689b9afa963a9bd60b53be55ddc2a41e058b847f24555d2b3866d0bd8296a8446cd1517d42fe55e3a90926d44942c99989591c0ea349ef71ebe7 -DIST bgpq3-0.1.19.tgz 60308 SHA256 f919ae9aa0cab12c991569178f938ee18267e754298710e1a0f28c36ea211086 SHA512 dc7a3a3e679797316129d10662741d2b94f91631b729712d20a1b6386b567d29b5f6024c0b28c6bf872dab624160069c5b911ab4281415f03e6faab3076499fe WHIRLPOOL 0ae476afafea689b9afa963a9bd60b53be55ddc2a41e058b847f24555d2b3866d0bd8296a8446cd1517d42fe55e3a90926d44942c99989591c0ea349ef71ebe7 diff --git a/net-misc/connman/connman-1.25.ebuild b/net-misc/connman/connman-1.25.ebuild index 8444e9730201..ceca4008fcc7 100644 --- a/net-misc/connman/connman-1.25.ebuild +++ b/net-misc/connman/connman-1.25.ebuild @@ -60,5 +60,6 @@ src_install() { fi keepdir /var/lib/${PN} newinitd "${FILESDIR}"/${PN}.initd2 ${PN} - newconfd "${FILESDIR}"/${# Copyright 1999-2014 Gentoo Foundation -# Distributed under the \ No newline at end of file + newconfd "${FILESDIR}"/${PN}.confd ${PN} + systemd_dounit "${FILESDIR}"/connman.service +} diff --git a/net-misc/dibbler/dibbler-0.8.4.ebuild b/net-misc/dibbler/dibbler-0.8.4.ebuild index c4d82c19d717..37e117793108 100644 --- a/net-misc/dibbler/dibbler-0.8.4.ebuild +++ b/net-misc/dibbler/dibbler-0.8.4.ebuild @@ -35,11 +35,18 @@ src_compile() { } src_install() { - readme.gentoo_create# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dibbler/dibbler-0.8.4.ebuild,v 1.4 2014/02/22 08:07:15 ago Exp $ + readme.gentoo_create_doc -EAPI="5" -inherit eutils readme.gentoo systemd + dosbin dibbler-{client,relay,server} + doman doc/man/*.8 -DESCRIPTION="Portable DHCPv6 implementation (server, client a \ No newline at end of file + insinto /etc/dibbler + doins doc/examples/*.conf + dodir /var/lib/dibbler + + dodoc AUTHORS CHANGELOG RELNOTES TODO + use doc && dodoc doc/dibbler-user.pdf + + doinitd "${FILESDIR}"/dibbler-{client,relay,server} + systemd_dounit "${FILESDIR}"/dibbler-client.service +} diff --git a/net-misc/dropbear/metadata.xml b/net-misc/dropbear/metadata.xml index 4a900cde7264..abc91b38869c 100644 --- a/net-misc/dropbear/metadata.xml +++ b/net-misc/dropbear/metadata.xml @@ -5,13 +5,6 @@ I was looking for a small and secure SSH server to fit on a laptop with 4 megs ram and no hard disk, and couldn't find one which was satisfactory. I decided to write my own, and Dropbear is -the result. It implements most required features of the SSH 2 protocol, - - - embedded - -I was looking for a small and secure SSH server to fit on a laptop with 4 megs ram and no hard -disk, and couldn't find one which was satisfactory. I decided to write my own, and Dropbear is the result. It implements most required features of the SSH 2 protocol, and other features such as X11, TCP and Authentication Agent forwarding. Dropbear is Open Source software, distributed under a MIT-style license. @@ -21,4 +14,12 @@ under a MIT-style license. くて安全な SSH サーバを探していました。しかし満足するものは見つけられません でした。私は自身で作ろうと決意しました。その結果が Dropbear です。SSH 2 プ ロトコルに必要な機能の大半、他にも X11 や TCP、認証エージェント・フォワーデ -ィングといった機能が実装してあります。Dropbear はオープンソースで、MIT ス \ No newline at end of file +ィングといった機能が実装してあります。Dropbear はオープンソースで、MIT スタ +イルのライセンス下で配布されます。 + + + Add support for legacy BSD pty's rather than dynamic UNIX pty's -- do not use this flag unless you are absolutely sure you actually want it + Build all the programs as one little binary (to save space) + Enable shadow password support + + diff --git a/net-misc/fakeidentd/Manifest b/net-misc/fakeidentd/Manifest index 092629ac02b3..7fa77c31ff64 100644 --- a/net-misc/fakeidentd/Manifest +++ b/net-misc/fakeidentd/Manifest @@ -1,4 +1,2 @@ DIST fakeidentd-2.6.c 23042 SHA256 75b321e5d9dddcea2b38035b62ac30f2175ed43f3f187be6da19aaa67c4fe165 SHA512 97f6cc70c5cbd757d250db58dfe01f0b82bfecd8296f26f258ef16cc612d7427350ad93740150bf2e8a3c09b92de3340b2e9612ed5c9b4a4be5550f0b18da76b WHIRLPOOL 3da376b7c1f36f093be2b40faa63c87c8d32590a16c1e8ff99294d4204346f9bacabdb1b8d9950f3708e136fcd7b1a9ea10b1b6f43e1b888b72640aa0158cf88 -DIST fakeidentd-2.6.readme 5589 SHA256 887acf81df0ef991f5990fd434b0c38b32f92d4e86d19f258960c83d847f36c4 SHA512 057f0ce278b5520d5db1edf3139a68ac15f36fde1aefcb2c94db59d1557905f4f437a0bfaa30f0714e3b8b4c1cf4698a245d2c94fc6023fd2e677cc76e796d75 WHIRLPOOL 1aab212b8a45dbb194ee7c178d75cf09d259a472c38f43ab4eebf0555b32b6b3f-----BEGIN PGP SIGNED MESSAGE----- -DIST fakeidentd-2.6.c 23042 SHA256 75b321e5d9dddcea2b38035b62ac30f2175ed43f3f187be6da19aaa67c4fe165 SHA512 97f6cc70c5cbd757d250db58dfe01f0b82bfecd8296f26f258ef16cc612d7427350ad93740150bf2e8a3c09b92de3340b2e9612ed5c9b4a4be5550f0b18da76b WHIRLPOOL 3da376b7c1f36f093be2b40faa63c87c8d32590a16c1e8ff99294d4204346f9bacabdb1b8d9950f3708e136fcd7b1a9ea10b1b6f43e1b888b72640aa0158cf88 DIST fakeidentd-2.6.readme 5589 SHA256 887acf81df0ef991f5990fd434b0c38b32f92d4e86d19f258960c83d847f36c4 SHA512 057f0ce278b5520d5db1edf3139a68ac15f36fde1aefcb2c94db59d1557905f4f437a0bfaa30f0714e3b8b4c1cf4698a245d2c94fc6023fd2e677cc76e796d75 WHIRLPOOL 1aab212b8a45dbb194ee7c178d75cf09d259a472c38f43ab4eebf0555b32b6b3f1e1afa7c98d358e0fe76eba3531f7c22586c4db840d7499a28b068549a4ca12 diff --git a/net-misc/freerdp/freerdp-9999.1.ebuild b/net-misc/freerdp/freerdp-9999.1.ebuild index b56ee1fe760a..c614e865cd55 100644 --- a/net-misc/freerdp/freerdp-9999.1.ebuild +++ b/net-misc/freerdp/freerdp-9999.1.ebuild @@ -18,26 +18,6 @@ else KEYWORDS="" fi -DESCRIPTION="Free implementation of the Re# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/freerdp-9999.1.ebuild,v 1.19 2014/08/06 00:49:04 floppym Exp $ - -EAPI="5" - -inherit cmake-utils vcs-snapshot - -if [[ ${PV} != 9999* ]]; then - COMMIT="780d451afad21a22d2af6bd030ee71311856f038" - SRC_URI="https://github.com/FreeRDP/FreeRDP/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -else - inherit git-2 - SRC_URI="" - EGIT_REPO_URI="git://github.com/FreeRDP/FreeRDP.git - https://github.com/FreeRDP/FreeRDP.git" - KEYWORDS="" -fi - DESCRIPTION="Free implementation of the Remote Desktop Protocol" HOMEPAGE="http://www.freerdp.com/" @@ -105,4 +85,22 @@ src_configure() { local mycmakeargs=( $(cmake-utils_use_with alsa ALSA) $(cmake-utils_use_with client CLIENT) - $(cmake-u \ No newline at end of file + $(cmake-utils_use_with cups CUPS) + $(cmake-utils_use_with debug DEBUG_ALL) + $(cmake-utils_use_with doc MANPAGES) + $(cmake-utils_use_with directfb DIRECTFB) + $(cmake-utils_use_with ffmpeg FFMPEG) + $(cmake-utils_use_with gstreamer GSTREAMER_1_0) + $(cmake-utils_use_with jpeg JPEG) + $(cmake-utils_use_with pulseaudio PULSE) + $(cmake-utils_use_with server SERVER) + $(cmake-utils_use_with smartcard PCSC) + $(cmake-utils_use_with sse2 SSE2) + $(cmake-utils_use usb CHANNEL_URBDRC) + $(cmake-utils_use_with X X11) + $(cmake-utils_use_with xinerama XINERAMA) + $(cmake-utils_use_with xv XV) + $(cmake-utils_use_build test TESTING) + ) + cmake-utils_src_configure +} diff --git a/net-misc/hotot/Manifest b/net-misc/hotot/Manifest index 02fc7bdb11b3..64c0c5b870fb 100644 --- a/net-misc/hotot/Manifest +++ b/net-misc/hotot/Manifest @@ -1,3 +1,2 @@ DIST hotot-0.9.8.14.tar.gz 1234004 SHA256 1e67a8c39cfe250ed86633f9aedf366d25fe8133cca98fb0f28b9c1a0d7edd7b SHA512 96e110acfff50048d404e79e5345be16d85dde55f6ed952610e75cff248f78087f832dffba45302840d7fc737bb53e9642fbd44d93473713811cd402c0ca7456 WHIRLPOOL 50aa12a82f0c524d1e3dc76f74f30bcc5cd2879bef252aed6d81cf81f3cab70f4fcc09f4518f8c9c6566b6c7340b20bdeb264cbc81dcd1de915952e545510151 DIST hotot-0.9.8.14_p20130514.tar.gz 1234379 SHA256 46198319c76516354b38fb6f02994e57ab39bf0707f533243c5c0753cde8d641 SHA512 3b4e041ebf48c7397c78139d2e8542178bf16a0bd73de8ea33781ba581b1ea3da9aefa3aa1d0bc91d32d46dd3f15902786982ef8ec64e548723cd4500386afae WHIRLPOOL e94e5eec52147fbf533858095dcc9924d381529a59c6e6d420fd06e1de50e62147660c5c0b9acf93a64efa4cdeea4c09a10303ac25e198f1709772bfcb417a0e -DIST hotot-0.9.8.14.tar.gz 1234004 SHA256 1e67a8c39cfe250ed86633f9aedf366d25fe8133cca98fb0f28b9c1a0d7edd7b SHA512 96e110acfff50048d404e79e5345be16d85dde55f6ed952610e75cff248f78087f832dffba45302840d7fc737bb53e9642fbd44d93473713811cd402c0ca7456 WHIRLPOOL 50aa12a82f0c \ No newline at end of file diff --git a/net-misc/hylafaxplus/files/hylafaxplus-init b/net-misc/hylafaxplus/files/hylafaxplus-init index dd35e094b344..47c16fdff2f2 100644 --- a/net-misc/hylafaxplus/files/hylafaxplus-init +++ b/net-misc/hylafaxplus/files/hylafaxplus-init @@ -107,66 +107,70 @@ checkconfig() { start() { local result - checkconfig || return #!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation -# Author Geaaru -# Distributed under the terms of the GNU General Public License v2 + checkconfig || return 1 -opts="zap" + ebegin "Starting HylaFAX server daemons" -depend() { - use lo -} + start_faxq + result=$? -checkconfig() { - ebegin "Check hylafax server configuration..." - - if [ x$spooldir == x ] ; then - eerror "No spooldir directory defined" + if [ $result -ne 0 ] ; then + eerror "Error on start $faxq daemon" return 1 - else - SPOOL=$spooldir - einfo "Use spool directory $SPOOL" fi - if [ x$mode == x ] ; then - eerror "No mode defined" - return 1 - fi + start_hfaxd + result=$? - if [ ! -f $SPOOL/etc/setup.cache ] ; then - eerror "No $SPOOL/etc/setup.cache file founded. Use faxsetup command" - return 1 - fi + eend $result +} - if [[ x$hfaxd == x || ! -f $hfaxd ]] ; then - eerror "No hfaxd daemon founded" - return 1 - fi +start_hfaxd() { + local arguments="--start \ + --make-pidfile --pidfile $PIDDIR/hfaxd.pid" + + einfo "Starting $hfaxd with args $hfaxd_args" - if [[ x$faxq == x || ! -f $faxq ]] ; then - eerror "No faxq program founded" - return 1 - fi + start-stop-daemon -b ${arguments} --exec $hfaxd -- $hfaxd_args > /dev/null 2>&1 - if [[ x$faxgetty == x || ! -f $faxgetty ]] ; then - eerror "No faxgetty program founded" - return 1 - fi + return $?; +} - if [ x$faxbind == x ] ; then - eerror "No binding address supply" - return 1 - fi +start_faxq() { + local arguments="--start \ + --make-pidfile --pidfile $PIDDIR/faxq.pid" + einfo "Starting $faxq ... " - if [ x$piddir == x ] ; then - PIDDIR=$SPOOL - else - PIDDIR=$piddir - fi + start-stop-daemon -b ${arguments} --exec $faxq -- $faxq_args > /dev/null 2>&1 + + return $? +} +stop() { + checkconfig || return 1 - hfaxd_args="-l $faxbind -q $SPOOL" + ebegin "Stopping HylaFAX server daemons" + + start-stop-daemon --stop --quiet --pidfile $PIDDIR/hfaxd.pid + start-stop-daemon --stop --quiet --pidfile $PIDDIR/faxq.pid + eend $? +} - case $mode in - newproto) \ No newline at end of file +zap() { + checkconfig || return 1 + + ebegin "Zap HylaFAX server daemon files" + + if [ -f $PIDFILE/hfaxd.pid ] ; then + rm -f $PIDFILE/hfaxd.pid + fi + + if [ -f $PIDFILE/faxq.pid ] ; then + rm -f $PIDFILE/faxq.pid + fi +} + +restart() { + stop + start +} diff --git a/net-misc/knemo/knemo-0.7.6-r1.ebuild b/net-misc/knemo/knemo-0.7.6-r1.ebuild index aa41a2517a4e..6ff29ba3f161 100644 --- a/net-misc/knemo/knemo-0.7.6-r1.ebuild +++ b/net-misc/knemo/knemo-0.7.6-r1.ebuild @@ -24,6 +24,14 @@ DEPEND=" dev-qt/qtsql:4[sqlite] wifi? ( net-wireless/wireless-tools ) " -R# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/knemo/knemo-0. \ No newline at end of file +RDEPEND="${DEPEND}" + +DOCS=( AUTHORS ChangeLog README ) + +src_configure() { + mycmakeargs=( + $(cmake-utils_use_no wifi WIRELESS_SUPPORT) + ) + + kde4-base_src_configure +} diff --git a/net-misc/lldpd/lldpd-0.7.7.ebuild b/net-misc/lldpd/lldpd-0.7.7.ebuild index 83deb14d920c..0158454109bf 100644 --- a/net-misc/lldpd/lldpd-0.7.7.ebuild +++ b/net-misc/lldpd/lldpd-0.7.7.ebuild @@ -6,14 +6,6 @@ EAPI=5 inherit eutils user -DESCRIPTION="Impl# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/lldpd/lldpd-0.7.7.ebuild,v 1.1 2014/02/21 18:47:03 chutzpah Exp $ - -EAPI=5 - -inherit eutils user - DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)" HOMEPAGE="http://vincentbernat.github.com/lldpd/" SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz" @@ -77,4 +69,19 @@ src_configure() { $(use_with xml) } -src_compile() \ No newline at end of file +src_compile() { + emake + use doc && emake doxygen-doc +} + +src_install() { + emake DESTDIR="${D}" install + prune_libtool_files + + newinitd "${FILESDIR}"/${PN}-initd-1 ${PN} + newconfd "${FILESDIR}"/${PN}-confd-1 ${PN} + + use doc && dohtml -r doxygen/html/* + + keepdir /var/lib/${PN} +} diff --git a/net-misc/mediatomb/mediatomb-0.12.2_pre20140810.ebuild b/net-misc/mediatomb/mediatomb-0.12.2_pre20140810.ebuild index 269861a383e7..4f3fbdc2e129 100644 --- a/net-misc/mediatomb/mediatomb-0.12.2_pre20140810.ebuild +++ b/net-misc/mediatomb/mediatomb-0.12.2_pre20140810.ebuild @@ -44,55 +44,6 @@ RDEPEND="${DEPEND}" CONFIG_CHECK="~INOTIFY_USER" -pkg_setup() { - use inotify && linux-info_pkg_setup - - enewgro# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/mediatomb-0.12.2_pre20140810.ebuild,v 1.2 2014/09/30 17:19:14 thev00d00 Exp $ - -EAPI=5 -inherit autotools eutils linux-info user vcs-snapshot - -DESCRIPTION="MediaTomb is an open source UPnP MediaServer" -HOMEPAGE="http://www.mediatomb.cc/" -SRC_URI="https://github.com/v00d00/${PN}/archive/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86" - -IUSE="curl debug +exif +ffmpeg flac id3tag +inotify +javascript lastfm - +magic +mp4 mysql +sqlite +taglib thumbnail +zlib" -REQUIRED_USE=" - || ( mysql sqlite ) - taglib? ( !id3tag ) - id3tag? ( !taglib ) - thumbnail? ( ffmpeg ) -" - -DEPEND="mysql? ( virtual/mysql ) - dev-libs/expat - id3tag? ( media-libs/id3lib ) - javascript? ( >=dev-lang/spidermonkey-1.8.5:0 ) - taglib? ( media-libs/taglib ) - sqlite? ( >=dev-db/sqlite-3 ) - lastfm? ( >=media-libs/lastfmlib-0.4 ) - exif? ( media-libs/libexif ) - mp4? ( >=media-libs/libmp4v2-1.9.1_p479:0 ) - ffmpeg? ( virtual/ffmpeg ) - flac? ( media-libs/flac ) - thumbnail? ( media-video/ffmpegthumbnailer[jpeg] ) - curl? ( net-misc/curl net-misc/youtube-dl ) - magic? ( sys-apps/file ) - sys-apps/util-linux - zlib? ( sys-libs/zlib ) - virtual/libiconv -" -RDEPEND="${DEPEND}" - -CONFIG_CHECK="~INOTIFY_USER" - pkg_setup() { use inotify && linux-info_pkg_setup @@ -115,4 +66,52 @@ src_configure() { econf \ $(use_enable curl) \ $(use_enable curl youtube) \ - $(use_enable \ No newline at end of file + $(use_enable debug tombdebug) \ + $(use_enable exif libexif) \ + $(use_enable ffmpeg) \ + $(use_enable flac) \ + $(use_enable id3tag id3lib) \ + $(use_enable inotify) \ + $(use_enable javascript libjs) \ + $(use_enable lastfm lastfm) \ + $(use_enable magic libmagic) \ + $(use_enable mp4 libmp4v2) \ + $(use_enable mysql) \ + $(use_enable sqlite sqlite3) \ + $(use_enable taglib) \ + $(use_enable thumbnail ffmpegthumbnailer) \ + --enable-external-transcoding \ + --enable-protocolinfo-extension +} + +src_install() { + default + + newinitd "${FILESDIR}"/${PN}-0.12.1.initd ${PN} + use mysql || sed -i -e "/use mysql/d" "${ED}"/etc/init.d/${PN} + newconfd "${FILESDIR}"/${PN}-0.12.0.confd ${PN} + + insinto /etc/mediatomb + newins "${FILESDIR}/${PN}-0.12.0.config" config.xml + fperms 0600 /etc/mediatomb/config.xml + fowners mediatomb:mediatomb /etc/mediatomb/config.xml + + keepdir /var/lib/mediatomb + fowners mediatomb:mediatomb /var/lib/mediatomb +} + +pkg_postinst() { + if use mysql ; then + elog "MediaTomb has been built with MySQL support and needs" + elog "to be configured before being started." + elog "For more information, please consult the MediaTomb" + elog "documentation: http://mediatomb.cc/pages/documentation" + elog + fi + + elog "To configure MediaTomb edit:" + elog "/etc/mediatomb/config.xml" + elog + elog "The MediaTomb web interface can be reached at (after the service is started):" + elog "http://localhost:49152/" +} diff --git a/net-misc/netcomics-cvs/netcomics-cvs-0.14.1-r1.ebuild b/net-misc/netcomics-cvs/netcomics-cvs-0.14.1-r1.ebuild index d838553c66b3..3c3e1b2d13d6 100644 --- a/net-misc/netcomics-cvs/netcomics-cvs-0.14.1-r1.ebuild +++ b/net-misc/netcomics-cvs/netcomics-cvs-0.14.1-r1.ebuild @@ -43,4 +43,7 @@ src_install () { sed -i -e "s:${D}::g" -e "s:site_perl:vendor_perl:g" "${D}"${f} || die "failure in sed statement" done - if use doc; th# Copyright 1999-2014 Gent \ No newline at end of file + if use doc; then + dohtml -r doc/ + fi +} diff --git a/net-misc/netctl/netctl-1.9.ebuild b/net-misc/netctl/netctl-1.9.ebuild index be43274d6ee3..ec715d7a24c1 100644 --- a/net-misc/netctl/netctl-1.9.ebuild +++ b/net-misc/netctl/netctl-1.9.ebuild @@ -65,21 +65,16 @@ optfeature() { shift done } -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/netctl/netctl-1.9.ebuild,v 1.1 2014/08/07 19:44:11 floppym Exp $ - -EAPI=5 -inherit bash-completion-r1 - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="git://projects.archlinux.org/netctl.git" - inherit git-2 - DEPEND="app-text/asciidoc" -else - SRC_URI="ftp://ftp.archlinux.org/other/packages/${PN}/${P}.tar.xz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="Profil \ No newline at end of file +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]]; then + elog "To get additional features, a number of optional runtime dependencies may be" + elog "installed." + optfeature "DHCP support" net-misc/dhcpcd ">=net-misc/dhcp-5.6.7[client]" + optfeature "WPA support" net-wireless/wpa_supplicant + optfeature "interactive assistant" dev-util/dialog + optfeature "automatic connection" sys-apps/ifplugd + optfeature "bonding support" net-misc/ifenslave + optfeature "dialup support" net-dialup/ppp + fi +} diff --git a/net-misc/raccess/metadata.xml b/net-misc/raccess/metadata.xml index 45c7be035ada..f9d50da18d39 100644 --- a/net-misc/raccess/metadata.xml +++ b/net-misc/raccess/metadata.xml @@ -5,4 +5,4 @@ maintainer-needed@gentoo.org This package lacks a primary herd or maintainer. - diff --git a/net-misc/rdesktop/rdesktop-1.7.1.ebuild b/net-misc/rdesktop/rdesktop-1.7.1.ebuild index 0c86d57ea112..c87a88eab9af 100644 --- a/net-misc/rdesktop/rdesktop-1.7.1.ebuild +++ b/net-misc/rdesktop/rdesktop-1.7.1.ebuild @@ -63,20 +63,20 @@ src_configure() { $(use_with debug) \ $(use_with ipv6) \ $(use_with libsamplerate) \ - # Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.7.1.ebuild,v 1.12 2013/11/10 15:16:18 pinkbyte Exp $ - -EAPI=4 - -inherit autotools eutils - -MY_PV=${PV/_/-} - -DESCRIPTION="A Remote Desktop Protocol Client" -HOMEPAGE="http://rdesktop.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz" + $(use_enable pcsc-lite smartcard) \ + ${sound_conf} +} -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linu \ No newline at end of file +src_install() { + emake DESTDIR="${D}" install + dodoc doc/HACKING doc/TODO doc/keymapping.txt + + # For #180313 - applies to versions >= 1.5.0 + # Fixes sf.net bug + # http://sourceforge.net/tracker/index.php?func=detail&aid=1725634&group_id=24366&atid=381349 + # check for next version to see if this needs to be removed + insinto /usr/share/rdesktop/keymaps + newins "${FILESDIR}/rdesktop-keymap-additional" additional + newins "${FILESDIR}/rdesktop-keymap-cs" cs + newins "${FILESDIR}/rdesktop-keymap-sk" sk +} diff --git a/net-misc/rinetd/Manifest b/net-misc/rinetd/Manifest index 723cfe8f6d7e..e260e9f021d7 100644 --- a/net-misc/rinetd/Manifest +++ b/net-misc/rinetd/Manifest @@ -1,2 +1 @@ DIST rinetd.tar.gz 115541 SHA256 0c68d27c5bd4b16ce4f58a6db514dd6ff37b2604a88b02c1dfcdc00fc1059898 -DIST rinetd.tar.gz 115541 SHA256 0c68d27c5bd4b16ce4f58a6db514dd6ff37b2604a88b02c1dfcdc00fc1059898 diff --git a/net-misc/rygel/rygel-0.22.3.ebuild b/net-misc/rygel/rygel-0.22.3.ebuild index 83fde24f90f7..493d1324ba0b 100644 --- a/net-misc/rygel/rygel-0.22.3.ebuild +++ b/net-misc/rygel/rygel-0.22.3.ebuild @@ -15,38 +15,6 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="X +sqlite tracker test transcode" -# The deps for tracker? and transcode? are just the earliest available -# version at the time of writing this ebuild -RDEPEND=" - >=dev-libs/glib-2.34:2 - >=dev-libs/libgee-0.8:0.8 - >=dev-libs/libxml2-2.7:2 - >=media-libs/gupnp-dlna-0.9.4:2.0 - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - media-plugins/gst-plugins-soup:1.0 - >=net-libs/gssdp-0.13 - >=net-libs/gupnp-0.19 - >=net-libs/gupnp-av-0.12.4 - >=net-libs/libsoup-2.44:2.4 - >=sys-apps/util-linux-2.20 - x11-misc/shared-mime# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/rygel/rygel-0.22.3.ebuild,v 1.1 2014/09/04 15:29:57 pacho Exp $ - -EAPI="5" -GCONF_DEBUG="no" - -inherit gnome2 virtualx - -DESCRIPTION="Rygel is an open source UPnP/DLNA MediaServer" -HOMEPAGE="https://wiki.gnome.org/Projects/Rygel" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="X +sqlite tracker test transcode" - # The deps for tracker? and transcode? are just the earliest available # version at the time of writing this ebuild RDEPEND=" @@ -82,4 +50,38 @@ DEPEND="${RDEPEND} virtual/pkgconfig " # Maintainer only -# >=dev-lang/v \ No newline at end of file +# >=dev-lang/vala-0.22 +# dev-libs/libxslt + +src_prepare() { + # runs gst-plugins-scanner on run with triggers sandbox violation + # trying to open dri + sed -e 's/rygel-media-engine-test$(EXEEXT)//' \ + -e 's/rygel-playbin-renderer-test$(EXEEXT)//' \ + -i tests/Makefile.in || die + + gnome2_src_prepare +} + +src_configure() { + # We defined xsltproc because man pages are provided by upstream + # and we do not want to regenerate them automagically. + gnome2_src_configure \ + XSLTPROC=$(type -P false) \ + --enable-gst-launch-plugin \ + --enable-mediathek-plugin \ + --with-media-engine=gstreamer \ + --enable-nls \ + $(use_enable sqlite media-export-plugin) \ + $(use_enable test tests) \ + $(use_enable tracker tracker-plugin) \ + $(use_with X ui) +} + +src_install() { + gnome2_src_install + # Autostart file is not placed correctly, bug #402745 + insinto /etc/xdg/autostart + doins "${D}"/usr/share/applications/rygel.desktop + rm "${D}"/usr/share/applications/rygel.desktop +} diff --git a/net-misc/stargazer/files/mans/rscriptd.8 b/net-misc/stargazer/files/mans/rscriptd.8 index 2e0e767b99b2..440f7b0267b1 100644 --- a/net-misc/stargazer/files/mans/rscriptd.8 +++ b/net-misc/stargazer/files/mans/rscriptd.8 @@ -8,20 +8,6 @@ rscriptd \- a remote script execute daemon for Stargazer .RI [ config-file ] .br -.SH DESCRIPTION -The -.B rscriptd -daemon typically runs on a last-wire router before users and -manages firewall rul.TH rscriptd 8 "December 31, 2012" "" "rscriptd" - -.SH NAME -rscriptd \- a remote script execute daemon for Stargazer - -.SH SYNOPSIS -.B rscriptd -.RI [ config-file ] -.br - .SH DESCRIPTION The .B rscriptd @@ -57,4 +43,9 @@ Path to rscriptd configuration file. Default is .BR stargazer (8). .SH AUTHOR -rscriptd was originally written by Boris Mikha \ No newline at end of file +rscriptd was originally written by Boris Mikhailenko and +Maxim Mamontov . +.PP +This manual page was written by Alexey Osipov , +for the Debian project (and may be used by others), and was modified by +Vladimir Pavljuchenkov for Gentoo Linux \ No newline at end of file diff --git a/net-misc/stargazer/files/mans/sgconf_xml.1 b/net-misc/stargazer/files/mans/sgconf_xml.1 index 3715e519025a..428fadfd5b18 100644 --- a/net-misc/stargazer/files/mans/sgconf_xml.1 +++ b/net-misc/stargazer/files/mans/sgconf_xml.1 @@ -51,30 +51,29 @@ Administrator password. The request in form of XML. .TP .BI \-f " request-file" -File containing request in form of X.TH sgconf_xml 1 "December 31, 2012" "" "sgconf_xml" +File containing request in form of XML. -.SH NAME -sgconf_xml \- a command-line xml-based utility for configuring Stargazer - -.SH SYNOPSIS +.SH REQUEST SYNTAX +TODO. +.br +As for now you can check an example by running .B sgconf_xml -.BI \-s " server" -.BI \-p " port" -.BI \-a " admin" -.BI \-w " admin-pass" -( -.BI \-r " request-string" -| -.BI \-f " request-file" -) +without arguments. -.SH DESCRIPTION -.B sgconf_xml -allows system administrators to configure -.BR Stargazer . +.SH FILES +.B +/usr/bin/sgconf_xml + +.SH SEE ALSO +.BR sgauth (8), +.BR sgconf (1), +.BR sgconv (1), +.BR stargazer (8), +.BR rscriptd (8). + +.SH AUTHOR +sgconf_xml was initially written by Boris Mikhailenko . .PP -.B sgconf_xml -uses XML for requests and responses. You can specify a -file containing XML request by using -.B \-f -option, or you can specify XML request dir \ No newline at end of file +This manual page was written by Alexey Osipov , +for the Debian project (and may be used by others), and was modified by +Vladimir Pavljuchenkov for Gentoo Linux \ No newline at end of file diff --git a/net-misc/stargazer/files/patches/stg-2.408-rscriptd.conf-upstream.patch b/net-misc/stargazer/files/patches/stg-2.408-rscriptd.conf-upstream.patch index a73667588fb8..21746e59e8d1 100644 --- a/net-misc/stargazer/files/patches/stg-2.408-rscriptd.conf-upstream.patch +++ b/net-misc/stargazer/files/patches/stg-2.408-rscriptd.conf-upstream.patch @@ -43,28 +43,38 @@ +# Default: /etc/rscriptd +ConfigDir = /etc/rscriptd + -+# Defines password for the encryption exchange --- projects/rscriptd/rscriptd.conf.org 2013-01-12 15:44:46.000000000 +0200 -+++ projects/rscriptd/rscriptd.conf 2013-01-12 15:45:44.000000000 +0200 -@@ -1,8 +1,68 @@ --LogFileName=/var/log/rscriptd.log --ExecutersNum=1 --ConfigDir=/etc/rscriptd --Password=123456 --Port=9999 --UserTimeout=60 --ScriptOnConnect=/etc/stargazer/OnConnect --ScriptOnDisconnect=/etc/stargazer/OnDisconnect -+################################################################################ -+# Rscriptd Configuration file # -+################################################################################ ++# Defines password for the encryption exchange between ++# Stargazer server and rscriptd. ++# Parameter: optional ++# Value: any ++# Default: 123456 ++Password = 123456 + -+# LOG file name ++# Defines port number for communication between ++# Stargazer server and rscriptd. ++# Parameter: optional ++# Value: 1 ... 65535 ++# Default: 9999 ++Port = 9999 ++ ++# User timeout. If Stargazer does not respond during this time, ++# the user will be disconnected. ++# Parameter: optional ++# Values: 5 ... 600 ++# Default: 60 ++UserTimeout = 60 ++ ++# Defines file which runs when user gets access +# Parameter: optional +# Value: file path -+# Default: /var/log/rscriptd.log -+LogFileName = /var/log/rscriptd.log ++# Default: /etc/rscriptd/OnConnect ++ScriptOnConnect = /etc/rscriptd/OnConnect + -+# Amount of rscriptd-exec processes. -+# These processes are responsible for the execution of scripts -+# OnConnect and OnDisconnect. -+# Amount of processes means how \ No newline at end of file ++# Defines file which runs when user loses access ++# Parameter: optional ++# Value: file path ++# Default: /etc/rscriptd/OnDisconnect ++ScriptOnDisconnect = /etc/rscriptd/OnDisconnect ++ ++################################################################################ +\ No newline at end of file diff --git a/net-misc/stone/files/stone-2.3e-makefile.patch b/net-misc/stone/files/stone-2.3e-makefile.patch index 2c28419ac127..5df2b6868a24 100644 --- a/net-misc/stone/files/stone-2.3e-makefile.patch +++ b/net-misc/stone/files/stone-2.3e-makefile.patch @@ -4,16 +4,17 @@ # -DWINDOWS Windows95/98/NT # -DNT_SERVICE WindowsNT/2000 native service --CFLAGS= --- Makefile.orig 2013-02-20 17:45:36.000000000 +0400 -+++ Makefile 2013-02-20 17:47:19.323650328 +0400 -@@ -19,8 +19,6 @@ - # -DWINDOWS Windows95/98/NT - # -DNT_SERVICE WindowsNT/2000 native service - -CFLAGS= # -g - SSL= /usr/local/ssl SSL_FLAGS= -DUSE_SSL SSL_LIBS= -lssl -lcrypto @@ -60,7 +58,7 @@ - @echo "*** md5c.c is contained in RFC1 \ No newline at end of file + @echo "*** md5c.c is contained in RFC1321" + + stone: stone.c +- $(CC) $(CFLAGS) $(FLAGS) -o $@ $? $(LIBS) ++ $(CC) $(CFLAGS) $(FLAGS) ${LDFLAGS} -o $@ $? $(LIBS) + + pop_stone: $(POP_LIBS) + $(MAKE) FLAGS="$(POP_FLAGS)" LIBS="$(POP_LIBS)" $(TARGET) diff --git a/net-misc/stunnel/files/stunnel.initd b/net-misc/stunnel/files/stunnel.initd index ff97dabe8c00..cf33c04f085c 100644 --- a/net-misc/stunnel/files/stunnel.initd +++ b/net-misc/stunnel/files/stunnel.initd @@ -58,9 +58,16 @@ stop() { ebegin "Stopping stunnel" for file in ${FILES} ; do PROCLIST=$(get_pids ${file}) - if [ "${PROCLIST}" ] && kill -0 ${PROCLIST#!/sbin/runscript -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 + if [ "${PROCLIST}" ] && kill -0 ${PROCLIST} 2> /dev/null ; then + kill ${PROCLIST} + einfo " ${file} " + fi + done + eend $? +} -# Default pidfile location -DEFAULT_PIDFILE=" \ No newline at end of file +restart() { + svc_stop + sleep 1 + svc_start +} diff --git a/net-misc/tokyotyrant/files/fix_makefiles-1.4.41.patch b/net-misc/tokyotyrant/files/fix_makefiles-1.4.41.patch index b1c0d04e68fc..40d26cc5f93a 100644 --- a/net-misc/tokyotyrant/files/fix_makefiles-1.4.41.patch +++ b/net-misc/tokyotyrant/files/fix_makefiles-1.4.41.patch @@ -13,23 +13,6 @@ index b388455..52d3bc3 100644 POSTCMD = @MYPOSTCMD@ -@@ -120,10 +120,6 @@ install : - cp -Rf $(LIBRARYFILES) $(DESTDIR)$(LIBDIR) - mkdir -p $diff --git a/Makefile.in b/Makefile.in -index b388455..52d3bc3 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -58,8 +58,8 @@ CFLAGS = @MYCFLAGS@ - LDFLAGS = @MYLDFLAGS@ - CMDLDFLAGS = @MYCMDLDFLAGS@ - LIBS = @LIBS@ --LDENV = LD_RUN_PATH=/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@:. --RUNENV = @MYLDLIBPATHENV@=.:/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@ -+LDENV = -+RUNENV = @MYLDLIBPATHENV@=.:$(LIBDIR) - POSTCMD = @MYPOSTCMD@ - - @@ -120,10 +120,6 @@ install : cp -Rf $(LIBRARYFILES) $(DESTDIR)$(LIBDIR) mkdir -p $(DESTDIR)$(BINDIR) @@ -81,4 +64,22 @@ index fbe0c71..809a839 100644 - PATH="$PATH:`pkg-config --variable=bindir tokyocabinet`" - CPATH="$CPATH:`pkg-config --variable=includedir tokyocabinet`" - LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir tokyocabinet`" -- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-con \ No newline at end of file +- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir tokyocabinet`" +-fi +- +- +- + #================================================================ + # Options + #================================================================ +diff --git a/tokyotyrant.pc.in b/tokyotyrant.pc.in +index efb3749..efec1f6 100644 +--- a/tokyotyrant.pc.in ++++ b/tokyotyrant.pc.in +@@ -10,5 +10,5 @@ datadir=@datadir@ + Name: Tokyo Tyrant + Description: network interface of Tokyo Cabinet + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -ltokyotyrant @LIBS@ ++Libs: -L${libdir} -ltokyotyrant + Cflags: -I${includedir} diff --git a/net-misc/vde/metadata.xml b/net-misc/vde/metadata.xml index 1e1b108e47ba..efafaa5b7bd2 100644 --- a/net-misc/vde/metadata.xml +++ b/net-misc/vde/metadata.xml @@ -7,13 +7,16 @@ jmbsvicetto@gentoo.org - Jorge Manuel B. S. V - - -proxy-maintainers - - mlspamcb@noci.xs4all.nl + Jorge Manuel B. S. Vicetto - - jmbsvicetto@gentoo.org - Jorge Manu \ No newline at end of file + + + Enable the pcap-based plugin that allows creating a switch against + a real interface. + + + Enable the cryptcab plugin that allows creating an encrypted + virtual cable. + + + diff --git a/net-misc/vmnet/Manifest b/net-misc/vmnet/Manifest index fc1ad3fd8ffc..a0e53669a3a0 100644 --- a/net-misc/vmnet/Manifest +++ b/net-misc/vmnet/Manifest @@ -1,4 +1,2 @@ DIST vmnet-0.4.tar.gz 11362 RMD160 dc58a2bb48a38b9da99ac529798548de7f58dd6e SHA1 49c0e4cb70fdd56b79937e0650dd0c6c2c090b8a SHA256 80c7148200bffa239e3daae79332a18c28409a5ef92ce631d41e2859a9011765 DIST vmnet_0.4-1.diff.gz 5084 RMD160 6a783781706350c7c21dc00392c16f2447ed28b1 SHA1 997805f34ba773176c32d4622bd69302e2e5798c SHA256 fb01abcbc384025365ff50b35ca3e7777cc4a9a62f353c04d16f4c867332e453 -DIST vmnet-0.4.tar.gz 11362 RMD160 dc58a2bb48a38b9da99ac529798548de7f58dd6e SHA1 49c0e4cb70fdd56b79937e0650dd0c6c2c090b8a SHA256 80c7148200bffa239e3daae79332a18c28409a5ef92ce631d41e2859a9011765 -DIST vmnet_0.4-1.diff.gz 5084 RMD160 6a783781706350c7c21dc00392c16f2447ed28b1 SHA1 997805f34ba773176c32d4622bd69302e2e5798c SHA256 fb01abcbc384025365ff50b35ca3e7777cc4a9a62f353c04d16f4c867332e453 diff --git a/net-misc/vmpsd/files/vmpsd-1.3-snmp-support.patch b/net-misc/vmpsd/files/vmpsd-1.3-snmp-support.patch index eb73da9ed81b..612bee519174 100644 --- a/net-misc/vmpsd/files/vmpsd-1.3-snmp-support.patch +++ b/net-misc/vmpsd/files/vmpsd-1.3-snmp-support.patch @@ -63,12 +63,10 @@ diff -Nuar --exclude '*~' vmpsd.orig/vmpsd.c vmpsd/vmpsd.c opterr = 0; @@ -74,7 +74,7 @@ printf("\t-d do not detach, log to stderr also\n"); - printf("\t-e path use external program for mac tFix SNMP support and also make application work on platforms where char is -unsigned by design, which would otherwise break getopt. - -Signed-off-by: Robin H. Johnson -Date: 30 Sept 2006 -Bugzilla-URL: http://bugs.gentoo.org/show_bug.cgi?id=148575 - -diff -Nuar --exclude '*~' vmpsd.orig/Makefile.in vmpsd/Makefile.in ---- vmpsd.orig/Makefile.in 2004-10-30 17:54:44.000000000 \ No newline at end of file + printf("\t-e path use external program for mac to vlan assignment\n"); + printf("\t when/if used with -f, -f is disregarded\n"); +- printf("\t-f file read VMPS database from file (/etc/vmps.db)\n"); ++ printf("\t-f file read VMPS database from file ("SYSCONFDIR"/vmps.db)\n"); + printf("\t-l level set logging level:\n"); + printf("\t 0x0100 - fatal,\n"); + printf("\t 0x0200 - info,\n"); diff --git a/net-misc/vpnc/files/vpnc-2.init b/net-misc/vpnc/files/vpnc-2.init index 1bd2780e7a92..78df1eac9e67 100644 --- a/net-misc/vpnc/files/vpnc-2.init +++ b/net-misc/vpnc/files/vpnc-2.init @@ -67,24 +67,37 @@ start() { "${PREUPSCRIPT}" > ${SCREEN_OUTPUT} fi - start-stop-daem#!/sbin/runscript + start-stop-daemon --start --pidfile "${VPNPID}" --exec /usr/sbin/vpnc \ + -- --pid-file "${VPNPID}" "${VPNCONF}" > ${SCREEN_OUTPUT} + local retval=$? + if [ ! ${retval} -eq 0 ]; then + eend ${retval} + return ${retval} + fi -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/files/vpnc-2.init,v 1.5 2010/08/13 08:39:48 fauli Exp $ + if [ -x "${POSTUPSCRIPT}" ] ; then + "${POSTUPSCRIPT}" > ${SCREEN_OUTPUT} + fi + eend $? +} -VPNDIR="/etc/vpnc" -VPN="${SVCNAME#*.}" -if [ -n ${VPN} ] && [ ${SVCNAME} != "vpnc" ]; then - mkdir -p /var/run/vpnc - VPNPID="/var/run/vpnc/${VPN}.pid" -else - VPNPID="/var/run/vpnc.pid" -fi -VPNCONF="${VPNDIR}/${VPN}.conf" -VPNSCRIPTDIR="${VPNDIR}/scripts.d" -PREUPSCRIPT="${VPNSCRIPTDIR}/${VPN}-preup.sh" -PREDOWNSCRIPT="${VPNSCRIPTDIR}/${VPN}-predown.sh" -POSTUPSCRIPT="${VPNSCRIPTDIR}/${VPN}-postup.sh" -POSTDOWNSCRIPT="${VPNSCRIPTDIR}/${VPN}-postdown.sh" -# We should source \ No newline at end of file +stop() { + ebegin "Stopping VPNC: ${VPN}" + screenoutput + if [ -x "${PREDOWNSCRIPT}" ] ; then + "${PREDOWNSCRIPT}" > ${SCREEN_OUTPUT} + fi + + start-stop-daemon --stop --exec /usr/sbin/vpnc --pidfile "${VPNPID}" + local retval=$? + if [ ! ${retval} -eq 0 ]; then + eend ${retval} + return ${retval} + fi + + + if [ -x "${POSTDOWNSCRIPT}" ] ; then + "${POSTDOWNSCRIPT}" > ${SCREEN_OUTPUT} + fi + eend $? +} diff --git a/net-misc/vpnc/vpnc-0.5.3_p527-r1.ebuild b/net-misc/vpnc/vpnc-0.5.3_p527-r1.ebuild index 9c3359822566..e3d08d71a529 100644 --- a/net-misc/vpnc/vpnc-0.5.3_p527-r1.ebuild +++ b/net-misc/vpnc/vpnc-0.5.3_p527-r1.ebuild @@ -48,28 +48,26 @@ src_prepare() { sed \ -e 's:/var/run:/run:g' \ - -i ChangeLog co# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p527-r1.ebuild,v 1.11 2014/09/10 21:29:50 zerochaos Exp $ - -EAPI=5 - -inherit eutils linux-info systemd toolchain-funcs - -DESCRIPTION="Free client for Cisco VPN routing software" -HOMEPAGE="http://www.unix-ag.uni-kl.de/~massar/vpnc/" -SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz" - -LICENSE="GPL-2 BSD" -SLOT="0" -KEYWORDS="amd64 arm ppc ppc64 sparc x86" -IUSE="resolvconf +gnutls bindist selinux" - -REQUIRED_USE="bindist? ( gnutls )" - -DEPEND=" - dev-lang/perl - dev-libs/libgcrypt:0= - >=sys-apps/iproute2-2.6.19.20061214[-minimal] - gnutls? ( net-libs/gnutls:= ) - !gnutls? ( dev-libs/op \ No newline at end of file + -i ChangeLog config.c TODO || die +} + +src_install() { + emake PREFIX="/usr" DESTDIR="${D}" install + dodoc README TODO VERSION + keepdir /etc/vpnc/scripts.d + newinitd "${FILESDIR}/vpnc-3.init" vpnc + newconfd "${FILESDIR}/vpnc.confd" vpnc + sed -e "s:/usr/local:/usr:" -i "${D}"/etc/vpnc/vpnc-script || die + + systemd_dotmpfilesd "${FILESDIR}"/vpnc-tmpfiles.conf + systemd_newunit "${FILESDIR}"/vpnc.service vpnc@.service + + # COPYING file resides here, should not be installed + rm -rf "${ED}"/usr/share/doc/vpnc/ || die +} + +pkg_postinst() { + elog "You can generate a configuration file from the original Cisco profiles of your" + elog "connection by using /usr/bin/pcf2vpnc to convert the .pcf file" + elog "A guide is available in http://www.gentoo.org/doc/en/vpnc-howto.xml" +} diff --git a/net-misc/wget/wget-1.14-r1.ebuild b/net-misc/wget/wget-1.14-r1.ebuild index f312ba08f3aa..b45db4f0fb24 100644 --- a/net-misc/wget/wget-1.14-r1.ebuild +++ b/net-misc/wget/wget-1.14-r1.ebuild @@ -15,29 +15,6 @@ 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 ~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" IUSE="debug gnutls idn ipv6 nls ntlm pcre +ssl static uuid zlib" -LIB_DEPEND="idn? ( net-dns/libidn[static-libs(+)] ) - pcre? ( dev-libs/libpcre[static-libs(+)] ) - ssl? ( - gnutls? ( net-libs/gnutls[static-libs(+)] ) - !gnutls? ( dev-libs/openssl:0[static-libs(+)] ) - ) - uuid? ( # Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.14-r1.ebuild,v 1.3 2014/01/18 05:35:17 vapier Exp $ - -EAPI="4" - -inherit flag-o-matic toolchain-funcs autotools - -DESCRIPTION="Network utility to retrieve files from the WWW" -HOMEPAGE="http://www.gnu.org/software/wget/" -SRC_URI="mirror://gnu/wget/${P}.tar.xz" - -LICENSE="GPL-3" -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 ~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" -IUSE="debug gnutls idn ipv6 nls ntlm pcre +ssl static uuid zlib" - LIB_DEPEND="idn? ( net-dns/libidn[static-libs(+)] ) pcre? ( dev-libs/libpcre[static-libs(+)] ) ssl? ( @@ -62,4 +39,45 @@ src_prepare() { epatch "${FILESDIR}"/${P}-texi2pod.patch epatch "${FILESDIR}"/${PN}-1.14-gnutls-ssl.patch #479948 epatch "${FILESDIR}"/${PN}-1.14-wgetrc.patch #327229 - # We patch the wgetrc sample file which goes into the info p \ No newline at end of file + # We patch the wgetrc sample file which goes into the info page. + # Update the info timestamp to avoid regenerating it. + touch doc/sample.wgetrc.munged_for_texi_inclusion doc/wget.info + eautoreconf +} + +src_configure() { + # openssl-0.9.8 now builds with -pthread on the BSD's + use elibc_FreeBSD && use ssl && append-ldflags -pthread + # fix compilation on Solaris, we need filio.h for FIONBIO as used in + # the included gnutls -- force ioctl.h to include this header + [[ ${CHOST} == *-solaris* ]] && append-flags -DBSD_COMP=1 + + if use static ; then + append-ldflags -static + tc-export PKG_CONFIG + PKG_CONFIG+=" --static" + fi + econf \ + --disable-rpath \ + $(use_with ssl ssl $(usex gnutls gnutls openssl)) \ + $(use_enable ssl opie) \ + $(use_enable ssl digest) \ + $(use_enable idn iri) \ + $(use_enable ipv6) \ + $(use_enable nls) \ + $(use_enable ntlm) \ + $(use_enable pcre) \ + $(use_enable debug) \ + $(use_with uuid libuuid) \ + $(use_with zlib) +} + +src_install() { + default + + sed -i \ + -e "s:/usr/local/etc:${EPREFIX}/etc:g" \ + "${ED}"/etc/wgetrc \ + "${ED}"/usr/share/man/man1/wget.1 \ + "${ED}"/usr/share/info/wget.info +} diff --git a/net-nds/gosa-core/Manifest b/net-nds/gosa-core/Manifest index 4e16c263a100..0159e7330155 100644 --- a/net-nds/gosa-core/Manifest +++ b/net-nds/gosa-core/Manifest @@ -1,6 +1,3 @@ DIST gosa-core-2.6.10.tar.bz2 2651987 SHA256 f372b753a675745b8d177f4cd497b625fd36a49deb84b053d51fe1c133933e5d DIST gosa-core-2.6.11.tar.bz2 2711910 SHA256 79e484da20524ec17b8da12a146f35e6c5784e7e9f75962c89657680d00ebc30 DIST gosa-core-2.6.12.tar.bz2 2541062 SHA256 dd6cf2bdb32196e6ad68efa4d2400bf6a95b4a7fddf7c11888c60ea8888b8dc0 -DIST gosa-core-2.6.10.tar.bz2 2651987 SHA256 f372b753a675745b8d177f4cd497b625fd36a49deb84b053d51fe1c133933e5d -DIST gosa-core-2.6.11.tar.bz2 2711910 SHA256 79e484da20524ec17b8da12a146f35e6c5784e7e9f75962c89657680d00ebc30 -DIST gosa-core-2.6.12.tar.bz2 2541062 SHA256 dd6cf2bdb32196e6ad68efa4d2400bf6a95b4a7fddf7c11888c60ea8888b8dc0 diff --git a/net-nds/gosa-plugin-mail/Manifest b/net-nds/gosa-plugin-mail/Manifest index 2f6eb10f12f0..d930f1f16180 100644 --- a/net-nds/gosa-plugin-mail/Manifest +++ b/net-nds/gosa-plugin-mail/Manifest @@ -1,5 +1,3 @@ DIST gosa-plugin-mail-2.6.10.tar.bz2 166019 RMD160 14bb6f3041e7b6dc33297ac4cef166f9450c390e SHA1 23b2ce17198d64f426226f50de8171700a6ba0b0 SHA256 6b65e6aa37bf8b1b9f136f54500c89061567fb62969de009c8b61e2e44480ecd -DIST gosa-plu-----BEGIN PGP SIGNED MESSAGE----- -DIST gosa-plugin-mail-2.6.10.tar.bz2 166019 RMD160 14bb6f3041e7b6dc33297ac4cef166f9450c390e SHA1 23b2ce17198d64f426226f50de8171700a6ba0b0 SHA256 6b65e6aa37bf8b1b9f136f54500c89061567fb62969de009c8b61e2e44480ecd DIST gosa-plugin-mail-2.6.11.tar.bz2 168876 RMD160 0ac5c0df7e62a39ec0c406b5378fd934c1f9bc68 SHA1 2d2f4058f933aff0002ddee909cc83337647b34e SHA256 40f476c02880a08268989f069eebadc7be8be932df00ec65166ba505113e0d75 DIST gosa-plugins-mail-2.6.12.tar.bz2 169052 RMD160 65ca0c766aafe9f7cf917b134ea420e08cb4a548 SHA1 21f8013d67812d2a2677d27baa30c7229ada0f7c SHA256 526d431ed7f940c78de59e4b9b2bf2fb9e7ae9f3de585ff7f98ee5a4ce3f4a34 diff --git a/net-news/blam/Manifest b/net-news/blam/Manifest index 3f176414f3cd..2e02a3d20135 100644 --- a/net-news/blam/Manifest +++ b/net-news/blam/Manifest @@ -1,4 +1,2 @@ DIST blam-1.8.12.tar.xz 309492 SHA256 6294d13629cd0cabc50ed3a489682b50c2c61972d55d8209b59b2a8b434810ea SHA512 b364be33cd2335015da4b05f403bced713d96fc455c16ded598f8227b724ac3c0b864e0013e94d2e5dc1d7e1b5982b8df7e7dc9bddcc6f194408751df37b921a WHIRLPOOL 54588986b656e9407a1740fd22ae1ebbad58adf2f7ae4d375245b0da17e9d7eec9c78978f0dca590cff644f7e0418c8901f1692a1c0d673ad5a4b2b39f07680c DIST blam-1.8.9.tar.bz2 267277 SHA256 b54a84af4fbabdbe277119190e99e57c07fd8230d58399d9643bd668585285ba SHA512 43d6639bdd7b12e60d20f2e83cda5c4fe9adad3acc45b440c54ad97f4dbc0ffc653a6ffbed613788909be4c4ce6498424ea54b510e76d95eff38f6c180cd9406 WHIRLPOOL bfdbcc66787c827323ebcb206e423195b80b8fbcefdd8fd54aa1dfc0ce37da48af2c711152079965e57bbddf95378a53aaf16de25e843e9178d8179eb345af0d -DIST blam-1.8.12.tar.xz 309492 SHA256 6294d13629cd0cabc50ed3a489682b50c2c61972d55d8209b59b2a8b434810ea SHA512 b364be33cd2335015da4b05f403bced713d96fc455c16ded598f8227b724ac3c0b864e0013e94d2e5dc1d7e1b5982b8df7e7dc9bddcc6f194408751df37b921a WHIRLPOOL 54588986b656e9407a1740fd22ae1ebbad58adf2f7ae4d375245b0da17e9d7eec9c78978f0dca590cff644f7e0418c8901f1692a1c0d673ad5a4b2b39f07680c -DIST blam-1.8.9.tar.bz2 267277 SHA256 b54a84af4fbabdbe277119190e99e57c07fd8230d58399d9643bd668585285ba SHA512 43d6639bdd7b12e60d20f2e83cda5c4fe9adad3acc45b440c54ad97f4dbc0ffc653a6ffbed613788909be4c4ce6498424ea54b510e76d95eff38f6c180cd9406 WHIRLPOOL bfdbcc66787c827323ebcb206e423195b80b8fbcefdd8fd54aa1dfc0ce37da48af2c711152079965e57bbddf95378a53aaf16de25e843e9178d8179eb345af0d diff --git a/net-p2p/datacoin-hp/datacoin-hp-9999.ebuild b/net-p2p/datacoin-hp/datacoin-hp-9999.ebuild index 1d732d52071d..e00860ca4a6f 100644 --- a/net-p2p/datacoin-hp/datacoin-hp-9999.ebuild +++ b/net-p2p/datacoin-hp/datacoin-hp-9999.ebuild @@ -100,28 +100,24 @@ src_install() { keepdir /var/lib/datacoin/.datacoin fperms 700 /var/lib/datacoin - fowners ${PN}:${PN} /v# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/datacoin-hp/datacoin-hp-9999.ebuild,v 1.5 2014/08/28 22:52:09 blueness Exp $ - -EAPI=5 - -DB_VER="4.8" + fowners ${PN}:${PN} /var/lib/datacoin/ + fowners ${PN}:${PN} /var/lib/datacoin/.datacoin + dosym /etc/datacoin/datacoin.conf /var/lib/datacoin/.datacoin/datacoin.conf -inherit bash-completion-r1 git-2 eutils db-use systemd user - -MyPV="${PV/_/-}" -MyPN="${PN/-hp/d}" -MyP="primecoin-${MyPV}" + dodoc doc/README.md doc/release-notes.md + newman contrib/debian/manpages/bitcoind.1 ${MyPN}.1 + newman contrib/debian/manpages/bitcoin.conf.5 datacoin.conf.5 -DESCRIPTION="High-performance version of datacoin (primecoin-hp fork)" -HOMEPAGE="https://github.com/foo1inge/datacoin-hp" -EGIT_REPO_URI="https://github.com/foo1inge/${PN}.git" + sed -i -e 's/bitcoin/datacoin-hp/g' contrib/bitcoind.bash-completion + newbashcomp contrib/bitcoind.bash-completion ${PN}.bash-completion -LICENSE="MIT" -SLOT="0" -KEYWORDS="" -IUSE="examples upnp ipv6 examples logrotate hardened" + if use examples; then + docinto examples + dodoc -r contrib/{bitrpc,pyminer,spendfrom,tidy_datadir.sh,wallettools} + fi -RDEPEND=" - dev-libs/boost[thread \ No newline at end of file + if use logrotate; then + insinto /etc/logrotate.d + newins "${FILESDIR}/datacoind.logrotate" ${MyPN} + fi +} diff --git a/net-p2p/gift-ares/Manifest b/net-p2p/gift-ares/Manifest index 8fd3e0f78317..e83633317a0f 100644 --- a/net-p2p/gift-ares/Manifest +++ b/net-p2p/gift-ares/Manifest @@ -1,2 +1 @@ DIST gift-ares-0.3.0.tar.bz2 311141 SHA256 bfbd6673c58b8d7304cbfffd0dbb776b4fd6ca0ac5c807d71cdd702d3f411419 -DIST gift-ares-0.3.0.tar.bz2 311141 SHA256 bfbd6673c58b8d7304cbfffd0dbb776b4fd6ca0ac5c807d71cdd702d3f411419 diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.0.1.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.0.1.ebuild index 3036a717e5ad..13b7173189ce 100644 --- a/net-p2p/gtk-gnutella/gtk-gnutella-1.0.1.ebuild +++ b/net-p2p/gtk-gnutella/gtk-gnutella-1.0.1.ebuild @@ -76,16 +76,16 @@ src_configure() { } src_compile() { - # Build system is not parallel-sa# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/gtk-gnutella-1.0.1.ebuild,v 1.5 2014/05/10 13:42:53 ago Exp $ - -EAPI=5 - -inherit eutils + # Build system is not parallel-safe, bug 500760 + emake -j1 +} -IUSE="nls dbus ssl +gtk" +src_install() { + dodir /usr/bin + emake INSTALL_PREFIX="${D}" install || die "Install failed" + dodoc AUTHORS ChangeLog README TODO -DESCRIPTION="A GTK+ Gnutella client" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" -HOMEPAGE="htt \ No newline at end of file + # Touch the symbols file into the future to avoid warnings from + # gtk-gnutella later on, since we will most likely strip the binary. + touch --date="next minute" "${D}/usr/lib/gtk-gnutella/gtk-gnutella.nm" || die +} diff --git a/net-p2p/ktorrent/Manifest b/net-p2p/ktorrent/Manifest index 24a3a5c5a986..5d0ff1a28905 100644 --- a/net-p2p/ktorrent/Manifest +++ b/net-p2p/ktorrent/Manifest @@ -1,2 +1 @@ -DIST ktorrent-4.3.1.tar.bz2 2943708 SHA256 66094f6833347afb0c49e332f0ec15ec48db652cbe66476840846ffd5ca0e4a1 SHA512 bf1fa144295cb00fccce3a511afe845bc7bf42d77d70205f5893686e7b1fa78c5799c46c7e4e04435ab6fdd4bc9b3b4a25bffb2c5538a25af36302c60742900e WHIRLPOOL 61303c19f0160bba9bdd288415d86519594f26c5c062f394cee7924093506a9cc6236f-----BEGIN PGP SIGNED MESSAGE----- -DIST ktorrent-4.3.1.tar.bz2 2943708 SHA256 66094f6833347afb0c49e332f0ec15ec48db652cbe66476840846ffd5ca0e4a1 SHA512 bf1fa144295cb00fccce3a511af \ No newline at end of file +DIST ktorrent-4.3.1.tar.bz2 2943708 SHA256 66094f6833347afb0c49e332f0ec15ec48db652cbe66476840846ffd5ca0e4a1 SHA512 bf1fa144295cb00fccce3a511afe845bc7bf42d77d70205f5893686e7b1fa78c5799c46c7e4e04435ab6fdd4bc9b3b4a25bffb2c5538a25af36302c60742900e WHIRLPOOL 61303c19f0160bba9bdd288415d86519594f26c5c062f394cee7924093506a9cc6236fd8eedec16c6f799f71a15cb4af15c4b7c079831dccb4e498b833c2234e diff --git a/net-p2p/litecoind/litecoind-0.8.7.1.ebuild b/net-p2p/litecoind/litecoind-0.8.7.1.ebuild index 60b06715a235..806cbceffe8a 100644 --- a/net-p2p/litecoind/litecoind-0.8.7.1.ebuild +++ b/net-p2p/litecoind/litecoind-0.8.7.1.ebuild @@ -46,56 +46,6 @@ pkg_setup() { enewuser "${UG}" -1 -1 /var/lib/litecoin "${UG}" } -src_prepare() { - epatch "${FILESDIR}"/${MyPN}-sys_leveldb.patch - rm -r src/l# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/litecoind/litecoind-0.8.7.1.ebuild,v 1.3 2014/08/28 22:34:06 blueness Exp $ - -EAPI=5 - -DB_VER="4.8" - -inherit bash-completion-r1 db-use eutils systemd user - -MyPV="${PV/_/-}" -MyPN="litecoin" -MyP="${MyPN}-${MyPV}" - -DESCRIPTION="P2P Internet currency based on Bitcoin but easier to mine" -HOMEPAGE="https://litecoin.org/" -SRC_URI="https://github.com/${MyPN}-project/${MyPN}/archive/v${MyPV}.tar.gz -> ${MyP}.tar.gz" - -LICENSE="MIT ISC GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="examples ipv6 logrotate upnp" - -RDEPEND=" - dev-libs/boost[threads(+)] - dev-libs/openssl:0[-bindist] - logrotate? ( - app-admin/logrotate - ) - upnp? ( - net-libs/miniupnpc - ) - sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx] - <=dev-libs/leveldb-1.12.0[-snappy] -" -DEPEND="${RDEPEND} - >=app-shells/bash-4.1 - sys-apps/sed -" - -S="${WORKDIR}/${MyP}" - -pkg_setup() { - local UG='litecoin' - enewgroup "${UG}" - enewuser "${UG}" -1 -1 /var/lib/litecoin "${UG}" -} - src_prepare() { epatch "${FILESDIR}"/${MyPN}-sys_leveldb.patch rm -r src/leveldb @@ -133,4 +83,41 @@ src_configure() { #src_test() { # cd src || die # emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" -f makefile.unix "${OPTS[@]}" test_litecoin -# . \ No newline at end of file +# ./test_litecoin || die 'Tests failed' +#} + +src_install() { + dobin src/${PN} + + insinto /etc/litecoin + doins "${FILESDIR}/litecoin.conf" + fowners litecoin:litecoin /etc/litecoin/litecoin.conf + fperms 600 /etc/litecoin/litecoin.conf + + newconfd "${FILESDIR}/litecoin.confd" ${PN} + newinitd "${FILESDIR}/litecoin.initd-r1" ${PN} + systemd_dounit "${FILESDIR}/litecoin.service" + + keepdir /var/lib/litecoin/.litecoin + fperms 700 /var/lib/litecoin + fowners litecoin:litecoin /var/lib/litecoin/ + fowners litecoin:litecoin /var/lib/litecoin/.litecoin + dosym /etc/litecoin/litecoin.conf /var/lib/litecoin/.litecoin/litecoin.conf + + dodoc doc/README.md doc/release-notes.md + newman contrib/debian/manpages/bitcoind.1 litecoind.1 + newman contrib/debian/manpages/bitcoin.conf.5 litecoin.conf.5 + + sed -i -e 's/bitcoin/litecoin/g' contrib/bitcoind.bash-completion + newbashcomp contrib/bitcoind.bash-completion ${PN}.bash-completion + + if use examples; then + docinto examples + dodoc -r contrib/{bitrpc,pyminer,spendfrom,tidy_datadir.sh,wallettools} + fi + + if use logrotate; then + insinto /etc/logrotate.d + newins "${FILESDIR}/litecoind.logrotate" litecoind + fi +} diff --git a/net-p2p/transmission/metadata.xml b/net-p2p/transmission/metadata.xml index 0d553a2a6314..6bccb486e525 100644 --- a/net-p2p/transmission/metadata.xml +++ b/net-p2p/transmission/metadata.xml @@ -1,12 +1,5 @@ - - net-p2p - - ssuominen@gentoo.org - Samuli Suominen - - net-p2p @@ -14,4 +7,7 @@ Samuli Suominen - Optimize transmission for low-resource \ No newline at end of file + Optimize transmission for low-resource systems (smaller cache size, prefer unencrypted peer connections, etc.) + Enable XFS filesystem capabilities by using sys-fs/xfsprogs headers (in building of fdlimit(.c)) + + diff --git a/net-print/ink/Manifest b/net-print/ink/Manifest index 750f17782057..df10765fdc24 100644 --- a/net-print/ink/Manifest +++ b/net-print/ink/Manifest @@ -1,2 +1 @@ DIST ink-0.5.1.tar.gz 105174 SHA256 d1985d40baae5cb8bf2c7ea554d24530b1cd95cd93cd143134f19ca7e1e90298 -MISC metadata.xml 161 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37DIST ink-0.5.1.tar.gz 105174 SHA256 d1985d40baae5cb8bf2c7ea554d24530b1cd95cd93cd143134f19ca7e1e90298 diff --git a/net-print/kyocera-mita-ppds/kyocera-mita-ppds-8.4.ebuild b/net-print/kyocera-mita-ppds/kyocera-mita-ppds-8.4.ebuild index e1a68fccbe06..897ce8a91e29 100644 --- a/net-print/kyocera-mita-ppds/kyocera-mita-ppds-8.4.ebuild +++ b/net-print/kyocera-mita-ppds/kyocera-mita-ppds-8.4.ebuild @@ -31,18 +31,31 @@ pkg_nofetch() { einfo "number of printers in six languages." } -src_# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/kyocera-mita-ppds/kyocera-mita-ppds-8.4.ebuild,v 1.1 2011/01/26 12:43:18 flameeyes Exp $ - -DESCRIPTION="PPD description files for (some) Kyocera Mita Printers" -HOMEPAGE="http://www.kyoceramita.it/" -SRC_URI="Linux_PPDs_KSL${PV/\./_}.zip" - -LICENSE="kyocera-mita-ppds" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE_LINGUAS="en fr de it pt es" - -IUSE="" -for lingua in $IUSE_L \ No newline at end of file +src_compile() { :; } + +src_install() { + insinto /usr/share/cups/model/KyoceraMita + + local installall=yes + for lingua in $IUSE_LINGUAS; do + if use linguas_$lingua; then + installall=no + break; + fi + done + + inslanguage() { + if [[ ${installall} == yes ]] || use linguas_$1; then + doins $2/*.ppd || die "failed to install $2 ppds" + fi + } + + inslanguage en English + inslanguage fr French + inslanguage de German + inslanguage it Italian + inslanguage pt Portuguese + inslanguage es Spanish + + dohtml ReadMe.htm || die +} diff --git a/net-print/libgnomecups/libgnomecups-0.2.3-r5.ebuild b/net-print/libgnomecups/libgnomecups-0.2.3-r5.ebuild index 5c977129e736..9e8b9a1a1391 100644 --- a/net-print/libgnomecups/libgnomecups-0.2.3-r5.ebuild +++ b/net-print/libgnomecups/libgnomecups-0.2.3-r5.ebuild @@ -46,14 +46,20 @@ src_prepare() { epatch "${FILESDIR}/${P}-cups-config.patch" # Fix building with -Werror=format-security, bug #517612 - epatch "${FILESDIR}# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/libgnomecups/libgnomecups-0.2.3-r5.ebuild,v 1.9 2014/09/15 08:23:46 ago Exp $ + epatch "${FILESDIR}/${P}-format-string.patch" -EAPI=5 -GCONF_DEBUG="yes" -GNOME_TARBALL_SUFFIX="bz2" + # Look for lpoptions in the right spot, upstream bug #520449 + epatch "${FILESDIR}/${P}-lpoptions.patch" -inherit autotools eutils gnome2 multilib-minimal + eautoreconf # To fix intltool files making LINGUAS to be honored + gnome2_src_prepare +} + +multilib_src_configure() { + ECONF_SOURCE=${S} \ + gnome2_src_configure --disable-static +} -DESCRIPTION="GNOME cups li \ No newline at end of file +multilib_src_install() { + gnome2_src_install +} diff --git a/net-print/lprng/lprng-3.8.35-r2.ebuild b/net-print/lprng/lprng-3.8.35-r2.ebuild index d968862c5afd..ce4f127b73a8 100644 --- a/net-print/lprng/lprng-3.8.35-r2.ebuild +++ b/net-print/lprng/lprng-3.8.35-r2.ebuild @@ -35,34 +35,46 @@ src_prepare() { src_configure() { # wont compile with -O3, needs -O2 - replace-f# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/lprng/lprng-3.8.35-r2.ebuild,v 1.1 2013/05/05 07:09:26 mgorny Exp $ + replace-flags -O[3-9] -O2 -EAPI=4 + econf \ + $(use_enable nls) \ + $(use_enable kerberos) \ + $(use_enable ssl) \ + --disable-setuid \ + --disable-werror \ + --with-userid=lp \ + --with-groupid=lp \ + --with-lpd_conf_path=/etc/lprng/lpd.conf \ + --with-lpd_perms_path=/etc/lprng/lpd.perms \ + --libexecdir=/usr/libexec/lprng \ + --sysconfdir=/etc/lprng \ + --disable-strip +} -inherit eutils flag-o-matic +src_compile() { + # bash is necessary due to bashisms in libtool + emake -j1 SHELL=/bin/bash +} -MY_PN=LPRng -DESCRIPTION="Extended implementation of the Berkeley LPR print spooler" -HOMEPAGE="http://www.lprng.com/" -SRC_URI="ftp://ftp.lprng.com/pub/${MY_PN}/${MY_PN}/${MY_PN}-${PV}.tgz" +src_install() { + dodir /var/spool/lpd + diropts -m 700 -o lp -g lp + dodir /var/spool/lpd/lp -LICENSE="|| ( GPL-2 Artistic )" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86" -IUSE="foomaticdb kerberos nls ssl" + emake install \ + DESTDIR="${D}" \ + POSTINSTALL="NO" \ + gnulocaledir="${D}"/usr/share/locale -RDEPEND="sys-process/procps - ssl? ( dev-libs/openssl ) - foomaticdb? ( net-print/foomatic-filters net-print/foomatic-db ) - !>=net-print/cups-1.6.2-r4[-lprng-compat] - ! 'Samsung ML-1610, 1.0 (en)'" +} diff --git a/net-proxy/dansguardian/dansguardian-2.10.0.3-r1.ebuild b/net-proxy/dansguardian/dansguardian-2.10.0.3-r1.ebuild index 537e7d84cb6a..2338bf359124 100644 --- a/net-proxy/dansguardian/dansguardian-2.10.0.3-r1.ebuild +++ b/net-proxy/dansguardian/dansguardian-2.10.0.3-r1.ebuild @@ -13,24 +13,6 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" IUSE="clamav kaspersky debug ntlm pcre" -RDEPEND="sys-libs/zlib - pcre? ( >=dev-libs/libpcre-8.32 ) - clamav? ( >=app-antivirus/clamav-0.93 )" -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/dansguardian-2.10.0.3-r1.ebuild,v 1.1 2013/04/09 18:36:01 tomwij Exp $ - -inherit eutils - -DESCRIPTION="Web content filtering via proxy" -HOMEPAGE="http://dansguardian.org" -SRC_URI="http://dansguardian.org/downloads/2/Stable/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="clamav kaspersky debug ntlm pcre" - RDEPEND="sys-libs/zlib pcre? ( >=dev-libs/libpcre-8.32 ) clamav? ( >=app-antivirus/clamav-0.93 )" @@ -105,4 +87,26 @@ src_install() { sed -r -i -e 's/^#( *contentscanner *=.*clamdscan[.]conf.*)/\1/' "${D}/etc/dansguardian/dansguardian.conf" sed -r -i -e 's/^#( *clamdudsfile *=.*)/\1/' "${D}/etc/dansguardian/contentscanners/clamdscan.conf" elif use kaspersky; then - \ No newline at end of file + sed -r -i -e 's/^#( *contentscanner *=.*kavdscan[.]conf.*)/\1/' "${D}/etc/dansguardian/dansguardian.conf" + fi + + # Copying logrotation file + insinto /etc/logrotate.d + newins "${FILESDIR}/dansguardian.logrotate" dansguardian + + keepdir /var/log/dansguardian + fperms o-rwx /var/log/dansguardian +} + +pkg_postinst() { + local runas="nobody:nobody" + if use clamav ; then + runas="clamav:clamav" + fi + einfo "The dansguardian daemon will run by default as ${runas}" + + if [ -d "${ROOT}/var/log/dansguardian" ] ; then + chown -R ${runas} "${ROOT}/var/log/dansguardian" + chmod o-rwx "${ROOT}/var/log/dansguardian" + fi +} diff --git a/net-proxy/polipo/polipo-1.0.4.1-r1.ebuild b/net-proxy/polipo/polipo-1.0.4.1-r1.ebuild index 3e7672b3711f..0766d0640517 100644 --- a/net-proxy/polipo/polipo-1.0.4.1-r1.ebuild +++ b/net-proxy/polipo/polipo-1.0.4.1-r1.ebuild @@ -34,10 +34,16 @@ src_install() { newinitd "${FILESDIR}/polipo.initd" polipo insinto /etc/polipo ; doins "${FILESDIR}/config" - exeinto /etc/cron.daily ; newexe "${FILESDIR}/polipo.cro# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/polipo-1.0.4.1-r1.ebuild,v 1.2 2013/03/04 14:34:10 dastergon Exp $ + exeinto /etc/cron.daily ; newexe "${FILESDIR}/polipo.crond" polipo.sh -EAPI="4" + diropts -m0750 -o polipo -g polipo + keepdir /var/cache/polipo -inherit eut \ No newline at end of file + dodoc CHANGES README + dohtml html/* +} + +pkg_postinst() { + einfo "Do not forget to read the manual." + einfo "Change the config file in /etc/polipo to suit your needs." +} diff --git a/net-proxy/privoxy/privoxy-3.0.21-r2.ebuild b/net-proxy/privoxy/privoxy-3.0.21-r2.ebuild index 3131315b3a18..926d123d4229 100644 --- a/net-proxy/privoxy/privoxy-3.0.21-r2.ebuild +++ b/net-proxy/privoxy/privoxy-3.0.21-r2.ebuild @@ -54,6 +54,12 @@ src_configure() { src_install () { default - newinitd "${F# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/privoxy-3.0.21-r2.ebuild,v 1.8 2014/01/18 19:49:06 ago Exp \ No newline at end of file + newinitd "${FILESDIR}/privoxy.initd" privoxy + systemd_dounit "${FILESDIR}"/${PN}.service + + insinto /etc/logrotate.d + newins "${FILESDIR}/privoxy.logrotate" privoxy + + diropts -m 0750 -g privoxy -o privoxy + keepdir /var/log/privoxy +} diff --git a/net-proxy/squid/metadata.xml b/net-proxy/squid/metadata.xml index 800d255d60dc..01c2e992c726 100644 --- a/net-proxy/squid/metadata.xml +++ b/net-proxy/squid/metadata.xml @@ -1,18 +1,5 @@ - - - eras@gentoo.org - Eray Aslan - - net-proxy - A full-featured web proxy cache - - Adds support for loadable content adaptation modules - (http://www.e-cap.org) - Enable ESI for accelerators, will cause squid reverse proxies - to be capable of the Edg - eras@gentoo.org @@ -32,4 +19,15 @@ Use app-admin/logrotate for rotating logs Enables *BSD kqueue() support - Adds transparent proxy support for system \ No newline at end of file + Adds transparent proxy support for systems using + PF (only for *bsd) + Adds support for Quality of Service using netfilter conntrack + - see qos_flow directive for more info + Adds support for dynamic SSL certificate generation in + SslBump environments + Enables real Transparent Proxy support for Linux Netfilter + TPROXY + Enable Web Cache Coordination Protocol + Enable Web Cache Coordination V2 Protocol + + diff --git a/net-proxy/squidclamav/squidclamav-6.10.ebuild b/net-proxy/squidclamav/squidclamav-6.10.ebuild index 7f9e96e647e1..ae8676fc5e22 100644 --- a/net-proxy/squidclamav/squidclamav-6.10.ebuild +++ b/net-proxy/squidclamav/squidclamav-6.10.ebuild @@ -62,5 +62,6 @@ pkg_postinst() { elog " icap_send_client_ip on" elog " icap_send_client_username on" elog "" - elog " icap_service clamav res# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public Licens \ No newline at end of file + elog " icap_service clamav respmod_precache bypass=0 icap://localhost:1344/clamav" + elog " adaptation_access clamav allow all" +} diff --git a/net-proxy/squidguard/squidguard-1.4-r4.ebuild b/net-proxy/squidguard/squidguard-1.4-r4.ebuild index 1647c3471d78..417d78771e46 100644 --- a/net-proxy/squidguard/squidguard-1.4-r4.ebuild +++ b/net-proxy/squidguard/squidguard-1.4-r4.ebuild @@ -47,26 +47,27 @@ src_configure() { } src_install() { - emake prefix="/usr" INSTDIR="${D}" in# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/squidguard-1.4-r4.ebuild,v 1.11 2014/08/10 20:35:44 slyfox Exp $ - -EAPI=2 -WANT_AUTOMAKE=none + emake prefix="/usr" INSTDIR="${D}" install || die "emake install has failed" -inherit eutils autotools user + keepdir /var/log/squidGuard + fowners squid:squid /var/log/squidGuard -DESCRIPTION="Combined filter, redirector and access controller plugin for Squid" -HOMEPAGE="http://www.squidguard.org" -SRC_URI="http://www.squidguard.org/Downloads/squidGuard-${PV}.tar.gz" + insinto /etc/squidGuard/sample + doins "${FILESDIR}"/squidGuard.conf.* + insinto /etc/squidGuard/sample/db + doins "${FILESDIR}"/blockedsites -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ppc ppc64 sparc x86" -IUSE="ldap" + dodoc ANNOUNCE CHANGELOG README + dohtml doc/*.html + docinto text + dodoc doc/*.txt +} -RDEPEND=">=sys-libs/db-2 - ldap? ( net-nds/openldap )" -DEPEND="${RDEPEND} - sys-devel/bison - sys-devel/flex" \ No newline at end of file +pkg_postinst() { + einfo "To enable squidGuard, add the following lines to /etc/squid/squid.conf:" + einfo " url_rewrite_program /usr/bin/squidGuard" + einfo " url_rewrite_children 10" + einfo "" + einfo "Remember to edit /etc/squidGuard/squidGuard.conf first!" + einfo "Examples can be found in /etc/squidGuard/sample/" +} diff --git a/net-voip/homer/homer-9999.ebuild b/net-voip/homer/homer-9999.ebuild index aaed3f38d76c..39dd8076b8b3 100644 --- a/net-voip/homer/homer-9999.ebuild +++ b/net-voip/homer/homer-9999.ebuild @@ -57,12 +57,17 @@ src_compile() { tc-export CXX emake -C HomerBuild default \ INSTALL_PREFIX=/usr/bin \ - INSTALL_L# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-voip/homer/homer-9999.ebuild,v 1.9 2014/08/10 20:34:30 slyfox Exp $ - -EAPI=5 + INSTALL_LIBDIR=/usr/$(get_libdir) \ + INSTALL_DATADIR=/usr/share/${PN} \ + VERBOSE=1 +} -inherit eutils multilib toolchain-funcs +src_install() { + emake -C HomerBuild install \ + DESTDIR="${D}" \ + VERBOSE=1 -DESCRIPTION="Homer Conferencing (short: Homer) is a free SIP \ No newline at end of file + # Create .desktop entry + doicon ${MY_BIN}/${MY_BIN}.png + make_desktop_entry "${MY_BIN}" "${MY_PN}" "${MY_BIN}" "Network;InstantMessaging;Telephony;VideoConference" +} diff --git a/net-voip/telepathy-gabble/telepathy-gabble-0.16.6.ebuild b/net-voip/telepathy-gabble/telepathy-gabble-0.16.6.ebuild index 33c478644e7d..08d76d4a4607 100644 --- a/net-voip/telepathy-gabble/telepathy-gabble-0.16.6.ebuild +++ b/net-voip/telepathy-gabble/telepathy-gabble-0.16.6.ebuild @@ -28,30 +28,44 @@ RDEPEND=" dev-libs/libxml2 gnutls? ( >=net-libs/gnutls-2.10.2 ) - !g# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-gabble/telepathy-gabble-0.16.6.ebuild,v 1.9 2013/09/05 19:02:50 mgorny Exp $ - -EAPI="5" -PYTHON_COMPAT=( python2_{6,7} ) + !gnutls? ( >=dev-libs/openssl-0.9.8g[-bindist] ) + jingle? ( || ( net-libs/libsoup:2.4[ssl] + >=net-libs/libsoup-2.33.1 ) + >=net-libs/libnice-0.0.11 ) -inherit eutils python-any-r1 + !=net-wireless/rtl-sdr-0.5.3:= ) + uhd? ( net-wireless/uhd:=[${PYTHON_USEDEP}] )" +DEPEND="${RDEPEND} + dev-python/cheetah" -EAPI=5 -PYTHON_COMPAT=( python2_7 ) +REQUIRED_USE="${PYTHON_REQUIRED_USE}" -inherit cmake-utils python-single-r1 +src_prepare() { + epatch_user +} -DESCRIPTION="GNU Radio source block for OsmoSDR and rtlsdr and hackrf" -HOMEPAGE="http://sdr.osmocom.org/trac/wiki/GrOsmoSDR" +src_configure() { + local mycmakeargs=( + -DENABLE_DEFAULT=OFF + -DPYTHON_EXECUTABLE="${PYTHON}" + -DENABLE_FILE=ON + $(cmake-utils_use_enable bladerf) + $(cmake-utils_use_enable fcd) + $(cmake-utils_use_enable hackrf) + $(cmake-utils_use_enable iqbalance) + $(cmake-utils_use_enable mirisdr MIRI) + $(cmake-utils_use_enable python) + $(cmake-utils_use_enable rtlsdr RTL) + $(cmake-utils_use_enable rtlsdr RTL_TCP) + $(cmake-utils_use_enable uhd) + ) -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - SRC_URI="" - EGIT_REPO_URI="git://git.osmocom.org/${PN}.git" - KEYWORDS="" -else - #git clone git://git.osmocom.org/gr-osmosdr.git - #cd gr-osmosdr - #git archive --format=tar --prefix=gr-osmosdr-${PV}/ v${PV} | xz > ../gr-osmosdr-${PV}.tar.xz - SRC_URI="https://dev.gentoo.org/~zerochaos/di \ No newline at end of file + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + python_fix_shebang "${ED}"/usr/bin +} diff --git a/net-wireless/irda-utils/irda-utils-0.9.18-r3.ebuild b/net-wireless/irda-utils/irda-utils-0.9.18-r3.ebuild index dd17438ccfe0..c6a4bac5d009 100644 --- a/net-wireless/irda-utils/irda-utils-0.9.18-r3.ebuild +++ b/net-wireless/irda-utils/irda-utils-0.9.18-r3.ebuild @@ -13,49 +13,6 @@ SLOT="0" KEYWORDS="amd64 ~arm ppc ~sh x86" IUSE="" -RDEPEND="=dev-libs/glib-2* - >=sys-apps/pciutils-2.2.7-r1 - sys-process/procps - sys-apps/setserial - sys-apps/grep - virtual/udev" -DEPEND="${RDEPEND} - virtual/pkgconfig - !app-laptop/smcinit" - -src_unpack() { - unpack ${A} - - cd "${S}" - epatch "${FILESDIR}"/irda-utils-rh1.patch \ - "${FILESDIR}"/${P}-makefile.diff \ - "${FILESDIR}"/${P}-smcinit.diff \ - "${FILESDIR}"/${P}-io.h.diff \ - "${FILESDIR}"/${P}-dofail.patch \ - "${FILESDIR}"/${P}-asneeded.patch - - # fix crosscompile, respect CFLAGS (Bug 200295) - sed -i -e "/^CC/s:gcc:$(tc-getCC):" \ - -e "/^LD/s:ld:$(tc-getLD):" \ - -e "/^AR/s:ar:$(tc-getAR):" \ - -e "/^RANLIB/s:ranlib:$(tc-getRANLIB):" \ - -e "/^CFLAGS/s:-O2:${CFLAGS}:" Makefile */Makefile - - # fix compile when pciutils is compiled with USE=zlib (Bug 200295)# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/irda-utils/irda-utils-0.9.18-r3.ebuild,v 1.11 2013/02/10 15:23:21 floppym Exp $ - -inherit eutils toolchain-funcs flag-o-matic udev - -DESCRIPTION="IrDA management and handling utilities" -HOMEPAGE="http://irda.sourceforge.net" -SRC_URI="mirror://sourceforge/irda/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ppc ~sh x86" -IUSE="" - RDEPEND="=dev-libs/glib-2* >=sys-apps/pciutils-2.2.7-r1 sys-process/procps @@ -93,4 +50,45 @@ src_unpack() { # disable write_pid(), because we don't need it sed -i -e "s:\(write_pid();\):/* \1 */:g" irattach/util.c - append-flags "- \ No newline at end of file + append-flags "-fno-strict-aliasing" +} + +src_compile() { + emake RPM_OPT_FLAGS="${CFLAGS}" RPM_BUILD_ROOT="${D}" ROOT="${D}" \ + || die "emake failed" +} + +src_install () { + dodir /usr/bin + dodir /usr/sbin + + emake install RPM_OPT_FLAGS="${CFLAGS}" ROOT="${D}" \ + MANDIR="${D}usr/share/man" || die "emake install failed" + + newdoc ethereal/README README.wireshark + newdoc irattach/README README.irattach + newdoc irdadump/README README.irdadump + newdoc irdaping/README README.irdaping + newdoc irsockets/README README.irsockets + newdoc tekram/README README.tekram + newdoc smcinit/README README.smcinit + newdoc smcinit/README.Peri README.smcinit.Peri + newdoc smcinit/README.Rob README.smcinit.Rob + newdoc smcinit/README.Tom README.smcinit.Tom + newdoc irattach/ChangeLog ChangeLog.irattach + newdoc irdadump/ChangeLog ChangeLog.irdadump + newdoc smcinit/ChangeLog ChangeLog.smcinit + dohtml smcinit/RobMiller-irda.html + dodoc README + + newconfd "${FILESDIR}/irda.confd" irda + newinitd "${FILESDIR}/irda.initd" irda + + insinto /etc/modprobe.d + newins "${FILESDIR}/irda.modsd" irda.conf + + udev_newrules "${FILESDIR}/irda.rules" 53-irda.rules + exeinto "$(get_udevdir)" + newexe "${FILESDIR}/irda-setup.sh" irda-setup + newexe "${FILESDIR}/irda-usb.sh" irda-usb +} diff --git a/perl-core/CGI/Manifest b/perl-core/CGI/Manifest index 33c5e6ba11be..160b50eea059 100644 --- a/perl-core/CGI/Manifest +++ b/perl-core/CGI/Manifest @@ -1,2 +1 @@ DIST CGI.pm-3.63.tar.gz 247277 SHA256 f180778f9d1bcb5029bffb8c6be305c6deec60bf71ef14170fce9dfe6c548e2c SHA512 93dd548d41c842c6aef4696e17610a21e51f8bacea468a3342f8ced76dbed6218f6caa99be97aac9b0c005ee37059d5e318077526a9f6288c487efcc8e38cf76 WHIRLPOOL c7cf77022b0acf39acb8a1daf8de2bb40a91f1eff97ec18d1756775295fae8d4b62c904d6ef5f1c3894a5be3303771945f905cddabbe2514d5c72edfd3a07409 -DIST CGI.pm-3.63.tar.gz 247277 SHA256 f180778f9d1bcb5029bffb8c6be305c6deec60bf71ef14170fce9dfe6c548e2c SHA512 93dd548d41c842c6aef4696e17610a21e51f8bacea468a3342f8ced76dbed6218f6caa99be97aac9b0c005ee37059d5e318077526a9f6288c487efcc8e38cf76 WHIRLPOOL c7cf77022b0acf39acb8a1daf8de2bb40a91f1eff97ec18d1756775295fae8d4b62c904d6ef5f1c3894a5be3303771945f905cddabbe2514d5c72edfd3a07409 diff --git a/perl-core/JSON-PP/Manifest b/perl-core/JSON-PP/Manifest index 1524435f4fe7..95d21b8faeb4 100644 --- a/perl-core/JSON-PP/Manifest +++ b/perl-core/JSON-PP/Manifest @@ -1,4 +1,2 @@ DIST JSON-PP-2.27200.tar.gz 41571 SHA256 035e11154bdee7908842a30f4150f47fb9d0d696e56a27947fe2b8a479cc69d3 SHA512 a00ca10ac2c79a29592b72151510044c6e1c36ab216e0d7472991ad37b7e28dba01e2fd062d64a329341011404249d112867c68ab5aef2a0781c3d81b7592c8e WHIRLPOOL 5f590285537d9553b51a5e03aa4d467f25e02cb1deb216eb5628db39d53686fb03a99990047dafff07bb4ddc146297953473baf5cdf7ee6aad53ed0631a9f957 -DIST JSON-PP-2.27202.tar.gz 41076 SHA256 3ec0a78d1049db7f58449c28b69349834f8a9623190acbf041a709f184527eb3 SHA512 e8374a30e107f02c1226d33fb5cf063142a9c26445fed0acf0d56de901b4be007af75f1a90578568d0eb25301c8ee5eb963a7b29b6dcd4bad421d980b485d211 WHIRLPOO-----BEGIN PGP SIGNED MESSAGE----- -DIST JSON-PP-2.27200.tar.gz 41571 SHA256 035e11154bdee7908842a30f4150f47fb9d0d696e56a27947fe2b8a479cc69d3 SHA512 a00ca10ac2c79a29592b72151510044c6e1c36ab216e0d7472991ad37b7e28dba01e2fd062d64a329341011404249d112867c68ab5aef2a0781c3d81b7592c8e WHIRLPOOL 5f590285537d9553b51a5e03aa4d467f25e02cb1deb216eb5628db39d53686fb03a99990047dafff07bb4ddc146297953473baf5cdf7ee6aad53ed0631a9f957 DIST JSON-PP-2.27202.tar.gz 41076 SHA256 3ec0a78d1049db7f58449c28b69349834f8a9623190acbf041a709f184527eb3 SHA512 e8374a30e107f02c1226d33fb5cf063142a9c26445fed0acf0d56de901b4be007af75f1a90578568d0eb25301c8ee5eb963a7b29b6dcd4bad421d980b485d211 WHIRLPOOL 88c5c66b61b7af4569d5cdd17a2e4c6143f8435f6a8309017880680f74d4a12cf970b022203e2200b5d0d11ea5970cd2a6beb3ede712db44b27ae20344ac57f7 diff --git a/perl-core/Parse-CPAN-Meta/Manifest b/perl-core/Parse-CPAN-Meta/Manifest index 899e2e4a769a..fb039c1ddc59 100644 --- a/perl-core/Parse-CPAN-Meta/Manifest +++ b/perl-core/Parse-CPAN-Meta/Manifest @@ -1,4 +1,2 @@ DIST Parse-CPAN-Meta-1.4404.tar.gz 7829 SHA256 b03ad539129a30fc76311a4d341878172a5aade8338c4d7a0184ce5961c995f8 SHA512 e05bc835e543803301c5297d723e138fcaa8d674d970db8926dfdef813557c9c005287fb96c65ba65baafee48ced355964dea6cbab4f06b6a347b3012299b2fd WHIRLPOOL af673e37aa2fb15b48d897317d5e883f4ff36c9a46528d83efcdfc67d666dbe59309f979fa0a430245377da1c9ffd32313b75363764f86b9d866cd0f68dec3d8 DIST Parse-CPAN-Meta-1.4409.tar.gz 21191 SHA256 2920b5213c6131d473c036a921fbec0a80b5c41a1799041471bc4af5d1b9ec2c SHA512 66db554d1725e98e48a4ecf89045a0b88e412844cff849526774ab667c5f81ef697d11e495597e505f3c2803d79ea0ecf3ffc07ed4f55a04ca30fc95fdb27f0e WHIRLPOOL 82365315d43fcb79fd7f09d23e7b204375fbe0fed168bf71228e6eebd22b8434bf611adec985884767b98481749e5f729bbb82e327d8085fb4ac8068e1a3b04e -DIST Parse-CPAN-Meta-1.4404.tar.gz 7829 SHA256 b03ad539129a30fc76311a4d341878172a5aade8338c4d7a0184ce5961c995f8 SHA512 e05bc835e543803301c5297d723e138fcaa8d674d970db8926dfdef813557c9c005287fb96c65ba65baafee48ced355964dea6cbab4f06b6a347b3012299b2fd WHIRLPOOL af673e37aa2fb15b48d897317d5e883f4ff36c9a46528d83efcdfc67d666dbe59309f979fa0a430245377da1c9ffd32313b75363764f86b9d866cd0f68dec3d8 -DIST Parse-CPAN-Meta-1.4409.tar.gz 21191 SHA256 2920b5213c6131d473c036a921fbec0a80b5c41a1799041471bc4af5d1b9ec2c SHA512 66db554d1725e98e48a4ecf89045a0b88e412844cff849526774ab667c5f81ef697d11e495597e505f3c2803d79ea0ecf3ffc07ed4f55a04ca30fc95fdb27f0e WHIRLPOOL 82365315d43fcb79fd7f09d23e7b204375fbe0fed168bf71228e6eebd22b8434bf611adec985884767b98481749e5f729bbb82e327d8085fb4ac8068e1a3b04e diff --git a/perl-core/Scalar-List-Utils/Manifest b/perl-core/Scalar-List-Utils/Manifest index b2ec8934d222..0e9e66ae9ff0 100644 --- a/perl-core/Scalar-List-Utils/Manifest +++ b/perl-core/Scalar-List-Utils/Manifest @@ -1,4 +1,2 @@ DIST Scalar-List-Utils-1.27.tar.gz 69083 SHA256 592f35be82ebd32cf36982874b26df8b2dd7a9b2d4bf041fee0fdab706f081ce SHA512 5881d2b472d0eea55dc560a198b8fba411606caa64bd9b3dfb1def06cced8e2a77570e9c5de918b950052c556870f1d14d1343411e0b18b3cac7aa8af7a4bff4 WHIRLPOOL c944183d9187b6e8e161230a2f596be5c4da0212ef9205ecafd7dc0f5cd35e035e2468c006af82539bea430a37d707d3fac7600fc3ec3802f8330a0d797358d9 -DIST Scalar-List-Utils-1.35.tar.gz 74666 SHA256 ddc0c6e08993ef92db63c6304d83e0596f37681f03032f1e748ab8784496b750 SHA512 ec68dcd1e3ae3e52b1f08ea2fe262577d808b5f7bfa557f024be438a92afdbba4fafe676e54a2a00843bef638d705f174cdc7e43a8d69564921febc0dd733306 WHIRLPOOL 1610762a9649ea02728ba356d3aa6d37d53d44c9-----BEGIN PGP SIGNED MESSAGE----- -DIST Scalar-List-Utils-1.27.tar.gz 69083 SHA256 592f35be82ebd32cf36982874b26df8b2dd7a9b2d4bf041fee0fdab706f081ce SHA512 5881d2b472d0eea55dc560a198b8fba411606caa64bd9b3dfb1def06cced8e2a77570e9c5de918b950052c556870f1d14d1343411e0b18b3cac7aa8af7a4bff4 WHIRLPOOL c944183d9187b6e8e161230a2f596be5c4da0212ef9205ecafd7dc0f5cd35e035e2468c006af82539bea430a37d707d3fac7600fc3ec3802f8330a0d797358d9 DIST Scalar-List-Utils-1.35.tar.gz 74666 SHA256 ddc0c6e08993ef92db63c6304d83e0596f37681f03032f1e748ab8784496b750 SHA512 ec68dcd1e3ae3e52b1f08ea2fe262577d808b5f7bfa557f024be438a92afdbba4fafe676e54a2a00843bef638d705f174cdc7e43a8d69564921febc0dd733306 WHIRLPOOL 1610762a9649ea02728ba356d3aa6d37d53d44c93727320d8625f608bda0bfd4746921832a8b545c4b38f6e0af71ecfc75e3faa4bf8e31600eda10468eae46cb diff --git a/perl-core/Sys-Syslog/Manifest b/perl-core/Sys-Syslog/Manifest index 5930173e8fd4..f0c1e3c0ddab 100644 --- a/perl-core/Sys-Syslog/Manifest +++ b/perl-core/Sys-Syslog/Manifest @@ -1,4 +1,2 @@ DIST Sys-Syslog-0.32.tar.gz 82027 SHA256 c27e4b0100b2eb8edd06ada4068136ce4432be6f7763782ddf6528f25022d5a2 SHA512 f1c874560d2676739bdfc3d9a9dafbe9e1cc46813967370d4ee3a1d1d6c02ab4d3c56ef176640219a97d4f60e0a64d972e2d5b5306d5c0277c5e49d1d09bb34d WHIRLPOOL 6f5f05a6cfd25ea665ed7ec5670ce64f1e34e860f910d9650e72d4176ba02443a60d6c83302eb92c8f7bf4fd43b226df98818ac54611a9cfe03b30176ad8dbd4 -DIST Sys-Syslog-0.33.tar.gz 82440 SHA256 d5d901d9d9333a66db95fb1c7692ff457f7c7ad17287b51a87e40734f7c2741d SHA512 5903d63b99915947c15326ca51c2757c8fb84202aee449df3bac699e95f7d85549e30cb0e512a6fa30163c0a182bad0e9944aed341efd4a26-----BEGIN PGP SIGNED MESSAGE----- -DIST Sys-Syslog-0.32.tar.gz 82027 SHA256 c27e4b0100b2eb8edd06ada4068136ce4432be6f7763782ddf6528f25022d5a2 SHA512 f1c874560d2676739bdfc3d9a9dafbe9e1cc46813967370d4ee3a1d1d6c02ab4d3c56ef176640219a97d4f60e0a64d972e2d5b5306d5c0277c5e49d1d09bb34d WHIRLPOOL 6f5f05a6cfd25ea665ed7ec5670ce64f1e34e860f910d9650e72d4176ba02443a60d6c83302eb92c8f7bf4fd43b226df98818ac54611a9cfe03b30176ad8dbd4 DIST Sys-Syslog-0.33.tar.gz 82440 SHA256 d5d901d9d9333a66db95fb1c7692ff457f7c7ad17287b51a87e40734f7c2741d SHA512 5903d63b99915947c15326ca51c2757c8fb84202aee449df3bac699e95f7d85549e30cb0e512a6fa30163c0a182bad0e9944aed341efd4a261ead169fd5eb9a7 WHIRLPOOL 2016617229792c9ff88e64595873e57801853328c90f15012ae59e6a1494a6c385e9536440f29beea15dc1ce1d4376ff9bb8b12a4cab86b7b92beff171c85be3 diff --git a/perl-core/Test-Harness/metadata.xml b/perl-core/Test-Harness/metadata.xml index 4ef2d4369729..6884ccffc9d9 100644 --- a/perl-core/Test-Harness/metadata.xml +++ b/perl-core/Test-Harness/metadata.xml @@ -1,24 +1,5 @@ - - perl - - Test-Harness - App::Prove - App::Prove::State - App::Prove::State::Result - App::Prove::State::Result::Test - TAP::Base - TAP::Formatter::Base - TAP::Formatter::Color - TAP::Formatter::Console - TAP::Formatter::Console::ParallelSession - TAP::Formatter::Console::Session - TAP::Formatter::File - TAP::Formatter::File::Session - TAP::Formatter::Session - - perl @@ -56,4 +37,20 @@ TAP::Parser::Result::Unknown TAP::Parser::Result::Version TAP::Parser::Result::YAML - TAP::Parser::ResultFactory + TAP::Parser::Scheduler + TAP::Parser::Scheduler::Job + TAP::Parser::Scheduler::Spinner + TAP::Parser::Source + TAP::Parser::SourceHandler + TAP::Parser::SourceHandler::Executable + TAP::Parser::SourceHandler::File + TAP::Parser::SourceHandler::Handle + TAP::Parser::SourceHandler::Perl + TAP::Parser::SourceHandler::RawTAP + TAP::Parser::Utils + TAP::Parser::YAMLish::Reader + TAP::Parser::YAMLish::Writer + Test::Harness + + diff --git a/perl-core/Test-Simple/Manifest b/perl-core/Test-Simple/Manifest index 033e2a848c96..98ff70652675 100644 --- a/perl-core/Test-Simple/Manifest +++ b/perl-core/Test-Simple/Manifest @@ -1,4 +1,2 @@ DIST Test-Simple-0.98.tar.gz 107255 SHA256 2fb203e2cb75e72c6f70af71c6b01998f2c0ec2afba6c38cc5053c6107cd12a8 SHA512 bc6147526837afac1d8c33d3318d179ae387246e2083e7e284bae10822fd0150a848bd6c6df8c923a11306116925234da154d5ca155af2757eb7b565b7c84283 WHIRLPOOL 15da9b86a2067168372a5d0e321d719a9011d342e742ff8204212309330ddec8e7d381de3af22ee93ec3ac0ae5c56feb2e0befa7b2a00d8b7fd85b2803d140ca -DIST Test-Simple-0.98_05.tar.gz 111892 SHA256 bc70e8f3cab9a28a8ecbc4299f1703c7c5529c5b22222c28689dd89127f947a2 SHA512 ca4a77a5e5841ab6fb5d5ec8ff7bca6ec244c75ae267a6d85e8340204f109eb35ccc2fab1f30d06d2a98d2dd7687b7d908fcfad12041c15cdd-----BEGIN PGP SIGNED MESSAGE----- -DIST Test-Simple-0.98.tar.gz 107255 SHA256 2fb203e2cb75e72c6f70af71c6b01998f2c0ec2afba6c38cc5053c6107cd12a8 SHA512 bc6147526837afac1d8c33d3318d179ae387246e2083e7e284bae10822fd0150a848bd6c6df8c923a11306116925234da154d5ca155af2757eb7b565b7c84283 WHIRLPOOL 15da9b86a2067168372a5d0e321d719a9011d342e742ff8204212309330ddec8e7d381de3af22ee93ec3ac0ae5c56feb2e0befa7b2a00d8b7fd85b2803d140ca DIST Test-Simple-0.98_05.tar.gz 111892 SHA256 bc70e8f3cab9a28a8ecbc4299f1703c7c5529c5b22222c28689dd89127f947a2 SHA512 ca4a77a5e5841ab6fb5d5ec8ff7bca6ec244c75ae267a6d85e8340204f109eb35ccc2fab1f30d06d2a98d2dd7687b7d908fcfad12041c15cdd4d1133a7359e5f WHIRLPOOL 401bca11acc22545c6044141065c57169817ac1c3a3ae207661e828f6269914ead8758aa5db578f6ce4d0e65e3c6134d755df5a34af0094b526d00595754baeb diff --git a/perl-core/Time-HiRes/Manifest b/perl-core/Time-HiRes/Manifest index 96397b102804..2200ed54b773 100644 --- a/perl-core/Time-HiRes/Manifest +++ b/perl-core/Time-HiRes/Manifest @@ -1,4 +1,2 @@ DIST Time-HiRes-1.9725.tar.gz 88527 SHA256 c099b3df9b57be47e56d93cd5ea399b723166b7c92e5d9ba645fcd52d8fc273b SHA512 5aaa1b8fc03ffc222f19b4e437e9f3db56f8124307b1176cf35ef37160ee1ce01b3fbe0082d5c35fbaccb2e918db4be50e0a1d78feb00f213cc86b1ee88e9575 WHIRLPOOL 54e088003b4b98f9a678c480e47e48f4a7c2457354d6251c64e171ff22555797541128df49d817d0c3d4a72542ef40b8056c9ddf033d9cdbb05325609e36cc62 -DIST Time-HiRes-1.9726.tar.gz 89744 SHA256 ff662ad9b1f6c75a149db7fa1bfc7a161ac8b271e5f3980345e08b734769109e SHA512 b82790e039ccab04b6411487063b23387009abdae5ef304be46ef99d4f2130ea680fec6388ac6d309e766edcb07b0e1c36224c49d76a3-----BEGIN PGP SIGNED MESSAGE----- -DIST Time-HiRes-1.9725.tar.gz 88527 SHA256 c099b3df9b57be47e56d93cd5ea399b723166b7c92e5d9ba645fcd52d8fc273b SHA512 5aaa1b8fc03ffc222f19b4e437e9f3db56f8124307b1176cf35ef37160ee1ce01b3fbe0082d5c35fbaccb2e918db4be50e0a1d78feb00f213cc86b1ee88e9575 WHIRLPOOL 54e088003b4b98f9a678c480e47e48f4a7c2457354d6251c64e171ff22555797541128df49d817d0c3d4a72542ef40b8056c9ddf033d9cdbb05325609e36cc62 DIST Time-HiRes-1.9726.tar.gz 89744 SHA256 ff662ad9b1f6c75a149db7fa1bfc7a161ac8b271e5f3980345e08b734769109e SHA512 b82790e039ccab04b6411487063b23387009abdae5ef304be46ef99d4f2130ea680fec6388ac6d309e766edcb07b0e1c36224c49d76a33a6e38f684dc5182c7c WHIRLPOOL 57ba7c84d63fba8eab78bca6b1c3bbd76b84f41f03670d074e0d9225116be72e5d3a17d2770a29a186f8e4d5333821441ed1b249330bf0c322b805eb993412a6 diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask index 549b1e95d0b0..0372e1b56fc4 100644 --- a/profiles/arch/x86/package.use.stable.mask +++ b/profiles/arch/x86/package.use.stable.mask @@ -35,5 +35,6 @@ dev-python/python-exec -python_single_target_pypy # Mask unstable USE flags on media-video/vlc, see security bug #499806. media-video/vlc gnutls opus vdpau -# Tom Wijsman (06 Feb# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License \ No newline at end of file +# Tom Wijsman (06 Feb 2014) +# [QA] Masked jit USE flag on www-apps/cgit as dev-lang/luajit is not stable. +www-apps/cgit jit diff --git a/profiles/desc/dvb_cards.desc b/profiles/desc/dvb_cards.desc index aee00c0e248d..b28d6fe11ac5 100644 --- a/profiles/desc/dvb_cards.desc +++ b/profiles/desc/dvb_cards.desc @@ -7,15 +7,6 @@ # Keep it sorted. -af9005 - DVB_CARDS setting to add support for the afatech af9005 USB1.1 DVB-T # Copyright 1999-2006 Gentoo Foundation. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/desc/dvb_cards.desc,v 1.9 2009/11/12 18:12:12 billie Exp $ - -# This file contains descriptions of DVB_CARDS USE_EXPAND flags. - -# Keep it sorted. - - af9005 - DVB_CARDS setting to add support for the afatech af9005 USB1.1 DVB-T Demodulator (Various NoName devices, Terratec Xinergy XE rev.1) bcm3510 - DVB_CARDS setting to add support for the Broadcom BCM3510 ATSC demodulator (Air2PC) cx18 - DVB_CARDS setting to add support for the Conexant cx23418 chip (Hauppauge HVR1600) @@ -43,4 +34,7 @@ usb-dib0700 - DVB_CARDS setting to add support for the usb-dib0700 USB DVB-T-dev usb-dw2104 - DVB_CARDS setting to add support for the usb-dw2104 USB DVB-S2-device (TeVii S650 DVB-S2 USB) usb-dtt200u - DVB_CARDS setting to add support for the usb-dtt200u USB DVB-T-devices (Yakumo, Yuan, Hama, TYPHOON, WideView, V-Gear) usb-umt - DVB_CARDS setting to add support for the usb-umt USB2.0-DVB-T-device (Hanftek) -usb-vp702x - DVB_CARDS setting to add support for the usb-vp702x USB DVB-S-devices (TwinhanDTV, DigitalR \ No newline at end of file +usb-vp702x - DVB_CARDS setting to add support for the usb-vp702x USB DVB-S-devices (TwinhanDTV, DigitalRise, TYPHOON) +usb-vp7045 - DVB_CARDS setting to add support for the usb-vp7045 USB DVB-T-devices (TwinhanDTV, DigitalNow, DigitalRise, dnt) +usb-wt220u - DVB_CARDS setting to add support for the usb-wt220u USB DVB-T-devices (Yakumo, Yuan, TYPHOON, WideView, Freecom, V-Gear, dnt, Redbell) +vp7041 - DVB_CARDS setting to add support for the vp7041 USB DVB-T-devices (TwinhanDTV) diff --git a/profiles/package.mask b/profiles/package.mask index df02344bc09b..ed91bf41e470 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,5 +1,5 @@ #################################################################### -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16065 2014/09/30 21:03:25 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16066 2014/10/01 11:47:59 yngwin Exp $ # # When you add an entry to the top of this file, add your name, the date, and # an explanation of why something is getting masked. Please be extremely @@ -35,18 +35,10 @@ # Masked for removal in 30 days, bug #461916. app-emulation/emul-linux-x86-motif -# Ben de Groot (30 Sep 2014) -# WIP, needs testing ->=dev-python/mako-1.0.0 - # Pawel Hajdan jr (30 Sep 2014) # Reverse dependencies need to be tested and fixed, bug #521406. >=dev-libs/protobuf-2.6.0 -# Ben de Groot (30 Sep 2014) -# WIP, needs version bumps of several dependencies ->=www-apps/nikola-7.1.0 - # Pacho Ramos (27 Sep 2014) # >=0.5 broke API, bug #523838, wait for next major tracker # version diff --git a/profiles/prefix/linux/make.defaults b/profiles/prefix/linux/make.defaults index 7c5b2f9ebdd8..b2bf673f2986 100644 --- a/profiles/prefix/linux/make.defaults +++ b/profiles/prefix/linux/make.defaults @@ -23,6 +23,8 @@ USE="${USE} -acl" # direction with how LDFLAGS will be set by default, this entry # may move. # 2010/08/12 - Fabian Groffen -# Unlike default/linux, we do NOT h# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/ \ No newline at end of file +# Unlike default/linux, we do NOT have --as-needed here, as it seems to +# break a random amount of packages, that don't break (or just not +# enough) for non-Prefix installs. +LDFLAGS="-Wl,-O1" + diff --git a/razorqt-base/razorqt-panel/razorqt-panel-0.5.2.ebuild b/razorqt-base/razorqt-panel/razorqt-panel-0.5.2.ebuild index f3901a28167f..9bbe053055ac 100644 --- a/razorqt-base/razorqt-panel/razorqt-panel-0.5.2.ebuild +++ b/razorqt-base/razorqt-panel/razorqt-panel-0.5.2.ebuild @@ -38,16 +38,20 @@ RDEPEND="${DEPEND} src_configure() { local mycmakeargs=( - -DSPLIT_BUILD=On# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/razorqt-base/razorqt-panel/razorqt-panel-0.5.2.ebuild,v 1.3 2013/04/05 14:40:56 ago Exp $ - -EAPI=4 -inherit cmake-utils - -DESCRIPTION="Razor-qt panel and its plugins" -HOMEPAGE="http://razor-qt.org/" - -if [[ ${PV} = *9999* ]]; then - inherit git-2 - EG \ No newline at end of file + -DSPLIT_BUILD=On + -DMODULE_PANEL=On + ) + + local i + for i in clock colorpicker cpuload desktopswitch mainmenu mount networkmonitor \ + quicklaunch screensaver sensors showdesktop taskbar tray volume; do + use $i || mycmakeargs+=( -D${i^^}_PLUGIN=No ) + done + + if use volume; then + for i in alsa pulseaudio; do + use $i || mycmakeargs+=( -DVOLUME_USE_${i^^}=No ) + done + fi + cmake-utils_src_configure +} diff --git a/rox-base/oroborox/oroborox-0.9.8-r1.ebuild b/rox-base/oroborox/oroborox-0.9.8-r1.ebuild index 27f91888595f..323d02503bd1 100644 --- a/rox-base/oroborox/oroborox-0.9.8-r1.ebuild +++ b/rox-base/oroborox/oroborox-0.9.8-r1.ebuild @@ -59,6 +59,16 @@ unset CHOICESPATH src_unpack() { unpack ${A} - epatch "${FILESDIR}"/${P# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/rox-base/oroborox/oroborox-0.9.8-r1.ebuild, \ No newline at end of file + epatch "${FILESDIR}"/${P}-respectflags.patch + cd ${MY_PN}/src + eautoreconf + tc-export CC +} + +src_compile() { + rox_src_compile + + # Remove the leftover '=build' directory + cd "${S}/${APPNAME}" + rm -rf '=build' +} diff --git a/rox-base/rox-media/Manifest b/rox-base/rox-media/Manifest index 5b6f4cfd2f69..61cd5eb0a673 100644 --- a/rox-base/rox-media/Manifest +++ b/rox-base/rox-media/Manifest @@ -1,2 +1 @@ DIST Media-0.0.3.tar.bz2 26051 SHA256 e52339ca78960c6ac5b4ede1ad5792f108b8af37cd6fbe4cbde72e7b8d86d826 -DIST Media-0.0.3.tar.bz2 26051 SHA256 e52339ca78960c6ac5b4ede1ad5792f108b8af37cd6fbe4cbde72e7b8d86d826 diff --git a/sci-biology/blat/Manifest b/sci-biology/blat/Manifest index ee4c272095cc..c1b249e1a095 100644 --- a/sci-biology/blat/Manifest +++ b/sci-biology/blat/Manifest @@ -1,2 +1 @@ DIST blatSrc34.zip 2142975 SHA256 b764828fdf8ef4c9994ae4b6148340a776493475edb573b6adf63ae7ca9b2629 -DIST blatSrc34.zip 2142975 SHA256 b764828fdf8ef4c9994ae4b6148340a776493475edb573b6adf63ae7ca9b2629 diff --git a/sci-biology/cd-hit/files/4.5.1-gentoo.patch b/sci-biology/cd-hit/files/4.5.1-gentoo.patch index 87263310f43e..c3eaf79cc8f2 100644 --- a/sci-biology/cd-hit/files/4.5.1-gentoo.patch +++ b/sci-biology/cd-hit/files/4.5.1-gentoo.patch @@ -47,50 +47,39 @@ index f1eaa26..92d3130 100644 + $(CXX) $(CXXFLAGS) cdhit-est.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit-est cd-hit-est-2d: cdhit-common.o cdhit-utility.o cdhit-est-2d.o -- $(CC) $(CCFLdiff --git a/Makefile b/Makefile -index f1eaa26..92d3130 100644 ---- a/Makefile -+++ b/Makefile -@@ -10,7 +10,7 @@ CCFLAGS = -O2 -DNO_OPENMP - # in command line: - # make openmp=yes - ifeq ($(openmp),yes) --CCFLAGS = -O2 -fopenmp -+CXXFLAGS += -fopenmp - endif +- $(CC) $(CCFLAGS) cdhit-est-2d.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit-est-2d ++ $(CXX) $(CXXFLAGS) cdhit-est-2d.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit-est-2d - # support debugging -@@ -18,16 +18,16 @@ endif - # make debug=yes - # make openmp=yes debug=yes - ifeq ($(debug),yes) --CCFLAGS += -ggdb -+CXXFLAGS += -ggdb - endif + cd-hit-div: cdhit-common.o cdhit-utility.o cdhit-div.o +- $(CC) $(CCFLAGS) cdhit-div.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit-div ++ $(CXX) $(CXXFLAGS) cdhit-div.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit-div - #LDFLAGS = -static -o --LDFLAGS = -o -+LDFLAGS += -o + # objects + cdhit-common.o: cdhit-common.c++ cdhit-common.h +- $(CC) $(CCFLAGS) cdhit-common.c++ -c ++ $(CXX) $(CXXFLAGS) cdhit-common.c++ -c - PROGS = cd-hit cd-hit-est cd-hit-2d cd-hit-est-2d cd-hit-div + cdhit-utility.o: cdhit-utility.c++ cdhit-utility.h +- $(CC) $(CCFLAGS) cdhit-utility.c++ -c ++ $(CXX) $(CXXFLAGS) cdhit-utility.c++ -c - .c++.o: -- $(CC) $(CCFLAGS) -c $< -+ $(CXX) $(CXXFLAGS) -c $< + cdhit.o: cdhit.c++ cdhit-utility.h +- $(CC) $(CCFLAGS) cdhit.c++ -c ++ $(CXX) $(CXXFLAGS) cdhit.c++ -c - all: $(PROGS) + cdhit-2d.o: cdhit-2d.c++ cdhit-utility.h +- $(CC) $(CCFLAGS) cdhit-2d.c++ -c ++ $(CXX) $(CXXFLAGS) cdhit-2d.c++ -c -@@ -37,39 +37,39 @@ clean: - # programs + cdhit-est.o: cdhit-est.c++ cdhit-utility.h +- $(CC) $(CCFLAGS) cdhit-est.c++ -c ++ $(CXX) $(CXXFLAGS) cdhit-est.c++ -c - cd-hit: cdhit-common.o cdhit-utility.o cdhit.o -- $(CC) $(CCFLAGS) cdhit.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit -+ $(CXX) $(CXXFLAGS) cdhit.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit + cdhit-est-2d.o: cdhit-est-2d.c++ cdhit-utility.h +- $(CC) $(CCFLAGS) cdhit-est-2d.c++ -c ++ $(CXX) $(CXXFLAGS) cdhit-est-2d.c++ -c - cd-hit-2d: cdhit-common.o cdhit-utility.o cdhit-2d.o -- $(CC) $(CCFLAGS) cdhit-2d.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit-2d -+ $(CXX) $(CXXFLAGS) cdhit-2d.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit-2d + cdhit-div.o: cdhit-div.c++ cdhit-common.h +- $(CC) $(CCFLAGS) cdhit-div.c++ -c ++ $(CXX) $(CXXFLAGS) cdhit-div.c++ -c - cd-hit-est: cdhit-common.o cdhit-utility.o cdhit-est.o -- $(CC) $(CCFLAGS) cdhit-est.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit-est -+ $(CXX) $(CXXFLAGS) cdhit-est.o cdhit-common.o \ No newline at end of file diff --git a/sci-biology/clustalx/Manifest b/sci-biology/clustalx/Manifest index 487a9927b470..acbf2db29963 100644 --- a/sci-biology/clustalx/Manifest +++ b/sci-biology/clustalx/Manifest @@ -1,2 +1 @@ DIST clustalx-2.1.tar.gz 341649 SHA256 e10adb728c320598a165ca529f1aa3d2560061de0236e0a0926eaca9554afa05 SHA512 e8cbad783722161de6999ab01a91d555fc10db609197a8d2878f91e9d7dc998784c02d2ccb54c4936ee27b41321db6f4f37021221662f483b8b6d945b6e1c026 WHIRLPOOL 6cbe8dcf2be3a535e8ac0ef0b9b476d4429a80bd94b394c0194f46ed039f9ac2b97b0ec2ed680838a0973b3187b2dbc90285733657975e03288b9840ba3d6b15 -DIST clustalx-2.1.tar.gz 341649 SHA256 e10adb728c320598a165ca529f1aa3d2560061de0236e0a0926eaca9554afa05 SHA512 e8cbad783722161de6999ab01a91d555fc10db609197a8d2878f91e9d7dc998784c02d2ccb54c4936ee27b41321db6f4f37021221662f483b8b6d945b6e1c026 WHIRLPOOL 6cbe8dcf2be3a535e8ac0ef0b9b476d4429a80bd94b394c0194f46ed039f9ac2b97b0ec2ed680838a0973b3187b2dbc90285733657975e03288b9840ba3d6b15 diff --git a/sci-biology/embassy-domainatrix/Manifest b/sci-biology/embassy-domainatrix/Manifest index 64369c9332b6..babb2befd12d 100644 --- a/sci-biology/embassy-domainatrix/Manifest +++ b/sci-biology/embassy-domainatrix/Manifest @@ -2,7 +2,3 @@ DIST EMBOSS-6.0.1.tar.gz 20204153 RMD160 c97673670a110b51a6c1d1a0305451c44cd7b50 DIST EMBOSS-6.1.0.tar.gz 21968220 RMD160 2eb01da419464ccbc53a95407df0243d00be8720 SHA1 2f2a48d7aa66a8852c1dd531cfe061b024521c33 SHA256 033d205c108e10e314b1ca61ec026a4a7fec2780e8781da67b0e16825b63af41 DIST embassy-6.0.1-domainatrix-0.1.0.tar.gz 420983 RMD160 902b0a31c2bb64f04912aa70c23cca5390850686 SHA1 2f8148d8c0781a12a103286de65464603bf2bef0 SHA256 7596e76b79f19d77e27b8ea8a75a3e1ba4c806aa548cb9675f23e2bb434a42b1 DIST embassy-6.1.0-domainatrix-0.1.0.tar.gz 399655 RMD160 6a719745621c29b41ba21cf354b7681c1bcb4850 SHA1 d8db155889c88ecbdf9c0f9ee032a47c24ee509f SHA256 54f4aa2bd8753a261722f16098e42f01a9083467162c027e2f1738a740f880d3 -DIST EMBOSS-6.0.1.tar.gz 20204153 RMD160 c97673670a110b51a6c1d1a0305451c44cd7b504 SHA1 ea6fa6e1e4222bc57e748a4d674d72d9b03475dd SHA256 3e352902aa9dab88bf486457ff23794f19398dfc6b550c4bf175dfcad34c233d -DIST EMBOSS-6.1.0.tar.gz 21968220 RMD160 2eb01da419464ccbc53a95407df0243d00be8720 SHA1 2f2a48d7aa66a8852c1dd531cfe061b024521c33 SHA256 033d205c108e10e314b1ca61ec026a4a7fec2780e8781da67b0e16825b63af41 -DIST embassy-6.0.1-domainatrix-0.1.0.tar.gz 420983 RMD160 902b0a31c2bb64f04912aa70c23cca5390850686 SHA1 2f8148d8c0781a12a103286de65464603bf2bef0 SHA256 7596e76b79f19d77e27b8ea8a75a3e1ba4c806aa548cb9675f23e2bb434a42b1 -DIST embassy-6.1.0-domainatrix-0.1.0.tar.gz 399655 RMD160 6a719745621c29b41ba21cf354b7681c1bcb4850 SHA1 d8db155889c88ecbdf9c0f9ee032a47c24ee509f SHA256 54f4aa2bd8753a261722f16098e42f01a9083467162c027e2f1738a740f880d3 diff --git a/sci-biology/embassy-esim4/Manifest b/sci-biology/embassy-esim4/Manifest index 87f3e4aedccd..61b70a231f89 100644 --- a/sci-biology/embassy-esim4/Manifest +++ b/sci-biology/embassy-esim4/Manifest @@ -2,5 +2,3 @@ DIST EMBOSS-6.0.1.tar.gz 20204153 RMD160 c97673670a110b51a6c1d1a0305451c44cd7b50 DIST EMBOSS-6.1.0.tar.gz 21968220 RMD160 2eb01da419464ccbc53a95407df0243d00be8720 SHA1 2f2a48d7aa66a8852c1dd531cfe061b024521c33 SHA256 033d205c108e10e314b1ca61ec026a4a7fec2780e8781da67b0e16825b63af41 DIST embassy-6.0.1-esim4-1.0.0.tar.gz 431898 RMD160 228f886fa5804e2558884e035c90e8837a6939be SHA1 10710ade8f85c7adf5ded862b211726d2c1000d5 SHA256 219b3541e2a67d31fd62140c2c9c2b41e2d3d814dec6aaf691f764e337917577 DIST embassy-6.1.0-esim4-1.0.0.tar.gz 405076 RMD160 7db28acb948de25501dd2428567e208376066e07 SHA1 853aaafb776270e607e5a4040fb6062280484a30 SHA256 ff4c01548a4a70f0e27b25df439588d25db417a6f80371590acc4254b3876b7c -DIST EMBOSS-6.0.1.tar.gz 20204153 RMD160 c97673670a110b51a6c1d1a0305451c44cd7b504 SHA1 ea6fa6e1e4222bc57e748a4d674d72d9b03475dd SHA256 3e352902aa9dab88bf486457ff23794f19398dfc6b550c4bf175dfcad34c233d -DIST EMBOSS-6.1.0.tar.gz 21968220 RMD160 2eb01da419464ccbc53a95407df0243d00be8720 SHA1 2f2a48d7aa66a8852c1dd531cfe061b024521c33 SHA256 033d205c108e10e314b1ca61ec026a4a7fec278 \ No newline at end of file diff --git a/sci-biology/embassy-hmmer/Manifest b/sci-biology/embassy-hmmer/Manifest index fafafe45365c..cb18954b7b17 100644 --- a/sci-biology/embassy-hmmer/Manifest +++ b/sci-biology/embassy-hmmer/Manifest @@ -2,6 +2,3 @@ DIST EMBOSS-6.0.1.tar.gz 20204153 RMD160 c97673670a110b51a6c1d1a0305451c44cd7b50 DIST EMBOSS-6.1.0.tar.gz 21968220 RMD160 2eb01da419464ccbc53a95407df0243d00be8720 SHA1 2f2a48d7aa66a8852c1dd531cfe061b024521c33 SHA256 033d205c108e10e314b1ca61ec026a4a7fec2780e8781da67b0e16825b63af41 DIST embassy-6.0.1-hmmer-2.3.2.tar.gz 565686 RMD160 d2fdaf691f3064d44739fde42809a5222729f532 SHA1 642f6f7601cab5f18181157dde4496570a661541 SHA256 9b27f2b7a9059b017e3bd3d31de08f6fbf7d49c3e025d73abd83ff0567732258 DIST embassy-6.1.0-hmmer-2.3.2.tar.gz 541801 RMD160 214c0155e2f14c8a0968cd4d8ee55642fdcf0b18 SHA1 c324164767d4503a0c567d113d280c5dd4e39bfd SHA256 725d1b1f7b79a29b6b2a0569ce82fbd773c1199cd041b1c2360f66e4be78aaab -DIST EMBOSS-6.0.1.tar.gz 20204153 RMD160 c97673670a110b51a6c1d1a0305451c44cd7b504 SHA1 ea6fa6e1e4222bc57e748a4d674d72d9b03475dd SHA256 3e352902aa9dab88bf486457ff23794f19398dfc6b550c4bf175dfcad34c233d -DIST EMBOSS-6.1.0.tar.gz 21968220 RMD160 2eb01da419464ccbc53a95407df0243d00be8720 SHA1 2f2a48d7aa66a8852c1dd531cfe061b024521c33 SHA256 033d205c108e10e314b1ca61ec026a4a7fec2780e8781da67b0e16825b63af41 -DIST embassy-6.0.1-hmmer-2.3.2.tar.gz 565686 RMD160 d2fdaf691f3064d44739fde42809a5222729f532 SHA1 642f6f7601cab5f18181157dde44 \ No newline at end of file diff --git a/sci-biology/emboss/emboss-6.0.1.ebuild b/sci-biology/emboss/emboss-6.0.1.ebuild index 7a6898e7b92c..c6979dcf971e 100644 --- a/sci-biology/emboss/emboss-6.0.1.ebuild +++ b/sci-biology/emboss/emboss-6.0.1.ebuild @@ -75,68 +75,38 @@ src_install() { dodoc AUTHORS ChangeLog FAQ NEWS README THANKS \ || die "Failed to install documentation." newdoc "${FILESDIR}"/${PN}-README.Gentoo-1 README.Gentoo \ - || die "Faile# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-biology/emboss/emboss-6.0.1.ebuild,v 1.12 2014/07/30 01:12:51 grknight Exp $ - -EAPI=1 - -inherit eutils - -DESCRIPTION="The European Molecular Biology Open Software Suite - A sequence analysis package" -HOMEPAGE="http://emboss.sourceforge.net/" -SRC_URI="ftp://${PN}.open-bio.org/pub/EMBOSS/old/${PV}/EMBOSS-${PV}.tar.gz" -LICENSE="GPL-2 LGPL-2" - -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="X png minimal" - -DEPEND=" - X? ( x11-libs/libXt ) - png? ( - sys-libs/zlib - media-libs/libpng - media-libs/gd - ) - !minimal? ( - sci-biology/primer3 - sci-biology/clustalw - )" - -RDEPEND="${DEPEND} - !sys-devel/cons" - -PDEPEND=" - !minimal? ( - sci-biology/aaindex - sci-biology/cutg - sci-biology/prints - sci-biology/prosite - sci-biology/rebase - sci-biology/transfac - )" - -S="${WORKDIR}/EMBOSS-${PV}" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PN}-5.0.0-as-needed.patch - - local link_string="$(pkg-config --libs x11)" - if use png; then - link_string="${link_string} -lgd $(pkg-config --libs libpng)" - fi - sed -e "s:PATCH_PLPLOT:${link_string}:" -i plplot/Makefile.in \ - || die "Failed to patch ajax Makefile" + || die "Failed to install Gentoo readme file." + + # Install env file for setting libplplot and acd files path. + cat <<- EOF > 22emboss + # plplot libs dir + PLPLOT_LIB="/usr/share/EMBOSS/" + # ACD files location + EMBOSS_ACDROOT="/usr/share/EMBOSS/acd" + EOF + doenvd 22emboss || die "Failed to install environment file." + + # Symlink preinstalled docs to "/usr/share/doc". + dosym /usr/share/EMBOSS/doc/manuals /usr/share/doc/${PF}/manuals || die + dosym /usr/share/EMBOSS/doc/programs /usr/share/doc/${PF}/programs || die + dosym /usr/share/EMBOSS/doc/tutorials /usr/share/doc/${PF}/tutorials || die + dosym /usr/share/EMBOSS/doc/html /usr/share/doc/${PF}/html || die + + # Clashes #330507 + mv "${D}"/usr/bin/{digest,pepdigest} || die + + # Remove useless dummy files from the image. + find emboss/data -name dummyfile -delete || die "Failed to remove dummy files." + + # Move the provided codon files to a different directory. This will avoid + # user confusion and file collisions on case-insensitive file systems (see + # bug #115446). This change is documented in "README.Gentoo". + mv "${D}"/usr/share/EMBOSS/data/CODONS{,.orig} || \ + die "Failed to move CODON directory." + + # Move the provided restriction enzyme prototypes file to a different name. + # This avoids file collisions with versions of rebase that install their + # own enzyme prototypes file (see bug #118832). + mv "${D}"/usr/share/EMBOSS/data/embossre.equ{,.orig} || \ + die "Failed to move enzyme equivalence file." } - -src_compile() { - local myconf - myconf="--includedir=${D}/usr/include/emboss" - use X || myconf="${EXTRA_CONF} --without-x" - use png || myconf="${EXTRA_CONF} --without-pngdriver" - - econf ${myconf} - # Do not in \ No newline at end of file diff --git a/sci-biology/emboss/files/emboss-5.0.0-as-needed.patch b/sci-biology/emboss/files/emboss-5.0.0-as-needed.patch index d574f68b7724..9915f95376d0 100644 --- a/sci-biology/emboss/files/emboss-5.0.0-as-needed.patch +++ b/sci-biology/emboss/files/emboss-5.0.0-as-needed.patch @@ -12,15 +12,13 @@ diff -Naur EMBOSS-5.0.0.old/ajax/Makefile.in EMBOSS-5.0.0/ajax/Makefile.in @ISCYGWIN_TRUE@AM_LDFLAGS = -no-undefined -Wl,--add-stdcall-alias -Wl,--export-all-symbols -Wl,--enable-auto-import -L../plplot -leplplot diff -Naur EMBOSS-5.0.0.old/plplot/Makefile.in EMBOSS-5.0.0/plplot/Makefile.in --- EMBOSS-5.0.0.old/plplot/Makefile.in 2007-07-12 05:53:36.000000000 -0500 -+++ EMBOSS-5.0.0/plplot/Madiff -Naur EMBOSS-5.0.0.old/ajax/Makefile.in EMBOSS-5.0.0/ajax/Makefile.in ---- EMBOSS-5.0.0.old/ajax/Makefile.in 2007-07-12 05:53:32.000000000 -0500 -+++ EMBOSS-5.0.0/ajax/Makefile.in 2008-01-25 16:43:51.000000000 -0500 -@@ -244,7 +244,7 @@ - top_srcdir = @top_srcdir@ - @ISCYGWIN_FALSE@lib_LTLIBRARIES = libajax.la libajaxg.la - @ISCYGWIN_TRUE@lib_LTLIBRARIES = libajax.la ++++ EMBOSS-5.0.0/plplot/Makefile.in 2008-01-25 16:42:51.000000000 -0500 +@@ -229,7 +229,7 @@ + lib_LTLIBRARIES = libeplplot.la + @AMPNG_FALSE@@ISAIXIA64_TRUE@@ISSHARED_TRUE@AM_CFLAGS = -Wl,-G -lX11 + @AMPNG_TRUE@@ISAIXIA64_TRUE@@ISSHARED_TRUE@AM_CFLAGS = -Wl,-G -lgd -lpng -lz -lX11 -lm -@ISAIXIA64_FALSE@@ISSHARED_TRUE@AM_CFLAGS = -+@ISAIXIA64_FALSE@@ISSHARED_TRUE@AM_CFLAGS = -lm -L../plplot/.libs -leplplot - @ISAIXIA64_TRUE@@ISSHARED_TRUE@@NEEDAJAX_FALSE@AM_CFLAGS = -Wl,-G -L../plplot/.libs -L.libs -leplplot -lm - @ISAIXIA64_TRUE@@ISSHARED_TRUE@@NEEDAJAX_TRUE@AM_CFLAGS = -Wl,-G -L../plplot/.libs -L.libs -lajax -leplplot -lm - @ISCYG \ No newline at end of file ++@ISAIXIA64_FALSE@@ISSHARED_TRUE@AM_CFLAGS = PATCH_PLPLOT + @ISCYGWIN_TRUE@AM_LDFLAGS = -no-undefined -Wl,--add-stdcall-alias -Wl,--export-all-symbols -Wl,--enable-auto-import -lX11 -lgd -lpng -lz + INCLUDES = $(X_CFLAGS) -I$(srcdir)/ -I/usr/include/gd -DPREFIX=\"$(prefix)\" -DBUILD_DIR=\"$(srcdir)\" -DDRV_DIR=\"$(srcdir)\" -DEMBOSS_TOP=\"$(EMBOSS_TOP)\" + PLPLOTSRC = pdfutils.c plargs.c plbox.c plcont.c plcore.c \ diff --git a/sci-biology/phylip/phylip-3.69.ebuild b/sci-biology/phylip/phylip-3.69.ebuild index 14fb78e54d7c..b11f4d3a84b3 100644 --- a/sci-biology/phylip/phylip-3.69.ebuild +++ b/sci-biology/phylip/phylip-3.69.ebuild @@ -9,19 +9,6 @@ LICENSE="freedist" HOMEPAGE="http://evolution.genetics.washington.edu/phylip.html" SRC_URI="http://evolution.gs.washington.edu/${PN}/download/${P}.tar.gz" -SLOT="0" -IUSE="" -KEYWORDS="amd64 ~ppc x86 ~amd64-# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-biology/phylip/phylip-3.69.ebuild,v 1.3 2010/01/01 21:38:17 fauli Exp $ - -inherit toolchain-funcs - -DESCRIPTION="PHYLIP - The PHYLogeny Inference Package" -LICENSE="freedist" -HOMEPAGE="http://evolution.genetics.washington.edu/phylip.html" -SRC_URI="http://evolution.gs.washington.edu/${PN}/download/${P}.tar.gz" - SLOT="0" IUSE="" KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" @@ -40,4 +27,21 @@ src_compile() { -i Makefile || die "Patching Makefile failed." mkdir ../fonts emake -j1 all put || die "Compilation failed." - mv ../exe/font* ../fonts || die "Font move fail \ No newline at end of file + mv ../exe/font* ../fonts || die "Font move failed." + mv ../exe/factor ../exe/factor-${PN} || die "Renaming factor failed." +} + +src_install() { + cd "${WORKDIR}/${P}" + + dobin exe/* || die "Failed to install programs." + + dodoc "${FILESDIR}"/README.Gentoo || die "Failed to install Gentoo notes." + + dohtml phylip.html || die "Failed to install HTML documentation index." + insinto /usr/share/doc/${PF}/html/doc + doins doc/* || die "Failed to install HTML documentation." + + insinto /usr/share/${PN}/fonts + doins fonts/* || die "Fonts installation failed." +} diff --git a/sci-biology/piler/Manifest b/sci-biology/piler/Manifest index 461df2fb4779..a63f193ecb5b 100644 --- a/sci-biology/piler/Manifest +++ b/sci-biology/piler/Manifest @@ -1,2 +1 @@ DIST piler-1.0.tar.gz 35220 SHA256 2940530c0afd7e49ca6e9cd8a1e3fd9890d87c71f9c19a42b1e468add83ccc69 -DIST piler-1.0.tar.gz 35220 SHA256 2940530c0afd7e49ca6e9cd8a1e3fd9890d87c71f9c19a42b1e468add83ccc69 diff --git a/sci-biology/velvet/velvet-1.2.10.ebuild b/sci-biology/velvet/velvet-1.2.10.ebuild index 3afbacae96a5..47bbdb2d7b4d 100644 --- a/sci-biology/velvet/velvet-1.2.10.ebuild +++ b/sci-biology/velvet/velvet-1.2.10.ebuild @@ -53,14 +53,21 @@ src_prepare() { OPT="${CFLAGS}" ) if [[ ${VELVET_MAXKMERLENGTH} != "" ]]; then MAKE_XOPTS+=( MAXKMERLENGTH=${VELVET_MAXKMERLENGTH} ); fi - if [[# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-biology/velvet/velvet-1.2.10.ebuild,v 1.1 2013/12/28 23:19:35 jlec Exp $ + if [[ ${VELVET_CATEGORIES} != "" ]]; then MAKE_XOPTS+=( CATEGORIES=${VELVET_CATEGORIES} ); fi +} -EAPI=5 +src_compile() { + emake "${MAKE_XOPTS[@]}" + emake "${MAKE_XOPTS[@]}" color +} -inherit eutils flag-o-matic toolchain-funcs +src_test() { + emake "${MAKE_XOPTS[@]}" test +} -MY_P=${PN}_${PV} - -DESCRIPTION="A sequence assembler for very short reads" +src_install() { + dobin velvet{g,h,g_de,h_de} + insinto /usr/share/${PN} + doins -r contrib + dodoc Manual.pdf CREDITS.txt ChangeLog +} diff --git a/sci-biology/wise/wise-2.2.0.ebuild b/sci-biology/wise/wise-2.2.0.ebuild index a041d8b985cb..f738f66ef751 100644 --- a/sci-biology/wise/wise-2.2.0.ebuild +++ b/sci-biology/wise/wise-2.2.0.ebuild @@ -13,23 +13,6 @@ SLOT="0" IUSE="" KEYWORDS="~alpha ia64 ~sparc x86 ~amd64" -RDEPEND="~sci-biology/hmmer-2.3.2" -DEPEND="${RDEPEND} - app-# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-biology/wise/wise-2.2.0.ebuild,v 1.12 2010/10/02 15:08:42 dilfridge Exp $ - -inherit eutils toolchain-funcs - -DESCRIPTION="Intelligent algorithms for DNA searches" -HOMEPAGE="http://www.ebi.ac.uk/Wise2/" -SRC_URI="ftp://ftp.ebi.ac.uk/pub/software/unix/${PN}2/${PN}${PV}.tar.gz" - -LICENSE="BSD" -SLOT="0" -IUSE="" -KEYWORDS="~alpha ia64 ~sparc x86 ~amd64" - RDEPEND="~sci-biology/hmmer-2.3.2" DEPEND="${RDEPEND} app-shells/tcsh @@ -70,4 +53,17 @@ src_compile() { src_install() { dobin "${S}"/src/bin/* || die "Failed to install program" dolib "${S}"/src/base/libwisebase.a || die "Failed to install libwisebase" - doli \ No newline at end of file + dolib "${S}"/src/dynlibsrc/libdyna.a || die "Failed to install libdyna" + dobin "${S}"/src/dynlibsrc/testgendb || die "Failed to install testgendb" + dolib "${S}"/src/models/libmodel.a || die "Failed to install libmodel" + insinto /usr/share/${PN} + doins -r "${S}"/wisecfg || die "Failed to install wisecfg" + insinto /usr/share/doc/${PF} + doins "${S}"/docs/*.ps || die "Failed to install documentation" + newenvd "${FILESDIR}"/${PN}-env 24wise || die "Failed to install env file" +} + +src_test() { + cd "${S}"/src + WISECONFIGDIR="${S}/wisecfg" make test || die +} diff --git a/sci-chemistry/PyMca/Manifest b/sci-chemistry/PyMca/Manifest index 619d7c997fcb..c6899e234b21 100644 --- a/sci-chemistry/PyMca/Manifest +++ b/sci-chemistry/PyMca/Manifest @@ -1,2 +1 @@ -DIST pymca4.6.2-src.tgz 15979581 SHA256 c50d3a54cad633bac3ec361d1b3b63a78292f1ad4ed976e5206665edd76bc32d SHA512 e33188b446c399e50cf65ebca4bfee-----BEGIN PGP SIGNED MESSAGE----- DIST pymca4.6.2-src.tgz 15979581 SHA256 c50d3a54cad633bac3ec361d1b3b63a78292f1ad4ed976e5206665edd76bc32d SHA512 e33188b446c399e50cf65ebca4bfeef34e1b7d99c331f670dc41ca204284fbba996a1c83bd12a2410a9972927aa9c92b42b5374c58c924b3a8583d4f37be6528 WHIRLPOOL 47f0491aa0e470661bea1aa247d1db730f1db7266f1d2be2272d08f203faa2a084bcb40d579861365ace26d2f94abe03485183eed03139ad7b697cf57bfa5324 diff --git a/sci-chemistry/ccpn/files/talosn.patch b/sci-chemistry/ccpn/files/talosn.patch index 635e808f0260..e19a0ab19783 100644 --- a/sci-chemistry/ccpn/files/talosn.patch +++ b/sci-chemistry/ccpn/files/talosn.patch @@ -12,7 +12,5 @@ index d10553e..fb732db 100644 - 'talos': ['dihedral.tab',1,0, [['MultiSelectionList','validClasses','Classes for valid constraint:',['Good','New','Warn','None'],None], + 'talos': ['dihedral.tab',1,0, [['MultiSelectionList','validClasses','Classes for valid constraint:',['Good','New','Warn','Dyn', 'Strong', 'Generous', 'None'],None], ['IntEntry','validCount','Count variable lower limit for valid constraint:',0,None], - ['Flo ccpnmr2.3/python/ccpnmr/format/general/Constants.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ccpnmr2.3/python/ccpnmr/format/genera \ No newline at end of file + ['FloatEntry','multiplyDeviation','Multiplication factor to convert deviation in constraint range:',2.0,None]], + []]}, diff --git a/sci-chemistry/gperiodic/Manifest b/sci-chemistry/gperiodic/Manifest index 2295ac13f003..659d4e28d9ce 100644 --- a/sci-chemistry/gperiodic/Manifest +++ b/sci-chemistry/gperiodic/Manifest @@ -1,2 +1 @@ -DIST gperiodic-2.0.10.tar.gz 131213 SHA256 78d72870c51c39e4a35c804c05b8ef5e39f88d42eced52b2934e21d74fb8d096 SHA512 23d0074ad5b0f9e25e8eee63f8c375e2448b1ee7c00f89e965b7dd8ce3f60f20251d7699a2f7a767228316144b946a5ac204a3e478c395767133f7fc801b51ba WHIRLPOOL b758b622bfb980a-----BEGIN PGP SIGNED MESSAGE----- DIST gperiodic-2.0.10.tar.gz 131213 SHA256 78d72870c51c39e4a35c804c05b8ef5e39f88d42eced52b2934e21d74fb8d096 SHA512 23d0074ad5b0f9e25e8eee63f8c375e2448b1ee7c00f89e965b7dd8ce3f60f20251d7699a2f7a767228316144b946a5ac204a3e478c395767133f7fc801b51ba WHIRLPOOL b758b622bfb980aad45b0bb6e2850579408959c3bf700f4dbb21d4bc64168d2a589a9ed5974f75b5eaf7f6c9d593c69dbc9b470957b01457caa30eb356850f14 diff --git a/sci-chemistry/molmol/molmol-2k_p2-r2.ebuild b/sci-chemistry/molmol/molmol-2k_p2-r2.ebuild index 51f1d01a97c1..0158b6dffb40 100644 --- a/sci-chemistry/molmol/molmol-2k_p2-r2.ebuild +++ b/sci-chemistry/molmol/molmol-2k_p2-r2.ebuild @@ -76,4 +76,5 @@ src_install() { insinto ${MMDIR} doins -r auxil help macros man setup tips - dodoc # Copyright 1999- \ No newline at end of file + dodoc HISTORY README +} diff --git a/sci-chemistry/molmol/molmol-2k_p2-r4.ebuild b/sci-chemistry/molmol/molmol-2k_p2-r4.ebuild index 03920289370e..5d6c64675f3b 100644 --- a/sci-chemistry/molmol/molmol-2k_p2-r4.ebuild +++ b/sci-chemistry/molmol/molmol-2k_p2-r4.ebuild @@ -80,4 +80,7 @@ src_install() { exeinto ${MMDIR} newexe src/main/molmol molmol.lnx insinto ${MMDIR} - doins -r auxil help macros man setup ti# Copyright 1999-2013 Gentoo \ No newline at end of file + doins -r auxil help macros man setup tips + + dodoc HISTORY README +} diff --git a/sci-chemistry/molrep/molrep-11.0.02.ebuild b/sci-chemistry/molrep/molrep-11.0.02.ebuild index abbb1b967de9..c9148066ee39 100644 --- a/sci-chemistry/molrep/molrep-11.0.02.ebuild +++ b/sci-chemistry/molrep/molrep-11.0.02.ebuild @@ -15,25 +15,6 @@ SLOT="0" KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" IUSE="" -RDEPEND=" - >=sci-libs/ccp4-libs-6.1.3 -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molrep/molrep-11.0.02.ebuild,v 1.10 2013/02/21 22:00:47 jlec Exp $ - -EAPI=4 - -inherit eutils fortran-2 multilib toolchain-funcs - -DESCRIPTION="molecular replacement program" -HOMEPAGE="http://www.ysbl.york.ac.uk/~alexei/molrep.html" -SRC_URI="mirror://gentoo/${P}.tar.gz" - -LICENSE="ccp4" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" -IUSE="" - RDEPEND=" >=sci-libs/ccp4-libs-6.1.3 sci-libs/mmdb @@ -49,4 +30,28 @@ src_prepare() { "${FILESDIR}"/11.0.00-test.patch } -src_co \ No newline at end of file +src_compile() { + cd "${S}"/src + emake clean + emake \ + MR_FORT="$(tc-getFC) ${FFLAGS}" \ + FFLAGS="${FFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + MR_LIBRARY="-L${EPREFIX}/usr/$(get_libdir) -lccp4f -lccp4c $($(tc-getPKG_CONFIG) --libs mmdb lapack) -lccif -lstdc++ -lm" +} + +src_test() { + export MR_TEST="${S}/bin/" + cd "${S}"/molrep_check/work + mkdir out scr + cp ../*.bat . + bash em.bat || die + bash mr.bat || die +} + +src_install() { + exeinto /usr/libexec/ccp4/bin/ + doexe bin/${PN} + dosym ../libexec/ccp4/bin/${PN} /usr/bin/${PN} + dodoc readme doc/${PN}.rtf +} diff --git a/sci-chemistry/molscript/molscript-2.1.2-r1.ebuild b/sci-chemistry/molscript/molscript-2.1.2-r1.ebuild index eddc2cee4e87..71d7ca135e9d 100644 --- a/sci-chemistry/molscript/molscript-2.1.2-r1.ebuild +++ b/sci-chemistry/molscript/molscript-2.1.2-r1.ebuild @@ -16,29 +16,6 @@ KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" RESTRICT="fetch" IUSE="" -DEPEND=" - virtual/jpeg - media-libs/libpng - media-libs/gd - media-libs/freeglut - || ( x11-libs# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molscript/molscript-2.1.2-r1.ebuild,v 1.8 2011/08/09 08:25:28 ssuominen Exp $ - -EAPI="3" - -inherit eutils toolchain-funcs - -DESCRIPTION="Display molecular 3D structures, such as proteins, in both schematic and detailed representations" -HOMEPAGE="http://www.avatar.se/molscript/" -SRC_URI="${P}.tar.gz" - -LICENSE="glut molscript" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" -RESTRICT="fetch" -IUSE="" - DEPEND=" virtual/jpeg media-libs/libpng @@ -57,4 +34,32 @@ pkg_nofetch() { src_prepare() { epatch \ - "${FILESDIR}"/fix-makefile-sha \ No newline at end of file + "${FILESDIR}"/fix-makefile-shared.patch \ + "${FILESDIR}"/${PV}-ldflags.patch \ + "${FILESDIR}"/${PV}-prll.patch \ + "${FILESDIR}"/${PV}-libpng15.patch + + # Provide glutbitmap.h, because freeglut doesn't have it + cp "${FILESDIR}"/glutbitmap.h "${S}"/clib/ + + # Stop an incredibly hacky include + sed -i -e 's:<../lib/glut/glutbitmap.h>:"glutbitmap.h":g' \ + "${S}"/clib/ogl_bitmap_character.c || die +} + +src_compile() { + # Prefix of programs it links with + export FREEWAREDIR="${EPREFIX}/usr" + + ln -s Makefile.complete Makefile + + emake \ + CC="$(tc-getCC)" \ + COPT="${CFLAGS}" \ + || die "emake failed" +} + +src_install() { + dobin molscript molauto || die + dohtml "${S}"/doc/*.html || die +} diff --git a/sci-chemistry/surf/Manifest b/sci-chemistry/surf/Manifest index eaa95efbf46d..7e50ca58e561 100644 --- a/sci-chemistry/surf/Manifest +++ b/sci-chemistry/surf/Manifest @@ -1,2 +1 @@ DIST surf-1.0.tar.Z 74347 SHA256 6d032e4b749e5e1971b5d97b0fcf552029068a87bcaebd6ce92db27179f7cb0a -DIST surf-1.0.tar.Z 74347 SHA256 6d032e4b749e5e1971b5d97b0fcf552029068a87bcaebd6ce92db27179f7cb0a diff --git a/sci-electronics/drawtiming/Manifest b/sci-electronics/drawtiming/Manifest index 79f223e5a96b..cda5063940c1 100644 --- a/sci-electronics/drawtiming/Manifest +++ b/sci-electronics/drawtiming/Manifest @@ -1,2 +1 @@ -DIST drawtiming-0.7.1.tar.gz 123714 RMD160 9f6a39a139c9426e432-----BEGIN PGP SIGNED MESSAGE----- DIST drawtiming-0.7.1.tar.gz 123714 RMD160 9f6a39a139c9426e432ae400620c80da02b9f354 SHA1 cae987875cc9ed0a35fd6ca3a30e63e4aa512407 SHA256 ae35a369f71f03b219d23f56329ced73100f79ffda38dd8d31d1e9e510f3cf6e diff --git a/sci-electronics/drawtiming/files/drawtiming-0.7.1-ldflags.patch b/sci-electronics/drawtiming/files/drawtiming-0.7.1-ldflags.patch index 061c2b27b533..d50621f76796 100644 --- a/sci-electronics/drawtiming/files/drawtiming-0.7.1-ldflags.patch +++ b/sci-electronics/drawtiming/files/drawtiming-0.7.1-ldflags.patch @@ -26,9 +26,11 @@ Forwarded: yes depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -159,7 +159,7 @@ - AM_CXXFLAGS Description: Switch LDADD with LDFLAGS - This change is to move the objects before the libs. to fix an FTBFS when - --as-needed is passed to gcc. -Author: حمودي (Ahmed El-Mahmoudy) -Forwarded: yes ---- drawtiming-0.7.1.orig/src/Makefile.am \ No newline at end of file + AM_CXXFLAGS = @MAGICK_CFLAGS@ -DYYDEBUG=1 + AM_YFLAGS = -d + drawtiming_SOURCES = main.cc globals.h parser.yy scanner.ll timing.cc timing.h +-drawtiming_LDFLAGS = @MAGICK_LIBS@ ++drawtiming_LDFLAGS = @LDFLAGS@ + EXTRA_DIST = parser.h + BUILT_SOURCES = parser.h + all: $(BUILT_SOURCES) diff --git a/sci-electronics/electric/files/7.00-qt.patch b/sci-electronics/electric/files/7.00-qt.patch index 653e162f71a2..137f1e943642 100644 --- a/sci-electronics/electric/files/7.00-qt.patch +++ b/sci-electronics/electric/files/7.00-qt.patch @@ -32,4 +32,4 @@ +#CCOMPILER = @PTHREAD_CC@ ##### For the general-purpose X facility, uncomment this line ---- Makefile.in.oric \ No newline at end of file + XPOWER = -DANYDEPTH diff --git a/sci-electronics/geda-xgsch2pcb/geda-xgsch2pcb-0.1.3-r2.ebuild b/sci-electronics/geda-xgsch2pcb/geda-xgsch2pcb-0.1.3-r2.ebuild index 8456ba10ef39..caa8522f33c7 100644 --- a/sci-electronics/geda-xgsch2pcb/geda-xgsch2pcb-0.1.3-r2.ebuild +++ b/sci-electronics/geda-xgsch2pcb/geda-xgsch2pcb-0.1.3-r2.ebuild @@ -72,5 +72,7 @@ pkg_postinst() { pkg_postrm() { fdo-mime_desktop_database_update - fdo-mime_mime_datab# Copyright 1999-2013 Gentoo Foundation -# Distributed under the t \ No newline at end of file + fdo-mime_mime_database_update + gnome2_icon_cache_update + python_mod_cleanup ${PN} +} diff --git a/sci-electronics/geda/Manifest b/sci-electronics/geda/Manifest index 669013eb94f1..889fbe8d837d 100644 --- a/sci-electronics/geda/Manifest +++ b/sci-electronics/geda/Manifest @@ -1,4 +1,2 @@ DIST geda-gaf-1.8.1.tar.gz 11197244 SHA256 026888ce21cb83a3543a7554de0ddc610cc8dc6ce2341df17c5b3305d6dcbb10 SHA512 16f88af81d514c3504625765c64ad1d2a45d3da6a4c75f68db30f51776ff56d907ce97fb69e39cc6347ee9bfa4b591a62240fec6cfc73c0f54b61285e118b35b WHIRLPOOL da6743d97428deb81dd80dad9ca2f8476643f21bb34386681e54edd1dccb241f5d016d8b3d1640a80aaab1233a1cc23f835fc340955b1524d2085cc5b50abc71 DIST geda-gaf-1.8.2.tar.gz 11282353 SHA256 bbf4773aef1b5a51a8d6f4c3fa288c047340cc62dd6e14d7928fcc6e4051b721 SHA512 3a6fad455c3fd2b62e9788ff04ca33242f2e4701ec24089d8c4304ad5ca44af4901fc1c396b3f840e14a0be0729ff08561a82c6911e1d23ac4b8636534b4e764 WHIRLPOOL e4e6db1b7f6d2f37d99027f9a55797f7ac5a304bb4be474d6d57091121672a86e8dfa5131e830f9bc6335f57cb3864716ef17793b550b0df064e9d2c2b158038 -DIST geda-gaf-1.8.1.tar.gz 11197244 SHA256 026888ce21cb83a3543a7554de0ddc610cc8dc6ce2341df17c5b3305d6dcbb10 SHA512 16f88af81d514c3504625765c64ad1d2a45d3da6a4c75f68db30f51776ff56d907ce97fb69e39cc6347ee9bfa4b591a62240fec6cfc73c0f54b61285e118b35b WHIRLPOOL da6743d97428deb81dd80dad9ca2f8476643f21bb34386681e54edd1dccb241f5d016d8b3d1640a80aaab1233a1cc23f835fc340955b1524d2085cc5b50abc71 -DIST geda-gaf-1.8.2.tar.gz 11282353 SHA256 bbf4773aef1b5a51a8d6f4c3fa288c047340cc62dd6e14d7928fcc6e4051b721 SHA512 3a6fad \ No newline at end of file diff --git a/sci-electronics/gerbv/Manifest b/sci-electronics/gerbv/Manifest index 5666a5baab5f..c7a3d8b23a0e 100644 --- a/sci-electronics/gerbv/Manifest +++ b/sci-electronics/gerbv/Manifest @@ -1,5 +1,3 @@ DIST gerbv-2.4.0.tar.gz 2285912 SHA256 448d31d4ec5a21e56588f5c758dc691de8303998b5e9381234505ea6e2fc3eec SHA512 48ab756175b2651efdbe30ea7b1087db3088d6833082e6dd8043c686086faf28bde214c0d0e52f40e1cb9112edcf1968b3296be0f84c56cbe964aeeb8d2632dc WHIRLPOOL 049c900b43ef01739550d9804d5b0a915d6a70be35e5f3f2a4e54c8b5fcc4979730fc4d3d53aebcabb19618a31f90302a3d18925abdd7b388a2dfc53670a5f50 DIST gerbv-2.5.0.tar.gz 2295221 SHA256 fdb6d78c4c7b18a8a25d43f5d061e1ece0124a93ff61483ff11141f9cd7dbb49 SHA512 ffd43e8d6ed1d67ce739a17bb14570a586f05d9aa8ffb7ee57506604fbc480af58232f08eb2f35e27da2d2c8d2e4857a543192192914dae7c7a0da3e59d9deed WHIRLPOOL 53a8e59ee5f71d63a36e4fc81a4df15e945b5828254e06a4c7f2fdb07a244c6284db7f717d668e003195d21f3248eddcd416a8fad1cd4da6eb753448e96d114b DIST gerbv-2.6.0.tar.gz 2346299 SHA256 5c55425c3493bc8407949be8b4e572434a6b378f5727cc0dcef97dc2e7574dd0 SHA512 a2d7601b44c8ed16a89d18713f451c0298bee65e2ea76b87e3d9d573af63d3b57758cb7cfcfb2177a22aecc7d9fdaaca3d369ea051446651af4dc542065a4377 WHIRLPOOL 07fd10e35d7f384bfdf8d16c9e1a42bdf3010dcd45c2cb3cb359f7c0478b0739c784900e8448c117841511e7d6fed2fe5bd69051fd61e2c64750f83e931909c4 -MISC ChangeLog 7065 SHA256 0e54bebb1a7291b1e5c59e17f7f33432eac4315cf127d5dcab7982a49f59ada7 SHA512 8354c9cdd2232c1bb14f8c0f7848198e0e9a75a010b3fdadd90b3b549c1583DIST gerbv-2.4.0.tar.gz 2285912 SHA256 448d31d4ec5a21e56588f5c758dc691de8303998b5e9381234505ea6e2fc3eec SHA512 48ab756175b2651efdbe30ea7b1087db3088d6833082e6dd8043c686086faf28bde214c0d0e52f40e1cb9112edcf1968b3296be0f84c56cbe964aeeb8d2632dc WHIRLPOOL 049c900b43ef01739550d9804d5b0a915d6a70be35e5f3f2a4e54c8b5fcc4979730fc4d3d53aebcabb19618a31f90302a3d18925abdd7b388a2dfc53670a5f50 -DIST gerbv-2.5.0.tar.gz 2295221 SHA256 fdb6d78c4c7b18a8a25d43f5d061e1ece0124a93ff61483ff11141f9cd7dbb49 SHA512 ffd43e8d6ed1d67ce739a17bb14570a586f05d9aa8ffb7ee57506604fbc480af58232f08eb2f35e27da2d \ No newline at end of file diff --git a/sci-electronics/gtkwave/gtkwave-3.3.59.ebuild b/sci-electronics/gtkwave/gtkwave-3.3.59.ebuild index c16114ad0d0c..a6e3904b1e3b 100644 --- a/sci-electronics/gtkwave/gtkwave-3.3.59.ebuild +++ b/sci-electronics/gtkwave/gtkwave-3.3.59.ebuild @@ -64,6 +64,12 @@ src_install() { fi } -pkg_postinst# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-electroni \ No newline at end of file +pkg_postinst() { + fdo-mime_desktop_database_update + fdo-mime_mime_database_update +} + +pkg_postrm() { + fdo-mime_desktop_database_update + fdo-mime_mime_database_update +} diff --git a/sci-electronics/gwave/files/gwave-20090213-as-needed.patch b/sci-electronics/gwave/files/gwave-20090213-as-needed.patch index ef1465618e17..7ec72ed2aab7 100644 --- a/sci-electronics/gwave/files/gwave-20090213-as-needed.patch +++ b/sci-electronics/gwave/files/gwave-20090213-as-needed.patch @@ -43,10 +43,12 @@ @@ -4,7 +4,9 @@ AM_CFLAGS = @GTK_CFLAGS@ bin_PROGRAMS=gwave-exec gwaverepl - gwave_exec_SOURCES=gwave-exec.c xgclient.c xgex--- gwave2-20090213.orig/src/Makefile.am 2008-01-22 05:36:59.000000000 +0100 -+++ gwave2-20090213/src/Makefile.am 2010-02-06 18:10:38.011218381 +0100 -@@ -15,8 +15,7 @@ - rgeval.c xgserver.c measurebtn.c measurebtn.h \ - GtkTable_indel.c GtkTable_indel.h xsnarf.h + gwave_exec_SOURCES=gwave-exec.c xgclient.c xgexec.h +-gwave_exec_LDADD= @GTK_LIBS@ ++gwave_exec_CFLAGS= @X11_CFLAGS@ ++gwave_exec_LDADD= @GTK_LIBS@ @X11_LIBS@ --gwave_LDADD = ../spicefile/libspicefile.a @GTK_LIBS@ @GUILE_GN \ No newline at end of file + gwaverepl_SOURCES=gwaverepl.c xgclient.c xgexec.h repllib.c +-gwaverepl_LDADD= @GTK_LIBS@ @READLINE_LIB@ ++gwaverepl_CFLAGS= @X11_CFLAGS@ @GLIB_CFLAGS@ ++gwaverepl_LDADD= @GTK_LIBS@ @READLINE_LIB@ @X11_LIBS@ @GLIB_LIBS@ diff --git a/sci-electronics/iverilog/iverilog-0.9.1.ebuild b/sci-electronics/iverilog/iverilog-0.9.1.ebuild index d076fbc8d1ee..f86678f10399 100644 --- a/sci-electronics/iverilog/iverilog-0.9.1.ebuild +++ b/sci-electronics/iverilog/iverilog-0.9.1.ebuild @@ -30,15 +30,22 @@ src_prepare() { sed -i -e 's/driver\/iverilog -B./IVERILOG_ROOT="." driver\/iverilog -B./' Makefile.in || die # Fix LDFLAGS - sed -i -e 's/@shared@/@shared@ $(LDFLAGS)/' {cadpli,tgt-vhdl,tgt-null,tgt-stub,tgt-vvp}/Makefile.in || die "sed faile# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-electronics/iverilog/iverilog-0.9.1.ebuild,v 1.6 2010/06/01 11:59:38 ssuominen Exp $ - -EAPI="2" - -inherit eutils multilib - -S="${WORKDIR}/verilog-${PV}" - -DESCRIPTION="A Verilog simulation and synthesis tool" -SRC_URI= \ No newline at end of file + sed -i -e 's/@shared@/@shared@ $(LDFLAGS)/' {cadpli,tgt-vhdl,tgt-null,tgt-stub,tgt-vvp}/Makefile.in || die "sed failed" + + epatch "${FILESDIR}"/${P}-gcc45.patch +} + +src_install() { + emake -j1 \ + prefix="${D}"/usr \ + mandir="${D}"/usr/share/man \ + infodir="${D}"/usr/share/info \ + libdir="${D}"/usr/$(get_libdir) \ + libdir64="${D}"/usr/$(get_libdir) \ + vpidir="${D}"/usr/$(get_libdir)/ivl \ + install || die + + dodoc *.txt + insinto /usr/share/doc/${PF} + doins -r examples +} diff --git a/sci-electronics/linsmith/linsmith-0.99.25.ebuild b/sci-electronics/linsmith/linsmith-0.99.25.ebuild index 5d5a7312f86b..2c284f162aa5 100644 --- a/sci-electronics/linsmith/linsmith-0.99.25.ebuild +++ b/sci-electronics/linsmith/linsmith-0.99.25.ebuild @@ -32,29 +32,35 @@ src_prepare() { # Now they are cp to the correct location. epatch \ "${FILESDIR}"/${PN}-datafiles.patch -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-electronics/linsmith/linsmith-0.99.25.ebuild,v 1.4 2014/08/10 20:28:03 slyfox Exp $ -EAPI=5 + # fix QA warnings about wrong categories in .desktop file + sed -i -e "s/Application;Engineering;/Education;Science;Electronics;/" \ + -e "s/Encoding=/#Encoding=/" \ + ${PN}.desktop || die -inherit eutils autotools + # fix QA warnings about 'maintainer mode' + eautoreconf +} -DESCRIPTION="Smith charting program, mainly designed for educational use" -HOMEPAGE="http://www.jcoppens.com/soft/linsmith/index.en.php" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +src_install() { + emake DESTDIR="${D}" install -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="doc examples" + insinto "/usr/share/${PN}" + doins datafiles/conv0809 -RDEPEND=" - x11-libs/gtk+:2 - dev-libs/libxml2:2 - dev-libs/glib:2 - dev-libs/atk - gnome-base/libgnome - gnome-base/libgnomecanvas - gnome-base/libgnomeui" -DEPE \ No newline at end of file + dodoc AUTHORS ChangeLog NEWS NOTES README THANKS TODO + doman doc/${PN}.1 + + domenu ${PN}.desktop + doicon ${PN}_icon.xpm + + if use doc; then + insinto "/usr/share/doc/${PF}" + doins doc/manual.pdf + fi + + if use examples; then + insinto "/usr/share/doc/${PF}/examples" + doins datafiles/*.circ datafiles/*.load || die + fi +} diff --git a/sci-electronics/ngspice/files/ngspice-23-flags.patch b/sci-electronics/ngspice/files/ngspice-23-flags.patch index af7f854bca49..ad5c231eb2a9 100644 --- a/sci-electronics/ngspice/files/ngspice-23-flags.patch +++ b/sci-electronics/ngspice/files/ngspice-23-flags.patch @@ -13,15 +13,28 @@ diff -Nadurp ngspice-23.orig//configure.ac ngspice-23/configure.ac + CFLAGS="$ext_CFLAGS" fi else - AC_DEFINE(NGDEBUG,1,[Comdiff -Nadurp ngspice-23.orig//configure.ac ngspice-23/configure.ac ---- ngspice-23.orig//configure.ac 2011-05-30 12:47:05.000000000 -0600 -+++ ngspice-23/configure.ac 2011-07-14 10:47:14.668378976 -0600 -@@ -203,10 +203,10 @@ dnl the above AC_PROG_CC may set CFLAGS - if test "$enable_debug" = "no"; then - if test "x$GCC" = "xyes"; then - AC_MSG_WARN(Removing debugging option!) -- CFLAGS="$ext_CFLAGS -O2 -Wall -Wextra -Wmissing-prototypes -Wstrict-prototypes -Wimplicit-function-declaration -Wnested-externs -Wold-style-definition -Wredundant-decls -s" -+ CFLAGS="$ext_CFLAGS -Wall -Wextra -Wmissing-prototypes -Wstrict-prototypes -Wimplicit-function-declaration -Wnested-externs -Wold-style-definition -Wredundant-decls" - else - AC_MSG_WARN(Removing debugging option!) -- CFLAGS="$ext_CFLAGS -O \ No newline at end of file + AC_DEFINE(NGDEBUG,1,[Compile with debug info]) +diff -Nadurp ngspice-23.orig//src/xspice/icm/makedefs.in ngspice-23/src/xspice/icm/makedefs.in +--- ngspice-23.orig//src/xspice/icm/makedefs.in 2011-01-25 11:34:11.000000000 -0700 ++++ ngspice-23/src/xspice/icm/makedefs.in 2011-07-14 10:58:25.521002437 -0600 +@@ -41,16 +41,16 @@ endif + CMPP = $(top_builddir)/src/xspice/cmpp/cmpp + + # Flags to use when linking shared library +-LDFLAGS = -shared ++LDFLAGS += -shared + ifeq ($(ISMINGW), 1) +- LDFLAGS = -shared @LDFLAGS@ ++ LDFLAGS += -shared @LDFLAGS@ + endif + ifeq "$(strip $(uname))" "Darwin" +- LDFLAGS = -bundle -flat_namespace -undefined suppress ++ LDFLAGS += -bundle -flat_namespace -undefined suppress + endif + ifeq "$(strip $(uname))" "SunOS" + ifneq "$(CC)" "gcc" +- LDFLAGS = -G ++ LDFLAGS += -G + endif + endif + diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-disable_update_check.patch b/sci-geosciences/gpsbabel/files/gpsbabel-disable_update_check.patch index b5950088c537..a429fdf1fbab 100644 --- a/sci-geosciences/gpsbabel/files/gpsbabel-disable_update_check.patch +++ b/sci-geosciences/gpsbabel/files/gpsbabel-disable_update_check.patch @@ -1,11 +1,5 @@ Disable check for newer versions on start. ---- a/gui/preferences.ui -+++ b/gui/preferences.ui -@@ -40,13 +40,6 @@ - - matplotlibrc || die + MPLCONFIGDIR=. nosetests --exe -v --cover-package=skimage skimage || die +} diff --git a/sci-libs/spr/Manifest b/sci-libs/spr/Manifest index 1b82b9186833..442894b6c355 100644 --- a/sci-libs/spr/Manifest +++ b/sci-libs/spr/Manifest @@ -1,2 +1 @@ -DIST SPR-3.3.2.tar.gz 2512059 SHA256 e0ab1d690c11556f5c67a991398bf04c58d456febfcc98402fc58ae3dbd9a1ff SHA512 5fc5cd90de87385ac2bc6c4b7f54be2fe5e1548c2c5b9fbd4f-----BEGIN PGP SIGNED MESSAGE----- DIST SPR-3.3.2.tar.gz 2512059 SHA256 e0ab1d690c11556f5c67a991398bf04c58d456febfcc98402fc58ae3dbd9a1ff SHA512 5fc5cd90de87385ac2bc6c4b7f54be2fe5e1548c2c5b9fbd4fd9958f443bd25233b59b773186dc3c38efdfb90b622420f1a0ab585937df75e7ed049500a59a9d WHIRLPOOL b938140ea12777435ae10417d1b7f8718aa4b5d6db97f0be5b3ff478a452d770e337a0610353705a359c376b5bee1cf89d975daa0dc42e60fd2a0cc38a051323 diff --git a/sci-libs/vtk/files/vtk-5.6.1-libav-0.8.patch b/sci-libs/vtk/files/vtk-5.6.1-libav-0.8.patch index dd314fe4a3d8..523919d6f676 100644 --- a/sci-libs/vtk/files/vtk-5.6.1-libav-0.8.patch +++ b/sci-libs/vtk/files/vtk-5.6.1-libav-0.8.patch @@ -4,18 +4,6 @@ Description: Upstream changes introduced in version 5.6.1-6.1 those changes were made: . vtk (5.6.1-6.1) unstable; urgency=low - . - [ Michael Schutte ] - * Non-maintainer upload. - * Remove absolute paths to required libraries from - /usr/lib/vtk-5.6/VTKLibraryDepends.cmake after building, closes: - #506992. Due to the multiarch transition, the original behavior - frequently causDescription: Upstream changes introduced in version 5.6.1-6.1 - This patch has been created by dpkg-source during the package build. - Here's the last changelog entry, hopefully it gives details on why - those changes were made: - . - vtk (5.6.1-6.1) unstable; urgency=low . [ Michael Schutte ] * Non-maintainer upload. @@ -62,4 +50,17 @@ Last-Update: //Set up the codec. AVCodecContext *c = this->avStream->codec; c->codec_id = (CodecID)this->avOutputFormat->video_codec; -- c->codec_type = COD \ No newline at end of file +- c->codec_type = CODEC_TYPE_VIDEO; ++ c->codec_type = AVMEDIA_TYPE_VIDEO; + c->width = this->Dim[0]; + c->height = this->Dim[1]; + c->pix_fmt = PIX_FMT_YUVJ420P; +@@ -329,7 +329,7 @@ int vtkFFMPEGWriterInternal::Write(vtkIm + pkt.stream_index = this->avStream->index; + if (cc->coded_frame->key_frame) //treat keyframes well + { +- pkt.flags |= PKT_FLAG_KEY; ++ pkt.flags |= AV_PKT_FLAG_KEY; + } + pkt.duration = 0; //presentation duration in time_base units or 0 if NA + pkt.pos = -1; //byte position in stream or -1 if NA diff --git a/sci-mathematics/agda-stdlib/agda-stdlib-0.7-r1.ebuild b/sci-mathematics/agda-stdlib/agda-stdlib-0.7-r1.ebuild index bf4a74b12aea..89c9da53abc3 100644 --- a/sci-mathematics/agda-stdlib/agda-stdlib-0.7-r1.ebuild +++ b/sci-mathematics/agda-stdlib/agda-stdlib-0.7-r1.ebuild @@ -59,20 +59,24 @@ src_compile() { # datadir = "/usr/share/agda-9999/ghc-7.6.1" # it fails without the --css option like: # /usr/share/agda-9999/ghc-7.4.1/Agda.css: copyFile: does not exist - local cssdir=$(egrep 'datadir *=' # Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/agda-stdlib/agda-stdlib-0.7-r1.ebuild,v 1.1 2013/12/10 11:46:28 gienah Exp $ - -EAPI=5 - -CABAL_FEATURES="bin" -inherit haskell-cabal elisp-common + local cssdir=$(egrep 'datadir *=' "${S}/dist/build/autogen/Paths_lib.hs" | sed -e 's@datadir = \(.*\)@\1@') + agda --html -i "${S}" -i "${S}"/src --css="${cssdir}/Agda.css" "${S}"/README.agda || die + pushd "${S}/ffi" + cabal_src_compile + popd +} -DESCRIPTION="Agda standard library" -HOMEPAGE="http://wiki.portal.chalmers.se/agda/" -SRC_URI="http://www.cse.chalmers.se/~nad/software/lib-${PV}.tar.gz" +src_test() { + agda -i "${S}" -i "${S}"/src README.agda || die +} -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IU \ No newline at end of file +src_install() { + insinto usr/share/agda-stdlib + export INSOPTIONS=--preserve-timestamps + doins -r src/* + dodoc -r html/* + elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die + pushd "${S}/ffi" + cabal_src_install + popd +} diff --git a/sci-mathematics/agda-stdlib/agda-stdlib-0.8.ebuild b/sci-mathematics/agda-stdlib/agda-stdlib-0.8.ebuild index d4c3dc27be1e..b9ba977d5d2a 100644 --- a/sci-mathematics/agda-stdlib/agda-stdlib-0.8.ebuild +++ b/sci-mathematics/agda-stdlib/agda-stdlib-0.8.ebuild @@ -49,19 +49,19 @@ src_compile() { # containing: # datadir = "/usr/share/agda-9999/ghc-7.6.1" # it fails without the --css option like: - # /usr/share/a# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/agda-stdlib/agda-stdlib-0.8.ebuild,v 1.1 2014/07/02 15:24:38 gienah Exp $ - -EAPI=5 - -CABAL_FEATURES="bin" -inherit haskell-cabal elisp-common + # /usr/share/agda-9999/ghc-7.4.1/Agda.css: copyFile: does not exist + local cssdir=$(egrep 'datadir *=' "${S}/dist/build/autogen/Paths_lib.hs" | sed -e 's@datadir = \(.*\)@\1@') + agda --html -i "${S}" -i "${S}"/src --css="${cssdir}/Agda.css" "${S}"/README.agda || die +} -DESCRIPTION="Agda standard library" -HOMEPAGE="http://wiki.portal.chalmers.se/agda/" -SRC_URI="https://github.com/agda/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +src_test() { + agda -i "${S}" -i "${S}"/src README.agda || die +} -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" \ No newline at end of file +src_install() { + insinto usr/share/agda-stdlib + export INSOPTIONS=--preserve-timestamps + doins -r src/* + dodoc -r html/* + elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die +} diff --git a/sci-mathematics/cado-nfs/Manifest b/sci-mathematics/cado-nfs/Manifest index 563e1d5b8604..9c24267720ac 100644 --- a/sci-mathematics/cado-nfs/Manifest +++ b/sci-mathematics/cado-nfs/Manifest @@ -1,6 +1,3 @@ DIST cado-nfs-1.1.tar.gz 1453860 SHA256 295c8662208c432a98157951ddc117820ff2e57ee36fdae53b30dca89ebfc02f SHA512 e0578c4931eaa044c46e1a11e4d44f0d716f5049b9414a73371a2f1001798e5b011887ae450ff1a4256cd683e928c88b7f4f5af8402570c5dc3f4d17c9801101 WHIRLPOOL 4162a221763cb858beab19259331a1ed2fbafede4f55af1dc962869cfd00cd37af867b021d595f902f0a111f2af5548a783be3ca1fdd4e5c3421a3d804633903 DIST cado-nfs-2.0.tar.gz 2088866 SHA256 67f2ca3f739e07e89c9873f98d876bf771a3900288eda3d724b06f5736b4bfa2 SHA512 7f531e9ad1445c763a2fd37441e2e3bf6d4184d0d93be414d078b7024860c9d85754afe6629d9436b540361183462792248a88c0af76407d10a621385ec5b18b WHIRLPOOL 91b7a874cedb90c555625f9a0187f62c2cfccebc7236182d6bba17187fa5080b5164b121361035f3c7281881cc44f026fb66c6b242f8abcf6b6628a6eb280b90 DIST cado-nfs-2.1.tar.gz 2558577 SHA256 ff50baeb2eb5bf0ff3dd8600056e8e762fa30c94c2425fb73843329ced2a5ae1 SHA512 fcdba87ca349485e6d25c1298cc90197855a2fa354b51edb827445b10e7cb023f5d239e02aba0cdae28b4f4b38d260b4b492cdf5eb0c929afdca6aa604b29191 WHIRLPOOL c23a7b5d184efa385689493831f70cff823811d8f320ea3e91f367c580b285dcf6515027d466784d56c5f3f49d51e1d3baccd566096af561710b9267d1e0bdda -EBUILD cado-nfs-2.1.ebuild 1194 SHA256 a93b9313abb8e095196a0648755160e9f338c386c8aeac83a8db095cfdc07eef SHA512 759d3e5d19534f68a70815370362f384DIST cado-nfs-1.1.tar.gz 1453860 SHA256 295c8662208c432a98157951ddc117820ff2e57ee36fdae53b30dca89ebfc02f SHA512 e0578c4931eaa044c46e1a11e4d44f0d716f5049b9414a73371a2f1001798e5b011887ae450ff1a4256cd683e928c88b7f4f5af8402570c5dc3f4d17c9801101 WHIRLPOOL 4162a221763cb858beab19259331a1ed2fbafede4f55af1dc962869cfd00cd37af867b021d595f902f0a111f2af5548a783be3ca1fdd4e5c3421a3d804633903 -DIST cado-nfs-2.0.tar.gz 2088866 SHA256 67f2ca3f739e07e89c9873f98d876bf771a3900288eda3d724b06f5736b4bfa2 SHA512 7f531e9ad1445c763a2fd37441e2e3bf6d4184d0d93be414d078b7024860c9d85754afe6629d9436b540361183462792248a88c0af76407d10a621385ec5b18b WHIRLPOOL 91b7a874cedb90c555625f9a0187f62c2cfccebc7236182d6bba17187fa5080b5164b121361035f3c7281881cc44f026fb66c6b242f8abcf6b6628a6eb280b90 -DIST cado-nfs-2.1.tar.gz 2558577 SHA256 ff50baeb2eb5bf0ff3dd8600056e8e762fa30c94c2425fb73843329ced2a5ae1 SHA512 fcdba87ca349485e6d25c1298cc90197855a2fa354b51edb827445b10e7cb023f5d239e02aba0cdae28b4f4b38d260b4b492 \ No newline at end of file diff --git a/sci-mathematics/calc/calc-2.12.4.13.ebuild b/sci-mathematics/calc/calc-2.12.4.13.ebuild index d18b6fe7ea64..f4a6a8157dbe 100644 --- a/sci-mathematics/calc/calc-2.12.4.13.ebuild +++ b/sci-mathematics/calc/calc-2.12.4.13.ebuild @@ -21,31 +21,37 @@ DEPEND=" sys-libs/readline" RDEPEND="${DEPEND}" -src_pr# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/calc/calc-2.12.4.13.ebuild,v 1.1 2014/01/13 05:10:11 mrueg Exp $ - -EAPI=5 - -inherit eutils multilib toolchain-funcs - -DESCRIPTION="Arbitrary precision C-like arithmetic system" -HOMEPAGE="http://www.isthe.com/chongo/tech/comp/calc/" -SRC_URI="http://www.isthe.com/chongo/src/calc/${P}.tar.bz2" - -SLOT="0" -LICENSE="LGPL-2" -KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" - -IUSE="" - -DEPEND=" - sys-libs/ncurses - sys-libs/readline" -RDEPEND="${DEPEND}" - src_prepare() { epatch "${FILESDIR}"/${PN}-2.12.4.13-prefix.patch\ "${FILESDIR}"/2.12.4.0-ldflags.patch ln -sf libcustcalc.so.${PV} custom/libcustcalc.so || die - sed -i -e "/DIR/s:/usr \ No newline at end of file + sed -i -e "/DIR/s:/usr:${EPREFIX}/usr:g" Makefile || die +} + +src_compile() { + # parallel compilation hard to fix. better to leave upstream. + emake -j1 \ + CC="$(tc-getCC)" \ + DEBUG="${CFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + CALCPAGER="${PAGER}" \ + USE_READLINE="-DUSE_READLINE" \ + READLINE_LIB="-lreadline -lhistory -lncurses -L${S}/custom -lcustcalc" \ + all +} + +src_test() { + if echo "${LD_PRELOAD}" | grep -q "sandbox"; then + ewarn "Can't run check when running in sandbox - see bug #59676" + else + emake chk + fi +} + +src_install() { + emake \ + T="${D}" \ + LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ + install + dodoc BUGS CHANGES LIBRARY README +} diff --git a/sci-mathematics/cgal/cgal-4.3.ebuild b/sci-mathematics/cgal/cgal-4.3.ebuild index 69d04566494e..d3b7e4f0e201 100644 --- a/sci-mathematics/cgal/cgal-4.3.ebuild +++ b/sci-mathematics/cgal/cgal-4.3.ebuild @@ -38,25 +38,37 @@ RDEPEND=" mpfi? ( sci-libs/mpfi )" DEPEND="${RDEPEND} app-arch/xz-utils -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/cgal-4.3.ebuild,v 1.3 2014/01/06 14:11:39 jlec Exp $ + virtual/pkgconfig" -EAPI=5 +S="${WORKDIR}/${MY_P}" -CMAKE_BUILD_TYPE=Release +DOCS="AUTHORS CHANGES* README" -inherit multilib cmake-utils +src_prepare() { + cmake-utils_src_prepare + sed \ + -e '/install(FILES AUTHORS/d' \ + -i CMakeLists.txt || die +} -MY_P=CGAL-${PV} -PID=32995 -DPID=33000 - -DESCRIPTION="C++ library for geometric algorithms and data structures" -HOMEPAGE="http://www.cgal.org/ https://gforge.inria.fr/projects/cgal/" -SRC_URI=" - http://gforge.inria.fr/frs/download.php/${PID}/${MY_P}.tar.xz - doc? ( http://gforge.inria.fr/frs/download.php/${DPID}/${MY_P}-doc_html.tar.xz )" +src_configure() { + local mycmakeargs+=( + -DCGAL_INSTALL_LIB_DIR=$(get_libdir) + -DWITH_CGAL_Qt3=OFF + -DWITH_LEDA=OFF + $(cmake-utils_use_with gmp) + $(cmake-utils_use_with gmp GMPXX) + $(cmake-utils_use_with qt4 CGAL_Qt4) + $(cmake-utils_use_with mpfi) + ) + cmake-utils_src_configure +} -LICENSE="LGPL-3 GPL-3 Boost-1.0" -SL \ No newline at end of file +src_install() { + use doc && HTML_DOCS=( "${WORKDIR}"/doc_html/. ) + cmake-utils_src_install + if use examples; then + insinto /usr/share/doc/${PF} + doins -r examples demo + fi +} diff --git a/sci-mathematics/coq/coq-8.3_p1.ebuild b/sci-mathematics/coq/coq-8.3_p1.ebuild index 1203d6b4579d..c3516a91d50c 100644 --- a/sci-mathematics/coq/coq-8.3_p1.ebuild +++ b/sci-mathematics/coq/coq-8.3_p1.ebuild @@ -70,6 +70,12 @@ src_configure() { } src_compile() { - em# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/coq-8.3_p1.ebuild,v 1.7 2014/01/23 08:1 \ No newline at end of file + emake STRIP="true" -j1 || die "make failed" +} + +src_install() { + emake STRIP="true" COQINSTALLPREFIX="${D}" install || die + dodoc README CREDITS CHANGES + + use gtk && domenu "${FILESDIR}/coqide.desktop" +} diff --git a/sci-mathematics/dataplot/files/Makefile.am.20090821 b/sci-mathematics/dataplot/files/Makefile.am.20090821 index 38c6eb33adbb..e10cf41ebd54 100644 --- a/sci-mathematics/dataplot/files/Makefile.am.20090821 +++ b/sci-mathematics/dataplot/files/Makefile.am.20090821 @@ -17,21 +17,30 @@ endif if ENABLE_GL dataplot_SOURCES += gl_src.c -elbin_PROGRAMS = dataplot -dataplot_SOURCES = dp1_linux.f \ - dp2.f dp3.f dp4.f dp5.f dp6.f dp7.f dp8.f dp9.f dp10.f dp11.f \ - dp12.f dp13.f dp14.f dp15.f dp16.f dp17.f dp18.f dp19.f dp20.f dp21.f \ - dp22.f dp23.f dp24.f dp25.f dp26.f dp27.f dp28.f dp29.f dp30.f dp31.f \ - dp32.f dp33.f dp34.f dp35.f dp36.f dp37.f dp38.f dp39.f dp40.f dp41.f \ - dp42.f dp43.f dp44.f dp45.f dp46.f \ - dpcalc.f dpdds2.f dpdds3.f dpdds.f edinit.f edmai2.f edsear.f edsub.f \ - edwrst.f fit3b.f starpac.f tcdriv_nopc.f aqua_src.f cluster.f compgeom.f \ - optimi.f libplot_src.c rldp.c main.f +else +dataplot_SOURCES += gl_src.f +endif -if ENABLE_GD -dataplot_SOURCES += gd_src.c +if ENABLE_X11 +dataplot_SOURCES += x11_src.c else -dataplot_SOURCES += gd_src.f +dataplot_SOURCES += x11src.f endif -if ENABLE_GL \ No newline at end of file +dataplot_CFLAGS = @GL_CFLAGS@ +dataplot_LDADD = @GD_LIBS@ @GL_LIBS@ @X11_LIBS@ $(FLIBS) -lreadline + +# this is to remove ambiguity between the similar filenames +# of the c and f77 version (shortcoming of automake) +# the f77 versions are forced +# the c versions objects are called dataplot-gd_src.o etc +gd_src.o: gd_src.f + $(F77COMPILE) -c -o $@ $< +gl_src.o: gl_src.f + $(F77COMPILE) -c -o $@ $< +aqua_src.o: aqua_src.f + $(F77COMPILE) -c -o $@ $< +libplot_src.o: libplot_src.f + $(F77COMPILE) -c -o $@ $< +rldp.o: rldp.f + $(F77COMPILE) -c -o $@ $< diff --git a/sci-mathematics/dataplot/files/dataplot-20090821-opengl.patch b/sci-mathematics/dataplot/files/dataplot-20090821-opengl.patch index f18be65889a5..5810b6029b87 100644 --- a/sci-mathematics/dataplot/files/dataplot-20090821-opengl.patch +++ b/sci-mathematics/dataplot/files/dataplot-20090821-opengl.patch @@ -18,22 +18,30 @@ int WIDTH_CURRENT; /* current line width */ int LINE_STYLE_CURRENT; /* current line style */ char FONT_NAME_CURRENT[80]; /* name of current font */ -@@ -922,7 +--- gl_src.c.orig 2001-02-28 16:45:56.000000000 -0500 -+++ gl_src.c 2008-04-10 17:03:03.000000000 -0400 -@@ -154,7 +154,7 @@ - #include - #include - #include --#include -+#include +@@ -922,7 +922,7 @@ + glNewList(list_id, GL_COMPILE_AND_EXECUTE); - #if UNIX == 0 - #include -@@ -257,7 +257,7 @@ - /* flags for current attribute settings */ - static int OPEN_FLAG = 0; /* 0 - X11 closed, 1 - X11 open */ - static int OPEN_FLAG_2 = 0; /* 0 - repeat graph window closed, 1 - open */ --int GRAPH_FLAG = 0; /* 0 - gleras has not been called, 1 - gleras has been called */ -+static int GRAPH_FLAG = 0; /* 0 - gleras has not been called, 1 - gleras has been called */ - int WIDTH_CURRENT; /* current line width */ - int \ No newline at end of file + glClearColor(red_temp,green_temp,blue_temp,1.0); +- glclear(GL_COLOR_BUFFER_BIT); ++ glClear(GL_COLOR_BUFFER_BIT); + + GRAPH_FLAG = 1; + } +@@ -1486,7 +1486,7 @@ + * Color only set if being changed. + */ + #if APPEND_UNDERSCORE == 1 && SUBROUTINE_CASE == 1 +-void glseco(jcol, red, green, blue) ++void glseco_(jcol, red, green, blue) + #elif APPEND_UNDERSCORE == 1 && SUBROUTINE_CASE == 0 + void GLSECO_(jcol, red, green, blue) + #elif APPEND_UNDERSCORE == 0 && SUBROUTINE_CASE == 1 +@@ -1691,7 +1691,7 @@ + width = isize[0]; + #endif + if (width < 1.0) width = 1.0; +- glPointsize(width); ++ glPointSize(width); + glBegin(GL_POINTS); + #if PRECISION == 0 + glVertex2f(*ix, *iy); diff --git a/sci-mathematics/flint/flint-2.4.4-r1.ebuild b/sci-mathematics/flint/flint-2.4.4-r1.ebuild index fd3398b5bfc9..d4da733012b1 100644 --- a/sci-mathematics/flint/flint-2.4.4-r1.ebuild +++ b/sci-mathematics/flint/flint-2.4.4-r1.ebuild @@ -43,12 +43,25 @@ src_configure() { $(use_enable static-libs static) \ $(usex gc "--with-gc=${EPREFIX}/usr" "") \ CC=$(tc-getCC) \ - CXX=$(tc-g# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/flint/flint-2.4.4-r1.ebuild,v 1.3 2014/08/14 16:22:26 phajdan.jr Exp $ + CXX=$(tc-getCXX) \ + AR=$(tc-getAR) \ + || die +} -EAPI="5" +src_compile() { + emake verbose -inherit eutils multilib toolchain-funcs + if use doc ; then + emake -C doc/latex + fi +} + +src_test() { + emake AT= QUIET_CC= QUIET_CXX= QUIET_AR= check +} -DESCRIPTION="Fast Library for Nu \ No newline at end of file +src_install() { + emake DESTDIR="${D}" LIBDIR="$(get_libdir)" install + einstalldocs + use doc && dodoc doc/latex/flint-manual.pdf +} diff --git a/sci-mathematics/lpsolve/Manifest b/sci-mathematics/lpsolve/Manifest index 768a1d46059f..66ad68b59e55 100644 --- a/sci-mathematics/lpsolve/Manifest +++ b/sci-mathematics/lpsolve/Manifest @@ -1,2 +1 @@ DIST lpsolve-5.5.2.0.tar.xz 737000 SHA256 09d914b43db327fa32c94914917c0db9e4f128c407f41df1dae18df6d2c7573d SHA512 341bff74dccf805cfd3aa4ee844a51f3c46ce875e88b1bf079a6ff0074f7cbd27420ec9c6a66a2530098a85c967457214543895651f4c570b956324a51bb9fe6 WHIRLPOOL a8c2a26f2401c5a230043c7e285d6f24d69645aae70a4a0d9eaf973f2afc35e084d2fd32a70e274d19df51d09372052f79f05ba0251694fd6e10b4f18167b921 -DIST lpsolve-5.5.2.0.tar.xz 737000 SHA256 09d914b43db327fa32c94914917c0db9e4f128c407f41df1dae18df6d2c7573d SHA512 341bff7 \ No newline at end of file diff --git a/sci-mathematics/maxima/files/clisp-0.patch b/sci-mathematics/maxima/files/clisp-0.patch index 5382280b5cf2..7e65c40b58f7 100644 --- a/sci-mathematics/maxima/files/clisp-0.patch +++ b/sci-mathematics/maxima/files/clisp-0.patch @@ -4,15 +4,16 @@ diff -r -U1 maxima-5.30.0.orig/src/maxima.in maxima-5.30.0/src/maxima.in @@ -138,5 +138,5 @@ if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then - exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -q "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9" -+ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -q -norc "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9" - else -- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CLISP_RUNTIME@" $MAXIMA_LISP_OPTIONS -q -diff -r -U1 maxima-5.30.0.orig/src/maxima.in maxima-5.30.0/src/maxima.in ---- maxima-5.30.0.orig/src/maxima.in 2012-12-04 12:54:50.000000000 +0700 -+++ maxima-5.30.0/src/maxima.in 2013-04-13 13:07:03.094128196 +0700 -@@ -138,5 +138,5 @@ - if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then -- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -q "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9" + exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -q -norc "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9" else - exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CLISP_RUNTIME@" $MAXIMA_LISP_OPTIONS -q -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9" -+ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CLISP_RUNTIME@" $MAXIMA_LISP_OPTIONS -q -norc -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$ \ No newline at end of file ++ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CLISP_RUNTIME@" $MAXIMA_LISP_OPTIONS -q -norc -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9" + fi +@@ -144,5 +144,5 @@ + if [ -x "$maxima_image_base" ]; then +- exec "$maxima_image_base" $MAXIMA_LISP_OPTIONS -q "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9" ++ exec "$maxima_image_base" $MAXIMA_LISP_OPTIONS -q -norc "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9" + else +- exec "@CLISP_NAME@" $MAXIMA_LISP_OPTIONS -q -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9" ++ exec "@CLISP_NAME@" $MAXIMA_LISP_OPTIONS -q -norc -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9" + fi diff --git a/sci-mathematics/maxima/files/sbcl-0.patch b/sci-mathematics/maxima/files/sbcl-0.patch index eae3b68a2249..5c2bdf7b509e 100644 --- a/sci-mathematics/maxima/files/sbcl-0.patch +++ b/sci-mathematics/maxima/files/sbcl-0.patch @@ -12,17 +12,15 @@ diff -r -U1 maxima-5.30.0.orig/src/maxima.in maxima-5.30.0/src/maxima.in @@ -196,5 +196,5 @@ if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then - exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --eval '(cl-user::run)' --end-toplevel-options "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9" -+ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --no-sysinit --no-userinit --eval '(cl-user::run)' --end-toplevel-options "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$diff -r -U1 maxima-5.30.0.orig/src/Makefile.am maxima-5.30.0/src/Makefile.am ---- maxima-5.30.0.orig/src/Makefile.am 2013-03-23 08:32:07.000000000 +0700 -+++ maxima-5.30.0/src/Makefile.am 2013-04-13 14:36:39.977014432 +0700 -@@ -199,3 +199,3 @@ - if SBCL --EXECUTESBCL = "$(SBCL_NAME)" --noinform --noprint --eval -+EXECUTESBCL = "$(SBCL_NAME)" --noinform --noprint --no-sysinit --no-userinit --eval - all-local: sharefiles.mk $(SBCL_MAXIMA) -diff -r -U1 maxima-5.30.0.orig/src/maxima.in maxima-5.30.0/src/maxima.in ---- maxima-5.30.0.orig/src/maxima.in 2012-12-04 12:54:50.000000000 +0700 -+++ maxima-5.30.0/src/maxima.in 2013-04-13 14:36:39.977014432 +0700 -@@ -196,5 +196,5 @@ - if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then -- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --eval '(cl-user::run)' --end-toplevel-options "$arg1" "$arg2" "$arg3" "$arg4 \ No newline at end of file ++ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --no-sysinit --no-userinit --eval '(cl-user::run)' --end-toplevel-options "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9" + else +- exec "@SBCL_NAME@" --core "$maxima_image_base.core" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --eval '(cl-user::run)' --end-toplevel-options "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9" ++ exec "@SBCL_NAME@" --core "$maxima_image_base.core" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --no-sysinit --no-userinit --eval '(cl-user::run)' --end-toplevel-options "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9" + fi +diff -r -U1 maxima-5.30.0.orig/src/server.lisp maxima-5.30.0/src/server.lisp +--- maxima-5.30.0.orig/src/server.lisp 2012-11-19 04:40:51.000000000 +0700 ++++ maxima-5.30.0/src/server.lisp 2013-04-13 14:37:19.937051659 +0700 +@@ -10,3 +10,2 @@ + (eval-when (:compile-toplevel :load-toplevel :execute) +- #+sbcl (require 'asdf) ;not needed here for a recent SBCL + #+sbcl (require 'sb-posix) diff --git a/sci-mathematics/mlpy/Manifest b/sci-mathematics/mlpy/Manifest index e87b06d4c976..cf81140d04d9 100644 --- a/sci-mathematics/mlpy/Manifest +++ b/sci-mathematics/mlpy/Manifest @@ -1,2 +1 @@ DIST mlpy-3.5.0.tar.gz 1961206 SHA256 344fa75fbf9f76af72f6a346d5309613defc4d244bac13c218e509a51d68bf6a SHA512 b6b3cf6e1d47fe58d68da81752ce9324e78a97c9fc341c93db7b2ea0c5d1730fae9535b69671fda13cb012ab0173951768c1601f2b4ad678a6065c018b34eb0f WHIRLPOOL 531cf00f31e8abb72d4d882aa41379d1214f17f04c028922f084756059d471c3e0ddead82d089262e2855d843e8e8e96233bc06937870e6f1f589906889a756f -DIST mlpy-3.5.0.tar.gz 1961206 SHA256 344fa75fbf9f76af72f6a346d5309613defc4d244bac13c218e509a51d68bf6a SHA512 b6b3cf6e1d47fe58d68da81752ce9324e78a97c9fc341c93db7b2ea0c5d1730fae9535b69671fda13cb012ab0173951768c1601f2b4ad678a6065c018b34eb0f WHIRLPOOL 531cf00f31e8abb72d4d882aa41379d1214f17f04c028922f084756059d471c3e0ddead82d08 \ No newline at end of file diff --git a/sci-mathematics/msieve/msieve-9999.ebuild b/sci-mathematics/msieve/msieve-9999.ebuild index 80c716e2d75b..9f83a342ddbb 100644 --- a/sci-mathematics/msieve/msieve-9999.ebuild +++ b/sci-mathematics/msieve/msieve-9999.ebuild @@ -48,6 +48,8 @@ src_install() { mkdir -p "${D}/usr/include/msieve" mkdir -p "${D}/usr/lib/" mkdir -p "${D}/usr/share/doc/${P}/" - cp include/* "${D}/usr/include/msieve" || die "# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/msieve/msieve-9999.ebuild,v 1 \ No newline at end of file + cp include/* "${D}/usr/include/msieve" || die "Failed to install" + cp libmsieve.a "${D}/usr/lib/" || die "Failed to install" + dobin msieve || die "Failed to install" + cp Readme* "${D}/usr/share/doc/${P}/" || die "Failed to install" +} diff --git a/sci-mathematics/num-utils/num-utils-0.5-r1.ebuild b/sci-mathematics/num-utils/num-utils-0.5-r1.ebuild index f6594464d494..9ca843030209 100644 --- a/sci-mathematics/num-utils/num-utils-0.5-r1.ebuild +++ b/sci-mathematics/num-utils/num-utils-0.5-r1.ebuild @@ -8,16 +8,6 @@ inherit eutils DEB_PR=11 -DESCRIP# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/num-utils/num-utils-0.5-r1.ebuild,v 1.2 2012/06/19 11:56:26 jlec Exp $ - -EAPI=4 - -inherit eutils - -DEB_PR=11 - DESCRIPTION="A set of programs for dealing with numbers from the command line" HOMEPAGE="http://suso.suso.org/programs/num-utils/" SRC_URI=" @@ -42,4 +32,17 @@ src_prepare() { done sed \ - -e 's/^RPMDIR/#RPMDIR \ No newline at end of file + -e 's/^RPMDIR/#RPMDIR/' \ + -e 's/COPYING//' \ + -e 's/LICENSE//' \ + -e '/^DOCS/s/MANIFEST//' \ + -i Makefile || die "sed Makefile failed" +} + +src_install () { + emake ROOT="${ED}" install +} + +pkg_postinst() { + elog "All ${PN} programs have been renamed with prefix 'num' to avoid collisions" +} diff --git a/sci-mathematics/octave/files/octave-3.8.0-llvm-3.4.patch b/sci-mathematics/octave/files/octave-3.8.0-llvm-3.4.patch index 3d3a5c9d18d8..63c5303d13c7 100644 --- a/sci-mathematics/octave/files/octave-3.8.0-llvm-3.4.patch +++ b/sci-mathematics/octave/files/octave-3.8.0-llvm-3.4.patch @@ -43,22 +43,21 @@ diff -aur octave-3.8.0/libinterp/corefcn/pt-jit.cc octave-3.8.0.fix/libinterp/co { std::string error; llvm::raw_fd_ostream fout ("test.bc", error, -- diff -aur octave-3.8.0/libinterp/corefcn/jit-util.h octave-3.8.0.fix/libinterp/corefcn/jit-util.h ---- octave-3.8.0/libinterp/corefcn/jit-util.h 2013-12-27 15:57:41.000000000 -0600 -+++ octave-3.8.0.fix/libinterp/corefcn/jit-util.h 2014-01-16 17:06:47.512782643 -0600 -@@ -42,8 +42,10 @@ - { - class Value; - class Module; -- class FunctionPassManager; -- class PassManager; -+ namespace legacy { -+ class FunctionPassManager; -+ class PassManager; -+ } - class ExecutionEngine; - class Function; - class BasicBlock; -diff -aur octave-3.8.0/libinterp/corefcn/pt-jit.cc octave-3.8.0.fix/libinterp/corefcn/pt-jit.cc ---- octave-3.8.0/libinterp/corefcn/pt-jit.cc 2013-12-27 15:58:17.000000000 -0600 -+++ octave-3.8.0.fix/libinterp/corefcn/pt-jit.cc 2014-01-16 1 \ No newline at end of file +- llvm::raw_fd_ostream::F_Binary); ++ llvm::sys::fs::F_Binary); + llvm::WriteBitcodeToFile (module, fout); + } + } +diff -aur octave-3.8.0/libinterp/corefcn/pt-jit.h octave-3.8.0.fix/libinterp/corefcn/pt-jit.h +--- octave-3.8.0/libinterp/corefcn/pt-jit.h 2013-12-27 15:58:17.000000000 -0600 ++++ octave-3.8.0.fix/libinterp/corefcn/pt-jit.h 2014-01-16 17:05:08.224619116 -0600 +@@ -384,8 +384,8 @@ + size_t trip_count (const octave_value& bounds) const; + + llvm::Module *module; +- llvm::PassManager *module_pass_manager; +- llvm::FunctionPassManager *pass_manager; ++ llvm::legacy::PassManager *module_pass_manager; ++ llvm::legacy::FunctionPassManager *pass_manager; + llvm::ExecutionEngine *engine; + }; diff --git a/sci-mathematics/p9m4/files/p9m4-v05-python2.6.patch b/sci-mathematics/p9m4/files/p9m4-v05-python2.6.patch index f5a867e58682..70cb006d268e 100644 --- a/sci-mathematics/p9m4/files/p9m4-v05-python2.6.patch +++ b/sci-mathematics/p9m4/files/p9m4-v05-python2.6.patch @@ -32,10 +32,13 @@ diff -Nur p9m4-0.5/partition_input.py p9m4-0.5.new/partition_input.py + keep_end = m2.start() + else: + keep_end = len(str) - diff -Nur p9m4-0.5/my_setup.py p9m4-0.5.new/my_setup.py ---- p9m4-0.5/my_setup.py 2008-01-14 23:30:55.000000000 +0000 -+++ p9m4-0.5.new/my_setup.py 2008-01-14 23:35:45.000000000 +0000 -@@ -158,7 +158,9 @@ - self.ed.SetStyle(start, end, - wx.TextAttr('RED', - \ No newline at end of file + else: + keep_start = m1.start() +- keep_end = m2.end() if m2 else len(str) ++ if m2: ++ keep_end = m2.end() ++ else: ++ keep_end = len(str) + matched += str[keep_start:keep_end] + next = other_start = match_end + else: diff --git a/sci-mathematics/polymake/polymake-2.13.ebuild b/sci-mathematics/polymake/polymake-2.13.ebuild index 66910868e3a0..e93e99ec5390 100644 --- a/sci-mathematics/polymake/polymake-2.13.ebuild +++ b/sci-mathematics/polymake/polymake-2.13.ebuild @@ -32,38 +32,32 @@ S="${WORKDIR}/${PN}-${MY_PV}" src_prepare() { # Don't strip - se# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/polymake/polymake-2.13.ebuild,v 1.1 2014/06/26 12:22:39 tomka Exp $ - -EAPI=5 - -inherit eutils flag-o-matic - -MY_PV=${PV}-1 - -DESCRIPTION="research tool for polyhedral geometry and combinatorics" -SRC_URI="http://polymake.org/lib/exe/fetch.php/download/${PN}-${MY_PV}.tar.bz2" -HOMEPAGE="http://polymake.org" - -IUSE="libpolymake" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" - -DEPEND="dev-libs/gmp - dev-libs/boost - dev-libs/libxml2:2 - dev-perl/XML-LibXML - dev-libs/libxslt - dev-perl/XML-LibXSLT - dev-perl/XML-Writer - dev-perl/Term-ReadLine-Gnu" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${PN}-${MY_PV}" - -src_prepare() { - # Don't strip - sed -i '/system "strip $to"/d' support/inst \ No newline at end of file + sed -i '/system "strip $to"/d' support/install.pl || die + + einfo "During compile this package uses up to" + einfo "750MB of RAM per process. Use MAKEOPTS=\"-j1\" if" + einfo "you run into trouble." +} + +src_configure () { + export CXXOPT=$(get-flag -O) + # Configure does not accept --host, therefore econf cannot be used + ./configure --prefix="${EPREFIX}/usr" \ + --without-java \ + $(use_with libpolymake callable) \ + --without-prereq \ + --libdir="${EPREFIX}/usr/$(get_libdir)" \ + --libexecdir="${EPREFIX}/usr/$(get_libdir)/polymake" \ + "${myconf}" || die +} + +src_install(){ + emake -j1 DESTDIR="${D}" install + dosym libpolymake.so "${EPREFIX}/usr/$(get_libdir)/libpolymake.so.0" +} + +pkg_postinst(){ + elog "Docs can be found on http://www.polymake.org/doku.php/documentation" + elog " " + elog "Support for jreality is missing, sorry (see bug #346073)." +} diff --git a/sci-mathematics/twelf/twelf-1.7.1.ebuild b/sci-mathematics/twelf/twelf-1.7.1.ebuild index 1bef8933632b..19edebe52e46 100644 --- a/sci-mathematics/twelf/twelf-1.7.1.ebuild +++ b/sci-mathematics/twelf/twelf-1.7.1.ebuild @@ -88,15 +88,21 @@ src_install() { fi exeinto /usr/bin doexe bin/twelf-server - dohtml doc/html/# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/twelf/twelf-1.7.1.ebuild,v 1.5 2014/08/10 20:24:19 slyfox Exp $ - -EAPI="5" - -inherit base elisp-common multilib + dohtml doc/html/index.html + doinfo doc/guide/twelf.info + dodoc doc/guide/twelf.dvi doc/guide/twelf.ps doc/guide/twelf.pdf + dohtml doc/guide/twelf/* +} -MY_PN="${PN}-src" -MY_P="${MY_PN}-${PV}" +pkg_postinst() { + if use emacs; then + elisp-site-regen + ewarn "For twelf emacs, add this line to ~/.emacs" + ewarn "" + ewarn '(load (concat twelf-root "/twelf-init.el"))' + fi +} -DESCRIPTION="Twelf is an implementation of the logical \ No newline at end of file +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/sci-mathematics/unuran/files/unuran-1.8.0-nogsl.patch b/sci-mathematics/unuran/files/unuran-1.8.0-nogsl.patch index 2c6d1858fde0..f6266532e83e 100644 --- a/sci-mathematics/unuran/files/unuran-1.8.0-nogsl.patch +++ b/sci-mathematics/unuran/files/unuran-1.8.0-nogsl.patch @@ -27,23 +27,22 @@ diff -Nur unuran-1.8.0.orig/configure.ac unuran-1.8.0/configure.ac @@ -215,7 +216,8 @@ [], [enable_experimental=no]) - AS_IF([test "x$ediff -Nur unuran-1.8.0.orig/configure.ac unuran-1.8.0/configure.ac ---- unuran-1.8.0.orig/configure.ac 2010-12-22 05:11:07.000000000 +0000 -+++ unuran-1.8.0/configure.ac 2010-12-22 05:15:35.000000000 +0000 -@@ -62,10 +62,6 @@ - dnl libm: the standard math library - AC_CHECK_LIB([m], [sqrt]) - --dnl libmgsl: the GNU Scientific library --dnl (only used for experimental code) --AC_CHECK_LIB([gsl], [gsl_integration_qagiu]) -- - dnl Optional support for external uniform random number generators + AS_IF([test "x$enable_experimental" = xyes], +- [AC_DEFINE([USE_EXPERIMENTAL_CODE], [1], ++ [AC_CHECK_LIB([gsl], [gsl_integration_qagiu]) ++ AC_DEFINE([USE_EXPERIMENTAL_CODE], [1], + [Define to 1 if you want to use experimental code])], + []) + AM_CONDITIONAL(ENABLE_EXPERIMENTAL, test x$enable_experimental = xyes) +diff -Nur unuran-1.8.0.orig/tests/Makefile.am unuran-1.8.0/tests/Makefile.am +--- unuran-1.8.0.orig/tests/Makefile.am 2010-12-22 05:11:07.000000000 +0000 ++++ unuran-1.8.0/tests/Makefile.am 2010-12-22 05:11:19.000000000 +0000 +@@ -9,7 +9,7 @@ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/tests - dnl RngStream: Pierre L'Ecuyer's multiple random stream generator -@@ -80,6 +76,11 @@ - AX_ADD_URNG_LIB([gsl],[GSL],[random number generators from GNU Scientific Library], - [gsl],[gsl_rng_alloc],[gsl/gsl_rng.h]) +-noinst_LTLIBRARIES = libtestroutines.la ++check_LTLIBRARIES = libtestroutines.la + libtestroutines_la_SOURCES = testroutines.c testcounter.c -+if test -n $UNURAN_SUPPORTS_GSL; then -+ \ No newline at end of file + LDADD = \ diff --git a/sci-mathematics/wxmaxima/wxmaxima-12.09.0.ebuild b/sci-mathematics/wxmaxima/wxmaxima-12.09.0.ebuild index 1559b284f838..eb805f5b164f 100644 --- a/sci-mathematics/wxmaxima/wxmaxima-12.09.0.ebuild +++ b/sci-mathematics/wxmaxima/wxmaxima-12.09.0.ebuild @@ -76,4 +76,5 @@ pkg_postinst() { pkg_postrm() { gnome2_icon_cache_update - fdo-mime_deskto# Copyright 1999-201 \ No newline at end of file + fdo-mime_desktop_database_update +} diff --git a/sci-misc/gt-itm/gt-itm-19961004-r1.ebuild b/sci-misc/gt-itm/gt-itm-19961004-r1.ebuild index cbdc2a603da6..7ab520927c53 100644 --- a/sci-misc/gt-itm/gt-itm-19961004-r1.ebuild +++ b/sci-misc/gt-itm/gt-itm-19961004-r1.ebuild @@ -4,20 +4,6 @@ inherit eutils toolchain-funcs -DESCRIPTION="Routines to generate and analyze graphs using different models for internetwork topology" -HOMEPAGE="http://www.cc.gatech.edu/fac/Ellen.Zegura/graphs.html - http://www.isi.edu/nsnam/ns/ns-topogen.html#gt-itm" -SRC_URI="http://www.cc.gatech.edu/fac/Ellen.Zegura/gt-itm/gt-itm.tar.gz - http://www.isi.edu/nsnam/dist/sgb2ns.tar.gz" - -LICENSE="all-rights-reserved sgb2ns" -SLOT="0" -KEYWORDS="~x8# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-misc/gt-itm/gt-itm-19961004-r1.ebuild,v 1.2 2014/04/16 22:19:34 ulm Exp $ - -inherit eutils toolchain-funcs - DESCRIPTION="Routines to generate and analyze graphs using different models for internetwork topology" HOMEPAGE="http://www.cc.gatech.edu/fac/Ellen.Zegura/graphs.html http://www.isi.edu/nsnam/ns/ns-topogen.html#gt-itm" @@ -60,4 +46,30 @@ src_unpack() { sed -e '162 s/connected $/connected \\/' -i "${S}"/src/eval.c || die # fix implicit function declarations - sed -e '/stdio.h/ \ No newline at end of file + sed -e '/stdio.h/ a\#include ' \ + -i "${S2}/sgb2comns.c" "${S2}/sgb2hierns.c" || die + sed -e "s///g" \ + -i "${S2}/sgb2hierns.c" || die + epatch "${FILESDIR}"/${PN}-implicits.patch +} + +src_compile() { + cd "${S}"/src + emake CFLAGS="${CFLAGS} -I../include" LDFLAGS="${LDFLAGS}" \ + CC="$(tc-getCC)" || die + + cd "${S2}" + emake CFLAGS="${CFLAGS} -I\$(IDIR) -L\$(LDIR)" LDFLAGS="${LDFLAGS}" \ + CC="$(tc-getCC)" || die +} + +src_install() { + dobin "${S}"/bin/* || die + dodoc "${S}"/README "${S}"/docs/* || die + cp -pPR "${S}"/sample-graphs "${D}"/usr/share/doc/${PF} || die + + cd "${S2}" + dodoc *.tcl *.gb || die + newdoc README README.sgb2ns || die + +} diff --git a/sci-physics/mpb/mpb-1.4.2-r2.ebuild b/sci-physics/mpb/mpb-1.4.2-r2.ebuild index 6d9badd4a48b..0b7a8338e458 100644 --- a/sci-physics/mpb/mpb-1.4.2-r2.ebuild +++ b/sci-physics/mpb/mpb-1.4.2-r2.ebuild @@ -2,10 +2,6 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sci-physics/mpb/mpb-1.4.2-r2.ebuild,v 1.7 2013/02/19 19:44:18 jlec Exp $ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/mpb/mpb-1.4.2-r2.ebuild,v 1.7 2013/02/19 19:44:18 jlec Exp $ - EAPI=4 inherit eutils autotools flag-o-matic toolchain-funcs @@ -123,4 +119,9 @@ src_install() { if use mpi; then newbin "${S}_mpi"/mpb-ctl/.mpb mpb-mpi newbin "${S}_inv_mpi"/mpb-ctl/.mpb mpbh-mpi - newbi \ No newline at end of file + newbin "${S}_herm_mpi"/mpb-ctl/.mpb mpbi-mpi + einfo "mpb-mpi : regular version with mpi" + einfo "mpbi-mpi: configured for inversion symmetry with mpi" + einfo "mpbh-mpi: configured for hermitian epsilon with mpi" + fi +} diff --git a/sys-apps/attr/attr-2.4.47-r1.ebuild b/sys-apps/attr/attr-2.4.47-r1.ebuild index 87fea33b87a2..317a5caa39dd 100644 --- a/sys-apps/attr/attr-2.4.47-r1.ebuild +++ b/sys-apps/attr/attr-2.4.47-r1.ebuild @@ -40,23 +40,30 @@ multilib_src_configure() { econf \ $(use_enable nls gettext) \ --enable-shared $(use_enable static-libs static) \ - --l# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/attr/attr-2.4.47-r1.ebuild,v 1.15 2014/07/13 20:30:00 tgall Exp $ - -EAPI="4" + --libexecdir="${EPREFIX}"/usr/$(get_libdir) \ + --bindir="${EPREFIX}"/bin +} -inherit eutils toolchain-funcs multilib-minimal +multilib_src_compile() { + emake $(multilib_is_native_abi || echo TOOL_SUBDIRS=) +} -DESCRIPTION="Extended attributes tools" -HOMEPAGE="http://savannah.nongnu.org/projects/attr" -SRC_URI="mirror://nongnu/${PN}/${P}.src.tar.gz" +multilib_src_install() { + emake \ + $(multilib_is_native_abi || echo TOOL_SUBDIRS=) \ + DIST_ROOT="${D}" \ + install install-lib install-dev -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux" -IUSE="nls static-libs" + if multilib_is_native_abi; then + # we install attr into /bin, so we need the shared lib with it + gen_usr_ldscript -a attr + # the man-pages packages provides the man2 files + # note: man-pages are installed by TOOL_SUBDIRS + rm -r "${ED}"/usr/share/man/man2 || die + fi +} -DEPEND="nls? ( sys-devel/gettext ) - sys-devel/autoconf" -RDEPEND="abi_x86_32 \ No newline at end of file +multilib_src_install_all() { + use static-libs || prune_libtool_files --all + einstalldocs +} diff --git a/sys-apps/checkpolicy/Manifest b/sys-apps/checkpolicy/Manifest index f7ceb174c6dc..214ca72e5916 100644 --- a/sys-apps/checkpolicy/Manifest +++ b/sys-apps/checkpolicy/Manifest @@ -1,4 +1,2 @@ DIST checkpolicy-2.2.tar.gz 64458 SHA256 9ff6698f4d4cb59c9c916e348187d533ada4107f90c253ef7304905934e9adf8 SHA512 a6f70e1b6581673af515d7d192237e2d47c0e07bb589c64b92f90f3a450ef8c312eabc2384479faed8bb909b98c15b676cea77e7dcb5304a51314601e93bef59 WHIRLPOOL 18c13139e8b75bb5bd45a9ddbf0c17c07fa86da66e792ece4a1d1204d211766fec27f6fce7db248957e7d2b2847c91b4c9d0ef45cf64e106aee52bc29be7992c DIST checkpolicy-2.3.tar.gz 64970 SHA256 90632d11afecb66997971d4c5c5d70dfb02d3969ec610ee2918ba6df99c8207b SHA512 9b10cee8ec9d555c810712131eec0e7e1bf900e4675804b8f57b04988543ba784f4bf76030f196868cef91a1c4ec370f77da12ef9e79362bf7a1cc38c7cafcff WHIRLPOOL 49ca9fa1695bedf141d397ca679ba769b748dc39ec7d462718f6b90af9c31c1da64d1ff67b3b4e426f758a9d305dc9e19d755e1127bfcd5e492dccf09ac75d09 -DIST checkpolicy-2.2.tar.gz 64458 SHA256 9ff6698f4d4cb59c9c916e348187d533ada4107f90c253ef7304905934e9adf8 SHA512 a6f70e1b6581673af515d7d192237e2d47c0e07bb589c64b92f90f3a450ef8c312eabc2384479faed8bb909b98c15b676cea77e7dcb5304a51314601e93bef59 WHIRLPOOL 18c13139e8b75bb5bd45a9ddbf0c17c07fa86da66e792ece4a1d1204d211766fec27f6fce7db248957e7d2b2847c91b4c9d0ef45cf64e106aee52bc29be7992c -DIST checkpolicy-2.3.tar.gz 64970 SHA256 90632d11afecb66997971d4c5c5d70dfb02d3969ec610ee2918ba6df99c8207b SHA512 9b10cee8ec9d555c810712131eec0e7e1bf900e4675804b8f57b04988543ba784f4bf76030f196868cef91a1c4ec370f77da12ef9e79362bf7a1cc38c7cafcff WHIRLPOOL 49ca9fa1695bedf141d397ca679ba769b748dc39ec7d462718f6b90af9c31c1da64d1ff67b3b4e426f758a9d305dc9e19d755e1127bfcd5e492dccf09ac75d09 diff --git a/sys-apps/fwcrv/Manifest b/sys-apps/fwcrv/Manifest index 28f3c14d8dd6..321f392cf7bc 100644 --- a/sys-apps/fwcrv/Manifest +++ b/sys-apps/fwcrv/Manifest @@ -1,2 +1 @@ -DIST fwcrv-0.1.0.tar.gz 76154 RMD160 df46067779b5440ba99da6120a89b8ef0f21f4cb SHA1 8c48a332acbe4def9816549f2c8f47255fb81d8f SHA256 f6585c20149c9AUX fwcrv-0.1.0-endian.patch 1732 RMD160 729500c59ed3f6aa416b797631aafdcb71f4155b SHA1 fad37071df2ab930359acc57186b8be14cb416a0 SHA256 43e33968ce17a60781d6f7e0dfc568f21024d82ce8d35fd0efcb4f66ca7348c2 DIST fwcrv-0.1.0.tar.gz 76154 RMD160 df46067779b5440ba99da6120a89b8ef0f21f4cb SHA1 8c48a332acbe4def9816549f2c8f47255fb81d8f SHA256 f6585c20149c95a7ea7d3cef8ccf30fe2211ca3d892ce0b265ada4163b351a36 diff --git a/sys-apps/gawk/files/gawk-4.1.1-sigpipe.patch b/sys-apps/gawk/files/gawk-4.1.1-sigpipe.patch index 648cbd4c2362..a64e116f60ce 100644 --- a/sys-apps/gawk/files/gawk-4.1.1-sigpipe.patch +++ b/sys-apps/gawk/files/gawk-4.1.1-sigpipe.patch @@ -22,12 +22,13 @@ index a6e786f..2bb8f28 100644 execl("/bin/sh", "sh", "-c", str, NULL); _exit(errno == ENOENT ? 127 : 126); } -@@ -2271,6 +227From 19564e696aca506a14ceb4a08aa2b7c7988a2473 Mon Sep 17 00:00:00 2001 -From: Arnold D. Robbins -Date: Fri, 25 Apr 2014 10:21:43 +0000 -Subject: In forked children, set SIGPIPE to SIG_DFL. - ---- -* io.c (two_way_open): In forked child, reset SIGPIPE to SIG_DFL. -Fixes problems with "broken pipe" errors from child processes, -restoring 4.1.0 and earlier behavior. \ No newline at end of file +@@ -2271,6 +2272,7 @@ gawk_popen(const char *cmd, struct redirect *rp) + fatal(_("moving pipe to stdout in child failed (dup: %s)"), strerror(errno)); + if (close(p[0]) == -1 || close(p[1]) == -1) + fatal(_("close of pipe failed (%s)"), strerror(errno)); ++ signal(SIGPIPE, SIG_DFL); + execl("/bin/sh", "sh", "-c", cmd, NULL); + _exit(errno == ENOENT ? 127 : 126); + } +-- +cgit v0.9.0.2 diff --git a/sys-apps/gentoo-functions/Manifest b/sys-apps/gentoo-functions/Manifest index b814e471a681..f4cfb267ebf2 100644 --- a/sys-apps/gentoo-functions/Manifest +++ b/sys-apps/gentoo-functions/Manifest @@ -1,4 +1,2 @@ DIST gentoo-functions-0.7.tar.bz2 10656 SHA256 0034ff7a65deb8df902683deb1662ce561b7f76ff8561b4ada46cfb18effc7f3 SHA512 7b7c779daeaa37476be488123222af591b357ce1071d8a68694797ce35c8f9c1492da55e4d3059443eb20e08cc7d88eee0e1914efa2b322628c3660c277f7a64 WHIRLPOOL 4b50d0cf0e355d267c2cb6db18211a8d48f48a248190e38227449ef01e39b3968b10a4276ca22b43af9d40706b804730ac81e6ba83efbfcc426a6781dd007cc1 DIST gentoo-functions-0.8.tar.bz2 10647 SHA256 89dc0a3289a2e3312efb560e904add13ececdd5eb554151cb30d0b96f1bd8116 SHA512 34f04f5e7ecd888197b6486c131c346a84a6937501f68a54481ec3caacaee86e54345a6c34364a5953c55b1d4aeb4ca2173b70864cdd7b81e74964352132b322 WHIRLPOOL 6ba223987953fa1dd80b79590c5f72ab8b5d0eca47cc1df23559e295f03faa369a372e5c27ed47d19d605dfe072c22c7702f3d4443a8ea2489d25092274670f3 -DIST gentoo-functions-0.7.tar.bz2 10656 SHA256 0034ff7a65deb8df902683deb1662ce561b7f76ff8561b4ada46cfb18effc7f3 SHA512 7b7c779daeaa37476be488123222af591b357ce1071d8a68694797ce35c8f9c1492da55e4d3059443eb20e08cc7d88eee0e1914efa2b322628c3660c277f7a64 WHIRLPOOL 4b50d0cf0e355d267c2cb6db18211a8d48f48a248190e38227449ef01e39b3968b10a4276ca22b43af9d40706b804730ac81e6ba83efbfcc426a6781dd007cc1 -DIST gentoo-functions-0.8.tar.bz2 10647 SHA256 89dc0a3289a2e3312efb560e904add13ececdd5eb554151cb30d0b96f1bd8116 SHA512 34f04f5e7ecd888197b6486c131c346a84a6937501f68a54481ec3caacaee86e54345a6c34364a5953c55b1d4aeb4ca2173b70864cdd7b81e74964352132b322 WHIRLPOOL 6ba223987953fa1dd80b79590c5f72ab8b5d0eca47cc1df23559e295f03faa369a372e5c27ed47d19d605dfe072c22c7702f3d4443a8ea2489d25092274670f3 diff --git a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.10.0-kill-gsd-automagic.patch b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.10.0-kill-gsd-automagic.patch index 1edb04ec89e6..c6d414c0ae97 100644 --- a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.10.0-kill-gsd-automagic.patch +++ b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.10.0-kill-gsd-automagic.patch @@ -25,26 +25,22 @@ index cce9d62..d8f6198 100644 +++ b/configure.ac @@ -120,7 +120,6 @@ PKG_CHECK_MODULES(LIBSECRET1, [libsecret-1 >= $LIBSECRET1_REQUIRED]) PKG_CHECK_MODULES(PWQUALITY, [pwquality >= $PWQUALITY_REQUIRED]) - PKG_CHECK_MODULES(CANBERRA, [libcFrom cfefd62c7f23625fd1b07dacb35681bdf5aafa04 Mon Sep 17 00:00:00 2001 -From: Andreas Henriksson -Date: Fri, 5 Apr 2013 12:42:06 +0200 -Subject: [PATCH 1/2] Avoid needing gsd during build when --disable-gsd-plugin - is used - -PKG_CHECK_MODULES was previously unconditionally requiring -gnome-settings-daemon to be available, even when it was later -not going to be used because the --disable-gsd-plugin configure -switch was passed. - -Move the check to only require g-s-d when it's actually going to be -used. - -While at it, also fix the indentation of the msg_gsd_plugin=yes line. - -https://bugzilla.gnome.org/show_bug.cgi?id=697146 ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + PKG_CHECK_MODULES(CANBERRA, [libcanberra-gtk3 >= $CANBERRA_REQUIRED]) + PKG_CHECK_MODULES(LIBDVDREAD, [dvdread >= $LIBDVDREAD_REQUIRED]) +-PKG_CHECK_MODULES(GSD_PLUGIN, [gnome-settings-daemon >= $GSD_PLUGIN_REQUIRED]) + PKG_CHECK_MODULES(LIBNOTIFY, [libnotify >= $LIBNOTIFY_REQUIRED]) + PKG_CHECK_MODULES(LIBLZMA, [liblzma >= $LIBLZMA_REQUIRED]) + +@@ -157,7 +156,8 @@ dnl ************************************* + AC_ARG_ENABLE(gsd_plugin, AS_HELP_STRING([--disable-gsd-plugin],[don't build gnome-settings-daemon plug-in])) + msg_gsd_plugin=no + if test "x$enable_gsd_plugin" != "xno"; then +- msg_gsd_plugin=yes ++ msg_gsd_plugin=yes ++ PKG_CHECK_MODULES(GSD_PLUGIN, [gnome-settings-daemon >= $GSD_PLUGIN_REQUIRED]) + fi + AM_CONDITIONAL(USE_GSD_PLUGIN, [test "$msg_gsd_plugin" = "yes"]) + +-- +1.8.3.2 -diff --git a/configure.ac b/configure.ac -in \ No newline at end of file diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.10.0.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.10.0.ebuild index 690ce5e64f7a..8b68853263fd 100644 --- a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.10.0.ebuild +++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.10.0.ebuild @@ -41,10 +41,16 @@ DEPEND="${COMMON_DEPEND} " src_prepare() { - # Fix USE=-gnome, bug #478820# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/gnome-disk-utility-3.10.0.ebuild,v 1.5 2014/03/29 21:53:43 tetromino Exp $ + # Fix USE=-gnome, bug #478820 + epatch "${FILESDIR}"/${PN}-3.10.0-kill-gsd-automagic.patch + epatch "${FILESDIR}"/${PN}-3.10.0-raise-gsd-dependency.patch -EAPI="5" -GCONF_DEBUG="no" -GNOME2_L \ No newline at end of file + eautoreconf + gnome2_src_prepare +} + +src_configure() { + gnome2_src_configure \ + $(use_enable gnome gsd-plugin) \ + $(use_enable systemd libsystemd-login) +} diff --git a/sys-apps/lm_sensors/lm_sensors-3.3.1.ebuild b/sys-apps/lm_sensors/lm_sensors-3.3.1.ebuild index 6c75e80c3e70..e2c9086e880a 100644 --- a/sys-apps/lm_sensors/lm_sensors-3.3.1.ebuild +++ b/sys-apps/lm_sensors/lm_sensors-3.3.1.ebuild @@ -67,46 +67,41 @@ src_install() { if use sensord; then newconfd "${FILESDIR}"/sensord-conf.d sensord || die - newinitd "${FIL# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-3.3.1.ebuild,v 1.10 2012/10/18 18:58:50 maekke Exp $ - -EAPI=3 -inherit eutils linux-info toolchain-funcs multilib - -DESCRIPTION="Hardware Monitoring user-space utilities" -HOMEPAGE="http://www.lm-sensors.org/" -SRC_URI="http://dl.lm-sensors.org/lm-sensors/releases/${P}.tar.bz2" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="alpha amd64 ~arm ~mips ppc sparc x86 ~amd64-linux ~x86-linux" -IUSE="sensord static-libs" - -RDEPEND="dev-lang/perl - sensord? ( - net-analyzer/rrdtool - virtual/logger - )" -DEPEND="${RDEPEND} - sys-apps/sed - sys-devel/bison - sys-devel/flex" - -CONFIG_CHECK="~HWMON ~I2C_CHARDEV ~I2C" -WARNING_HWMON="${PN} requires CONFIG_HWMON to be enabled for use." -WARNING_I2C_CHARDEV="sensors-detect requires CONFIG_I2C_CHARDEV to be enabled." -WARNING_I2C="${PN} requires CONFIG_I2C to be enabled for most sensors." + newinitd "${FILESDIR}"/sensord-3-init.d sensord || die + fi -src_prepare() { - epatch "${FILESDIR}"/${PN}-3.3.1-sensors-detect-gentoo.patch + dodoc CHANGES CONTRIBUTORS INSTALL README \ + doc/{donations,fancontrol.txt,fan-divisors,libsensors-API.txt,progs,temperature-sensors,vid} - if use sensord; then - sed -i -e 's:^#\(PROG_EXTRA.*\):\1:' Makefile || die - fi + docinto chips + dodoc doc/chips/* - # Respect LDFLAGS - sed -i -e 's/\$(LIBDIR)$/\$(LIBDIR) \$(LDFLAGS)/g' Makefile || die + docinto developers + dodoc doc/developers/applications +} - if ! use static-libs; then - sed -i -e '/^BUILD_STATI \ No newline at end of file +pkg_postinst() { + elog + elog "Please run \`/usr/sbin/sensors-detect' in order to setup" + elog "/etc/conf.d/lm_sensors." + elog + elog "/etc/conf.d/lm_sensors is vital to the init-script." + elog "Please make sure you also add lm_sensors to the desired" + elog "runlevel. Otherwise your I2C modules won't get loaded" + elog "on the next startup." + elog + elog "You will also need to run the above command if you're upgrading from" + elog "<=${PN}-2, as the needed entries in /etc/conf.d/lm_sensors has" + elog "changed." + elog + elog "Be warned, the probing of hardware in your system performed by" + elog "sensors-detect could freeze your system. Also make sure you read" + elog "the documentation before running lm_sensors on IBM ThinkPads." + elog + elog "Also make sure you have read:" + elog "http://www.lm-sensors.org/wiki/FAQ/Chapter3#Mysensorshavestoppedworkinginkernel2.6.31" + elog + elog "Please refer to the lm_sensors documentation for more information." + elog "(http://www.lm-sensors.org/wiki/Documentation)" + elog +} diff --git a/sys-apps/logwatch/logwatch-7.4.0.ebuild b/sys-apps/logwatch/logwatch-7.4.0.ebuild index 1189a8025b67..5b9464512a92 100644 --- a/sys-apps/logwatch/logwatch-7.4.0.ebuild +++ b/sys-apps/logwatch/logwatch-7.4.0.ebuild @@ -2,10 +2,6 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sys-apps/logwatch/logwatch-7.4.0.ebuild,v 1.9 2012/03/17 17:57:48 armin76 Exp $ -DESCRIPTION="Anal# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/logwatch/logwatch-7.4.0.ebuild,v 1.9 2012/03/17 17:57:48 armin76 Exp $ - DESCRIPTION="Analyzes and Reports on system logs" HOMEPAGE="http://www.logwatch.org/" SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz" @@ -73,4 +69,10 @@ src_install() { } pkg_postinst() { - if [[ -e ${ROOT}/etc/cron.daily/logwat \ No newline at end of file + if [[ -e ${ROOT}/etc/cron.daily/logwatch ]] ; then + local md5=$(md5sum "${ROOT}"/etc/cron.daily/logwatch) + [[ ${md5} == "edb003cbc0686ed4cf37db16025635f3" ]] \ + && rm -f "${ROOT}"/etc/cron.daily/logwatch \ + || ewarn "You have two logwatch files in /etc/cron.daily/" + fi +} diff --git a/sys-apps/mouseemu/mouseemu-0.12.ebuild b/sys-apps/mouseemu/mouseemu-0.12.ebuild index 3e6383f2eb09..31350561f728 100644 --- a/sys-apps/mouseemu/mouseemu-0.12.ebuild +++ b/sys-apps/mouseemu/mouseemu-0.12.ebuild @@ -34,6 +34,8 @@ src_install() { pkg_postinst() { einfo "For mouseemu to work you need uinput support in your kernel:" einfo " CONFIG_INPUT_UINPUT=y" - einfo "(Device Drivers->Input device support->M# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/mouseemu/mouseemu-0.12.ebuild,v 1.5 2007/04/2 \ No newline at end of file + einfo "(Device Drivers->Input device support->Misc->User level driver support)" + einfo "Don't forget to add mouseemu to your default runlevel:" + einfo " rc-update add mouseemu default" + einfo "Configuration is in /etc/mouseemu.conf." +} diff --git a/sys-apps/nca/Manifest b/sys-apps/nca/Manifest index 6d1cda578075..b3a2b81ff177 100644 --- a/sys-apps/nca/Manifest +++ b/sys-apps/nca/Manifest @@ -1,2 +1 @@ DIST nca-0.9.0.tar.gz 818721 SHA256 407144394f6f90e818c7ce992a691c4e99983defbe9de63f6a0adaa93a36ae03 SHA512 375dc747414af7e8971a9112fa6a4583dd543f6f4b3a84b2c16f45ee2487363929c2eed3c1837687b802161c630443885e6da20ac738017d219e9a608b4d700c WHIRLPOOL 60c726e918e3684fe9dc45eacbfb2aa264f7ea1fd71e46eacc2020252e5cf6b333345c000eb8efafba65965fe184ff1ad4cbc87886a623831476f18c052953d9 -DIST nca-0.9.0.tar.gz 818721 SHA256 407144394f6f90e818c7ce992a691c4e99983defbe9de63f6a0adaa93a36ae03 SHA512 375dc747414af7e8971a9112fa6a4583dd543f6f4b3a84b2c16f45ee2487363929c2eed3c1837687b802161c630443885e6da20ac738017d219e9a608b4d700c WHIRLPOOL 60c726e918e3684fe9dc45eacbfb2aa264f7ea1fd71e46eacc2020252e5cf6 \ No newline at end of file diff --git a/sys-apps/netloc/Manifest b/sys-apps/netloc/Manifest index f21e52194c54..3d0b16f4d4ef 100644 --- a/sys-apps/netloc/Manifest +++ b/sys-apps/netloc/Manifest @@ -1,2 +1 @@ DIST netloc-0.5.tar.gz 474646 SHA256 41a8d31097b9aeabff89596b42bd3d4590f6b7552378a0fc80ec7a02823c5d1a SHA512 88600c59302cd8e5ed024373a57b27e54b288288091ed0ab3852bee59c255a8b520d38c59d64f6c1eafe307f0d5e61d64c799a92e9695c42ecc1e33dcc2df6ba WHIRLPOOL d83dbe17bcea2c083ded5c364e344b904799fd6405a38e52318d9d88f041ee47b50383fd038003b2e558b36577544779c118c509de29cc1e2027314cf3b8b8b1 -DIST netloc-0.5.tar.gz 474646 SHA256 41a8d31097b9aeabff89596b42bd3d4590f6b7552378a0fc80ec7a02823c5d1a SHA512 88600c59302cd8e5ed024373a57b27e54b288288091ed0ab3852bee59c255a8b520d38c59d64f6c1eafe307f0d5e61d64c799a92e9695c42ecc1e33dcc2df6ba WHIRLPOOL d83dbe17bcea2c083ded5c364e344b904799fd6405a38e52318d9d88f041ee47b50383fd038003b2e558b36577544779c118c509de29cc1e2027314cf3b8b8b1 diff --git a/sys-apps/pciutils/pciutils-3.2.0.ebuild b/sys-apps/pciutils/pciutils-3.2.0.ebuild index 155026ff1565..80dfefce4170 100644 --- a/sys-apps/pciutils/pciutils-3.2.0.ebuild +++ b/sys-apps/pciutils/pciutils-3.2.0.ebuild @@ -10,20 +10,6 @@ DESCRIPTION="Various utilities dealing with the PCI bus" HOMEPAGE="http://mj.ucw.cz/sw/pciutils/ http://git.kernel.org/?p=utils/pciutils/pciutils.git" SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha am# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-3.2.0.ebuild,v 1.14 2014/01/18 04:55:35 vapier Exp $ - -EAPI="5" - -inherit eutils multilib toolchain-funcs - -DESCRIPTION="Various utilities dealing with the PCI bus" -HOMEPAGE="http://mj.ucw.cz/sw/pciutils/ http://git.kernel.org/?p=utils/pciutils/pciutils.git" -SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${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 ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux" @@ -80,4 +66,19 @@ src_compile() { src_install() { pemake DESTDIR="${D}" install install-lib - use static-li \ No newline at end of file + use static-libs && dolib.a "${S}.static/lib/libpci.a" + dodoc ChangeLog README TODO + + rm "${ED}"/usr/sbin/update-pciids "${ED}"/usr/share/misc/pci.ids \ + "${ED}"/usr/share/man/man8/update-pciids.8* + + newinitd "${FILESDIR}"/init.d-pciparm pciparm + newconfd "${FILESDIR}"/conf.d-pciparm pciparm +} + +pkg_postinst() { + if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 3.2.0 ]]; then + elog "The 'network-cron' USE flag is gone; if you want a more up-to-date" + elog "pci.ids file, you should use sys-apps/hwids-99999999 (live ebuild)." + fi +} diff --git a/sys-apps/preload/files/0001-Early-restart-of-forking-readahead-children.patch b/sys-apps/preload/files/0001-Early-restart-of-forking-readahead-children.patch index b30afa868c8f..2143ba3cc15e 100644 --- a/sys-apps/preload/files/0001-Early-restart-of-forking-readahead-children.patch +++ b/sys-apps/preload/files/0001-Early-restart-of-forking-readahead-children.patch @@ -46,9 +46,19 @@ index c169e81..7617449 100644 if (procs >= maxprocs) - wait_for_children (); -+ From 63cbd8862714a97c8ef752041dc8c351ba4fae1d Mon Sep 17 00:00:00 2001 -From: Kai Krakow -Date: Mon, 28 Jul 2008 19:50:22 +0200 -Subject: [PATCH] Early restart of forking readahead children ++ wait_for_children (maxprocs); + + if (maxprocs > 0) + { +@@ -257,7 +257,7 @@ preload_readahead (preload_map_t **files, int file_count) + path = NULL; + } + +- wait_for_children (); ++ wait_for_children (0); + + return processed; + } +-- +1.5.4.5 -This patch adds ability to wait_for_children() to rest \ No newline at end of file diff --git a/sys-apps/rename/rename-1.3.ebuild b/sys-apps/rename/rename-1.3.ebuild index f8536ae8d198..1e82b9c36f0c 100644 --- a/sys-apps/rename/rename-1.3.ebuild +++ b/sys-apps/rename/rename-1.3.ebuild @@ -22,10 +22,17 @@ src_unpack() { Makefile.in epatch "${FILESDIR}"/${P}-rename.patch epatch "${FILESDIR}"/${P}-build.patch - epatch "${F# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/rename/rename-1.3.ebuild,v 1.25 2013/10/21 13:30:22 grobian Exp $ + epatch "${FILESDIR}"/${P}-gcc44.patch + tc-export CC +} -inherit toolchain-funcs eutils +src_install() { + newbin rename renamexm || die + newman rename.1 renamexm.1 + dodoc README ChangeLog +} -DESCRIPTION="tool for \ No newline at end of file +pkg_postinst() { + ewarn "This has been renamed to 'renamexm' to avoid" + ewarn "a naming conflict with sys-apps/util-linux." +} diff --git a/sys-apps/rigo-daemon/rigo-daemon-254.ebuild b/sys-apps/rigo-daemon/rigo-daemon-254.ebuild index 383de65dc2b5..bedf4d737610 100644 --- a/sys-apps/rigo-daemon/rigo-daemon-254.ebuild +++ b/sys-apps/rigo-daemon/rigo-daemon-254.ebuild @@ -38,6 +38,7 @@ src_install() { pkg_preinst() { # ask RigoDaemon to shutdown, if running - # TOD# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/ \ No newline at end of file + # TODO: this will be removed in future + local shutdown_exec=${EROOT}/usr/lib/rigo/${MY_PN}/shutdown.py + [[ -x "${shutdown_exec}" ]] && "${shutdown_exec}" +} diff --git a/sys-apps/roccat-tools/roccat-tools-1.4.0.ebuild b/sys-apps/roccat-tools/roccat-tools-1.4.0.ebuild index b2a913f52ae9..6ef57af4b96a 100644 --- a/sys-apps/roccat-tools/roccat-tools-1.4.0.ebuild +++ b/sys-apps/roccat-tools/roccat-tools-1.4.0.ebuild @@ -51,14 +51,25 @@ src_configure() { local UDEVDIR="$(get_udevdir)"/rules.d local MODELS=${INPUT_DEVICES//roccat_/} mycmakeargs=( -DDEVICES=${MODELS// /;} \ - -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/roccat-tools/roccat-tools-1.4.0.ebuild,v 1.2 2014/07/24 17:46:58 axs Exp $ - -EAPI=5 - -inherit readme.gentoo cmake-utils gnome2-utils udev user - -DESCRIPTION="Utility for advanced configuration of Roccat devices" + -DUDEVDIR="${UDEVDIR/"//"//}" ) + cmake-utils_src_configure +} +src_install() { + cmake-utils_src_install + local stat_dir=/var/lib/roccat + keepdir $stat_dir + fowners root:roccat $stat_dir + fperms 2770 $stat_dir + readme.gentoo_src_install +} +pkg_preinst() { + gnome2_icon_savelist +} +pkg_postinst() { + gnome2_icon_cache_update + readme.gentoo_print_elog +} -HOMEPAGE="http://roccat.sourc \ No newline at end of file +pkg_postrm() { + gnome2_icon_cache_update +} diff --git a/sys-apps/rsbac-admin/rsbac-admin-1.4.7.ebuild b/sys-apps/rsbac-admin/rsbac-admin-1.4.7.ebuild index 6cd8cd88c0b8..91acd1dc8b1d 100644 --- a/sys-apps/rsbac-admin/rsbac-admin-1.4.7.ebuild +++ b/sys-apps/rsbac-admin/rsbac-admin-1.4.7.ebuild @@ -53,29 +53,19 @@ src_install() { pkg_postinst() { einfo "********************************************************************************" - einfo "You have to add a security user to your system if you h# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/rsbac-admin/rsbac-admin-1.4.7.ebuild,v 1.1 2013/08/20 11:24:32 blueness Exp $ - -EAPI="5" - -inherit multilib toolchain-funcs - -DESCRIPTION="Rule Set Based Access Control (RSBAC) Admin Tools" -HOMEPAGE="http://www.rsbac.org/" -SRC_URI="http://download.rsbac.org/code/${PV}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -# using rklogd is deprecated but offer the option since it is fully removed -# from source -IUSE="pam rklogd" - -DEPEND=" - dev-util/dialog - pam? ( sys-libs/pam ) - sys-apps/baselayout - >=sys-libs/ncurses-5.2" - -RDEPE \ No newline at end of file + einfo "You have to add a security user to your system if you have not already done so." + einfo "The name could be 'secoff' or 'security' and, if you did not change the default" + einfo "uid in the RSBAC kernel configuration, then the following will work:" + einfo + einfo " groupadd -g 400 security" + einfo " useradd -g 400 -u 400 security" + einfo + einfo "We suggest you run a separate copy of syslog-ng (for example) to log RSBAC" + einfo "messages as user 'audit' (uid 404) instead of using the deprecated rklogd." + einfo "See" + einfo + einfo " http://www.rsbac.org/documentation/administration_examples/syslog-ng" + einfo + einfo "for more information." + einfo "********************************************************************************" +} diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest index 8c4f3b895ce0..f5fae3f1eda0 100644 --- a/sys-apps/s6/Manifest +++ b/sys-apps/s6/Manifest @@ -1,2 +1 @@ DIST s6-1.1.0.tar.gz 104852 SHA256 fe466be5855286168b4afeb6b8bbd4b8d86a5bf7bcd0bc2cf6abbe6b5ca8c1d3 SHA512 926a986c6f80349230e516af7ae41aa567ea56829bb04b7c3978ae71f6aaa6d9b07c7687d1687d32e10e27bb3c87301f3d46cfaa0162d092603d5a8f383dbd2e WHIRLPOOL 9d5b79b40b2fe8eb4cda973b3ee4918ebb78156e4b94b659f4af1fc882c081f07e8287ab7b7783a9650bf2b332c77660caf8b8897de0992dec717f0ab19faefb -DIST s6-1.1.0.tar.gz 104852 SHA256 fe466be5855286168b4afeb6b8bbd4b8d86a5bf7bcd0bc2cf6abbe6b5ca8c1d3 SHA512 926a986c6f80349230e516af7ae41aa567ea56829bb04b7c3978ae71f6aaa6d9b07c7687d1687d32e10e27bb3c87301f3d46cfaa0162d092603d5a8f383dbd2e WHIRLPOOL 9d5b79b40b2fe8eb4cda973b3ee4918ebb78156e4b94b659f4af1fc882c081f07e8287ab7b7783a9650bf2b332c77660caf8b8897de0992dec717f0ab19faefb diff --git a/sys-apps/udevil/udevil-0.4.1.ebuild b/sys-apps/udevil/udevil-0.4.1.ebuild index b5782c093559..955f8e813b75 100644 --- a/sys-apps/udevil/udevil-0.4.1.ebuild +++ b/sys-apps/udevil/udevil-0.4.1.ebuild @@ -61,13 +61,11 @@ pkg_postinst() { elog " virtual/eject (eject via devmon)" if ! has_version 'sys-fs/udisks' ; then elog - elog "When using ${PN} withou# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/udevil/udevil-0.4.1.ebuild,v 1.5 2013/08/12 02:10:45 hasufell Exp $ - -EAPI=5 - -inherit eutils autotools user - -DESCRIPTION="mount and unmount removable devices without a password" -HOMEPAGE="http://ign \ No newline at end of file + elog "When using ${PN} without udisks, and without the udisks-daemon running," + elog "you may need to enable kernel polling for device media changes to be detected." + elog "See http://ignorantguru.github.com/${PN}/#polling" + has_version ' -Date: Sun, 13 Jan 2013 13 \ No newline at end of file ++AC_CONFIG_HEADERS([config.h]) + + # Enable silent build when available (Automake 1.11) + m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) +-- +cgit v0.9.0.2-2-gbebe diff --git a/sys-auth/libnss-mysql/libnss-mysql-1.5_p20060915-r2.ebuild b/sys-auth/libnss-mysql/libnss-mysql-1.5_p20060915-r2.ebuild index 5014bcffa8f9..995ef2df1b52 100644 --- a/sys-auth/libnss-mysql/libnss-mysql-1.5_p20060915-r2.ebuild +++ b/sys-auth/libnss-mysql/libnss-mysql-1.5_p20060915-r2.ebuild @@ -35,12 +35,16 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-auth/libnss-mysql/libnss-mysql-1.5_p20060915-r2.ebuild,v 1.6 2014/08/10 20:22:14 slyfox Exp $ + emake DESTDIR="${D}" install || die -EAPI=2 + find "${D}" -name '*.la' -delete -inherit eutils multilib autotools + newdoc sample/README README.sample + dodoc AUTHORS DEBUGGING FAQ INSTALL NEWS README THANKS \ + TODO UPGRADING ChangeLog -KEYWO \ No newline at end of file + for subdir in sample/{linux,freebsd,complex,minimal} ; do + docinto "${subdir}" + dodoc "${subdir}/"{*.sql,*.cfg} + done +} diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.4.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.4.ebuild index 41a2d3048a67..ea5a15628bf7 100644 --- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.4.ebuild +++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.4.ebuild @@ -40,51 +40,53 @@ src_configure() { --enable-warnings --with-ldap-lib=openldap --with-ldap-conf-file=/etc/nslcd.conf - # Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.4.ebuild,v 1.1 2014/06/15 03:51:12 prometheanfire Exp $ + --with-nslcd-pidfile=/run/nslcd/nslcd.pid + --with-nslcd-socket=/run/nslcd/socket + --with-pam-seclib-dir=/$(get_libdir)/security + --libdir=/$(get_libdir) + $(use_enable debug) + $(use_enable kerberos) + $(use_enable pam) + $(use_enable sasl)" -EAPI=5 + if use x86-fbsd; then + myconf+=" --with-nss-flavour=freebsd" + else + myconf+=" --with-nss-flavour=glibc" + fi -inherit eutils multilib user + econf ${myconf} +} -DESCRIPTION="NSS module for name lookups using LDAP" -HOMEPAGE="http://arthurdejong.org/nss-pam-ldapd/" -SRC_URI="http://arthurdejong.org/nss-pam-ldapd/${P}.tar.gz" +src_install() { + default -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="" -IUSE="debug kerberos sasl +pam" + # for socket and pid file (not needed bug 452992) + #keepdir /run/nslcd -DEPEND=" - net-nds/openldap - sasl? ( dev-libs/cyrus-sasl ) - kerberos? ( virtual/krb5 ) - pam? ( virtual/pam ) - !sys-auth/nss_ldap - !sys-auth/pam_ldap" -RDEPEND="${DEPEND}" + # init script + newinitd "${FILESDIR}"/nslcd-init-r1 nslcd -pkg_setup() { - enewgroup nslcd - enewuser nslcd -1 -1 -1 nslcd -} + # make an example copy + insinto /usr/share/nss-pam-ldapd + doins nslcd.conf -src_prepare() { - # support user patches - epatch_user + fperms o-r /etc/nslcd.conf } -src_configure() { - # nss libraries always go in /lib on Gentoo - myconf=" - --enable-warnings - --with-ldap-lib=openldap - --with-ldap-conf-file=/etc/nslcd.conf - --with-nslcd-pidfile=/run/nslcd/nslcd.pid - --with-nslcd-socket=/run/nslcd/socket - --with-pam-seclib-dir=/$(get_libdir)/security - --libdir=/$(get_libdir) - $(use_enable debug) - $(use_enable \ No newline at end of file +pkg_postinst() { + echo + elog "For this to work you must configure /etc/nslcd.conf" + elog "This configuration is similar to pam_ldap's /etc/ldap.conf" + echo + elog "In order to use nss-pam-ldapd, nslcd needs to be running. You can" + elog "start it like this:" + elog " # /etc/init.d/nslcd start" + echo + elog "You can add it to the default runlevel like so:" + elog " # rc-update add nslcd default" + elog + elog "If you are upgrading, keep in mind that /etc/nss-ldapd.conf" + elog " is now named /etc/nslcd.conf" + echo +} diff --git a/sys-auth/nss_ldap/files/nss_ldap-257-nss_max_group_depth.patch b/sys-auth/nss_ldap/files/nss_ldap-257-nss_max_group_depth.patch index b7d0e754e67c..d2f8efeec751 100644 --- a/sys-auth/nss_ldap/files/nss_ldap-257-nss_max_group_depth.patch +++ b/sys-auth/nss_ldap/files/nss_ldap-257-nss_max_group_depth.patch @@ -6,15 +6,6 @@ Rediffed-by: Robin H. Johnson +++ nss_ldap-257/ChangeLog 2007-09-18 15:04:07.925113592 -0700 @@ -3,2 +3,7 @@ -+257.1 Heath Caldwell -Gentoo-Bug: 155492 -Original-Author: Heath Caldwell -Rediffed-by: Robin H. Johnson - ---- nss_ldap-257.orig/ChangeLog 2007-09-18 15:02:59.997686000 -0700 -+++ nss_ldap-257/ChangeLog 2007-09-18 15:04:07.925113592 -0700 -@@ -3,2 +3,7 @@ - +257.1 Heath Caldwell + + * add configurable maximum group depth with new @@ -92,4 +83,10 @@ Rediffed-by: Robin H. Johnson --- nss_ldap-257.orig/util.h 2007-09-18 15:03:00.001020000 -0700 +++ nss_ldap-257/util.h 2007-09-18 15:05:11.295822638 -0700 @@ -84,6 +84,7 @@ - #define NSS_LDAP_KEY_INITGROUP \ No newline at end of file + #define NSS_LDAP_KEY_INITGROUPS "nss_initgroups" + #define NSS_LDAP_KEY_INITGROUPS_IGNOREUSERS "nss_initgroups_ignoreusers" + #define NSS_LDAP_KEY_GETGRENT_SKIPMEMBERS "nss_getgrent_skipmembers" ++#define NSS_LDAP_KEY_MAX_GROUP_DEPTH "nss_max_group_depth" + + /* more reconnect policy fine-tuning */ + #define NSS_LDAP_KEY_RECONNECT_TRIES "nss_reconnect_tries" diff --git a/sys-auth/nss_ldap/nss_ldap-258.ebuild b/sys-auth/nss_ldap/nss_ldap-258.ebuild index 24128ee625bf..994657a5d2b8 100644 --- a/sys-auth/nss_ldap/nss_ldap-258.ebuild +++ b/sys-auth/nss_ldap/nss_ldap-258.ebuild @@ -56,17 +56,25 @@ src_compile() { --enable-schema-mapping \ --enable-paged-results \ --enable-rfc2307bis \ - ${myconf} || die "configure fai# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss_ldap/nss_ldap-258.ebuild,v 1.8 2007/11/14 03:56:40 beandog Exp $ + ${myconf} || die "configure failed" -inherit fixheadtails eutils multilib autotools + emake || die "make failed" +} -IUSE="debug sasl kerberos" +src_install() { + dodir /$(get_libdir) -DESCRIPTION="NSS LDAP Module" -HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html" -SRC_URI="http://www.padl.com/download/${P}.tar.gz" + emake -j1 DESTDIR="${D}" install || die "make install failed" -SLOT="0" -LICENSE \ No newline at end of file + insinto /etc + doins ldap.conf + + dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \ + COPYING CVSVersionInfo.txt README nsswitch.ldap certutil + docinto docs; dodoc doc/* +} + +pkg_postinst() { + elog "If you use a ldaps:// string in the 'uri' setting of" + elog "your /etc/ldap.conf, you must set 'ssl on'!" +} diff --git a/sys-auth/pam_mount/Manifest b/sys-auth/pam_mount/Manifest index a0bc34fda0ce..84084aca1295 100644 --- a/sys-auth/pam_mount/Manifest +++ b/sys-auth/pam_mount/Manifest @@ -1,2 +1 @@ DIST pam_mount-2.14.tar.xz 312776 SHA256 6f66cbb34568875772d854d3f2a8948f97f3f1c7f30e3ea2474e1d4b227adcf9 SHA512 621fc13f01c625bb0c8cb9ac1b7bcfd9851f239b37c4479eb9ff958ad2b7f00698df32e32893558119f486e2e5fa05514f6e8e34498359c432db75706cc2477e WHIRLPOOL 6d4f74067e73cb61cb777d8125c2d4bb4e41510e4ec031b23f00cc3eb06c70312b6c53d785c2a4e3509a16fa1880b726bb165e3a81ba27b16d820180a776b30e -DIST pam_mount-2.14.tar.xz 312776 SHA256 6f66cbb34568875772d854d3f2a8948f97f3f1c7f30e3ea2474e1d4b227adcf9 SHA512 621fc13f01c625bb0c8cb9ac1b7bcfd9851f239b37c4479eb9ff958ad2b7f00698df32e32893558119f486e2e5fa05514f6e8e34498359c432db75706cc2477e WHIRLPOOL 6d4f74067e73cb61cb777d8125c2d4bb4e41510e4ec031b23f00cc3eb06c70312b6c53d785c2a4e3509a16fa1880b726bb165e3a81ba27b16d820180a776b30e diff --git a/sys-auth/pam_mysql/Manifest b/sys-auth/pam_mysql/Manifest index b259b9efe407..0a9d6512e7a6 100644 --- a/sys-auth/pam_mysql/Manifest +++ b/sys-auth/pam_mysql/Manifest @@ -1,2 +1 @@ -DIST pam_mysql-0.7RC1.tar.gz 335240 SHA256 cb3cf89b9b51cb196ee8d731f85acbab72b4878a3a7c4183c5534161d4385ce7 SHA512 c057999c62d29dfa7a07db9a8d33d0cf0377-----BEGIN PGP SIGNED MESSAGE----- DIST pam_mysql-0.7RC1.tar.gz 335240 SHA256 cb3cf89b9b51cb196ee8d731f85acbab72b4878a3a7c4183c5534161d4385ce7 SHA512 c057999c62d29dfa7a07db9a8d33d0cf0377dae4770c73019bd85f67c9c92fc9dac36fa606739162a5f7b0f9fbd849e5833fee827febfe4af883b8c2ddbd8b4f WHIRLPOOL 4d47d4be6c95ad70705884f2023975a719d06915ac41738d7c28ceff2d57e0c58187b52314e1f11e0e4bcfe3b3471525a3e97591d653342847f1d2ed66ecdc57 diff --git a/sys-auth/tfm-fingerprint/metadata.xml b/sys-auth/tfm-fingerprint/metadata.xml index de90768661b7..a2e51d46d661 100644 --- a/sys-auth/tfm-fingerprint/metadata.xml +++ b/sys-auth/tfm-fingerprint/metadata.xml @@ -1,5 +1,8 @@ - - + vapier@gentoo.org + Mike Frysinger + + diff --git a/sys-block/megacli/megacli-8.07.10.ebuild b/sys-block/megacli/megacli-8.07.10.ebuild index 9dddde7c9ee5..835c7293d205 100644 --- a/sys-block/megacli/megacli-8.07.10.ebuild +++ b/sys-block/megacli/megacli-8.07.10.ebuild @@ -57,24 +57,24 @@ src_install() { into /opt newbin "${FILESDIR}"/${PN}-wrapper ${PN} - dosym ${PN} /opt/# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-block/megacli/megacli-8.07.10.ebuild,v 1.4 2014/03/21 11:53:47 xarthisius Exp $ - -EAPI=5 - -inherit rpm -MY_P=${PV}_MegaCLI_Linux + dosym ${PN} /opt/bin/MegaCli -DESCRIPTION="LSI Logic MegaRAID Command Line Interface management tool" -HOMEPAGE="http://www.lsi.com/" -SRC_URI="http://www.lsi.com/downloads/Public/RAID%20Controllers/RAID%20Controllers%20Common%20Files/${MY_P}.zip" - -LICENSE="LSI" -SLOT="0" -# This package can never enter stable, it can't be mirrored and upstream -# can remove the distfiles from their mirror anytime. -KEYWORDS="amd64 x86" -IUSE="" + # Remove DT_RPATH + chrpath -d "${D}"/opt/${PN}/${PN} +} -DEPE \ No newline at end of file +pkg_postinst() { + einfo + einfo "See /usr/share/doc/${PF}/RELEASE.txt for a list of supported controllers" + einfo "(contains LSI model names only, not those sold by 3rd parties" + einfo "under custom names like Dell PERC etc)." + einfo + einfo "As there's no dedicated manual, you might want to have" + einfo "a look at the following cheat sheet (originally written" + einfo "for Dell PowerEdge Expandable RAID Controllers):" + einfo "http://tools.rapidsoft.de/perc/perc-cheat-sheet.html" + einfo + einfo "For more information about working with Dell PERCs see:" + einfo "http://tools.rapidsoft.de/perc/" + einfo +} diff --git a/sys-block/mpt-status/files/mpt-status-1.2.0-gentoo.patch b/sys-block/mpt-status/files/mpt-status-1.2.0-gentoo.patch index deb04c6e1332..445868a2ef9d 100644 --- a/sys-block/mpt-status/files/mpt-status-1.2.0-gentoo.patch +++ b/sys-block/mpt-status/files/mpt-status-1.2.0-gentoo.patch @@ -9,22 +9,6 @@ Patch for Gentoo distribution of mpt-status. Signed-off-by: Robin H. Johnson -diff -Nuar mpt-status-1.2.0.orig/Makefile mpt-status-1.2.0/Makefile ---- mpt-status-1.2.0.orig/Makefile 2006-11-01 19:02:30.000000000 +0000 -+++ mpt-status-1.2.0/Makefile 2006-11-10 08:54:18.000000000 +0000 -@@ -3,28 +3,26 @@ - KERNEL_PATH := /usr/src/linux - KERNEL_PATH_B := /lib/modules/`unaPatch for Gentoo distribution of mpt-status. - 1. -I../linux-sources/drivers/message/fusion for our inclusion of the mpt headers. - 2. Remove -O2, and use $(CFLAGS) from user instead. - 3. Use LDFLAGS - 4. -D flag to install is GNU specific. - 5. Remove sparc64 specific CFLAGS. - 6. Remember to make the sbin directory before installing to it. - 7. Don't strip the binary. - -Signed-off-by: Robin H. Johnson - diff -Nuar mpt-status-1.2.0.orig/Makefile mpt-status-1.2.0/Makefile --- mpt-status-1.2.0.orig/Makefile 2006-11-01 19:02:30.000000000 +0000 +++ mpt-status-1.2.0/Makefile 2006-11-10 08:54:18.000000000 +0000 @@ -37,4 +21,31 @@ diff -Nuar mpt-status-1.2.0.orig/Makefile mpt-status-1.2.0/Makefile + -I../linux-sources/drivers/message/fusion \ -I${KERNEL_PATH}/drivers/message/fusion \ -I${KERNEL_PATH_B}/drivers/message/fusion \ -- \ No newline at end of file +- -I${KERNEL_PATH_S}/drivers/message/fusion ++ -I${KERNEL_PATH_S}/drivers/message/fusion \ ++ $(CFLAGS) + DFLAGS := #-DSANITIZED_KERNEL_HEADERS +-LDFLAGS := ++LDFLAGS := $(LDFLAGS) + DESTDIR := + MANDIR := /usr/share/man + CC := gcc +-INSTALL := install -D ++INSTALL := install + ARCH := $(shell uname -m) + +-ifeq "${ARCH}" "sparc64" +- CFLAGS := -Iincl -Wall -W -O2 -m64 -pipe \ +- -mcpu=ultrasparc -mcmodel=medlow +-endif +- + ${PROG}: ${PROG}.c ${PROG}.h + ${CC} ${DFLAGS} ${CFLAGS} -o $@ $< ${LDFLAGS} + + install: ${PROG} +- ${INSTALL} -s -o root -g root -m 0500 $< \ ++ ${INSTALL} -d ${DESTDIR}${PREFIX}/sbin/ ++ ${INSTALL} -o root -g root -m 0500 $< \ + ${DESTDIR}${PREFIX}/sbin + + install_doc: man/${PROG}.8 diff --git a/sys-block/parted/files/parted-3.2-devmapper.patch b/sys-block/parted/files/parted-3.2-devmapper.patch index ba3dd89e7ca2..0cd3e0e3307f 100644 --- a/sys-block/parted/files/parted-3.2-devmapper.patch +++ b/sys-block/parted/files/parted-3.2-devmapper.patch @@ -57,4 +57,4 @@ +#endif /* ENABLE_DEVICE_MAPPER */ /* lpn = largest partition number. - * for remove pass, use greater --- a/libparted/arch/linux.c \ No newline at end of file + * for remove pass, use greater of device or label limit */ diff --git a/sys-block/parted/parted-3.2.ebuild b/sys-block/parted/parted-3.2.ebuild index 06abc6bceea6..00c6fd5d3368 100644 --- a/sys-block/parted/parted-3.2.ebuild +++ b/sys-block/parted/parted-3.2.ebuild @@ -48,19 +48,35 @@ src_prepare() { # There is no configure flag for controlling the dev-libs/check test sed -i \ -e "s:have_check=[a-z]*:have_check=$(usex test):g" \ - conf# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-block/parted/parted-3.2.ebuild,v 1.2 2014/07/29 18:16:15 jer Exp $ + configure.ac || die -EAPI=5 + epatch "${FILESDIR}"/${PN}-3.2-devmapper.patch -inherit autotools eutils + eautoreconf +} -DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems" -HOMEPAGE="http://www.gnu.org/software/parted" -SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" +src_configure() { + econf \ + $(use_enable debug) \ + $(use_enable device-mapper) \ + $(use_enable nls) \ + $(use_enable selinux) \ + $(use_enable static-libs static) \ + $(use_with readline) \ + --disable-rpath \ + --disable-silent-rules +} -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="+debug device-mapper nls readlin \ No newline at end of file +src_test() { + if use debug; then + emake check + else + ewarn "Skipping tests because USE=-debug is set" + fi +} +DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp} ) + +src_install() { + default + prune_libtool_files +} diff --git a/sys-boot/elilo/elilo-3.12.ebuild b/sys-boot/elilo/elilo-3.12.ebuild index 34bf1fd03f79..cdf4bd97290f 100644 --- a/sys-boot/elilo/elilo-3.12.ebuild +++ b/sys-boot/elilo/elilo-3.12.ebuild @@ -46,20 +46,26 @@ src_compile() { case $(tc-arch) in ia64) iarch=ia64 ;; x86) iarch=ia32 ;; - amd64) iarch=x86_64 # Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/elilo/elilo-3.12.ebuild,v 1.3 2011/04/02 12:00:12 armin76 Exp $ + amd64) iarch=x86_64 ;; + *) die "unknown architecture: $(tc-arch)" ;; + esac -inherit toolchain-funcs eutils + # "prefix" on the next line specifies where to find gcc, as, ld, + # etc. It's not the usual meaning of "prefix". By blanking it we + # allow PATH to be searched. + emake -j1 prefix= CC="$(tc-getCC)" ARCH=${iarch} || die "emake failed" +} -DESCRIPTION="Linux boot loader for EFI-based systems such as IA-64" -HOMEPAGE="http://elilo.sourceforge.net/" -SRC_URI="mirror://sourceforge/elilo/${P}-source.tar.gz" -SRC_URI="${SRC_URI} mirror://debian/pool/main/e/elilo/elilo_3.12-1.diff.gz" +src_install() { + exeinto /usr/lib/elilo + doexe elilo.efi || die "elilo.efi failed" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ia64 ~x86" -IUSE="" + newsbin debian/elilo.sh elilo || die "elilo failed" + dosbin tools/eliloalt || die "eliloalt failed" + + insinto /etc + newins "${FILESDIR}"/elilo.conf.sample elilo.conf -# gnu-efi contains only static libs, so there's no run-time dep on it \ No newline at end of file + dodoc docs/* "${FILESDIR}"/elilo.conf.sample + doman debian/*.[0-9] +} diff --git a/sys-boot/grub/files/2.02_beta2/0008-Fix-an-infinite-loop-in-grub-mkconfig.patch b/sys-boot/grub/files/2.02_beta2/0008-Fix-an-infinite-loop-in-grub-mkconfig.patch index ee99fb584830..ba0c029234bf 100644 --- a/sys-boot/grub/files/2.02_beta2/0008-Fix-an-infinite-loop-in-grub-mkconfig.patch +++ b/sys-boot/grub/files/2.02_beta2/0008-Fix-an-infinite-loop-in-grub-mkconfig.patch @@ -50,34 +50,34 @@ diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in index 00d1931..d2e2a8f 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in -@@ -241,7 +241,7 @@ while [ "x$list" != "x" ] ;From 21a85381a1586a0989f2cf9d151b746231984c92 Mon Sep 17 00:00:00 2001 -From: Colin Watson -Date: Tue, 8 Jul 2014 23:54:30 +0100 -Subject: [PATCH 8/8] Fix an infinite loop in grub-mkconfig - -* util/grub.d/10_hurd.in: Make kernel list progression not fail on -kernels whose paths contain regex metacharacters. -* util/grub.d/10_kfreebsd.in: Likewise. -* util/grub.d/10_linux.in: Likewise. -* util/grub.d/20_linux_xen.in: Likewise. - -Reported by: Heimo Stranner. - -Conflicts: - ChangeLog ---- - util/grub.d/10_hurd.in | 2 +- - util/grub.d/10_kfreebsd.in | 2 +- - util/grub.d/10_linux.in | 2 +- - util/grub.d/20_linux_xen.in | 4 ++-- - 4 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/util/grub.d/10_hurd.in b/util/grub.d/10_hurd.in -index 82dfe19..29b4554 100644 ---- a/util/grub.d/10_hurd.in -+++ b/util/grub.d/10_hurd.in -@@ -168,7 +168,7 @@ while [ "x$kernels" != "x" ] ; do - hurd_entry "$kernel" advanced - hurd_entry "$kernel" recovery +@@ -241,7 +241,7 @@ while [ "x$list" != "x" ] ; do + "single ${GRUB_CMDLINE_LINUX}" + fi + +- list=`echo $list | tr ' ' '\n' | grep -vx $linux | tr '\n' ' '` ++ list=`echo $list | tr ' ' '\n' | fgrep -vx "$linux" | tr '\n' ' '` + done + + # If at least one kernel was found, then we need to +diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in +index a608435..2e77758 100644 +--- a/util/grub.d/20_linux_xen.in ++++ b/util/grub.d/20_linux_xen.in +@@ -255,12 +255,12 @@ while [ "x${xen_list}" != "x" ] ; do + "single ${GRUB_CMDLINE_LINUX}" "${GRUB_CMDLINE_XEN}" + fi -- kernels=`echo $kernels | tr \ No newline at end of file +- list=`echo $list | tr ' ' '\n' | grep -vx $linux | tr '\n' ' '` ++ list=`echo $list | tr ' ' '\n' | fgrep -vx "$linux" | tr '\n' ' '` + done + if [ x"$is_top_level" != xtrue ]; then + echo ' }' + fi +- xen_list=`echo $xen_list | tr ' ' '\n' | grep -vx $current_xen | tr '\n' ' '` ++ xen_list=`echo $xen_list | tr ' ' '\n' | fgrep -vx "$current_xen" | tr '\n' ' '` + done + + # If at least one kernel was found, then we need to +-- +2.1.0 + diff --git a/sys-boot/os-prober/os-prober-1.56.ebuild b/sys-boot/os-prober/os-prober-1.56.ebuild index f2a2e3267e34..c011313ab69f 100644 --- a/sys-boot/os-prober/os-prober-1.56.ebuild +++ b/sys-boot/os-prober/os-prober-1.56.ebuild @@ -54,13 +54,15 @@ src_install() { done if use amd64 || use x86; then - exeinto /usr/lib/os-probes/# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/os-prober/os-prober-1.56.ebuild,v 1.1 2012/10/14 19:10:30 abcd Exp $ - -EAPI=4 + exeinto /usr/lib/os-probes/mounted + doexe os-probes/mounted/powerpc/20macosx + fi -#inherit eutils multilib toolchain-funcs -inherit toolchain-funcs + dodoc README TODO debian/changelog +} -DESCRIPTION="Utility to detect other OSs on a set o \ No newline at end of file +pkg_postinst() { + elog "If you intend for os-prober to detect versions of Windows installed on" + elog "NTFS-formatted partitions, your system must be capable of reading the" + elog "NTFS filesystem. One way to do this is by installing sys-fs/ntfs3g" +} diff --git a/sys-boot/raspberrypi-mkimage/files/raspberrypi-mkimage-0_p20120201-imagetool-uncompressed.patch b/sys-boot/raspberrypi-mkimage/files/raspberrypi-mkimage-0_p20120201-imagetool-uncompressed.patch index 9966593990bd..6b12c95c0fbe 100644 --- a/sys-boot/raspberrypi-mkimage/files/raspberrypi-mkimage-0_p20120201-imagetool-uncompressed.patch +++ b/sys-boot/raspberrypi-mkimage/files/raspberrypi-mkimage-0_p20120201-imagetool-uncompressed.patch @@ -21,21 +21,29 @@ diff -ru raspberrypi-mkimage-0_p20120201.orig/imagetool-uncompressed.py raspberr +parser.add_argument('kernel', + help='kernel file from /usr/src/linux*/arch/arm/boot/Image') +parser.add_argument('bootimage', -+ help='file to be placed in /boot/kdiff -ru raspberrypi-mkimage-0_p20120201.orig/imagetool-uncompressed.py raspberrypi-mkimage-0_p20120201/imagetool-uncompressed.py ---- raspberrypi-mkimage-0_p20120201.orig/imagetool-uncompressed.py 2013-07-19 15:11:23.373837900 +0200 -+++ raspberrypi-mkimage-0_p20120201/imagetool-uncompressed.py 2013-07-19 15:31:56.495421758 +0200 -@@ -3,15 +3,23 @@ - import os - import re - import sys -+import argparse ++ help='file to be placed in /boot/kernel.img') ++args = parser.parse_args() ++if os.path.exists(args.bootimage) and not args.force: ++ print('Target file exists, use --force to override') ++ sys.exit(1) ++ ++f = open(args.kernel, 'rb') ++kernel_image = f.read() ++f.close() + + re_line = re.compile(r"0x(?P[0-9a-f]{8})") --try: -- kernel_image = sys.argv[1] --except: -- kernel_image = "" +@@ -35,11 +43,10 @@ + load_to_mem("boot-uncompressed.txt", 0x00000000) + load_to_mem("args-uncompressed.txt", 0x00000100) + +-f = open("first32k.bin", "wb") ++f = open(args.bootimage, "wb") + + for m in mem: + f.write(chr(m)) + ++f.write(kernel_image) + f.close() - --if kernel_image == "": -- print("usage : imagetool-uncompressed.py "); -- sys.exit(0) -+parser = argparse.ArgumentParser(descriptio \ No newline at end of file +-os.system("cat first32k.bin " + kernel_image + " > kernel.img") diff --git a/sys-boot/sgibootcd/Manifest b/sys-boot/sgibootcd/Manifest index 9f6013f4cbc6..5e147fc072ad 100644 --- a/sys-boot/sgibootcd/Manifest +++ b/sys-boot/sgibootcd/Manifest @@ -1,2 +1 @@ DIST sgibootcd-0.12.tar.bz2 3810 SHA256 2b0bfd0ebaa218fec414ff7102b8128dc658110fbeac83a510dc87d6559f299c SHA512 180e4f5a185b14c0b2c8158b368a50a3a55673fa86760e2a424c9533b1bb8ec37824c715ba02fd264621e2e31906ddd310398e9f24cf19147bce3e49fc62da3e WHIRLPOOL a1c98b2b6fc48201f4db47ac3a48cd64bb84becd5d664a8418a02115c47cb462e527aa1ba1dad4c58367441178101fe2661e9e2b08f67f1c8566f73e3c9eb08c -DIST sgibootcd-0.12.tar.bz2 3810 SHA256 2b0bfd0ebaa218fec414ff7102b8128dc658110fbeac83a510dc87d6559f299c SHA512 180e4f5a185b14c0b2c8158b368a50a3a55673fa86760e2a424c9533b1bb8ec37824c715ba02fd264621e2e31906ddd310398e9f24cf19147bce3e49fc62da3e WHIRLPOOL a1c98b2b6fc48201f4db47ac3a48cd64bb84becd5d664a8418a02115c47cb462e527aa1ba1dad4c58367441178101fe2661e9e2b08f67f1c8566f73e3c9eb08c diff --git a/sys-boot/syslinux/syslinux-3.86.ebuild b/sys-boot/syslinux/syslinux-3.86.ebuild index b47039e3c4da..34083df01fc9 100644 --- a/sys-boot/syslinux/syslinux-3.86.ebuild +++ b/sys-boot/syslinux/syslinux-3.86.ebuild @@ -23,26 +23,34 @@ DEPEND="${RDEPEND} # This departure is necessary since hpa doesn't support the rebuilding of anything other # than the installers. -# removed all the unpack/patching stuff since we a# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-3.86.ebuild,v 1.6 2012/06/27 13:31:31 chithanh Exp $ +# removed all the unpack/patching stuff since we aren't rebuilding the core stuff anymore -inherit eutils toolchain-funcs +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${PN}-3.86-nopie.patch -DESCRIPTION="SysLinux, IsoLinux and PXELinux bootloader" -HOMEPAGE="http://syslinux.zytor.com/" -SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${PV:0:1}.xx/${P}.tar.bz2" + rm -f gethostip #bug 137081 -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="-* amd64 x86" -IUSE="custom-cflags" + local SYSLINUX_MAKEFILES="extlinux/Makefile linux/Makefile mtools/Makefile \ + sample/Makefile utils/Makefile" + sed -i ${SYSLINUX_MAKEFILES} -e '/^LDFLAGS/d' || die "sed failed" -RDEPEND="sys-fs/mtools - dev-perl/Crypt-PasswdMD5 - dev-perl/Digest-SHA1" -DEPEND="${RDEPEND} - dev-lang/nasm" + if use custom-cflags; then + sed -i ${SYSLINUX_MAKEFILES} \ + -e 's|-g -Os||g' \ + -e 's|-Os||g' \ + -e 's|CFLAGS[[:space:]]\+=|CFLAGS +=|g' \ + || die "sed custom-cflags failed" + fi -# This ebuild is a departure from the old way of rebuilding everything in syslinux -# This departure is neces \ No newline at end of file +} + +src_compile() { + emake CC=$(tc-getCC) installer || die +} + +src_install() { + emake INSTALLSUBDIRS=utils INSTALLROOT="${D}" MANDIR=/usr/share/man install || die + dodoc README NEWS TODO doc/* +} diff --git a/sys-boot/vboot-utils/Manifest b/sys-boot/vboot-utils/Manifest index ad41774a9d73..1289ff846208 100644 --- a/sys-boot/vboot-utils/Manifest +++ b/sys-boot/vboot-utils/Manifest @@ -1,2 +1 @@ DIST vboot-utils-20130222gite6cf2c2-3.fc19.src.rpm 2170079 SHA256 f20235e5f708bcbe3b30cb684a5aa9fa3f60d1fdea454375db0e62bebabd0c41 SHA512 ccb5320f01d270ff30465e6ffc234d245220afdb9628f9b5f9e8abc7c91c5e58085b5e8eefe217e85faa18166576d945cad9f757d99927389473cb0a4337a05f WHIRLPOOL 9da1a4f503619c9754e4c0b1c2d52deb4c687e693ba521213e2406cba417f5b8ce5645285ed2e106c0d05f56bd325dc7f929692c5de2ff1be2bb7fe191f74c68 -DIST vboot-utils-20130222gite6cf2c2-3.fc19.src.rpm 2170079 SHA256 f20235e5f708bcbe3b30cb684a5aa9fa3f60d1fdea454375db0e62bebabd0c41 SHA512 ccb5320f01d270ff30465e6ffc234d245220afdb9628f9b5f9e8abc7c91c5e58085b5e8eefe217e85faa18166576d945cad9f757d99927389473cb0a4337a05f WHIRLPOOL 9da1a4f503619c9754e4c0b1c2d52deb4c687e693ba521213e2406cba417f5b8ce5645285ed2e106c0d05f56bd325dc7f929692c5de2ff1be2bb7fe191f74c68 diff --git a/sys-boot/yaboot/files/yaboot-1.3.17-nopiessp-gcc4.patch b/sys-boot/yaboot/files/yaboot-1.3.17-nopiessp-gcc4.patch index fdf5eeb57ce7..8e060e54c2e8 100644 --- a/sys-boot/yaboot/files/yaboot-1.3.17-nopiessp-gcc4.patch +++ b/sys-boot/yaboot/files/yaboot-1.3.17-nopiessp-gcc4.patch @@ -9,17 +9,6 @@ diff -Nrup yaboot-1.3.13.orig/Config.gentoo yaboot-1.3.13/Config.gentoo +CFLAGS += $(call check_gcc, --nopie) + diff -Nrup yaboot-1.3.13.orig/Makefile yaboot-1.3.13/Makefile ---- yaboot-1.3.13.orig/Makefile 2004-07-11 20:12:03.0000000diff -Nrup yaboot-1.3.13.orig/Config.gentoo yaboot-1.3.13/Config.gentoo ---- yaboot-1.3.13.orig/Config.gentoo 1970-01-01 00:00:00.000000000 +0000 -+++ yaboot-1.3.13/Config.gentoo 2005-06-12 00:41:14.889576152 +0000 -@@ -0,0 +1,6 @@ -+check_gcc=$(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \ -+ then echo "$(1)"; else echo "$(2)"; fi) -+ -+CFLAGS += $(call check_gcc, -fno-stack-protector) -+CFLAGS += $(call check_gcc, --nopie) -+ -diff -Nrup yaboot-1.3.13.orig/Makefile yaboot-1.3.13/Makefile --- yaboot-1.3.13.orig/Makefile 2004-07-11 20:12:03.000000000 +0000 +++ yaboot-1.3.13/Makefile 2005-06-12 00:41:14.890576000 +0000 @@ -1,6 +1,7 @@ @@ -33,4 +22,21 @@ diff -Nrup yaboot-1.3.13.orig/Makefile yaboot-1.3.13/Makefile @@ -79,7 +80,7 @@ HOSTCFLAGS = -O2 $(CFLAGS) -Wall -I/usr/ second/fs_of.o second/fs_ext2.o second/fs_iso.o second/fs_swap.o \ second/iso_util.o \ - lib/n \ No newline at end of file + lib/nonstd.o \ +- lib/nosys.o lib/string.o lib/strtol.o lib/vsprintf.o lib/ctype.o lib/malloc.o lib/strstr.o ++ lib/nosys.o lib/string.o lib/strtol.o lib/vsprintf.o lib/ctype.o lib/malloc.o lib/strstr.o lib/ssp.o + + ifeq ($(USE_MD5_PASSWORDS),y) + OBJS += second/md5.o +diff -Naur yaboot-1.3.14.orig/lib/ssp.c yaboot-1.3.14/lib/ssp.c +--- yaboot-1.3.14.orig/lib/ssp.c 1970-01-01 00:00:00.000000000 +0000 ++++ yaboot-1.3.14/lib/ssp.c 2010-06-20 18:50:57.000000000 +0000 +@@ -0,0 +1,7 @@ ++extern void __stack_chk_fail_local (void) ; ++ ++void ++__stack_chk_fail_local (void) ++{ ++ return; ++} + diff --git a/sys-boot/yaboot/files/yaboot-nopiessp.patch b/sys-boot/yaboot/files/yaboot-nopiessp.patch index 0263bb0dcbb5..32e64392b730 100644 --- a/sys-boot/yaboot/files/yaboot-nopiessp.patch +++ b/sys-boot/yaboot/files/yaboot-nopiessp.patch @@ -27,16 +27,25 @@ diff -Nrup yaboot-1.3.13.orig/Makefile yaboot-1.3.13/Makefile + lib/nosys.o lib/string.o lib/strtol.o lib/vsprintf.o lib/ctype.o lib/malloc.o lib/strstr.o lib/ssp.o ifeq ($(USE_MD5_PASSWORDS),y) - Odiff -Nrup yaboot-1.3.13.orig/Config.gentoo yaboot-1.3.13/Config.gentoo ---- yaboot-1.3.13.orig/Config.gentoo 1970-01-01 00:00:00.000000000 +0000 -+++ yaboot-1.3.13/Config.gentoo 2005-06-12 00:41:14.889576152 +0000 -@@ -0,0 +1,6 @@ -+check_gcc=$(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \ -+ then echo "$(1)"; else echo "$(2)"; fi) + OBJS += second/md5.o +diff -Nrup yaboot-1.3.13.orig/lib/ssp.c yaboot-1.3.13/lib/ssp.c +--- yaboot-1.3.13.orig/lib/ssp.c 1970-01-01 00:00:00.000000000 +0000 ++++ yaboot-1.3.13/lib/ssp.c 2005-06-12 00:42:17.087120688 +0000 +@@ -0,0 +1,17 @@ ++unsigned long __guard = 0UL; ++static void __guard_setup (void) __attribute__ ((constructor)); ++void __stack_smash_handler (char func[], int damaged ++ __attribute__ ((unused))); ++static void ++__guard_setup (void) ++{ ++ if (__guard != 0UL) ++ return; ++ __guard = 0xFF0A0D00UL; ++} + -+CFLAGS += $(call check_gcc, -fno-stack-protector) -+CFLAGS += $(call check_gcc, --nopie) -+ -diff -Nrup yaboot-1.3.13.orig/Makefile yaboot-1.3.13/Makefile ---- yaboot-1.3.13.orig/Makefile 2004-07-11 20:12:03.000000000 +0000 -+++ yaboot-1 \ No newline at end of file ++void ++__stack_smash_handler (char func[], int damaged) ++{ ++ return; ++} diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild index c14670be1786..69134fbfd84d 100644 --- a/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild +++ b/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild @@ -59,35 +59,37 @@ src_configure() { $(use_enable libnet) \ $(use_enable static-libs static) \ --disable-fatal-warnings \ - --disable-d# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild,v 1.1 2014/07/23 08:51:15 ultrabug Exp $ + --disable-dependency-tracking \ + --docdir=/usr/share/doc/${PF} \ + --localstatedir=/var \ + --with-ocf-root=/usr/$(get_libdir)/ocf \ + ${myopts} \ + --with-group-id=$(id -g hacluster) \ + --with-ccmuser-id=$(id -u hacluster) \ + --with-daemon-user=hacluster --with-daemon-group=haclient +} -EAPI=4 +src_install() { + base_src_install -MY_P="${P/cluster-}" -inherit autotools multilib eutils base user + dodir /var/lib/heartbeat/cores + dodir /var/lib/heartbeat/lrm -DESCRIPTION="Library pack for Heartbeat / Pacemaker" -HOMEPAGE="http://www.linux-ha.org/wiki/Cluster_Glue" -SRC_URI="http://hg.linux-ha.org/glue/archive/${MY_P}.tar.bz2" + keepdir /var/lib/heartbeat/cores + keepdir /var/lib/heartbeat/lrm -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~x86" -IUSE="doc libnet static-libs" + # init.d file + cp "${FILESDIR}"/heartbeat-logd.init "${T}/" || die + sed -i \ + -e "s:%libdir%:$(get_libdir):" \ + "${T}/heartbeat-logd.init" || die +# newinitd "${T}/heartbeat-logd.init" heartbeat-logd || die + rm "${D}"/etc/init.d/logd -RDEPEND="app-text/asciidoc - app-arch/bzip2 - app-text/docbook-xml-dtd:4.4 - dev-libs/glib:2 - dev-libs/libaio - libnet? ( net-libs/libnet:1.1 ) - net-misc/curl - net-misc/iputils - || ( net-misc/netkit-telnetd net-misc/telnet-bsd ) - dev-libs/libxml2 - ! -Date: Mon, 1 Jul 2013 20:37:17 -0400 -Subject: [PATCH] hooks: disable malloc override inside of Gentoo s \ No newline at end of file ++ easily by looking for SANDBOX_ON. ++ */ ++ + if (getenv("FAKEROOTKEY") != NULL || +- getenv("FAKED_MODE") != NULL) { ++ getenv("FAKED_MODE") != NULL || ++ getenv("SANDBOX_ON") != NULL ) { + return; + } + +-- +1.8.1.5 + diff --git a/sys-cluster/pacemaker/pacemaker-1.1.10.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.10.ebuild index 93a4e3691a7c..f935ce715afc 100644 --- a/sys-cluster/pacemaker/pacemaker-1.1.10.ebuild +++ b/sys-cluster/pacemaker/pacemaker-1.1.10.ebuild @@ -80,6 +80,13 @@ src_install() { rm -rf "${D}"/var/run "${D}"/etc/init.d newinitd "${FILESDIR}/${PN}.initd" ${PN} || die if has_version "::" \ - -i lib/# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.1.8-r2.ebuild,v 1.1 2013/04/23 08:04:02 ultrabug Exp $ - -EAPI=4 - -PYTHON_DEPEND="2" - -inherit autotools base python - -MY_PN=Pacemaker -MY_P=${MY_PN}-${PV} -MY_TREE="1f8858c" + -i lib/ais/plugin.c || die + eautoreconf + python_convert_shebangs -r 2 . +} -DESCRIPTION="Pacemaker CRM" -HOMEPAGE="http://www.linux-ha.org/wiki/Pacemaker" -SRC_URI="https://github.com/ClusterLabs/${PN}/tarball/${MY_P} -> ${P}.tar.gz" +src_configure() { + local myopts="" + if use heartbeat ; then + myopts="--without-corosync" + else + myopts="--with-ais" + fi + # appends lib to localstatedir automatically + econf \ + --localstatedir=/var \ + --disable-dependency-tracking \ + --disable-fatal-warnings \ + $(use_with acl) \ + $(use_with cman cs-quorum) \ + $(use_with cman cman) \ + $(use_with heartbeat) \ + $(use_with smtp esmtp) \ + $(use_with snmp) \ + $(use_enable static-libs static) \ + ${myopts} +} -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~x86" -REQUIRED_USE="cman? ( !heartbeat )" -IUSE="acl cman heartbeat smtp snmp static-libs" +src_install() { + base_src_install + rm -rf "${D}"/var/run + newinitd "${FILESDIR}/${PN}.initd" ${PN} || die + if has_version " -Date: Tue, 1 Dec 2009 22:07:45 +0100 -Subject: [PATCH 1/1] do not put world-writable directories in distribution tarballs - -* lib/am/distdir.am (distdir): Do not make all directories -group- or world-writable. Instead, use 755. - -Signed-off-by: Ralf Wildenhues ---- - Makefile.in | 3 ++- - lib/am/distdir.am | 9 +++------ - 4 files changed, 17 insertions(+), 8 deletions(-) +-## also make directories writable by everybody, because some +-## brain-dead tar implementations change ownership and permissions of +-## a directory before extracting the files, thus becoming unable to +-## extract them. ++## links into the source tree, in case they're hard-linked. + ## + ## Ignore return result from chmod, because it might give an error + ## if we chmod a symlink. +@@ -207,7 +203,8 @@ endif %?DIST-TARGETS% + ## the file in place in the source tree. + ## + if %?TOPDIR_P% +- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ++ -find "$(distdir)" -type d ! -perm -755 \ ++ -exec chmod u+rwx,go+rx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ +-- +1.6.5.4 -diff --git a/Makefile.in b/Makefile.in -index f6971b4..c753eaa 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -389,7 +389,8 @@ distdir: $(DISTFILES) - || exit 1; \ - fi; \ - done -- -find $(distdir) -type d ! -perm -777 -exec chmod \ No newline at end of file diff --git a/sys-devel/clang/metadata.xml b/sys-devel/clang/metadata.xml index c4b805944353..466ad974778a 100644 --- a/sys-devel/clang/metadata.xml +++ b/sys-devel/clang/metadata.xml @@ -30,5 +30,6 @@ Conformance with C/C++/ObjC and their variants Build all host targets (default: host only) Install the Clang static analyzer - By default, clang++ searchs for C++ headers in a series of hardcoded paths. Enabling this f -By default, clang++ searchs for C++ headers in a series of hardcoded paths. Enabling this flag will force it to use the active gcc profile ones + + diff --git a/sys-devel/dev86/dev86-0.16.20.ebuild b/sys-devel/dev86/dev86-0.16.20.ebuild index 20eff47778b1..bb0c299b407b 100644 --- a/sys-devel/dev86/dev86-0.16.20.ebuild +++ b/sys-devel/dev86/dev86-0.16.20.ebuild @@ -61,12 +61,17 @@ src_compile() { ln -s ncc bcc cd .. cd bootblocks -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/dev86/dev86-0.16.20.ebuild,v 1.2 2014/05/18 17:26:27 vapier Exp $ - -EAPI="5" - -inherit eutils multilib + ln -s ../bcc/version.h . + emake DIST="${D}" +} -DESCRIPTION="Bruce's C compiler - Simple C compiler t \ No newline at end of file +src_install() { + emake -j1 install-all DIST="${D}" + dobin bootblocks/makeboot + # remove all the stuff supplied by bin86 + cd "${D}" + rm usr/bin/{as,ld,nm,objdump,size}86 || die + rm usr/man/man1/{as,ld}86.1 || die + dodir /usr/share/man + mv usr/man usr/share/ +} diff --git a/sys-devel/dwz/Manifest b/sys-devel/dwz/Manifest index 79b0bff0551e..07fbf0f95e09 100644 --- a/sys-devel/dwz/Manifest +++ b/sys-devel/dwz/Manifest @@ -1,2 +1 @@ DIST dwz-0.9.tar.xz 90604 SHA256 b909699372a3a02227184ffd4a22118cb50b975f55df7368d8851de9bb6a4e98 SHA512 ce139fd37cfd8cd6e1b6d162fb4896527122f4cb25685eed73eb3dc9fe7aea5ab85d59fe4e299940f0bc5a7cc7c9fa54236581bd9dc4ffab3cc4d62f0f164cdc WHIRLPOOL 3d9840e725cffa9ec2aabb87c9601c867f3be15bbadb7cbb68a30dcd87792429d402ea01376fb0ee82e4f5c4133dde2a3e5488eb33a7bb583eba193655b0a015 -DIST dwz-0.9.tar.xz 90604 SHA256 b909699372a3a02227184ffd4a22118cb50b975f55df7368d8851de9bb6a4e98 SHA512 ce139fd37cfd8cd6e1b6d162fb4896527122f4cb25685eed73eb3dc9fe7aea5ab85d59fe4e299940f0bc5a7cc7c9fa54236581bd9dc4ffab3cc4d62f0f164cdc WHIRLPOOL 3d9840e725cffa9ec2aabb87c9601c867f3be15bbadb7cbb68a30dcd87792429d402ea01376fb0ee82e4f5c4133dde2a3e5488eb33a7bb583eba193655b0a015 diff --git a/sys-devel/icecream/files/icecream-gentoo-multilib.patch b/sys-devel/icecream/files/icecream-gentoo-multilib.patch index 650473833d96..94c6a41b3af6 100644 --- a/sys-devel/icecream/files/icecream-gentoo-multilib.patch +++ b/sys-devel/icecream/files/icecream-gentoo-multilib.patch @@ -48,8 +48,12 @@ Index: client/main.cpp + + job.setFlags(args); + -+ Index: services/job.h -=================================================================== ---- services/job.h (revision 843731) -+++ services/job.h (working copy) -@@ -57,6 +57,10 @@ \ No newline at end of file ++ free(pch); ++ } ++ ++ free(envar); ++ } ++ + /* if ICECC is set to no, then run job locally */ + char* icecc = getenv("ICECC"); + if ( icecc && !strcasecmp(icecc, "no") ) diff --git a/sys-devel/parity/parity-9999.ebuild b/sys-devel/parity/parity-9999.ebuild index fee16f1a1846..155f5d2fc34b 100644 --- a/sys-devel/parity/parity-9999.ebuild +++ b/sys-devel/parity/parity-9999.ebuild @@ -51,6 +51,7 @@ src_install() { dosym /usr/bin/parity.gnu.ld${exeext} /usr/bin/i586-pc-winnt$(uname -r)-ld # we don't need the header files installed by parity... private - # header files are supporte# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x \ No newline at end of file + # header files are supported with a patch from 2.1.0-r1 onwards, + # so they won't be there anymore, but -f does the job in any case. + rm -f "${ED}"/usr/include/*.h +} diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-8.2.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-8.2.ebuild index f09c76b2f2b1..16393d932e28 100644 --- a/sys-freebsd/freebsd-libexec/freebsd-libexec-8.2.ebuild +++ b/sys-freebsd/freebsd-libexec/freebsd-libexec-8.2.ebuild @@ -10,30 +10,6 @@ DESCRIPTION="FreeBSD libexec things" SLOT="0" KEYWORDS="~sparc-fbsd ~x86-fbsd" -SRC_URI="mirror://gentoo/${LIBEXEC}.tar.bz2 - mirror://gentoo/${UBIN}.tar.bz2 - mirror://gentoo/${BIN}.tar.bz2 - mirror://gentoo/${CONTRIB}.tar.bz2 - mirror://gentoo/${LIB}.tar.bz2 - mirror://gentoo/${ETC}.tar.bz2 - mirror://gentoo/${USBIN}.tar.bz2" - -RDEPEND="=sys-freebsd/freebsd-lib-${RV}* - pam? ( virtual/pam )" -DEPEND="${RDEPEND} - =sys-freebsd/freebsd-mk-defs-${RV}* - =sys-freebsd/freebsd-sou# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/freebsd-libexec-8.2.ebuild,v 1.1 2011/07/06 06:01:18 aballier Exp $ - -EAPI=2 - -inherit bsdmk freebsd pam - -DESCRIPTION="FreeBSD libexec things" -SLOT="0" -KEYWORDS="~sparc-fbsd ~x86-fbsd" - SRC_URI="mirror://gentoo/${LIBEXEC}.tar.bz2 mirror://gentoo/${UBIN}.tar.bz2 mirror://gentoo/${BIN}.tar.bz2 @@ -59,4 +35,31 @@ REMOVE_SUBDIRS="smrsh mail.local tcpd telnetd rshd rlogind lukemftpd ftpd" IUSE="pam ssl kerberos ipv6 nis xinetd" pkg_setup() { - use ipv6 || mymakeopts="${mymakeopts} WITHOUT_IN \ No newline at end of file + use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= " + use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= " + use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= " + use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= " + use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= " + + mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_PF= WITHOUT_RCMDS= " +} + +src_prepare() { + ln -s /usr/include "${WORKDIR}/include" +} + +src_install() { + freebsd_src_install + + insinto /etc + doins "${WORKDIR}/etc/gettytab" + newinitd "${FILESDIR}/bootpd.initd" bootpd + newconfd "${FILESDIR}/bootpd.confd" bootpd + + if use xinetd; then + for rpcd in rstatd rusersd walld rquotad sprayd; do + insinto /etc/xinetd.d + newins "${FILESDIR}/${rpcd}.xinetd" ${rpcd} + done + fi +} diff --git a/sys-freebsd/freebsd-pf/freebsd-pf-9.1.ebuild b/sys-freebsd/freebsd-pf/freebsd-pf-9.1.ebuild index cea2fe7abe19..a16024915b99 100644 --- a/sys-freebsd/freebsd-pf/freebsd-pf-9.1.ebuild +++ b/sys-freebsd/freebsd-pf/freebsd-pf-9.1.ebuild @@ -1,5 +1,4 @@ # Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pf/freebsd-pf-9.1.ebuild,v 1.3 2013/08/09 14:46:27 aballier Exp $ @@ -62,4 +61,7 @@ src_install() { cd "${WORKDIR}"/etc insinto /etc - do \ No newline at end of file + doins pf.os + # pf.initd provided by openrc, but no pf.confd + newconfd "${FILESDIR}/pf.confd" pf +} diff --git a/sys-freebsd/freebsd-pf/freebsd-pf-9.2_rc1.ebuild b/sys-freebsd/freebsd-pf/freebsd-pf-9.2_rc1.ebuild index 86f40165c64f..209d2a8ae71e 100644 --- a/sys-freebsd/freebsd-pf/freebsd-pf-9.2_rc1.ebuild +++ b/sys-freebsd/freebsd-pf/freebsd-pf-9.2_rc1.ebuild @@ -9,20 +9,6 @@ SLOT="0" IUSE="" -# Crypto is needed to have an internal OpenSSL header -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64-fbsd ~x86-fbsd" - SRC_URI="m# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pf/freebsd-pf-9.2_rc1.ebuild,v 1.2 2013/08/11 19:53:39 aballier Exp $ - -inherit bsdmk freebsd user - -DESCRIPTION="FreeBSD's base system libraries" -SLOT="0" - -IUSE="" - # Crypto is needed to have an internal OpenSSL header if [[ ${PV} != *9999* ]]; then KEYWORDS="~amd64-fbsd ~x86-fbsd" @@ -57,4 +43,27 @@ src_unpack() { epatch "${FILESDIR}/${PN}-9.0-bpf.patch" epatch "${FILESDIR}/${PN}-9.0-getline.patch" # Link in kernel sources - ln -s "/us \ No newline at end of file + ln -s "/usr/src/sys" "${WORKDIR}/sys" +} + +src_compile() { + for dir in ${SUBDIRS}; do + einfo "Starting make in ${dir}" + cd "${S}/${dir}" + mkmake || die "Make ${dir} failed" + done +} + +src_install() { + for dir in ${SUBDIRS}; do + einfo "Starting install in ${dir}" + cd "${S}/${dir}" + mkinstall || die "Install ${dir} failed" + done + + cd "${WORKDIR}"/etc + insinto /etc + doins pf.os + # pf.initd provided by openrc, but no pf.confd + newconfd "${FILESDIR}/pf.confd" pf +} diff --git a/sys-freebsd/freebsd-rescue/freebsd-rescue-9.1.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-9.1.ebuild index 95a83ebe6324..1a6717101a6e 100644 --- a/sys-freebsd/freebsd-rescue/freebsd-rescue-9.1.ebuild +++ b/sys-freebsd/freebsd-rescue/freebsd-rescue-9.1.ebuild @@ -13,27 +13,6 @@ LICENSE="BSD zfs? ( CDDL )" IUSE="atm netware nis zfs" -SRC_URI="mirror://gentoo/${UBIN}.tar.bz2 - mirror://gentoo/${CONTRIB}.tar.bz2 - mirror://gentoo/${LIB}.tar.bz2 - mirror://gentoo/${BIN}.tar.bz2 - mirror://gentoo/${SBIN}.tar.bz2 - mirror://gentoo/${USBIN}.tar.bz2 - mi# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-rescue/freebsd-rescue-9.1.ebuild,v 1.1 2013/01/27 21:27:12 aballier Exp $ - -EAPI=2 - -inherit bsdmk freebsd - -DESCRIPTION="FreeBSD's rescue binaries" -SLOT="0" -KEYWORDS="~amd64-fbsd ~x86-fbsd" -LICENSE="BSD zfs? ( CDDL )" - -IUSE="atm netware nis zfs" - SRC_URI="mirror://gentoo/${UBIN}.tar.bz2 mirror://gentoo/${CONTRIB}.tar.bz2 mirror://gentoo/${LIB}.tar.bz2 @@ -61,4 +40,23 @@ DEPEND="sys-devel/flex virtual/pkgconfig =sys-freebsd/freebsd-lib-${RV}*[atm?,netware?] =sys-freebsd/freebsd-sources-${RV}* - =sys-freebsd/freebsd-mk- \ No newline at end of file + =sys-freebsd/freebsd-mk-defs-${RV}*" + +S="${WORKDIR}/rescue" + +pkg_setup() { + use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= " + use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= " + use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= " + use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= " +} + +src_prepare() { + # As they are patches from ${WORKDIR} apply them by hand + cd "${WORKDIR}" + epatch "${FILESDIR}/${PN}"-8.0-pkgconfig_static_libarchive.patch + epatch "${FILESDIR}/${PN}"-7.1-zlib.patch + epatch "${FILESDIR}/${PN}"-9.1-libcleverlink.patch + epatch "${FILESDIR}/${PN}"-9.1-bsdtar.patch + epatch "${FILESDIR}/freebsd-sbin-bsdxml2expat.patch" +} diff --git a/sys-freebsd/freebsd-rescue/freebsd-rescue-9.2_rc1.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-9.2_rc1.ebuild index 90e4f0d0564d..e54a741356f4 100644 --- a/sys-freebsd/freebsd-rescue/freebsd-rescue-9.2_rc1.ebuild +++ b/sys-freebsd/freebsd-rescue/freebsd-rescue-9.2_rc1.ebuild @@ -12,21 +12,6 @@ LICENSE="BSD zfs? ( CDDL )" IUSE="atm netware nis zfs" -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64-fbsd # Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-rescue/freebsd-rescue-9.2_rc1.ebuild,v 1.1 2013/08/11 19:45:47 aballier Exp $ - -EAPI=5 - -inherit bsdmk freebsd toolchain-funcs - -DESCRIPTION="FreeBSD's rescue binaries" -SLOT="0" -LICENSE="BSD zfs? ( CDDL )" - -IUSE="atm netware nis zfs" - if [[ ${PV} != *9999* ]]; then KEYWORDS="~amd64-fbsd ~x86-fbsd" SRC_URI="mirror://gentoo/${UBIN}.tar.bz2 @@ -69,4 +54,23 @@ pkg_setup() { } src_prepare() { - # As they are patches \ No newline at end of file + # As they are patches from ${WORKDIR} apply them by hand + cd "${WORKDIR}" + epatch "${FILESDIR}/${PN}"-7.1-zlib.patch + epatch "${FILESDIR}/freebsd-sbin-bsdxml2expat.patch" +} + +src_compile() { + tc-export CC + # crunchgen is now checks env MAKE. + # Use to force BSD's make + export MAKE=/usr/bin/make + + cd "${WORKDIR}/lib/libarchive" + echo "#include " > bsdxml.h + freebsd_src_compile + export CC="${CC} -L${WORKDIR}/lib/libarchive" + + cd "${S}" + freebsd_src_compile +} diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-8.2-r1.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-8.2-r1.ebuild index 33276f138614..5f6e2006f543 100644 --- a/sys-freebsd/freebsd-sbin/freebsd-sbin-8.2-r1.ebuild +++ b/sys-freebsd/freebsd-sbin/freebsd-sbin-8.2-r1.ebuild @@ -35,43 +35,6 @@ DEPEND="${RDEPEND} S="${WORKDIR}/sbin" -IUSE="atm ipfilter +pf ipv6 # Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/freebsd-sbin-8.2-r1.ebuild,v 1.2 2014/07/24 01:58:41 naota Exp $ - -EAPI=2 - -inherit bsdmk freebsd - -DESCRIPTION="FreeBSD sbin utils" -KEYWORDS="~sparc-fbsd ~x86-fbsd" -SLOT="0" - -SRC_URI="mirror://gentoo/${SBIN}.tar.bz2 - mirror://gentoo/${CONTRIB}.tar.bz2 - mirror://gentoo/${LIB}.tar.bz2 - mirror://gentoo/${LIBEXEC}.tar.bz2 - mirror://gentoo/${USBIN}.tar.bz2 - mirror://gentoo/${ETC}.tar.bz2 - build? ( mirror://gentoo/${SYS}.tar.bz2 )" - -RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[ipv6?,atm?,netware?] - =sys-freebsd/freebsd-libexec-${RV}* - >=dev-libs/expat-2.0.1 - ssl? ( dev-libs/openssl ) - dev-libs/libedit - sys-libs/readline - || ( - sys-process/cronie - sys-process/vixie-cron - ) - atm? ( net-analyzer/bsnmp )" -DEPEND="${RDEPEND} - !build? ( =sys-freebsd/freebsd-sources-${RV}* ) - =sys-freebsd/freebsd-mk-defs-${RV}*" - -S="${WORKDIR}/sbin" - IUSE="atm ipfilter +pf ipv6 build ssl +cxx netware" pkg_setup() { @@ -88,4 +51,44 @@ REMOVE_SUBDIRS="dhclient pfctl pflogd rcorder" PATCHES=( "${FILESDIR}/${PN}-setXid.patch" "${FILESDIR}/${PN}-7.1-zlib.patch" - "${FILESDIR}/${PN \ No newline at end of file + "${FILESDIR}/${PN}-6.2-ldconfig.patch" + "${FILESDIR}/${PN}-6.1-pr102701.patch" + "${FILESDIR}/${PN}-bsdxml2expat.patch" ) + +src_prepare() { + use build || ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" +} + +src_install() { + freebsd_src_install + keepdir /var/log + # Needed by ldconfig: + keepdir /var/run + + # Maybe ship our own sysctl.conf so things like radvd work out of the box. + # New wireless config method requires regdomain.xml in /etc + cd "${WORKDIR}/etc/" + insinto /etc + doins minfree sysctl.conf regdomain.xml || die + + # initd script for idmapd + newinitd "${FILESDIR}/idmapd.initd" idmapd + + # Install a crontab for adjkerntz + insinto /etc/cron.d + newins "${FILESDIR}/adjkerntz-crontab" adjkerntz + + # Install the periodic stuff (needs probably to be ported in a more + # gentooish way) + cd "${WORKDIR}/etc/periodic" + + doperiodic security \ + security/*.ipfwlimit \ + security/*.ipfwdenied || die + + use ipfilter && { doperiodic security \ + security/*.ipfdenied || die ; } + + use pf && { doperiodic security \ + security/*.pfdenied || die ; } +} diff --git a/sys-fs/bindfs/bindfs-1.12.2.ebuild b/sys-fs/bindfs/bindfs-1.12.2.ebuild index e7f27f59a8ac..1adbe922b412 100644 --- a/sys-fs/bindfs/bindfs-1.12.2.ebuild +++ b/sys-fs/bindfs/bindfs-1.12.2.ebuild @@ -22,6 +22,11 @@ DEPEND="${RDEPEND} RESTRICT="test" src_prepare() { - epatch "${F# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/bindfs/bi \ No newline at end of file + epatch "${FILESDIR}"/${PN}-1.10.7-cflags.patch + epatch "${FILESDIR}"/${PN}-1.12.2-ac-config-headers.patch + eautoreconf +} + +src_configure() { + econf $(use_enable debug) +} diff --git a/sys-fs/ntfs3g/ntfs3g-2013.1.13.ebuild b/sys-fs/ntfs3g/ntfs3g-2013.1.13.ebuild index adafd16375e5..5096c5d65b6b 100644 --- a/sys-fs/ntfs3g/ntfs3g-2013.1.13.ebuild +++ b/sys-fs/ntfs3g/ntfs3g-2013.1.13.ebuild @@ -17,33 +17,6 @@ SLOT="0" KEYWORDS="alpha amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux" IUSE="acl debug +external-fuse ntfsdecrypt +ntfsprogs static-libs suid xattr" -RDEPEND="!=dev-libs/libgcrypt-1.2.2:0 - =net-libs/gnutls-1.4.4 - ) - external-fuse? ( >=sys-fs/fuse-2.8.0 )" -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ntfs3g-2013.1.13.ebuild,v 1.13 2014/03/01 22:11:24 mgorny Exp $ - -EAPI=5 -inherit eutils linux-info udev - -MY_PN=${PN/3g/-3g} -MY_P=${MY_PN}_ntfsprogs-${PV} - -DESCRIPTION="Open source read-write NTFS driver that runs under FUSE" -HOMEPAGE="http://www.tuxera.com/community/ntfs-3g-download/" -SRC_URI="http://tuxera.com/opensource/${MY_P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux" -IUSE="acl debug +external-fuse ntfsdecrypt +ntfsprogs static-libs suid xattr" - RDEPEND="!speed);diff -Nru siefs-0.5.orig/siefs/Makefile.am siefs-0.5/siefs/Makefile.am ---- siefs-0.5.orig/siefs/Makefile.am 2005-04-05 14:36:28.000000000 +0000 -+++ siefs-0.5/siefs/Makefile.am 2009-03-03 20:59:05.000000000 +0000 -@@ -9,8 +9,8 @@ - slink_SOURCES = slink.c obex.c obex.h transport.c transport.h comm.c comm.h \ - crcmodel.c crcmodel.h + f = commflags(h->speed); + if (f == -1) return -1; + tio.c_cflag = f; +diff -Nru siefs-0.5.orig/siefs/transport.c siefs-0.5/siefs/transport.c +--- siefs-0.5.orig/siefs/transport.c 2005-04-05 18:06:44.000000000 +0300 ++++ siefs-0.5/siefs/transport.c 2007-05-23 14:13:00.000000000 +0300 +@@ -10,6 +10,7 @@ --LDADD = $(fuseinst)/lib/libfuse.a -lpthread -+LDADD = -lfuse -lpthrea \ No newline at end of file + #include + #include ++#include + #include + #include "comm.h" + #include "crcmodel.h" diff --git a/sys-fs/wpflash/Manifest b/sys-fs/wpflash/Manifest index 9a50b6072235..29c73699c674 100644 --- a/sys-fs/wpflash/Manifest +++ b/sys-fs/wpflash/Manifest @@ -1,2 +1 @@ DIST wpflash.c 25813 RMD160 6398cc7aa9530d8922ac4715fe6ae21a23c2631b SHA1 1ef76d31dc45bfc11a0da48e8baaa84499d70bb3 SHA256 9c2158b14a77ba2baf9e0a136288367f402c60366084288615a459566a046ee3 -DIST wpflash.c 25813 RMD160 6398cc7aa9530d8922ac4715fe6ae21a23c2631b SHA1 1ef76d31dc45bfc11a0da48e8baaa84499d70bb3 SHA256 9c2158b14a77ba2baf9e0a136288367f402c60366084288615a45956 \ No newline at end of file diff --git a/sys-fs/xfsdump/xfsdump-3.1.2.ebuild b/sys-fs/xfsdump/xfsdump-3.1.2.ebuild index 737d74ecd57c..900576175a37 100644 --- a/sys-fs/xfsdump/xfsdump-3.1.2.ebuild +++ b/sys-fs/xfsdump/xfsdump-3.1.2.ebuild @@ -18,19 +18,27 @@ IUSE="" RDEPEND="sys-fs/e2fsprogs !=sys-apps/attr-2.4.19" +DEPEND="${RDEPEND} + sys-devel/gettext" + +src_prepare() { + sed -i \ + -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \ + include/builddefs.in \ + || die + epatch "${FILESDIR}"/${PN}-3.0.5-prompt-overflow.patch #335115 + epatch "${FILESDIR}"/${PN}-3.0.4-no-symlink.patch #311881 +} + +src_configure() { + unset PLATFORM #184564 + export OPTIMIZER=${CFLAGS} + export DEBUG=-DNDEBUG + + econf \ + --libdir=/$(get_libdir) \ + --libexecdir=/usr/$(get_libdir) \ + --sbindir=/sbin +} diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc9-remove-pfmalloc-2-of-3.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc9-remove-pfmalloc-2-of-3.patch index ab4d6fedc385..0a4fd26040e7 100644 --- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc9-remove-pfmalloc-2-of-3.patch +++ b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc9-remove-pfmalloc-2-of-3.patch @@ -36,12 +36,21 @@ index 5ac41c9..2e9f72a 100644 - /* - * Disable the normal reclaim path for zpl_putpage(). This - * ensures that all memory allocations under this call path -- * will never enter direct reclaim. From 78d26b8497b3845fc8130981c76214d6788f7a9d Mon Sep 17 00:00:00 2001 -From: Richard Yao -Date: Mon, 7 May 2012 14:14:45 -0400 -Subject: [PATCH] Revert Fix zpl_writepage() deadlock +- * will never enter direct reclaim. If this were to happen +- * the VM might try to write out additional pages by calling +- * zpl_putpage() again resulting in a deadlock. +- */ +- if (current->flags & PF_MEMALLOC) { +- (void) zfs_putpage(mapping->host, pp, wbc); +- } else { +- current->flags |= PF_MEMALLOC; +- (void) zfs_putpage(mapping->host, pp, wbc); +- current->flags &= ~PF_MEMALLOC; +- } ++ (void) zfs_putpage(mapping->host, pp, wbc); + + return (0); + } +-- +1.7.10 -The commit, cfc9a5c88f91f7b4d606fce89505e1f404691ea5, to fix deadlocks -in zpl_writepage() relied on PF_MEMALLOC. That had the effect of -disabling the direct reclaim path on all allocations originating from -calls to this function \ No newline at end of file diff --git a/sys-libs/libcxxrt/libcxxrt-9999.ebuild b/sys-libs/libcxxrt/libcxxrt-9999.ebuild index 74e86309eeab..b0a758811e86 100644 --- a/sys-libs/libcxxrt/libcxxrt-9999.ebuild +++ b/sys-libs/libcxxrt/libcxxrt-9999.ebuild @@ -54,12 +54,18 @@ multilib_src_test() { cd "${BUILD_DIR}/test" LD_LIBRARY_PATH="${BUILD_DIR}/src:${LD_LIBRARY_PATH}" \ LIBS="-L${BUILD_DIR}/src -lcxxrt -l$(usex libunwind unwind gcc_s) -lc" \ - # Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxxrt/libcxxrt-9999.ebuild,v 1.12 2014/08/10 20:12:23 slyfox Exp $ - -EAPI=5 + emake check +} -EGIT_REPO_URI="git://github.com/pathscale/libcxxrt.git" +multilib_src_install() { + # TODO: See README. Maybe hide it in a subdir and let only libcxx know about + # it. FreeBSD head installs it in /lib + dolib.so src/${PN}.so* + use static-libs && dolib.a src/${PN}.a +} -[ "${PV%9999}" != "${PV}" ] && SCM="git-2" || SCM= \ No newline at end of file +multilib_src_install_all() { + einstalldocs + insinto /usr/include/libcxxrt/ + doins src/cxxabi.h src/unwind*.h +} diff --git a/sys-libs/libstatgrab/Manifest b/sys-libs/libstatgrab/Manifest index 58567cfed2fc..99e8d18de000 100644 --- a/sys-libs/libstatgrab/Manifest +++ b/sys-libs/libstatgrab/Manifest @@ -1,4 +1,2 @@ DIST libstatgrab-0.16.tar.gz 462691 SHA256 8a7adb6f3e322c6974d7ca70abd16dd5d5755d108689f6c77f3b42a1ad3aa184 SHA512 dedfd63f33b4386f2446d614b5ea318072de5f97e7f29a198150fb435c5ef6de2d32b5a5b0f47220ed1eabf92fcda04d3a12810189b8c3e03387dd19d4407a63 WHIRLPOOL b6453c4b01b8ecfdfa5a00238f45c064b54a30ddc9c257da7105ea7baae10de7bd0a29a4579e75b2cf11214ad647afab1af20f92cccc297ded0c575dd565669a DIST libstatgrab-0.17.tar.gz 463224 SHA256 bbaa88c6bde8bd3cf2720b81a26528cc055a7e83e4ea3bdb1d0a3c4287cceb88 -DIST libstatgrab-0.16.tar.gz 462691 SHA256 8a7adb6f3e322c6974d7ca70abd16dd5d5755d108689f6c77f3b42a1ad3aa184 SHA512 dedfd63f33b4386f2446d614b5ea318072de5f97e7f29a198150fb435c5ef6de2d32b5a5b0f47220ed1eabf92fcda04d3a12810189b8c3e03387dd19d4407a63 WHIRLPOOL b6453c4b01b8ecfdfa5a00238f45c064b54a30ddc9c257da7105ea7baae10de7bd0a29a4579e75b2cf11214ad647afab1af20f92cccc297ded0c575dd565669a -DIST libstatgrab-0.17.tar.gz 463224 SHA256 bbaa88c6bde8bd3cf2720b81a26528cc055a7e83e4ea3bdb1d0a3c4287cceb88 diff --git a/sys-libs/libunwind/libunwind-1.0.1-r1.ebuild b/sys-libs/libunwind/libunwind-1.0.1-r1.ebuild index aff0586f49a0..9512bf403b30 100644 --- a/sys-libs/libunwind/libunwind-1.0.1-r1.ebuild +++ b/sys-libs/libunwind/libunwind-1.0.1-r1.ebuild @@ -23,32 +23,6 @@ DOCS=( AUTHORS ChangeLog NEWS README TODO ) QA_DT_NEEDED_x86_fbsd="usr/lib/libunwind.so.7.0.0" -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.0# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libunwind/libunwind-1.0.1-r1.ebuild,v 1.8 2012/12/17 17:04:24 ago Exp $ - -EAPI="4" - -inherit autotools eutils - -DESCRIPTION="Portable and efficient API to determine the call-chain of a program" -HOMEPAGE="http://savannah.nongnu.org/projects/libunwind" -SRC_URI="http://download.savannah.nongnu.org/releases/libunwind/${P}.tar.gz" - -LICENSE="MIT" -SLOT="7" -KEYWORDS="amd64 ~arm ia64 ~ppc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="debug debug-frame static-libs" - -# https://savannah.nongnu.org/bugs/?22368 -# https://bugs.gentoo.org/273372 -RESTRICT="test" - -DOCS=( AUTHORS ChangeLog NEWS README TODO ) - -QA_DT_NEEDED_x86_fbsd="usr/lib/libunwind.so.7.0.0" - src_prepare() { epatch "${FILESDIR}"/${PN}-1.0.1-disable-setjmp.patch epatch "${FILESDIR}"/${PN}-1.0.1-ia64.patch #425736 @@ -59,4 +33,28 @@ src_configure() { # do not $(use_enable) because the configure.in is broken and parses # --disable-debug the same as --enable-debug. # https://savannah.nongnu.org/bugs/index.php?34324 - # \ No newline at end of file + # --enable-cxx-exceptions: always enable it, headers provide the interface + # and on some archs it is disabled by default causing a mismatch between the + # API and the ABI, bug #418253 + # conservative-checks: validate memory addresses before use; as of 1.0.1, + # only x86_64 supports this, yet may be useful for debugging, couple it with + # debug useflag. + econf \ + --enable-cxx-exceptions \ + $(use_enable debug-frame) \ + $(use_enable static-libs static) \ + $(use_enable debug conservative_checks) \ + $(use debug && echo --enable-debug) +} + +src_test() { + # explicitly allow parallel build of tests + emake check +} + +src_install() { + default + # libunwind-ptrace.a (and libunwind-ptrace.h) is separate API and without + # shared library, so we keep it in any case + use static-libs || rm -f "${ED}"usr/lib*/libunwind{-generic.a,*.la} +} diff --git a/sys-libs/libunwind/libunwind-1.1.ebuild b/sys-libs/libunwind/libunwind-1.1.ebuild index 7c5d2fbc6fad..8660eeb0e79a 100644 --- a/sys-libs/libunwind/libunwind-1.1.ebuild +++ b/sys-libs/libunwind/libunwind-1.1.ebuild @@ -37,37 +37,34 @@ src_prepare() { } src_configure() { - # do not $(use_enable) b# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libunwind/libunwind-1.1.ebuild,v 1.15 2014/04/16 07:22:16 ago Exp $ - -EAPI="5" - -inherit eutils libtool - -DESCRIPTION="Portable and efficient API to determine the call-chain of a program" -HOMEPAGE="http://savannah.nongnu.org/projects/libunwind" -SRC_URI="http://download.savannah.nongnu.org/releases/libunwind/${P}.tar.gz" - -LICENSE="MIT" -SLOT="7" -KEYWORDS="amd64 arm hppa ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" -IUSE="debug debug-frame libatomic lzma static-libs" - -RESTRICT="test" #461958 -- re-enable tests with >1.1 again for retesting, this is here for #461394 - -# We just use the header from libatomic. -RDEPEND="lzma? ( app-arch/xz-utils )" -DEPEND="${RDEPEND} - libatomic? ( dev-libs/libatomic_ops )" - -DOCS=( AUTHORS ChangeLog NEWS README TODO ) - -QA_DT_NEEDED_x86_fbsd="usr/lib/libunwind.so.7.0.0" + # do not $(use_enable) because the configure.in is broken and parses + # --disable-debug the same as --enable-debug. + # https://savannah.nongnu.org/bugs/index.php?34324 + # --enable-cxx-exceptions: always enable it, headers provide the interface + # and on some archs it is disabled by default causing a mismatch between the + # API and the ABI, bug #418253 + # conservative-checks: validate memory addresses before use; as of 1.0.1, + # only x86_64 supports this, yet may be useful for debugging, couple it with + # debug useflag. + ac_cv_header_atomic_ops_h=$(usex libatomic) \ + econf \ + --enable-cxx-exceptions \ + $(use_enable debug-frame) \ + $(use_enable lzma minidebuginfo) \ + $(use_enable static-libs static) \ + $(use_enable debug conservative_checks) \ + $(use debug && echo --enable-debug) +} -src_prepare() { - # These tests like to fail. bleh. - echo 'int main(){return 0;}' > tests/Gtest-dyn1.c - echo 'int main(){return 0;}' > tests/Ltest-dyn1.c +src_test() { + # Explicitly allow parallel build of tests. + # Sandbox causes some tests to freak out. + SANDBOX_ON=0 emake check +} - sed -i -e '/LIBLZMA/s:-lz \ No newline at end of file +src_install() { + default + # libunwind-ptrace.a (and libunwind-ptrace.h) is separate API and without + # shared library, so we keep it in any case + use static-libs || find "${ED}"usr '(' -name 'libunwind-generic.a' -o -name 'libunwind*.la' ')' -delete +} diff --git a/sys-libs/libvpd/Manifest b/sys-libs/libvpd/Manifest index de08546550f4..04d326a6c7e3 100644 --- a/sys-libs/libvpd/Manifest +++ b/sys-libs/libvpd/Manifest @@ -1,4 +1,2 @@ DIST libvpd-2.1.3.tar.gz 116493 SHA256 18390b1c272c774b153615a84d4f4e683da08156daf5a0b001c3c07f54d422ae SHA512 f5aac9253752552674ac6c54dd3e6dbdd7ff79867740076d6e19782940b809e53736a11e668978d8d73bf636d92d1daeb78080e5fd31c4febc2257e5497c373c WHIRLPOOL a0f34265c865282a755092c854521d538bbb633b92ff8004a7b8f4949a91bfd924ca156edd4357f67fbf62c7456e0785887a6e62e67f385d348aae8836c4b199 DIST libvpd-2.2.0.tar.gz 349527 SHA256 50ec6965471fff4526997611d10c23ec1ff507c7ee9fc117d1667ee9135b9af4 SHA512 3d64b99bbb63771d174348e892aa186bf6b23cd9e0939b2285ee0ae7bd33d69f08841de19d6bc11f26a0c0c5603592091a32bbd1fd0dcef50ffa6f532fe7b452 WHIRLPOOL f94e8f7d5551837e8205d3a553f5da9143c3e0d461c22de4a4172ba4a41b0ae758c8d1664a9742c5182bc136b0eb556f001474c04f57edfac87c951376651907 -DIST libvpd-2.1.3.tar.gz 116493 SHA256 18390b1c272c774b153615a84d4f4e683da08156daf5a0b001c3c07f54d422ae SHA512 f5aac9253752552674ac6c54dd3e6dbdd7ff79867740076d6e19782940b809e53736a11e668978d8d73bf636d92d1daeb78080e5fd31c4febc2257e5497c373c WHIRLPOOL a0f34265c865282a755092c854521d538bbb633b92ff8004a7b8f4949a91bfd924ca156edd4357f67fbf62c7456e0785887a6e62e67f385d348aae8836c4b199 -DIST libvpd-2.2.0.tar.gz 349527 SHA256 50ec6965471fff4526997611d10c23ec1ff507c7ee9fc117d1667ee9135b9af4 SHA512 3d64b99bbb63771d174348e892aa186bf6b23cd9e0939b2285ee0ae7bd33d69f08841de19d6bc11f26a0c0c5603592091a32bbd1fd0dcef50ffa6f532fe7b452 WHIRLPOOL f94e8f7d5551837e8205d3a553f5da9143c3e0d461c22de4a4172ba4a41b0ae758c8d1664a9742c5182bc136b0eb556f001474c04f57edfac87c951376651907 diff --git a/sys-libs/zlib/files/zlib-1.2.3-LDFLAGS.patch b/sys-libs/zlib/files/zlib-1.2.3-LDFLAGS.patch index ec3fd267e730..86da956eb5f4 100644 --- a/sys-libs/zlib/files/zlib-1.2.3-LDFLAGS.patch +++ b/sys-libs/zlib/files/zlib-1.2.3-LDFLAGS.patch @@ -21,15 +21,11 @@ example$(EXE): example.o $(LIBS) - $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS) -+ $(CC) $(CFLAGS) -o $@ examp--- zlib-1.2.3/Makefile.in -+++ zlib-1.2.3/Makefile.in -@@ -24,7 +24,7 @@ - #CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ - # -Wstrict-prototypes -Wmissing-prototypes ++ $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS) $(TEST_LDFLAGS) --LDFLAGS=libz.a -+TEST_LDFLAGS=libz.a - LDSHARED=$(CC) - CPP=$(CC) -E + minigzip$(EXE): minigzip.o $(LIBS) +- $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) ++ $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) $(TEST_LDFLAGS) -@@ -8 \ No newline at end of file + install-libs: $(LIBS) + -@if [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi diff --git a/sys-power/iasl/iasl-20090123.ebuild b/sys-power/iasl/iasl-20090123.ebuild index 0cc06fe8b395..555e349d4251 100644 --- a/sys-power/iasl/iasl-20090123.ebuild +++ b/sys-power/iasl/iasl-20090123.ebuild @@ -17,27 +17,6 @@ SLOT="0" KEYWORDS="amd64 ppc x86 ~x86-fbsd" IUSE="test" -DEPEND="sys-devel/bison - sys-devel/flex" -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/iasl/iasl-20090123.ebuild,v 1.9 2014/03/26 14:16:40 polynomial-c Exp $ - -inherit toolchain-funcs flag-o-matic eutils - -MY_PN=acpica-unix -MY_P=${MY_PN}-${PV} -MY_TESTS_P=${MY_PN/ca/tests}-${PV} -DESCRIPTION="Intel ACPI Source Language (ASL) compiler" -HOMEPAGE="https://www.acpica.org/downloads/" -SRC_URI="http://www.acpica.org/sites/acpica/files/${MY_P}.tar.gz - test? ( http://www.acpica.org/sites/acpica/files/${MY_TESTS_P}.tar.gz )" - -LICENSE="iASL" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~x86-fbsd" -IUSE="test" - DEPEND="sys-devel/bison sys-devel/flex" RDEPEND="" @@ -123,4 +102,23 @@ aslts_test() { echo "$ASLTSDIR" >"${T}"/asltdir cd "${ASLTSDIR}" edos2unix $(find . -type 'f') - make install \ No newline at end of file + make install || die "make install aslts test failed" + chmod +x $(find bin/ | sed -r -e '/\/[A-Z_]+$/d') || die "chmod bin +x failed" + + #The below Do commands runs the tests twice and then dies if the results aren't + #Identical. + Do 1 || die "failed Do 1" + Do 2 || die "failed Do 2" +} + +aapits_test() { + mv "${WORKDIR}/${MY_TESTS_P}/tests/aapits" "${S}/tools/" || die "mv failed" + cd "${S}/tools/aapits" || die "cannot find ${S}/tools/aapits" + edos2unix $(find . -type 'f') + chmod +x $(find bin/ | sed -r -e '/\/[A-Z_]+$/d') || die "chmod bin +x failed" + make || die "make in aapits failed" + cd asl || die "cd asl failed" + make || die "make in asl failed" + cd ../bin + ./aapitsrun || die "aapitsrun failed" +} diff --git a/sys-process/at/at-3.1.13-r2.ebuild b/sys-process/at/at-3.1.13-r2.ebuild index 003aa3ffb1e9..0a59d619562b 100644 --- a/sys-process/at/at-3.1.13-r2.ebuild +++ b/sys-process/at/at-3.1.13-r2.ebuild @@ -37,41 +37,47 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-3.1.10.2-Makefile.in-parallel-make-fix.patch epatch "${FILESDIR}"/${P}-configure.in-fix-PAM-automagick-dep.patch # Fix parallel make issue (bug #408375) - epatch "${FILESDIR}"/${PN}-3.1.13-parallel-make-fix.patc# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/at/at-3.1.13-r2.ebuild,v 1.11 2013/09/14 10:56:55 ago Exp $ + epatch "${FILESDIR}"/${PN}-3.1.13-parallel-make-fix.patch + epatch "${FILESDIR}"/${PN}-3.1.13-getloadavg.patch -EAPI=4 + eautoconf +} -inherit autotools eutils flag-o-matic pam user systemd +src_configure() { + use pam || my_conf="--without-pam" + econf \ + --sysconfdir=/etc/at \ + --with-jobdir=/var/spool/at/atjobs \ + --with-atspool=/var/spool/at/atspool \ + --with-etcdir=/etc/at \ + --with-daemon_username=at \ + --with-daemon_groupname=at \ + ${my_conf} +} -DESCRIPTION="Queues jobs for later execution" -HOMEPAGE="http://packages.qa.debian.org/a/at.html" -SRC_URI="mirror://debian/pool/main/a/at/${PN}_${PV}.orig.tar.gz" +src_install() { + emake install IROOT="${D}" || die -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86" -IUSE="pam selinux" + newinitd "${FILESDIR}"/atd.rc7 atd + newconfd "${FILESDIR}"/atd.confd atd + newpamd "${FILESDIR}"/at.pamd-3.1.13-r1 atd -DEPEND="virtual/mta - >=sys-devel/autoconf-2.64 - sys-devel/bison - >=sys-devel/flex-2.5.4a - pam? ( virtual/pam ) - selinux? ( sec-policy/selinux-at )" -RDEPEND="virtual/mta - virtual/logger - selinux? ( sec-policy/selinux-at )" + # Preserve existing .SEQ files (bug #386625) + local seq_file="${ROOT}/var/spool/at/atjobs/.SEQ" + if [ -f "${seq_file}" ] ; then + einfo "Preserving existing .SEQ file (bug #386625)." + cp -p "${seq_file}" "${D}"/var/spool/at/atjobs/ || die + fi -pkg_setup() { - enewgroup at 25 - enewuser at 25 -1 /var/spool/at/atjobs at + systemd_dounit "${FILESDIR}/atd.service" } -src_prepare() { - epatch "${FILESDIR}"/${PN}-3.1.8-more-deny.patch - epatch "${FILESDIR}"/${PN}-3.1.13-Makefile.patch - # fix parallel make issues, bug #244884 - epatch "${FILESDIR}"/${PN}-3.1.10.2-Makefile.in-parallel-make-fix.patch - epatch "${FILESDIR}"/${P}-configure.in-fix-PAM-automagick-dep.pa \ No newline at end of file +pkg_postinst() { + einfo "Forcing correct permissions on /var/spool/at" + chown at:at "${ROOT}/var/spool/at/atjobs" + chmod 1770 "${ROOT}/var/spool/at/atjobs" + chown at:at "${ROOT}/var/spool/at/atjobs/.SEQ" + chmod 0600 "${ROOT}/var/spool/at/atjobs/.SEQ" + chown at:at "${ROOT}/var/spool/at/atspool" + chmod 1770 "${ROOT}/var/spool/at/atspool" +} diff --git a/sys-process/time/Manifest b/sys-process/time/Manifest index db3840f82209..aa5e05278e9f 100644 --- a/sys-process/time/Manifest +++ b/sys-process/time/Manifest @@ -1,2 +1 @@ DIST time-1.7.tar.gz 103066 SHA256 e37ea79a253bf85a85ada2f7c632c14e481a5fd262a362f6f4fd58e68601496d SHA512 d759b651e343beddc0b3bd06af85881486b72319c979a2e7f752d5a34edd8b7c1c19391c5c7a2e8f6685746cc7a046bf2c8e082b31458a1dd043ed90a4cebcd1 WHIRLPOOL 8102c994a6b5faa60ee51e7343383f307c0d31cbd26177f86fc96b41014e1065b536202a371556af336394ac0bf473db2571a15bc7644247a9a3d8235269880f -DIST time-1.7.tar.gz 103066 SHA256 e37ea79a253bf85a85ada2f7c632c14e481a5fd262a362f6f4fd58e68601496d SHA512 d759b651e343beddc0b3bd06af85881486b72319c979a2e7f752d5a34edd8b7c1c19391c5c7a2e8f6685746cc7a046bf2c8e082b31458a1dd043ed90a4cebcd1 WHIRLPOOL 8102c994a6b5faa60ee51e7343383f307c0d31cbd26177f86fc96b41014e1065b536202a371556af336394ac0bf473db2571a15bc7644247a9a3d8235269880f diff --git a/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-fixes.patch b/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-fixes.patch index f48cf635a725..b86be697ae06 100644 --- a/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-fixes.patch +++ b/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-fixes.patch @@ -29,9 +29,12 @@ Compiler warning fixes. static int authenticate_user_gss(request_rec *r, kerb_auth_config *conf, -@@ -1722,7 +1725,7 @@ ker -Compiler warning fixes. - ---- mod_auth_kerb-5.4/src/mod_auth_kerb.c.fixes -+++ mod_auth_kerb-5.4/src/mod_auth_kerb.c -@@ -677,7 +677,8 @@ en \ No newline at end of file +@@ -1722,7 +1725,7 @@ kerb_authenticate_user(request_rec *r) + return ret; + } + +-int ++static int + have_rcache_type(const char *type) + { + krb5_error_code ret; diff --git a/www-apache/mod_auth_nufw/mod_auth_nufw-2.2.2.ebuild b/www-apache/mod_auth_nufw/mod_auth_nufw-2.2.2.ebuild index 1613b7180383..74bb9a4c4028 100644 --- a/www-apache/mod_auth_nufw/mod_auth_nufw-2.2.2.ebuild +++ b/www-apache/mod_auth_nufw/mod_auth_nufw-2.2.2.ebuild @@ -19,13 +19,30 @@ DEPEND="mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server )" RDEPEND="${DEPEND}" -APACHE2_MOD_FILE="mod_auth_nufw.so"# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_auth_nufw/mod_auth_nufw-2.2.2.ebuild,v 1.3 2014/08/10 20:14:07 slyfox Exp $ +APACHE2_MOD_FILE="mod_auth_nufw.so" +APACHE2_MOD_CONF="50_${PN}" +APACHE2_MOD_DEFINE="AUTH_NUFW" -EAPI="2" +DOCFILES="doc/mod_auth_nufw.html" -inherit autotools confutils apache-module +need_apache2_2 -DESCRIPTION="A NuFW authentication module for Apache" -HOMEPAGE="http://software.inl.fr/trac/wiki/EdenWall/mod_auth_nufw" +pkg_setup() { + confutils_require_one mysql postgres +} + +src_prepare() { + eautoreconf +} + +src_configure() { + CPPFLAGS="-I$(/usr/bin/apr-1-config --includedir) ${CPPFLAGS}" \ + econf \ + --with-apache22 \ + $(use_with mysql) \ + || die "econf failed" +} + +src_compile() { + emake || die "emake failed" +} diff --git a/www-apache/mod_dnsbl_lookup/mod_dnsbl_lookup-0.91.ebuild b/www-apache/mod_dnsbl_lookup/mod_dnsbl_lookup-0.91.ebuild index 4281e6a0abc9..e783e7fd4949 100644 --- a/www-apache/mod_dnsbl_lookup/mod_dnsbl_lookup-0.91.ebuild +++ b/www-apache/mod_dnsbl_lookup/mod_dnsbl_lookup-0.91.ebuild @@ -2,14 +2,28 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/www-apache/mod_dnsbl_lookup/mod_dnsbl_lookup-0.91.ebuild,v 1.2 2008/01/31 16:41:13 hollow Exp $ -inherit a# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_dnsbl_lookup/mod_dnsbl_lookup-0.91.ebuild,v 1.2 2008/01/31 16:41:13 hollow Exp $ - inherit apache-module eutils KEYWORDS="~amd64 ~x86" DESCRIPTION="A helper module for Apache2 providing DNSBL lookup" HOMEPAGE="http://www.sysdesign.ca" -SRC_URI="http://www.sysdesign.ca/archiv \ No newline at end of file +SRC_URI="http://www.sysdesign.ca/archive/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="" + +DEPEND="" +RDEPEND="" + +APACHE2_MOD_CONF="09_${PN}" +APACHE2_MOD_DEFINE="DNSBL" + +need_apache2 + +src_install() { + apache-module_src_install + insinto $(${APXS} -q INCLUDEDIR) + doins dnsbl_lookup.h +} diff --git a/www-apache/mod_nss/mod_nss-1.0.8-r1.ebuild b/www-apache/mod_nss/mod_nss-1.0.8-r1.ebuild index 12893b0b48a6..73ff8fbb6dd1 100644 --- a/www-apache/mod_nss/mod_nss-1.0.8-r1.ebuild +++ b/www-apache/mod_nss/mod_nss-1.0.8-r1.ebuild @@ -51,6 +51,13 @@ src_install() { dosbin gencert nss_pcache dohtml docs/mod_nss.html newbin migrate.pl nss_migrate - dodir /etc# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_nss/mod_nss-1.0.8-r1.ebuild,v 1.5 2012/10 \ No newline at end of file + dodir /etc/apache2/nss + apache-module_src_install +} + +pkg_postinst() { + apache-module_pkg_postinst + + elog "If you need to generate a SSL certificate," + elog "please use gencert tool from net-dns/bind-tools" +} diff --git a/www-apache/mod_slotlimit/files/10_mod_slotlimit.conf b/www-apache/mod_slotlimit/files/10_mod_slotlimit.conf index 800fee98ffcc..93f95fbb40b1 100644 --- a/www-apache/mod_slotlimit/files/10_mod_slotlimit.conf +++ b/www-apache/mod_slotlimit/files/10_mod_slotlimit.conf @@ -52,17 +52,25 @@ LoadModule slotlimit_module modules/mod_slotlimit.so # Syntax: CustomLimitsFile /path/to/file # Default: No Value # -# -LoadModule slotlimit_module modules/mod_slotlimit.so - -# AvailableSlotsPercent -# Syntax: AvailableSlotsPercent number -# Default: 0 -# -# Percentage of apache slots available in order to set any restrictions. -# Setting it to 0 dynamic slot allocation algorithm will be deactivated. -# When has remained free the specified percentage of apache slots, module -# start to manage incoming connections, penalizing sites that are monopolizing -# the resources of the server. +# Using this directive you can specify limits customized for each running site, +# penalizing or privileged it. In the file should be stored (line by line) the +# site name and the number of usable slots. You can add comments by using the '#' +# character. The file format is as follows: # -# N.B. Before activating this option check that the apache scoreboard d \ No newline at end of file +# .. +# .. +# www.sitename1.it 10 +# # this is a comment +# www.site2.com 35 +# .. +# .. + +# Example: +# AvailableSlotsPercent 13 +# MaxConnectionsPerSite 20 +# ClientIpLimit 20 +# CustomLimitsFile /etc/apache2/mod_slotlimit.rules + + + +# vim: ts=4 filetype=apache diff --git a/www-apache/mod_suphp/files/70_mod_suphp.conf b/www-apache/mod_suphp/files/70_mod_suphp.conf index 652ec014752f..3d111b9aa375 100644 --- a/www-apache/mod_suphp/files/70_mod_suphp.conf +++ b/www-apache/mod_suphp/files/70_mod_suphp.conf @@ -21,15 +21,29 @@ LoadModule suphp_module modules/mod_suphp.so AddType application/x-httpd-php .php AddType application/x-httpd-php5 .php5 AddType application/x-httpd-php4 .php4 -AddType application/x-httpd-# Please note that using -DSUPHP in conjunction with -DPHP4 will currently -# not work. Whilst it is possible to run both using combinations of -# 'php_admin_flag engine off' and 'suPHP_Engine on', which can be configured -# per-vhost, this is not a supported configuration. +AddType application/x-httpd-phtml .phtml +AddType application/x-suphp-cgi .cgi .pl -# Use suphp for every CGI script (not only for *.cgi and *.pl): -# 1) you can disable mod_cgi and mod_cgid if you run all your cgi scripts -# with mod_suphp! -# 2) Replace ScriptAlias directives with Alias ones -# (e.g. ScriptAlias /cgi-bin/ /path/to/cgi-bin/ will change to -# Alias /cgi-bin/ /path/to/cgi-bin/) -# 3) Put the \ No newline at end of file +AddHandler x-httpd-php .php +AddHandler x-httpd-php5 .php5 +AddHandler x-httpd-php4 .php4 +AddHandler x-httpd-phtml .phtml +AddHandler x-suphp-cgi .cgi .pl + +suPHP_Engine on + + + SuPHP_AddHandler x-httpd-php + SuPHP_AddHandler x-httpd-php5 + SuPHP_AddHandler x-httpd-php4 + SuPHP_AddHandler x-httpd-phtml + SuPHP_AddHandler x-suphp-cgi + + +# if you're using owner mode comment the following line +SuPHP_UserGroup apache apache + +DirectoryIndex index.php index.php5 index.php4 index.php3 index.phtml + + +# vim: ts=4 filetype=apache diff --git a/www-apache/mod_vhost_ldap/mod_vhost_ldap-1.0.0-r1.ebuild b/www-apache/mod_vhost_ldap/mod_vhost_ldap-1.0.0-r1.ebuild index 4ed5ef7b67d4..9169ca6e7df0 100644 --- a/www-apache/mod_vhost_ldap/mod_vhost_ldap-1.0.0-r1.ebuild +++ b/www-apache/mod_vhost_ldap/mod_vhost_ldap-1.0.0-r1.ebuild @@ -32,13 +32,20 @@ src_prepare() { } src_compile() { - sed -i "s/MOD_VHOST_LDAP_VERSION/\"$(cat VERSION)\"/g" m# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_vhost_ldap/mod_vhost_ldap-1.0.0-r1.ebuild,v 1.5 2014/08/10 20:18:29 slyfox Exp $ - -EAPI="2" + sed -i "s/MOD_VHOST_LDAP_VERSION/\"$(cat VERSION)\"/g" mod_vhost_ldap.c + apache-module_src_compile +} -inherit eutils apache-module +src_install() { + mkdir -p "${D}"/etc/openldap/schema + cp -f mod_vhost_ldap.schema "${D}"/etc/openldap/schema/ + apache-module_src_install +} -DESCRIPTION="An Apache2 module for storing and configuring virtual hosts from LDAP" -HOMEPAGE="http://modvhostldap.alio \ No newline at end of file +pkg_postinst() { + apache-module_pkg_postinst + einfo + einfo "Your LDAP server needs to include mod_vhost_ldap.schema and should" + einfo "also maintain indices on apacheServerName and apacheServerAlias." + einfo +} diff --git a/www-apps/cgit/cgit-9999.ebuild b/www-apps/cgit/cgit-9999.ebuild index a532590e3081..337c09561fe7 100644 --- a/www-apps/cgit/cgit-9999.ebuild +++ b/www-apps/cgit/cgit-9999.ebuild @@ -10,18 +10,6 @@ inherit webapp eutils multilib user toolchain-funcs git-2 [[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/" -DESCRIPTION="a fast web-interface for g# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/cgit/cgit-9999.ebuild,v 1.11 2014/07/04 20:32:57 hasufell Exp $ - -EAPI="4" - -WEBAPP_MANUAL_SLOT="yes" - -inherit webapp eutils multilib user toolchain-funcs git-2 - -[[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/" - DESCRIPTION="a fast web-interface for git repositories" HOMEPAGE="http://git.zx2c4.com/cgit/about" SRC_URI="" @@ -83,4 +71,22 @@ src_install() { emake V=1 AR="$(tc-getAR)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" install - insi \ No newline at end of file + insinto /etc + doins "${FILESDIR}"/cgitrc + + dodoc README + use doc && doman cgitrc.5 + + webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt + webapp_src_install + + keepdir "${CGIT_CACHEDIR}" + fowners ${PN}:${PN} "${CGIT_CACHEDIR}" + fperms 700 "${CGIT_CACHEDIR}" +} + +pkg_postinst() { + webapp_pkg_postinst + ewarn "If you intend to run cgit using web server's user" + ewarn "you should change ${CGIT_CACHEDIR} permissions." +} diff --git a/www-apps/dokuwiki/dokuwiki-20120125.ebuild b/www-apps/dokuwiki/dokuwiki-20120125.ebuild index 3181dbaaa20c..2c235440a7b9 100644 --- a/www-apps/dokuwiki/dokuwiki-20120125.ebuild +++ b/www-apps/dokuwiki/dokuwiki-20120125.ebuild @@ -10,19 +10,6 @@ inherit webapp depend.php MY_BASE_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}" MY_PV="${MY_BASE_PV}${PV:8:1}" -DESCRIPTION="DokuWiki is a simple to use Wiki aimed at a small company's documentation needs" -HOMEPAGE="http://wiki.splitbrain.org/wiki# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20120125.ebuild,v 1.3 2014/08/10 20:13:04 slyfox Exp $ - -EAPI="4" - -inherit webapp depend.php - -# upstream uses dashes in the datestamp -MY_BASE_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}" -MY_PV="${MY_BASE_PV}${PV:8:1}" - DESCRIPTION="DokuWiki is a simple to use Wiki aimed at a small company's documentation needs" HOMEPAGE="http://wiki.splitbrain.org/wiki:dokuwiki" SRC_URI="http://www.splitbrain.org/_media/projects/${PN}/${PN}-${MY_PV}.tgz" @@ -49,3 +36,29 @@ src_prepare() { } src_install() { + webapp_src_preinst + + dodoc README + rm -f README COPYING + + docinto scripts + dodoc bin/* + rm -rf bin + + insinto "${MY_HTDOCSDIR}" + doins -r . + + for x in $(find data/ -not -name '.htaccess'); do + webapp_serverowned "${MY_HTDOCSDIR}"/${x} + done + + webapp_configfile "${MY_HTDOCSDIR}"/.htaccess.dist + webapp_configfile "${MY_HTDOCSDIR}"/conf + + for x in $(find conf/ -not -name 'msg'); do + webapp_configfile "${MY_HTDOCSDIR}"/${x} + done + + webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt + webapp_src_install +} diff --git a/www-apps/horde-mnemo/Manifest b/www-apps/horde-mnemo/Manifest index afbd7dca9781..36578923b9b3 100644 --- a/www-apps/horde-mnemo/Manifest +++ b/www-apps/horde-mnemo/Manifest @@ -1,4 +1,2 @@ DIST mnemo-h3-2.2.3.tar.gz 1668520 RMD160 b85cf47ca7669133e2cf403c2c6c8e748f153848 SHA1 2c3851dd7a92ae3d98c75126c2dd53340ec3a685 SHA256 8a18a4552ed69502b197a1e932bf62546fb05575ddac22fd4fde8bbc8812724e DIST mnemo-h3-2.2.4.tar.gz 1673734 RMD160 1a2e1f4ed46fb83b3715020d587ca28223c0857a SHA1 2f19977107e6cafdfba9a0585408c9d42b5058d2 SHA256 7c1226e558002a03034cbf1655d7995ae04e6c5ade71cf3c5dc6a5537d00e976 -DIST mnemo-h3-2.2.3.tar.gz 1668520 RMD160 b85cf47ca7669133e2cf403c2c6c8e748f153848 SHA1 2c3851dd7a92ae3d98c75126c2dd53340ec3a685 SHA256 8a18a4552ed69502b197a1e932bf62546fb05575ddac22fd4fde8bbc8812724e -DIST mnemo-h3-2.2.4.tar.gz 1673734 RMD160 1a2e1f4ed46fb83b3715020d587ca28223c0857a SHA1 2f19977107e6cafdfba9a0585408c9d42b5058d2 SHA256 7c1226e558002a03034cbf1655d7995ae04e6c5ade71cf3c5dc6a5537d00e976 diff --git a/www-apps/horde-nag/Manifest b/www-apps/horde-nag/Manifest index 99ea590157bb..91ad39c8ecab 100644 --- a/www-apps/horde-nag/Manifest +++ b/www-apps/horde-nag/Manifest @@ -1,3 +1,2 @@ DIST nag-h3-2.3.4.tar.gz 2111158 RMD160 8edb8b24e8b62394d6860b8d8b1902f2ecc8641a SHA1 25949cb6fc1254c594c1aa15894c3fbe8c3db6b8 SHA256 f8eac1e4425810cc386cce35181e4c078ad858837bd3343a42f37305a670e385 DIST nag-h3-2.3.6.tar.gz 2118662 RMD160 b0f83a4886ac1958d112c71b35653f86c3f162fd SHA1 ac82132a97b93b502156dca0e912a69a2f169c4f SHA256 c516124694a2c74af21a7d7b0373d24f565ba7056b6e1ef7fc0e01f7eac54314 -DIST nag-h3-2.3.4.tar.gz 2111158 RMD160 8edb8b24e8b62394d6860b8d8b1902f2ecc8641a SHA1 25949cb6fc1254c594c1aa15894c3fbe8c3db6b8 SHA256 f8eac1e4425810cc386cce35181e4c078ad858837bd3343a42f37305a6 \ No newline at end of file diff --git a/www-apps/horizon/Manifest b/www-apps/horizon/Manifest index b3a270b4e152..0526323300a0 100644 --- a/www-apps/horizon/Manifest +++ b/www-apps/horizon/Manifest @@ -1,2 +1 @@ DIST horizon-2014.1.2.tar.gz 3338790 SHA256 a299ed26dc4f6c79242e733eb2febe0b647fa85c1a1a8971a1abb5070ee42b75 SHA512 38b43327efb18da66ef6d68adf951cdec2b3e2cc3495b0cd10e1a71fa71a015c1bd01e22a6ce9dad7506908e498958383c8da4d74cbc507574277f5b45e784ce WHIRLPOOL d341dd370288ce93ac10ecaf925c4e9f09bafef5a83181cc637d5c3ec5dc64e5385906f503a55c67e37d21794f12a3d3dafc5ae5bce660b3285f53b2a4028ea4 -DIST horizon-2014.1.2.tar.gz 3338790 SHA256 a299ed26dc4f6c79242e733eb2febe0b647fa85c1a1a8971a1abb5070ee42b75 SHA512 38b43327efb18da66ef6d68adf951cdec2b3e2cc3495b0cd10e1a71fa71a015c1bd01e22a6ce9dad7506908e498958383c8da4d74cbc507574277f5b45e784ce WHIRLPOOL d341dd370288ce93ac10ecaf925c4e9f09bafef5a83181cc637d5c3ec5dc64e5385906f503a55c67e37d21794f12a3d3dafc5ae5bce660b3285f53b2a4028ea4 diff --git a/www-apps/horizon/files/2014.1.2-CVE-2014-3594.patch b/www-apps/horizon/files/2014.1.2-CVE-2014-3594.patch index 2bec40418eed..564e53b0d634 100644 --- a/www-apps/horizon/files/2014.1.2-CVE-2014-3594.patch +++ b/www-apps/horizon/files/2014.1.2-CVE-2014-3594.patch @@ -10,20 +10,6 @@ wasn't sanitised. Closes-Bug: #1349491 Change-Id: Id82eefe48ccb17a158751ec65d24f3ac779380ec -diff --git a/openstack_dashboard/dashboards/admin/aggregates/tables.py b/openstack_dashboard/dashboards/admin/aggregates/tables.py -index 5cefae1..f0c2122 100644 ---- a/openstack_dashboard/dashboards/admin/aggregates/tFrom ba908ae88d5925f4f6783eb234cc4ea95017472b Mon Sep 17 00:00:00 2001 -From: Julie Pichon -Date: Tue, 29 Jul 2014 16:17:44 +0100 -Subject: Fix XSS issue with the unordered_list filter - -When using the unordered_list filter in a Horizon table (as opposed to -a template directly), autoescaping is not set by default and the input -wasn't sanitised. - -Closes-Bug: #1349491 -Change-Id: Id82eefe48ccb17a158751ec65d24f3ac779380ec - diff --git a/openstack_dashboard/dashboards/admin/aggregates/tables.py b/openstack_dashboard/dashboards/admin/aggregates/tables.py index 5cefae1..f0c2122 100644 --- a/openstack_dashboard/dashboards/admin/aggregates/tables.py @@ -48,4 +34,20 @@ index 5cefae1..f0c2122 100644 metadata = tables.Column(get_metadata, verbose_name=_("Metadata"), wrap_list=True, -- \ No newline at end of file +- filters=(filters.unordered_list,)) ++ filters=(safe_unordered_list,)) + + class Meta: + name = "host_aggregates" +@@ -123,7 +127,7 @@ class AvailabilityZonesTable(tables.DataTable): + hosts = tables.Column(get_zone_hosts, + verbose_name=_('Hosts'), + wrap_list=True, +- filters=(filters.unordered_list,)) ++ filters=(safe_unordered_list,)) + available = tables.Column(get_available, + verbose_name=_('Available'), + status=True, +-- +cgit v0.10.1 + diff --git a/www-apps/liquid_feedback_frontend/files/postinstall-en.txt b/www-apps/liquid_feedback_frontend/files/postinstall-en.txt index ef47016d97cf..688f693c48cb 100644 --- a/www-apps/liquid_feedback_frontend/files/postinstall-en.txt +++ b/www-apps/liquid_feedback_frontend/files/postinstall-en.txt @@ -13,26 +13,6 @@ Shall the new role be allowed to create more new roles? (y/n) n $ psql postgres=# ALTER USER liquid_feedback WITH PASSWORD 'the_new_password'; -$ createdb -U liquid_feedback liquid_feedback -$ psql -U liquid_feedback liquid_feedback -liquid_feedback=# \i ${MY_INSTALLDIR}/liquid_feedback_core/core.sql -liquid_feedback=# \i ${MY_INSTALLDIR}/liquid_feedback_core/init.sql -INSERT INTO system_setting (member_ttl) VALUES ('1 year'); -INSERT INTO contingent (polling, time_frame, text_entry_0. DATABASE SETUP - -To use Liquid Feedback you have to follow these -simple steps, which have to be done as the postgres system user (or -which ever is the database superuser): - -$ createuser liquid_feedback -and answer the following -Shall the new role be a superuser? (y/n) n -Shall the new role be allowed to create databases? (y/n) y -Shall the new role be allowed to create more new roles? (y/n) n - -$ psql -postgres=# ALTER USER liquid_feedback WITH PASSWORD 'the_new_password'; - $ createdb -U liquid_feedback liquid_feedback $ psql -U liquid_feedback liquid_feedback liquid_feedback=# \i ${MY_INSTALLDIR}/liquid_feedback_core/core.sql @@ -52,4 +32,21 @@ Lua 5.1.5 Copyright (C) 1994-2012 Lua.org, PUC-Rio > member:save() > os.exit() -Ensu \ No newline at end of file +Ensure that "lf_update dbname=liquid_feedback" and +"lf_update_suggestion_order dbname=liquid_feedback" are called +regularly! It is required to run these commands regularly +(i.e. every 5 minutes via cron) to update cached supporter counts, +to change the state of issues when neccessary, to calculate the +result of votings, etc. If you wish, copy the created lf_update +and lf_update_suggestion_order files to /usr/local/bin or a +similar directory. + +It is possible to run these two commands in parallel, if a setup +requires splitting the load to multiple processor cores. In other +cases it is recommended to run "lf_update" first, and then +"lf_update_suggestion_order". + +To create an export file, which is containing all but private data, +you may use the lf_export shell-script: +$ lf_export liquid_feedback export.sql.gz + diff --git a/www-apps/mythweb/mythweb-0.27.1.ebuild b/www-apps/mythweb/mythweb-0.27.1.ebuild index b7d8ac34bed0..5a0cc99d6699 100644 --- a/www-apps/mythweb/mythweb-0.27.1.ebuild +++ b/www-apps/mythweb/mythweb-0.27.1.ebuild @@ -1,7 +1,5 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/mythweb/mythweb-0.27.1.ebuild,v 1.2 2014/08/10 20# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/www-apps/mythweb/mythweb-0.27.1.ebuild,v 1.2 2014/08/10 20:14:07 slyfox Exp $ EAPI=4 @@ -82,4 +80,11 @@ src_install() { # Data needs to be writable and modifiable by the web server webapp_serverowned -R "${MY_HTDOCSDIR}"/data - # Message to \ No newline at end of file + # Message to display after install + webapp_postinst_txt en "${FILESDIR}"/0.25-postinstall-en.txt + + # Script to set the correct defaults on install + webapp_hook_script "${FILESDIR}"/reconfig + + webapp_src_install +} diff --git a/www-apps/nanoblogger/nanoblogger-3.5_rc1.ebuild b/www-apps/nanoblogger/nanoblogger-3.5_rc1.ebuild index 3155c7d0f0ab..c0da9ed67ee7 100644 --- a/www-apps/nanoblogger/nanoblogger-3.5_rc1.ebuild +++ b/www-apps/nanoblogger/nanoblogger-3.5_rc1.ebuild @@ -28,45 +28,6 @@ src_prepare() { nb || die "sed nb failed" } -src_install() { - dobin nb - insinto /usr/share/nanoblogger - doins -r default moods plugins lib lang docs welcome-to-nb.txt - insinto /etc - doins nb.conf - dodoc ChangeLog - dohtml docs/nanoblogger.html - dobashcomp "${FILESDIR}"/nb.bashcomp -}# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/nanoblogger/nanoblogger-3.5_rc1.ebuild,v 1.1 2011/10/02 05:06:15 radhermit Exp $ - -EAPI=4 - -inherit bash-completion-r1 - -MY_P="${P/_/-}" -DESCRIPTION="Small and simple weblog engine written in Bash for the command-line" -HOMEPAGE="http://nanoblogger.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~x86" -IUSE="" - -RDEPEND="app-shells/bash" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - sed -i \ - -e 's|^\(NB_BASE_DIR=\).*$|\1"/usr/share/nanoblogger"|' \ - -e 's|^\(NB_CFG_DIR=\).*$|\1"/etc"|' \ - -e "s|\$NB_BASE_DIR.*\(nano.*html\)|/usr/share/doc/${PF}/html/\1|" \ - nb || die "sed nb failed" -} - src_install() { dobin nb insinto /usr/share/nanoblogger @@ -83,4 +44,27 @@ pkg_postinst() { elog "Documentation for getting started with nanoblogger may be found at" elog "/usr/share/doc/${PF}/html/nanoblogger.html or by running 'nb --manual;." elog - elog "To cr \ No newline at end of file + elog "To create and configure a new weblog, run the following as your user:" + elog " nb -b /some/dir -a" + elog "where /some/dir is a directory that DOES NOT exist." + elog + elog "To prevent having to specify your blog directory every time you use" + elog "nanoblogger (with the -b switch), you can set a default value in your" + elog "~/.nb.conf. For example:" + elog ' BLOG_DIR="$HOME/public_html/blog"' + elog + elog "If you are upgrading nanoblogger from a previous version, follow" + elog "these directions (as stated in the manual):" + elog " 1. create a new weblog directory using nanoblogger (skip configuration):" + elog " nb [-b blog_dir] -a" + elog " 2. copy old data directry to new weblog:" + elog " cp -r [old_blog_dir]/data [newblog_dir]" + elog " 3. edit new blog.conf to your liking and rebuild weblog:" + elog " nb [-b blog_dir] --configure -u all" + elog + elog "You also should remove your [newblog_dir]/data/cat_1.db and run:" + elog " nb -u all" + elog "after copying your old entries from [oldblog_dir]/data to" + elog "[newblog_dir]/data." + elog +} diff --git a/www-apps/novnc/Manifest b/www-apps/novnc/Manifest index 65121c2f4ab4..420c6e71aea1 100644 --- a/www-apps/novnc/Manifest +++ b/www-apps/novnc/Manifest @@ -1,2 +1 @@ -DIST v0.4.tar.gz 711551 SHA256 e779c44d35d7534fdd2a3ac98c4c519fd118898147abe3a0c1d692f210b14567 SHA512 9bcc624c9464205d21b56193321b9b7361598b883c5580501dcb6bfd631b5f6db537880f2c2cf7a3473c81f8a4b5aa8c87dc441cee6cd969c202048125-----BEGIN PGP SIGNED MESSAGE----- DIST v0.4.tar.gz 711551 SHA256 e779c44d35d7534fdd2a3ac98c4c519fd118898147abe3a0c1d692f210b14567 SHA512 9bcc624c9464205d21b56193321b9b7361598b883c5580501dcb6bfd631b5f6db537880f2c2cf7a3473c81f8a4b5aa8c87dc441cee6cd969c202048125466088 WHIRLPOOL 676e8fd63d996b9bb5354d69308a610359a2ac982fe904a37da9d3e3ff8a6261a46f7c048f18dda8c525729b9dfaa5df4df0e8432b98a8568ecd34fb0e90178c diff --git a/www-apps/openwebstats/Manifest b/www-apps/openwebstats/Manifest index f288b5a1123b..f8e7910e0d86 100644 --- a/www-apps/openwebstats/Manifest +++ b/www-apps/openwebstats/Manifest @@ -1,2 +1 @@ -DIST openwebstats-1.1.tar.gz 1634-----BEGIN PGP SIGNED MESSAGE----- DIST openwebstats-1.1.tar.gz 163477 SHA256 6378591300c68921fc2d5cd38ec9aaf4b00a4d34f97d3eafad2d22097030d926 diff --git a/www-apps/openwebstats/files/config.php b/www-apps/openwebstats/files/config.php index 41c4fc16cb3f..5523397582b4 100644 --- a/www-apps/openwebstats/files/config.php +++ b/www-apps/openwebstats/files/config.php @@ -19,21 +19,28 @@ if (!defined("logformat_combined")) define("logformat_combined_vhost", "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"", TRUE); define("logformat_common" , "%h %l %u %t \"%r\" %>s %b", TRUE); define("logformat_referer" , "%{Referer}i -> %U", TRUE); - define("logformat_a ## -## ## -################################################################################ -## Please read the README! ## -################################################################################ + define("logformat_agent" , "%{User-agent}i", TRUE); +} ########################################## -## Define Globals for OpenWebStats ## +## Database information below here ## ########################################## -global $openstats_web_dir, $databasename; +$databaselocation = 'localhost'; +$databaseport = '3306'; +$databasename = 'ows'; +$databaseuser = 'ows'; +$databasepass = 'pass'; +$db_connect = mysql_connect($databaselocation, $databaseuser, $databasepass); +mysql_select_db($databasename, $db_connect); + +########################################## +## Logfile and Logformat are for the db ## +## import in the class_apache file. ## +## $openstatsdir is the install dir on ## +## your system. ## +########################################## +$openstats_web_dir = '/openwebstats'; // Remember to include the stats dir +$logfile = "/var/log/apache2/access_log"; +$logformat = logformat_combined; //example: $logformat = logformat_combined_vhost; -if (!defined("logformat_combined")) -{ - define("logforma \ No newline at end of file +?> diff --git a/www-apps/ownpaste/Manifest b/www-apps/ownpaste/Manifest index c054b1ecf9ef..dc72ae136fca 100644 --- a/www-apps/ownpaste/Manifest +++ b/www-apps/ownpaste/Manifest @@ -1,2 +1 @@ DIST ownpaste-0.2.2.tar.gz 22030 SHA256 98e6bb80ff395617ce037968a739f8f71c1d0fd140914317986a9cc68e8878df SHA512 2a55e89e00e7530aafab427e7e2e4015391a68a8c7b8843cdd5b1010f492a4ecb6f28f33b2a92812a7072a35f3437f08ac1635867b492903256e92dabcb9beaf WHIRLPOOL 1ee3e1a8ff2756c1062fdb0492d96d9ef17d30919227f67480fd7bc1e73e37ca723acecbdcd243e30f5e554a4c11e8bdaa55f804a29eb402acf9b1cd05848a00 -DIST ownpaste-0.2.2.tar.gz 22030 SHA256 98e6bb80ff395617ce037968a739f8f71c1d0fd140914317986a9cc68e8878df SHA512 2a55e89e00e7530aafab427e7e2e4015391a68a8c7b8843cdd5b1010f492a4ecb6f28f33b2a92812a7072a35f3437f08ac1635867b492903256e92dabcb9beaf WHIRLPOOL 1ee3e1a8ff2756c1062fdb0492d96d9ef17d30919227f67480fd7bc1e73e37ca723acecbdcd243e30f5e554a4c11e8bdaa55f804a29eb402acf9b1cd05848a00 diff --git a/www-apps/phprojekt/Manifest b/www-apps/phprojekt/Manifest index 92bf3505640b..8ea606860918 100644 --- a/www-apps/phprojekt/Manifest +++ b/www-apps/phprojekt/Manifest @@ -1,2 +1 @@ DIST phprojekt-6.1.2.tar.gz 34786513 SHA256 1192c00e09e3552e1f43d80239371de8239b24e6c5bc6a2d13d2f791e47f3048 SHA512 f37453458db85ede353d7bdae79504d3cc4b65e80db7b8ff72db8a0e5ed9770579ea106c2b180d69c79dcadda95fd89049d81fb310c281ec796662c83131e081 WHIRLPOOL a611f1a63c6b7cba8f4c73c226891e84372ccc2ed3feb624470f496f89ea8475f1bf793b1164209e43a37abc36679f0ce4d59471112945f8e43158e69f870495 -DIST phprojekt-6.1.2.tar.gz 34786513 SHA256 1192c00e09e3552e1f43d80239371de8239b24e6c5bc6a2d13d2f791e47f3048 SHA512 f37453458db85ede353d7bdae79504d3cc4b65e80db7b8ff72db8a0e5ed9770579ea106c2b180d69c79dcadda95fd89049d81fb310c281ec796662c83131e081 WHIRLPOOL a611f1a63c6b7cba8f4c73c226891e84372ccc2ed3feb624470f496f89ea8475f1bf793b1164209e43a37abc36679f0ce4d59471112945f8e43158e69f870495 diff --git a/www-apps/trac-accountmanager/Manifest b/www-apps/trac-accountmanager/Manifest index 199fc4505fda..0b887470c1ae 100644 --- a/www-apps/trac-accountmanager/Manifest +++ b/www-apps/trac-accountmanager/Manifest @@ -1,6 +1,3 @@ DIST TracAccountManager-0.4.2.tar.gz 157706 SHA256 4f527394db9316e1f826b1bd0fb8d97253516daf35c6d5f71a016df317a57d74 SHA512 b73046dd15cefbe4d7854107af1bdf372ab5c2c6e83855395383b4a894d85325d867eaa1e9013f41ffcf8907baf3ea64873ac1b6c3b333af6dfd6480ab4016b4 WHIRLPOOL 5607957625a104596975fdf0283d9ae1c85a2f5c4a309aff0a04475e7f5123c8c53e45ba0f7d69a4bbe1e7c62912490356e5c48220d51ebbc9497b160f2bfac6 DIST trac-accountmanager-0.3_p9766.zip 91200 SHA256 c1c6a23d464f53e148aa79272e6d76513d32379778d2c76afe42fc68a9c5568f DIST trac-accountmanager-0.4_p10645.zip 145212 SHA256 51d63b3c01ef951942a53669297aa7bb46285b4ef611a250a62f4f2d98d91f7b -DIST TracAccountManager-0.4.2.tar.gz 157706 SHA256 4f527394db9316e1f826b1bd0fb8d97253516daf35c6d5f71a016df317a57d74 SHA512 b73046dd15cefbe4d7854107af1bdf372ab5c2c6e83855395383b4a894d85325d867eaa1e9013f41ffcf8907baf3ea64873ac1b6c3b333af6dfd6480ab4016b4 WHIRLPOOL 5607957625a104596975fdf0283d9ae1c85a2f5c4a309aff0a04475e7f5123c8c53e45ba0f7d69a4bbe1e7c62912490356e5c48220d51ebbc9497b160f2bfac6 -DIST trac-accountmanager-0.3_p9766.zip 91200 SHA256 c1c6a23d464f53e148aa79272e6d76513d32379778d2c76afe42fc68a9c5568f -DIST trac-accountmanager-0.4_p10645.zip 145212 SHA256 51d63b3c01ef951942a53669297aa7bb46285b4ef611a250a62f4f2d98d91f7b diff --git a/www-apps/tt-rss/files/ttrssd.initd-r2 b/www-apps/tt-rss/files/ttrssd.initd-r2 index 23fe7861d10a..3ebadb45b4c8 100644 --- a/www-apps/tt-rss/files/ttrssd.initd-r2 +++ b/www-apps/tt-rss/files/ttrssd.initd-r2 @@ -13,26 +13,6 @@ TTRSSD_GROUP=${TTRSSD_GROUP:-"ttrssd"} INSTANCE_FOLDERS="cache lock feed-icons" BASE_PID="/run/ttrssd" -checkconfig() { - local instance instancepidname dir - - # check instances - if [ -z "${INSTANCE_DIRS}" ]; then - eerror "There is no defined instance directory in /etc/conf.d/tt#!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need logger net - after postgres mysql -} - -LOGFILE=${LOGFILE:-"/var/log/ttrssd.log"} -TTRSSD_USER=${TTRSSD_USER:-"ttrssd"} -TTRSSD_GROUP=${TTRSSD_GROUP:-"ttrssd"} -INSTANCE_FOLDERS="cache lock feed-icons" -BASE_PID="/run/ttrssd" - checkconfig() { local instance instancepidname dir @@ -81,4 +61,23 @@ start () { ebegin "Starting TT-RSS update daemon in \"${instance}\"" start-stop-daemon --start --user "${TTRSSD_USER}":"${TTRSSD_GROUP}" --background \ --stdout "${LOGFILE}" --stderr "${LOGFILE}" \ - --make \ No newline at end of file + --make-pidfile --pidfile "${mypid}" \ + --exec /usr/bin/php -- -f "${instance}/update_daemon2.php" + eend $? + done +} + +stop() { + local instance instancepidname + + for instance in ${INSTANCE_DIRS}; do + instancepidname=$(echo "${instance}.pid" | sed -e 's|/||' -e 's|/|--|g') + mypid="${BASE_PID}/${instancepidname}" + ebegin "Stopping TT-RSS update daemon in \"${instance}\"" + start-stop-daemon --stop \ + --pidfile "${mypid}" \ + --exec /usr/bin/php -- -f "${instance}/update_daemon2.php" + eend $? + rm -f ${instance}/lock/*.lock + done +} diff --git a/www-apps/tt-rss/tt-rss-1.10.ebuild b/www-apps/tt-rss/tt-rss-1.10.ebuild index 06c20800293e..2b7f15375e56 100644 --- a/www-apps/tt-rss/tt-rss-1.10.ebuild +++ b/www-apps/tt-rss/tt-rss-1.10.ebuild @@ -66,12 +66,14 @@ src_install() { webapp_configfile "${MY_HTDOCSDIR}"/config.php if use daemon; then - webapp_pos# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/tt-rss/tt-rss-1.10.ebuild,v 1.1 2013/09/24 09:07:05 tomka Exp $ - -EAPI=5 - -inherit user eutils webapp depend.php depend.apache vcs-snapshot + webapp_postinst_txt en "${FILESDIR}"/postinstall-en-with-daemon.txt + newinitd "${FILESDIR}"/ttrssd.initd-r2 ttrssd + newconfd "${FILESDIR}"/ttrssd.confd-r1 ttrssd + insinto /etc/logrotate.d/ + newins "${FILESDIR}"/ttrssd.logrotated ttrssd + else + webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt + fi -DESCRIPTION="Tiny Tiny RSS - A web-b \ No newline at end of file + webapp_src_install +} diff --git a/www-apps/tt-rss/tt-rss-1.12.ebuild b/www-apps/tt-rss/tt-rss-1.12.ebuild index 5dd70df603e3..282c2b7f3a0d 100644 --- a/www-apps/tt-rss/tt-rss-1.12.ebuild +++ b/www-apps/tt-rss/tt-rss-1.12.ebuild @@ -63,21 +63,20 @@ src_install() { webapp_serverowned -R "${MY_HTDOCSDIR}/${DIR}" done -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/tt-rss/tt-rss-1.12.ebuild,v 1.1 2014/04/04 11:22:05 tomka Exp $ - -EAPI=5 - -inherit user eutils webapp depend.php depend.apache vcs-snapshot - -DESCRIPTION="Tiny Tiny RSS - A web-based news feed (RSS/Atom) aggregator using AJAX" -HOMEPAGE="http://tt-rss.org/" -SRC_URI="https://github.com/gothfox/Tiny-Tiny-RSS/archive/${PV}.tar.gz -> ${P}.tar.gz" + # In the old days we put a config.php directly and tried to + # protect it with the following which did not work reliably. + # These days we only install the config.php-dist file. + # webapp_configfile "${MY_HTDOCSDIR}"/config.php -LICENSE="GPL-3" -KEYWORDS="~amd64 ~mips ~x86" -IUSE="daemon +mysql postgres" + if use daemon; then + webapp_postinst_txt en "${FILESDIR}"/postinstall-en-with-daemon.txt + newinitd "${FILESDIR}"/ttrssd.initd-r2 ttrssd + newconfd "${FILESDIR}"/ttrssd.confd-r1 ttrssd + insinto /etc/logrotate.d/ + newins "${FILESDIR}"/ttrssd.logrotated ttrssd + else + webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt + fi -DEPEND=" - daemon? ( de \ No newline at end of file + webapp_src_install +} diff --git a/www-apps/tt-rss/tt-rss-1.8.ebuild b/www-apps/tt-rss/tt-rss-1.8.ebuild index 5b7376599bb2..46703fe5d896 100644 --- a/www-apps/tt-rss/tt-rss-1.8.ebuild +++ b/www-apps/tt-rss/tt-rss-1.8.ebuild @@ -20,28 +20,6 @@ DEPEND=" " RDEPEND="${DEPEND}" -REQUIRED_# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/tt-rss/tt-rss-1.8.ebuild,v 1.1 2013/06/20 13:02:05 scarabeus Exp $ - -EAPI=5 - -inherit user eutils webapp depend.php depend.apache vcs-snapshot - -DESCRIPTION="Tiny Tiny RSS - A web-based news feed (RSS/Atom) aggregator using AJAX" -HOMEPAGE="http://tt-rss.org/" -SRC_URI="https://github.com/gothfox/Tiny-Tiny-RSS/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" -IUSE="daemon +mysql postgres" - -DEPEND=" - daemon? ( dev-lang/php[mysql?,postgres?,pcntl,curl] ) - !daemon? ( dev-lang/php[mysql?,postgres?,curl] ) -" -RDEPEND="${DEPEND}" - REQUIRED_USE="|| ( mysql postgres )" need_httpd_cgi @@ -68,4 +46,34 @@ src_prepare() { fi sed -i \ - -e "/define('DB_TY \ No newline at end of file + -e "/define('DB_TYPE',/{s:// \(or mysql\):// pgsql \1:}" \ + config.php || die + + # per 462578 + epatch_user +} + +src_install() { + webapp_src_preinst + + insinto "/${MY_HTDOCSDIR}" + doins -r * + keepdir "/${MY_HTDOCSDIR}"/feed-icons + + for DIR in cache lock feed-icons; do + webapp_serverowned -R "${MY_HTDOCSDIR}/${DIR}" + done + + webapp_configfile "${MY_HTDOCSDIR}"/config.php + if use daemon; then + webapp_postinst_txt en "${FILESDIR}"/postinstall-en-with-daemon.txt + newinitd "${FILESDIR}"/ttrssd.initd-r1 ttrssd + newconfd "${FILESDIR}"/ttrssd.confd-r1 ttrssd + insinto /etc/logrotate.d/ + newins "${FILESDIR}"/ttrssd.logrotated ttrssd + else + webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt + fi + + webapp_src_install +} diff --git a/www-apps/websvn/Manifest b/www-apps/websvn/Manifest index 42ce224104cf..fcd2980632c4 100644 --- a/www-apps/websvn/Manifest +++ b/www-apps/websvn/Manifest @@ -1,4 +1,2 @@ DIST websvn-2.3.2.tar.gz 846511 SHA256 d2e6e65c1ca8c51e036b2229f144fe22cd13c005a080326a99eef48453855bdc DIST websvn-2.3.3.tar.gz 882779 SHA256 67d5cb7ffb087f8a92e3dcad10f16612baac4d15a60d659aa8b6e06200ac8742 SHA512 8c77a9770dfc3c9487793cd71c460d4048aa4aa7b8520a53eea8ae872f30e06d885f849d63fa0e9f61ed5923f9dd9c5ef1f3c4f020afaa83d7815a99d64818a0 WHIRLPOOL efd59ddbe6a84d2b0bce9286271627e485c77b93dd0ad998ecaa4bad8bfb246f62508c3e1d6183194b9f64313f223bb44fc8d8fdf0c1f176efb808b3cbf7e7d9 -DIST websvn-2.3.2.tar.gz 846511 SHA256 d2e6e65c1ca8c51e036b2229f144fe22cd13c005a080326a99eef48453855bdc -DIST websvn-2.3.3.tar.gz 882779 SHA256 67d5cb7ffb087f8a92e3dcad10f16612baac4d15a60d659aa8b6e06200ac8742 SHA512 8c77a9770dfc3c9487793cd71c460d4048aa4aa7b8520a53eea8ae872f30e06d885f849d63fa0e9f61ed5923f9dd9c5ef1f3c4f020afaa83d7815a99d64818a0 WHIRLPOOL efd59ddbe6a \ No newline at end of file diff --git a/www-misc/awstats/Manifest b/www-misc/awstats/Manifest index 60a633335705..269c6ec6e8d2 100644 --- a/www-misc/awstats/Manifest +++ b/www-misc/awstats/Manifest @@ -1,4 +1,3 @@ DIST awstats-7.1.1.tar.gz 1261038 SHA256 b0051595a38b8b7776f553f20e431760d306bbad1a9e83cf2aca52ef0205f2c0 SHA512 c2bc1604bd15629a057ee7fbbbe4bb0e54992cbd0ed4cd38e4cb9fcbadaa28cd5defd6691352ee8a3f84e98f17b19f9ad953705de4ab36fe4ece95b99b9b685d WHIRLPOOL 37e81b0eb991115b6438f1bf91561c545ae729571de31fd3b46386006027038f2cbed3564f3e9c0dfae6b8fb38f29f05adefe38019ef7deab831c019502da4ca DIST awstats-7.1_p20121017.tar.gz 1258135 SHA256 262364b77d825096fee088b207f9f6c3d986dddd89645fca53fe09aa8c1fd850 SHA512 171ff3118955c8b73c968a23983885d967632d2c6e95a45f71e5f6fea74afe34d869c9cc901e2e739419068babc96385d7d7df1e8ca10074be7388fbe5c51f53 WHIRLPOOL 678bd6e36634ae2bdee46f42df6d2239a260a188fb1ae07199ef9043a0ad3b54baca7152032873848fabd42f94ef6a92da623e1eb9439d2dbcff15411679f207 DIST awstats-7.3.tar.gz 2921079 SHA256 39b5b1a4406c30874f020b9635b5d6439ac3acbd7612be1abdcfec65e011c100 SHA512 9dfbab607cef02d8e31fd1738a27effb38ad04b22f2f876674879cc95d8fc56d4b0cd280b4e659ac6c20e65393b9365447fe0b851d00e91601d9e4f618530fbd WHIRLPOOL 193759d0e684099a51af65dcff8e056f52951dcec31361e67acc454bf7cd3227e3f64bfaef59a55d7bae81df73ef4c87c3ce203c18d3709e630bd7bbc2d38daa -DIST awstats-7.1.1.tar.gz 1261038 SHA256 b0051595a38b8b7776f553f20e431760d306bbad1a9e83cf2aca52ef0205f2c0 SHA512 c2bc1604bd15629a057ee7fbbbe4bb0e54992cbd0ed4cd38e4cb9fcbadaa28cd5defd6691352ee8a3f84e98f17b19f9ad953705de4ab36fe4ece95b99b9b685d WHIRLPOOL 37e81b0eb991115b6438f1bf91561c545ae729571de31fd3b46386006027038f2cbed3564 \ No newline at end of file diff --git a/www-misc/htdig/htdig-3.2.0_beta6-r3.ebuild b/www-misc/htdig/htdig-3.2.0_beta6-r3.ebuild index 8cfd0c6058d4..c897163bc8c6 100644 --- a/www-misc/htdig/htdig-3.2.0_beta6-r3.ebuild +++ b/www-misc/htdig/htdig-3.2.0_beta6-r3.ebuild @@ -16,24 +16,6 @@ SLOT="0" KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux" IUSE="ssl" -DEPEND=">=sys-libs/zlib-# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-misc/htdig/htdig-3.2.0_beta6-r3.ebuild,v 1.12 2013/05/02 04:13:35 patrick Exp $ - -inherit eutils autotools - -MY_PV=${PV/_beta/b} -S=${WORKDIR}/${PN}-${MY_PV} - -DESCRIPTION="HTTP/HTML indexing and searching system" -HOMEPAGE="http://www.htdig.org" -SRC_URI="http://www.htdig.org/files/${PN}-${MY_PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux" -IUSE="ssl" - DEPEND=">=sys-libs/zlib-1.1.3 app-arch/unzip ssl? ( dev-libs/openssl )" @@ -57,4 +39,28 @@ src_compile() { --with-default-config-file="${EPREFIX}"/etc/${PN}/${PN}.conf \ --with-database-dir="${EPREFIX}"/var/lib/${PN}/db \ --with-cgi-bin-dir="${EPREFIX}"/var/www/localhost/cgi-bin \ - --with-search-dir="${EPREFIX}"/var/www/localhos \ No newline at end of file + --with-search-dir="${EPREFIX}"/var/www/localhost/htdocs/${PN} \ + --with-image-dir="${EPREFIX}"/var/www/localhost/htdocs/${PN} \ + $(use_with ssl) + +# --with-image-url-prefix="file://${EPREFIX}/var/www/localhost/htdocs/${PN}" \ + + emake || die "emake failed" +} + +src_install () { + use prefix || ED="${D}" + + emake DESTDIR="${D}" install || die "make install failed" + + dodoc ChangeLog README + dohtml -r htdoc + + sed -i "s:${D}::g" \ + "${ED}"/etc/${PN}/${PN}.conf \ + "${ED}"/usr/bin/rundig \ + || die "sed failed (removing \${D} from installed files)" + + # symlink htsearch so it can be easily found. see bug #62087 + dosym ../../var/www/localhost/cgi-bin/htsearch /usr/bin/htsearch +} diff --git a/www-misc/litmus/Manifest b/www-misc/litmus/Manifest index 866edfc19c99..55d8f096bfcc 100644 --- a/www-misc/litmus/Manifest +++ b/www-misc/litmus/Manifest @@ -1,2 +1 @@ DIST litmus-0.13.tar.gz 467532 SHA256 09d615958121706444db67e09c40df5f753ccf1fa14846fdeb439298aa9ac3ff SHA512 a1c04a17cbe4a17b5e0ed768017296256c9f234ae3f238f838f55064855b254246ba1d2e41b07145e1a9587698145b36b67e31488cfce817a9b5b119ee505b1e WHIRLPOOL a9809b9e3a3faf0f51dc234a117812442bac84dddfe339f1746094237096164bbfcab8eb4739d7c4a325480124828217194374401a1396e1c7f1f1807883e9eb -DIST litmus-0.13.tar.gz 467532 SHA256 09d615958121706444db67e09c40df5f753ccf1fa14846fdeb439298aa9ac3ff SHA512 a1c04a17cbe4a17b5e0ed768017296256c9f234ae3f238f838f55064855b254246ba1d2e41b07145e1a9587698145b36b67e31488cfce817a9b5b119ee505b1e WHIRLPOOL a9809b9e3a3faf0f51dc234a117812442bac84dddfe339f1746094237096164bbfcab8eb4739d7c4a325480124828217194374401a1396e1c7f1f1807883e9eb diff --git a/www-misc/monitorix/Manifest b/www-misc/monitorix/Manifest index 25c005479d5f..68479e414bd0 100644 --- a/www-misc/monitorix/Manifest +++ b/www-misc/monitorix/Manifest @@ -1,2 +1 @@ -DIST monitorix-3.5.1.tar.gz 218548 SHA256 8cbd749153f48e17a253791c2079912e50b499026de0083e5f25b87a782f3004 SHA512 cf64f89e147f3ddf31d48e593d5a5f09be827fd9a104c5cc28b1146e491507476d4f8-----BEGIN PGP SIGNED MESSAGE----- DIST monitorix-3.5.1.tar.gz 218548 SHA256 8cbd749153f48e17a253791c2079912e50b499026de0083e5f25b87a782f3004 SHA512 cf64f89e147f3ddf31d48e593d5a5f09be827fd9a104c5cc28b1146e491507476d4f86bf249fda24ce92d7e37a3699dd94501d441c3767d12dfbabe4d782c37c WHIRLPOOL 2b894222f4defd5396c9c82554caeaccdcb64dd387dd78a0f2beabf896c6fedbf4571b2f2822786b2dc4165946588f72b5d4e1f6f5d2f4acde17beddd57ceab7 diff --git a/www-servers/varnish/files/varnish-3.0.4-automagic.patch b/www-servers/varnish/files/varnish-3.0.4-automagic.patch index 767366fd418d..6a517cc9efeb 100644 --- a/www-servers/varnish/files/varnish-3.0.4-automagic.patch +++ b/www-servers/varnish/files/varnish-3.0.4-automagic.patch @@ -30,38 +30,6 @@ diff -Naur varnish-3.0.4.orig/configure.ac varnish-3.0.4/configure.ac +]) AM_CONDITIONAL([HAVE_CURSES], [test x$have_curses = xyes]) - sadiff -Naur varnish-3.0.4.orig/configure.ac varnish-3.0.4/configure.ac ---- varnish-3.0.4.orig/configure.ac 2013-06-14 04:39:32.000000000 -0400 -+++ varnish-3.0.4/configure.ac 2013-06-15 23:51:51.000000000 -0400 -@@ -87,15 +87,20 @@ - - save_LIBS="${LIBS}" - LIBS="" --AC_SEARCH_LIBS(initscr, [curses ncurses], -- [have_curses=yes], [have_curses=no]) --CURSES_LIBS="${LIBS}" --LIBS="${save_LIBS}" --AC_SUBST(CURSES_LIBS) --if test "$have_curses" = no; then -- AC_MSG_WARN([curses not found; some tools will not be built]) --fi --AC_CHECK_HEADERS([ncurses/curses.h curses.h]) -+AC_ARG_WITH([tools], AS_HELP_STRING([--without-tools], -+ [Don't build additional tools: varnishhist, varnishstat, varnishtop, varnishsizes (default: test)])) -+ -+AS_IF([test "x$with_tools" != "xno"], [ -+ AC_SEARCH_LIBS(initscr, [curses ncurses], -+ [have_curses=yes], [have_curses=no]) -+ CURSES_LIBS="${LIBS}" -+ LIBS="${save_LIBS}" -+ AC_SUBST(CURSES_LIBS) -+ if test "$have_curses" = no; then -+ AC_MSG_ERROR([curses not found, required to build additional tools]) -+ fi -+ AC_CHECK_HEADERS([ncurses/curses.h curses.h]) -+]) - AM_CONDITIONAL([HAVE_CURSES], [test x$have_curses = xyes]) - save_LIBS="${LIBS}" @@ -266,7 +271,6 @@ CFLAGS="${save_CFLAGS}" @@ -81,4 +49,46 @@ diff -Naur varnish-3.0.4.orig/configure.ac varnish-3.0.4/configure.ac - AC_CHECK_LIB([jemalloc], [malloc_conf], +if test "x$with_jemalloc" != xno; then + AC_CHECK_LIB([jemalloc], [malloc_conf], -+ \ No newline at end of file ++ [JEMALLOC_LDADD="-ljemalloc"], ++ [AC_CHECK_LIB([jemalloc], [jmalloc_conf], + [JEMALLOC_LDADD="-ljemalloc"], +- [AC_MSG_NOTICE([No system jemalloc found, using bundled version]) +- JEMALLOC_SUBDIR=libjemalloc +- JEMALLOC_LDADD='$(top_builddir)/lib/libjemalloc/libjemalloc_mt.la']) +- fi +- ;; +-esac +-AC_SUBST(JEMALLOC_SUBDIR) ++ [AC_MSG_ERROR([No system jemalloc found])])]) ++fi + AC_SUBST(JEMALLOC_LDADD) + + # Userland slab allocator, available only on Solaris +@@ -588,7 +587,6 @@ + lib/libvcl/Makefile + lib/libvgz/Makefile + lib/libvmod_std/Makefile +- lib/libjemalloc/Makefile + man/Makefile + redhat/Makefile + varnishapi.pc +--- varnish-3.0.4.orig/lib/Makefile.am 2013-06-14 04:39:32.000000000 -0400 ++++ varnish-3.0.4/lib/Makefile.am 2013-06-15 23:51:08.000000000 -0400 +@@ -6,14 +6,12 @@ + libvarnishapi \ + libvcl \ + libvgz \ +- libvmod_std \ +- @JEMALLOC_SUBDIR@ ++ libvmod_std + +-DIST_SUBDIRS = \ ++DIST_SUBDIRS = \ + libvarnishcompat \ + libvarnish \ + libvarnishapi \ + libvcl \ + libvgz \ +- libvmod_std \ +- libjemalloc ++ libvmod_std diff --git a/x11-apps/ardesia/Manifest b/x11-apps/ardesia/Manifest index f02ba61e2f4a..244ac5fa44d8 100644 --- a/x11-apps/ardesia/Manifest +++ b/x11-apps/ardesia/Manifest @@ -1,6 +1,3 @@ DIST ardesia-0.6.tar.gz 15190407 SHA256 13ae6040e8243504173368dc810c108003d0397f6846d63b809d01a743741578 DIST ardesia-0.7.tar.bz2 1917438 SHA256 961b4812fb7148d485df6ec38a032e73459aeb8e2b06e87f0c6b558754d500ca DIST ardesia-1.0.tar.bz2 2831274 SHA256 6386ef36353220951d0f6c891df62976e171c359fad99451cd017e3c79b8ef32 SHA512 cbd3a95cd8a628830f79d9920dd7a58af295fbc335648f4bdaf720cbcc8d87a74da52195649b54f3b651aa52b4d655505f47d081511468caabace21e40481e00 WHIRLPOOL bb40783111fca1f3bb5a3ddf4ebab72bf5b073b836d2afd8681bc00bb5c1c6b23002ca0acc80680e5ac2dafb0c7c7770950d468edc64f05b8d58c843e9b08d90 -DIST ardesia-0.6.tar.gz 15190407 SHA256 13ae6040e8243504173368dc810c108003d0397f6846d63b809d01a743741578 -DIST ardesia-0.7.tar.bz2 1917438 SHA256 961b4812fb7148d485df6ec38a032e73459aeb8e2b06e87f0c6b558754d500ca -DIST ardesia-1.0.tar.bz2 2831274 SHA256 6386ef36353220951d0f6c891df62976e171c359fad99451cd017e3c79b8ef32 SHA512 cbd3a95cd8a628830f79d9920dd7a58af295fbc335648f4bdaf720cbcc8d87a74da52195649b54f3b651aa52b4d655505f47d081511468caabace21e40481e00 WHIRLPOOL bb40783111fca1f3bb5a3ddf4ebab72bf5b073b836d2afd8681bc00bb5c1c6b23002ca0acc80680e5ac2dafb0c7c7770950d468edc64f05b8d58c843e9b08d90 diff --git a/x11-apps/bitmap/Manifest b/x11-apps/bitmap/Manifest index c0a93e5d6811..7f720563b596 100644 --- a/x11-apps/bitmap/Manifest +++ b/x11-apps/bitmap/Manifest @@ -1,4 +1,2 @@ DIST bitmap-1.0.6.tar.bz2 165457 SHA256 f70100002faf7c54b1b851261a14606c147abcc9e43f9b4e980ffc82f56eb5eb SHA512 40d7af0706807c285f9211a0aeefb94f242bd1c8b316db10c3fc3a0f955502264131ef1ef1d2cb40cd69d6a22580249c28a680cc070c58bc9ca167a892ab0f05 WHIRLPOOL 63b49c31c68c121655762017734202d191066f3659224d5c9c7c97649de32ee41f4f2e6c98db876a9f1a7c11163d3caf29e7a751a49b101ce6e33b5632b92733 DIST bitmap-1.0.7.tar.bz2 169437 SHA256 7ea2823a930ddfe3bfc0c7fbb16a5b463222edf05284c5cdc40a6d3c5c3988af SHA512 4f445879e301910f3a9503ba1d2a88974848b35a0b66a57061d8d45a5d27441d30fe3c3cdedd9b637cef2f3f77a8b81786c2ecaff3f6884364037f1aaa69cd30 WHIRLPOOL 3fde660525e1cdb111867e255260ca85e13c142295557a35ab863db6e63e3343b4070e0da7af0ae0d9569119f46aaf3b8325794d9859907fc9b4885a441b1970 -DIST bitmap-1.0.6.tar.bz2 165457 SHA256 f70100002faf7c54b1b851261a14606c147abcc9e43f9b4e980ffc82f56eb5eb SHA512 40d7af0706807c285f9211a0aeefb94f242bd1c8b316db10c3fc3a0f955502264131ef1ef1d2cb40cd69d6a22580249c28a680cc070c58bc9ca167a892ab0f05 WHIRLPOOL 63b49c31c68c121655762017734202d191066f3659224d5c9c7c97649de32ee41f4f2e6c98db876a9f1a7c11163d3caf29e7a751a49b101ce6e33b5632b92733 -DIST bitmap-1.0.7.tar.bz2 169437 SHA256 7ea2823a930ddfe3bfc0c7fbb16a5b463222edf05284c5cdc40a6d3c5c3988af SHA512 4f445879e301910f3a9503ba1d2a88974848b35a0b66a57061d8d45a5d27441d30fe3c3cdedd9b637cef2f3f77a8b81786c2ecaff3f6884364037f1aaa69cd30 WHIRLPOOL 3fde660525e1cdb111867e255260ca85e13c142295557a35ab863db6e63e3343b4070e0da7af0ae0d9569119f46aaf3b8325794d9859907fc9b4885a441b1970 diff --git a/x11-apps/editres/Manifest b/x11-apps/editres/Manifest index 837e70874dff..3637e9e026bf 100644 --- a/x11-apps/editres/Manifest +++ b/x11-apps/editres/Manifest @@ -1,4 +1,2 @@ DIST editres-1.0.5.tar.bz2 145578 SHA256 fd97a3522e97b8b7ead7b5cddeb79bfabe44769d144ac9ae5595c25c41afa33d SHA512 00ee1fd30dec2a12c5fa8c337a1062bcbf0c3198c03ad3f42fdd300e4967f12d19bb746020c8e0d2d08f6d27f3b8e473ca25c20f96d09ea3fe0f24f7e156c816 WHIRLPOOL 280d8bf4a0f80f332b2dbc22809d2a51d58db7317fe94dee9462583b0b0871088566bcbce471f8e04c884c9845e263120db6d3491d7ac796d0b81d3693a0e769 DIST editres-1.0.6.tar.bz2 156155 SHA256 3b66d1240bde853872bbb341c4b8fb029094d0a5d21347a58831f15b162c4df0 SHA512 c070709ce926802696d43d27256cea125c04021ad7555e1ea6c90650bf9e9fdd8da7786ebc99d6cf6a2dac73db041d489d34e6b2f6ceb6b396b6e96711b1c510 WHIRLPOOL 434b7520e2474d72ab8a51ebfdaba5bdce3eaf6aee03c44c73ad60b6b4e0a4436687328ad638aa7b7b08464f67b6321a09fb45cddc54710a4867ffa47b428704 -DIST editres-1.0.5.tar.bz2 145578 SHA256 fd97a3522e97b8b7ead7b5cddeb79bfabe44769d144ac9ae5595c25c41afa33d SHA512 00ee1fd30dec2a12c5fa8c337a1062bcbf0c3198c03ad3f42fdd300e4967f12d19bb746020c8e0d2d08f6d27f3b8e473ca25c20f96d09ea3fe0f24f7e156c816 WHIRLPOOL 280d8bf4a0f80f332b2dbc22809d2a51d58db7317fe94dee9462583b0b0871088566bcbce471f8e04c884c9845e263120db6d3491d7ac796d0b81d3693a0e769 -DIST editres-1.0.6.tar.bz2 156155 SHA256 3b66d1240bde853872bbb341c4b8fb029094d0a5d21347a58831f15b162c4df0 SHA512 c070709ce926802696d43d27256cea125c04021ad7555e1ea6c90650bf9e9fdd8da7786ebc99d6cf6a2dac73db041d489d34e6b2f6ceb6b396b6e96711b1c510 WHIRLPOOL 434b7520e2474d72ab8a51ebfdaba5bdce3eaf6aee03c44c73ad60b6b4e0a4436687328ad638aa7b7b08464f67b6321a09fb45cddc54710a4867ffa47b428704 diff --git a/x11-apps/xkbcomp/Manifest b/x11-apps/xkbcomp/Manifest index 16a6ee535b00..ca69eef206ea 100644 --- a/x11-apps/xkbcomp/Manifest +++ b/x11-apps/xkbcomp/Manifest @@ -1,4 +1,2 @@ DIST xkbcomp-1.2.3.tar.bz2 227566 SHA256 7598e8f44e2643c96d2e37aa44f344f6c48f1a262fc9207154353195b760cb16 SHA512 89de9318d8f7dbf7ca31889a1da51f38a0f71ee33d324f2942553ddd0a35158de3b6f819f310601021805e8268ad3d02d23c83a1c4bda04f9ebc31a9d1670b3d WHIRLPOOL e4bd476e4eef0d44b1f00e0dd0b4d311f1b75f765b8a9c7102392000cf03cacfb28d6f8f630f4181db07a3d31c69e801b55ce582536797a7e9eb6c2008020d74 DIST xkbcomp-1.2.4.tar.bz2 242185 SHA256 91d0c9ab445d21dfe1892dbae5ae5264f39bae68223dd092ffc547c9450b5a2d SHA512 51d6ba1dc4d9c4b8f52320990326f50ac4cc4fb45a939875308d23fe366dc287cbd252759a839a4780c165fc1e972b8cf031cd26622a10a19cb190e38d1d68c4 WHIRLPOOL 2151f5348758226badedef332183cfcfb5d4d50013a665c22f84bcf84ebce5e5ea41a6342816edab7f34392bb11e724bae5e7713e50f2f796bb6766b97f5c00b -DIST xkbcomp-1.2.3.tar.bz2 227566 SHA256 7598e8f44e2643c96d2e37aa44f344f6c48f1a262fc9207154353195b760cb16 SHA512 89de9318d8f7dbf7ca31889a1da51f38a0f71ee33d324f2942553ddd0a35158de3b6f819f310601021805e8268ad3d02d23c83a1c4bda04f9ebc31a9d1670b3d WHIRLPOOL e4bd476e4eef0d44b1f00e0dd0b4d311f1b75f765b8a9c7102392000cf03cacfb28d6f8f630f4181db07a3d31c69e801b55ce582536797a7e9eb6c2008020d74 -DIST xkbcomp-1.2.4.tar.bz2 242185 SHA256 91d0c9ab445d21dfe1892dbae5ae5264f39bae68223dd092ffc547c9450b5a2d SHA512 51d6ba1dc4d9c4b8f52320990326f50ac4cc4fb45a939875308d23fe366dc287cbd252759a839a4780c165fc1e972b8cf031cd26622a10a19cb190e38d1d68c4 WHIRLPOOL 2151f5348758226badedef332183cfcfb5d4d50013a665c22f84bcf84ebce5e5ea41a6342816edab7f34392bb11e724bae5e7713e50f2f796bb6766b97f5c00b diff --git a/x11-apps/xmessage/Manifest b/x11-apps/xmessage/Manifest index 084365e3dcfd..66a58c5e63fc 100644 --- a/x11-apps/xmessage/Manifest +++ b/x11-apps/xmessage/Manifest @@ -1,4 +1,2 @@ DIST xmessage-1.0.3.tar.bz2 110604 SHA256 cfa35d3ad4ad1306e49878163982e9d54872a20a497e77ab0a8d5de05c8b3d5b SHA512 7698dd6d02b2234e5463de7c7493a1ba1498f0434108e941271eca32e0a60d5c1affb6b21ac5fc94bc1962ba2d1853d669f1c1290aa4e669aff6c06411d5aa41 WHIRLPOOL 4044d55ef657872cc47d5b945631b4edb9b82ac65ff4ad41e0b33a47808df01047a5087a8d67d52e42ff8d4cc3f48bacd1382849d446542cde160ac4790e3d21 -DIST xmessage-1.0.4.tar.bz2 125011 SHA256 bcdf4b461c439bb3ade6e1e41c47d6218b912da8e9396b7ad70856db2f95ab68 SHA512 a087fb09595bf0b188a4525b45e9b607acd063cceae36c69c78a48674fb7eca1c82d5c2d2770c7f4425b499e4c002bfc0e377935308c218a330a2b4994b94ebd WHIRLPOOL 10e5-----BEGIN PGP SIGNED MESSAGE----- -DIST xmessage-1.0.3.tar.bz2 110604 SHA256 cfa35d3ad4ad1306e49878163982e9d54872a20a497e77ab0a8d5de05c8b3d5b SHA512 7698dd6d02b2234e5463de7c7493a1ba1498f0434108e941271eca32e0a60d5c1affb6b21ac5fc94bc1962ba2d1853d669f1c1290aa4e669aff6c06411d5aa41 WHIRLPOOL 4044d55ef657872cc47d5b945631b4edb9b82ac65ff4ad41e0b33a47808df01047a5087a8d67d52e42ff8d4cc3f48bacd1382849d446542cde160ac4790e3d21 DIST xmessage-1.0.4.tar.bz2 125011 SHA256 bcdf4b461c439bb3ade6e1e41c47d6218b912da8e9396b7ad70856db2f95ab68 SHA512 a087fb09595bf0b188a4525b45e9b607acd063cceae36c69c78a48674fb7eca1c82d5c2d2770c7f4425b499e4c002bfc0e377935308c218a330a2b4994b94ebd WHIRLPOOL 10e5609685ded588b23a01265f165f9624f22e2adea622381be13cc3f428027958aa2b333eb6b138d2f4710ee6f8fe6acffaa350f73174363cc5fcb31b2bd8da diff --git a/x11-apps/xrefresh/Manifest b/x11-apps/xrefresh/Manifest index 1ad9d6c22444..b373c0b31d80 100644 --- a/x11-apps/xrefresh/Manifest +++ b/x11-apps/xrefresh/Manifest @@ -1,4 +1,2 @@ DIST xrefresh-1.0.4.tar.bz2 105912 SHA256 069502eb485ea128a0bebf94302d5cbb271ad9d31ae51691abd6d64914ff9d7b SHA512 57911fc7fdce72385eb13df0ccf3b4b3961557e8b689e7afc42943ae7746eb2556ceb27d133176114e2d8beef51288f723c7b3c373db1ed701463f611987b37a WHIRLPOOL 107110c7082702141ffd27b8efa422bd3f0796be2db07eaa74fffabf2149d88bdeeb921828c0b976eedf29c0399500aa0f7ccbcb9ef0b46f9bcc0c4d6ead06ca -DIST xrefresh-1.0.5.tar.bz2 120757 SHA256 3213671b0a8a9d1e8d1d5d9-----BEGIN PGP SIGNED MESSAGE----- -DIST xrefresh-1.0.4.tar.bz2 105912 SHA256 069502eb485ea128a0bebf94302d5cbb271ad9d31ae51691abd6d64914ff9d7b SHA512 57911fc7fdce72385eb13df0ccf3b4b3961557e8b689e7afc42943ae7746eb2556ceb27d133176114e2d8beef51288f723c7b3c373db1ed701463f611987b37a WHIRLPOOL 107110c7082702141ffd27b8efa422bd3f0796be2db07eaa74fffabf2149d88bdeeb921828c0b976eedf29c0399500aa0f7ccbcb9ef0b46f9bcc0c4d6ead06ca DIST xrefresh-1.0.5.tar.bz2 120757 SHA256 3213671b0a8a9d1e8d1d5d9e3fd86842c894dd9acc1be2560eda50bc1fb791d6 SHA512 287d167cd167aa35cfc89364bf4e74313137ce47978419446c60cb915188c34051f95d4900d0d5dcf692173f31e00e2699d70e54b79f0b21a59b4694be744014 WHIRLPOOL 74c3f7938eb9da294545960d0160b6ce099c9ca666f837a7406a8202b07a1aa1bb68fa19db80c209f018f7585cf4202b15e455bac85e540a058375c7c0cd6404 diff --git a/x11-apps/xsm/Manifest b/x11-apps/xsm/Manifest index 0acd4459b12d..7d3ae4ded7a4 100644 --- a/x11-apps/xsm/Manifest +++ b/x11-apps/xsm/Manifest @@ -1,4 +1,2 @@ DIST xsm-1.0.2.tar.bz2 145772 SHA256 cdb733ef2508aecdd21edf6e394ddff8c4ac99f7659f65210548b69ef54c2b57 SHA512 90ffea9f99316fe3aa3ec88848db631c83eb999da63b33a70ba32e06a751722aa9195d9b5656a31a7bde040dae43bf5d39301b272ea0410cf0f803ebb87de718 WHIRLPOOL 604c3680c105c10a0523ae18b1b05b1c80515ba0c3edd9468d0c4118d5c91fa2c9312e115a8a977196e572367e8bc7c6dbd3d67fe5d1eda93c37b768eec9f55b -DIST xsm-1.0.3.tar.bz2 161012 SHA256 ad9dee2847a683841f73518a83014b0accae60e9eff7e96752a0dbc412867b4a SHA512 930a12272011ddd7c60e62b32b485c383292163f8aed6086c756f71cece62d0c316d89a6056751818b3b0ee26f68cca6e-----BEGIN PGP SIGNED MESSAGE----- -DIST xsm-1.0.2.tar.bz2 145772 SHA256 cdb733ef2508aecdd21edf6e394ddff8c4ac99f7659f65210548b69ef54c2b57 SHA512 90ffea9f99316fe3aa3ec88848db631c83eb999da63b33a70ba32e06a751722aa9195d9b5656a31a7bde040dae43bf5d39301b272ea0410cf0f803ebb87de718 WHIRLPOOL 604c3680c105c10a0523ae18b1b05b1c80515ba0c3edd9468d0c4118d5c91fa2c9312e115a8a977196e572367e8bc7c6dbd3d67fe5d1eda93c37b768eec9f55b DIST xsm-1.0.3.tar.bz2 161012 SHA256 ad9dee2847a683841f73518a83014b0accae60e9eff7e96752a0dbc412867b4a SHA512 930a12272011ddd7c60e62b32b485c383292163f8aed6086c756f71cece62d0c316d89a6056751818b3b0ee26f68cca6e0fc914cd58d9b20da0a3b7ccf2145f0 WHIRLPOOL bb8a30a849c3570c91a69b5490509919fe19e9f986a018e8ea7b71b36aa986c2770eba4206b8d17918f3a3f199dc34c105e57aaa23716d897f81bb5f8682c2b6 diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest index d178e63da38f..45237a196a96 100644 --- a/x11-drivers/nvidia-drivers/Manifest +++ b/x11-drivers/nvidia-drivers/Manifest @@ -4,7 +4,7 @@ DIST NVIDIA-FreeBSD-x86-331.89.tar.gz 56039270 SHA256 c6c8dc05b7d47dc612494ecec1 DIST NVIDIA-FreeBSD-x86-334.21.tar.gz 56975582 SHA256 ddce7f8e23dd4070c53c7239ce1436c07e28a8bc9679fafba6748038767e8648 SHA512 9e421cac504f075bb80501e7815ada27182c66e6bc22324595da1824b49c00fc8b005028bd9f5d0428f0d9ee04af82e1c90bf1f6b77cf0d60b90dbac963c544b WHIRLPOOL 1ba6573f67be85efdc656063aab8d5cc9a51eb455946dcfdea1b368879d6279de214c7554359bfa2252925f338d597ac5178593f50cc073bb66bf952beffce5f DIST NVIDIA-FreeBSD-x86-337.25.tar.gz 58137349 SHA256 9857b24b5d910fb8688a2b9e11039d88b70ec250e900149183454675a363e8db SHA512 0c85814061732bd09948b5fd203d5d3a1fd5df0e1c23f4af11e1cfae6f7d8c7d7f569f35398c2c5551abf7eb5ce357229fa9b16ce2c21799e96396cff3313777 WHIRLPOOL a7ca516e184334117e1cdd45b3f4c1b0a8c50281ffd1c3859865d877c2bfb20136c308b1ff09e4d64d0e7fef8eeddacab488d0bc30c98d82a9280572be5f0de0 DIST NVIDIA-FreeBSD-x86-340.32.tar.gz 59021194 SHA256 ee4f34a279ae84b97373adbc8c91ab7d34eb52dd4a7b095d51d8592b3e264df8 SHA512 9b5eafa48ccb105fe978242096c99355a291314cacf7a232cb81292355dffac5496cdb8667fa4ad3f0f2286792bf0473f523535e3258bb3b0237c76dbf5ba837 WHIRLPOOL b9438f675f65ec0b55aa2c1ca8c3beb35d20f3c56837bbeb02d511b66d4bce825ba95852ecbca70f6f83ff53f23c98e1c0d2bd313d195426fea63baed27c1cce -DIST NVIDIA-FreeBSD-x86-343.13.tar.gz 60092809 SHA256 b697db64c4ec654bed7b4059be934c9f88e2c057314a5bf511db6e3db60e38fb SHA512 dcca58a0ca469fdfba3e9d3c9bb371825b59154adfa5b66efb805da067effddc9c4ad423db9c26496b15ed16bff8d11b5c101ea1c2d1d123ab125e2f87fd8a2c WHIRLPOOL 24cb3be4ee63ca182241cb504eaa5eca57e8d5a627844bb3f2bab77b2ce6070a96f447c5d26b9f6846b5e19f392026df0e27882c64147a6c0b72c8fe91ca7a67 +DIST NVIDIA-FreeBSD-x86-340.46.tar.gz 59013852 SHA256 5aa4ec5f9ca4425cd3fdc47ac19c76900cecae8a9606632a8063514481363571 SHA512 03bddeb919c6ff58e11df2a4d7f0c30a8f47a9970704dde762c81183773057cdffadf37d60bb920c218b1c72bc8f71949aadcf250747f48b1cd27b1a6164949b WHIRLPOOL 0ce3f23d4660e368b10972a39366a1d26116e38fddaee1a3a4764e85e868151bc7f1e27f3c1dbbc52187c74acabd483c65455d7fd0b9679d89a2c05200e05d83 DIST NVIDIA-FreeBSD-x86-343.22.tar.gz 58851966 SHA256 4b28d08ab763fedb34a856f5915b96d3d6245c7e3420f09a253ca18963a55c5d SHA512 dc0b1812ceeef15846fd780377ce6f94ef4198731dcc413b65401665d9faee877d0afa40753fa25d5a0b9a3d59f3d1c5e607dd3affe9aecf7f9a8566e617b036 WHIRLPOOL 28200c495f39d483b995ddff638606c286d7412c9b0193f5cb5d92e2155011785857fa94eb9f09962cc72de09b48917f11d12f50729480461464631910e2c02c DIST NVIDIA-FreeBSD-x86-96.43.23.tar.gz 15463464 SHA256 18d855db8381eda1a6cf548c9e5095fc5bb8694bf1d6e24fc1072fba4e54cd78 SHA512 42d7b1b76cdb3b23680363e565614a22112162a5dd3639cb804fe670c0c3f3f23595bbefa3f78afdc6a8ca848446dee853c7a355f2c96a0d01b354753ba2785c WHIRLPOOL f8e59ce521990cd9edee441e73f973f074db492952807a0931e362102874cddbb47604ff5c5eb20a0cbde27f9b6d4e440dd12cc2e5a20c9cb65bf3c0b3e62511 DIST NVIDIA-FreeBSD-x86_64-304.123.tar.gz 35144064 SHA256 32ea8ce22b4fe50f59782c390b8ec1d90bb44e02787255476f0304c60f11e877 SHA512 e12f55e2a303e8df628b3d7e5f2c80517cae4f6a146f20a3c10ab2d1147b4bc9386b678bbab9e519e28ea921832e1c855b4b8f4643c839717c5c97a833679b2a WHIRLPOOL 5d751bf72e1e089edcaab34d2ba8d413793a92c5a0d3601ff71285b458ad6aef4632481ece9f520f2006440d35b2eab3941e30f54d79351bc8da3ba12eaf3388 @@ -12,7 +12,7 @@ DIST NVIDIA-FreeBSD-x86_64-331.89.tar.gz 47156745 SHA256 78d78d02cbafb7538a98126 DIST NVIDIA-FreeBSD-x86_64-334.21.tar.gz 57725419 SHA256 5f6c34f6cce4190631b9ffa64006b611c92c8e6af8f016f8c541561d50c0f5d0 SHA512 0a2dc4150b0fd2798438cf68205497c12c5019daca1dc1b3d0f29483220c5db4a5837547ce909f2248770fed8061ef32ace710c9cc5866a0d300bee2c9c2681d WHIRLPOOL 54b0f15bc53dee73a3d6d11eee6f780aa1880c3bacfb45ea75187388411669349a2928ef28d2113b74f87fc9ad825b2e5f5413c2a0a110eaa3e6c9e9a6e67ae0 DIST NVIDIA-FreeBSD-x86_64-337.25.tar.gz 58941876 SHA256 189dc0f70528d0099d0396a52bf759af74d6a99203484be2d2d6514faf0d4161 SHA512 458c9200579a6caed02aabbc196ec998a0d19149cca665c5ef9bc709c018b991b27713c92d00bdd1ea6ddd86e04c641f387e1ec8a1235cc9581af9e7a3b19ebf WHIRLPOOL d819cf486edc443b1da39ea67582a12698b1dea1501f3b6738014a80f8a96260aa0ba30a9e2f1fac075f0f7d604dc94978f7f82092b40531dd4989a2954cc420 DIST NVIDIA-FreeBSD-x86_64-340.32.tar.gz 59836909 SHA256 4a55cbd4f87528d4d5b5a8809a8c6e2dac9ad22b0f8b357590893dfb39e52512 SHA512 ef333d94a147e04292d6e197ee72a7abfb10a84665931876455b689409af42ac713d1a16f965214a46d9dd28fd324769fa4dd14dde5caf20a8b23a9683b6c55e WHIRLPOOL 76fd78eb97b69d7a5d7dc46e06a8d7b4dc3fadc1f2c6995d86161ca90ce99ec4a0b42eedf09939a4436481bad33ef201f49c73c8add833cf912af86774d47b34 -DIST NVIDIA-FreeBSD-x86_64-343.13.tar.gz 60899859 SHA256 6b13c3b8c3e42b7b4fec96d29969f6ec2a24b70af0f6400b56079f05522fce52 SHA512 f2a2a99353c246ccb3bb49129d046d77e34afc74a0e86e55d69f5700e0a74a87fd31ba0dd9a0ea14d34d51c4e805aaaeca10291422ace2a1aa75926b05414596 WHIRLPOOL cb9dc90bbc0dde6d5f095f042de3a00fb2783e4a553d01da4edda02b4ca638914cfccb60d6a377eb1ba32d1d0853e63bb389b16b99912f305a2d019d65b4a029 +DIST NVIDIA-FreeBSD-x86_64-340.46.tar.gz 59835566 SHA256 699a65b5184f8705ba4ddbefb5776136bec98619ea00af3304725e5e028b7346 SHA512 7a6ba9fbd769aec45985664edd7291403e70c0e89a90f5c0665d6433e4baa8e0b59ceb99e817b377753576d189c0091d5af0bc2da796726ce0a9f0ebfa831d5b WHIRLPOOL aea421916646f68efbba007c08319d7b26259e1ee146bd420910468c36c04c3bc574ee6db103d64259083b11190cb3d5342a3dd1af42b0a306aa4515eb4bc9af DIST NVIDIA-FreeBSD-x86_64-343.22.tar.gz 59662876 SHA256 cc6853ae16f2dd1cbaa9ee251a6ccffc1ae15c112a770ecc95f9e65d864d195b SHA512 d4123a3c832272e129a101601fe57a7078e398c8ffd769137f4b0e7ab9eb154624cd3e6de77afdf05d2a887161f99a2e099dbdc95e9640d13f96e2a29eced117 WHIRLPOOL da860a68952d78b8758a7f3a623cacc38b2f3f507ddaa7886899361d08853ae72915d0f2ac72ab266cf54e9b1687a7fc135391f769d29d4c431a9e30502dd545 DIST NVIDIA-Linux-x86-173.14.39-pkg0.run 15134997 SHA256 a09935f37121ed3db8ae3da63a0d8e9d4348a19c859811c9fe44d6ce8e3eab23 SHA512 e24e15ccec725d3cbca502c2b77061776a81ef92917a950adec4ff6bdc34f10903aa654433177ea74be0dade4af81c5380d5710d375a5ea445940d06154bde93 WHIRLPOOL fce3d8e4f6cdf698f5a057514b6fe220bb1011025bdce5bd4cf0e424fb4d306d38251b6726bda03f290ea8137d5a95ed418cf8751722879f9042462abd9181b6 DIST NVIDIA-Linux-x86-304.123.run 40250272 SHA256 d5034900173cb7195f52bd6add5bf574dfcd8868bd75c0e1793592c03b97f425 SHA512 7397a28c67a3cfc5ad58f079ced4c45639922c39008d606ca703c22dde34374c4942c894eec49d42187cf00cb0179e3dcf80edd28a81c4c89456a62e42f12b43 WHIRLPOOL 8b55196678cddba5e640f90525d69835c273befe01e4e1a87c00a21839e9a86bc68829a3c59c64609c47475466a158f43d8579897728cabe6b6bc0eadef62e2b @@ -20,7 +20,7 @@ DIST NVIDIA-Linux-x86-331.89.run 37023195 SHA256 608c5555933fd8738f9263e569ae31a DIST NVIDIA-Linux-x86-334.21.run 37740148 SHA256 ece6ac1d66b0de53b6db0ae92f72112f734c9ec4b7f1ffb1ec508d32f700df39 SHA512 b52a9f08fb91ef915c3c7ce2aa34ecdd93a5fd8731d7f4b9cb887289f931a4dc5e82afa259bc985be55964a8c788550683ef61306bed9a32a5614dcb2d64373d WHIRLPOOL 547862c1ef1b1f3c0684af38ddef9ecd37776e820a7d5c2a7e2ae2e71a5c7956fb1b5c87b78f60e0ce52b7bb7f37efdc27ee4f62a1d42699f48a69521ee42056 DIST NVIDIA-Linux-x86-337.25.run 37649836 SHA256 f76ece6bd98bfe2ae641a1847094e98c6f7ad7a01af682b4f38108d6b6227f9b SHA512 f68105a43f9129f4112c8a091ed7c9641708b62d20c199544e5e7079d5c5bdc0b6c83427be868e62c7134400ca62cab6a65eaff96ddb940768750250cbd50112 WHIRLPOOL 1ff92ffe33dad59bf393a7b6fe7523362433704dc8329701e74814c2eef833d15e44334264601080b90f723f5390ce6502fa3ed530fe9fadaf3efff139e65047 DIST NVIDIA-Linux-x86-340.32.run 38587515 SHA256 1d0489c35c5b332c9b949d9de3c3cbab4ac3a94385aa41e7a7b62ef23f4395f5 SHA512 a67e57a1bd70a9cd5ae2bed70403920ed94d8eac9d08dcd380f6065cd597d5824e26ae25a0bcd56626190124c07d128f3b0429040794c8e8d3ead85860fcb646 WHIRLPOOL 66bf6db27edddae845606e82cf9397dbf483bbde23e97899575c8ac3f6ce86c84d88f8e60c60b1aad1360fe9bea4f43de030a849f88f43d482508de23cd24d8e -DIST NVIDIA-Linux-x86-343.13.run 41273139 SHA256 47ab5edf5be5e73d607b663e92d557a215aed739f7e431e312afd14dfe82f05e SHA512 4acf4f48f6062c3a048d51d63b9470486ca6dc0ec00ba93281e4771b21dafce22725b72822f11d43f3a3de9109ef993b34cc0d03c1cd9b61c3b10e643a726981 WHIRLPOOL 66c5535c2a59011b491d396fdc76e4fcb6b7ce9ddcc2aa07f452a2b05612d6cfd00188d2cad66225b0293df1c6e841aada9f1d908d47c70e4e5e3afa47760c8c +DIST NVIDIA-Linux-x86-340.46.run 38635506 SHA256 a2e6d779397372dea77466e85ba30a15211c24502687512694604e570db11f87 SHA512 3d90a73fbe07eb25ec80a485c3827bebaf64a941331d6f28fb9b925678d74d66421dfecf6fe9637fb57b4aece268e987bfa8f29c06567243ae998d7ddac25f98 WHIRLPOOL dca92cff7d72f105e89deea74d6de69d4f78f1a7b15adea9e4a8cbbca9007b4bee4cc9b9f0cb39d7a2436e141785a5cfd3011b235418e701d27e7393ffefbf66 DIST NVIDIA-Linux-x86-343.22.run 41016661 SHA256 0399de911182bc6da2694c07443ec19a7eab2975955e65be2b3d5fc861400adf SHA512 9249ef93dfe963b13de2743b4144a15aca2fb3dcc6d1c4e78361bcd177a27428283a48fabc82891190ef8f1ead4292e613316f4534fac1387caa0acbff854478 WHIRLPOOL 482d4f7c6d717a4a5e3ed2113ba92250ff450c7db95e07241b82f1c820b926fe7170eed21208b70d23e51c6bb902036f5e01d41bdf033697ae1f3ea249697189 DIST NVIDIA-Linux-x86-96.43.23-pkg0.run 11504817 SHA256 51e6adf4ba73071622045fc37169f80db3ae3e784dff53b29d35146a04042142 SHA512 bed5726e57637481fe4e3c03a65ec14fe949f00860e729ebde408f4fd861d7bfdc296a78bc2f5d42e8b282db09f4bbde1e0545df7228fa20227080dc4b868ba7 WHIRLPOOL 6d4fd1786c11f4e326cc3101d0bb1a2f8b63c25c3dd59f10188f8355759e2861ce44fd53d60258b513d5a1d6124d0f91ba8edf4d3668b6feabfb3e8d585f14fe DIST NVIDIA-Linux-x86_64-173.14.39-pkg2.run 21100833 SHA256 15a953666d5681ba54c97498b578ffd286a1dc96d605f3b02110f3f99813100e SHA512 a65cd496e6ed57f771c3d99f37f616a1242d97844f6faef7a807825ad899c0e536a99fde397020839f0857883b934032f9491024f3047a6b06d3eea1f5d77713 WHIRLPOOL dc5f243b7d1de7e2d1b7f005e018a2940d63335b11a7c83c234b348b7a1839e9131169d2ea928bd8c2f549a4535149b03e16e6c94d59dfa745f7f904ff790a45 @@ -29,6 +29,6 @@ DIST NVIDIA-Linux-x86_64-331.89.run 60300634 SHA256 e7f51a6c7abfe3ba8f03dbb284e2 DIST NVIDIA-Linux-x86_64-334.21.run 67906887 SHA256 dd35011967b815e096c267f80b36664e34d779bc33017f396dabbd1a1b86d057 SHA512 254500cbb83420df26c860df13a448aece837096db8374c41cc0a979c0102b848b5a6ad463e2daf4dc34ae5fcedf7921767e7bd7d86a97ceff4c683b7ee1c886 WHIRLPOOL c525946dc40b03ee5b395535ee278e09ecc400b833bd501a14ee0672ddfb61e1f3dfda305e9c1bdf70344dc34b6aeadfa68a636afba0a80e33a1da808c8f17b4 DIST NVIDIA-Linux-x86_64-337.25.run 68053486 SHA256 83280f7738f65bb2e790e7530a38978cf0bd0aa741eda51629c9e9b068128af0 SHA512 27cb5030da00d6fa2a2dd6701cc149ce885e7ff7e7ca4f1629c27737357fdadedec41e830f5cacabef14646515d6d2729f753d78424260316e28111f2c3e53b9 WHIRLPOOL 72eba5239ae7272d3501403ef292f0e131896b3dd852a7e2423e79206d99aa5a4a3b98eb4193ad5cd1e0247ffd48189d3a3ba02ca307a759a4f15b9c9a386dbd DIST NVIDIA-Linux-x86_64-340.32.run 69753673 SHA256 ef96003110564953cad4ffaec073696dcf9652338dfe5eb0c58ae3ce45db42ac SHA512 24c2dec161022bd229862ad66711232cf6424a0bd1eb056d7eb22a34e265d4b1f6208779cf507b480189f95f795d580a30ec5f8ab1bff549d2a41a57adcc14b4 WHIRLPOOL 6422498998253003fc1e1d6396449d2fe35b5836a083a254d9d7439434e5a3e1cf55afbcc3860a234ee9b3d0a1b18b9c58e4946107465559f0dcb121ef796e5a -DIST NVIDIA-Linux-x86_64-343.13.run 74289137 SHA256 424a7d0fbf668c94454a140c880c298c71496ad7dee699a0bfc594c70e499e54 SHA512 5a22d5967c2a72c135cdee26bb2d5512db38ce82085a2485f6b1280c7b65fae390d4653a630b6634dcc46868db394a046d71b73131f5a37c3a5b302ea3984c3f WHIRLPOOL dd79c4fa0324a39e2c7a5c46eb7a1af2c13b21d720c7815431f1b727bc6fa18503110048bb2a1bff7c6c4d7723734007babe434e9b64b629d213327eb99ad343 +DIST NVIDIA-Linux-x86_64-340.46.run 69693129 SHA256 57e7694b5a985ee95d2da37598ec37cdabf40f914490f4cdb0c5184f12a74270 SHA512 43cce2911c1894fe9240453179666c5fd1f437b49a1e3e5990463e9009ffa25d5da7f91105d1520c6133a0bdef9070c768efdc087e2d8ef85ed7896fcf555c7a WHIRLPOOL 9f845c5b6621fcc34a5b64d1c5823a3978a04c669ee4d3f7e3aee3f8da06c1c6eaa3b51792be2e1006945ee06df0c1a2650fc70d4257b768ca4d144a79775892 DIST NVIDIA-Linux-x86_64-343.22.run 73701713 SHA256 762e9d3c1253712a5a62f7052d58e4768eaea3f0492cab934dbf5349c8523315 SHA512 280a8d85f5aed770d08333f8a0f58b48ab96b93e4c5df15730f7588ed84675874cf70460a5fce748e0cb22e0c36a454ddcd7998685c22ee6516af30d35e0069b WHIRLPOOL 0d540e89ea0fd3390aa894237f9c9b842f9750536d5983cd014a0d6652e7e691ccfb6c4d64165f6054a307071f974bd644f5f4767e1e5e6090f74ecd189435a7 DIST NVIDIA-Linux-x86_64-96.43.23-pkg2.run 15962375 SHA256 ce8d8253e7dab7da63fbdac449ebf190cd0c10cbfffea0f8d0165515f851bc64 SHA512 04bec1187a6024a2b9839f008ec829281f1f2602dae2e639030bc385943186506bcaa2b46a230b2ab87f9217190841abc62f9e2d6395ab5559623389c31c6563 WHIRLPOOL 0651c44a51a1a06fcff5bfddbf9c3e408977e03263c7fe806cb6c01f9fe92f716dfe4e5190ffe1048bde72fcffdc8bca8267e74dd43ba5c9dfb22b6201fcc2bb diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-343.13-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-340.46.ebuild similarity index 98% rename from x11-drivers/nvidia-drivers/nvidia-drivers-343.13-r1.ebuild rename to x11-drivers/nvidia-drivers/nvidia-drivers-340.46.ebuild index ecda8c887159..8640ae4c3128 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-343.13-r1.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-340.46.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-343.13-r1.ebuild,v 1.1 2014/08/13 08:12:47 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-340.46.ebuild,v 1.1 2014/10/01 09:39:58 jer Exp $ EAPI=5 @@ -328,6 +328,8 @@ src_install() { doman nvidia-modprobe.1.gz doman nvidia-persistenced.1.gz newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi + newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced + newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced fi if use tools; then diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-343.22-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-343.22-r2.ebuild index 31940019fab2..0758baec58e3 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-343.22-r2.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-343.22-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-343.22-r2.ebuild,v 1.1 2014/09/19 22:09:28 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-343.22-r2.ebuild,v 1.2 2014/10/01 09:51:36 jer Exp $ EAPI=5 @@ -24,7 +24,7 @@ SRC_URI=" LICENSE="GPL-2 NVIDIA-r2" SLOT="0" -KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="-* amd64 x86 ~amd64-fbsd ~x86-fbsd" IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X uvm" RESTRICT="bindist mirror strip" EMULTILIB_PKG="true" diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-343.22.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-343.22.ebuild deleted file mode 100644 index 9964a5b5e653..000000000000 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-343.22.ebuild +++ /dev/null @@ -1,482 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-343.22.ebuild,v 1.1 2014/09/19 21:27:55 jer Exp $ - -EAPI=5 - -inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \ - portability toolchain-funcs unpacker user udev - -NV_URI="http://us.download.nvidia.com/XFree86/" -X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}" -AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}" -X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}" -AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}" - -DESCRIPTION="NVIDIA Accelerated Graphics Driver" -HOMEPAGE="http://www.nvidia.com/" -SRC_URI=" - amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz ) - amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run ) - x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz ) - x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run ) -" - -LICENSE="GPL-2 NVIDIA-r2" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd" -IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X uvm" -RESTRICT="bindist mirror strip" -EMULTILIB_PKG="true" - -COMMON=" - app-admin/eselect-opencl - kernel_linux? ( >=sys-libs/glibc-2.6.1 ) - X? ( - >=app-admin/eselect-opengl-1.0.9 - ) -" -DEPEND=" - ${COMMON} - app-arch/xz-utils - kernel_linux? ( virtual/linux-sources ) -" -RDEPEND=" - ${COMMON} - acpi? ( sys-power/acpid ) - tools? ( - dev-libs/atk - dev-libs/glib - x11-libs/gdk-pixbuf - >=x11-libs/gtk+-2.4:2 - x11-libs/libX11 - x11-libs/libXext - x11-libs/pango[X] - ) - X? ( - =x11-libs/libvdpau-0.3-r1 - multilib? ( - || ( - ( - >=x11-libs/libX11-1.6.2[abi_x86_32] - >=x11-libs/libXext-1.3.2[abi_x86_32] - ) - app-emulation/emul-linux-x86-xlibs - ) - ) - ) -" - -REQUIRED_USE="tools? ( X )" - -QA_PREBUILT="opt/* usr/lib*" - -S=${WORKDIR}/ - -pkg_pretend() { - - if use amd64 && has_multilib_profile && \ - [ "${DEFAULT_ABI}" != "amd64" ]; then - eerror "This ebuild doesn't currently support changing your default ABI" - die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}" - fi - - if use kernel_linux && kernel_is ge 3 17 ; then - ewarn "Gentoo supports kernels which are supported by NVIDIA" - ewarn "which are limited to the following kernels:" - ewarn " userspace driver config lib - donvidia ${NV_OBJ}/libnvidia-cfg.so ${NV_SOVER} - - # NVIDIA framebuffer capture library - donvidia ${NV_OBJ}/libnvidia-fbc.so ${NV_SOVER} - - # NVIDIA video encode/decode <-> CUDA - if use kernel_linux; then - donvidia ${NV_OBJ}/libnvcuvid.so ${NV_SOVER} - donvidia ${NV_OBJ}/libnvidia-encode.so ${NV_SOVER} - fi - - if use X; then - # Xorg DDX driver - insinto /usr/$(get_libdir)/xorg/modules/drivers - doins ${NV_X11}/nvidia_drv.so - - # Xorg GLX driver - donvidia ${NV_X11}/libglx.so ${NV_SOVER} \ - /usr/$(get_libdir)/opengl/nvidia/extensions - fi - - # OpenCL ICD for NVIDIA - if use kernel_linux; then - insinto /etc/OpenCL/vendors - doins ${NV_OBJ}/nvidia.icd - fi - - # Documentation - dohtml ${NV_DOC}/html/* - if use kernel_FreeBSD; then - dodoc "${NV_DOC}/README" - use X && doman "${NV_MAN}/nvidia-xconfig.1" - use tools && doman "${NV_MAN}/nvidia-settings.1" - else - # Docs - newdoc "${NV_DOC}/README.txt" README - dodoc "${NV_DOC}/NVIDIA_Changelog" - doman "${NV_MAN}/nvidia-smi.1.gz" - use X && doman "${NV_MAN}/nvidia-xconfig.1.gz" - use tools && doman "${NV_MAN}/nvidia-settings.1.gz" - doman "${NV_MAN}/nvidia-cuda-mps-control.1.gz" - fi - - # Helper Apps - exeinto /opt/bin/ - - if use X; then - doexe ${NV_OBJ}/nvidia-xconfig - fi - - if use kernel_linux ; then - doexe ${NV_OBJ}/nvidia-cuda-mps-control - doexe ${NV_OBJ}/nvidia-cuda-mps-server - doexe ${NV_OBJ}/nvidia-debugdump - doexe ${NV_OBJ}/nvidia-persistenced - doexe ${NV_OBJ}/nvidia-smi - - # install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092) - doexe ${NV_OBJ}/nvidia-modprobe - fowners root:video /opt/bin/nvidia-modprobe - fperms 4710 /opt/bin/nvidia-modprobe - dosym /{opt,usr}/bin/nvidia-modprobe - - doman nvidia-cuda-mps-control.1.gz - doman nvidia-modprobe.1.gz - doman nvidia-persistenced.1.gz - newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi - fi - - if use tools; then - doexe ${NV_OBJ}/nvidia-settings - insinto /usr/share/nvidia/ - doins nvidia-application-profiles-${PV}-key-documentation - insinto /etc/nvidia - newins nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc - fi - - exeinto /usr/bin/ - doexe ${NV_OBJ}/nvidia-bug-report.sh - - # Desktop entries for nvidia-settings - if use tools ; then - # There is no icon in the FreeBSD tarball. - use kernel_FreeBSD || newicon ${NV_OBJ}/nvidia-settings.png ${PN}-settings.png - domenu "${FILESDIR}"/${PN}-settings.desktop - exeinto /etc/X11/xinit/xinitrc.d - doexe "${FILESDIR}"/95-nvidia-settings - fi - - #doenvd "${FILESDIR}"/50nvidia-prelink-blacklist - - if has_multilib_profile && use multilib ; then - local OABI=${ABI} - for ABI in $(get_install_abis) ; do - src_install-libs - done - ABI=${OABI} - unset OABI - else - src_install-libs - fi - - is_final_abi || die "failed to iterate through all ABIs" - - readme.gentoo_create_doc -} - -src_install-libs() { - local inslibdir=$(get_libdir) - local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib" - local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia" - local libdir=${NV_OBJ} - - if use kernel_linux && has_multilib_profile && \ - [[ ${ABI} == "x86" ]] ; then - libdir=${NV_OBJ}/32 - fi - - if use X; then - # The GLX libraries - donvidia ${libdir}/libEGL.so ${NV_SOVER} ${GL_ROOT} - donvidia ${libdir}/libGL.so ${NV_SOVER} ${GL_ROOT} - donvidia ${libdir}/libGLESv1_CM.so ${NV_SOVER} ${GL_ROOT} - donvidia ${libdir}/libnvidia-eglcore.so ${NV_SOVER} - donvidia ${libdir}/libnvidia-glcore.so ${NV_SOVER} - donvidia ${libdir}/libnvidia-glsi.so ${NV_SOVER} - donvidia ${libdir}/libnvidia-ifr.so ${NV_SOVER} - if use kernel_FreeBSD; then - donvidia ${libdir}/libnvidia-tls.so ${NV_SOVER} - else - donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER} - fi - - # VDPAU - donvidia ${libdir}/libvdpau_nvidia.so ${NV_SOVER} - - # GLES v2 libraries - insinto ${GL_ROOT} - doexe ${libdir}/libGLESv2.so.${PV} - dosym libGLESv2.so.${PV} ${GL_ROOT}/libGLESv2.so.2 - dosym libGLESv2.so.2 ${GL_ROOT}/libGLESv2.so - fi - - # NVIDIA monitoring library - if use kernel_linux ; then - donvidia ${libdir}/libnvidia-ml.so ${NV_SOVER} - fi - - # CUDA & OpenCL - if use kernel_linux; then - donvidia ${libdir}/libcuda.so ${NV_SOVER} - donvidia ${libdir}/libnvidia-compiler.so ${NV_SOVER} - donvidia ${libdir}/libOpenCL.so 1.0.0 ${CL_ROOT} - donvidia ${libdir}/libnvidia-opencl.so ${NV_SOVER} - fi -} - -pkg_preinst() { - if use kernel_linux; then - linux-mod_pkg_preinst - - local videogroup="$(egetent group video | cut -d ':' -f 3)" - if [ -z "${videogroup}" ]; then - eerror "Failed to determine the video group gid" - die "Failed to determine the video group gid" - else - sed -i \ - -e "s:PACKAGE:${PF}:g" \ - -e "s:VIDEOGID:${videogroup}:" \ - "${D}"/etc/modprobe.d/nvidia.conf || die - fi - fi - - # Clean the dynamic libGL stuff's home to ensure - # we dont have stale libs floating around - if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then - rm -rf "${ROOT}"/usr/lib/opengl/nvidia/* - fi - # Make sure we nuke the old nvidia-glx's env.d file - if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then - rm -f "${ROOT}"/etc/env.d/09nvidia - fi -} - -pkg_postinst() { - use kernel_linux && linux-mod_pkg_postinst - - # Switch to the nvidia implementation - use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia - "${ROOT}"/usr/bin/eselect opencl set --use-old nvidia - - readme.gentoo_print_elog - - if ! use X; then - elog "You have elected to not install the X.org driver. Along with" - elog "this the OpenGL libraries and VDPAU libraries were not" - elog "installed. Additionally, once the driver is loaded your card" - elog "and fan will run at max speed which may not be desirable." - elog "Use the 'nvidia-smi' init script to have your card and fan" - elog "speed scale appropriately." - elog - fi - if ! use tools; then - elog "USE=tools controls whether the nvidia-settings application" - elog "is installed. If you would like to use it, enable that" - elog "flag and re-emerge this ebuild. Optionally you can install" - elog "media-video/nvidia-settings" - elog - fi -} - -pkg_prerm() { - use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11 -} - -pkg_postrm() { - use kernel_linux && linux-mod_pkg_postrm - use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11 -} diff --git a/x11-libs/cairo/files/cairo-1.10.2-export-symbols.patch b/x11-libs/cairo/files/cairo-1.10.2-export-symbols.patch index b1d98a15fe86..5f1c2d484ebf 100644 --- a/x11-libs/cairo/files/cairo-1.10.2-export-symbols.patch +++ b/x11-libs/cairo/files/cairo-1.10.2-export-symbols.patch @@ -32,6 +32,7 @@ index d7e4427..8d4181b 100644 $(NULL) libcairo_script_interpreter_la_CFLAGS = $(CAIRO_CFLAGS) -libcairo_script_interpreter_la_LDFLAGS = -version-info $(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols) -+libcairo_script_interpreter_la_LDFLAGS = -version-info $(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols) -export-sIndex: cairo/src/Makefile.am -=================================================================== ---- cairo.orig/src/Makefile.am 2011-02-08 10:11:46.8795 \ No newline at end of file ++libcairo_script_interpreter_la_LDFLAGS = -version-info $(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols) -export-symbols-regex \^cairo_.* + libcairo_script_interpreter_la_LIBADD = $(top_builddir)/src/libcairo.la $(CAIRO_LIBS) -lz + + csi_replay_SOURCES = csi-replay.c diff --git a/x11-libs/cairo/files/cairo-1.12.10-xlib-corruption.patch b/x11-libs/cairo/files/cairo-1.12.10-xlib-corruption.patch index 34878fc518ce..84bab57e4d16 100644 --- a/x11-libs/cairo/files/cairo-1.12.10-xlib-corruption.patch +++ b/x11-libs/cairo/files/cairo-1.12.10-xlib-corruption.patch @@ -49,41 +49,42 @@ index dbc677e..ee69b66 100644 --- a/src/cairo-xlib-surface.c +++ b/src/cairo-xlib-surface.c @@ -1139,26 +1139,24 @@ _cairo_xlib_surface_draw_image (cairo_xlib_surface_t *surface, - From fa4f48cccb6c7f4e1afb2ff4b98b906b7d8d4afc Mon Sep 17 00:00:00 2001 -From: Chris Wilson -Date: Wed, 23 Jan 2013 15:04:26 +0000 -Subject: xlib: Do not upload the whole image just because we want an entire row - -Fixes regression exposed by - -commit a73e7ff0186176bc82cd3ae1432c054c1fd3aebd -Author: Chris Wilson -Date: Sun Jan 6 11:29:27 2013 +0000 - - xlib: Simplify source creation by use of map-to-image - -but ultimately from - -commit 74941f822015cc50cd8477d0cf97f1a70dbff60b -Author: Chris Wilson -Date: Wed Jan 2 22:27:55 2013 +0000 - - xlib: Use SHM transport for ordinary image uploads - -Reported-by: Gökçen Eraslan -Reported-by: Guillaume Ayoub -Reported-by: Emmanuel Benisty -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=59635 -Signed-off-by: Chris Wilson ---- -diff --git a/src/cairo-xlib-source.c b/src/cairo-xlib-source.c -index 24290f7..ca55278 100644 ---- a/src/cairo-xlib-source.c -+++ b/src/cairo-xlib-source.c -@@ -1035,7 +1035,13 @@ surface_source (cairo_xlib_surface_t *dst, - - status = _cairo_surface_unmap_image (&xsrc->base, image); - if (unlikely (status)) { -- cairo_surface_destroy (src); -+ cairo_surface_destroy (&xsrc->base); -+ return _cairo_surfa \ No newline at end of file + max_request_size = XMaxRequestSize (display->display); + if (max_request_size > 8192) + max_request_size = 8192; +- if (image->stride * image->height > max_request_size) { ++ if (width * height * 4 > max_request_size) { + shm_image = _cairo_xlib_surface_create_shm__image (surface, + image->pixman_format, +- image->width, +- image->height); ++ width, height); + if (shm_image && shm_image->status == CAIRO_STATUS_SUCCESS) { + cairo_image_surface_t *clone = (cairo_image_surface_t *) shm_image; +- if (clone->stride == image->stride) { +- memcpy (clone->data, image->data, clone->stride * clone->height); +- } else { +- pixman_image_composite32 (PIXMAN_OP_SRC, +- image->pixman_image, NULL, clone->pixman_image, +- 0, 0, +- 0, 0, +- 0, 0, +- image->width, image->height); +- } ++ pixman_image_composite32 (PIXMAN_OP_SRC, ++ image->pixman_image, NULL, clone->pixman_image, ++ src_x, src_y, ++ 0, 0, ++ 0, 0, ++ width, height); + ximage.obdata = _cairo_xlib_shm_surface_get_obdata (shm_image); + ximage.data = (char *)clone->data; + ximage.bytes_per_line = clone->stride; ++ ximage.width = width; ++ ximage.height = height; ++ src_x = src_y = 0; + } + } + } else +-- +cgit v0.9.0.2-2-gbebe diff --git a/x11-libs/colord-gtk/Manifest b/x11-libs/colord-gtk/Manifest index e791c495a2b9..f0e1ffe21f42 100644 --- a/x11-libs/colord-gtk/Manifest +++ b/x11-libs/colord-gtk/Manifest @@ -1,2 +1 @@ DIST colord-gtk-0.1.25.tar.xz 271192 SHA256 bd0f91c4348acba41018222915cd62917882dd35883bcc81848d089e13a70b0a SHA512 858a95630109ebbcc1e75f6ccdd73af28f9f0739a797d23ea6eadc1447518652925383e61940f0181c7361956a7250b209c63be2107b7f696bb471a122989611 WHIRLPOOL 95fc0aa6e56cadcfb98b13561826d856fb1a5e2a8d0804a7f00c461bf590662c566e9d1213afd91012db0231f9ab65e78286422f8af84f4d9b953f3ed011f6cc -DIST colord-gtk-0.1.25.tar.xz 271192 SHA256 bd0f91c4348acba41018222915cd62917882dd35883bcc81848d089e13a70b0a SHA512 858a95630109ebbcc1e75f6ccdd73af28f9f0739a797d23ea6eadc1447518652925383e61940f0181c7361956a7250b209c63be2107b7f696bb471a122989611 WHIRLPOOL 95fc0aa6e56cadcfb98b13561826d856fb1a5e2a8d0804a \ No newline at end of file diff --git a/x11-libs/fltk/files/fltk-1.3.0-conf-tests.patch b/x11-libs/fltk/files/fltk-1.3.0-conf-tests.patch index e5d70b306d94..f5e2a1fdbfe2 100644 --- a/x11-libs/fltk/files/fltk-1.3.0-conf-tests.patch +++ b/x11-libs/fltk/files/fltk-1.3.0-conf-tests.patch @@ -47,50 +47,33 @@ index 1742cfa..8102c43 100644 - $(INSTALL_MAN) $(SRC_DOCDIR)/fltk.$(CAT3EXT) $(DESTDIR)$(mandir)/cat3 -$(INSTALL_DIR) $(DESTDIR)$(mandir)/man1 $(INSTALL_MAN) $(SRC_DOCDIR)/fluid.man $(DESTDIR)$(mandir)/man1/fluid.1 - $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.man $(DESTDIdiff --git a/Makefile b/Makefile -index ccec15c..747625e 100644 ---- a/Makefile -+++ b/Makefile -@@ -27,7 +27,7 @@ - - include makeinclude + $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.man $(DESTDIR)$(mandir)/man1/fltk-config.1 +@@ -104,10 +99,6 @@ install: $(MANPAGES) + $(INSTALL_MAN) $(SRC_DOCDIR)/fltk.man $(DESTDIR)$(mandir)/man3/fltk.3 --DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid test documentation -+DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid - - all: makeinclude fltk-config - for dir in $(DIRS); do\ -@@ -35,6 +35,10 @@ all: makeinclude fltk-config - (cd $$dir; $(MAKE) $(MFLAGS)) || exit 1;\ - done - -+check: all -+ $(MAKE) $(MFLAGS) -C test || exit 1 -+ -+ - install: makeinclude - -mkdir -p $(DESTDIR)$(bindir) - $(RM) $(DESTDIR)$(bindir)/fltk-config -@@ -109,9 +113,6 @@ makeinclude: configure configh.in makeinclude.in - touch config.h - chmod +x fltk-config + install-linux install-osx: +- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat6 +- $(INSTALL_MAN) $(SRC_DOCDIR)/blocks.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6 +- $(INSTALL_MAN) $(SRC_DOCDIR)/checkers.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6 +- $(INSTALL_MAN) $(SRC_DOCDIR)/sudoku.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6 + -$(INSTALL_DIR) $(DESTDIR)$(mandir)/man6 + $(INSTALL_MAN) $(SRC_DOCDIR)/blocks.man $(DESTDIR)$(mandir)/man6/blocks.6 + $(INSTALL_MAN) $(SRC_DOCDIR)/checkers.man $(DESTDIR)$(mandir)/man6/checkers.6 +@@ -116,17 +107,11 @@ install-linux install-osx: --configure: configure.in -- autoconf -- - portable-dist: - epm -v -s fltk.xpm fltk + uninstall: + $(RMDIR) $(DESTDIR)$(docdir) +- $(RM) $(DESTDIR)$(mandir)/cat1/fluid.$(CAT1EXT) + $(RM) $(DESTDIR)$(mandir)/man1/fluid.1 +- $(RM) $(DESTDIR)$(mandir)/cat1/fltk-config.$(CAT1EXT) + $(RM) $(DESTDIR)$(mandir)/man1/fltk-config.1 +- $(RM) $(DESTDIR)$(mandir)/cat3/fltk.$(CAT3EXT) + $(RM) $(DESTDIR)$(mandir)/man3/fltk.3 -diff --git a/documentation/Makefile b/documentation/Makefile -index 1742cfa..8102c43 100644 ---- a/documentation/Makefile -+++ b/documentation/Makefile -@@ -92,11 +92,6 @@ install: $(MANPAGES) - $(INSTALL_DATA) fltk.pdf $(DESTDIR)$(docdir); \ - fi - echo "Installing man pages in $(DESTDIR)$(mandir) ..." -- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat1 -- $(INSTALL_MAN) $(SRC_DOCDIR)/fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1 -- $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1 -- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat3 -- $(INSTALL_MAN) $(SRC_DOCDIR)/fltk.$(CAT3EXT) $(D \ No newline at end of file + uninstall-linux uninstall-osx: +- $(RM) $(DESTDIR)$(mandir)/cat6/blocks.$(CAT6EXT) +- $(RM) $(DESTDIR)$(mandir)/cat6/checkers.$(CAT6EXT) +- $(RM) $(DESTDIR)$(mandir)/cat6/sudoku.$(CAT6EXT) + $(RM) $(DESTDIR)$(mandir)/man6/blocks.6 + $(RM) $(DESTDIR)$(mandir)/man6/checkers.6 + $(RM) $(DESTDIR)$(mandir)/man6/sudoku.6 diff --git a/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild b/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild index fd792c742d69..e5076d3c663b 100644 --- a/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild +++ b/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild @@ -45,23 +45,45 @@ src_configure() { use nls || myconf="${myconf} --disable-nls" strip-linguas ${MY_AVAILABLE_LINGUAS} - if use debug ;# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild,v 1.17 2013/05/01 03:22:51 tetromino Exp $ + if use debug ; then + myconf="${myconf} --enable-debug=yes" + else + myconf="${myconf} --enable-debug=minimum" + fi -EAPI=4 -GNOME_TARBALL_SUFFIX="gz" -inherit gnome.org eutils toolchain-funcs autotools + econf \ + --sysconfdir=/etc \ + --with-xinput=xfree \ + --with-x \ + ${myconf} +} -DESCRIPTION="The GIMP Toolkit" -HOMEPAGE="http://www.gtk.org/" -SRC_URI="${SRC_URI} http://www.ibiblio.org/gentoo/distfiles/gtk+-1.2.10-r8-gentoo.diff.bz2" +src_compile() { + emake CC="$(tc-getCC)" +} -LICENSE="LGPL-2.1+" -SLOT="1" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd" -IUSE="nls debug" +src_install() { + default -# Supported languages and translated documentation -# Be sure all languages are prefixed with a single space! -MY_AVAILABLE_LINGUAS=" az ca cs da de el es et eu fi fr ga gl hr hu it ja ko lt nl nn no pl pt_BR pt ro ru sk sl sr sv \ No newline at end of file + dodoc AUTHORS ChangeLog* HACKING + dodoc NEWS* README* TODO + docinto docs + cd docs + dodoc *.txt *.gif text/* + dohtml -r html + + #install nice, clean-looking gtk+ style + insinto /usr/share/themes/Gentoo/gtk + doins "${FILESDIR}"/gtkrc +} + +pkg_postinst() { + if [[ -e /etc/X11/gtk/gtkrc ]] ; then + ewarn "Older versions added /etc/X11/gtk/gtkrc which changed settings for" + ewarn "all themes it seems. Please remove it manually as it will not due" + ewarn "to /env protection." + fi + + echo "" + einfo "The old gtkrc is available through the new Gentoo gtk theme." +} diff --git a/x11-libs/libSM/libSM-1.2.1-r1.ebuild b/x11-libs/libSM/libSM-1.2.1-r1.ebuild index 828f23107ba2..7feca045f89a 100644 --- a/x11-libs/libSM/libSM-1.2.1-r1.ebuild +++ b/x11-libs/libSM/libSM-1.2.1-r1.ebuild @@ -10,18 +10,6 @@ inherit xorg-2 DESCRIPTION="X.Org Session Management library" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libSM/libSM-1.2.1-r1.ebuild,v 1.3 2014/06/18 21:02:55 mgorny Exp $ - -EAPI=5 - -XORG_DOC=doc -XORG_MULTILIB=yes -inherit xorg-2 - -DESCRIPTION="X.Org Session Management library" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="doc ipv6 +uuid" @@ -50,4 +38,25 @@ pkg_setup() { if [[ ! -d ${EROOT}usr/include/uuid ]] && [[ -d ${ROOT}usr/include/uuid ]] then - # Solaris and Darwin h \ No newline at end of file + # Solaris and Darwin have uuid provided by the host + # system. Since util-linux's version is based on this + # version, and on Darwin actually breaks host headers when + # installed, we can "pretend" for libSM we have libuuid + # installed, while in fact we don't + withuuid="--without-libuuid" + export HAVE_LIBUUID=yes + export LIBUUID_CFLAGS="-I${ROOT}usr/include/uuid" + # Darwin has uuid in libSystem + [[ ${CHOST} == *-solaris* ]] && export LIBUUID_LIBS="-luuid" + fi + ;; + esac + fi + XORG_CONFIGURE_OPTIONS=( + $(use_enable ipv6) + $(use_enable doc docs) + $(use_with doc xmlto) + ${withuuid} + --without-fop + ) +} diff --git a/x11-libs/libSM/libSM-1.2.2-r1.ebuild b/x11-libs/libSM/libSM-1.2.2-r1.ebuild index e0d0d018d67b..1a0bb6e3698f 100644 --- a/x11-libs/libSM/libSM-1.2.2-r1.ebuild +++ b/x11-libs/libSM/libSM-1.2.2-r1.ebuild @@ -13,22 +13,6 @@ DESCRIPTION="X.Org Session Management library" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="doc ipv6 +uuid" -RDEPEND=">=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}] - # Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libSM/libSM-1.2.2-r1.ebuild,v 1.3 2014/06/18 21:02:55 mgorny Exp $ - -EAPI=5 - -XORG_DOC=doc -XORG_MULTILIB=yes -inherit xorg-2 - -DESCRIPTION="X.Org Session Management library" - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="doc ipv6 +uuid" - RDEPEND=">=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}] x11-libs/xtrans >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] @@ -47,4 +31,28 @@ src_configure() { case ${CHOST} in *-solaris*|*-darwin*) if [[ ! -d ${EROOT}usr/include/uuid ]] && - [[ \ No newline at end of file + [[ -d ${ROOT}usr/include/uuid ]] + then + # Solaris and Darwin have uuid provided by the host + # system. Since util-linux's version is based on this + # version, and on Darwin actually breaks host headers when + # installed, we can "pretend" for libSM we have libuuid + # installed, while in fact we don't + withuuid="--without-libuuid" + export HAVE_LIBUUID=yes + export LIBUUID_CFLAGS="-I${ROOT}usr/include/uuid" + # Darwin has uuid in libSystem + [[ ${CHOST} == *-solaris* ]] && export LIBUUID_LIBS="-luuid" + fi + ;; + esac + fi + XORG_CONFIGURE_OPTIONS=( + $(use_enable ipv6) + $(use_enable doc docs) + $(use_with doc xmlto) + ${withuuid} + --without-fop + ) + xorg-2_src_configure +} diff --git a/x11-libs/libXcursor/Manifest b/x11-libs/libXcursor/Manifest index 9b221fd151da..f0316289e1d6 100644 --- a/x11-libs/libXcursor/Manifest +++ b/x11-libs/libXcursor/Manifest @@ -1,2 +1 @@ DIST libXcursor-1.1.14.tar.bz2 311896 SHA256 9bc6acb21ca14da51bda5bc912c8955bc6e5e433f0ab00c5e8bef842596c33df SHA512 687963b54da66be25371f64a88f91812b38de4ffc3b806070f3aeb1da379df16ede819201a352b3fb66efc6b40a36a22770add3ae464f2008aff3e23cb60a8e6 WHIRLPOOL 3cb8adedd3b4f68f37814a880949a7d05d429b3f7f80a94456af823e921844dd338c5f5fa0da4a157b1b853ca8116e8366b004c6f4561150121397440aa651ec -DIST libXcursor-1.1.14.tar.bz2 311896 SHA256 9bc6acb21ca14da51bda5bc912c8955bc6e5e433f0ab00c5e8bef842596c33df SHA512 687963b54da66be25371f64a88f91812b38de4ffc3b806070f3aeb1da379df16ede819201a352b3fb66efc6b40a36a22770add3ae464f2008aff3e23cb60a8e6 WHIRLPOOL 3cb8adedd3b4f68f37814a880949a7d05d429b3f7f80a94456af823e921844dd338c5f5fa0da4a157b1b853ca8116e8366b004c6f4561150121397440aa651ec diff --git a/x11-libs/libXfontcache/Manifest b/x11-libs/libXfontcache/Manifest index 30e39f02b1e1..79bc750e8ff7 100644 --- a/x11-libs/libXfontcache/Manifest +++ b/x11-libs/libXfontcache/Manifest @@ -1,2 +1 @@ DIST libXfontcache-1.0.5.tar.bz2 240293 SHA256 0d639219549f51fa0e6b4414383f5d13e6c1638e66b3434f4626eb989ffacbce SHA512 cd11231b95d3d3be9deb82e61506e58281150d743b07d05716aa627ab31005cf0f963ef2b96eafc65c4a0438f7ff93cdfab25022a05961ea1ff184d47c131310 WHIRLPOOL 81e0622146d1d8c4f7e6e318be1974d7d45f8021195e57ab849df00904b2b2a54c28c68c6c49ae0c3a65253effc27a0b8027bb805384d07825d46a0d661417a5 -DIST libXfontcache-1.0.5.tar.bz2 240293 SHA256 0d639219549f51fa0e6b4414383f5d13e6c1638e66b3434f4626eb989ffacbce SHA512 cd11231b95d3d3be9deb82e61506e58281150d743b07d05716aa627ab31005cf0f963ef2b96eafc65c4a0438f7ff93cdfab25022a05961ea1ff184d47c131310 WHIRLPOOL 81e0622146d1d8c4f7e6e318be1974d7d45f8021195e57ab849df00904b2b2a54c28c68c6c49ae0c3a65253effc27a0b8027bb805384d07825d46a0d661417a5 diff --git a/x11-libs/libXft/Manifest b/x11-libs/libXft/Manifest index 4b19f908e2f3..f1b2a0da1071 100644 --- a/x11-libs/libXft/Manifest +++ b/x11-libs/libXft/Manifest @@ -1,4 +1,2 @@ DIST libXft-2.3.1.tar.bz2 311556 SHA256 7fce32b92dcb7b2869bed567af2abc7bbad0d5d6fcf471b8a3e137964a31bbbd SHA512 737d6ab892daf829da8b2fed954b31b2657d29033f35e806599cd67c6e044ab94b0f035804a1c4c9e3e0cbdc74a117cd274128a57f4b2cf81383561d62eb9f1f WHIRLPOOL ecd372614afc4fba05598e51c051f0a011c5ccaabc41e9e585b67180099cd9f7c6d68904adbe5ccf44f79133e21495daa6cd46675ca7556e7d7ab0dac1ee432a DIST libXft-2.3.2.tar.bz2 335495 SHA256 f5a3c824761df351ca91827ac221090943ef28b248573486050de89f4bfcdc4c SHA512 eb2e0c46b4434198690a3ca2b613df14ad599c860b47d10a1e8efe3b4e812a78460f9f414eaf89db21d605613a4e18324dcb8a22928609c6bc15178330a05398 WHIRLPOOL d6d5e5741f223824ffaffc11f0bd51b992516f87a688a9f4f7d344caeef52d60094aee0d5e1f6313b714f68865828f3ddbb5531e073c04e4f6a9311c652218dc -DIST libXft-2.3.1.tar.bz2 311556 SHA256 7fce32b92dcb7b2869bed567af2abc7bbad0d5d6fcf471b8a3e137964a31bbbd SHA512 737d6ab892daf829da8b2fed954b31b2657d29033f35e806599cd67c6e044ab94b0f035804a1c4c9e3e0cbdc74a117cd274128a57f4b2cf81383561d62eb9f1f WHIRLPOOL ecd372614afc4fba05598e51c051f0a011c5ccaabc41e9e585b67180099cd9f7c6d68904adbe5ccf44f79133e21495daa6cd46675ca7556e7d7ab0dac1ee432a -DIST libXft-2.3.2.tar.bz2 335495 SHA256 f5a3c824761df351ca91827ac221090943ef28b248573486050de89f4bfcdc4c SHA512 eb2e0c46b4434198690a3ca2b613df14ad599c860b47d10a1e8efe3b4e812a78460f9f414eaf89db21d605613a4e18324dcb8a22928609c6bc15178330a05398 WHIRLPOOL d6d5e5741f223824ffaffc11f0bd51b992516f87a688a9f4f7d344caeef52d600 \ No newline at end of file diff --git a/x11-misc/bbtime/files/bbtime-0.1.5-asneeded.patch b/x11-misc/bbtime/files/bbtime-0.1.5-asneeded.patch index 9aa6dd8ee23b..17788812d8a2 100644 --- a/x11-misc/bbtime/files/bbtime-0.1.5-asneeded.patch +++ b/x11-misc/bbtime/files/bbtime-0.1.5-asneeded.patch @@ -34,11 +34,6 @@ https://bugs.gentoo.org/show_bug.cgi?id=248555 timemenu.cc timemenu.hh \ blackboxstyle.hh EXTRA_DIST = BUGS TODO -Fixing build with as-needed - -https://bugs.gentoo.org/show_bug.cgi?id=248555 - ---- configure.in -+++ configure.in -@@ -47,14 +47,9 @@ - AC_PATH \ No newline at end of file +-bbtime_LDADD = @X_LIBS@ ++bbtime_LDADD = @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@ ++bbtime_CFLAGS = @X_PRE_CFLAGS@ @X_CGLAGS@ @X_EXTRA_CFLAGS@ diff --git a/x11-misc/compton/Manifest b/x11-misc/compton/Manifest index 2a7084cd3013..d7a0fbc900f1 100644 --- a/x11-misc/compton/Manifest +++ b/x11-misc/compton/Manifest @@ -1,4 +1,2 @@ DIST compton-0.1_beta1.tar.gz 140466 SHA256 28a770e81ae9e33d759044a75cd2b57329b17bf211cf0e795bc73e56933df8d6 SHA512 fa3e9eb8d85071ac38aa2834f7a14679fce95e1367f6c58987e2d56c5d90e7dd6e3945557e91512199a78bc38eba7f22bdd6efa872d8b108cb33c4579501ae95 WHIRLPOOL faa3a2c23ab1af3f340615bb7593cbd0e81edd36398fb58293ddc543df80ecc13a7e2f2ff8f281cb478f94713896b081b39607c0918d524dfa931a4a1b1c412f DIST compton-0.1_beta2.tar.gz 144239 SHA256 7b9cd52a57326116fb5db3f5f89b7d50e17715252d9fd79b70b45ace30a6b009 SHA512 c3a019d90e32559d44e3a4969bcc15a15837db9c9519ce8cc70b1bd3d0cb16d29449f68cc2f6a8d834569c9620ec6533ab85c1586da957c69b1ae341d9584535 WHIRLPOOL 39ca9718bc79d4542d73cce39bb51fc9b9c0497a30914ab044b920f72a3c2f8cbd315c5dc97c999c1f0ca798ae692ada4626f069914b6835f0c225638b486422 -DIST compton-0.1_beta1.tar.gz 140466 SHA256 28a770e81ae9e33d759044a75cd2b57329b17bf211cf0e795bc73e56933df8d6 SHA512 fa3e9eb8d85071ac38aa2834f7a14679fce95e1367f6c58987e2d56c5d90e7dd6e3945557e91512199a78bc38eba7f22bdd6efa872d8b108cb33c4579501ae95 WHIRLPOOL faa3a2c23ab1af3f340615bb7593cbd0e81edd36398fb58293ddc543df80ecc13a7e2f2ff8f281cb478f94713896b081b39607c0918d524dfa931a4a1b1c412f -DIST compton-0.1_beta2.tar.gz 144239 SHA256 7b9cd52a57326116fb5db3f5f89b7d50e17715252d9fd79b70b45ace30a6b009 SHA512 c3a019d90e32559d44e3a4969bcc15a15837db9c9519ce8cc70b1bd3d0 \ No newline at end of file diff --git a/x11-misc/habak/habak-0.2.5-r1.ebuild b/x11-misc/habak/habak-0.2.5-r1.ebuild index dc282c6eb593..0db7568d26e3 100644 --- a/x11-misc/habak/habak-0.2.5-r1.ebuild +++ b/x11-misc/habak/habak-0.2.5-r1.ebuild @@ -28,12 +28,16 @@ src_prepare() { sed -i \ -e '/(LDFLAGS)/s:$: -lImlib2 -lm -lX11:' \ -e 's:gcc:$(CC):' \ - "${S}"/Mak# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/habak/habak-0.2.5-r1.ebuild,v 1.5 2012/08/03 06:22:33 xmw Exp $ + "${S}"/Makefile || die "Makefile fixing failed" +} -EAPI=2 +src_compile() { + emake CC="$(tc-getCC)" ${PN} || die "make failed" +} -inherit eutils toolchain-funcs +src_install() { + dobin ${PN} || die "dobin failed" -DESCRI \ No newline at end of file + cd "${WORKDIR}/${P}" + dodoc ChangeLog README TODO "${FILESDIR}"/README.en || die "dodoc failed" +} diff --git a/x11-misc/outwiker/Manifest b/x11-misc/outwiker/Manifest index 897a1f0446ae..09b06bc03050 100644 --- a/x11-misc/outwiker/Manifest +++ b/x11-misc/outwiker/Manifest @@ -1,4 +1,2 @@ DIST outwiker-1.6.0-src.tar.gz 16117228 SHA256 1fdf13af19a5c7e2aef19b383610eabda87370311c82c5a2cf0396c5d90e56d5 SHA512 89d838080ab41f3928d11bd7a0df6b7abde6ba78720058c42187856f794504152d9630390de4b5f360495cc1189616819929e7ec77c8a3f7c715bcbe27c6b892 WHIRLPOOL c2b98c5dfcdfb29ea72c9ad462ccac21ef902e47f8405dd38efc4ade925d7d34ca0a9a3decc3c6137a183f3fc6c8341f445fef612c258a464c2795eeea73c0a9 DIST outwiker-1.7.0-src-full.tar.gz 17740708 SHA256 63adca029e5f2384bb2e865bc72b1a89dc78f2495396acb519a4aa663a4dc29c SHA512 9b776010847f91302c4469462124b7c986bb9fe58ff998c5979f00ab1ba03064fb8f89135406ad050346cae5a3403742e173561193f0c7c7676859d80a613d6f WHIRLPOOL 0e95b6548c1185ec06233e612019ea8487aefab6215daf5142455906c7bc0d38e71aa5c4a4c9d166a4f5a219435019de9004a1711033e9057e4602154e4d75b7 -EBUILD outwiker-1.6.0-r1.ebuild 641 SHA256 73d50238ee2b31a468d2037a024ff059098dc530d04f847aeb77b6edc118185d SHA512 dcdd1aab97a636e3574db23e0a3c8c003bad6786881a03d7592e7c729c355cf2ac2e2556bbff3a04ca2f3fd33a1a759de2965ceb0df8cc3437b61651180f5b3c WHIRLPOOL 0361b7434fa7cd3d18f8a20c2f224b138032b2cee1cec0fda21d810327a51297f9adf5a210625f20d1181b05a1e1fab128b9a4dea14d85cDIST outwiker-1.6.0-src.tar.gz 16117228 SHA256 1fdf13af19a5c7e2aef19b383610eabda87370311c82c5a2cf0396c5d90e56d5 SHA512 89d838080ab41f3928d11bd7a0df6b7abde6ba78720058c42187856f794504152d9630390de4b5f360495cc1189616819929e7ec77c8a3f7c715bcbe27c6b892 WHIRLPOOL c2b98c5dfcdfb29ea72c9ad462ccac21ef902e47f8405dd38efc4ade925d7d34ca0a9a3decc3c6137a183f3fc6c8341f445fef612c258a464c2795eeea73c0a9 -DIST outwiker-1.7.0-src-full.tar.gz 17740708 SHA256 63adca029e5f2384bb2e865bc72b1a89dc78f2495396acb519a4aa663a4dc29c SHA512 9b776010847f91302c4469462124b7c986bb9fe58ff998c5979f00ab1ba03064fb8f89135406ad050346cae5a3403742e173561193f0c7c7676859d80a613d6f WHIRLPOOL 0e95b6548c1185ec06233e612019ea8487aefab6215daf5142455906c7bc0d38e71aa5c4a4c9d166a4f5a219435019de9004a1711033e9057e4602154e4d75b7 diff --git a/x11-misc/parcellite/Manifest b/x11-misc/parcellite/Manifest index 4ff55781aa40..8bc2034c9460 100644 --- a/x11-misc/parcellite/Manifest +++ b/x11-misc/parcellite/Manifest @@ -1,4 +1,2 @@ DIST parcellite-1.1.7.tar.gz 723826 SHA256 870f3789f247b200a609cb6dbefa42204779b2575a9dafa5b90828d2fce05f5f SHA512 f825ee247a39804c15db8cfa7cb065da47aac3c138b7b8acc266e19278e6cdec68375db8e8722e62dba94e1fab6baf9496b18c18627e75af2fd40077e6afb74b WHIRLPOOL b9c607a82109840ee121e25607554640c93ceca0657b15696d715e0852cc7130447b8ed8b7d9ea841f7d826bb4c3802b85409c09680b12a66fa2ef4218d60cf2 -DIST parcellite-1.1.8.tar.gz 718163 SHA256 41cb6aacf8b4668db2974620814283a83e50a8a5c3784009c87195294d6f6477 SHA512 ae13a796decbdcef655941f8d4653693fadb5a2c45a159653e94927c87a16d500a31c3f6a18dd1263c69f6bfcbe7b9fd5958f39f5de2a1420096a1d32e5e2e90 WHIRLPOOL 8628da660d-----BEGIN PGP SIGNED MESSAGE----- -DIST parcellite-1.1.7.tar.gz 723826 SHA256 870f3789f247b200a609cb6dbefa42204779b2575a9dafa5b90828d2fce05f5f SHA512 f825ee247a39804c15db8cfa7cb065da47aac3c138b7b8acc266e19278e6cdec68375db8e8722e62dba94e1fab6baf9496b18c18627e75af2fd40077e6afb74b WHIRLPOOL b9c607a82109840ee121e25607554640c93ceca0657b15696d715e0852cc7130447b8ed8b7d9ea841f7d826bb4c3802b85409c09680b12a66fa2ef4218d60cf2 DIST parcellite-1.1.8.tar.gz 718163 SHA256 41cb6aacf8b4668db2974620814283a83e50a8a5c3784009c87195294d6f6477 SHA512 ae13a796decbdcef655941f8d4653693fadb5a2c45a159653e94927c87a16d500a31c3f6a18dd1263c69f6bfcbe7b9fd5958f39f5de2a1420096a1d32e5e2e90 WHIRLPOOL 8628da660d0c51a2c2451f87e2c7036a59be87901188c3c89665c2b8ea0aff71b42065ffb6ff488397c460e74a9bf39e000d4d4c38b9deab3fc9dff2a14ebf5f diff --git a/x11-misc/qps/Manifest b/x11-misc/qps/Manifest index 0456e61c54f1..e8ec5fbc582f 100644 --- a/x11-misc/qps/Manifest +++ b/x11-misc/qps/Manifest @@ -1,4 +1,2 @@ DIST qps-1.10.12.1.tar.bz2 223171 SHA256 d392b84f0b1d4d838014ff3f9fcbcc8f046b8262edc19a1504808b0ecb9cf70d DIST qps-1.10.16.tar.bz2 218323 SHA256 733b910fafbd07310fa4273e04aedbeaeaf3f8b9d0bbde3543e34bf83dcce39e -DIST qps-1.10.12.1.tar.bz2 223171 SHA256 d392b84f0b1d4d838014ff3f9fcbcc8f046b8262edc19a1504808b0ecb9cf70d -DIST qps-1.10.16.tar.bz2 218323 SHA256 733b910fafbd07310fa4273e04aedbeaeaf3f8b9d0bbde3543e34bf83dcce39e diff --git a/x11-misc/revelation/Manifest b/x11-misc/revelation/Manifest index 9a1eab3989b6..bc8c4148a363 100644 --- a/x11-misc/revelation/Manifest +++ b/x11-misc/revelation/Manifest @@ -1,2 +1 @@ DIST revelation-0.4.14.tar.xz 316096 SHA256 38a532e7c528076f82ef3564b5a75d0a37387492007cf49f2e4ef2c3eee9454d SHA512 0af5b7eea47a7706dd164f4f0a1da12fd2595e8add1455e4e4092e4b6aa1507faf2c94227dd838734bdc19fef9d268938362fca2d3cde59897580598eefa1145 WHIRLPOOL 5e65fa3e4e2ee1c13b5095ed00426987d74898113135e5ede878b206d01877bfa732eb145234a4a8889ca633a7b830a6d3621386dc8fa3579defdfbc66c3aeb8 -DIST revelation-0.4.14.tar.xz 316096 SHA256 38a532e7c528076f82ef3564b5a75d0a37387492007cf49f2e4ef2c3eee9454d SHA512 0af5b7eea47a7706dd164f4f0a1da12fd2595e8add1455e4e4092e4b6aa1507faf2c94227dd838734bdc19fef9d268938362fca2d3cde59897580598eefa1145 WHIRLPOOL 5e65fa3e4e2ee1c13b5095ed00426987d74898113135e5ede878b206d01877bfa732eb145234a4a8889ca633a7b830a6d3621386dc8fa3579defdfbc66c3aeb8 diff --git a/x11-misc/seetxt/Manifest b/x11-misc/seetxt/Manifest index 9b97419aa27b..46d14e5ebbc0 100644 --- a/x11-misc/seetxt/Manifest +++ b/x11-misc/seetxt/Manifest @@ -1,2 +1 @@ DIST seetxt-0.72.tar.bz2 141695 SHA256 c38786057e3939f262235c68cf3b8a7d7ab1450ffe4508ec98ec10e16b396159 SHA512 3d6e604e3ee8b0d382dcf60a507c54162eb28d5a9d61edc631a40a95f550276bf4e505ea37966a50d7f38ba952408d8d06b91bc71a8eb32322cb047a4ffc27ea WHIRLPOOL 1bd4060d5a2d49e601b868a43aa3e24ea104ed953a96701c50ab7ded234eabf9f31683d14294914e517bd5df641e58f56d50c2b7898338032f3c4561df37d615 -DIST seetxt-0.72.tar.bz2 141695 SHA256 c38786057e3939f262235c68cf3b8a7d7ab1450ffe4508ec98ec10e16b396159 SHA512 3d6e604e3ee8b0d382dcf60a507c54162eb28d5a9d61edc631a40a95f550276bf4e505ea37966a50d7f38ba952408d8d06b91bc71a8eb32322cb047a4ffc27ea WHIRLPOOL 1bd4060d5a2d49e601b868a43aa3e24ea104ed953a96701c50ab7ded234eabf9f31683d14294914e517bd5df64 \ No newline at end of file diff --git a/x11-misc/shutter/shutter-0.90.1.ebuild b/x11-misc/shutter/shutter-0.90.1.ebuild index 79c597ecf9c4..03b5e1584138 100644 --- a/x11-misc/shutter/shutter-0.90.1.ebuild +++ b/x11-misc/shutter/shutter-0.90.1.ebuild @@ -53,27 +53,18 @@ src_prepare() { src_install() { dobin bin/${PN} || die "dobin failed" insinto /usr/share/${PN} - doins -r share/${PN}/* || die # Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/shutter/shutter-0.90.1.ebuild,v 1.1 2013/09/08 10:40:14 hwoarang Exp $ - -EAPI="5" - -inherit eutils - -DESCRIPTION="Feature-rich screenshot program" -HOMEPAGE="http://shutter-project.org/" -SRC_URI="http://shutter-project.org/wp-content/uploads/releases/tars/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="drawing webphoto" - -RDEPEND="dev-lang/perl - drawing? ( dev-perl/Goo-Canvas ) - webphoto? ( gnome-extra/gnome-web-photo ) - || ( media-gfx/imagemagick[perl] media-gfx/graphicsmagick[imagemagick,perl] ) - dev-perl/libxml-perl - dev-perl/gnome2-wnck - dev-perl/ \ No newline at end of file + doins -r share/${PN}/* || die "doins failed" + dodoc README || die "dodoc failed" + domenu share/applications/${PN}.desktop + # Man page is broken. Reconstruct it. + gunzip share/man/man1/${PN}.1.gz || die "gunzip failed" + doman share/man/man1/${PN}.1 || die "doman failed" + doicon share/pixmaps/${PN}.png + doins -r share/locale || die "doins failed" + insinto /usr/share/icons/hicolor + doins -r share/icons/hicolor/* || die "doins failed" + find "${D}"/usr/share/shutter/resources/system/plugins/ -type f ! -name '*.*' -exec chmod 755 {} \; \ + || die "failed to make plugins executables" + find "${D}"/usr/share/shutter/resources/system/upload_plugins/upload -type f \ + -name "*.pm" -exec chmod 755 {} \; || die "failed to make upload plugins executables" +} diff --git a/x11-misc/trayer-srg/Manifest b/x11-misc/trayer-srg/Manifest index e9a95db89a55..898c501b26d0 100644 --- a/x11-misc/trayer-srg/Manifest +++ b/x11-misc/trayer-srg/Manifest @@ -1,3 +1,2 @@ DIST trayer-srg-1.1.5.tar.gz 27322 SHA256 98804500188c0bb99c7389ebea4b2e4dfffa2f3d06dc97e633b4934cf7c29757 SHA512 143277849c19f0caf8fcfb7c0e49f6caa1aec35e12a52cc9a92bdab0f64a9112334d998eb107e587755212d4421ff303582052206ac916b35f1e06e3e1d23277 WHIRLPOOL 37be63aa199a3c9271a7dbcc18c7b6639e81c746e9ba8cd772eb3f229723fad254c2d457ff6120278401124d98f0934857c2fb46fff5872518edc20d8af5fe19 DIST trayer-srg-1.1.6.tar.gz 27576 SHA256 70acdf466e03a69715f8b90296ecbb14c5e8594f64a94d4b1ad1f5ba6b146a2e SHA512 456af94277dc237c516fff1589060b0b656040811ae48bba3c021be6310d104881c0eee7391d228d197db78e9bfb04773d4282ab2fe31717a4779b38bdb6739d WHIRLPOOL 6dc5394db31d73e6f8e28b4a86f0262108f946e2f0b111af3bd7c774cc84ea0b90e0eb0ba869c24b1dcdf477280dfaed10cf2c598ba5d075c372a28736434574 -DIST trayer-srg-1.1.5.tar.gz 27322 SHA256 98804500188c0bb99c7389ebea4b2e4dfffa2f3d06dc97e633b4934cf7c29757 SHA512 143277849c19f0caf8fcfb7c0e49f6caa1aec35e12a52cc9a92bdab0f64a9112334d998eb107e587755212d4421ff303582052206ac916b35f1e06e3e1d23277 WHIRLPOOL 37be63aa199a3c9271a7dbcc18c7b6639e81c746e9ba8cd772eb3f229723fad254 \ No newline at end of file diff --git a/x11-misc/treeline/Manifest b/x11-misc/treeline/Manifest index 2d3d62b0dd4f..9feced7c1d8d 100644 --- a/x11-misc/treeline/Manifest +++ b/x11-misc/treeline/Manifest @@ -1,4 +1,3 @@ DIST treeline-1.4.1.tar.gz 499500 SHA256 d66e0fcae9bcb5e54f664381f6af73f360f9ff46c91787a126c7197fbe685489 SHA512 85e87d4201eca19fb4255eacef89b7975f982a32790e74b5a35ab37e42e316eb45a1518f093097141dc5db1a8a090537f42e35fddf3f51b3ae4cf4c812f9ea95 WHIRLPOOL 7f97e943d86f6f94fd32dbb2836ed9a5f1cd38c777322962b7809705f48886ad4988c3739907020976ee0aa798d5b9b76302d05fb753f642fa839cd556175312 DIST treeline-1.9.4.tar.gz 327826 SHA256 eb26c836024687c2cbe386c129d49b72891333d6908ba6b7109aa1bad58a2f62 SHA512 be9a2dd385a941794adb779a3f4deec4d855ec2dbcfb92ed421879c212ab78dcc401dc0ee7fbdbd075faa60f3d290219877bcf97376e9df4d00d1cd9c2774f2d WHIRLPOOL 97682512a2f1461cee4230a2adeba47284a50263c3a2dbad2588bb503abbfc3ccb118f7832b7dd6b92946881ca79fc6a042f0d50d2d0c21f5549ca9c83773f5e DIST treeline-i18n-1.4.1a.tar.gz 279797 SHA256 891f086b0718336911ef118a4e25772c639cb48c1bea007031b5da075512e478 SHA512 82a79d24d451f5512c80b7647a6d10146649d2224c5ced8e5b402b44dea5d3d7cb00a3e8c96384d499fe2eb87dca686feb74a79db083e531fdb872218f54861b WHIRLPOOL cd8cac4419273369800314b7428e202586540e5b348203ab6567c73d1861e48b1f83e4f7c5c21da6fce9800d95bca71a5b057a81f2e22e64a2a656cd54d32dda -DIST treeline-1.4.1.tar.gz 499500 SHA256 d66e0fcae9bcb5e54f664381f6af73f360f9ff46c91787a126c7197fbe685489 SHA512 85e87d4201eca19fb4255eacef89b7975f982a32790e74b5a35ab37e42e316eb45a1518f093097141dc5db1a8a090537f42e35fddf3f51b3ae4cf4c812f9ea95 WHIRLPOOL 7f97e943d86f6f94fd32dbb2836ed9a5f1cd38c777322962b7809705f48886ad4988c3739907020976ee0aa798d5b9b76302d05fb7 \ No newline at end of file diff --git a/x11-misc/whaw/Manifest b/x11-misc/whaw/Manifest index 31458c12a427..2df4242da43a 100644 --- a/x11-misc/whaw/Manifest +++ b/x11-misc/whaw/Manifest @@ -1,2 +1 @@ DIST whaw-0.2.tar.gz 105440 SHA256 0aa010fd107adcf35bbedbf5bece6a01e9bf7773d5db90e94a8783a23637e027 SHA512 80f38353a867ceb9e9850bf3f723ec6f943a559ab4b38aad2a44818bc88f44d289e9d97acc82d25462bc48bb55fd462cea09b865829e595f1a2ede221b72fa7f WHIRLPOOL 567671cbc0e6bc898a7a6747a3bc49ecd1811785000f1afe45b3f09e7fa7376c323bee48b1937770c49aa9bdc7c1011b9cc1e753ab6c50aec2f147f1f2b1e306 -DIST whaw-0.2.tar.gz 105440 SHA256 0aa010fd107adcf35bbedbf5bece6a01e9bf7773d5db90e94a8783a23637e027 SHA512 80f38353a867ceb9e9850bf3f723ec6f943a559ab4b38aad2a44818bc88f44d289e9d97acc82d25462bc48bb55fd462cea09b865829e595f1a2ede221b72fa7f WHIRLPOOL 567671cbc0e6bc898a7a6747a3bc49ecd1811785000f1afe45b3f09e7fa7376c323bee48b1937770c49aa9bdc7c1011b9cc1e753ab6c50aec2f147f1f2b1e306 diff --git a/x11-misc/winswitch/files/winswitch-0.12.18-PIL.patch b/x11-misc/winswitch/files/winswitch-0.12.18-PIL.patch index 01d32a82c6f7..be6484dd1084 100644 --- a/x11-misc/winswitch/files/winswitch-0.12.18-PIL.patch +++ b/x11-misc/winswitch/files/winswitch-0.12.18-PIL.patch @@ -53,29 +53,32 @@ https://winswitch.org/trac/ticket/238 + import PIL.JpegImagePlugin + import PIL.PngImagePlugin + import PIL.ImageGrab -+ assert PIL.Image and PIL.GifImagePluhttps://bugs.gentoo.org/show_bug.cgi?id=471564 -https://winswitch.org/trac/ticket/238 - ---- winswitch-0.12.18/winswitch/virt/xpra_client_util.py -+++ winswitch-0.12.18/winswitch/virt/xpra_client_util.py -@@ -95,8 +95,8 @@ - widgets = [] - has_pil = False - try: -- import Image -- has_pil = Image is not None -+ import PIL.Image -+ has_pil = PIL.Image is not None - except: - pass - jw = self.get_encoding_widget(server, server_command, options, change_cb, has_pil) ---- winswitch-0.12.18/winswitch/ui/capture_util.py -+++ winswitch-0.12.18/winswitch/ui/capture_util.py -@@ -125,16 +125,16 @@ - #resize it - img_data = load_binary_file(self.filename) - import StringIO -- import Image -- image = Image.open(StringIO.StringIO(img_data)) -+ import PIL.Image -+ image = PIL.Image.open(Stri \ No newline at end of file ++ assert PIL.Image and PIL.GifImagePlugin and PIL.JpegImagePlugin and PIL.PngImagePlugin and PIL.ImageGrab #avoid pydev warnings ++ screenshot = PIL.ImageGrab.grab() + self.save_resized(screenshot) + self.finish() + +--- winswitch-0.12.18/winswitch/util/icon_util.py ++++ winswitch-0.12.18/winswitch/util/icon_util.py +@@ -27,7 +27,7 @@ + HAS_CAIRO_RSVG = False + + try: +- import Image ++ import PIL.Image + has_PIL = True + except: + has_PIL = False +@@ -58,10 +58,10 @@ + return scaled_data + + def pil_load_scaled_pixmap(filename, size_limit): +- img = Image.open(filename) ++ img = PIL.Image.open(filename) + (w,h) = img.size + if w>size_limit or h>size_limit: +- img.thumbnail((size_limit,size_limit), Image.ANTIALIAS) ++ img.thumbnail((size_limit,size_limit), PIL.Image.ANTIALIAS) + assert img + return pil_image_to_png_data(img) + diff --git a/x11-misc/wmakerconf/wmakerconf-2.12-r1.ebuild b/x11-misc/wmakerconf/wmakerconf-2.12-r1.ebuild index aa69489ded79..a50a83372ebb 100644 --- a/x11-misc/wmakerconf/wmakerconf-2.12-r1.ebuild +++ b/x11-misc/wmakerconf/wmakerconf-2.12-r1.ebuild @@ -9,19 +9,6 @@ DESCRIPTION="X based config tool for the windowmaker X windowmanager" HOMEPAGE="http://wmakerconf.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmakerconf/wmakerconf-2.12-r1.ebuild,v 1.5 2014/08/10 20:04:39 slyfox Exp $ - -EAPI=4 -inherit eutils - -DESCRIPTION="X based config tool for the windowmaker X windowmanager" -HOMEPAGE="http://wmakerconf.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.gz" - LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" @@ -48,4 +35,20 @@ src_configure() { use imlib || myconf="--disable-imlibtest" econf \ - $(use_enable \ No newline at end of file + $(use_enable perl upgrade) \ + $(use_enable nls) \ + ${myconf} +} + +src_install() { + emake DESTDIR="${D}" gnulocaledir="${ED}/usr/share/locale" install + dodoc AUTHORS ChangeLog MANUAL NEWS README TODO + doman man/*.1 + + rm -f "${ED}"/usr/share/${PN}/{AUTHORS,README,COPYING,NEWS,MANUAL,ABOUT-NLS,NLS-TEAM1,ChangeLog} +} + +pkg_postinst() { + elog "New features added with WindowMaker >= 0.95 will not be available in wmakerconf" + elog "WPrefs is the recommended configuration tool" +} diff --git a/x11-misc/xcape/Manifest b/x11-misc/xcape/Manifest index a39339ea8c06..0157bd0e62f4 100644 --- a/x11-misc/xcape/Manifest +++ b/x11-misc/xcape/Manifest @@ -1,2 +1 @@ DIST xcape-1.0.tar.gz 16409 SHA256 1ba287cf98a417fd67afff58b8f5f4c00e62b3e5195d3aea48b11bba70649561 SHA512 289954bf6ba7dc5f260354c677db11954abcaa4dadeee64566a4524c54529754ccb771816ceabee238dad0f77ba3acd8536c0e1d4817d72e71e76b2f7975fed4 WHIRLPOOL ca54bfb111f31969c7243377c32748580b9ebce22035e034453d80efc6fc86d9c2ead7d8ec17b44b81266d0ac94c8c2139a70c5db116a1f6385c3c991682099b -DIST xcape-1.0.tar.gz 16409 SHA256 1ba287cf98a417fd67afff58b8f5f4c00e62b3e5195d3aea48b11bba70649561 SHA512 289954bf6ba7dc5f260354c677db11954abcaa4dadeee64566a4524c54529754ccb771816ceabee238dad0f77ba3acd8536c0e1d4817d72e71e76b2f7975fed4 WHIRLPOOL ca54bfb111f31969c7243377c32748580b9ebce22035e034453d80efc6fc86d9c2ead7d8e \ No newline at end of file diff --git a/x11-misc/xcave/Manifest b/x11-misc/xcave/Manifest index fe81e0cd254a..0c9e3a5e9403 100644 --- a/x11-misc/xcave/Manifest +++ b/x11-misc/xcave/Manifest @@ -1,4 +1,2 @@ DIST xcave-2.3.2.tar.gz 817887 SHA256 d80376f56c2fa62f61f55ce50dcf0e65032c78e9319e6e411fbd6d3f01887ac3 SHA512 3948bfd62deb9c29eb333093a7295ec8a2ee5633bed881252351bc3355803893e15ccd0145189a7d6a6160c89617b757c9b3205037a015f1da881160fd480f96 WHIRLPOOL 25c014b01aa84cc2e14b6b45e457c58134a35ef9bc666549e9f6739692213cf165090d686b2db3894c95c525216323d56e80971a1a1b617dba034b2862276881 DIST xcave-2.4.0.tar.gz 817356 SHA256 e561850fe4fc4c7ac5ea592dd43590a4049cd2cc52595333ba953d660d9dc533 SHA512 cdba5ad8b7634004a9439fd87a8eb8ed45137e78cb119310c6b7df9352aa979682edaae6440200804e23953c822d377c95cf459cc37ce227d1a41885a91afba4 WHIRLPOOL e9c4b6469adc7a6183cd431efa86ead19fd246a408b23fa84135942532531635ad9be6136145578963720944f8895d672e9b4625933e900333c75d15b56f3136 -EBUILD xcave-2.3.2.ebuild 850 SHA256 5cd0300fc1e084409ec4e8571ffcb20a86b3389a4d91c13bf0221921223e8046 SHA512 e6c4cd1d450628c802d5e0a82022161b5473a3a3bae638ea87ecefc4e5e05ee1c067e059eec2c3499156d969b587b4647a1b960d9e3907f96b09ddad357b77d2 WHIRLPOOL ae39b2a47bac285eb0db44e6b6bd5d671924860153fa87236e70468a17f9a5a9ccd31f878603ce188c175da554b6999f73b03b7560b9DIST xcave-2.3.2.tar.gz 817887 SHA256 d80376f56c2fa62f61f55ce50dcf0e65032c78e9319e6e411fbd6d3f01887ac3 SHA512 3948bfd62deb9c29eb333093a7295ec8a2ee5633bed881252351bc3355803893e15ccd0145189a7d6a6160c89617b757c9b3205037a015f1da881160fd480f96 WHIRLPOOL 25c014b01aa84cc2e14b6b45e457c58134a35ef9bc666549e9f6739692213cf165090d686b2db3894c95c525216323d56e80971a1a1b617dba034b2862276881 -DIST xcave-2.4.0.tar.gz 817356 SHA256 e561850fe4fc4c7ac5ea592dd43590a4049cd2cc52595333ba953d660d9dc533 SHA512 cdba5ad8b7634004a9439fd87a8eb8ed45137e78cb119310c6b7df9352aa979682edaae6440200804e23953c822d377c95cf459cc37ce227d1a41885a91afba4 WHIRLPOOL e9c4b6469adc7a6183cd431efa86ead19fd246a408b23fa84135942532531635ad9be6136145578963720944f8895d672e9b4625933e900333c75d15b56f3136 diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.0_rc2.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.0_rc2.ebuild index dc9ffdb0de84..5c23940eb59a 100644 --- a/x11-misc/xdg-utils/xdg-utils-1.1.0_rc2.ebuild +++ b/x11-misc/xdg-utils/xdg-utils-1.1.0_rc2.ebuild @@ -36,19 +36,21 @@ src_configure() { } src_install() { - default# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdg-utils/xdg-utils-1.1.0_rc2.ebuild,v 1.11 2014/03/24 15:11:02 ago Exp $ + default -EAPI=5 + newdoc scripts/xsl/README README.xsl + use doc && dohtml -r scripts/html -MY_P=${P/_/-} + # Install default XDG_DATA_DIRS, bug #264647 + echo XDG_DATA_DIRS=\"${EPREFIX}/usr/local/share\" > 30xdg-data-local + echo 'COLON_SEPARATED="XDG_DATA_DIRS XDG_CONFIG_DIRS"' >> 30xdg-data-local + doenvd 30xdg-data-local -DESCRIPTION="Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability" -HOMEPAGE="http://portland.freedesktop.org/" -SRC_URI="http://people.freedesktop.org/~rdieter/${PN}/${MY_P}.tar.gz" -#SRC_URI="http://portland.freedesktop.org/download/${MY_P}.tar.gz" + echo XDG_DATA_DIRS=\"${EPREFIX}/usr/share\" > 90xdg-data-base + echo XDG_CONFIG_DIRS=\"${EPREFIX}/etc/xdg\" >> 90xdg-data-base + doenvd 90xdg-data-base +} -LICENSE="MIT" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 \ No newline at end of file +pkg_postinst() { + [[ -x $(type -P gtk-update-icon-cache) ]] || elog "Install x11-libs/gtk+:2 for the gtk-update-icon-cache command." +} diff --git a/x11-misc/xgestures/Manifest b/x11-misc/xgestures/Manifest index de9f68c287f9..cc46a743c4c5 100644 --- a/x11-misc/xgestures/Manifest +++ b/x11-misc/xgestures/Manifest @@ -1,2 +1 @@ DIST xgestures-0.4.tar.bz2 77902 SHA256 aec17a79e411abf00388f78adf8ceaaa1f4cbbc18e0f5c1b81d48ff3821459ca SHA512 c61108e609fb0f28affb5d5cc4002a7f840f123bb96b79265a47e74a541b1ca8deee016f90fc801fa682e61b9df008c0323d36482abaa83f8f6d4a5c73137abf WHIRLPOOL c3088c2a93b211c06737a7f18b9c0935270df7db91a7dae0d95749bf06570ad4a0a67c2c052c68e842c1e5b741f5ec185cfadcb709b7ed30d5c83a8f97f3e044 -EBUILD xgestures-0.4.ebuild 816 SHA256 a7ca05d5ceb73590ab90c7a6a3ec43f0055c7d23c52aabfddc1ff62bb4249ab3 SHA5DIST xgestures-0.4.tar.bz2 77902 SHA256 aec17a79e411abf00388f78adf8ceaaa1f4cbbc18e0f5c1b81d48ff3821459ca SHA512 c61108e609fb0f28affb5d5cc4002a7f840f123bb96b79265a47e74a541b1ca8deee016f90fc801fa682e61b9df008c0323d36482abaa83f8f6d4a5c73137abf WHIRLPOOL c3088c2a93b211c06737a7f18b9c0935270df7db91a7dae0d95749bf06570ad4a0a67c2c052c68e842c1e5b741f5ec185cfadcb709b7ed30d5c83a8f97f3e044 diff --git a/x11-misc/xmonad-log-applet/Manifest b/x11-misc/xmonad-log-applet/Manifest index 474fced48995..25cc13b44be5 100644 --- a/x11-misc/xmonad-log-applet/Manifest +++ b/x11-misc/xmonad-log-applet/Manifest @@ -1,2 +1 @@ DIST xmonad-log-applet-2.0.0.tar.gz 82881 SHA256 154bdb5b857195b318837ef086ddd3091d100884ada29a146ff18a5589549fa0 SHA512 1885ac97569d909ab1c6af99d9b271d0f782de905dfe035df27524f428d09cefa20a468103477132656dea8945faf886270fd70a49e5a08be538e04f3f05baca WHIRLPOOL 87bce2156b8a5f7a2c3b8b0597d24eee5238333e6a10c161a49e3cab08f3e1cdd3facfbf60ab879109b151143823e99d2d2c3470904e361fe892f950902e7d9f -DIST xmonad-log-applet-2.0.0.tar.gz 82881 SHA256 154bdb5b857195b318837ef086ddd3091d100884ada29a146ff18a5589549fa0 SHA512 1885ac97569d909ab1c6af99d9b271d0f782de905dfe035df27524f428d09cefa20a468103477132656dea8945faf886270fd70a49e5a08be538e04f3f05baca WHIRLPOOL 87bce2156b8a5f7a2c3b8b0597d24eee5238333e6a10c161a49e3cab08f3e1cdd3facfbf60ab879109b151143823e99d2d2c3470904e361fe892f950902e7d9f diff --git a/x11-misc/xnee/xnee-3.18.ebuild b/x11-misc/xnee/xnee-3.18.ebuild index 20d00bc5db48..9de0fc1e5482 100644 --- a/x11-misc/xnee/xnee-3.18.ebuild +++ b/x11-misc/xnee/xnee-3.18.ebuild @@ -39,31 +39,35 @@ DEPEND="${RDEPEND} ) ) " -# This needs RECORD extension from X.org server which isn'# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xnee/xnee-3.18.ebuild,v 1.2 2014/08/10 20:05:05 slyfox Exp $ +# This needs RECORD extension from X.org server which isn't necessarily +# enabled. Xlib: extension "RECORD" missing on display ":0.0". +RESTRICT="test" -EAPI=5 +src_prepare() { + epatch "${FILESDIR}"/${P}-linker.patch + eautoreconf +} -inherit autotools eutils +src_configure() { + econf \ + $(use_enable gnome gui) \ + $(use_enable static-libs static) \ + $(use_enable xosd buffer_verbose) \ + $(use_enable xosd verbose) \ + $(use_enable xosd) \ + --disable-gnome-applet \ + --disable-static-programs \ + --enable-cli \ + --enable-lib +} -DESCRIPTION="Program suite to record, replay and distribute user actions" -HOMEPAGE="http://www.sandklef.com/xnee/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="gnome static-libs xosd" +src_test() { + Xemake check +} -RDEPEND=" - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXi - x11-libs/libXtst - x11-libs/libxcb - gnome? ( - x11-libs/gtk+:2 - >=gnome-base/libgn \ No newline at end of file +src_install() { + default + dodoc AUTHORS BUGS ChangeLog FAQ NEWS README TODO + use gnome && make_desktop_entry gnee Gnee ${PN} "Utility;GTK" + use static-libs || rm -f "${ED}"usr/lib*/lib*.la +} diff --git a/x11-misc/xrootconsole/files/xrootconsole-0.6.noversion.patch b/x11-misc/xrootconsole/files/xrootconsole-0.6.noversion.patch index a3ea6c75130f..b1ede4023113 100644 --- a/x11-misc/xrootconsole/files/xrootconsole-0.6.noversion.patch +++ b/x11-misc/xrootconsole/files/xrootconsole-0.6.noversion.patch @@ -1,17 +1,5 @@ --- main.c.orig 2004-02-21 07:31:53.000000000 +0900 +++ main.c 2005-03-06 16:34:27.949346504 +0900 -@@ -68,6 +68,7 @@ - " --solid make background a solid color, not shaded-transparent\n" \ - " --topdown insert lines at the top and scroll the rest down\n" \ - " --wrap wrap long lines, instead of cutting them off\n" \ -+" --noversion do not display xrootwindow version in output\n" \ - " -h or --help a familiar-looking help screen\n" \ - " -v or --version displays the version number\n" \ - " [console] filename to read (defaults to standard input)\n" \ -@@ -102,6 +103,7 @@ - int wrap; ---- main.c.orig 2004-02-21 07:31:53.000000000 +0900 -+++ main.c 2005-03-06 16:34:27.949346504 +0900 @@ -68,6 +68,7 @@ " --solid make background a solid color, not shaded-transparent\n" \ " --topdown insert lines at the top and scroll the rest down\n" \ @@ -40,4 +28,25 @@ io->bw = atoi(*++argv); else if (!strcmp(*argv, "-columns") || !strcmp(*argv, "-c")) io->tc = atoi(*++argv); -+ else if (!strcmp(*arg \ No newline at end of file ++ else if (!strcmp(*argv, "--noversion")) ++ io->show_version = 0; + else if (!strcmp(*argv, "--solid")) + io->solid = True; + else if (!strcmp(*argv, "--wrap")) +@@ -560,10 +565,12 @@ + init_console(io.console_name, ws.colwidth, ws.nlines, &cs); + + /* Display a message */ +- put("xrootconsole ",&io,&ws,&cs); +- put(XROOTCONSOLE_VERSION,&io,&ws,&cs); +- put("\n",&io,&ws,&cs); +- ++ if (io.show_version) { ++ put("xrootconsole ",&io,&ws,&cs); ++ put(XROOTCONSOLE_VERSION,&io,&ws,&cs); ++ put("\n",&io,&ws,&cs); ++ } ++ + draw_pixmap(&io,&ws,&cs); + + event_loop(&io,&ws,&cs); diff --git a/x11-misc/xtermcontrol/Manifest b/x11-misc/xtermcontrol/Manifest index df57e6e9fa00..e2c34a08b3ea 100644 --- a/x11-misc/xtermcontrol/Manifest +++ b/x11-misc/xtermcontrol/Manifest @@ -1,4 +1,2 @@ DIST xtermcontrol-3.0.tar.gz 134440 SHA256 289c261b21c6b88e5b04f0387ae02d5cba754a9584b2a2054894cd2e5af5f9cf SHA512 610c817812311b8c8de7caa6d4a353de15a41835a00c9578e82cc722328ab9406d6ebd32d70da64f2a8d7f55581051347634233a90e074b4453fd115e6a16fa4 WHIRLPOOL d605a763adb1d16fab4d1c05cc6493ab7a4fc79c8ec54ca70c25e2f8ec1b3ae18ee2a415902938b6d8d7def604b88b21799fc306249e1feb4cad40f6bf931048 DIST xtermcontrol-3.2.tar.gz 141574 SHA256 6e4f1de182aa0d1623405d831c01a99940390e3af45deadc43a171f4c432d1e1 SHA512 cfda6595508d2aa3c1a4c0bf5e158717592c471e80b0124a496f9966aa8221a00d62f1aa1642cd9c02c3110287f0fbbe86d1cf0b55d0f790e0434dcffd4cb286 WHIRLPOOL 0b3c22ffa305492e203b9bb1671fe23039cf087ee0f1cd331934bb27ca2045655305078640599fdf9988e8a705c29fce0ea1464e9a94e97b4c4e5bd984523489 -MISC CDIST xtermcontrol-3.0.tar.gz 134440 SHA256 289c261b21c6b88e5b04f0387ae02d5cba754a9584b2a2054894cd2e5af5f9cf SHA512 610c817812311b8c8de7caa6d4a353de15a41835a00c9578e82cc722328ab9406d6ebd32d70da64f2a8d7f55581051347634233a90e074b4453fd115e6a16fa4 WHIRLPOOL d605a763adb1d16fab4d1c05cc6493ab7a4fc79c8ec54ca70c25e2f8ec1b3ae18ee2a415902938b6d8d7def604b88b21799fc306249e1feb4cad40f6bf931048 -DIST xtermcontrol-3.2.tar.gz 141574 SHA256 6e4f1de182aa0d1623405d831c01a99940390e3af45deadc43a171f4c432d1e1 SHA512 cfda6595508d2aa3c1a4c0bf5e158717592c471e80b0124a496f9966aa8221a00d62f1aa1642cd9c02c3110287f0fbbe86d1cf0b55d0f790e0434dcffd4cb286 WHIRLPOOL 0b3c22ffa305492e203b9bb1671fe23039cf087ee0f1cd331934bb27ca2045655305078640599fdf9988e8a705c29 \ No newline at end of file diff --git a/x11-misc/xtoolwait/Manifest b/x11-misc/xtoolwait/Manifest index 9a52a79d07d0..b9a9b50a85d7 100644 --- a/x11-misc/xtoolwait/Manifest +++ b/x11-misc/xtoolwait/Manifest @@ -1,2 +1 @@ DIST xtoolwait-1.3.tar.gz 14315 RMD160 db75a684c5655d2cafad9eadedcf875e812f98d7 SHA1 544fbf1deca73324087272d22655a67cf72a5c6f SHA256 c6d075b75294d92440a37a45a6b8bbda07b9d58df5bf585f5a265679f16cb485 -DIST xtoolwait-1.3.tar.gz 14315 RMD160 d \ No newline at end of file diff --git a/x11-misc/xtrlock/Manifest b/x11-misc/xtrlock/Manifest index 50ec57ae90ef..850d78784cc3 100644 --- a/x11-misc/xtrlock/Manifest +++ b/x11-misc/xtrlock/Manifest @@ -1,6 +1,3 @@ DIST xtrlock_2.2.tar.gz 20716 SHA256 eed63851f4ad9f3026fd0a73767c8d2e5e2b973e050d271be6ec5086faa11ef6 SHA512 00eb877c721d5ad134912ab61969c96ede3b9e8b551cdc527da1b1dab404643b4b03f73a656293efae1bc6a186376addf8000cd500341273a24534bd186af9c9 WHIRLPOOL 0abd1ed9c45fcbd392e989d7e2d29121419620d8e6d767bb84c17c3535bcec9c2b86544109897934aa3607bcb36387e34bf7b30cfbf81c639603b04ba29dde9e DIST xtrlock_2.5.tar.gz 70723 SHA256 f07b05801efc39173dd82b04846b832525c72ba7de7df52a7097cbbd5b2df108 SHA512 7004408d02f5dcfe63e804e72105036a3af50912222492131f2d68a51f968e59d7e170533f28ca26880a685d1d1f8207d1a0641b9d14300f260b7f85a5b4a837 WHIRLPOOL 5c6cdac5c6eca5079b1771f4b6e181f4fe22aff6c6d930b52ad1c1543da65e4e629cf0a6db6f0a7555329fb2b145e0d22843a9d5fe27f1819e0f2606b14ca159 DIST xtrlock_2.6.tar.gz 20814 SHA256 f0acccd39b9beedf1244434045e243cf515ba8653964fe6f3fb9187c640cc3bb SHA512 995530e50892c2f39340cbd82006b1acfed5530cef1ae16e62d1883874b92f6ebe46689bf93af14ac4d2abd4be871aaee7d434db3bdfde86ca69bcf7d3d0b603 WHIRLPOOL fbf87f4455702bdea892391261fca082599de292e3ea3d31659e77734f2e085b247c40a1e5589178024e083ada3a791b6777dbd55b4373ecb840f90d170cd63e -DIST xtrlock_2.2.tar.gz 20716 SHA256 eed63851f4ad9f3026fd0a73767c8d2e5e2b973e050d271be6ec5086faa11ef6 SHA512 00eb877c721d5ad134912ab61969c96ede3b9e8b551cdc527da1b1dab404643b4b03f73a656293efae1bc6a186376addf8000cd500341273a24534bd186af9c9 WHIRLPOOL 0abd1ed9c45fcbd392e989d7e2d29121419620d8e6d767bb84c17c3535bcec9c2b86544109897934aa3607bcb36387e34bf7b30cfbf81c639603b04ba29dde9e -DIST xtrlock_2.5.tar.gz 70723 SHA256 f07b05801efc39173dd82b04846b832525c72ba7de7df52a7097cbbd5b2df108 SHA512 7004408d02f5dcfe63e804e72105036a3af50912222492131f2d68a51f968e59d7e170533f28ca26880a685d1d1f8207d1a0641b9d14300f260b7f85a5b4a837 WHIRLPOOL 5c6cdac5c6eca5079b1771f4b6e181f4fe22aff6c6d930b52ad1c1543da65e4e629cf0a6db6f0a7555329fb2b145e0d22843a9d5fe27f1819e0f2606b14ca159 -DIST xtrlock_2.6.tar.gz 20814 SHA256 f0acccd39b9beedf1244434045e243cf515ba8653964fe6f3fb9187c640cc3bb SHA512 995530e50892c2f39340cbd82006b1acfed5530cef1ae16e62d1883874b92f6ebe46689bf93af14ac4d2abd4be871aaee7d434db3bdfde86ca69bcf7d3d0b603 WHIRLPOOL fbf87f4455702bdea892391261fca082599de292e3 \ No newline at end of file diff --git a/x11-misc/xxkb/files/de48.xpm b/x11-misc/xxkb/files/de48.xpm index 3aeb47f0c2b9..5cae8928b68d 100644 --- a/x11-misc/xxkb/files/de48.xpm +++ b/x11-misc/xxkb/files/de48.xpm @@ -50,11 +50,6 @@ static char * de48_xpm[] = { "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@/* XPM */ -static char * de48_xpm[] = { -"48 48 4 1", -" c None", -". c #000000", -"+ c #FF0000", -"@ c #FFE900", -" \ No newline at end of file +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"}; diff --git a/x11-plugins/allin1/allin1-0.5.0-r1.ebuild b/x11-plugins/allin1/allin1-0.5.0-r1.ebuild index 0afb01b614d4..409524f2ae61 100644 --- a/x11-plugins/allin1/allin1-0.5.0-r1.ebuild +++ b/x11-plugins/allin1/allin1-0.5.0-r1.ebuild @@ -29,6 +29,11 @@ src_compile() { emake \ CC="$(tc-getCC)" \ CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDF# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gent \ No newline at end of file + LDFLAGS="${LDFLAGS}" +} + +src_install() { + dobin src/allin1 + doman docs/allin1.1 + dodoc README README.it TODO ChangeLog BUGS src/allin1.conf.example +} diff --git a/x11-plugins/screenlets/Manifest b/x11-plugins/screenlets/Manifest index ca4c26ca00d5..cea95af60f4d 100644 --- a/x11-plugins/screenlets/Manifest +++ b/x11-plugins/screenlets/Manifest @@ -1,4 +1,2 @@ DIST screenlets-0.1.2.tar.bz2 2899575 SHA256 010d69544b33709c64c5894b17658db2f504ac331663829255868ec8b1e6f54d SHA512 1c8c0de1c1e446878bbc0d86e99c548d6262bdc273d49d230a30da5376f1cd0b97dc5b23dd0a0d90d987f4ee2e7a4b19256d6f32402c7ce95defd79c78e03e81 WHIRLPOOL 079ca73c4ef4f8c1ee3de89bcdc4565e2f0687542ef9208a6f8fe5b6f0791e8e79fd7ab817f4a0f10d3e222e6d2868a768d05c15c47b7f7b69c6250215912413 DIST screenlets-0.1.6.tar.bz2 814470 SHA256 65383faaf02b6d571d2136c849cec5885583f513a9bbffacd3381cd998ee86e3 SHA512 f7b38de88ca500bef49a1be327aae29bb2c784e63b3ba0f7b02ed8d235935e0d372e7c1cf55e8ecff9bc91cb88fb2a697d70d18812ff06ff63935aca1612cb15 WHIRLPOOL cf3a25476323d433b03414f210afa7c384738b29167694d2c938c9fbe285d25e392679f348232758cc17a1e95af75dc90ee8a77d859d8452890fc77250c1fd69 -DIST screenlets-0.1.2.tar.bz2 2899575 SHA256 010d69544b33709c64c5894b17658db2f504ac331663829255868ec8b1e6f54d SHA512 1c8c0de1c1e446878bbc0d86e99c548d6262bdc273d49d230a30da5376f1cd0b97dc5b23dd0a0d90d987f4ee2e7a4b19256d6f32402c7ce95defd79c78e03e81 WHIRLPOOL 079ca73c4ef4f8c1ee3de89bcdc4565e2f0687542ef9208a6f8fe5b6f0791e8e79fd7ab817f4a0f10d3e222e6d2868a768d05c15c47b7f7b69c6250215912413 -DIST screenlets-0.1.6.tar.bz2 814470 SHA256 65383faaf02b6d571d2136c849cec5885583f513a9bbffacd3381cd998ee86e3 SHA512 f7b38de88ca500bef49a1be327aae29bb2c784e63b3ba0f7b02ed8d235935e0d372e7c1cf55e8ecff9bc91cb88fb2a697d70d18812ff06ff63935aca1612cb15 WHIRLPOOL cf3a25476323d433b03414f210afa7c384738b29167694d2c938c9fbe285d25e392679f348232758cc17a1e95af75dc90ee8a77d859d8452890fc77250c1fd69 diff --git a/x11-proto/recordproto/Manifest b/x11-proto/recordproto/Manifest index 4ce2db05f336..8907a03552ac 100644 --- a/x11-proto/recordproto/Manifest +++ b/x11-proto/recordproto/Manifest @@ -1,4 +1,2 @@ DIST recordproto-1.14.1.tar.bz2 112238 SHA256 b27eb043d3e618bc1f8b704a64f8ae218ea00e7f36f9107ac41d41940773098d SHA512 bf82548c2cf9d49d700d4a6bbebe71f1b0f3d0fca594cc58d4d2f772d20df264bbb420d27ab2fab4e20e4012bfb1f0c706cd636f5470add3a99b7745f96f0f75 WHIRLPOOL 08d55198cb68f4701d50254d921e6c8f0f7eb7561a1f1d29cb91677d3bc4d19f13d420526dc728535d2a5edc1d04b47d861a5da7c6d7e915b331a2551583aeba -DIST recordproto-1.14.2.tar.bz2 123033 SHA256 a777548d2e92aa259f1528de3c4a36d15e07a4650d0976573a8e2ff5437e737-----BEGIN PGP SIGNED MESSAGE----- -DIST recordproto-1.14.1.tar.bz2 112238 SHA256 b27eb043d3e618bc1f8b704a64f8ae218ea00e7f36f9107ac41d41940773098d SHA512 bf82548c2cf9d49d700d4a6bbebe71f1b0f3d0fca594cc58d4d2f772d20df264bbb420d27ab2fab4e20e4012bfb1f0c706cd636f5470add3a99b7745f96f0f75 WHIRLPOOL 08d55198cb68f4701d50254d921e6c8f0f7eb7561a1f1d29cb91677d3bc4d19f13d420526dc728535d2a5edc1d04b47d861a5da7c6d7e915b331a2551583aeba DIST recordproto-1.14.2.tar.bz2 123033 SHA256 a777548d2e92aa259f1528de3c4a36d15e07a4650d0976573a8e2ff5437e7370 SHA512 ab82d966ffacb46c001df15b272ca58f996826dc6f6835d3dc4d385b31c682acacb073a380d61938e2f242bffdabdd9b8f7107cd5ac67cb7aa3a28cc14a8ea02 WHIRLPOOL cf3b1547c1d2bcea06b772b8273c4d08039c492e2afc1146ede1f644260cfffcedad7ff67e5763f658f31aa437253f9495ac4e951ab239bb1c373231b1046c1e diff --git a/x11-terms/eterm/eterm-9999.ebuild b/x11-terms/eterm/eterm-9999.ebuild index 8357cefc04ff..14f4882f8417 100644 --- a/x11-terms/eterm/eterm-9999.ebuild +++ b/x11-terms/eterm/eterm-9999.ebuild @@ -65,14 +65,18 @@ src_configure() { --enable-trans \ $(use_enable mmx) \ $(use_enable sse2) \ - $(use_enable uni# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/eterm-9999.ebuild,v 1.20 2012/08/23 04:06:33 ottxor Exp $ - -EAPI="3" -inherit eutils autotools + $(use_enable unicode multi-charset) \ + $(use_enable utempter utmp) \ + --with-delete=execute \ + --with-backspace=auto +} -MY_P=Eterm-${PV} +src_install() { + emake DESTDIR="${D}" install || die + dodoc ChangeLog README ReleaseNotes + use escreen && dodoc doc/README.Escreen + dodoc bg/README.backgrounds -if [[ ${PV} == "9999" ]] ; then - ESVN_REPO_URI="http://svn.enlightenment.org/svn/e/trunk/eterm \ No newline at end of file + # We don't install headers to link against this library + rm -f "${D}"/usr/*/libEterm.{so,la} +} diff --git a/x11-terms/guake/guake-0.4.4.ebuild b/x11-terms/guake/guake-0.4.4.ebuild index ed92b980a3f3..5952565e9d00 100644 --- a/x11-terms/guake/guake-0.4.4.ebuild +++ b/x11-terms/guake/guake-0.4.4.ebuild @@ -33,17 +33,26 @@ DEPEND="${RDEPEND} virtual/pkgconfig" pkg_setup() { - DOCS="AUTHORS ChangeL# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/guake/guake-0.4.4.ebuild,v 1.4 2012/10/17 03:46:04 phajdan.jr Exp $ + DOCS="AUTHORS ChangeLog NEWS README TODO" + G2CONF="--disable-static" -EAPI=4 + python_set_active_version 2 + python_pkg_setup +} -GCONF_DEBUG=no -GNOME2_LA_PUNT=yes +src_prepare() { + python_convert_shebangs 2 src/{guake,prefs.py} + >py-compile -PYTHON_DEPEND="2:2.7" + gnome2_src_prepare +} -inherit gnome2 python +pkg_postinst() { + gnome2_pkg_postinst + python_mod_optimize ${PN} +} -DESCRIPTION="A dropd \ No newline at end of file +pkg_postrm() { + gnome2_pkg_postrm + python_mod_cleanup ${PN} +} diff --git a/x11-terms/hanterm/files/hanterm-3.1.6-gentoo.patch b/x11-terms/hanterm/files/hanterm-3.1.6-gentoo.patch index 66f9d561e38a..bb3d6b1365df 100644 --- a/x11-terms/hanterm/files/hanterm-3.1.6-gentoo.patch +++ b/x11-terms/hanterm/files/hanterm-3.1.6-gentoo.patch @@ -31,9 +31,12 @@ diff -Naur hanterm-3.1.6.orig/charproc.c hanterm-3.1.6/charproc.c extern void InsertLine(); diff -Naur hanterm-3.1.6.orig/scrollbar.c hanterm-3.1.6/scrollbar.c --- hanterm-3.1.6.orig/scrollbar.c 1999-03-19 15:27:19.000000000 +0900 -+++ diff -Naur hanterm-3.1.6.orig/button.c hanterm-3.1.6/button.c ---- hanterm-3.1.6.orig/button.c 2001-06-06 22:05:15.000000000 +0900 -+++ hanterm-3.1.6/button.c 2008-12-23 00:48:18.000000000 +0900 -@@ -42,7 +42,6 @@ ++++ hanterm-3.1.6/scrollbar.c 2008-12-23 00:45:53.000000000 +0900 +@@ -28,6 +28,7 @@ + #include "ptyx.h" /* gets Xt headers, too */ + + #include ++#include + #include + #include - vo \ No newline at end of file diff --git a/x11-terms/multi-aterm/multi-aterm-0.2.1-r1.ebuild b/x11-terms/multi-aterm/multi-aterm-0.2.1-r1.ebuild index e1fcdfec84c9..f5c32e3026c1 100644 --- a/x11-terms/multi-aterm/multi-aterm-0.2.1-r1.ebuild +++ b/x11-terms/multi-aterm/multi-aterm-0.2.1-r1.ebuild @@ -6,15 +6,6 @@ EAPI=4 inherit eutils -DESCRIPTION="Terminal emulator with transparency support as well as rxvt backwards compatibility with tab support" -HOMEPAGE="http:# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/multi-aterm/multi-aterm-0.2.1-r1.ebuild,v 1.11 2012/10/15 15:53:44 ago Exp $ - -EAPI=4 - -inherit eutils - DESCRIPTION="Terminal emulator with transparency support as well as rxvt backwards compatibility with tab support" HOMEPAGE="http://www.nongnu.org/materm/materm.html" SRC_URI="http://www.nongnu.org/materm/${P}.tar.gz" @@ -42,4 +33,27 @@ src_prepare() { configure || die } -src_configure \ No newline at end of file +src_configure() { + econf \ + --enable-transparency \ + --enable-fading \ + --enable-xterm-scroll \ + --enable-half-shadow \ + --enable-graphics \ + --enable-mousewheel \ + --with-x \ + --with-xpm=/usr \ + $(use_enable cjk kanji) \ + $(use_enable debug) \ + $(use_enable jpeg) \ + $(use_enable png) +} + +src_compile() { + emake CFLAGS="${CFLAGS}" +} + +src_install() { + default + newdoc doc/TODO TODO.2 +} diff --git a/x11-terms/roxterm/roxterm-2.6.5.ebuild b/x11-terms/roxterm/roxterm-2.6.5.ebuild index 648a1a0e8ea7..684e97f94f5a 100644 --- a/x11-terms/roxterm/roxterm-2.6.5.ebuild +++ b/x11-terms/roxterm/roxterm-2.6.5.ebuild @@ -29,21 +29,22 @@ DEPEND="${RDEPEND} nls? ( app-text/po4a sys-devel/gettext )" pkg_setup() { - python_set# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/roxterm/roxterm-2.6.5.ebuild,v 1.1 2012/07/31 06:12:20 ssuominen Exp $ - -EAPI=4 -inherit gnome2-utils python toolchain-funcs - -DESCRIPTION="A terminal emulator designed to integrate with the ROX environment" -HOMEPAGE="http://roxterm.sourceforge.net/" -SRC_URI="mirror://sourceforge/roxterm/${P}.tar.bz2" - -LICENSE="GPL-2 LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="nls" - -RDEPEND=">=dev-libs/dbus-glib-0.100 - >=dev-libs/glib- \ No newline at end of file + python_set_active_version 2 + python_pkg_setup +} + +src_prepare() { + python_convert_shebangs 2 mscript.py +} + +src_configure() { + local myconf=( CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" --prefix=/usr --docdir=/usr/share/doc/${PF} --destdir="${D}" ) + use nls || myconf+=( --disable-gettext --disable-po4a --disable-translations ) + ./mscript.py configure "${myconf[@]}" +} + +src_compile() { ./mscript.py build; } +src_install() { ./mscript.py install; } +pkg_preinst() { gnome2_icon_savelist; } +pkg_postinst() { gnome2_icon_cache_update; } +pkg_postrm() { gnome2_icon_cache_update; } diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.14-clear.patch b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.14-clear.patch index 39e8c6f4f2d6..050907cea435 100644 --- a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.14-clear.patch +++ b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.14-clear.patch @@ -17,7 +17,9 @@ https://bbs.archlinux.org/viewtopic.php?id=129302 + int extra_lines = nrow-1; + if (screen.cur.row == 0) + extra_lines += nrow; -+ for (int i = 0; i < extra_lines; +store visible lines to buffer before clearing the screen when pressing ctrl-l - -patch by rlblaster -https://bbs.archlinux.org/viewtopic.php?id=1293 \ No newline at end of file ++ for (int i = 0; i < extra_lines; ++i) ++ scr_add_lines (L"\r\n", 2); ++ } + scr_gotorc (arg[0] - 1, nargs < 2 ? 0 : (arg[1] - 1), 0); + break; + diff --git a/x11-terms/rxvt/rxvt-2.7.10-r4.ebuild b/x11-terms/rxvt/rxvt-2.7.10-r4.ebuild index bb3e56ffd118..a5e877b958e2 100644 --- a/x11-terms/rxvt/rxvt-2.7.10-r4.ebuild +++ b/x11-terms/rxvt/rxvt-2.7.10-r4.ebuild @@ -89,10 +89,10 @@ src_install() { pkg_postinst() { einfo - einfo "If you want to change default TERM vari# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt/rxvt-2.7.10-r4.ebuild,v 1.11 2014/08/30 12:07:41 mgorny Exp $ - -EAPI=1 - -inherit eutils flag-o-matic libtool toolchain-fu \ No newline at end of file + einfo "If you want to change default TERM variable other than rxvt," + einfo "set RXVT_TERM environment variable and then emerge rxvt." + einfo "Especially, if you use rxvt under monochrome X you might need to run" + einfo "\t RXVT_TERM=rxvt-basic emerge rxvt" + einfo "otherwise curses based program will not work." + einfo +} diff --git a/x11-terms/xfce4-terminal/Manifest b/x11-terms/xfce4-terminal/Manifest index 78be0d7d5e6e..d3cb6ed68443 100644 --- a/x11-terms/xfce4-terminal/Manifest +++ b/x11-terms/xfce4-terminal/Manifest @@ -1,2 +1 @@ DIST xfce4-terminal-0.6.3.tar.bz2 815207 SHA256 912f4716c2395a14a80620ef982b4af1e2a67a8df9a1ef0b802ecae826057e08 SHA512 805390b75178b3a2fbff4f8dfe972474e5575ad5a80aaf775f7b4086f975cf5b444a335b1ec1a9a39bc89642c71e1d0cb1bbc14d96b913980bd231d32a081c49 WHIRLPOOL 199f305ae3996eeb5797dbc3fbe07f459c577bfb5a259c3ce820b2fea87ef92593ed26fd82745b7266a6e8801aef61c5a82ddd0f7e9cdc3f3c741e58ba37ed0a -DIST xfce4-terminal-0.6.3.tar.bz2 815207 SHA256 912f4716c2395a14a80620ef982b4af1e2a67a8df9a1ef0b802ecae826057e08 SHA512 805390b75178b3a2fbff4f8dfe972474e5575ad5a80aaf775f7b4086f975cf5b444a335b1ec1a9a39bc89642c71e1d0cb1bbc14d96b913980bd231d32a081c49 WHIRLPOOL 199f305ae3996eeb5797dbc3fbe07f459c577bfb5a259c3ce820b2fea87ef92593ed26fd82745b7266a6e8801aef61c5a82ddd0f7e9cdc3f3c741e58ba37ed0a diff --git a/x11-themes/gtk-engines-xfce/Manifest b/x11-themes/gtk-engines-xfce/Manifest index 64ab29a813ba..455246c3d78f 100644 --- a/x11-themes/gtk-engines-xfce/Manifest +++ b/x11-themes/gtk-engines-xfce/Manifest @@ -1,2 +1 @@ -DIST gtk-xfce-engine-3.0.1.tar.bz2 369040 SHA256 eb03cf81da1a91e426a2141c092ed7a1634cab29ea2f3546480e901290a7a06d SHA512 0cd701cc485fcf7e112221c550f58078ca63773b0dd8c22d052b55-----BEGIN PGP SIGNED MESSAGE----- DIST gtk-xfce-engine-3.0.1.tar.bz2 369040 SHA256 eb03cf81da1a91e426a2141c092ed7a1634cab29ea2f3546480e901290a7a06d SHA512 0cd701cc485fcf7e112221c550f58078ca63773b0dd8c22d052b55564ad7954c721398735fbcf85b72f2b56ac5c65c1648522c1238fe97c274093d90f80af058 WHIRLPOOL e891fcde19fd6c27d42bbc72e34d0afa35c8050525b6affda587e9c3849bd70463da498012810a3aa99a25ad9129bc532bd93266ed8b0a0e1fe1cd166c5a87d3 diff --git a/x11-wm/awesome/awesome-3.4.15.ebuild b/x11-wm/awesome/awesome-3.4.15.ebuild index 8272edc55b18..b0787c1c7551 100644 --- a/x11-wm/awesome/awesome-3.4.15.ebuild +++ b/x11-wm/awesome/awesome-3.4.15.ebuild @@ -10,21 +10,6 @@ DESCRIPTION="A dynamic floating and tiling window manager" HOMEPAGE="http://awesome.naquadah.org/" SRC_URI="http://awesome.naquadah.org/download/${P}.tar.bz2" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd" -IUSE="dbus doc # Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.15.ebuild,v 1.9 2013/12/27 14:16:45 maksbotan Exp $ - -EAPI="3" -CMAKE_MIN_VERSION="2.8" -inherit cmake-utils eutils - -DESCRIPTION="A dynamic floating and tiling window manager" -HOMEPAGE="http://awesome.naquadah.org/" -SRC_URI="http://awesome.naquadah.org/download/${P}.tar.bz2" - LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd" @@ -126,4 +111,22 @@ src_install() { mv html doxygen dohtml -r doxygen || die ) - mv "${ED}"/usr/share/d \ No newline at end of file + mv "${ED}"/usr/share/doc/${PN}/luadoc "${ED}"/usr/share/doc/${PF}/html/luadoc || die + fi + rm -rf "${ED}"/usr/share/doc/${PN} || die + + exeinto /etc/X11/Sessions + newexe "${FILESDIR}"/${PN}-session ${PN} || die + + # GNOME-based awesome + if use gnome ; then + # GNOME session + insinto /usr/share/gnome-session/sessions + doins "${FILESDIR}/${PN}-gnome.session" || die + # Application launcher + domenu "${FILESDIR}/${PN}-gnome.desktop" || die + # X Session + insinto /usr/share/xsessions/ + doins "${FILESDIR}/${PN}-gnome-xsession.desktop" || die + fi +} diff --git a/x11-wm/awesome/files/awesome-3.5.5-util.lua-xdg-icons-fix.patch b/x11-wm/awesome/files/awesome-3.5.5-util.lua-xdg-icons-fix.patch index a37ff1a679c9..588f9ab9ec52 100644 --- a/x11-wm/awesome/files/awesome-3.5.5-util.lua-xdg-icons-fix.patch +++ b/x11-wm/awesome/files/awesome-3.5.5-util.lua-xdg-icons-fix.patch @@ -6,20 +6,6 @@ X-Git-Url: http://git.naquadah.org/?p=awesome.git;a=commitdiff_plain;h=d76d3e0b6 Merge git://github.com/Teknocrat/awesome --- -diff --git a/lib/awful/util.lua.in b/lib/awful/util.lua.in -index 1d35f2f..123c4a6 100644 ---- a/lib/awful/util.lua.in -+++ b/lib/awful/util.lua.in -@@ -185,21 +185,24 @@ end - -- of the dirs are searched first - function util.geticonpath(iconname, exts, diFrom: Uli Schlachter -Date: Sat, 12 Apr 2014 14:15:11 +0000 (+0200) -Subject: Merge git://github.com/Teknocrat/awesome -X-Git-Url: http://git.naquadah.org/?p=awesome.git;a=commitdiff_plain;h=d76d3e0b6a00b8b289b3801ba197e0dae732a92d;hp=1090719d677c86e90a1394a34f0effb418728493 - -Merge git://github.com/Teknocrat/awesome ---- - diff --git a/lib/awful/util.lua.in b/lib/awful/util.lua.in index 1d35f2f..123c4a6 100644 --- a/lib/awful/util.lua.in @@ -39,4 +25,22 @@ index 1d35f2f..123c4a6 100644 - if size then - icon = string.format("%s%ux%u/%s.%s", - d, size, size, iconname, e) -- \ No newline at end of file +- if util.file_readable(icon) then +- return icon +- end +- end + icon = d .. iconname .. '.' .. e + if util.file_readable(icon) then + return icon + end ++ if size then ++ for _, t in pairs(icontypes) do ++ icon = string.format("%s%ux%u/%s/%s.%s", d, size, size, t, iconname, e) ++ if util.file_readable(icon) then ++ return icon ++ end ++ end ++ end + end + end + end diff --git a/x11-wm/i3/i3-4.6.ebuild b/x11-wm/i3/i3-4.6.ebuild index 0f142eb6abac..e23c99465e7e 100644 --- a/x11-wm/i3/i3-4.6.ebuild +++ b/x11-wm/i3/i3-4.6.ebuild @@ -64,5 +64,7 @@ pkg_postinst() { einfo "There are several packages that you may find useful with ${PN} and" einfo "their usage is suggested by the upstream maintainers, namely:" einfo " x11-misc/dmenu" - einfo " x11-misc/i3status# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public \ No newline at end of file + einfo " x11-misc/i3status" + einfo " x11-misc/i3lock" + einfo "Please refer to their description for additional info." +} diff --git a/x11-wm/jwm/jwm-2.1.0.ebuild b/x11-wm/jwm/jwm-2.1.0.ebuild index 61e61f8202cc..ae94e0fcb11d 100644 --- a/x11-wm/jwm/jwm-2.1.0.ebuild +++ b/x11-wm/jwm/jwm-2.1.0.ebuild @@ -64,6 +64,7 @@ src_install() { } pkg_postinst() { - einfo "Put an appropriate co# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo \ No newline at end of file + einfo "Put an appropriate configuration file in /etc/system.jwmrc" + einfo "or in ~/.jwmrc." + einfo "An example file can be found in ${EROOT}/usr/share/doc/${PF}/" +} diff --git a/x11-wm/matchbox-panel/files/matchbox-panel-0.9.3-wifi.patch b/x11-wm/matchbox-panel/files/matchbox-panel-0.9.3-wifi.patch index a2ba91e9c361..d36a2eb8df0a 100644 --- a/x11-wm/matchbox-panel/files/matchbox-panel-0.9.3-wifi.patch +++ b/x11-wm/matchbox-panel/files/matchbox-panel-0.9.3-wifi.patch @@ -23,9 +23,21 @@ diff -Naurp matchbox-panel-0.9.3.orig/configure.ac matchbox-panel-0.9.3/configur +if test x$enable_wireless_tools = xyes; then + AC_CHECK_HEADERS(iwlib.h, have_iwlib_h=yes, + AC_MSG_ERROR([Unable to find the wireless-tools headers])) -+ AC_CHECK_LIB(iw, iw_sockets_open, have_libidiff -Naurp matchbox-panel-0.9.3.orig/configure.ac matchbox-panel-0.9.3/configure.ac ---- matchbox-panel-0.9.3.orig/configure.ac 2006-03-07 18:46:39.000000000 +0000 -+++ matchbox-panel-0.9.3/configure.ac 2010-05-18 13:10:59.000000000 +0000 -@@ -56,6 +56,10 @@ AC_ARG_ENABLE(acpi-linux, - [ --enable-acpi-linux Use Linux ACPI rather than APM for battery info], - enable_acpi_linux=$enab \ No newline at end of file ++ AC_CHECK_LIB(iw, iw_sockets_open, have_libiw=yes, ++ AC_MSG_ERROR([Unable to find the wireless-tools library])) + +-if test x$have_iwlib_h = x"yes" && test x$have_libiw = x"yes"; then +- WIRELESS_LIBS="-liw" +- wifi_enabled=yes ++ WIRELESS_LIBS="-liw" ++ wifi_enabled=yes ++else ++ WIRELESS_LIBS="" ++ wifi_enabled=no + fi +-AC_SUBST(WIRELESS_LIBS) + ++AC_SUBST(WIRELESS_LIBS) + AM_CONDITIONAL(WANT_WIFI, test x$wifi_enabled = x"yes") + + diff --git a/x11-wm/matchbox-window-manager/matchbox-window-manager-1.2.ebuild b/x11-wm/matchbox-window-manager/matchbox-window-manager-1.2.ebuild index b47cdd6a8494..1624d702564b 100644 --- a/x11-wm/matchbox-window-manager/matchbox-window-manager-1.2.ebuild +++ b/x11-wm/matchbox-window-manager/matchbox-window-manager-1.2.ebuild @@ -13,23 +13,6 @@ LICENSE="GPL-2" KEYWORDS="amd64 ~arm ~hppa ppc x86" IUSE="debug expat gnome session startup-notification xcomposite" -RDEPEND=">=x11-libs/libmatchbox-1.5 - expat? ( dev-libs/expat ) - gnome? ( gnome-base/gconf )# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox-window-manager/matchbox-window-manager-1.2.ebuild,v 1.10 2012/06/04 00:25:35 xmw Exp $ - -inherit eutils versionator gnome2 - -DESCRIPTION="Light weight WM designed for use on PDA computers" -HOMEPAGE="http://matchbox-project.org/" -SRC_URI="http://matchbox-project.org/sources/${PN}/$(get_version_component_range 1-2)/${P}.tar.bz2" -SLOT="0" -LICENSE="GPL-2" - -KEYWORDS="amd64 ~arm ~hppa ppc x86" -IUSE="debug expat gnome session startup-notification xcomposite" - RDEPEND=">=x11-libs/libmatchbox-1.5 expat? ( dev-libs/expat ) gnome? ( gnome-base/gconf ) @@ -43,4 +26,32 @@ src_unpack() { unpack ${A} cd "${S}" - # Allows to build \ No newline at end of file + # Allows to build with USE=-png + epatch "${FILESDIR}"/${PN}-1.0-use-nopng.patch +} + +src_compile() { + econf --enable-keyboard \ + --enable-ping-protocol \ + --enable-xrm \ + $(use_enable debug) \ + $(use_enable session) \ + $(use_enable expat) \ + $(use_enable gnome gconf) \ + $(use_enable startup-notification) \ + $(use_enable xcomposite composite) \ + || die "Configuration failed" + + emake || die "Compilation failed" +} + +src_install() { + # we must delay gconf schema installation due to sandbox + export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1" + make DESTDIR="${D}" install || die "Installation failed" + unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL + + gnome2_gconf_install + + dodoc AUTHORS ChangeLog INSTALL NEWS README +} diff --git a/x11-wm/mate-window-manager/mate-window-manager-1.6.2.ebuild b/x11-wm/mate-window-manager/mate-window-manager-1.6.2.ebuild index 16f7b09ba1eb..0cfe0938e2d8 100644 --- a/x11-wm/mate-window-manager/mate-window-manager-1.6.2.ebuild +++ b/x11-wm/mate-window-manager/mate-window-manager-1.6.2.ebuild @@ -12,20 +12,6 @@ inherit gnome2 versionator MATE_BRANCH="$(get_version_component_range 1-2)" -SRC_URI="http://pub.mate-desktop.org/releases/${MATE_B# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/mate-window-manager/mate-window-manager-1.6.2.ebuild,v 1.4 2014/05/04 14:55:59 ago Exp $ - -EAPI="5" - -# Debug only changes CFLAGS -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" - -inherit gnome2 versionator - -MATE_BRANCH="$(get_version_component_range 1-2)" - SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz" DESCRIPTION="MATE default window manager" HOMEPAGE="http://mate-desktop.org" @@ -62,4 +48,23 @@ RDEPEND=" DEPEND="${RDEPEND} >=app-text/mate-doc-utils-1.6:0 >=dev-util/intltool-0.34.90:* - sys-de \ No newline at end of file + sys-devel/gettext:* + virtual/pkgconfig:* + x11-proto/xextproto:0 + x11-proto/xproto:0 + test? ( app-text/docbook-xml-dtd:4.5 ) + xinerama? ( x11-proto/xineramaproto:0 )" + +src_configure() { + gnome2_src_configure \ + --enable-compositor \ + --enable-render \ + --enable-shape \ + --enable-sm \ + --enable-xsync \ + --with-gtk=2.0 \ + $(use_enable startup-notification) \ + $(use_enable xinerama) +} + +DOCS="AUTHORS ChangeLog HACKING NEWS README *.txt doc/*.txt" diff --git a/x11-wm/matwm2/Manifest b/x11-wm/matwm2/Manifest index bc1a64a5682e..1e8fb6b98ac5 100644 --- a/x11-wm/matwm2/Manifest +++ b/x11-wm/matwm2/Manifest @@ -1,2 +1 @@ DIST matwm2-0.1.1.tar.gz 64552 SHA256 b85de9adc2118a7305a9015b57183117a4dbebf52b1ae4ac688e8f276319beb7 -DIST matwm2-0.1.1.tar.gz 64552 SHA256 b85de9adc2118a7305a9015b57183117a4dbebf52b1ae4ac688e8f276319beb7 diff --git a/x11-wm/mutter/files/mutter-3.2.1-ignore-shadow-and-padding.patch b/x11-wm/mutter/files/mutter-3.2.1-ignore-shadow-and-padding.patch index 850c6258c432..bf4649e75ed8 100644 --- a/x11-wm/mutter/files/mutter-3.2.1-ignore-shadow-and-padding.patch +++ b/x11-wm/mutter/files/mutter-3.2.1-ignore-shadow-and-padding.patch @@ -43,33 +43,8 @@ index 9063541..63a881f 100644 G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, @@ -3027,6 +3041,18 @@ parse_style_element (GMarkupParseContext *context, - Patch author: Timo Kluck Wed, 21 Sep 2011 17:51:28 +0200 - -Patch to silently ignore padding and shadow tags in Ubuntu metacity themes. - -https://bugs.launchpad.net/bugs/800315 -https://bugs.gentoo.org/show_bug.cgi?id=396673 - -diff --git a/src/ui/theme-parser.c b/src/ui/theme-parser.c -index 9063541..63a881f 100644 ---- a/src/ui/theme-parser.c -+++ b/src/ui/theme-parser.c -@@ -90,7 +90,9 @@ typedef enum - STATE_WINDOW, - /* things we don't use any more but we can still parse: */ - STATE_MENU_ICON, -- STATE_FALLBACK -+ STATE_FALLBACK, -+ /* an ubuntu specific ignore-this-element state */ -+ UBUNTU_STATE_IGNORE - } ParseState; - - typedef struct -@@ -1306,7 +1308,19 @@ parse_toplevel_element (GMarkupParseContext *context, - */ - push_state (info, STATE_FALLBACK); + push_state (info, STATE_BUTTON); } -- else + else if (ELEMENT_IS ("shadow")) + { + /* ubuntu specific, workaround for light-themes: silently ignore shadow tag. @@ -82,6 +57,35 @@ index 9063541..63a881f 100644 + */ + push_state (info, UBUNTU_STATE_IGNORE); + } -+ else + else { - set_error (error, context, \ No newline at end of file + set_error (error, context, +@@ -3671,6 +3697,8 @@ start_element_handler (GMarkupParseContext *context, + _("Element <%s> is not allowed inside a <%s> element"), + element_name, "fallback"); + break; ++ case UBUNTU_STATE_IGNORE: ++ break; + } + } + +@@ -3960,6 +3988,9 @@ end_element_handler (GMarkupParseContext *context, + pop_state (info); + g_assert (peek_state (info) == STATE_THEME); + break; ++ case UBUNTU_STATE_IGNORE: ++ pop_state (info); ++ break; + } + + pop_required_version (info); +@@ -4165,6 +4196,9 @@ text_handler (GMarkupParseContext *context, + case STATE_FALLBACK: + NO_TEXT ("fallback"); + break; ++ case UBUNTU_STATE_IGNORE: ++ NO_TEXT ("ignored_element"); ++ break; + } + } + diff --git a/x11-wm/notion/notion-9999.ebuild b/x11-wm/notion/notion-9999.ebuild index 3053b4607d91..1dc764b625ee 100644 --- a/x11-wm/notion/notion-9999.ebuild +++ b/x11-wm/notion/notion-9999.ebuild @@ -17,30 +17,6 @@ SLOT="0" KEYWORDS="" IUSE="nls xinerama +xrandr" -RDEPEND="dev-lang/lua - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXext - nls? ( sys-devel/gettext ) - xinerama? ( x11-libs/lib# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/notion/notion-9999.ebuild,v 1.8 2014/05/25 13:01:33 jer Exp $ - -EAPI=5 - -EGIT_REPO_URI="git://notion.git.sourceforge.net/gitroot/notion/notion" -EGIT_HAS_SUBMODULES="1" - -inherit eutils git-2 multilib toolchain-funcs - -DESCRIPTION="Notion is a tiling, tabbed window manager for the X window system" -HOMEPAGE="http://notion.sourceforge.net" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="" -IUSE="nls xinerama +xrandr" - RDEPEND="dev-lang/lua x11-libs/libSM x11-libs/libX11 @@ -67,4 +43,39 @@ src_prepare() { -i system-autodetect.mk || die sed -e 's/gcc/$(CC)/g' \ -i ioncore/Makefile || die - expor \ No newline at end of file + export STRIPPROG=true + + tc-export CC +} + +src_configure() { + use nls || export DEFINES=" -DCF_NO_LOCALE -DCF_NO_GETTEXT" + + if ! use xinerama ; then + sed -e 's/mod_xinerama//g' -i modulelist.mk || die + fi + + if ! use xrandr ; then + sed -e 's/mod_xrandr//g' -i modulelist.mk || die + fi +} + +src_compile() { + emake CC="$(tc-getCC)" AR="$(tc-getAR)" \ + RANLIB="$(tc-getRANLIB)" +} + +src_install() { + default + + exeinto /etc/X11/Sessions + doexe "${FILESDIR}"/notion + + insinto /usr/share/xsessions + doins "${FILESDIR}"/notion.desktop +} + +pkg_postinst() { + elog "If you want notion to have an ability to view a file based on its" + elog "guessed MIME type you should emerge app-misc/run-mailcap." +} diff --git a/x11-wm/spectrwm/files/spectrwm-2.3.0-Makefile.patch b/x11-wm/spectrwm/files/spectrwm-2.3.0-Makefile.patch index 99d61f2ff29e..2b04953ea9c4 100644 --- a/x11-wm/spectrwm/files/spectrwm-2.3.0-Makefile.patch +++ b/x11-wm/spectrwm/files/spectrwm-2.3.0-Makefile.patch @@ -7,17 +7,6 @@ +CFLAGS+= -DSWM_LIB=\"libswmhack.so.$(LVERS)\" LDADD+= -lX11 -lX11-xcb -lxcb -lxcb-icccm -lxcb-randr -lxcb-keysyms -lxcb-util -lxcb-xtest -lXft -lXcursor - PREFIX?= /usr/local -@@ -29,10 +29,10 @@ - $(CC) $(LDFL--- spectrwm-2.3.0/linux/Makefile -+++ spectrwm-2.3.0/linux/Makefile -@@ -1,5 +1,5 @@ --CFLAGS+= -std=c99 -Wall -Wextra -Wmissing-prototypes -Wshadow -g -D_GNU_SOURCE -I. -I/usr/include/freetype2 --CFLAGS+= -DSWM_LIB=\"$(LIBDIR)/libswmhack.so.$(LVERS)\" -+CFLAGS+= -std=c99 -Wall -Wextra -Wmissing-prototypes -Wshadow -D_GNU_SOURCE -I. -I/usr/include/freetype2 -+CFLAGS+= -DSWM_LIB=\"libswmhack.so.$(LVERS)\" - LDADD+= -lX11 -lX11-xcb -lxcb -lxcb-icccm -lxcb-randr -lxcb-keysyms -lxcb-util -lxcb-xtest -lXft -lXcursor - PREFIX?= /usr/local @@ -29,10 +29,10 @@ $(CC) $(LDFLAGS) -o $@ $+ $(LDADD) @@ -34,4 +23,14 @@ install -m 755 -d $(DESTDIR)$(BINDIR) @@ -45,9 +45,9 @@ install -m 644 ../spectrwm_it.1 $(DESTDIR)$(MANDIR)/man1/spectrwm_it.1 - install -m 644 ../spectrwm_pt. \ No newline at end of file + install -m 644 ../spectrwm_pt.1 $(DESTDIR)$(MANDIR)/man1/spectrwm_pt.1 + install -m 644 ../spectrwm_ru.1 $(DESTDIR)$(MANDIR)/man1/spectrwm_ru.1 +- ln -sf $(BINDIR)/spectrwm $(DESTDIR)$(BINDIR)/scrotwm +- ln -sf $(LIBDIR)/libswmhack.so.0.0 $(DESTDIR)$(LIBDIR)/libswmhack.so.0 +- ln -sf $(LIBDIR)/libswmhack.so.0.0 $(DESTDIR)$(LIBDIR)/libswmhack.so ++ ln -sf spectrwm $(DESTDIR)$(BINDIR)/scrotwm ++ ln -sf libswmhack.so.0.0 $(DESTDIR)$(LIBDIR)/libswmhack.so.0 ++ ln -sf libswmhack.so.0.0 $(DESTDIR)$(LIBDIR)/libswmhack.so + + clean: + rm -f spectrwm *.o *.so libswmhack.so.* spectrwm.c swm_hack.c version.h diff --git a/xfce-extra/thunar-archive-plugin/Manifest b/xfce-extra/thunar-archive-plugin/Manifest index 4fbc213f2c24..ca50c6791581 100644 --- a/xfce-extra/thunar-archive-plugin/Manifest +++ b/xfce-extra/thunar-archive-plugin/Manifest @@ -1,2 +1 @@ DIST thunar-archive-plugin-0.3.1.tar.bz2 329005 SHA256 9ad559b0c11308f6897ad56604e5a06dc8f369f649eb20120b2d3018ef5da54c SHA512 51157c2680b3fcc6b541d35fc2943a350a0354d7d5bbb5fbe8a9dcbbeaf4bf4f5fe62521b8e9a73254f70bbefc440357deade8181313da96270c280eb0464e68 WHIRLPOOL 151a505968b871eae82bff1799464e4c6042e99668ec4752ecfa7537ed6968886134941bfcc7741ad56ba8ebb429c021046a968db92b1bba89bf1a1d2bb4a0d1 -DIST thunar-archive-plugin-0.3.1.tar.bz2 329005 SHA256 9ad559b0c11308f6897ad56604e5a06dc8f369f649eb20120b2d3018ef5da54c SHA512 51157c2680b3fcc6b541d35fc2943a350a0354d7d5bbb5fbe8a9dcbbeaf4bf4f5fe62521b8e9a73254f70bbefc44035 \ No newline at end of file diff --git a/xfce-extra/thunar-volman/Manifest b/xfce-extra/thunar-volman/Manifest index 7166d68a22a3..00e68cd91cc0 100644 --- a/xfce-extra/thunar-volman/Manifest +++ b/xfce-extra/thunar-volman/Manifest @@ -1,2 +1 @@ DIST thunar-volman-0.8.0.tar.bz2 411013 SHA256 ff0887c862b578580d05f4cd7db66081382ff143f9cc7ea3c9ba58cf5d02bceb SHA512 c953f06c82f10c5d8585662a3123cec84384b55aef45e258968d01624c1d1badc094f839dd930eb6fd5580264f5aa54f26c80df133d40c4f89fd4750116eb70f WHIRLPOOL 972cd0dd8ef8d56e91fc2d4dfec45599b6d8af684a670f3b31eee142f606fe2310ce376e80ab7b50590c3204a79ae73771cbd0dd8867c0860d57554b5db7eb50 -DIST thunar-volman-0.8.0.tar.bz2 411013 SHA256 ff0887c862b578580d05f4cd7db66081382ff143f9cc7ea3c9ba58cf5d02bceb SHA512 c953f06c82f10c5d8585662a3123cec84384b55aef45e258968d01624c1d1badc094f839dd930eb6fd5580264f5aa54f26c80df133d40c4f89fd4750116eb70f WHIRLPOOL 972cd0dd8ef8d56e91fc2d4dfec45599b6d8af684a670f3b31eee142f606fe2310ce376e80ab7b50590c3204a79ae73771cbd0dd8867c0860d57554b5db7eb50 diff --git a/xfce-extra/xfce-theme-manager/xfce-theme-manager-0.3.5.ebuild b/xfce-extra/xfce-theme-manager/xfce-theme-manager-0.3.5.ebuild index 96f7770b020e..010f5abe0457 100644 --- a/xfce-extra/xfce-theme-manager/xfce-theme-manager-0.3.5.ebuild +++ b/xfce-extra/xfce-theme-manager/xfce-theme-manager-0.3.5.ebuild @@ -8,18 +8,6 @@ inherit xfconf MY_PN=Xfce-Theme-Manager MY_P=${MY_PN}-${PV} -DESCRIPTION="An alternative theme manager for The Xfce Desktop Environment" -HOMEPAGE="http://keithhedger.hostingsiteforfree.com/pages/apps.html#themeed" -SRC_URI="http://keithhedger.hostingsiteforfree.com/zips/xfc# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce-theme-manager/xfce-theme-manager-0.3.5.ebuild,v 1.1 2014/03/21 07:37:00 ssuominen Exp $ - -EAPI=5 -inherit xfconf - -MY_PN=Xfce-Theme-Manager -MY_P=${MY_PN}-${PV} - DESCRIPTION="An alternative theme manager for The Xfce Desktop Environment" HOMEPAGE="http://keithhedger.hostingsiteforfree.com/pages/apps.html#themeed" SRC_URI="http://keithhedger.hostingsiteforfree.com/zips/xfcethememanager/${MY_P}.tar.gz" @@ -46,4 +34,24 @@ pkg_setup() { src_prepare() { sed -i \ - -e '/^Ca \ No newline at end of file + -e '/^Cat/s:;;Settings::' \ + -e '/^Cat/s:Gnome:GNOME:' \ + ${MY_PN}/resources/pixmaps/${MY_PN}.desktop || die + + local configext desktopversion=10 + has_version '>=xfce-base/xfdesktop-4.11' && desktopversion=11 + [[ -x configure ]] || configext=.ac + + sed -i \ + -e '/^CFLAGS/s:=-Wall:"& $CFLAGS":' \ + -e '/^CXXFLAGS/s:=-Wall:"& $CXXFLAGS":' \ + -e "/^desktopversion/s:=.*:=$desktopversion:" \ + configure${configext} || die + + xfconf_src_prepare +} + +src_install() { + xfconf_src_install + rm -f "${ED}"/usr/share/${MY_PN}/docs/gpl-3.0.txt +}