public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog texlive-module.eclass
@ 2012-03-22 12:03 Alexis Ballier (aballier)
  0 siblings, 0 replies; 2+ messages in thread
From: Alexis Ballier (aballier) @ 2012-03-22 12:03 UTC (permalink / raw
  To: gentoo-commits

aballier    12/03/22 12:03:54

  Modified:             ChangeLog texlive-module.eclass
  Log:
  Drop support for pre-2010 TeX Live versions

Revision  Changes    Path
1.180                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- ChangeLog	22 Mar 2012 06:57:59 -0000	1.179
+++ ChangeLog	22 Mar 2012 12:03:54 -0000	1.180
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.179 2012/03/22 06:57:59 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.180 2012/03/22 12:03:54 aballier Exp $
+
+  22 Mar 2012; Alexis Ballier <aballier@gentoo.org> texlive-module.eclass:
+  Drop support for pre-2010 TeX Live versions
 
   22 Mar 2012; Michał Górny <mgorny@gentoo.org> xorg-2.eclass:
   Use autotools-utils to reconfigure.



1.61                 eclass/texlive-module.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/texlive-module.eclass?rev=1.61&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/texlive-module.eclass?rev=1.61&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/texlive-module.eclass?r1=1.60&r2=1.61

Index: texlive-module.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/texlive-module.eclass,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- texlive-module.eclass	29 Aug 2011 01:28:10 -0000	1.60
+++ texlive-module.eclass	22 Mar 2012 12:03:54 -0000	1.61
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/texlive-module.eclass,v 1.60 2011/08/29 01:28:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/texlive-module.eclass,v 1.61 2012/03/22 12:03:54 aballier Exp $
 
 # @ECLASS: texlive-module.eclass
 # @MAINTAINER:
@@ -27,21 +27,17 @@
 # @DESCRIPTION:
 # The list of packages that will be installed. This variable will be expanded to
 # SRC_URI:
-#
-# For TeX Live 2008: foo -> texlive-module-foo-${PV}.tar.lzma
-# For TeX Live 2009: foo -> texlive-module-foo-${PV}.tar.xz
+# foo -> texlive-module-foo-${PV}.tar.xz
 
 # @ECLASS-VARIABLE: TEXLIVE_MODULE_DOC_CONTENTS
 # @DESCRIPTION:
 # The list of packages that will be installed if the doc useflag is enabled.
-# Expansion to SRC_URI is the same as for TEXLIVE_MODULE_CONTENTS. This is only
-# valid for TeX Live 2008 and later.
+# Expansion to SRC_URI is the same as for TEXLIVE_MODULE_CONTENTS.
 
 # @ECLASS-VARIABLE: TEXLIVE_MODULE_SRC_CONTENTS
 # @DESCRIPTION:
 # The list of packages that will be installed if the source useflag is enabled.
-# Expansion to SRC_URI is the same as for TEXLIVE_MODULE_CONTENTS. This is only
-# valid for TeX Live 2008 and later.
+# Expansion to SRC_URI is the same as for TEXLIVE_MODULE_CONTENTS.
 
 # @ECLASS-VARIABLE: TEXLIVE_MODULE_BINSCRIPTS
 # @DESCRIPTION:
@@ -68,17 +64,10 @@
 
 IUSE="source"
 
-# TeX Live 2008 was providing .tar.lzma files of CTAN packages.
-# For 2009 and 2010 they are now .tar.xz
-if [ "${PV#2008}" != "${PV}" ]; then
-	PKGEXT=tar.lzma
-	DEPEND="${COMMON_DEPEND}
-		|| ( app-arch/xz-utils app-arch/lzma-utils )"
-else
-	PKGEXT=tar.xz
-	DEPEND="${COMMON_DEPEND}
-		app-arch/xz-utils"
-fi
+# Starting from TeX Live 2009, upstream provides .tar.xz modules.
+PKGEXT=tar.xz
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils"
 
 for i in ${TEXLIVE_MODULE_CONTENTS}; do
 	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.${PKGEXT}"
@@ -106,8 +95,6 @@
 
 S="${WORKDIR}"
 
-if [ "${PV#2008}" = "${PV}" ]; then
-
 # @FUNCTION: texlive-module_src_unpack
 # @DESCRIPTION:
 # Only for TeX Live 2009 and later.
@@ -144,8 +131,6 @@
 	done
 }
 
-fi
-
 # @FUNCTION: texlive-module_add_format
 # @DESCRIPTION:
 # Creates/appends to a format.${PN}.cnf file for fmtutil.
@@ -278,7 +263,7 @@
 			AddHyphen)
 				texlive-module_make_language_def_lines "$parameter"
 				texlive-module_make_language_dat_lines "$parameter"
-				[ "${PV#2008}" = "${PV}" -a "${PV#2009}" = "${PV}" ] && texlive-module_make_language_lua_lines "$parameter"
+				texlive-module_make_language_lua_lines "$parameter"
 				;;
 			AddFormat)
 				texlive-module_add_format "$parameter";;
@@ -379,8 +364,4 @@
 	etexmf-update
 }
 
-if [ "${PV#2008}" != "${PV}" ]; then
-EXPORT_FUNCTIONS src_compile src_install pkg_postinst pkg_postrm
-else
 EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_postinst pkg_postrm
