Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 39245 Details for
Bug 58791
automake-1.9 released but not in portage tree
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
automake.diff
automake.diff (text/plain), 5.32 KB, created by
Carsten Lohrke (RETIRED)
on 2004-09-09 04:47:46 UTC
(
hide
)
Description:
automake.diff
Filename:
MIME Type:
Creator:
Carsten Lohrke (RETIRED)
Created:
2004-09-09 04:47:46 UTC
Size:
5.32 KB
patch
obsolete
>--- /usr/portage/sys-devel/automake/automake-1.8.5-r1.ebuild 2004-09-01 16:05:56.000000000 +0200 >+++ automake-1.9.0.ebuild 2004-09-09 13:45:10.000000000 +0200 >@@ -1,6 +1,6 @@ > # Copyright 1999-2004 Gentoo Foundation > # Distributed under the terms of the GNU General Public License v2 >-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.8.5-r1.ebuild,v 1.10 2004/09/01 13:42:25 vapier Exp $ >+# $Header: $ > > inherit eutils > >@@ -8,7 +8,8 @@ > # OLD15 = 1.5 > # OLD16 = 1.6 > # OLD17 = 1.7 >-# NEW = 1.8 (.2) >+# OLD18 = 1.8 >+# NEW = 1.9 (.n) > > # NOTE: For all of those brave souls out there that wants to fix > # or update this, note that all three versions install >@@ -36,8 +37,11 @@ > # nosferatu automake-1.8.1 # > # > # You should then set NEW_PV to 1.8, as this is the suffix >-NEW_PV="1.8" >+NEW_PV="1.9" > >+OLD18_PV="1.8.5" >+OLD18_PV_S="1.8" >+OLD18_P="${PN}-${OLD18_PV}" > OLD17_PV="1.7.9" > OLD17_PV_S="1.7" > OLD17_P="${PN}-${OLD17_PV}" >@@ -48,13 +52,18 @@ > OLD15_P="${PN}-${OLD15_PV}" > OLD14_PV="1.4-p6" > OLD14_P="${PN}-${OLD14_PV}" >+OLD18_S="${WORKDIR}/${OLD18_P}" > OLD17_S="${WORKDIR}/${OLD17_P}" > OLD16_S="${WORKDIR}/${OLD16_P}" > OLD15_S="${WORKDIR}/${OLD15_P}" > OLD14_S="${WORKDIR}/${OLD14_P}" >+ >+MY_P=${P%.?} >+S=${WORKDIR}/${MY_P} > DESCRIPTION="Used to generate Makefile.in from Makefile.am" > HOMEPAGE="http://www.gnu.org/software/automake/automake.html" >-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2 >+SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.bz2 >+ mirror://gnu/${PN}/${OLD18_P}.tar.bz2 > mirror://gnu/${PN}/${OLD17_P}.tar.bz2 > mirror://gnu/${PN}/${OLD16_P}.tar.bz2 > mirror://gnu/${PN}/${OLD15_P}.tar.gz >@@ -62,7 +71,7 @@ > > LICENSE="GPL-2" > SLOT="1.5" >-KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 s390" >+KEYWORDS="~x86 ~ppc ~ppc64 ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390" > IUSE="uclibc" > > DEPEND="dev-lang/perl >@@ -75,14 +84,17 @@ > epatch ${FILESDIR}/${PN}-${OLD15_PV}-target_hook.patch > cd ${OLD17_S} > epatch ${FILESDIR}/${PN}-${OLD17_PV}-infopage-namechange.patch >- cd ${S} >+ cd ${OLD18_S} > epatch ${FILESDIR}/${PN}-1.8.2-infopage-namechange.patch > epatch ${FILESDIR}/${PN}-1.8.5-config-guess-uclibc.patch >+ cd ${S} >+ epatch ${FILESDIR}/${PN}-1.9-infopage-namechange.patch >+ > } > > src_compile() { > # >- # ************ automake-1.8x ************ >+ # ************ automake-1.9x ************ > # > > # stupid configure script goes and run autoconf in a subdir, >@@ -92,6 +104,32 @@ > > cd ${S} > >+ perl -pi -e 's:setfilename automake.info:setfilename automake19.info:' \ >+ doc/automake.texi >+ perl -pi -e 's|\* automake: \(automake\)|\* Automake v1\.9: \(automake\)|' \ >+ doc/automake.texi >+ perl -pi -e 's|\* aclocal:|\* aclocal v1.9:|' doc/automake.texi >+ perl -pi -e 's:\(automake\):\(automake19\):' doc/automake.texi >+ >+ ./configure \ >+ --prefix=/usr \ >+ --infodir=/usr/share/info \ >+ --mandir=/usr/share/man \ >+ --target=${CHOST} \ >+ || die "configure 1.9x failed" >+ emake || die "emake 1.9x failed" >+ >+ # >+ # ************ automake-1.8x ************ >+ # >+ >+ # stupid configure script goes and run autoconf in a subdir, >+ # so 'ac-wrapper.pl' do not detect that it should use >+ # autoconf-2.5x >+ export WANT_AUTOCONF_2_5=1 >+ >+ cd ${OLD18_S} >+ > perl -pi -e 's:setfilename automake.info:setfilename automake18.info:' \ > doc/automake.texi > perl -pi -e 's|\* automake: \(automake\)|\* Automake v1\.8: \(automake\)|' \ >@@ -232,16 +270,17 @@ > # install wrapper script for autodetecting the proper version > # to use. > exeinto /usr/lib/${PN} >- newexe ${FILESDIR}/am-wrapper.pl-1.8-v2 am-wrapper.pl >+ newexe ${FILESDIR}/am-wrapper.pl-1.9 am-wrapper.pl > # Name binaries to exact version, as they have limited support for > # more than one version installs >- dosed "s:1\.8x:${NEW_PV}:g" /usr/lib/${PN}/am-wrapper.pl >+ dosed "s:1\.9x:${NEW_PV}:g" /usr/lib/${PN}/am-wrapper.pl >+ dosed "s:1\.8x:${OLD18_PV_S}:g" /usr/lib/${PN}/am-wrapper.pl > dosed "s:1\.7x:${OLD17_PV_S}:g" /usr/lib/${PN}/am-wrapper.pl > dosed "s:1\.6x:${OLD16_PV_S}:g" /usr/lib/${PN}/am-wrapper.pl > dosed "s:1\.5x:${OLD15_PV}:g" /usr/lib/${PN}/am-wrapper.pl > > # >- # ************ automake-1.8x ************ >+ # ************ automake-1.9x ************ > # > > cd ${S} >@@ -257,12 +296,34 @@ > rm -f ${D}/usr/bin/${x} > done > >- doinfo doc/automake18.info* >+ doinfo doc/automake19.info* > > docinto ${PV} > dodoc COPYING NEWS README THANKS TODO AUTHORS ChangeLog > > # >+ # ************ automake-1.8x ************ >+ # >+ >+ cd ${OLD18_S} >+# not needed for 1.8.2 >+# fix_bins ${NEW_PV} >+ >+ make DESTDIR=${D} \ >+ install || die >+ >+ for x in automake aclocal >+ do >+# mv ${D}/usr/bin/${x} ${D}/usr/bin/${x}-${NEW_PV} >+ rm -f ${D}/usr/bin/${x} >+ done >+ >+ doinfo doc/automake18.info* >+ >+ docinto ${OLD18_PV} >+ dodoc COPYING NEWS README THANKS TODO AUTHORS ChangeLog >+ >+ # > # ************ automake-1.7x ************ > # > >@@ -463,6 +524,23 @@ > fi > done > fi >+ if [ -d ${OLD18_S}/m4 ] && [ -d ${ROOT}/usr/share/aclocal-${OLD18_PV_S} ] >+ then >+ for x in ${ROOT}/usr/share/aclocal-${OLD18_PV_S}/*.m4 >+ do >+ if [ ! -f ${OLD18_S}/m4/${x##*/} ] >+ then >+ if [ ! -f ${ROOT}/usr/share/aclocal/${x##*/} ] >+ then >+ einfo "Moving ${x} to aclocal..." >+ mv -f ${x} ${ROOT}/usr/share/aclocal >+ else >+ einfo "Deleting duplicate ${x}..." >+ rm -f ${x} >+ fi >+ fi >+ done >+ fi > if [ -d ${S}/m4 ] && [ -d ${ROOT}/usr/share/aclocal-${NEW_PV} ] > then > for x in ${ROOT}/usr/share/aclocal-${NEW_PV}/*.m4
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 Raw
Actions:
View
Attachments on
bug 58791
: 39245 |
39246
|
39247