| 1 |
commit: f2909e2c89dc2b9193a84862cdea1e5e1319c387 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jun 28 15:09:55 2022 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jun 28 15:09:55 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2909e2c |
| 7 |
|
| 8 |
app-admin/webalizer: update EAPI 5 -> 8 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/835387 |
| 11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 12 |
|
| 13 |
.../webalizer-2.23.08-broken-disable-static.patch | 16 +++++++++++++++ |
| 14 |
...-2.23.08.ebuild => webalizer-2.23.08-r1.ebuild} | 24 +++++++++++++--------- |
| 15 |
2 files changed, 30 insertions(+), 10 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-admin/webalizer/files/webalizer-2.23.08-broken-disable-static.patch b/app-admin/webalizer/files/webalizer-2.23.08-broken-disable-static.patch |
| 18 |
new file mode 100644 |
| 19 |
index 000000000000..109740a33ccb |
| 20 |
--- /dev/null |
| 21 |
+++ b/app-admin/webalizer/files/webalizer-2.23.08-broken-disable-static.patch |
| 22 |
@@ -0,0 +1,16 @@ |
| 23 |
+--- a/configure |
| 24 |
++++ b/configure |
| 25 |
+@@ -3939,13 +3939,6 @@ |
| 26 |
+ |
| 27 |
+ |
| 28 |
+ if test "$GCC" = "yes"; then |
| 29 |
+- |
| 30 |
+- # Check whether --enable-static was given. |
| 31 |
+-if test "${enable_static+set}" = set; then |
| 32 |
+- enableval=$enable_static; LDFLAGS="--static ${LDFLAGS}" |
| 33 |
+-fi |
| 34 |
+- |
| 35 |
+- |
| 36 |
+ if test "$IN_CFLAGS" = ""; then |
| 37 |
+ CFLAGS="-Wall -O2" |
| 38 |
+ fi |
| 39 |
|
| 40 |
diff --git a/app-admin/webalizer/webalizer-2.23.08.ebuild b/app-admin/webalizer/webalizer-2.23.08-r1.ebuild |
| 41 |
similarity index 91% |
| 42 |
rename from app-admin/webalizer/webalizer-2.23.08.ebuild |
| 43 |
rename to app-admin/webalizer/webalizer-2.23.08-r1.ebuild |
| 44 |
index 8eb9f1511f93..4599eb628b61 100644 |
| 45 |
--- a/app-admin/webalizer/webalizer-2.23.08.ebuild |
| 46 |
+++ b/app-admin/webalizer/webalizer-2.23.08-r1.ebuild |
| 47 |
@@ -4,15 +4,15 @@ |
| 48 |
# uses webapp.eclass to create directories with right permissions |
| 49 |
# probably slight overkill but works well |
| 50 |
|
| 51 |
-EAPI="5" |
| 52 |
+EAPI=8 |
| 53 |
|
| 54 |
-inherit flag-o-matic versionator epatch webapp db-use |
| 55 |
+inherit flag-o-matic webapp db-use |
| 56 |
|
| 57 |
WEBAPP_MANUAL_SLOT="yes" |
| 58 |
XTENDED_VER="RB30" |
| 59 |
XTENDED_URL="rb30" |
| 60 |
|
| 61 |
-MY_PV="$(get_version_component_range 1-2)-$(get_version_component_range 3)" |
| 62 |
+MY_PV="$(ver_cut 1-2)-$(ver_cut 3)" |
| 63 |
MY_P="${PN}-${MY_PV}" |
| 64 |
|
| 65 |
GEODB_DATE="20140201" |
| 66 |
@@ -21,17 +21,20 @@ GEODB_DIR="/usr/share/webalizer/geodb" |
| 67 |
|
| 68 |
DESCRIPTION="Webserver log file analyzer" |
| 69 |
HOMEPAGE="http://www.webalizer.org/" |
| 70 |
-SRC_URI="ftp://ftp.mrunix.net/pub/webalizer/${MY_P}-src.tar.bz2 |
| 71 |
+SRC_URI=" |
| 72 |
+ ftp://ftp.mrunix.net/pub/webalizer/${MY_P}-src.tar.bz2 |
| 73 |
xtended? ( http://patrickfrei.ch/webalizer/${XTENDED_URL}/${PN}-${MY_PV}-${XTENDED_VER}-patch.tar.gz ) |
| 74 |
https://dev.gentoo.org/~blueness/webalizer/webalizer.conf.gz |
| 75 |
${GEODB_URL}/webalizer-geodb-${GEODB_DATE}.tgz" |
| 76 |
+S="${WORKDIR}/${MY_P}" |
| 77 |
|
| 78 |
LICENSE="GPL-2" |
| 79 |
+SLOT="0" |
| 80 |
KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86" |
| 81 |
IUSE="bzip2 xtended geoip nls" |
| 82 |
-SLOT="0" |
| 83 |
|
| 84 |
-DEPEND=">=sys-libs/db-4.2:* |
| 85 |
+DEPEND=" |
| 86 |
+ >=sys-libs/db-4.2:* |
| 87 |
>=sys-libs/zlib-1.1.4 |
| 88 |
>=media-libs/libpng-1.2:0= |
| 89 |
>=media-libs/gd-1.8.3[png] |
| 90 |
@@ -39,8 +42,6 @@ DEPEND=">=sys-libs/db-4.2:* |
| 91 |
bzip2? ( app-arch/bzip2 )" |
| 92 |
RDEPEND="${DEPEND}" |
| 93 |
|
| 94 |
-S="${WORKDIR}"/${MY_P} |
| 95 |
- |
| 96 |
pkg_setup() { |
| 97 |
webapp_pkg_setup |
| 98 |
|
| 99 |
@@ -53,10 +54,13 @@ pkg_setup() { |
| 100 |
} |
| 101 |
|
| 102 |
src_prepare() { |
| 103 |
- epatch "${FILESDIR}"/${PN}-2.23.08-gcc-10.patch |
| 104 |
+ eapply "${FILESDIR}"/${PN}-2.23.08-broken-disable-static.patch |
| 105 |
+ eapply "${FILESDIR}"/${PN}-2.23.08-gcc-10.patch |
| 106 |
if use xtended; then |
| 107 |
- epatch "${WORKDIR}"/${PN}-${MY_PV}-${XTENDED_VER}-patch |
| 108 |
+ eapply "${WORKDIR}"/${PN}-${MY_PV}-${XTENDED_VER}-patch |
| 109 |
fi |
| 110 |
+ |
| 111 |
+ eapply_user |
| 112 |
} |
| 113 |
|
| 114 |
src_configure() { |
Archives