Bug 433736 – apache-2.eclass: please review prefix changes

• Status: RESOLVED FIXED
• Product: Gentoo Linux

[Description Christoph Junghans (RETIRED) 2012-09-03 03:03:18 UTC]

For prefix support the only things left are EAPI>=3 and ${D} to ${ED}. So please bump EAPI to 3 or 4.

[Comment 1 Patrick Lauer 2012-10-12 06:08:05 UTC]

+  12 Oct 2012; Patrick Lauer <[e-mail]> +apache-2.4.3.ebuild,
+  -apache-2.4.2.ebuild, metadata.xml:
+  Bump with fixes from #410607 #411433 #433736

[Comment 2 Christoph Junghans (RETIRED) 2012-10-12 07:28:55 UTC]

(In reply to comment #1)
> +  12 Oct 2012; Patrick Lauer <[e-mail]> +apache-2.4.3.ebuild,
> +  -apache-2.4.2.ebuild, metadata.xml:
> +  Bump with fixes from #410607 #411433 #433736
$ grep EAPI /usr/portage/www-servers/apache/*.ebuild
/usr/portage/www-servers/apache/apache-2.2.22-r1.ebuild:EAPI="2"
/usr/portage/www-servers/apache/apache-2.2.23.ebuild:EAPI="2"
/usr/portage/www-servers/apache/apache-2.4.3.ebuild:EAPI="2"

Where is the EAPI bump?

[Comment 3 Christoph Junghans (RETIRED) 2013-12-01 20:24:04 UTC]

Created attachment 364378 [details, diff]
patch against apache-2.4.7

Ok, apache-2.4.7 is EAPI 5, so adding prefix support is trivial.

We still need to merge apache-2.eclass, but that is a different bug.

[Comment 4 Christoph Junghans (RETIRED) 2013-12-10 11:03:54 UTC]

Hmm, we have a prefix patch in the overlay.

However doing something like:
$ sed -i "s@/\(usr\|var\|etc\|run\)/@${EPREFIX}&/g' conf/httpd.conf scripts/* docs/*.example patches/*.layout init/* conf/vhosts.d/* conf/modules.d/*

will do pretty much the same thing!

Any opinions?

[Comment 5 Fabian Groffen 2013-12-10 19:55:47 UTC]

you need to fix the quotes (starts with ", ends with ') but if the sed can do it iso a patch, in this case I think that can be justified, since the need will always stay

[Comment 6 Michael Orlitzky 2014-05-23 17:05:31 UTC]

Fixed?

  $ grep EAPIapache-2.*
  apache-2.2.27.ebuild:EAPI=5
  apache-2.2.27-r3.ebuild:EAPI=5
  apache-2.4.9-r3.ebuild:EAPI=5

[Comment 7 Christoph Junghans (RETIRED) 2014-05-23 17:15:52 UTC]

(In reply to Michael Orlitzky from comment #6)
> Fixed?
> 
>   $ grep EAPIapache-2.*
>   apache-2.2.27.ebuild:EAPI=5
>   apache-2.2.27-r3.ebuild:EAPI=5
>   apache-2.4.9-r3.ebuild:EAPI=5

We need to add this to the ebuild:
> $ sed -i "s@/\(usr\|var\|etc\|run\)/@${EPREFIX}&/g" conf/httpd.conf
> scripts/* docs/*.example patches/*.layout init/* conf/vhosts.d/*
> conf/modules.d/*

[Comment 8 Lars Wendler (Polynomial-C) (RETIRED) 2014-05-23 20:48:45 UTC]

(In reply to Christoph Junghans from comment #7)
> (In reply to Michael Orlitzky from comment #6)
> > Fixed?
> > 
> >   $ grep EAPIapache-2.*
> >   apache-2.2.27.ebuild:EAPI=5
> >   apache-2.2.27-r3.ebuild:EAPI=5
> >   apache-2.4.9-r3.ebuild:EAPI=5
> 
> We need to add this to the ebuild:
> > $ sed -i "s@/\(usr\|var\|etc\|run\)/@${EPREFIX}&/g" conf/httpd.conf
> > scripts/* docs/*.example patches/*.layout init/* conf/vhosts.d/*
> > conf/modules.d/*

Feel free to add the necessary changes to the unstable ebuilds but if possible without a revbump please.

[Comment 9 Christoph Junghans (RETIRED) 2014-07-25 23:49:33 UTC]

added apache-2.4.10 without keywords to prefix overlay for testing.

[Comment 10 Christoph Junghans (RETIRED) 2014-07-27 21:37:40 UTC]

Created attachment 381680 [details, diff]
patch against gx86 version

It is the easiest to move the sed command to apache-2.eclass.

Otherwise there are only trivial changes:
- prefix paths here and there
- ${D} -> ${ED}
- ${ROOT} -> ${EROOT}

[Comment 11 Christoph Junghans (RETIRED) 2014-07-27 21:39:02 UTC]

(In reply to Christoph Junghans from comment #9)
> added apache-2.4.10 without keywords to prefix overlay for testing.
apache-2.4.10 from gx86 work on my amd64-linux machine, so re-added keywords.

[Comment 12 Christoph Junghans (RETIRED) 2014-08-03 23:53:03 UTC]

ebuilds are gone from prefix overlay (same as gx86), eclass patch still needs review.

[Comment 13 Lars Wendler (Polynomial-C) (RETIRED) 2014-08-04 04:51:04 UTC]

(In reply to Christoph Junghans from comment #12)
> ebuilds are gone from prefix overlay (same as gx86), eclass patch still
> needs review.

The patch looks good. You have my go to change the eclass accordingly.

[Comment 14 Christoph Junghans (RETIRED) 2014-08-05 14:19:22 UTC]

+  05 Aug 2014; Christoph Junghans <[e-mail]> apache-2.eclass:
+  added prefix support (bug #433736)
+