From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1KIqgj-0004Dq-SN for garchives@archives.gentoo.org; Tue, 15 Jul 2008 19:59:54 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 13F0AE05A3; Tue, 15 Jul 2008 19:59:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C22C3E05A3 for ; Tue, 15 Jul 2008 19:59:52 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 5FF07664F4 for ; Tue, 15 Jul 2008 19:59:52 +0000 (UTC) Received: from grobian by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1KIqgh-00048n-7d for gentoo-commits@lists.gentoo.org; Tue, 15 Jul 2008 19:59:51 +0000 To: gentoo-commits@lists.gentoo.org From: "Fabian Groffen (grobian)" Subject: [gentoo-commits] portage r11060 - main/branches/prefix/man X-VCS-Repository: portage X-VCS-Revision: 11060 X-VCS-Files: main/branches/prefix/man/ebuild.1 main/branches/prefix/man/ebuild.5 X-VCS-Directories: main/branches/prefix/man X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen Content-Type: text/plain; charset=UTF-8 Message-Id: Sender: Fabian Groffen Date: Tue, 15 Jul 2008 19:59:51 +0000 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: 107d87a0-2e0d-4e50-a8a6-ef656f114ef9 X-Archives-Hash: c0f5b3321b80067cf401bc6bebb9f317 Author: grobian Date: 2008-07-15 19:59:50 +0000 (Tue, 15 Jul 2008) New Revision: 11060 Modified: main/branches/prefix/man/ebuild.1 main/branches/prefix/man/ebuild.5 Log: try to be more correct in Prefix Modified: main/branches/prefix/man/ebuild.1 =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 --- main/branches/prefix/man/ebuild.1 2008-07-15 19:40:07 UTC (rev 11059) +++ main/branches/prefix/man/ebuild.1 2008-07-15 19:59:50 UTC (rev 11060) @@ -125,7 +125,7 @@ \fIpkg_preinst()\fR function (if specified) is run. Then, the files are merged into the live filesystem, and the installed files' md5 digests are recorded in -\fI/var/db/pkg/${CATEGORY}/${PN}\-${PVR}/CONTENTS\fR. After +\fI@DOMAIN_PREFIX@/var/db/pkg/${CATEGORY}/${PN}\-${PVR}/CONTENTS\fR. Af= ter all the files have been merged, the \fIpkg_postinst()\fR function (if specified) is executed. .TP @@ -162,7 +162,7 @@ This command is a lot like the \fImerge\fR command, except that after fetching, unpacking, compiling and installing, a .tbz2 binary package tarball is created and stored in ${PKGDIR}/All (${PKGDIR} defaults to -/usr/portage/packages). A symbolic link is created in +@DOMAIN_PREFIX@/usr/portage/packages). A symbolic link is created in ${PKGDIR}/${CATEGORY} that points to the package in ${PKGDIR}/All. .TP .BR rpm @@ -187,11 +187,11 @@ .fi .SH "FILES" .TP -.B /etc/make.conf=20 +.B @sysconfdir@/make.conf=20 Contains variables for the build\-process and overwrites those in make.globals. .TP -.B /etc/portage/color.map +.B @sysconfdir@/portage/color.map Contains variables customizing colors. .SH "SEE ALSO" .BR emerge (1), @@ -199,6 +199,6 @@ .BR make.conf (5), .BR color.map (5) .TP -The \fI/usr/sbin/ebuild.sh\fR script.=20 +The \fI@DOMAIN_PREFIX@/usr/sbin/ebuild.sh\fR script.=20 .TP The helper apps in \fI@PORTAGE_BASE@/bin\fR. Modified: main/branches/prefix/man/ebuild.5 =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 --- main/branches/prefix/man/ebuild.5 2008-07-15 19:40:07 UTC (rev 11059) +++ main/branches/prefix/man/ebuild.5 2008-07-15 19:59:50 UTC (rev 11060) @@ -155,7 +155,7 @@ where it has been PROVEN TO WORK. (Packages KEYWORDed this way may be unmasked for testing by setting ACCEPT_KEYWORDS=3D"~arch" on the command line, or in \fBmake.conf\fR(5)) For an authoritative list please review -/usr/portage/profiles/arch.list. Please keep this list in alphabetical = order. +@DOMAIN_PREFIX@/usr/portage/profiles/arch.list. Please keep this list i= n alphabetical order. .TP \fBSLOT\fR This sets the SLOT for packages that may need to have multiple versions @@ -166,7 +166,7 @@ \fBLICENSE\fR This should be a space delimited list of licenses that the package falls under. This \fB_must_\fR be set to a matching license in -/usr/portage/licenses/. If the license does not exist in portage yet, yo= u +@DOMAIN_PREFIX@/usr/portage/licenses/. If the license does not exist in = portage yet, you must add it first. .TP \fBIUSE\fR @@ -619,13 +619,13 @@ This is used as a replacement for configure. Performs: .nf ${\fIECONF_SOURCE\fR:-.}/configure \\ - \-\-prefix=3D/usr \\ + \-\-prefix=3D"@DOMAIN_PREFIX@"/usr \\ \-\-host=3D${CHOST} \\ - \-\-mandir=3D/usr/share/man \\ - \-\-infodir=3D/usr/share/info \\ - \-\-datadir=3D/usr/share \\ - \-\-sysconfdir=3D/etc \\ - \-\-localstatedir=3D/var/lib \\ + \-\-mandir=3D"@DOMAIN_PREFIX@"/usr/share/man \\ + \-\-infodir=3D"@DOMAIN_PREFIX@"/usr/share/info \\ + \-\-datadir=3D"@DOMAIN_PREFIX@"/usr/share \\ + \-\-sysconfdir=3D"@DOMAIN_PREFIX@"/etc \\ + \-\-localstatedir=3D"@DOMAIN_PREFIX@"/var/lib \\ \fI${EXTRA_ECONF}\fR \\ \fIconfigure options\fR .fi @@ -635,7 +635,7 @@ .TP \fBemake\fR \fI[make options]\fR This is used as a replacement for make. Performs 'make ${MAKEOPTS} -\fImake options\fR' (as set in /etc/make.globals), default is MAKEOPTS=3D= "\-j2". +\fImake options\fR' (as set in @DOMAIN_PREFIX@/etc/make.globals), defaul= t is MAKEOPTS=3D"\-j2". =20 \fB***warning***\fR .br @@ -650,12 +650,12 @@ This is used as a replacement for make install. Performs: .nf make \\ - prefix=3D${D}/usr \\ - datadir=3D${D}/usr/share \\ - infodir=3D${D}/usr/share/info \\ - localstatedir=3D${D}/var/lib \\ - mandir=3D${D}/usr/share/man \\ - sysconfdir=3D${D}/etc \\ + prefix=3D"${ED}"/usr \\ + datadir=3D"${ED}"/usr/share \\ + infodir=3D"${ED}"/usr/share/info \\ + localstatedir=3D"${ED}"/var/lib \\ + mandir=3D"${ED}"/usr/share/man \\ + sysconfdir=3D"${ED}"/etc \\ \fI${EXTRA_EINSTALL}\fR \\ \fImake options\fR \\ install @@ -690,13 +690,13 @@ does \fI*not*\fR run \fBprepalldocs\fR. .TP .B prepalldocs: -Compresses all doc files in ${D}/usr/share/doc. +Compresses all doc files in ${ED}/usr/share/doc. .TP .B prepallinfo: -Compresses all info files in ${D}/usr/share/info. +Compresses all info files in ${ED}/usr/share/info. .TP .B prepallman: -Compresses all man files in ${D}/usr/share/man. +Compresses all man files in ${ED}/usr/share/man. .TP .B prepallstrip: Strips all executable files of debugging symboles. This includes librar= ies. @@ -716,31 +716,31 @@ .B prepinfo: If a \fIdir\fR is not specified, then \fBprepinfo\fR will assume the dir \fIusr\fR. \fBprepinfo\fR will then compress all the files in -${D}/\fIdir\fR/info. +${ED}/\fIdir\fR/info. .TP .B prepman: If a \fIdir\fR is not specified, then \fBprepman\fR will assume the dir \fIusr\fR. \fBprepman\fR will then compress all the files in -${D}/\fIdir\fR/man/*/. +${ED}/\fIdir\fR/man/*/. .TP .B prepstrip: -All the files found in ${D}/\fIdir\fR will be stripped. You may specify +All the files found in ${ED}/\fIdir\fR will be stripped. You may specif= y multiple directories. .RE .PD 1 .TP \fBdosed\fR \fI"s:orig:change:g" \fR -Performs sed in place on \fIfilename\fR inside ${D}. If no expression is +Performs sed in place on \fIfilename\fR inside ${ED}. If no expression i= s given then \fI"s:${D}::g"\fR is used as the default expression. .br .BR 'dosed\ "s:/usr/local:/usr:g"\ /usr/bin/some\-script' -runs sed on ${D}/usr/bin/some\-script +runs sed on ${ED}/usr/bin/some\-script .TP \fBdodir\fR \fI\fR -Creates a directory inside of ${D}. +Creates a directory inside of ${ED}. .br .BR 'dodir\ /usr/lib/apache' -creates ${D}/usr/lib/apache. Note that the do* functions will run +creates ${ED}/usr/lib/apache. Note that the do* functions will run \fBdodir\fR for you. .TP \fBdiropts\fR \fI[options for install(1)]\fR @@ -909,18 +909,18 @@ .fi .SH "FILES" .TP -The \fI/usr/sbin/ebuild.sh\fR script. +The \fI@DOMAIN_PREFIX@/usr/sbin/ebuild.sh\fR script. .TP The helper apps in \fI@PORTAGE_BASE@/bin\fR. .TP -.B /etc/make.conf +.B @sysconfdir@/make.conf Contains variables for the build\-process and overwrites those in make.d= efaults. .TP -.B /etc/make.globals +.B @sysconfdir@/make.globals Contains the default variables for the build\-process, you should edit -\fI/etc/make.conf\fR instead. +\fI@sysconfdir@/make.conf\fR instead. .TP -.B /etc/portage/color.map +.B @sysconfdir@/portage/color.map Contains variables customizing colors. .SH "SEE ALSO" .BR ebuild (1), --=20 gentoo-commits@lists.gentoo.org mailing list