From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C07A91381F3 for ; Tue, 22 Oct 2013 16:06:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6ADE7E0B41; Tue, 22 Oct 2013 16:06:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E89D9E0B41 for ; Tue, 22 Oct 2013 16:06:30 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DC1CA33F0D1 for ; Tue, 22 Oct 2013 16:06:29 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2279) id A26832004C; Tue, 22 Oct 2013 16:06:28 +0000 (UTC) From: "Michal Gorny (mgorny)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, mgorny@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/paludis: paludis-1.4.2-r1.ebuild ChangeLog paludis-1.4.2.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: paludis-1.4.2-r1.ebuild ChangeLog paludis-1.4.2.ebuild X-VCS-Directories: sys-apps/paludis X-VCS-Committer: mgorny X-VCS-Committer-Name: Michal Gorny Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20131022160628.A26832004C@flycatcher.gentoo.org> Date: Tue, 22 Oct 2013 16:06:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: dd82eac5-bcf7-4522-9bad-4b4712fc3be7 X-Archives-Hash: 1511ebe87434aeaa19551f55aa57e3e7 mgorny 13/10/22 16:06:28 Modified: ChangeLog Added: paludis-1.4.2-r1.ebuild Removed: paludis-1.4.2.ebuild Log: Change the ruby dep to :1.9 and fix the script shebangs on this version. Noticed by Hans de Graaff on bug #439372. (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) Revision Changes Path 1.240 sys-apps/paludis/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/paludis/ChangeLog?rev=1.240&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/paludis/ChangeLog?rev=1.240&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/paludis/ChangeLog?r1=1.239&r2=1.240 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/paludis/ChangeLog,v retrieving revision 1.239 retrieving revision 1.240 diff -u -r1.239 -r1.240 --- ChangeLog 20 Oct 2013 15:53:28 -0000 1.239 +++ ChangeLog 22 Oct 2013 16:06:28 -0000 1.240 @@ -1,6 +1,13 @@ # ChangeLog for sys-apps/paludis # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/ChangeLog,v 1.239 2013/10/20 15:53:28 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/ChangeLog,v 1.240 2013/10/22 16:06:28 mgorny Exp $ + +*paludis-1.4.2-r1 (22 Oct 2013) + + 22 Oct 2013; Michał Górny +paludis-1.4.2-r1.ebuild, + -paludis-1.4.2.ebuild: + Change the ruby dep to :1.9 and fix the script shebangs on this version. + Noticed by Hans de Graaff on bug #439372. 20 Oct 2013; Michał Górny paludis-1.4.2.ebuild: Drop leftover csep function and comments. 1.1 sys-apps/paludis/paludis-1.4.2-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/paludis/paludis-1.4.2-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/paludis/paludis-1.4.2-r1.ebuild?rev=1.1&content-type=text/plain Index: paludis-1.4.2-r1.ebuild =================================================================== # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-1.4.2-r1.ebuild,v 1.1 2013/10/22 16:06:28 mgorny Exp $ EAPI=4 PYTHON_COMPAT=( python{2_6,2_7} ) inherit bash-completion-r1 eutils python-single-r1 user DESCRIPTION="paludis, the other package mangler" HOMEPAGE="http://paludis.exherbo.org/" SRC_URI="http://paludis.exherbo.org/download/${P}.tar.bz2" IUSE="doc pbins pink python ruby search-index test xml" LICENSE="GPL-2 vim" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" COMMON_DEPEND=" >=app-admin/eselect-1.2.13 >=app-shells/bash-3.2 >=sys-devel/gcc-4.4 dev-libs/libpcre[cxx] sys-apps/file pbins? ( >=app-arch/libarchive-3.1.2[xattr] ) python? ( ${PYTHON_DEPS} >=dev-libs/boost-1.41.0[python,${PYTHON_USEDEP}] ) ruby? ( dev-lang/ruby:1.9 ) xml? ( >=dev-libs/libxml2-2.6 ) search-index? ( >=dev-db/sqlite-3 )" DEPEND="${COMMON_DEPEND} doc? ( || ( >=app-doc/doxygen-1.5.3 <=app-doc/doxygen-1.5.1 ) python? ( dev-python/epydoc[${PYTHON_USEDEP}] dev-python/pygments[${PYTHON_USEDEP}] ) ruby? ( dev-ruby/syntax ) ) virtual/pkgconfig test? ( >=dev-cpp/gtest-1.6.0-r1 )" RDEPEND="${COMMON_DEPEND} sys-apps/sandbox" PDEPEND="app-admin/eselect-package-manager" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" pkg_pretend() { if [[ ${MERGE_TYPE} != buildonly ]]; then if id paludisbuild >/dev/null 2>/dev/null ; then if ! groups paludisbuild | grep --quiet '\' ; then eerror "The 'paludisbuild' user is now expected to be a member of the" eerror "'tty' group. You should add the user to this group before" eerror "upgrading Paludis." die "Please add paludisbuild to tty group" fi fi fi if [[ ${MERGE_TYPE} != binary ]]; then if [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]] then eerror "Paludis requires at least gcc 4.4 to build. Please switch the active" eerror "gcc version using gcc-config." die "Paludis requires at least gcc 4.4" fi fi } pkg_setup() { enewgroup "paludisbuild" enewuser "paludisbuild" -1 -1 "/var/tmp/paludis" "paludisbuild,tty" python-single-r1_pkg_setup } src_prepare() { # The package explicitly wants ruby1.9, so fix the script on it. # https://bugs.gentoo.org/show_bug.cgi?id=439372#c2 sed -i -e '1s/ruby/&19/' ruby/demos/*.rb || die epatch_user } src_configure() { local myeconfargs=( --htmldir=/usr/share/doc/${PF}/html $(use_enable doc doxygen) $(use_enable pbins) $(use_enable pink) $(use_enable ruby) $(use ruby && use_enable doc ruby-doc) $(use_enable python) $(use python && use_enable doc python-doc) $(use_enable xml) $(use_enable search-index) $(use_enable test gtest) --enable-prebuilt-documentation --enable-vim --enable-visibility --with-config-framework=eselect --with-environments=default,portage --with-vim-install-dir=/usr/share/vim/vimfiles ) econf "${myeconfargs[@]}" } src_install() { default prune_libtool_files dobashcomp bash-completion/cave insinto /usr/share/zsh/site-functions doins zsh-completion/_cave } src_test() { # Work around Portage bugs local -x PALUDIS_DO_NOTHING_SANDBOXY="portage sucks" local -x BASH_ENV=/dev/null if [[ ${EUID} == 0 ]] ; then # hate local -x PALUDIS_REDUCED_UID=0 local -x PALUDIS_REDUCED_GID=0 fi if ! nonfatal emake check ; then eerror "Tests failed. Looking for files for you to add to your bug report..." find "${S}" -type f -name '*.epicfail' -or -name '*.log' | while read a ; do eerror " $a" done die "Make check failed" fi } pkg_postinst() { local pm if [[ -f ${ROOT}/etc/env.d/50package-manager ]] ; then pm=$( source "${ROOT}"/etc/env.d/50package-manager ; echo "${PACKAGE_MANAGER}" ) fi if [[ ${pm} != paludis ]] ; then elog "If you are using paludis or cave as your primary package manager," elog "you should consider running:" elog " eselect package-manager set paludis" fi }