net-irc/znc: fix googlecode URI, minor fixes

- use github URI for googletest, use tar.gz instead of zip
- add missing quotes around systemd_get_systemunitdir

Package-Manager: portage-2.3.2

diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index d4ac35e5b667fedee865ab975702cc7e77fef0ff..a51598c369beb8ed64abff7a618a159ff94fbca1 100644 (file)
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,3 +1,4 @@
+DIST googletest-release-1.7.0.tar.gz 468653 SHA256 f73a6546fdf9fce9ff93a5015e0333a8af3062a152a9ad6bcb772c96687016cc SHA512 c623d5720c4ed574e95158529872815ecff478c03bdcee8b79c9b042a603533f93fe55f939bcfe2cd745ce340fd626ad6d9a95981596f1a4d05053d874cd1dfc WHIRLPOOL e59e6aede05fd882c64586de7d204ed97fd02ec0f53abeb3130dcd18940ecefb59a43592ac5bd14dd28a8825845bd11359f637e28671554852573a4a43f8cd9c
 DIST gtest-1.7.0.zip 1164254 SHA256 247ca18dd83f53deb1328be17e4b1be31514cedfc1e3424f672bf11fd7e0d60d SHA512 8859369f2dd32cbc2ac01aba029aa3ff20a321f40658b9643aff442d34c33468221866b801b28c66a28af47dbcd362d26941fc98db92b6efb7e41ea5b7be1a07 WHIRLPOOL 0c31a385159551859c1afe76480b3fb1b560d666db9a0afc5cbda92bcd53bf129f85a8f902c6ded0779c2b4c49aacec59ba5a4d5ce316a07bf08174f4fc64049
 DIST znc-1.4.tar.gz 1239648 SHA256 86e98fd0ed182d39828c926809f8075d836ee3b70a6dd43dfbb434822f2a7b52 SHA512 0c33b05e8232084999812cbaa467dc7d37b80cafc1001b82e89c702b4303d8db9a27b948fe653e7090404eb1c66f5492f02f3524bc39efabade4be8bdb476671 WHIRLPOOL 420e665fa193b3f0284a070e021c4c467e3d40a0812eedeef9b2f65a6626a050b7af8bf15a754ac571d12261705832cfa18a0f7a7817cce96d220028a86230cf
 DIST znc-1.6.1.tar.gz 1463397 SHA256 ba49397364f48d6d32ae5242bc1166f21d972f85dd390d6bbe68a63ecbb6c140 SHA512 92c0acca6b585df394cf8d6d295948fc1342ff7b15d081017d2e0ba521129f914fa2b019a82d801f826f1009456294e4f578e978f34677bbfe436e87e2734aba WHIRLPOOL ff4a22742d5e1e8da66325fdc8a2fd88a467674a5f13f6d353b1c3588affd86f2c33c24d48f1b61dfba14311d6f1c13b2939851316cb302ab031073baa05ec17

diff --git a/net-irc/znc/metadata.xml b/net-irc/znc/metadata.xml
index b8a87043cc30b98e2856e102278ba864c0f1e852..944a888ca4257f0a519d043e0a04a69f10ef5d8e 100644 (file)
--- a/net-irc/znc/metadata.xml
+++ b/net-irc/znc/metadata.xml
@@ -4,7 +4,6 @@
        <maintainer type="person">
                <email>sautier.louis@gmail.com</email>
                <name>Louis Sautier</name>
-               <description>Proxied maintainer; set to assignee in all bugs</description>
        </maintainer>
        <maintainer type="project">
                <email>proxy-maint@gentoo.org</email>

diff --git a/net-irc/znc/znc-1.6.3.ebuild b/net-irc/znc/znc-1.6.3.ebuild
index 7f315465cc89055fc753a34faae9762f506e5eef..d900f545bda5d592f284cc75512b9744a4405d61 100644 (file)
--- a/net-irc/znc/znc-1.6.3.ebuild
+++ b/net-irc/znc/znc-1.6.3.ebuild
@@ -9,11 +9,13 @@ inherit eutils python-single-r1 readme.gentoo-r1 systemd user
 
 MY_PV=${PV/_/-}
 GTEST_VER="1.7.0"
-GTEST_URL="https://googletest.googlecode.com/files/gtest-${GTEST_VER}.zip"
+GTEST_URL="https://github.com/google/googletest/archive/release-${GTEST_VER}.tar.gz -> googletest-release-${GTEST_VER}.tar.gz"
 DESCRIPTION="An advanced IRC Bouncer"
 
-SRC_URI="http://znc.in/releases/${PN}-${MY_PV}.tar.gz
-       test? ( ${GTEST_URL} )"
+SRC_URI="
+       http://znc.in/releases/${PN}-${MY_PV}.tar.gz
+       test? ( ${GTEST_URL} )
+"
 KEYWORDS="amd64 arm x86"
 
 HOMEPAGE="http://znc.in"
@@ -35,7 +37,8 @@ RDEPEND="
        )
        tcl? ( dev-lang/tcl:0= )
 "
-DEPEND="${RDEPEND}
+DEPEND="
+       ${RDEPEND}
        virtual/pkgconfig
 "
 
@@ -62,7 +65,7 @@ pkg_setup() {
 
 src_configure() {
        econf \
-               --with-systemdsystemunitdir=$(systemd_get_systemunitdir) \
+               --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
                $(use_enable debug) \
                $(use_enable ipv6) \
                $(use_enable perl) \
@@ -70,12 +73,12 @@ src_configure() {
                $(use_enable sasl cyrus) \
                $(use_enable ssl openssl) \
                $(use_enable tcl tcl) \
-               $(use_with test gtest "${WORKDIR}/gtest-${GTEST_VER}")
+               $(use_with test gtest "${WORKDIR}/googletest-release-${GTEST_VER}")
 }
 
 src_install() {
-       emake install DESTDIR="${D%/}"
-       dodoc NOTICE README.md
+       default
+       dodoc NOTICE
        if use daemon; then
                newinitd "${FILESDIR}"/znc.initd-r1 znc
                newconfd "${FILESDIR}"/znc.confd-r1 znc