Fix 14.0.3 ebuild and bump to 14.1.4

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xBEE84C64

4 files changed, 151 insertions, 22 deletions

diff --git a/app-emulation/crossover-bin/ChangeLog b/app-emulation/crossover-bin/ChangeLog
index df5ce1252149..0e26333570f7 100644
--- a/app-emulation/crossover-bin/ChangeLog
+++ b/app-emulation/crossover-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/crossover-bin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/ChangeLog,v 1.20 2015/06/14 18:31:19 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/ChangeLog,v 1.21 2015/07/29 22:06:16 ryao Exp $
+
+*crossover-bin-14.1.4 (29 Jul 2015)
+
+  29 Jul 2015; Richard Yao <ryao@gentoo.org> +crossover-bin-14.1.4.ebuild,
+  crossover-bin-14.0.3.ebuild:
+  Fix 14.0.3 ebuild and bump to 14.1.4
 
   14 Jun 2015; Ulrich Müller <ulm@gentoo.org> crossover-bin-12.5.0-r2.ebuild,
   crossover-bin-12.5.1-r2.ebuild, crossover-bin-13.0.0-r2.ebuild,
diff --git a/app-emulation/crossover-bin/Manifest b/app-emulation/crossover-bin/Manifest
index dcc26df5d3bc..24fb1f42c0bc 100644
--- a/app-emulation/crossover-bin/Manifest
+++ b/app-emulation/crossover-bin/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST install-crossover-12.5.0.bin 55089470 SHA256 596ae288059005f26326196b81f705f3fc3ecd2bc872a23f9a86e75dfd8908da SHA512 85dbf37b76dd63ba761f6f8efc8c294f38bdb2a443fbed7a7f7f37652b377046f7bd27588600fc456e7fa8040d06a1673475bfc6a7b7a110a16a678efcc5c764 WHIRLPOOL 1d99ebad15e76bac0fb3174fdae2e09eb6b407e27b60c2562d2dc692f02d53f72c06398f68d7f0453b60adcd6789f62f2437e44eeb46f8c33ed92ba78c74e5f8
 DIST install-crossover-12.5.1.bin 56658131 SHA256 7ef5bbb092467fefa1e59cb5b0e1c8794a2511cebfc0c4665e8a7fe721140a4f SHA512 0f71a06f3a028698c4b076b205d807e193282c10c7cfb8e62e4697e9b3bd7549947c02c15f82d959d6963630677e6c72a5f8468d35d66ccb3ff6814ed2173c72 WHIRLPOOL 3386a231faa9af53b0dba7c2064bea436518afcc44c5b76c07ce1b5b61fe4a74a5bb8b16f92da97be79548851a3f08b1ed5739d6071a60f45f0382eed7ffe85e
 DIST install-crossover-13.0.0.bin 58807581 SHA256 e41cd80d38281d1c42a9a8ecb16249977887a13145d5fa3da883ce5f6f24c5c7 SHA512 fcf5dde6da1f2fb1eb402bd588baab5e951f8a0ad7959b06a4b7a42f250beb74f9c8d95f26f6fcd4ced9ce0bc4b484ad9a045a485f82028bf8ab7f2abf7ace33 WHIRLPOOL 57cd742cba31e57fb97f1a53e6c6c4e481f1a11b9e061f933995198053c80bd3828b0c6ee39ab152768cf603c1ab4c7125bc076ecfade651d063c1d97407464a
@@ -10,6 +7,7 @@ DIST install-crossover-13.1.2.bin 58730543 SHA256 005a0ed9e102c54c3b204491406bfa
 DIST install-crossover-13.1.3.bin 58768110 SHA256 3d16dbecec584a1d6155ddda6f62a5824980cddc25f5910c2c733de06a716b04 SHA512 091a70e777f8311f818d227f26850f256d6acc7f50c93855f72857f2e21298524262d490fcc8a97342faea1a261ab042b0064d112aacb6c30e9ab5301f89eabe WHIRLPOOL aaffeb604d929b3b4611707cb7878a961c8a2f17baafc4f58dc293d3b29e5485246847327dcf441353ff3feeed76fd7c2f34a516ebeafb2fedee3567d8cdb485
 DIST install-crossover-13.2.0.bin 64625581 SHA256 ef29ca8ca275e4fb6b33337aadc2d3ee92b4dc7d582fab7d5cff5c775d23c75d SHA512 1f582eeca8db02c15d98d519b2d24f65b8dcddd90ff270915a4e6dbd24e135b074c5a20dd824c3d8c8f35cef79610c02423b5558db205a6e80630f69191e051b WHIRLPOOL f8ce0628d961a567291981a238f03da6f5f7554d4d971a8b27fc34b67969a7061032b84325df1a8e38313415dcda3dab98acd6833b396e4f46a65427c9dc8c3e
 DIST install-crossover-14.0.3.bin 68080015 SHA256 23f67221e4047b50f3250b29fae51086cce93529956d3885d149d5abddcc83a2 SHA512 86855e112f5b5d7621e0d4c644abe570de0270e678dc9666482025c948733de02c66fcf67999079a8ba99537695b36d4fb61aee90a59c319edad5fb477a0f902 WHIRLPOOL a0f26d06d2bb81063bcf78a474b9bf4732e9314fd886f430c1141bfce26ae09c297ff79087e5834474d87aa772a1f08a44791d24a3a83ff2baf24969885fe9b8
