commit: ad0bec2eff2d536eebb3360cbaffbc03ae649372
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue May 3 18:59:33 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue May 3 20:43:49 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad0bec2e
sys-apps/paludis: Bump to 2.6.0
sys-apps/paludis/Manifest | 1 +
.../{paludis-9999.ebuild => paludis-2.6.0.ebuild} | 22 ++++++++--------------
sys-apps/paludis/paludis-9999.ebuild | 13 +++++--------
3 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/sys-apps/paludis/Manifest b/sys-apps/paludis/Manifest
index 3c4e861..a6c2d07 100644
--- a/sys-apps/paludis/Manifest
+++ b/sys-apps/paludis/Manifest
@@ -3,3 +3,4 @@ DIST paludis-2.0.0.tar.bz2 1787616 SHA256
9e635d86e655658d31adde5813f5fcad2982b5
DIST paludis-2.2.0.tar.bz2 1786405 SHA256
0b0bcb14a6539874d274c72e6a7b9825aa80fa083c2b61e1d5b14daf24829346 SHA512
9b4dd4613ec31683021d6fc5b5eb094024ceada47c41e09d1f0cb86f1de5b621869756401ba14ec0ec5f5dd20a5f8bf5b596c3891724bb9c245400b5fef4961f
WHIRLPOOL
9cd602561b38e1bb6fc3d9baa5452c63a394c1e51faf299d8d1e82dad9a53969f14be542dac3f90974fcdf08c16c267cfdf45273c5244f378f9a2b7b6288bd97
DIST paludis-2.4.0.tar.bz2 1787689 SHA256
f47b4bb5503dc127022453b15ca811dec22ee2f04c3c3b76ed1c5a83dbe1af1f SHA512
5fbb15d2285c892fdf19288b8838c51ec2439817a9abc685b8692ff4a3ddf76632d3ab51b2e0298c8eacf00f8b00f4e66b47b34db12844cd4eb77cbfb87ca32e
WHIRLPOOL
d9dc107886b8bf09bb203704d559dd030190b8390607964578c3f2e10a5c5cd4400146ffed894a968143761fc8149796d37597274b34b8414133b26c7252345b
DIST paludis-2.4.0_p20160112.tar.xz 1296724 SHA256
2b209337b6a4667ffe8b3db431a88314b3b224cf0f9d57a6d4fdd8c2c00f4b19 SHA512
898853bf75e60dcfcb8aca7e45da3b7eeec2bb119db5b77a12e876282abe936bb3064bf52c27b7a7a949ab0865e7fbbfea78dc66408a09d00a02e1a2069153ae
WHIRLPOOL
5167ad0d234f874ef304e0725ea78517c7bcd2e0ef09b5e8ac6b6cf4213fcbccd3b6057caf89274ed67bfd7b35efa0f33fc82d479f5b5f31937a0b7c48c37777
+DIST paludis-2.6.0.tar.bz2 1885055 SHA256
bde018c89fce95c2cc793d9171e5a51748ad682d06f839fab394e233257aaf4c SHA512
78a9c0a19703dbbc07934de389b749ab83365454e29b19c323d6c03304162e35ff4d92f7ac1f28067ad853057f2422be43418b3c6a57a193c4b8dd5a4e81eba4
WHIRLPOOL
dc4f4ecad0ccbb4b8e6b1b4d0a2c71772b5be244f09dc5456fe42d5510b6b7432ca087f99ae86b2bbbd05b18f70a15371dca1193ead556751faffd01ef227dd6
diff --git a/sys-apps/paludis/paludis-9999.ebuild
b/sys-apps/paludis/paludis-2.6.0.ebuild
similarity index 89%
copy from sys-apps/paludis/paludis-9999.ebuild
copy to sys-apps/paludis/paludis-2.6.0.ebuild
index d61f74a..4bff156 100644
--- a/sys-apps/paludis/paludis-9999.ebuild
+++ b/sys-apps/paludis/paludis-2.6.0.ebuild
@@ -1,28 +1,27 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-EGIT_REPO_URI='git://git.exherbo.org/paludis/paludis.git'
PYTHON_COMPAT=( python2_7 )
# matching profile defaults for now
-RUBY_VER=2.0
+RUBY_VER=2.1
-inherit autotools bash-completion-r1 eutils git-r3 python-single-r1 user
+inherit bash-completion-r1 eutils python-single-r1 user
DESCRIPTION="paludis, the other package mangler"
HOMEPAGE="http://paludis.exherbo.org/";
-SRC_URI=""
+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=""
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
COMMON_DEPEND="
>=app-admin/eselect-1.2.13
- >=app-shells/bash-3.2
+ >=app-shells/bash-3.2:0
dev-libs/libpcre[cxx]
sys-apps/file
pbins? ( >=app-arch/libarchive-3.1.2 )
@@ -39,11 +38,8 @@ DEPEND="${COMMON_DEPEND}
app-text/xmlto
>=sys-devel/gcc-4.7
doc? (
- || (
- >=app-doc/doxygen-1.5.3
- <=app-doc/doxygen-1.5.1 )
- python? (
- dev-python/sphinx[${PYTHON_USEDEP}] )
+ app-doc/doxygen
+ python? ( dev-python/sphinx[${PYTHON_USEDEP}] )
ruby? ( dev-ruby/syntax[ruby_targets_ruby${RUBY_VER/./}] )
)
virtual/pkgconfig
@@ -81,8 +77,6 @@ src_prepare() {
# https://bugs.gentoo.org/show_bug.cgi?id=439372#c2
sed -i -e "1s/ruby/&${RUBY_VER/./}/" ruby/demos/*.rb || die
- ./autotools_prepare.bash || die
- eautoreconf
epatch_user
}
diff --git a/sys-apps/paludis/paludis-9999.ebuild
b/sys-apps/paludis/paludis-9999.ebuild
index d61f74a..ef50c66 100644
--- a/sys-apps/paludis/paludis-9999.ebuild
+++ b/sys-apps/paludis/paludis-9999.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$
@@ -7,7 +7,7 @@ EAPI=5
EGIT_REPO_URI='git://git.exherbo.org/paludis/paludis.git'
PYTHON_COMPAT=( python2_7 )
# matching profile defaults for now
-RUBY_VER=2.0
+RUBY_VER=2.1
inherit autotools bash-completion-r1 eutils git-r3 python-single-r1 user
@@ -22,7 +22,7 @@ KEYWORDS=""
COMMON_DEPEND="
>=app-admin/eselect-1.2.13
- >=app-shells/bash-3.2
+ >=app-shells/bash-3.2:0
dev-libs/libpcre[cxx]
sys-apps/file
pbins? ( >=app-arch/libarchive-3.1.2 )
@@ -39,11 +39,8 @@ DEPEND="${COMMON_DEPEND}
app-text/xmlto
>=sys-devel/gcc-4.7
doc? (
- || (
- >=app-doc/doxygen-1.5.3
- <=app-doc/doxygen-1.5.1 )
- python? (
- dev-python/sphinx[${PYTHON_USEDEP}] )
+ app-doc/doxygen
+ python? ( dev-python/sphinx[${PYTHON_USEDEP}] )
ruby? ( dev-ruby/syntax[ruby_targets_ruby${RUBY_VER/./}] )
)
virtual/pkgconfig
