[gentoo-commits] gentoo-x86 commit in app-emulation/crossover-bin: crossover-bin-14.1.4.ebuild crossover-bin-14.0.3.ebuild ChangeLog

[Richard Yao (ryao)]

ryao        15/07/29 22:06:16

  Modified:             crossover-bin-14.0.3.ebuild ChangeLog
  Added:                crossover-bin-14.1.4.ebuild
  Log:
  Fix 14.0.3 ebuild and bump to 14.1.4
  
  (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0xBEE84C64)

Revision  Changes    Path
1.4                  app-emulation/crossover-bin/crossover-bin-14.0.3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/crossover-bin/crossover-bin-14.0.3.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/crossover-bin/crossover-bin-14.0.3.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/crossover-bin/crossover-bin-14.0.3.ebuild?r1=1.3&r2=1.4

Index: crossover-bin-14.0.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-14.0.3.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- crossover-bin-14.0.3.ebuild	14 Jun 2015 18:31:19 -0000	1.3
+++ crossover-bin-14.0.3.ebuild	29 Jul 2015 22:06:16 -0000	1.4
@@ -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_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 @@
 	# 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
 }



1.21                 app-emulation/crossover-bin/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/crossover-bin/ChangeLog?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/crossover-bin/ChangeLog?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/crossover-bin/ChangeLog?r1=1.20&r2=1.21

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/ChangeLog,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ChangeLog	14 Jun 2015 18:31:19 -0000	1.20
+++ ChangeLog	29 Jul 2015 22:06:16 -0000	1.21
@@ -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@g.o> +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@g.o> crossover-bin-12.5.0-r2.ebuild,
   crossover-bin-12.5.1-r2.ebuild, crossover-bin-13.0.0-r2.ebuild,



1.1                  app-emulation/crossover-bin/crossover-bin-14.1.4.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/crossover-bin/crossover-bin-14.1.4.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/crossover-bin/crossover-bin-14.1.4.ebuild?rev=1.1&content-type=text/plain

Index: crossover-bin-14.1.4.ebuild
===================================================================
# 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
}