Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 357018 Details for
Bug 433738
sys-libs/timezone-data: please review prefix changes
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patch against timezone-data-2013c.ebuild
timezone-data-2013c.ebuild.patch (text/plain), 3.67 KB, created by
Christoph Junghans (RETIRED)
on 2013-08-25 22:49:00 UTC
(
hide
)
Description:
patch against timezone-data-2013c.ebuild
Filename:
MIME Type:
Creator:
Christoph Junghans (RETIRED)
Created:
2013-08-25 22:49:00 UTC
Size:
3.67 KB
patch
obsolete
>--- /usr/portage/sys-libs/timezone-data/timezone-data-2013c.ebuild 2013-08-24 19:01:34.000000000 -0600 >+++ timezone-data-2013c.ebuild 2013-08-25 16:47:56.439613292 -0600 >@@ -1,6 +1,8 @@ > # Copyright 1999-2013 Gentoo Foundation > # Distributed under the terms of the GNU General Public License v2 >-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2013c.ebuild,v 1.2 2013/08/25 00:36:22 vapier Exp $ >+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2013c.ebuild,v 1.1 2013/04/20 17:18:55 vapier Exp $ >+ >+EAPI=3 > > inherit eutils toolchain-funcs flag-o-matic > >@@ -15,15 +17,14 @@ > > LICENSE="BSD public-domain" > SLOT="0" >-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" >+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" > IUSE="nls elibc_FreeBSD elibc_glibc" > > RDEPEND="!<sys-libs/glibc-2.3.5" > > S=${WORKDIR} > >-src_unpack() { >- unpack ${A} >+src_prepare() { > epatch "${FILESDIR}"/${PN}-2013a-makefile.patch > tc-is-cross-compiler && cp -pR "${S}" "${S}"-native > } >@@ -31,15 +32,18 @@ > src_compile() { > local LDLIBS > tc-export CC >- use elibc_FreeBSD && append-flags -DSTD_INSPIRED #138251 >+ if use elibc_FreeBSD || use elibc_Darwin ; then >+ append-flags -DSTD_INSPIRED #138251 >+ fi > export NLS=$(usex nls 1 0) > if use nls && ! use elibc_glibc ; then > LDLIBS+=" -lintl" #154181 > fi > emake \ >+ DESTDIR="${EPREFIX}" \ > CFLAGS="${CPPFLAGS} ${CFLAGS} -std=gnu99" \ > LDFLAGS="${LDFLAGS}" \ >- LDLIBS="${LDLIBS}" \ >+ LDLIBS="${LDLIBS}" > || die "emake failed" > if tc-is-cross-compiler ; then > emake -C "${S}"-native \ >@@ -54,21 +58,21 @@ > src_install() { > local zic="" > tc-is-cross-compiler && zic="zic=${S}-native/zic" >- emake install ${zic} DESTDIR="${D}" || die >- rm -rf "${D}"/usr/share/zoneinfo-leaps >+ emake install ${zic} DESTDIR="${D}${EPREFIX}" || die >+ rm -rf "${ED}"/usr/share/zoneinfo-leaps > dodoc README Theory > dohtml *.htm > } > > pkg_config() { > # make sure the /etc/localtime file does not get stale #127899 >- local tz src etc_lt="${ROOT}etc/localtime" >+ local tz src etc_lt="${EROOT}etc/localtime" > > if has_version '<sys-apps/baselayout-2' ; then >- src="${ROOT}etc/conf.d/clock" >+ src="${EROOT}etc/conf.d/clock" > tz=$(unset TIMEZONE ; source "${src}" ; echo ${TIMEZONE-FOOKABLOIE}) > else >- src="${ROOT}etc/timezone" >+ src="${EROOT}etc/timezone" > if [[ -e ${src} ]] ; then > tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}") > else >@@ -84,7 +88,7 @@ > # if /etc/localtime is a symlink somewhere, assume they > # know what they're doing and they're managing it themselves > if [[ ! -L ${etc_lt} ]] ; then >- cp -f "${ROOT}"/usr/share/zoneinfo/Factory "${etc_lt}" >+ cp -f "${EROOT}"/usr/share/zoneinfo/Factory "${etc_lt}" > elog "Setting ${etc_lt} to Factory." > else > elog "Assuming your ${etc_lt} symlink is what you want; skipping update." >@@ -95,14 +99,14 @@ > return 0 > fi > >- if [[ ! -e ${ROOT}/usr/share/zoneinfo/${tz} ]] ; then >- elog "You have an invalid TIMEZONE setting in ${src}" >+ if [[ ! -e ${EROOT}/usr/share/zoneinfo/${tz} ]] ; then >+ elog "You have an invalid TIMEZONE setting in ${EPREFIX}${src}" > elog "Your ${etc_lt} has been reset to Factory; enjoy!" > tz="Factory" > fi >- einfo "Updating ${etc_lt} with ${ROOT}usr/share/zoneinfo/${tz}" >+ einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}" > [[ -L ${etc_lt} ]] && rm -f "${etc_lt}" >- cp -f "${ROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}" >+ cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}" > } > > pkg_postinst() {
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 433738
:
322802
|
357018
|
357974
|
358068