Created attachment 322860 [details, diff] patch for php-5.4.6-r2.ebuild Changes: - added some ${EPREFIX} in elog messages - one tweak for darwin (bug #343481)
Looks fine to me
(In reply to comment #1) > Looks fine to me Added, thanks for the quick reply.
Sigh...if only it were that easy... % diff -r files/eblits/ /usr/portage/dev-lang/php/files/eblits/|wc -l 706 Please revert and come up with a better plan...
(In reply to comment #3) > Sigh...if only it were that easy... > > % diff -r files/eblits/ /usr/portage/dev-lang/php/files/eblits/|wc -l > 706 > > Please revert and come up with a better plan... True, I overlooked that. At least it makes the sync of the ebuild easier and the changes do not harm gx86. I will try to merge the eblits changes step by step.
Created attachment 323036 [details, diff] patch for php-eblits (In reply to comment #3) > Sigh...if only it were that easy... > > % diff -r files/eblits/ /usr/portage/dev-lang/php/files/eblits/|wc -l > 706 > > Please revert and come up with a better plan... $sed -n 's/.*eblit.*\(common\|src\)\(.*\) \(v[0-9]*\).*/\1\2-\3.eblit/p' php-5.4.6.ebuild common-v2.eblit src_prepare-v4.eblit - no diff src_configure-v54.eblit src_compile-v2.eblit - no diff src_install-v3.eblit src_test-v1.eblit - no diff These are the trivial changes to eblit, please review first.
The rest of the diff, but 20php5-envd is the same in prefix and gx86. So no need to add this anymore. --- src_install-v3.eblit 2012-09-05 21:13:41.000000000 -0600 +++ src_install-v3.eblit.prefix 2012-09-05 21:12:42.000000000 -0600 @@ -84,8 +84,9 @@ done # Install env.d files - newenvd "${FILESDIR}/20php5-envd" \ + newenvd "${FILESDIR}/20php${PHP_MV}-envd" \ "20php${SLOT}" + eprefixify "${ED}/etc/env.d/20php${SLOT}" sed -e "s|/lib/|/$(get_libdir)/|g" -i \ "${ED}/etc/env.d/20php${SLOT}" sed -e "s|php5|php${SLOT}|g" -i \
(In reply to comment #5) > Created attachment 323036 [details, diff] [details, diff] > common-v2.eblit > src_prepare-v4.eblit - no diff > src_configure-v54.eblit > src_compile-v2.eblit - no diff > src_install-v3.eblit > src_test-v1.eblit - no diff > > These are the trivial changes to eblit, please review first. @PHP: ping, I just want to avoid redoing this patch in 3 months
It looks okay.
(In reply to comment #8) > It looks okay. Added. (In reply to comment #6) > The rest of the diff, but 20php5-envd is the same in prefix and gx86. So no > need to add this anymore. > > --- src_install-v3.eblit 2012-09-05 21:13:41.000000000 -0600 > +++ src_install-v3.eblit.prefix 2012-09-05 21:12:42.000000000 -0600 > @@ -84,8 +84,9 @@ > done > > # Install env.d files > - newenvd "${FILESDIR}/20php5-envd" \ > + newenvd "${FILESDIR}/20php${PHP_MV}-envd" \ > "20php${SLOT}" > + eprefixify "${ED}/etc/env.d/20php${SLOT}" > sed -e "s|/lib/|/$(get_libdir)/|g" -i \ > "${ED}/etc/env.d/20php${SLOT}" > sed -e "s|php5|php${SLOT}|g" -i \ @Prefix: please have another look this part and if it doesn't matter, consider php as merged. (We still need to port eselect-php as codependency).
(In reply to comment #9) > (In reply to comment #8) > @Prefix: please have another look this part and if it doesn't matter, > consider php as merged. (We still need to port eselect-php as codependency). eselect-php-0.6.7 seems alright, it works on my ~x86-linux and has ${EROOT} in all the important places. I will add the following keywords in gx86: "~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos" ("~x64-macos ~x86-macos" are already there.)
(In reply to comment #10) > (In reply to comment #9) > > (In reply to comment #8) > > @Prefix: please have another look this part and if it doesn't matter, > > consider php as merged. (We still need to port eselect-php as codependency). > eselect-php-0.6.7 seems alright, it works on my ~x86-linux and has ${EROOT} > in all the important places. > > I will add the following keywords in gx86: "~x86-freebsd ~amd64-linux > ~ia64-linux ~x86-linux ~ppc-macos" ("~x64-macos ~x86-macos" are already > there.) Done.