+DIST install-crossover-14.1.4.bin 68463678 SHA256 9e51823fca911916755b1edca8673c69df4c6f3607b170d9b01e9d9143b4d4c7 SHA512 2078d9e8fc10c526085aef0bfa0cedbcc1a96ec59ade934ea10e7f10062f1a58f5647e9aed59653d4a1253699a08e9ef6f01548010e960af24d0d3546549fb91 WHIRLPOOL a9714f15de43acb2ab6fed91bb35ffdec832dc8fef0b9f75ed394ca18af8552b797b795fdc5bc108c7cf27ca432f932b1f4fe6b4d04d4d52dfaa06bfef083aca
 EBUILD crossover-bin-12.5.0-r2.ebuild 3864 SHA256 004a5ba78dd5515d29d1d9f31d3fb5a6cb86529c3ea1dc570d1d355c74ee3ac8 SHA512 43b66e48910aa463b8bb0b8471571655350acaa4b40331e6092c86b110134438c177f9e3a409c1c53136647c55c8708fe28d52a65813abd0c65caf37281cd5ef WHIRLPOOL 6554154943d77e6946218062c3b0a81b686c62ba6236549bc3522e138d80018c50634b26371667af4787a69e60b3f9168a9ea06c478730913d05f7459d0e5580
 EBUILD crossover-bin-12.5.1-r2.ebuild 3865 SHA256 9891363d9a6aaa78a1ff6f2cf20cd92a347635bbfde124ae835ca19b51854964 SHA512 078d69ee06ea8b6ab2a8df7c6440de44bcbf646b57a76af5c0e4d9d6ae8cd4c0700f3736057f6f72dc89028f55b57406b516abe2cc78b15ddd9bbc022dcf62cc WHIRLPOOL 7f7dbe0e4a062a6e66869c40eb7c6322cd94a25c54e71691f9eef30149fc1e4fb488a0f3e1a8b4f39dde46563693069f47ba6c454f54b95ff0d4130e1259de5b
 EBUILD crossover-bin-13.0.0-r2.ebuild 3865 SHA256 8cda8b896c52593ff118ad136d9236b0859293c674a664c7e94fa6aa08394554 SHA512 1cdc2e8680c6801e3ed06b5f80feffc80f7d8b44ec8e6a3df47d3e2d5ad5fa2983adf41d6e0f6305bc1dff56170ab7d8105fd5eb3662e652709b874eff8e9669 WHIRLPOOL 8fb5ef6b288c1913fa1cd1f8af5dd4f1701f89466f2ab839137da252be9335fcf055f9b7442e4841f4307134464fd8fc70e2e58e5142a927707651e36914db2b
