diff options
| author |   Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2012-11-14 13:08:46 +0000 |
|---|---|---|
| committer | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2012-11-14 13:08:46 +0000 |
| commit | 3e9ec40005e3e213cf8cd18e71d79444c7fed720 (patch) | |
| tree | 317650b41085a8a75efa986b10f80577c1248f50 | |
| parent | Stable for amd64, wrt bug #441350 (diff) | |
| download | historical-3e9ec40005e3e213cf8cd18e71d79444c7fed720.tar.gz historical-3e9ec40005e3e213cf8cd18e71d79444c7fed720.tar.bz2 historical-3e9ec40005e3e213cf8cd18e71d79444c7fed720.zip | |
Add pkg_pretend() check against file collisions with symlinks which were managed by eselect opengl, bug #435682.
Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
| -rw-r--r-- | media-libs/glu/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/glu/Manifest | 4 | ||||
| -rw-r--r-- | media-libs/glu/glu-9.0.0.ebuild | 14 |
3 files changed, 21 insertions, 4 deletions
diff --git a/media-libs/glu/ChangeLog b/media-libs/glu/ChangeLog index 221cf2ca712b..5f1ad0d2c62a 100644 --- a/media-libs/glu/ChangeLog +++ b/media-libs/glu/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/glu # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/glu/ChangeLog,v 1.2 2012/09/20 11:57:23 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/glu/ChangeLog,v 1.3 2012/11/14 13:08:42 chithanh Exp $ + + 14 Nov 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + glu-9.0.0.ebuild: + Add pkg_pretend() check against file collisions with symlinks which were + managed by eselect opengl, bug #435682. 20 Sep 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> glu-9.0.0.ebuild: diff --git a/media-libs/glu/Manifest b/media-libs/glu/Manifest index 75bd4d5d3ee5..73a690c2ec82 100644 --- a/media-libs/glu/Manifest +++ b/media-libs/glu/Manifest @@ -1,4 +1,4 @@ DIST glu-9.0.0.tar.bz2 493206 SHA256 1f7ad0d379a722fcbd303aa5650c6d7d5544fde83196b42a73d1193568a4df12 SHA512 ff920e3fbca739794e1432a92fdd8517aa732110fea71ed724185425042f83ce18e9866c16f95c6e10f6993f0814a90fac9636e2b3d8ca2084d1ac0a860f61c8 WHIRLPOOL 3b63c789dc54da94bceae57601baad96b6d05901e262d2758f68163ed67d9d9bdecf49f96a2a2598891b0398d3403555e1be28d1c7f7deb7a95431cc2e2c2b1e -EBUILD glu-9.0.0.ebuild 1504 SHA256 024c14a37b5d0f73791f04bc7e18e0232757bc45e05f7201ebb5afe6f50962be SHA512 d7345f5c4d73775e9bef2ee4effd2e5bf66232d857cd8a851273a1446c4000a5c0041813bd6c260dacbbc3907812b0496fd6ddb0f93aeb198b526ce261eacca2 WHIRLPOOL a8faa2c4ee4b1e4be8b05d1fed144c1287ef345c53ec48a455ec7713f28c9a3817f8d76441202a0277d06b32be3ab9014657eea0688a311ef0cfe5eafa2df1ca -MISC ChangeLog 522 SHA256 c172bb02ae8fdd3bcf7ef357f6ba07813ce3520d19d2126d2e55f1b946daa675 SHA512 db8fe22c3a46da8dac26f0675c71985f36795b8fedd9000e3ccebe198daf87e5df2b5d4f49d15aefbb06b04b6425271564013c5bfae5e95bfe6caf72b71a5f2d WHIRLPOOL 33d2cf1e3dd2d7a86c64e09ae0d035f5dee8f84e67f93436e2382c35d7cab01c8db071b007c8a74cbffbf94093bdf6d7073efee01e727df8d2660eb5f8109ee3 +EBUILD glu-9.0.0.ebuild 2083 SHA256 d30adc160f2c4a176c19d3f7f7147aa6f2f0ecc5e66397ecb4209c21019d7465 SHA512 beea314603862c4dbc7daa01dcaf4b3ce26c6de624a4c983d21ad28f33449122540c5d0b392f995a9a864c77684ce01dfdcb0c69e7abe989ca429829de479461 WHIRLPOOL aa3481122338e088d4aede8cfc732a758ea2d65af64a78b292d831f9c089c3029e99ea2809b874b321eaa1a3d21cd5f6c7f7cd784cef5470ae9285ea99c2626a +MISC ChangeLog 729 SHA256 6da660099e739cbf4de9b280a7930ebec648246b17734a95827f1686f01258a2 SHA512 3a80a7089f83dc758cdfac6a591625f9fcfc450878224b48ef1969dd3e30784aa6fd6fcdbeb3e58325f7fded37b281fa820c9c45bd077e61a2b1f907a173d09c WHIRLPOOL d233e84f956d7c868ed5cd644270659216c267ee69bc4d4064f1e31ab99175c5c4f62c4a5461d71676653cad66b2f798a3816b204661a4354aa1f06c91b06df3 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93 diff --git a/media-libs/glu/glu-9.0.0.ebuild b/media-libs/glu/glu-9.0.0.ebuild index 6f1a2864c4de..839ee36f55ff 100644 --- a/media-libs/glu/glu-9.0.0.ebuild +++ b/media-libs/glu/glu-9.0.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/glu/glu-9.0.0.ebuild,v 1.2 2012/09/20 11:57:23 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/glu/glu-9.0.0.ebuild,v 1.3 2012/11/14 13:08:42 chithanh Exp $ EAPI=4 @@ -44,6 +44,18 @@ foreachabi() { fi } +pkg_pretend() { + if [[ ${MERGE_TYPE} != buildonly ]] && has collision-protect ${FEATURES}; then + if [[ $(readlink "${EPREFIX}"/usr/$(get_libdir)/libGLU$(get_libname)) == *opengl* ]]; then + eerror "FEATURES=\"collision protect\" is enabled, which will prevent overwriting" + eerror "symlinks that were formerly managed by eselect opengl. You must disable" + eerror "collision-protect or remove ${EPREFIX}/usr/$(get_libdir)/libGLU$(get_libname)*" + eerror "manually. For details see bug #435682." + die "collision-protect cannot overwrite libGLU$(get_libname)*" + fi + fi +} + src_unpack() { default [[ $PV = 9999* ]] && git-2_src_unpack |