From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Q0icf-0006AA-1r for garchives@archives.gentoo.org; Fri, 18 Mar 2011 22:58:21 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 18062E0138; Fri, 18 Mar 2011 22:58:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id CCE17E0138 for ; Fri, 18 Mar 2011 22:58:12 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 154A51B4023 for ; Fri, 18 Mar 2011 22:58:12 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 763) id AE08920054; Fri, 18 Mar 2011 22:58:10 +0000 (UTC) From: "Andreas Proschofsky (suka)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, suka@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in app-office/openoffice-bin: ChangeLog openoffice-bin-3.3.0.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog openoffice-bin-3.3.0.ebuild X-VCS-Directories: app-office/openoffice-bin X-VCS-Committer: suka X-VCS-Committer-Name: Andreas Proschofsky Content-Type: text/plain; charset=utf8 Message-Id: <20110318225810.AE08920054@flycatcher.gentoo.org> Date: Fri, 18 Mar 2011 22:58:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: d8c1aa6ff2f515194a3a2bd41f5de002 suka 11/03/18 22:58:10 Modified: ChangeLog openoffice-bin-3.3.0.ebuild Log: some ebuild reorganization to make future maintenance easier =20 (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/openoff= ice-bin/ChangeLog?rev=3D1.243&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoff= ice-bin/ChangeLog?rev=3D1.243&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoff= ice-bin/ChangeLog?r1=3D1.242&r2=3D1.243 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 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 + openoffice-bin-3.3.0.ebuild: + some ebuild reorganization to make future maintenance easier =20 17 Mar 2011; Andreas Proschofsky openoffice-bin-3.3.0.ebuild: 1.7 app-office/openoffice-bin/openoffice-bin-3.3.0.ebuil= d file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoff= ice-bin/openoffice-bin-3.3.0.ebuild?rev=3D1.7&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoff= ice-bin/openoffice-bin-3.3.0.ebuild?rev=3D1.7&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoff= ice-bin/openoffice-bin-3.3.0.ebuild?r1=3D1.6&r2=3D1.7 Index: openoffice-bin-3.3.0.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bi= n-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 $ =20 EAPI=3D"3" =20 @@ -10,20 +10,26 @@ =20 BUILDID=3D"9567" BUILDID2=3D"9556" -UREVER=3D"1.7.0" +MST=3D"OOO330_m20" MY_PV=3D"${PV}rc10" MY_PV2=3D"${MY_PV}_20110118" -MY_PV3=3D"${PV}-${BUILDID}" +BVER=3D"${PV}-${BUILDID}" +BVER2=3D"3.3-${BUILDID2}" +UREVER=3D"1.7.0" BASIS=3D"ooobasis3.3" -MST=3D"OOO330_m20" +BASIS2=3D"basis3.3" +NM=3D"openoffice" +NM1=3D"${NM}.org" +NM2=3D"${NM1}3" +NM3=3D"${NM2}.3" FILEPATH=3D"http://download.services.openoffice.org/files/extended/${MY_= PV}" =20 if [ "${ARCH}" =3D "amd64" ] ; then - OOARCH=3D"x86_64" + XARCH=3D"x86_64" PACKED=3D"${MST}_native_packed-1" PACKED2=3D"${MST}_native_packed-1" else - OOARCH=3D"i586" + XARCH=3D"i586" PACKED=3D"${MST}_native_packed-1" PACKED2=3D"${MST}_native_packed-1" fi @@ -68,40 +74,40 @@ =20 RESTRICT=3D"strip" =20 -QA_EXECSTACK=3D"usr/$(get_libdir)/openoffice/basis3.3/program/* - usr/$(get_libdir)/openoffice/ure/lib/*" -QA_TEXTRELS=3D"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=3D"usr/$(get_libdir)/${NM}/${BASIS2}/program/* + usr/$(get_libdir)/${NM}/ure/lib/*" +QA_TEXTRELS=3D"usr/$(get_libdir)/${NM}/${BASIS2}/program/libvclplug_genl= i.so \ + usr/$(get_libdir)/${NM}/${BASIS2}/program/python-core-2.6.1/lib/lib-dyn= load/_curses_panel.so \ + usr/$(get_libdir)/${NM}/${BASIS2}/program/python-core-2.6.1/lib/lib-dyn= load/_curses.so \ + usr/$(get_libdir)/${NM}/ure/lib/*" =20 src_unpack() { =20 unpack ${A} =20 - 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} =20 for i in base binfilter calc core01 core02 core03 core04 core05 core06 = core07 draw graphicfilter images impress math ooofonts oooimprovement ooo= linguistic pyuno testtool writer xsltfilter ; do - rpm_unpack "./${UP}/${BASIS}-${i}-${MY_PV3}.${OOARCH}.rpm" + rpm_unpack "./${UP}/${BASIS}-${i}-${BVER}.${XARCH}.rpm" done =20 + 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 =20 - rpm_unpack "./${UP}/openoffice.org3-${MY_PV3}.${OOARCH}.rpm" - rpm_unpack "./${UP}/openoffice.org-ure-${UREVER}-${BUILDID}.${OOARCH}.r= pm" - - rpm_unpack "./${UP}/desktop-integration/openoffice.org3.3-freedesktop-m= enus-3.3-${BUILDID2}.noarch.rpm" + rpm_unpack "./${UP}/desktop-integration/${NM3}-freedesktop-menus-${BVER= 2}.noarch.rpm" =20 - 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}.${X= ARCH}.rpm" + use java && rpm_unpack "./${UP}/${BASIS}-javafilter-${BVER}.${XARCH}.rp= m" =20 # 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" =20 # Localization strip-linguas ${LANGS} @@ -117,10 +123,10 @@ else LANGDIR=3D"${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 =20 @@ -128,12 +134,10 @@ =20 src_install () { =20 - INSTDIR=3D"/usr/$(get_libdir)/openoffice" - - einfo "Installing OpenOffice.org into build root..." + INSTDIR=3D"/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 =20 #Menu entries, icons and mime-types cd "${ED}${INSTDIR}/share/xdg/" @@ -141,9 +145,9 @@ if [ "${desk}" =3D "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 =20 rm -f "${ED}${INSTDIR}/basis-link" || die - dosym ${INSTDIR}/basis3.3 ${INSTDIR}/basis-link + dosym ${INSTDIR}/${BASIS2} ${INSTDIR}/basis-link =20 # Change user install dir - sed -i -e "s/.openoffice.org\/3/.ooo3/g" "${ED}${INSTDIR}/program/boots= traprc" || die + sed -i -e "s/.${NM1}\/3/.ooo3/g" "${ED}${INSTDIR}/program/bootstraprc" = || die =20 # Non-java weirdness see bug #99366 use !java && rm -f "${ED}${INSTDIR}/ure/bin/javaldx" =20 # 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}" =20 } =20 @@ -190,7 +194,7 @@ fdo-mime_mime_database_update use gnome && gnome2_icon_cache_update =20 - pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/openoffice/program/soffice.b= in + pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/${NM}/program/soffice.bin =20 elog " openoffice-bin does not provide integration with system spell " elog " dictionaries. Please install them manually through the Extension= s "