diff options
Diffstat (limited to 'dev-util')
78 files changed, 280 insertions, 1658 deletions
diff --git a/dev-util/anjuta/anjuta-3.18.2.ebuild b/dev-util/anjuta/anjuta-3.18.2.ebuild index f0f3bdefb2e2..1671bb66883e 100644 --- a/dev-util/anjuta/anjuta-3.18.2.ebuild +++ b/dev-util/anjuta/anjuta-3.18.2.ebuild @@ -18,7 +18,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Anjuta" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd" +KEYWORDS="amd64 ~ppc ~sparc ~x86 ~x86-fbsd" IUSE="debug devhelp glade +introspection packagekit subversion terminal test vala" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/dev-util/catkin/catkin-0.6.16-r2.ebuild b/dev-util/catkin/catkin-0.6.16-r2.ebuild index 1e114945e04a..f9a32a87c9f0 100644 --- a/dev-util/catkin/catkin-0.6.16-r2.ebuild +++ b/dev-util/catkin/catkin-0.6.16-r2.ebuild @@ -10,7 +10,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then EGIT_REPO_URI="http://github.com/ros/catkin" fi -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} ) inherit ${SCM} cmake-utils python-r1 python-utils-r1 diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-9999.ebuild index 1e114945e04a..f9a32a87c9f0 100644 --- a/dev-util/catkin/catkin-9999.ebuild +++ b/dev-util/catkin/catkin-9999.ebuild @@ -10,7 +10,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then EGIT_REPO_URI="http://github.com/ros/catkin" fi -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} ) inherit ${SCM} cmake-utils python-r1 python-utils-r1 diff --git a/dev-util/cdiff/Manifest b/dev-util/cdiff/Manifest index a6353a13d41d..32f47e4c93df 100644 --- a/dev-util/cdiff/Manifest +++ b/dev-util/cdiff/Manifest @@ -1,3 +1,2 @@ -DIST cdiff-0.9.6.tar.gz 30751 SHA256 a2fe898344f80ff5ecfd1d4bea7908422aeb0193f58b7669b485b8f7f978ae1b SHA512 8ae4d3dd26a53ba806f750736d7fcdddcae435d9492045e7ec57fa4b818125d0fe0f015d23910f393fa729b1c010ba3bf7bc5144f4794fe178a8a3e25d830480 WHIRLPOOL b799956392ea7b650b14d7073248a7a436281b5bbe6f11a53fe1c792543b46b279da24c795fb9bc49d1b4b35bee8518fd97e4486cc6cde3c8f932f828b2d35ce DIST cdiff-0.9.7.tar.gz 32061 SHA256 63b7f1037cbcf5ce76b56cd4e5643751e25e0c2a124bcd382af827651d81ca90 SHA512 2f2bf77ecc6e369325753c5d1c6fd23279138e8ae6a4d11cd102b5674d5c7e089e7f2613bbd39d68a00b0db16c589df64af14746228e38065556d0eb11b1e0cd WHIRLPOOL c26cb5df0b02b3567fa334ab2fe131ee99742b782d1bc8e83a4f06476c03d8242bbdc8489cec07ffb49ada0f5404c192c69765e3d9835fdf5feb944f8bb0e703 DIST cdiff-0.9.8.tar.gz 34861 SHA256 61229ba5b294faa8b4c257a220cfda34ac4a7ecf35aa88e8121c36234fea3760 SHA512 303126c51b4c5cfafd800da7f4ffd56655f28f8b525c7d83c7417e1e0013b2186b178697aca41af18f5397ac860cc0159d359e2b23eaa8111e8f77184dc9d4f3 WHIRLPOOL a49f492746fba7af7869408bdfcb4ae2accfb78f9b999d49763f35fbfddb58ac96ae9a734e22441a0b9d060d89de56704f09762c1af10c059851e280a348156b diff --git a/dev-util/cdiff/cdiff-0.9.6.ebuild b/dev-util/cdiff/cdiff-0.9.6.ebuild deleted file mode 100644 index e16cd6efad2f..000000000000 --- a/dev-util/cdiff/cdiff-0.9.6.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) - -inherit distutils-r1 - -DESCRIPTION="Term based view of colored, incremental diff in a Git/Mercurial/Svn workspace" -HOMEPAGE="https://github.com/ymattw/${PN}" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -IUSE="" - -DEPEND=" - !<app-misc/colordiff-1.0.13-r1 - dev-python/setuptools[${PYTHON_USEDEP}] - sys-apps/less" - -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}"/${PN}-0.9.2-disable-unimportant-failing-test.patch ) - -DOCS=( CHANGES.rst README.rst ) - -python_test() { - ${PYTHON} tests/test_cdiff.py || die "Unit tests failed." - - ./tests/regression.sh || die "Regression tests failed." -} diff --git a/dev-util/cdiff/cdiff-0.9.7.ebuild b/dev-util/cdiff/cdiff-0.9.7.ebuild index cfde74d83980..d37dc8420433 100644 --- a/dev-util/cdiff/cdiff-0.9.7.ebuild +++ b/dev-util/cdiff/cdiff-0.9.7.ebuild @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python2_7 python3_{3,4} ) inherit distutils-r1 if [[ "${PV}" != *"9999"* ]] ; then - KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" else KEYWORDS="" diff --git a/dev-util/cocom/Manifest b/dev-util/cocom/Manifest deleted file mode 100644 index 6d8d18a67b7b..000000000000 --- a/dev-util/cocom/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST cocom-0.996.tar.gz 4632140 SHA256 e143ab556d79a35ef31ec1e240897c9b8a8d0b6693e50a2b6e47d7fd4b200519 SHA512 57a7338677c443d293f02d64f38268bd76feb075e3c9780fcd37e53a294d5e8fa374bb98d40b505d2d8f9fd9b7d8327f8f461cf4650868bf4adfd5b244cf1d4e WHIRLPOOL 599b48e444acb13bc14e170d8f34602462e45de8c4efea2f611ac7e023f876249c68e83712d9734639e456fc5961704999df6dc0baa139ae4fd965ecca7cd26f diff --git a/dev-util/cocom/cocom-0.996-r1.ebuild b/dev-util/cocom/cocom-0.996-r1.ebuild deleted file mode 100644 index 8e817965be44..000000000000 --- a/dev-util/cocom/cocom-0.996-r1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="2" - -inherit eutils autotools - -DESCRIPTION="Toolset to help create compilers, cross-compilers, interpreters, and other language processors" -HOMEPAGE="http://cocom.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux ~ppc-macos ~x86-macos" -IUSE="" -RDEPEND="!!media-gfx/hugin" -DEPEND="${RDEPEND}" - -src_prepare() { - epatch "${FILESDIR}/${P}-configure.patch" - cd "${S}"/REGEX - eautoconf -} - -src_install() { - emake install DESTDIR="${D}" || die - dodoc CHANGES README -} diff --git a/dev-util/cocom/files/cocom-0.996-configure.patch b/dev-util/cocom/files/cocom-0.996-configure.patch deleted file mode 100644 index ad584a82a219..000000000000 --- a/dev-util/cocom/files/cocom-0.996-configure.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- cocom-0.996/configure.orig 2007-02-08 19:25:24.000000000 +0100 -+++ cocom-0.996/configure 2009-09-01 20:21:04.000000000 +0200 -@@ -5474,7 +5474,7 @@ - Linux*) - GCC_FPIC=-fPIC - LIB_SUFFIX=so -- MAKELIB="gcc -shared -Wl,-soname,\\\$\$0 -o \\\$\$0" -+ MAKELIB="$CC $LDFLAGS -shared -Wl,-soname,\\\$\$0 -o \\\$\$0" - AFTER_MAKELIB="echo \\\$\$0" - # The following option is needed if we use no shared dino library but - # shared external library diff --git a/dev-util/cocom/metadata.xml b/dev-util/cocom/metadata.xml deleted file mode 100644 index 0101a3ef8b46..000000000000 --- a/dev-util/cocom/metadata.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <longdescription> - COCOM tool set is oriented towards the creation of compilers, - cross-compilers, interpreters, and other language processors. - Now COCOM tool set consists of the following components: - * Ammunition (reusable packages) - * Sprut (internal representation description translator) - * Nona (code selector description translator) - * Msta (syntax description translator) - * Oka (pipeline hazards description translator) - * Shilka (keywords description translator) - - All of these components are written in ANSI C and have common style - input languages (a la YACC). All code generated by the components is in - also strict ANSI C and in standard C++. All documentation exists in - ASCII, TeX dvi, Postsrcipt, HTML, and GNU info formats. - </longdescription> - <upstream> - <remote-id type="sourceforge">cocom</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-util/creduce/creduce-2.4.0.ebuild b/dev-util/creduce/creduce-2.4.0.ebuild index 76098b7b1d2e..ab9551703093 100644 --- a/dev-util/creduce/creduce-2.4.0.ebuild +++ b/dev-util/creduce/creduce-2.4.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -24,7 +24,7 @@ DEPEND=" dev-perl/Sys-CPU dev-util/astyle dev-util/indent - sys-devel/clang:0/3.7 - sys-devel/llvm:0/3.7.0[clang]" + =sys-devel/clang-3.7*:0= + =sys-devel/llvm-3.7*:0=[clang]" RDEPEND="${DEPEND}" diff --git a/dev-util/cscope/cscope-15.8a.ebuild b/dev-util/cscope/cscope-15.8a.ebuild index 8db9728cdede..208407b7d1e8 100644 --- a/dev-util/cscope/cscope-15.8a.ebuild +++ b/dev-util/cscope/cscope-15.8a.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/cscope/${P}.tar.gz" LICENSE="BSD GPL-2+" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" IUSE="emacs" RDEPEND=">=sys-libs/ncurses-5.2 diff --git a/dev-util/debootstrap/Manifest b/dev-util/debootstrap/Manifest index 8f913571e48a..e9bc0821601b 100644 --- a/dev-util/debootstrap/Manifest +++ b/dev-util/debootstrap/Manifest @@ -1,3 +1,4 @@ DIST debootstrap_1.0.75.tar.gz 61897 SHA256 4fdc5daf7bce3816a7faa916e7cbd6d45357f241f0d845bec0015c06fd7c7cd6 SHA512 bbf4a9e33ee0b398064aa12ba77c7e2ad8fba0e050a8d821341c9c065f8554476aaa6c67f93e3255f85828b98643080f331aee9de6a901a9d5fb5cbcb8ed6beb WHIRLPOOL dca8e385102ef03ea970320fc1fea8a8f44fc09b78384591911df046afb0f14157e90fafb3cf8c021ea7568e22eea9f26674eb07cfb25b21ed72810cf0957c7a DIST debootstrap_1.0.78.tar.gz 63725 SHA256 b08b32152f240b42ee7fc30f365d95527edf9012e25a16a5f03ba70297389abb SHA512 a65435fde2e7d2bb2dd51c8ac1fad51616d3ff11a2966c74eb1b2869685d62c7e0f7e2ecb539f92a700e2a6d570d0715ba15476ac0439feb9fda80310db2392b WHIRLPOOL 4f86fda0b95de15520586bab92506b75f44c48aaf1ea3bb3025b309c9f4063549e9faf526c3b9a7423335b0e64072f0a23e6f3dafeb7137d9f2c778e60ad77e9 +DIST debootstrap_1.0.79.tar.gz 64390 SHA256 11ee0dca0c0e0b5ccb0f80c885f62467c67b90abcbdd7f48dd8ca66af4ec5fc0 SHA512 dcaff6930b8b6679f5306be64405ee8e6670c2361a1d448701a3039453f0f42763e54e3841d1fd5bf201ca005f240a81e077db27593aa4066c21236cdf637535 WHIRLPOOL 42d0505e51774aabd15505d2036feb5cb97bb7b8b290b43fd914870de8135fd5602334115b0faa12a6bb28f11b0460d3fdbfa4385ddc4055f5aef37c9c0635ab DIST devices.tar.gz 47835 SHA256 0d93f93c8b21160069d14e74f8f990a2e0e1e5a90dc828b29e6b3f5aa5829e48 SHA512 994ec8d72e3d52d2d872f7ff0da2336e4cbd3a5fa73bb6cdb9e06f5e7f5b8c69cea639c738fdba1186f382d6dcf62e7746fface664bfbd744aac24b16f034432 WHIRLPOOL 222963bb920e1311bc2f481bba04e49f386b60cce6ce0576424896277e0c4fc6a339d4403d587744c32b0bfb1db6391f200fa8d66117e3f21e1c12f35365d732 diff --git a/dev-util/debootstrap/debootstrap-1.0.78.ebuild b/dev-util/debootstrap/debootstrap-1.0.78-r1.ebuild index 8c30ccb533b4..1ea5e165e7ea 100644 --- a/dev-util/debootstrap/debootstrap-1.0.78.ebuild +++ b/dev-util/debootstrap/debootstrap-1.0.78-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 inherit eutils DESCRIPTION="Debian/Ubuntu bootstrap scripts" @@ -40,7 +40,13 @@ src_install() { pkg_postinst() { if ! has_version ${CATEGORY}/${PN} && ! has_version app-crypt/gnupg; then - elog "To check Release files against a keyring" - elog " (--keyring=K), please install app-crypt/gnupg." + elog "To check Release files against a keyring (--keyring=K), please" + elog "install app-crypt/gnupg" + fi + + if ! has_version app-crypt/debian-archive-keyring || ! has_version app-crypt/ubuntu-keyring; then + elog "To check Release files from Debian or Ubuntu, please install" + elog " app-crypt/debian-archive-keyring or" + elog " app-crypt/ubuntu-keyring as required" fi } diff --git a/dev-util/debootstrap/debootstrap-1.0.79.ebuild b/dev-util/debootstrap/debootstrap-1.0.79.ebuild new file mode 100644 index 000000000000..78ad534d1170 --- /dev/null +++ b/dev-util/debootstrap/debootstrap-1.0.79.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +inherit eutils + +DESCRIPTION="Debian/Ubuntu bootstrap scripts" +HOMEPAGE="http://packages.qa.debian.org/d/debootstrap.html" +SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz + mirror://gentoo/devices.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" + +RDEPEND=" + app-arch/dpkg + net-misc/wget + sys-devel/binutils +" + +DOCS=( TODO debian/changelog ) + +src_unpack() { + unpack ${PN}_${PV}.tar.gz + cp "${DISTDIR}"/devices.tar.gz "${S}" +} + +src_compile() { + return +} + +src_install() { + default + doman debootstrap.8 +} + +pkg_postinst() { + if ! has_version ${CATEGORY}/${PN} && ! has_version app-crypt/gnupg; then + elog "To check Release files against a keyring (--keyring=K), please" + elog "install app-crypt/gnupg" + fi + + if ! has_version app-crypt/debian-archive-keyring || ! has_version app-crypt/ubuntu-keyring; then + elog "To check Release files from Debian or Ubuntu, please install" + elog " app-crypt/debian-archive-keyring or" + elog " app-crypt/ubuntu-keyring as required" + fi +} diff --git a/dev-util/devhelp/devhelp-3.18.1.ebuild b/dev-util/devhelp/devhelp-3.18.1.ebuild index d2c6c131d1de..9022eb7a58ba 100644 --- a/dev-util/devhelp/devhelp-3.18.1.ebuild +++ b/dev-util/devhelp/devhelp-3.18.1.ebuild @@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp" LICENSE="GPL-2+" SLOT="0/3-1" # subslot = 3-(libdevhelp-3 soname version) -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" IUSE="gedit" REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} )" diff --git a/dev-util/eclipse-sdk/Manifest b/dev-util/eclipse-sdk/Manifest deleted file mode 100644 index 31e6d404b0d9..000000000000 --- a/dev-util/eclipse-sdk/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST eclipse-R3_5_1-fetched-src.tar.bz2 79061683 SHA256 3c93115e3031686dd26c94833cd21ce26244340408a435a3b9dcd29404309c60 SHA512 2ad3669a5d39abeebed4121ccc67a42590b9ae80bde5ae69b4fc079e39640cabfcb3a7388c6cc6329fff74c0858f20b97c855fd4828a3b1a90bd6aa2c486dd63 WHIRLPOOL 36ccc7323ea0958b595e29bf12eb2b7a3891800119030353bdb4ed7f47f20f567435508415e909580958d2af1c0b40850dbb8f7d03ba1f649931b1d067fb59d9 -DIST eclipse-build-R0_4_0.tar.gz 164001 SHA256 87f159e0861b378b1ea13d3173d6066fbc141a350283b0f0278831a5097cbe1b SHA512 c8ff9fcf3dc6512e051d8d3d89391b49b6260583980851409263fdb03ea1af9f8bde55fc18db4e418c109cc78aa1bd33f90e0b5a8ffa65f4c826ecfc245ba6ca WHIRLPOOL 243be2d46de3454ca514e5955219742cddc2c9762ee9040087ccdac227699f054476f57e6b66daaf2a188e746c1196d6605b6e64b415c6f017600c256763d2d8 diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.5.1-r1.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.5.1-r1.ebuild deleted file mode 100644 index 58ced432c30d..000000000000 --- a/dev-util/eclipse-sdk/eclipse-sdk-3.5.1-r1.ebuild +++ /dev/null @@ -1,304 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="2" -WANT_ANT_TASKS="ant-nodeps" - -# eclipse-build is too complicated for automatic fixing -# if there are any fixes we should create patches -# and push them upstream -JAVA_PKG_BSFIX="off" - -inherit eutils java-pkg-2 java-ant-2 check-reqs - -BUILD_ID="R3_5_1" -ECLIPSE_BUILD_VER="R0_4_0" -S="${WORKDIR}/eclipse-build-${ECLIPSE_BUILD_VER}" - -DESCRIPTION="Eclipse SDK" -HOMEPAGE="http://www.eclipse.org/eclipse/" -SRC_URI="http://download.eclipse.org/technology/linuxtools/eclipse-build/eclipse-${BUILD_ID}-fetched-src.tar.bz2 - http://download.eclipse.org/technology/linuxtools/eclipse-build/eclipse-build-${ECLIPSE_BUILD_VER}.tar.gz" - -LICENSE="EPL-1.0" -SLOT="3.5" -KEYWORDS="amd64 x86" -IUSE="doc gnome source" - -CDEPEND=">=dev-java/swt-${PV}:${SLOT} - >=dev-java/ant-1.7.1 - >=dev-java/ant-core-1.7.1 - >=dev-java/asm-3.1:3 - >=dev-java/commons-codec-1.3 - >=dev-java/commons-el-1.0 - >=dev-java/commons-httpclient-3.1:3 - >=dev-java/commons-logging-1.0.4 - >=dev-java/hamcrest-core-1.1 - >=dev-java/icu4j-4.0.1:4 - >=dev-java/jsch-0.1.41 - >=dev-java/junit-3.8.2:0 - >=dev-java/junit-4.5:4 - >=dev-java/lucene-1.9.1:1.9 - >=dev-java/lucene-analyzers-1.9.1:1.9 - >=dev-java/sat4j-core-2.1:2 - >=dev-java/sat4j-pseudo-2.1:2 - dev-java/tomcat-servlet-api:2.5 - x86? ( gnome? ( gnome-base/gconf ) ) - dev-java/ant-nodeps" -RDEPEND="${CDEPEND} - >=virtual/jre-1.5" -DEPEND="${CDEPEND} - app-arch/unzip - app-arch/zip - >=virtual/jdk-1.6" - -ALL_OS='aix hpux linux macosx qnx solaris win32' -ALL_WS='carbon cocoa gtk motif photon win32 wpf' -ALL_ARCH='alpha arm ia64 mips mipsel PA_RISC ppc ppc64 s390 s390x sparc sparc64 x86 x86_64' - -buildDir="${S}/build/eclipse-${BUILD_ID}-fetched-src" - -pkg_setup() { - ws='gtk' - if use x86 ; then os='linux' ; arch='x86' - elif use amd64 ; then os='linux' ; arch='x86_64' - fi - - java-pkg-2_pkg_setup - - if use doc ; then - ewarn "Having the 'doc' USE flag enabled greatly increases the build time." - ewarn "You might want to disable it for ${PN} if you don't need it." - fi -} - -src_unpack() { - CHECKREQS_MEMORY="1536M" - if use doc || use source ; then - CHECKREQS_DISK_BUILD="3072M" - else - CHECKREQS_DISK_BUILD="1536M" - fi - check_reqs - - unpack "eclipse-build-${ECLIPSE_BUILD_VER}.tar.gz" - mv "${WORKDIR}/eclipse-build-0_4_RC6" "${S}" || die - ln -s "${DISTDIR}/eclipse-${BUILD_ID}-fetched-src.tar.bz2" "${S}"/ || die - - cd "${S}" - # building with ecj fails for some reason (polluted classpath probably) - java-pkg_force-compiler javac - eant unpack -} - -src_prepare() { - epatch "${FILESDIR}/3.5/jvmarg.patch" || die - - # apply patches before we start cleaning junk out - eant applyPatches - - # fix up hardcoded runtime class paths - sed -e 's|/usr/lib/jvm/java/jre/lib/rt\.jar:.*$|'"$(java-config --runtime)"'|' \ - -i {,pde}build.properties || die - - # fix up arch specifications if we're x86_64 - if use amd64 ; then - sed -e 's/x86/\0_64/' -i "${buildDir}"/buildConfigs/eclipse-build-config/build.properties || die - fi - - # disable building of libgnomeproxy on x86 if USE=-gnome - if ! use gnome ; then - sed_xml_element 'condition' -e '/property="build\.libgnomeproxy"/d' -i build.xml || die - fi - - # skip compilation of SWT native libraries (we use the system-installed copies) - sed_xml_element 'ant' -e '/swt/d' -i build.xml || die - - ebegin 'Removing plugins of irrelevant platforms' - local remove_os=" ${ALL_OS} " ; remove_os=${remove_os/ ${os} / } - remove_os=${remove_os# } ; remove_os=${remove_os% } ; remove_os=${remove_os// /'\|'} - local remove_ws=" ${ALL_WS} " ; remove_ws=${remove_ws/ ${ws} / } - remove_ws=${remove_ws# } ; remove_ws=${remove_ws% } ; remove_ws=${remove_ws// /'\|'} - local remove_arch=" ${ALL_ARCH} " ; remove_arch=${remove_arch/ ${arch} / } - remove_arch=${remove_arch# } ; remove_arch=${remove_arch% } ; remove_arch=${remove_arch// /'\|'} - sed_xml_element 'includes\|plugin' \ - -e '/id="org\.eclipse\.\(core\.net\.linux\.x86\|update\.core\.linux\)"/b' \ - -e '/os="'"${remove_os}"'"/d' -e '/ws="'"${remove_ws}"'"/d' -e '/arch="'"${remove_arch}"'"/d' \ - -i "${buildDir}"/features/*/feature.xml "${S}"/eclipse-build-feature/feature.xml \ - || die 'remove irrelevant platforms failed' - eend - - if ! use doc ; then - ebegin 'Removing documentation plugins' - rm -rf "${buildDir}"/plugins/*.doc{,.*} - eclipse_delete-plugins '.*\.doc\(\..*\|\)' - eend - fi - - if ! use source ; then - ebegin 'Removing source plugins' - rm -rf "${buildDir}"/plugins/*.source{,_*} - eclipse_delete-plugins '.*\.source' - eend - fi - - unbundle "${buildDir}"/plugins - cd ${buildDir} || die - epatch "${FILESDIR}/${SLOT}/hamcrest-junit-lib.patch" - epatch "${FILESDIR}/${SLOT}/gtk_makefile.patch" -} - -src_compile() { - ANT_OPTS='-Xmx512M' eant -DbuildArch=${arch} -} - -src_install() { - local destDir="/usr/$(get_libdir)/eclipse-${SLOT}" - - insinto "${destDir}" - shopt -s dotglob - doins -r "${buildDir}"/installation/* || die - shopt -u dotglob - chmod +x "${D}${destDir}"/eclipse - rm -f "${D}${destDir}"/libcairo-swt.so # use the system-installed SWT libraries - - ebegin 'Unbundling dependencies' - unbundle "${D}${destDir}" - eend - - # Install Gentoo wrapper and config - dobin "${FILESDIR}/${SLOT}/eclipse-${SLOT}" || die - insinto /etc - doins "${FILESDIR}/${SLOT}/eclipserc-${SLOT}" || die - - # Create desktop entry - make_desktop_entry "eclipse-${SLOT}" "Eclipse ${PV}" "${destDir}/icon.xpm" || die -} - -unbundle() { - pushd "${1}" > /dev/null || die - eclipse_unbundle-dir plugins/org.apache.ant_* ant-core,ant-nodeps lib - eclipse_unbundle-dir plugins/org.junit_* junit - eclipse_unbundle-dir plugins/org.junit4_* junit-4 - eclipse_unbundle-jar plugins/com.ibm.icu_*.jar icu4j-4 - eclipse_unbundle-jar plugins/com.jcraft.jsch_*.jar jsch - eclipse_unbundle-jar plugins/javax.servlet_*.jar tomcat-servlet-api-2.5 servlet-api - eclipse_unbundle-jar plugins/javax.servlet.jsp_*.jar tomcat-servlet-api-2.5 jsp-api - eclipse_unbundle-jar plugins/org.apache.commons.codec_*.jar commons-codec - eclipse_unbundle-jar plugins/org.apache.commons.el_*.jar commons-el - eclipse_unbundle-jar plugins/org.apache.commons.httpclient_*.jar commons-httpclient-3 - eclipse_unbundle-jar plugins/org.apache.commons.logging_*.jar commons-logging - #eclipse_unbundle-jar plugins/org.apache.jasper_*.jar tomcat-jasper - eclipse_unbundle-jar plugins/org.apache.lucene_*.jar lucene-1.9 - eclipse_unbundle-jar plugins/org.apache.lucene.analysis_*.jar lucene-analyzers-1.9 - eclipse_unbundle-jar plugins/org.eclipse.swt."${ws}.${os}.${arch}"_*.jar swt-${SLOT} - eclipse_unbundle-jar plugins/org.hamcrest.core_*.jar hamcrest-core - #eclipse_unbundle-jar plugins/org.mortbay.jetty_*.jar jetty - eclipse_unbundle-jar plugins/org.objectweb.asm_*.jar asm-3 - eclipse_unbundle-jar plugins/org.sat4j.core_*.jar sat4j-core-2 - eclipse_unbundle-jar plugins/org.sat4j.pb_*.jar sat4j-pseudo-2 - popd > /dev/null -} - -# Replaces the bundled jars in plugin dir ${1} with links to the jars from -# java-config package ${2}. If ${3} is given, the jars are linked in ${1}/${3}. -eclipse_unbundle-dir() { - local bundle=${1} package=${2} into=${3} - local basename=$(basename "${bundle}") - local barename=${basename%_*} - - if [[ -d "${bundle}" ]] ; then - einfo " ${barename} => ${package}" - - pushd "${bundle}" > /dev/null || die - local classpath=$(manifest_get META-INF/MANIFEST.MF 'Bundle-ClassPath') - manifest_delete META-INF/MANIFEST.MF 'Name\|SHA1-Digest' - rm -f ${classpath//,/ } META-INF/ECLIPSEF.{RSA,SF} - java-pkg_jar-from ${into:+--into "${into}"} "${package}" - popd > /dev/null - fi -} - -# Converts plugin jar ${1} into a plugin dir, creates symbolic links to the -# jars of java-config package ${2} in that dir, and updates artifacts.xml and -# bundles.info to reflect the fact that the plugin is now a dir. -eclipse_unbundle-jar() { - local bundle=${1} package=${2} jar=${3} - local basename=$(basename "${bundle}" .jar) - local barename=${basename%_*} - - if [[ -f "${bundle}" ]] ; then - einfo " ${barename} => ${package}" - - mkdir "${bundle%.jar}" - pushd "${bundle%.jar}" > /dev/null || die - "$(java-config --jar)" -xf "../${basename}.jar" plugin.properties META-INF/MANIFEST.MF || die - java-pkg_jar-from "${package}" ${jar:+"${jar}.jar"} - local classpath=$(find . -type l -name '*.jar' -print0 | tr '\0' ',') - classpath=${classpath%,} ; classpath=${classpath//.\/} - manifest_delete META-INF/MANIFEST.MF 'Name\|SHA1-Digest' - manifest_replace META-INF/MANIFEST.MF 'Bundle-ClassPath' "${classpath}" - popd > /dev/null || die - rm "${bundle}" - - sed_xml_element 'artifact' \ - -e '/id='\'"${barename//./\.}"\''/s|</artifact>| <repositoryProperties size='\'1\''>\n <property name='\'artifact.folder\'' value='\'true\''/>\n </repositoryProperties>\n \0|' \ - -i artifacts.xml || die - sed -e 's|'"${bundle//./\.}"'|'"${bundle%.jar}"'/|' \ - -i configuration/org.eclipse.equinox.simpleconfigurator/bundles.info || die - fi -} - -# Removes feature.xml references to plugins matching ${1}. -eclipse_delete-plugins() { - sed_xml_element 'includes\|plugin' -e '/id="'"${1}"'"/d' \ - -i "${buildDir}"/features/*/feature.xml "${S}"/eclipse-build-feature/feature.xml \ - || die 'eclipse_delete-plugins failed' -} - -# Prints the first value from manifest file ${1} whose key matches regex ${2}, -# unfolding as necessary. -manifest_get() { - sed -n -e '/^\('"${2}"'\): /{h;:A;$bB;n;/^ /!bB;H;bA};d;:B;g;s/^[^:]*: //;s/\n //g;p;q' "${1}" \ - || die 'manifest_get failed' -} - -# Deletes values from manifest file ${1} whose keys match regex ${2}, taking -# into account folding. -manifest_delete() { - sed -n -e ':A;/^\('"${2}"'\): /{:B;n;/^ /!{bA};bB};p' -i "${1}" \ - || die 'manifest_delete failed' -} - -# Replaces the value for key ${2} in the first section of manifest file ${1} -# with ${3}, or adds the key-value pair to that section if the key was absent. -manifest_replace() { - LC_ALL='C' awk -v key="${2}" -v val="${3}" ' -function fold(s, o, l, r) { - o = 2 ; l = length(s) - 1 ; r = substr(s, 1, 1) - while (l > 69) { r = r substr(s, o, 69) "\n " ; o += 69 ; l -= 69 } - return r substr(s, o) -} -BEGIN { FS = ": " } -f { print ; next } -i { if ($0 !~ "^ ") { f = 1 ; print } ; next } -$1 == key { print fold(key FS val) ; i = 1 ; next } -/^\r?$/ { print fold(key FS val) ; print ; f = 1 ; next } -{ print } -END { if (!f) { print fold(key FS val) } } -' "${1}" > "${1}-" && mv "${1}"{-,} || die 'manifest_replace failed' -} - -# Executes sed over each XML element with a name matching ${1}, rather than -# over each line. The entire element (and its children) may be removed with the -# 'd' command, or they may be edited using all the usual sed foo. Basically, -# the script argument will be executed only for elements matching ${1}, and the -# sed pattern space will consist of the entire element, including any nested -# elements. Note that this is not perfect and requires no more than one XML -# element per line to be reliable. -sed_xml_element() { - local elem="${1}" ; shift - sed -e '/<\('"${elem}"'\)\([> \t]\|$\)/{:_1;/>/!{N;b_1};/\/>/b_3' \ - -e ':_2;/<\/\('"${elem}"'\)>/!{N;b_2};b_3};b;:_3' "${@}" -} diff --git a/dev-util/eclipse-sdk/files/3.5/eclipse-3.5 b/dev-util/eclipse-sdk/files/3.5/eclipse-3.5 deleted file mode 100644 index f50a51ad629d..000000000000 --- a/dev-util/eclipse-sdk/files/3.5/eclipse-3.5 +++ /dev/null @@ -1,50 +0,0 @@ -#! /bin/sh -# -# Tiny startup wrapper for Eclipse -# -# Copyright (c) 2004, Karl Trygve Kalleberg <karltk@gentoo.org> -# Copyright (c) 2007-2008, Jean-Noël Rivasseau <elvanor@gentoo.org> -# Copyright (c) 2004-2008, Gentoo Foundation -# -# Licensed under the GNU General Public License, version 2 -# - -SLOT="3.5" - -[ -f "/etc/eclipserc-${SLOT}" ] && . "/etc/eclipserc-${SLOT}" -[ -f "$HOME/gentoo/.eclipserc" ] && . "$HOME/gentoo/.eclipserc" - -ECLIPSE_HOME=${ECLIPSE_HOME:="/usr/lib/eclipse-${SLOT}"} -ECLIPSE_BIN="${ECLIPSE_HOME}/eclipse" - -if [ ! -x "${ECLIPSE_BIN}" ] ; then - echo "Failed to find executable '${ECLIPSE_BIN}'" > /dev/stderr - exit 1 -fi - -if [ $(id -u) -eq 0 ] ; then - echo "Do not run eclipse as root user! Exiting ..." > /dev/stderr - exit 1 -fi - -case "$(java-config -f)" in - *gcj*) - export JAVA_PKG_CLASSMAP="${ECLIPSE_HOME}/eclipse.gcjdb" - ;; -esac - -eval $(gjl --package "swt-${SLOT}" --get-args) - -[ -n "${ECLIPSE_XMS}" ] && VM_ARGS="${VM_ARGS} -Xms${ECLIPSE_XMS}" -[ -n "${ECLIPSE_XMX}" ] && VM_ARGS="${VM_ARGS} -Xmx${ECLIPSE_XMX}" -[ -n "${ECLIPSE_PERMSIZE}" ] && VM_ARGS="${VM_ARGS} -XX:PermSize=${ECLIPSE_PERMSIZE}" -[ -n "${ECLIPSE_MAX_PERMSIZE}" ] && VM_ARGS="${VM_ARGS} -XX:MaxPermSize=${ECLIPSE_MAX_PERMSIZE}" - -# Fix for JRE 1.5. -export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/lib - -# Fix for >=x11-libs/gtk+-2.18.1 (not needed for Eclipse 3.6+) -# see https://bugs.eclipse.org/bugs/show_bug.cgi?id=291257 -export GDK_NATIVE_WINDOWS=true - -exec "${ECLIPSE_BIN}" -vm $(java-config --java) "$@" "${ECLIPSE_USER_ARGS}" -vmargs ${VM_ARGS} diff --git a/dev-util/eclipse-sdk/files/3.5/eclipserc-3.5 b/dev-util/eclipse-sdk/files/3.5/eclipserc-3.5 deleted file mode 100644 index 703b6491c463..000000000000 --- a/dev-util/eclipse-sdk/files/3.5/eclipserc-3.5 +++ /dev/null @@ -1,20 +0,0 @@ -# This file specifies some initial Eclipse settings, like memory allowed -# These settings only affect Eclipse startup and overall configuration -# Main Eclipse configuration should be done within Eclipse (with the GUI) - -# Following variables controls the minimal and maximum amounts of memory -# allocated to Eclipse (respectively). -# Increase those numbers if you get OutOfMemory errors. - -ECLIPSE_XMS=128m -ECLIPSE_XMX=256m - -# Following variables controls the minimal and maximum amounts of memory -# allocated to the permanent generation space. -# This space contains data related to all classes. -# Thus, if you use a lot of Eclipse plugins, it is recommended to uncomment -# these variables and even increase it, if you have enough RAM. -# Else you will get crashes related to OutOfMemory in PermGen exceptions. - -#ECLIPSE_PERMSIZE=64m -#ECLIPSE_MAX_PERMSIZE=128m
\ No newline at end of file diff --git a/dev-util/eclipse-sdk/files/3.5/gtk_makefile.patch b/dev-util/eclipse-sdk/files/3.5/gtk_makefile.patch deleted file mode 100644 index a9ab46e50588..000000000000 --- a/dev-util/eclipse-sdk/files/3.5/gtk_makefile.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- features/org.eclipse.equinox.executable/library/gtk/make_linux.mak.bak 2010-03-06 06:32:49.000000000 +1300 -+++ features/org.eclipse.equinox.executable/library/gtk/make_linux.mak 2010-03-06 06:33:31.000000000 +1300 -@@ -27,14 +27,14 @@ - PROGRAM_OUTPUT=eclipse - endif - --PROGRAM_LIBRARY=$(PROGRAM_OUTPUT)_$(LIB_VERSION).so -+PROGRAM_SONAME=$(PROGRAM_OUTPUT)_$(LIB_VERSION) -+PROGRAM_LIBRARY=$(PROGRAM_SONAME).so - - ifeq ($(DEFAULT_JAVA),) - DEFAULT_JAVA=DEFAULT_JAVA_JNI - endif - - # Define the object modules to be compiled and flags. --CC=gcc - MAIN_OBJS = eclipseMain.o - COMMON_OBJS = eclipseConfig.o eclipseCommon.o eclipseGtkCommon.o eclipseGtkInit.o - DLL_OBJS = eclipse.o eclipseGtk.o eclipseUtil.o eclipseJNI.o eclipseMozilla.o eclipseShm.o eclipseNix.o -@@ -44,8 +44,8 @@ - #LIBS = `pkg-config --libs-only-L gtk+-2.0` -lgtk-x11-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lgdk-x11-2.0 -lpthread -ldl - LIBS = -lpthread -ldl - GTK_LIBS = -DGTK_LIB="\"libgtk-x11-2.0.so.0\"" -DGDK_LIB="\"libgdk-x11-2.0.so.0\"" -DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" --LFLAGS = -shared -fpic -Wl,--export-dynamic --CFLAGS = -g -s -Wall\ -+LFLAGS = -shared -Wl,-soname=$(PROGRAM_SONAME) -fpic -Wl,--export-dynamic -+CFLAGS += -Wall\ - -fpic \ - -DLINUX \ - -DMOZILLA_FIX \ -@@ -95,10 +95,10 @@ - $(CC) $(CFLAGS) -c ../eclipseNix.c -o eclipseNix.o - - $(EXEC): $(MAIN_OBJS) $(COMMON_OBJS) -- $(CC) -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS) -+ $(CC) $(LDFLAGS) -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS) - - $(DLL): $(DLL_OBJS) $(COMMON_OBJS) -- $(CC) $(LFLAGS) -o $(DLL) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS) -+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(DLL) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS) - - install: all - cp $(EXEC) $(OUTPUT_DIR) diff --git a/dev-util/eclipse-sdk/files/3.5/hamcrest-junit-lib.patch b/dev-util/eclipse-sdk/files/3.5/hamcrest-junit-lib.patch deleted file mode 100644 index f76f540b9b5e..000000000000 --- a/dev-util/eclipse-sdk/files/3.5/hamcrest-junit-lib.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./plugins/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/buildpath/BuildPathSupport.java.old 2010-03-04 07:29:04.000000000 +1300 -+++ ./plugins/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/buildpath/BuildPathSupport.java 2010-03-04 07:29:28.000000000 +1300 -@@ -139,7 +139,7 @@ - "org.junit4", new VersionRange("[4.5.0,5.0.0)"), "junit.jar", "org.junit4.source", "junitsrc.zip", JUnitPreferencesConstants.JUNIT4_JAVADOC); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ - - private static final JUnitPluginDescription HAMCREST_CORE_PLUGIN= new JUnitPluginDescription( -- "org.hamcrest.core", new VersionRange("[1.1.0,2.0.0)"), null, "org.hamcrest.core.source", "source-bundle/", JUnitPreferencesConstants.HAMCREST_CORE_JAVADOC); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ -+ "org.hamcrest.core", new VersionRange("[1.1.0,2.0.0)"), "hamcrest-core.jar", "org.hamcrest.core.source", "source-bundle/", JUnitPreferencesConstants.HAMCREST_CORE_JAVADOC); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ - - /** - * @return the JUnit3 classpath container diff --git a/dev-util/eclipse-sdk/files/3.5/jvmarg.patch b/dev-util/eclipse-sdk/files/3.5/jvmarg.patch deleted file mode 100644 index 95ac7049038a..000000000000 --- a/dev-util/eclipse-sdk/files/3.5/jvmarg.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/build/eclipse-build-0_4_RC6/build.xml 2009-11-05 11:15:17.000000000 +0000 -+++ b/build/eclipse-build-0_4_RC6/build.xml 2010-01-07 22:29:17.000000000 +0000 -@@ -283,6 +283,7 @@ - <arg line="-Dbuilder=${buildConfig} " /> - <arg line="-DbuildDirectory=${buildDirectory} " /> - <arg line="-consolelog " /> -+ <jvmarg value="-Xmx512m"/> - </java> - <!-- - <ant antfile="build.xml" dir="${eclipse.pdebuild.scripts}"> diff --git a/dev-util/eclipse-sdk/metadata.xml b/dev-util/eclipse-sdk/metadata.xml deleted file mode 100644 index b5a96e3145bb..000000000000 --- a/dev-util/eclipse-sdk/metadata.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>java@gentoo.org</email> - <name>Java</name> - </maintainer> - <longdescription> -The Eclipse Project is an open source project of eclipse.org, overseen by -a Project Management Committee (PMC) and project leaders. The work is done -in subprojects working against a CVS repository. The Eclipse Project -Charter describes the organization of the project, roles and -responsibilities of the participants, and top level development process -for the project. The JDT and PDE are plug-in tools for the Eclipse -Platform. Together, these three pieces form the Eclipse SDK download, a -complete development environment for Eclipse-based tools, and for -developing Eclipse itself. -</longdescription> -</pkgmetadata> diff --git a/dev-util/exmap/Manifest b/dev-util/exmap/Manifest deleted file mode 100644 index a34a5b5dbe01..000000000000 --- a/dev-util/exmap/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST exmap-0.10.tgz 124620 SHA256 f6d5feffa53afa3e1321df91b127cdf403f7239076539eeef9aab665286c007c SHA512 ce9cd231ab8d726ea29f9ad1cccd505b00661290acfa6dadfe0bee756d706011cc7003ade011b106778eaa11d00b8b7b2eb094fb3666062faa063761f4622503 WHIRLPOOL 3cc45d74be4eee8d61993799d1f89ad7529b33c0dd979520b0f1160da75cd8477519fd3f4c904f6295f08d5d908a5ae61b6638f38a7624ab7e26496837fba34d diff --git a/dev-util/exmap/exmap-0.10-r1.ebuild b/dev-util/exmap/exmap-0.10-r1.ebuild deleted file mode 100644 index 4c25abe48413..000000000000 --- a/dev-util/exmap/exmap-0.10-r1.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=2 - -inherit eutils linux-mod - -DESCRIPTION="A memory analysis kernel module with userland tool" -HOMEPAGE="http://www.berthels.co.uk/exmap/" -SRC_URI="http://www.berthels.co.uk/${PN}/download/${P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="gtk" - -RDEPEND="dev-libs/libpcre - gtk? ( dev-cpp/gtkmm:2.4 - x11-libs/gtk+:2 )" -DEPEND="${RDEPEND} - dev-libs/boost - virtual/pkgconfig" - -MODULE_NAMES="exmap(misc:${S}/kernel)" -BUILD_TARGETS="clean kernel_modules" - -src_prepare() { - # patch find_task_by_pid to pid_task and &proc_root to NULL - epatch "${FILESDIR}/${P}-kernel.patch" - - # use $(MAKE), remove -g on CXXFLAGS, clean up CXX/LD invocations - # remove -Werror, bug 468246 - epatch "${FILESDIR}/${PF}-makefiles.patch" - - # somthing strange between linux-mod supplied ARCH and old kernels - # which leads to arch/x86/Makefile: file/dir x86 not found - if kernel_is lt 2 6 25 ; then - sed -i -e 's:\$(MAKE):unset ARCH ; \$(MAKE):' kernel/Makefile || die - fi - - # new gcc include behavior - epatch "${FILESDIR}/${P}-gcc.patch" - - # gcc4.5 fails on return false as std::string - epatch "${FILESDIR}/${P}-gcc45.patch" - - # fix for 64bit from http://www.kdedevelopers.org/node/4166 - epatch "${FILESDIR}/${P}-fix64bit.patch" - - # fix underlinking with -Wl,--as-needed - epatch "${FILESDIR}/${P}-as-needed.patch" - - # no longer call make clean in kernel source dir - epatch "${FILESDIR}/${P}-kernel-3.5.patch" - - rm -v src/{*.so,munged-ls-threeloads,prelinked-amule} || die -} - -src_compile() { - export KERNEL_DIR - linux-mod_src_compile - - emake CXX="$(tc-getCXX)" LD="$(tc-getLD)" -C jutil || die - emake CXX="$(tc-getCXX)" LD="$(tc-getLD)" -C src $(use gtk || echo exmtool) || die -} - -src_install() { - linux-mod_src_install - - dobin src/exmtool || die - use gtk && { dobin src/gexmap || die ; } - dodoc TODO README || die -} - -pkg_postinst() { - linux-mod_pkg_postinst - - elog "Please load the exmap kernel module before running exmtool or gexmap." -} diff --git a/dev-util/exmap/exmap-0.10.ebuild b/dev-util/exmap/exmap-0.10.ebuild deleted file mode 100644 index 1ee0349cf09e..000000000000 --- a/dev-util/exmap/exmap-0.10.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=2 - -inherit eutils linux-mod - -DESCRIPTION="A memory analysis kernel module with userland tool" -HOMEPAGE="http://www.berthels.co.uk/exmap/" -SRC_URI="http://www.berthels.co.uk/${PN}/download/${P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="gtk" - -RDEPEND="dev-libs/libpcre - gtk? ( dev-cpp/gtkmm:2.4 - x11-libs/gtk+:2 )" -DEPEND="${RDEPEND} - dev-libs/boost - virtual/pkgconfig" - -MODULE_NAMES="exmap(misc:${S}/kernel)" -BUILD_TARGETS="clean kernel_modules" - -src_prepare() { - # patch find_task_by_pid to pid_task and &proc_root to NULL - epatch "${FILESDIR}/${P}-kernel.patch" - - # use $(MAKE), remove -g on CXXFLAGS, clean up CXX/LD invocations - epatch "${FILESDIR}/${P}-makefiles.patch" - - # somthing strange between linux-mod supplied ARCH and old kernels - # which leads to arch/x86/Makefile: file/dir x86 not found - if kernel_is lt 2 6 25 ; then - sed -i -e 's:\$(MAKE):unset ARCH ; \$(MAKE):' kernel/Makefile || die - fi - - # new gcc include behavior - epatch "${FILESDIR}/${P}-gcc.patch" - - # gcc4.5 fails on return false as std::string - epatch "${FILESDIR}/${P}-gcc45.patch" - - # fix for 64bit from http://www.kdedevelopers.org/node/4166 - epatch "${FILESDIR}/${P}-fix64bit.patch" - - # fix underlinking with -Wl,--as-needed - epatch "${FILESDIR}/${P}-as-needed.patch" - - # no longer call make clean in kernel source dir - epatch "${FILESDIR}/${P}-kernel-3.5.patch" - - rm -v src/{*.so,munged-ls-threeloads,prelinked-amule} || die -} - -src_compile() { - export KERNEL_DIR - linux-mod_src_compile - - emake CXX="$(tc-getCXX)" LD="$(tc-getLD)" -C jutil || die - emake CXX="$(tc-getCXX)" LD="$(tc-getLD)" -C src $(use gtk || echo exmtool) || die -} - -src_install() { - linux-mod_src_install - - dobin src/exmtool || die - use gtk && { dobin src/gexmap || die ; } - dodoc TODO README || die -} - -pkg_postinst() { - linux-mod_pkg_postinst - - elog "Please load the exmap kernel module before running exmtool or gexmap." -} diff --git a/dev-util/exmap/files/exmap-0.10-as-needed.patch b/dev-util/exmap/files/exmap-0.10-as-needed.patch deleted file mode 100644 index 72671b31fc70..000000000000 --- a/dev-util/exmap/files/exmap-0.10-as-needed.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- src/Makefile 2010-08-09 01:17:29.000000000 +0200 -+++ src/Makefile 2010-08-09 01:21:13.000000000 +0200 -@@ -42,15 +42,15 @@ - OBJS += $(TR_OBJ) - TESTS += t_range - --TE_OBJ = t_elf.o Elf.o Range.o -+TE_OBJ = t_elf.o Elf.o Range.o ../jutil/Pcre.o - OBJS += $(TE_OBJ) - TESTS += t_elf - --TP_OBJ = t_pcre.o -+TP_OBJ = t_pcre.o ../jutil/Pcre.o - OBJS += $(TP_OBJ) - TESTS += t_pcre - --TX_OBJ = t_exmap.o $(EXMAP_OBJ) -+TX_OBJ = t_exmap.o ../jutil/Pcre.o $(EXMAP_OBJ) - OBJS += $(TX_OBJ) - TESTS += t_exmap - diff --git a/dev-util/exmap/files/exmap-0.10-fix64bit.patch b/dev-util/exmap/files/exmap-0.10-fix64bit.patch deleted file mode 100644 index 8f886f1fe9a7..000000000000 --- a/dev-util/exmap/files/exmap-0.10-fix64bit.patch +++ /dev/null @@ -1,24 +0,0 @@ -I quite frankly don't entirely understand this code, but exmap's debug -output on i586 and x86_64 pointed out these differences and this makes -it work. - ---- exmap-0.10/src/Exmap.cpp.sav 2006-09-28 18:52:25.000000000 +0200 -+++ exmap-0.10/src/Exmap.cpp 2010-01-02 17:45:49.787955568 +0100 -@@ -450,7 +450,7 @@ void Vma::add_pages(const list<Page> &pa - - bool Vma::is_vdso() - { -- return fname() == "[vdso]"; -+ return fname() == "[vdso]" || fname() == "[vsyscall]"; - } - - bool Vma::is_file_backed() -@@ -1495,7 +1495,7 @@ bool MapCalculator::calc_map_for_seg(con - - filevmas.pop_front(); - dbg << pref.str() << "consuming vma\n"; -- if (!filevmas.empty() && !filevmas.front()->is_file_backed()) { -+ while (!filevmas.empty() && !filevmas.front()->is_file_backed()) { - filevmas.pop_front(); - dbg << pref.str() << "consuming anon vma\n"; - } diff --git a/dev-util/exmap/files/exmap-0.10-gcc.patch b/dev-util/exmap/files/exmap-0.10-gcc.patch deleted file mode 100644 index fd73371529bc..000000000000 --- a/dev-util/exmap/files/exmap-0.10-gcc.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff -ru exmap-0.10/work/exmap-0.10/jutil/jutil.cpp exm/work/exmap-0.10/jutil/jutil.cpp ---- jutil/jutil.cpp 2006-09-28 18:52:25.000000000 +0200 -+++ jutil/jutil.cpp 2010-02-15 15:35:43.000000000 +0100 -@@ -3,6 +3,7 @@ - #include <sys/types.h> - #include <sys/stat.h> - #include <unistd.h> -+#include <cstring> - #include <limits.h> - #include <dirent.h> - -diff -ru exmap-0.10/work/exmap-0.10/jutil/jutil.hpp exm/work/exmap-0.10/jutil/jutil.hpp ---- jutil/jutil.hpp 2006-09-28 18:52:25.000000000 +0200 -+++ jutil/jutil.hpp 2010-02-15 15:40:02.000000000 +0100 -@@ -3,6 +3,7 @@ - - #include <iostream> - #include <string> -+#include <cstdlib> - #include <list> - #include <map> - -diff -ru exmap-0.10/work/exmap-0.10/src/exmtool.cpp exm/work/exmap-0.10/src/exmtool.cpp ---- src/exmtool.cpp 2006-09-28 18:52:25.000000000 +0200 -+++ src/exmtool.cpp 2010-02-15 15:34:04.000000000 +0100 -@@ -5,6 +5,7 @@ - - #include <sstream> - #include <iostream> -+#include <cstring> - #include <vector> - - using namespace std; -@@ -19,9 +18,9 @@ - - struct command - { -- char *command; -+ const char *command; - Handler handler; -- char *usage; -+ const char *usage; - } cmd_handles[] = { - { "procs", - do_procs, - -diff -ru exmap-0.10/work/exmap-0.10/src/Elf.cpp norg/work/exmap-0.10/src/Elf.cpp ---- src/Elf.cpp 2006-09-28 18:52:25.000000000 +0200 -+++ src/Elf.cpp 2010-02-15 16:55:37.000000000 +0100 -@@ -4,6 +4,7 @@ - #include "Elf.hpp" - - #include <sstream> -+#include <cstring> - #include <unistd.h> // getpagesize() - - using namespace std; - -diff -ru exmap-0.10/jutil/TestRunner.cpp.orig exmap-0.10/jutil/TestRunner.cpp ---- jutil/TestRunner.cpp.orig 2010-02-15 22:00:03.000000000 +0100 -+++ jutil/TestRunner.cpp 2010-02-15 22:00:19.000000000 +0100 -@@ -1,5 +1,6 @@ - #include "TestRunner.hpp" - #include "Pcre.hpp" -+#include <cstdio> - - using namespace std; - diff --git a/dev-util/exmap/files/exmap-0.10-gcc45.patch b/dev-util/exmap/files/exmap-0.10-gcc45.patch deleted file mode 100644 index a9ed3419e774..000000000000 --- a/dev-util/exmap/files/exmap-0.10-gcc45.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Elf.cpp 2010-05-14 01:40:27.000000000 +0200 -+++ src/Elf.cpp 2010-05-14 01:46:06.000000000 +0200 -@@ -579,7 +579,7 @@ - std::string Section::find_string(istream &is, int index) - { - if (!is_string_table() || index < 0) { -- return false; -+ return NULL; - } - - int offset = _sectstruct->offset() + index; diff --git a/dev-util/exmap/files/exmap-0.10-kernel-3.5.patch b/dev-util/exmap/files/exmap-0.10-kernel-3.5.patch deleted file mode 100644 index 314f0fc3301f..000000000000 --- a/dev-util/exmap/files/exmap-0.10-kernel-3.5.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- exmap-0.10/kernel/Makefile -+++ exmap-0.10/kernel/Makefile -@@ -10,4 +10,4 @@ - $(MAKE) -C ${KERNEL_DIR} M=$(CURDIR) modules - - clean: -- $(MAKE) -C ${KERNEL_DIR} M=$(CURDIR) clean -+ #$(MAKE) -C ${KERNEL_DIR} M=$(CURDIR) clean diff --git a/dev-util/exmap/files/exmap-0.10-kernel.patch b/dev-util/exmap/files/exmap-0.10-kernel.patch deleted file mode 100644 index 8bc58737b6d5..000000000000 --- a/dev-util/exmap/files/exmap-0.10-kernel.patch +++ /dev/null @@ -1,50 +0,0 @@ -Tested with linux-2.6.16-gentoo-r13, linux-2.6.25-gentoo-r9, linux-2.6.26-gentoo-r4, linux-2.6.27-gentoo-r10, -linux-2.6.28-gentoo-r6, linux-2.6.29-gentoo-r6, linux-2.6.30-gentoo-r9, linux-2.6.32-gentoo-r4, linux-2.6.32-gentoo-r5 - -diff -ru exmap-0.10.orig/work/exmap-0.10/kernel/exmap.c exmap-0.10/work/exmap-0.10/kernel/exmap.c ---- kernel/exmap.c 2006-09-28 18:52:25.000000000 +0200 -+++ kernel/exmap.c 2010-02-17 16:15:04.000000000 +0100 -@@ -392,7 +392,11 @@ - struct task_struct *tsk; - int errcode = -EINVAL; - -+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27) -+ tsk = pid_task(find_pid_ns(pid, &init_pid_ns), PIDTYPE_PID); -+ #else - tsk = find_task_by_pid(pid); -+ #endif - if (tsk == NULL) { - printk (KERN_ALERT - "/proc/%s: can't find task for pid %d\n", -@@ -507,7 +511,11 @@ - NULL); - - if (exmap_proc_file == NULL) { -+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) -+ remove_proc_entry (PROCFS_NAME, NULL); -+ #else - remove_proc_entry (PROCFS_NAME, &proc_root); -+ #endif - printk (KERN_ALERT "/proc/%s: could not initialize\n", - PROCFS_NAME); - return -ENOMEM; -@@ -523,7 +523,9 @@ - - exmap_proc_file->read_proc = procfile_read; - exmap_proc_file->write_proc = procfile_write; -+ #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,29) - exmap_proc_file->owner = THIS_MODULE; -+ #endif - - /* exmap_proc_file->mode = S_IFREG | S_IRUGO; */ - /* TODO - this is quite probably a security problem */ -@@ -532,5 +540,9 @@ - void cleanup_module () - { - printk (KERN_INFO "/proc/%s: remove\n", PROCFS_NAME); -+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) -+ remove_proc_entry (PROCFS_NAME, NULL); -+ #else - remove_proc_entry (PROCFS_NAME, &proc_root); -+ #endif - } diff --git a/dev-util/exmap/files/exmap-0.10-makefiles.patch b/dev-util/exmap/files/exmap-0.10-makefiles.patch deleted file mode 100644 index e3841c60566d..000000000000 --- a/dev-util/exmap/files/exmap-0.10-makefiles.patch +++ /dev/null @@ -1,115 +0,0 @@ -diff -ru exmap-0.10.orig/work/exmap-0.10/jutil/Makefile exmap-0.10/work/exmap-0.10/jutil/Makefile ---- jutil/Makefile 2006-09-28 18:52:25.000000000 +0200 -+++ jutil/Makefile 2010-02-17 17:31:56.000000000 +0100 -@@ -12,21 +12,20 @@ - OBJ += $(ETOBJ) - EXES += egtest - --CXX=g++ --CXXFLAGS=-Wall -Werror -g -I. --LD=g++ --LDFLAGS=-lpcre -+CXX = g++ -+CXXFLAGS += -Wall -Werror -I. -+LD = ld - - build: $(LIBS) $(EXES) - - trun: $(TROBJ) $(JLIB) -- $(LD) $(TROBJ) -o trun $(LDFLAGS) -ljutil -L. -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(TROBJ) -o trun -ljutil -lpcre -L. - - $(JLIB): $(JOBJ) - ar rs $(JLIB) $(JOBJ) - - egtest: $(ETOBJ) -- $(LD) $(ETOBJ) -o egtest $(LDFLAGS) -+ $(CXX) $(CXXFLAGS) $(ETOBJ) -o egtest $(LDFLAGS) - - clean: - rm -f $(OBJ) $(EXES) $(JLIB) *~ -diff -ru exmap-0.10.orig/work/exmap-0.10/kernel/Makefile exmap-0.10/work/exmap-0.10/kernel/Makefile ---- kernel/Makefile 2006-09-28 18:52:25.000000000 +0200 -+++ kernel/Makefile 2010-02-17 17:30:06.000000000 +0100 -@@ -7,7 +7,7 @@ - build: kernel_modules - - kernel_modules: -- make -C /lib/modules/$(shell uname -r)/build M=$(CURDIR) modules -+ $(MAKE) -C ${KERNEL_DIR} M=$(CURDIR) modules - - clean: -- make -C /lib/modules/$(shell uname -r)/build M=$(CURDIR) clean -+ $(MAKE) -C ${KERNEL_DIR} M=$(CURDIR) clean -Only in exmap-0.10/work/exmap-0.10/kernel/.tmp_versions: exmap.mod -diff -ru exmap-0.10.orig/work/exmap-0.10/src/Makefile exmap-0.10/work/exmap-0.10/src/Makefile ---- src/Makefile 2006-09-28 18:52:25.000000000 +0200 -+++ src/Makefile 2010-02-17 17:33:38.000000000 +0100 -@@ -1,5 +1,5 @@ - CXX=g++ --LD=g++ -+LD=ld - JUTILDIR=../jutil - - #CXXFLAGS += -pg -@@ -11,11 +11,12 @@ - - EXMAP_OBJ=Exmap.o Range.o Elf.o - --CXXFLAGS += -g -Wall -Werror -I$(JUTILDIR) --LDFLAGS += -lpcre -ljutil -L$(JUTILDIR) -+CXXFLAGS += -Wall -Werror -I$(JUTILDIR) -+LDFLAGS += -L$(JUTILDIR) -+LIBS += -lpcre -ljutil - - GTKCXXFLAGS = `pkg-config --cflags gtkmm-2.4` --GTKLDFLAGS = `pkg-config --libs gtkmm-2.4` -+GTKLIBS = `pkg-config --libs gtkmm-2.4` - - # ------------------------------------------------------------ - -@@ -76,34 +77,34 @@ - $(JUTILDIR)/trun $(TESTS) - - gexmap: $(GEM_OBJ) -- $(LD) -o gexmap $(GEM_OBJ) $(LDFLAGS) $(GTKLDFLAGS) -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o gexmap $(GEM_OBJ) $(LIBS) $(GTKLIBS) - - gexmap.o: gexmap.cpp -- $(CC) $(CXXFLAGS) $(GTKCXXFLAGS) -c $< -+ $(CXX) $(CXXFLAGS) $(GTKCXXFLAGS) -c $< - - exmtool: $(CL_OBJ) -- $(LD) -o exmtool $(CL_OBJ) $(LDFLAGS) -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o exmtool $(CL_OBJ) $(LIBS) - - elftool: $(ET_OBJ) -- $(LD) -o elftool $(ET_OBJ) $(LDFLAGS) -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o elftool $(ET_OBJ) $(LIBS) - - showproc: $(SP_OBJ) -- $(LD) -o showproc $(SP_OBJ) $(LDFLAGS) -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o showproc $(SP_OBJ) $(LIBS) - - t_range: $(TR_OBJ) -- $(LD) -o t_range $(TR_OBJ) $(LDFLAGS) -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o t_range $(TR_OBJ) $(LIBS) - - t_elf: $(TE_OBJ) -- $(LD) -o t_elf $(TE_OBJ) $(LDFLAGS) -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o t_elf $(TE_OBJ) $(LIBS) - - t_pcre: $(TP_OBJ) -- $(LD) -o t_pcre $(TP_OBJ) $(LDFLAGS) -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o t_pcre $(TP_OBJ) $(LIBS) - - t_exmap: $(TX_OBJ) -- $(LD) -o t_exmap $(TX_OBJ) $(LDFLAGS) -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o t_exmap $(TX_OBJ) $(LIBS) - - t_artsd: $(TA_OBJ) -- $(LD) -o t_artsd $(TA_OBJ) $(LDFLAGS) -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o t_artsd $(TA_OBJ) $(LIBS) - - clean: cleantags cleandoc - rm -f $(OBJS) $(EXES) $(SHLIBS) $(EXTRA_DEL_FILES) diff --git a/dev-util/exmap/files/exmap-0.10-r1-makefiles.patch b/dev-util/exmap/files/exmap-0.10-r1-makefiles.patch deleted file mode 100644 index 4c971454bc74..000000000000 --- a/dev-util/exmap/files/exmap-0.10-r1-makefiles.patch +++ /dev/null @@ -1,115 +0,0 @@ -diff -ru exmap-0.10.orig/work/exmap-0.10/jutil/Makefile exmap-0.10/work/exmap-0.10/jutil/Makefile ---- jutil/Makefile 2006-09-28 18:52:25.000000000 +0200 -+++ jutil/Makefile 2010-02-17 17:31:56.000000000 +0100 -@@ -12,21 +12,20 @@ - OBJ += $(ETOBJ) - EXES += egtest - --CXX=g++ --CXXFLAGS=-Wall -Werror -g -I. --LD=g++ --LDFLAGS=-lpcre -+CXX = g++ -+CXXFLAGS += -Wall -I. -+LD = ld - - build: $(LIBS) $(EXES) - - trun: $(TROBJ) $(JLIB) -- $(LD) $(TROBJ) -o trun $(LDFLAGS) -ljutil -L. -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(TROBJ) -o trun -ljutil -lpcre -L. - - $(JLIB): $(JOBJ) - ar rs $(JLIB) $(JOBJ) - - egtest: $(ETOBJ) -- $(LD) $(ETOBJ) -o egtest $(LDFLAGS) -+ $(CXX) $(CXXFLAGS) $(ETOBJ) -o egtest $(LDFLAGS) - - clean: - rm -f $(OBJ) $(EXES) $(JLIB) *~ -diff -ru exmap-0.10.orig/work/exmap-0.10/kernel/Makefile exmap-0.10/work/exmap-0.10/kernel/Makefile ---- kernel/Makefile 2006-09-28 18:52:25.000000000 +0200 -+++ kernel/Makefile 2010-02-17 17:30:06.000000000 +0100 -@@ -7,7 +7,7 @@ - build: kernel_modules - - kernel_modules: -- make -C /lib/modules/$(shell uname -r)/build M=$(CURDIR) modules -+ $(MAKE) -C ${KERNEL_DIR} M=$(CURDIR) modules - - clean: -- make -C /lib/modules/$(shell uname -r)/build M=$(CURDIR) clean -+ $(MAKE) -C ${KERNEL_DIR} M=$(CURDIR) clean -Only in exmap-0.10/work/exmap-0.10/kernel/.tmp_versions: exmap.mod -diff -ru exmap-0.10.orig/work/exmap-0.10/src/Makefile exmap-0.10/work/exmap-0.10/src/Makefile ---- src/Makefile 2006-09-28 18:52:25.000000000 +0200 -+++ src/Makefile 2010-02-17 17:33:38.000000000 +0100 -@@ -1,5 +1,5 @@ - CXX=g++ --LD=g++ -+LD=ld - JUTILDIR=../jutil - - #CXXFLAGS += -pg -@@ -11,11 +11,12 @@ - - EXMAP_OBJ=Exmap.o Range.o Elf.o - --CXXFLAGS += -g -Wall -Werror -I$(JUTILDIR) --LDFLAGS += -lpcre -ljutil -L$(JUTILDIR) -+CXXFLAGS += -Wall -I$(JUTILDIR) -+LDFLAGS += -L$(JUTILDIR) -+LIBS += -lpcre -ljutil - - GTKCXXFLAGS = `pkg-config --cflags gtkmm-2.4` --GTKLDFLAGS = `pkg-config --libs gtkmm-2.4` -+GTKLIBS = `pkg-config --libs gtkmm-2.4` - - # ------------------------------------------------------------ - -@@ -76,34 +77,34 @@ - $(JUTILDIR)/trun $(TESTS) - - gexmap: $(GEM_OBJ) -- $(LD) -o gexmap $(GEM_OBJ) $(LDFLAGS) $(GTKLDFLAGS) -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o gexmap $(GEM_OBJ) $(LIBS) $(GTKLIBS) - - gexmap.o: gexmap.cpp -- $(CC) $(CXXFLAGS) $(GTKCXXFLAGS) -c $< -+ $(CXX) $(CXXFLAGS) $(GTKCXXFLAGS) -c $< - - exmtool: $(CL_OBJ) -- $(LD) -o exmtool $(CL_OBJ) $(LDFLAGS) -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o exmtool $(CL_OBJ) $(LIBS) - - elftool: $(ET_OBJ) -- $(LD) -o elftool $(ET_OBJ) $(LDFLAGS) -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o elftool $(ET_OBJ) $(LIBS) - - showproc: $(SP_OBJ) -- $(LD) -o showproc $(SP_OBJ) $(LDFLAGS) -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o showproc $(SP_OBJ) $(LIBS) - - t_range: $(TR_OBJ) -- $(LD) -o t_range $(TR_OBJ) $(LDFLAGS) -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o t_range $(TR_OBJ) $(LIBS) - - t_elf: $(TE_OBJ) -- $(LD) -o t_elf $(TE_OBJ) $(LDFLAGS) -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o t_elf $(TE_OBJ) $(LIBS) - - t_pcre: $(TP_OBJ) -- $(LD) -o t_pcre $(TP_OBJ) $(LDFLAGS) -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o t_pcre $(TP_OBJ) $(LIBS) - - t_exmap: $(TX_OBJ) -- $(LD) -o t_exmap $(TX_OBJ) $(LDFLAGS) -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o t_exmap $(TX_OBJ) $(LIBS) - - t_artsd: $(TA_OBJ) -- $(LD) -o t_artsd $(TA_OBJ) $(LDFLAGS) -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o t_artsd $(TA_OBJ) $(LIBS) - - clean: cleantags cleandoc - rm -f $(OBJS) $(EXES) $(SHLIBS) $(EXTRA_DEL_FILES) diff --git a/dev-util/exmap/metadata.xml b/dev-util/exmap/metadata.xml deleted file mode 100644 index a535b8852829..000000000000 --- a/dev-util/exmap/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="person"> -<email>xmw@gentoo.org</email> -<name>Michael Weber</name> -</maintainer> -</pkgmetadata> diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.46.2.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.46.2.ebuild index 1e93e9ac4eba..67f9bc2bab72 100644 --- a/dev-util/gdbus-codegen/gdbus-codegen-2.46.2.ebuild +++ b/dev-util/gdbus-codegen/gdbus-codegen-2.46.2.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="http://www.gtk.org/" LICENSE="LGPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos" IUSE="" RDEPEND="${PYTHON_DEPS}" diff --git a/dev-util/gnome-devel-docs/gnome-devel-docs-3.18.1.ebuild b/dev-util/gnome-devel-docs/gnome-devel-docs-3.18.1.ebuild index f144b2ff7123..1671e1d3121d 100644 --- a/dev-util/gnome-devel-docs/gnome-devel-docs-3.18.1.ebuild +++ b/dev-util/gnome-devel-docs/gnome-devel-docs-3.18.1.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://developer.gnome.org/" LICENSE="FDL-1.1+ CC-BY-SA-3.0 CC-BY-SA-4.0" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc ~x86" IUSE="" RDEPEND="" diff --git a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.29.ebuild b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.29.ebuild index dc8003219c83..e61fe6c77e24 100644 --- a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.29.ebuild +++ b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.29.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="http://www.gtk.org/" LICENSE="LGPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.18.4.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.18.4.ebuild index cd3f82a3e6dc..60ba2221de59 100644 --- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.18.4.ebuild +++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.18.4.ebuild @@ -15,7 +15,7 @@ LICENSE="LGPL-2+" SLOT="0" IUSE="" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" RDEPEND=" >=dev-libs/glib-2.45.8:2 diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest index d51d433743d2..d3a66eeef35c 100644 --- a/dev-util/jenkins-bin/Manifest +++ b/dev-util/jenkins-bin/Manifest @@ -1,4 +1,4 @@ DIST jenkins-bin-1.625.3.war 63322455 SHA256 9964b10581414b5504921dd8a717b172c07bcdf5f9d1bae50595aca07ddacf20 SHA512 daa739c902d417949dd348780fe4c3d088d64917231273083638bbfe87a47c69007669298175d5bc60623aa7bb6c3ce19c250764b6108ae026e0622d968a3b26 WHIRLPOOL da0e99183bb22ef4b1475acd840c67c3d0e2cc2f3d998340ea0d6cbb0ce4cc4e26d60871d65aaf08d9af0026b51152274640c485592e6cb36cd95813848eddc6 DIST jenkins-bin-1.642.1.war 63664516 SHA256 ce036e227fe1fed15e3da9be8d29e859bdcda7118895fd269d1c9ac35925de66 SHA512 1fa79b6029078d8a8c0996b63dc7c411f9a56037257dbb3080e07559cb949af819f6245846b5c586ba7c9a61d5a25137d3c2d9c91a7a63fe2b4f3358d7c439c2 WHIRLPOOL 2b54f22895f7de1ced34bd99a03d37b4f06211e6dd5bdd56ac49eff2b010797f82f4d67f2a2b051feb2eba08f5eb87ca7223c46a75c690588361eb11aa007d62 -DIST jenkins-bin-1.646.war 63352963 SHA256 2b892d363e1ce88e4d3a37e7d5c17c0be5bce902b3b98e6e0ebfe0d2d509f2d4 SHA512 b67f0dc90b8f58fed51490e850a4cf281e20501fefe42c4293d7721f8b658c210463f62d1acd72d8d5bc172616e6435f1633c52ccda35f8f16886581abea70c3 WHIRLPOOL 2be58f37ebd1e2928d403524b27adac788918a58c5261ef564051c2efc57372e2e89366321aa6f6e39906ebe70eb29b49910a65c318efaa90d1b4ca94d666d6d DIST jenkins-bin-1.647.war 63359416 SHA256 52778609d34cb532c934509bb2a63c77986ae8e9b7e85186bad0235f58e4200f SHA512 cf8130453b52a19d6fa1f54a6676496f7d3ffe2a0793fe2b95ecb9296ab0bae831aebb5d3af81d8e7ee5c51e0942f315ba3c720be09e31e6c0d7e1a972bb6c29 WHIRLPOOL 4c4e388fc6909608f340d9e3eb6c379d228193b9f00d2875d096b0d938bbe14af2c3cab0285510b45ee3d1ed048dbf1a07b6f39279077fc91f5516d356b8080c +DIST jenkins-bin-1.649.war 64590491 SHA256 ca270b2a7e3d8927e7765e516c7cff9b90a85c7a3010d632f8f3b96a5acb9b82 SHA512 5480692cdb2efd94ea6c6f5f56909f69b2b0be7d794dd7e8860a2e31a650992aa63ffbdc67686dfd7cb484d07766227151dc40b8729340d5a07daa461216b57c WHIRLPOOL 5828194b863d64cd2d80c30306622479347846f56b517d2df3ccc26ba1b37861ecf2e98b10196d2e62f1f6764015376802cbb04bd8a70dd0aa8cff29d40e6fa8 diff --git a/dev-util/jenkins-bin/jenkins-bin-1.646.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.649.ebuild index 96dfaf75f07d..96dfaf75f07d 100644 --- a/dev-util/jenkins-bin/jenkins-bin-1.646.ebuild +++ b/dev-util/jenkins-bin/jenkins-bin-1.649.ebuild diff --git a/dev-util/ltrace/files/ltrace-0.7.3-test-protos.patch b/dev-util/ltrace/files/ltrace-0.7.3-test-protos.patch new file mode 100644 index 000000000000..caafff4b2637 --- /dev/null +++ b/dev-util/ltrace/files/ltrace-0.7.3-test-protos.patch @@ -0,0 +1,71 @@ +https://bugs.gentoo.org/421649 + +For some reason testsuite does not handle warnings well: + /tmp/lt-cZI2cFo0z7.c:2:24: warning: inplicit function declaration «puts» [-Wimplicit-function-declaration] + void func2(void) { puts("func2"); } + ^ +and abandons problematic tests: + Testcase compile failed, so all tests in this file will automatically fail. +diff --git a/testsuite/ltrace.main/filters.exp b/testsuite/ltrace.main/filters.exp +index 988346f..f7f4140 100644 +--- a/testsuite/ltrace.main/filters.exp ++++ b/testsuite/ltrace.main/filters.exp +@@ -24,2 +24,3 @@ set libfilt1 [ltraceCompile libfilt1.so [ltraceSource c { + set libfilt2 [ltraceCompile libfilt2.so [ltraceSource c { ++ #include <stdio.h> + void func2(void) { puts("func2"); } +diff --git a/testsuite/ltrace.main/parameters.c b/testsuite/ltrace.main/parameters.c +index ff24a38..9569dbe 100644 +--- a/testsuite/ltrace.main/parameters.c ++++ b/testsuite/ltrace.main/parameters.c +@@ -19,2 +19,3 @@ void func_strfixed(char*); + void func_ppp(int***); ++void func_string(char*); + void func_stringp(char**); +diff --git a/testsuite/ltrace.main/signals.c b/testsuite/ltrace.main/signals.c +index a02e795..fda4ab9 100644 +--- a/testsuite/ltrace.main/signals.c ++++ b/testsuite/ltrace.main/signals.c +@@ -7,2 +7,3 @@ + #include <sys/types.h> ++#include <unistd.h> + +diff --git a/testsuite/ltrace.minor/time-record.c b/testsuite/ltrace.minor/time-record.c +index a66b838..7d5e5e3 100644 +--- a/testsuite/ltrace.minor/time-record.c ++++ b/testsuite/ltrace.minor/time-record.c +@@ -7,2 +7,3 @@ + #include <time.h> ++#include <unistd.h> + +diff --git a/testsuite/ltrace.minor/trace-clone.c b/testsuite/ltrace.minor/trace-clone.c +index db1936d..c68b128 100644 +--- a/testsuite/ltrace.minor/trace-clone.c ++++ b/testsuite/ltrace.minor/trace-clone.c +@@ -10,2 +10,3 @@ + #include <sched.h> ++#include <unistd.h> + +diff --git a/testsuite/ltrace.minor/trace-fork.c b/testsuite/ltrace.minor/trace-fork.c +index c5f0c71..e1ab17f 100644 +--- a/testsuite/ltrace.minor/trace-fork.c ++++ b/testsuite/ltrace.minor/trace-fork.c +@@ -8,2 +8,4 @@ + #include <sys/types.h> ++#include <sys/wait.h> ++#include <unistd.h> + +@@ -29,3 +31,4 @@ main () + printf("My child pid is %d\n",pid); +- wait(); ++ int status; ++ wait(&status); + } +diff --git a/testsuite/ltrace.torture/signals.c b/testsuite/ltrace.torture/signals.c +index b786c81..86e2dba 100644 +--- a/testsuite/ltrace.torture/signals.c ++++ b/testsuite/ltrace.torture/signals.c +@@ -7,2 +7,3 @@ + #include <sys/types.h> ++#include <unistd.h> + diff --git a/dev-util/ltrace/ltrace-0.7.3_p4.ebuild b/dev-util/ltrace/ltrace-0.7.3_p4.ebuild index 8611887d3264..cb60e0efbea2 100644 --- a/dev-util/ltrace/ltrace-0.7.3_p4.ebuild +++ b/dev-util/ltrace/ltrace-0.7.3_p4.ebuild @@ -30,6 +30,7 @@ S=${WORKDIR}/${PN}-${LTRACE_V} src_prepare() { epatch "${WORKDIR}"/debian/patches/[0-9]* + epatch "${FILESDIR}"/${PN}-0.7.3-test-protos.patch #bug 421649 sed -i '/^dist_doc_DATA/d' Makefile.am || die eautoreconf } diff --git a/dev-util/lttng-modules/Manifest b/dev-util/lttng-modules/Manifest index 58df523a2559..8db44162ad03 100644 --- a/dev-util/lttng-modules/Manifest +++ b/dev-util/lttng-modules/Manifest @@ -1,3 +1,2 @@ -DIST lttng-modules-2.5.0.tar.bz2 275319 SHA256 3dfa268024834a4598bbd356d2ae7ea1e2ad828c625943ea5f5ead484e8ad82b SHA512 c266d51af66958f25137db352e2df4497126afc4d448a226b1a03e422702e2aba8fed10ace68c50408ccdc99380f8cf4e85b44f08f9f1dd17efdb6f7d051ac0d WHIRLPOOL 87a21dd546342d8448ab1f7f4870c970d35133c1c1876b6d6147f50dd4ab8a86bd500fc6df208425a08348058d4e5f9da65f39ae481f54cdd268dcb7525f866c -DIST lttng-modules-2.5.1.tar.bz2 277110 SHA256 962238175f0959ac71b97fdde144a3f76a84f63aea6b3645f94da88512bcccdb SHA512 f144710483660edd59e328fae89a72510a8e295aa29c3c7d6ff2da5900fe6d7f746970068e7a43c18ec6f987635563629c918471cdd7e2b2f6a2bc8fffdeefb4 WHIRLPOOL 29bd62f0b87c19f14278cc82c61c8c11c78a9c3fbd1548b7c2a6c9fae0c612849d00ff8acbb454389e8fa298cfad4bcbfefb5d001514be1b17bfa1f23ed754e3 -DIST lttng-modules-2.6.0-rc1.tar.bz2 295707 SHA256 5faf1a460b34235574c71acfb97ba93bce2e8b4b79c17735939d4cd849a4e439 SHA512 995544f9e966cfc7ba2a2e1d510d70eba4101117ea877e11597654768e2a2ec7f09c5ff2280a3d51a99b3b32918d5a3ff7e16d2e0de70cb5abe412a13a8f8a79 WHIRLPOOL 253ffb2f23db074a286a570bc2e9f66aa7e7198d0911565b472b122ed4d8b460c88ebfa62d35cfdf1b7aa19cdd8f8d5114004a4c0487cee42c7bc3d0836a0aec +DIST lttng-modules-2.6.4.tar.bz2 295609 SHA256 2e476958563839140a1d5f4316a51ea73fd54283464e050494977a62846099e0 SHA512 ec93456829b04964d0c9befd1071e220bc047e3bf57978bf9e6a666d0be418c5825873746604e0758cd8fcd47f70f4471e0b190ad87f53b79d7efa94febeef03 WHIRLPOOL 4a1bb3f04e91eba8e668efe156dc3e553090071777aef9773d17c8235fffc7746635e34eaa979cd736a43b51047f5251f44a74d85c70d0f602a0704d6152aa10 +DIST lttng-modules-2.7.1.tar.bz2 297555 SHA256 3ce48a0d0fef39d2cc4687ec866de8f2fe49289faad02425b689559d7ddd077f SHA512 77609c7b7bc0a8315dd4c635c1be2d84cc1a946438323b362bd25cfcd97f2cf9655aefdbca8b96fceb61db7b733219251d2f9f2e1a46c7534c5d1c622c03b744 WHIRLPOOL 671f9eb773742ea8409806cf1ed26911654910c8c75a719654c6c0e154b80b07c4319cbf94b4a1114ffbca4d935e4631d7128701764d84622117c5f1d1b033bb diff --git a/dev-util/lttng-modules/lttng-modules-2.5.0.ebuild b/dev-util/lttng-modules/lttng-modules-2.5.0.ebuild deleted file mode 100644 index 14fd7addac85..000000000000 --- a/dev-util/lttng-modules/lttng-modules-2.5.0.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit linux-mod - -MY_P="${P/_rc/-rc}" -DESCRIPTION="LTTng Kernel Tracer Modules" -HOMEPAGE="http://lttng.org" -SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -BUILD_TARGETS="default" - -CONFIG_CHECK="MODULES KALLSYMS HIGH_RES_TIMERS TRACEPOINTS - ~HAVE_SYSCALL_TRACEPOINTS ~PERF_EVENTS ~EVENT_TRACING ~KPROBES KRETPROBES" - -MODULE_NAMES="true" - -S="${WORKDIR}/${MY_P}" - -pkg_pretend() { - if kernel_is lt 2 6 27; then - eerror "${PN} require Linux kernel >= 2.6.27" - die "Please update your kernel!" - fi -} - -src_install() { - for i in $(find "${S}" -name "*.ko" -print); do - local val=${i##${S}/} - local modules+="${val%%.ko}(misc:) " - done - MODULE_NAMES=${modules} - - linux-mod_src_install - dodoc ChangeLog README TODO -} diff --git a/dev-util/lttng-modules/lttng-modules-2.5.1.ebuild b/dev-util/lttng-modules/lttng-modules-2.6.4.ebuild index 14fd7addac85..374c4d933dc7 100644 --- a/dev-util/lttng-modules/lttng-modules-2.5.1.ebuild +++ b/dev-util/lttng-modules/lttng-modules-2.6.4.ebuild @@ -1,18 +1,20 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -inherit linux-mod +inherit linux-mod versionator MY_P="${P/_rc/-rc}" +MY_SLOT="$(get_version_component_range 1-2)" + DESCRIPTION="LTTng Kernel Tracer Modules" HOMEPAGE="http://lttng.org" SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2" LICENSE="GPL-2" -SLOT="0" +SLOT="0/${MY_SLOT}" KEYWORDS="~amd64 ~x86" IUSE="" @@ -40,5 +42,5 @@ src_install() { MODULE_NAMES=${modules} linux-mod_src_install - dodoc ChangeLog README TODO + dodoc ChangeLog README.md TODO } diff --git a/dev-util/lttng-modules/lttng-modules-2.6.0_rc1.ebuild b/dev-util/lttng-modules/lttng-modules-2.7.1.ebuild index 048c6a77c95c..b24347e1fa6b 100644 --- a/dev-util/lttng-modules/lttng-modules-2.6.0_rc1.ebuild +++ b/dev-util/lttng-modules/lttng-modules-2.7.1.ebuild @@ -4,15 +4,17 @@ EAPI=5 -inherit linux-mod +inherit linux-mod versionator MY_P="${P/_rc/-rc}" +MY_SLOT="$(get_version_component_range 1-2)" + DESCRIPTION="LTTng Kernel Tracer Modules" HOMEPAGE="http://lttng.org" SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2" LICENSE="GPL-2" -SLOT="0" +SLOT="0/${MY_SLOT}" KEYWORDS="~amd64 ~x86" IUSE="" diff --git a/dev-util/lttng-tools/Manifest b/dev-util/lttng-tools/Manifest index df1c1c0a926d..cd63a29eb1c2 100644 --- a/dev-util/lttng-tools/Manifest +++ b/dev-util/lttng-tools/Manifest @@ -1,3 +1,2 @@ -DIST lttng-tools-2.5.0.tar.bz2 867879 SHA256 dad8b8f9d7209dcf91b2bf6ec34a0b31d1cf3c6a81698492a6e9cff2d11e1ca7 SHA512 91ccdcd2f02999c97bb218147aab28a4e8c5e6b4813e97c690da965f8f54c312fc1e0487a200558e2101938096f2ba3e22f09fbbcd6b7abcdd800215f328dfd5 WHIRLPOOL d9af3d5c4267acaadb5296db42322e7a475e1366f4ff7f83b3dcfe7fa5507261eb938920c2bdc95395eff528a1022cee33665f1781a2172958b4e57d96ab764c -DIST lttng-tools-2.5.2.tar.bz2 876344 SHA256 1f52d342fb5b56a6675748f0b8e8557ec7c4e90732c3d8f5732bd10b920b233d SHA512 c556b54d1b571f9f5e3b95b729536ada179d899227b6fd0f0fb3482572ca775d4d8212aab4782d6048587df225846d90ba947730e1ca0101f4c54de0819f421d WHIRLPOOL e0552e68a2c3b4c50cefafd600c1dd6e5e586e16eb1c64d5b0b6749e197a754a982f2e8a3915ab5f76f92295cb4bcb9a20266a32a178bfbc4adc4c14a3ec3206 -DIST lttng-tools-2.6.0-rc3.tar.bz2 913287 SHA256 c11d6158d8865b6329d9e1eabc938fc81f33b18634d7c9a2a27a82cea1c63f2d SHA512 db40ee1fe0ec7d93a7e35a742f945cbb89399f56c406f276512e5f9a44907ce0dd195c5f6d763adb13015c8beef74e09019ca3535d7be619dd072e5cf5650dab WHIRLPOOL aa331e76cd4f9b035a50a2b65778cf602f9c7f34d318338d2ad20baa95cb798a9077518966fc4a14b5e288be21246ec9ac403c2fca2b37e277e26d0091bb0e48 +DIST lttng-tools-2.6.1.tar.bz2 956120 SHA256 70ec8e24f8ea12f593d77c6bdc5348e4124dcb4897e8c0eb6fba25048fd31137 SHA512 7b2de0a42975e3c8ced67ed877417684892322c477a35a310c13ddbf84fcf125ee87156bae56b802eacec7757a927388d764e917ce8da8e57bfd33fdae3da469 WHIRLPOOL 22596b4572ffddd025c89c51eb234096105526614e2c5616bdc0f0ee97c83aab03852cd02af6890c2cb590b6c003dcd8a02ab87c849d792763624442f45c3b00 +DIST lttng-tools-2.7.1.tar.bz2 984351 SHA256 0c799fb21dfa42475feaa1507ded934608b2e531039b46c40e944a5b81c7b21c SHA512 b0cafa5b74182a077232dbe2b73ed4e2267a921a62163367f0e7e14463e176d4538fc6ec27b8737f55fc417734677e5d22efc65685f885fa5f892f7900ee0e2d WHIRLPOOL cfe0db0679e128888dfe0061bfaeb5b8b337900a1b1e84cf1aaafec230638e67744cc0873f2959456f3cc1c91e6c9c9458f64a10c2fe835e34af4bf2778b956b diff --git a/dev-util/lttng-tools/lttng-tools-2.5.2.ebuild b/dev-util/lttng-tools/lttng-tools-2.5.2.ebuild deleted file mode 100644 index b2fdfcd49ec0..000000000000 --- a/dev-util/lttng-tools/lttng-tools-2.5.2.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit linux-info - -MY_P="${P/_rc/-rc}" -DESCRIPTION="Linux Trace Toolkit - next generation" -HOMEPAGE="http://lttng.org" -SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+ust" - -DEPEND="dev-libs/userspace-rcu - dev-libs/popt - dev-libs/libxml2 - ust? ( dev-util/lttng-ust ) -" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -pkg_pretend() { - if kernel_is -lt 2 6 27; then - ewarn "${PN} require Linux kernel >= 2.6.27" - ewarn " pipe2(), epoll_create1() and SOCK_CLOEXEC are needed to run" - ewarn " the session daemon. There were introduce in the 2.6.27" - fi -} - -src_configure() { - econf $(use_enable ust lttng-ust) -} diff --git a/dev-util/lttng-tools/lttng-tools-2.5.0.ebuild b/dev-util/lttng-tools/lttng-tools-2.6.1.ebuild index b2fdfcd49ec0..7f5af9aa935a 100644 --- a/dev-util/lttng-tools/lttng-tools-2.5.0.ebuild +++ b/dev-util/lttng-tools/lttng-tools-2.6.1.ebuild @@ -1,25 +1,27 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -inherit linux-info +inherit linux-info versionator MY_P="${P/_rc/-rc}" +MY_SLOT="$(get_version_component_range 1-2)" + DESCRIPTION="Linux Trace Toolkit - next generation" HOMEPAGE="http://lttng.org" SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2" LICENSE="GPL-2" -SLOT="0" +SLOT="0/${MY_SLOT}" KEYWORDS="~amd64 ~x86" IUSE="+ust" DEPEND="dev-libs/userspace-rcu dev-libs/popt dev-libs/libxml2 - ust? ( dev-util/lttng-ust ) + ust? ( dev-util/lttng-ust:= ) " RDEPEND="${DEPEND}" diff --git a/dev-util/lttng-tools/lttng-tools-2.6.0_rc3.ebuild b/dev-util/lttng-tools/lttng-tools-2.7.1.ebuild index b2fdfcd49ec0..7f5af9aa935a 100644 --- a/dev-util/lttng-tools/lttng-tools-2.6.0_rc3.ebuild +++ b/dev-util/lttng-tools/lttng-tools-2.7.1.ebuild @@ -1,25 +1,27 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -inherit linux-info +inherit linux-info versionator MY_P="${P/_rc/-rc}" +MY_SLOT="$(get_version_component_range 1-2)" + DESCRIPTION="Linux Trace Toolkit - next generation" HOMEPAGE="http://lttng.org" SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2" LICENSE="GPL-2" -SLOT="0" +SLOT="0/${MY_SLOT}" KEYWORDS="~amd64 ~x86" IUSE="+ust" DEPEND="dev-libs/userspace-rcu dev-libs/popt dev-libs/libxml2 - ust? ( dev-util/lttng-ust ) + ust? ( dev-util/lttng-ust:= ) " RDEPEND="${DEPEND}" diff --git a/dev-util/lttng-ust/Manifest b/dev-util/lttng-ust/Manifest index dabba7ec1bc2..78622630cee3 100644 --- a/dev-util/lttng-ust/Manifest +++ b/dev-util/lttng-ust/Manifest @@ -1,3 +1,2 @@ -DIST lttng-ust-2.5.0.tar.bz2 583293 SHA256 dcd0bb81a12833e6edea110a0cc97108a7e55b1dc95ff2c97d06796866f5c3aa SHA512 15e614a0b66d668e00de56275f80f67a3ee159642e06a5c2981ac3bd2266c0f3c2cbad8dd3e4b5158ef85070bdcf9b513e17de346dbc628878c2de68768dd634 WHIRLPOOL 3cac7a2d905a2ab913220d13ffd295e442e7e0b676b68e501542b799092a7d6d8e45211fd8cf98939478958aee739e86041b797229207820172cce2726c86677 -DIST lttng-ust-2.5.1.tar.bz2 589487 SHA256 fbd9e2d78641e5c659f1d51f8097c8279c155ff50f8e38a4c57f188ca4b84546 SHA512 718f0f50077ed7d1c9647de7714c237fde619ea23de8160af508fd1e6a60fb3594b0424b93a7ad5cbc47f4106721e7ef75ea82f1976a0a8fbf3305e8179769b6 WHIRLPOOL 38ea8fbdc6461f3a8af914b289cf8496c6a6fa48efcb0ed29be6f404310624602e7b8402b3ec2ad89a2a45c1a441afc162e83b09ecd9cd3654cf1e2638599575 -DIST lttng-ust-2.6.0-rc2.tar.bz2 608934 SHA256 664fabe883c863f8ba1f83b2fa030c097181aed44bd75979431c0fc0e1e71598 SHA512 a7ccf10e03693397168cca34b5008609a2c6dbf1bd88b84e42014861af432379efdbb040a31c77bf20014838d491fcb05ab67ca47c6924c7f74ca539c3019f3b WHIRLPOOL 7fd15c99e57cc21c6d9ce46ecab07da2389a2364d7de5a0b34357465a404bbd15d756d4ce54460ae52a923bb644e6719fcf4527773400e2aeef4c1a70bf84c5f +DIST lttng-ust-2.6.5.tar.bz2 619053 SHA256 31ad8ae3a63a5009747732b5d015d19cd3fdb9a4524dcdc7b92c6b29b2120d8a SHA512 bf144c987b7ff62f70551db51a5605bc006b1d8a0e7f4197e1a2c7a7d79a1e4e786a658d0ec885f7d56c4d4f405da23717137c8b0d2be6289fc16ca84f06a230 WHIRLPOOL bec7bf92e07c2b606c726b48c691524f4821ce1dd7715a0784603968f40f2e1b01558f92d5a7019e060aa413624c96b35ad8242b261d2e936b0a315ca8529858 +DIST lttng-ust-2.7.1.tar.bz2 643906 SHA256 878438f10a488aa5855615a3108f4759bd123fa795d70c34647146d70103ce16 SHA512 80ba4b79df2a0ba0606a31145a427c8c5b30e2a4ace20f9e4602738ace99fe88146569de549288ff33c809a606b6973c17c3effcf9699b5dca3383b8da5b10ee WHIRLPOOL b6f5d40594bddf60c5463167d70d09633b0bca9593c5b018ecf3220819926a0d44af6288340d76c3dfe2aea9b4c29a9301285b98f5aa55884a9efa39f7e82287 diff --git a/dev-util/lttng-ust/lttng-ust-2.5.0.ebuild b/dev-util/lttng-ust/lttng-ust-2.5.0.ebuild deleted file mode 100644 index 88522a591bec..000000000000 --- a/dev-util/lttng-ust/lttng-ust-2.5.0.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit autotools - -MY_P="${P/_rc/-rc}" -DESCRIPTION="Linux Trace Toolkit - UST library" -HOMEPAGE="http://lttng.org" -SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" -IUSE="examples" - -DEPEND="dev-libs/userspace-rcu" -RDEPEND="${DEPEND}" - -src_prepare() { - if ! use examples; then - sed -i -e '/SUBDIRS/s:examples::' doc/Makefile.am || die - fi - eautoreconf -} diff --git a/dev-util/lttng-ust/lttng-ust-2.6.0_rc2.ebuild b/dev-util/lttng-ust/lttng-ust-2.6.5.ebuild index 136b7571b825..c3f261f5db6c 100644 --- a/dev-util/lttng-ust/lttng-ust-2.6.0_rc2.ebuild +++ b/dev-util/lttng-ust/lttng-ust-2.6.5.ebuild @@ -1,18 +1,20 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -inherit autotools +inherit autotools versionator MY_P="${P/_rc/-rc}" +MY_SLOT="$(get_version_component_range 1-2)" + DESCRIPTION="Linux Trace Toolkit - UST library" HOMEPAGE="http://lttng.org" SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2" LICENSE="GPL-2" -SLOT="0" +SLOT="0/${MY_SLOT}" KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" IUSE="examples" diff --git a/dev-util/lttng-ust/lttng-ust-2.5.1.ebuild b/dev-util/lttng-ust/lttng-ust-2.7.1.ebuild index 88522a591bec..c3f261f5db6c 100644 --- a/dev-util/lttng-ust/lttng-ust-2.5.1.ebuild +++ b/dev-util/lttng-ust/lttng-ust-2.7.1.ebuild @@ -1,24 +1,28 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -inherit autotools +inherit autotools versionator MY_P="${P/_rc/-rc}" +MY_SLOT="$(get_version_component_range 1-2)" + DESCRIPTION="Linux Trace Toolkit - UST library" HOMEPAGE="http://lttng.org" SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2" LICENSE="GPL-2" -SLOT="0" +SLOT="0/${MY_SLOT}" KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" IUSE="examples" DEPEND="dev-libs/userspace-rcu" RDEPEND="${DEPEND}" +S="${WORKDIR}"/${MY_P} + src_prepare() { if ! use examples; then sed -i -e '/SUBDIRS/s:examples::' doc/Makefile.am || die diff --git a/dev-util/mdds/Manifest b/dev-util/mdds/Manifest index cd58451961d3..405c02e69d23 100644 --- a/dev-util/mdds/Manifest +++ b/dev-util/mdds/Manifest @@ -1,3 +1,4 @@ +DIST mdds-1.1.0.tar.bz2 258691 SHA256 4253ab93fe8bb579321a50e247f1f800191ab99fe2d8c6c181741b8bd3fb161f SHA512 928cb6dffacdb2fe9e67dde094bbd8191137cb58402172d0fc99ed8c7aa6069668c6b1f06e515366a0843325ea051e8e0650aa2142cbc94b107a748a399d7a47 WHIRLPOOL 79ec5589ad682712244cc235c8ec7f9626208526b43839f07fff9dfc96509e232fccce801664b2c50b00dcde656cb78e8ac1e5db2fde7c807bc5507af410a83b DIST mdds_0.10.3.tar.bz2 151389 SHA256 db10932dbe7e9b5b9b3f513bc8165ab7e29c3bf75702b3c3cfff6956c521e0c2 SHA512 52be0fe4eedc8a44f61944e078d8f0d2490bfea27451c5d4772b6d46d71562702d3b90b34c5721d8bdf6de2ea32a4a9126e310614bb36e0d573c047dfc9f3fcb WHIRLPOOL 17a461cf01f286ccb0e8b351e627dc870db5676a3698cf99f1520b01562138a8d74fa99ccca901d81b5f354abf95ff35d2a7957a3bf2dae16d92aee12e62f8b1 DIST mdds_0.11.2.tar.bz2 154444 SHA256 cd0a0dc8b35d6582efad6898546c86714eb058696ba26b0e7f8914faa002a5ab SHA512 b0e00d50be9b8319dabfe7e607849af27a52be9b46d770849b919444b905bf198d99edcefe1be15e6018b79839443b3a709fe22b84ac11e2267f02bec5139633 WHIRLPOOL a505c4b746c7ffefe3ea74fd0eb7c2ae46b4c598e1136cf9e9cfe44a4c48db2bb1b84528a5f0a86cc1b7a5c9d5b7d82522bd7836ed5e4de61d9664a863e1b014 DIST mdds_0.12.0.tar.bz2 152285 SHA256 2a22de23ca828886625120e9d40fccd6333458a1934a13d2c982b6f9403e5981 SHA512 462f6e3701eb7cce872ce0a76d826886eedccf5ca20293d03744b6d6d5ff1ef16770c6abce1c9118829e252e90783e206d281006d0d4e7e9b328ed9ae37264c1 WHIRLPOOL f86314644d80ae1b75a4cc1af6ebc4a3df3b65eac4244abc0fbf69893020509abae3be7e758d90a07eafffb866d67dcb75968b38a411e747d7f361a7d2905f0b diff --git a/dev-util/mdds/mdds-1.1.0.ebuild b/dev-util/mdds/mdds-1.1.0.ebuild new file mode 100644 index 000000000000..754707aed497 --- /dev/null +++ b/dev-util/mdds/mdds-1.1.0.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +EGIT_REPO_URI="https://gitlab.com/mdds/mdds.git" +[[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools" + +inherit eutils toolchain-funcs ${GITECLASS} + +DESCRIPTION="A collection of multi-dimensional data structure and indexing algorithm" +HOMEPAGE="https://gitlab.com/mdds/mdds" +[[ ${PV} == 9999 ]] || SRC_URI="http://kohei.us/files/${PN}/src/${P}.tar.bz2" + +LICENSE="MIT" +SLOT="1/${PV}" +IUSE="doc valgrind" + +[[ ${PV} == 9999 ]] || \ +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" + +COMMON_DEPEND="dev-libs/boost:=" +DEPEND="${COMMON_DEPEND} + doc? ( + app-doc/doxygen + dev-python/sphinx + )" +RDEPEND="${COMMON_DEPEND}" + +DOCS=() # buildsystem installs docs + +src_prepare(){ + eapply_user + [[ ${PV} == 9999 ]] && eautoreconf +} + +src_configure() { + econf \ + $(use_enable doc docs) \ + $(use_enable valgrind memory_tests) \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" +} + +src_compile() { :; } + +src_test() { + tc-export CXX + default +} diff --git a/dev-util/mdds/mdds-9999.ebuild b/dev-util/mdds/mdds-9999.ebuild index e0db9959c3b9..754707aed497 100644 --- a/dev-util/mdds/mdds-9999.ebuild +++ b/dev-util/mdds/mdds-9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 EGIT_REPO_URI="https://gitlab.com/mdds/mdds.git" [[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools" @@ -11,27 +11,34 @@ inherit eutils toolchain-funcs ${GITECLASS} DESCRIPTION="A collection of multi-dimensional data structure and indexing algorithm" HOMEPAGE="https://gitlab.com/mdds/mdds" -[[ ${PV} == 9999 ]] || SRC_URI="http://kohei.us/files/${PN}/src/${P/-/_}.tar.bz2" +[[ ${PV} == 9999 ]] || SRC_URI="http://kohei.us/files/${PN}/src/${P}.tar.bz2" LICENSE="MIT" -SLOT="0/${PV}" -IUSE="" +SLOT="1/${PV}" +IUSE="doc valgrind" [[ ${PV} == 9999 ]] || \ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -DEPEND="dev-libs/boost:=" -RDEPEND="${DEPEND}" +COMMON_DEPEND="dev-libs/boost:=" +DEPEND="${COMMON_DEPEND} + doc? ( + app-doc/doxygen + dev-python/sphinx + )" +RDEPEND="${COMMON_DEPEND}" -[[ ${PV} == 9999 ]] || S=${WORKDIR}/${P/-/_} +DOCS=() # buildsystem installs docs src_prepare(){ + eapply_user [[ ${PV} == 9999 ]] && eautoreconf } src_configure() { econf \ - --with-hash-container=boost \ + $(use_enable doc docs) \ + $(use_enable valgrind memory_tests) \ --docdir="${EPREFIX}/usr/share/doc/${PF}" } diff --git a/dev-util/mdds/metadata.xml b/dev-util/mdds/metadata.xml index 4bf2727332a9..c054dfb0bb86 100644 --- a/dev-util/mdds/metadata.xml +++ b/dev-util/mdds/metadata.xml @@ -8,4 +8,7 @@ <upstream> <remote-id type="google-code">multidimalgorithm</remote-id> </upstream> + <use> + <flag name="valgrind">Add support for memory debugging using <pkg>dev-util/valgrind</pkg></flag> + </use> </pkgmetadata> diff --git a/dev-util/meld/meld-3.14.2.ebuild b/dev-util/meld/meld-3.14.2.ebuild index 3ed56a0e0aff..97b12453e52d 100644 --- a/dev-util/meld/meld-3.14.2.ebuild +++ b/dev-util/meld/meld-3.14.2.ebuild @@ -15,7 +15,7 @@ HOMEPAGE="http://meldmerge.org/" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND="${PYTHON_DEPS} diff --git a/dev-util/piklab/Manifest b/dev-util/piklab/Manifest deleted file mode 100644 index 9561c5a45f86..000000000000 --- a/dev-util/piklab/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST piklab-0.16.2.tar.bz2 1036644 SHA256 51de9edda8edb9d2e9d07ed1c479b83b87eb6fb17c85717477f05fac03a5740e SHA512 8fdf8fdbcedbb0c7b840341575560e6bc3d02b5564cecd043fbe0e1bf6560aa28bd1e92ed2c80ea6d890bb5759dd0d4a72571f68ab7ee0858eb98649097e5f30 WHIRLPOOL be037be4fbf410cb9722d2a20a3b96222f57d63f0a4d7e744b65bd53937a73d3576aa6be80d16f8b478c3fdeb0663964a74be8344678b65adbe0af669eec42ab diff --git a/dev-util/piklab/metadata.xml b/dev-util/piklab/metadata.xml deleted file mode 100644 index 1283ddda10dc..000000000000 --- a/dev-util/piklab/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <upstream> - <remote-id type="sourceforge">piklab</remote-id> - <bugs-to>http://sourceforge.net/tracker/?group_id=138852</bugs-to> - </upstream> -</pkgmetadata> diff --git a/dev-util/piklab/piklab-0.16.2.ebuild b/dev-util/piklab/piklab-0.16.2.ebuild deleted file mode 100644 index 429f8296ae22..000000000000 --- a/dev-util/piklab/piklab-0.16.2.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -KDE_REQUIRED="optional" -KDE_HANDBOOK="optional" -KDE_LINGUAS="de cs es fr hu it" -inherit kde4-base - -DESCRIPTION="IDE for applications based on PIC and dsPIC microcontrollers" -HOMEPAGE="http://piklab.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND=" - dev-qt/qtcore:4 - dev-qt/qtgui:4 - dev-qt/qt3support:4 - sys-libs/readline - virtual/libusb:0 -" -RDEPEND="${DEPEND}" - -DOCS=( Changelog README TODO ) - -src_prepare() { - sed -e "/install(FILES README/d" \ - -i CMakeLists.txt || die - - kde4-base_src_prepare -} - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use !kde QT_ONLY) - -DLOCALE_INSTALL_DIR="/usr/share/locale" - ) - kde4-base_src_configure -} diff --git a/dev-util/pkgconf/pkgconf-0.9.12.ebuild b/dev-util/pkgconf/pkgconf-0.9.12.ebuild index d2e7167dcbc9..c1e5f68d306b 100644 --- a/dev-util/pkgconf/pkgconf-0.9.12.ebuild +++ b/dev-util/pkgconf/pkgconf-0.9.12.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then else inherit eutils multilib-minimal SRC_URI="http://rabbit.dereferenced.org/~nenolod/distfiles/${P}.tar.bz2" - KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris" + KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris" fi DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89" diff --git a/dev-util/radare2/radare2-0.10.0.ebuild b/dev-util/radare2/radare2-0.10.0.ebuild index 8c8badd448ad..c43c45737d8d 100644 --- a/dev-util/radare2/radare2-0.10.0.ebuild +++ b/dev-util/radare2/radare2-0.10.0.ebuild @@ -28,3 +28,15 @@ src_configure() { econf \ $(use_with ssl openssl) } + +src_install() { + # a workaround for unstable $(INSTALL) call, bug #574866 + local d + for d in doc/*; do + if [[ -d $d ]]; then + rm -rfv "$d" || die "failed to delete '$d'" + fi + done + + default +} diff --git a/dev-util/rbtools/Manifest b/dev-util/rbtools/Manifest index 61fe110f2cac..c0cf022bd4cb 100644 --- a/dev-util/rbtools/Manifest +++ b/dev-util/rbtools/Manifest @@ -1,2 +1 @@ -DIST RBTools-0.7.4.tar.gz 158594 SHA256 1626d449eae9d03a8e3e5c0125f77a86eefdc615b86ba7ee1368b238521de198 SHA512 c12d254f1eeb7a8d06a1ab7cbb952f45975da355b436a7514cf9fa0c3fe60b713daa79874c8cf7df05b13acb22441cf6ae06e442b238b5481a01cdaf15f6c5c9 WHIRLPOOL b6116eb6445994dadb3c6003e8fdecf60d9fa17257988c9822b69c5cf19ae369e31c9a07315c14e27cdce35697f0eef16207306f0e6a5ec8fa47a9d0aa66680b DIST RBTools-0.7.5.tar.gz 160657 SHA256 4f252a3d5ad4a2d25883b9adf0c6ee17ef56146bd9c0586e0aa2a2790748c069 SHA512 f5c795929d8fb09b3f39c18e747096d56205c6fbf73e4a04a5898b5adc058d092e41f835ba6cea8b4b94bc5747cbbdf988131ad66e637cc77e0d59a4509786ef WHIRLPOOL ee414239c9289b1ac17b6fa6e63fcb42c058bde9cd3bb69a8d13e5c038c77a942de48d63091c5e8b499dc47e62f5b469d22ebbba66050138b35c355c02d98d89 diff --git a/dev-util/rbtools/rbtools-0.7.4.ebuild b/dev-util/rbtools/rbtools-0.7.4.ebuild deleted file mode 100644 index 5f25a92ebbcd..000000000000 --- a/dev-util/rbtools/rbtools-0.7.4.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 versionator - -MY_PN="RBTools" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Command line tools for use with Review Board" -HOMEPAGE="http://www.reviewboard.org/" -SRC_URI="http://downloads.reviewboard.org/releases/${MY_PN}/$(get_version_component_range 1-2)/${MY_P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND=">=dev-python/six-1.8.0[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] -" - -DOCS=( AUTHORS NEWS README.md ) - -S=${WORKDIR}/${MY_P} diff --git a/dev-util/rbtools/rbtools-0.7.5.ebuild b/dev-util/rbtools/rbtools-0.7.5.ebuild index 56d140216a7d..5f25a92ebbcd 100644 --- a/dev-util/rbtools/rbtools-0.7.5.ebuild +++ b/dev-util/rbtools/rbtools-0.7.5.ebuild @@ -16,7 +16,7 @@ SRC_URI="http://downloads.reviewboard.org/releases/${MY_PN}/$(get_version_compon LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" RDEPEND=">=dev-python/six-1.8.0[${PYTHON_USEDEP}]" diff --git a/dev-util/reviewboard/Manifest b/dev-util/reviewboard/Manifest deleted file mode 100644 index 24ba9ecc6a2e..000000000000 --- a/dev-util/reviewboard/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ReviewBoard-1.7.28.tar.gz 2957387 SHA256 69a976e69c1e805b23aa78f43fc1954599b7513dff1d1cfd0bafa6112a946931 SHA512 9e97b56b68da6c06f713d98c70dda321ea3fdf6f26986b4272fbb392c1c633f1ce44170bb515e8b685813b69a0ae8ada9f392b5e776793222dd25c3b7d4fa704 WHIRLPOOL 51a731117b9a84b9f8e1cd785511da516bf4d7216f7f08a8ba83d200af94a235d994d53c630b26f430d28f1ce4a7ca8a47d83b87c241bc4b1f5469f7668cc03d diff --git a/dev-util/reviewboard/files/1.7.28-docs.patch b/dev-util/reviewboard/files/1.7.28-docs.patch deleted file mode 100644 index 99741d2e40d0..000000000000 --- a/dev-util/reviewboard/files/1.7.28-docs.patch +++ /dev/null @@ -1,52 +0,0 @@ -Avoid un-needed downloading od object.infv files, fix conf.py for docs/manual -diff -ur ReviewBoard-1.7.7.1.orig/docs/codebase/conf.py ReviewBoard-1.7.7.1/docs/codebase/conf.py ---- docs/codebase/conf.py 2013-04-22 04:40:29.000000000 +0800 -+++ docs/codebase/conf.py 2013-06-16 15:35:59.639256650 +0800 -@@ -197,7 +197,3 @@ - - # If false, no module index is generated. - #latex_use_modindex = True -- -- --# Example configuration for intersphinx: refer to the Python standard library. --intersphinx_mapping = {'http://docs.python.org/dev': None} -diff -ur ReviewBoard-1.7.7.1.orig/docs/manual/conf.py ReviewBoard-1.7.7.1/docs/manual/conf.py ---- docs/manual/conf.py 2013-04-22 04:40:29.000000000 +0800 -+++ docs/manual/conf.py 2013-06-16 15:36:30.592256658 +0800 -@@ -30,9 +30,14 @@ - - import reviewboard - from reviewboard import settings -+from reviewboard.settings import EXTENSIONS_STATIC_ROOT, ROOT_URLCONF - from django.core.management import setup_environ -+from django import conf -+from settings_local import DATABASES -+conf.EXTENSIONS_STATIC_ROOT=EXTENSIONS_STATIC_ROOT -+conf.settings.DATABASES=DATABASES - setup_environ(settings) -- -+conf.settings.ROOT_URLCONF=ROOT_URLCONF - - # If your extensions are in another directory, add it here. If the directory - # is relative to the documentation root, use os.path.abspath to make it -@@ -223,7 +223,4 @@ - latex_show_pagerefs = True - - --# Example configuration for intersphinx: refer to the Python standard library. --intersphinx_mapping = {'http://docs.python.org/dev': None} -- - todo_include_todos = True -diff -ur -ReviewBoard-1.7.7.1.orig/docs/releasenotes/conf.py -ReviewBoard-1.7.7.1/docs/releasenotes/conf.py ---- docs/releasenotes/conf.py 2013-04-22 04:40:29.000000000 +0800 -+++ docs/releasenotes/conf.py 2013-06-16 15:36:53.119256665 +0800 -@@ -202,7 +202,3 @@ - - # If false, no module index is generated. - #latex_use_modindex = True -- -- --# Example configuration for intersphinx: refer to the Python standard library. --intersphinx_mapping = {'https://www.reviewboard.org/docs/manual/dev': None} diff --git a/dev-util/reviewboard/files/CVE-2013-2209-sec.patch b/dev-util/reviewboard/files/CVE-2013-2209-sec.patch deleted file mode 100644 index 1b41c3c6f0d2..000000000000 --- a/dev-util/reviewboard/files/CVE-2013-2209-sec.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 4aaacbb1e628a80803ba1a55703db38fccdf7dbf Mon Sep 17 00:00:00 2001 -From: Christian Hammond <chipx86@chipx86.com> -Date: Fri, 21 Jun 2013 23:33:16 -0700 -Subject: [PATCH] Fix an XSS vulnerability in the reviews dropdown. - -The reviews dropdown had a bad vulnerability where it would assume the -user's full name is valid HTML. This allowed the user to craft a script -tag that would be executed every time the name appeared in the dropdown. - -This vulnerability exists in 1.6.x, 1.7.x, and the in-development 1.8. -There are no known attacks in the wild. - -This was reported by Craig Young at Tripwire. -#--- -# reviewboard/htdocs/media/rb/js/reviews.js | 6 ++++-- -# 1 file changed, 4 insertions(+), 2 deletions(-) - -#diff --git a/reviewboard/htdocs/media/rb/js/reviews.js b/reviewboard/htdocs/media/rb/js/reviews.js -#index 6340744..035872f 100644 -#--- a/reviewboard/htdocs/media/rb/js/reviews.js -#+++ b/reviewboard/htdocs/media/rb/js/reviews.js -#@@ -352,10 +352,12 @@ $.fn.reviewsAutoComplete = function(options) { -# $(this) -# .autocomplete({ -# formatItem: function(data) { -#- var s = data[options.nameKey]; -#+ var s = data[options.nameKey], -#+ desc; -# -# if (options.descKey) { -#- s += " <span>(" + data[options.descKey] + ")</span>"; -#+ desc = $('<div/>').text(data[options.descKey]).html(); -#+ s += " <span>(" + desc + ")</span>"; -# } -# - # return s; -#-- -#1.8.1.6 -diff -ur ReviewBoard-1.7.7.1.orig/reviewboard/htdocs/static/rb/js/reviews.js ReviewBoard-1.7.7.1/reviewboard/htdocs/static/rb/js/reviews.js ---- reviewboard/htdocs/static/rb/js/reviews.js 2013-04-22 04:40:30.000000000 +0800 -+++ reviewboard/htdocs/static/rb/js/reviews.js 2013-06-28 10:38:29.514298074 +0800 -@@ -257,10 +257,12 @@ - $(this) - .rbautocomplete({ - formatItem: function(data) { -- var s = data[options.nameKey]; -+ var s = data[options.nameKey], -+ desc; - - if (options.descKey && data[options.descKey]) { -- s += " <span>(" + data[options.descKey] + ")</span>"; -+ desc = $('<div/>').text(data[options.descKey]).html(); -+ s += " <span>(" + desc + ")</span>"; - } - - return s; -diff -ur ReviewBoard-1.7.7.1.orig/reviewboard/static/rb/js/reviews.js ReviewBoard-1.7.7.1/reviewboard/static/rb/js/reviews.js ---- reviewboard/static/rb/js/reviews.js 2013-04-22 04:40:29.000000000 +0800 -+++ reviewboard/static/rb/js/reviews.js 2013-06-28 10:40:09.922290974 +0800 -@@ -257,10 +257,12 @@ - $(this) - .rbautocomplete({ - formatItem: function(data) { -- var s = data[options.nameKey]; -+ var s = data[options.nameKey], -+ desc; - - if (options.descKey && data[options.descKey]) { -- s += " <span>(" + data[options.descKey] + ")</span>"; -+ desc = $('<div/>').text(data[options.descKey]).html(); -+ s += " <span>(" + desc + ")</span>"; - } - - return s; diff --git a/dev-util/reviewboard/metadata.xml b/dev-util/reviewboard/metadata.xml deleted file mode 100644 index 411f82cecba0..000000000000 --- a/dev-util/reviewboard/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>idella4@gentoo.org</email> - <name>Ian Delaney</name> - </maintainer> - <use> - <flag name="codebase">Enables a build of the docs/codebase folder</flag> - <flag name="manual">Enables a build of the docs/manual folder</flag> - <flag name="rnotes">Enables a doc build of the release notes</flag> - </use> -</pkgmetadata> diff --git a/dev-util/reviewboard/reviewboard-1.7.28.ebuild b/dev-util/reviewboard/reviewboard-1.7.28.ebuild deleted file mode 100644 index 21b651dbb379..000000000000 --- a/dev-util/reviewboard/reviewboard-1.7.28.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite" - -inherit distutils-r1 - -MY_PN="ReviewBoard" -DESCRIPTION="A web-based code review tool that offers developers an easy way to handle code reviews" -HOMEPAGE="http://www.reviewboard.org/" -SRC_URI="http://downloads.reviewboard.org/releases/${MY_PN}/1.7/${MY_PN}-${PV}.tar.gz" -KEYWORDS="~amd64 ~x86" -IUSE="codebase doc manual rnotes test" - -LICENSE="MIT" -SLOT="0" -S=${WORKDIR}/${MY_PN}-${PV} - -RDEPEND=">=dev-python/django-1.4.14[${PYTHON_USEDEP},sqlite] - <dev-python/django-1.5[${PYTHON_USEDEP},sqlite] - >=dev-python/django-evolution-0.6.9[${PYTHON_USEDEP}] - <dev-python/django-evolution-0.7[${PYTHON_USEDEP}] - >=dev-python/django-pipeline-1.2.24[${PYTHON_USEDEP}] - >=dev-python/Djblets-0.7.31[${PYTHON_USEDEP}] - <dev-python/Djblets-0.8[${PYTHON_USEDEP}] - >=dev-python/pygments-1.5[${PYTHON_USEDEP}] - dev-python/docutils[${PYTHON_USEDEP}] - >=dev-python/markdown-2.2.1[${PYTHON_USEDEP}] - >=dev-python/paramiko-1.9.0[${PYTHON_USEDEP}] - >=dev-python/mimeparse-0.1.3[${PYTHON_USEDEP}] - dev-python/python-dateutil[${PYTHON_USEDEP}] - dev-python/python-memcached[${PYTHON_USEDEP}] - >=dev-python/pytz-2012h[${PYTHON_USEDEP}] - dev-python/recaptcha-client[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/nose[${PYTHON_USEDEP}] ) - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )" - -REQUIRED_USE="doc? ( || ( codebase manual rnotes ) )" -# Tests mostly access the inet and when run mostly fail -RESTRICT=test - -PATCHES=( "${FILESDIR}"/${PV}-docs.patch ) - -python_prepare_all() { - # Running uglify is a problem right now, so skip this step. Rather - # have newer versions that compacted javascript. - sed -e "s/'pipeline.compressors.uglifyjs.UglifyJSCompressor'/None/" -i reviewboard/settings.py || die - - # https://github.com/reviewboard/reviewboard/commit/b1b8867deb7cd857003d8abbf16e85897b0cb4bf - # # The version bordering of python-dateutil is long out of date and wrong since end of March 2012! - sed -e 's:==1.5:>=1.5:' -i setup.py || die - - distutils-r1_python_prepare_all -} - -python_compile_all() { - # See https://code.google.com/p/reviewboard/issues/ #3009 - # until build of manual can find and use ROOT_URLCONF, only possible build path for manual - # requires sacrificing the resources section, all of which call on ROOT_URLCONF - local msg="Generating docs for" - if use doc; then - if use manual; then - rm -rf docs/manual/webapi//2.0/resources/ || die - einfo;einfo "$msg manual" - DJANGO_SETTINGS_MODULE="django.conf" emake -C docs/manual html - fi - - if use codebase; then - pushd docs/codebase &> /dev/null - ln -sf ../../contrib/internal/conf/settings_local.py . - popd &> /dev/null - einfo;einfo "$msg codebase" - emake -C docs/codebase html - fi - - if use rnotes; then - einfo;einfo "$msg release notes" - emake -C docs/releasenotes html - fi - fi -} - -python_test() { - pushd ${PN} > /dev/null - ln -sf contrib/internal/conf/settings_local.py . - "${PYTHON}" manage.py test || die -} - -python_install_all() { - if use doc; then - if use manual; then - insinto /usr/share/doc/${PF}/manual - doins -r docs/manual/_build/html/ - fi - if use codebase; then - insinto /usr/share/doc/${PF}/codebase - doins -r docs/codebase/_build/html/ - fi - if use rnotes; then - insinto /usr/share/doc/${PF}/release_notes - doins -r docs/releasenotes/_build/html/ - fi - fi - distutils-r1_python_install_all -} - -pkg_postinst() { - elog "You must install any VCS tool you wish ${PN} to support." - elog "dev-util/cvs, dev-vcs/git, dev-vcs/mercurial or dev-util/subversion." - elog - elog "Enable the mysql, postgres or sqlite USEflag on dev-python/django" - elog "to use the corresponding database backend." - elog - elog "For speed and responsiveness, consider installing net-misc/memcached" - elog "and dev-python/python-memcached" -} diff --git a/dev-util/spec-cleaner/Manifest b/dev-util/spec-cleaner/Manifest index 6bcf4449f239..cfdc80c91ddf 100644 --- a/dev-util/spec-cleaner/Manifest +++ b/dev-util/spec-cleaner/Manifest @@ -1 +1 @@ -DIST spec-cleaner-0.7.2.tar.gz 79297 SHA256 e58703a9fba035923396044c4339cc71d1c9023246b7cae5f6445acf908d3cbe SHA512 bd46c64d9473f66a8e4756dfd67b94f902a8884536bb9153a6076b7c5ea9b8c30cc54fdbddc18d4931509effc7e18ef51662ee21b2d1e5fd7bf6a4b5436b3ed0 WHIRLPOOL d087320eb65f1fb9de75074b50469a8531b76f1067acb1b8982c7f69f184ec4b933e8b0d66dc7f64ffe03f766f9d18e4264b52b6df1933282cf038d3fad144c0 +DIST spec-cleaner-0.7.8.tar.gz 89125 SHA256 d9ed8aeefac4836182a4c0a8bcaaaedaf4acad88bc601b2576f3adfad5436528 SHA512 2937c2480b4a24343c5ea8a665f2820e37da3f2816c22e6bc82ebba66711754a59f5e68fb903258750cac3118206a9e02fc5a87051c0bcb4e8396ab658e844d3 WHIRLPOOL 6559460eb869c8428b17611e4005edd59abd24ec105467768191825c6cd232f776e40ce7e5762fcecf9adad6bdfbf24c1790b8fd3d992deeb07a67b44c1665ac diff --git a/dev-util/spec-cleaner/spec-cleaner-0.7.2.ebuild b/dev-util/spec-cleaner/spec-cleaner-0.7.8.ebuild index 20592dcd5458..20592dcd5458 100644 --- a/dev-util/spec-cleaner/spec-cleaner-0.7.2.ebuild +++ b/dev-util/spec-cleaner/spec-cleaner-0.7.8.ebuild diff --git a/dev-util/vmtouch/Manifest b/dev-util/vmtouch/Manifest index ffdd57e5c4d0..ac26980b8cd8 100644 --- a/dev-util/vmtouch/Manifest +++ b/dev-util/vmtouch/Manifest @@ -1 +1 @@ -DIST vmtouch-0.8.0.tar.gz 224882 SHA256 6848b9355451e8ab848501b5604f47a396bce1ef1dcb613577feaaaea1dfe262 SHA512 71756a2b93545f916441913b11a6d366fe886df99d131303df2ae2ac382346321f47809620711f57f0a2df4133c175524234128abafdea47747b5c74017062bb WHIRLPOOL 54b645fa1a7eeb5fe86182de0bb3c9f54684698f9da0ad5392910bf8316008560a6f4592bf3c7720519db11bbd3759c306637acfb3f33e76c163b697936e459d +DIST vmtouch-1.0.2.tar.gz 13404 SHA256 48d41e5b805a0fcac46c12feeb4650e4b9def44b75d528d7c66c2f8b3a747c39 SHA512 df0d8a1599c970540e70e050dab33327589f0dd64548640c7d44607c3ef3397c7b1d2184fe80195ec5cb9a73d7218d7fd1b2cda2cee227ce84a8c20e8874f489 WHIRLPOOL 903813783d93395b637b565a887b8d0d3d5d3b7d548d9a98d49c1ab9bfc82322a495c771937cc7688561de30d0ec2aca6edb6d599508c440bd963547b78915b9 diff --git a/dev-util/vmtouch/vmtouch-0.8.0.ebuild b/dev-util/vmtouch/vmtouch-1.0.2.ebuild index 51d07ae29413..f4beade5b671 100644 --- a/dev-util/vmtouch/vmtouch-0.8.0.ebuild +++ b/dev-util/vmtouch/vmtouch-1.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -12,7 +12,7 @@ SRC_URI="https://github.com/hoytech/${PN}/archive/${P}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="" DEPEND="" @@ -21,6 +21,7 @@ RDEPEND="" S="${WORKDIR}"/${PN}-${P} src_install() { - default - doman vmtouch.8 + local my_prefix="${ED}/usr" + emake PREFIX="${my_prefix}" MANDIR="${my_prefix}/share/man" install + dodoc CHANGES README.md TODO } |