| 1 |
commit: 9ca5e822de1ab3c7f2be4125a1e87c7c6c336eab |
| 2 |
Author: Louis Sautier <sautier.louis <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Fri Mar 4 12:24:10 2016 +0000 |
| 4 |
Commit: Amy Winston <amynka <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Mar 4 17:43:48 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ca5e822 |
| 7 |
|
| 8 |
net-irc/eggdrop: bump to EAPI=6, fix a QA warning |
| 9 |
|
| 10 |
Add a patch to fix a compilation warning. |
| 11 |
Taken from eggheads/eggdrop@7570148085cd33f12ba30897e27e6064c202f12b |
| 12 |
|
| 13 |
Package-Manager: portage-2.2.27 |
| 14 |
|
| 15 |
net-irc/eggdrop/eggdrop-1.6.21-r1.ebuild | 13 ++++++++----- |
| 16 |
net-irc/eggdrop/files/eggdrop-1.6.21-fix-memset.patch | 11 +++++++++++ |
| 17 |
2 files changed, 19 insertions(+), 5 deletions(-) |
| 18 |
|
| 19 |
diff --git a/net-irc/eggdrop/eggdrop-1.6.21-r1.ebuild b/net-irc/eggdrop/eggdrop-1.6.21-r1.ebuild |
| 20 |
index f761a3b..541c9a3 100644 |
| 21 |
--- a/net-irc/eggdrop/eggdrop-1.6.21-r1.ebuild |
| 22 |
+++ b/net-irc/eggdrop/eggdrop-1.6.21-r1.ebuild |
| 23 |
@@ -2,7 +2,7 @@ |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
# $Id$ |
| 26 |
|
| 27 |
-EAPI=4 |
| 28 |
+EAPI=6 |
| 29 |
|
| 30 |
inherit eutils |
| 31 |
|
| 32 |
@@ -27,15 +27,17 @@ DEPEND=" |
| 33 |
sys-apps/gentoo-functions |
| 34 |
!vanilla? ( |
| 35 |
mysql? ( virtual/mysql ) |
| 36 |
- postgres? ( dev-db/postgresql[server] ) |
| 37 |
- ssl? ( dev-libs/openssl ) |
| 38 |
+ postgres? ( dev-db/postgresql:*[server] ) |
| 39 |
+ ssl? ( dev-libs/openssl:0= ) |
| 40 |
)" |
| 41 |
RDEPEND="${DEPEND}" |
| 42 |
|
| 43 |
S=${WORKDIR}/${MY_P} |
| 44 |
|
| 45 |
src_prepare() { |
| 46 |
- epatch "${FILESDIR}/${P}-fix-gcc5-remove-inline.patch" # bug 571004 |
| 47 |
+ # fix bug 571004 and a QA warning |
| 48 |
+ epatch "${FILESDIR}/${P}-fix-gcc5-remove-inline.patch" \ |
| 49 |
+ "${FILESDIR}/${P}-fix-memset.patch" |
| 50 |
if use vanilla; then |
| 51 |
rm -f "${WORKDIR}"/patch/[1-6]*.patch || die |
| 52 |
fi |
| 53 |
@@ -46,6 +48,7 @@ src_prepare() { |
| 54 |
sed -i \ |
| 55 |
-e '/\$(LD)/s/-o/$(CFLAGS) $(LDFLAGS) &/' \ |
| 56 |
src/mod/*.mod/Makefile* src/Makefile.in || die |
| 57 |
+ default |
| 58 |
} |
| 59 |
|
| 60 |
src_configure() { |
| 61 |
@@ -98,7 +101,7 @@ src_install() { |
| 62 |
src/mod/mystats.mod/tools/mystats.{conf,sql} \ |
| 63 |
src/mod/pgstats.mod/tools/{pgstats.conf,setup.sql} |
| 64 |
|
| 65 |
- dohtml doc/html/*.html |
| 66 |
+ dodoc -r doc/html |
| 67 |
|
| 68 |
dobin "${FILESDIR}"/eggdrop-installer |
| 69 |
doman doc/man1/eggdrop.1 |
| 70 |
|
| 71 |
diff --git a/net-irc/eggdrop/files/eggdrop-1.6.21-fix-memset.patch b/net-irc/eggdrop/files/eggdrop-1.6.21-fix-memset.patch |
| 72 |
new file mode 100644 |
| 73 |
index 0000000..f4d60f3 |
| 74 |
--- /dev/null |
| 75 |
+++ b/net-irc/eggdrop/files/eggdrop-1.6.21-fix-memset.patch |
| 76 |
@@ -0,0 +1,11 @@ |
| 77 |
+diff --git a/src/md5/md5c.c b/src/md5/md5c.c |
| 78 |
+index 4dce058..cfdf97c 100644 |
| 79 |
+--- a/src/md5/md5c.c |
| 80 |
++++ b/src/md5/md5c.c |
| 81 |
+@@ -267,5 +267,5 @@ void MD5_Final(unsigned char *result, MD5_CTX *ctx) |
| 82 |
+ result[14] = ctx->d >> 16; |
| 83 |
+ result[15] = ctx->d >> 24; |
| 84 |
+ |
| 85 |
+- egg_memset(ctx, 0, sizeof(ctx)); |
| 86 |
++ egg_memset(ctx, 0, sizeof(*ctx)); |
| 87 |
+ } |
Archives