-fi






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

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog texlive-module.eclass
@ 2013-09-25 15:18 Christoph Junghans (ottxor)
  0 siblings, 0 replies; 2+ messages in thread
From: Christoph Junghans (ottxor) @ 2013-09-25 15:18 UTC (permalink / raw
  To: gentoo-commits

ottxor      13/09/25 15:18:28

  Modified:             ChangeLog texlive-module.eclass
  Log:
  Require EAPI>=2, add prefix support

Revision  Changes    Path
1.987                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.986
retrieving revision 1.987
diff -u -r1.986 -r1.987
--- ChangeLog	25 Sep 2013 11:19:09 -0000	1.986
+++ ChangeLog	25 Sep 2013 15:18:28 -0000	1.987
@@ -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.986 2013/09/25 11:19:09 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.987 2013/09/25 15:18:28 ottxor Exp $
+
+  25 Sep 2013; Christoph Junghans <ottxor@gentoo.org> texlive-module.eclass:
+  Require EAPI>=2, add prefix support
 
   25 Sep 2013; Michał Górny <mgorny@gentoo.org> git-r3.eclass:
   Support EGIT_REPO_URI being an array. This is needed for tests.



1.67                 eclass/texlive-module.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/texlive-module.eclass?rev=1.67&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/texlive-module.eclass?rev=1.67&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/texlive-module.eclass?r1=1.66&r2=1.67

Index: texlive-module.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/texlive-module.eclass,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- texlive-module.eclass	5 Jul 2013 22:43:41 -0000	1.66
+++ texlive-module.eclass	25 Sep 2013 15:18:28 -0000	1.67
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/texlive-module.eclass,v 1.66 2013/07/05 22:43:41 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/texlive-module.eclass,v 1.67 2013/09/25 15:18:28 ottxor Exp $
 
 # @ECLASS: texlive-module.eclass
 # @MAINTAINER:
@@ -21,7 +21,7 @@
 # care of unpacking and relocating the files that need it.
 #
 # It inherits texlive-common and base for supporting patching via the PATCHES
-# bash array with EAPI>=2.
+# bash array.
 
 # @ECLASS-VARIABLE: TEXLIVE_MODULE_CONTENTS
 # @DESCRIPTION:
@@ -63,6 +63,14 @@
 
 inherit texlive-common base
 
+case "${EAPI:-0}" in
+	0|1|2)
+		die "EAPI='${EAPI}' is not supported anymore"
+		;;
+	*)
+		;;
+esac
+
 HOMEPAGE="http://www.tug.org/texlive/"
 
 COMMON_DEPEND=">=app-text/texlive-core-${TL_PV:-${PV}}"
@@ -103,28 +111,12 @@
 # @FUNCTION: texlive-module_src_unpack
 # @DESCRIPTION:
 # Only for TeX Live 2009 and later.
-# Gives tar.xz unpack support until we can use an EAPI with that support.
-# If EAPI supports tar.xz then it calls unpack instead of its own unpacker.
 # After unpacking, the files that need to be relocated are moved accordingly.
 
 RELOC_TARGET=texmf-dist
 
 texlive-module_src_unpack() {
-	if has "${EAPI:-0}" 0 1 2 ; then
-		local i s
-		# Avoid installing world writable files
-		# Bugs #309997, #310039, #338881
-		umask 022
-		for i in ${A}
-		do
-			s="${DISTDIR%/}/${i}"
-			einfo "Unpacking ${s} to ${PWD}"
-			test -s "${s}" || die "${s} does not exist"
-			xz -dc -- "${s}" | tar xof - || die "Unpacking ${s} failed"
-		done
-	else
-		unpack ${A}
-	fi
+	unpack ${A}
 
 	grep RELOC tlpkg/tlpobj/* | awk '{print $2}' | sed 's#^RELOC/##' > "${T}/reloclist"
 	{ for i in $(<"${T}/reloclist"); do  dirname $i; done; } | uniq > "${T}/dirlist"
@@ -312,15 +304,15 @@
 
 	dodir /usr/share
 	if [ -z "${PN##*documentation*}" ] || use doc; then
-		[ -d texmf-doc ] && cp -pR texmf-doc "${D}/usr/share/"
+		[ -d texmf-doc ] && cp -pR texmf-doc "${ED}/usr/share/"
 	else
 		[ -d texmf/doc ] && rm -rf texmf/doc
 		[ -d texmf-dist/doc ] && rm -rf texmf-dist/doc
 	fi
 
-	[ -d texmf ] && cp -pR texmf "${D}/usr/share/"
-	[ -d texmf-dist ] && cp -pR texmf-dist "${D}/usr/share/"
-	[ -d tlpkg ] && use source && cp -pR tlpkg "${D}/usr/share/"
+	[ -d texmf ] && cp -pR texmf "${ED}/usr/share/"
+	[ -d texmf-dist ] && cp -pR texmf-dist "${ED}/usr/share/"
+	[ -d tlpkg ] && use source && cp -pR tlpkg "${ED}/usr/share/"
 
 	insinto /var/lib/texmf
 	[ -d texmf-var ] && doins -r texmf-var/*





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

end of thread, other threads:[~2013-09-25 15:18 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-22 12:03 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog texlive-module.eclass Alexis Ballier (aballier)
  -- strict thread matches above, loose matches on Subject: below --
2013-09-25 15:18 Christoph Junghans (ottxor)

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