Fix bug #226929 with linking fun.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.27-rc1-10246-gca5de40 x86_64

4 files changed, 159 insertions, 12 deletions

diff --git a/sys-libs/timezone-data/ChangeLog b/sys-libs/timezone-data/ChangeLog
index c75ba522f9e7..f891bef9ee89 100644
--- a/sys-libs/timezone-data/ChangeLog
+++ b/sys-libs/timezone-data/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-libs/timezone-data
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.149 2008/10/09 05:41:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.150 2008/10/14 09:50:56 robbat2 Exp $
+
+*timezone-data-2008g-r1 (14 Oct 2008)
+
+  14 Oct 2008; Robin H. Johnson <robbat2@gentoo.org>
+  +files/timezone-data-2008f-makefile-libs-not-flags.patch,
+  +timezone-data-2008g-r1.ebuild:
+  Fix bug #226929 with linking fun.
 
 *timezone-data-2008g (09 Oct 2008)
 
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index 3b6ebf2d9ea0..d9f5ac609054 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -1,7 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX timezone-data-2005n-makefile.patch 3504 RMD160 c08c65c6a6ae0392dfc5128801251c5d1c6d3b0d SHA1 ba0f9dd788b0cce06c7b016e3a9ff672e307aa23 SHA256 5eb2068da4df12a2eb84caebe262c285b62e244e046b50869b6a80e16401d707
+AUX timezone-data-2008f-makefile-libs-not-flags.patch 1273 RMD160 0c6518b1468435d38ceaa0efcbf0f1132dc5bd31 SHA1 113611a4d00c0e4f9b0438a419b4d977c1b19294 SHA256 90f2dfa55e8ee711e79c6931bdf97569b0beb964fdf234e0a2e55d59517c3f97
 DIST tzcode2008e.tar.gz 189670 RMD160 8484e93fd0ae7e5dc3df2d1871c33030dbc798d6 SHA1 bdd1896bacfefd2d1324702b4adc4d03d69e9816 SHA256 46bce4b2f052e942f7c2fdc00e5b4410a1df97626238e140c3b43d0cd432e3a3
 DIST tzcode2008g.tar.gz 189689 RMD160 084f6d998a217dfd67d51ef351f069bc2826e8e4 SHA1 37c9f21450078aca172edb0b6aefe76c6968fad7 SHA256 698256a7996e4ceffd6a35d7f84d5ca924e0c7e9e2cad15023be1d086530df56
 DIST tzdata2008e.tar.gz 171200 RMD160 cd936fe2c50aca5deede81e9241357ad60004624 SHA1 5d0f167b219e09b70d867868dabe89d5972511c8 SHA256 ddd526edfaf0d43fbe8facf772feb13266ae3cdddaf69a612b7a74cf37036548
@@ -9,13 +7,7 @@ DIST tzdata2008f.tar.gz 172882 RMD160 2f8fb8f6afe6ba0302b5abf051cbf46a48fbaa8f S
 DIST tzdata2008g.tar.gz 173126 RMD160 b96389333c93cfa8b0c4a822bd40baa64ce309ad SHA1 ebf9763c332a11c9c6bd867044023332cf496042 SHA256 78a90cf70e9cd661ba253236b558216d2f707f3457b20a05e7ede04ab5acf0b6
 EBUILD timezone-data-2008e.ebuild 2685 RMD160 cf28a8f4580c0af49562fee5a0add0abc5c03a31 SHA1 6b294da21620603fd9f290449024e23c3fd8ae34 SHA256 fc7552fab2a07a10de3529f3fb28b67ee6909604aa170b7dc05c5889ea9f4b03
 EBUILD timezone-data-2008f.ebuild 2701 RMD160 01fc407a651943cec69e630c2a9b36582efea251 SHA1 365260ef4c107b348bb089d14d256fd133d4d48e SHA256 bd29e0d3f7e5e6d09a183ff81605d2f8e4cdeefad7c045c73789b41213b8f7d9
