From dc259be7da5fbe1f910196383af55120973e87ff Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Thu, 22 Jan 2015 16:44:20 +0000 Subject: [PATCH] rm cdinstall USE flag wrt #537260 Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xBDEED020 --- games-engines/openmw/ChangeLog | 7 +++-- games-engines/openmw/Manifest | 32 ++++++++++---------- games-engines/openmw/openmw-0.33.0-r2.ebuild | 19 +++++------- 3 files changed, 28 insertions(+), 30 deletions(-) diff --git a/games-engines/openmw/ChangeLog b/games-engines/openmw/ChangeLog index 0aae593cc839..f770448522e0 100644 --- a/games-engines/openmw/ChangeLog +++ b/games-engines/openmw/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for games-engines/openmw -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-engines/openmw/ChangeLog,v 1.5 2014/11/08 23:33:48 hasufell Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-engines/openmw/ChangeLog,v 1.6 2015/01/22 16:44:16 hasufell Exp $ + + 22 Jan 2015; Julian Ospald openmw-0.33.0-r2.ebuild: + rm cdinstall USE flag wrt #537260 *openmw-0.33.0-r2 (08 Nov 2014) diff --git a/games-engines/openmw/Manifest b/games-engines/openmw/Manifest index c13bd658c19b..c98cc6c20abc 100644 --- a/games-engines/openmw/Manifest +++ b/games-engines/openmw/Manifest @@ -4,25 +4,25 @@ Hash: SHA256 AUX openmw-0.33.0-cfg.patch 338 SHA256 064dee511f54ef063f21eade8dd7d3b13fd9c681fbee42c7ef85572692590f0d SHA512 8217001ee3dd761524e71c155ead3d7bde259a000a38a2edbba1f10c88e8e397992d30f998dd1a47fd44f5b7ea0f7b8b3f258bab28f0d915f98e9b0cad86e5ef WHIRLPOOL ef972affc624a0dacb705588b5b88b502f9a4fa231142cd6d65bfb2faeae18258be07b5ebb9b69c3742d218bdd32ff8d20773bb8cf72dbb0af6248d1f4b4e69d AUX openmw-0.33.0-opencs.patch 324 SHA256 82793593651f0eee8486ea518e9170f348c49ef0aa7756c5e7d3a883f0af07b0 SHA512 788d66fce118e889947e7a9a4a5a749e405d39c273045703fa5f270e1b4566a09175e48bd9b065d84b9b8eb60ef76ad1186e2685d2a0ad2f5bbaca07e2396363 WHIRLPOOL 48bf6f917f081a40eb2ca9f4ff2b16e9e255b65703ee2b06ed9487575d0f3aa12756162942ab5fc4980a3f9cb7e0a73f38280f6f98e5a2c4055a4107277461f5 DIST openmw-0.33.0.tar.gz 3524287 SHA256 62baa03eb206bea760c6b2b0260ae1a942eac34e7439a114398d2101154f4a83 SHA512 96525ee794277284f39a18bbbd01361422273ef073917b5e51ec7951bb15e59e0d0dd39ba70311588d4b18adccffac5c4fed4d9bf9e37ca0e865869277e795f9 WHIRLPOOL ab9df256ff107fcd361a6308c6bcb49aeb5a40289a224173d6d9f883042491c09a1f90af982be257c2e425d8dd1ec44a04025622d41c21c23c9683db182dfd30 -EBUILD openmw-0.33.0-r2.ebuild 2875 SHA256 5bdbdd63047b7c298262f8d6cdcfd8c9b37600d199c3c1e75eac46fd56d35a84 SHA512 009c9946f34ed6d765fbc70788adfb3015f1b12752c8b3b9effe60a51c50754158aed176c7dcbdc18f79cff5b3292a2ddb278e85d09f50db5b0dd0d8b3d65ecb WHIRLPOOL 14df33ae3d462a94dfaf96049c4776d4351b44855ecd9cdd7189600a207347d90af3a19d374be7792929a15024ba9cc7ca0742cba40b4d092c8758e2ff328e53 -MISC ChangeLog 1184 SHA256 0119a3d57ffbbcfaf0b6dfb33b3ee448e653ee498f732bb9cf57681687fb2a57 SHA512 5d24c62fdadc36b17277c58a3bf42b4bb9a289b264a2242e04e4360daa253a543fbbf76507feaeb9f93d95d30dfc1cc5b10b460262c9176b3a36b888d1e734c8 WHIRLPOOL 9f3ffb1af9edb7b1cbb24b4f3838222cfc62c8515d0070adedabe94491773ea3333759a0bc7cc385559140cb172e6ccec45a9504dc96c2e1ef17e4c967748573 +EBUILD openmw-0.33.0-r2.ebuild 2634 SHA256 125a56a296529bbc67133b8c7ec855d0932f0b3f534421f688012a7eb0696b13 SHA512 bdd039d7918073251be4c1ad9d7eeb784d821b7a07de608a71312e4385e614934fd317d41d731ab8275fa3bcf0df017b53edb6032158292e77114ddddfedad41 WHIRLPOOL 219befa0329a14a37a94ff27678e1657d850a3e0afbd048511889495ddcc983743ea1f6373099d341c8a88e6c734612381b50e4b6b00b6f5fa55807000b883cf +MISC ChangeLog 1297 SHA256 ccd53251654ece1d9deb46f95a83c20f0123938852e8209c8011bf40c0d5ef7b SHA512 7a9de3b6ae266009376f73ad57ed122d699b8ecc60a3735cf805b74091d016762b7c84b0b8fcf50111078368f9fc1cec864e1f4888e77ec90479543676f1f34d WHIRLPOOL 936dab547f842b4233bd51669ad196dbbd20b4468ac031022724a511dce85abf93377a7d9d345025c43b30760246e03d2ffc653d64685a0a094e490c8e91b3db MISC metadata.xml 1125 SHA256 7cec4fa3a9e257ea00a5776de3ee5230927804ff96bc3d9a05f75bc4d794d629 SHA512 14da78b996386d420be0aa27ae302ca0bc54e2074d03e0bd4e04f6380105a9e1ac91e6ba565de8c04da8dacbcba88f2b706487c3036ff60aa141cd75d9241730 WHIRLPOOL 808d4881548fea60d99529e4970ac49c711741c47795719c6606b1cc32c08c5d044c546109ae0587b65d17b04162d7015fb4404dca973224ae340460dfccf661 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0 -iQJ8BAEBCABmBQJUXqhgXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJUwSjiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy -MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgDAAP/RIwhuomHk3olbi/QGNJpduc -/BSJp921KZlgJxN9B9KOxY9bQ9apod3jxu1Ys/xzeqTFzXseqakSXgBVm8kE7ruh -35Ky5HYfDSAzZv2jhFRfYBSbK8T7Tyv2QB6LlGzgyKHdCOIJE5VKSVm0gD3AFIz8 -/vm7V55NRo9vnEOvhSnWy9luSbpx9FT1QP/cVDLwuPdoB3esHhs/AMTDP71b2NsJ -UvFQlOf8Btdsi62mBtDlFx1qNJ/e+tbLToKJofPYFwMe7eKdtLA2I5OXFAFFx54n -y6bmD6ikBKbEpAtH9cZq5GOBi4Dicc48tf4j6UTUV1HXLmKZKO/1kLHngIvl9ID7 -jYJPrvv1QhoilFTicK/H3zRZbpUN48RmBx1oRmMKcVjY5dcKtIOMWYPqivTGCN9B -NnBzP3Fc/PtmZ+YICNj7KdDL5eCEX84K7fv+jaZDx013rz6TXBsWl7wsZ+V9rSH3 -b0NUKO5Llb4kGOUZDKX/EU/7RhoAWTXv1boZwWychSn08FJiwoZOFimrbxV6AWPK -BYV6XvlpR2PcRVgy5+Rys5Aur++8eqdUbs0ilrkLjACJj6c3uQvpfHe6pRvhivk4 -6IspxZ/mRt9lQICjwkjOnXhokdN5s8y+tTM7TI3ULYeEcw4/mhgFwqzKWVp3P1wC -vDqJ9ZSkkNF7d/1AQSU+ -=a9EV +MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAg4pAP/RG07qUQKb7mPjD5M5tHvjLD +cJmKvIMrl8F5czZHwTcbD6qysjfg+wI6XYs6wF33Me6+Px3gRv/uK7hV+F6KzHCK +YUf6rZ+TgSN7tZAw1k/aP9fmWvdh9oXzqgh4A8t0Ou6Q3vIy63tg67pKu/b9lu+B +l8Li5v3dalzO6MufX7zBx0tiF/1VPPN7yGPgrF10wfuyRc7eGdq3SelDkeCDp4JE +ptN2ypBSoriVnEmSWkj7S/uFUznsA4n4isfoQiaExab33PamynM8ClugrASOBHdQ +Inh6rvQ2HeG5kWnMk+9Tn+D/uxdeNUFV6nEBtzOCcALRSeSQxOAQefdOqwfqerDV +G6T1KiOH5yZUqKia6qZywQ7gkioKmVaQ1AofhDXqimpl4+kfsy421QY1YnkP2VvA +D649iqODHxMgmWnfhx8Dp9b9OAze1Yp6Xt/mL7KMkHJMNrVR1nluRN86RHJ5rK+9 +V6rZbrOCYYofoyDZ+J+h/B8eURu9xxGjy26uTI2wDuuLicO9GEy/ADmH+/2vaRL+ +greYsppuy15rIBGQcd34UNwe0cUCbWAEFe+ORcwcZ8aqHNu/qxd/7erMRF/Z2JYH +d3xdBeN+9IZC/O+uxGAnT+kieT5yFaKDNPkxurIbxw7Vuv+6yQxb/1QU5ew3pksy +q/qRhxih63vJZqnO+XKh +=eZmZ -----END PGP SIGNATURE----- diff --git a/games-engines/openmw/openmw-0.33.0-r2.ebuild b/games-engines/openmw/openmw-0.33.0-r2.ebuild index acc5dd9be647..b18e9a322ad5 100644 --- a/games-engines/openmw/openmw-0.33.0-r2.ebuild +++ b/games-engines/openmw/openmw-0.33.0-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-engines/openmw/openmw-0.33.0-r2.ebuild,v 1.1 2014/11/08 23:33:48 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-engines/openmw/openmw-0.33.0-r2.ebuild,v 1.2 2015/01/22 16:44:16 hasufell Exp $ EAPI=5 @@ -13,7 +13,7 @@ SRC_URI="https://github.com/OpenMW/openmw/archive/${P}.tar.gz" LICENSE="GPL-3 MIT BitstreamVera OFL-1.1" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="doc cdinstall devtools +launcher" +IUSE="doc devtools +launcher" # XXX static build RDEPEND=">=dev-games/mygui-3.2.1 @@ -32,7 +32,6 @@ RDEPEND=">=dev-games/mygui-3.2.1 DEPEND="${RDEPEND} virtual/pkgconfig doc? ( app-doc/doxygen media-gfx/graphviz )" -PDEPEND="cdinstall? ( games-rpg/morrowind-data )" S=${WORKDIR}/${PN}-${P} @@ -96,14 +95,10 @@ pkg_postinst() { games_pkg_postinst gnome2_icon_cache_update - if use !cdinstall ; then - elog "You need the original Morrowind Data files. If you haven't" - elog "installed them yet, you can install them straight via the" - elog "game launcher (launcher USE flag) which is the officially" - elog "supported method or by using the" - elog "games-rpg/morrowind-data (cdinstall USE flag) package" - elog "(this might not work for all morrowind releases out there)." - fi + elog "You need the original Morrowind Data files. If you haven't" + elog "installed them yet, you can install them straight via the" + elog "game launcher (launcher USE flag) which is the officially" + elog "supported method." } pkg_postrm() { -- 2.26.2