public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog office-ext-r1.eclass
@ 2013-03-23 10:16 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 4+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2013-03-23 10:16 UTC (permalink / raw
  To: gentoo-commits

scarabeus    13/03/23 10:16:58

  Modified:             ChangeLog
  Added:                office-ext-r1.eclass
  Log:
  Add next version of office-ext eclass. This time we can directly deploy libreoffice exts, but ooo crashes so keep backcompat over crashy uno interface for them (it is oo bug and they should fix it).

Revision  Changes    Path
1.749                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.749&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.749&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.748&r2=1.749

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.748
retrieving revision 1.749
diff -u -r1.748 -r1.749
--- ChangeLog	20 Mar 2013 19:01:54 -0000	1.748
+++ ChangeLog	23 Mar 2013 10:16:57 -0000	1.749
@@ -1,6 +1,11 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.748 2013/03/20 19:01:54 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.749 2013/03/23 10:16:57 scarabeus Exp $
+
+  23 Mar 2013; Tomáš Chvátal <scarabeus@gentoo.org> +office-ext-r1.eclass:
+  Add next version of office-ext eclass. This time we can directly deploy
+  libreoffice exts, but ooo crashes so keep backcompat over crashy uno
+  interface for them (it is oo bug and they should fix it).
 
   20 Mar 2013; Michał Górny <mgorny@gentoo.org> python-r1.eclass:
   Introduce an ability to override PYTHON_COMPAT for testing.



1.1                  eclass/office-ext-r1.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/office-ext-r1.eclass?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/office-ext-r1.eclass?rev=1.1&content-type=text/plain

Index: office-ext-r1.eclass
===================================================================
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/office-ext-r1.eclass,v 1.1 2013/03/23 10:16:57 scarabeus Exp $

# @ECLASS: office-ext-r1.eclass
# @MAINTAINER:
# The office team <openoffice@gentoo.org>
# @AUTHOR:
# Tomáš Chvátal <scarabeus@gentoo.org>
# @BLURB: Eclass for installing libreoffice/openoffice extensions
# @DESCRIPTION:
# Eclass for easing maitenance of libreoffice/openoffice extensions.

case "${EAPI:-0}" in
	5) OEXT_EXPORTED_FUNCTIONS="src_unpack src_install pkg_postinst pkg_prerm" ;;
	*) die "EAPI=${EAPI} is not supported" ;;
esac

inherit eutils multilib

# @ECLASS-VARIABLE: OFFICE_REQ_USE
# @DESCRIPTION:
# Useflags required on office implementation for the extension.
#
# Example:
# @CODE
# OFFICE_REQ_USE="java,jemalloc(-)?"
# @CODE
if [[ ${OFFICE_REQ_USE} ]]; then
	# Append the brackets for the depend bellow
	PYTHON_REQ_USE="[${OFFICE_REQ_USE}]"
fi

# @ECLASS-VARIABLE: OFFICE_IMPLEMENTATIONS
# @DESCRIPTION:
# List of implementations supported by the extension.
# Some work only for libreoffice and vice versa.
# Default value is all implementations.
#
# Example:
# @CODE
# OFFICE_IMPLEMENTATIONS=( "libreoffice" "openoffice" )
# @CODE
[[ -z ${OFFICE_IMPLEMENTATIONS} ]] && OFFICE_IMPLEMENTATIONS=( "libreoffice" "openoffice" )

# @ECLASS-VARIABLE: OFFICE_EXTENSIONS
# @REQUIRED
# @DESCRIPTION:
# Array containing list of extensions to install.
#
# Example:
# @CODE
# OFFICE_EXTENSIONS=( ${PN}_${PV}.oxt )
# @CODE
[[ -z ${OFFICE_EXTENSIONS} ]] && die "OFFICE_EXTENSIONS variable is unset."
if [[ "$(declare -p OFFICE_EXTENSIONS 2>/dev/null 2>&1)" != "declare -a"* ]]; then
	die "OFFICE_EXTENSIONS variable is not an array."
