# ChangeLog for sys-apps/paludis
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/ChangeLog,v 1.250 2015/03/21 15:37:58 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/ChangeLog,v 1.251 2015/03/29 18:30:52 mgorny Exp $
+
+*paludis-2.2.0-r2 (29 Mar 2015)
+
+ 29 Mar 2015; Michał Górny <mgorny@gentoo.org>
+ +files/paludis-2.2.0-check-IUSE_EFFECTIVE-in-EAPI-5.patch,
+ +files/paludis-2.2.0-filter-EBUILD_PHASE_FUNC.patch,
+ +files/paludis-2.2.0-filter-IUSE_EFFECTIVE.patch,
+ +files/paludis-2.2.0-fix-MERGE_TYPE.patch,
+ +files/paludis-2.2.0-fix-PWD-handling.patch, +paludis-2.2.0-r2.ebuild,
+ -paludis-2.2.0-r1.ebuild:
+ Backport some EAPI support bugfixes.
21 Mar 2015; Michał Górny <mgorny@gentoo.org> paludis-2.2.0-r1.ebuild:
Add -k to emake check, to get as many tests done as possible on failure.
Hash: SHA256
AUX paludis-2.0.0-fix-format-security.patch 5556 SHA256 ebbb74a941370675edfca73f29e953773921267a8f618554384bd8b06648f2f3 SHA512 88684502ece678cc76415ad7355495bd060cadaeb8a1880fd848478eb68b9c8eef65e1a057e803da8ea5db133253e298182667c327a669bf23f3cca27d31e3c7 WHIRLPOOL 0711cc616e46c3394d521d61d2d508d2259c3816e1bff598a68a40b4feef8cfaa63a7b366bfde9969143692c88f46cbb7775c4c754ed3df2378cd0ad254c3a76
+AUX paludis-2.2.0-check-IUSE_EFFECTIVE-in-EAPI-5.patch 3042 SHA256 929dfad378dd5f614b73b676aa0c325d5cc5e252dbbff787e97b7d5ff599b1b8 SHA512 415140a1ab74ec1dbd85405886eac7e037ee56ddb250e6e9d4a50749fd40b4f38e0387728b3db9703f8fdfd2f07e3c0728b5e07b1d4d93ca2f93da78314bd622 WHIRLPOOL e2167b2f05adeceab5ea6a23936c0900918604350bafb6549866de2117f2d30baa1cf9011ad1abaf1b4231381f786af17caf39c0a06ce19761be3fa310eccece
+AUX paludis-2.2.0-filter-EBUILD_PHASE_FUNC.patch 1074 SHA256 8b2d0aa55aa7cc946b9f6bc91fb67f02e10796d32ba8a54aa2609bcc565d663e SHA512 09c5f073976a83e67bf68f76e868c8f77b7975353dc9dc200d43551965dc70eaeca3aff13bc351c3a2b1ccb534e2bb4f3182759acdab9c32c1b8872949b23d0f WHIRLPOOL 27212e592a51ebe31606f93d0955ee9f9657fc70ae9d4ec005a2ee873bed34fef00cc82307db98bbb29cfd86789a24c192431b1c0dcfcfe9a17e0541fe5f7757
+AUX paludis-2.2.0-filter-IUSE_EFFECTIVE.patch 1626 SHA256 f7c6cd18ebe6d36f43c3f40e1a77f91b1ac73e4895931153b952cda4906c5e32 SHA512 b933a5f710a3a47de5746b2d6d1fa826ca8fce27a93bb0bf542b27bb778a8eb33e846ab63c50de3281a70c45701d5c8df60d78f295582254123b3652e9ed1412 WHIRLPOOL 8c2ec54bcc1808af1dc525eac66a27861a823f6e2c2ddc06f829f04836259cee271345386f3c3b1a91ebbbe4ac298277d646c6780e7f1524d2e14f4decc5e595
+AUX paludis-2.2.0-fix-MERGE_TYPE.patch 3444 SHA256 9ca51104d647f02b1c6ec8c6fe220dcd13506a29d4c9179dcd4f0118682ce5f6 SHA512 b0f42ec59d11fd8eaf0c60c918719a6855fc389bd4e45522f4918114af7adfc33173bece4c2ca6e926764e49fd9de3095ebfd3c882fafc53fe12f978b44f4b9b WHIRLPOOL 9a7aa0c9af417ce94a4022c01ec71d728daabf0a196f377b57889eb3f1ab302e4c0750e8361f7133853059f9a46357161fbbd5c6b0d15e9fbf156ef15c94446c
+AUX paludis-2.2.0-fix-PWD-handling.patch 1363 SHA256 ad4b75c7e60691e6d0e78f250e8208ad2a1d3ccf6365da63938b3a3c60b9296c SHA512 dc797c8f3c04d40a00b4ed400a3cdd4a5e5aec67fa149c0381161f02cb32cc179f8c9994fcd2c3b669602b200741c2271fc9e59cf5beb35929f9155bdbd41ee3 WHIRLPOOL 7de5af57ba5adf29abc615231bf08ae3b2116736b60dbc2e45eec188bf1aeb99179a9b1f19d54b05875ba840e9338c7dd7c949e971c07ffd9a591d905046eb7e
DIST paludis-1.2.0.tar.bz2 1793681 SHA256 310c77163ea83c2ef43dba7c9a11daf894001b1a2d1f966612b22aa236de39f7 SHA512 53b1cb2dda4ae99659c2fd79a23c79659f9d1037a48dea01a3bcb6ebc3b2df0dba182f91eea2c5b1785e5bb463cf1846e5605064942aa91b2c95ff4e238e1c1f WHIRLPOOL 8114e9163edd830187f55df307c5b76c0f39f8eca2dd24f45b04b198f914d828703b045fb1efbde13a3d5b036782753a0fbf385587fa5cc61026aab9ae6e922b
DIST paludis-1.4.0.tar.bz2 1792579 SHA256 161c02b4328acc5cade6e37c69176ac227a695b056a2942690f833c4b1f008b0 SHA512 9e9d8a00a20f79b6a7220ddc47c924114c07814ed6cc3e1c3ec7736b17378b6e8a3aa03adaf060dcb97aca01ea9b832b082336e1e67725ef9def68da3cfc3e15 WHIRLPOOL 4fd41cc3b15ebc7ea05b87408053e27fbdf1fb7ddc6a0a1ee882faeb281281a7206f9ee98603860e0bb2a6924af6b8c0954241e702262509757a9b140eeded6f
DIST paludis-1.4.2.tar.bz2 1791385 SHA256 ac342d908572e97968abcdd806ba9f390585a06f8da213b34374475972cb2611 SHA512 1176812683453e61897005612f525aad42b38063ff680e645ee840d63c3ffe866578f4c2756f85f7d8bea5be8ca70d3ad1713c0ea2de9e18a76135251126c109 WHIRLPOOL 72b7391b242cebd78883e43ad82d736825841de64a2e4675a7b43a751a51edd3da8acdf37888b5112f4c9aa22c0137502e519cb81b6a1085681a4d860dafcd1c
EBUILD paludis-1.4.0.ebuild 5064 SHA256 c5dec16232126d5d8aeccb744f099db9fd1a391f636a85194b2a6bde5cd565e3 SHA512 492d4ce94977383e35684727a589fd3cdf12cd0c6b34e33a2aa3faea2440e95c661391c6c8103d439f478f27cde2d8f16d7bf8b5564890c6de552e00eabbab81 WHIRLPOOL 87f046c68465995e3939affc795132e9b04e833443196c0480b3ce127fe05e44affb91a1af3ae7346ec54f0f1625607001b4759a07c053064c89d904828d6f82
EBUILD paludis-1.4.2-r1.ebuild 4088 SHA256 6148cbe68a0550e950c1ffd782893d1cf62d201d27ff55b653ead7753ba25eb6 SHA512 320a4e284d907dbd905f85587455a734e538a303343b2918038b02befe3d299af1345699765259c90662b3b3890fb3fc383ca5ab5e6b869ea2d7324a1a690be5 WHIRLPOOL 81e12491803a98d4079980f350d44541f44a53564cabe418034a2f66945db4a872ef16aa2a383ca6121d54928e7e444f75d51c4f871c241728ba5f10519064fa
EBUILD paludis-2.0.0.ebuild 4111 SHA256 820623f08617defc485f4a185b1c04b608ef5abf5c59560ac8284ca4185d4528 SHA512 1cb2d92f05e4c406a1e354804eb7865d17442d3154b7c23544cb7a10ff9d42340d060ab6638832c6f78091058fde9d0714434c35b5fe547509434eb20af11660 WHIRLPOOL 7b0c4c37e55736049a59d5d30be73deb20c394858e8fe0608eb46e99ed5be17c7b2aa1cc1df6173e5d658a9eeb725c8429538c32d634c6271d01076625ca4219
-EBUILD paludis-2.2.0-r1.ebuild 4038 SHA256 23ba5ec4b28633dc9d83e5437cc24299a61e50dbc6ed3a9478d1102347d3d15a SHA512 4a6526d56190931294c58cfd1b1bc0272e91dce8c5e9ffec4edfa42c2f34f6c0754e74a19d826a7bbd9c949988dc180548b8a2136d378d5491937f94dd04b695 WHIRLPOOL ae66238bd3f126b8865f4a7c4c171f105cd211bf1b0c911704ee59612909c4cb71b860821ab6bc9f21c20939c322eba1fd72200fdcbf690f59d7e95dde1d3eef
+EBUILD paludis-2.2.0-r2.ebuild 4351 SHA256 d047cb043530776b36eef231addd7908dca6554cd84b7500dd2d9c9450b5e507 SHA512 600baf245cd1b7edc5dfbed52ea12492c119c2972e745c68b85d7056c67219a31275405d327b6dfcad6765e37815c705d6fbf291fac496b328722f1b98324b35 WHIRLPOOL 358e86a4f0bae5d5c08e2bcda44315509a182fb073a63becb5ca77ac7c298f2240775022ae6e2eddf5ca65ec0e6f8c311f37c63f97e27ffee552e213dcb34fae
EBUILD paludis-2.2.0.ebuild 4038 SHA256 598cc3889f9108fd9c0553cfd7717b8e11f0a6b45db242d88fd2e20b399c391f SHA512 fce9dd1856850e0eaf5d406576bd2a993828aabc72afcd0fee72f68f92dc86a9c6364abaf9cda7f1c5ca63231b0edf8dce4d7a7e806b0b82ba0fc1a8e1e1afb8 WHIRLPOOL b951226d1a65d8a58da815eeabccdada4c8554b5cd0bf532368e35727ed36affc4e91696549ed39384178e138b5f0fde55a367504c072af015a1956ae97769d6
-MISC ChangeLog 39393 SHA256 0dd40843bad4421815b4de8b77fa722e34616ba244be29aec0c31118fc9778a5 SHA512 73acdc331442a19c0cf654481c53b76da9e45fe127ee51c99ae21a794aa85a662f9cf46ce0448a04be0d9a395f537fa1df8621b54d28f19ad5781f1e10c9e964 WHIRLPOOL c8be329d5db83cbfef8fd8c17d4d0247ecdb283fe013c8120c353b40a3ab3e3ca41d3fdda3490b3ce1d2342507071d844da09574bb92ab26202347aa9419631b
+MISC ChangeLog 39830 SHA256 0f92bd23d21dbe246811e8f1ae69801e6f70159636337131a88aa4d2f22e4082 SHA512 dd24500b2f3150a04200909547d582a301cc73aa51c51f95b5cb401d384b2ebf0eb5bf262003850016803f952e7e1a19bb210e0151ea20b4b65d0ad464077ba7 WHIRLPOOL 48bcb2f8fb6d8eece90e1483bc0a1cd606542c09dabdb21c1f6844a166aaac153c29ec781e2493f6ce81d12737bde52dbe0e2d73679384c02dbff4612e1794d3
MISC metadata.xml 1141 SHA256 300482e42865640820375ce50549e529bcc15bf168c4595692be2413155c6a37 SHA512 26b475393d38f6833e404cbbb8c8c52e3e32c0015d60debf6cf5d2470407a18b83e28211f09b693cd6f9de0fc7141c08ec66adaeec99c34c7ba1496f58f2fbce WHIRLPOOL bf53292f6e023dbfa7c9707838c8aac45d957d9ca6b4bec12c0a8d6179edf84eb2792a45ea4ff61629c16c9139a76c76c58024041c4e0264e51d064094b616d9
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQJ8BAEBCABmBQJVDZBYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVGETdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOe+EQALbKc9+EH/dbh10xuK58jm2z
-Vpu0rV4A6VC5SkQQ+nLxTnBOWq5cXHY9DnjuStuOnjuy2abnueJPVbd8j4Rgr+pE
-01UFTlndhrlm4eBglPYF5T7zopbtC9qc+Ixtuc+Hwpsg2ba/rqNdPijkrY1lYaPr
-NFT+NKbKbdAwKReYoGDZCh3vzKjZNcxVc06eAMqk4I7SCsYqDpxorIxaSnvoUiX2
-3W6VEppD1crOommuFr9QSFeef5Y0f4a316d42AZoRRqFd+y/fADk4hDxiwXkoK2W
-8WGTIY0Zo7uGAmoD8Fqpm9VtAUoohFEMVh6n2IXZE99J0bEJy30jTZgJGAU+AR17
-eXL4YOTdc/94qp8HSyp8Owd/8v6cWDuqRyHC90oelJf0k9JOgnoOstRVZ0sxoG9W
-IHpiDwORaQHNwj3gUL1y2uGnJhuPOixhtFSnhlEBpC6iDQL4iJzvTSkuP6XIszPN
-euzKSM//5g9lVV8bQSvFrgSrbSkeeYfRGLNgxXlpUbnNqciM2dReR1UX/6DynWHS
-SmllXa3gU0ov12En07Zq9y+rFfUMSdK0APCXqmnJ+XyA/e4CEQe7qFADrkefE6R9
-25kY1WHa+DcZuWO1up77jQL6EDivgCvM5tVUzk//ty5LWcnxg18dOrzS4U8sMFEm
-7jdgvf0ItydwYdM+Y8/V
-=YFuW
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZORy8QAJD9H69PNrih2V6tgBryy4Xd
+agZq4QxdXZNfx6kykqToJeWxvpVc80+R4lbRQ7m2qtb1/kgir1STgZU4unMYfXJE
+1JpZWyhsXZCi4aYMF8KuB5aQZkSJExBxDT6arEYEL5afCrWCoKhl/gsdpbGkuOIn
+KkZKtCyP/YECG5avbxof7COmffmHz55Vh2tV7ZwIfj/gVzv6pT5hmrfAxv5D1sOz
+gYAc9MXZAjZG22AD7lq0WFxkKdmqWc8HKYCqj/SaYyf2j391A8ETLxLI0ARWJxFo
+crRV7yhhpamhNb2qKlN5ikoLH+IiIIRYHOc6N1C4uWDruDSjpFLVOmFavnCXduAO
+KwQZpucoT9RDYkYQO1R77mU+RF1vot0lnVAM1bCLU2eih6M5VvSNT8eluZHp4xcJ
+5hcTx96BORKto8CRET1BPgFPdVJ6wRaqIIHQyue2Twxj/kFIAT9m1CFz24ToEDtv
+9KHmYgXM49d/JwPBSGm1d9Gqpi1fbS3SPunk0R6QtVJNlg5gytVTngAlJWknsUgQ
+IWRU1LFbcfb7wYpVno4zag9uDx1U3J5yztv1qmd7kskKlsOy7E6A0r+V45cIfWI2
+VjVflmptwLBG5biP6hvPP7POpCh4LvByuy6VKHyPkAkl2r2Au8Gqa9nA7jPd3huz
++hgxriE99rWeZtD6l9/b
+=Ji1t
-----END PGP SIGNATURE-----
--- /dev/null
+From bfb1bd7682b4a678cfa7dccb87d1f49d842317ac Mon Sep 17 00:00:00 2001
+From: David Leverton <levertond@googlemail.com>
+Date: Sat, 21 Mar 2015 20:04:30 +0000
+Subject: Only check IUSE_EFFECTIVE for EAPI 5
+
+In other EAPIs the value isn't set by C++, and therefore may leak in
+from the calling environment.
+
+diff --git a/paludis/repositories/e/ebuild/0/list_functions.bash b/paludis/repositories/e/ebuild/0/list_functions.bash
+index 0c5d91a..4998c2b 100644
+--- a/paludis/repositories/e/ebuild/0/list_functions.bash
++++ b/paludis/repositories/e/ebuild/0/list_functions.bash
+@@ -37,13 +37,6 @@ usev()
+
+ useq()
+ {
+- if [[ -n "${IUSE_EFFECTIVE:+x}" ]] ; then
+- local i=( $IUSE_EFFECTIVE )
+- if ! hasq ${1#!} "${i[@]#[+-]}" ; then
+- die "Flag '${1#!}' is not included in IUSE_EFFECTIVE=\"${IUSE_EFFECTIVE}\""
+- fi
+- fi
+-
+ if [[ "${1:0:1}" == "!" ]] ; then
+ ! hasq "${1#!}" "${USE}"
+ else
+diff --git a/paludis/repositories/e/ebuild/5/Makefile.am b/paludis/repositories/e/ebuild/5/Makefile.am
+index fbcb919..ced4e53 100644
+--- a/paludis/repositories/e/ebuild/5/Makefile.am
++++ b/paludis/repositories/e/ebuild/5/Makefile.am
+@@ -7,6 +7,7 @@ libexecprog5dir = $(libexecdir)/paludis/5
+ libexecprog5_SCRIPTS = \
+ src_test.bash \
+ usex.bash \
++ list_functions.bash \
+ output_functions.bash
+
+ TESTS =
+diff --git a/paludis/repositories/e/ebuild/5/list_functions.bash b/paludis/repositories/e/ebuild/5/list_functions.bash
+new file mode 100644
+index 0000000..7cb22ad
+--- /dev/null
++++ b/paludis/repositories/e/ebuild/5/list_functions.bash
+@@ -0,0 +1,41 @@
++#!/usr/bin/env bash
++# vim: set sw=4 sts=4 et :
++
++# Copyright (c) 2006, 2009, 2012 Ciaran McCreesh
++# Copyright (c) 2015 David Leverton
++#
++# Based in part upon ebuild.sh from Portage, which is Copyright 1995-2005
++# Gentoo Foundation and distributed under the terms of the GNU General
++# Public License v2.
++#
++# This file is part of the Paludis package manager. Paludis is free software;
++# you can redistribute it and/or modify it under the terms of the GNU General
++# Public License, version 2, as published by the Free Software Foundation.
++#
++# Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
++# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
++# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
++# details.
++#
++# You should have received a copy of the GNU General Public License along with
++# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
++# Place, Suite 330, Boston, MA 02111-1307 USA
++
++ebuild_load_module --older list_functions
++
++useq()
++{
++ if [[ -n "${IUSE_EFFECTIVE:+x}" ]] ; then
++ local i=( $IUSE_EFFECTIVE )
++ if ! hasq ${1#!} "${i[@]#[+-]}" ; then
++ die "Flag '${1#!}' is not included in IUSE_EFFECTIVE=\"${IUSE_EFFECTIVE}\""
++ fi
++ fi
++
++ if [[ "${1:0:1}" == "!" ]] ; then
++ ! hasq "${1#!}" "${USE}"
++ else
++ hasq "${1}" "${USE}"
++ fi
++}
++
+--
+cgit v0.10.2
+
--- /dev/null
+From dccb65acba7684c97675473fec5120e3aa55d2d0 Mon Sep 17 00:00:00 2001
+From: David Leverton <levertond@googlemail.com>
+Date: Sun, 29 Mar 2015 18:36:02 +0100
+Subject: Fix EBUILD_PHASE_FUNC leakage
+
+
+diff --git a/paludis/repositories/e/ebuild/ebuild.bash b/paludis/repositories/e/ebuild/ebuild.bash
+index 24a93d4..b856bad 100755
+--- a/paludis/repositories/e/ebuild/ebuild.bash
++++ b/paludis/repositories/e/ebuild/ebuild.bash
+@@ -76,7 +76,7 @@ ebuild_sanitise_envvars
+ # fancy fake variables
+ EBUILD_METADATA_VARIABLES="DEPEND RDEPEND PDEPEND IUSE IUSE_EFFECTIVE SRC_URI DOWNLOADS RESTRICT \
+ LICENSE LICENCES KEYWORDS INHERITED PROVIDE HOMEPAGE DESCRIPTION DEPENDENCIES \
+- E_IUSE E_DEPEND E_RDEPEND E_PDEPEND PLATFORMS DEFINED_PHASES \
++ E_IUSE E_DEPEND E_RDEPEND E_PDEPEND PLATFORMS DEFINED_PHASES EBUILD_PHASE_FUNC \
+ MYOPTIONS E_MYOPTIONS E_DEPENDENCIES BINARY_KEYWORDS BINARY_URI \
+ GENERATED_USING GENERATED_TIME GENERATED_FROM_REPOSITORY BINARY_PLATFORMS REMOTE_IDS \
+ SUMMARY BUGS_TO UPSTREAM_DOCUMENTATION UPSTREAM_CHANGELOG \
+--
+cgit v0.10.2
+
--- /dev/null
+From ef6930e03428ec512c9d564886c06078e5238d45 Mon Sep 17 00:00:00 2001
+From: David Leverton <levertond@googlemail.com>
+Date: Sat, 21 Mar 2015 19:38:52 +0000
+Subject: Add IUSE_EFFECTIVE to EBUILD_METADATA_VARIABLES{,_FROM_CPLUSPLUS}
+
+
+diff --git a/paludis/repositories/e/ebuild/ebuild.bash b/paludis/repositories/e/ebuild/ebuild.bash
+index f4387e1..24a93d4 100755
+--- a/paludis/repositories/e/ebuild/ebuild.bash
++++ b/paludis/repositories/e/ebuild/ebuild.bash
+@@ -74,7 +74,7 @@ ebuild_sanitise_envvars
+
+ # The list below should include all variables from all EAPIs, along with any
+ # fancy fake variables
+-EBUILD_METADATA_VARIABLES="DEPEND RDEPEND PDEPEND IUSE SRC_URI DOWNLOADS RESTRICT \
++EBUILD_METADATA_VARIABLES="DEPEND RDEPEND PDEPEND IUSE IUSE_EFFECTIVE SRC_URI DOWNLOADS RESTRICT \
+ LICENSE LICENCES KEYWORDS INHERITED PROVIDE HOMEPAGE DESCRIPTION DEPENDENCIES \
+ E_IUSE E_DEPEND E_RDEPEND E_PDEPEND PLATFORMS DEFINED_PHASES \
+ MYOPTIONS E_MYOPTIONS E_DEPENDENCIES BINARY_KEYWORDS BINARY_URI \
+@@ -82,7 +82,7 @@ EBUILD_METADATA_VARIABLES="DEPEND RDEPEND PDEPEND IUSE SRC_URI DOWNLOADS RESTRIC
+ SUMMARY BUGS_TO UPSTREAM_DOCUMENTATION UPSTREAM_CHANGELOG \
+ UPSTREAM_RELEASE_NOTES PROPERTIES PALUDIS_DECLARED_FUNCTIONS SLOT EAPI OPTIONS USE \
+ PALUDIS_EBUILD_RDEPEND_WAS_SET PALUDIS_EBUILD_DEPEND REQUIRED_USE SCM_REVISION"
+-EBUILD_METADATA_VARIABLES_FROM_CPLUSPLUS="SLOT EAPI OPTIONS USE"
++EBUILD_METADATA_VARIABLES_FROM_CPLUSPLUS="SLOT EAPI OPTIONS USE IUSE_EFFECTIVE"
+
+ shopt -s expand_aliases
+ [[ -z ${PALUDIS_SHELL_OPTIONS} && unset == ${PALUDIS_SHELL_OPTIONS-unset} ]] &&
+--
+cgit v0.10.2
+
--- /dev/null
+From 96768e54e2fdfc526edd2e939f20203e43b25a36 Mon Sep 17 00:00:00 2001
+From: David Leverton <levertond@googlemail.com>
+Date: Sun, 1 Mar 2015 15:22:32 +0000
+Subject: Fix MERGE_TYPE
+
+Unfortunately the test cases were broken in the same way as the
+feature itself, so it wasn't caught.
+
+Fixes: ticket:1323
+
+diff --git a/paludis/repositories/e/e_repository_TEST_4.cc b/paludis/repositories/e/e_repository_TEST_4.cc
+index a59014d..caccf2c 100644
+--- a/paludis/repositories/e/e_repository_TEST_4.cc
++++ b/paludis/repositories/e/e_repository_TEST_4.cc
+@@ -301,7 +301,6 @@ TEST(ERepository, EAPI4MergeType)
+ n::replacing() = std::make_shared<PackageIDSequence>(),
+ n::want_phase() = &want_all_phases
+ ));
+- ::setenv("EXPECTED_MERGE_TYPE", "source", 1);
+
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ PackageDepSpec(parse_user_package_dep_spec("=cat/merge-type-4::test-repo",
+@@ -371,7 +370,6 @@ TEST(ERepository, EAPI4MergeTypeBin)
+ n::replacing() = std::make_shared<PackageIDSequence>(),
+ n::want_phase() = &want_all_phases
+ ));
+- ::setenv("EXPECTED_MERGE_TYPE", "buildonly", 1);
+
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ PackageDepSpec(parse_user_package_dep_spec("=cat/merge-type-bin-4::test-repo",
+@@ -389,7 +387,6 @@ TEST(ERepository, EAPI4MergeTypeBin)
+ n::replacing() = std::make_shared<PackageIDSequence>(),
+ n::want_phase() = &want_all_phases
+ ));
+- ::setenv("EXPECTED_MERGE_TYPE", "binary", 1);
+
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ PackageDepSpec(parse_user_package_dep_spec("=cat/merge-type-bin-4::binrepo",
+diff --git a/paludis/repositories/e/e_repository_TEST_4_setup.sh b/paludis/repositories/e/e_repository_TEST_4_setup.sh
+index 81b6593..0c28acc 100755
+--- a/paludis/repositories/e/e_repository_TEST_4_setup.sh
++++ b/paludis/repositories/e/e_repository_TEST_4_setup.sh
+@@ -956,6 +956,8 @@ KEYWORDS="test"
+
+ S="${WORKDIR}"
+
++EXPECTED_MERGE_TYPE=source
++
+ pkg_setup() {
+ if [[ ${EXPECTED_MERGE_TYPE} != ${MERGE_TYPE} ]] ; then
+ die ${EXPECTED_MERGE_TYPE} is not ${MERGE_TYPE}
+@@ -975,10 +977,13 @@ KEYWORDS="test"
+
+ S="${WORKDIR}"
+
++EXPECTED_MERGE_TYPE=buildonly
++
+ pkg_setup() {
+ if [[ ${EXPECTED_MERGE_TYPE} != ${MERGE_TYPE} ]] ; then
+ die ${EXPECTED_MERGE_TYPE} is not ${MERGE_TYPE}
+ fi
++ EXPECTED_MERGE_TYPE=binary
+ }
+ END
+ mkdir -p "cat/required-use-all-good" || exit 1
+diff --git a/paludis/repositories/e/ebuild/ebuild.bash b/paludis/repositories/e/ebuild/ebuild.bash
+index a88554b..f4387e1 100755
+--- a/paludis/repositories/e/ebuild/ebuild.bash
++++ b/paludis/repositories/e/ebuild/ebuild.bash
+@@ -304,7 +304,7 @@ ebuild_scrub_environment()
+ echo "\${!${PALUDIS_CLIENT_UPPER}_CMDLINE_*} ${PALUDIS_CLIENT_UPPER}_OPTIONS" )
+
+ unset -v CATEGORY PN PV P PNV PVR PF PNVR
+- unset -v ebuild EBUILD
++ unset -v ebuild EBUILD MERGE_TYPE
+ unset -v $(
+ for v in ${PALUDIS_SOURCE_MERGED_VARIABLES} ${PALUDIS_BRACKET_MERGED_VARIABLES} ; do
+ echo E_${v}
+--
+cgit v0.10.2
+
--- /dev/null
+From f9b2434560399b00f7de479474f8f22fc0271e77 Mon Sep 17 00:00:00 2001
+From: Georgi Georgiev <chutz@gg3.net>
+Date: Tue, 10 Mar 2015 00:38:36 +0900
+Subject: PWD is a special variable, we should leave its value alone
+
+Bash sets the value of PWD to the current working directory. It is not a
+good idea to change that variable without actually changing the
+directory. This would happen if the working directory changes between
+saving and loading the environment (saving - when building a PBIN, and
+loading - when installing it for example), so better let bash handle
+this variable.
+
+Fixes: ticket:1325
+
+diff --git a/paludis/repositories/e/ebuild/source_functions.bash b/paludis/repositories/e/ebuild/source_functions.bash
+index 58b9327..5bfb251 100755
+--- a/paludis/repositories/e/ebuild/source_functions.bash
++++ b/paludis/repositories/e/ebuild/source_functions.bash
+@@ -37,7 +37,7 @@ ebuild_need_extglob()
+ ebuild_safe_source()
+ {
+ set -- "${@}" '[^a-zA-Z_]*' '*[^a-zA-Z0-9_]*' \
+- EUID PPID UID FUNCNAME GROUPS SHELLOPTS BASHOPTS BASHPID IFS \
++ EUID PPID UID FUNCNAME GROUPS SHELLOPTS BASHOPTS BASHPID IFS PWD \
+ 'BASH_@(ARGC|ARGV|LINENO|SOURCE|VERSINFO|REMATCH)' \
+ 'BASH_COMPLETION?(_DIR)' 'bash+([0-9])?([a-z])' \
+ EBUILD_KILL_PID PALUDIS_LOADSAVEENV_DIR PALUDIS_DO_NOTHING_SANDBOXY SANDBOX_ACTIVE \
+--
+cgit v0.10.2
+
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-2.2.0-r1.ebuild,v 1.2 2015/03/21 15:37:58 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-2.2.0-r2.ebuild,v 1.1 2015/03/29 18:30:52 mgorny Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
-inherit bash-completion-r1 eutils python-single-r1 user
+inherit autotools bash-completion-r1 eutils python-single-r1 user
DESCRIPTION="paludis, the other package mangler"
HOMEPAGE="http://paludis.exherbo.org/"
# https://bugs.gentoo.org/show_bug.cgi?id=439372#c2
sed -i -e '1s/ruby/&19/' ruby/demos/*.rb || die
+ local PATCHES=(
+ "${FILESDIR}"/${P}-fix-MERGE_TYPE.patch
+ "${FILESDIR}"/${P}-fix-PWD-handling.patch
+ "${FILESDIR}"/${P}-filter-IUSE_EFFECTIVE.patch
+ "${FILESDIR}"/${P}-check-IUSE_EFFECTIVE-in-EAPI-5.patch
+ "${FILESDIR}"/${P}-filter-EBUILD_PHASE_FUNC.patch
+ )
+
+ epatch "${PATCHES[@]}"
epatch_user
+ eautoreconf
}
src_configure() {
projects / gentoo.git / commitdiff