diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2013-10-22 16:06:28 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2013-10-22 16:06:28 +0000 |
| commit | c59bbd96d1378c04a8f9f56549d68585748d02bf (patch) | |
| tree | 3c5497ada3efffd676b44d1d483f540f24fec9e4 /sys-apps/paludis | |
| parent | virtual/pyparsing has been removed. (diff) | |
| download | gentoo-2-c59bbd96d1378c04a8f9f56549d68585748d02bf.tar.gz gentoo-2-c59bbd96d1378c04a8f9f56549d68585748d02bf.tar.bz2 gentoo-2-c59bbd96d1378c04a8f9f56549d68585748d02bf.zip | |
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!)
Diffstat (limited to 'sys-apps/paludis')
| -rw-r--r-- | sys-apps/paludis/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-apps/paludis/paludis-1.4.2-r1.ebuild (renamed from sys-apps/paludis/paludis-1.4.2.ebuild) | 12 |
2 files changed, 18 insertions, 3 deletions
diff --git a/sys-apps/paludis/ChangeLog b/sys-apps/paludis/ChangeLog index 67041b5fcdc0..88aab0d40518 100644 --- a/sys-apps/paludis/ChangeLog +++ b/sys-apps/paludis/ChangeLog @@ -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 <mgorny@gentoo.org> +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 <mgorny@gentoo.org> paludis-1.4.2.ebuild: Drop leftover csep function and comments. diff --git a/sys-apps/paludis/paludis-1.4.2.ebuild b/sys-apps/paludis/paludis-1.4.2-r1.ebuild index bb0409d44fb2..1572e3149c22 100644 --- a/sys-apps/paludis/paludis-1.4.2.ebuild +++ b/sys-apps/paludis/paludis-1.4.2-r1.ebuild @@ -1,6 +1,6 @@ # 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.ebuild,v 1.4 2013/10/20 15:53:28 mgorny Exp $ +# $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 @@ -27,7 +27,7 @@ COMMON_DEPEND=" python? ( ${PYTHON_DEPS} >=dev-libs/boost-1.41.0[python,${PYTHON_USEDEP}] ) - ruby? ( >=dev-lang/ruby-1.8 ) + ruby? ( dev-lang/ruby:1.9 ) xml? ( >=dev-libs/libxml2-2.6 ) search-index? ( >=dev-db/sqlite-3 )" @@ -79,6 +79,14 @@ pkg_setup() { 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 |