[gentoo-commits] proj/gamerlay:master commit in: games-util/lgogdownloader/
commit: 483c16823cbc708f821b7468b79834f789a3f2cc Author: James Le Cuirot gentoo org> AuthorDate: Sat Sep 17 11:01:00 2016 + Commit: James Le Cuirot gentoo org> CommitDate: Sun Sep 18 08:42:40 2016 + URL:https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=483c1682 games-util/lgogdownloader: Bring in line with ebuild in Gentoo repo Keep this ebuild around as the Gentoo repo does not have . Package-Manager: portage-2.3.0 .../lgogdownloader/lgogdownloader-2.28.ebuild | 26 - .../lgogdownloader/lgogdownloader-.ebuild | 34 -- games-util/lgogdownloader/metadata.xml | 33 + 3 files changed, 51 insertions(+), 42 deletions(-) diff --git a/games-util/lgogdownloader/lgogdownloader-2.28.ebuild b/games-util/lgogdownloader/lgogdownloader-2.28.ebuild deleted file mode 100644 index 0bbca8b..000 --- a/games-util/lgogdownloader/lgogdownloader-2.28.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit cmake-utils - -DESCRIPTION="Linux compatible gog.com downloader" -HOMEPAGE="https://sites.google.com/site/gogdownloader/"; -SRC_URI="https://github.com/Sude-/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="WTFPL" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - dev-libs/jsoncpp - net-libs/liboauth - net-misc/curl - dev-libs/boost - dev-libs/tinyxml - app-crypt/librhash - net-libs/htmlcxx -" -DEPEND="${RDEPEND}" diff --git a/games-util/lgogdownloader/lgogdownloader-.ebuild b/games-util/lgogdownloader/lgogdownloader-.ebuild index 429eed9..e5f9556 100644 --- a/games-util/lgogdownloader/lgogdownloader-.ebuild +++ b/games-util/lgogdownloader/lgogdownloader-.ebuild @@ -1,26 +1,28 @@ # Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 +# $Id$ -EAPI="6" +EAPI=6 + +CMAKE_MIN_VERSION="3.0.0" inherit cmake-utils git-r3 -DESCRIPTION="Linux compatible gog.com downloader" +DESCRIPTION="Unofficial GOG.com downloader for Linux" HOMEPAGE="https://sites.google.com/site/gogdownloader/"; EGIT_REPO_URI="https://github.com/Sude-/lgogdownloader.git"; - -LICENSE="WTFPL" +LICENSE="WTFPL-2" SLOT="0" -KEYWORDS="" -IUSE="" +IUSE="+debug" + +RDEPEND=">=app-crypt/rhash-1.3.3-r2:= + dev-cpp/htmlcxx:= + dev-libs/boost:= + >=dev-libs/jsoncpp-1.7:= + dev-libs/tinyxml2:= + net-libs/liboauth:= + >=net-misc/curl-7.32:=[ssl]" -RDEPEND=" - dev-libs/jsoncpp - net-libs/liboauth - net-misc/curl - dev-libs/boost - dev-libs/tinyxml - app-crypt/librhash - net-libs/htmlcxx -" -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + sys-apps/help2man + virtual/pkgconfig" diff --git a/games-util/lgogdownloader/metadata.xml b/games-util/lgogdownloader/metadata.xml new file mode 100644 index 000..c85bfde --- /dev/null +++ b/games-util/lgogdownloader/metadata.xml @@ -0,0 +1,33 @@ + +http://www.gentoo.org/dtd/metadata.dtd";> + + + ch...@gentoo.org + James Le Cuirot + + + ga...@gentoo.org + Gentoo Games Project + + + Sude-/lgogdownloader + + + LGOGDownloader is open source downloader to GOG.com for Linux + users using the same API as the official GOGDownloader. + + Features: + * List available games + * Resume downloads + * Batch downloading + * Repair downloaded files + * Read/create XML files used by the official GOG Downloader + * Download cover art + * Check for orphaned files + * Check status of files + * Download individual files by id number + * List/download updated files + * Blacklist unwanted files + * Perl regular expressions for filtering games + +
[gentoo-commits] proj/gamerlay:master commit in: app-crypt/librhash/
commit: b71acb35fb87247bd75f69641ee542f299ce8a23 Author: James Le Cuirot gentoo org> AuthorDate: Sat Sep 17 11:01:31 2016 + Commit: James Le Cuirot gentoo org> CommitDate: Sun Sep 18 08:42:55 2016 + URL:https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=b71acb35 app-crypt/librhash: Remove in favour of app-crypt/rhash in Gentoo repo app-crypt/librhash/librhash-1.2.10.ebuild | 44 --- 1 file changed, 44 deletions(-) diff --git a/app-crypt/librhash/librhash-1.2.10.ebuild b/app-crypt/librhash/librhash-1.2.10.ebuild deleted file mode 100644 index b2eb4a2..000 --- a/app-crypt/librhash/librhash-1.2.10.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: app-crypt/librhash-1.2.10.ebuild,v 1.0 2013/04/28 10:15:41 by frostwork Exp $ - -EAPI="4" - -inherit eutils - -MY_PN="rhash" - -DESCRIPTION="a professional, portable, thread-safe library for computing hash sums" -HOMEPAGE="http://sourceforge.net/projects/${MY_PN}"; -SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}-${PV}-src.tar.gz" - -LICENSE="RHash" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="dev-libs/jsoncpp - net-libs/liboauth - net-misc/curl - dev-libs/boost - dev-libs/tinyxml" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${MY_PN}-${PV} - -src_prepare() { - sed -i -e "s:/usr/local:/usr:" ${PN}/Makefile || die -} - -src_compile() { - cd ${PN} - emake lib-shared || die "emake failed" -} - -src_install() { - cd ${PN} - newlib.so ${PN}.so.0 ${PN}.so.0 - newlib.so ${PN}.so ${PN}.so - insinto /usr/include - doins rhash.h -}
[gentoo-commits] proj/gamerlay:master commit in: net-libs/htmlcxx/, net-libs/htmlcxx/files/
commit: 6b53ee9c83a4dd6277854552559ee46fadaeb6b9 Author: James Le Cuirot gentoo org> AuthorDate: Sat Sep 17 11:02:21 2016 + Commit: James Le Cuirot gentoo org> CommitDate: Sun Sep 18 08:42:55 2016 + URL:https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=6b53ee9c net-libs/htmlcxx: Remove in favour of version in Gentoo repo The Gentoo repo version is in dev-cpp. It includes important QA fixes. .../htmlcxx/files/htmlcxx-0.85-ptrdiff_t.patch | 11 --- net-libs/htmlcxx/htmlcxx-0.85.ebuild | 23 -- 2 files changed, 34 deletions(-) diff --git a/net-libs/htmlcxx/files/htmlcxx-0.85-ptrdiff_t.patch b/net-libs/htmlcxx/files/htmlcxx-0.85-ptrdiff_t.patch deleted file mode 100644 index 0444fed..000 --- a/net-libs/htmlcxx/files/htmlcxx-0.85-ptrdiff_t.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur htmlcxx-0.85/html/tree.h htmlcxx-0.85/html/tree.h htmlcxx-0.85/html/tree.h 2011-02-13 23:24:53.0 +0100 -+++ htmlcxx-0.85/html/tree.h 2013-04-28 14:38:17.370643634 +0200 -@@ -45,6 +45,7 @@ - #ifndef tree_hh_ - #define tree_hh_ - -+#include - #include - #include - #include diff --git a/net-libs/htmlcxx/htmlcxx-0.85.ebuild b/net-libs/htmlcxx/htmlcxx-0.85.ebuild deleted file mode 100644 index 241e253..000 --- a/net-libs/htmlcxx/htmlcxx-0.85.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: net-libs/htmlcxx-0.85.ebuild,v 1.0 2013/04/28 10:15:41 by frostwork Exp $ - -EAPI="4" - -inherit eutils - -DESCRIPTION="a simple non-validating css1 and html parser for C++" -HOMEPAGE="http://sf.net/projects/${PN}"; -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/${P}-ptrdiff_t.patch -}
[gentoo-commits] repo/gentoo:master commit in: net-ftp/lftp/
commit: c75e25ebaa3d04e1ade51d531f726e5b3b735fe8 Author: Jeroen Roovers gentoo org> AuthorDate: Sun Sep 18 09:02:10 2016 + Commit: Jeroen Roovers gentoo org> CommitDate: Sun Sep 18 09:02:10 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c75e25eb net-ftp/lftp: Stable for HPPA PPC64 (bug #593466). Package-Manager: portage-2.3.0 RepoMan-Options: --ignore-arches net-ftp/lftp/lftp-4.7.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-ftp/lftp/lftp-4.7.3.ebuild b/net-ftp/lftp/lftp-4.7.3.ebuild index e1cd91d..dd6b7a1 100644 --- a/net-ftp/lftp/lftp-4.7.3.ebuild +++ b/net-ftp/lftp/lftp-4.7.3.ebuild @@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}ftp/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="convert-mozilla-cookies +gnutls idn ipv6 libressl nls socks5 +ssl verify-file" LFTP_LINGUAS=( cs de es fr it ja ko pl pt_BR ru uk zh_CN zh_HK zh_TW )
[gentoo-commits] repo/gentoo:master commit in: sci-electronics/geda-xgsch2pcb/
commit: e4a7a4408f165dbc3b349623d130e079a65a3a91 Author: Pacho Ramos gentoo org> AuthorDate: Sun Sep 18 09:18:26 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Sep 18 09:22:10 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4a7a440 sci-electronics/geda-xgsch2pcb: amd64/x86 stable, bug #585680 Package-Manager: portage-2.3.0 sci-electronics/geda-xgsch2pcb/geda-xgsch2pcb-0.1.3-r3.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sci-electronics/geda-xgsch2pcb/geda-xgsch2pcb-0.1.3-r3.ebuild b/sci-electronics/geda-xgsch2pcb/geda-xgsch2pcb-0.1.3-r3.ebuild index ec565d2..a1c0e3b 100644 --- a/sci-electronics/geda-xgsch2pcb/geda-xgsch2pcb-0.1.3-r3.ebuild +++ b/sci-electronics/geda-xgsch2pcb/geda-xgsch2pcb-0.1.3-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -14,7 +14,7 @@ SRC_URI="http://geda.seul.org/dist/${P}.tar.gz"; LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="gnome nls" REQUIRED_USE="${PYTHON_REQUIRED_USE}"
[gentoo-commits] repo/gentoo:master commit in: media-video/tovid/
commit: f9ed7e9d733d1473a62c7a0d3f5bb23e3c5b6984 Author: Pacho Ramos gentoo org> AuthorDate: Sun Sep 18 09:19:11 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Sep 18 09:22:15 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9ed7e9d media-video/tovid: Drop old Package-Manager: portage-2.3.0 media-video/tovid/Manifest | 1 - media-video/tovid/tovid-0.34.ebuild | 60 - 2 files changed, 61 deletions(-) diff --git a/media-video/tovid/Manifest b/media-video/tovid/Manifest index 489b6fc..0f31b8d 100644 --- a/media-video/tovid/Manifest +++ b/media-video/tovid/Manifest @@ -1,2 +1 @@ -DIST tovid-0.34.tar.gz 512950 SHA256 f95d14ffbd2bd491751b529b09fb27ae45e24af1ad44c87b25bac9c1a184f4ee SHA512 4a8e25d6c579dc1b2fd34c467d7421faaf4fcaebdb25282856e25a05a00ad200385fea3c2bc0393ca85761cf12d70e760165f653911cf93ff7a22e85398e0593 WHIRLPOOL 282b20e94843428c2644190448f8e3a28ccdb914805914d5b6a8b33199285b60d7887afe32bf45eda879858f2f720d8c3555b689d5f8d16d34348c23e7acb9a0 DIST tovid-0.35.2.tar.gz 527332 SHA256 c1be87b78832093dad31ef3613bbe31575ff60299850abb8bfd449b8b6ef0e89 SHA512 35e1d2a9584127498ee7d4b772fff0643860270dd38018a7fd9c20ef2875bf037235c341b0a001b0fe9a020fb74f9d348729dec0ccb7d97ccdeec508e6fa674e WHIRLPOOL 7c61a51b879bde0724973d2e166f7e1140544bf819c17dea962ca0f409420ccafe5589f7e5ad5f5b1306822cb26df10aa2573317778eed6292b37ed8e8602cc1 diff --git a/media-video/tovid/tovid-0.34.ebuild b/media-video/tovid/tovid-0.34.ebuild deleted file mode 100644 index b161ec2.. --- a/media-video/tovid/tovid-0.34.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=3 - -PYTHON_DEPEND="2:2.6" -PYTHON_USE_WITH="tk" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3.*" - -inherit distutils gnome2-utils - -DESCRIPTION="A collection of DVD authoring tools" -HOMEPAGE="http://tovid.wikia.com/wiki/Tovid_Wiki"; -SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND="app-cdr/cdrdao - app-cdr/dvd+rw-tools - dev-python/pycairo - dev-tcltk/tix - || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] ) - media-sound/normalize - >=media-sound/sox-14.3.2 - media-video/dvdauthor - >=media-video/mjpegtools-2.0.0 - >=media-video/mplayer-1.0_rc4_p20110101 - >=media-video/transcode-1.1.5 - media-video/vcdimager - sys-devel/bc - virtual/ffmpeg" -DEPEND="app-text/txt2tags" - -DOCS="AUTHORS ChangeLog README" - -src_install() { - distutils_src_install - - # punt at least .install.log - find "${ED}" -name '*.log' -exec rm -f {} + -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - distutils_pkg_postinst - gnome2_icon_cache_update -} - -pkg_postrm() { - distutils_pkg_postrm - gnome2_icon_cache_update -}
[gentoo-commits] repo/gentoo:master commit in: media-sound/pympd/
commit: 31eb094754ba1a92e66a4a44652834ae2b501f78 Author: Pacho Ramos gentoo org> AuthorDate: Sun Sep 18 09:12:10 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Sep 18 09:22:07 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31eb0947 media-sound/pympd: Drop old Package-Manager: portage-2.3.0 media-sound/pympd/pympd-0.08.1.ebuild | 58 --- 1 file changed, 58 deletions(-) diff --git a/media-sound/pympd/pympd-0.08.1.ebuild b/media-sound/pympd/pympd-0.08.1.ebuild deleted file mode 100644 index 2fe0fe1.. --- a/media-sound/pympd/pympd-0.08.1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=3 - -PYTHON_DEPEND="2:2.6" - -inherit eutils gnome2-utils multilib python toolchain-funcs - -DESCRIPTION="a Rhythmbox-like PyGTK+ client for Music Player Daemon" -HOMEPAGE="https://sourceforge.net/projects/pympd"; -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc ~sparc x86" -IUSE="" - -RDEPEND=">=dev-python/pygtk-2.6 - || ( x11-libs/gdk-pixbuf:2[jpeg] x11-libs/gtk+:2[jpeg] ) - x11-themes/gnome-icon-theme" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -pkg_setup() { - python_set_active_version 2 - python_pkg_setup -} - -src_prepare() { - sed -i -e 's:FLAGS =:FLAGS +=:' src/modules/tray/Makefile || die - sed -i -e 's:\..\/py:/usr/share/pympd/py:g' src/glade/pympd.glade || die - epatch "${FILESDIR}"/${P}-desktop-entry.patch -} - -src_compile() { - emake CC="$(tc-getCC)" PREFIX=/usr DESTDIR="${D}" || die -} - -src_install() { - emake PREFIX=/usr DESTDIR="${D}" install || die - dodoc README -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - python_mod_optimize pympd - gnome2_icon_cache_update -} - -pkg_postrm() { - python_mod_cleanup pympd - gnome2_icon_cache_update -}
[gentoo-commits] repo/gentoo:master commit in: profiles/, media-video/miro/, media-video/miro/files/
commit: 324a4c7908fbf2a424ed8161d89bb9ea01daccd8 Author: Pacho Ramos gentoo org> AuthorDate: Sun Sep 18 09:08:50 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Sep 18 09:22:02 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=324a4c79 media-video/miro: remove masked for removal package media-video/miro/Manifest| 3 - media-video/miro/files/miro-5.0.4-ffmpeg-1.patch | 78 --- media-video/miro/metadata.xml| 4 - media-video/miro/miro-4.0.6.ebuild | 91 -- media-video/miro/miro-5.0.4.ebuild | 97 media-video/miro/miro-6.0.ebuild | 96 --- profiles/package.mask| 5 -- 7 files changed, 374 deletions(-) diff --git a/media-video/miro/Manifest b/media-video/miro/Manifest deleted file mode 100644 index 56ae381.. --- a/media-video/miro/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST miro-4.0.6.tar.gz 13078726 SHA256 f51261d4505f0e9b2e429476ccfc8ce787ade6bfddb13a3eb05dee74a111d7da SHA512 9c05ee4ad78226eb53a8ceb167c9b1c65fad1cd008a23ff27eb34e28b0b9e3dda0e0c838abf1d0f3ea2afd1748307be87f43a1ba20a8a0ad85704663cfa28a7d WHIRLPOOL 3d48dd54d685c3e8c445a04578c146fa08189294c4cd13421f9d51c0295ca51a0cbe76a5cad00e4c6bc53d1488be5499784aaa140a553a7a8732921f7cd6ef5b -DIST miro-5.0.4.tar.gz 12990017 SHA256 4841c70c59a16647a77ea6c05a6d4d450bcc7973b9d33236d7cff2dbacf1c33a SHA512 fd4c9d95c921361209491f725bd979512c41b8dbffca5c310991fb3c112c8e1d401fccfa3f7de9baba7e169fbe7061501c876b848f765765e0d853b7fb240312 WHIRLPOOL 4aa2f75a2702dbf71523ab5d14db63cb819a85c849dbaa2deea9ed675ff95d88dc79d0e47db223939dedf72f2bd4085521ce501f26711c7be98ca49e0626a4bd -DIST miro-6.0.tar.gz 13121803 SHA256 558d194278fe5d602ba4d5d6737035b150e907c57da3344afa2ec462062f026b SHA512 d7770af3d4c63812c69cdbf05af7d7a2fe017736dc118ad509ce4e5b9ae66f917bf541e8abba5dd2318f22dac1f8698e77fe7da339ebaf7a72181faa77183370 WHIRLPOOL 961dd8ccf5c311f459f1d51bf939b8b64abbdd4e14721ad51438583e5a509aa764fdb0e286fd6a268be92d1c2a5a734d52b982ff38e27788e4cbfa996c5cfa4e diff --git a/media-video/miro/files/miro-5.0.4-ffmpeg-1.patch b/media-video/miro/files/miro-5.0.4-ffmpeg-1.patch deleted file mode 100644 index 93e92ed.. --- a/media-video/miro/files/miro-5.0.4-ffmpeg-1.patch +++ /dev/null @@ -1,78 +0,0 @@ -commit efe8bec33931522f60719102f53099f1796c7b75 -Author: Ben Dean-Kawamura -Date: Fri Aug 31 16:30:59 2012 -0400 - -Update segmenter code to not use deprecated functions - -diff --git a/tv/linux/miro-segmenter.c b/tv/linux/miro-segmenter.c -index 1bfdda3..fd2a726 100644 a/tv/linux/miro-segmenter.c -+++ b/tv/linux/miro-segmenter.c -@@ -156,7 +156,7 @@ int main(int argc, char **argv) - exit(1); - } - --ret = av_open_input_file(&ic, input, ifmt, 0, NULL); -+ret = avformat_open_input(&ic, input, ifmt, 0); - if (ret != 0) { - fprintf(stderr, "Could not open input file, make sure it is an mpegts file: %d\n", ret); - exit(1); -@@ -215,12 +215,7 @@ int main(int argc, char **argv) - } - } - --if (av_set_parameters(oc, NULL) < 0) { --fprintf(stderr, "Invalid output format parameters\n"); --exit(1); --} -- --dump_format(oc, 0, input, 1); -+av_dump_format(oc, 0, input, 1); - - if (video_st) { - codec = avcodec_find_decoder(video_st->codec->codec_id); -@@ -233,12 +228,12 @@ int main(int argc, char **argv) - } - } - --if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) { -+if (avio_open(&oc->pb, output_filename, AVIO_FLAG_WRITE) < 0) { - fprintf(stderr, "Could not open '%s'\n", output_filename); - exit(1); - } - --if (av_write_header(oc)) { -+if (avformat_write_header(oc, NULL)) { - fprintf(stderr, "Could not write mpegts header to first output file\n"); - - exit(1); -@@ -274,10 +269,10 @@ int main(int argc, char **argv) - } - - if (segment_time - prev_segment_time >= segment_duration) { --put_flush_packet(oc->pb); --url_fclose(oc->pb); -+avio_flush(oc->pb); -+avio_close(oc->pb); - --if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) { -+if (avio_open(&oc->pb, output_filename, AVIO_FLAG_WRITE) < 0) { - fprintf(stderr, "Could not open '%s'\n", output_filename); - break; - } -@@ -307,13 +302,13 @@ int main(int argc, char **argv) - av_freep(&oc->streams[i]); - } - --url_fclose(oc->pb); -+avio_close(oc->pb); - av_free(oc); - - /* End-of-transcode marker. */ - { - struct sockaddr_in sockaddr; -- int rc, s; -+int rc, s; - - memset(&sockaddr, 0, sizeof(sockaddr)); - sockaddr.sin_family = AF_INET; diff --git a/media-video/miro/metadata.xml b/m
[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/
commit: 51c7e4e68ebec4da73e03c6c34336c400157765b Author: Pacho Ramos gentoo org> AuthorDate: Sun Sep 18 09:03:17 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Sep 18 09:21:59 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51c7e4e6 media-gfx/tuxpaint: Drop old Package-Manager: portage-2.3.0 media-gfx/tuxpaint/tuxpaint-0.9.21-r1.ebuild | 71 1 file changed, 71 deletions(-) diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.21-r1.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.21-r1.ebuild deleted file mode 100644 index 72014f9.. --- a/media-gfx/tuxpaint/tuxpaint-0.9.21-r1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="2" - -inherit eutils gnome2-utils multilib toolchain-funcs - -DESCRIPTION="Drawing program designed for young children" -HOMEPAGE="http://www.tuxpaint.org/"; -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" - -IUSE="nls" - -RDEPEND=" - app-text/libpaper - dev-libs/fribidi - gnome-base/librsvg - >=media-libs/libpng-1.2 - >=media-libs/freetype-2 - media-libs/libsdl - media-libs/sdl-image[png] - media-libs/sdl-mixer - media-libs/sdl-pango - media-libs/sdl-ttf - x11-libs/cairo" - -DEPEND=" - ${RDEPEND} - nls? ( sys-devel/gettext )" - -src_prepare() { - # Sanitize the Makefile and correct a few other issues. - epatch "${FILESDIR}/${PN}-0.9.20-gentoo.patch" - epatch "${FILESDIR}/${P}-libpng1.5.patch" #378199 - epatch "${FILESDIR}/${P}-LDFLAGS.patch" #334571 - epatch "${FILESDIR}/${P}-underlinking.patch" #484434 - - sed -i \ - -e "s|linux_PREFIX:=/usr/local|linux_PREFIX:=/usr|" \ - -e "s:/lib/:/$(get_libdir)/:" \ - -e "s:/share/doc/tuxpaint.*:/share/doc/${PF}:g" \ - Makefile || die -} - -src_compile() { - # emake may break things - make CC="$(tc-getCC)" \ - $(use nls && echo ENABLE_GETTEXT=1) || die "Compilation failed" -} - -src_install () { - make PKG_ROOT="${D}" \ - $(use nls && echo ENABLE_GETTEXT=1) install || die "Installation failed" - - rm -f docs/COPYING.txt docs/INSTALL.txt - dodoc docs/*.txt -} - -pkg_postinst() { - gnome2_icon_cache_update - - elog "" - elog "For additional graphic stamps, you can emerge the" - elog "media-gfx/tuxpaint-stamps package." - elog "" -}
[gentoo-commits] repo/gentoo:master commit in: sci-electronics/geda-xgsch2pcb/
commit: 96fb5d03d3f586988619aafa1c4f0302bb393381 Author: Pacho Ramos gentoo org> AuthorDate: Sun Sep 18 09:18:44 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Sep 18 09:22:13 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96fb5d03 sci-electronics/geda-xgsch2pcb: Drop old Package-Manager: portage-2.3.0 .../geda-xgsch2pcb/geda-xgsch2pcb-0.1.3-r2.ebuild | 78 -- 1 file changed, 78 deletions(-) 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 deleted file mode 100644 index aff4c68.. --- a/sci-electronics/geda-xgsch2pcb/geda-xgsch2pcb-0.1.3-r2.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="3" - -WANT_AUTOCONF="2.5" -PYTHON_DEPEND="2" - -inherit autotools eutils fdo-mime gnome2-utils python - -DESCRIPTION="A graphical front-end for the gschem -> pcb workflow" -HOMEPAGE="http://www.gpleda.org"; -SRC_URI="http://geda.seul.org/dist/${P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="gnome nls" - -CDEPEND=" - dev-python/pygtk:2 - dev-python/pygobject:2 - dev-python/dbus-python - sci-electronics/pcb[dbus] - sci-electronics/geda - nls? ( virtual/libintl )" - -RDEPEND=" - ${CDEPEND} - sci-electronics/electronics-menu - gnome? ( dev-python/gnome-vfs-python )" - -DEPEND=" - ${CDEPEND} - dev-util/intltool - dev-lang/perl - nls? ( sys-devel/gettext )" - -pkg_setup() { - python_set_active_version 2 -} - -src_prepare(){ - echo '#!/bin/sh' > py-compile - epatch "${FILESDIR}"/${PV}-python.patch - eautoreconf -} - -src_configure() { - econf \ - $(use_enable nls) \ - --disable-update-desktop-database \ - --disable-dependency-tracking -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc README ChangeLog || die -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update - python_mod_optimize ${PN} -} - -pkg_postrm() { - fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update - python_mod_cleanup ${PN} -}
[gentoo-commits] repo/gentoo:master commit in: media-sound/pympd/
commit: 2aa46a79b68c0911b9cbdbc61bdfe16f7af81431 Author: Pacho Ramos gentoo org> AuthorDate: Sun Sep 18 09:11:49 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Sep 18 09:22:04 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2aa46a79 media-sound/pympd: amd64/x86 stable, bug #585678 Package-Manager: portage-2.3.0 media-sound/pympd/pympd-0.08.1-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-sound/pympd/pympd-0.08.1-r1.ebuild b/media-sound/pympd/pympd-0.08.1-r1.ebuild index bc19741..e9c6cd2 100644 --- a/media-sound/pympd/pympd-0.08.1-r1.ebuild +++ b/media-sound/pympd/pympd-0.08.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" +KEYWORDS="amd64 ~ppc ~sparc x86" IUSE="" REQUIRED_USE="${PYTHON_REQUIRED_USE}"
[gentoo-commits] repo/gentoo:master commit in: www-apps/ikiwiki/
commit: cf6ce29f81b854d58acbafa1749f1621f09c432c Author: Alice Ferrazzi gentoo org> AuthorDate: Sun Sep 18 09:37:23 2016 + Commit: Alice Ferrazzi gentoo org> CommitDate: Sun Sep 18 09:48:28 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf6ce29f www-apps/ikiwiki: Version bump to 3.20160905 Gentoo-bug: 582528 fix XSS in raised exception via crafted filename (CVE-2016-4561) Gentoo-bug: 545040 fix cross-site scripting via openid_identifier Package-Manager: portage-2.2.28 www-apps/ikiwiki/Manifest | 1 + www-apps/ikiwiki/ikiwiki-3.20160905.ebuild | 111 + 2 files changed, 112 insertions(+) diff --git a/www-apps/ikiwiki/Manifest b/www-apps/ikiwiki/Manifest index 92bb0da..f9d693f 100644 --- a/www-apps/ikiwiki/Manifest +++ b/www-apps/ikiwiki/Manifest @@ -1,3 +1,4 @@ DIST ikiwiki_3.20140227.tar.gz 3186289 SHA256 2333636af56a9966640a9b2b0eb0b4b2293e6eec4376d619f641d1c088c677ad SHA512 00cfdeeaa2fd31fe2b75d5d9bafd9a62950df833592f840f376a7279368068081d1b8e7844e12bca9631d8a15a0c29c0bdaa85276fefc30b6d66b9d5a2e134eb WHIRLPOOL da7dbdb25d4ae8f2073505e74eb2a17aba693e4492b005dadda289acb3f9c5b5245a05168410bfca9f89f3f76c6854461f7f16439ee905c37a22332955e2a124 DIST ikiwiki_3.20140916.tar.gz 3213411 SHA256 c0362be677cc8a825d0abf43dba6e86c7d74838dc73ecc8f390f2e3625d2dc16 SHA512 3bb01173a1c34ea3c24a3330ab827bf7e9029a830f13ee575cc66a9f421aa5838e613528dc4f2fc5c5bb8f217976d590f5f45ed812b0ad98abd174771bf5178f WHIRLPOOL d3f4a83c0d823dd0d6ab126d4965623a84c7fb1559513d7c29c8385aae11525d6ecef5afb26220da95271a8a148d5c5668e9d755020708ea0f15f702302b596d DIST ikiwiki_3.20150107.tar.gz 3285794 SHA256 6eef15e58da48ecb0510a38eaa196f48b192cd9b0ea91ec9a41b062ab4fee93f SHA512 14cc08f42b94245d2f6ba55b0f6d43fb32b55963c11079a26f02e8b3c3a5ec214ed41efa703d1f563fd2d1f306198d9cc03e37c6d4e54e22e2b466d402e15e88 WHIRLPOOL b025332613efb2fe19b2301465a78d0d4307dcf6bd37fa579d65d7fbf48ed1959a0f4d010508e8d4319e6a7b21d7178adc93226a4d3623181ef66706ec6defca +DIST ikiwiki_3.20160905.tar.gz 3459755 SHA256 768ff65cec01747f083b474b24dd30fb17f0a4da3bfd645601eec07e719172f5 SHA512 eeb94b832991653cfa6e884a92922a7c6250adf74c2382d22f4ef8ac3cf6b30e1bd49caca932bb4ff52762d0f316cf94adcc8f7bba3f69f6b2d894caad001d27 WHIRLPOOL 8e5453e6148d0dae87ed4045fdefa90100d526083a32cde38d7f2a23ab86e6c5f7bc244f6eb24d4e77e0c263463df14a98fdbe933ca0749082e84c1fc87024ab diff --git a/www-apps/ikiwiki/ikiwiki-3.20160905.ebuild b/www-apps/ikiwiki/ikiwiki-3.20160905.ebuild new file mode 100644 index ..4048b8e --- /dev/null +++ b/www-apps/ikiwiki/ikiwiki-3.20160905.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit perl-module + +DESCRIPTION="A wiki compiler" +HOMEPAGE="http://ikiwiki.info/"; +SRC_URI="mirror://debian/pool/main/i/ikiwiki/${PN}_${PV}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +IUSE="extras minimal test" +KEYWORDS="~amd64" + +S=${WORKDIR}/${PN}-${PV} + +#Authen::Passphrase +#Search::Xapian +#Locale::gettext +#Crypt::SSLeay +#Text::CSV +#Text::Typography +#Text::Textile +#Text::WikiFormat +#Net::Amazon::S3 + +EXTRA_RDEPEND=" + dev-python/docutils + dev-perl/Digest-SHA1 + dev-perl/File-MimeInfo + dev-perl/RPC-XML + dev-perl/XML-Feed + dev-perl/LWPx-ParanoidAgent + dev-perl/Net-OpenID-Consumer +" + +SUGGESTED_RDEPEND=" + dev-perl/CGI + >=dev-perl/CGI-FormBuilder-3.0202 + >=dev-perl/CGI-Session-4.14 + dev-perl/Mail-Sendmail + dev-perl/Term-ReadLine-Gnu + dev-perl/XML-Simple + media-gfx/imagemagick[perl] +" + +TEST_DEPEND=" + dev-perl/File-chdir + dev-perl/File-ReadBackwards + dev-perl/File-MimeInfo + dev-perl/HTML-LinkExtractor + dev-perl/HTML-Tree + dev-perl/Net-OpenID-Consumer + dev-perl/RPC-XML + dev-perl/XML-Feed + dev-perl/XML-Twig + dev-vcs/cvs[server] + dev-vcs/cvsps" + +DEPEND=" + >=dev-lang/perl-5.10 + app-text/po4a + dev-perl/HTML-Parser + dev-perl/HTML-Scrubber + dev-perl/HTML-Template + dev-perl/URI + dev-perl/Text-Markdown + dev-perl/TimeDate + dev-perl/YAML-LibYAML +" + +RDEPEND="${DEPEND} + !minimal? ( + ${SUGGESTED_RDEPEND} + extras? ( + ${EXTRA_RDEPEND} + ) + ) +" + +DEPEND="${DEPEND} + test? ( ${TEST_DEPEND} )" + +SRC_TEST=do + +src_prepare() { + #bug 498444 /usr/lib/plan9/lib/fortunes.index + addpredict "/usr/lib/plan9/lib/fortunes" + + sed -i 's,lib/ikiwiki,libexec/ikiwiki,' \ + "${S}"/{IkiWiki.pm,Makefile.PL,doc/plugins/install.mdwn} || die +# if use w3m ; then + sed -i 's,lib/w3m,libexec/w3m,' "${S}"/Makefile.PL || die +# else +# sed -i '/w3m/d' "${S}"/Makefile.PL || die +# fi +} + +src_i
[gentoo-commits] repo/gentoo:master commit in: net-ftp/bareftp/
commit: 6a67e05c4641d6c125c8bee78df697cd69bed31f Author: Pacho Ramos gentoo org> AuthorDate: Sun Sep 18 09:39:33 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Sep 18 09:57:44 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a67e05c net-ftp/bareftp: Drop old Package-Manager: portage-2.3.0 net-ftp/bareftp/Manifest | 2 -- net-ftp/bareftp/bareftp-0.3.10.ebuild | 33 - net-ftp/bareftp/bareftp-0.3.9.ebuild | 33 - 3 files changed, 68 deletions(-) diff --git a/net-ftp/bareftp/Manifest b/net-ftp/bareftp/Manifest index f2eec4e..fcb4342 100644 --- a/net-ftp/bareftp/Manifest +++ b/net-ftp/bareftp/Manifest @@ -1,3 +1 @@ -DIST bareftp-0.3.10.tar.gz 618615 SHA256 d36f10485762d93e38e81618981b540f2130945d7f41c7c0b60b6a0c059cd849 SHA512 944ef7d533b68c772e02e57526b7a4e11afd02a95c4100fcc8902616f1b3b5f14c78df1bba4e67c290a6e2db973dcf979f4a761ac84fc9ca139cc5e49dedf43b WHIRLPOOL 6f3869cbd10405a7a727ab9c3e13e12255118bf877327334c22c3ad9e4208c72766b66fab923207991a0b117b059a2c370691432602b81574073cb279a17bb8c DIST bareftp-0.3.12.tar.gz 642509 SHA256 efb22c6b03a84a74ad734e493d5fa711b2c6cfea75db1bedf68c713a31d62727 SHA512 039135f8a2ff293fa5299f4e190b75f7ca3a3734a2b7514e6423ee62dc9cfc992cd00039af8caf4ef82db94e41cc04f5727a64985e8b3c7e90c124e74f5236d2 WHIRLPOOL 36036fe0ab0a146a1674c7825d048fde41ba8b92560191eb2d46c6e10ce4f70657656b94e0d0c1e30a10a1d1f8a082c819161fd2f2fdd58682bc0640d65b430e -DIST bareftp-0.3.9.tar.gz 593672 SHA256 ac799d0b38695c8dbff85ef497746868a4b07ff2a86e61a901d8e61f125aeaef SHA512 c8730f4e0ed583f79f1ca7bc87940f73cf0ec44ca1db5bc5db121d9716c530621d7d8aeca431d6fc0b963ac561728cfa87c3cf56c74fff1f845cb7612a09c9a4 WHIRLPOOL 1440922e15832e5e287a1a477f03b82bfd3e9fc881e0119140cdb392697c93f39b4863856ba0841930b089fc7340d9f0cb79938989c85edbe6884e648ede9c95 diff --git a/net-ftp/bareftp/bareftp-0.3.10.ebuild b/net-ftp/bareftp/bareftp-0.3.10.ebuild deleted file mode 100644 index 5d0632d.. --- a/net-ftp/bareftp/bareftp-0.3.10.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" - -inherit mono gnome2 - -DESCRIPTION="Mono based file transfer client" -HOMEPAGE="http://www.bareftp.org/"; -SRC_URI="http://www.bareftp.org/release/${P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="gnome-keyring" - -RDEPEND=">=dev-lang/mono-2.0 - >=dev-dotnet/gtk-sharp-2.12 - >=dev-dotnet/gnome-sharp-2.20 - >=dev-dotnet/gnomevfs-sharp-2.20 - >=dev-dotnet/gconf-sharp-2.20 - gnome-keyring? ( >=dev-dotnet/gnome-keyring-sharp-1.0.0-r2 )" -DEPEND="${RDEPEND}" - -pkg_setup() { - DOCS="AUTHORS ChangeLog CREDITS README" - G2CONF="--disable-caches - --disable-static - $(use_with gnome-keyring gnomekeyring)" -} diff --git a/net-ftp/bareftp/bareftp-0.3.9.ebuild b/net-ftp/bareftp/bareftp-0.3.9.ebuild deleted file mode 100644 index 451ac00.. --- a/net-ftp/bareftp/bareftp-0.3.9.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" - -inherit mono gnome2 - -DESCRIPTION="Mono based file transfer client" -HOMEPAGE="http://www.bareftp.org/"; -SRC_URI="http://www.bareftp.org/release/${P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="gnome-keyring" - -RDEPEND=">=dev-lang/mono-2.0 - >=dev-dotnet/gtk-sharp-2.12 - >=dev-dotnet/gnome-sharp-2.20 - >=dev-dotnet/gnomevfs-sharp-2.20 - >=dev-dotnet/gconf-sharp-2.20 - gnome-keyring? ( >=dev-dotnet/gnome-keyring-sharp-1.0.0-r2 )" -DEPEND="${RDEPEND}" - -pkg_setup() { - DOCS="AUTHORS ChangeLog CREDITS README" - G2CONF="--disable-caches - --disable-static - $(use_with gnome-keyring gnomekeyring)" -}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/gsmartcontrol/
commit: 5f23e374f6a8439c97cb44738bc12dff7be787e3 Author: Pacho Ramos gentoo org> AuthorDate: Sun Sep 18 09:48:18 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Sep 18 09:57:52 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f23e374 sys-apps/gsmartcontrol: Stop relying in eapi4 support for gnome2-utils.eclass Package-Manager: portage-2.3.0 sys-apps/gsmartcontrol/gsmartcontrol-0.8.7.ebuild | 24 --- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/sys-apps/gsmartcontrol/gsmartcontrol-0.8.7.ebuild b/sys-apps/gsmartcontrol/gsmartcontrol-0.8.7.ebuild index 9fa1694..54f8351 100644 --- a/sys-apps/gsmartcontrol/gsmartcontrol-0.8.7.ebuild +++ b/sys-apps/gsmartcontrol/gsmartcontrol-0.8.7.ebuild @@ -1,9 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=4 - +EAPI=6 inherit flag-o-matic gnome2-utils DESCRIPTION="Hard disk drive health inspection tool" @@ -15,25 +14,28 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="test" -COMMON_DEPEND="dev-cpp/gtkmm:2.4 - dev-libs/libpcre - sys-apps/smartmontools" +COMMON_DEPEND=" + dev-cpp/gtkmm:2.4 + dev-libs/libpcre:3 + sys-apps/smartmontools +" RDEPEND="${COMMON_DEPEND} - x11-apps/xmessage" + x11-apps/xmessage +" DEPEND="${COMMON_DEPEND} virtual/pkgconfig - test? ( dev-util/gtk-builder-convert )" + test? ( dev-util/gtk-builder-convert ) +" DOCS="TODO" # See 'dist_doc_DATA' value in Makefile.am src_prepare() { + default append-cxxflags -std=c++11 } src_configure() { - econf \ - --docdir=/usr/share/doc/${PF} \ - $(use test tests) + econf $(use test tests) } src_install() {
[gentoo-commits] repo/gentoo:master commit in: net-ftp/bareftp/
commit: 6af272ed371d30503389995af8bd9d4dd1d7c35f Author: Pacho Ramos gentoo org> AuthorDate: Sun Sep 18 09:39:16 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Sep 18 09:57:40 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6af272ed net-ftp/bareftp: amd64/x86 stable as this is the only working version with stable mono Package-Manager: portage-2.3.0 net-ftp/bareftp/bareftp-0.3.12.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-ftp/bareftp/bareftp-0.3.12.ebuild b/net-ftp/bareftp/bareftp-0.3.12.ebuild index 5c992e7..5e424af 100644 --- a/net-ftp/bareftp/bareftp-0.3.12.ebuild +++ b/net-ftp/bareftp/bareftp-0.3.12.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://www.bareftp.org/release/${P}.tar.gz"; LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="gnome-keyring" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: net-ftp/bareftp/
commit: 6989e1c310014d37bf9703aa62f9338f12abae1b Author: Pacho Ramos gentoo org> AuthorDate: Sun Sep 18 09:38:47 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Sep 18 09:57:35 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6989e1c3 net-ftp/bareftp: Version bump, compatible with mono-4 Package-Manager: portage-2.3.0 net-ftp/bareftp/Manifest | 1 + net-ftp/bareftp/bareftp-0.3.12.ebuild | 43 +++ 2 files changed, 44 insertions(+) diff --git a/net-ftp/bareftp/Manifest b/net-ftp/bareftp/Manifest index 513f813..f2eec4e 100644 --- a/net-ftp/bareftp/Manifest +++ b/net-ftp/bareftp/Manifest @@ -1,2 +1,3 @@ DIST bareftp-0.3.10.tar.gz 618615 SHA256 d36f10485762d93e38e81618981b540f2130945d7f41c7c0b60b6a0c059cd849 SHA512 944ef7d533b68c772e02e57526b7a4e11afd02a95c4100fcc8902616f1b3b5f14c78df1bba4e67c290a6e2db973dcf979f4a761ac84fc9ca139cc5e49dedf43b WHIRLPOOL 6f3869cbd10405a7a727ab9c3e13e12255118bf877327334c22c3ad9e4208c72766b66fab923207991a0b117b059a2c370691432602b81574073cb279a17bb8c +DIST bareftp-0.3.12.tar.gz 642509 SHA256 efb22c6b03a84a74ad734e493d5fa711b2c6cfea75db1bedf68c713a31d62727 SHA512 039135f8a2ff293fa5299f4e190b75f7ca3a3734a2b7514e6423ee62dc9cfc992cd00039af8caf4ef82db94e41cc04f5727a64985e8b3c7e90c124e74f5236d2 WHIRLPOOL 36036fe0ab0a146a1674c7825d048fde41ba8b92560191eb2d46c6e10ce4f70657656b94e0d0c1e30a10a1d1f8a082c819161fd2f2fdd58682bc0640d65b430e DIST bareftp-0.3.9.tar.gz 593672 SHA256 ac799d0b38695c8dbff85ef497746868a4b07ff2a86e61a901d8e61f125aeaef SHA512 c8730f4e0ed583f79f1ca7bc87940f73cf0ec44ca1db5bc5db121d9716c530621d7d8aeca431d6fc0b963ac561728cfa87c3cf56c74fff1f845cb7612a09c9a4 WHIRLPOOL 1440922e15832e5e287a1a477f03b82bfd3e9fc881e0119140cdb392697c93f39b4863856ba0841930b089fc7340d9f0cb79938989c85edbe6884e648ede9c95 diff --git a/net-ftp/bareftp/bareftp-0.3.12.ebuild b/net-ftp/bareftp/bareftp-0.3.12.ebuild new file mode 100644 index ..5c992e7 --- /dev/null +++ b/net-ftp/bareftp/bareftp-0.3.12.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +GNOME2_LA_PUNT="yes" + +inherit autotools mono-env gnome2 + +DESCRIPTION="Mono based file transfer client" +HOMEPAGE="http://www.bareftp.org/"; +SRC_URI="http://www.bareftp.org/release/${P}.tar.gz"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="gnome-keyring" + +RDEPEND=" + >=dev-lang/mono-2.0 + >=dev-dotnet/gtk-sharp-2.12 + >=dev-dotnet/gnome-sharp-2.20 + >=dev-dotnet/gnomevfs-sharp-2.20 + >=dev-dotnet/gconf-sharp-2.20 + gnome-keyring? ( >=dev-dotnet/gnome-keyring-sharp-1.0.0-r2 ) +" +DEPEND="${RDEPEND}" + +src_prepare() { + # Fixes for build with Mono 4 + sed -i "s#gmcs#mcs#g" configure.ac || die + + eautoreconf + sed -i "s#mono/2.0#mono/4.5#g" configure || die + gnome2_src_prepare +} + +src_configure() { + gnome2_src_configure \ + --disable-caches \ + --disable-static \ + $(use_with gnome-keyring gnomekeyring) +}
[gentoo-commits] repo/gentoo:master commit in: app-dicts/gwaei/files/, app-dicts/gwaei/
commit: 5b36c1787c7b9bef144189f69fc97678f15263c6 Author: Pacho Ramos gentoo org> AuthorDate: Sun Sep 18 09:43:40 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Sep 18 09:57:48 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b36c178 app-dicts/gwaei: Drop old Package-Manager: portage-2.3.0 app-dicts/gwaei/Manifest | 2 - app-dicts/gwaei/files/gwaei-3.0.2-no-ncurses.patch | 20 -- app-dicts/gwaei/gwaei-3.0.2.ebuild | 77 -- app-dicts/gwaei/gwaei-3.2.0.ebuild | 69 --- 4 files changed, 168 deletions(-) diff --git a/app-dicts/gwaei/Manifest b/app-dicts/gwaei/Manifest index 54e203a..11fa880 100644 --- a/app-dicts/gwaei/Manifest +++ b/app-dicts/gwaei/Manifest @@ -1,3 +1 @@ -DIST gwaei-3.0.2.tar.gz 821533 SHA256 1b27df77b38ea30680b9a93de64a93bf71631fd780b9277709854f797115c1dd SHA512 241460d59d0d47d9638d4b90f904a77efc922331f4a0c2bb7aec712841aa8766b8ee3bb0ac9d536db2611aec4dfb8287166a0b19f92afea645c34e6d797a489e WHIRLPOOL 5421a8f69210b3db67c8493dac1cb43e14952d7680eb64e45439af32d69f3b189c4815cebe6ced6de394f43092090d8610958b6ad4ca8339e70ba7e1dd001f1c -DIST gwaei-3.2.0.tar.gz 841824 SHA256 7267f2fba1ee76e6ef6bfd76206c15ac0f9cb6169d70a610a14529f9bb10aded SHA512 7ac34d371910abe724c873d1279fdce42747c31ad5376c42e878e688111554423357c84abab3ff4d0e316d0b8757a7440a0980e89efb81c173eab79164a0 WHIRLPOOL 1d203691c54b4e1fc775de3fa765e70495b29598713beee64a2057c1f1b0c8be3b20b2ecd0e21906917b8dd4bb01b8930801d8bbd554e9b59c6a5c2159df4930 DIST gwaei-3.6.2.tar.xz 547592 SHA256 9904e1755505f9a40cd7368e96e1eeb035c6c2f7ce14029cccb765f5b85986d7 SHA512 96876f7e15ff5e166dcd116e2286294b7b375e55723684e4e3dec31aba46d1c89ccd70007fc01cab97a5fd5e671ec073c3f69525ff7e68126851e587d4f20c3b WHIRLPOOL 9bec5d65af285291a7d916b3e5b75b6c36e438486b942ded402f59e9b59244578157917a5066828fd8e97f20372a02509dedd77d414f7744855fc63feabf8031 diff --git a/app-dicts/gwaei/files/gwaei-3.0.2-no-ncurses.patch b/app-dicts/gwaei/files/gwaei-3.0.2-no-ncurses.patch deleted file mode 100644 index b614c21.. --- a/app-dicts/gwaei/files/gwaei-3.0.2-no-ncurses.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: gwaei-3.0.2/src/waei/waei.c -=== gwaei-3.0.2.orig/src/waei/waei.c -+++ gwaei-3.0.2/src/waei/waei.c -@@ -195,6 +195,7 @@ int w_start_console (int argc, char* arg - } - - -+#ifdef WITH_NCURSES - //! - //! @brief Equivalent to the main function for many programs. This is what starts the program - //! @param argc Your argc from your main function -@@ -219,6 +220,7 @@ int w_start_ncurses (int argc, char* arg - - return TRUE; - } -+#endif - - - int main (int argc, char *argv[]) diff --git a/app-dicts/gwaei/gwaei-3.0.2.ebuild b/app-dicts/gwaei/gwaei-3.0.2.ebuild deleted file mode 100644 index 448be18.. --- a/app-dicts/gwaei/gwaei-3.0.2.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit gnome2-utils eutils - -DESCRIPTION="Japanese-English Dictionary for GNOME" -HOMEPAGE="http://gwaei.sourceforge.net/"; -SRC_URI="mirror://sourceforge/gwaei/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="gtk nls unique test ncurses" - -RDEPEND=">=net-misc/curl-7.21.0 - >=dev-libs/glib-2.25.0:2 - gtk? ( - x11-libs/gtk+:3 - >=app-text/gnome-doc-utils-0.13.0 - unique? ( dev-libs/libunique:3 ) - ) - ncurses? ( sys-libs/ncurses[unicode] ) - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - test? ( app-text/docbook-xml-dtd:4.1.2 ) - gtk? ( - >=app-text/gnome-doc-utils-0.13.0 - app-text/scrollkeeper - ) - nls? ( >=sys-devel/gettext-0.17 ) - app-text/rarian - dev-util/intltool - virtual/pkgconfig" - -REQUIRED_USE="unique? ( gtk )" - -src_prepare() { - epatch "${FILESDIR}"/${P}-no-ncurses.patch -} - -src_configure() { - econf \ - $(use_with gtk gnome) \ - $(use_with ncurses) \ - $(use_with unique libunique) \ - $(use_enable nls) \ - --disable-static \ - --docdir=/usr/share/doc/${PF} -} - -src_install() { - emake DESTDIR="${D}" install || die - find "${D}" -name '*.la' -delete - - dodoc AUTHORS README -} - -pkg_preinst() { - if use gtk ; then - gnome2_schemas_savelist - fi -} - -pkg_postinst() { - if use gtk ; then - gnome2_schemas_update - fi -} - -pkg_postrm() { - if use gtk ; then - gnome2_schemas_update - fi -} diff --git a/app-dicts/gwaei/gwaei-3.2.0.ebuild b/app-dicts/gwaei/gwaei-3.2.0.ebuild deleted file mode 100644 index 8219264.. --- a/app-dicts/gwaei/gwae
[gentoo-commits] repo/gentoo:master commit in: dev-dotnet/gnome-keyring-sharp/
commit: 454f243f20be36d7e57104d2063cf74c143f4ee9 Author: Pacho Ramos gentoo org> AuthorDate: Sun Sep 18 09:31:01 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Sep 18 09:57:31 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=454f243f dev-dotnet/gnome-keyring-sharp: Drop old Package-Manager: portage-2.3.0 .../gnome-keyring-sharp-1.0.2.ebuild | 44 -- 1 file changed, 44 deletions(-) diff --git a/dev-dotnet/gnome-keyring-sharp/gnome-keyring-sharp-1.0.2.ebuild b/dev-dotnet/gnome-keyring-sharp/gnome-keyring-sharp-1.0.2.ebuild deleted file mode 100644 index 3d3e402.. --- a/dev-dotnet/gnome-keyring-sharp/gnome-keyring-sharp-1.0.2.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="2" - -inherit mono - -DESCRIPTION="C# implementation of gnome-keyring" -HOMEPAGE="http://www.mono-project.com/ https://github.com/mono/gnome-keyring-sharp"; -SRC_URI="http://www.go-mono.com/archive/${PN}/${P}.tar.gz"; - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="doc" - -RDEPEND=">=dev-lang/mono-2.0 - >=gnome-base/libgnome-keyring-2.30.0 - dev-dotnet/glib-sharp" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - # Disable building samples. - sed -i -e 's:sample::' "${S}"/Makefile.in || die "sed failed" -} - -src_configure() { - econf $(use_enable doc monodoc) || die "econf failed" -} - -src_compile() { - # This dies without telling in docs with anything not -j1 - # CSC=gmcs needed for https://bugs.gentoo.org/show_bug.cgi?id=250069 - emake -j1 CSC=gmcs || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc AUTHORS ChangeLog README || die - mono_multilib_comply - find "${D}" -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed" -}
[gentoo-commits] repo/gentoo:master commit in: dev-dotnet/gnome-keyring-sharp/
commit: ec32bbdbbd82e65862d3a0c078c48bbbed066dcd Author: Pacho Ramos gentoo org> AuthorDate: Sun Sep 18 09:30:36 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Sep 18 09:57:27 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec32bbdb dev-dotnet/gnome-keyring-sharp: amd64/x86 stable, bug #594200 Package-Manager: portage-2.3.0 dev-dotnet/gnome-keyring-sharp/gnome-keyring-sharp-1.0.2-r2.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-dotnet/gnome-keyring-sharp/gnome-keyring-sharp-1.0.2-r2.ebuild b/dev-dotnet/gnome-keyring-sharp/gnome-keyring-sharp-1.0.2-r2.ebuild index ed50c22..0c4d375 100644 --- a/dev-dotnet/gnome-keyring-sharp/gnome-keyring-sharp-1.0.2-r2.ebuild +++ b/dev-dotnet/gnome-keyring-sharp/gnome-keyring-sharp-1.0.2-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -11,7 +11,7 @@ SRC_URI="http://www.go-mono.com/archive/${PN}/${P}.tar.gz"; LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc x86" IUSE="" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: net-misc/gwget/files/, net-misc/gwget/
commit: 46534fb6572a75ccffe9cb60a888a437dd75e9ea Author: Pacho Ramos gentoo org> AuthorDate: Sun Sep 18 09:53:10 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Sep 18 09:57:55 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46534fb6 net-misc/gwget: eapi6 bump Package-Manager: portage-2.3.0 .../gwget/files/gwget-1.0.4-libnotify-0.7.patch| 4 +-- net-misc/gwget/gwget-1.0.4.ebuild | 39 +++--- 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/net-misc/gwget/files/gwget-1.0.4-libnotify-0.7.patch b/net-misc/gwget/files/gwget-1.0.4-libnotify-0.7.patch index 116cf60..8cecc19 100644 --- a/net-misc/gwget/files/gwget-1.0.4-libnotify-0.7.patch +++ b/net-misc/gwget/files/gwget-1.0.4-libnotify-0.7.patch @@ -1,5 +1,5 @@ src/systray.c -+++ src/systray.c +--- a/src/systray.c b/src/systray.c @@ -6,6 +6,12 @@ #include "systray.h" #include "main_window_cb.h" diff --git a/net-misc/gwget/gwget-1.0.4.ebuild b/net-misc/gwget/gwget-1.0.4.ebuild index a50f14e..5113017 100644 --- a/net-misc/gwget/gwget-1.0.4.ebuild +++ b/net-misc/gwget/gwget-1.0.4.ebuild @@ -1,13 +1,12 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="4" -GCONF_DEBUG="no" +EAPI=6 GNOME2_LA_PUNT="yes" GNOME_TARBALL_SUFFIX="bz2" -inherit eutils gnome2 +inherit gnome2 DESCRIPTION="GTK2 WGet Frontend" HOMEPAGE="https://gnome.org/projects/gwget/"; @@ -19,32 +18,32 @@ IUSE="epiphany libnotify" # FIXME: dbus should be optional #needs patching for linguas/intltool -RDEPEND="net-misc/wget +RDEPEND=" + net-misc/wget >=x11-libs/gtk+-2.6:2 >=dev-libs/glib-2.16.0:2 >=gnome-base/gconf-2:2 >=gnome-base/libgnomeui-2 >=dev-libs/dbus-glib-0.70 epiphany? ( >=www-client/epiphany-1.4 ) - libnotify? ( >=x11-libs/libnotify-0.2.2 )" + libnotify? ( >=x11-libs/libnotify-0.2.2 ) +" DEPEND="${RDEPEND} virtual/pkgconfig >=dev-util/intltool-0.35.0 - >=sys-devel/gettext-0.10.4" - -pkg_setup() { - DOCS="AUTHORS ChangeLog NEWS README THANKS TODO" - G2CONF="${G2CONF} - $(use_enable epiphany epiphany-extension) - $(use_enable libnotify) + >=sys-devel/gettext-0.10.4 +" + +PATCHES=( + "${FILESDIR}"/${P}-libnotify-0.7.patch + "${FILESDIR}"/${P}-glib-single-include.patch +) + +src_configure() { + gnome2_src_configure \ + $(use_enable epiphany epiphany-extension) \ + $(use_enable libnotify) \ --disable-static - --disable-schemas-install" -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-libnotify-0.7.patch - epatch "${FILESDIR}"/${P}-glib-single-include.patch - gnome2_src_prepare } src_install() {
[gentoo-commits] repo/gentoo:master commit in: media-sound/nted/files/, media-sound/nted/
commit: 9b80cc03dc6919d7c1962146946d1281ee24f693 Author: Kacper Kołodziej kolodziej in> AuthorDate: Sun Sep 18 09:13:43 2016 + Commit: David Seifert gentoo org> CommitDate: Sun Sep 18 10:03:39 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b80cc03 media-sound/nted: fix -Wnarrowing error, bug #594056 Gentoo-bug: 594056 Closes: https://github.com/gentoo/gentoo/pull/2353 Signed-off-by: David Seifert gentoo.org> media-sound/nted/files/nted-1.10.18-cpp14.patch | 11 +++ media-sound/nted/nted-1.10.18-r3.ebuild | 1 + 2 files changed, 12 insertions(+) diff --git a/media-sound/nted/files/nted-1.10.18-cpp14.patch b/media-sound/nted/files/nted-1.10.18-cpp14.patch new file mode 100644 index ..04a2a15 --- /dev/null +++ b/media-sound/nted/files/nted-1.10.18-cpp14.patch @@ -0,0 +1,11 @@ +--- idiotseditor/idiotseditor.cpp.dist 2016-09-18 10:47:58.933319888 +0200 idiotseditor/idiotseditor.cpp 2016-09-18 10:48:28.852321336 +0200 +@@ -2538,7 +2538,7 @@ + + #define BAR_COLOR 0, 0, 0 + #define NOMINATOR_COLOR 0, 0, 204 +-#define HALF_COLOR 0.0, 26, 153 ++#define HALF_COLOR 0, 26, 153 + #define QUARTER_COLOR 0, 51, 127 + #define EIGHTS_COLOR 127, 77, 102 + #define COLOR_16 0, 102, 77 diff --git a/media-sound/nted/nted-1.10.18-r3.ebuild b/media-sound/nted/nted-1.10.18-r3.ebuild index 495a5d2..ddf3285 100644 --- a/media-sound/nted/nted-1.10.18-r3.ebuild +++ b/media-sound/nted/nted-1.10.18-r3.ebuild @@ -41,6 +41,7 @@ PATCHES=( "${FILESDIR}/${P}-lilypond-tremolo.patch" # bug #437540 "${FILESDIR}/${P}-automake-1.12.patch" # bug #459466 "${FILESDIR}/${P}-freetype.patch" # bug #514522 + "${FILESDIR}/${P}-cpp14.patch" # bug #594056 ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: dev-python/pastescript/files/
commit: 9f554b39dc36c7fab71d821d09b5099e157a364d Author: Michael Mair-Keimberger (asterix) gmail com> AuthorDate: Fri Sep 16 15:41:18 2016 + Commit: Patrice Clement gentoo org> CommitDate: Sun Sep 18 10:09:14 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f554b39 dev-python/pastescript: remove unused patch. Signed-off-by: Patrice Clement gentoo.org> .../files/pastescript-setup.py-exclude-tests.patch| 19 --- 1 file changed, 19 deletions(-) diff --git a/dev-python/pastescript/files/pastescript-setup.py-exclude-tests.patch b/dev-python/pastescript/files/pastescript-setup.py-exclude-tests.patch deleted file mode 100644 index 24190a7.. --- a/dev-python/pastescript/files/pastescript-setup.py-exclude-tests.patch +++ /dev/null @@ -1,19 +0,0 @@ -# HG changeset patch -# User Mike Gilbert -# Date 1353179174 18000 -# Node ID 814fbc493e7a086127f64c2406ecb1794990 -# Parent 510ff7d7627750eb0dbbc0d36fa63c72ffa6b303 -Exclude subpackages of tests. - -diff --git a/setup.py b/setup.py a/setup.py -+++ b/setup.py -@@ -61,7 +61,7 @@ - url="http://pythonpaste.org/script/";, - namespace_packages=['paste'], - license='MIT', --packages=find_packages(exclude='tests'), -+packages=find_packages(exclude=['tests','tests.*']), - package_data={ - 'paste.script': ['paster-templates/basic_package/setup.*', -'paster-templates/basic_package/tests/*.py',
[gentoo-commits] repo/gentoo:master commit in: dev-python/mako/files/
commit: 596bdb5fb23a2ac8f5b493275aadd6c70a282a75 Author: Michael Mair-Keimberger (asterix) gmail com> AuthorDate: Fri Sep 16 15:36:05 2016 + Commit: Patrice Clement gentoo org> CommitDate: Sun Sep 18 10:08:44 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=596bdb5f dev-python/mako: remove unused patch. Closes: https://github.com/gentoo/gentoo/pull/2344 Signed-off-by: Patrice Clement gentoo.org> dev-python/mako/files/test-fix.patch | 11 --- 1 file changed, 11 deletions(-) diff --git a/dev-python/mako/files/test-fix.patch b/dev-python/mako/files/test-fix.patch deleted file mode 100644 index 3792e3e.. --- a/dev-python/mako/files/test-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ur Mako-0.7.0.orig/test/test_template.py Mako-0.7.0/test/test_template.py test/test_template.py 2012-03-31 07:52:02.0 +0800 -+++ test/test_template.py 2012-04-11 20:25:23.797168875 +0800 -@@ -1,5 +1,5 @@ - # -*- coding: utf-8 -*- -- -+from __future__ import with_statement - from mako.template import Template, ModuleTemplate - from mako.lookup import TemplateLookup - from mako.ext.preprocessors import convert_comments -
[gentoo-commits] repo/gentoo:master commit in: dev-python/paver/files/
commit: 059cb3fb91a76ba2ad4fc56f63c25984d8561884 Author: Michael Mair-Keimberger (asterix) gmail com> AuthorDate: Fri Sep 16 15:41:40 2016 + Commit: Patrice Clement gentoo org> CommitDate: Sun Sep 18 10:09:17 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=059cb3fb dev-python/paver: remove unused patch. Signed-off-by: Patrice Clement gentoo.org> .../paver/files/paver-1.2.0-skip-cog-tests.patch | 34 -- 1 file changed, 34 deletions(-) diff --git a/dev-python/paver/files/paver-1.2.0-skip-cog-tests.patch b/dev-python/paver/files/paver-1.2.0-skip-cog-tests.patch deleted file mode 100644 index 1ee339d.. --- a/dev-python/paver/files/paver-1.2.0-skip-cog-tests.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 1b9641cd841fe5d22ba4c5ef4198e47995c74f04 Mon Sep 17 00:00:00 2001 -From: Almad -Date: Wed, 27 Feb 2013 02:56:12 +0100 -Subject: [PATCH] Skip cog tests if tests are not installed (refs #93) - - paver/tests/test_doctools.py |4 - 1 file changed, 4 insertions(+) - -diff --git a/paver/tests/test_doctools.py b/paver/tests/test_doctools.py -index bc0cf8c..6104b3f 100644 a/paver/tests/test_doctools.py -+++ b/paver/tests/test_doctools.py -@@ -137,6 +137,8 @@ def test_include_lookup(): - """, "Second was '%s'" % (second) - - def test_cogging(): -+if not paver.doctools.has_cog: -+raise SkipTest("Cog must be installed for this test") - _no25() - env = tasks.Environment(doctools) - tasks.environment = env -@@ -159,6 +161,8 @@ def test_cogging(): - assert "print sys.path" not in data - - def test_cogging_with_markers_removed(): -+if not paver.doctools.has_cog: -+raise SkipTest("Cog must be installed for this test") - _no25() - env = tasks.Environment(doctools) - tasks.environment = env --- -1.7.10 -
[gentoo-commits] repo/gentoo:master commit in: dev-python/markdown/files/
commit: dd763a71d0990cceed4f3623100c6606eb1571da Author: Michael Mair-Keimberger (asterix) gmail com> AuthorDate: Fri Sep 16 15:36:31 2016 + Commit: Patrice Clement gentoo org> CommitDate: Sun Sep 18 10:09:12 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd763a71 dev-python/markdown: remove unused patch. Signed-off-by: Patrice Clement gentoo.org> .../markdown/files/markdown-2.2.0-tests.patch | 80 -- 1 file changed, 80 deletions(-) diff --git a/dev-python/markdown/files/markdown-2.2.0-tests.patch b/dev-python/markdown/files/markdown-2.2.0-tests.patch deleted file mode 100644 index ef05702.. --- a/dev-python/markdown/files/markdown-2.2.0-tests.patch +++ /dev/null @@ -1,80 +0,0 @@ -https://github.com/waylan/Python-Markdown/issues/112 -https://github.com/waylan/Python-Markdown/commit/5b3e724fb78da73ab87fb34e4ac9d9299773cfed - markdown/__init__.py -+++ markdown/__init__.py -@@ -37,6 +37,7 @@ - import codecs - import sys - import logging -+import warnings - import util - from preprocessors import build_preprocessors - from blockprocessors import build_block_parser -@@ -163,10 +164,10 @@ - if isinstance(ext, basestring): - ext = self.build_extension(ext, configs.get(ext, [])) - if isinstance(ext, Extension): --# might raise NotImplementedError, but that's the extension author's problem - ext.extendMarkdown(self, globals()) - elif ext is not None: --raise ValueError('Extension "%s.%s" must be of type: "markdown.Extension".' \ -+raise TypeError( -+'Extension "%s.%s" must be of type: "markdown.Extension"' - % (ext.__class__.__module__, ext.__class__.__name__)) - - return self -@@ -200,19 +201,22 @@ - module_name_old_style = '_'.join(['mdx', ext_name]) - try: # Old style (mdx_) - module = __import__(module_name_old_style) --except ImportError: --logger.warn("Failed loading extension '%s' from '%s' or '%s'" --% (ext_name, module_name, module_name_old_style)) --# Return None so we don't try to initiate none-existant extension --return None -+except ImportError, e: -+message = "Failed loading extension '%s' from '%s' or '%s'" \ -+% (ext_name, module_name, module_name_old_style) -+e.args = (message,) + e.args[1:] -+raise - - # If the module is loaded successfully, we expect it to define a - # function called makeExtension() - try: - return module.makeExtension(configs.items()) - except AttributeError, e: --logger.warn("Failed to initiate extension '%s': %s" % (ext_name, e)) --return None -+message = e.args[0] -+message = "Failed to initiate extension " \ -+ "'%s': %s" % (ext_name, message) -+e.args = (message,) + e.args[1:] -+raise - - def registerExtension(self, extension): - """ This gets called by the extension """ tests/test_apis.py -+++ tests/test_apis.py -@@ -245,18 +245,18 @@ - - def testLoadExtensionFailure(self): - """ Test failure of an extension to load. """ --self.assertRaises(ValueError, -+self.assertRaises(ImportError, - markdown.Markdown, extensions=['non_existant_ext']) - - def testLoadBadExtension(self): - """ Test loading of an Extension with no makeExtension function. """ - _create_fake_extension(name='fake', has_factory_func=False) --self.assertRaises(ValueError, markdown.Markdown, extensions=['fake']) -+self.assertRaises(AttributeError, markdown.Markdown, extensions=['fake']) - - def testNonExtension(self): - """ Test loading a non Extension object as an extension. """ - _create_fake_extension(name='fake', is_wrong_type=True) --self.assertRaises(ValueError, markdown.Markdown, extensions=['fake']) -+self.assertRaises(TypeError, markdown.Markdown, extensions=['fake']) - - def testBaseExtention(self): - """ Test that the base Extension class will raise NotImplemented. """
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gtksourceviewmm/
commit: f93ace3e31f52bdda60aff18b6a4705140ec8018 Author: Pacho Ramos gentoo org> AuthorDate: Sun Sep 18 10:27:02 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Sep 18 11:01:25 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f93ace3e dev-cpp/gtksourceviewmm: Drop old Package-Manager: portage-2.3.0 dev-cpp/gtksourceviewmm/Manifest | 1 - .../gtksourceviewmm/gtksourceviewmm-2.10.3.ebuild | 47 -- .../gtksourceviewmm/gtksourceviewmm-3.12.0.ebuild | 35 3 files changed, 83 deletions(-) diff --git a/dev-cpp/gtksourceviewmm/Manifest b/dev-cpp/gtksourceviewmm/Manifest index 85d422c..afeb72c 100644 --- a/dev-cpp/gtksourceviewmm/Manifest +++ b/dev-cpp/gtksourceviewmm/Manifest @@ -1,3 +1,2 @@ DIST gtksourceviewmm-2.10.3.tar.xz 742184 SHA256 df1b582d7be2e412020c5d748f21c0e6e5074c6b2ca8529985e70479375b SHA512 e6ddc4f585251f68e48cf0ea2c33bce02a90031efcd885105a82837715d659a317ee0845b476fc54c1c4c71b518df41ce494505af1524db6acb733e51f44e6ca WHIRLPOOL 35ae10e70e6d2a8c59e9be6552229034b844efdf1c730c20b75b9e6dbdd85d88e7b12104dbce400ba83b2745677d4abb04e994e3e75b8d3a2bdc8e9b920699de -DIST gtksourceviewmm-3.12.0.tar.xz 1046368 SHA256 73939031bcc60e6ad31a315ec84b132deba15e5732de16e75fe424a619267ace SHA512 c4318039ad683a69e6610fa8da058327726e57e485445a9fd2a5d9ef7afd603d30f5954e586c5f9b586d0cd2ef9e444ba7cbf17c44bae8e4c20bd54dcec8288f WHIRLPOOL 130927a9aede6572db20cb660aa64612abd7cf7e53313fcc029ea1806483bd818ce1fc67c2422fac6740d4f52f0d8ffe824d6fccc382750e66f91dd859488fe0 DIST gtksourceviewmm-3.18.0.tar.xz 1079780 SHA256 51081ae3d37975dae33d3f6a40621d85cb68f4b36ae3835eec1513482aacfb39 SHA512 143de4a650f2a6090efeba359e78d1f4982519a9e7a2be838f9888732c57dcc42db8b6ab45bd23ccd261d8f17bc743846a3bb572566f233cee9b4238c017c64c WHIRLPOOL b3c7dee2e8c41e4a14457e45f5131fb8fcf2f5841f5080b950da39ea6c1afaf39e4f89cbe8ab279bd5b2f2d1f34a071a9b9d3cdf08e808ae993f3d0727d4244c diff --git a/dev-cpp/gtksourceviewmm/gtksourceviewmm-2.10.3.ebuild b/dev-cpp/gtksourceviewmm/gtksourceviewmm-2.10.3.ebuild deleted file mode 100644 index f7242d5.. --- a/dev-cpp/gtksourceviewmm/gtksourceviewmm-2.10.3.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" - -inherit gnome2 - -DESCRIPTION="C++ bindings for gtksourceview" -HOMEPAGE="https://projects.gnome.org/gtksourceviewmm/"; - -KEYWORDS="amd64 ppc x86" -IUSE="doc" -SLOT="2.0" -LICENSE="LGPL-2.1" - -RDEPEND=">=dev-cpp/gtkmm-2.12:2.4 - dev-cpp/atkmm - >=x11-libs/gtksourceview-2.10.0:2.0 - !>=dev-cpp/libgtksourceviewmm-1" - -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( app-doc/doxygen )" - -pkg_setup() { - DOCS="AUTHORS ChangeLog* NEWS README" - G2CONF="${G2CONF} - $(use_enable doc documentation) - --disable-static" -} - -src_prepare() { - gnome2_src_prepare - - # Remove docs from SUBDIRS so that docs are not installed, as - # we handle it in src_install. - sed -i -e 's|^\(SUBDIRS =.*\)$(doc_subdirs)\(.*\)|\1\2|' Makefile.in || \ - die "sed Makefile.in failed" -} - -src_install() { - gnome2_src_install - use doc && dohtml -r docs/reference/html/* -} diff --git a/dev-cpp/gtksourceviewmm/gtksourceviewmm-3.12.0.ebuild b/dev-cpp/gtksourceviewmm/gtksourceviewmm-3.12.0.ebuild deleted file mode 100644 index 5bd3943.. --- a/dev-cpp/gtksourceviewmm/gtksourceviewmm-3.12.0.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -GCONF_DEBUG="no" - -inherit gnome2 eutils - -DESCRIPTION="C++ bindings for gtksourceview" -HOMEPAGE="https://projects.gnome.org/gtksourceviewmm/"; - -KEYWORDS="amd64 ppc x86" -IUSE="doc" -SLOT="3.0" -LICENSE="LGPL-2.1" - -RDEPEND=" - >=dev-cpp/glibmm-2.28:2 - >=dev-cpp/gtkmm-3.2:3.0 - >=x11-libs/gtksourceview-3.12:3.0 - - dev-cpp/atkmm - dev-cpp/cairomm - dev-cpp/pangomm:1.4 -" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( app-doc/doxygen ) -" - -src_configure() { - DOCS="AUTHORS ChangeLog* NEWS README" - gnome2_src_configure $(use_enable doc documentation) -}
[gentoo-commits] repo/gentoo:master commit in: media-sound/potamus/
commit: 17033ca6146c3bf3532e10e7182ee16b73ba2220 Author: Pacho Ramos gentoo org> AuthorDate: Sun Sep 18 10:03:28 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Sep 18 11:01:05 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17033ca6 media-sound/potamus: Drop old Package-Manager: portage-2.3.0 media-sound/potamus/Manifest| 2 -- media-sound/potamus/potamus-0.12.ebuild | 42 -- media-sound/potamus/potamus-14.ebuild | 46 - 3 files changed, 90 deletions(-) diff --git a/media-sound/potamus/Manifest b/media-sound/potamus/Manifest index 99d5e97..adaebbb 100644 --- a/media-sound/potamus/Manifest +++ b/media-sound/potamus/Manifest @@ -1,3 +1 @@ -DIST potamus-0.12.tar.gz 127788 SHA256 5034e09c8646cbb299f895541e155b9d7012597210bc8b0ba213812928525e2d SHA512 ab88031eaa4608b4513aec75d86ab1b16e6e192926d0ca7b0616845ecb9a564f12affba9ed2a3fc903b8b9ac5481a1aabab8904df5546a3ea6a9f6f3eccc1ba0 WHIRLPOOL 4491a23f1e87fee6dab5e279630de4c1f5a85106263b6c11d2410c511ac838bd30e36057bf3a42960514559bbb71714f5839659b49ce04c15ac151e2cc609b7a -DIST potamus-14.tar.gz 163164 SHA256 ae271a7101dbbd75c95faaa0afcd311cae24311a1c4eb01e73d1ffce43667194 SHA512 d6192e9e9114f4f88619751529718afb94f113613f23432646c1d5fa707a82ad10c70425135a5ca5a076b68a36ededdb01d73bc1dc6a92e2bdb644d624303394 WHIRLPOOL fc70d8043fec093be4781cdee5e615131f9bea3c375c9f22b290d4777b121c911c402298bac6b9253deb791580a98f224abd751d4912c46a1cb939d50a562b23 DIST potamus-16.tar.gz 144874 SHA256 0b31955f5495477d68048915560e528d13d741178fb90ef39e3ff2dbcad7ae63 SHA512 e4c87d4166d958d200edc13835c57c894b0803b243fd79fb211480a217a33ca34fbd451622842efc47c0ed1b79bcd0fa4f0258f129f70678f14c373234b1b32d WHIRLPOOL c4cd12042a907e222495435fe3434ee7bee8d167a3ce883891cdae8bfe638a6340525daf0d0f8c51ce2f13bbf151768a390cee565d8aa289dafa862c266f305f diff --git a/media-sound/potamus/potamus-0.12.ebuild b/media-sound/potamus/potamus-0.12.ebuild deleted file mode 100644 index 06e4f90.. --- a/media-sound/potamus/potamus-0.12.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit gnome2 - -DESCRIPTION="a lightweight audio player with a simple interface and an emphasis on high audio quality" -HOMEPAGE="http://offog.org/code/potamus.html"; -SRC_URI="http://offog.org/files/${P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -RDEPEND="x11-libs/gtk+:2 - >=gnome-base/libglade-2 - media-libs/libao - media-libs/libsamplerate - media-libs/libvorbis - media-libs/libmad - media-libs/audiofile - media-libs/libmodplug - virtual/ffmpeg - media-libs/flac - media-sound/jack-audio-connection-kit" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - gnome2_src_prepare - - sed -i -e \ - 's:CODEC_TYPE_AUDIO:AVMEDIA_TYPE_AUDIO:g' \ - src/input-avcodec.c || die -} - -src_install() { - default -} diff --git a/media-sound/potamus/potamus-14.ebuild b/media-sound/potamus/potamus-14.ebuild deleted file mode 100644 index 1115ecc.. --- a/media-sound/potamus/potamus-14.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit gnome2 - -DESCRIPTION="a lightweight audio player with a simple interface and an emphasis on high audio quality" -HOMEPAGE="http://offog.org/code/potamus.html"; -SRC_URI="http://offog.org/files/${P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="audiofile flac mad modplug vorbis +ao jack" - -RDEPEND="x11-libs/gtk+:2 - >=gnome-base/libglade-2 - media-libs/libsamplerate - virtual/ffmpeg - audiofile? ( media-libs/audiofile ) - flac? ( media-libs/flac ) - mad? ( media-libs/libmad ) - modplug? ( media-libs/libmodplug ) - vorbis? ( media-libs/libvorbis ) - ao? ( media-libs/libao ) - jack? ( media-sound/jack-audio-connection-kit )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_configure() { - econf \ - $(use_enable audiofile input-audiofile) \ - $(use_enable flac input-flac) \ - $(use_enable mad input-mad) \ - $(use_enable modplug input-modplug) \ - $(use_enable vorbis input-vorbis) \ - $(use_enable ao output-ao) \ - $(use_enable jack output-jack) - -} - -src_install() { - default -}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libunique/
commit: fa98c2e129e32e20c06239510f3ff9d65a45a458 Author: Pacho Ramos gentoo org> AuthorDate: Sun Sep 18 10:45:28 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Sep 18 11:01:36 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa98c2e1 dev-libs/libunique: Bump eapi, fix introspection dependencies, stop rebuilding gtk-docs Package-Manager: portage-2.3.0 dev-libs/libunique/libunique-3.0.2-r1.ebuild | 46 1 file changed, 46 insertions(+) diff --git a/dev-libs/libunique/libunique-3.0.2-r1.ebuild b/dev-libs/libunique/libunique-3.0.2-r1.ebuild new file mode 100644 index ..2f000ed --- /dev/null +++ b/dev-libs/libunique/libunique-3.0.2-r1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +GNOME2_LA_PUNT="yes" + +inherit gnome2 virtualx + +DESCRIPTION="A library for writing single instance application" +HOMEPAGE="https://wiki.gnome.org/Attic/LibUnique"; + +LICENSE="LGPL-2.1" +SLOT="3" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris" +IUSE="debug +introspection" + +RDEPEND=" + >=dev-libs/glib-2.25.7:2 + sys-apps/dbus[X] + >=x11-libs/gtk+-2.90.0:3[introspection?] + x11-libs/libX11 + introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) +" +DEPEND="${RDEPEND} + >=dev-util/gtk-doc-am-1.11 + virtual/pkgconfig +" +# For eautoreconf +# dev-util/gtk-doc-am + +src_configure() { + # --disable-dbus means gdbus is used instead of dbus-glib + gnome2_src_configure \ + --disable-static \ + --disable-maintainer-flags \ + --disable-dbus \ + $(usex debug --enable-debug=yes ' ') \ + $(use_enable introspection) +} + +src_test() { + cd "${S}/tests" + cp "${FILESDIR}/run-tests" . || die "Unable to cp \${FILESDIR}/run-tests" + virtx emake -f run-tests || die "Tests failed" +}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/gnome-raw-thumbnailer/
commit: 653725d2f387fcdc2fc6eb2c94f445021576bfc3 Author: Pacho Ramos gentoo org> AuthorDate: Sun Sep 18 10:51:35 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Sep 18 11:01:49 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=653725d2 media-gfx/gnome-raw-thumbnailer: Update eapi and ebuild Package-Manager: portage-2.3.0 .../gnome-raw-thumbnailer-3.0.0.ebuild | 26 ++ 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-3.0.0.ebuild b/media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-3.0.0.ebuild index d305716..1125daf 100644 --- a/media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-3.0.0.ebuild +++ b/media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-3.0.0.ebuild @@ -1,12 +1,11 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=4 -GCONF_DEBUG=no +EAPI=6 inherit gnome2 -MY_P=${PN/gnome-}-${PV} +MY_P="${PN/gnome-}-${PV}" DESCRIPTION="A lightweight and fast raw image thumbnailer for GNOME" HOMEPAGE="https://libopenraw.freedesktop.org/wiki/RawThumbnailer"; @@ -17,17 +16,16 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="" -RDEPEND=">=media-libs/libopenraw-0.0.9[gtk] - >=x11-libs/gdk-pixbuf-2 - >=dev-libs/glib-2.26 - !media-gfx/raw-thumbnailer" +RDEPEND=" + >=media-libs/libopenraw-0.0.9[gtk] + >=x11-libs/gdk-pixbuf-2:2 + >=dev-libs/glib-2.26:2 + !media-gfx/raw-thumbnailer +" DEPEND="${RDEPEND} dev-util/intltool virtual/pkgconfig - sys-devel/gettext" + sys-devel/gettext +" -S=${WORKDIR}/${MY_P} - -pkg_setup() { - DOCS="AUTHORS ChangeLog NEWS" -} +S="${WORKDIR}/${MY_P}"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libunique/
commit: e0799fc0f26c4174439622d8a1fe1333ede39cfd Author: Pacho Ramos gentoo org> AuthorDate: Sun Sep 18 10:46:04 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Sep 18 11:01:39 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0799fc0 dev-libs/libunique: Make repoman more happy Package-Manager: portage-2.3.0 dev-libs/libunique/libunique-1.1.6-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libunique/libunique-1.1.6-r2.ebuild b/dev-libs/libunique/libunique-1.1.6-r2.ebuild index 74a1132..f0b29b9 100644 --- a/dev-libs/libunique/libunique-1.1.6-r2.ebuild +++ b/dev-libs/libunique/libunique-1.1.6-r2.ebuild @@ -46,7 +46,7 @@ PATCHES=( # Remove G_CONST_RETURN usage, now that its gone in glib "${FILESDIR}/${PN}-1.1.6-G_CONST_RETURN.patch" ) - + src_configure() { gnome2_src_configure \ --disable-maintainer-flags \
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xmonad-log-applet/
commit: 06f5bb859f1c1cb45d10d4ae77a12aa398e43528 Author: Pacho Ramos gentoo org> AuthorDate: Sun Sep 18 10:09:53 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Sep 18 11:01:11 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06f5bb85 x11-misc/xmonad-log-applet: Use newer eapi Package-Manager: portage-2.3.0 .../xmonad-log-applet/xmonad-log-applet-2.0.0-r301.ebuild | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/x11-misc/xmonad-log-applet/xmonad-log-applet-2.0.0-r301.ebuild b/x11-misc/xmonad-log-applet/xmonad-log-applet-2.0.0-r301.ebuild index 89b75cd..181ff5f 100644 --- a/x11-misc/xmonad-log-applet/xmonad-log-applet-2.0.0-r301.ebuild +++ b/x11-misc/xmonad-log-applet/xmonad-log-applet-2.0.0-r301.ebuild @@ -1,9 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=4 - +EAPI=6 inherit autotools gnome2 DESCRIPTION="Gnome and XFCE applet for displaying XMonad log" @@ -28,19 +27,21 @@ DEPEND="${RDEPEND}" src_prepare() { eautoreconf + gnome2_src_prepare } src_configure() { - econf --sysconfdir=/etc --with-panel=xfce4 + gnome2_src_configure --sysconfdir=/etc --with-panel=xfce4 } src_install() { - emake DESTDIR="${D}" install + gnome2_src_install dodoc AUTHORS.md README.md dodoc "${FILESDIR}"/xmonad.hs } pkg_postinst() { + gnome2_pkg_postinst elog "Remember to update your xmonad.hs accordingly" elog "a sample xmonad.hs is provided in /usr/share/doc/${PF}" }
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libunique/
commit: 2af2ab7232990416b191973a99e0f790f858c10f Author: Pacho Ramos gentoo org> AuthorDate: Sun Sep 18 10:38:38 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Sep 18 11:01:29 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2af2ab72 dev-libs/libunique: Bump eapi, fix introspection dependencies, stop rebuilding gtk-docs Package-Manager: portage-2.3.0 dev-libs/libunique/libunique-1.1.6-r2.ebuild | 64 1 file changed, 64 insertions(+) diff --git a/dev-libs/libunique/libunique-1.1.6-r2.ebuild b/dev-libs/libunique/libunique-1.1.6-r2.ebuild new file mode 100644 index ..17a96b4 --- /dev/null +++ b/dev-libs/libunique/libunique-1.1.6-r2.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +GNOME2_LA_PUNT="yes" +GNOME_TARBALL_SUFFIX="bz2" + +inherit gnome2 virtualx + +DESCRIPTION="A library for writing single instance application" +HOMEPAGE="https://wiki.gnome.org/Attic/LibUnique"; + +LICENSE="LGPL-2.1" +SLOT="1" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris" +IUSE="debug dbus +introspection" + +RDEPEND=" + >=dev-libs/glib-2.12:2 + >=x11-libs/gtk+-2.11:2[introspection?] + x11-libs/libX11 + dbus? ( + >=dev-libs/dbus-glib-0.70 + sys-apps/dbus[X] ) + introspection? ( >=dev-libs/gobject-introspection-0.6.3:= ) +" +DEPEND="${RDEPEND} + dev-util/gtk-doc-am + sys-devel/gettext + virtual/pkgconfig +" +# For eautoreconf +# dev-util/gtk-doc-am + +PATCHES=( + # Include NUL terminator in unique_message_data_get_filename() + "${FILESDIR}/${P}-include-terminator.patch" + + # test-unique: Resolve format string issues + "${FILESDIR}/${P}-fix-test.patch" + + # Remove compiler warnings + "${FILESDIR}/${P}-compiler-warnings.patch" + + # Remove G_CONST_RETURN usage, now that its gone in glib + "${FILESDIR}/${PN}-1.1.6-G_CONST_RETURN.patch" +) + +src_configure() { + gnome2_src_configure \ + --disable-maintainer-flags \ + --disable-static \ + --enable-bacon \ + $(use_enable introspection) \ + $(usex debug --enable-debug=yes ' ') \ + $(use_enable dbus) +} + +src_test() { + cd "${S}/tests" + cp "${FILESDIR}/run-tests" . || die "Unable to cp \${FILESDIR}/run-tests" + virtx emake -f run-tests || die "Tests failed" +}
[gentoo-commits] repo/gentoo:master commit in: media-sound/potamus/
commit: 5ccd54626f39461a4096c6d322482998636c6268 Author: Pacho Ramos gentoo org> AuthorDate: Sun Sep 18 10:16:32 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Sep 18 11:01:15 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ccd5462 media-sound/potamus: Update ffmpeg handling, bump eapi Package-Manager: portage-2.3.0 media-sound/potamus/potamus-16.ebuild | 38 --- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/media-sound/potamus/potamus-16.ebuild b/media-sound/potamus/potamus-16.ebuild index aa6e665..01b06d0 100644 --- a/media-sound/potamus/potamus-16.ebuild +++ b/media-sound/potamus/potamus-16.ebuild @@ -1,42 +1,42 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=4 +EAPI=6 +inherit gnome2 -inherit gnome2 eutils - -DESCRIPTION="a lightweight audio player with a simple interface and an emphasis on high audio quality" -HOMEPAGE="http://offog.org/code/potamus.html"; +DESCRIPTION="A lightweight audio player with a simple interface and an emphasis on high audio quality" +HOMEPAGE="http://offog.org/code/potamus/"; SRC_URI="http://offog.org/files/${P}.tar.gz"; LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="audiofile flac mad modplug opus vorbis +ao jack" +IUSE="+ao audiofile flac jack libav mad modplug opus vorbis" -RDEPEND="x11-libs/gtk+:2 +RDEPEND=" + x11-libs/gtk+:2 >=gnome-base/libglade-2 media-libs/libsamplerate - virtual/ffmpeg + ao? ( media-libs/libao ) audiofile? ( media-libs/audiofile ) flac? ( media-libs/flac ) + jack? ( media-sound/jack-audio-connection-kit ) + libav? ( media-video/libav:= ) + !libav? ( >=media-video/ffmpeg-2.8:0= ) mad? ( media-libs/libmad ) modplug? ( media-libs/libmodplug ) opus? ( media-libs/opusfile ) vorbis? ( media-libs/libvorbis ) - ao? ( media-libs/libao ) - jack? ( media-sound/jack-audio-connection-kit )" +" DEPEND="${RDEPEND} - virtual/pkgconfig" + virtual/pkgconfig +" -src_prepare() { - gnome2_src_prepare - has_version '>=media-video/ffmpeg-2.8' && epatch "${FILESDIR}/ffmpeg29.patch" -} +PATCHES=( "${FILESDIR}/ffmpeg29.patch" ) src_configure() { - econf \ + gnome2_src_configure \ $(use_enable audiofile input-audiofile) \ $(use_enable flac input-flac) \ $(use_enable mad input-mad) \ @@ -47,7 +47,3 @@ src_configure() { $(use_enable jack output-jack) } - -src_install() { - default -}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libunique/
commit: 9efb6f08272b59195f1f2338c37b38d5535869b1 Author: Pacho Ramos gentoo org> AuthorDate: Sun Sep 18 10:40:44 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Sep 18 11:01:32 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9efb6f08 dev-libs/libunique: Make repoman more happy and raise gtk-doc-am dep Package-Manager: portage-2.3.0 dev-libs/libunique/libunique-1.1.6-r2.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-libs/libunique/libunique-1.1.6-r2.ebuild b/dev-libs/libunique/libunique-1.1.6-r2.ebuild index 17a96b4..74a1132 100644 --- a/dev-libs/libunique/libunique-1.1.6-r2.ebuild +++ b/dev-libs/libunique/libunique-1.1.6-r2.ebuild @@ -26,7 +26,7 @@ RDEPEND=" introspection? ( >=dev-libs/gobject-introspection-0.6.3:= ) " DEPEND="${RDEPEND} - dev-util/gtk-doc-am + >=dev-util/gtk-doc-am-1.11 sys-devel/gettext virtual/pkgconfig " @@ -46,7 +46,7 @@ PATCHES=( # Remove G_CONST_RETURN usage, now that its gone in glib "${FILESDIR}/${PN}-1.1.6-G_CONST_RETURN.patch" ) - + src_configure() { gnome2_src_configure \ --disable-maintainer-flags \
[gentoo-commits] repo/gentoo:master commit in: dev-python/nautilus-python/
commit: df847f0ec0f8392c20fa33876e57bdece498dfff Author: Pacho Ramos gentoo org> AuthorDate: Sun Sep 18 10:46:28 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Sep 18 11:01:42 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df847f0e dev-python/nautilus-python: Drop old Package-Manager: portage-2.3.0 .../nautilus-python/nautilus-python-1.1-r1.ebuild | 50 -- 1 file changed, 50 deletions(-) diff --git a/dev-python/nautilus-python/nautilus-python-1.1-r1.ebuild b/dev-python/nautilus-python/nautilus-python-1.1-r1.ebuild deleted file mode 100644 index 63054f2.. --- a/dev-python/nautilus-python/nautilus-python-1.1-r1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -PYTHON_DEPEND="2" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" - -inherit eutils gnome2 python - -DESCRIPTION="Python bindings for the Nautilus file manager" -HOMEPAGE="https://projects.gnome.org/nautilus-python/"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 x86" -IUSE="doc" - -# Depend on pygobject:3 for sanity, and because it's automagic -RDEPEND="dev-python/pygobject:3 - >=gnome-base/nautilus-2.32[introspection]" -DEPEND="${RDEPEND} - doc? ( - app-text/docbook-xml-dtd:4.1.2 - >=dev-util/gtk-doc-1.9 )" - -DOCS="AUTHORS ChangeLog NEWS README" - -pkg_setup() { - python_set_active_version 2 - python_pkg_setup -} - -src_install() { - gnome2_src_install - # Directory for systemwide extensions - keepdir /usr/share/nautilus-python/extensions/ - # Doesn't get installed by "make install" for some reason - if use doc; then - insinto /usr/share/gtk-doc/html/nautilus-python # for dev-util/devhelp - doins -r docs/html/* - fi -} - -pkg_postinst() { - gnome2_pkg_postinst - python_need_rebuild -}
[gentoo-commits] repo/gentoo:master commit in: media-sound/quark/
commit: 8874813743d15abbc621b787b7b35230858103f7 Author: Pacho Ramos gentoo org> AuthorDate: Sun Sep 18 10:17:09 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Sep 18 11:01:18 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88748137 media-sound/quark: Drop old Package-Manager: portage-2.3.0 media-sound/quark/Manifest | 1 - media-sound/quark/quark-3.21.ebuild | 37 - 2 files changed, 38 deletions(-) diff --git a/media-sound/quark/Manifest b/media-sound/quark/Manifest index e93a43d..611a3a4 100644 --- a/media-sound/quark/Manifest +++ b/media-sound/quark/Manifest @@ -1,2 +1 @@ -DIST quark-3.21.tar.gz 204423 SHA256 45b0b17c82f4c4ed58fc76548dba6ca3e766391c5e42ea5f207249056514ac6b SHA512 861c429bca7c98d125f5b3d4d8eb5381f5a4590f302cf443edcab7929222f9489fa5d38d6390eab1aa2cbd43bb71f31d1e1c1022928c46b69ef5f7a36b9c586e WHIRLPOOL 733383648100b64cfe02146a605067c0a434cf0341702ef53832bccc254575a3d9bb7c477feaa854289620eb316444e15b27df13899fa4bad8d83dfe8c2a453a DIST quark-3.24.tar.gz 215417 SHA256 afac7b03082fd581412cf701187a21a4d6f6eea75c207b366f4b1dc939fff04c SHA512 a34a3160ab4cfe976cbabd6b2d94cc21ca263c069c53ad6244ed23674e17bf713dc759af998d4ae74720c91ba5e452e3996408d6ae11305bf581eb9a71876a01 WHIRLPOOL bb90b6087cc48ef732b77f183f222a9cc85260a972694f145ad28a0ae80e377d0533d8719bed8d087f2532b52859858755f6426c81d11fa5e46d6c7751da diff --git a/media-sound/quark/quark-3.21.ebuild b/media-sound/quark/quark-3.21.ebuild deleted file mode 100644 index 0df4e98.. --- a/media-sound/quark/quark-3.21.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 -GCONF_DEBUG=yes -inherit flag-o-matic gnome2 - -DESCRIPTION="Quark is the Anti-GUI Music Player with a cool Docklet!" -HOMEPAGE="https://hsgg.github.com/quark/"; -SRC_URI="https://hsgg.github.com/${PN}/${P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="" - -RDEPEND="media-libs/xine-lib - x11-libs/gtk+:2 - >=gnome-base/gconf-2 - gnome-base/gnome-vfs" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -DOCS="AUTHORS README" - -src_prepare() { - sed -i \ - -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \ - strange-quark/Makefile.{am,in} quark/Makefile.{am,in} || die #387823 -} - -src_configure() { - #367859 - append-libs X11 - gnome2_src_configure -}
[gentoo-commits] repo/gentoo:master commit in: app-dicts/gwaei/
commit: 4f3d42f552311399003429b6bf7abaac4fc7764f Author: Pacho Ramos gentoo org> AuthorDate: Sun Sep 18 10:51:10 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Sep 18 11:01:46 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f3d42f5 app-dicts/gwaei: Cleanup metadata Package-Manager: portage-2.3.0 app-dicts/gwaei/metadata.xml | 4 1 file changed, 4 deletions(-) diff --git a/app-dicts/gwaei/metadata.xml b/app-dicts/gwaei/metadata.xml index 6a93eda..bb2eba8 100644 --- a/app-dicts/gwaei/metadata.xml +++ b/app-dicts/gwaei/metadata.xml @@ -12,10 +12,6 @@ for it. - - Enable single instance support using - dev-libs/libunique. - Enable app-text/mecab support
[gentoo-commits] repo/gentoo:master commit in: app-office/grisbi/
commit: 92509bc0dfe7edafeb1d8f808b07b820ab0931d0 Author: Pacho Ramos gentoo org> AuthorDate: Sun Sep 18 10:25:28 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Sep 18 11:01:21 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92509bc0 app-office/grisbi: Update ebuild and fix deps on openssl Package-Manager: portage-2.3.0 app-office/grisbi/grisbi-1.0.0-r1.ebuild | 41 1 file changed, 41 insertions(+) diff --git a/app-office/grisbi/grisbi-1.0.0-r1.ebuild b/app-office/grisbi/grisbi-1.0.0-r1.ebuild new file mode 100644 index ..e593440 --- /dev/null +++ b/app-office/grisbi/grisbi-1.0.0-r1.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +GNOME2_LA_PUNT="yes" + +inherit gnome2 + +DESCRIPTION="Grisbi is a personal accounting application for Linux" +HOMEPAGE="http://www.grisbi.org"; +SRC_URI="mirror://sourceforge/grisbi/grisbi%20stable/1.0.x/${P}.tar.bz2" +IUSE="libressl nls ofx ssl" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +RDEPEND=" + dev-libs/libxml2:2 + >=dev-libs/glib-2.18.0:2 + >=x11-libs/gtk+-2.12.0:2 + x11-misc/xdg-utils + ssl? ( + libressl? ( dev-libs/libressl:0= ) + !libressl? ( >=dev-libs/openssl-0.9.5:0= ) ) + ofx? ( >=dev-libs/libofx-0.7.0 ) +" +DEPEND="${RDEPEND} + virtual/pkgconfig +" + +src_configure() { + gnome2_src_configure \ + --with-libxml2 \ + --without-cunit \ + --disable-static \ + $(use_with ssl openssl) \ + $(use_with ofx) \ + $(use_enable nls) +}
[gentoo-commits] repo/gentoo:master commit in: sci-biology/lagan/, sci-biology/lagan/files/
commit: 9f39270bff954737259cc2b52e97e0bde41f7d2b Author: David Seifert gentoo org> AuthorDate: Sun Sep 18 11:25:38 2016 + Commit: David Seifert gentoo org> CommitDate: Sun Sep 18 11:33:03 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f39270b sci-biology/lagan: Allow for compiling with GCC 6 Gentoo-bug: 594148 * EAPI=6 * Also fix QA violations due to implicit declarations and incorrectly formatted fprintf calls. Package-Manager: portage-2.3.0 sci-biology/lagan/files/lagan-2.0-fix-c++14.patch | 473 + .../files/lagan-2.0-qa-implicit-declarations.patch | 96 + sci-biology/lagan/lagan-2.0-r3.ebuild | 72 3 files changed, 641 insertions(+) diff --git a/sci-biology/lagan/files/lagan-2.0-fix-c++14.patch b/sci-biology/lagan/files/lagan-2.0-fix-c++14.patch new file mode 100644 index ..9865f27 --- /dev/null +++ b/sci-biology/lagan/files/lagan-2.0-fix-c++14.patch @@ -0,0 +1,473 @@ +Fix building with C++14, which errors out due to namespace collisions with std::end +in C++14 mode, due to crappy 'using namespace std' declared everywhere. +See also: https://bugs.gentoo.org/show_bug.cgi?id=594148 + +--- a/src/ancseq.cpp b/src/ancseq.cpp +@@ -30,7 +30,6 @@ + #include + #include + +-using namespace std; + + #include "util.cpp" + #include "faindex.cpp" +--- a/src/ancseqrest.cpp b/src/ancseqrest.cpp +@@ -31,7 +31,6 @@ + #include + #include + +-using namespace std; + + #define fastaRowLength 50 + typedef char* pchar; +--- a/src/cutmfa.cpp b/src/cutmfa.cpp +@@ -45,7 +45,6 @@ + #include + #include + +-using namespace std; + + // TODO refactor in classes and normal make project + +--- a/src/glocal/glocal.cpp b/src/glocal/glocal.cpp +@@ -7,9 +7,9 @@ + } + + //vectors that would be needed globally +-vector fragments; +-vectorstartPoints; +-vectorendPoints; ++std::vector fragments; ++std::vectorstartPoints; ++std::vectorendPoints; + long long int numFragments; + InterPoint inter; + +@@ -19,7 +19,7 @@ + RI RI_regions[1<<(UPSTRANDBITS+DOWNSTRANDBITS+RELPOSBITS)]; + LI LI_regions[1<<(UPSTRANDBITS+DOWNSTRANDBITS+RELPOSBITS)]; + +-vector scoreFunctions[1<<(UPSTRANDBITS+DOWNSTRANDBITS+RELPOSBITS)]; ++std::vector scoreFunctions[1<<(UPSTRANDBITS+DOWNSTRANDBITS+RELPOSBITS)]; + + Name allNames; + +--- a/src/glocal/io.cpp b/src/glocal/io.cpp +@@ -3,9 +3,9 @@ + #include + #include + +-extern vector fragments; +-extern vector startPoints; +-extern vector endPoints; ++extern std::vector fragments; ++extern std::vector startPoints; ++extern std::vector endPoints; + extern Name allNames; + + bool PointCompare(const Point &f1, const Point &f2) { +@@ -223,8 +223,8 @@ + startPoints.push_back(startPoint); + endPoints.push_back(endPoint); + } +- sort(startPoints.begin(), startPoints.end(), PointCompare); +- sort(endPoints.begin(), endPoints.end(), PointCompare); ++ std::sort(startPoints.begin(), startPoints.end(), PointCompare); ++ std::sort(endPoints.begin(), endPoints.end(), PointCompare); + } + + +--- a/src/glocal/leftinfluence.cpp b/src/glocal/leftinfluence.cpp +@@ -154,8 +154,8 @@ + + if (second->score == -1) { return TRUE; } + +- dummy.seq1Start = max(first->seq1End, second->seq1End) + 2; +- dummy.seq2Start = max(first->getSeq2End(LeftInfluence->reflectFlag), second->getSeq2End(LeftInfluence->reflectFlag)) + 1; ++ dummy.seq1Start = std::max(first->seq1End, second->seq1End) + 2; ++ dummy.seq2Start = std::max(first->getSeq2End(LeftInfluence->reflectFlag), second->getSeq2End(LeftInfluence->reflectFlag)) + 1; + + if (first->getSeq2End(LeftInfluence->reflectFlag) > second->getSeq2End(LeftInfluence->reflectFlag)) { + dummy.nameIter = first->nameIter; +@@ -444,7 +444,7 @@ + temp.seq1 = col - diag; + temp.seq2 = col; + +- pair pairp(temp, LeftInfluence); ++ std::pair pairp(temp, LeftInfluence); + tempinter = inter.insert(pairp); + + colInter->second = tempinter; +--- a/src/glocal/leftinfluence.h b/src/glocal/leftinfluence.h +@@ -39,15 +39,15 @@ + + + +-typedef list Owner; +-typedef map CBound; ++typedef std::list Owner; ++typedef std::map CBound; + +-typedef multimap InterPoint; ++typedef std::multimap InterPoint; + +-typedef map CInter; +-typedef map DBound; ++typedef std::map CInter; ++typedef std::map DBound; + +-typedef map DInter; ++typedef std::map DInter; + + + +--- a/src/glocal/rightinfluence.h b/src/glocal/rightinfluence.h +@@ -17,7 +17,7 @@ + }; + + +-typedef map Active; ++typedef std::map Active; + + typedef struct RI { + //List of active regions +--- a/src/glocal/score.cpp b/src/glocal/score.cpp +@@ -4,7 +4,7 @@ + #include + #include + +-extern vector scoreFunctions[1<<(UPSTRANDBITS+DOWNSTRANDBITS+RELPOSBITS)]; ++extern std::vector scoreFunctions[1<<(UPSTRANDBITS+DOWNSTRANDBITS+RELPOSBIT
[gentoo-commits] repo/gentoo:master commit in: sci-biology/lagan/
commit: 71e6df91447916064f790d4ec80e6a2ddd917ccf Author: David Seifert gentoo org> AuthorDate: Sun Sep 18 11:26:32 2016 + Commit: David Seifert gentoo org> CommitDate: Sun Sep 18 11:33:07 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71e6df91 sci-biology/lagan: Remove old ebuilds Package-Manager: portage-2.3.0 sci-biology/lagan/lagan-2.0-r1.ebuild | 50 --- sci-biology/lagan/lagan-2.0-r2.ebuild | 55 --- 2 files changed, 105 deletions(-) diff --git a/sci-biology/lagan/lagan-2.0-r1.ebuild b/sci-biology/lagan/lagan-2.0-r1.ebuild deleted file mode 100644 index 63b966e.. --- a/sci-biology/lagan/lagan-2.0-r1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="2" - -inherit eutils - -MY_P="lagan20" - -DESCRIPTION="LAGAN, Multi-LAGAN, Shuffle-LAGAN, Supermap: Whole-genome multiple alignment of genomic DNA" -HOMEPAGE="http://lagan.stanford.edu/lagan_web/index.shtml"; -SRC_URI="http://lagan.stanford.edu/lagan_web/${MY_P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -IUSE="" -KEYWORDS="~amd64 ~x86" - -DEPEND="" -RDEPEND="" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - sed -i "/use Getopt::Long;/ i use lib \"/usr/share/${PN}/lib\";" "${S}/supermap.pl" || die - # NB: Testing with glibc-2.10 has uncovered a bug in src/utils/Sequence.h where libc getline is erroneously used instead of own getline - sed -i 's/getline/my_getline/' "${S}"/src/{anchors.c,glocal/io.cpp} || die - epatch "${FILESDIR}"/${P}-*.patch -} - -src_install() { - dobin lagan.pl slagan.pl mlagan - rm lagan.pl slagan.pl utils/Utils.pm - dodir /usr/share/${PN}/lib - insinto /usr/share/${PN}/lib - doins Utils.pm - exeinto /usr/share/${PN}/utils - doexe utils/* - exeinto /usr/share/${PN} - doexe *.pl anchors chaos glocal order prolagan - insinto /usr/share/${PN} - doins *.txt - dosym /usr/share/${PN}/supermap.pl /usr/bin/supermap - dosym /usr/bin/lagan.pl /usr/bin/lagan - dosym /usr/bin/slagan.pl /usr/bin/slagan - echo "LAGAN_DIR=\"/usr/share/${PN}\"" > ${S}/99${PN} - doenvd "${S}/99${PN}" - dodoc Readmes/README.* -} diff --git a/sci-biology/lagan/lagan-2.0-r2.ebuild b/sci-biology/lagan/lagan-2.0-r2.ebuild deleted file mode 100644 index a37a373.. --- a/sci-biology/lagan/lagan-2.0-r2.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="2" - -inherit eutils multilib toolchain-funcs - -MY_P="lagan20" - -DESCRIPTION="LAGAN, Multi-LAGAN, Shuffle-LAGAN, Supermap: Whole-genome multiple alignment of genomic DNA" -HOMEPAGE="http://lagan.stanford.edu/lagan_web/index.shtml"; -SRC_URI="http://lagan.stanford.edu/lagan_web/${MY_P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -IUSE="" -KEYWORDS="~amd64 ~x86" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - sed -i "/use Getopt::Long;/ i use lib \"/usr/$(get_libdir)/${PN}/lib\";" "${S}/supermap.pl" || die - # NB: Testing with glibc-2.10 has uncovered a bug in src/utils/Sequence.h where libc getline is erroneously used instead of own getline - sed -i 's/getline/my_getline/' "${S}"/src/{anchors.c,glocal/io.cpp} || die - epatch "${FILESDIR}"/${P}-*.patch -} - -src_compile() { - emake \ - CC=$(tc-getCC) \ - CXX=$(tc-getCXX) \ - CXXFLAGS="${CXXFLAGS}" \ - CFLAGS="${CFLAGS}" -} - -src_install() { - newbin lagan.pl lagan || die - newbin slagan.pl slagan || die - dobin mlagan || die - rm lagan.pl slagan.pl utils/Utils.pm - - insinto /usr/$(get_libdir)/${PN}/lib - doins Utils.pm || die - exeinto /usr/$(get_libdir)/${PN}/utils - doexe utils/* || die - exeinto /usr/$(get_libdir)/${PN} - doexe *.pl anchors chaos glocal order prolagan || die - insinto /usr/$(get_libdir)/${PN} - doins *.txt || die - dosym /usr/$(get_libdir)/${PN}/supermap.pl /usr/bin/supermap - echo "LAGAN_DIR=\"/usr/$(get_libdir)/${PN}\"" > ${S}/99${PN} - doenvd "${S}/99${PN}" || die - dodoc Readmes/README.* || die -}
[gentoo-commits] repo/gentoo:master commit in: gnome-extra/docky/
commit: 1f5e0448766c79d882caa8181e993cb296cd8f74 Author: Pacho Ramos gentoo org> AuthorDate: Sun Sep 18 11:21:06 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Sep 18 11:36:52 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f5e0448 gnome-extra/docky: Drop old Package-Manager: portage-2.3.0 gnome-extra/docky/Manifest | 1 - gnome-extra/docky/docky-2.2.0.ebuild | 44 2 files changed, 45 deletions(-) diff --git a/gnome-extra/docky/Manifest b/gnome-extra/docky/Manifest index 3f3e222..e644db1 100644 --- a/gnome-extra/docky/Manifest +++ b/gnome-extra/docky/Manifest @@ -1,2 +1 @@ -DIST docky-2.2.0.tar.xz 570248 SHA256 28710b2deb998992184c96f1bfebdf43a8db1a074f716e309f955596be8f8af5 SHA512 054c3f8b10ccdc85b8defd108178ebcd880e46ec3d7d558cd2de8cc56f311dafe2efdb552ac8ff9a92cbe9279fdc44a66cad2395791e4a6de59a1cee1d2c6919 WHIRLPOOL db72c05e9e587eb0be661c2d0e6598064bfa4ea7456d16d08f4e533659c5e2cc76cfd6f1a4f669d67e8aa0275005ad0851b0c530715179f5d039e2edb200dde6 DIST docky-2.2.1.1.tar.xz 587780 SHA256 3759c052a375dea4ab462669896d92acc6eb497197dd5a73ff30527d668dfbc6 SHA512 614117a0523e3d5b0cab069cb8b2dd0d69a80d318a7d4c583716a5690da6e99f5c376bf85472a6dd36b3578ba1711c036c2712892494f5115c9270d79c2d996f WHIRLPOOL 438fea2b3aeedce51b09b452a29495f3e4dce6bca97f2a4b88eb82503a7c6127d9b0cf31c511ab1d3340f6ae7dffe7a8e5e424cf694a3b4d1beb7ab933e0328d diff --git a/gnome-extra/docky/docky-2.2.0.ebuild b/gnome-extra/docky/docky-2.2.0.ebuild deleted file mode 100644 index 08d2133.. --- a/gnome-extra/docky/docky-2.2.0.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 -inherit autotools eutils gnome2 mono - -DESCRIPTION="Elegant, powerful, clean dock" -HOMEPAGE="https://wiki.go-docky.com"; -SRC_URI="https://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.xz"; - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="debug nls" - -RDEPEND="dev-dotnet/dbus-sharp:1.0 - dev-dotnet/dbus-sharp-glib:1.0 - dev-dotnet/gconf-sharp - >=dev-dotnet/gio-sharp-0.2-r1 - dev-dotnet/glib-sharp - dev-dotnet/gnome-desktop-sharp - dev-dotnet/gnome-keyring-sharp - dev-dotnet/gtk-sharp - dev-dotnet/mono-addins[gtk] - dev-dotnet/notify-sharp - dev-dotnet/rsvg-sharp - dev-dotnet/wnck-sharp" -DEPEND="${RDEPEND} - dev-util/intltool - virtual/pkgconfig" - -pkg_setup() { - G2CONF="${G2CONF} - --enable-release - $(use_enable nls)" - - DOCS="AUTHORS NEWS" -} - -src_prepare() { - sed -i -e "/warnaserror/d" configure.ac || die - eautoreconf -}
[gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-dvb-daemon/
commit: 01247d68a38f262532308a082575fb8cd0edd998 Author: Pacho Ramos gentoo org> AuthorDate: Sun Sep 18 11:20:46 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Sep 18 11:36:49 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01247d68 gnome-extra/gnome-dvb-daemon: Drop old Package-Manager: portage-2.3.0 gnome-extra/gnome-dvb-daemon/Manifest | 1 - .../gnome-dvb-daemon-0.2.10.ebuild | 74 -- 2 files changed, 75 deletions(-) diff --git a/gnome-extra/gnome-dvb-daemon/Manifest b/gnome-extra/gnome-dvb-daemon/Manifest index 413ebc8..68a50e0 100644 --- a/gnome-extra/gnome-dvb-daemon/Manifest +++ b/gnome-extra/gnome-dvb-daemon/Manifest @@ -1,2 +1 @@ -DIST gnome-dvb-daemon-0.2.10.tar.xz 696372 SHA256 c23fcd4744c91bda065036a1a9b4a77b4665d7ca237f489e89a4c2f3133adcfb SHA512 9bf99f3b9d3c6a96a0fd193e41d98017f60ffa6255ae5fea52d2360fed0a3f292fc28c59060f54eb58e321e32e06693f5443bd3a4aba41cbd579a07a3c9691fb WHIRLPOOL 18eaa5739788ae3d9c44ce596105b64fcf608a875d4aba224abe18c8e1eac14d388c22126a61c92abe5efbf54c1cfc37400eb6b70fb457f597b4cdc1cb3573d6 DIST gnome-dvb-daemon-0.2.90.tar.xz 700504 SHA256 8d1f3cc6cd8cdb5e032841ea136d27c432f2c8a9b9e46fc8e7d752e22c875a5f SHA512 73e18ed5b267f1ef1ceebfe4ff25ccac3222bca9d7da164dd16acf9367c6b9f9710e915c81ef851c54b6fcae9b08f36d0c78665f4af425afc41b4c08eba49c40 WHIRLPOOL 618584c1e25be5ef4ad4a6c551a61e9a8bab8f8d1b308e863193dbde97af44554b82116d6b1ec86d88367defdc76c8c50ea10e4bf19be54c8f5325f2169f12f6 diff --git a/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.10.ebuild b/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.10.ebuild deleted file mode 100644 index 6a3fc9b.. --- a/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.10.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" -GCONF_DEBUG="no" -PYTHON_DEPEND="2:2.5" -VALA_MIN_API_VERSION="0.16" - -inherit eutils python gnome2 multilib vala - -DESCRIPTION="Setup your DVB devices, record and watch TV shows and browse EPG using GStreamer" -HOMEPAGE="https://wiki.gnome.org/action/show/Projects/DVBDaemon"; - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64" -IUSE="nls totem vala" - -RDEPEND=">=dev-libs/glib-2.32.0:2 - >=media-libs/gstreamer-0.10.29:0.10 - >=media-libs/gst-plugins-good-0.10.14:0.10 - >=media-libs/gst-plugins-bad-0.10.13:0.10 - >=dev-libs/libgee-0.5:0 - >=dev-db/sqlite-3.4 - >=media-libs/gst-rtsp-server-0.10.7:0.10 - media-plugins/gst-plugins-dvb:0.10 - dev-python/gst-python:0.10 - >=dev-python/pygobject-3.2.1:3 - >=dev-libs/gobject-introspection-0.10.8 - x11-libs/gtk+:3[introspection] - virtual/libgudev - vala? ( $(vala_depend) ) - totem? ( media-video/totem )" -DEPEND="${RDEPEND} - >=dev-lang/perl-5.8.1 - >=dev-util/intltool-0.40.0 - virtual/pkgconfig - nls? ( >=sys-devel/gettext-0.18.1 ) - >=sys-devel/libtool-2.2.6" - -pkg_setup() { - G2CONF="${G2CONF} \ - $(use_enable nls) - $(use_enable totem totem-plugin)" - use totem && G2CONF="${G2CONF} \ - --with-totem-plugin-dir=/usr/$(get_libdir)/totem/plugins" - - python_set_active_version 2 - python_pkg_setup -} - -src_prepare() { - python_clean_py-compile_files - python_convert_shebangs -r 2 . - gnome2_src_prepare - use vala && vala_src_prepare -} - -pkg_postinst() { - python_mod_optimize gnomedvb - if use totem; then - python_mod_optimize "/usr/$(get_libdir)/totem/plugins" - fi - gnome2_pkg_postinst -} - -pkg_postrm() { - python_mod_cleanup gnomedvb - if use totem; then - python_mod_cleanup "/usr/$(get_libdir)/totem/plugins" - fi - gnome2_pkg_postrm -}
[gentoo-commits] repo/gentoo:master commit in: app-i18n/libtomoe-gtk/
commit: 6ba0d510ed62e7ea799a788807320ec46501b3c9 Author: Pacho Ramos gentoo org> AuthorDate: Sun Sep 18 11:34:30 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Sep 18 11:36:57 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ba0d510 app-i18n/libtomoe-gtk: Drop old Package-Manager: portage-2.3.0 app-i18n/libtomoe-gtk/libtomoe-gtk-0.6.0-r2.ebuild | 71 app-i18n/libtomoe-gtk/libtomoe-gtk-0.6.0-r3.ebuild | 76 -- 2 files changed, 147 deletions(-) diff --git a/app-i18n/libtomoe-gtk/libtomoe-gtk-0.6.0-r2.ebuild b/app-i18n/libtomoe-gtk/libtomoe-gtk-0.6.0-r2.ebuild deleted file mode 100644 index 870bb27.. --- a/app-i18n/libtomoe-gtk/libtomoe-gtk-0.6.0-r2.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="3" -PYTHON_DEPEND="python? 2" - -inherit autotools eutils python - -MY_P="tomoe-gtk-${PV}" -DESCRIPTION="Tomoe GTK+ interface widget library" -HOMEPAGE="http://tomoe.sourceforge.jp/"; -SRC_URI="mirror://sourceforge/tomoe/${MY_P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="doc +gucharmap python static-libs" - -RDEPEND=">=app-i18n/tomoe-0.6.0[python?] - python? ( - dev-python/pygtk:2 - dev-python/pygobject:2 - ) - gucharmap? ( gnome-extra/gucharmap:0 )" -DEPEND="${RDEPEND} - dev-util/gtk-doc-am - virtual/pkgconfig - sys-devel/gettext - doc? ( >=dev-util/gtk-doc-1.4 )" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if use python ; then - python_set_active_version 2 - fi -} - -src_prepare() { - # Fix compilation with gucharmap-2.24, bug #243160 - epatch "${FILESDIR}/${P}-gucharmap2.patch" - epatch "${FILESDIR}/${P}-underlinking.patch" - - eautoreconf -} - -src_configure() { - local myconf - #--with-python b0rked - use python || myconf="${myconf} --without-python" - - econf \ - $(use_enable doc gtk-doc) \ - $(use_with gucharmap) \ - $(use_enable static-libs static) \ - ${myconf} || die -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - - if use python ; then - find "${ED}$(python_get_sitedir)" \( -name "*.la" -o -name "*.a" \) -type f -delete || die - fi - if ! use static-libs ; then - find "${ED}" -name "*.la" -type f -delete || die - fi - - dodoc AUTHORS ChangeLog NEWS README || die -} diff --git a/app-i18n/libtomoe-gtk/libtomoe-gtk-0.6.0-r3.ebuild b/app-i18n/libtomoe-gtk/libtomoe-gtk-0.6.0-r3.ebuild deleted file mode 100644 index 26e2436.. --- a/app-i18n/libtomoe-gtk/libtomoe-gtk-0.6.0-r3.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit autotools eutils python-single-r1 - -MY_P="tomoe-gtk-${PV}" -DESCRIPTION="Tomoe GTK+ interface widget library" -HOMEPAGE="http://tomoe.sourceforge.jp/"; -SRC_URI="mirror://sourceforge/tomoe/${MY_P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc +gucharmap python static-libs" - -RDEPEND=">=app-i18n/tomoe-0.6.0 - python? ( - ${PYTHON_DEPS} - >=app-i18n/tomoe-0.6.0[python,${PYTHON_USEDEP}] - dev-python/pygtk:2[${PYTHON_USEDEP}] - dev-python/pygobject:2[${PYTHON_USEDEP}] - ) - gucharmap? ( gnome-extra/gucharmap:0 )" -DEPEND="${RDEPEND} - dev-util/gtk-doc-am - virtual/pkgconfig - sys-devel/gettext - doc? ( >=dev-util/gtk-doc-1.4 )" -REQUIRED_USE=${PYTHON_REQUIRED_USE} - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if use python ; then - python-single-r1_pkg_setup - fi -} - -src_prepare() { - # Fix compilation with gucharmap-2.24, bug #243160 - epatch "${FILESDIR}/${P}-gucharmap2.patch" - epatch "${FILESDIR}/${P}-underlinking.patch" - - eautoreconf -} - -src_configure() { - local myconf - #--with-python b0rked hard - unset PYTHON - use python || myconf="${myconf} --without-python" - - econf \ - $(use_enable doc gtk-doc) \ - $(use_with gucharmap) \ - $(use_enable static-libs static) \ - ${myconf} || die -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - - if use python ; then - find "${D}$(python_get_sitedir)" \( -name "*.la" -o -name "*.a" \) -type f -delete || die - fi - if ! use static-libs ; then - find "${ED}" -name "*.la" -type f -delete || die - fi - - dodoc AUTHORS ChangeLog NEWS README || die -}
[gentoo-commits] repo/gentoo:master commit in: media-video/gnome-subtitles/
commit: 23a6d6afdc18930408a08d8be379e6cc5244e3b5 Author: Pacho Ramos gentoo org> AuthorDate: Sun Sep 18 11:10:35 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Sep 18 11:36:47 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23a6d6af media-video/gnome-subtitles: Workaround parallel build bug (#508842), disable scrollkeeper. Package-Manager: portage-2.3.0 .../gnome-subtitles/gnome-subtitles-1.3.ebuild| 19 +++ 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/media-video/gnome-subtitles/gnome-subtitles-1.3.ebuild b/media-video/gnome-subtitles/gnome-subtitles-1.3.ebuild index 2e3eb1b..e0373e1 100644 --- a/media-video/gnome-subtitles/gnome-subtitles-1.3.ebuild +++ b/media-video/gnome-subtitles/gnome-subtitles-1.3.ebuild @@ -1,9 +1,8 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" -GCONF_DEBUG="no" +EAPI=6 GNOME2_LA_PUNT="yes" inherit mono-env gnome2 @@ -17,17 +16,21 @@ SLOT="0" IUSE="" KEYWORDS="~amd64 ~ppc ~x86" -RDEPEND=">=dev-lang/mono-1.1 +RDEPEND=" + >=dev-lang/mono-1.1 >=dev-dotnet/glade-sharp-2.12 >=dev-dotnet/gtk-sharp-2.12 >=dev-dotnet/gconf-sharp-2.12 media-libs/gstreamer:1.0 >=app-text/gtkspell-2.0:2 >=app-text/enchant-1.3 - media-libs/gst-plugins-base:1.0" + media-libs/gst-plugins-base:1.0 +" DEPEND="${RDEPEND} - app-text/scrollkeeper virtual/pkgconfig - app-text/gnome-doc-utils" + app-text/gnome-doc-utils +" -DOCS="AUTHORS ChangeLog NEWS README" +src_compile() { + MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_compile #508842 +}
[gentoo-commits] repo/gentoo:master commit in: gnome-extra/assogiate/
commit: 53271ebc722c1103de046f8860b81b0a47ef2d59 Author: Pacho Ramos gentoo org> AuthorDate: Sun Sep 18 11:24:39 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Sep 18 11:36:55 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53271ebc gnome-extra/assogiate: Drop old Package-Manager: portage-2.3.0 gnome-extra/assogiate/assogiate-0.2.1.ebuild | 46 1 file changed, 46 deletions(-) diff --git a/gnome-extra/assogiate/assogiate-0.2.1.ebuild b/gnome-extra/assogiate/assogiate-0.2.1.ebuild deleted file mode 100644 index 76b9d84.. --- a/gnome-extra/assogiate/assogiate-0.2.1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" -GCONF_DEBUG="yes" - -inherit autotools gnome2 eutils - -DESCRIPTION="assoGiate is an editor of the file types database for GNOME" -HOMEPAGE="http://www.kdau.com/projects/assogiate"; -SRC_URI="http://www.kdau.com/files/${P}.tar.bz2"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~sparc x86" -IUSE="" - -RDEPEND=">=dev-libs/glib-2.8:2 - >=dev-cpp/glibmm-2.8:2 - >=dev-cpp/gtkmm-2.8:2.4 - >=dev-cpp/libxmlpp-2.14 - >=dev-cpp/gnome-vfsmm-2.6" -DEPEND="${RDEPEND} - app-text/gnome-doc-utils - virtual/pkgconfig - dev-util/intltool" - -DOCS="AUTHORS ChangeLog NEWS README TODO" - -src_prepare() { - # Fix desktop file - epatch "${FILESDIR}/${P}-desktop.patch" - - # Fix compilation, bug #374911 - epatch "${FILESDIR}/${P}-typedialog.patch" - - # Fix building with glib-2.32, bug #417765 - epatch "${FILESDIR}/${P}-glib-2.32.patch" - - # Fix building with gcc-4.7 - epatch "${FILESDIR}/${P}-gcc-4.7.patch" - - eautoreconf - gnome2_src_prepare -}
[gentoo-commits] repo/gentoo:master commit in: net-firewall/pglinux/
commit: 0ed97f4088e7227b1aa1165355ae820c3b058051 Author: Pacho Ramos gentoo org> AuthorDate: Sun Sep 18 11:46:52 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Sep 18 11:46:52 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ed97f40 net-firewall/pglinux: Drop old Package-Manager: portage-2.3.0 net-firewall/pglinux/Manifest | 1 - net-firewall/pglinux/pglinux-2.3.0.ebuild | 98 --- 2 files changed, 99 deletions(-) diff --git a/net-firewall/pglinux/Manifest b/net-firewall/pglinux/Manifest index 8209230..2b57368 100644 --- a/net-firewall/pglinux/Manifest +++ b/net-firewall/pglinux/Manifest @@ -1,3 +1,2 @@ DIST pgl-2.2.4.tar.gz 608622 SHA256 26e91cb085a9da7faa643f9364192c0e3eeec64ccae56d0bb62de5174e185866 SHA512 d6daad259a904647917388e586d4bd7d6a73b078bf61974a5682b6eec2d8d2abb02760483838f23fefa13ae761b4bd40765ddb13e6d820d0b6e3ee65b0815f58 WHIRLPOOL 59de9ad6a3c95e2f9f553e7c311be948b488825bfe8db7e2fc78610d46d98c0cbef4ce4846a659b01b2a0b6548dfed13dde27c55ffc22cb37418b97cde0c0ca8 -DIST pgl-2.3.0.tar.gz 604284 SHA256 4183386a674e4778225f13165b0e9390eded89d9bc9445d4207a9c50078d0752 SHA512 535f13d6b17bbea099e415e9dd463ebf4e2ffa9af4d8ae96c7ace2667c84380f506018aca2b6b6a6d4ca1e2afd24fc6eaf9544eb00710645d562f2aa1fa5a1a7 WHIRLPOOL 959ed95aa89271c2632997d050031d97354fdc59ed33de527fffbcfb6a05d89dea1b2d03d35394af48b2342cc46c4dfe3180c65d727291c4df66b37d0f1519b9 DIST pgl-2.3.1.tar.gz 605656 SHA256 1b5c6d233baa943b42254c95ed2853d036f3f246feaebc073e3c91c05a4c98b4 SHA512 f23d44ad6448814ba0a2c90292ff4a933d31fed942886d63c50bb62fb56e1af70df72e09070ad3cd27c878f322576326040c330fbdbda63128ad304375b02a1e WHIRLPOOL f36f2d740f2b760d70e90de2e8004932289130b76119af80e478b0e8136d0dffb167c941b54b602a6f1857c9a3f8df1e7b4c6ed5c02099c008bec601ab967e2b diff --git a/net-firewall/pglinux/pglinux-2.3.0.ebuild b/net-firewall/pglinux/pglinux-2.3.0.ebuild deleted file mode 100644 index 0f048b0.. --- a/net-firewall/pglinux/pglinux-2.3.0.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils gnome2-utils linux-info systemd - -MY_P="pgl-${PV}" - -DESCRIPTION="Privacy oriented firewall application" -HOMEPAGE="https://sourceforge.net/projects/peerguardian/"; -SRC_URI="mirror://sourceforge/peerguardian/${MY_P}.tar.gz" - -LICENSE="GPL-3" -KEYWORDS="~amd64 ~x86" -SLOT="0" -IUSE="cron dbus logrotate networkmanager qt4 zlib" - -COMMON_DEPEND=" - net-libs/libnetfilter_queue - net-libs/libnfnetlink - dbus? ( sys-apps/dbus ) - zlib? ( sys-libs/zlib ) - qt4? ( sys-auth/polkit-qt[qt4(+)] - dev-qt/qtcore:4 - dev-qt/qtdbus:4 - dev-qt/qtgui:4 - || ( kde-apps/kdesu x11-libs/gksu x11-misc/ktsuss ) - )" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig - sys-devel/libtool:2" -RDEPEND="${COMMON_DEPEND} - net-firewall/iptables - sys-apps/sysvinit - cron? ( virtual/cron ) - logrotate? ( app-admin/logrotate ) - networkmanager? ( net-misc/networkmanager )" - -REQUIRED_USE="qt4? ( dbus )" - -CONFIG_CHECK="~NETFILTER_NETLINK - ~NETFILTER_NETLINK_QUEUE - ~NETFILTER_XTABLES - ~NETFILTER_XT_TARGET_NFQUEUE - ~NETFILTER_XT_MATCH_IPRANGE - ~NETFILTER_XT_MARK - ~NETFILTER_XT_MATCH_MULTIPORT - ~NETFILTER_XT_MATCH_STATE - ~NF_CONNTRACK - ~NF_CONNTRACK_IPV4 - ~NF_DEFRAG_IPV4 - ~IP_NF_FILTER - ~IP_NF_IPTABLES - ~IP_NF_TARGET_REJECT" - -S=${WORKDIR}/${MY_P} - -src_configure() { - econf \ - --localstatedir=/var \ - --docdir=/usr/share/doc/${PF} \ - $(use_enable logrotate) \ - $(use_enable cron) \ - $(use_enable networkmanager) \ - $(use_enable zlib) \ - $(use_enable dbus) \ - --disable-lowmem \ - --with-iconsdir=/usr/share/icons/hicolor/128x128/apps \ - --with-gentoo-init \ - $(use_with qt4) \ - --with-systemd="$(systemd_get_unitdir)" -} - -src_install() { - default - keepdir /var/{lib,log,spool}/pgl - rm -rf "${ED%/}"/tmp -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - elog "optional dependencies:" - elog " app-arch/p7zip (needed for blocklists packed as .7z)" - elog " app-arch/unzip (needed for blocklists packed as .zip)" - elog " virtual/mta (needed to send informational (blocklist updates) and" - elog "warning mails (if pglcmd.wd detects a problem.))" - - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -}
[gentoo-commits] repo/gentoo:master commit in: net-firewall/pglinux/
commit: 6ce6f4d0a3af80afedd80e3c68bfcd6b10fd5e41 Author: Pacho Ramos gentoo org> AuthorDate: Sun Sep 18 11:46:38 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Sep 18 11:46:38 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ce6f4d0 net-firewall/pglinux: gksu is deprecated for years and vulnerable (#534540) Package-Manager: portage-2.3.0 net-firewall/pglinux/pglinux-2.3.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-firewall/pglinux/pglinux-2.3.1.ebuild b/net-firewall/pglinux/pglinux-2.3.1.ebuild index a9d5e40..a762801 100644 --- a/net-firewall/pglinux/pglinux-2.3.1.ebuild +++ b/net-firewall/pglinux/pglinux-2.3.1.ebuild @@ -26,7 +26,7 @@ COMMON_DEPEND=" dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 - || ( kde-apps/kdesu x11-libs/gksu x11-misc/ktsuss ) + || ( kde-apps/kdesu x11-misc/ktsuss ) )" DEPEND="${COMMON_DEPEND} virtual/pkgconfig
[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/casacore/files/, sci-astronomy/casacore/
commit: 02cd747eb9c3ec0c8ce5f3969c3d19061fe1bc51 Author: David Seifert gentoo org> AuthorDate: Sun Sep 18 12:26:37 2016 + Commit: David Seifert gentoo org> CommitDate: Sun Sep 18 12:27:02 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02cd747e sci-astronomy/casacore: Allow for compiling with GCC 6 Gentoo-bug: 594186 Patch taken from upstream master branch Package-Manager: portage-2.3.0 sci-astronomy/casacore/casacore-2.1.0.ebuild | 5 ++- .../casacore/files/casacore-2.1.0-fix-c++14.patch | 45 ++ 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/sci-astronomy/casacore/casacore-2.1.0.ebuild b/sci-astronomy/casacore/casacore-2.1.0.ebuild index 6829883..cfdc619 100644 --- a/sci-astronomy/casacore/casacore-2.1.0.ebuild +++ b/sci-astronomy/casacore/casacore-2.1.0.ebuild @@ -34,7 +34,10 @@ DEPEND="${RDEPEND} doc? ( app-doc/doxygen ) test? ( sci-astronomy/casa-data sci-astronomy/sofa_c )" -PATCHES=( "${FILESDIR}/${PN}-disable-tpath-test.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-disable-tpath-test.patch" + "${FILESDIR}/${PN}-2.1.0-fix-c++14.patch" +) pkg_pretend() { if [[ $(tc-getCC)$ == *gcc* ]] && [[ ${MERGE_TYPE} != binary ]]; then diff --git a/sci-astronomy/casacore/files/casacore-2.1.0-fix-c++14.patch b/sci-astronomy/casacore/files/casacore-2.1.0-fix-c++14.patch new file mode 100644 index ..b14b703 --- /dev/null +++ b/sci-astronomy/casacore/files/casacore-2.1.0-fix-c++14.patch @@ -0,0 +1,45 @@ +From 3a45f84ccb6f08270fd6fd299eaf1b5401199d77 Mon Sep 17 00:00:00 2001 +From: Tammo Jan Dijkema +Date: Fri, 18 Mar 2016 10:43:13 +0100 +Subject: [PATCH] Add std to isinf and isnan, fixes #337 + +--- + casa/BasicMath/Math.cc | 4 ++-- + casa/BasicMath/test/tMathNaN.cc | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/casa/BasicMath/Math.cc b/casa/BasicMath/Math.cc +index d1bd984..00659e3 100644 +--- a/casa/BasicMath/Math.cc b/casa/BasicMath/Math.cc +@@ -178,7 +178,7 @@ Bool isInf(Float val) { + // infinite. I can only have access to Solaris, Linux and SGI machines to + // determine this. + #if defined(AIPS_LINUX) +- return (isinf(Double(val))); ++ return (std::isinf(Double(val))); + #elif defined(AIPS_DARWIN) + return (std::isinf(Double(val))); + #elif defined(AIPS_SOLARIS) || defined(AIPS_IRIX) +@@ -212,7 +212,7 @@ Bool isInf(Double val) { + // infinite. I can only have access to Solaris, Linux and SGI machines to + // determine this. + #if defined(AIPS_LINUX) +- return (isinf(Double(val))); ++ return (std::isinf(Double(val))); + #elif defined(AIPS_DARWIN) + return (std::isinf(Double(val))); + #elif defined(AIPS_SOLARIS) || defined(AIPS_IRIX) +diff --git a/casa/BasicMath/test/tMathNaN.cc b/casa/BasicMath/test/tMathNaN.cc +index f1a73bc..0c330d1 100644 +--- a/casa/BasicMath/test/tMathNaN.cc b/casa/BasicMath/test/tMathNaN.cc +@@ -43,7 +43,7 @@ + ((*(Int *)(x) & 0x007f) != 0x)) + + inline Bool isNaN_isnan(Float val) { +- return (isnan(Double(val))); ++ return (std::isnan(Double(val))); + } + + inline Bool isNaN_isnanf(const Float& val) {
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: fc034c82b286e891d50f2c1e516640ee3107104c Author: Sergei Trofimovich gentoo org> AuthorDate: Sun Sep 18 12:39:26 2016 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sun Sep 18 12:39:36 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc034c82 sys-apps/file: apply missing magic.h fix from bug #586444 The bug #586444 manifested on a cross-compiler case as well when we built native 'file'. Reported-by: n05 on #gentoo-embedded Package-Manager: portage-2.3.0 sys-apps/file/file-5.28.ebuild | 1 + sys-apps/file/file-.ebuild | 1 + 2 files changed, 2 insertions(+) diff --git a/sys-apps/file/file-5.28.ebuild b/sys-apps/file/file-5.28.ebuild index fefe087..e70a726 100644 --- a/sys-apps/file/file-5.28.ebuild +++ b/sys-apps/file/file-5.28.ebuild @@ -87,6 +87,7 @@ multilib_src_compile() { src_compile() { if tc-is-cross-compiler && ! ROOT=/ has_version "~${CATEGORY}/${P}" ; then + emake -C "${WORKDIR}"/build/src magic.h #586444 emake -C "${WORKDIR}"/build/src file PATH="${WORKDIR}/build/src:${PATH}" fi diff --git a/sys-apps/file/file-.ebuild b/sys-apps/file/file-.ebuild index 466e194..b067a3e 100644 --- a/sys-apps/file/file-.ebuild +++ b/sys-apps/file/file-.ebuild @@ -85,6 +85,7 @@ multilib_src_compile() { src_compile() { if tc-is-cross-compiler && ! ROOT=/ has_version "~${CATEGORY}/${P}" ; then + emake -C "${WORKDIR}"/build/src magic.h #586444 emake -C "${WORKDIR}"/build/src file PATH="${WORKDIR}/build/src:${PATH}" fi
[gentoo-commits] repo/gentoo:master commit in: app-i18n/scim-tomoe/
commit: 328d42c8865552a197d2fbd2ee8de66abc898d21 Author: Pacho Ramos gentoo org> AuthorDate: Sun Sep 18 12:37:08 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Sep 18 12:41:09 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=328d42c8 app-i18n/scim-tomoe: Stop relying on gucharmap:0 Package-Manager: portage-2.3.0 app-i18n/scim-tomoe/scim-tomoe-0.6.0-r2.ebuild | 38 -- app-i18n/scim-tomoe/scim-tomoe-0.6.0-r3.ebuild | 26 ++ 2 files changed, 26 insertions(+), 38 deletions(-) diff --git a/app-i18n/scim-tomoe/scim-tomoe-0.6.0-r2.ebuild b/app-i18n/scim-tomoe/scim-tomoe-0.6.0-r2.ebuild deleted file mode 100644 index 2831d2c.. --- a/app-i18n/scim-tomoe/scim-tomoe-0.6.0-r2.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="2" - -inherit eutils - -DESCRIPTION="Japanese input method Tomoe IMEngine for SCIM" -HOMEPAGE="http://tomoe.sourceforge.net/"; -SRC_URI="mirror://sourceforge/tomoe/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+gucharmap" - -RDEPEND=">=app-i18n/scim-1.2.0 - >=app-i18n/libtomoe-gtk-0.6.0[gucharmap=] - gucharmap? ( >=gnome-extra/gucharmap-1.4 ) - >=x11-libs/gtk+-2.4:2" -DEPEND="${RDEPEND} - virtual/pkgconfig - >=dev-util/intltool-0.35.0" - -src_prepare() { - # Fix build with gcc-4.3, bug # - epatch "${FILESDIR}"/${P}-gcc43.patch - - # Fix build with gucharmap-2.24, bug #243160 - epatch "${FILESDIR}/${P}-gucharmap2.patch" -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - - dodoc AUTHORS ChangeLog NEWS README TODO -} diff --git a/app-i18n/scim-tomoe/scim-tomoe-0.6.0-r3.ebuild b/app-i18n/scim-tomoe/scim-tomoe-0.6.0-r3.ebuild new file mode 100644 index ..54ba846 --- /dev/null +++ b/app-i18n/scim-tomoe/scim-tomoe-0.6.0-r3.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +DESCRIPTION="Japanese input method Tomoe IMEngine for SCIM" +HOMEPAGE="http://tomoe.sourceforge.net/"; +SRC_URI="mirror://sourceforge/tomoe/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + >=app-i18n/scim-1.2.0 + >=app-i18n/libtomoe-gtk-0.6.0 + >=x11-libs/gtk+-2.4:2 +" +DEPEND="${RDEPEND} + virtual/pkgconfig + >=dev-util/intltool-0.35.0 +" + +PATCHES=( "${FILESDIR}"/${P}-gcc43.patch )
[gentoo-commits] repo/gentoo:master commit in: app-i18n/scim-tomoe/
commit: 5c6503380aa52cb372979844bce9fc33a8b1e2e5 Author: Pacho Ramos gentoo org> AuthorDate: Sun Sep 18 12:40:12 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Sep 18 12:41:14 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c650338 app-i18n/scim-tomoe: Drop static and .la files Package-Manager: portage-2.3.0 app-i18n/scim-tomoe/scim-tomoe-0.6.0-r3.ebuild | 10 ++ 1 file changed, 10 insertions(+) diff --git a/app-i18n/scim-tomoe/scim-tomoe-0.6.0-r3.ebuild b/app-i18n/scim-tomoe/scim-tomoe-0.6.0-r3.ebuild index 54ba846..a7ae98f 100644 --- a/app-i18n/scim-tomoe/scim-tomoe-0.6.0-r3.ebuild +++ b/app-i18n/scim-tomoe/scim-tomoe-0.6.0-r3.ebuild @@ -3,6 +3,7 @@ # $Id$ EAPI=6 +inherit eutils DESCRIPTION="Japanese input method Tomoe IMEngine for SCIM" HOMEPAGE="http://tomoe.sourceforge.net/"; @@ -24,3 +25,12 @@ DEPEND="${RDEPEND} " PATCHES=( "${FILESDIR}"/${P}-gcc43.patch ) + +src_configure() { + econf --disable-static +} + +src_install() { + default + prune_libtool_files --modules +}
[gentoo-commits] repo/gentoo:master commit in: app-i18n/libtomoe-gtk/
commit: dfc1124c072ceff000378ba578489e437b091340 Author: Pacho Ramos gentoo org> AuthorDate: Sun Sep 18 12:40:40 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Sep 18 12:41:17 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfc1124c app-i18n/libtomoe-gtk: Cleanup metadata Package-Manager: portage-2.3.0 app-i18n/libtomoe-gtk/metadata.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/app-i18n/libtomoe-gtk/metadata.xml b/app-i18n/libtomoe-gtk/metadata.xml index 0ed2038..bb5bed5 100644 --- a/app-i18n/libtomoe-gtk/metadata.xml +++ b/app-i18n/libtomoe-gtk/metadata.xml @@ -5,9 +5,6 @@ c...@gentoo.org Cjk - - Enable gucharmap dictionary plugin - tomoe tomoe
[gentoo-commits] repo/gentoo:master commit in: app-i18n/scim-tomoe/
commit: 49db42371dec398ff3681d1b1449be03b16fb55e Author: Pacho Ramos gentoo org> AuthorDate: Sun Sep 18 12:37:29 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Sep 18 12:41:12 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49db4237 app-i18n/scim-tomoe: Cleanup metadata Package-Manager: portage-2.3.0 app-i18n/scim-tomoe/metadata.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/app-i18n/scim-tomoe/metadata.xml b/app-i18n/scim-tomoe/metadata.xml index 0aaed66..f01b1e0 100644 --- a/app-i18n/scim-tomoe/metadata.xml +++ b/app-i18n/scim-tomoe/metadata.xml @@ -5,9 +5,6 @@ c...@gentoo.org Cjk - - Enable gucharmap dictionary plugin - tomoe
[gentoo-commits] proj/linux-patches:3.18 commit in: /
commit: a3730ed4142f4394f432aa12a5f8371eadd992a9 Author: Mike Pagano gentoo org> AuthorDate: Sun Sep 18 12:43:17 2016 + Commit: Mike Pagano gentoo org> CommitDate: Sun Sep 18 12:43:17 2016 + URL:https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=a3730ed4 Linux patch 3.18.41 and 3.18.42. _README |8 + 1040_linux-3.18.41.patch | 1139 ++ 1041_linux-3.18.42.patch | 611 + 3 files changed, 1758 insertions(+) diff --git a/_README b/_README index c85b470..7228605 100644 --- a/_README +++ b/_README @@ -203,6 +203,14 @@ Patch: 1039_linux-3.18.40.patch From: http://www.kernel.org Desc: Linux 3.18.40 +Patch: 1040_linux-3.18.41.patch +From: http://www.kernel.org +Desc: Linux 3.18.41 + +Patch: 1041_linux-3.18.42.patch +From: http://www.kernel.org +Desc: Linux 3.18.42 + Patch: 1500_XATTR_USER_PREFIX.patch From: https://bugs.gentoo.org/show_bug.cgi?id=470644 Desc: Support for namespace user.pax.* on tmpfs. diff --git a/1040_linux-3.18.41.patch b/1040_linux-3.18.41.patch new file mode 100644 index 000..ca98c36 --- /dev/null +++ b/1040_linux-3.18.41.patch @@ -0,0 +1,1139 @@ +diff --git a/Makefile b/Makefile +index 39e8b5638789..e31123a1d511 100644 +--- a/Makefile b/Makefile +@@ -1,6 +1,6 @@ + VERSION = 3 + PATCHLEVEL = 18 +-SUBLEVEL = 40 ++SUBLEVEL = 41 + EXTRAVERSION = + NAME = Diseased Newt + +diff --git a/arch/arc/include/asm/entry.h b/arch/arc/include/asm/entry.h +index 884081099f80..81cdbc36699b 100644 +--- a/arch/arc/include/asm/entry.h b/arch/arc/include/asm/entry.h +@@ -143,8 +143,6 @@ + POP r13 + .endm + +-#define OFF_USER_R25_FROM_R24 (SZ_CALLEE_REGS + SZ_PT_REGS - 8)/4 +- + /*-- + * Collect User Mode callee regs as struct callee_regs - needed by + * fork/do_signal/unaligned-access-emulation. +@@ -157,12 +155,13 @@ + *-*/ + .macro SAVE_CALLEE_SAVED_USER + ++ mov r12, sp ; save SP as ref to pt_regs + SAVE_R13_TO_R24 + + #ifdef CONFIG_ARC_CURR_IN_REG +- ; Retrieve orig r25 and save it on stack +- ld.as r12, [sp, OFF_USER_R25_FROM_R24] +- st.ar12, [sp, -4] ++ ; Retrieve orig r25 and save it with rest of callee_regs ++ ld r12, [r12, PT_user_r25] ++ PUSHr12 + #else + PUSHr25 + #endif +@@ -209,12 +208,16 @@ + .macro RESTORE_CALLEE_SAVED_USER + + #ifdef CONFIG_ARC_CURR_IN_REG +- ld.ab r12, [sp, 4] +- st.as r12, [sp, OFF_USER_R25_FROM_R24] ++ POP r12 + #else + POP r25 + #endif + RESTORE_R24_TO_R13 ++ ++ ; SP is back to start of pt_regs ++#ifdef CONFIG_ARC_CURR_IN_REG ++ st r12, [sp, PT_user_r25] ++#endif + .endm + + /*-- +diff --git a/arch/arc/include/asm/irqflags.h b/arch/arc/include/asm/irqflags.h +index 742816f1b210..ec8276de345e 100644 +--- a/arch/arc/include/asm/irqflags.h b/arch/arc/include/asm/irqflags.h +@@ -159,10 +159,10 @@ static inline int arch_irqs_disabled(void) + .endm + + .macro IRQ_ENABLE scratch ++ TRACE_ASM_IRQ_ENABLE + lr \scratch, [status32] + or \scratch, \scratch, (STATUS_E1_MASK | STATUS_E2_MASK) + flag\scratch +- TRACE_ASM_IRQ_ENABLE + .endm + + #endif/* __ASSEMBLY__ */ +diff --git a/arch/arc/include/uapi/asm/elf.h b/arch/arc/include/uapi/asm/elf.h +index 0f99ac8fcbb2..0037a587320d 100644 +--- a/arch/arc/include/uapi/asm/elf.h b/arch/arc/include/uapi/asm/elf.h +@@ -13,8 +13,15 @@ + + /* Machine specific ELF Hdr flags */ + #define EF_ARC_OSABI_MSK 0x0f00 +-#define EF_ARC_OSABI_ORIG 0x /* MUST be zero for back-compat */ +-#define EF_ARC_OSABI_CURRENT 0x0300 /* v3 (no legacy syscalls) */ ++ ++#define EF_ARC_OSABI_V3 0x0300 /* v3 (no legacy syscalls) */ ++#define EF_ARC_OSABI_V4 0x0400 /* v4 (64bit data any reg align) */ ++ ++#if __GNUC__ < 6 ++#define EF_ARC_OSABI_CURRENT EF_ARC_OSABI_V3 ++#else ++#define EF_ARC_OSABI_CURRENT EF_ARC_OSABI_V4 ++#endif + + typedef unsigned long elf_greg_t; + typedef unsigned long elf_fpregset_t; +diff --git a/arch/arc/kernel/arcksyms.c b/arch/arc/kernel/arcksyms.c +index 4d9e77724bed..000dd041ab42 100644 +--- a/arch/arc/kernel/arcksyms.c b/arch/arc/kernel/arcksyms.c +@@ -28,6 +28,7 @@ extern void __muldf3(void); + extern void __divdf3(void); + extern void __floatunsidf(void); + extern void __floatunsisf(void); ++extern void __udivdi3(void); + + EXPORT_SYMBOL(__ashldi3); + EXPORT_SYMBOL(__ashrdi3); +@@ -45,6 +46,7 @@ EXPORT_SYMBOL(__muldf3); + EXPORT_SYMBOL(__divdf3); + EXPORT_SYMBOL(__floatunsidf); + EXPORT_SYMBOL(__floatunsisf); ++EXPORT_SYMBOL(__udivdi3); + + /* ARC optimised assembler routines */ + EXPORT_S
[gentoo-commits] proj/linux-patches:4.1 commit in: /
commit: 859d270f730c3d0b708c6cc88ddfc3ed97fc5b3a Author: Mike Pagano gentoo org> AuthorDate: Sun Sep 18 12:47:05 2016 + Commit: Mike Pagano gentoo org> CommitDate: Sun Sep 18 12:47:05 2016 + URL:https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=859d270f Linux patch 4.1.32. Linux patch 4.1.33 _README |8 + 1031_linux-4.1.32.patch | 1489 +++ 1032_linux-4.1.33.patch | 982 +++ 3 files changed, 2479 insertions(+) diff --git a/_README b/_README index 0ce7ab6..9a2fbfa 100644 --- a/_README +++ b/_README @@ -167,6 +167,14 @@ Patch: 1030_linux-4.1.31.patch From: http://www.kernel.org Desc: Linux 4.1.31 +Patch: 1031_linux-4.1.32.patch +From: http://www.kernel.org +Desc: Linux 4.1.32 + +Patch: 1032_linux-4.1.33.patch +From: http://www.kernel.org +Desc: Linux 4.1.33 + Patch: 1500_XATTR_USER_PREFIX.patch From: https://bugs.gentoo.org/show_bug.cgi?id=470644 Desc: Support for namespace user.pax.* on tmpfs. diff --git a/1031_linux-4.1.32.patch b/1031_linux-4.1.32.patch new file mode 100644 index 000..87bef87 --- /dev/null +++ b/1031_linux-4.1.32.patch @@ -0,0 +1,1489 @@ +diff --git a/Makefile b/Makefile +index bea5ca2ca2b0..e995f28b6d37 100644 +--- a/Makefile b/Makefile +@@ -1,6 +1,6 @@ + VERSION = 4 + PATCHLEVEL = 1 +-SUBLEVEL = 31 ++SUBLEVEL = 32 + EXTRAVERSION = + NAME = Series 4800 + +diff --git a/arch/arc/include/asm/entry.h b/arch/arc/include/asm/entry.h +index 884081099f80..81cdbc36699b 100644 +--- a/arch/arc/include/asm/entry.h b/arch/arc/include/asm/entry.h +@@ -143,8 +143,6 @@ + POP r13 + .endm + +-#define OFF_USER_R25_FROM_R24 (SZ_CALLEE_REGS + SZ_PT_REGS - 8)/4 +- + /*-- + * Collect User Mode callee regs as struct callee_regs - needed by + * fork/do_signal/unaligned-access-emulation. +@@ -157,12 +155,13 @@ + *-*/ + .macro SAVE_CALLEE_SAVED_USER + ++ mov r12, sp ; save SP as ref to pt_regs + SAVE_R13_TO_R24 + + #ifdef CONFIG_ARC_CURR_IN_REG +- ; Retrieve orig r25 and save it on stack +- ld.as r12, [sp, OFF_USER_R25_FROM_R24] +- st.ar12, [sp, -4] ++ ; Retrieve orig r25 and save it with rest of callee_regs ++ ld r12, [r12, PT_user_r25] ++ PUSHr12 + #else + PUSHr25 + #endif +@@ -209,12 +208,16 @@ + .macro RESTORE_CALLEE_SAVED_USER + + #ifdef CONFIG_ARC_CURR_IN_REG +- ld.ab r12, [sp, 4] +- st.as r12, [sp, OFF_USER_R25_FROM_R24] ++ POP r12 + #else + POP r25 + #endif + RESTORE_R24_TO_R13 ++ ++ ; SP is back to start of pt_regs ++#ifdef CONFIG_ARC_CURR_IN_REG ++ st r12, [sp, PT_user_r25] ++#endif + .endm + + /*-- +diff --git a/arch/arc/include/asm/irqflags.h b/arch/arc/include/asm/irqflags.h +index 27ecc6975a58..853a80ee7aaa 100644 +--- a/arch/arc/include/asm/irqflags.h b/arch/arc/include/asm/irqflags.h +@@ -168,10 +168,10 @@ static inline int arch_irqs_disabled(void) + .endm + + .macro IRQ_ENABLE scratch ++ TRACE_ASM_IRQ_ENABLE + lr \scratch, [status32] + or \scratch, \scratch, (STATUS_E1_MASK | STATUS_E2_MASK) + flag\scratch +- TRACE_ASM_IRQ_ENABLE + .endm + + #endif/* __ASSEMBLY__ */ +diff --git a/arch/arc/include/uapi/asm/elf.h b/arch/arc/include/uapi/asm/elf.h +index 0f99ac8fcbb2..0037a587320d 100644 +--- a/arch/arc/include/uapi/asm/elf.h b/arch/arc/include/uapi/asm/elf.h +@@ -13,8 +13,15 @@ + + /* Machine specific ELF Hdr flags */ + #define EF_ARC_OSABI_MSK 0x0f00 +-#define EF_ARC_OSABI_ORIG 0x /* MUST be zero for back-compat */ +-#define EF_ARC_OSABI_CURRENT 0x0300 /* v3 (no legacy syscalls) */ ++ ++#define EF_ARC_OSABI_V3 0x0300 /* v3 (no legacy syscalls) */ ++#define EF_ARC_OSABI_V4 0x0400 /* v4 (64bit data any reg align) */ ++ ++#if __GNUC__ < 6 ++#define EF_ARC_OSABI_CURRENT EF_ARC_OSABI_V3 ++#else ++#define EF_ARC_OSABI_CURRENT EF_ARC_OSABI_V4 ++#endif + + typedef unsigned long elf_greg_t; + typedef unsigned long elf_fpregset_t; +diff --git a/arch/arc/kernel/arcksyms.c b/arch/arc/kernel/arcksyms.c +index 4d9e77724bed..000dd041ab42 100644 +--- a/arch/arc/kernel/arcksyms.c b/arch/arc/kernel/arcksyms.c +@@ -28,6 +28,7 @@ extern void __muldf3(void); + extern void __divdf3(void); + extern void __floatunsidf(void); + extern void __floatunsisf(void); ++extern void __udivdi3(void); + + EXPORT_SYMBOL(__ashldi3); + EXPORT_SYMBOL(__ashrdi3); +@@ -45,6 +46,7 @@ EXPORT_SYMBOL(__muldf3); + EXPORT_SYMBOL(__divdf3); + EXPORT_SYMBOL(__floatunsidf); + EXPORT_SYMBOL(__floatunsisf); ++EXPORT_SYMBOL(__udivdi3); + + /* ARC optimised assembler routines */ + EXPORT_SYM
[gentoo-commits] proj/linux-patches: New tag: 4.1-38
commit: Commit: Mike Pagano gentoo org> CommitDate: Sun Sep 18 12:56:43 2016 + New tag: 4.1-38
[gentoo-commits] proj/linux-patches: New tag: 3.18-41
commit: Commit: Mike Pagano gentoo org> CommitDate: Sun Sep 18 12:59:01 2016 + New tag: 3.18-41
[gentoo-commits] repo/gentoo:master commit in: net-libs/wvstreams/files/, net-libs/wvstreams/
commit: cf1f89cf9056c80498a07796b28092671688d316 Author: David Seifert gentoo org> AuthorDate: Sun Sep 18 13:07:37 2016 + Commit: David Seifert gentoo org> CommitDate: Sun Sep 18 13:08:10 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf1f89cf net-libs/wvstreams: Allow for compiling with GCC 6 Gentoo-bug: 594058 * Add missing slot operators Package-Manager: portage-2.3.0 .../files/wvstreams-4.6.1-fix-c++14.patch | 36 ++ net-libs/wvstreams/wvstreams-4.6.1-r3.ebuild | 9 +++--- 2 files changed, 41 insertions(+), 4 deletions(-) diff --git a/net-libs/wvstreams/files/wvstreams-4.6.1-fix-c++14.patch b/net-libs/wvstreams/files/wvstreams-4.6.1-fix-c++14.patch new file mode 100644 index ..b2c2efd --- /dev/null +++ b/net-libs/wvstreams/files/wvstreams-4.6.1-fix-c++14.patch @@ -0,0 +1,36 @@ +Fix building with C++14, which errors out due to explicit operator bool() conversion +See also: https://bugs.gentoo.org/show_bug.cgi?id=594058 + +--- a/streams/wvstream.cc b/streams/wvstream.cc +@@ -907,9 +907,9 @@ + + if (forceable) + { +- si.wants.readable = readcb; +- si.wants.writable = writecb; +- si.wants.isexception = exceptcb; ++ si.wants.readable = static_cast(readcb); ++ si.wants.writable = static_cast(writecb); ++ si.wants.isexception = static_cast(exceptcb); + } + else + { +@@ -1019,7 +1019,7 @@ + + IWvStream::SelectRequest WvStream::get_select_request() + { +-return IWvStream::SelectRequest(readcb, writecb, exceptcb); ++return IWvStream::SelectRequest(static_cast(readcb), static_cast(writecb), static_cast(exceptcb)); + } + + +@@ -1107,7 +1107,7 @@ + // inefficient, because if the alarm was expired then pre_select() + // returned true anyway and short-circuited the previous select(). + TRACE("hello-%p\n", this); +-return !alarm_was_ticking || select(0, readcb, writecb, exceptcb); ++return !alarm_was_ticking || select(0, static_cast(readcb), static_cast(writecb), static_cast(exceptcb)); + } + + diff --git a/net-libs/wvstreams/wvstreams-4.6.1-r3.ebuild b/net-libs/wvstreams/wvstreams-4.6.1-r3.ebuild index 394d4d0..33711e8 100644 --- a/net-libs/wvstreams/wvstreams-4.6.1-r3.ebuild +++ b/net-libs/wvstreams/wvstreams-4.6.1-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -21,10 +21,10 @@ RESTRICT="test" #It'll take a larger patching effort to get it extracted, since upstream integrated it #more tightly this time. Probably for the better since upstream xplc seems dead. -RDEPEND="sys-libs/readline +RDEPEND="sys-libs/readline:0= sys-libs/zlib dbus? ( >=sys-apps/dbus-1.4.20 ) - dev-libs/openssl:0 + dev-libs/openssl:0= pam? ( virtual/pam )" DEPEND="${RDEPEND} virtual/pkgconfig @@ -48,7 +48,8 @@ src_prepare() { "${FILESDIR}"/${P}-parallel-make.patch \ "${FILESDIR}"/${P}-openssl-1.0.0.patch \ "${FILESDIR}"/${P}-glibc212.patch \ - "${FILESDIR}"/${P}-gcc47.patch + "${FILESDIR}"/${P}-gcc47.patch \ + "${FILESDIR}"/${P}-fix-c++14.patch sed -i \ -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
[gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
commit: e741758ef6abc12874f62cedc4021e18f018e762 Author: Fabian Groffen gentoo org> AuthorDate: Sun Sep 18 13:16:20 2016 + Commit: Fabian Groffen gentoo org> CommitDate: Sun Sep 18 13:16:32 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e741758e mail-client/mutt: revise 1.7.0 ebuild - drop NeoMutt references since we're no longer on it - re-introduce USE=vanilla for upstream bug reports - only show SmartTime warning for upgrade to 1.7 Package-Manager: portage-2.2.28 mail-client/mutt/mutt-1.7.0-r4.ebuild | 78 ++- 1 file changed, 40 insertions(+), 38 deletions(-) diff --git a/mail-client/mutt/mutt-1.7.0-r4.ebuild b/mail-client/mutt/mutt-1.7.0-r4.ebuild index 0aff2a1..470118b 100644 --- a/mail-client/mutt/mutt-1.7.0-r4.ebuild +++ b/mail-client/mutt/mutt-1.7.0-r4.ebuild @@ -6,16 +6,16 @@ EAPI="6" inherit eutils flag-o-matic autotools -#NEOMUTT="neomutt-20160710" -NEOMUTT="gentoo-${PVR}" +PATCHREV="r4" +PATCHSET="gentoo-${PVR}/${PATCHREV}" DESCRIPTION="A small but very powerful text-based mail client" HOMEPAGE="http://www.mutt.org/"; +MUTT_G_PATCHES="mutt-gentoo-1.7.0-patches-${PATCHREV}.tar.xz" SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz - https://dev.gentoo.org/~grobian/distfiles/mutt-gentoo-1.7.0-patches-r4.tar.xz"; - #https://github.com/neomutt/integration/archive/${NEOMUTT}.tar.gz -> ${P}-patches-${NEOMUTT}.tar.gz" -IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos libressl mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet" + https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}"; +IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos libressl mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet vanilla" SLOT="0" LICENSE="GPL-2" KEYWORDS="~alpha ~amd64 ~x86 ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" @@ -84,40 +84,37 @@ RDEPEND="${CDEPEND} " src_prepare() { - #local PATCHDIR="${WORKDIR}"/integration-${NEOMUTT} local PATCHDIR="${WORKDIR}"/gentoo-mutt-1.7.0-patches - # apply NeoMutt patches - export EPATCH_FORCE="yes" - export EPATCH_SUFFIX="patch" - # order of patches from README.md - local patches=( - patches-mutt - #bugs-common - bugs-gentoo - features-common - features-extra - #bugs-neomutt - gentoo - ) - local patchset - for patchset in "${patches[@]}" ; do - einfo "Applying NeoMutt ${NEOMUTT} patchset ${patchset}" - EPATCH_SOURCE="${PATCHDIR}"/${patchset} epatch \ - || die "NeoMutt patchset ${patchset} failed" - done - # add some explanation as to why not going to upstream - sed -i \ - -e '/ReachingUs = N_(/a\"This release of Mutt is heavily enriched by NeoMutt patches.\\nFor this reason, any bugs are better reported at https://bugs.gentoo.org/\\nor directly to the NeoMutt project.\\n"' \ - version.c || die "Failed to add bug instructions" + if use !vanilla ; then + # apply patches + export EPATCH_FORCE="yes" + export EPATCH_SUFFIX="patch" + local patches=( + patches-mutt + bugs-gentoo + features-common + features-extra + gentoo + ) + local patchset + for patchset in "${patches[@]}" ; do + einfo "Applying ${PATCHSET} patchset ${patchset}" + EPATCH_SOURCE="${PATCHDIR}"/${patchset} epatch \ + || die "patchset ${patchset} failed" + done + # add some explanation as to why not to go upstream + sed -i \ + -e '/ReachingUs = N_(/a\"This release of Mutt is heavily enriched with patches.\\nFor this reason, any bugs are better reported at https://bugs.gentoo.org/\\nor re-emerge with USE=vanilla and try to reproduce your problem.\\n"' \ + version.c || die "Failed to add bug instructions" + fi local upatches= # allow user patches eapply_user && upatches=" with user patches" # patch version string for bug reports - #rm VERSION.neo || die # we already flag it appropriate - sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}${upatches}, NeoMutt ${NEOMUTT})"'"/' \ + sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s, '"${PATCHSET}${upatches}"')"|' \ muttlib.c || die "failed patching in Gentoo version" # many p
[gentoo-commits] repo/gentoo:master commit in: dev-python/logbook/files/
commit: 030e81ffd7f65bc29d648a5c04a875b07cf40ed9 Author: Michael Mair-Keimberger (asterix) gmail com> AuthorDate: Tue Sep 13 15:39:13 2016 + Commit: David Seifert gentoo org> CommitDate: Sun Sep 18 13:27:23 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=030e81ff dev-python/logbook: remove unused patch Closes: https://github.com/gentoo/gentoo/pull/2321 Signed-off-by: David Seifert gentoo.org> .../logbook/files/logbook-0.5-pypy-test-fix.patch | 50 -- 1 file changed, 50 deletions(-) diff --git a/dev-python/logbook/files/logbook-0.5-pypy-test-fix.patch b/dev-python/logbook/files/logbook-0.5-pypy-test-fix.patch deleted file mode 100644 index 9f691a1.. --- a/dev-python/logbook/files/logbook-0.5-pypy-test-fix.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 41dc7b9af1841b0005051ad81ab36ed2e062d663 Mon Sep 17 00:00:00 2001 -From: Rotem Yaari -Date: Sat, 17 Aug 2013 22:43:39 +0300 -Subject: [PATCH] #91: Fix broken tests on pypy - - .travis.yml | 1 + - tests/test_logbook.py | 2 +- - tox.ini | 2 +- - 3 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/.travis.yml b/.travis.yml -index ee3f457..b0aaea6 100644 a/.travis.yml -+++ b/.travis.yml -@@ -3,6 +3,7 @@ python: - - "2.6" - - "2.7" - - "3.3" -+ - "pypy" - - install: - # this fixes SemLock issues on travis -diff --git a/tests/test_logbook.py b/tests/test_logbook.py -index 6d1a301..a1da11c 100644 a/tests/test_logbook.py -+++ b/tests/test_logbook.py -@@ -99,7 +99,7 @@ def make_record(): - - errormsg = str(caught.exception) - self.assertRegexpMatches(errormsg, --"Could not format message with provided arguments: Invalid (?:format specifier)|(?:conversion specification)") -+"Could not format message with provided arguments: Invalid (?:format specifier)|(?:conversion specification)|(?:format spec)") - self.assertIn("msg='Hello {foo:invalid}'", errormsg) - self.assertIn('args=()', errormsg) - self.assertIn("kwargs={'foo': 42}", errormsg) -diff --git a/tox.ini b/tox.ini -index 694cd51..2b52a28 100644 a/tox.ini -+++ b/tox.ini -@@ -1,5 +1,5 @@ - [tox] --envlist=py26,py27,py33,docs -+envlist=py26,py27,py33,pypy,docs - - [testenv] - commands= --- -1.8.1.6 -
[gentoo-commits] repo/gentoo:master commit in: dev-python/genshi/files/
commit: e8cd854727fc5473d8189e44425fbe5f993c3102 Author: Michael Mair-Keimberger (asterix) gmail com> AuthorDate: Tue Sep 13 15:35:12 2016 + Commit: David Seifert gentoo org> CommitDate: Sun Sep 18 13:27:28 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8cd8547 dev-python/genshi: remove unused patch Closes: https://github.com/gentoo/gentoo/pull/2322 Signed-off-by: David Seifert gentoo.org> dev-python/genshi/files/genshi-0.6-html_test.patch | 37 -- 1 file changed, 37 deletions(-) diff --git a/dev-python/genshi/files/genshi-0.6-html_test.patch b/dev-python/genshi/files/genshi-0.6-html_test.patch deleted file mode 100644 index 4f74d6b.. --- a/dev-python/genshi/files/genshi-0.6-html_test.patch +++ /dev/null @@ -1,37 +0,0 @@ -Add/Change #501 (test_sanitize_remove_src_javascript fails due to HTMLParser bugfixes in cpython) -Add/Change #500 (test_sanitize_remove_script_elem fails due to HTMLParser bugfixes in cpython) a/genshi/filters/tests/html.py -+++ b/genshi/filters/tests/html.py -@@ -365,9 +365,12 @@ - self.assertEquals('', (html | HTMLSanitizer()).render()) - html = HTML('http://example.com/";>') - self.assertEquals('', (html | HTMLSanitizer()).render()) --self.assertRaises(ParseError, HTML, 'alert("foo")') --self.assertRaises(ParseError, HTML, -- 'http://example.com/";>') -+html = HTML('alert("foo")') -+self.assertEquals('alert("foo")', -+ (html | HTMLSanitizer()).render()) -+html = HTML('http://example.com/";>') -+self.assertEquals('