diff options
| author |   Repository QA checks <repo-qa-checks@gentoo.org> | 2017-11-19 14:33:37 +0000 |
|---|---|---|
| committer | Repository QA checks <repo-qa-checks@gentoo.org> | 2017-11-19 14:33:37 +0000 |
| commit | 5c6366daecc311b04f8015ffe78c5997155a8e36 (patch) | |
| tree | 88ed7d09d4005d5778c23189ab09e2d34f14bf89 | |
| parent | 2017-11-19 09:24:10 UTC (diff) | |
| parent | games-action/atanks: Remove old (diff) | |
| download | gentoo-5c6366daecc311b04f8015ffe78c5997155a8e36.tar.gz gentoo-5c6366daecc311b04f8015ffe78c5997155a8e36.tar.bz2 gentoo-5c6366daecc311b04f8015ffe78c5997155a8e36.zip | |
Merge updates from master
110 files changed, 1207 insertions, 4904 deletions
diff --git a/app-admin/metalog/metalog-3-r2.ebuild b/app-admin/metalog/metalog-3-r2.ebuild index 073d55ec90e1..ee7031589446 100644 --- a/app-admin/metalog/metalog-3-r2.ebuild +++ b/app-admin/metalog/metalog-3-r2.ebuild @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" IUSE="unicode" RDEPEND=">=dev-libs/libpcre-3.4" diff --git a/app-doc/doxygen/doxygen-1.8.12.ebuild b/app-doc/doxygen/doxygen-1.8.12.ebuild index 180085b00aa4..78d2e3148ac3 100644 --- a/app-doc/doxygen/doxygen-1.8.12.ebuild +++ b/app-doc/doxygen/doxygen-1.8.12.ebuild @@ -63,7 +63,7 @@ pkg_setup() { } src_prepare() { - default + cmake-utils_src_prepare # Ensure we link to -liconv if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; then diff --git a/app-doc/doxygen/doxygen-9999.ebuild b/app-doc/doxygen/doxygen-9999.ebuild index cac030450f19..70af58f7ee83 100644 --- a/app-doc/doxygen/doxygen-9999.ebuild +++ b/app-doc/doxygen/doxygen-9999.ebuild @@ -60,7 +60,7 @@ pkg_setup() { } src_prepare() { - default + cmake-utils_src_prepare # Ensure we link to -liconv if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; then diff --git a/app-doc/halibut/halibut-1.2.ebuild b/app-doc/halibut/halibut-1.2.ebuild index 5a7b3c9d44f7..7acefbd01bc9 100644 --- a/app-doc/halibut/halibut-1.2.ebuild +++ b/app-doc/halibut/halibut-1.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://www.chiark.greenend.org.uk/~sgtatham/${PN}/${P}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="~amd64 ppc ~x86" IUSE="" src_compile() { diff --git a/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch index d54c8da00191..ddf5a0c3309e 100644 --- a/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch +++ b/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch @@ -225,3 +225,47 @@ diff -Naur gprbuild-gpl-2016-src.old/src/gprinstall-sigint_intercepted.ads gprbu if Gpr_Prj_Path.all /= "" then Add_Directories (Self, Gpr_Prj_Path.all); end if; +--- gprbuild-gpl-2017-src/gpr/src/gpr-names.ads.old 2017-11-19 13:09:18.947527738 +0100 ++++ gprbuild-gpl-2017-src/gpr/src/gpr-names.ads 2017-11-19 13:10:08.125654595 +0100 +@@ -27,6 +27,8 @@ + Name_Buffer : String (1 .. 1_000_000); + Name_Len : Natural := 0; + ++ Last_Id : Name_Id := Name_Id'First; ++ + procedure Get_Name_String (Id : Name_Id); + procedure Get_Name_String (Id : Unit_Name_Type); + procedure Get_Name_String (Id : File_Name_Type); +--- gprbuild-gpl-2017-src/gpr/src/gpr-names.adb.old 2017-11-19 13:10:27.674316703 +0100 ++++ gprbuild-gpl-2017-src/gpr/src/gpr-names.adb 2017-11-19 13:14:38.360963627 +0100 +@@ -354,6 +354,8 @@ + + Name_Chars.Append (ASCII.NUL); + ++ Last_Id := Name_Entries.Last; ++ + return Name_Entries.Last; + end Name_Enter; + +@@ -427,6 +429,8 @@ + + Name_Chars.Append (ASCII.NUL); + ++ Last_Id := Name_Entries.Last; ++ + return Name_Entries.Last; + end Name_Find; + +--- gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb.old 2017-11-19 13:12:41.592995718 +0100 ++++ gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb 2017-11-19 13:16:31.980979696 +0100 +@@ -53,6 +53,10 @@ + return; + end if; + ++ if Last_Id = Name_Id'First then ++ Add_Name (""); ++ end if; ++ + Add_Name ("a"); + Add_Name ("b"); + Add_Name ("c"); diff --git a/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch index 57b3bfe213e9..79a07a349887 100644 --- a/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch +++ b/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch @@ -32,3 +32,47 @@ if Gpr_Prj_Path.all /= "" then Add_Directories (Self, Gpr_Prj_Path.all); end if; +--- gprbuild-gpl-2017-src/gpr/src/gpr-names.ads.old 2017-11-19 13:09:18.947527738 +0100 ++++ gprbuild-gpl-2017-src/gpr/src/gpr-names.ads 2017-11-19 13:10:08.125654595 +0100 +@@ -27,6 +27,8 @@ + Name_Buffer : String (1 .. 1_000_000); + Name_Len : Natural := 0; + ++ Last_Id : Name_Id := Name_Id'First; ++ + procedure Get_Name_String (Id : Name_Id); + procedure Get_Name_String (Id : Unit_Name_Type); + procedure Get_Name_String (Id : File_Name_Type); +--- gprbuild-gpl-2017-src/gpr/src/gpr-names.adb.old 2017-11-19 13:10:27.674316703 +0100 ++++ gprbuild-gpl-2017-src/gpr/src/gpr-names.adb 2017-11-19 13:14:38.360963627 +0100 +@@ -354,6 +354,8 @@ + + Name_Chars.Append (ASCII.NUL); + ++ Last_Id := Name_Entries.Last; ++ + return Name_Entries.Last; + end Name_Enter; + +@@ -427,6 +429,8 @@ + + Name_Chars.Append (ASCII.NUL); + ++ Last_Id := Name_Entries.Last; ++ + return Name_Entries.Last; + end Name_Find; + +--- gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb.old 2017-11-19 13:12:41.592995718 +0100 ++++ gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb 2017-11-19 13:16:31.980979696 +0100 +@@ -53,6 +53,10 @@ + return; + end if; + ++ if Last_Id = Name_Id'First then ++ Add_Name (""); ++ end if; ++ + Add_Name ("a"); + Add_Name ("b"); + Add_Name ("c"); diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest index 9b917725e766..a5fed084adf4 100644 --- a/dev-db/mysql-workbench/Manifest +++ b/dev-db/mysql-workbench/Manifest @@ -1,3 +1,4 @@ DIST antlr-3.4-complete.jar 2388361 SHA256 9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7 SHA512 04be4dfba3a21f3ab9d9e439a64958bd8e844a9f151b798383bd9e0dd6ebc416783ae7cb1d1dbb27fb7288ab9756b13b8338cdb8ceb41a10949c852ad45ab1f2 WHIRLPOOL 488b7b9af1d1d06cca163d43e7be190730e2f0421796c21a26ace11196ee37a16b1bdeea78a1e2e64f8ca0e87f67a2aecd066af21505f3dd92dd76de40a94fa0 +DIST mysql-workbench-community-6.3.10-src.tar.gz 14969443 SHA256 b5593e439c6f8d50262a8950456a9ba3709b02d1dece0360d5f6e47e1b0d7dc3 SHA512 f892853a5f8b000c424b945c38680e17b041699fe2b03743b71c803de6cedeb12e3f69ad94d1c737e23f26d8608026e18fb29d31be6b3a2ffea1d78229212a4d WHIRLPOOL e5d589a15a41a63861ad479a56b8d843487cf739fe9c3422796ddfac1577e7535e6c8c3531ee01595fb7780c524dd186371740ae36ed2d508b36fc7d9e764874 DIST mysql-workbench-community-6.3.4-src.tar.gz 14954524 SHA256 be47f30c48c04f951a1be9b6496e4d94d5b975d6c693933ba2fa6e96718179d3 SHA512 8d7eacd46fd3cac912dac2fdbc0669759f9411796507cca76b0ad47228381b15b7f88e60a7a5a8763e704b456884828783cb0c7ed218025edb35aa5033d7d02f WHIRLPOOL 9e00ce475e573ee8b875d9f25d73d488cf68ff96b2eb006dba1dc7e424c70a0650cac42dcc3ed34648c5879354cab5311eaf6729e9b307718935d543c4f43bf5 DIST mysql-workbench-community-6.3.9-src.tar.gz 14634678 SHA256 607af29481821b25c13c8b28011162c9d6d5e9ef96df5f664408116b88308951 SHA512 a3df060114adb0c4f95423dc2732a39917be4eb2281cc2d811cc68c2d43cfa28eea52c4ab743018e91c8c58b0ad7d4b34a9936df8c17381accee8159afe19901 WHIRLPOOL 654eaa76d6f132e50ca904aae54c07a7d2aabe746e519f5c6c8cd5d40529ebe022616d5ef28be8dd322aba19e589dc8d9dd2bb4c5f2356fa7b5698a84190208e diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild b/dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild new file mode 100644 index 000000000000..efa53cd769f5 --- /dev/null +++ b/dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GCONF_DEBUG="no" + +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="sqlite" + +inherit gnome2 eutils flag-o-matic python-single-r1 cmake-utils + +MY_P="${PN}-community-${PV}-src" + +DESCRIPTION="MySQL Workbench" +HOMEPAGE="https://www.mysql.com/products/workbench/" +SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz https://github.com/antlr/website-antlr3/blob/gh-pages/download/antlr-3.4-complete.jar?raw=true -> antlr-3.4-complete.jar" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="debug doc gnome-keyring" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +# glibc: deprecated mutex functions, removed in 2.36.0 +CDEPEND="${PYTHON_DEPS} + dev-libs/glib:2 + dev-cpp/atkmm + dev-cpp/pangomm + >=dev-cpp/glibmm-2.14:2 + dev-cpp/gtkmm:3.0 + dev-libs/atk + x11-libs/pango + x11-libs/gtk+:3 + gnome-base/libglade:2.0 + >=x11-libs/cairo-1.5.12[glib,svg] + dev-libs/libsigc++:2 + >=dev-libs/boost-1.55.0[nls] + >=dev-cpp/ctemplate-0.95 + >=dev-libs/libxml2-2.6.2:2 + dev-libs/libzip + >=virtual/mysql-5.6 + dev-libs/libpcre[cxx] + >=sci-libs/gdal-1.11.1-r1[-mdb] + virtual/opengl + || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid ) + dev-libs/tinyxml[stl] + >=dev-db/mysql-connector-c++-1.1.8 + dev-db/vsqlite++ + || ( dev-db/libiodbc dev-db/unixODBC ) + gnome-keyring? ( gnome-base/libgnome-keyring ) + dev-python/pexpect + >=dev-python/paramiko-1.7.4 + " + +RDEPEND="${CDEPEND} + app-admin/sudo + >=sys-apps/net-tools-1.60_p20120127084908" + +DEPEND="${CDEPEND} + dev-lang/swig + virtual/jre + virtual/pkgconfig" + +S="${WORKDIR}"/"${MY_P}" + +PATCHES=( + "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch" + "${FILESDIR}/${PN}-6.3.9-mariadb-json.patch" +) + +src_unpack() { + unpack ${PN}-community-${PV}-src.tar.gz +} + +src_prepare() { + sed -i -e '/target_link_libraries/ s/sqlparser.grt/sqlparser.grt sqlparser/' \ + modules/db.mysql.sqlparser/CMakeLists.txt + + ## remove hardcoded CXXFLAGS + sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die + + ## package is very fragile... + strip-flags + + cmake-utils_src_prepare +} + +src_configure() { + append-cxxflags -std=c++11 + local mycmakeargs=( + -DUSE_GNOME_KEYRING="$(usex gnome-keyring)" + -DLIB_INSTALL_DIR="/usr/$(get_libdir)" + -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" + -DPYTHON_LIBRARY="$(python_get_library_path)" + -DMySQL_CONFIG_PATH="/usr/bin/mysql_config" + ) + ANTLR_JAR_PATH="${DISTDIR}/antlr-3.4-complete.jar" cmake-utils_src_configure +} + +src_compile() { + # Work around parallel build issues, bug 507838 + cmake-utils_src_compile -j1 +} diff --git a/dev-libs/zthread/zthread-2.3.2-r4.ebuild b/dev-libs/zthread/zthread-2.3.2-r4.ebuild index 33b3ecb1670d..02a19d70ea2b 100644 --- a/dev-libs/zthread/zthread-2.3.2-r4.ebuild +++ b/dev-libs/zthread/zthread-2.3.2-r4.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/zthread/${MY_P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="alpha amd64 ~hppa ~mips ~ppc ~sparc x86" +KEYWORDS="alpha amd64 ~hppa ~mips ppc ~sparc x86" IUSE="debug doc kernel_linux static-libs" DEPEND="doc? ( app-doc/doxygen )" diff --git a/dev-perl/MIME-Lite-HTML/metadata.xml b/dev-perl/MIME-Lite-HTML/metadata.xml index 51930499ab60..75c21feffd92 100644 --- a/dev-perl/MIME-Lite-HTML/metadata.xml +++ b/dev-perl/MIME-Lite-HTML/metadata.xml @@ -5,4 +5,9 @@ <email>perl@gentoo.org</email> <name>Gentoo Perl Project</name> </maintainer> + <upstream> + <remote-id type="cpan">MIME-Lite-HTML</remote-id> + <remote-id type="cpan-module">MIME::Lite::HTML</remote-id> + <remote-id type="cpan-module">RequestAgent</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-perl/MIME-Lite/MIME-Lite-3.30.0.ebuild b/dev-perl/MIME-Lite/MIME-Lite-3.30.0.ebuild index bd63ca7705bf..b61b2b4da194 100644 --- a/dev-perl/MIME-Lite/MIME-Lite-3.30.0.ebuild +++ b/dev-perl/MIME-Lite/MIME-Lite-3.30.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -33,6 +33,9 @@ DEPEND="${RDEPEND} virtual/perl-ExtUtils-MakeMaker " +# Race condition in "testout" directory creation +DIST_TEST="do" + src_install() { perl-module_src_install insinto /usr/share/${PN} diff --git a/dev-perl/Math-Base-Convert/metadata.xml b/dev-perl/Math-Base-Convert/metadata.xml index 2b9a936fc0a1..0df019ba29a9 100644 --- a/dev-perl/Math-Base-Convert/metadata.xml +++ b/dev-perl/Math-Base-Convert/metadata.xml @@ -5,4 +5,11 @@ <email>perl@gentoo.org</email> <name>Gentoo Perl Project</name> </maintainer> + <upstream> + <remote-id type="cpan">Math-Base-Convert</remote-id> + <remote-id type="cpan-module">Math::Base::Convert</remote-id> + <remote-id type="cpan-module">Math::Base::Convert::Bases</remote-id> + <remote-id type="cpan-module">Math::Base::Convert::CalcPP</remote-id> + <remote-id type="cpan-module">Math::Base::Convert::Shortcuts</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-perl/Math-ModInt/metadata.xml b/dev-perl/Math-ModInt/metadata.xml index 832123d2b975..3a6d82a72e69 100644 --- a/dev-perl/Math-ModInt/metadata.xml +++ b/dev-perl/Math-ModInt/metadata.xml @@ -7,5 +7,14 @@ </maintainer> <upstream> <remote-id type="cpan">Math-ModInt</remote-id> + <remote-id type="cpan-module">Math::ModInt</remote-id> + <remote-id type="cpan-module">Math::ModInt::BigInt</remote-id> + <remote-id type="cpan-module">Math::ModInt::ChineseRemainder</remote-id> + <remote-id type="cpan-module">Math::ModInt::Event</remote-id> + <remote-id type="cpan-module">Math::ModInt::Event::Trap</remote-id> + <remote-id type="cpan-module">Math::ModInt::GF2</remote-id> + <remote-id type="cpan-module">Math::ModInt::GF3</remote-id> + <remote-id type="cpan-module">Math::ModInt::Perl</remote-id> + <remote-id type="cpan-module">Math::ModInt::Trivial</remote-id> </upstream> </pkgmetadata> diff --git a/dev-perl/MediaWiki-API/metadata.xml b/dev-perl/MediaWiki-API/metadata.xml index 51930499ab60..29f40133dea5 100644 --- a/dev-perl/MediaWiki-API/metadata.xml +++ b/dev-perl/MediaWiki-API/metadata.xml @@ -5,4 +5,8 @@ <email>perl@gentoo.org</email> <name>Gentoo Perl Project</name> </maintainer> + <upstream> + <remote-id type="cpan">MediaWiki-API</remote-id> + <remote-id type="cpan-module">MediaWiki::API</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-perl/Module-Compile/metadata.xml b/dev-perl/Module-Compile/metadata.xml index 51930499ab60..229a7f687dd4 100644 --- a/dev-perl/Module-Compile/metadata.xml +++ b/dev-perl/Module-Compile/metadata.xml @@ -5,4 +5,10 @@ <email>perl@gentoo.org</email> <name>Gentoo Perl Project</name> </maintainer> + <upstream> + <remote-id type="cpan">Module-Compile</remote-id> + <remote-id type="cpan-module">Module::Compile</remote-id> + <remote-id type="cpan-module">Module::Compile::Opt</remote-id> + <remote-id type="cpan-module">Module::Optimize</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-perl/Module-Runtime/Module-Runtime-0.16.0.ebuild b/dev-perl/Module-Runtime/Module-Runtime-0.16.0.ebuild index ca4242298ab3..ccc4fc9cb92a 100644 --- a/dev-perl/Module-Runtime/Module-Runtime-0.16.0.ebuild +++ b/dev-perl/Module-Runtime/Module-Runtime-0.16.0.ebuild @@ -21,8 +21,6 @@ DEPEND="${RDEPEND} ) " -SRC_TEST="do" - src_test() { perl_rm_files t/pod_cvg.t t/pod_syn.t perl-module_src_test diff --git a/dev-perl/Module-Signature/Module-Signature-0.810.0.ebuild b/dev-perl/Module-Signature/Module-Signature-0.810.0.ebuild index 7ff554717ffc..7ebfaa72c276 100644 --- a/dev-perl/Module-Signature/Module-Signature-0.810.0.ebuild +++ b/dev-perl/Module-Signature/Module-Signature-0.810.0.ebuild @@ -26,8 +26,6 @@ DEPEND="${RDEPEND} ) " -SRC_TEST="do parallel" - src_prepare() { sed -i -e 's/use inc::Module::Install /use lib q[.]; use inc::Module::Install /' Makefile.PL || die "Can't patch Makefile.PL for 5.26 dot-in-inc" diff --git a/dev-perl/MooX-HandlesVia/metadata.xml b/dev-perl/MooX-HandlesVia/metadata.xml index 51930499ab60..550bddadd3f1 100644 --- a/dev-perl/MooX-HandlesVia/metadata.xml +++ b/dev-perl/MooX-HandlesVia/metadata.xml @@ -5,4 +5,13 @@ <email>perl@gentoo.org</email> <name>Gentoo Perl Project</name> </maintainer> + <upstream> + <remote-id type="cpan">MooX-HandlesVia</remote-id> + <remote-id type="cpan-module">Data::Perl::Bool::MooseLike</remote-id> + <remote-id type="cpan-module">Data::Perl::Collection::Array::MooseLike</remote-id> + <remote-id type="cpan-module">Data::Perl::Collection::Hash::MooseLike</remote-id> + <remote-id type="cpan-module">Data::Perl::Number::MooseLike</remote-id> + <remote-id type="cpan-module">Data::Perl::String::MooseLike</remote-id> + <remote-id type="cpan-module">MooX::HandlesVia</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-perl/Moose-Autobox/metadata.xml b/dev-perl/Moose-Autobox/metadata.xml index 2b9a936fc0a1..aa874415a26c 100644 --- a/dev-perl/Moose-Autobox/metadata.xml +++ b/dev-perl/Moose-Autobox/metadata.xml @@ -5,4 +5,21 @@ <email>perl@gentoo.org</email> <name>Gentoo Perl Project</name> </maintainer> + <upstream> + <remote-id type="cpan">Moose-Autobox</remote-id> + <remote-id type="cpan-module">Moose::Autobox</remote-id> + <remote-id type="cpan-module">Moose::Autobox::Array</remote-id> + <remote-id type="cpan-module">Moose::Autobox::Code</remote-id> + <remote-id type="cpan-module">Moose::Autobox::Defined</remote-id> + <remote-id type="cpan-module">Moose::Autobox::Hash</remote-id> + <remote-id type="cpan-module">Moose::Autobox::Indexed</remote-id> + <remote-id type="cpan-module">Moose::Autobox::Item</remote-id> + <remote-id type="cpan-module">Moose::Autobox::List</remote-id> + <remote-id type="cpan-module">Moose::Autobox::Number</remote-id> + <remote-id type="cpan-module">Moose::Autobox::Ref</remote-id> + <remote-id type="cpan-module">Moose::Autobox::Scalar</remote-id> + <remote-id type="cpan-module">Moose::Autobox::String</remote-id> + <remote-id type="cpan-module">Moose::Autobox::Undef</remote-id> + <remote-id type="cpan-module">Moose::Autobox::Value</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-perl/MooseX-Has-Sugar/metadata.xml b/dev-perl/MooseX-Has-Sugar/metadata.xml index 2b9a936fc0a1..fbd9046a7695 100644 --- a/dev-perl/MooseX-Has-Sugar/metadata.xml +++ b/dev-perl/MooseX-Has-Sugar/metadata.xml @@ -5,4 +5,10 @@ <email>perl@gentoo.org</email> <name>Gentoo Perl Project</name> </maintainer> + <upstream> + <remote-id type="cpan">MooseX-Has-Sugar</remote-id> + <remote-id type="cpan-module">MooseX::Has::Sugar</remote-id> + <remote-id type="cpan-module">MooseX::Has::Sugar::Minimal</remote-id> + <remote-id type="cpan-module">MooseX::Has::Sugar::Saccharin</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-perl/MooseX-Params-Validate/metadata.xml b/dev-perl/MooseX-Params-Validate/metadata.xml index 8ad3d950c4bd..975af7182ff4 100644 --- a/dev-perl/MooseX-Params-Validate/metadata.xml +++ b/dev-perl/MooseX-Params-Validate/metadata.xml @@ -5,4 +5,9 @@ <email>perl@gentoo.org</email> <name>Gentoo Perl Project</name> </maintainer> + <upstream> + <remote-id type="cpan">MooseX-Params-Validate</remote-id> + <remote-id type="cpan-module">MooseX::Params::Validate</remote-id> + <remote-id type="cpan-module">MooseX::Params::Validate::Exception::ValidationFailedForTypeConstraint</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-perl/MooseX-Role-WithOverloading/Manifest b/dev-perl/MooseX-Role-WithOverloading/Manifest index 93b7140e4dfc..6c42cdd1521f 100644 --- a/dev-perl/MooseX-Role-WithOverloading/Manifest +++ b/dev-perl/MooseX-Role-WithOverloading/Manifest @@ -1 +1,2 @@ DIST MooseX-Role-WithOverloading-0.16.tar.gz 30591 SHA256 bb610bc0cecec8a59f15da9d483e9d7c628e54847a0a2460d79b901b0710da4d SHA512 0255d2c2f5b21e996281d883c680564dfe4504a70e7a9bd1936a85ee77ceb6126f8778e8e1c1e46bf166b97f043052b9cb28d5e4f270c3ca852c35fd48522ae1 WHIRLPOOL f38b2aea4dc3d65707e665b23baa7720a1912481643f8eee5fffc370531a758a41299fe09f71ae59aad75e55802b36d908e960d33ca1e3f37e8d47221852f041 +DIST MooseX-Role-WithOverloading-0.17.tar.gz 32308 SHA256 92b095d73f1220f9c2ed2d3aaa5ba072eb5aa2de209b7c455da5a8701b986865 SHA512 510c243dc561b82ee50934e802e697d1fcd4db35c6a4cd8044f5cd5668c890e38a6ba38648f8ca0f11ac55dfddc3d4fa94f2e6ed90871547d76e3b5953e54155 WHIRLPOOL e17d3c4a57784c8d837447987246063e774009ecf51454969e77dfad29d92bfdbb100fd946c11a999a047a16942f005703d231eae853ecef0ea0322e303f7005 diff --git a/dev-perl/MooseX-Role-WithOverloading/MooseX-Role-WithOverloading-0.170.0.ebuild b/dev-perl/MooseX-Role-WithOverloading/MooseX-Role-WithOverloading-0.170.0.ebuild new file mode 100644 index 000000000000..6ffe72b0d3f8 --- /dev/null +++ b/dev-perl/MooseX-Role-WithOverloading/MooseX-Role-WithOverloading-0.170.0.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DIST_AUTHOR=ETHER +DIST_VERSION=0.17 +inherit perl-module + +DESCRIPTION="Roles which support overloading (DEPRECATED)" + +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x64-macos" +IUSE="test" + +RDEPEND=" + >=dev-perl/Moose-0.940.0 + dev-perl/aliased + >=dev-perl/namespace-autoclean-0.160.0 + >=dev-perl/namespace-clean-0.190.0 +" +DEPEND="${RDEPEND} + virtual/perl-ExtUtils-MakeMaker + test? ( + virtual/perl-File-Spec + >=virtual/perl-Test-Simple-0.960.0 + virtual/perl-if + ) +" +pkg_postinst() { + ewarn "dev-perl/MooseX-Role-WithOverloading is deprecated by upstream as" + ewarn "equivalent functionality is now provided by >=dev-perl/Moose-2.130.0" +} diff --git a/dev-perl/MooseX-Role-WithOverloading/metadata.xml b/dev-perl/MooseX-Role-WithOverloading/metadata.xml index f53c778e0d38..7d2e1283a5af 100644 --- a/dev-perl/MooseX-Role-WithOverloading/metadata.xml +++ b/dev-perl/MooseX-Role-WithOverloading/metadata.xml @@ -5,4 +5,19 @@ <email>perl@gentoo.org</email> <name>Gentoo Perl Project</name> </maintainer> + <upstream> + <remote-id type="cpan">MooseX-Role-WithOverloading</remote-id> + <remote-id type="cpan-module">MooseX::Role::WithOverloading</remote-id> + <remote-id type="cpan-module">MooseX::Role::WithOverloading::Meta::Role</remote-id> + <remote-id type="cpan-module">MooseX::Role::WithOverloading::Meta::Role::Application</remote-id> + <remote-id type="cpan-module">MooseX::Role::WithOverloading::Meta::Role::Application::Composite</remote-id> + <remote-id type="cpan-module">MooseX::Role::WithOverloading::Meta::Role::Application::Composite::ToClass</remote-id> + <remote-id type="cpan-module">MooseX::Role::WithOverloading::Meta::Role::Application::Composite::ToInstance</remote-id> + <remote-id type="cpan-module">MooseX::Role::WithOverloading::Meta::Role::Application::Composite::ToRole</remote-id> + <remote-id type="cpan-module">MooseX::Role::WithOverloading::Meta::Role::Application::FixOverloadedRefs</remote-id> + <remote-id type="cpan-module">MooseX::Role::WithOverloading::Meta::Role::Application::ToClass</remote-id> + <remote-id type="cpan-module">MooseX::Role::WithOverloading::Meta::Role::Application::ToInstance</remote-id> + <remote-id type="cpan-module">MooseX::Role::WithOverloading::Meta::Role::Application::ToRole</remote-id> + <remote-id type="cpan-module">MooseX::Role::WithOverloading::Meta::Role::Composite</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-perl/MooseX-StrictConstructor/Manifest b/dev-perl/MooseX-StrictConstructor/Manifest index 74263e57d2c4..bb890756b5e6 100644 --- a/dev-perl/MooseX-StrictConstructor/Manifest +++ b/dev-perl/MooseX-StrictConstructor/Manifest @@ -1 +1,2 @@ DIST MooseX-StrictConstructor-0.19.tar.gz 10242 SHA256 486573c16901e83c081da3d90a544281af1baa40bbf036337d6fa91994e48a31 SHA512 49fe134b4fa9f8deef014851aa851a185f02eb6f75c293e76a1143cb23de760aa46aeefcdb4c22322b545e73058532d35b0924f91de2561277b3f485f7a2fabd WHIRLPOOL 3f6b0211160f81a0d9ac1a98e4eb7b3ba0222dd73fed741431288b790c1e9799325cadd1a3fef25a364da653131648841b7ff92ca4c6def0d68e57deb25beae5 +DIST MooseX-StrictConstructor-0.21.tar.gz 26792 SHA256 c72a5ae9583706ccdec71d401dcb3054013a7536b750df1436613d858ea2920d SHA512 b515ce0de7962b2d2da0da3dfd0fab978a014f2d5dc9e92e76cc137a260d3190a993d3b791db5eaf416e838180bdec1f827961aad4552c67f7c7cf1477107bfc WHIRLPOOL 32d85850ed2423713f246658cc85fae0012bf441cc7c5b1fac16c3cdc7c380a45e132570ce59db3273e8a0d9339411dbe281fb3879488bd92d3a3ad6ccbddd39 diff --git a/dev-perl/MooseX-StrictConstructor/MooseX-StrictConstructor-0.210.0.ebuild b/dev-perl/MooseX-StrictConstructor/MooseX-StrictConstructor-0.210.0.ebuild new file mode 100644 index 000000000000..30968f8ada84 --- /dev/null +++ b/dev-perl/MooseX-StrictConstructor/MooseX-StrictConstructor-0.210.0.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DIST_AUTHOR=DROLSKY +DIST_VERSION=0.21 +inherit perl-module + +DESCRIPTION="Make your object constructors blow up on unknown attributes" + +LICENSE="Artistic-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +RDEPEND=" + >=dev-perl/Moose-0.940.0 + dev-perl/namespace-autoclean +" +DEPEND="${RDEPEND} + virtual/perl-ExtUtils-MakeMaker + test? ( + virtual/perl-File-Spec + dev-perl/Test-Fatal + dev-perl/Test-Needs + >=virtual/perl-Test-Simple-0.960.0 + ) +" diff --git a/dev-perl/MooseX-Types-Path-Class/Manifest b/dev-perl/MooseX-Types-Path-Class/Manifest index 90993b924c79..116b798eb7fa 100644 --- a/dev-perl/MooseX-Types-Path-Class/Manifest +++ b/dev-perl/MooseX-Types-Path-Class/Manifest @@ -1 +1,2 @@ DIST MooseX-Types-Path-Class-0.08.tar.gz 28203 SHA256 38c55c0723d2533b0b16b41eda78adbe71194f3b7588a3b3f7ec71b2768664b7 SHA512 d206b32d765f7766e18cc15a045f1ab34efa160aa699823a9be437861bc2a3c8deee0bf66a46b7e2ccb5fc6ba25fa18c40391606f25c5a9e024f7744be7841c7 WHIRLPOOL bc673df8e53b681e835057e12c2af7e03bea7cdccec651aa9682f52db18f053ace3bda681f34d55f30a04f788c3e5b30e3bccc05cf85d6cc82df00f2fd55bf8b +DIST MooseX-Types-Path-Class-0.09.tar.gz 29220 SHA256 e784bab53698ae95a709a8663306145ffec55668df6cf31615333523fbe7ef7e SHA512 d61f72957431852903d99257b2d9f53f88702d4d314297192345896aeb1df86ab4d80767a1d0fad76fb23b561925aae076bfda80106e3f7d0f2d8093956bdc9e WHIRLPOOL 793b1064d08a59f4cbbb66398ee717ff5d05c36574ddac0736234db8ddcd23bc7482c2d3c34ca301bc49603e17691cec840d7bd5e2e23635af5b9a1a99bf153d diff --git a/dev-perl/MooseX-Types-Path-Class/MooseX-Types-Path-Class-0.90.0.ebuild b/dev-perl/MooseX-Types-Path-Class/MooseX-Types-Path-Class-0.90.0.ebuild new file mode 100644 index 000000000000..4c8696d77de0 --- /dev/null +++ b/dev-perl/MooseX-Types-Path-Class/MooseX-Types-Path-Class-0.90.0.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DIST_AUTHOR=ETHER +DIST_VERSION=0.09 +inherit perl-module + +DESCRIPTION="A Path::Class type library for Moose" + +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test minimal" + +RDEPEND=" + dev-perl/MooseX-Types + >=dev-perl/Path-Class-0.160.0 + virtual/perl-if +" +DEPEND="${RDEPEND} + >=dev-perl/Module-Build-Tiny-0.34.0 + test? ( + !minimal? ( dev-perl/MooseX-Getopt ) + virtual/perl-File-Spec + virtual/perl-Module-Metadata + dev-perl/Moose + dev-perl/Test-Needs + virtual/perl-Test-Simple + ) +" diff --git a/dev-perl/MooseX-Types-Path-Tiny/Manifest b/dev-perl/MooseX-Types-Path-Tiny/Manifest index 8a62a74551b4..23f0910bfdfc 100644 --- a/dev-perl/MooseX-Types-Path-Tiny/Manifest +++ b/dev-perl/MooseX-Types-Path-Tiny/Manifest @@ -1 +1,2 @@ DIST MooseX-Types-Path-Tiny-0.011.tar.gz 25140 SHA256 668ea48c99bc4a61cbdd87c39cfa0cb6c1e9c1b0c9f221a25a976bb4bccc6f00 SHA512 b18d674d0fbed5266591bd3cc221d8ebe996ff9214cc7d74e111bb3b570193e6373e7220023a79a71ff982b4d5b4829fc2a9f3dd9aef8b78a8d1457718f8a679 WHIRLPOOL 3b2c490c667066d48e7223230e1407e86d176e293cab59230b0fabdb900fa04e26d8c50d7944dcf55c974c588ac39f8d2a59bd19b973a205bd2097bc60de8b15 +DIST MooseX-Types-Path-Tiny-0.012.tar.gz 28898 SHA256 19eede02dd654e70f73e34cd7af0063765173bcaefeeff1bdbe21318ecfd9158 SHA512 96f7632a94677e85f88fdae3b818ff54096f088137baef994181fcb352dcd4b6da5993045422923fe232e3818582e067dcfd5c7689713488aee09da8f8285351 WHIRLPOOL da998d8ed4b91b8197f400b4d6b7ed76bed6f7776b359e6fedd4d1fadd7cb3a5a09f7eafbfc40007bea55615ffb61caa8ebc37aed89016c0f0ce06fc0d02bfd6 diff --git a/dev-perl/MooseX-Types-Path-Tiny/MooseX-Types-Path-Tiny-0.12.0.ebuild b/dev-perl/MooseX-Types-Path-Tiny/MooseX-Types-Path-Tiny-0.12.0.ebuild new file mode 100644 index 000000000000..28233ddd7016 --- /dev/null +++ b/dev-perl/MooseX-Types-Path-Tiny/MooseX-Types-Path-Tiny-0.12.0.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DIST_AUTHOR=ETHER +DIST_VERSION=0.012 +inherit perl-module + +DESCRIPTION="Path::Tiny types and coercions for Moose" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +RDEPEND=" + >=dev-perl/Moose-2.0.0 + dev-perl/MooseX-Getopt + dev-perl/MooseX-Types + dev-perl/MooseX-Types-Stringlike + dev-perl/Path-Tiny + virtual/perl-if + dev-perl/namespace-autoclean +" +DEPEND="${RDEPEND} + >=dev-perl/Module-Build-Tiny-0.34.0 + test? ( + virtual/perl-File-Spec + >=virtual/perl-File-Temp-0.180.0 + dev-perl/File-pushd + virtual/perl-Module-Metadata + dev-perl/Test-Fatal + >=virtual/perl-Test-Simple-0.960.0 + ) +" +mytargets="install" diff --git a/dev-perl/MooseX-Types/Manifest b/dev-perl/MooseX-Types/Manifest index b5c2415917b2..a7a1cf92f72c 100644 --- a/dev-perl/MooseX-Types/Manifest +++ b/dev-perl/MooseX-Types/Manifest @@ -1,2 +1,3 @@ DIST MooseX-Types-0.36.tar.gz 55122 SHA256 cf73a14fa67ca3070b76e071a933fae87b8daf1dbc48970d8461884ee9f8e9aa SHA512 970938bbe9fa484e0623e30f611e84145bc4a1ded442c1c777ec5df20129a7af05612084228fe2073ff14e4acc7a94e797a509021344b006acbcf414277d30f9 WHIRLPOOL 382e2e3de8d0ea4a6a7f69d0859f70abcd86583842491dcbbce1c5f24ce95cedb35525ba2a86653576fdc432ba65b1a4b9d706a6900b8911dd7d0e9fed685abe DIST MooseX-Types-0.46.tar.gz 54112 SHA256 e9e8c36284cf1adc6563c980c0a4f0a7df720dbaaece0dd6be66b975dde5db7a SHA512 9eee2afb7122d63a43af8c193c82fd9bf3600245956b7878badedf42280aa38814bf7370da31ede0f437e44f368d68d9c600a4f90bf42f95fa8fdb16b1056d4e WHIRLPOOL f6b165a034eb20291692f19757492f9983f39a42fe44a602470980b84f126c76dafc39699a14485127dfacbc71d0f81899c56c4335f85723e5209fe51874c475 +DIST MooseX-Types-0.50.tar.gz 57252 SHA256 9cd87b3492cbf0be9d2df9317b2adf9fc30663770e69906654bea3f41b17cb08 SHA512 42606b1caeb6423acaaa9288239c63512f398a2fba45492443d3e003c6ae3e93cbd8ea2631d487e428ea7d25b63744e4c2096a1e53012e262c99ff4b0c29484b WHIRLPOOL 3c05987fe21e3a1575bc4e5b23cad13e1839c89a8690802f69031ab60b6530d52ba913e1ef4c88aa9ee1fc4313580d3b6d8e5350a707a3113d118aeef47ea788 diff --git a/dev-perl/MooseX-Types/MooseX-Types-0.500.0.ebuild b/dev-perl/MooseX-Types/MooseX-Types-0.500.0.ebuild new file mode 100644 index 000000000000..4a83ab162965 --- /dev/null +++ b/dev-perl/MooseX-Types/MooseX-Types-0.500.0.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DIST_AUTHOR=ETHER +DIST_VERSION=0.50 +DIST_EXAMPLES=("eg/*") +inherit perl-module + +DESCRIPTION="Organise your Moose types in libraries" + +SLOT="0" +KEYWORDS="~amd64 ~hppa ~ppc ~x86" +IUSE="test" + +RDEPEND=" + virtual/perl-Carp + >=dev-perl/Carp-Clan-6 + virtual/perl-Exporter + dev-perl/Module-Runtime + >=dev-perl/Moose-1.60.0 + >=virtual/perl-Scalar-List-Utils-1.190.0 + dev-perl/Sub-Exporter + >=dev-perl/Sub-Exporter-ForMethods-0.100.52 + dev-perl/Sub-Install + dev-perl/Sub-Name + >=dev-perl/namespace-autoclean-0.160.0 +" +DEPEND="${RDEPEND} + >=dev-perl/Module-Build-Tiny-0.34.0 + test? ( + virtual/perl-File-Spec + virtual/perl-Module-Metadata + dev-perl/Test-Fatal + dev-perl/Test-Requires + >=virtual/perl-Test-Simple-0.880.0 + virtual/perl-if + ) +" diff --git a/dev-perl/Mouse/Manifest b/dev-perl/Mouse/Manifest index cec821c65ee1..129e44254d30 100644 --- a/dev-perl/Mouse/Manifest +++ b/dev-perl/Mouse/Manifest @@ -1 +1,2 @@ +DIST Mouse-v2.4.10.tar.gz 222745 SHA256 b995dda1918fcebecff34458b6abd16c06b6a7844572c7293d72a24d18126d14 SHA512 57d797bed24ccea66307d95395bb7d5dd860c0bc41e25a7701cf5a16fdf28776dc7633a6b8bbb1bcf6684b930385da71bf2d44f777a211988a500e30bdf8e9e5 WHIRLPOOL 5b71633d7280de1e3859adcb792e658e96a9408f15bdd176e7808bad20ef9899218084941d93080f2c59e0de99d441ceeffce44a08734f9fcf8d70905be3745c DIST Mouse-v2.4.9.tar.gz 222421 SHA256 9640aae77bfee2fa9c739640c8da41482c183890f0901663f004867e12d540f8 SHA512 194471dc7121692dc4dcd384c4e3ecd3936457bf34fa3088b25abc9d6d5faa76fc7ca08ee2c1bc23c3ab9c2d91a6b414b065796aea1371d46a31cbf248621b10 WHIRLPOOL f990d98e15c3e265f8f9a35853202c862b3a60d20b13b84a92264828d9d49084c5df7004e25360876833f3d95e8793a7d1f29e4d7782f755c219f85a6d18b817 diff --git a/dev-perl/Mouse/Mouse-2.4.10.ebuild b/dev-perl/Mouse/Mouse-2.4.10.ebuild new file mode 100644 index 000000000000..b9884ff69e83 --- /dev/null +++ b/dev-perl/Mouse/Mouse-2.4.10.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DIST_AUTHOR=GFUJI +DIST_VERSION=v2.4.10 +DIST_EXAMPLES=("example/*" "benchmarks") +inherit perl-module + +DESCRIPTION="Moose minus the antlers" + +SLOT="0" +KEYWORDS="~amd64 ~hppa ~ppc ~x86" +IUSE="test" + +RDEPEND=" + >=virtual/perl-Scalar-List-Utils-1.140.0 + >=virtual/perl-XSLoader-0.20.0 +" +DEPEND="${RDEPEND} + >=virtual/perl-ExtUtils-ParseXS-3.220.0 + >=virtual/perl-Devel-PPPort-3.220.0 + >=dev-perl/Module-Build-0.400.500 + dev-perl/Module-Build-XSUtil + test? ( + dev-perl/Test-Exception + dev-perl/Test-Fatal + dev-perl/Test-LeakTrace + >=virtual/perl-Test-Simple-0.880.0 + dev-perl/Test-Output + dev-perl/Test-Requires + dev-perl/Try-Tiny + ) +" diff --git a/eclass/ruby-fakegem.eclass b/eclass/ruby-fakegem.eclass index 2bdba3630ad2..57ff678cdf07 100644 --- a/eclass/ruby-fakegem.eclass +++ b/eclass/ruby-fakegem.eclass @@ -18,18 +18,18 @@ inherit ruby-ng # @DESCRIPTION: # Sets the Gem name for the generated fake gemspec. # This variable MUST be set before inheriting the eclass. -# RUBY_FAKEGEM_NAME="${PN}" +RUBY_FAKEGEM_NAME="${RUBY_FAKEGEM_NAME:-${PN}}" # @ECLASS-VARIABLE: RUBY_FAKEGEM_VERSION # @DESCRIPTION: # Sets the Gem version for the generated fake gemspec. # This variable MUST be set before inheriting the eclass. -# RUBY_FAKEGEM_VERSION="${PV}" +RUBY_FAKEGEM_VERSION="${RUBY_FAKEGEM_VERSION:-${PV/_pre/.pre}}" # @ECLASS-VARIABLE: RUBY_FAKEGEM_TASK_DOC # @DESCRIPTION: # Specify the rake(1) task to run to generate documentation. -# RUBY_FAKEGEM_TASK_DOC="rdoc" +RUBY_FAKEGEM_TASK_DOC="${RUBY_FAKEGEM_TASK_DOC-rdoc}" # @ECLASS-VARIABLE: RUBY_FAKEGEM_RECIPE_TEST # @DESCRIPTION: @@ -40,13 +40,13 @@ inherit ruby-ng # - cucumber (calls ruby-ng_cucumber, adds dev-util/cucumber to the # dependencies; does not work on JRuby). # - none -# RUBY_FAKEGEM_RECIPE_TEST="rake" +RUBY_FAKEGEM_RECIPE_TEST="${RUBY_FAKEGEM_RECIPE_TEST-rake}" # @ECLASS-VARIABLE: RUBY_FAKEGEM_TASK_TEST # @DESCRIPTION: # Specify the rake(1) task used for executing tests. Only valid # if RUBY_FAKEGEM_RECIPE_TEST is set to "rake" (the default). -# RUBY_FAKEGEM_TASK_TEST="test" +RUBY_FAKEGEM_TASK_TEST="${RUBY_FAKEGEM_TASK_TEST-test}" # @ECLASS-VARIABLE: RUBY_FAKEGEM_RECIPE_DOC # @DESCRIPTION: @@ -55,68 +55,58 @@ inherit ruby-ng # - rdoc (calls `rdoc-2`, adds dev-ruby/rdoc to the dependencies); # - yard (calls `yard`, adds dev-ruby/yard to the dependencies); # - none -# RUBY_FAKEGEM_RECIPE_DOC="rake" +RUBY_FAKEGEM_RECIPE_DOC="${RUBY_FAKEGEM_RECIPE_DOC-rake}" # @ECLASS-VARIABLE: RUBY_FAKEGEM_DOCDIR +# @DEFAULT_UNSET # @DESCRIPTION: # Specify the directory under which the documentation is built; # if empty no documentation will be installed automatically. # Note: if RUBY_FAKEGEM_RECIPE_DOC is set to `rdoc`, this variable is # hardwired to `doc`. -# RUBY_FAKEGEM_DOCDIR="" # @ECLASS-VARIABLE: RUBY_FAKEGEM_EXTRADOC +# @DEFAULT_UNSET # @DESCRIPTION: # Extra documentation to install (readme, changelogs, …). -# RUBY_FAKEGEM_EXTRADOC="" # @ECLASS-VARIABLE: RUBY_FAKEGEM_DOC_SOURCES # @DESCRIPTION: # Allow settings defined sources to scan for documentation. # This only applies if RUBY_FAKEGEM_DOC_TASK is set to `rdoc`. -# RUBY_FAKEGEM_DOC_SOURCES="lib" +RUBY_FAKEGEM_DOC_SOURCES="${RUBY_FAKEGEM_DOC_SOURCES-lib}" # @ECLASS-VARIABLE: RUBY_FAKEGEM_BINWRAP # @DESCRIPTION: # Binaries to wrap around (relative to the RUBY_FAKEGEM_BINDIR directory) -# RUBY_FAKEGEM_BINWRAP="*" +RUBY_FAKEGEM_BINWRAP="${RUBY_FAKEGEM_BINWRAP-*}" # @ECLASS-VARIABLE: RUBY_FAKEGEM_BINDIR # @DESCRIPTION: # Path that contains binaries to be binwrapped. Equivalent to the # gemspec bindir option. -# RUBY_FAKEGEM_BINDIR="bin" +RUBY_FAKEGEM_BINDIR="${RUBY_FAKEGEM_BINDIR-bin}" # @ECLASS-VARIABLE: RUBY_FAKEGEM_REQUIRE_PATHS +# @DEFAULT_UNSET # @DESCRIPTION: # Extra require paths (beside lib) to add to the specification -# RUBY_FAKEGEM_REQUIRE_PATHS="" # @ECLASS-VARIABLE: RUBY_FAKEGEM_GEMSPEC +# @DEFAULT_UNSET # @DESCRIPTION: # Filename of .gemspec file to install instead of generating a generic one. -# RUBY_FAKEGEM_GEMSPEC="" # @ECLASS-VARIABLE: RUBY_FAKEGEM_EXTRAINSTALL # @DESCRIPTION: # List of files and directories relative to the top directory that also # get installed. Some gems provide extra files such as version information, # Rails generators, or data that needs to be installed as well. -# RUBY_FAKEGEM_EXTRAINSTALL="" +RUBY_FAKEGEM_EXTRAINSTALL="" -RUBY_FAKEGEM_NAME="${RUBY_FAKEGEM_NAME:-${PN}}" -RUBY_FAKEGEM_VERSION="${RUBY_FAKEGEM_VERSION:-${PV/_pre/.pre}}" -RUBY_FAKEGEM_SUFFIX="${RUBY_FAKEGEM_SUFFIX:-}" - -RUBY_FAKEGEM_RECIPE_DOC="${RUBY_FAKEGEM_RECIPE_DOC-rake}" -RUBY_FAKEGEM_TASK_DOC="${RUBY_FAKEGEM_TASK_DOC-rdoc}" -RUBY_FAKEGEM_DOC_SOURCES="${RUBY_FAKEGEM_DOC_SOURCES-lib}" -RUBY_FAKEGEM_RECIPE_TEST="${RUBY_FAKEGEM_RECIPE_TEST-rake}" -RUBY_FAKEGEM_TASK_TEST="${RUBY_FAKEGEM_TASK_TEST-test}" +RUBY_FAKEGEM_SUFFIX="${RUBY_FAKEGEM_SUFFIX:-}" -RUBY_FAKEGEM_BINWRAP="${RUBY_FAKEGEM_BINWRAP-*}" -RUBY_FAKEGEM_BINDIR="${RUBY_FAKEGEM_BINDIR-bin}" [[ ${RUBY_FAKEGEM_TASK_DOC} == "" ]] && RUBY_FAKEGEM_RECIPE_DOC="none" diff --git a/games-action/0verkill/0verkill-0.16-r3.ebuild b/games-action/0verkill/0verkill-0.16-r3.ebuild deleted file mode 100644 index 3c347dd0a14d..000000000000 --- a/games-action/0verkill/0verkill-0.16-r3.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils games - -DESCRIPTION="a bloody 2D action deathmatch-like game in ASCII-ART" -HOMEPAGE="http://artax.karlin.mff.cuni.cz/~brain/0verkill/" -SRC_URI="http://artax.karlin.mff.cuni.cz/~brain/0verkill/release/${P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="X" - -DEPEND="X? ( x11-libs/libXpm )" -RDEPEND=${DEPEND} - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-docs.patch \ - "${FILESDIR}"/${P}-home-overflow.patch \ - "${FILESDIR}"/${P}-segv.patch \ - "${FILESDIR}"/${P}-gentoo-paths.patch \ - "${FILESDIR}"/${P}-ovflfix.patch \ - "${FILESDIR}"/${P}-CC.patch \ - "${FILESDIR}"/${P}-underflow-check.patch #136222 \ - sed -i \ - -e "s:data/:${GAMES_DATADIR}/${PN}/data/:" cfg.h || die - sed -i \ - -e "s:@CFLAGS@ -O3 :@CFLAGS@ :" Makefile.in || die - sed -i \ - -e "/gettimeofday/s/getopt/getopt calloc/" configure.in || die - eautoreconf -} - -src_configure() { - egamesconf $(use_with X x) -} - -src_install() { - local x - dogamesbin 0verkill - for x in avi bot editor server test_server ; do - newgamesbin ${x} 0verkill-${x} - done - if use X ; then - dogamesbin x0verkill - for x in avi editor ; do - newgamesbin ${x} 0verkill-${x} - done - fi - - insinto "${GAMES_DATADIR}/${PN}" - doins -r data grx - - dohtml doc/*.html - rm doc/*.html doc/README.OS2 doc/Readme\ Win32.txt doc/COPYING - dodoc doc/* - - prepgamesdirs -} diff --git a/games-action/0verkill/0verkill-0.16-r4.ebuild b/games-action/0verkill/0verkill-0.16-r4.ebuild index b512d03cdb80..478fcc1bbda7 100644 --- a/games-action/0verkill/0verkill-0.16-r4.ebuild +++ b/games-action/0verkill/0verkill-0.16-r4.ebuild @@ -1,11 +1,12 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit autotools eutils -DESCRIPTION="a bloody 2D action deathmatch-like game in ASCII-ART" -HOMEPAGE="http://artax.karlin.mff.cuni.cz/~brain/0verkill/" +inherit autotools + +DESCRIPTION="A bloody 2D action deathmatch-like game in ASCII-ART" +HOMEPAGE="http://freecode.com/projects/0verkill" SRC_URI="http://artax.karlin.mff.cuni.cz/~brain/0verkill/release/${P}.tgz" LICENSE="GPL-2" @@ -34,6 +35,8 @@ src_prepare() { -e "s:@CFLAGS@ -O3 :@CFLAGS@ :" Makefile.in || die sed -i \ -e "/gettimeofday/s/getopt/getopt calloc/" configure.in || die + + mv configure.{in,ac} || die eautoreconf } @@ -42,8 +45,8 @@ src_configure() { } src_install() { - local x dobin 0verkill + local x for x in avi bot editor server test_server ; do newbin ${x} 0verkill-${x} done @@ -54,9 +57,9 @@ src_install() { done fi - insinto "/usr/share/${PN}" + insinto /usr/share/${PN} doins -r data grx - rm doc/README.OS2 doc/Readme\ Win32.txt doc/COPYING - dodoc -r doc/ + rm doc/{README.OS2,"Readme Win32.txt",COPYING} || die + dodoc -r doc/. } diff --git a/games-action/abuse/abuse-0.8-r1.ebuild b/games-action/abuse/abuse-0.8-r1.ebuild index b43ca930f027..5099dd703aa8 100644 --- a/games-action/abuse/abuse-0.8-r1.ebuild +++ b/games-action/abuse/abuse-0.8-r1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit autotools + +inherit autotools eutils DESCRIPTION="Port of Abuse by Crack Dot Com" HOMEPAGE="http://abuse.zoy.org/" diff --git a/games-action/abuse/abuse-0.8.ebuild b/games-action/abuse/abuse-0.8.ebuild deleted file mode 100644 index d56c20871b1b..000000000000 --- a/games-action/abuse/abuse-0.8.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils games - -DESCRIPTION="port of Abuse by Crack Dot Com" -HOMEPAGE="http://abuse.zoy.org/" -SRC_URI="http://abuse.zoy.org/raw-attachment/wiki/download/${P}.tar.gz" - -LICENSE="GPL-2 WTFPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND=">=media-libs/libsdl-1.1.6[sound,opengl,video] - media-libs/sdl-mixer - virtual/opengl" -RDEPEND="${DEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch - eautoreconf -} - -src_configure() { - egamesconf \ - --with-assetdir="${GAMES_DATADIR}/${PN}" -} - -src_install() { - # Source-based install - default - - doicon doc/${PN}.png - make_desktop_entry abuse Abuse - - prepgamesdirs -} - -pkg_postinst() { - games_pkg_postinst - elog "NOTE: If you had previous version of abuse installed" - elog "you may need to remove ~/.abuse for the game to work correctly." -} diff --git a/games-action/accelerator3d/accelerator3d-0.1.1-r2.ebuild b/games-action/accelerator3d/accelerator3d-0.1.1-r2.ebuild deleted file mode 100644 index 89a2b11fe697..000000000000 --- a/games-action/accelerator3d/accelerator3d-0.1.1-r2.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) -inherit eutils python-r1 games - -DESCRIPTION="Fast-paced, 3D, first-person shoot/dodge-'em-up, in the vain of Tempest or n2o" -HOMEPAGE="http://accelerator3d.sourceforge.net/" -SRC_URI="mirror://sourceforge/accelerator3d/accelerator-${PV}.tar.bz2" - -LICENSE="Artistic" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~x86-fbsd" -IUSE="" -REQUIRED_USE=${PYTHON_REQUIRED_USE} - -DEPEND="${PYTHON_DEPS}" -RDEPEND="${DEPEND} - dev-python/pyode[${PYTHON_USEDEP}] - dev-python/pygame[${PYTHON_USEDEP}] - dev-python/pyopengl[${PYTHON_USEDEP}]" - -S=${WORKDIR}/${PN} - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-gentoo-paths.patch \ - "${FILESDIR}"/${P}-gllightmodel.patch - sed -i \ - -e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \ - accelerator.py || die -} - -src_install() { - python_scriptinto "${GAMES_BINDIR}" - python_foreach_impl python_newscript accelerator.py accelerator - insinto "${GAMES_DATADIR}"/${PN} - doins gfx/* snd/* - dodoc CHANGELOG README - make_desktop_entry accelerator - - prepgamesdirs -} diff --git a/games-action/accelerator3d/accelerator3d-0.1.1-r3.ebuild b/games-action/accelerator3d/accelerator3d-0.1.1-r3.ebuild index 38ae98f25014..1a5d9737b89a 100644 --- a/games-action/accelerator3d/accelerator3d-0.1.1-r3.ebuild +++ b/games-action/accelerator3d/accelerator3d-0.1.1-r3.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 + PYTHON_COMPAT=( python2_7 ) inherit eutils python-r1 @@ -13,7 +14,7 @@ LICENSE="Artistic" SLOT="0" KEYWORDS="~amd64 ~x86 ~x86-fbsd" IUSE="" -REQUIRED_USE=${PYTHON_REQUIRED_USE} +REQUIRED_USE="${PYTHON_REQUIRED_USE}" DEPEND="${PYTHON_DEPS}" RDEPEND="${DEPEND} @@ -32,14 +33,15 @@ src_prepare() { default sed -i \ - -e "s:@GENTOO_DATADIR@:/usr/share/${PN}:" \ + -e "s:@GENTOO_DATADIR@:${EPREFIX}/usr/share/${PN}:" \ accelerator.py || die } src_install() { python_foreach_impl python_newscript accelerator.py accelerator - insinto "/usr/share/${PN}" - doins gfx/* snd/* - dodoc CHANGELOG README + + insinto /usr/share/${PN} + doins -r gfx/. snd/. + einstalldocs make_desktop_entry accelerator } diff --git a/games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild b/games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild index 7aa64769890a..9147b2111608 100644 --- a/games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild +++ b/games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 + inherit eutils gnome2-utils DESCRIPTION="Fast-paced 3D lightcycle game based on Tron" @@ -16,15 +17,12 @@ IUSE="dedicated sound" RDEPEND=" dev-libs/libxml2 !dedicated? ( - media-libs/libpng:0 - media-libs/libsdl[X,opengl,video] + media-libs/libpng:0= + media-libs/libsdl[X,opengl,video,sound?] media-libs/sdl-image[jpeg,png] virtual/glu virtual/opengl - sound? ( - media-libs/libsdl[sound] - media-libs/sdl-mixer - ) + sound? ( media-libs/sdl-mixer ) )" DEPEND=${RDEPEND} @@ -38,7 +36,6 @@ src_prepare() { src_configure() { # --enable-games just messes up paths econf \ - --docdir=/usr/share/doc/${PF} \ $(use_enable dedicated) \ $(use_enable sound music) \ --disable-sysinstall \ @@ -48,12 +45,10 @@ src_configure() { } src_install() { - # FIXME: is the -j1 needed? https://bugs.gentoo.org/588104 - emake -j1 DESTDIR="${D}" install - einstalldocs + default # misplaced desktop-file/icons - rm -rf "${ED%/}${GAMES_DATADIR}"/armagetronad/desktop + rm -r "${ED%/}"/usr/share/${PN}/desktop || die doicon -s 48 desktop/icons/large/armagetronad.png make_desktop_entry ${PN} } diff --git a/games-action/atanks/atanks-6.4-r1.ebuild b/games-action/atanks/atanks-6.4-r1.ebuild index d17df9c83dc6..ed2deed79042 100644 --- a/games-action/atanks/atanks-6.4-r1.ebuild +++ b/games-action/atanks/atanks-6.4-r1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils gnome2-utils + +inherit eutils gnome2-utils toolchain-funcs DESCRIPTION="Worms and Scorched Earth-like game" HOMEPAGE="http://atanks.sourceforge.net/" @@ -16,18 +17,27 @@ IUSE="" DEPEND="media-libs/allegro:0[X]" RDEPEND=${DEPEND} +PATCHES=( "${FILESDIR}"/${PN}-6.4-fix-build-system.patch ) + +src_configure() { + tc-export CXX +} + src_compile() { emake \ - INSTALLDIR="/usr/share/${PN}" + INSTALLDIR="${EPREFIX}/usr/share/${PN}" } src_install() { dobin ${PN} + local DOCS=( Changelog README TODO ) + einstalldocs + insinto /usr/share/${PN} doins -r button misc missile sound stock tank tankgun text title unicode.dat *.txt + doicon -s 48 ${PN}.png make_desktop_entry atanks "Atomic Tanks" - dodoc Changelog README TODO } pkg_preinst() { diff --git a/games-action/atanks/atanks-6.4.ebuild b/games-action/atanks/atanks-6.4.ebuild deleted file mode 100644 index 50382f26af2c..000000000000 --- a/games-action/atanks/atanks-6.4.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils gnome2-utils games - -DESCRIPTION="Worms and Scorched Earth-like game" -HOMEPAGE="http://atanks.sourceforge.net/" -SRC_URI="mirror://sourceforge/atanks/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="media-libs/allegro:0[X]" -RDEPEND=${DEPEND} - -src_compile() { - emake \ - BINDIR="${GAMES_BINDIR}" \ - INSTALLDIR="${GAMES_DATADIR}/${PN}" -} - -src_install() { - dogamesbin ${PN} - insinto "${GAMES_DATADIR}"/${PN} - doins -r button misc missile sound stock tank tankgun text title unicode.dat *.txt - doicon -s 48 ${PN}.png - make_desktop_entry atanks "Atomic Tanks" - dodoc Changelog README TODO - prepgamesdirs -} - -pkg_preinst() { - games_pkg_preinst - gnome2_icon_savelist -} - -pkg_postinst() { - games_pkg_postinst - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-action/atanks/files/atanks-6.4-fix-build-system.patch b/games-action/atanks/files/atanks-6.4-fix-build-system.patch new file mode 100644 index 000000000000..e13ebb1d1421 --- /dev/null +++ b/games-action/atanks/files/atanks-6.4-fix-build-system.patch @@ -0,0 +1,28 @@ +* Don't try to find where $(CXX) is, just use it +* Don't muck with CXXFLAGS + +--- a/Makefile ++++ b/Makefile +@@ -85,13 +85,9 @@ + # ------------------------------------ + INSTALL := $(shell which install) + RM := $(shell which rm) -f +-CXX ?= g++ + SED := $(shell which sed) + WINDRES := + +-ifeq (,$(findstring /,$(CXX))) +- CXX := $(shell which $(CXX)) +-endif + + + # if this is a Windows target, prefer mingw32-g++ over g++ +@@ -231,8 +227,6 @@ + CPPFLAGS := ${CPPFLAGS} -DATANKS_DEBUG_LOGTOFILE + endif + +-else +- CXXFLAGS := -march=native ${CXXFLAGS} -O2 + endif + + diff --git a/games-arcade/opensonic/files/opensonic-0.1.4-r1-cmake.patch b/games-arcade/opensonic/files/opensonic-0.1.4-r1-cmake.patch index b4db7644bc9d..53d76faafae2 100644 --- a/games-arcade/opensonic/files/opensonic-0.1.4-r1-cmake.patch +++ b/games-arcade/opensonic/files/opensonic-0.1.4-r1-cmake.patch @@ -8,8 +8,8 @@ make paths modifiable add rules for icon, desktop-file and game-wrapper fix compilation for as-needed ---- CMakeLists.txt -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -35,16 +35,14 @@ MESSAGE("Using CFLAGS='${CFLAGS}'") diff --git a/games-arcade/opensonic/opensonic-0.1.4-r1.ebuild b/games-arcade/opensonic/opensonic-0.1.4-r2.ebuild index 95eb7ebac18a..3e0e1b0c35a2 100644 --- a/games-arcade/opensonic/opensonic-0.1.4-r1.ebuild +++ b/games-arcade/opensonic/opensonic-0.1.4-r2.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit cmake-utils eutils games +EAPI=6 + +inherit cmake-utils MY_PN=opensnc MY_P=${MY_PN}-src-${PV} @@ -17,40 +18,33 @@ KEYWORDS="~amd64 ~x86" IUSE="" RESTRICT="mirror" # unsure about legality of graphics -DEPEND="media-libs/allegro:0[X,jpeg,png,vorbis] - media-libs/libogg - media-libs/libpng:0 - media-libs/libvorbis - sys-libs/zlib +DEPEND=" + media-libs/allegro:0=[X,jpeg,png,vorbis] + media-libs/libogg:= + media-libs/libpng:0= + media-libs/libvorbis:= + sys-libs/zlib:= virtual/jpeg:0" RDEPEND=${DEPEND} S=${WORKDIR}/${MY_P} - -src_prepare() { - epatch "${FILESDIR}"/${PF}-cmake.patch -} +PATCHES=( "${FILESDIR}"/${PN}-0.1.4-r1-cmake.patch ) src_configure() { local mycmakeargs=( - -DGAME_INSTALL_DIR="${GAMES_DATADIR}"/${PN} - -DGAME_FINAL_DIR="${GAMES_BINDIR}" - -DGAME_LIBDIR="$(games_get_libdir)/${PN}" + -DGAME_INSTALL_DIR="${EPREFIX}"/usr/share/${PN} + -DGAME_FINAL_DIR="${EPREFIX}"/usr/bin + -DGAME_LIBDIR="${EPREFIX}"/usr/$(get_libdir)/${PN} ) - cmake-utils_src_configure } -src_compile() { - cmake-utils_src_compile -} - src_install() { cmake-utils_src_install - local i - for i in $(ls "${D}${GAMES_DATADIR}/${PN}") ; do - dosym "${GAMES_DATADIR}/${PN}/${i}" \ - "$(games_get_libdir)/${PN}/${i}" - done - prepgamesdirs + + local f + while IFS="" read -d $'\0' -r f; do + dosym ../../share/${PN}/${f##*/} \ + /usr/$(get_libdir)/${PN}/${f##*/} + done < <(find "${ED%/}"/usr/share/${PN}/ -mindepth 1 -maxdepth 1 -type d -print0) } diff --git a/games-emulation/dolphin/dolphin-5.0.ebuild b/games-emulation/dolphin/dolphin-5.0.ebuild index 04b020090999..66b0fe9c7dab 100644 --- a/games-emulation/dolphin/dolphin-5.0.ebuild +++ b/games-emulation/dolphin/dolphin-5.0.ebuild @@ -10,7 +10,7 @@ WX_GTK_VER="3.0" inherit cmake-utils eutils l10n pax-utils toolchain-funcs versionator wxwidgets SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.zip -> ${P}.zip" -KEYWORDS="~amd64" +KEYWORDS="amd64" DESCRIPTION="Gamecube and Wii game emulator" HOMEPAGE="https://www.dolphin-emu.org/" diff --git a/games-emulation/mgba/mgba-0.5.2.ebuild b/games-emulation/mgba/mgba-0.5.2.ebuild index 042cf1dd13fc..be3429d13af3 100644 --- a/games-emulation/mgba/mgba-0.5.2.ebuild +++ b/games-emulation/mgba/mgba-0.5.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MPL-2.0" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="ffmpeg imagemagick opengl qt5 +sdl" REQUIRED_USE="|| ( qt5 sdl ) qt5? ( opengl )" diff --git a/games-emulation/pcsx2/pcsx2-1.4.0.ebuild b/games-emulation/pcsx2/pcsx2-1.4.0.ebuild index 5ce65187a04c..cfd1606f91af 100644 --- a/games-emulation/pcsx2/pcsx2-1.4.0.ebuild +++ b/games-emulation/pcsx2/pcsx2-1.4.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/PCSX2/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="-* ~amd64 ~x86" +KEYWORDS="-* amd64 x86" IUSE="" RDEPEND=" diff --git a/games-engines/renpy/renpy-6.17.7.ebuild b/games-engines/renpy/renpy-6.17.7.ebuild index 879493b46d11..adc56df50743 100644 --- a/games-engines/renpy/renpy-6.17.7.ebuild +++ b/games-engines/renpy/renpy-6.17.7.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://www.renpy.org/dl/${PV}/${P}-source.tar.bz2" LICENSE="MIT" SLOT="$(get_version_component_range 1-2)" MYSLOT=$(delete_all_version_separators ${SLOT}) -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="development doc examples" REQUIRED_USE="examples? ( development )" diff --git a/games-engines/renpy/renpy-6.99.12.4-r3.ebuild b/games-engines/renpy/renpy-6.99.12.4-r3.ebuild index ccf21fbcc9cd..27a1a8b3f14e 100644 --- a/games-engines/renpy/renpy-6.99.12.4-r3.ebuild +++ b/games-engines/renpy/renpy-6.99.12.4-r3.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://www.renpy.org/dl/${PV}/${P}-source.tar.bz2" LICENSE="MIT" SLOT="$(get_version_component_range 1-2)" MYSLOT=$(delete_all_version_separators ${SLOT}) -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="development doc examples" REQUIRED_USE="examples? ( development )" diff --git a/games-misc/fortune-mod-gentoo-ru/fortune-mod-gentoo-ru-0.25.ebuild b/games-misc/fortune-mod-gentoo-ru/fortune-mod-gentoo-ru-0.25.ebuild index feddb8333f00..08a2859f46e5 100644 --- a/games-misc/fortune-mod-gentoo-ru/fortune-mod-gentoo-ru-0.25.ebuild +++ b/games-misc/fortune-mod-gentoo-ru/fortune-mod-gentoo-ru-0.25.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://slepnoga.googlecode.com/files/gentoo-ru-${PV}.gz LICENSE="fairuse" SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND="games-misc/fortune-mod" diff --git a/games-misc/fortune-mod-gentoo-ru/fortune-mod-gentoo-ru-0.26.ebuild b/games-misc/fortune-mod-gentoo-ru/fortune-mod-gentoo-ru-0.26.ebuild index acbe34fb6f11..ba8aa2589f79 100644 --- a/games-misc/fortune-mod-gentoo-ru/fortune-mod-gentoo-ru-0.26.ebuild +++ b/games-misc/fortune-mod-gentoo-ru/fortune-mod-gentoo-ru-0.26.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://slepnoga.googlecode.com/files/gentoo-ru-${PV}.gz LICENSE="fairuse" SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND="games-misc/fortune-mod" diff --git a/games-misc/xcowsay/xcowsay-1.3.ebuild b/games-misc/xcowsay/xcowsay-1.3.ebuild index 2557c54c1e23..84cdb4184731 100644 --- a/games-misc/xcowsay/xcowsay-1.3.ebuild +++ b/games-misc/xcowsay/xcowsay-1.3.ebuild @@ -9,7 +9,7 @@ SRC_URI="http://www.nickg.me.uk/files/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="dbus fortune" RDEPEND="dbus? ( sys-apps/dbus ) diff --git a/games-strategy/hedgewars/Manifest b/games-strategy/hedgewars/Manifest index 1e4e92d735bc..5c93a9bba444 100644 --- a/games-strategy/hedgewars/Manifest +++ b/games-strategy/hedgewars/Manifest @@ -1,2 +1,3 @@ DIST hedgewars-src-0.9.22.tar.bz2 160103313 SHA256 b699c8971ff420c3edd6533527ae2e99040f1e79207c9140826945bcf0e62192 SHA512 753cccef09b725048d9e66988b03859a12e577a601656cc2b3dbb2755c59ed9ae4d4c88c9247238408fc76d881c921593a694a58a500b3d5b8c9a4c0cfb053ac WHIRLPOOL c8003da8d1435f4bece344a593bda9b214a24b35ee662310245e13cabc5f35820a38f9ac0883ba5543db413189491f6c3da37b7452034bfa9fb04e8936f52e27 +DIST hedgewars-src-0.9.23.tar.bz2 173042171 SHA256 da2e4908042be56d1c0f3cb80a355bde7f0a49f675b050a03228cc3fb22aae89 SHA512 b9bcd6d32c7bb97c2766aacbc759dd48b7a4c7a72003ab2bf31cdfac94a6e08de740a689458c276d3c35b90e89a1af6c200f98f463e9554e8b176b5706dc3090 WHIRLPOOL 3a623ac8810fb8ced80cea65b71d1a64cc3cb5b4e65356b3d2552f21784fd98db751706c8f48caa5e9648b676e274d249361bfb1a4da715ddd568bbc188619c8 DIST hedgewars_0.9.22-dfsg-7.debian.tar.xz 79016 SHA256 7c57376a4f85ff33bf9345b46a4df72d70fe9824b8fd7df68b62107dbb8bb5cb SHA512 011d44989b6fcad9ae7a20fcb11a4e2b9a75d1ace6c6e4c2139cd7e67f13ea21d90b6c8a7afb76fa9a06c32537b00b8b4b7689967b3019300e93a7a6fe3e0fbf WHIRLPOOL a8a769b5275b6adec26dce48c113c4a5eb1c69eee9a01e181ec41b611e999a33349bad2b52eaf72099b1dbfce14a1af6e559aaceb3e2ac98ab04065c61bffca7 diff --git a/games-strategy/hedgewars/files/hedgewars-0.9.22-rpath-fix.patch b/games-strategy/hedgewars/files/hedgewars-0.9.22-rpath-fix.patch new file mode 100644 index 000000000000..332c0c3ce4ac --- /dev/null +++ b/games-strategy/hedgewars/files/hedgewars-0.9.22-rpath-fix.patch @@ -0,0 +1,10 @@ +diff -up hedgewars-src-0.9.22/cmake_modules/paths.cmake~ hedgewars-src-0.9.22/cmake_modules/paths.cmake +--- hedgewars-src-0.9.22/cmake_modules/paths.cmake~ 2015-12-02 15:02:38.000000000 +0100 ++++ hedgewars-src-0.9.22/cmake_modules/paths.cmake 2015-12-02 15:15:24.729980850 +0100 +@@ -67,5 +67,5 @@ else(APPLE AND NOT (${CMAKE_INSTALL_PREF + # - the third one is the full path of the system dir + #source http://www.cmake.org/pipermail/cmake/2008-January/019290.html + #skip this if the install prefix is the standard one +- set(CMAKE_INSTALL_RPATH "$ORIGIN/../${target_library_install_dir}/:$ORIGIN/:${CMAKE_INSTALL_PREFIX}/${target_library_install_dir}/") ++ #set(CMAKE_INSTALL_RPATH "$ORIGIN/../${target_library_install_dir}/:$ORIGIN/:${CMAKE_INSTALL_PREFIX}/${target_library_install_dir}/") + endif(APPLE) diff --git a/games-strategy/hedgewars/hedgewars-0.9.22-r2.ebuild b/games-strategy/hedgewars/hedgewars-0.9.22-r2.ebuild index d7016bea411e..d447ec2bd156 100644 --- a/games-strategy/hedgewars/hedgewars-0.9.22-r2.ebuild +++ b/games-strategy/hedgewars/hedgewars-0.9.22-r2.ebuild @@ -46,6 +46,7 @@ RDEPEND="${CDEPEND} >=media-fonts/dejavu-2.28" S=${WORKDIR}/${MY_P} +PATCHES=( "${FILESDIR}"/${PN}-0.9.22-rpath-fix.patch ) src_prepare() { while IFS="" read -r f ; do @@ -64,6 +65,9 @@ src_configure() { -DNOSERVER=TRUE -DCMAKE_VERBOSE_MAKEFILE=TRUE -DPHYSFS_SYSTEM=ON + # upstream sets RPATH that leafs to weird breakage + # https://bugzilla.redhat.com/show_bug.cgi?id=1200193 + -DCMAKE_SKIP_RPATH=ON ) cmake-utils_src_configure } diff --git a/games-strategy/hedgewars/hedgewars-0.9.23.ebuild b/games-strategy/hedgewars/hedgewars-0.9.23.ebuild new file mode 100644 index 000000000000..4d270e4dde16 --- /dev/null +++ b/games-strategy/hedgewars/hedgewars-0.9.23.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +CMAKE_MAKEFILE_GENERATOR=emake + +inherit cmake-utils eutils xdg-utils + +MY_P=${PN}-src-${PV} +DEB_PATCH_VER=7 + +DESCRIPTION="A turn-based strategy, artillery, action and comedy game" +HOMEPAGE="https://www.hedgewars.org/" +SRC_URI="https://www.hedgewars.org/download/releases/${MY_P}.tar.bz2 + mirror://debian/pool/main/h/${PN}/${PN}_0.9.22-dfsg-${DEB_PATCH_VER}.debian.tar.xz" + +LICENSE="GPL-2 Apache-2.0 FDL-1.3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="libav" + +QA_FLAGS_IGNORED="/usr/bin/hwengine" # pascal sucks +QA_PRESTRIPPED="/usr/bin/hwengine" # pascal sucks + +CDEPEND=" + >=dev-games/physfs-3.0.1 + dev-lang/lua:0= + dev-qt/qtcore:4 + dev-qt/qtgui:4 + media-libs/libpng:0= + media-libs/libsdl2:= + media-libs/sdl2-image:= + media-libs/sdl2-mixer:= + media-libs/sdl2-net:= + media-libs/sdl2-ttf:= + sys-libs/zlib:= + libav? ( media-video/libav:= ) + !libav? ( media-video/ffmpeg:= )" +DEPEND="${CDEPEND} + >=dev-lang/fpc-2.4" +RDEPEND="${CDEPEND} + app-arch/xz-utils + media-fonts/wqy-zenhei + >=media-fonts/dejavu-2.28" + +S=${WORKDIR}/${MY_P} +PATCHES=( "${FILESDIR}"/${PN}-0.9.22-rpath-fix.patch ) + +src_configure() { + local mycmakeargs=( + -DMINIMAL_FLAGS=ON + -DDATA_INSTALL_DIR="${EPREFIX}/usr/share/${PN}" + -Dtarget_binary_install_dir="${EPREFIX}/usr/bin" + -Dtarget_library_install_dir="${EPREFIX}/usr/$(get_libdir)" + -DNOSERVER=TRUE + -DCMAKE_VERBOSE_MAKEFILE=TRUE + -DPHYSFS_SYSTEM=ON + # upstream sets RPATH that leafs to weird breakage + # https://bugzilla.redhat.com/show_bug.cgi?id=1200193 + -DCMAKE_SKIP_RPATH=ON + ) + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + + rm -f "${ED%/}"/usr/share/games/hedgewars/Data/Fonts/{DejaVuSans-Bold.ttf,wqy-zenhei.ttc} || die + dosym ../../../fonts/dejavu/DejaVuSans-Bold.ttf \ + /usr/share/${PN}/Data/Fonts/DejaVuSans-Bold.ttf + dosym ../../../fonts/wqy-zenhei/wqy-zenhei.ttc \ + /usr/share/${PN}/Data/Fonts/wqy-zenhei.ttc + doicon misc/hedgewars.png + make_desktop_entry ${PN} Hedgewars + doman man/${PN}.6 +} + +pkg_postinst() { + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_desktop_database_update +} diff --git a/games-strategy/seven-kingdoms/seven-kingdoms-2.14.4.ebuild b/games-strategy/seven-kingdoms/seven-kingdoms-2.14.4.ebuild index 40b532976f66..b82832b94681 100644 --- a/games-strategy/seven-kingdoms/seven-kingdoms-2.14.4.ebuild +++ b/games-strategy/seven-kingdoms/seven-kingdoms-2.14.4.ebuild @@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/skfans/${MY_PN}-source-${PV}.tar.bz2 LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="network" DEPEND="media-libs/libsdl[X,video] diff --git a/games-util/pogo-manager-bin/pogo-manager-bin-0.1.6.ebuild b/games-util/pogo-manager-bin/pogo-manager-bin-0.1.6.ebuild index 90679eeb287b..a58f94b84142 100644 --- a/games-util/pogo-manager-bin/pogo-manager-bin-0.1.6.ebuild +++ b/games-util/pogo-manager-bin/pogo-manager-bin-0.1.6.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/Wolfsblvt/BlossomsPokemonGoManager/releases/download LICENSE="CC-BY-NC-SA-4.0" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="" RDEPEND="|| ( dev-java/oracle-jdk-bin:1.8[javafx] dev-java/oracle-jre-bin:1.8[javafx] )" diff --git a/games-util/wit/wit-2.40a.ebuild b/games-util/wit/wit-2.40a.ebuild index d7c5615c3c1c..cb5a55fdabdc 100644 --- a/games-util/wit/wit-2.40a.ebuild +++ b/games-util/wit/wit-2.40a.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~radhermit/distfiles/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="+fuse +zlib" RDEPEND=" diff --git a/media-gfx/exiv2/exiv2-0.26_p20171104.ebuild b/media-gfx/exiv2/exiv2-0.26_p20171104.ebuild index dc05f6aaed6e..0a12c279fd1d 100644 --- a/media-gfx/exiv2/exiv2-0.26_p20171104.ebuild +++ b/media-gfx/exiv2/exiv2-0.26_p20171104.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} = *9999 ]]; then else COMMIT=900d2417dbeb46e14cbf65fc2798ed1d043ab76d SRC_URI="https://github.com/Exiv2/${PN}/tarball/${COMMIT} -> ${P}.tar.gz" - KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" + KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" fi inherit cmake-multilib python-any-r1 vcs-snapshot diff --git a/media-gfx/sane-backends/sane-backends-1.0.27.ebuild b/media-gfx/sane-backends/sane-backends-1.0.27.ebuild index af5b6083c411..76f70f9768c2 100644 --- a/media-gfx/sane-backends/sane-backends-1.0.27.ebuild +++ b/media-gfx/sane-backends/sane-backends-1.0.27.ebuild @@ -137,7 +137,7 @@ esac LICENSE="GPL-2 public-domain" SLOT="0" if [[ ${PV} != "9999" ]] ; then - KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux" + KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux" fi RDEPEND=" diff --git a/media-libs/libgphoto2/libgphoto2-2.5.14.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.14.ebuild index 546aa0f76345..fad807c16216 100644 --- a/media-libs/libgphoto2/libgphoto2-2.5.14.ebuild +++ b/media-libs/libgphoto2/libgphoto2-2.5.14.ebuild @@ -17,7 +17,7 @@ LICENSE="GPL-2" # FIXME: should we also bump for libgphoto2_port.so soname version? SLOT="0/6" # libgphoto2.so soname version -KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" IUSE="doc examples exif gd jpeg nls serial" # By default, drivers for all supported cameras will be compiled. diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild b/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild new file mode 100644 index 000000000000..5817ec12981b --- /dev/null +++ b/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild @@ -0,0 +1,118 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools eutils flag-o-matic multilib-minimal toolchain-funcs + +DESCRIPTION="Tools for MJPEG video" +HOMEPAGE="http://mjpeg.sourceforge.net/" +SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="1" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" +IUSE="dv gtk cpu_flags_x86_mmx png quicktime sdl sdlgfx static-libs" +REQUIRED_USE="sdlgfx? ( sdl )" + +RDEPEND="virtual/jpeg:0=[${MULTILIB_USEDEP}] + quicktime? ( >=media-libs/libquicktime-1.2.4-r1[${MULTILIB_USEDEP}] ) + dv? ( >=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}] ) + png? ( media-libs/libpng:0= ) + gtk? ( x11-libs/gtk+:2 ) + sdl? ( >=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}] + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + sdlgfx? ( media-libs/sdl-gfx ) + )" + +DEPEND="${RDEPEND} + cpu_flags_x86_mmx? ( dev-lang/nasm ) + >=sys-apps/sed-4 + virtual/awk + >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]" + +RDEPEND="${RDEPEND} + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-medialibs-20140508-r4 + !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] + )" + +src_prepare() { + epatch "${FILESDIR}"/${P}-pic.patch + # https://sourceforge.net/p/mjpeg/bugs/139/ + epatch "${FILESDIR}"/${P}-sdl-cflags.patch + epatch "${FILESDIR}"/mjpegtools-2.1.0-no_format.patch + default + + eautoreconf + sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure +} + +multilib_src_configure() { + [[ $(gcc-major-version) -eq 3 ]] && append-flags -mno-sse2 + + local myconf=( + --enable-compile-warnings + $(use_enable cpu_flags_x86_mmx simd-accel) + $(use_enable static-libs static) + --enable-largefile + + $(use_with quicktime libquicktime) + $(use_with dv libdv) + $(use_with sdl libsdl) + --without-v4l + $(use_with sdl x) + + # used by tools only + $(multilib_native_use_with gtk) + $(multilib_native_use_with png libpng) + $(multilib_native_use_with sdlgfx) + + # used only in V4LCONF_LIBS that is not used anywhere... + --without-dga + ) + + ECONF_SOURCE=${S} \ + econf "${myconf[@]}" +} + +multilib_src_compile() { + if multilib_is_native_abi; then + default + else + # avoid building programs + emake bin_PROGRAMS= + fi +} + +multilib_src_test() { + # there are no tests at the moment, so it would just build + # all programs in non-native ABIs... + multilib_is_native_abi && default +} + +multilib_src_install() { + if multilib_is_native_abi; then + default + else + emake DESTDIR="${D}" install \ + bin_PROGRAMS= + fi +} + +multilib_src_install_all() { + einstalldocs + dodoc mjpeg_howto.txt PLANS HINTS docs/FAQ.txt + + find "${D}" -name '*.la' -delete || die +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + elog "mjpegtools installs user contributed scripts which require additional" + elog "dependencies not pulled in by the installation." + elog "These have to be installed manually." + elog "Currently known extra dpendencies are: ffmpeg, mencoder from mplayer," + elog "parts of transcode, mpeg2dec from libmpeg2, sox, toolame, vcdimager, python." + fi +} diff --git a/media-video/projectx/projectx-0.91.0.10-r1.ebuild b/media-video/projectx/projectx-0.91.0.10-r1.ebuild new file mode 100644 index 000000000000..930ed27128ca --- /dev/null +++ b/media-video/projectx/projectx-0.91.0.10-r1.ebuild @@ -0,0 +1,128 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +JAVA_PKG_IUSE="doc source" + +inherit eutils toolchain-funcs java-pkg-2 java-ant-2 + +XDG_P="xdg-20100731" + +DESCRIPTION="Converts, splits and demuxes DVB and other MPEG recordings" +HOMEPAGE="http://project-x.sourceforge.net/" +SRC_URI="https://dev.gentoo.org/~billie/distfiles/${P}.tar.xz + https://dev.gentoo.org/~billie/distfiles/${PN}-idctfast.tar.xz + https://dev.gentoo.org/~billie/distfiles/${XDG_P}.java.xz + https://dev.gentoo.org/~billie/distfiles/${PN}-icon.png" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc64 ~x86" +IUSE="X cpu_flags_x86_mmx cpu_flags_x86_sse" + +COMMON_DEP="dev-java/commons-net:0 + X? ( dev-java/browserlauncher2:1.0 )" + +RDEPEND=">=virtual/jre-1.5 + ${COMMON_DEP}" + +DEPEND=">=virtual/jdk-1.5 + app-arch/xz-utils + virtual/libiconv + ${COMMON_DEP}" + +S="${WORKDIR}/Project-X" + +mainclass() { + # read Main-Class from MANIFEST.MF + sed -n "s/^Main-Class: \([^ ]\+\).*/\1/p" "${S}/MANIFEST.MF" || die +} + +src_prepare() { + default + + local X + + # apply stdout corruption patch (zzam@gentoo.org) + epatch "${FILESDIR}/${PN}-0.90.4.00_p33-stdout-corrupt.patch" + + # apply BrowserLauncher2 patch + use X && epatch "${FILESDIR}/${PN}-0.90.4.00_p33-bl2.patch" + rm -rf src/edu || die + + # apply IDCTFast patch + epatch "${FILESDIR}/${PN}-0.90.4.00_p33-idctfast.patch" + + # apply XDG patch + cp -f "${WORKDIR}/${XDG_P}.java" "${S}/src/xdg.java" || die + epatch "${FILESDIR}/${PN}-0.90.4.00_p33-xdg.patch" + + # copy build.xml + cp -f "${FILESDIR}/build-0.90.4.00_p33.xml" build.xml || die + + # patch executable and icon + sed -i -e "s:^\(Exec=\).*:\1${PN}_gui:g" \ + -e "s:^\(Icon=\).*:\1${PN}:g" *.desktop || die + + # convert CRLF to LF + edos2unix *.txt MANIFEST.MF + + # convert docs to utf-8 + if [ -x "$(type -p iconv)" ]; then + for X in zutun.txt; do + iconv -f LATIN1 -t UTF8 -o "${X}~" "${X}" && mv -f "${X}~" "${X}" || die + done + fi + + # merge/remove resources depending on USE="X" + if use X; then + mv -f htmls resources/ || die + else + rm -rf src/net/sourceforge/dvb/projectx/gui || die + rm resources/*.gif || die + fi + + # update library packages + cd lib || die + rm -f {commons-net,jakarta-oro}*.jar || die + java-pkg_jar-from commons-net + use X && java-pkg_jar-from browserlauncher2-1.0 + java-pkg_ensure-no-bundled-jars +} + +src_compile() { + local IDCT="idct-mjpeg" # default IDCT implementation + if use x86 || use amd64; then + use cpu_flags_x86_mmx && IDCT="idct-mjpeg-mmx" + use cpu_flags_x86_sse && IDCT="idct-mjpeg-sse" + fi + + eant build $(use_doc) -Dmanifest.mainclass=$(mainclass) + + cd lib/PORTABLE || die + emake CC=$(tc-getCC) IDCT="${IDCT}" LDFLAGS="${LDFLAGS}" \ + CPLAT="${CFLAGS} -O3 -ffast-math -fPIC" +} + +src_install() { + java-pkg_dojar dist/${PN}.jar + java-pkg_doso lib/PORTABLE/libidctfast.so + + java-pkg_dolauncher ${PN}_cli --main $(mainclass) \ + --java_args "-Djava.awt.headless=true -Xmx256m" + + if use X; then + java-pkg_dolauncher ${PN}_gui --main $(mainclass) \ + --java_args "-Xmx256m" + dosym ${PN}_gui /usr/bin/${PN} + newicon "${DISTDIR}/${PN}-icon.png" "${PN}.png" + domenu *.desktop + else + dosym ${PN}_cli /usr/bin/${PN} + fi + + dodoc *.txt + use doc && java-pkg_dojavadoc apidocs + use source && java-pkg_dosrc src +} diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest new file mode 100644 index 000000000000..ce2f92fc9ca5 --- /dev/null +++ b/net-im/signal-desktop-bin/Manifest @@ -0,0 +1 @@ +DIST signal-desktop_1.0.38_amd64.deb 94694718 SHA256 ea2e215876357e027fbbcb82a57512185cf6fc7f8781819d1e8a8680078389c0 SHA512 a9b01dd4b991e2208613e5b0a70d615a06e9aa95202a15958cb6765612218022b807a8907e49bef6c2c9b7b865250f2682cbc675520364f251a9ed32cd937fb5 WHIRLPOOL 00bb2db589af68d3e706b01ebe5577bb77e20bd425731f6e8a532bc5acb0f7187cebd81bdeb278472685fba4e18c63b011f9f50f353fd518ebde5f81bac5f47d diff --git a/net-im/signal-desktop-bin/metadata.xml b/net-im/signal-desktop-bin/metadata.xml new file mode 100644 index 000000000000..0961ae0091e8 --- /dev/null +++ b/net-im/signal-desktop-bin/metadata.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>gentoo.bugzilla.2012@r123.de</email> + <name>Robert Siebeck</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <longdescription>Signal is an encrypted messenger. It requires an account created through their Android or iOS app.</longdescription> +</pkgmetadata> diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-1.0.38.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-1.0.38.ebuild new file mode 100644 index 000000000000..8a6f4926cd85 --- /dev/null +++ b/net-im/signal-desktop-bin/signal-desktop-bin-1.0.38.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +MY_PN="${PN/-bin/}" + +inherit gnome2-utils unpacker xdg-utils + +DESCRIPTION="Signal Desktop" +HOMEPAGE="https://signal.org/ https://github.com/WhisperSystems/Signal-Desktop" +SRC_URI="https://updates.signal.org/desktop/apt/pool/main/s/${MY_PN}/${MY_PN}_${PV}_amd64.deb" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +RESTRICT="bindist mirror" + +RDEPEND=" + gnome-base/gconf:2 + dev-libs/libappindicator:3 + dev-libs/nss + x11-libs/libXtst + " + +QA_PREBUILT="opt/Signal/signal-desktop + opt/Signal/libnode.so + opt/Signal/libffmpeg.so" + +S="${WORKDIR}" + +src_install() { + doins -r . + fperms +x /opt/Signal/signal-desktop + + dosym ../../opt/Signal/${MY_PN} /usr/bin/${MY_PN} +} + +pkg_postinst() { + xdg_desktop_database_update + gnome2_icon_cache_update +} + +pkg_postrm() { + xdg_desktop_database_update + gnome2_icon_cache_update +} diff --git a/profiles/arch/sparc/use.mask b/profiles/arch/sparc/use.mask index cf557eaec121..bcf5c4deeda3 100644 --- a/profiles/arch/sparc/use.mask +++ b/profiles/arch/sparc/use.mask @@ -6,6 +6,11 @@ # This file contains a list of useflags that cannot be used on sparc. +# Sergei Trofimovich <slyfox@gentoo.org> (19 Nov 2017) +# There is no luajit support on sparc. Bug #554376 +luajit +luajittex + # David Seifert <soap@gentoo.org> (08 Jul 2017) # Games are not keyworded anymore on sparc fortune diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest index 5d4b2fdc3699..76c18739074d 100644 --- a/sci-mathematics/rstudio/Manifest +++ b/sci-mathematics/rstudio/Manifest @@ -5,21 +5,6 @@ DIST gwt-2.7.0.zip 108818328 SHA256 aa65061b73836190410720bea422eb8e787680d7bc0c DIST packrat-0.98.1000.tar.gz 97677 SHA256 c2da99ea6b62fd460f36b76f6c9b91865c42851545d61817c181bf6109e2df6b SHA512 2290c768ecf27a037e73c3f8336b9fd71c68ff19d071b4a8fbc469550d29007cacacdb75f854f73b5db2139a5104f129b85a3612e2ee47bd6118ee13f7d103a6 WHIRLPOOL a2d0c3c3e04cbc496f59abbf1065fcd0b7ae25433ce0b7ca8e75ab59362f320508537b2a62ed1028dd5baad6cbab5ef2e91dd9d3af327bbd04c08a96c57d80f4 DIST rmarkdown-0.98.1000.tar.gz 1423820 SHA256 56e9f964f805627f6d6face9bf09e6435be4cc48321447ad4041fee86d6f88b4 SHA512 df3540c24c87930fe55bff2ffe67c86c219800cb00ed72ba9451ecd0d0cad411548a78c1a04b9a2e301e853616dcb77e09129c4e48ade6f16d3f14b7ea7e4852 WHIRLPOOL 51098cd48a12a61da312fc1cc96927626db4a19cc069c88f615dd20abe40f52a7b1ac1325b52b1922110ffa76a7f255d9ff2a75cd05d3de01d1b96f0c8286790 DIST rsconnect_0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0.tar.gz 197051 SHA256 e1e3e1f799eb8be679be9a2ed5aad7e9ce6cd603e3cb43fdc242490f0c311113 SHA512 208dc349f4aa7613ecf94939aba60d22d3a06972344b526c9b6c951015571f5922927bca08db571a7b8a268e42609a4f558f01278c9685f6da2ffc66a1f95ade WHIRLPOOL 4e3d64de00a98190c435d76f12a401d30950fdc7590b6bcc886ae50d4771825d39f93ea2bdcb4a9db026361c522f16f11297ff89dcb15c35f9471c1abf4f4e2c -DIST rstudio-0.99.473.tar.gz 16993092 SHA256 a402995251393d50fa70e2e02188a8b32dc34e067f2f8461f087bf71f643585c SHA512 5615840501f7629e82100fee78c35b8d4dc78d78932d65c2e91a6472bc94726389566f5853a99e3d0631fd260e59acea5a40acf82f72709741b89a1ed3c901af WHIRLPOOL 809549c76efee8b29452584ab4295bcbbf533f8100c8caf4dd3b4a3c8843dc54a0d8f3178a6aecab5c188f2498a74daa6c6677fc6d43bd7dd861487c557e48df -DIST rstudio-0.99.482.tar.gz 16992873 SHA256 1185d6ce5d3872e134f3255668d8f082370c760f06ec409c7b84c0936f52c4bf SHA512 bdb845cceae851d27323448a3570621bcb2aba7742e9e1669c88f3ebeaaade8c8371eb38f2ad348d7e2b740778c34f73e59013502ae3cebafba84e5d249c3e52 WHIRLPOOL 743440227c8d7e56000b1ff0b1a12def50e006b4f34d2067587274e2bae0eda42656787fc0cf6c51ffdbfcca08fc6eab0d042891bd77e4446b6fe26c6d19cc05 -DIST rstudio-0.99.483.tar.gz 16993049 SHA256 85ce1a2f40690e4ed0338b153a1b3279ce9564396d8c6d6201a0ad39297d4a9a SHA512 7d9cc8b471a4d799f286193da5f6f950f85e82949ede0f1ffe3626a429a49204878fb731250e5f54164a48e1d6e9cbb19a04a38ff83e35fd46c0ba05ef78a9bc WHIRLPOOL 0c5c1d86b0bafe9d5ca02397793f902b4dca7edc3f507a472b8b235f91965d8a769a7873cc87d834fbb121792b52eb6908018ce6579acdf3d285b6ec986abc20 -DIST rstudio-0.99.484.tar.gz 16993033 SHA256 8ca4abccb9b554713077cf1057ac13abadfd7606f22ac3386b2a88a38ae8a427 SHA512 407f50747bca749ef2c512e727cbe062abdd99c1eb76af09761e6bdfb4208f30117e1ee55b485447f64f6cf249bc939ef1fb4f8ce0199595e241a3cc617b4b8b WHIRLPOOL 8cc16553ea2703f005908c69803b64da4172092cb0b3ff9015e7ec354340fcd1cfa82a218ac890adffafe3565ead94bee6f7bd239b1c56ee38cbeb5896f556b0 -DIST rstudio-0.99.486.tar.gz 16992775 SHA256 4057195465e5032625bad0304bfbd9d123a78c3e4d6d5d41abcc6ef6ccd18a6f SHA512 bb88d12f8ae2f79779532371d03a698a2c2897c212c42c8438d5223c14e1033098dbd7c278a929958fa4bbc764a3ceb101abe03634f0e33192de44cf97128a1f WHIRLPOOL 13c35a69e525d90c6694d068526a2aede76a086427539294e46db67d0fc92759fb9cb0a1169cf88745ae1e121fdd7ba2e46bd2d2fb3fa17dc7fcc65848820941 -DIST rstudio-0.99.491.tar.gz 16992702 SHA256 e8c21e2262b610a7ccf39283b97d114bee33c6840a060067b8019404ff44b03f SHA512 2658694d6154f4b91b2dc07a7ec653edb7f593c4d9829a06a5e600e4db465ca6059418be6812d5ba2529fd6202dd136f0f58d74576f856fdcf6f81032d74f3c2 WHIRLPOOL e71650a07cc010ab3c25955c7fa9e90eee68577c1ef78e02a5f81a0160c688908ec5ec4fd89c89e5a9bc49b926623cd5de976fb249aa2d472354d23f5fad76de -DIST rstudio-0.99.879.tar.gz 17406999 SHA256 73fa59be34eb63d9ed194642a93ad529d2c67cdcbcd2f291952fdef8e999a097 SHA512 c2bbe598a4a9c2abc69e39807af70be5729a06bbcb73bac5249f74f3c3daddb2909bf4a46d988f0d4bfeabe308f0c31d2a75aa28a52f11c1343dfcead07e2c45 WHIRLPOOL 5c9c75a7891ac53eb80a36eff518d77a0c281b16bff383526ac1ede07ee57486d7b00be4e400a0cad48dfea92729becf25c67f18782af7930f9b4218592afe5c -DIST rstudio-0.99.893.tar.gz 17407634 SHA256 90a657b1fa16cfc575ca884789bac47f17832eb8b92496d044da3c5d79b0b874 SHA512 baa2a8c27e101e74b8a3f3b1cd290c90031881ae11fb44606b9af1efa4114c4c6fe68298f554d8b83f96418159477579414ddb99d49d2942c021aa0697947222 WHIRLPOOL a81ed5ee17a730e9674b2a98b95f87e70c532df95fda15402952901f7def24cc673db724841579e5dbf184a3e9fc16cfada93284b40014edf74863a61e0798a5 -DIST rstudio-0.99.896.tar.gz 17409121 SHA256 05fc7546ad1d21d7e6219538056ec2ee1b86d09b731a588198ce137d3fe25bae SHA512 c62df2a1c54f8c6d14b1239dd746b88693c11c48ec56aa5ae89023e98901793b0e65df44526cbc8c71036c0f73a512767cae086ed3777540b1ceda05e3398e17 WHIRLPOOL 7f4d0ebc8db509f09ccc15da02a4a426de431312f2dc65126bda76e11de0e106671fc7a83e9ea8e66b88f81268d0db8b44014a70744b30641bb58bedda73427d -DIST rstudio-0.99.902.tar.gz 17408815 SHA256 703a3ebedbb4bb44d2cacffed2615b4f65156fcd4115029931eb5fd99950c689 SHA512 23db68f05900666287901d75f02006f7edacafab057d82a312b4e5aac639ef4b5db702420632f2768e509411bbfc73c32a533aa0f1b33379c10df82e009b974e WHIRLPOOL e7ef3cf0d9a414257c4c0c68809c674721f9513917bd450c9946133ee69dd735374417483c7dc380ee4d387119558c961d4ea815aac5bcd3fa22ee863556e0a4 -DIST rstudio-0.99.903.tar.gz 17409865 SHA256 8902fe7a6f7f6e0d6e8fae2472e479bb9cbe9cbb2e0747e5f01a093d31993a3c SHA512 9ddcfdab187c907dfa3cbf386ee902b43ba35c242b44a4190c58d1e3bad590ca428209423739768b57f759c4bde61ef2b5958fb3cba366d7740753c3c5dbf739 WHIRLPOOL 82ca64883d02aacc0c1081779f769c3ea2bbac3c370f1e62fba18465547742114df18d431f30c3fe449c0ae2ac212cd7dd98a72bb2e5810eb1fc6cdbb3c82a69 -DIST rstudio-1.0.136.tar.gz 17786389 SHA256 bb6a8aa475e09dd090cd2b5ea505f578d270858784120599aee5c10bd8ca58e8 SHA512 cb4f98834f287267925169c8141bd0f95fd23cefdba8f407f76a24617bc40da56430745f112774838345330b9f99b9cac86d5b99517346a019e8e2cb3b01f713 WHIRLPOOL 5932ef2572670951a094f79e8805215fd50c3643b4a4654cb469d7181708a3327763531cb68e968e64ebdb7b44df03da0c18f9a06a12d968e908bedc43dac52f -DIST rstudio-1.0.143.tar.gz 17791067 SHA256 8ae88731b4474e5e2ff9030aa14e168903fe3a7ffc4fa716f497084a86801062 SHA512 46eaa88dd8332f18bb3a43de6e262d8a365860d9add78aea6a2d345784b239972c9c73bf0b56f1736b2981b8f688dbaf5a83c6848d170c0cf61d0e51dd636a82 WHIRLPOOL db1c11be240db3528e46d359c7d40d64068dfe5f7d915c4a6b690444f7f7fbc11f3898a6e262fa625bfab906f0cbfb2a8e3288a4fd20470423a99d992972fcda -DIST rstudio-1.0.153.tar.gz 17790922 SHA256 79b90e21e56b114e28b03fd8543a208c55bb9d5f47a87fd29143d08b9a06f7a0 SHA512 d970a9bde88845e3fc6cdaff5233ffb65c03939c685c3fca0dd052246e065c7580b3f9bc4e053a79d2ecbb5f8c283d3fce7b97cc69e43176bd49587c736dab86 WHIRLPOOL c1f4c7bdc8e5a85af53411a35d736278b83f4732d2e273378fecc77cb075dff507147d56012682564edd58041c91cc051189eb38a7348d0827b76c7ac37bd54d -DIST rstudio-1.0.44.tar.gz 17774065 SHA256 43ece6cfdd1a13ac0e17f2a50154a30a1a14ad6c1b3cf381cc6007988ce44a0f SHA512 a8b975dc517125a257e5f61db5bb137e133b02d738d55553770aa65e388cd112ce646b53b77dc069d1ca95ccd95979f4a57ad60b99fc3b91543cf61e737e8169 WHIRLPOOL 4ad472aed130451e81d8d8e3251d3bbd701a8b8e2fbddf17dc357f39335e33c75505f9443c2c7208e60a19c2767b9328134433e5d4fd22504813020712c658ef DIST rstudio-1.1.368.tar.gz 20197144 SHA256 586573707a488b5f528680b932ba5f8ea6d07667cc5ae6426104e2abf5ddab75 SHA512 39cdf583d7dcd22338916cc0ea4f90681580e41663b2d3e04b2e650759c6b030c85ee111cdfe1f717f931932a9b7ca423a21585d69a785f056f754f6d50399a1 WHIRLPOOL e18ff21823638d458179819e0b0b234b80be2f095f5b7bf5b9ac0190b078f0d7acb51e8896cbfcf1ce33cd203ed4e9fbe097aac6eee62515cace1d2f08c08219 DIST selenium-java-2.37.0.zip 24625928 SHA256 0eebba65d8edb01c1f46e462907c58f5d6e1cb0ddf63660a9985c8432bdffbb7 SHA512 68624e82dbc751a25c50fad72702a98eb30d77fd4337d2a969f8e06bcc49e5f8c835cd27ec53772f3375014ddde1d5636936e966b75f3594a9f86aa18ba4e779 WHIRLPOOL eb6659aae26f3c78b6f998546b23d0636c9d00ed8a7f985db1463ac4bd483ccb3e643d84e2ca0f59e0636a8de79eb552ff1d68eb6f9c06907029f7552d8f7777 DIST selenium-server-standalone-2.37.0.jar 34730734 SHA256 97bc8c699037fb6e99ba7af570fb60dbb1b7ce30cde2448287a44ef65b13023e SHA512 b215446d42d2d1f69664349b6ae6dc53a532d3624c91254f0f4183d0ad764648792e5cc1126a55a1e60d9687d55200fed01d6d2f46cc3d853b1fa6ee38111018 WHIRLPOOL 20640591534f31f24825a9ed139589b182e8b60d86541bf0be104d3cc0280983f6566bd0459f2253ac3875b48a2798b205bac8f815a119fff6db625ce9bbc29e diff --git a/sci-mathematics/rstudio/files/rstudio-0.98.1091-pandoc.patch b/sci-mathematics/rstudio/files/rstudio-0.98.1091-pandoc.patch deleted file mode 100644 index 3df8d1a986a3..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-0.98.1091-pandoc.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- rstudio-0.98.1091-orig/src/cpp/session/CMakeLists.txt 2014-11-06 23:15:47.000000000 +1100 -+++ rstudio-0.98.1091/src/cpp/session/CMakeLists.txt 2014-11-26 17:12:42.699712510 +1100 -@@ -25,9 +25,6 @@ - if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-23") - message(FATAL_ERROR "Mathjax 2.3 not found (re-run install-dependencies script to install)") - endif() --if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc") -- message(FATAL_ERROR "pandoc not found (re-run install-dependencies script to install)") --endif() - if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/rmarkdown") - message(FATAL_ERROR "rmarkdown package not found (re-run install-dependencies script to install)") - endif() -@@ -343,13 +340,6 @@ - install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-23" - DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources") - -- # install pandoc -- set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/1.12.4.2") -- file(GLOB PANDOC_FILES "${PANDOC_BIN}/pandoc*") -- install(FILES ${PANDOC_FILES} -- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE -- DESTINATION ${RSTUDIO_INSTALL_BIN}/pandoc) -- - # install rmarkdown package - file(GLOB RMARKDOWN_PACKAGE "${RSTUDIO_DEPENDENCIES_DIR}/common/rmarkdown*.tar.gz") - install(FILES ${RMARKDOWN_PACKAGE} diff --git a/sci-mathematics/rstudio/files/rstudio-0.98.490-paths.patch b/sci-mathematics/rstudio/files/rstudio-0.98.490-paths.patch deleted file mode 100644 index d28ad5cb0752..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-0.98.490-paths.patch +++ /dev/null @@ -1,120 +0,0 @@ -diff --git a/CMakeGlobals.txt b/CMakeGlobals.txt -index cc10191..f75b85a 100644 ---- a/CMakeGlobals.txt -+++ b/CMakeGlobals.txt -@@ -105,7 +105,7 @@ else() - else() - set(RSTUDIO_INSTALL_BIN bin) - endif() -- set(RSTUDIO_INSTALL_SUPPORTING .) -+ set(RSTUDIO_INSTALL_SUPPORTING ${DISTRO_SHARE}) - endif() - - # if the install prefix is /usr/local then tweak as appropriate -diff --git a/src/cpp/server/CMakeLists.txt b/src/cpp/server/CMakeLists.txt -index 184e514..d09aac5 100644 ---- a/src/cpp/server/CMakeLists.txt -+++ b/src/cpp/server/CMakeLists.txt -@@ -145,7 +145,7 @@ if (UNIX AND NOT APPLE) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}.in - ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT} -- DESTINATION ${RSERVER_INITD_DEBIAN_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_DEBIAN_DIR}) - - # install configured redhat init.d script - set(RSERVER_INITD_REDHAT_DIR "extras/init.d/redhat") -@@ -153,7 +153,7 @@ if (UNIX AND NOT APPLE) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}.in - ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT} -- DESTINATION ${RSERVER_INITD_REDHAT_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_REDHAT_DIR}) - - # install configured suse init.d script - set(RSERVER_INITD_SUSE_DIR "extras/init.d/suse") -@@ -161,13 +161,13 @@ if (UNIX AND NOT APPLE) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_SUSE_SCRIPT}.in - ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT}) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT} -- DESTINATION ${RSERVER_INITD_SUSE_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_SUSE_DIR}) - - # install pam profile - set(RSERVER_PAM_DIR "extras/pam") - set(RSERVER_PAM_PROFILE "${RSERVER_PAM_DIR}/rstudio") - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_PAM_PROFILE} -- DESTINATION ${RSERVER_PAM_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_PAM_DIR}) - - # install configured apparmor profile - set(RSERVER_APPARMOR_DIR "extras/apparmor") -@@ -175,9 +175,9 @@ if (UNIX AND NOT APPLE) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_PROFILE}.in - ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_APPARMOR_PROFILE}) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_APPARMOR_PROFILE} -- DESTINATION ${RSERVER_APPARMOR_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_APPARMOR_DIR}) - install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_DIR}/apparmor-profile-load -- DESTINATION ${RSERVER_APPARMOR_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_APPARMOR_DIR}) - - # install configured upstart profile - set(RSERVER_UPSTART_DIR "extras/upstart") -@@ -185,12 +185,12 @@ if (UNIX AND NOT APPLE) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE}.in - ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE}) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE} -- DESTINATION ${RSERVER_UPSTART_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR}) - set(RSERVER_UPSTART_PROFILE_REDHAT "${RSERVER_UPSTART_DIR}/rstudio-server.redhat.conf") - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT}.in - ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT}) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT} -- DESTINATION ${RSERVER_UPSTART_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR}) - - endif() - -diff --git a/src/cpp/server/ServerOptions.cpp b/src/cpp/server/ServerOptions.cpp -index 1eaf7c0..4b25fa1 100644 ---- a/src/cpp/server/ServerOptions.cpp -+++ b/src/cpp/server/ServerOptions.cpp -@@ -307,8 +307,8 @@ ProgramStatus Options::read(int argc, - - // convert relative paths by completing from the system installation - // path (this allows us to be relocatable) -- resolvePath(resourcePath, &wwwLocalPath_); -- resolvePath(resourcePath, &wwwSymbolMapsPath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwLocalPath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwSymbolMapsPath_); - resolvePath(binaryPath, &authPamHelperPath_); - resolvePath(binaryPath, &rsessionPath_); - resolvePath(binaryPath, &rldpathPath_); -diff --git a/src/cpp/session/SessionOptions.cpp b/src/cpp/session/SessionOptions.cpp -index 44b3d55..a48cdb6 100644 ---- a/src/cpp/session/SessionOptions.cpp -+++ b/src/cpp/session/SessionOptions.cpp -@@ -357,14 +357,14 @@ core::ProgramStatus Options::read(int argc, char * const argv[]) - timeoutMinutes_ = 0; - - // convert relative paths by completing from the app resource path -- resolvePath(resourcePath, &rResourcesPath_); -- resolvePath(resourcePath, &agreementFilePath_); -- resolvePath(resourcePath, &wwwLocalPath_); -- resolvePath(resourcePath, &wwwSymbolMapsPath_); -- resolvePath(resourcePath, &coreRSourcePath_); -- resolvePath(resourcePath, &modulesRSourcePath_); -- resolvePath(resourcePath, &sessionLibraryPath_); -- resolvePath(resourcePath, &sessionPackagesPath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &rResourcesPath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &agreementFilePath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwLocalPath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &coreRSourcePath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &modulesRSourcePath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &sessionLibraryPath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &sessionPackagesPath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwSymbolMapsPath_); - resolvePostbackPath(resourcePath, &rpostbackPath_); - #ifdef _WIN32 - resolvePath(resourcePath, &consoleIoPath_); diff --git a/sci-mathematics/rstudio/files/rstudio-0.98.490-prefs.patch b/sci-mathematics/rstudio/files/rstudio-0.98.490-prefs.patch deleted file mode 100644 index 3175d47235ab..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-0.98.490-prefs.patch +++ /dev/null @@ -1,24 +0,0 @@ -And now we fix src/gwt/build.xml since java's user preference class is -braindead and insists on writing where it is not allowed. -much thanks to http://www.allaboutbalance.com/articles/disableprefs/ - -diff --git a/src/gwt/build.xml b/src/gwt/build.xml -index e7d2418..ae3a331 100644 ---- a/src/gwt/build.xml -+++ b/src/gwt/build.xml -@@ -25,6 +25,7 @@ - <property name="gwt.extra.args" value=""/> - <property name="gwt.main.module" value="org.rstudio.studio.RStudio"/> - <property name="ace.bin" value="src/org/rstudio/studio/client/workbench/views/source/editors/text/ace"/> -+ <property environment="env"/> - - <path id="project.class.path"> - <pathelement location="bin"/> -@@ -109,6 +110,7 @@ - </classpath> - <!-- add jvmarg -Xss16M or similar if you see a StackOverflowError --> - <jvmarg value="-Xmx1024M"/> -+ <jvmarg value="-Djava.util.prefs.userRoot=${env.T}"/> - <arg value="-war"/> - <arg value="www"/> - <arg value="-localWorkers"/> diff --git a/sci-mathematics/rstudio/files/rstudio-0.98.932-pandoc.patch b/sci-mathematics/rstudio/files/rstudio-0.98.932-pandoc.patch deleted file mode 100644 index d2b6911eabb8..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-0.98.932-pandoc.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/src/cpp/session/CMakeLists.txt -+++ b/src/cpp/session/CMakeLists.txt -@@ -25,9 +25,6 @@ - if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax") - message(FATAL_ERROR "Mathjax not found (re-run install-dependencies script to install)") - endif() --if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc") -- message(FATAL_ERROR "pandoc not found (re-run install-dependencies script to install)") --endif() - if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/rmarkdown") - message(FATAL_ERROR "rmarkdown package not found (re-run install-dependencies script to install)") - endif() -@@ -337,12 +334,6 @@ - install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax" - DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources") - -- # install pandoc -- set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/1.12.3") -- file(GLOB PANDOC_FILES "${PANDOC_BIN}/pandoc*") -- install(PROGRAMS ${PANDOC_FILES} -- DESTINATION ${RSTUDIO_INSTALL_BIN}/pandoc) -- - # install rmarkdown package - file(GLOB RMARKDOWN_PACKAGE "${RSTUDIO_DEPENDENCIES_DIR}/common/rmarkdown*.tar.gz") - install(FILES ${RMARKDOWN_PACKAGE} diff --git a/sci-mathematics/rstudio/files/rstudio-0.98.932-paths.patch b/sci-mathematics/rstudio/files/rstudio-0.98.932-paths.patch deleted file mode 100644 index d4bb4249f1a6..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-0.98.932-paths.patch +++ /dev/null @@ -1,140 +0,0 @@ -diff --git a/CMakeGlobals.txt b/CMakeGlobals.txt -index cc10191..f75b85a 100644 ---- a/CMakeGlobals.txt -+++ b/CMakeGlobals.txt -@@ -105,7 +105,7 @@ else() - else() - set(RSTUDIO_INSTALL_BIN bin) - endif() -- set(RSTUDIO_INSTALL_SUPPORTING .) -+ set(RSTUDIO_INSTALL_SUPPORTING ${DISTRO_SHARE}) - endif() - - # if the install prefix is /usr/local then tweak as appropriate -diff --git a/src/cpp/server/CMakeLists.txt b/src/cpp/server/CMakeLists.txt -index 184e514..d09aac5 100644 ---- a/src/cpp/server/CMakeLists.txt -+++ b/src/cpp/server/CMakeLists.txt -@@ -145,7 +145,7 @@ if (UNIX AND NOT APPLE) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}.in - ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT} -- DESTINATION ${RSERVER_INITD_DEBIAN_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_DEBIAN_DIR}) - - # install configured redhat init.d script - set(RSERVER_INITD_REDHAT_DIR "extras/init.d/redhat") -@@ -153,7 +153,7 @@ if (UNIX AND NOT APPLE) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}.in - ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT} -- DESTINATION ${RSERVER_INITD_REDHAT_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_REDHAT_DIR}) - - # install configured suse init.d script - set(RSERVER_INITD_SUSE_DIR "extras/init.d/suse") -@@ -161,13 +161,13 @@ if (UNIX AND NOT APPLE) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_SUSE_SCRIPT}.in - ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT}) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT} -- DESTINATION ${RSERVER_INITD_SUSE_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_SUSE_DIR}) - - # install pam profile - set(RSERVER_PAM_DIR "extras/pam") - set(RSERVER_PAM_PROFILE "${RSERVER_PAM_DIR}/rstudio") - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_PAM_PROFILE} -- DESTINATION ${RSERVER_PAM_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_PAM_DIR}) - - # install configured apparmor profile - set(RSERVER_APPARMOR_DIR "extras/apparmor") -@@ -175,9 +175,9 @@ if (UNIX AND NOT APPLE) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_PROFILE}.in - ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_APPARMOR_PROFILE}) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_APPARMOR_PROFILE} -- DESTINATION ${RSERVER_APPARMOR_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_APPARMOR_DIR}) - install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_DIR}/apparmor-profile-load -- DESTINATION ${RSERVER_APPARMOR_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_APPARMOR_DIR}) - - # install configured upstart profile - set(RSERVER_UPSTART_DIR "extras/upstart") -@@ -185,12 +185,12 @@ if (UNIX AND NOT APPLE) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE}.in - ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE}) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE} -- DESTINATION ${RSERVER_UPSTART_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR}) - set(RSERVER_UPSTART_PROFILE_REDHAT "${RSERVER_UPSTART_DIR}/rstudio-server.redhat.conf") - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT}.in - ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT}) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT} -- DESTINATION ${RSERVER_UPSTART_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR}) - - endif() - -diff --git a/src/cpp/server/ServerOptions.cpp b/src/cpp/server/ServerOptions.cpp -index 1eaf7c0..4b25fa1 100644 ---- a/src/cpp/server/ServerOptions.cpp -+++ b/src/cpp/server/ServerOptions.cpp -@@ -307,8 +307,8 @@ ProgramStatus Options::read(int argc, - - // convert relative paths by completing from the system installation - // path (this allows us to be relocatable) -- resolvePath(resourcePath, &wwwLocalPath_); -- resolvePath(resourcePath, &wwwSymbolMapsPath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwLocalPath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwSymbolMapsPath_); - resolvePath(binaryPath, &authPamHelperPath_); - resolvePath(binaryPath, &rsessionPath_); - resolvePath(binaryPath, &rldpathPath_); -diff --git a/src/cpp/session/SessionOptions.cpp b/src/cpp/session/SessionOptions.cpp -index 44b3d55..a48cdb6 100644 ---- a/src/cpp/session/SessionOptions.cpp -+++ b/src/cpp/session/SessionOptions.cpp -@@ -40,7 +40,7 @@ - namespace session { - - namespace { --const char* const kDefaultPandocPath = "bin/pandoc"; -+const char* const kDefaultPandocPath = "bin"; - const char* const kDefaultPostbackPath = "bin/postback/rpostback"; - } // anonymous namespace - -@@ -392,15 +392,15 @@ - } - - // convert relative paths by completing from the app resource path -- resolvePath(resourcePath, &rResourcesPath_); -- resolvePath(resourcePath, &agreementFilePath_); -- resolvePath(resourcePath, &wwwLocalPath_); -- resolvePath(resourcePath, &wwwSymbolMapsPath_); -- resolvePath(resourcePath, &coreRSourcePath_); -- resolvePath(resourcePath, &modulesRSourcePath_); -- resolvePath(resourcePath, &sessionLibraryPath_); -- resolvePath(resourcePath, &sessionPackagesPath_); -- resolvePath(resourcePath, &sessionPackageArchivesPath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &rResourcesPath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &agreementFilePath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwLocalPath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &coreRSourcePath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &modulesRSourcePath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &sessionLibraryPath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &sessionPackagesPath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &sessionPackageArchivesPath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwSymbolMapsPath_); - resolvePostbackPath(resourcePath, &rpostbackPath_); - #ifdef _WIN32 - resolvePath(resourcePath, &consoleIoPath_); -@@ -409,7 +409,7 @@ - resolvePath(resourcePath, &msysSshPath_); - resolvePath(resourcePath, &sumatraPath_); - #endif -- resolvePath(resourcePath, &hunspellDictionariesPath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &hunspellDictionariesPath_); - resolvePath(resourcePath, &mathjaxPath_); - resolvePandocPath(resourcePath, &pandocPath_); - diff --git a/sci-mathematics/rstudio/files/rstudio-0.99.473-clang-pandoc.patch b/sci-mathematics/rstudio/files/rstudio-0.99.473-clang-pandoc.patch deleted file mode 100644 index b37a91929574..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-0.99.473-clang-pandoc.patch +++ /dev/null @@ -1,77 +0,0 @@ ---- rstudio-0.99.473-orig/src/cpp/session/CMakeLists.txt 2015-08-12 09:58:43.000000000 +1000 -+++ rstudio-0.99.473/src/cpp/session/CMakeLists.txt 2015-08-27 00:51:48.395751378 +1000 -@@ -25,30 +25,11 @@ - if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-23") - message(FATAL_ERROR "Mathjax 2.3 not found (re-run install-dependencies script to install)") - endif() --if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc") -- message(FATAL_ERROR "pandoc not found (re-run install-dependencies script to install)") --endif() - if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/rsconnect") - message(FATAL_ERROR "rsconnect package not found (re-run install-dependencies script to install)") - endif() - - --# verify libclang is installed --if(WIN32) -- set(LIBCLANG_VERSION "3.4") --else() -- set(LIBCLANG_VERSION "3.5") --endif() --set(LIBCLANG_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/${LIBCLANG_VERSION}") --if(NOT EXISTS "${LIBCLANG_DIR}") -- message(FATAL_ERROR "libclang ${LIBCLANG_VERSION} not found (re-run install-dependencies script to install)") --endif() --set(LIBCLANG_HEADERS_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers") --if(NOT EXISTS "${LIBCLANG_HEADERS_DIR}") -- message(FATAL_ERROR "libclang builtin-headers not found (re-run install-dependencies script to install)") --endif() -- -- - # include files - file(GLOB_RECURSE SESSION_HEADER_FILES "*.h*") - -@@ -391,18 +372,6 @@ - install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-23" - DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources") - -- # install pandoc -- if(RSTUDIO_PACKAGE_BUILD_SLES) -- # when producing a SUSE Linux Enterpise build, we want to install the -- # static Pandoc binaries (see dependencies/common/install-pandoc) -- set(PANDOC_EXTENSION_DIR "/static") -- endif() -- set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/1.13.1${PANDOC_EXTENSION_DIR}") -- file(GLOB PANDOC_FILES "${PANDOC_BIN}/pandoc*") -- install(FILES ${PANDOC_FILES} -- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE -- DESTINATION ${RSTUDIO_INSTALL_BIN}/pandoc) -- - # install rsconnect package - file(GLOB RSCONNECT_PACKAGE "${RSTUDIO_DEPENDENCIES_DIR}/common/rsconnect*.tar.gz") - install(FILES ${RSCONNECT_PACKAGE} -@@ -420,24 +389,6 @@ - install(DIRECTORY "resources/help_resources" - DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources) - -- # install libclang -- if(WIN32) -- file(GLOB LIBCLANG_32_FILES "${LIBCLANG_DIR}/x86/libclang.*") -- install(PROGRAMS ${LIBCLANG_32_FILES} -- DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang/x86) -- file(GLOB LIBCLANG_64_FILES "${LIBCLANG_DIR}/x86_64/libclang.*") -- install(PROGRAMS ${LIBCLANG_64_FILES} -- DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang/x86_64) -- else() -- file(GLOB_RECURSE LIBCLANG_FILES "${LIBCLANG_DIR}/libclang.*") -- install(PROGRAMS ${LIBCLANG_FILES} -- DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang) -- endif() -- -- # install libclang builtin-headers -- install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers" -- DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources/libclang") -- - # install 64 bit binaries if we are on win64 - if(WIN32) - if(NOT ("$ENV{PROGRAMW6432}" STREQUAL "")) diff --git a/sci-mathematics/rstudio/files/rstudio-0.99.473-paths.patch b/sci-mathematics/rstudio/files/rstudio-0.99.473-paths.patch deleted file mode 100644 index 6b8d8886e21e..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-0.99.473-paths.patch +++ /dev/null @@ -1,130 +0,0 @@ ---- rstudio-0.99.473-orig/CMakeGlobals.txt 2015-08-12 09:58:43.000000000 +1000 -+++ rstudio-0.99.473/CMakeGlobals.txt 2015-08-26 22:12:43.614346285 +1000 -@@ -111,7 +111,7 @@ - else() - set(RSTUDIO_INSTALL_BIN bin) - endif() -- set(RSTUDIO_INSTALL_SUPPORTING .) -+ set(RSTUDIO_INSTALL_SUPPORTING ${DISTRO_SHARE}) - endif() - - # if the install prefix is /usr/local then tweak as appropriate ---- rstudio-0.99.473-orig/src/cpp/server/CMakeLists.txt 2015-08-12 09:58:43.000000000 +1000 -+++ rstudio-0.99.473/src/cpp/server/CMakeLists.txt 2015-08-26 22:15:30.988353389 +1000 -@@ -160,7 +160,7 @@ - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}.in - ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT} -- DESTINATION ${RSERVER_INITD_DEBIAN_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_DEBIAN_DIR}) - - # install configured redhat init.d script - set(RSERVER_INITD_REDHAT_DIR "extras/init.d/redhat") -@@ -168,7 +168,7 @@ - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}.in - ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT} -- DESTINATION ${RSERVER_INITD_REDHAT_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_REDHAT_DIR}) - - # install configured suse init.d script - set(RSERVER_INITD_SUSE_DIR "extras/init.d/suse") -@@ -176,13 +176,13 @@ - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_SUSE_SCRIPT}.in - ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT}) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT} -- DESTINATION ${RSERVER_INITD_SUSE_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_SUSE_DIR}) - - # install pam profile - set(RSERVER_PAM_DIR "extras/pam") - set(RSERVER_PAM_PROFILE "${RSERVER_PAM_DIR}/rstudio") - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_PAM_PROFILE} -- DESTINATION ${RSERVER_PAM_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_PAM_DIR}) - - # install configured apparmor profile - set(RSERVER_APPARMOR_DIR "extras/apparmor") -@@ -190,9 +190,9 @@ - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_PROFILE}.in - ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_APPARMOR_PROFILE}) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_APPARMOR_PROFILE} -- DESTINATION ${RSERVER_APPARMOR_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_APPARMOR_DIR}) - install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_DIR}/apparmor-profile-load -- DESTINATION ${RSERVER_APPARMOR_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_APPARMOR_DIR}) - - # install configured upstart profile - set(RSERVER_UPSTART_DIR "extras/upstart") -@@ -200,12 +200,12 @@ - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE}.in - ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE}) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE} -- DESTINATION ${RSERVER_UPSTART_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR}) - set(RSERVER_UPSTART_PROFILE_REDHAT "${RSERVER_UPSTART_DIR}/rstudio-server.redhat.conf") - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT}.in - ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT}) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT} -- DESTINATION ${RSERVER_UPSTART_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR}) - - # install configured systemd profile - set(RSERVER_SYSTEMD_DIR "extras/systemd") ---- rstudio-0.99.473-orig/src/cpp/server/ServerOptions.cpp 2015-08-12 09:58:43.000000000 +1000 -+++ rstudio-0.99.473/src/cpp/server/ServerOptions.cpp 2015-08-26 22:12:43.615346286 +1000 -@@ -314,8 +314,8 @@ - - // convert relative paths by completing from the system installation - // path (this allows us to be relocatable) -- resolvePath(resourcePath, &wwwLocalPath_); -- resolvePath(resourcePath, &wwwSymbolMapsPath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwLocalPath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwSymbolMapsPath_); - resolvePath(binaryPath, &authPamHelperPath_); - resolvePath(binaryPath, &rsessionPath_); - resolvePath(binaryPath, &rldpathPath_); ---- rstudio-0.99.473-orig/src/cpp/session/SessionOptions.cpp 2015-08-12 09:58:43.000000000 +1000 -+++ rstudio-0.99.473/src/cpp/session/SessionOptions.cpp 2015-08-26 22:17:40.594358890 +1000 -@@ -43,7 +43,7 @@ - namespace session { - - namespace { --const char* const kDefaultPandocPath = "bin/pandoc"; -+const char* const kDefaultPandocPath = "bin"; - const char* const kDefaultPostbackPath = "bin/postback/rpostback"; - const char* const kDefaultRsclangPath = "bin/rsclang"; - } // anonymous namespace -@@ -431,14 +431,14 @@ - } - - // convert relative paths by completing from the app resource path -- resolvePath(resourcePath, &rResourcesPath_); -- resolvePath(resourcePath, &agreementFilePath_); -- resolvePath(resourcePath, &wwwLocalPath_); -- resolvePath(resourcePath, &wwwSymbolMapsPath_); -- resolvePath(resourcePath, &coreRSourcePath_); -- resolvePath(resourcePath, &modulesRSourcePath_); -- resolvePath(resourcePath, &sessionLibraryPath_); -- resolvePath(resourcePath, &sessionPackageArchivesPath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &rResourcesPath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &agreementFilePath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwLocalPath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwSymbolMapsPath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &coreRSourcePath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &modulesRSourcePath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &sessionLibraryPath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &sessionPackageArchivesPath_); - resolvePostbackPath(resourcePath, &rpostbackPath_); - #ifdef _WIN32 - resolvePath(resourcePath, &consoleIoPath_); -@@ -447,7 +447,7 @@ - resolvePath(resourcePath, &msysSshPath_); - resolvePath(resourcePath, &sumatraPath_); - #endif -- resolvePath(resourcePath, &hunspellDictionariesPath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &hunspellDictionariesPath_); - resolvePath(resourcePath, &mathjaxPath_); - resolvePath(resourcePath, &libclangHeadersPath_); - resolvePandocPath(resourcePath, &pandocPath_); diff --git a/sci-mathematics/rstudio/files/rstudio-0.99.486-systemd.patch b/sci-mathematics/rstudio/files/rstudio-0.99.486-systemd.patch deleted file mode 100644 index 4c7eda39cc29..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-0.99.486-systemd.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Naur /tmp/rstudio.org/work/rstudio-0.99.486/src/cpp/server/CMakeLists.txt ./work/rstudio-0.99.486/src/cpp/server/CMakeLists.txt ---- /tmp/rstudio.org/work/rstudio-0.99.486/src/cpp/server/CMakeLists.txt 2015-12-10 19:29:24.408267862 +0100 -+++ ./work/rstudio-0.99.486/src/cpp/server/CMakeLists.txt 2015-12-10 19:35:24.660194216 +0100 -@@ -208,17 +208,12 @@ - DESTINATION ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR}) - - # install configured systemd profile -- set(RSERVER_SYSTEMD_DIR "extras/systemd") -+ set(RSERVER_SYSTEMD_DIR "lib/systemd/system") - set(RSERVER_SYSTEMD_PROFILE "${RSERVER_SYSTEMD_DIR}/rstudio-server.service") - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_SYSTEMD_PROFILE}.in - ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_SYSTEMD_PROFILE}) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_SYSTEMD_PROFILE} - DESTINATION ${RSERVER_SYSTEMD_DIR}) -- set(RSERVER_SYSTEMD_PROFILE_REDHAT "${RSERVER_SYSTEMD_DIR}/rstudio-server.redhat.service") -- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_SYSTEMD_PROFILE_REDHAT}.in -- ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_SYSTEMD_PROFILE_REDHAT}) -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_SYSTEMD_PROFILE_REDHAT} -- DESTINATION ${RSERVER_SYSTEMD_DIR}) - - endif() - diff --git a/sci-mathematics/rstudio/files/rstudio-0.99.879-clang-pandoc.patch b/sci-mathematics/rstudio/files/rstudio-0.99.879-clang-pandoc.patch deleted file mode 100644 index c3af2b7a6f56..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-0.99.879-clang-pandoc.patch +++ /dev/null @@ -1,77 +0,0 @@ ---- rstudio-0.99.879-orig/src/cpp/session/CMakeLists.txt 2016-02-12 09:24:39.000000000 +1100 -+++ rstudio-0.99.879/src/cpp/session/CMakeLists.txt 2016-02-19 23:04:57.266186448 +1100 -@@ -25,30 +25,11 @@ - if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-23") - message(FATAL_ERROR "Mathjax 2.3 not found (re-run install-dependencies script to install)") - endif() --if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc") -- message(FATAL_ERROR "pandoc not found (re-run install-dependencies script to install)") --endif() - if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/rsconnect") - message(FATAL_ERROR "rsconnect package not found (re-run install-dependencies script to install)") - endif() - - --# verify libclang is installed --if(WIN32) -- set(LIBCLANG_VERSION "3.4") --else() -- set(LIBCLANG_VERSION "3.5") --endif() --set(LIBCLANG_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/${LIBCLANG_VERSION}") --if(NOT EXISTS "${LIBCLANG_DIR}") -- message(FATAL_ERROR "libclang ${LIBCLANG_VERSION} not found (re-run install-dependencies script to install)") --endif() --set(LIBCLANG_HEADERS_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers") --if(NOT EXISTS "${LIBCLANG_HEADERS_DIR}") -- message(FATAL_ERROR "libclang builtin-headers not found (re-run install-dependencies script to install)") --endif() -- -- - # include files - file(GLOB_RECURSE SESSION_HEADER_FILES "*.h*") - -@@ -399,18 +380,6 @@ - install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-23" - DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources") - -- # install pandoc -- if(RSTUDIO_PACKAGE_BUILD_SLES) -- # when producing a SUSE Linux Enterpise build, we want to install the -- # static Pandoc binaries (see dependencies/common/install-pandoc) -- set(PANDOC_EXTENSION_DIR "/static") -- endif() -- set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/1.15.2${PANDOC_EXTENSION_DIR}") -- file(GLOB PANDOC_FILES "${PANDOC_BIN}/pandoc*") -- install(FILES ${PANDOC_FILES} -- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE -- DESTINATION ${RSTUDIO_INSTALL_BIN}/pandoc) -- - # install rsconnect package - file(GLOB RSCONNECT_PACKAGE "${RSTUDIO_DEPENDENCIES_DIR}/common/rsconnect*.tar.gz") - install(FILES ${RSCONNECT_PACKAGE} -@@ -428,24 +397,6 @@ - install(DIRECTORY "resources/help_resources" - DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources) - -- # install libclang -- if(WIN32) -- file(GLOB LIBCLANG_32_FILES "${LIBCLANG_DIR}/x86/libclang.*") -- install(PROGRAMS ${LIBCLANG_32_FILES} -- DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang/x86) -- file(GLOB LIBCLANG_64_FILES "${LIBCLANG_DIR}/x86_64/libclang.*") -- install(PROGRAMS ${LIBCLANG_64_FILES} -- DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang/x86_64) -- else() -- file(GLOB_RECURSE LIBCLANG_FILES "${LIBCLANG_DIR}/libclang.*") -- install(PROGRAMS ${LIBCLANG_FILES} -- DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang) -- endif() -- -- # install libclang builtin-headers -- install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers" -- DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources/libclang") -- - # install 64 bit binaries if we are on win64 - if(WIN32) - if(NOT ("$ENV{PROGRAMW6432}" STREQUAL "")) diff --git a/sci-mathematics/rstudio/files/rstudio-0.99.879-paths.patch b/sci-mathematics/rstudio/files/rstudio-0.99.879-paths.patch deleted file mode 100644 index a8b48f24968c..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-0.99.879-paths.patch +++ /dev/null @@ -1,130 +0,0 @@ ---- rstudio-0.99.879-orig/CMakeGlobals.txt 2016-02-12 09:24:39.000000000 +1100 -+++ rstudio-0.99.879/CMakeGlobals.txt 2016-02-19 22:58:41.396818474 +1100 -@@ -120,7 +120,7 @@ - else() - set(RSTUDIO_INSTALL_BIN bin) - endif() -- set(RSTUDIO_INSTALL_SUPPORTING .) -+ set(RSTUDIO_INSTALL_SUPPORTING ${DISTRO_SHARE}) - endif() - - # if the install prefix is /usr/local then tweak as appropriate ---- rstudio-0.99.879-orig/src/cpp/server/CMakeLists.txt 2016-02-12 09:24:39.000000000 +1100 -+++ rstudio-0.99.879/src/cpp/server/CMakeLists.txt 2016-02-19 22:58:41.397818478 +1100 -@@ -155,7 +155,7 @@ - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}.in - ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT} -- DESTINATION ${RSERVER_INITD_DEBIAN_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_DEBIAN_DIR}) - - # install configured redhat init.d script - set(RSERVER_INITD_REDHAT_DIR "extras/init.d/redhat") -@@ -163,7 +163,7 @@ - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}.in - ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT} -- DESTINATION ${RSERVER_INITD_REDHAT_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_REDHAT_DIR}) - - # install configured suse init.d script - set(RSERVER_INITD_SUSE_DIR "extras/init.d/suse") -@@ -171,13 +171,13 @@ - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_SUSE_SCRIPT}.in - ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT}) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT} -- DESTINATION ${RSERVER_INITD_SUSE_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_SUSE_DIR}) - - # install pam profile - set(RSERVER_PAM_DIR "extras/pam") - set(RSERVER_PAM_PROFILE "${RSERVER_PAM_DIR}/rstudio") - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_PAM_PROFILE} -- DESTINATION ${RSERVER_PAM_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_PAM_DIR}) - - # install configured apparmor profile - set(RSERVER_APPARMOR_DIR "extras/apparmor") -@@ -185,9 +185,9 @@ - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_PROFILE}.in - ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_APPARMOR_PROFILE}) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_APPARMOR_PROFILE} -- DESTINATION ${RSERVER_APPARMOR_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_APPARMOR_DIR}) - install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_DIR}/apparmor-profile-load -- DESTINATION ${RSERVER_APPARMOR_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_APPARMOR_DIR}) - - # install configured upstart profile - set(RSERVER_UPSTART_DIR "extras/upstart") -@@ -195,12 +195,12 @@ - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE}.in - ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE}) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE} -- DESTINATION ${RSERVER_UPSTART_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR}) - set(RSERVER_UPSTART_PROFILE_REDHAT "${RSERVER_UPSTART_DIR}/rstudio-server.redhat.conf") - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT}.in - ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT}) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT} -- DESTINATION ${RSERVER_UPSTART_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR}) - - # install configured systemd profile - set(RSERVER_SYSTEMD_DIR "extras/systemd") ---- rstudio-0.99.879-orig/src/cpp/server/ServerOptions.cpp 2016-02-12 09:24:39.000000000 +1100 -+++ rstudio-0.99.879/src/cpp/server/ServerOptions.cpp 2016-02-19 22:58:41.397818478 +1100 -@@ -382,8 +382,8 @@ - - // convert relative paths by completing from the system installation - // path (this allows us to be relocatable) -- resolvePath(resourcePath, &wwwLocalPath_); -- resolvePath(resourcePath, &wwwSymbolMapsPath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwLocalPath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwSymbolMapsPath_); - resolvePath(binaryPath, &authPamHelperPath_); - resolvePath(binaryPath, &rsessionPath_); - resolvePath(binaryPath, &rldpathPath_); ---- rstudio-0.99.879-orig/src/cpp/session/SessionOptions.cpp 2016-02-12 09:24:39.000000000 +1100 -+++ rstudio-0.99.879/src/cpp/session/SessionOptions.cpp 2016-02-20 18:13:34.807771539 +1100 -@@ -49,7 +49,7 @@ - namespace session { - - namespace { --const char* const kDefaultPandocPath = "bin/pandoc"; -+const char* const kDefaultPandocPath = "bin"; - const char* const kDefaultPostbackPath = "bin/postback/rpostback"; - const char* const kDefaultRsclangPath = "bin/rsclang"; - } // anonymous namespace -@@ -451,14 +451,14 @@ - } - - // convert relative paths by completing from the app resource path -- resolvePath(resourcePath_, &rResourcesPath_); -- resolvePath(resourcePath_, &agreementFilePath_); -- resolvePath(resourcePath_, &wwwLocalPath_); -- resolvePath(resourcePath_, &wwwSymbolMapsPath_); -- resolvePath(resourcePath_, &coreRSourcePath_); -- resolvePath(resourcePath_, &modulesRSourcePath_); -- resolvePath(resourcePath_, &sessionLibraryPath_); -- resolvePath(resourcePath_, &sessionPackageArchivesPath_); -+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &rResourcesPath_); -+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &agreementFilePath_); -+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &wwwLocalPath_); -+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &wwwSymbolMapsPath_); -+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &coreRSourcePath_); -+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &modulesRSourcePath_); -+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &sessionLibraryPath_); -+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &sessionPackageArchivesPath_); - resolvePostbackPath(resourcePath_, &rpostbackPath_); - #ifdef _WIN32 - resolvePath(resourcePath_, &consoleIoPath_); -@@ -467,7 +467,7 @@ - resolvePath(resourcePath_, &msysSshPath_); - resolvePath(resourcePath_, &sumatraPath_); - #endif -- resolvePath(resourcePath_, &hunspellDictionariesPath_); -+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &hunspellDictionariesPath_); - resolvePath(resourcePath_, &mathjaxPath_); - resolvePath(resourcePath_, &libclangHeadersPath_); - resolvePandocPath(resourcePath_, &pandocPath_); diff --git a/sci-mathematics/rstudio/files/rstudio-1.0.44-clang-pandoc.patch b/sci-mathematics/rstudio/files/rstudio-1.0.44-clang-pandoc.patch deleted file mode 100644 index ed0fc8ebce4b..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-1.0.44-clang-pandoc.patch +++ /dev/null @@ -1,71 +0,0 @@ ---- rstudio-1.0.44-orig/src/cpp/session/CMakeLists.txt 2016-10-19 08:32:41.000000000 +1100 -+++ rstudio-1.0.44/src/cpp/session/CMakeLists.txt 2016-12-01 23:44:30.130725331 +1100 -@@ -25,24 +25,6 @@ - if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-26") - message(FATAL_ERROR "Mathjax 2.6 not found (re-run install-dependencies script to install)") - endif() --if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc") -- message(FATAL_ERROR "pandoc not found (re-run install-dependencies script to install)") --endif() -- --# verify libclang is installed --if(WIN32) -- set(LIBCLANG_VERSION "3.4") --else() -- set(LIBCLANG_VERSION "3.5") --endif() --set(LIBCLANG_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/${LIBCLANG_VERSION}") --if(NOT EXISTS "${LIBCLANG_DIR}") -- message(FATAL_ERROR "libclang ${LIBCLANG_VERSION} not found (re-run install-dependencies script to install)") --endif() --set(LIBCLANG_HEADERS_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers") --if(NOT EXISTS "${LIBCLANG_HEADERS_DIR}") -- message(FATAL_ERROR "libclang builtin-headers not found (re-run install-dependencies script to install)") --endif() - - - # include files -@@ -420,18 +402,6 @@ - install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-26" - DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources") - -- # install pandoc -- if(RSTUDIO_PACKAGE_BUILD_SLES) -- # when producing a SUSE Linux Enterpise build, we want to install the -- # static Pandoc binaries (see dependencies/common/install-pandoc) -- set(PANDOC_EXTENSION_DIR "/static") -- endif() -- set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/1.17.2${PANDOC_EXTENSION_DIR}") -- file(GLOB PANDOC_FILES "${PANDOC_BIN}/pandoc*") -- install(FILES ${PANDOC_FILES} -- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE -- DESTINATION ${RSTUDIO_INSTALL_BIN}/pandoc) -- - # install PDF.js - install(DIRECTORY "resources/pdfjs" - DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources) -@@ -452,24 +422,6 @@ - install(DIRECTORY "resources/pagedtable" - DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources) - -- # install libclang -- if(WIN32) -- file(GLOB LIBCLANG_32_FILES "${LIBCLANG_DIR}/x86/libclang.*") -- install(PROGRAMS ${LIBCLANG_32_FILES} -- DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang/x86) -- file(GLOB LIBCLANG_64_FILES "${LIBCLANG_DIR}/x86_64/libclang.*") -- install(PROGRAMS ${LIBCLANG_64_FILES} -- DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang/x86_64) -- else() -- file(GLOB_RECURSE LIBCLANG_FILES "${LIBCLANG_DIR}/libclang.*") -- install(PROGRAMS ${LIBCLANG_FILES} -- DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang) -- endif() -- -- # install libclang builtin-headers -- install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers" -- DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources/libclang") -- - # install 64 bit binaries if we are on win64 - if(WIN32) - if(NOT ("$ENV{PROGRAMW6432}" STREQUAL "")) diff --git a/sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild b/sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild deleted file mode 100644 index cd4815f5d332..000000000000 --- a/sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild +++ /dev/null @@ -1,240 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-utils - -# TODO -# * package gin and gwt -# * use dict from tree, linguas -# * do src_test (use junit from tree?) - -# update from scripts in dependencies/common -# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt -GWT_VER=2.7.0 -GIN_VER=1.5 -SELENIUM_VER=2.37.0 -CHROMEDRIVER_VER=2.7 -# grep 'PANDOC_VERSION=' dependencies/common/update-pandoc -PANDOC_VER=1.13.1 -# ls dependencies/common/*.tar.gz -PACKRAT_VER=0.98.1000 -RMARKDOWN_VER=0.98.1000 -SHINYAPPS_VER=0.98.1000 -RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0 - -DESCRIPTION="IDE for the R language" -HOMEPAGE=" - http://www.rstudio.org - https://github.com/rstudio/rstudio/" -SRC_URI=" - https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar - https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux - https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip - https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz -" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="dedicated server" - -QT_VER=5.4 -QT_SLOT=5 -RDEPEND=" - app-text/pandoc - dev-haskell/pandoc-citeproc - >=dev-lang/R-2.11.1 - >=dev-libs/boost-1.50:= - >=dev-libs/mathjax-2.3 - dev-libs/openssl:0 - sys-apps/util-linux - >=sys-devel/clang-3.5.0:* - sys-libs/zlib - >=virtual/jre-1.7:= - x11-libs/pango - !dedicated? ( - >=dev-qt/qtcore-${QT_VER}:${QT_SLOT} - >=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT} - >=dev-qt/qtdbus-${QT_VER}:${QT_SLOT} - >=dev-qt/qtgui-${QT_VER}:${QT_SLOT} - >=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT} - >=dev-qt/qtopengl-${QT_VER}:${QT_SLOT} - >=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT} - >=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5] - >=dev-qt/qtsensors-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsql-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsvg-${QT_VER}:${QT_SLOT} - >=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT} - >=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT} - >=dev-qt/qtxml-${QT_VER}:${QT_SLOT} - >=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT} - server? ( virtual/pam ) - ) - dedicated? ( virtual/pam )" -DEPEND="${RDEPEND} - app-arch/unzip - dev-java/ant-core - >=virtual/jdk-1.7:= - virtual/pkgconfig" -# test? ( dev-java/junit:4 ) - -src_unpack() { - unpack ${P}.tar.gz gwt-${GWT_VER}.zip - cd "${S}" || die - mkdir -p src/gwt/lib/{gin,gwt} \ - dependencies/common/dictionaries \ - src/gwt/lib/selenium/${SELENIUM_VER} \ - src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die - mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die - unzip -qd src/gwt/lib/gin/${GIN_VER} \ - "${DISTDIR}"/gin-${GIN_VER}.zip || die - unzip -qd dependencies/common/dictionaries \ - "${DISTDIR}"/core-dictionaries.zip || die - unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \ - "${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die - cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \ - src/gwt/lib/selenium/${SELENIUM_VER}/ || die - cp "${DISTDIR}"/chromedriver-linux \ - src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER}/ || die - cd dependencies/common || die - unpack packrat-${PACKRAT_VER}.tar.gz - unpack rmarkdown-${RMARKDOWN_VER}.tar.gz - unpack shinyapps-${SHINYAPPS_VER}.tar.gz - unpack rsconnect_${RSCONNECT_VER}.tar.gz - cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \ - . || die -} - -src_prepare() { - java-pkg-2_src_prepare - - egit_clean - - epatch \ - "${FILESDIR}"/${PN}-0.98.490-prefs.patch \ - "${FILESDIR}"/${PN}-0.99.473-paths.patch \ - "${FILESDIR}"/${PN}-0.99.473-clang-pandoc.patch \ - "${FILESDIR}"/${PN}-0.98.490-linker_flags.patch \ - "${FILESDIR}"/${PN}-0.98.1091-boost-1.57.patch \ - "${FILESDIR}"/${PN}-0.99.473-qtsingleapplication.patch - - # Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using - # this sed hack for now. ~RMH - sed -i \ - -e "s|DISTRO_SHARE|\"share/${PN}\"|g" \ - src/cpp/server/ServerOptions.cpp \ - src/cpp/session/SessionOptions.cpp || die - - # use mathjax from system - ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-23 || die - - # make sure icons and mime stuff are with prefix - sed -i \ - -e "s:/usr:${EPREFIX}/usr:g" \ - CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die - - # On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf - sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \ - -i src/cpp/server/ServerOptions.cpp \ - || die - - # Set the rsession.conf file location for Gentoo prefix - sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \ - -i src/cpp/session/SessionOptions.cpp \ - || die - - # dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module. - # It provides a library that has its version number appended to the end, - # which is difficult to handle in cmake, as find_library does not support - # searching for wildcard library names. So I find the library name from the - # qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt. - rm -rf "${S}"/src/cpp/desktop/3rdparty || die - local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \ - $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \ - | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \ - -e 's@LIBS \*= -l@@') - sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \ - -i "${S}"/src/cpp/desktop/CMakeLists.txt \ - || die - - # Avoid some of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny - # P: /root/.oracle_jre_usage. - sed -e 's@\(\s*\)\(</classpath>\)@\1\2\n\1\<jvmarg value="-Duser.home=${env.T}"/>@g' \ - -i "${S}"/src/gwt/build.xml \ - || die -} - -src_configure() { - export RSTUDIO_VERSION_MAJOR=$(get_version_component_range 1) - export RSTUDIO_VERSION_MINOR=$(get_version_component_range 2) - export RSTUDIO_VERSION_PATCH=$(get_version_component_range 3) - - local mycmakeargs=( - -DDISTRO_SHARE=share/${PN} - $(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP) - -DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")") - -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake - ) - - cmake-utils_src_configure -} - -src_compile() { - # Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny - # P: /root/.oracle_jre_usage. - export ANT_OPTS="-Duser.home=${T}" - cmake-utils_src_compile -} - -src_install() { - export ANT_OPTS="-Duser.home=${T}" - cmake-utils_src_install - pax-mark m "${ED}usr/bin/rstudio" - doconfd "${FILESDIR}"/rstudio-server.conf - dodir /etc/rstudio - insinto /etc/rstudio - doins "${FILESDIR}"/rsession.conf - dosym /etc/conf.d/rstudio-server.conf /etc/rstudio/rserver.conf - if use dedicated || use server; then - dopamd src/cpp/server/extras/pam/rstudio - newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server - fi -} - -pkg_preinst() { - use dedicated || gnome2_icon_savelist - java-pkg-2_pkg_preinst -} - -pkg_postinst() { - use dedicated || { fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update ;} - - if use dedicated || use server; then - enewgroup rstudio-server - enewuser rstudio-server -1 -1 -1 rstudio-server - fi -} - -pkg_postrm() { - use dedicated || { fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update ;} -} diff --git a/sci-mathematics/rstudio/rstudio-0.99.482.ebuild b/sci-mathematics/rstudio/rstudio-0.99.482.ebuild deleted file mode 100644 index cd4815f5d332..000000000000 --- a/sci-mathematics/rstudio/rstudio-0.99.482.ebuild +++ /dev/null @@ -1,240 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-utils - -# TODO -# * package gin and gwt -# * use dict from tree, linguas -# * do src_test (use junit from tree?) - -# update from scripts in dependencies/common -# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt -GWT_VER=2.7.0 -GIN_VER=1.5 -SELENIUM_VER=2.37.0 -CHROMEDRIVER_VER=2.7 -# grep 'PANDOC_VERSION=' dependencies/common/update-pandoc -PANDOC_VER=1.13.1 -# ls dependencies/common/*.tar.gz -PACKRAT_VER=0.98.1000 -RMARKDOWN_VER=0.98.1000 -SHINYAPPS_VER=0.98.1000 -RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0 - -DESCRIPTION="IDE for the R language" -HOMEPAGE=" - http://www.rstudio.org - https://github.com/rstudio/rstudio/" -SRC_URI=" - https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar - https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux - https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip - https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz -" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="dedicated server" - -QT_VER=5.4 -QT_SLOT=5 -RDEPEND=" - app-text/pandoc - dev-haskell/pandoc-citeproc - >=dev-lang/R-2.11.1 - >=dev-libs/boost-1.50:= - >=dev-libs/mathjax-2.3 - dev-libs/openssl:0 - sys-apps/util-linux - >=sys-devel/clang-3.5.0:* - sys-libs/zlib - >=virtual/jre-1.7:= - x11-libs/pango - !dedicated? ( - >=dev-qt/qtcore-${QT_VER}:${QT_SLOT} - >=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT} - >=dev-qt/qtdbus-${QT_VER}:${QT_SLOT} - >=dev-qt/qtgui-${QT_VER}:${QT_SLOT} - >=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT} - >=dev-qt/qtopengl-${QT_VER}:${QT_SLOT} - >=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT} - >=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5] - >=dev-qt/qtsensors-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsql-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsvg-${QT_VER}:${QT_SLOT} - >=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT} - >=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT} - >=dev-qt/qtxml-${QT_VER}:${QT_SLOT} - >=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT} - server? ( virtual/pam ) - ) - dedicated? ( virtual/pam )" -DEPEND="${RDEPEND} - app-arch/unzip - dev-java/ant-core - >=virtual/jdk-1.7:= - virtual/pkgconfig" -# test? ( dev-java/junit:4 ) - -src_unpack() { - unpack ${P}.tar.gz gwt-${GWT_VER}.zip - cd "${S}" || die - mkdir -p src/gwt/lib/{gin,gwt} \ - dependencies/common/dictionaries \ - src/gwt/lib/selenium/${SELENIUM_VER} \ - src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die - mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die - unzip -qd src/gwt/lib/gin/${GIN_VER} \ - "${DISTDIR}"/gin-${GIN_VER}.zip || die - unzip -qd dependencies/common/dictionaries \ - "${DISTDIR}"/core-dictionaries.zip || die - unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \ - "${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die - cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \ - src/gwt/lib/selenium/${SELENIUM_VER}/ || die - cp "${DISTDIR}"/chromedriver-linux \ - src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER}/ || die - cd dependencies/common || die - unpack packrat-${PACKRAT_VER}.tar.gz - unpack rmarkdown-${RMARKDOWN_VER}.tar.gz - unpack shinyapps-${SHINYAPPS_VER}.tar.gz - unpack rsconnect_${RSCONNECT_VER}.tar.gz - cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \ - . || die -} - -src_prepare() { - java-pkg-2_src_prepare - - egit_clean - - epatch \ - "${FILESDIR}"/${PN}-0.98.490-prefs.patch \ - "${FILESDIR}"/${PN}-0.99.473-paths.patch \ - "${FILESDIR}"/${PN}-0.99.473-clang-pandoc.patch \ - "${FILESDIR}"/${PN}-0.98.490-linker_flags.patch \ - "${FILESDIR}"/${PN}-0.98.1091-boost-1.57.patch \ - "${FILESDIR}"/${PN}-0.99.473-qtsingleapplication.patch - - # Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using - # this sed hack for now. ~RMH - sed -i \ - -e "s|DISTRO_SHARE|\"share/${PN}\"|g" \ - src/cpp/server/ServerOptions.cpp \ - src/cpp/session/SessionOptions.cpp || die - - # use mathjax from system - ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-23 || die - - # make sure icons and mime stuff are with prefix - sed -i \ - -e "s:/usr:${EPREFIX}/usr:g" \ - CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die - - # On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf - sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \ - -i src/cpp/server/ServerOptions.cpp \ - || die - - # Set the rsession.conf file location for Gentoo prefix - sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \ - -i src/cpp/session/SessionOptions.cpp \ - || die - - # dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module. - # It provides a library that has its version number appended to the end, - # which is difficult to handle in cmake, as find_library does not support - # searching for wildcard library names. So I find the library name from the - # qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt. - rm -rf "${S}"/src/cpp/desktop/3rdparty || die - local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \ - $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \ - | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \ - -e 's@LIBS \*= -l@@') - sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \ - -i "${S}"/src/cpp/desktop/CMakeLists.txt \ - || die - - # Avoid some of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny - # P: /root/.oracle_jre_usage. - sed -e 's@\(\s*\)\(</classpath>\)@\1\2\n\1\<jvmarg value="-Duser.home=${env.T}"/>@g' \ - -i "${S}"/src/gwt/build.xml \ - || die -} - -src_configure() { - export RSTUDIO_VERSION_MAJOR=$(get_version_component_range 1) - export RSTUDIO_VERSION_MINOR=$(get_version_component_range 2) - export RSTUDIO_VERSION_PATCH=$(get_version_component_range 3) - - local mycmakeargs=( - -DDISTRO_SHARE=share/${PN} - $(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP) - -DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")") - -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake - ) - - cmake-utils_src_configure -} - -src_compile() { - # Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny - # P: /root/.oracle_jre_usage. - export ANT_OPTS="-Duser.home=${T}" - cmake-utils_src_compile -} - -src_install() { - export ANT_OPTS="-Duser.home=${T}" - cmake-utils_src_install - pax-mark m "${ED}usr/bin/rstudio" - doconfd "${FILESDIR}"/rstudio-server.conf - dodir /etc/rstudio - insinto /etc/rstudio - doins "${FILESDIR}"/rsession.conf - dosym /etc/conf.d/rstudio-server.conf /etc/rstudio/rserver.conf - if use dedicated || use server; then - dopamd src/cpp/server/extras/pam/rstudio - newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server - fi -} - -pkg_preinst() { - use dedicated || gnome2_icon_savelist - java-pkg-2_pkg_preinst -} - -pkg_postinst() { - use dedicated || { fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update ;} - - if use dedicated || use server; then - enewgroup rstudio-server - enewuser rstudio-server -1 -1 -1 rstudio-server - fi -} - -pkg_postrm() { - use dedicated || { fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update ;} -} diff --git a/sci-mathematics/rstudio/rstudio-0.99.483.ebuild b/sci-mathematics/rstudio/rstudio-0.99.483.ebuild deleted file mode 100644 index cd4815f5d332..000000000000 --- a/sci-mathematics/rstudio/rstudio-0.99.483.ebuild +++ /dev/null @@ -1,240 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-utils - -# TODO -# * package gin and gwt -# * use dict from tree, linguas -# * do src_test (use junit from tree?) - -# update from scripts in dependencies/common -# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt -GWT_VER=2.7.0 -GIN_VER=1.5 -SELENIUM_VER=2.37.0 -CHROMEDRIVER_VER=2.7 -# grep 'PANDOC_VERSION=' dependencies/common/update-pandoc -PANDOC_VER=1.13.1 -# ls dependencies/common/*.tar.gz -PACKRAT_VER=0.98.1000 -RMARKDOWN_VER=0.98.1000 -SHINYAPPS_VER=0.98.1000 -RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0 - -DESCRIPTION="IDE for the R language" -HOMEPAGE=" - http://www.rstudio.org - https://github.com/rstudio/rstudio/" -SRC_URI=" - https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar - https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux - https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip - https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz -" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="dedicated server" - -QT_VER=5.4 -QT_SLOT=5 -RDEPEND=" - app-text/pandoc - dev-haskell/pandoc-citeproc - >=dev-lang/R-2.11.1 - >=dev-libs/boost-1.50:= - >=dev-libs/mathjax-2.3 - dev-libs/openssl:0 - sys-apps/util-linux - >=sys-devel/clang-3.5.0:* - sys-libs/zlib - >=virtual/jre-1.7:= - x11-libs/pango - !dedicated? ( - >=dev-qt/qtcore-${QT_VER}:${QT_SLOT} - >=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT} - >=dev-qt/qtdbus-${QT_VER}:${QT_SLOT} - >=dev-qt/qtgui-${QT_VER}:${QT_SLOT} - >=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT} - >=dev-qt/qtopengl-${QT_VER}:${QT_SLOT} - >=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT} - >=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5] - >=dev-qt/qtsensors-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsql-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsvg-${QT_VER}:${QT_SLOT} - >=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT} - >=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT} - >=dev-qt/qtxml-${QT_VER}:${QT_SLOT} - >=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT} - server? ( virtual/pam ) - ) - dedicated? ( virtual/pam )" -DEPEND="${RDEPEND} - app-arch/unzip - dev-java/ant-core - >=virtual/jdk-1.7:= - virtual/pkgconfig" -# test? ( dev-java/junit:4 ) - -src_unpack() { - unpack ${P}.tar.gz gwt-${GWT_VER}.zip - cd "${S}" || die - mkdir -p src/gwt/lib/{gin,gwt} \ - dependencies/common/dictionaries \ - src/gwt/lib/selenium/${SELENIUM_VER} \ - src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die - mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die - unzip -qd src/gwt/lib/gin/${GIN_VER} \ - "${DISTDIR}"/gin-${GIN_VER}.zip || die - unzip -qd dependencies/common/dictionaries \ - "${DISTDIR}"/core-dictionaries.zip || die - unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \ - "${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die - cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \ - src/gwt/lib/selenium/${SELENIUM_VER}/ || die - cp "${DISTDIR}"/chromedriver-linux \ - src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER}/ || die - cd dependencies/common || die - unpack packrat-${PACKRAT_VER}.tar.gz - unpack rmarkdown-${RMARKDOWN_VER}.tar.gz - unpack shinyapps-${SHINYAPPS_VER}.tar.gz - unpack rsconnect_${RSCONNECT_VER}.tar.gz - cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \ - . || die -} - -src_prepare() { - java-pkg-2_src_prepare - - egit_clean - - epatch \ - "${FILESDIR}"/${PN}-0.98.490-prefs.patch \ - "${FILESDIR}"/${PN}-0.99.473-paths.patch \ - "${FILESDIR}"/${PN}-0.99.473-clang-pandoc.patch \ - "${FILESDIR}"/${PN}-0.98.490-linker_flags.patch \ - "${FILESDIR}"/${PN}-0.98.1091-boost-1.57.patch \ - "${FILESDIR}"/${PN}-0.99.473-qtsingleapplication.patch - - # Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using - # this sed hack for now. ~RMH - sed -i \ - -e "s|DISTRO_SHARE|\"share/${PN}\"|g" \ - src/cpp/server/ServerOptions.cpp \ - src/cpp/session/SessionOptions.cpp || die - - # use mathjax from system - ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-23 || die - - # make sure icons and mime stuff are with prefix - sed -i \ - -e "s:/usr:${EPREFIX}/usr:g" \ - CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die - - # On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf - sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \ - -i src/cpp/server/ServerOptions.cpp \ - || die - - # Set the rsession.conf file location for Gentoo prefix - sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \ - -i src/cpp/session/SessionOptions.cpp \ - || die - - # dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module. - # It provides a library that has its version number appended to the end, - # which is difficult to handle in cmake, as find_library does not support - # searching for wildcard library names. So I find the library name from the - # qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt. - rm -rf "${S}"/src/cpp/desktop/3rdparty || die - local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \ - $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \ - | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \ - -e 's@LIBS \*= -l@@') - sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \ - -i "${S}"/src/cpp/desktop/CMakeLists.txt \ - || die - - # Avoid some of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny - # P: /root/.oracle_jre_usage. - sed -e 's@\(\s*\)\(</classpath>\)@\1\2\n\1\<jvmarg value="-Duser.home=${env.T}"/>@g' \ - -i "${S}"/src/gwt/build.xml \ - || die -} - -src_configure() { - export RSTUDIO_VERSION_MAJOR=$(get_version_component_range 1) - export RSTUDIO_VERSION_MINOR=$(get_version_component_range 2) - export RSTUDIO_VERSION_PATCH=$(get_version_component_range 3) - - local mycmakeargs=( - -DDISTRO_SHARE=share/${PN} - $(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP) - -DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")") - -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake - ) - - cmake-utils_src_configure -} - -src_compile() { - # Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny - # P: /root/.oracle_jre_usage. - export ANT_OPTS="-Duser.home=${T}" - cmake-utils_src_compile -} - -src_install() { - export ANT_OPTS="-Duser.home=${T}" - cmake-utils_src_install - pax-mark m "${ED}usr/bin/rstudio" - doconfd "${FILESDIR}"/rstudio-server.conf - dodir /etc/rstudio - insinto /etc/rstudio - doins "${FILESDIR}"/rsession.conf - dosym /etc/conf.d/rstudio-server.conf /etc/rstudio/rserver.conf - if use dedicated || use server; then - dopamd src/cpp/server/extras/pam/rstudio - newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server - fi -} - -pkg_preinst() { - use dedicated || gnome2_icon_savelist - java-pkg-2_pkg_preinst -} - -pkg_postinst() { - use dedicated || { fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update ;} - - if use dedicated || use server; then - enewgroup rstudio-server - enewuser rstudio-server -1 -1 -1 rstudio-server - fi -} - -pkg_postrm() { - use dedicated || { fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update ;} -} diff --git a/sci-mathematics/rstudio/rstudio-0.99.484.ebuild b/sci-mathematics/rstudio/rstudio-0.99.484.ebuild deleted file mode 100644 index cd4815f5d332..000000000000 --- a/sci-mathematics/rstudio/rstudio-0.99.484.ebuild +++ /dev/null @@ -1,240 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-utils - -# TODO -# * package gin and gwt -# * use dict from tree, linguas -# * do src_test (use junit from tree?) - -# update from scripts in dependencies/common -# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt -GWT_VER=2.7.0 -GIN_VER=1.5 -SELENIUM_VER=2.37.0 -CHROMEDRIVER_VER=2.7 -# grep 'PANDOC_VERSION=' dependencies/common/update-pandoc -PANDOC_VER=1.13.1 -# ls dependencies/common/*.tar.gz -PACKRAT_VER=0.98.1000 -RMARKDOWN_VER=0.98.1000 -SHINYAPPS_VER=0.98.1000 -RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0 - -DESCRIPTION="IDE for the R language" -HOMEPAGE=" - http://www.rstudio.org - https://github.com/rstudio/rstudio/" -SRC_URI=" - https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar - https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux - https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip - https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz -" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="dedicated server" - -QT_VER=5.4 -QT_SLOT=5 -RDEPEND=" - app-text/pandoc - dev-haskell/pandoc-citeproc - >=dev-lang/R-2.11.1 - >=dev-libs/boost-1.50:= - >=dev-libs/mathjax-2.3 - dev-libs/openssl:0 - sys-apps/util-linux - >=sys-devel/clang-3.5.0:* - sys-libs/zlib - >=virtual/jre-1.7:= - x11-libs/pango - !dedicated? ( - >=dev-qt/qtcore-${QT_VER}:${QT_SLOT} - >=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT} - >=dev-qt/qtdbus-${QT_VER}:${QT_SLOT} - >=dev-qt/qtgui-${QT_VER}:${QT_SLOT} - >=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT} - >=dev-qt/qtopengl-${QT_VER}:${QT_SLOT} - >=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT} - >=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5] - >=dev-qt/qtsensors-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsql-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsvg-${QT_VER}:${QT_SLOT} - >=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT} - >=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT} - >=dev-qt/qtxml-${QT_VER}:${QT_SLOT} - >=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT} - server? ( virtual/pam ) - ) - dedicated? ( virtual/pam )" -DEPEND="${RDEPEND} - app-arch/unzip - dev-java/ant-core - >=virtual/jdk-1.7:= - virtual/pkgconfig" -# test? ( dev-java/junit:4 ) - -src_unpack() { - unpack ${P}.tar.gz gwt-${GWT_VER}.zip - cd "${S}" || die - mkdir -p src/gwt/lib/{gin,gwt} \ - dependencies/common/dictionaries \ - src/gwt/lib/selenium/${SELENIUM_VER} \ - src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die - mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die - unzip -qd src/gwt/lib/gin/${GIN_VER} \ - "${DISTDIR}"/gin-${GIN_VER}.zip || die - unzip -qd dependencies/common/dictionaries \ - "${DISTDIR}"/core-dictionaries.zip || die - unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \ - "${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die - cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \ - src/gwt/lib/selenium/${SELENIUM_VER}/ || die - cp "${DISTDIR}"/chromedriver-linux \ - src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER}/ || die - cd dependencies/common || die - unpack packrat-${PACKRAT_VER}.tar.gz - unpack rmarkdown-${RMARKDOWN_VER}.tar.gz - unpack shinyapps-${SHINYAPPS_VER}.tar.gz - unpack rsconnect_${RSCONNECT_VER}.tar.gz - cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \ - . || die -} - -src_prepare() { - java-pkg-2_src_prepare - - egit_clean - - epatch \ - "${FILESDIR}"/${PN}-0.98.490-prefs.patch \ - "${FILESDIR}"/${PN}-0.99.473-paths.patch \ - "${FILESDIR}"/${PN}-0.99.473-clang-pandoc.patch \ - "${FILESDIR}"/${PN}-0.98.490-linker_flags.patch \ - "${FILESDIR}"/${PN}-0.98.1091-boost-1.57.patch \ - "${FILESDIR}"/${PN}-0.99.473-qtsingleapplication.patch - - # Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using - # this sed hack for now. ~RMH - sed -i \ - -e "s|DISTRO_SHARE|\"share/${PN}\"|g" \ - src/cpp/server/ServerOptions.cpp \ - src/cpp/session/SessionOptions.cpp || die - - # use mathjax from system - ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-23 || die - - # make sure icons and mime stuff are with prefix - sed -i \ - -e "s:/usr:${EPREFIX}/usr:g" \ - CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die - - # On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf - sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \ - -i src/cpp/server/ServerOptions.cpp \ - || die - - # Set the rsession.conf file location for Gentoo prefix - sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \ - -i src/cpp/session/SessionOptions.cpp \ - || die - - # dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module. - # It provides a library that has its version number appended to the end, - # which is difficult to handle in cmake, as find_library does not support - # searching for wildcard library names. So I find the library name from the - # qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt. - rm -rf "${S}"/src/cpp/desktop/3rdparty || die - local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \ - $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \ - | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \ - -e 's@LIBS \*= -l@@') - sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \ - -i "${S}"/src/cpp/desktop/CMakeLists.txt \ - || die - - # Avoid some of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny - # P: /root/.oracle_jre_usage. - sed -e 's@\(\s*\)\(</classpath>\)@\1\2\n\1\<jvmarg value="-Duser.home=${env.T}"/>@g' \ - -i "${S}"/src/gwt/build.xml \ - || die -} - -src_configure() { - export RSTUDIO_VERSION_MAJOR=$(get_version_component_range 1) - export RSTUDIO_VERSION_MINOR=$(get_version_component_range 2) - export RSTUDIO_VERSION_PATCH=$(get_version_component_range 3) - - local mycmakeargs=( - -DDISTRO_SHARE=share/${PN} - $(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP) - -DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")") - -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake - ) - - cmake-utils_src_configure -} - -src_compile() { - # Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny - # P: /root/.oracle_jre_usage. - export ANT_OPTS="-Duser.home=${T}" - cmake-utils_src_compile -} - -src_install() { - export ANT_OPTS="-Duser.home=${T}" - cmake-utils_src_install - pax-mark m "${ED}usr/bin/rstudio" - doconfd "${FILESDIR}"/rstudio-server.conf - dodir /etc/rstudio - insinto /etc/rstudio - doins "${FILESDIR}"/rsession.conf - dosym /etc/conf.d/rstudio-server.conf /etc/rstudio/rserver.conf - if use dedicated || use server; then - dopamd src/cpp/server/extras/pam/rstudio - newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server - fi -} - -pkg_preinst() { - use dedicated || gnome2_icon_savelist - java-pkg-2_pkg_preinst -} - -pkg_postinst() { - use dedicated || { fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update ;} - - if use dedicated || use server; then - enewgroup rstudio-server - enewuser rstudio-server -1 -1 -1 rstudio-server - fi -} - -pkg_postrm() { - use dedicated || { fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update ;} -} diff --git a/sci-mathematics/rstudio/rstudio-0.99.486-r1.ebuild b/sci-mathematics/rstudio/rstudio-0.99.486-r1.ebuild deleted file mode 100644 index a0c4907f68f8..000000000000 --- a/sci-mathematics/rstudio/rstudio-0.99.486-r1.ebuild +++ /dev/null @@ -1,248 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-utils - -# TODO -# * package gin and gwt -# * use dict from tree, linguas -# * do src_test (use junit from tree?) - -# update from scripts in dependencies/common -# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt -GWT_VER=2.7.0 -GIN_VER=1.5 -SELENIUM_VER=2.37.0 -CHROMEDRIVER_VER=2.7 -# grep 'PANDOC_VERSION=' dependencies/common/update-pandoc -PANDOC_VER=1.13.1 -# ls dependencies/common/*.tar.gz -PACKRAT_VER=0.98.1000 -RMARKDOWN_VER=0.98.1000 -SHINYAPPS_VER=0.98.1000 -RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0 - -DESCRIPTION="IDE for the R language" -HOMEPAGE=" - http://www.rstudio.org - https://github.com/rstudio/rstudio/" -SRC_URI=" - https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar - https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux - https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip - https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz -" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="dedicated server" - -QT_VER=5.4 -QT_SLOT=5 -RDEPEND=" - app-text/pandoc - dev-haskell/pandoc-citeproc - >=dev-lang/R-2.11.1 - >=dev-libs/boost-1.50:= - >=dev-libs/mathjax-2.3 - dev-libs/openssl:0 - sys-apps/util-linux - >=sys-devel/clang-3.5.0:* - sys-libs/zlib - >=virtual/jre-1.7:= - x11-libs/pango - !dedicated? ( - >=dev-qt/qtcore-${QT_VER}:${QT_SLOT} - >=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT} - >=dev-qt/qtdbus-${QT_VER}:${QT_SLOT} - >=dev-qt/qtgui-${QT_VER}:${QT_SLOT} - >=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT} - >=dev-qt/qtopengl-${QT_VER}:${QT_SLOT} - >=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT} - >=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5] - >=dev-qt/qtsensors-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsql-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsvg-${QT_VER}:${QT_SLOT} - >=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT} - >=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT} - >=dev-qt/qtxml-${QT_VER}:${QT_SLOT} - >=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT} - server? ( virtual/pam ) - ) - dedicated? ( virtual/pam )" -DEPEND="${RDEPEND} - app-arch/unzip - dev-java/ant-core - >=virtual/jdk-1.7:= - virtual/pkgconfig" -# test? ( dev-java/junit:4 ) - -PATCHES=( - "${FILESDIR}/${PN}-0.98.490-prefs.patch" - "${FILESDIR}/${PN}-0.99.473-paths.patch" - "${FILESDIR}/${PN}-0.99.473-clang-pandoc.patch" - "${FILESDIR}/${PN}-0.98.490-linker_flags.patch" - "${FILESDIR}/${PN}-0.98.1091-boost-1.57.patch" - "${FILESDIR}/${PN}-0.99.473-qtsingleapplication.patch" - "${FILESDIR}/${PN}-0.99.486-systemd.patch" -) - -src_unpack() { - unpack ${P}.tar.gz gwt-${GWT_VER}.zip - cd "${S}" || die - mkdir -p src/gwt/lib/{gin,gwt} \ - dependencies/common/dictionaries \ - src/gwt/lib/selenium/${SELENIUM_VER} \ - src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die - mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die - unzip -qd src/gwt/lib/gin/${GIN_VER} \ - "${DISTDIR}"/gin-${GIN_VER}.zip || die - unzip -qd dependencies/common/dictionaries \ - "${DISTDIR}"/core-dictionaries.zip || die - unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \ - "${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die - cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \ - src/gwt/lib/selenium/${SELENIUM_VER}/ || die - cp "${DISTDIR}"/chromedriver-linux \ - src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER}/ || die - cd dependencies/common || die - unpack packrat-${PACKRAT_VER}.tar.gz - unpack rmarkdown-${RMARKDOWN_VER}.tar.gz - unpack shinyapps-${SHINYAPPS_VER}.tar.gz - unpack rsconnect_${RSCONNECT_VER}.tar.gz - cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \ - . || die -} - -src_prepare() { - java-pkg-2_src_prepare - - egit_clean - - epatch "${PATCHES[@]}" - - # Enable CMake to install our .service file for systemd usage - mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die - cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die - - # Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using - # this sed hack for now. ~RMH - sed -i \ - -e "s|DISTRO_SHARE|\"share/${PN}\"|g" \ - src/cpp/server/ServerOptions.cpp \ - src/cpp/session/SessionOptions.cpp || die - - # use mathjax from system - ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-23 || die - - # make sure icons and mime stuff are with prefix - sed -i \ - -e "s:/usr:${EPREFIX}/usr:g" \ - CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die - - # On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf - sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \ - -i src/cpp/server/ServerOptions.cpp \ - || die - - # Set the rsession.conf file location for Gentoo prefix - sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \ - -i src/cpp/session/SessionOptions.cpp \ - || die - - # dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module. - # It provides a library that has its version number appended to the end, - # which is difficult to handle in cmake, as find_library does not support - # searching for wildcard library names. So I find the library name from the - # qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt. - rm -rf "${S}"/src/cpp/desktop/3rdparty || die - local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \ - $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \ - | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \ - -e 's@LIBS \*= -l@@') - sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \ - -i "${S}"/src/cpp/desktop/CMakeLists.txt \ - || die - - # Avoid some of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny - # P: /root/.oracle_jre_usage. - sed -e 's@\(\s*\)\(</classpath>\)@\1\2\n\1\<jvmarg value="-Duser.home=${env.T}"/>@g' \ - -i "${S}"/src/gwt/build.xml \ - || die -} - -src_configure() { - export RSTUDIO_VERSION_MAJOR=$(get_version_component_range 1) - export RSTUDIO_VERSION_MINOR=$(get_version_component_range 2) - export RSTUDIO_VERSION_PATCH=$(get_version_component_range 3) - - local mycmakeargs=( - -DDISTRO_SHARE=share/${PN} - $(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP) - -DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")") - -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake - ) - - cmake-utils_src_configure -} - -src_compile() { - # Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny - # P: /root/.oracle_jre_usage. - export ANT_OPTS="-Duser.home=${T}" - cmake-utils_src_compile -} - -src_install() { - export ANT_OPTS="-Duser.home=${T}" - cmake-utils_src_install - pax-mark m "${ED}usr/bin/rstudio" - doconfd "${FILESDIR}"/rstudio-server.conf - dodir /etc/rstudio - insinto /etc/rstudio - doins "${FILESDIR}"/rsession.conf - dosym /etc/conf.d/rstudio-server.conf /etc/rstudio/rserver.conf - if use dedicated || use server; then - dopamd src/cpp/server/extras/pam/rstudio - newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server - fi -} - -pkg_preinst() { - use dedicated || gnome2_icon_savelist - java-pkg-2_pkg_preinst -} - -pkg_postinst() { - use dedicated || { fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update ;} - - if use dedicated || use server; then - enewgroup rstudio-server - enewuser rstudio-server -1 -1 -1 rstudio-server - fi -} - -pkg_postrm() { - use dedicated || { fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update ;} -} diff --git a/sci-mathematics/rstudio/rstudio-0.99.491.ebuild b/sci-mathematics/rstudio/rstudio-0.99.491.ebuild deleted file mode 100644 index a0c4907f68f8..000000000000 --- a/sci-mathematics/rstudio/rstudio-0.99.491.ebuild +++ /dev/null @@ -1,248 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-utils - -# TODO -# * package gin and gwt -# * use dict from tree, linguas -# * do src_test (use junit from tree?) - -# update from scripts in dependencies/common -# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt -GWT_VER=2.7.0 -GIN_VER=1.5 -SELENIUM_VER=2.37.0 -CHROMEDRIVER_VER=2.7 -# grep 'PANDOC_VERSION=' dependencies/common/update-pandoc -PANDOC_VER=1.13.1 -# ls dependencies/common/*.tar.gz -PACKRAT_VER=0.98.1000 -RMARKDOWN_VER=0.98.1000 -SHINYAPPS_VER=0.98.1000 -RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0 - -DESCRIPTION="IDE for the R language" -HOMEPAGE=" - http://www.rstudio.org - https://github.com/rstudio/rstudio/" -SRC_URI=" - https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar - https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux - https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip - https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz -" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="dedicated server" - -QT_VER=5.4 -QT_SLOT=5 -RDEPEND=" - app-text/pandoc - dev-haskell/pandoc-citeproc - >=dev-lang/R-2.11.1 - >=dev-libs/boost-1.50:= - >=dev-libs/mathjax-2.3 - dev-libs/openssl:0 - sys-apps/util-linux - >=sys-devel/clang-3.5.0:* - sys-libs/zlib - >=virtual/jre-1.7:= - x11-libs/pango - !dedicated? ( - >=dev-qt/qtcore-${QT_VER}:${QT_SLOT} - >=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT} - >=dev-qt/qtdbus-${QT_VER}:${QT_SLOT} - >=dev-qt/qtgui-${QT_VER}:${QT_SLOT} - >=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT} - >=dev-qt/qtopengl-${QT_VER}:${QT_SLOT} - >=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT} - >=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5] - >=dev-qt/qtsensors-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsql-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsvg-${QT_VER}:${QT_SLOT} - >=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT} - >=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT} - >=dev-qt/qtxml-${QT_VER}:${QT_SLOT} - >=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT} - server? ( virtual/pam ) - ) - dedicated? ( virtual/pam )" -DEPEND="${RDEPEND} - app-arch/unzip - dev-java/ant-core - >=virtual/jdk-1.7:= - virtual/pkgconfig" -# test? ( dev-java/junit:4 ) - -PATCHES=( - "${FILESDIR}/${PN}-0.98.490-prefs.patch" - "${FILESDIR}/${PN}-0.99.473-paths.patch" - "${FILESDIR}/${PN}-0.99.473-clang-pandoc.patch" - "${FILESDIR}/${PN}-0.98.490-linker_flags.patch" - "${FILESDIR}/${PN}-0.98.1091-boost-1.57.patch" - "${FILESDIR}/${PN}-0.99.473-qtsingleapplication.patch" - "${FILESDIR}/${PN}-0.99.486-systemd.patch" -) - -src_unpack() { - unpack ${P}.tar.gz gwt-${GWT_VER}.zip - cd "${S}" || die - mkdir -p src/gwt/lib/{gin,gwt} \ - dependencies/common/dictionaries \ - src/gwt/lib/selenium/${SELENIUM_VER} \ - src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die - mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die - unzip -qd src/gwt/lib/gin/${GIN_VER} \ - "${DISTDIR}"/gin-${GIN_VER}.zip || die - unzip -qd dependencies/common/dictionaries \ - "${DISTDIR}"/core-dictionaries.zip || die - unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \ - "${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die - cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \ - src/gwt/lib/selenium/${SELENIUM_VER}/ || die - cp "${DISTDIR}"/chromedriver-linux \ - src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER}/ || die - cd dependencies/common || die - unpack packrat-${PACKRAT_VER}.tar.gz - unpack rmarkdown-${RMARKDOWN_VER}.tar.gz - unpack shinyapps-${SHINYAPPS_VER}.tar.gz - unpack rsconnect_${RSCONNECT_VER}.tar.gz - cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \ - . || die -} - -src_prepare() { - java-pkg-2_src_prepare - - egit_clean - - epatch "${PATCHES[@]}" - - # Enable CMake to install our .service file for systemd usage - mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die - cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die - - # Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using - # this sed hack for now. ~RMH - sed -i \ - -e "s|DISTRO_SHARE|\"share/${PN}\"|g" \ - src/cpp/server/ServerOptions.cpp \ - src/cpp/session/SessionOptions.cpp || die - - # use mathjax from system - ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-23 || die - - # make sure icons and mime stuff are with prefix - sed -i \ - -e "s:/usr:${EPREFIX}/usr:g" \ - CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die - - # On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf - sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \ - -i src/cpp/server/ServerOptions.cpp \ - || die - - # Set the rsession.conf file location for Gentoo prefix - sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \ - -i src/cpp/session/SessionOptions.cpp \ - || die - - # dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module. - # It provides a library that has its version number appended to the end, - # which is difficult to handle in cmake, as find_library does not support - # searching for wildcard library names. So I find the library name from the - # qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt. - rm -rf "${S}"/src/cpp/desktop/3rdparty || die - local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \ - $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \ - | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \ - -e 's@LIBS \*= -l@@') - sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \ - -i "${S}"/src/cpp/desktop/CMakeLists.txt \ - || die - - # Avoid some of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny - # P: /root/.oracle_jre_usage. - sed -e 's@\(\s*\)\(</classpath>\)@\1\2\n\1\<jvmarg value="-Duser.home=${env.T}"/>@g' \ - -i "${S}"/src/gwt/build.xml \ - || die -} - -src_configure() { - export RSTUDIO_VERSION_MAJOR=$(get_version_component_range 1) - export RSTUDIO_VERSION_MINOR=$(get_version_component_range 2) - export RSTUDIO_VERSION_PATCH=$(get_version_component_range 3) - - local mycmakeargs=( - -DDISTRO_SHARE=share/${PN} - $(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP) - -DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")") - -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake - ) - - cmake-utils_src_configure -} - -src_compile() { - # Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny - # P: /root/.oracle_jre_usage. - export ANT_OPTS="-Duser.home=${T}" - cmake-utils_src_compile -} - -src_install() { - export ANT_OPTS="-Duser.home=${T}" - cmake-utils_src_install - pax-mark m "${ED}usr/bin/rstudio" - doconfd "${FILESDIR}"/rstudio-server.conf - dodir /etc/rstudio - insinto /etc/rstudio - doins "${FILESDIR}"/rsession.conf - dosym /etc/conf.d/rstudio-server.conf /etc/rstudio/rserver.conf - if use dedicated || use server; then - dopamd src/cpp/server/extras/pam/rstudio - newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server - fi -} - -pkg_preinst() { - use dedicated || gnome2_icon_savelist - java-pkg-2_pkg_preinst -} - -pkg_postinst() { - use dedicated || { fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update ;} - - if use dedicated || use server; then - enewgroup rstudio-server - enewuser rstudio-server -1 -1 -1 rstudio-server - fi -} - -pkg_postrm() { - use dedicated || { fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update ;} -} diff --git a/sci-mathematics/rstudio/rstudio-0.99.879.ebuild b/sci-mathematics/rstudio/rstudio-0.99.879.ebuild deleted file mode 100644 index 6adb372e5cd4..000000000000 --- a/sci-mathematics/rstudio/rstudio-0.99.879.ebuild +++ /dev/null @@ -1,249 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-utils - -# TODO -# * package gin and gwt -# * use dict from tree, linguas -# * do src_test (use junit from tree?) - -# update from scripts in dependencies/common -# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt -GWT_VER=2.7.0 -GIN_VER=1.5 -SELENIUM_VER=2.37.0 -CHROMEDRIVER_VER=2.7 -# grep 'PANDOC_VERSION=' dependencies/common/update-pandoc -PANDOC_VER=1.13.1 -# ls dependencies/common/*.tar.gz -PACKRAT_VER=0.98.1000 -RMARKDOWN_VER=0.98.1000 -SHINYAPPS_VER=0.98.1000 -RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0 - -DESCRIPTION="IDE for the R language" -HOMEPAGE=" - http://www.rstudio.org - https://github.com/rstudio/rstudio/" -SRC_URI=" - https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar - https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux - https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip - https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz -" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="dedicated server" - -QT_VER=5.4 -QT_SLOT=5 -RDEPEND=" - app-text/pandoc - dev-haskell/pandoc-citeproc - >=dev-lang/R-2.11.1 - >=dev-libs/boost-1.50:= - >=dev-libs/mathjax-2.3 - dev-libs/openssl:0 - sys-apps/util-linux - >=sys-devel/clang-3.5.0:* - sys-libs/zlib - >=virtual/jre-1.7:= - x11-libs/pango - !dedicated? ( - >=dev-qt/qtcore-${QT_VER}:${QT_SLOT} - >=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT} - >=dev-qt/qtdbus-${QT_VER}:${QT_SLOT} - >=dev-qt/qtgui-${QT_VER}:${QT_SLOT} - >=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT} - >=dev-qt/qtopengl-${QT_VER}:${QT_SLOT} - >=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT} - >=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5] - >=dev-qt/qtsensors-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsql-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsvg-${QT_VER}:${QT_SLOT} - >=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT} - >=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT} - >=dev-qt/qtxml-${QT_VER}:${QT_SLOT} - >=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT} - server? ( virtual/pam ) - ) - dedicated? ( virtual/pam )" -DEPEND="${RDEPEND} - app-arch/unzip - dev-java/ant-core - >=virtual/jdk-1.7:= - virtual/pkgconfig" -# test? ( dev-java/junit:4 ) - -PATCHES=( - "${FILESDIR}/${PN}-0.99.879-prefs.patch" - "${FILESDIR}/${PN}-0.99.879-paths.patch" - "${FILESDIR}/${PN}-0.99.879-clang-pandoc.patch" - "${FILESDIR}/${PN}-0.98.490-linker_flags.patch" - "${FILESDIR}/${PN}-0.98.1091-boost-1.57.patch" - "${FILESDIR}/${PN}-0.99.473-qtsingleapplication.patch" - "${FILESDIR}/${PN}-0.99.486-systemd.patch" -) - -src_unpack() { - unpack ${P}.tar.gz gwt-${GWT_VER}.zip - cd "${S}" || die - mkdir -p src/gwt/lib/{gin,gwt} \ - dependencies/common/dictionaries \ - src/gwt/lib/selenium/${SELENIUM_VER} \ - src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die - mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die - unzip -qd src/gwt/lib/gin/${GIN_VER} \ - "${DISTDIR}"/gin-${GIN_VER}.zip || die - unzip -qd dependencies/common/dictionaries \ - "${DISTDIR}"/core-dictionaries.zip || die - unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \ - "${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die - cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \ - src/gwt/lib/selenium/${SELENIUM_VER}/ || die - cp "${DISTDIR}"/chromedriver-linux \ - src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER}/ || die - cd dependencies/common || die - unpack packrat-${PACKRAT_VER}.tar.gz - unpack rmarkdown-${RMARKDOWN_VER}.tar.gz - unpack shinyapps-${SHINYAPPS_VER}.tar.gz - unpack rsconnect_${RSCONNECT_VER}.tar.gz - cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \ - . || die -} - -src_prepare() { - java-pkg-2_src_prepare - - egit_clean - - epatch "${PATCHES[@]}" - - # Enable CMake to install our .service file for systemd usage - mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die - cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die - - # Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using - # this sed hack for now. ~RMH - sed -i \ - -e "s|DISTRO_SHARE|\"share/${PN}\"|g" \ - src/cpp/server/ServerOptions.cpp \ - src/cpp/session/SessionOptions.cpp || die - - # use mathjax from system - ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-23 || die - - # make sure icons and mime stuff are with prefix - sed -i \ - -e "s:/usr:${EPREFIX}/usr:g" \ - CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die - - # On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf - sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \ - -i src/cpp/server/ServerOptions.cpp \ - || die - - # Set the rsession.conf file location for Gentoo prefix - sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \ - -i src/cpp/session/SessionOptions.cpp \ - || die - - # dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module. - # It provides a library that has its version number appended to the end, - # which is difficult to handle in cmake, as find_library does not support - # searching for wildcard library names. So I find the library name from the - # qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt. - rm -rf "${S}"/src/cpp/desktop/3rdparty || die - local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \ - $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \ - | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \ - -e 's@LIBS \*= -l@@') - sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \ - -i "${S}"/src/cpp/desktop/CMakeLists.txt \ - || die - - # The git commit for tag v0.99.879 - sed -e 's@git ARGS rev-parse HEAD@echo ARGS 9ac918338d6f9d6dd25807d6d746b470f1cfcf6d@'\ - -i "${S}"/CMakeLists.txt \ - "${S}"/CMakeGlobals.txt \ - || die -} - -src_configure() { - export RSTUDIO_VERSION_MAJOR=$(get_version_component_range 1) - export RSTUDIO_VERSION_MINOR=$(get_version_component_range 2) - export RSTUDIO_VERSION_PATCH=$(get_version_component_range 3) - - local mycmakeargs=( - -DDISTRO_SHARE=share/${PN} - $(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP) - -DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")") - -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake - -DRSTUDIO_VERIFY_R_VERSION=FALSE - ) - - cmake-utils_src_configure -} - -src_compile() { - # Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny - # P: /root/.oracle_jre_usage. - export ANT_OPTS="-Duser.home=${T}" - cmake-utils_src_compile -} - -src_install() { - export ANT_OPTS="-Duser.home=${T}" - cmake-utils_src_install - pax-mark m "${ED}usr/bin/rstudio" - doconfd "${FILESDIR}"/rstudio-server.conf - dodir /etc/rstudio - insinto /etc/rstudio - doins "${FILESDIR}"/rsession.conf - dosym /etc/conf.d/rstudio-server.conf /etc/rstudio/rserver.conf - if use dedicated || use server; then - dopamd src/cpp/server/extras/pam/rstudio - newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server - fi -} - -pkg_preinst() { - use dedicated || gnome2_icon_savelist - java-pkg-2_pkg_preinst -} - -pkg_postinst() { - use dedicated || { fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update ;} - - if use dedicated || use server; then - enewgroup rstudio-server - enewuser rstudio-server -1 -1 -1 rstudio-server - fi -} - -pkg_postrm() { - use dedicated || { fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update ;} -} diff --git a/sci-mathematics/rstudio/rstudio-0.99.893.ebuild b/sci-mathematics/rstudio/rstudio-0.99.893.ebuild deleted file mode 100644 index c3bc93830dde..000000000000 --- a/sci-mathematics/rstudio/rstudio-0.99.893.ebuild +++ /dev/null @@ -1,249 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-utils - -# TODO -# * package gin and gwt -# * use dict from tree, linguas -# * do src_test (use junit from tree?) - -# update from scripts in dependencies/common -# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt -GWT_VER=2.7.0 -GIN_VER=1.5 -SELENIUM_VER=2.37.0 -CHROMEDRIVER_VER=2.7 -# grep 'PANDOC_VERSION=' dependencies/common/update-pandoc -PANDOC_VER=1.13.1 -# ls dependencies/common/*.tar.gz -PACKRAT_VER=0.98.1000 -RMARKDOWN_VER=0.98.1000 -SHINYAPPS_VER=0.98.1000 -RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0 - -DESCRIPTION="IDE for the R language" -HOMEPAGE=" - http://www.rstudio.org - https://github.com/rstudio/rstudio/" -SRC_URI=" - https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar - https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux - https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip - https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz -" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="dedicated server" - -QT_VER=5.4 -QT_SLOT=5 -RDEPEND=" - app-text/pandoc - dev-haskell/pandoc-citeproc - >=dev-lang/R-2.11.1 - >=dev-libs/boost-1.50:= - >=dev-libs/mathjax-2.3 - dev-libs/openssl:0 - sys-apps/util-linux - >=sys-devel/clang-3.5.0:* - sys-libs/zlib - >=virtual/jre-1.7:= - x11-libs/pango - !dedicated? ( - >=dev-qt/qtcore-${QT_VER}:${QT_SLOT} - >=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT} - >=dev-qt/qtdbus-${QT_VER}:${QT_SLOT} - >=dev-qt/qtgui-${QT_VER}:${QT_SLOT} - >=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT} - >=dev-qt/qtopengl-${QT_VER}:${QT_SLOT} - >=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT} - >=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5] - >=dev-qt/qtsensors-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsql-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsvg-${QT_VER}:${QT_SLOT} - >=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT} - >=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT} - >=dev-qt/qtxml-${QT_VER}:${QT_SLOT} - >=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT} - server? ( virtual/pam ) - ) - dedicated? ( virtual/pam )" -DEPEND="${RDEPEND} - app-arch/unzip - dev-java/ant-core - >=virtual/jdk-1.7:= - virtual/pkgconfig" -# test? ( dev-java/junit:4 ) - -PATCHES=( - "${FILESDIR}/${PN}-0.99.879-prefs.patch" - "${FILESDIR}/${PN}-0.99.879-paths.patch" - "${FILESDIR}/${PN}-0.99.879-clang-pandoc.patch" - "${FILESDIR}/${PN}-0.98.490-linker_flags.patch" - "${FILESDIR}/${PN}-0.98.1091-boost-1.57.patch" - "${FILESDIR}/${PN}-0.99.473-qtsingleapplication.patch" - "${FILESDIR}/${PN}-0.99.486-systemd.patch" -) - -src_unpack() { - unpack ${P}.tar.gz gwt-${GWT_VER}.zip - cd "${S}" || die - mkdir -p src/gwt/lib/{gin,gwt} \ - dependencies/common/dictionaries \ - src/gwt/lib/selenium/${SELENIUM_VER} \ - src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die - mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die - unzip -qd src/gwt/lib/gin/${GIN_VER} \ - "${DISTDIR}"/gin-${GIN_VER}.zip || die - unzip -qd dependencies/common/dictionaries \ - "${DISTDIR}"/core-dictionaries.zip || die - unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \ - "${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die - cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \ - src/gwt/lib/selenium/${SELENIUM_VER}/ || die - cp "${DISTDIR}"/chromedriver-linux \ - src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER}/ || die - cd dependencies/common || die - unpack packrat-${PACKRAT_VER}.tar.gz - unpack rmarkdown-${RMARKDOWN_VER}.tar.gz - unpack shinyapps-${SHINYAPPS_VER}.tar.gz - unpack rsconnect_${RSCONNECT_VER}.tar.gz - cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \ - . || die -} - -src_prepare() { - java-pkg-2_src_prepare - - egit_clean - - epatch "${PATCHES[@]}" - - # Enable CMake to install our .service file for systemd usage - mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die - cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die - - # Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using - # this sed hack for now. ~RMH - sed -i \ - -e "s|DISTRO_SHARE|\"share/${PN}\"|g" \ - src/cpp/server/ServerOptions.cpp \ - src/cpp/session/SessionOptions.cpp || die - - # use mathjax from system - ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-23 || die - - # make sure icons and mime stuff are with prefix - sed -i \ - -e "s:/usr:${EPREFIX}/usr:g" \ - CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die - - # On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf - sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \ - -i src/cpp/server/ServerOptions.cpp \ - || die - - # Set the rsession.conf file location for Gentoo prefix - sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \ - -i src/cpp/session/SessionOptions.cpp \ - || die - - # dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module. - # It provides a library that has its version number appended to the end, - # which is difficult to handle in cmake, as find_library does not support - # searching for wildcard library names. So I find the library name from the - # qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt. - rm -rf "${S}"/src/cpp/desktop/3rdparty || die - local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \ - $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \ - | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \ - -e 's@LIBS \*= -l@@') - sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \ - -i "${S}"/src/cpp/desktop/CMakeLists.txt \ - || die - - # The git commit for tag v0.99.893 - sed -e 's@git ARGS rev-parse HEAD@echo ARGS 7510856081e5b1b577bcc230fc2c8ac62eafa62e@'\ - -i "${S}"/CMakeLists.txt \ - "${S}"/CMakeGlobals.txt \ - || die -} - -src_configure() { - export RSTUDIO_VERSION_MAJOR=$(get_version_component_range 1) - export RSTUDIO_VERSION_MINOR=$(get_version_component_range 2) - export RSTUDIO_VERSION_PATCH=$(get_version_component_range 3) - - local mycmakeargs=( - -DDISTRO_SHARE=share/${PN} - $(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP) - -DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")") - -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake - -DRSTUDIO_VERIFY_R_VERSION=FALSE - ) - - cmake-utils_src_configure -} - -src_compile() { - # Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny - # P: /root/.oracle_jre_usage. - export ANT_OPTS="-Duser.home=${T}" - cmake-utils_src_compile -} - -src_install() { - export ANT_OPTS="-Duser.home=${T}" - cmake-utils_src_install - pax-mark m "${ED}usr/bin/rstudio" - doconfd "${FILESDIR}"/rstudio-server.conf - dodir /etc/rstudio - insinto /etc/rstudio - doins "${FILESDIR}"/rsession.conf - dosym /etc/conf.d/rstudio-server.conf /etc/rstudio/rserver.conf - if use dedicated || use server; then - dopamd src/cpp/server/extras/pam/rstudio - newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server - fi -} - -pkg_preinst() { - use dedicated || gnome2_icon_savelist - java-pkg-2_pkg_preinst -} - -pkg_postinst() { - use dedicated || { fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update ;} - - if use dedicated || use server; then - enewgroup rstudio-server - enewuser rstudio-server -1 -1 -1 rstudio-server - fi -} - -pkg_postrm() { - use dedicated || { fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update ;} -} diff --git a/sci-mathematics/rstudio/rstudio-0.99.896.ebuild b/sci-mathematics/rstudio/rstudio-0.99.896.ebuild deleted file mode 100644 index 134838bcf653..000000000000 --- a/sci-mathematics/rstudio/rstudio-0.99.896.ebuild +++ /dev/null @@ -1,249 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-utils - -# TODO -# * package gin and gwt -# * use dict from tree, linguas -# * do src_test (use junit from tree?) - -# update from scripts in dependencies/common -# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt -GWT_VER=2.7.0 -GIN_VER=1.5 -SELENIUM_VER=2.37.0 -CHROMEDRIVER_VER=2.7 -# grep 'PANDOC_VERSION=' dependencies/common/update-pandoc -PANDOC_VER=1.13.1 -# ls dependencies/common/*.tar.gz -PACKRAT_VER=0.98.1000 -RMARKDOWN_VER=0.98.1000 -SHINYAPPS_VER=0.98.1000 -RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0 - -DESCRIPTION="IDE for the R language" -HOMEPAGE=" - http://www.rstudio.org - https://github.com/rstudio/rstudio/" -SRC_URI=" - https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar - https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux - https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip - https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz -" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="dedicated server" - -QT_VER=5.4 -QT_SLOT=5 -RDEPEND=" - app-text/pandoc - dev-haskell/pandoc-citeproc - >=dev-lang/R-2.11.1 - >=dev-libs/boost-1.50:= - >=dev-libs/mathjax-2.3 - dev-libs/openssl:0 - sys-apps/util-linux - >=sys-devel/clang-3.5.0:* - sys-libs/zlib - >=virtual/jre-1.7:= - x11-libs/pango - !dedicated? ( - >=dev-qt/qtcore-${QT_VER}:${QT_SLOT} - >=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT} - >=dev-qt/qtdbus-${QT_VER}:${QT_SLOT} - >=dev-qt/qtgui-${QT_VER}:${QT_SLOT} - >=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT} - >=dev-qt/qtopengl-${QT_VER}:${QT_SLOT} - >=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT} - >=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5] - >=dev-qt/qtsensors-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsql-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsvg-${QT_VER}:${QT_SLOT} - >=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT} - >=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT} - >=dev-qt/qtxml-${QT_VER}:${QT_SLOT} - >=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT} - server? ( virtual/pam ) - ) - dedicated? ( virtual/pam )" -DEPEND="${RDEPEND} - app-arch/unzip - dev-java/ant-core - >=virtual/jdk-1.7:= - virtual/pkgconfig" -# test? ( dev-java/junit:4 ) - -PATCHES=( - "${FILESDIR}/${PN}-0.99.879-prefs.patch" - "${FILESDIR}/${PN}-0.99.879-paths.patch" - "${FILESDIR}/${PN}-0.99.879-clang-pandoc.patch" - "${FILESDIR}/${PN}-0.98.490-linker_flags.patch" - "${FILESDIR}/${PN}-0.98.1091-boost-1.57.patch" - "${FILESDIR}/${PN}-0.99.473-qtsingleapplication.patch" - "${FILESDIR}/${PN}-0.99.486-systemd.patch" -) - -src_unpack() { - unpack ${P}.tar.gz gwt-${GWT_VER}.zip - cd "${S}" || die - mkdir -p src/gwt/lib/{gin,gwt} \ - dependencies/common/dictionaries \ - src/gwt/lib/selenium/${SELENIUM_VER} \ - src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die - mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die - unzip -qd src/gwt/lib/gin/${GIN_VER} \ - "${DISTDIR}"/gin-${GIN_VER}.zip || die - unzip -qd dependencies/common/dictionaries \ - "${DISTDIR}"/core-dictionaries.zip || die - unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \ - "${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die - cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \ - src/gwt/lib/selenium/${SELENIUM_VER}/ || die - cp "${DISTDIR}"/chromedriver-linux \ - src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER}/ || die - cd dependencies/common || die - unpack packrat-${PACKRAT_VER}.tar.gz - unpack rmarkdown-${RMARKDOWN_VER}.tar.gz - unpack shinyapps-${SHINYAPPS_VER}.tar.gz - unpack rsconnect_${RSCONNECT_VER}.tar.gz - cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \ - . || die -} - -src_prepare() { - java-pkg-2_src_prepare - - egit_clean - - epatch "${PATCHES[@]}" - - # Enable CMake to install our .service file for systemd usage - mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die - cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die - - # Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using - # this sed hack for now. ~RMH - sed -i \ - -e "s|DISTRO_SHARE|\"share/${PN}\"|g" \ - src/cpp/server/ServerOptions.cpp \ - src/cpp/session/SessionOptions.cpp || die - - # use mathjax from system - ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-23 || die - - # make sure icons and mime stuff are with prefix - sed -i \ - -e "s:/usr:${EPREFIX}/usr:g" \ - CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die - - # On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf - sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \ - -i src/cpp/server/ServerOptions.cpp \ - || die - - # Set the rsession.conf file location for Gentoo prefix - sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \ - -i src/cpp/session/SessionOptions.cpp \ - || die - - # dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module. - # It provides a library that has its version number appended to the end, - # which is difficult to handle in cmake, as find_library does not support - # searching for wildcard library names. So I find the library name from the - # qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt. - rm -rf "${S}"/src/cpp/desktop/3rdparty || die - local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \ - $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \ - | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \ - -e 's@LIBS \*= -l@@') - sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \ - -i "${S}"/src/cpp/desktop/CMakeLists.txt \ - || die - - # The git commit for tag v0.99.896 - sed -e 's@git ARGS rev-parse HEAD@echo ARGS 5dbc604635bb296bc41fb7fa21e56f7195fbe1ca@'\ - -i "${S}"/CMakeLists.txt \ - "${S}"/CMakeGlobals.txt \ - || die -} - -src_configure() { - export RSTUDIO_VERSION_MAJOR=$(get_version_component_range 1) - export RSTUDIO_VERSION_MINOR=$(get_version_component_range 2) - export RSTUDIO_VERSION_PATCH=$(get_version_component_range 3) - - local mycmakeargs=( - -DDISTRO_SHARE=share/${PN} - $(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP) - -DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")") - -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake - -DRSTUDIO_VERIFY_R_VERSION=FALSE - ) - - cmake-utils_src_configure -} - -src_compile() { - # Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny - # P: /root/.oracle_jre_usage. - export ANT_OPTS="-Duser.home=${T}" - cmake-utils_src_compile -} - -src_install() { - export ANT_OPTS="-Duser.home=${T}" - cmake-utils_src_install - pax-mark m "${ED}usr/bin/rstudio" - doconfd "${FILESDIR}"/rstudio-server.conf - dodir /etc/rstudio - insinto /etc/rstudio - doins "${FILESDIR}"/rsession.conf - dosym /etc/conf.d/rstudio-server.conf /etc/rstudio/rserver.conf - if use dedicated || use server; then - dopamd src/cpp/server/extras/pam/rstudio - newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server - fi -} - -pkg_preinst() { - use dedicated || gnome2_icon_savelist - java-pkg-2_pkg_preinst -} - -pkg_postinst() { - use dedicated || { fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update ;} - - if use dedicated || use server; then - enewgroup rstudio-server - enewuser rstudio-server -1 -1 -1 rstudio-server - fi -} - -pkg_postrm() { - use dedicated || { fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update ;} -} diff --git a/sci-mathematics/rstudio/rstudio-0.99.902.ebuild b/sci-mathematics/rstudio/rstudio-0.99.902.ebuild deleted file mode 100644 index bd0e219d50ff..000000000000 --- a/sci-mathematics/rstudio/rstudio-0.99.902.ebuild +++ /dev/null @@ -1,249 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-utils - -# TODO -# * package gin and gwt -# * use dict from tree, linguas -# * do src_test (use junit from tree?) - -# update from scripts in dependencies/common -# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt -GWT_VER=2.7.0 -GIN_VER=1.5 -SELENIUM_VER=2.37.0 -CHROMEDRIVER_VER=2.7 -# grep 'PANDOC_VERSION=' dependencies/common/update-pandoc -PANDOC_VER=1.13.1 -# ls dependencies/common/*.tar.gz -PACKRAT_VER=0.98.1000 -RMARKDOWN_VER=0.98.1000 -SHINYAPPS_VER=0.98.1000 -RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0 - -DESCRIPTION="IDE for the R language" -HOMEPAGE=" - http://www.rstudio.org - https://github.com/rstudio/rstudio/" -SRC_URI=" - https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar - https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux - https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip - https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz -" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="dedicated server" - -QT_VER=5.4 -QT_SLOT=5 -RDEPEND=" - app-text/pandoc - dev-haskell/pandoc-citeproc - >=dev-lang/R-2.11.1 - >=dev-libs/boost-1.50:= - >=dev-libs/mathjax-2.3 - dev-libs/openssl:0 - sys-apps/util-linux - >=sys-devel/clang-3.5.0:* - sys-libs/zlib - >=virtual/jre-1.7:= - x11-libs/pango - !dedicated? ( - >=dev-qt/qtcore-${QT_VER}:${QT_SLOT} - >=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT} - >=dev-qt/qtdbus-${QT_VER}:${QT_SLOT} - >=dev-qt/qtgui-${QT_VER}:${QT_SLOT} - >=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT} - >=dev-qt/qtopengl-${QT_VER}:${QT_SLOT} - >=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT} - >=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5] - >=dev-qt/qtsensors-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsql-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsvg-${QT_VER}:${QT_SLOT} - >=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT} - >=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT} - >=dev-qt/qtxml-${QT_VER}:${QT_SLOT} - >=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT} - server? ( virtual/pam ) - ) - dedicated? ( virtual/pam )" -DEPEND="${RDEPEND} - app-arch/unzip - dev-java/ant-core - >=virtual/jdk-1.7:= - virtual/pkgconfig" -# test? ( dev-java/junit:4 ) - -PATCHES=( - "${FILESDIR}/${PN}-0.99.879-prefs.patch" - "${FILESDIR}/${PN}-0.99.879-paths.patch" - "${FILESDIR}/${PN}-0.99.879-clang-pandoc.patch" - "${FILESDIR}/${PN}-0.98.490-linker_flags.patch" - "${FILESDIR}/${PN}-0.98.1091-boost-1.57.patch" - "${FILESDIR}/${PN}-0.99.473-qtsingleapplication.patch" - "${FILESDIR}/${PN}-0.99.486-systemd.patch" -) - -src_unpack() { - unpack ${P}.tar.gz gwt-${GWT_VER}.zip - cd "${S}" || die - mkdir -p src/gwt/lib/{gin,gwt} \ - dependencies/common/dictionaries \ - src/gwt/lib/selenium/${SELENIUM_VER} \ - src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die - mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die - unzip -qd src/gwt/lib/gin/${GIN_VER} \ - "${DISTDIR}"/gin-${GIN_VER}.zip || die - unzip -qd dependencies/common/dictionaries \ - "${DISTDIR}"/core-dictionaries.zip || die - unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \ - "${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die - cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \ - src/gwt/lib/selenium/${SELENIUM_VER}/ || die - cp "${DISTDIR}"/chromedriver-linux \ - src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER}/ || die - cd dependencies/common || die - unpack packrat-${PACKRAT_VER}.tar.gz - unpack rmarkdown-${RMARKDOWN_VER}.tar.gz - unpack shinyapps-${SHINYAPPS_VER}.tar.gz - unpack rsconnect_${RSCONNECT_VER}.tar.gz - cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \ - . || die -} - -src_prepare() { - java-pkg-2_src_prepare - - egit_clean - - epatch "${PATCHES[@]}" - - # Enable CMake to install our .service file for systemd usage - mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die - cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die - - # Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using - # this sed hack for now. ~RMH - sed -i \ - -e "s|DISTRO_SHARE|\"share/${PN}\"|g" \ - src/cpp/server/ServerOptions.cpp \ - src/cpp/session/SessionOptions.cpp || die - - # use mathjax from system - ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-23 || die - - # make sure icons and mime stuff are with prefix - sed -i \ - -e "s:/usr:${EPREFIX}/usr:g" \ - CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die - - # On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf - sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \ - -i src/cpp/server/ServerOptions.cpp \ - || die - - # Set the rsession.conf file location for Gentoo prefix - sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \ - -i src/cpp/session/SessionOptions.cpp \ - || die - - # dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module. - # It provides a library that has its version number appended to the end, - # which is difficult to handle in cmake, as find_library does not support - # searching for wildcard library names. So I find the library name from the - # qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt. - rm -rf "${S}"/src/cpp/desktop/3rdparty || die - local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \ - $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \ - | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \ - -e 's@LIBS \*= -l@@') - sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \ - -i "${S}"/src/cpp/desktop/CMakeLists.txt \ - || die - - # The git commit for tag v0.99.902 - sed -e 's@git ARGS rev-parse HEAD@echo ARGS 4daf125408b86eeba48a39f62df34eb81d934639@'\ - -i "${S}"/CMakeLists.txt \ - "${S}"/CMakeGlobals.txt \ - || die -} - -src_configure() { - export RSTUDIO_VERSION_MAJOR=$(get_version_component_range 1) - export RSTUDIO_VERSION_MINOR=$(get_version_component_range 2) - export RSTUDIO_VERSION_PATCH=$(get_version_component_range 3) - - local mycmakeargs=( - -DDISTRO_SHARE=share/${PN} - $(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP) - -DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")") - -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake - -DRSTUDIO_VERIFY_R_VERSION=FALSE - ) - - cmake-utils_src_configure -} - -src_compile() { - # Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny - # P: /root/.oracle_jre_usage. - export ANT_OPTS="-Duser.home=${T}" - cmake-utils_src_compile -} - -src_install() { - export ANT_OPTS="-Duser.home=${T}" - cmake-utils_src_install - pax-mark m "${ED}usr/bin/rstudio" - doconfd "${FILESDIR}"/rstudio-server.conf - dodir /etc/rstudio - insinto /etc/rstudio - doins "${FILESDIR}"/rsession.conf - dosym /etc/conf.d/rstudio-server.conf /etc/rstudio/rserver.conf - if use dedicated || use server; then - dopamd src/cpp/server/extras/pam/rstudio - newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server - fi -} - -pkg_preinst() { - use dedicated || gnome2_icon_savelist - java-pkg-2_pkg_preinst -} - -pkg_postinst() { - use dedicated || { fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update ;} - - if use dedicated || use server; then - enewgroup rstudio-server - enewuser rstudio-server -1 -1 -1 rstudio-server - fi -} - -pkg_postrm() { - use dedicated || { fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update ;} -} diff --git a/sci-mathematics/rstudio/rstudio-0.99.903.ebuild b/sci-mathematics/rstudio/rstudio-0.99.903.ebuild deleted file mode 100644 index 60d0858c53c8..000000000000 --- a/sci-mathematics/rstudio/rstudio-0.99.903.ebuild +++ /dev/null @@ -1,249 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-utils - -# TODO -# * package gin and gwt -# * use dict from tree, linguas -# * do src_test (use junit from tree?) - -# update from scripts in dependencies/common -# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt -GWT_VER=2.7.0 -GIN_VER=1.5 -SELENIUM_VER=2.37.0 -CHROMEDRIVER_VER=2.7 -# grep 'PANDOC_VERSION=' dependencies/common/update-pandoc -PANDOC_VER=1.13.1 -# ls dependencies/common/*.tar.gz -PACKRAT_VER=0.98.1000 -RMARKDOWN_VER=0.98.1000 -SHINYAPPS_VER=0.98.1000 -RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0 - -DESCRIPTION="IDE for the R language" -HOMEPAGE=" - http://www.rstudio.org - https://github.com/rstudio/rstudio/" -SRC_URI=" - https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar - https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux - https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip - https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz -" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="dedicated server" - -QT_VER=5.4 -QT_SLOT=5 -RDEPEND=" - app-text/pandoc - dev-haskell/pandoc-citeproc - >=dev-lang/R-2.11.1 - >=dev-libs/boost-1.50:= - >=dev-libs/mathjax-2.3 - dev-libs/openssl:0 - sys-apps/util-linux - >=sys-devel/clang-3.5.0:* - sys-libs/zlib - >=virtual/jre-1.7:= - x11-libs/pango - !dedicated? ( - >=dev-qt/qtcore-${QT_VER}:${QT_SLOT} - >=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT} - >=dev-qt/qtdbus-${QT_VER}:${QT_SLOT} - >=dev-qt/qtgui-${QT_VER}:${QT_SLOT} - >=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT} - >=dev-qt/qtopengl-${QT_VER}:${QT_SLOT} - >=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT} - >=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5] - >=dev-qt/qtsensors-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsql-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsvg-${QT_VER}:${QT_SLOT} - >=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT} - >=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT} - >=dev-qt/qtxml-${QT_VER}:${QT_SLOT} - >=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT} - server? ( virtual/pam ) - ) - dedicated? ( virtual/pam )" -DEPEND="${RDEPEND} - app-arch/unzip - dev-java/ant-core - >=virtual/jdk-1.7:= - virtual/pkgconfig" -# test? ( dev-java/junit:4 ) - -PATCHES=( - "${FILESDIR}/${PN}-0.99.879-prefs.patch" - "${FILESDIR}/${PN}-0.99.879-paths.patch" - "${FILESDIR}/${PN}-0.99.879-clang-pandoc.patch" - "${FILESDIR}/${PN}-0.98.490-linker_flags.patch" - "${FILESDIR}/${PN}-0.98.1091-boost-1.57.patch" - "${FILESDIR}/${PN}-0.99.473-qtsingleapplication.patch" - "${FILESDIR}/${PN}-0.99.486-systemd.patch" -) - -src_unpack() { - unpack ${P}.tar.gz gwt-${GWT_VER}.zip - cd "${S}" || die - mkdir -p src/gwt/lib/{gin,gwt} \ - dependencies/common/dictionaries \ - src/gwt/lib/selenium/${SELENIUM_VER} \ - src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die - mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die - unzip -qd src/gwt/lib/gin/${GIN_VER} \ - "${DISTDIR}"/gin-${GIN_VER}.zip || die - unzip -qd dependencies/common/dictionaries \ - "${DISTDIR}"/core-dictionaries.zip || die - unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \ - "${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die - cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \ - src/gwt/lib/selenium/${SELENIUM_VER}/ || die - cp "${DISTDIR}"/chromedriver-linux \ - src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER}/ || die - cd dependencies/common || die - unpack packrat-${PACKRAT_VER}.tar.gz - unpack rmarkdown-${RMARKDOWN_VER}.tar.gz - unpack shinyapps-${SHINYAPPS_VER}.tar.gz - unpack rsconnect_${RSCONNECT_VER}.tar.gz - cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \ - . || die -} - -src_prepare() { - java-pkg-2_src_prepare - - egit_clean - - epatch "${PATCHES[@]}" - - # Enable CMake to install our .service file for systemd usage - mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die - cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die - - # Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using - # this sed hack for now. ~RMH - sed -i \ - -e "s|DISTRO_SHARE|\"share/${PN}\"|g" \ - src/cpp/server/ServerOptions.cpp \ - src/cpp/session/SessionOptions.cpp || die - - # use mathjax from system - ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-23 || die - - # make sure icons and mime stuff are with prefix - sed -i \ - -e "s:/usr:${EPREFIX}/usr:g" \ - CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die - - # On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf - sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \ - -i src/cpp/server/ServerOptions.cpp \ - || die - - # Set the rsession.conf file location for Gentoo prefix - sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \ - -i src/cpp/session/SessionOptions.cpp \ - || die - - # dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module. - # It provides a library that has its version number appended to the end, - # which is difficult to handle in cmake, as find_library does not support - # searching for wildcard library names. So I find the library name from the - # qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt. - rm -rf "${S}"/src/cpp/desktop/3rdparty || die - local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \ - $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \ - | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \ - -e 's@LIBS \*= -l@@') - sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \ - -i "${S}"/src/cpp/desktop/CMakeLists.txt \ - || die - - # The git commit for tag: git rev-list -n 1 v0.99.903 - sed -e 's@git ARGS rev-parse HEAD@echo ARGS 0eb2d8ea28ebc1ac6ac327e023becb6133b679c4@'\ - -i "${S}"/CMakeLists.txt \ - "${S}"/CMakeGlobals.txt \ - || die -} - -src_configure() { - export RSTUDIO_VERSION_MAJOR=$(get_version_component_range 1) - export RSTUDIO_VERSION_MINOR=$(get_version_component_range 2) - export RSTUDIO_VERSION_PATCH=$(get_version_component_range 3) - - local mycmakeargs=( - -DDISTRO_SHARE=share/${PN} - $(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP) - -DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")") - -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake - -DRSTUDIO_VERIFY_R_VERSION=FALSE - ) - - cmake-utils_src_configure -} - -src_compile() { - # Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny - # P: /root/.oracle_jre_usage. - export ANT_OPTS="-Duser.home=${T}" - cmake-utils_src_compile -} - -src_install() { - export ANT_OPTS="-Duser.home=${T}" - cmake-utils_src_install - pax-mark m "${ED}usr/bin/rstudio" - doconfd "${FILESDIR}"/rstudio-server.conf - dodir /etc/rstudio - insinto /etc/rstudio - doins "${FILESDIR}"/rsession.conf - dosym /etc/conf.d/rstudio-server.conf /etc/rstudio/rserver.conf - if use dedicated || use server; then - dopamd src/cpp/server/extras/pam/rstudio - newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server - fi -} - -pkg_preinst() { - use dedicated || gnome2_icon_savelist - java-pkg-2_pkg_preinst -} - -pkg_postinst() { - use dedicated || { fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update ;} - - if use dedicated || use server; then - enewgroup rstudio-server - enewuser rstudio-server -1 -1 -1 rstudio-server - fi -} - -pkg_postrm() { - use dedicated || { fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update ;} -} diff --git a/sci-mathematics/rstudio/rstudio-1.0.136.ebuild b/sci-mathematics/rstudio/rstudio-1.0.136.ebuild deleted file mode 100644 index dcb101cac4e3..000000000000 --- a/sci-mathematics/rstudio/rstudio-1.0.136.ebuild +++ /dev/null @@ -1,247 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-utils - -# TODO -# * package gin and gwt -# * use dict from tree, linguas -# * do src_test (use junit from tree?) - -# update from scripts in dependencies/common -# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt -GWT_VER=2.7.0 -GIN_VER=1.5 -SELENIUM_VER=2.37.0 -CHROMEDRIVER_VER=2.7 -# grep 'PANDOC_VERSION=' dependencies/common/update-pandoc -PANDOC_VER=1.13.1 -# ls dependencies/common/*.tar.gz -PACKRAT_VER=0.98.1000 -RMARKDOWN_VER=0.98.1000 -SHINYAPPS_VER=0.98.1000 -RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0 - -DESCRIPTION="IDE for the R language" -HOMEPAGE=" - http://www.rstudio.org - https://github.com/rstudio/rstudio/" -SRC_URI=" - https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar - https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux - https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip - https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz -" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="dedicated server" - -QT_VER=5.4 -QT_SLOT=5 -RDEPEND=" - app-text/pandoc - dev-haskell/pandoc-citeproc - >=dev-lang/R-2.11.1 - >=dev-libs/boost-1.50:= - >=dev-libs/mathjax-2.7.0 - dev-libs/openssl:0 - sys-apps/util-linux - >=sys-devel/clang-3.5.0:* - sys-libs/zlib - >=virtual/jre-1.8:= - x11-libs/pango - !dedicated? ( - >=dev-qt/qtcore-${QT_VER}:${QT_SLOT} - >=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT} - >=dev-qt/qtdbus-${QT_VER}:${QT_SLOT} - >=dev-qt/qtgui-${QT_VER}:${QT_SLOT} - >=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT} - >=dev-qt/qtopengl-${QT_VER}:${QT_SLOT} - >=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT} - >=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5] - >=dev-qt/qtsensors-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsql-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsvg-${QT_VER}:${QT_SLOT} - >=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT} - >=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT} - >=dev-qt/qtxml-${QT_VER}:${QT_SLOT} - >=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT} - server? ( virtual/pam ) - ) - dedicated? ( virtual/pam )" -DEPEND="${RDEPEND} - app-arch/unzip - dev-java/ant-core - >=virtual/jdk-1.8:= - virtual/pkgconfig" -# test? ( dev-java/junit:4 ) - -PATCHES=( - "${FILESDIR}/${PN}-0.99.879-prefs.patch" - "${FILESDIR}/${PN}-1.0.44-paths.patch" - "${FILESDIR}/${PN}-1.0.44-clang-pandoc.patch" - "${FILESDIR}/${PN}-0.98.490-linker_flags.patch" - "${FILESDIR}/${PN}-0.98.1091-boost-1.57.patch" - "${FILESDIR}/${PN}-0.99.473-qtsingleapplication.patch" - "${FILESDIR}/${PN}-1.0.44-systemd.patch" -) - -src_unpack() { - unpack ${P}.tar.gz gwt-${GWT_VER}.zip - cd "${S}" || die - mkdir -p src/gwt/lib/{gin,gwt} \ - dependencies/common/dictionaries \ - src/gwt/lib/selenium/${SELENIUM_VER} \ - src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die - mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die - unzip -qd src/gwt/lib/gin/${GIN_VER} \ - "${DISTDIR}"/gin-${GIN_VER}.zip || die - unzip -qd dependencies/common/dictionaries \ - "${DISTDIR}"/core-dictionaries.zip || die - unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \ - "${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die - cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \ - src/gwt/lib/selenium/${SELENIUM_VER}/ || die - cp "${DISTDIR}"/chromedriver-linux \ - src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER}/ || die - cd dependencies/common || die - unpack packrat-${PACKRAT_VER}.tar.gz - unpack rmarkdown-${RMARKDOWN_VER}.tar.gz - unpack shinyapps-${SHINYAPPS_VER}.tar.gz - unpack rsconnect_${RSCONNECT_VER}.tar.gz - cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \ - . || die -} - -src_prepare() { - default - java-pkg-2_src_prepare - egit_clean - - # Enable CMake to install our .service file for systemd usage - mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die - cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die - - # Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using - # this sed hack for now. ~RMH - sed -i \ - -e "s|DISTRO_SHARE|\"share/${PN}\"|g" \ - src/cpp/server/ServerOptions.cpp \ - src/cpp/session/SessionOptions.cpp || die - - # use mathjax from system - ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-26 || die - - # make sure icons and mime stuff are with prefix - sed -i \ - -e "s:/usr:${EPREFIX}/usr:g" \ - CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die - - # On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf - sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \ - -i src/cpp/server/ServerOptions.cpp \ - || die - - # Set the rsession.conf file location for Gentoo prefix - sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \ - -i src/cpp/session/SessionOptions.cpp \ - || die - - # dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module. - # It provides a library that has its version number appended to the end, - # which is difficult to handle in cmake, as find_library does not support - # searching for wildcard library names. So I find the library name from the - # qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt. - rm -rf "${S}"/src/cpp/desktop/3rdparty || die - local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \ - $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \ - | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \ - -e 's@LIBS \*= -l@@') - sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \ - -i "${S}"/src/cpp/desktop/CMakeLists.txt \ - || die - - # The git commit for tag: git rev-list -n 1 v0.99.903 - sed -e 's@git ARGS rev-parse HEAD@echo ARGS 0eb2d8ea28ebc1ac6ac327e023becb6133b679c4@'\ - -i "${S}"/CMakeLists.txt \ - "${S}"/CMakeGlobals.txt \ - || die -} - -src_configure() { - export RSTUDIO_VERSION_MAJOR=$(get_version_component_range 1) - export RSTUDIO_VERSION_MINOR=$(get_version_component_range 2) - export RSTUDIO_VERSION_PATCH=$(get_version_component_range 3) - - local mycmakeargs=( - -DDISTRO_SHARE=share/${PN} - -DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")" - -DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")") - -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake - -DRSTUDIO_VERIFY_R_VERSION=FALSE - ) - - cmake-utils_src_configure -} - -src_compile() { - # Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny - # P: /root/.oracle_jre_usage. - export ANT_OPTS="-Duser.home=${T}" - cmake-utils_src_compile -} - -src_install() { - export ANT_OPTS="-Duser.home=${T}" - cmake-utils_src_install - pax-mark m "${ED}usr/bin/rstudio" - doconfd "${FILESDIR}"/rstudio-server.conf - dodir /etc/rstudio - insinto /etc/rstudio - doins "${FILESDIR}"/rsession.conf - dosym /etc/conf.d/rstudio-server.conf /etc/rstudio/rserver.conf - if use dedicated || use server; then - dopamd src/cpp/server/extras/pam/rstudio - newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server - fi -} - -pkg_preinst() { - use dedicated || gnome2_icon_savelist - java-pkg-2_pkg_preinst -} - -pkg_postinst() { - use dedicated || { fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update ;} - - if use dedicated || use server; then - enewgroup rstudio-server - enewuser rstudio-server -1 -1 -1 rstudio-server - fi -} - -pkg_postrm() { - use dedicated || { fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update ;} -} diff --git a/sci-mathematics/rstudio/rstudio-1.0.143.ebuild b/sci-mathematics/rstudio/rstudio-1.0.143.ebuild deleted file mode 100644 index dcb101cac4e3..000000000000 --- a/sci-mathematics/rstudio/rstudio-1.0.143.ebuild +++ /dev/null @@ -1,247 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-utils - -# TODO -# * package gin and gwt -# * use dict from tree, linguas -# * do src_test (use junit from tree?) - -# update from scripts in dependencies/common -# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt -GWT_VER=2.7.0 -GIN_VER=1.5 -SELENIUM_VER=2.37.0 -CHROMEDRIVER_VER=2.7 -# grep 'PANDOC_VERSION=' dependencies/common/update-pandoc -PANDOC_VER=1.13.1 -# ls dependencies/common/*.tar.gz -PACKRAT_VER=0.98.1000 -RMARKDOWN_VER=0.98.1000 -SHINYAPPS_VER=0.98.1000 -RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0 - -DESCRIPTION="IDE for the R language" -HOMEPAGE=" - http://www.rstudio.org - https://github.com/rstudio/rstudio/" -SRC_URI=" - https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar - https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux - https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip - https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz -" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="dedicated server" - -QT_VER=5.4 -QT_SLOT=5 -RDEPEND=" - app-text/pandoc - dev-haskell/pandoc-citeproc - >=dev-lang/R-2.11.1 - >=dev-libs/boost-1.50:= - >=dev-libs/mathjax-2.7.0 - dev-libs/openssl:0 - sys-apps/util-linux - >=sys-devel/clang-3.5.0:* - sys-libs/zlib - >=virtual/jre-1.8:= - x11-libs/pango - !dedicated? ( - >=dev-qt/qtcore-${QT_VER}:${QT_SLOT} - >=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT} - >=dev-qt/qtdbus-${QT_VER}:${QT_SLOT} - >=dev-qt/qtgui-${QT_VER}:${QT_SLOT} - >=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT} - >=dev-qt/qtopengl-${QT_VER}:${QT_SLOT} - >=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT} - >=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5] - >=dev-qt/qtsensors-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsql-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsvg-${QT_VER}:${QT_SLOT} - >=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT} - >=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT} - >=dev-qt/qtxml-${QT_VER}:${QT_SLOT} - >=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT} - server? ( virtual/pam ) - ) - dedicated? ( virtual/pam )" -DEPEND="${RDEPEND} - app-arch/unzip - dev-java/ant-core - >=virtual/jdk-1.8:= - virtual/pkgconfig" -# test? ( dev-java/junit:4 ) - -PATCHES=( - "${FILESDIR}/${PN}-0.99.879-prefs.patch" - "${FILESDIR}/${PN}-1.0.44-paths.patch" - "${FILESDIR}/${PN}-1.0.44-clang-pandoc.patch" - "${FILESDIR}/${PN}-0.98.490-linker_flags.patch" - "${FILESDIR}/${PN}-0.98.1091-boost-1.57.patch" - "${FILESDIR}/${PN}-0.99.473-qtsingleapplication.patch" - "${FILESDIR}/${PN}-1.0.44-systemd.patch" -) - -src_unpack() { - unpack ${P}.tar.gz gwt-${GWT_VER}.zip - cd "${S}" || die - mkdir -p src/gwt/lib/{gin,gwt} \ - dependencies/common/dictionaries \ - src/gwt/lib/selenium/${SELENIUM_VER} \ - src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die - mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die - unzip -qd src/gwt/lib/gin/${GIN_VER} \ - "${DISTDIR}"/gin-${GIN_VER}.zip || die - unzip -qd dependencies/common/dictionaries \ - "${DISTDIR}"/core-dictionaries.zip || die - unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \ - "${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die - cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \ - src/gwt/lib/selenium/${SELENIUM_VER}/ || die - cp "${DISTDIR}"/chromedriver-linux \ - src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER}/ || die - cd dependencies/common || die - unpack packrat-${PACKRAT_VER}.tar.gz - unpack rmarkdown-${RMARKDOWN_VER}.tar.gz - unpack shinyapps-${SHINYAPPS_VER}.tar.gz - unpack rsconnect_${RSCONNECT_VER}.tar.gz - cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \ - . || die -} - -src_prepare() { - default - java-pkg-2_src_prepare - egit_clean - - # Enable CMake to install our .service file for systemd usage - mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die - cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die - - # Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using - # this sed hack for now. ~RMH - sed -i \ - -e "s|DISTRO_SHARE|\"share/${PN}\"|g" \ - src/cpp/server/ServerOptions.cpp \ - src/cpp/session/SessionOptions.cpp || die - - # use mathjax from system - ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-26 || die - - # make sure icons and mime stuff are with prefix - sed -i \ - -e "s:/usr:${EPREFIX}/usr:g" \ - CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die - - # On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf - sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \ - -i src/cpp/server/ServerOptions.cpp \ - || die - - # Set the rsession.conf file location for Gentoo prefix - sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \ - -i src/cpp/session/SessionOptions.cpp \ - || die - - # dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module. - # It provides a library that has its version number appended to the end, - # which is difficult to handle in cmake, as find_library does not support - # searching for wildcard library names. So I find the library name from the - # qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt. - rm -rf "${S}"/src/cpp/desktop/3rdparty || die - local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \ - $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \ - | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \ - -e 's@LIBS \*= -l@@') - sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \ - -i "${S}"/src/cpp/desktop/CMakeLists.txt \ - || die - - # The git commit for tag: git rev-list -n 1 v0.99.903 - sed -e 's@git ARGS rev-parse HEAD@echo ARGS 0eb2d8ea28ebc1ac6ac327e023becb6133b679c4@'\ - -i "${S}"/CMakeLists.txt \ - "${S}"/CMakeGlobals.txt \ - || die -} - -src_configure() { - export RSTUDIO_VERSION_MAJOR=$(get_version_component_range 1) - export RSTUDIO_VERSION_MINOR=$(get_version_component_range 2) - export RSTUDIO_VERSION_PATCH=$(get_version_component_range 3) - - local mycmakeargs=( - -DDISTRO_SHARE=share/${PN} - -DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")" - -DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")") - -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake - -DRSTUDIO_VERIFY_R_VERSION=FALSE - ) - - cmake-utils_src_configure -} - -src_compile() { - # Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny - # P: /root/.oracle_jre_usage. - export ANT_OPTS="-Duser.home=${T}" - cmake-utils_src_compile -} - -src_install() { - export ANT_OPTS="-Duser.home=${T}" - cmake-utils_src_install - pax-mark m "${ED}usr/bin/rstudio" - doconfd "${FILESDIR}"/rstudio-server.conf - dodir /etc/rstudio - insinto /etc/rstudio - doins "${FILESDIR}"/rsession.conf - dosym /etc/conf.d/rstudio-server.conf /etc/rstudio/rserver.conf - if use dedicated || use server; then - dopamd src/cpp/server/extras/pam/rstudio - newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server - fi -} - -pkg_preinst() { - use dedicated || gnome2_icon_savelist - java-pkg-2_pkg_preinst -} - -pkg_postinst() { - use dedicated || { fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update ;} - - if use dedicated || use server; then - enewgroup rstudio-server - enewuser rstudio-server -1 -1 -1 rstudio-server - fi -} - -pkg_postrm() { - use dedicated || { fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update ;} -} diff --git a/sci-mathematics/rstudio/rstudio-1.0.153.ebuild b/sci-mathematics/rstudio/rstudio-1.0.153.ebuild deleted file mode 100644 index dcb101cac4e3..000000000000 --- a/sci-mathematics/rstudio/rstudio-1.0.153.ebuild +++ /dev/null @@ -1,247 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-utils - -# TODO -# * package gin and gwt -# * use dict from tree, linguas -# * do src_test (use junit from tree?) - -# update from scripts in dependencies/common -# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt -GWT_VER=2.7.0 -GIN_VER=1.5 -SELENIUM_VER=2.37.0 -CHROMEDRIVER_VER=2.7 -# grep 'PANDOC_VERSION=' dependencies/common/update-pandoc -PANDOC_VER=1.13.1 -# ls dependencies/common/*.tar.gz -PACKRAT_VER=0.98.1000 -RMARKDOWN_VER=0.98.1000 -SHINYAPPS_VER=0.98.1000 -RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0 - -DESCRIPTION="IDE for the R language" -HOMEPAGE=" - http://www.rstudio.org - https://github.com/rstudio/rstudio/" -SRC_URI=" - https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar - https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux - https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip - https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz -" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="dedicated server" - -QT_VER=5.4 -QT_SLOT=5 -RDEPEND=" - app-text/pandoc - dev-haskell/pandoc-citeproc - >=dev-lang/R-2.11.1 - >=dev-libs/boost-1.50:= - >=dev-libs/mathjax-2.7.0 - dev-libs/openssl:0 - sys-apps/util-linux - >=sys-devel/clang-3.5.0:* - sys-libs/zlib - >=virtual/jre-1.8:= - x11-libs/pango - !dedicated? ( - >=dev-qt/qtcore-${QT_VER}:${QT_SLOT} - >=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT} - >=dev-qt/qtdbus-${QT_VER}:${QT_SLOT} - >=dev-qt/qtgui-${QT_VER}:${QT_SLOT} - >=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT} - >=dev-qt/qtopengl-${QT_VER}:${QT_SLOT} - >=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT} - >=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5] - >=dev-qt/qtsensors-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsql-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsvg-${QT_VER}:${QT_SLOT} - >=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT} - >=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT} - >=dev-qt/qtxml-${QT_VER}:${QT_SLOT} - >=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT} - server? ( virtual/pam ) - ) - dedicated? ( virtual/pam )" -DEPEND="${RDEPEND} - app-arch/unzip - dev-java/ant-core - >=virtual/jdk-1.8:= - virtual/pkgconfig" -# test? ( dev-java/junit:4 ) - -PATCHES=( - "${FILESDIR}/${PN}-0.99.879-prefs.patch" - "${FILESDIR}/${PN}-1.0.44-paths.patch" - "${FILESDIR}/${PN}-1.0.44-clang-pandoc.patch" - "${FILESDIR}/${PN}-0.98.490-linker_flags.patch" - "${FILESDIR}/${PN}-0.98.1091-boost-1.57.patch" - "${FILESDIR}/${PN}-0.99.473-qtsingleapplication.patch" - "${FILESDIR}/${PN}-1.0.44-systemd.patch" -) - -src_unpack() { - unpack ${P}.tar.gz gwt-${GWT_VER}.zip - cd "${S}" || die - mkdir -p src/gwt/lib/{gin,gwt} \ - dependencies/common/dictionaries \ - src/gwt/lib/selenium/${SELENIUM_VER} \ - src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die - mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die - unzip -qd src/gwt/lib/gin/${GIN_VER} \ - "${DISTDIR}"/gin-${GIN_VER}.zip || die - unzip -qd dependencies/common/dictionaries \ - "${DISTDIR}"/core-dictionaries.zip || die - unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \ - "${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die - cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \ - src/gwt/lib/selenium/${SELENIUM_VER}/ || die - cp "${DISTDIR}"/chromedriver-linux \ - src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER}/ || die - cd dependencies/common || die - unpack packrat-${PACKRAT_VER}.tar.gz - unpack rmarkdown-${RMARKDOWN_VER}.tar.gz - unpack shinyapps-${SHINYAPPS_VER}.tar.gz - unpack rsconnect_${RSCONNECT_VER}.tar.gz - cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \ - . || die -} - -src_prepare() { - default - java-pkg-2_src_prepare - egit_clean - - # Enable CMake to install our .service file for systemd usage - mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die - cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die - - # Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using - # this sed hack for now. ~RMH - sed -i \ - -e "s|DISTRO_SHARE|\"share/${PN}\"|g" \ - src/cpp/server/ServerOptions.cpp \ - src/cpp/session/SessionOptions.cpp || die - - # use mathjax from system - ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-26 || die - - # make sure icons and mime stuff are with prefix - sed -i \ - -e "s:/usr:${EPREFIX}/usr:g" \ - CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die - - # On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf - sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \ - -i src/cpp/server/ServerOptions.cpp \ - || die - - # Set the rsession.conf file location for Gentoo prefix - sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \ - -i src/cpp/session/SessionOptions.cpp \ - || die - - # dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module. - # It provides a library that has its version number appended to the end, - # which is difficult to handle in cmake, as find_library does not support - # searching for wildcard library names. So I find the library name from the - # qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt. - rm -rf "${S}"/src/cpp/desktop/3rdparty || die - local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \ - $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \ - | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \ - -e 's@LIBS \*= -l@@') - sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \ - -i "${S}"/src/cpp/desktop/CMakeLists.txt \ - || die - - # The git commit for tag: git rev-list -n 1 v0.99.903 - sed -e 's@git ARGS rev-parse HEAD@echo ARGS 0eb2d8ea28ebc1ac6ac327e023becb6133b679c4@'\ - -i "${S}"/CMakeLists.txt \ - "${S}"/CMakeGlobals.txt \ - || die -} - -src_configure() { - export RSTUDIO_VERSION_MAJOR=$(get_version_component_range 1) - export RSTUDIO_VERSION_MINOR=$(get_version_component_range 2) - export RSTUDIO_VERSION_PATCH=$(get_version_component_range 3) - - local mycmakeargs=( - -DDISTRO_SHARE=share/${PN} - -DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")" - -DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")") - -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake - -DRSTUDIO_VERIFY_R_VERSION=FALSE - ) - - cmake-utils_src_configure -} - -src_compile() { - # Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny - # P: /root/.oracle_jre_usage. - export ANT_OPTS="-Duser.home=${T}" - cmake-utils_src_compile -} - -src_install() { - export ANT_OPTS="-Duser.home=${T}" - cmake-utils_src_install - pax-mark m "${ED}usr/bin/rstudio" - doconfd "${FILESDIR}"/rstudio-server.conf - dodir /etc/rstudio - insinto /etc/rstudio - doins "${FILESDIR}"/rsession.conf - dosym /etc/conf.d/rstudio-server.conf /etc/rstudio/rserver.conf - if use dedicated || use server; then - dopamd src/cpp/server/extras/pam/rstudio - newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server - fi -} - -pkg_preinst() { - use dedicated || gnome2_icon_savelist - java-pkg-2_pkg_preinst -} - -pkg_postinst() { - use dedicated || { fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update ;} - - if use dedicated || use server; then - enewgroup rstudio-server - enewuser rstudio-server -1 -1 -1 rstudio-server - fi -} - -pkg_postrm() { - use dedicated || { fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update ;} -} diff --git a/sci-mathematics/rstudio/rstudio-1.0.44.ebuild b/sci-mathematics/rstudio/rstudio-1.0.44.ebuild deleted file mode 100644 index dcb101cac4e3..000000000000 --- a/sci-mathematics/rstudio/rstudio-1.0.44.ebuild +++ /dev/null @@ -1,247 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-utils - -# TODO -# * package gin and gwt -# * use dict from tree, linguas -# * do src_test (use junit from tree?) - -# update from scripts in dependencies/common -# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt -GWT_VER=2.7.0 -GIN_VER=1.5 -SELENIUM_VER=2.37.0 -CHROMEDRIVER_VER=2.7 -# grep 'PANDOC_VERSION=' dependencies/common/update-pandoc -PANDOC_VER=1.13.1 -# ls dependencies/common/*.tar.gz -PACKRAT_VER=0.98.1000 -RMARKDOWN_VER=0.98.1000 -SHINYAPPS_VER=0.98.1000 -RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0 - -DESCRIPTION="IDE for the R language" -HOMEPAGE=" - http://www.rstudio.org - https://github.com/rstudio/rstudio/" -SRC_URI=" - https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar - https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux - https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip - https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz -" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="dedicated server" - -QT_VER=5.4 -QT_SLOT=5 -RDEPEND=" - app-text/pandoc - dev-haskell/pandoc-citeproc - >=dev-lang/R-2.11.1 - >=dev-libs/boost-1.50:= - >=dev-libs/mathjax-2.7.0 - dev-libs/openssl:0 - sys-apps/util-linux - >=sys-devel/clang-3.5.0:* - sys-libs/zlib - >=virtual/jre-1.8:= - x11-libs/pango - !dedicated? ( - >=dev-qt/qtcore-${QT_VER}:${QT_SLOT} - >=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT} - >=dev-qt/qtdbus-${QT_VER}:${QT_SLOT} - >=dev-qt/qtgui-${QT_VER}:${QT_SLOT} - >=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT} - >=dev-qt/qtopengl-${QT_VER}:${QT_SLOT} - >=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT} - >=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5] - >=dev-qt/qtsensors-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsql-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsvg-${QT_VER}:${QT_SLOT} - >=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT} - >=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT} - >=dev-qt/qtxml-${QT_VER}:${QT_SLOT} - >=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT} - server? ( virtual/pam ) - ) - dedicated? ( virtual/pam )" -DEPEND="${RDEPEND} - app-arch/unzip - dev-java/ant-core - >=virtual/jdk-1.8:= - virtual/pkgconfig" -# test? ( dev-java/junit:4 ) - -PATCHES=( - "${FILESDIR}/${PN}-0.99.879-prefs.patch" - "${FILESDIR}/${PN}-1.0.44-paths.patch" - "${FILESDIR}/${PN}-1.0.44-clang-pandoc.patch" - "${FILESDIR}/${PN}-0.98.490-linker_flags.patch" - "${FILESDIR}/${PN}-0.98.1091-boost-1.57.patch" - "${FILESDIR}/${PN}-0.99.473-qtsingleapplication.patch" - "${FILESDIR}/${PN}-1.0.44-systemd.patch" -) - -src_unpack() { - unpack ${P}.tar.gz gwt-${GWT_VER}.zip - cd "${S}" || die - mkdir -p src/gwt/lib/{gin,gwt} \ - dependencies/common/dictionaries \ - src/gwt/lib/selenium/${SELENIUM_VER} \ - src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die - mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die - unzip -qd src/gwt/lib/gin/${GIN_VER} \ - "${DISTDIR}"/gin-${GIN_VER}.zip || die - unzip -qd dependencies/common/dictionaries \ - "${DISTDIR}"/core-dictionaries.zip || die - unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \ - "${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die - cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \ - src/gwt/lib/selenium/${SELENIUM_VER}/ || die - cp "${DISTDIR}"/chromedriver-linux \ - src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER}/ || die - cd dependencies/common || die - unpack packrat-${PACKRAT_VER}.tar.gz - unpack rmarkdown-${RMARKDOWN_VER}.tar.gz - unpack shinyapps-${SHINYAPPS_VER}.tar.gz - unpack rsconnect_${RSCONNECT_VER}.tar.gz - cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \ - . || die -} - -src_prepare() { - default - java-pkg-2_src_prepare - egit_clean - - # Enable CMake to install our .service file for systemd usage - mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die - cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die - - # Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using - # this sed hack for now. ~RMH - sed -i \ - -e "s|DISTRO_SHARE|\"share/${PN}\"|g" \ - src/cpp/server/ServerOptions.cpp \ - src/cpp/session/SessionOptions.cpp || die - - # use mathjax from system - ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-26 || die - - # make sure icons and mime stuff are with prefix - sed -i \ - -e "s:/usr:${EPREFIX}/usr:g" \ - CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die - - # On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf - sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \ - -i src/cpp/server/ServerOptions.cpp \ - || die - - # Set the rsession.conf file location for Gentoo prefix - sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \ - -i src/cpp/session/SessionOptions.cpp \ - || die - - # dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module. - # It provides a library that has its version number appended to the end, - # which is difficult to handle in cmake, as find_library does not support - # searching for wildcard library names. So I find the library name from the - # qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt. - rm -rf "${S}"/src/cpp/desktop/3rdparty || die - local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \ - $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \ - | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \ - -e 's@LIBS \*= -l@@') - sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \ - -i "${S}"/src/cpp/desktop/CMakeLists.txt \ - || die - - # The git commit for tag: git rev-list -n 1 v0.99.903 - sed -e 's@git ARGS rev-parse HEAD@echo ARGS 0eb2d8ea28ebc1ac6ac327e023becb6133b679c4@'\ - -i "${S}"/CMakeLists.txt \ - "${S}"/CMakeGlobals.txt \ - || die -} - -src_configure() { - export RSTUDIO_VERSION_MAJOR=$(get_version_component_range 1) - export RSTUDIO_VERSION_MINOR=$(get_version_component_range 2) - export RSTUDIO_VERSION_PATCH=$(get_version_component_range 3) - - local mycmakeargs=( - -DDISTRO_SHARE=share/${PN} - -DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")" - -DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")") - -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake - -DRSTUDIO_VERIFY_R_VERSION=FALSE - ) - - cmake-utils_src_configure -} - -src_compile() { - # Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny - # P: /root/.oracle_jre_usage. - export ANT_OPTS="-Duser.home=${T}" - cmake-utils_src_compile -} - -src_install() { - export ANT_OPTS="-Duser.home=${T}" - cmake-utils_src_install - pax-mark m "${ED}usr/bin/rstudio" - doconfd "${FILESDIR}"/rstudio-server.conf - dodir /etc/rstudio - insinto /etc/rstudio - doins "${FILESDIR}"/rsession.conf - dosym /etc/conf.d/rstudio-server.conf /etc/rstudio/rserver.conf - if use dedicated || use server; then - dopamd src/cpp/server/extras/pam/rstudio - newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server - fi -} - -pkg_preinst() { - use dedicated || gnome2_icon_savelist - java-pkg-2_pkg_preinst -} - -pkg_postinst() { - use dedicated || { fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update ;} - - if use dedicated || use server; then - enewgroup rstudio-server - enewuser rstudio-server -1 -1 -1 rstudio-server - fi -} - -pkg_postrm() { - use dedicated || { fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update ;} -} diff --git a/sci-mathematics/rstudio/rstudio-1.1.368.ebuild b/sci-mathematics/rstudio/rstudio-1.1.368.ebuild index 38ac6d8ddf2f..221887f8aa32 100644 --- a/sci-mathematics/rstudio/rstudio-1.1.368.ebuild +++ b/sci-mathematics/rstudio/rstudio-1.1.368.ebuild @@ -133,7 +133,7 @@ src_unpack() { } src_prepare() { - default + cmake-utils_src_prepare java-pkg-2_src_prepare egit_clean diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest index e5c6d6ec2ff7..3bfda9dd7788 100644 --- a/sci-visualization/gnuplot/Manifest +++ b/sci-visualization/gnuplot/Manifest @@ -1,4 +1,4 @@ DIST gnuplot-5.0.1.tar.gz 4963747 SHA256 7cbc557e71df581ea520123fb439dea5f073adcc9010a2885dc80d4ed28b3c47 SHA512 f68ccef8ecad0d5f7c2eb5dc2c97ba14abba6e3324c36bb9ede5f87eef613942376a26e42e55fa8e9c908e2b732aa0b9f34d6d5c386e3d5cf9685bbca60fa094 WHIRLPOOL 7c1d7ec4e999d5d78fadc67cee1186988dbb1cd53feef19094554aa215a19ee6b136d7b65e692cba42bfdb19a06f036fc3fbe1b78cb55f9d0f1b8a740341d15c -DIST gnuplot-5.0.4.tar.gz 5051380 SHA256 151cb845728bde75eb9d1561b35140114a05a7c52a52bd35b4b2b3d944e0c31e SHA512 ebb6bf64cc7f333135d328f6b72d73ef3a3b62f5df28d746efa1589dd9d54fc359306c7c2bc5ad9671b53b0cc945a4388b087abf365dda7417fe21a93ff29dae WHIRLPOOL 73c952dd640879190d68c66df1d67c143ec3619c356f52357df637748be9324946f538ca3da222580f7376332dfc2a295634523d9864bd7342c43af0baa26053 DIST gnuplot-5.0.5.tar.gz 5078771 SHA256 25f3e0bf192e01115c580f278c3725d7a569eb848786e12b455a3fda70312053 SHA512 fd6efc3a869850fa1939a4c833c776395efaaaf6dccc63e3626cee2e39938923b06314368802155adf711ae3e5ca0e3dd1a88be348e8571f9d0be8790240c62c WHIRLPOOL 586aa59439d92c1a05169b57b1c7369465914870788b20b394fef0591a84f134ce6f6707b370105f55277d326d3ab578904ac82355c8d97b7337a7980ab8e29e DIST gnuplot-5.0.6.tar.gz 5093897 SHA256 5bbe4713e555c2e103b7d4ffd45fca69551fff09cf5c3f9cb17428aaacc9b460 SHA512 7f9b05725a8594dcfbf1f1fc8f1db9bf45e1b6841fa1089b2c2528a3e36f71baab16d5fbeb027e4dd3618461a4895d037cb9f43781bfee2cb078cb9583567d8d WHIRLPOOL 3f3cf31f764af36d3761a17447ed8da98aec1148270eacc33c48605cf0dbff6dbde4b726403d4177da2104e6ff9baa4d48e0e3c65630a057ab1dc01f641daf5e +DIST gnuplot-5.0.7.tar.gz 5100186 SHA256 0ad760ff013b4a9cf29853fa9b50c50030a33cd8fb86220a23abb466655136fc SHA512 5d7241dc1472f87af8632110a1e88f83b5ea3f41e1bc8c89a45dc4662a3071d91a25bf9ae5196a2b8bef09c8079c22f635bb947c02def3416d78880d61eea919 WHIRLPOOL f8382c7a0e9a460f6898eaa4c280db9d6088aa997c2685350c23d97b2ec09b14236f6caa057b41f7f02a513734a99a18da3383e9ed769e821204de14a11d35cf diff --git a/sci-visualization/gnuplot/files/gnuplot-5.0.6-no-picins.patch b/sci-visualization/gnuplot/files/gnuplot-5.0.6-no-picins.patch new file mode 100644 index 000000000000..87408aebd447 --- /dev/null +++ b/sci-visualization/gnuplot/files/gnuplot-5.0.6-no-picins.patch @@ -0,0 +1,27 @@ +Do not require picins.sty. +https://bugs.gentoo.org/577828#c4 + +--- gnuplot-5.0.6-orig/docs/Makefile.am ++++ gnuplot-5.0.6/docs/Makefile.am +@@ -189,7 +189,6 @@ + touch figures.idx ; \ + rm -f pdffigures.tex ; \ + ( echo "\usepackage{graphicx}" > pdffigures.tex ; \ +- echo "\usepackage{picins}" >> pdffigures.tex ; \ + ) ; \ + TEXINPUTS=.:$(srcdir):$(top_srcdir):${TEXINPUTS}: $(PDFLATEX) $< ; \ + TEXINPUTS=.:$(srcdir):$(top_srcdir):${TEXINPUTS}: $(PDFLATEX) $< ; \ +--- gnuplot-5.0.6-orig/docs/doc2tex.c ++++ gnuplot-5.0.6/docs/doc2tex.c +@@ -170,9 +170,9 @@ + case 'F': /* embedded figure */ + if (figures) { + line[strlen(line)-1]=NUL; +- (void) fputs("\\parpic[r][rt]{\\includegraphics[width=3in,keepaspectratio]{",b); ++ (void) fputs("\\begin{figure}[htb]\n\\centering\\includegraphics[width=3in,keepaspectratio]{",b); + fputs(line+1, b); +- (void) fputs("}}\n",b); ++ (void) fputs("}\n\\end{figure}\n",b); + } + break; + diff --git a/sci-visualization/gnuplot/gnuplot-5.0.6.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.6.ebuild index cac060cf8d00..2a7de7b82e76 100644 --- a/sci-visualization/gnuplot/gnuplot-5.0.6.ebuild +++ b/sci-visualization/gnuplot/gnuplot-5.0.6.ebuild @@ -66,10 +66,10 @@ GP_VERSION="${PV%.*}" E_SITEFILE="lisp/50${PN}-gentoo.el" TEXMF="${EPREFIX}/usr/share/texmf-site" -PATCHES=( "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch ) - src_prepare() { - default + eapply "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch + eapply "${FILESDIR}"/${PN}-5.0.6-no-picins.patch + eapply_user if [[ -z ${PV%%*9999} ]]; then local dir @@ -162,7 +162,14 @@ src_compile() { if use doc; then # Avoid sandbox violation in epstopdf/ghostscript addpredict /var/cache/fontconfig - emake -C docs gnuplot.pdf + if use cairo; then + emake -C docs pdf + else + ewarn "Cannot build figures unless cairo is enabled." + ewarn "Building documentation without figures." + emake -C docs pdf_nofig + mv docs/nofigures.pdf docs/gnuplot.pdf || die + fi emake -C tutorial pdf fi } diff --git a/sci-visualization/gnuplot/gnuplot-5.1.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild index cbc8a7447f0a..2a7de7b82e76 100644 --- a/sci-visualization/gnuplot/gnuplot-5.1.9999.ebuild +++ b/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild @@ -67,7 +67,9 @@ E_SITEFILE="lisp/50${PN}-gentoo.el" TEXMF="${EPREFIX}/usr/share/texmf-site" src_prepare() { - default + eapply "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch + eapply "${FILESDIR}"/${PN}-5.0.6-no-picins.patch + eapply_user if [[ -z ${PV%%*9999} ]]; then local dir @@ -160,7 +162,14 @@ src_compile() { if use doc; then # Avoid sandbox violation in epstopdf/ghostscript addpredict /var/cache/fontconfig - emake -C docs gnuplot.pdf + if use cairo; then + emake -C docs pdf + else + ewarn "Cannot build figures unless cairo is enabled." + ewarn "Building documentation without figures." + emake -C docs pdf_nofig + mv docs/nofigures.pdf docs/gnuplot.pdf || die + fi emake -C tutorial pdf fi } diff --git a/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild index e06fd330630b..ef281474464e 100644 --- a/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild +++ b/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild @@ -66,10 +66,10 @@ GP_VERSION="${PV%.*}" E_SITEFILE="lisp/50${PN}-gentoo.el" TEXMF="${EPREFIX}/usr/share/texmf-site" -PATCHES=( "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch ) - src_prepare() { - default + eapply "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch + eapply "${FILESDIR}"/${PN}-5.0.6-no-picins.patch + eapply_user if [[ -z ${PV%%*9999} ]]; then local dir @@ -162,7 +162,14 @@ src_compile() { if use doc; then # Avoid sandbox violation in epstopdf/ghostscript addpredict /var/cache/fontconfig - emake -C docs gnuplot.pdf + if use cairo; then + emake -C docs pdf + else + ewarn "Cannot build figures unless cairo is enabled." + ewarn "Building documentation without figures." + emake -C docs pdf_nofig + mv docs/nofigures.pdf docs/gnuplot.pdf || die + fi emake -C tutorial pdf fi } diff --git a/sci-visualization/gnuplot/gnuplot-5.0.4.ebuild b/sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild index da8e950ce6ee..c2be8b92510f 100644 --- a/sci-visualization/gnuplot/gnuplot-5.0.4.ebuild +++ b/sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild @@ -1,18 +1,18 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 -inherit autotools eutils flag-o-matic multilib readme.gentoo toolchain-funcs wxwidgets +inherit autotools flag-o-matic readme.gentoo-r1 toolchain-funcs wxwidgets DESCRIPTION="Command-line driven interactive plotting program" HOMEPAGE="http://www.gnuplot.info/" if [[ -z ${PV%%*9999} ]]; then - inherit autotools cvs + inherit cvs ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot" ECVS_MODULE="gnuplot" - ECVS_BRANCH="branch-5-0-stable" + ECVS_BRANCH="HEAD" ECVS_USER="anonymous" ECVS_CVS_OPTIONS="-dP" MY_P="${PN}" @@ -21,8 +21,7 @@ if [[ -z ${PV%%*9999} ]]; then else MY_P="${P/_/.}" SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" - inherit autotools + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" fi LICENSE="gnuplot bitmap? ( free-noncomm )" @@ -68,15 +67,15 @@ E_SITEFILE="lisp/50${PN}-gentoo.el" TEXMF="${EPREFIX}/usr/share/texmf-site" src_prepare() { - # Fix underlinking - epatch "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch + eapply "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch + eapply "${FILESDIR}"/${PN}-5.0.6-no-picins.patch + eapply_user if [[ -z ${PV%%*9999} ]]; then local dir for dir in config demo m4 term tutorial; do emake -C "$dir" -f Makefile.am.in Makefile.am done - #eautoreconf fi # Add special version identification as required by provision 2 @@ -101,7 +100,6 @@ src_prepare() { environment variables. See the FAQ file in /usr/share/doc/${PF}/ for more information.' - mv configure.in configure.ac || die eautoreconf # Make sure we don't mix build & host flags. @@ -128,7 +126,6 @@ src_configure() { export CC_FOR_BUILD=${BUILD_CC} econf \ - --without-pdf \ --with-texdir="${TEXMF}/tex/latex/${PN}" \ --with-readline=$(usex readline gnu builtin) \ $(use_with bitmap bitmap-terminals) \ @@ -163,7 +160,14 @@ src_compile() { if use doc; then # Avoid sandbox violation in epstopdf/ghostscript addpredict /var/cache/fontconfig - emake -C docs gnuplot.pdf + if use cairo; then + emake -C docs pdf + else + ewarn "Cannot build figures unless cairo is enabled." + ewarn "Building documentation without figures." + emake -C docs pdf_nofig + mv docs/nofigures.pdf docs/gnuplot.pdf || die + fi emake -C tutorial pdf fi } @@ -181,8 +185,8 @@ src_install () { # Demo files insinto /usr/share/${PN}/${GP_VERSION} doins -r demo - rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile* - rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary* + rm -f "${ED%/}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile* + rm -f "${ED%/}"/usr/share/${PN}/${GP_VERSION}/demo/binary* fi if use doc; then diff --git a/sci-visualization/gnuplot/metadata.xml b/sci-visualization/gnuplot/metadata.xml index 151dd892920f..8700ea957399 100644 --- a/sci-visualization/gnuplot/metadata.xml +++ b/sci-visualization/gnuplot/metadata.xml @@ -1,32 +1,34 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>ulm@gentoo.org</email> - <name>Ulrich Müller</name> - </maintainer> - <maintainer type="person"> - <email>junghans@gentoo.org</email> - <name>Christoph Junghans</name> - </maintainer> - <maintainer type="project"> - <email>sci@gentoo.org</email> - <name>Gentoo Science Project</name> - </maintainer> - <longdescription> +<maintainer type="person"> + <email>ulm@gentoo.org</email> + <name>Ulrich Müller</name> +</maintainer> +<maintainer type="person"> + <email>junghans@gentoo.org</email> + <name>Christoph Junghans</name> +</maintainer> +<maintainer type="project"> + <email>sci@gentoo.org</email> + <name>Gentoo Science Project</name> +</maintainer> +<longdescription> Gnuplot is a command-driven interactive function plotting program. It can be used to plot functions and data points in both two- and three-dimensional plots in many different formats. It is designed primarily for the visual display of scientific data. </longdescription> - <use> - <flag name="compat">Enable backwards compatibility with version 4 syntax</flag> - <flag name="gd">Add support for <pkg>media-libs/gd</pkg>. +<use> + <flag name="compat">Enable backwards compatibility with version 4 + syntax</flag> + <flag name="gd">Add support for <pkg>media-libs/gd</pkg>. Needed for GIF, JPEG, and PNG image output.</flag> - <flag name="libcerf">Enable special functions from <pkg>sci-libs/libcerf</pkg></flag> - <flag name="bitmap">Enable dot-matrix printers and pbm terminal</flag> - </use> - <upstream> - <remote-id type="sourceforge">gnuplot</remote-id> - </upstream> + <flag name="libcerf">Enable special functions from + <pkg>sci-libs/libcerf</pkg></flag> + <flag name="bitmap">Enable dot-matrix printers and pbm terminal</flag> +</use> +<upstream> + <remote-id type="sourceforge">gnuplot</remote-id> +</upstream> </pkgmetadata> diff --git a/sys-devel/gcc/files/gcc-4.9.4-bootstrap.patch b/sys-devel/gcc/files/gcc-4.9.4-bootstrap.patch new file mode 100644 index 000000000000..aed1ad0e90be --- /dev/null +++ b/sys-devel/gcc/files/gcc-4.9.4-bootstrap.patch @@ -0,0 +1,66 @@ +From 41a4aa66eac45c8862a79351647ec06dd03bd1f5 Mon Sep 17 00:00:00 2001 +From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> +Date: Sat, 13 Dec 2014 11:24:37 +0000 +Subject: [PATCH] PR bootstrap/64023 * Makefile.tpl + (EXTRA_TARGET_FLAGS): Set STAGE1_LDFLAGS to POSTSTAGE1_LDFLAGS and + STAGE1_LIBS to POSTSTAGE1_LIBS. Add -B to libstdc++-v3/src/.libs and + libstdc++-v3/libsupc++/.libs to CXX. * Makefile.in: Regenerated. + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@218705 138bc75d-0d04-0410-961f-82ee72b054a4 +--- + ChangeLog | 9 +++++++++ + Makefile.in | 6 +++++- + Makefile.tpl | 6 +++++- + 3 files changed, 19 insertions(+), 2 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index ba5ae4c2ecb..8ffc313f157 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -835,7 +835,9 @@ EXTRA_TARGET_FLAGS = \ + 'AS=$(COMPILER_AS_FOR_TARGET)' \ + 'CC=$$(CC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ + 'CFLAGS=$$(CFLAGS_FOR_TARGET)' \ +- 'CXX=$$(CXX_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ ++ 'CXX=$$(CXX_FOR_TARGET) -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \ ++ -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \ ++ $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ + 'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \ + 'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \ + 'GCJ=$$(GCJ_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ +@@ -853,6 +855,8 @@ EXTRA_TARGET_FLAGS = \ + 'WINDRES=$$(WINDRES_FOR_TARGET)' \ + 'WINDMC=$$(WINDMC_FOR_TARGET)' \ + 'XGCC_FLAGS_FOR_TARGET=$(XGCC_FLAGS_FOR_TARGET)' \ ++ 'STAGE1_LDFLAGS=$$(POSTSTAGE1_LDFLAGS)' \ ++ 'STAGE1_LIBS=$$(POSTSTAGE1_LIBS)' \ + "TFLAGS=$$TFLAGS" + + TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) +diff --git a/Makefile.tpl b/Makefile.tpl +index dcbc6b1b143..bb8227eaafa 100644 +--- a/Makefile.tpl ++++ b/Makefile.tpl +@@ -641,7 +641,9 @@ EXTRA_TARGET_FLAGS = \ + 'AS=$(COMPILER_AS_FOR_TARGET)' \ + 'CC=$$(CC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ + 'CFLAGS=$$(CFLAGS_FOR_TARGET)' \ +- 'CXX=$$(CXX_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ ++ 'CXX=$$(CXX_FOR_TARGET) -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \ ++ -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \ ++ $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ + 'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \ + 'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \ + 'GCJ=$$(GCJ_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ +@@ -659,6 +661,8 @@ EXTRA_TARGET_FLAGS = \ + 'WINDRES=$$(WINDRES_FOR_TARGET)' \ + 'WINDMC=$$(WINDMC_FOR_TARGET)' \ + 'XGCC_FLAGS_FOR_TARGET=$(XGCC_FLAGS_FOR_TARGET)' \ ++ 'STAGE1_LDFLAGS=$$(POSTSTAGE1_LDFLAGS)' \ ++ 'STAGE1_LIBS=$$(POSTSTAGE1_LIBS)' \ + "TFLAGS=$$TFLAGS" + + TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) +-- +2.15.0 + diff --git a/sys-devel/gcc/gcc-4.9.4.ebuild b/sys-devel/gcc/gcc-4.9.4.ebuild index e7562f2330ad..44597c4ceecb 100644 --- a/sys-devel/gcc/gcc-4.9.4.ebuild +++ b/sys-devel/gcc/gcc-4.9.4.ebuild @@ -39,9 +39,12 @@ src_prepare() { EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch" fi + # Bug 638056 + epatch "${FILESDIR}/${P}-bootstrap.patch" + toolchain_src_prepare use vanilla && return 0 - #Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs. + # Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs. [[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch } diff --git a/sys-devel/gcc/gcc-6.4.0.ebuild b/sys-devel/gcc/gcc-6.4.0.ebuild index 6002afe6b4f2..b27054b3e414 100644 --- a/sys-devel/gcc/gcc-6.4.0.ebuild +++ b/sys-devel/gcc/gcc-6.4.0.ebuild @@ -8,7 +8,7 @@ PATCH_VER="1.1" inherit toolchain -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" RDEPEND="" DEPEND="${RDEPEND} diff --git a/x11-terms/aterm/aterm-1.0.1-r3.ebuild b/x11-terms/aterm/aterm-1.0.1-r3.ebuild index 13ec64d087df..57ccbace956a 100644 --- a/x11-terms/aterm/aterm-1.0.1-r3.ebuild +++ b/x11-terms/aterm/aterm-1.0.1-r3.ebuild @@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.afterstep.org/apps/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris" IUSE="background cjk xgetdefault" RDEPEND=" |