+EBUILD timezone-data-2008g-r1.ebuild 3007 RMD160 84774dc91610cb038e5d746db13dca19de479dbc SHA1 6ea5562d6944e2c72127e3d44174641cc1e4ba2b SHA256 5a4ffe629d6aaeaaeaf6302e2e493d4f56a411687984f2516385437e033f1e73
 EBUILD timezone-data-2008g.ebuild 2697 RMD160 01c5004d7df1b6f6d41270790525c8e2caffcc16 SHA1 309681d24031c9e926793fcf3a57bda9567f0b24 SHA256 471c16f6941ed228058dfb39cbb7c8948d84d19ebf81fb7c83060c13a74d917d
-MISC ChangeLog 18564 RMD160 7d1140373c43923ab95c98e42f1dc3cd2590d6a5 SHA1 853b460509408e86799f99e684385d7e0bd2475f SHA256 b7ec01f77fff648c8c35faf95ad489d503f6b098b89c0510be09091f72edeeb8
+MISC ChangeLog 18788 RMD160 3dd7041095f0ef0b83d97efb9736ab8c9448f4bf SHA1 9009c4163af5be1119ba7ddbaf36f36b8f1af3dc SHA256 173864706bbc032292685e4c5e810b2cf014f0e0163844bce2b48c77a9d2208f
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkjtmY8ACgkQ67wieSYcaxd2CACeLSWORPlpV5tF7QpeFrTXFN8C
-v0UAoMkCy5HFsY81ebxqBe05vR7tE3dr
-=KwXH
------END PGP SIGNATURE-----
diff --git a/sys-libs/timezone-data/files/timezone-data-2008f-makefile-libs-not-flags.patch b/sys-libs/timezone-data/files/timezone-data-2008f-makefile-libs-not-flags.patch
new file mode 100644
index 000000000000..4e45160fa16e
--- /dev/null
+++ b/sys-libs/timezone-data/files/timezone-data-2008f-makefile-libs-not-flags.patch
@@ -0,0 +1,41 @@
+Get some real sanity into the linking situation.
+- LDLIBS is for libraries only.
+- Flags to the linking are passed as LDFLAGS, not LFLAGS.
+- LDFLAGS was missed for the 'date' target.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nuar Makefile Makefile
+--- Makefile	2008-10-14 02:31:04.388508402 -0700
++++ Makefile	2008-10-14 02:36:18.931855910 -0700
+@@ -83,7 +83,7 @@
+ 
+ # Non-default libraries needed to link.
+ # Add -lintl if you want to use `gettext' on Solaris.
+-LDLIBS=$(LDFLAGS)
++LDLIBS=
+ 
+ # Add the following to the end of the "CFLAGS=" line as needed.
+ #  -DHAVE_ADJTIME=0 if `adjtime' does not exist (SVR0?)
+@@ -309,10 +309,10 @@
+ 		cp date.1 $(MANDIR)/man1/.
+ 
+ zdump:		$(TZDOBJS)
+-		$(CC) $(CFLAGS) $(LFLAGS) $(TZDOBJS) $(LDLIBS) -o $@
++		$(CC) $(CFLAGS) $(LDFLAGS) $(TZDOBJS) $(LDLIBS) -o $@
+ 
+ zic:		$(TZCOBJS) yearistype
+-		$(CC) $(CFLAGS) $(LFLAGS) $(TZCOBJS) $(LDLIBS) -o $@
++		$(CC) $(CFLAGS) $(LDFLAGS) $(TZCOBJS) $(LDLIBS) -o $@
+ 
+ yearistype:	yearistype.sh
+ 		cp yearistype.sh yearistype
+@@ -351,7 +351,7 @@
+ 			then ranlib $@ ; fi
+ 
+ date:		$(DATEOBJS)
+-		$(CC) $(CFLAGS) date.o localtime.o asctime.o strftime.o \
++		$(CC) $(CFLAGS) $(LDFLAGS) date.o localtime.o asctime.o strftime.o \
+ 			$(LDLIBS) -lc -o $@
+ 
+ tzselect:	tzselect.ksh
diff --git a/sys-libs/timezone-data/timezone-data-2008g-r1.ebuild b/sys-libs/timezone-data/timezone-data-2008g-r1.ebuild
new file mode 100644
index 000000000000..e3ad201c7103
--- /dev/null
+++ b/sys-libs/timezone-data/timezone-data-2008g-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2008g-r1.ebuild,v 1.1 2008/10/14 09:50:56 robbat2 Exp $
+
+inherit eutils toolchain-funcs flag-o-matic
+
+code_ver=${PV}
+data_ver=${PV}
+DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)"
+HOMEPAGE="ftp://elsie.nci.nih.gov/pub/"
+SRC_URI="ftp://elsie.nci.nih.gov/pub/tzdata${data_ver}.tar.gz
+	ftp://elsie.nci.nih.gov/pub/tzcode${code_ver}.tar.gz
+	mirror://gentoo/tzdata${data_ver}.tar.gz
+	mirror://gentoo/tzcode${code_ver}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="nls elibc_FreeBSD elibc_glibc"
+
+DEPEND=""
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${PN}-2005n-makefile.patch
+	epatch "${FILESDIR}"/${PN}-2008f-makefile-libs-not-flags.patch
+	tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
+}
+
+src_compile() {
+	local LDLIBS
+	tc-export CC
+	use elibc_FreeBSD && append-flags -DSTD_INSPIRED #138251
+	if use nls ; then
+		use elibc_glibc || LDLIBS="${LDLIBS} -lintl" #154181
+		export NLS=1
+	else
+		export NLS=0
+	fi
+	# Makefile uses LBLIBS for the libs (which defaults to LDFLAGS)
+	# But it also uses LFLAGS where it expects the real LDFLAGS
+	emake \
+		LDLIBS="${LDLIBS}" \
+		|| die "emake failed"
+	if tc-is-cross-compiler ; then
+		emake -C "${S}"-native \
+			CC=$(tc-getBUILD_CC) \
+			CFLAGS="${BUILD_CFLAGS}" \
+			LDFLAGS="${BUILD_LDFLAGS}" \
+			LDLIBS="${LDLIBS}" \
+			zic || die
+	fi
+}
+
+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
+	dodoc README Theory
+	dohtml *.htm *.jpg
+}
+
+pkg_config() {
+	# make sure the /etc/localtime file does not get stale #127899
+	local tz src
+
+	if has_version '<sys-apps/baselayout-2' ; then
+		src="/etc/conf.d/clock"
+		tz=$(unset TIMEZONE ; source "${ROOT}"/etc/conf.d/clock ; echo ${TIMEZONE-FOOKABLOIE})
+	else
+		src="/etc/timezone"
+		if [[ -e ${ROOT}/etc/timezone ]] ; then
+			tz=$(<"${ROOT}"/etc/timezone)
+		else
+			tz="FOOKABLOIE"
+		fi
+	fi
+	[[ -z ${tz} ]] && return 0
+
+	if [[ ${tz} == "FOOKABLOIE" ]] ; then
+		elog "You do not have TIMEZONE set in ${src}."
+
+		if [[ ! -e ${ROOT}/etc/localtime ]] ; then
+			cp -f "${ROOT}"/usr/share/zoneinfo/Factory "${ROOT}"/etc/localtime
+			elog "Setting /etc/localtime to Factory."
+		else
+			elog "Skipping auto-update of /etc/localtime."
+		fi
+		return 0
+	fi
+
+	if [[ ! -e ${ROOT}/usr/share/zoneinfo/${tz} ]] ; then
+		elog "You have an invalid TIMEZONE setting in ${src}"
+		elog "Your /etc/localtime has been reset to Factory; enjoy!"
+		tz="Factory"
+	fi
+	einfo "Updating /etc/localtime with /usr/share/zoneinfo/${tz}"
+	[[ -L ${ROOT}/etc/localtime ]] && rm -f "${ROOT}"/etc/localtime
+	cp -f "${ROOT}"/usr/share/zoneinfo/"${tz}" "${ROOT}"/etc/localtime
+}
+
+pkg_postinst() {
+	pkg_config
+}