fi

IUSE=""
RDEPEND=""

for i in ${OFFICE_IMPLEMENTATIONS[@]}; do
	# Set default on for the libreoffice implementation.
	# Or if we have just one impl set it also on enabled.
	if [[ ${i} == libreoffice || ${#OFFICE_IMPLEMENTATIONS[@]} == 1 ]]; then
		IUSE+=" +office_implementation_${i}"
	else
		IUSE+=" office_implementation_${i}"
	fi
	RDEPEND+="
		office_implementation_${i}? (
			|| (
				app-office/${i}${OFFICE_REQ_USE}
				app-office/${i}-bin${OFFICE_REQ_USE}
			)
		)
	"
done

REQUIRED_USE="|| ( "
for i in ${OFFICE_IMPLEMENTATIONS[@]}; do
	REQUIRED_USE+=" office_implementation_${i} "
done
REQUIRED_USE+=" )"

DEPEND="${RDEPEND}
	app-arch/unzip
"

# Most projects actually do not provide any relevant sourcedir as they are oxt.
S="${WORKDIR}"

# @FUNCTION: office-ext-r1_src_unpack
# @DESCRIPTION:
# Flush the cache after removal of an extension.
office-ext-r1_src_unpack() {
	debug-print-function ${FUNCNAME} "$@"
	local i

	default

	for i in ${OFFICE_EXTENSIONS[@]}; do
		# Unpack the extensions where required and add case for oxt
		# which should be most common case for the extensions.
		if [[ -f "${DISTDIR}/${i}" ]] ; then
			case ${i} in
				*.oxt)
					echo ">>> Unpacking "${DISTDIR}/${i}" to ${PWD}"
					unzip -qo ${DISTDIR}/${i}
					assert "failed unpacking ${DISTDIR}/${i}"
					;;
				*) unpack ${i} ;;
			esac
		fi
	done
}

# @FUNCTION: office-ext-r1_src_install
# @DESCRIPTION:
# Install the extension source to the proper location.
office-ext-r1_src_install() {
	debug-print-function ${FUNCNAME} "$@"
	debug-print "Extensions: ${OFFICE_EXTENSIONS[@]}"

	local i j

	for i in ${OFFICE_IMPLEMENTATIONS[@]}; do
		if use office_implementation_${i}; then
			if [[ ${i} == openoffice ]]; then
				# OOO needs to use uno because direct deployment segfaults.
				# This is bug by their side, but i don't want to waste time
				# fixing it myself.
				insinto /usr/$(get_libdir)/${i}/share/extension/install
				for j in ${OFFICE_EXTENSIONS[@]}; do
					doins ${DISTDIR}/${j}
				done
			else
				insinto /usr/$(get_libdir)/${i}/share/extensions/${PN}
				doins -r *
			fi
		fi
	done
}

#### OPENOFFICE COMPAT CODE

UNOPKG_BINARY="/usr/lib64/openoffice/program/unopkg"

# @FUNCTION: office-ext-r1_add_extension
# @DESCRIPTION:
# Install the extension into the libreoffice/openoffice.
office-ext-r1_add_extension() {
	debug-print-function ${FUNCNAME} "$@"
	local ext=$1
	local tmpdir=$(mktemp -d --tmpdir="${T}")

	debug-print "${FUNCNAME}: ${UNOPKG_BINARY} add --shared \"${ext}\""
	ebegin "Adding office extension: \"${ext}\""
	${UNOPKG_BINARY} add --suppress-license \
		--shared "${ext}" \
		"-env:UserInstallation=file:///${tmpdir}" \
		"-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1"
	eend $?
	${UNOPKG_BINARY} list --shared > /dev/null
	rm -rf "${tmpdir}"
}

# @FUNCTION: office-ext-r1_remove_extension
# @DESCRIPTION:
# Remove the extension from the libreoffice/openoffice.
office-ext-r1_remove_extension() {
	debug-print-function ${FUNCNAME} "$@"
	local ext=$1
	local tmpdir=$(mktemp -d --tmpdir="${T}")

	debug-print "${FUNCNAME}: ${UNOPKG_BINARY} remove --shared \"${ext}\""
	ebegin "Removing office extension: \"${ext}\""
	${UNOPKG_BINARY} remove --suppress-license \
		--shared "${ext}" \
		"-env:UserInstallation=file:///${tmpdir}" \
		"-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1"
	eend $?
	${UNOPKG_BINARY} list --shared > /dev/null
	rm -rf "${tmpdir}"
}

# @FUNCTION: office-ext-r1_pkg_postinst
# @DESCRIPTION:
# Add the extensions to the openoffice.
office-ext-r1_pkg_postinst() {
	if in_iuse office_implementation_openoffice && use office_implementation_openoffice; then
		debug-print-function ${FUNCNAME} "$@"
		debug-print "Extensions: ${OFFICE_EXTENSIONS[@]}"
		local i

		for i in ${OFFICE_EXTENSIONS[@]}; do
			office-ext-r1_add_extension "/usr/lib64/openoffice/share/extension/install/${i}"
		done
	fi
}

# @FUNCTION: office-ext-r1_pkg_prerm
# @DESCRIPTION:
# Remove the extensions from the openoffice.
office-ext-r1_pkg_prerm() {
	if in_iuse office_implementation_openoffice && use office_implementation_openoffice; then
		debug-print-function ${FUNCNAME} "$@"
		debug-print "Extensions: ${OFFICE_EXTENSIONS[@]}"
		local i

		for i in ${OFFICE_EXTENSIONS[@]}; do
			office-ext-r1_remove_extension "${i}"
		done
	fi
}

EXPORT_FUNCTIONS ${OEXT_EXPORTED_FUNCTIONS}
unset OEXT_EXPORTED_FUNCTIONS





^ permalink raw reply	[flat|nested] 4+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog office-ext-r1.eclass
@ 2013-03-23 10:19 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 4+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2013-03-23 10:19 UTC (permalink / raw
  To: gentoo-commits

scarabeus    13/03/23 10:19:39

  Modified:             ChangeLog office-ext-r1.eclass
  Log:
  Fix stupid copy&paste.

Revision  Changes    Path
1.750                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.750&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.750&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.749&r2=1.750

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.749
retrieving revision 1.750
diff -u -r1.749 -r1.750
--- ChangeLog	23 Mar 2013 10:16:57 -0000	1.749
+++ ChangeLog	23 Mar 2013 10:19:39 -0000	1.750
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.749 2013/03/23 10:16:57 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.750 2013/03/23 10:19:39 scarabeus Exp $
+
+  23 Mar 2013; Tomáš Chvátal <scarabeus@gentoo.org> office-ext-r1.eclass:
+  Fix stupid copy&paste.
 
   23 Mar 2013; Tomáš Chvátal <scarabeus@gentoo.org> +office-ext-r1.eclass:
   Add next version of office-ext eclass. This time we can directly deploy



1.2                  eclass/office-ext-r1.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/office-ext-r1.eclass?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/office-ext-r1.eclass?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/office-ext-r1.eclass?r1=1.1&r2=1.2

Index: office-ext-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/office-ext-r1.eclass,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- office-ext-r1.eclass	23 Mar 2013 10:16:57 -0000	1.1
+++ office-ext-r1.eclass	23 Mar 2013 10:19:39 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/office-ext-r1.eclass,v 1.1 2013/03/23 10:16:57 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/office-ext-r1.eclass,v 1.2 2013/03/23 10:19:39 scarabeus Exp $
 
 # @ECLASS: office-ext-r1.eclass
 # @MAINTAINER:
@@ -28,7 +28,7 @@
 # @CODE
 if [[ ${OFFICE_REQ_USE} ]]; then
 	# Append the brackets for the depend bellow
-	PYTHON_REQ_USE="[${OFFICE_REQ_USE}]"
+	OFFICE_REQ_USE="[${OFFICE_REQ_USE}]"
 fi
 
 # @ECLASS-VARIABLE: OFFICE_IMPLEMENTATIONS





^ permalink raw reply	[flat|nested] 4+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog office-ext-r1.eclass
@ 2013-03-23 10:24 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 4+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2013-03-23 10:24 UTC (permalink / raw
  To: gentoo-commits

scarabeus    13/03/23 10:24:42

  Modified:             ChangeLog office-ext-r1.eclass
  Log:
  Do not use-default here as we enable it by profile variable.

Revision  Changes    Path
1.751                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.751&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.751&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.750&r2=1.751

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.750
retrieving revision 1.751
diff -u -r1.750 -r1.751
--- ChangeLog	23 Mar 2013 10:19:39 -0000	1.750
+++ ChangeLog	23 Mar 2013 10:24:41 -0000	1.751
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.750 2013/03/23 10:19:39 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.751 2013/03/23 10:24:41 scarabeus Exp $
+
+  23 Mar 2013; Tomáš Chvátal <scarabeus@gentoo.org> office-ext-r1.eclass:
+  Do not use-default here as we enable it by profile variable.
 
   23 Mar 2013; Tomáš Chvátal <scarabeus@gentoo.org> office-ext-r1.eclass:
   Fix stupid copy&paste.



1.3                  eclass/office-ext-r1.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/office-ext-r1.eclass?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/office-ext-r1.eclass?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/office-ext-r1.eclass?r1=1.2&r2=1.3

Index: office-ext-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/office-ext-r1.eclass,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- office-ext-r1.eclass	23 Mar 2013 10:19:39 -0000	1.2
+++ office-ext-r1.eclass	23 Mar 2013 10:24:42 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/office-ext-r1.eclass,v 1.2 2013/03/23 10:19:39 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/office-ext-r1.eclass,v 1.3 2013/03/23 10:24:42 scarabeus Exp $
 
 # @ECLASS: office-ext-r1.eclass
 # @MAINTAINER:
@@ -61,13 +61,7 @@
 RDEPEND=""
 
 for i in ${OFFICE_IMPLEMENTATIONS[@]}; do
-	# Set default on for the libreoffice implementation.
-	# Or if we have just one impl set it also on enabled.
-	if [[ ${i} == libreoffice || ${#OFFICE_IMPLEMENTATIONS[@]} == 1 ]]; then
-		IUSE+=" +office_implementation_${i}"
-	else
-		IUSE+=" office_implementation_${i}"
-	fi
+	IUSE+=" office_implementation_${i}"
 	RDEPEND+="
 		office_implementation_${i}? (
 			|| (





^ permalink raw reply	[flat|nested] 4+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog office-ext-r1.eclass
@ 2013-03-29 10:02 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 4+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2013-03-29 10:02 UTC (permalink / raw
  To: gentoo-commits

scarabeus    13/03/29 10:02:23

  Modified:             ChangeLog office-ext-r1.eclass
  Log:
  Allow specification of directory where the extensions are. Also allow one package providing multiple oxts correctly. Wrt bug#463536.

Revision  Changes    Path
1.757                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.757&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.757&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.756&r2=1.757

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.756
retrieving revision 1.757
diff -u -r1.756 -r1.757
--- ChangeLog	28 Mar 2013 12:21:46 -0000	1.756
+++ ChangeLog	29 Mar 2013 10:02:23 -0000	1.757
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.756 2013/03/28 12:21:46 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.757 2013/03/29 10:02:23 scarabeus Exp $
+
+  29 Mar 2013; Tomáš Chvátal <scarabeus@gentoo.org> office-ext-r1.eclass:
+  Allow specification of directory where the extensions are. Also allow one
+  package providing multiple oxts correctly. Wrt bug#463536.
 
   28 Mar 2013; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
   Support obtaining CFLAGS and LIBS for the Python implementation (similarly to



1.4                  eclass/office-ext-r1.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/office-ext-r1.eclass?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/office-ext-r1.eclass?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/office-ext-r1.eclass?r1=1.3&r2=1.4

Index: office-ext-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/office-ext-r1.eclass,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- office-ext-r1.eclass	23 Mar 2013 10:24:42 -0000	1.3
+++ office-ext-r1.eclass	29 Mar 2013 10:02:23 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/office-ext-r1.eclass,v 1.3 2013/03/23 10:24:42 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/office-ext-r1.eclass,v 1.4 2013/03/29 10:02:23 scarabeus Exp $
 
 # @ECLASS: office-ext-r1.eclass
 # @MAINTAINER:
@@ -57,6 +57,16 @@
 	die "OFFICE_EXTENSIONS variable is not an array."
 fi
 
+# @ECLASS-VARIABLE: OFFICE_EXTENSIONS_LOCATION
+# @DESCRIPTION:
+# Path to the extensions location. Defaults to ${DISTDIR}.
+#
+# Example:
+# @CODE
+# OFFICE_EXTENSIONS_LOCATION="${S}/unpacked/"
+# @CODE
+: ${OFFICE_EXTENSIONS_LOCATION:=${DISTDIR}}
+
 IUSE=""
 RDEPEND=""
 
@@ -97,12 +107,15 @@
 	for i in ${OFFICE_EXTENSIONS[@]}; do
 		# Unpack the extensions where required and add case for oxt
 		# which should be most common case for the extensions.
-		if [[ -f "${DISTDIR}/${i}" ]] ; then
+		if [[ -f "${OFFICE_EXTENSIONS_LOCATION}/${i}" ]] ; then
 			case ${i} in
 				*.oxt)
-					echo ">>> Unpacking "${DISTDIR}/${i}" to ${PWD}"
-					unzip -qo ${DISTDIR}/${i}
-					assert "failed unpacking ${DISTDIR}/${i}"
+					mkdir -p "${WORKDIR}/${i}/"
+					pushd "${WORKDIR}/${i}/" > /dev/null
+					echo ">>> Unpacking "${OFFICE_EXTENSIONS_LOCATION}/${i}" to ${PWD}"
+					unzip -qo ${OFFICE_EXTENSIONS_LOCATION}/${i}
+					assert "failed unpacking ${OFFICE_EXTENSIONS_LOCATION}/${i}"
+					popd > /dev/null
 					;;
 				*) unpack ${i} ;;
 			esac
@@ -127,11 +140,15 @@
 				# fixing it myself.
 				insinto /usr/$(get_libdir)/${i}/share/extension/install
 				for j in ${OFFICE_EXTENSIONS[@]}; do
-					doins ${DISTDIR}/${j}
+					doins ${OFFICE_EXTENSIONS_LOCATION}/${j}
 				done
 			else
-				insinto /usr/$(get_libdir)/${i}/share/extensions/${PN}
-				doins -r *
+				for j in ${OFFICE_EXTENSIONS[@]}; do
+					pushd "${WORKDIR}/${j}/" > /dev/null
+					insinto /usr/$(get_libdir)/${i}/share/extensions/${j/.oxt/}
+					doins -r *
+					popd > /dev/null
+				done
 			fi
 		fi
 	done





^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2013-03-29 10:02 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-29 10:02 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog office-ext-r1.eclass Tomas Chvatal (scarabeus)
  -- strict thread matches above, loose matches on Subject: below --
2013-03-23 10:24 Tomas Chvatal (scarabeus)
2013-03-23 10:19 Tomas Chvatal (scarabeus)
2013-03-23 10:16 Tomas Chvatal (scarabeus)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox