public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in app-office/openoffice-bin: ChangeLog openoffice-bin-3.3.0.ebuild
@ 2011-03-16 23:31 Andreas Proschofsky (suka)
  0 siblings, 0 replies; 13+ messages in thread
From: Andreas Proschofsky (suka) @ 2011-03-16 23:31 UTC (permalink / raw
  To: gentoo-commits

suka        11/03/16 23:31:55

  Modified:             ChangeLog
  Added:                openoffice-bin-3.3.0.ebuild
  Log:
  Bump to OpenOffice.org 3.3.0
  
  (Portage version: 2.2.0_alpha27/cvs/Linux x86_64)

Revision  Changes    Path
1.237                app-office/openoffice-bin/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/ChangeLog?rev=1.237&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/ChangeLog?rev=1.237&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/ChangeLog?r1=1.236&r2=1.237

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -r1.236 -r1.237
--- ChangeLog	16 Mar 2011 22:26:39 -0000	1.236
+++ ChangeLog	16 Mar 2011 23:31:55 -0000	1.237
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/openoffice-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.236 2011/03/16 22:26:39 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.237 2011/03/16 23:31:55 suka Exp $
+
+*openoffice-bin-3.3.0 (16 Mar 2011)
+
+  16 Mar 2011; Andreas Proschofsky <suka@gentoo.org>
+  +openoffice-bin-3.3.0.ebuild:
+  Bump to OpenOffice.org 3.3.0
 
   16 Mar 2011; Andreas Proschofsky <suka@gentoo.org>
   openoffice-bin-3.2.1.ebuild:



1.1                  app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild

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

Index: openoffice-bin-3.3.0.ebuild
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild,v 1.1 2011/03/16 23:31:55 suka Exp $

EAPI="3"

inherit eutils fdo-mime pax-utils prefix rpm multilib

IUSE="gnome java kde"

BUILDID="9567"
BUILDID2="9556"
UREVER="1.7.0"
MY_PV="${PV}rc10"
MY_PV2="${MY_PV}_20110118"
MY_PV3="${PV}-${BUILDID}"
BASIS="ooobasis3.3"
MST="OOO330_m20"
FILEPATH="http://download.services.openoffice.org/files/extended/${MY_PV}"

if [ "${ARCH}" = "amd64" ] ; then
	OOARCH="x86_64"
	PACKED="${MST}_native_packed-1"
	PACKED2="${MST}_native_packed-1"
else
	OOARCH="i586"
	PACKED="${MST}_native_packed-1"
	PACKED2="${MST}_native_packed-1"
fi

S="${WORKDIR}"
UP="${PACKED}_en-US.${BUILDID}/RPMS"
DESCRIPTION="OpenOffice productivity suite"

SRC_URI="x86? ( http://download.services.openoffice.org/files/stable/${PV}/OOo_${PV}_Linux_x86_install-rpm_en-US.tar.gz )
	amd64? ( http://download.services.openoffice.org/files/stable/${PV}/OOo_${PV}_Linux_x86-64_install-rpm-wJRE_en-US.tar.gz  )"

LANGS="ar as ast bg bn ca cs da de dz el en en_GB eo es et eu fi fr ga gl gu hi hu id is it ja ka km kn ko ku lt lv mk ml mr my nb nl nn oc om or pa_IN pl pt pt_BR ro ru sh si sk sl sr sv ta te th tr ug uk uz vi zh_CN zh_TW"

for X in ${LANGS} ; do
	[[ ${X} != "en" ]] && SRC_URI="${SRC_URI} linguas_${X}? (
		x86? ( "${FILEPATH}"/OOo_${MY_PV2}_Linux_x86_langpack-rpm_${X/_/-}.tar.gz )
		amd64? ( "${FILEPATH}"/OOo_${MY_PV2}_Linux_x86-64_langpack-rpm_${X/_/-}.tar.gz ) )"
	IUSE="${IUSE} linguas_${X}"
done

HOMEPAGE="http://www.openoffice.org/"

LICENSE="LGPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"

RDEPEND="!app-office/openoffice
	x11-libs/libXaw
	!prefix? ( sys-libs/glibc )
	>=dev-lang/perl-5.0
	app-arch/zip
	app-arch/unzip
	>=media-libs/freetype-2.1.10-r2
	java? ( >=virtual/jre-1.5 )
	linguas_ja? ( >=media-fonts/kochi-substitute-20030809-r3 )
	linguas_zh_CN? ( >=media-fonts/arphicfonts-0.1-r2 )
	linguas_zh_TW? ( >=media-fonts/arphicfonts-0.1-r2 )"

DEPEND="${RDEPEND}
	sys-apps/findutils"

RESTRICT="strip"

QA_EXECSTACK="usr/$(get_libdir)/openoffice/basis3.2/program/*
	usr/$(get_libdir)/openoffice/ure/lib/*"
QA_TEXTRELS="usr/$(get_libdir)/openoffice/basis3.2/program/libvclplug_genli.so \
	usr/$(get_libdir)/openoffice/basis3.2/program/python-core-2.3.4/lib/lib-dynload/_curses_panel.so \
	usr/$(get_libdir)/openoffice/basis3.2/program/python-core-2.3.4/lib/lib-dynload/_curses.so \
	usr/$(get_libdir)/openoffice/ure/lib/*"

src_unpack() {

	unpack ${A}
	cp "${FILESDIR}"/{50-openoffice-bin,wrapper.in} "${T}"
	eprefixify "${T}"/{50-openoffice-bin,wrapper.in}

	cd "${S}"

	for i in base binfilter calc core01 core02 core03 core04 core05 core06 core07 draw graphicfilter images impress math ooofonts oooimprovement ooolinguistic pyuno testtool writer xsltfilter ; do
		rpm_unpack "./${UP}/${BASIS}-${i}-${MY_PV3}.${OOARCH}.rpm"
	done

	for j in base calc draw impress math writer; do
		rpm_unpack "./${UP}/openoffice.org3-${j}-${MY_PV3}.${OOARCH}.rpm"
	done

	rpm_unpack "./${UP}/openoffice.org3-${MY_PV3}.${OOARCH}.rpm"
	rpm_unpack "./${UP}/openoffice.org-ure-${UREVER}-${BUILDID}.${OOARCH}.rpm"

	rpm_unpack "./${UP}/desktop-integration/openoffice.org3.3-freedesktop-menus-3.3-${BUILDID2}.noarch.rpm"

	use gnome && rpm_unpack "./${UP}/${BASIS}-gnome-integration-${MY_PV3}.${OOARCH}.rpm"
	use kde && rpm_unpack "./${UP}/${BASIS}-kde-integration-${MY_PV3}.${OOARCH}.rpm"
	use java && rpm_unpack "./${UP}/${BASIS}-javafilter-${MY_PV3}.${OOARCH}.rpm"

	# Unpack provided dictionaries, unless there is a better solution...
	rpm_unpack "./${UP}/openoffice.org3-dict-en-${MY_PV3}.${OOARCH}.rpm"
	rpm_unpack "./${UP}/openoffice.org3-dict-es-${MY_PV3}.${OOARCH}.rpm"
	rpm_unpack "./${UP}/openoffice.org3-dict-fr-${MY_PV3}.${OOARCH}.rpm"

	strip-linguas ${LANGS}

	if [[ -z "${LINGUAS}" ]]; then
		export LINGUAS="en"
	fi

	for k in ${LINGUAS}; do
		i="${k/_/-}"
		if [[ ${i} = "en" ]] ; then
			i="en-US"
			LANGDIR="${PACKED}_${i}.${BUILDID}/RPMS/"
		else
			LANGDIR="${PACKED2}_${i}.${BUILDID}/RPMS/"
		fi
		rpm_unpack "./${LANGDIR}/${BASIS}-${i}-${MY_PV3}.${OOARCH}.rpm"
		rpm_unpack "./${LANGDIR}/openoffice.org3-${i}-${MY_PV3}.${OOARCH}.rpm"
		for j in base binfilter calc draw help impress math res writer; do
			rpm_unpack "./${LANGDIR}/${BASIS}-${i}-${j}-${MY_PV3}.${OOARCH}.rpm"
		done
	done

}

src_install () {

	INSTDIR="/usr/$(get_libdir)/openoffice"

	einfo "Installing OpenOffice.org into build root..."
	dodir ${INSTDIR}
	mv "${WORKDIR}"/opt/openoffice.org/* "${ED}${INSTDIR}" || die
	mv "${WORKDIR}"/opt/openoffice.org3/* "${ED}${INSTDIR}" || die

	#Menu entries, icons and mime-types
	cd "${ED}${INSTDIR}/share/xdg/"

	for desk in base calc draw impress math printeradmin qstart writer; do
		mv ${desk}.desktop openoffice.org-${desk}.desktop
		sed -i -e s/openoffice.org3/ooffice/g openoffice.org-${desk}.desktop || die
		sed -i -e s/openofficeorg3-${desk}/ooo-${desk}/g openoffice.org-${desk}.desktop || die
		domenu openoffice.org-${desk}.desktop
		insinto /usr/share/pixmaps
		if [ "${desk}" != "qstart" ] ; then
			newins "${WORKDIR}/usr/share/icons/gnome/48x48/apps/openofficeorg3-${desk}.png" ooo-${desk}.png
		fi
	done

	# Make sure the permissions are right
	use prefix || fowners -R root:0 /

	# Install wrapper script
	newbin "${T}/wrapper.in" ooffice
	sed -i -e s/LIBDIR/$(get_libdir)/g "${ED}/usr/bin/ooffice" || die

	# Component symlinks
	for app in base calc draw impress math writer; do
		dosym ${INSTDIR}/program/s${app} /usr/bin/oo${app}
	done

	dosym ${INSTDIR}/program/spadmin /usr/bin/ooffice-printeradmin
	dosym ${INSTDIR}/program/soffice /usr/bin/soffice

	rm -f "${ED}${INSTDIR}/basis-link" || die
	dosym ${INSTDIR}/basis3.3 ${INSTDIR}/basis-link

	# Change user install dir
	sed -i -e "s/.openoffice.org\/3/.ooo3/g" "${ED}${INSTDIR}/program/bootstraprc" || die

	# Non-java weirdness see bug #99366
	use !java && rm -f "${ED}${INSTDIR}/ure/bin/javaldx"

	# prevent revdep-rebuild from attempting to rebuild all the time
	insinto /etc/revdep-rebuild && doins "${T}/50-openoffice-bin"

}

pkg_postinst() {

	fdo-mime_desktop_database_update
	fdo-mime_mime_database_update

	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/openoffice/program/soffice.bin

	elog " openoffice-bin does not provide integration with system spell "
	elog " dictionaries. Please install them manually through the Extensions "
	elog " Manager (Tools > Extensions Manager) or use the source based "
	elog " package instead. "
	elog
	elog " Dictionaries for English, French and Spanish are provided in "
	elog " ${EPREFIX}/usr/$(get_libdir)/openoffice/share/extension/install "
	elog " Other dictionaries can be found at Suns extension site. "
	elog

}






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

* [gentoo-commits] gentoo-x86 commit in app-office/openoffice-bin: ChangeLog openoffice-bin-3.3.0.ebuild
@ 2011-03-17 11:47 Andreas Proschofsky (suka)
  0 siblings, 0 replies; 13+ messages in thread
From: Andreas Proschofsky (suka) @ 2011-03-17 11:47 UTC (permalink / raw
  To: gentoo-commits

suka        11/03/17 11:47:50

  Modified:             ChangeLog openoffice-bin-3.3.0.ebuild
  Log:
  Properly install all sizes of app and mimetype icons
  
  (Portage version: 2.2.0_alpha27/cvs/Linux x86_64)

Revision  Changes    Path
1.238                app-office/openoffice-bin/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/ChangeLog?rev=1.238&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/ChangeLog?rev=1.238&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/ChangeLog?r1=1.237&r2=1.238

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -r1.237 -r1.238
--- ChangeLog	16 Mar 2011 23:31:55 -0000	1.237
+++ ChangeLog	17 Mar 2011 11:47:50 -0000	1.238
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.237 2011/03/16 23:31:55 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.238 2011/03/17 11:47:50 suka Exp $
+
+  17 Mar 2011; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-bin-3.3.0.ebuild:
+  Properly install all sizes of app and mimetype icons
 
 *openoffice-bin-3.3.0 (16 Mar 2011)
 



1.2                  app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild

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

Index: openoffice-bin-3.3.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice-bin-3.3.0.ebuild	16 Mar 2011 23:31:55 -0000	1.1
+++ openoffice-bin-3.3.0.ebuild	17 Mar 2011 11:47:50 -0000	1.2
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild,v 1.1 2011/03/16 23:31:55 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild,v 1.2 2011/03/17 11:47:50 suka Exp $
 
 EAPI="3"
 
-inherit eutils fdo-mime pax-utils prefix rpm multilib
+inherit eutils fdo-mime gnome2-utils pax-utils prefix rpm multilib
 
 IUSE="gnome java kde"
 
@@ -138,17 +138,17 @@
 
 	#Menu entries, icons and mime-types
 	cd "${ED}${INSTDIR}/share/xdg/"
-
-	for desk in base calc draw impress math printeradmin qstart writer; do
+	for desk in base calc draw impress javafilter math printeradmin qstart startcenter writer; do
+		if [ "${desk}" = "javafilter" ] ; then
+			use java || { rm javafilter.desktop; continue; }
+		fi
 		mv ${desk}.desktop openoffice.org-${desk}.desktop
 		sed -i -e s/openoffice.org3/ooffice/g openoffice.org-${desk}.desktop || die
-		sed -i -e s/openofficeorg3-${desk}/ooo-${desk}/g openoffice.org-${desk}.desktop || die
 		domenu openoffice.org-${desk}.desktop
-		insinto /usr/share/pixmaps
-		if [ "${desk}" != "qstart" ] ; then
-			newins "${WORKDIR}/usr/share/icons/gnome/48x48/apps/openofficeorg3-${desk}.png" ooo-${desk}.png
-		fi
 	done
+	insinto /usr/share
+	doins -r "${WORKDIR}"/usr/share/icons
+	doins -r "${WORKDIR}"/usr/share/mime
 
 	# Make sure the permissions are right
 	use prefix || fowners -R root:0 /
@@ -179,10 +179,17 @@
 
 }
 
+pkg_preinst() {
+
+	use gnome && gnome2_icon_savelist
+
+}
+
 pkg_postinst() {
 
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
+	use gnome && gnome2_icon_cache_update
 
 	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/openoffice/program/soffice.bin
 
@@ -197,3 +204,10 @@
 	elog
 
 }
+
+pkg_postrm() {
+
+	fdo-mime_desktop_database_update
+	use gnome && gnome2_icon_cache_update
+
+}






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

* [gentoo-commits] gentoo-x86 commit in app-office/openoffice-bin: ChangeLog openoffice-bin-3.3.0.ebuild
@ 2011-03-17 11:56 Andreas Proschofsky (suka)
  0 siblings, 0 replies; 13+ messages in thread
From: Andreas Proschofsky (suka) @ 2011-03-17 11:56 UTC (permalink / raw
  To: gentoo-commits

suka        11/03/17 11:56:52

  Modified:             ChangeLog openoffice-bin-3.3.0.ebuild
  Log:
  Remove kde stuff, this is KDE3-only, which is not even in the tree anymore.
  
  (Portage version: 2.2.0_alpha27/cvs/Linux x86_64)

Revision  Changes    Path
1.239                app-office/openoffice-bin/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/ChangeLog?rev=1.239&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/ChangeLog?rev=1.239&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/ChangeLog?r1=1.238&r2=1.239

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -r1.238 -r1.239
--- ChangeLog	17 Mar 2011 11:47:50 -0000	1.238
+++ ChangeLog	17 Mar 2011 11:56:52 -0000	1.239
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/openoffice-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.238 2011/03/17 11:47:50 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.239 2011/03/17 11:56:52 suka Exp $
+
+  17 Mar 2011; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-bin-3.3.0.ebuild:
+  Remove kde stuff, this is KDE3-only, which is not even in the tree anymore.
+  Bug upstream about 
+  packaging KDE4-support
 
   17 Mar 2011; Andreas Proschofsky <suka@gentoo.org>
   openoffice-bin-3.3.0.ebuild:



1.3                  app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild

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

Index: openoffice-bin-3.3.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice-bin-3.3.0.ebuild	17 Mar 2011 11:47:50 -0000	1.2
+++ openoffice-bin-3.3.0.ebuild	17 Mar 2011 11:56:52 -0000	1.3
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild,v 1.2 2011/03/17 11:47:50 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild,v 1.3 2011/03/17 11:56:52 suka Exp $
 
 EAPI="3"
 
 inherit eutils fdo-mime gnome2-utils pax-utils prefix rpm multilib
 
-IUSE="gnome java kde"
+IUSE="gnome java"
 
 BUILDID="9567"
 BUILDID2="9556"
@@ -96,7 +96,6 @@
 	rpm_unpack "./${UP}/desktop-integration/openoffice.org3.3-freedesktop-menus-3.3-${BUILDID2}.noarch.rpm"
 
 	use gnome && rpm_unpack "./${UP}/${BASIS}-gnome-integration-${MY_PV3}.${OOARCH}.rpm"
-	use kde && rpm_unpack "./${UP}/${BASIS}-kde-integration-${MY_PV3}.${OOARCH}.rpm"
 	use java && rpm_unpack "./${UP}/${BASIS}-javafilter-${MY_PV3}.${OOARCH}.rpm"
 
 	# Unpack provided dictionaries, unless there is a better solution...






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

* [gentoo-commits] gentoo-x86 commit in app-office/openoffice-bin: ChangeLog openoffice-bin-3.3.0.ebuild
@ 2011-03-17 13:04 Andreas Proschofsky (suka)
  0 siblings, 0 replies; 13+ messages in thread
From: Andreas Proschofsky (suka) @ 2011-03-17 13:04 UTC (permalink / raw
  To: gentoo-commits

suka        11/03/17 13:04:03

  Modified:             ChangeLog openoffice-bin-3.3.0.ebuild
  Log:
  Bunch of cleanups, dependencies, restricts
  
  (Portage version: 2.2.0_alpha27/cvs/Linux x86_64)

Revision  Changes    Path
1.240                app-office/openoffice-bin/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/ChangeLog?rev=1.240&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/ChangeLog?rev=1.240&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/ChangeLog?r1=1.239&r2=1.240

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -r1.239 -r1.240
--- ChangeLog	17 Mar 2011 11:56:52 -0000	1.239
+++ ChangeLog	17 Mar 2011 13:04:03 -0000	1.240
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.239 2011/03/17 11:56:52 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.240 2011/03/17 13:04:03 suka Exp $
+
+  17 Mar 2011; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-bin-3.3.0.ebuild:
+  Bunch of cleanups, dependencies, restricts
 
   17 Mar 2011; Andreas Proschofsky <suka@gentoo.org>
   openoffice-bin-3.3.0.ebuild:



1.4                  app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild

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

Index: openoffice-bin-3.3.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openoffice-bin-3.3.0.ebuild	17 Mar 2011 11:56:52 -0000	1.3
+++ openoffice-bin-3.3.0.ebuild	17 Mar 2011 13:04:03 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild,v 1.3 2011/03/17 11:56:52 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild,v 1.4 2011/03/17 13:04:03 suka Exp $
 
 EAPI="3"
 
@@ -50,38 +50,38 @@
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
-RDEPEND="!app-office/openoffice
+RDEPEND="!app-office/libreoffice
+	!app-office/openoffice
+	!app-office/libreoffice-bin
 	x11-libs/libXaw
 	!prefix? ( sys-libs/glibc )
 	>=dev-lang/perl-5.0
 	app-arch/zip
 	app-arch/unzip
-	>=media-libs/freetype-2.1.10-r2
-	java? ( >=virtual/jre-1.5 )
-	linguas_ja? ( >=media-fonts/kochi-substitute-20030809-r3 )
-	linguas_zh_CN? ( >=media-fonts/arphicfonts-0.1-r2 )
-	linguas_zh_TW? ( >=media-fonts/arphicfonts-0.1-r2 )"
+	x11-libs/libXinerama
+	>=media-libs/freetype-2.1.10-r2"
 
 DEPEND="${RDEPEND}
 	sys-apps/findutils"
 
-RESTRICT="strip"
+PDEPEND="java? ( >=virtual/jre-1.5 )"
 
-QA_EXECSTACK="usr/$(get_libdir)/openoffice/basis3.2/program/*
+RESTRICT="strip binchecks"
+
+QA_EXECSTACK="usr/$(get_libdir)/openoffice/basis3.3/program/*
 	usr/$(get_libdir)/openoffice/ure/lib/*"
-QA_TEXTRELS="usr/$(get_libdir)/openoffice/basis3.2/program/libvclplug_genli.so \
-	usr/$(get_libdir)/openoffice/basis3.2/program/python-core-2.3.4/lib/lib-dynload/_curses_panel.so \
-	usr/$(get_libdir)/openoffice/basis3.2/program/python-core-2.3.4/lib/lib-dynload/_curses.so \
+QA_TEXTRELS="usr/$(get_libdir)/openoffice/basis3.3/program/libvclplug_genli.so \
+	usr/$(get_libdir)/openoffice/basis3.3/program/python-core-2.6.1/lib/lib-dynload/_curses_panel.so \
+	usr/$(get_libdir)/openoffice/basis3.3/program/python-core-2.6.1/lib/lib-dynload/_curses.so \
 	usr/$(get_libdir)/openoffice/ure/lib/*"
 
 src_unpack() {
 
 	unpack ${A}
+
 	cp "${FILESDIR}"/{50-openoffice-bin,wrapper.in} "${T}"
 	eprefixify "${T}"/{50-openoffice-bin,wrapper.in}
 
-	cd "${S}"
-
 	for i in base binfilter calc core01 core02 core03 core04 core05 core06 core07 draw graphicfilter images impress math ooofonts oooimprovement ooolinguistic pyuno testtool writer xsltfilter ; do
 		rpm_unpack "./${UP}/${BASIS}-${i}-${MY_PV3}.${OOARCH}.rpm"
 	done
@@ -103,8 +103,8 @@
 	rpm_unpack "./${UP}/openoffice.org3-dict-es-${MY_PV3}.${OOARCH}.rpm"
 	rpm_unpack "./${UP}/openoffice.org3-dict-fr-${MY_PV3}.${OOARCH}.rpm"
 
+	# Localization
 	strip-linguas ${LANGS}
-
 	if [[ -z "${LINGUAS}" ]]; then
 		export LINGUAS="en"
 	fi






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

* [gentoo-commits] gentoo-x86 commit in app-office/openoffice-bin: ChangeLog openoffice-bin-3.3.0.ebuild
@ 2011-03-17 13:51 Andreas Proschofsky (suka)
  0 siblings, 0 replies; 13+ messages in thread
From: Andreas Proschofsky (suka) @ 2011-03-17 13:51 UTC (permalink / raw
  To: gentoo-commits

suka        11/03/17 13:51:00

  Modified:             ChangeLog openoffice-bin-3.3.0.ebuild
  Log:
  Remove usage of RESTRICT="bincheck"
  
  (Portage version: 2.2.0_alpha27/cvs/Linux x86_64)

Revision  Changes    Path
1.242                app-office/openoffice-bin/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/ChangeLog?rev=1.242&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/ChangeLog?rev=1.242&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/ChangeLog?r1=1.241&r2=1.242

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -r1.241 -r1.242
--- ChangeLog	17 Mar 2011 13:27:18 -0000	1.241
+++ ChangeLog	17 Mar 2011 13:51:00 -0000	1.242
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.241 2011/03/17 13:27:18 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.242 2011/03/17 13:51:00 suka Exp $
+
+  17 Mar 2011; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-bin-3.3.0.ebuild:
+  Remove usage of RESTRICT="bincheck"
 
   17 Mar 2011; Andreas Proschofsky <suka@gentoo.org>
   openoffice-bin-3.2.1.ebuild, openoffice-bin-3.3.0.ebuild:



1.6                  app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild?r1=1.5&r2=1.6

Index: openoffice-bin-3.3.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openoffice-bin-3.3.0.ebuild	17 Mar 2011 13:27:18 -0000	1.5
+++ openoffice-bin-3.3.0.ebuild	17 Mar 2011 13:51:00 -0000	1.6
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild,v 1.5 2011/03/17 13:27:18 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild,v 1.6 2011/03/17 13:51:00 suka Exp $
 
 EAPI="3"
 
@@ -66,7 +66,7 @@
 
 PDEPEND="java? ( >=virtual/jre-1.5 )"
 
-RESTRICT="strip binchecks"
+RESTRICT="strip"
 
 QA_EXECSTACK="usr/$(get_libdir)/openoffice/basis3.3/program/*
 	usr/$(get_libdir)/openoffice/ure/lib/*"






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

* [gentoo-commits] gentoo-x86 commit in app-office/openoffice-bin: ChangeLog openoffice-bin-3.3.0.ebuild
@ 2011-03-18 22:58 Andreas Proschofsky (suka)
  0 siblings, 0 replies; 13+ messages in thread
From: Andreas Proschofsky (suka) @ 2011-03-18 22:58 UTC (permalink / raw
  To: gentoo-commits

suka        11/03/18 22:58:10

  Modified:             ChangeLog openoffice-bin-3.3.0.ebuild
  Log:
  some ebuild reorganization to make future maintenance easier
  
  (Portage version: 2.2.0_alpha27/cvs/Linux x86_64)

Revision  Changes    Path
1.243                app-office/openoffice-bin/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/ChangeLog?rev=1.243&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/ChangeLog?rev=1.243&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/ChangeLog?r1=1.242&r2=1.243

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -r1.242 -r1.243
--- ChangeLog	17 Mar 2011 13:51:00 -0000	1.242
+++ ChangeLog	18 Mar 2011 22:58:10 -0000	1.243
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.242 2011/03/17 13:51:00 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.243 2011/03/18 22:58:10 suka Exp $
+
+  18 Mar 2011; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-bin-3.3.0.ebuild:
+  some ebuild reorganization to make future maintenance easier
 
   17 Mar 2011; Andreas Proschofsky <suka@gentoo.org>
   openoffice-bin-3.3.0.ebuild:



1.7                  app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild?r1=1.6&r2=1.7

Index: openoffice-bin-3.3.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- openoffice-bin-3.3.0.ebuild	17 Mar 2011 13:51:00 -0000	1.6
+++ openoffice-bin-3.3.0.ebuild	18 Mar 2011 22:58:10 -0000	1.7
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild,v 1.6 2011/03/17 13:51:00 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild,v 1.7 2011/03/18 22:58:10 suka Exp $
 
 EAPI="3"
 
@@ -10,20 +10,26 @@
 
 BUILDID="9567"
 BUILDID2="9556"
-UREVER="1.7.0"
+MST="OOO330_m20"
 MY_PV="${PV}rc10"
 MY_PV2="${MY_PV}_20110118"
-MY_PV3="${PV}-${BUILDID}"
+BVER="${PV}-${BUILDID}"
+BVER2="3.3-${BUILDID2}"
+UREVER="1.7.0"
 BASIS="ooobasis3.3"
-MST="OOO330_m20"
+BASIS2="basis3.3"
+NM="openoffice"
+NM1="${NM}.org"
+NM2="${NM1}3"
+NM3="${NM2}.3"
 FILEPATH="http://download.services.openoffice.org/files/extended/${MY_PV}"
 
 if [ "${ARCH}" = "amd64" ] ; then
-	OOARCH="x86_64"
+	XARCH="x86_64"
 	PACKED="${MST}_native_packed-1"
 	PACKED2="${MST}_native_packed-1"
 else
-	OOARCH="i586"
+	XARCH="i586"
 	PACKED="${MST}_native_packed-1"
 	PACKED2="${MST}_native_packed-1"
 fi
@@ -68,40 +74,40 @@
 
 RESTRICT="strip"
 
-QA_EXECSTACK="usr/$(get_libdir)/openoffice/basis3.3/program/*
-	usr/$(get_libdir)/openoffice/ure/lib/*"
-QA_TEXTRELS="usr/$(get_libdir)/openoffice/basis3.3/program/libvclplug_genli.so \
-	usr/$(get_libdir)/openoffice/basis3.3/program/python-core-2.6.1/lib/lib-dynload/_curses_panel.so \
-	usr/$(get_libdir)/openoffice/basis3.3/program/python-core-2.6.1/lib/lib-dynload/_curses.so \
-	usr/$(get_libdir)/openoffice/ure/lib/*"
+QA_EXECSTACK="usr/$(get_libdir)/${NM}/${BASIS2}/program/*
+	usr/$(get_libdir)/${NM}/ure/lib/*"
+QA_TEXTRELS="usr/$(get_libdir)/${NM}/${BASIS2}/program/libvclplug_genli.so \
+	usr/$(get_libdir)/${NM}/${BASIS2}/program/python-core-2.6.1/lib/lib-dynload/_curses_panel.so \
+	usr/$(get_libdir)/${NM}/${BASIS2}/program/python-core-2.6.1/lib/lib-dynload/_curses.so \
+	usr/$(get_libdir)/${NM}/ure/lib/*"
 
 src_unpack() {
 
 	unpack ${A}
 
-	cp "${FILESDIR}"/{50-openoffice-bin,wrapper.in} "${T}"
-	eprefixify "${T}"/{50-openoffice-bin,wrapper.in}
+	cp "${FILESDIR}"/{50-${PN},wrapper.in} "${T}"
+	eprefixify "${T}"/{50-${PN},wrapper.in}
 
 	for i in base binfilter calc core01 core02 core03 core04 core05 core06 core07 draw graphicfilter images impress math ooofonts oooimprovement ooolinguistic pyuno testtool writer xsltfilter ; do
-		rpm_unpack "./${UP}/${BASIS}-${i}-${MY_PV3}.${OOARCH}.rpm"
+		rpm_unpack "./${UP}/${BASIS}-${i}-${BVER}.${XARCH}.rpm"
 	done
 
+	rpm_unpack "./${UP}/${NM2}-${BVER}.${XARCH}.rpm"
+	rpm_unpack "./${UP}/${NM1}-ure-${UREVER}-${BUILDID}.${XARCH}.rpm"
+
 	for j in base calc draw impress math writer; do
-		rpm_unpack "./${UP}/openoffice.org3-${j}-${MY_PV3}.${OOARCH}.rpm"
+		rpm_unpack "./${UP}/${NM2}-${j}-${BVER}.${XARCH}.rpm"
 	done
 
-	rpm_unpack "./${UP}/openoffice.org3-${MY_PV3}.${OOARCH}.rpm"
-	rpm_unpack "./${UP}/openoffice.org-ure-${UREVER}-${BUILDID}.${OOARCH}.rpm"
-
-	rpm_unpack "./${UP}/desktop-integration/openoffice.org3.3-freedesktop-menus-3.3-${BUILDID2}.noarch.rpm"
+	rpm_unpack "./${UP}/desktop-integration/${NM3}-freedesktop-menus-${BVER2}.noarch.rpm"
 
-	use gnome && rpm_unpack "./${UP}/${BASIS}-gnome-integration-${MY_PV3}.${OOARCH}.rpm"
-	use java && rpm_unpack "./${UP}/${BASIS}-javafilter-${MY_PV3}.${OOARCH}.rpm"
+	use gnome && rpm_unpack "./${UP}/${BASIS}-gnome-integration-${BVER}.${XARCH}.rpm"
+	use java && rpm_unpack "./${UP}/${BASIS}-javafilter-${BVER}.${XARCH}.rpm"
 
 	# Unpack provided dictionaries, unless there is a better solution...
-	rpm_unpack "./${UP}/openoffice.org3-dict-en-${MY_PV3}.${OOARCH}.rpm"
-	rpm_unpack "./${UP}/openoffice.org3-dict-es-${MY_PV3}.${OOARCH}.rpm"
-	rpm_unpack "./${UP}/openoffice.org3-dict-fr-${MY_PV3}.${OOARCH}.rpm"
+	rpm_unpack "./${UP}/${NM2}-dict-en-${BVER}.${XARCH}.rpm"
+	rpm_unpack "./${UP}/${NM2}-dict-es-${BVER}.${XARCH}.rpm"
+	rpm_unpack "./${UP}/${NM2}-dict-fr-${BVER}.${XARCH}.rpm"
 
 	# Localization
 	strip-linguas ${LANGS}
@@ -117,10 +123,10 @@
 		else
 			LANGDIR="${PACKED2}_${i}.${BUILDID}/RPMS/"
 		fi
-		rpm_unpack "./${LANGDIR}/${BASIS}-${i}-${MY_PV3}.${OOARCH}.rpm"
-		rpm_unpack "./${LANGDIR}/openoffice.org3-${i}-${MY_PV3}.${OOARCH}.rpm"
+		rpm_unpack "./${LANGDIR}/${BASIS}-${i}-${BVER}.${XARCH}.rpm"
+		rpm_unpack "./${LANGDIR}/${NM2}-${i}-${BVER}.${XARCH}.rpm"
 		for j in base binfilter calc draw help impress math res writer; do
-			rpm_unpack "./${LANGDIR}/${BASIS}-${i}-${j}-${MY_PV3}.${OOARCH}.rpm"
+			rpm_unpack "./${LANGDIR}/${BASIS}-${i}-${j}-${BVER}.${XARCH}.rpm"
 		done
 	done
 
@@ -128,12 +134,10 @@
 
 src_install () {
 
-	INSTDIR="/usr/$(get_libdir)/openoffice"
-
-	einfo "Installing OpenOffice.org into build root..."
+	INSTDIR="/usr/$(get_libdir)/${NM}"
 	dodir ${INSTDIR}
-	mv "${WORKDIR}"/opt/openoffice.org/* "${ED}${INSTDIR}" || die
-	mv "${WORKDIR}"/opt/openoffice.org3/* "${ED}${INSTDIR}" || die
+	mv "${WORKDIR}"/opt/${NM1}/* "${ED}${INSTDIR}" || die
+	mv "${WORKDIR}"/opt/${NM2}/* "${ED}${INSTDIR}" || die
 
 	#Menu entries, icons and mime-types
 	cd "${ED}${INSTDIR}/share/xdg/"
@@ -141,9 +145,9 @@
 		if [ "${desk}" = "javafilter" ] ; then
 			use java || { rm javafilter.desktop; continue; }
 		fi
-		mv ${desk}.desktop openoffice.org-${desk}.desktop
-		sed -i -e s/openoffice.org3/ooffice/g openoffice.org-${desk}.desktop || die
-		domenu openoffice.org-${desk}.desktop
+		mv ${desk}.desktop ${NM1}-${desk}.desktop
+		sed -i -e s/${NM2}/ooffice/g ${NM1}-${desk}.desktop || die
+		domenu ${NM1}-${desk}.desktop
 	done
 	insinto /usr/share
 	doins -r "${WORKDIR}"/usr/share/icons
@@ -165,16 +169,16 @@
 	dosym ${INSTDIR}/program/soffice /usr/bin/soffice
 
 	rm -f "${ED}${INSTDIR}/basis-link" || die
-	dosym ${INSTDIR}/basis3.3 ${INSTDIR}/basis-link
+	dosym ${INSTDIR}/${BASIS2} ${INSTDIR}/basis-link
 
 	# Change user install dir
-	sed -i -e "s/.openoffice.org\/3/.ooo3/g" "${ED}${INSTDIR}/program/bootstraprc" || die
+	sed -i -e "s/.${NM1}\/3/.ooo3/g" "${ED}${INSTDIR}/program/bootstraprc" || die
 
 	# Non-java weirdness see bug #99366
 	use !java && rm -f "${ED}${INSTDIR}/ure/bin/javaldx"
 
 	# prevent revdep-rebuild from attempting to rebuild all the time
-	insinto /etc/revdep-rebuild && doins "${T}/50-openoffice-bin"
+	insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
 
 }
 
@@ -190,7 +194,7 @@
 	fdo-mime_mime_database_update
 	use gnome && gnome2_icon_cache_update
 
-	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/openoffice/program/soffice.bin
+	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/${NM}/program/soffice.bin
 
 	elog " openoffice-bin does not provide integration with system spell "
 	elog " dictionaries. Please install them manually through the Extensions "






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

* [gentoo-commits] gentoo-x86 commit in app-office/openoffice-bin: ChangeLog openoffice-bin-3.3.0.ebuild
@ 2011-03-18 23:42 Andreas Proschofsky (suka)
  0 siblings, 0 replies; 13+ messages in thread
From: Andreas Proschofsky (suka) @ 2011-03-18 23:42 UTC (permalink / raw
  To: gentoo-commits

suka        11/03/18 23:42:47

  Modified:             ChangeLog openoffice-bin-3.3.0.ebuild
  Log:
  Install all the available dictionaries by default
  
  (Portage version: 2.2.0_alpha27/cvs/Linux x86_64)

Revision  Changes    Path
1.244                app-office/openoffice-bin/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/ChangeLog?rev=1.244&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/ChangeLog?rev=1.244&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/ChangeLog?r1=1.243&r2=1.244

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -r1.243 -r1.244
--- ChangeLog	18 Mar 2011 22:58:10 -0000	1.243
+++ ChangeLog	18 Mar 2011 23:42:47 -0000	1.244
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.243 2011/03/18 22:58:10 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.244 2011/03/18 23:42:47 suka Exp $
+
+  18 Mar 2011; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-bin-3.3.0.ebuild:
+  Install all the available dictionaries by default
 
   18 Mar 2011; Andreas Proschofsky <suka@gentoo.org>
   openoffice-bin-3.3.0.ebuild:



1.8                  app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild?r1=1.7&r2=1.8

Index: openoffice-bin-3.3.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- openoffice-bin-3.3.0.ebuild	18 Mar 2011 22:58:10 -0000	1.7
+++ openoffice-bin-3.3.0.ebuild	18 Mar 2011 23:42:47 -0000	1.8
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild,v 1.7 2011/03/18 22:58:10 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild,v 1.8 2011/03/18 23:42:47 suka Exp $
 
 EAPI="3"
 
@@ -104,30 +104,35 @@
 	use gnome && rpm_unpack "./${UP}/${BASIS}-gnome-integration-${BVER}.${XARCH}.rpm"
 	use java && rpm_unpack "./${UP}/${BASIS}-javafilter-${BVER}.${XARCH}.rpm"
 
-	# Unpack provided dictionaries, unless there is a better solution...
+	# English support installed by default
+	rpm_unpack "./${UP}/${BASIS}-en-US-${BVER}.${XARCH}.rpm"
+	rpm_unpack "./${UP}/${NM2}-en-US-${BVER}.${XARCH}.rpm"
 	rpm_unpack "./${UP}/${NM2}-dict-en-${BVER}.${XARCH}.rpm"
-	rpm_unpack "./${UP}/${NM2}-dict-es-${BVER}.${XARCH}.rpm"
-	rpm_unpack "./${UP}/${NM2}-dict-fr-${BVER}.${XARCH}.rpm"
+	for s in base binfilter calc draw help impress math res writer ; do
+		rpm_unpack "./${UP}/${BASIS}-en-US-${s}-${BVER}.${XARCH}.rpm"
+	done
 
 	# Localization
 	strip-linguas ${LANGS}
-	if [[ -z "${LINGUAS}" ]]; then
-		export LINGUAS="en"
-	fi
-
-	for k in ${LINGUAS}; do
-		i="${k/_/-}"
-		if [[ ${i} = "en" ]] ; then
-			i="en-US"
-			LANGDIR="${PACKED}_${i}.${BUILDID}/RPMS/"
-		else
-			LANGDIR="${PACKED2}_${i}.${BUILDID}/RPMS/"
+	for l in ${LINGUAS}; do
+		m="${l/_/-}"
+		if [[ ${m} != "en" ]] ; then
+			LANGDIR="${PACKED2}_${m}.${BUILDID}/RPMS/"
+			rpm_unpack "./${LANGDIR}/${BASIS}-${m}-${BVER}.${XARCH}.rpm"
+			rpm_unpack "./${LANGDIR}/${NM2}-${m}-${BVER}.${XARCH}.rpm"
+			for n in base binfilter calc draw help impress math res writer; do
+				rpm_unpack "./${LANGDIR}/${BASIS}-${m}-${n}-${BVER}.${XARCH}.rpm"
+			done
+
+			for DICT_FILE in `find "./${LANGDIR}" -name "${NM2}-dict-*-${BVER}.${XARCH}.rpm"`; do
+				DICT_REGEX="s/${NM2}-dict-(.*?)-${BVER}.${XARCH}.rpm/\1/"
+				DICT_LOCALE=`basename "$DICT_FILE" | sed -E "${DICT_REGEX}"`
+				if [[ -n "${DICT_LOCALE}" && ! -d "${WORKDIR}/opt/${NM1}/share/extensions/dict-${DICT_LOCALE}" ]] ; then
+					rpm_unpack "${DICT_FILE}"
+				fi
+			done
+
 		fi
-		rpm_unpack "./${LANGDIR}/${BASIS}-${i}-${BVER}.${XARCH}.rpm"
-		rpm_unpack "./${LANGDIR}/${NM2}-${i}-${BVER}.${XARCH}.rpm"
-		for j in base binfilter calc draw help impress math res writer; do
-			rpm_unpack "./${LANGDIR}/${BASIS}-${i}-${j}-${BVER}.${XARCH}.rpm"
-		done
 	done
 
 }
@@ -196,16 +201,6 @@
 
 	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/${NM}/program/soffice.bin
 
-	elog " openoffice-bin does not provide integration with system spell "
-	elog " dictionaries. Please install them manually through the Extensions "
-	elog " Manager (Tools > Extensions Manager) or use the source based "
-	elog " package instead. "
-	elog
-	elog " Dictionaries for English, French and Spanish are provided in "
-	elog " ${EPREFIX}/usr/$(get_libdir)/openoffice/share/extension/install "
-	elog " Other dictionaries can be found at Suns extension site. "
-	elog
-
 }
 
 pkg_postrm() {






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

* [gentoo-commits] gentoo-x86 commit in app-office/openoffice-bin: ChangeLog openoffice-bin-3.3.0.ebuild
@ 2011-03-19  0:06 Andreas Proschofsky (suka)
  0 siblings, 0 replies; 13+ messages in thread
From: Andreas Proschofsky (suka) @ 2011-03-19  0:06 UTC (permalink / raw
  To: gentoo-commits

suka        11/03/19 00:06:58

  Modified:             ChangeLog openoffice-bin-3.3.0.ebuild
  Log:
  Minor cleanup
  
  (Portage version: 2.2.0_alpha27/cvs/Linux x86_64)

Revision  Changes    Path
1.245                app-office/openoffice-bin/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/ChangeLog?rev=1.245&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/ChangeLog?rev=1.245&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/ChangeLog?r1=1.244&r2=1.245

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -r1.244 -r1.245
--- ChangeLog	18 Mar 2011 23:42:47 -0000	1.244
+++ ChangeLog	19 Mar 2011 00:06:58 -0000	1.245
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.244 2011/03/18 23:42:47 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.245 2011/03/19 00:06:58 suka Exp $
+
+  19 Mar 2011; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-bin-3.3.0.ebuild:
+  Minor cleanup
 
   18 Mar 2011; Andreas Proschofsky <suka@gentoo.org>
   openoffice-bin-3.3.0.ebuild:



1.9                  app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild?r1=1.8&r2=1.9

Index: openoffice-bin-3.3.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- openoffice-bin-3.3.0.ebuild	18 Mar 2011 23:42:47 -0000	1.8
+++ openoffice-bin-3.3.0.ebuild	19 Mar 2011 00:06:58 -0000	1.9
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild,v 1.8 2011/03/18 23:42:47 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild,v 1.9 2011/03/19 00:06:58 suka Exp $
 
 EAPI="3"
 
@@ -27,11 +27,9 @@
 if [ "${ARCH}" = "amd64" ] ; then
 	XARCH="x86_64"
 	PACKED="${MST}_native_packed-1"
-	PACKED2="${MST}_native_packed-1"
 else
 	XARCH="i586"
 	PACKED="${MST}_native_packed-1"
-	PACKED2="${MST}_native_packed-1"
 fi
 
 S="${WORKDIR}"
@@ -117,7 +115,7 @@
 	for l in ${LINGUAS}; do
 		m="${l/_/-}"
 		if [[ ${m} != "en" ]] ; then
-			LANGDIR="${PACKED2}_${m}.${BUILDID}/RPMS/"
+			LANGDIR="${PACKED}_${m}.${BUILDID}/RPMS/"
 			rpm_unpack "./${LANGDIR}/${BASIS}-${m}-${BVER}.${XARCH}.rpm"
 			rpm_unpack "./${LANGDIR}/${NM2}-${m}-${BVER}.${XARCH}.rpm"
 			for n in base binfilter calc draw help impress math res writer; do






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

* [gentoo-commits] gentoo-x86 commit in app-office/openoffice-bin: ChangeLog openoffice-bin-3.3.0.ebuild
@ 2011-03-19  0:38 Andreas Proschofsky (suka)
  0 siblings, 0 replies; 13+ messages in thread
From: Andreas Proschofsky (suka) @ 2011-03-19  0:38 UTC (permalink / raw
  To: gentoo-commits

suka        11/03/19 00:38:59

  Modified:             ChangeLog openoffice-bin-3.3.0.ebuild
  Log:
  Another minor ebuild cleanup
  
  (Portage version: 2.2.0_alpha27/cvs/Linux x86_64)

Revision  Changes    Path
1.246                app-office/openoffice-bin/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/ChangeLog?rev=1.246&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/ChangeLog?rev=1.246&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/ChangeLog?r1=1.245&r2=1.246

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -r1.245 -r1.246
--- ChangeLog	19 Mar 2011 00:06:58 -0000	1.245
+++ ChangeLog	19 Mar 2011 00:38:59 -0000	1.246
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.245 2011/03/19 00:06:58 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.246 2011/03/19 00:38:59 suka Exp $
+
+  19 Mar 2011; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-bin-3.3.0.ebuild:
+  Another minor ebuild cleanup
 
   19 Mar 2011; Andreas Proschofsky <suka@gentoo.org>
   openoffice-bin-3.3.0.ebuild:



1.10                 app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild?r1=1.9&r2=1.10

Index: openoffice-bin-3.3.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- openoffice-bin-3.3.0.ebuild	19 Mar 2011 00:06:58 -0000	1.9
+++ openoffice-bin-3.3.0.ebuild	19 Mar 2011 00:38:59 -0000	1.10
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild,v 1.9 2011/03/19 00:06:58 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild,v 1.10 2011/03/19 00:38:59 suka Exp $
 
 EAPI="3"
 
@@ -32,9 +32,8 @@
 	PACKED="${MST}_native_packed-1"
 fi
 
-S="${WORKDIR}"
 UP="${PACKED}_en-US.${BUILDID}/RPMS"
-DESCRIPTION="OpenOffice productivity suite"
+DESCRIPTION="OpenOffice productivity suite."
 
 SRC_URI="x86? ( http://download.services.openoffice.org/files/stable/${PV}/OOo_${PV}_Linux_x86_install-rpm_en-US.tar.gz )
 	amd64? ( http://download.services.openoffice.org/files/stable/${PV}/OOo_${PV}_Linux_x86-64_install-rpm-wJRE_en-US.tar.gz  )"






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

* [gentoo-commits] gentoo-x86 commit in app-office/openoffice-bin: ChangeLog openoffice-bin-3.3.0.ebuild
@ 2011-03-20 13:01 Andreas Proschofsky (suka)
  0 siblings, 0 replies; 13+ messages in thread
From: Andreas Proschofsky (suka) @ 2011-03-20 13:01 UTC (permalink / raw
  To: gentoo-commits

suka        11/03/20 13:01:12

  Modified:             ChangeLog openoffice-bin-3.3.0.ebuild
  Log:
  Add some more supported languages, ebuild cleanups
  
  (Portage version: 2.2.0_alpha28/cvs/Linux x86_64)

Revision  Changes    Path
1.247                app-office/openoffice-bin/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/ChangeLog?rev=1.247&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/ChangeLog?rev=1.247&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/ChangeLog?r1=1.246&r2=1.247

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -r1.246 -r1.247
--- ChangeLog	19 Mar 2011 00:38:59 -0000	1.246
+++ ChangeLog	20 Mar 2011 13:01:11 -0000	1.247
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.246 2011/03/19 00:38:59 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.247 2011/03/20 13:01:11 suka Exp $
+
+  20 Mar 2011; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-bin-3.3.0.ebuild:
+  Add some more supported languages, ebuild cleanups
 
   19 Mar 2011; Andreas Proschofsky <suka@gentoo.org>
   openoffice-bin-3.3.0.ebuild:



1.11                 app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild?r1=1.10&r2=1.11

Index: openoffice-bin-3.3.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- openoffice-bin-3.3.0.ebuild	19 Mar 2011 00:38:59 -0000	1.10
+++ openoffice-bin-3.3.0.ebuild	20 Mar 2011 13:01:11 -0000	1.11
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild,v 1.10 2011/03/19 00:38:59 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild,v 1.11 2011/03/20 13:01:11 suka Exp $
 
 EAPI="3"
 
@@ -23,7 +23,6 @@
 NM2="${NM1}3"
 NM3="${NM2}.3"
 FILEPATH="http://download.services.openoffice.org/files/extended/${MY_PV}"
-
 if [ "${ARCH}" = "amd64" ] ; then
 	XARCH="x86_64"
 	PACKED="${MST}_native_packed-1"
@@ -31,14 +30,14 @@
 	XARCH="i586"
 	PACKED="${MST}_native_packed-1"
 fi
-
 UP="${PACKED}_en-US.${BUILDID}/RPMS"
-DESCRIPTION="OpenOffice productivity suite."
 
+DESCRIPTION="OpenOffice productivity suite."
+HOMEPAGE="http://www.openoffice.org/"
 SRC_URI="x86? ( http://download.services.openoffice.org/files/stable/${PV}/OOo_${PV}_Linux_x86_install-rpm_en-US.tar.gz )
 	amd64? ( http://download.services.openoffice.org/files/stable/${PV}/OOo_${PV}_Linux_x86-64_install-rpm-wJRE_en-US.tar.gz  )"
 
-LANGS="ar as ast bg bn ca cs da de dz el en en_GB eo es et eu fi fr ga gl gu hi hu id is it ja ka km kn ko ku lt lv mk ml mr my nb nl nn oc om or pa_IN pl pt pt_BR ro ru sh si sk sl sr sv ta te th tr ug uk uz vi zh_CN zh_TW"
+LANGS="ar as ast be_BY bg bn ca ca_XV cs da de dz el en en_GB eo es et eu fi fr ga gl gu he hi hu id is it ja ka km kn ko ku lt lv mk ml mr my nb nl nn oc om or pa_IN pl pt pt_BR ro ru sh si sk sl sr sv ta te th tr ug uk uz vi zh_CN zh_TW"
 
 for X in ${LANGS} ; do
 	[[ ${X} != "en" ]] && SRC_URI="${SRC_URI} linguas_${X}? (
@@ -47,8 +46,6 @@
 	IUSE="${IUSE} linguas_${X}"
 done
 
-HOMEPAGE="http://www.openoffice.org/"
-
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
@@ -56,13 +53,13 @@
 RDEPEND="!app-office/libreoffice
 	!app-office/openoffice
 	!app-office/libreoffice-bin
-	x11-libs/libXaw
 	!prefix? ( sys-libs/glibc )
-	>=dev-lang/perl-5.0
-	app-arch/zip
 	app-arch/unzip
-	x11-libs/libXinerama
-	>=media-libs/freetype-2.1.10-r2"
+	app-arch/zip
+	>=dev-lang/perl-5.0
+	>=media-libs/freetype-2.1.10-r2
+	x11-libs/libXaw
+	x11-libs/libXinerama"
 
 DEPEND="${RDEPEND}
 	sys-apps/findutils"






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

* [gentoo-commits] gentoo-x86 commit in app-office/openoffice-bin: ChangeLog openoffice-bin-3.3.0.ebuild
@ 2011-03-20 15:53 PaweA Hajdan (phajdan.jr)
  0 siblings, 0 replies; 13+ messages in thread
From: PaweA Hajdan (phajdan.jr) @ 2011-03-20 15:53 UTC (permalink / raw
  To: gentoo-commits

phajdan.jr    11/03/20 15:53:22

  Modified:             ChangeLog openoffice-bin-3.3.0.ebuild
  Log:
  x86 stable wrt security bug #332321
  
  (Portage version: 2.1.9.42/cvs/Linux i686)

Revision  Changes    Path
1.248                app-office/openoffice-bin/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/ChangeLog?rev=1.248&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/ChangeLog?rev=1.248&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/ChangeLog?r1=1.247&r2=1.248

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -r1.247 -r1.248
--- ChangeLog	20 Mar 2011 13:01:11 -0000	1.247
+++ ChangeLog	20 Mar 2011 15:53:22 -0000	1.248
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.247 2011/03/20 13:01:11 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.248 2011/03/20 15:53:22 phajdan.jr Exp $
+
+  20 Mar 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  openoffice-bin-3.3.0.ebuild:
+  x86 stable wrt security bug #332321
 
   20 Mar 2011; Andreas Proschofsky <suka@gentoo.org>
   openoffice-bin-3.3.0.ebuild:



1.12                 app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild?r1=1.11&r2=1.12

Index: openoffice-bin-3.3.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- openoffice-bin-3.3.0.ebuild	20 Mar 2011 13:01:11 -0000	1.11
+++ openoffice-bin-3.3.0.ebuild	20 Mar 2011 15:53:22 -0000	1.12
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild,v 1.11 2011/03/20 13:01:11 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild,v 1.12 2011/03/20 15:53:22 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -48,7 +48,7 @@
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="!app-office/libreoffice
 	!app-office/openoffice






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

* [gentoo-commits] gentoo-x86 commit in app-office/openoffice-bin: ChangeLog openoffice-bin-3.3.0.ebuild
@ 2011-03-21 11:45 Markos Chandras (hwoarang)
  0 siblings, 0 replies; 13+ messages in thread
From: Markos Chandras (hwoarang) @ 2011-03-21 11:45 UTC (permalink / raw
  To: gentoo-commits

hwoarang    11/03/21 11:45:29

  Modified:             ChangeLog openoffice-bin-3.3.0.ebuild
  Log:
  Stable on amd64 wrt bug #332321
  
  (Portage version: 2.2.0_alpha27/cvs/Linux x86_64)

Revision  Changes    Path
1.249                app-office/openoffice-bin/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/ChangeLog?rev=1.249&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/ChangeLog?rev=1.249&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/ChangeLog?r1=1.248&r2=1.249

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -r1.248 -r1.249
--- ChangeLog	20 Mar 2011 15:53:22 -0000	1.248
+++ ChangeLog	21 Mar 2011 11:45:29 -0000	1.249
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.248 2011/03/20 15:53:22 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.249 2011/03/21 11:45:29 hwoarang Exp $
+
+  21 Mar 2011; Markos Chandras <hwoarang@gentoo.org>
+  openoffice-bin-3.3.0.ebuild:
+  Stable on amd64 wrt bug #332321
 
   20 Mar 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   openoffice-bin-3.3.0.ebuild:



1.13                 app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild?r1=1.12&r2=1.13

Index: openoffice-bin-3.3.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- openoffice-bin-3.3.0.ebuild	20 Mar 2011 15:53:22 -0000	1.12
+++ openoffice-bin-3.3.0.ebuild	21 Mar 2011 11:45:29 -0000	1.13
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild,v 1.12 2011/03/20 15:53:22 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild,v 1.13 2011/03/21 11:45:29 hwoarang Exp $
 
 EAPI="3"
 
@@ -48,7 +48,7 @@
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="!app-office/libreoffice
 	!app-office/openoffice






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

* [gentoo-commits] gentoo-x86 commit in app-office/openoffice-bin: ChangeLog openoffice-bin-3.3.0.ebuild
@ 2012-05-18 12:49 Chi-Thanh Christopher Nguyen (chithanh)
  0 siblings, 0 replies; 13+ messages in thread
From: Chi-Thanh Christopher Nguyen (chithanh) @ 2012-05-18 12:49 UTC (permalink / raw
  To: gentoo-commits

chithanh    12/05/18 12:49:09

  Modified:             ChangeLog
  Removed:              openoffice-bin-3.3.0.ebuild
  Log:
  Drop vulnerable version.
  
  (Portage version: 2.2.0_alpha101/cvs/Linux x86_64)

Revision  Changes    Path
1.255                app-office/openoffice-bin/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/ChangeLog?rev=1.255&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/ChangeLog?rev=1.255&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/ChangeLog?r1=1.254&r2=1.255

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -r1.254 -r1.255
--- ChangeLog	13 May 2012 11:12:38 -0000	1.254
+++ ChangeLog	18 May 2012 12:49:08 -0000	1.255
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice-bin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.254 2012/05/13 11:12:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.255 2012/05/18 12:49:08 chithanh Exp $
+
+  18 May 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  -openoffice-bin-3.3.0.ebuild:
+  Drop vulnerable version.
 
   13 May 2012; Agostino Sarubbo <ago@gentoo.org> openoffice-bin-3.4.0.ebuild:
   Stable for amd64, wrt bug #386081






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

end of thread, other threads:[~2012-05-18 12:49 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-17 11:47 [gentoo-commits] gentoo-x86 commit in app-office/openoffice-bin: ChangeLog openoffice-bin-3.3.0.ebuild Andreas Proschofsky (suka)
  -- strict thread matches above, loose matches on Subject: below --
2012-05-18 12:49 Chi-Thanh Christopher Nguyen (chithanh)
2011-03-21 11:45 Markos Chandras (hwoarang)
2011-03-20 15:53 PaweA Hajdan (phajdan.jr)
2011-03-20 13:01 Andreas Proschofsky (suka)
2011-03-19  0:38 Andreas Proschofsky (suka)
2011-03-19  0:06 Andreas Proschofsky (suka)
2011-03-18 23:42 Andreas Proschofsky (suka)
2011-03-18 22:58 Andreas Proschofsky (suka)
2011-03-17 13:51 Andreas Proschofsky (suka)
2011-03-17 13:04 Andreas Proschofsky (suka)
2011-03-17 11:56 Andreas Proschofsky (suka)
2011-03-16 23:31 Andreas Proschofsky (suka)

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