@@ -18,20 +16,7 @@ EBUILD crossover-bin-13.1.0-r2.ebuild 3865 SHA256 9741305a648d12ea224a5d7cf22dc6
 EBUILD crossover-bin-13.1.2-r2.ebuild 3865 SHA256 82f272524f9c0d832c23d55b1f1f62a3255d7134bfe8d5737cf9812ddeb3ef1c SHA512 e3d0ecc616406d38201c4891b9cd85749b7a4ba76bdc60f8a3c996b7084eba52e9a5042617b10e453141ba49e50e6f17328d8a752634a95f3bf9faa6724ce2fe WHIRLPOOL e3c5f137794153eb543b182a41843291679ea6c0931deed60e2e13522403fc1ea365be57c28bd5d33459f07ca3126d6733a3f77e1554fe4b124e620f573af89e
 EBUILD crossover-bin-13.1.3-r2.ebuild 3865 SHA256 4270882111b5b0d0c9014e4f08d0ea1a7018b29e5d5e7f17a8d1ab03f936c448 SHA512 de9a8e44762108b0ca344022c152572481a7efce19c99c2be4174881ae898f5e83d292ddb689847728bfacfce5fc8d3b262cd23d5f6c966ec4f71916e566022b WHIRLPOOL f675c84b0d7adbe8ac986a9c9dc458b2cd60da39ed0bfc4bbe407dabb732434ea42fa98eb77e1f0442bd0df9dd806ef972c24959f25c95428a67d614922d065f
 EBUILD crossover-bin-13.2.0-r2.ebuild 3865 SHA256 53e403014f39d979948f11ed64ee926a097befe538be5b98fb2f5a2cdeb4dc81 SHA512 483eac993d7e0ca7f60932d888477960542ed1172e22ec97b94a17c602a1f098bd5abe68d68004511d32db2c4697c9c3516b61b4667985c50df5515111038353 WHIRLPOOL bbc04f605689ed9ea4fd2bbe57fe2e1d68595adf997ce5c3d388daacea315770fc2c3de4952037ae0e08b13c73ae44018f8c77d027e59a3b8752f133b662fc23
-EBUILD crossover-bin-14.0.3.ebuild 3703 SHA256 c6d68afab81e4301d5b8a8eb0f89595bc6ef70e87ed1318503656f7fa90ec44c SHA512 242cc9b1c4d44372a1791dd1b17ca9e3d2ae6f09d8924953a9a96e4204c9b7d4a64877d404b614e6a22db748aac35a1ccb794be05d170b6bd751d754bc0f9695 WHIRLPOOL 1a018546a1e49112a09db8b76ecec8c8dbddd622d422dc788ded17ad71168bde2c682b025a5967cb9dd972e6855d9c8e65dfa82af8f92b60fce13600ce3e61ef
-MISC ChangeLog 7669 SHA256 267f8a67bd40b61116c3917ad3b868558e1073bb54ab064b281544cdce1ddfea SHA512 b2a59ea90de8579996ed210368c25ab2130f755cb5362c8e53795c4a0646fb0a3712aad5ddcb8b3751df82c8eb3bab7b571cb87259d1cc7034748b327a12c3e7 WHIRLPOOL 73f5ef3abb74e86f5fe013dff4712efc99a3ee4d000ed6f20c70464df6dd5ff2c5f95da10844ef4fa8a40a476bfb5e5063331f23643e21f01ed509a89cab2d5f
+EBUILD crossover-bin-14.0.3.ebuild 4123 SHA256 424aad7047a249d8539b589766f2bea99d0a0a5b36138f7bdc9fa5719c53da19 SHA512 0cc4395de8043ba2fdf81ac99a76e1ef977ad01d20c0e337e89359105bf2812489e16f34a383c598ec70611ed8e27625c6cd5efe91e88406e9ed458137807869 WHIRLPOOL 1efbfebe34223149a45c01414630b0bc199e2334587ea44d776ebd784c4924db0a98cc41d64261fe916bb8c9c92316a98b90d03094503a9b907b453517896778
+EBUILD crossover-bin-14.1.4.ebuild 4124 SHA256 e03500e265449f4711a7dbbd379d596e65d52da7746b006367d780b884bf3e0a SHA512 4752b5bcca074298519067015c52a6b917942a96ae4c3b67502e81fb7b0904501132f96e5cc448902948866cedb5eb379ede0ffa99704f1d9132b3e7683c069c WHIRLPOOL 9242c85c1f0b306ba3c6a19c7961984200db5796d04ea09cabc87b3c78f804b02b472b50c3df50657730a3dc6c491c1f42f07486a44367fd51430e5179076dc0
+MISC ChangeLog 7853 SHA256 f241ba73f153b8c9c866a3b5e22c51f508e568e07c2adcdb1609680ba97ee65d SHA512 e7a4f237cd33af1ca82b457b0a20c826d6392e4816b3fce8f78aca45f88a4a7125e9f0b1540bdd2c3e7af6e1e1234453246fce8d2a087bbc1f70e3de6f67d1e8 WHIRLPOOL 7bb13115a2f4df828d396617e980b6e62d242b951573d5c3f99388d2b23d8c326df65dd3755ae0840f9cba035d33f8922d2fea7cbcc08cd384b0ee285e56a571
 MISC metadata.xml 299 SHA256 1418809370ffded84700af60fec9e68cee312b0ce73f9668bc1763e00ff864cd SHA512 d95909115fce9cf70adb5cc7dd62c25ef58b6231a58959a61e08e848c2b994bdd51cf34d68484dce56d69b5f036b97e5f9f38ea34f123730372d37a099310c0d WHIRLPOOL 495e4b3f33c8fed584f84164ab271e44e1ff43ef5fab737c23de2156fd56bc4a51e6aa95cf8325cdb98c17e40d9fc1d56eb5d91aca2c2090be7119f017fdf693
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQGcBAEBCAAGBQJVfcgNAAoJEJQzkH1pP7W4RUgL/0gWhuV+D929FD6mHSHdd/vV
-6HmCHxczLLVlIedOQ7cQfquU4GtnYwXmXfiKfTSm2H/DAM2vmjWYH5SToQ39o8Qh
-DiB7WkhPE9udpLcqqkwFpcPNZAt6AC/TONSGC90fJOByQOJD9P15N8L8r0aBYsbP
-n+K3SQUGstca4Pmfwq5dymNfk9rJATURdwmg6VuyDD3AKO+gUIpRUSRAEyqT6F26
-4oJL9udjwThMMy6pHjMoG29Ym4HpgIPBrkuCev9woZHeWtZIpF84KL5SBcwnY+q5
-FI/xZiA7YOvfh9CGqkI8RKy0ciXI9WY5n9a/VwHqY3gVGsCkf9PH9BwNvX8djkLC
-wffGxSNJS49h37vHWO716YS6afvabw+7K8cWhk4xxEnjBaa3SRyE7o73HbVqOTAh
-/6j9fuqaN2c7rOJhbpIMj2baFbpODnht5ZbxSic4A2WaSLDXbUu/dkxNnMdwWrhJ
-nlwWpYYolIBdk6WBh8+y0xpGMkzfbLIQLUB0LnOdNQ==
-=zVWZ
------END PGP SIGNATURE-----
diff --git a/app-emulation/crossover-bin/crossover-bin-14.0.3.ebuild b/app-emulation/crossover-bin/crossover-bin-14.0.3.ebuild
index 8ecb96ee06f8..480ff6965362 100644
--- a/app-emulation/crossover-bin/crossover-bin-14.0.3.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-14.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-14.0.3.ebuild,v 1.3 2015/06/14 18:31:19 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-14.0.3.ebuild,v 1.4 2015/07/29 22:06:16 ryao Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -88,6 +88,12 @@ src_unpack() {
 src_prepare() {
 	python_fix_shebang .
 
+	sed -i -e "s:\$link=\"\$xdgdir:\$link=\"${ED}\/\$xdgdir:" "${S}/lib/perl/CXMenu.pm"
+	sed -i \
+	-e "s:\"\(.*\)/applications:\"${ED}/\1/applications:" \
+		-e "s:\"\(.*\)/desktop-directories:\"${ED}/\1/desktop-directories:" \
+		"${S}/lib/perl/CXMenuXDG.pm"
+
 	# Remove unnecessary files
 	rm -r license.txt guis/ || die "Could not remove files"
 	use doc || rm -r doc/ || die "Could not remove files"
@@ -114,7 +120,10 @@ src_install() {
 	# XXX: locate_gui.sh automatically detects *-application-merged directories
 	# This means what we install will vary depending on the contents of
 	# /etc/xdg, which is a QA violation. It is not clear how to resolve this.
-	XDG_CONFIG_HOME="/etc/xdg" \
+	XDG_DATA_DIRS="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
 		"${ED}opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
 		|| die "Could not install menus"
+
+	rm "${ED}usr/share/applications/"*"Uninstall CrossOver Linux.desktop"
+	sed -i -e "s:${ED}:/:" "${ED}usr/share/applications/"*.desktop
 }
diff --git a/app-emulation/crossover-bin/crossover-bin-14.1.4.ebuild b/app-emulation/crossover-bin/crossover-bin-14.1.4.ebuild
new file mode 100644
index 000000000000..1ede4f181fad
--- /dev/null
+++ b/app-emulation/crossover-bin/crossover-bin-14.1.4.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-14.1.4.ebuild,v 1.1 2015/07/29 22:06:16 ryao Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit python-single-r1 unpacker
+
+DESCRIPTION="Commercial version of app-emulation/wine with paid support."
+HOMEPAGE="http://www.codeweavers.com/products/crossover/"
+SRC_URI="install-crossover-${PV}.bin"
+
+LICENSE="CROSSOVER-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l"
+RESTRICT="fetch test"
+QA_FLAGS_IGNORED="opt/cxoffice/.*"
+QA_PRESTRIPPED="opt/cxoffice/lib/.*
+	opt/cxoffice/bin/cxburner
+	opt/cxoffice/bin/cxntlm_auth
+	opt/cxoffice/bin/wineserver
+	opt/cxoffice/bin/unrar
+	opt/cxoffice/bin/wine-preloader
+	opt/cxoffice/bin/cxdiag
+	opt/cxoffice/bin/cxgettext
+	opt/cxoffice/bin/wineloader
+	"
+S="${WORKDIR}"
+
+DEPEND="dev-lang/perl
+	app-arch/unzip
+	${PYTHON_DEPS}"
+
+RDEPEND="${DEPEND}
+	!prefix? ( sys-libs/glibc )
+	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-util/desktop-file-utils
+	!app-emulation/crossover-office-pro-bin
+	!app-emulation/crossover-office-bin
+	capi? ( net-dialup/capi4k-utils )
+	cups? ( net-print/cups[abi_x86_32(-)] )
+	gsm? ( media-sound/gsm[abi_x86_32(-)] )
+	jpeg? ( virtual/jpeg[abi_x86_32(-)] )
+	lcms? ( media-libs/lcms:2 )
+	ldap? ( net-nds/openldap[abi_x86_32(-)] )
+	gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
+	mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
+	nls? ( sys-devel/gettext[abi_x86_32(-)] )
+	openal? ( media-libs/openal[abi_x86_32(-)] )
+	opengl? (
+		virtual/glu[abi_x86_32(-)]
+		virtual/opengl[abi_x86_32(-)]
+	)
+	png? ( media-libs/libpng:0[abi_x86_32(-)] )
+	scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
+	ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
+	v4l? ( media-libs/libv4l[abi_x86_32(-)] )
+	media-libs/alsa-lib[abi_x86_32(-)]
+	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
+	media-libs/mesa[abi_x86_32(-)]
+	sys-apps/util-linux[abi_x86_32(-)]
+	sys-libs/zlib[abi_x86_32(-)]
+	x11-libs/libICE[abi_x86_32(-)]
+	x11-libs/libSM[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXau[abi_x86_32(-)]
+	x11-libs/libXdmcp[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	x11-libs/libXi[abi_x86_32(-)]
+	x11-libs/libXrandr[abi_x86_32(-)]
+	x11-libs/libXxf86vm[abi_x86_32(-)]
+	x11-libs/libxcb[abi_x86_32(-)]"
+
+pkg_nofetch() {
+	einfo "Please visit ${HOMEPAGE}"
+	einfo "and place ${A} in ${DISTDIR}"
+}
+
+src_unpack() {
+	# self unpacking zip archive; unzip warns about the exe stuff
+	unpack_zip ${A}
+}
+
+src_prepare() {
+	python_fix_shebang .
+
+	sed -i -e "s:\$link=\"\$xdgdir:\$link=\"${ED}\/\$xdgdir:" "${S}/lib/perl/CXMenu.pm"
+	sed -i \
+		-e "s:\"\(.*\)/applications:\"${ED}/\1/applications:" \
+		-e "s:\"\(.*\)/desktop-directories:\"${ED}/\1/desktop-directories:" \
+		"${S}/lib/perl/CXMenuXDG.pm"
+
+	# Remove unnecessary files
+	rm -r license.txt guis/ || die "Could not remove files"
+	use doc || rm -r doc/ || die "Could not remove files"
+}
+
+src_install() {
+	# Install crossover symlink, bug #476314
+	dosym /opt/cxoffice/bin/crossover /opt/bin/crossover
+
+	# Install documentation
+	dodoc README changelog.txt
+	rm README changelog.txt || die "Could not remove README and changelog.txt"
+
+	# Install files
+	dodir /opt/cxoffice
+	cp -r ./* "${ED}opt/cxoffice" \
+		|| die "Could not install into ${ED}opt/cxoffice"
+
+	# Install configuration file
+	insinto /opt/cxoffice/etc
+	doins share/crossover/data/cxoffice.conf
+
+	# Install menus
+	# XXX: locate_gui.sh automatically detects *-application-merged directories
+	# This means what we install will vary depending on the contents of
+	# /etc/xdg, which is a QA violation. It is not clear how to resolve this.
+	XDG_DATA_DIRS="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
+		"${ED}opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
+		|| die "Could not install menus"
+
+	rm "${ED}usr/share/applications/"*"Uninstall CrossOver Linux.desktop"
+	sed -i -e "s:${ED}:/:" "${ED}usr/share/applications/"*.desktop
+}