| 1 |
commit: fd676c937ab85d6653e7789df46febc2e3336236 |
| 2 |
Author: Louis Sautier <sautier.louis <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Dec 1 23:33:24 2016 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Dec 2 19:08:07 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd676c93 |
| 7 |
|
| 8 |
net-irc/znc: fix googlecode URI, minor fixes |
| 9 |
|
| 10 |
- use github URI for googletest, use tar.gz instead of zip |
| 11 |
- add missing quotes around systemd_get_systemunitdir |
| 12 |
|
| 13 |
Package-Manager: portage-2.3.2 |
| 14 |
|
| 15 |
net-irc/znc/Manifest | 1 + |
| 16 |
net-irc/znc/metadata.xml | 1 - |
| 17 |
net-irc/znc/znc-1.6.3.ebuild | 19 +++++++++++-------- |
| 18 |
3 files changed, 12 insertions(+), 9 deletions(-) |
| 19 |
|
| 20 |
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest |
| 21 |
index d4ac35e..a51598c 100644 |
| 22 |
--- a/net-irc/znc/Manifest |
| 23 |
+++ b/net-irc/znc/Manifest |
| 24 |
@@ -1,3 +1,4 @@ |
| 25 |
+DIST googletest-release-1.7.0.tar.gz 468653 SHA256 f73a6546fdf9fce9ff93a5015e0333a8af3062a152a9ad6bcb772c96687016cc SHA512 c623d5720c4ed574e95158529872815ecff478c03bdcee8b79c9b042a603533f93fe55f939bcfe2cd745ce340fd626ad6d9a95981596f1a4d05053d874cd1dfc WHIRLPOOL e59e6aede05fd882c64586de7d204ed97fd02ec0f53abeb3130dcd18940ecefb59a43592ac5bd14dd28a8825845bd11359f637e28671554852573a4a43f8cd9c |
| 26 |
DIST gtest-1.7.0.zip 1164254 SHA256 247ca18dd83f53deb1328be17e4b1be31514cedfc1e3424f672bf11fd7e0d60d SHA512 8859369f2dd32cbc2ac01aba029aa3ff20a321f40658b9643aff442d34c33468221866b801b28c66a28af47dbcd362d26941fc98db92b6efb7e41ea5b7be1a07 WHIRLPOOL 0c31a385159551859c1afe76480b3fb1b560d666db9a0afc5cbda92bcd53bf129f85a8f902c6ded0779c2b4c49aacec59ba5a4d5ce316a07bf08174f4fc64049 |
| 27 |
DIST znc-1.4.tar.gz 1239648 SHA256 86e98fd0ed182d39828c926809f8075d836ee3b70a6dd43dfbb434822f2a7b52 SHA512 0c33b05e8232084999812cbaa467dc7d37b80cafc1001b82e89c702b4303d8db9a27b948fe653e7090404eb1c66f5492f02f3524bc39efabade4be8bdb476671 WHIRLPOOL 420e665fa193b3f0284a070e021c4c467e3d40a0812eedeef9b2f65a6626a050b7af8bf15a754ac571d12261705832cfa18a0f7a7817cce96d220028a86230cf |
| 28 |
DIST znc-1.6.1.tar.gz 1463397 SHA256 ba49397364f48d6d32ae5242bc1166f21d972f85dd390d6bbe68a63ecbb6c140 SHA512 92c0acca6b585df394cf8d6d295948fc1342ff7b15d081017d2e0ba521129f914fa2b019a82d801f826f1009456294e4f578e978f34677bbfe436e87e2734aba WHIRLPOOL ff4a22742d5e1e8da66325fdc8a2fd88a467674a5f13f6d353b1c3588affd86f2c33c24d48f1b61dfba14311d6f1c13b2939851316cb302ab031073baa05ec17 |
| 29 |
|
| 30 |
diff --git a/net-irc/znc/metadata.xml b/net-irc/znc/metadata.xml |
| 31 |
index b8a8704..944a888 100644 |
| 32 |
--- a/net-irc/znc/metadata.xml |
| 33 |
+++ b/net-irc/znc/metadata.xml |
| 34 |
@@ -4,7 +4,6 @@ |
| 35 |
<maintainer type="person"> |
| 36 |
<email>sautier.louis@×××××.com</email> |
| 37 |
<name>Louis Sautier</name> |
| 38 |
- <description>Proxied maintainer; set to assignee in all bugs</description> |
| 39 |
</maintainer> |
| 40 |
<maintainer type="project"> |
| 41 |
<email>proxy-maint@g.o</email> |
| 42 |
|
| 43 |
diff --git a/net-irc/znc/znc-1.6.3.ebuild b/net-irc/znc/znc-1.6.3.ebuild |
| 44 |
index 7f31546..d900f54 100644 |
| 45 |
--- a/net-irc/znc/znc-1.6.3.ebuild |
| 46 |
+++ b/net-irc/znc/znc-1.6.3.ebuild |
| 47 |
@@ -9,11 +9,13 @@ inherit eutils python-single-r1 readme.gentoo-r1 systemd user |
| 48 |
|
| 49 |
MY_PV=${PV/_/-} |
| 50 |
GTEST_VER="1.7.0" |
| 51 |
-GTEST_URL="https://googletest.googlecode.com/files/gtest-${GTEST_VER}.zip" |
| 52 |
+GTEST_URL="https://github.com/google/googletest/archive/release-${GTEST_VER}.tar.gz -> googletest-release-${GTEST_VER}.tar.gz" |
| 53 |
DESCRIPTION="An advanced IRC Bouncer" |
| 54 |
|
| 55 |
-SRC_URI="http://znc.in/releases/${PN}-${MY_PV}.tar.gz |
| 56 |
- test? ( ${GTEST_URL} )" |
| 57 |
+SRC_URI=" |
| 58 |
+ http://znc.in/releases/${PN}-${MY_PV}.tar.gz |
| 59 |
+ test? ( ${GTEST_URL} ) |
| 60 |
+" |
| 61 |
KEYWORDS="amd64 arm x86" |
| 62 |
|
| 63 |
HOMEPAGE="http://znc.in" |
| 64 |
@@ -35,7 +37,8 @@ RDEPEND=" |
| 65 |
) |
| 66 |
tcl? ( dev-lang/tcl:0= ) |
| 67 |
" |
| 68 |
-DEPEND="${RDEPEND} |
| 69 |
+DEPEND=" |
| 70 |
+ ${RDEPEND} |
| 71 |
virtual/pkgconfig |
| 72 |
" |
| 73 |
|
| 74 |
@@ -62,7 +65,7 @@ pkg_setup() { |
| 75 |
|
| 76 |
src_configure() { |
| 77 |
econf \ |
| 78 |
- --with-systemdsystemunitdir=$(systemd_get_systemunitdir) \ |
| 79 |
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \ |
| 80 |
$(use_enable debug) \ |
| 81 |
$(use_enable ipv6) \ |
| 82 |
$(use_enable perl) \ |
| 83 |
@@ -70,12 +73,12 @@ src_configure() { |
| 84 |
$(use_enable sasl cyrus) \ |
| 85 |
$(use_enable ssl openssl) \ |
| 86 |
$(use_enable tcl tcl) \ |
| 87 |
- $(use_with test gtest "${WORKDIR}/gtest-${GTEST_VER}") |
| 88 |
+ $(use_with test gtest "${WORKDIR}/googletest-release-${GTEST_VER}") |
| 89 |
} |
| 90 |
|
| 91 |
src_install() { |
| 92 |
- emake install DESTDIR="${D%/}" |
| 93 |
- dodoc NOTICE README.md |
| 94 |
+ default |
| 95 |
+ dodoc NOTICE |
| 96 |
if use daemon; then |
| 97 |
newinitd "${FILESDIR}"/znc.initd-r1 znc |
| 98 |
newconfd "${FILESDIR}"/znc.confd-r1 znc |
Archives