Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

net-irc/znc: fix googlecode URI, add unzip DEPEND, minor fixes #2977

Closed
wants to merge 3 commits into from

Conversation

sbraz
Copy link
Member

@sbraz sbraz commented Dec 1, 2016

I only fixed the googlecode URI in the latest version and got rid of 1.6.1 as it's not stable anyway.

@gentoo-repo-qa-bot
Copy link
Collaborator

Pull Request assignment

Areas affected: ebuilds
Packages affected: net-irc/znc

net-irc/znc: @sbraz, @gentoo/proxy-maint

@gentoo-repo-qa-bot gentoo-repo-qa-bot added the assigned PR successfully assigned to the package maintainer(s). label Dec 1, 2016

src_compile() {
emake
use test && emake unittest
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do this in src_test

Copy link
Member

@mgorny mgorny left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See below.

Also, you mention that you've 'made tests compile in src_compile and not in src_test'. I did not see a relevant change. How did you change that?

@@ -1,4 +1,3 @@
DIST gtest-1.7.0.zip 1164254 SHA256 247ca18dd83f53deb1328be17e4b1be31514cedfc1e3424f672bf11fd7e0d60d SHA512 8859369f2dd32cbc2ac01aba029aa3ff20a321f40658b9643aff442d34c33468221866b801b28c66a28af47dbcd362d26941fc98db92b6efb7e41ea5b7be1a07 WHIRLPOOL 0c31a385159551859c1afe76480b3fb1b560d666db9a0afc5cbda92bcd53bf129f85a8f902c6ded0779c2b4c49aacec59ba5a4d5ce316a07bf08174f4fc64049
DIST googletest-release-1.7.0.zip 633003 SHA256 b58cb7547a28b2c718d1e38aee18a3659c9e3ff52440297e965f5edffe34b6d0 SHA512 7fff71ef2226b70843683d5c5d09f09f7fc2151a44c66d1dcf9ebdbe695cbc4c0cef330798af926b3bd65d156cece55b8015f78283e06cc6696d1ceab821cbaa WHIRLPOOL 0976aa65bd63c60539cc23f8c143bc17cd2867f0c7d516962c280e16140fbcf54a3e91890fbf456beb7afc8981555aa3a065a5a032bb1c105de12786a1241066
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see different checksums. Did anything change besides directory name?

@@ -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}.zip -> googletest-release-${GTEST_VER}.zip"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use .tar.gz instead.

@dwfreed
Copy link
Contributor

dwfreed commented Dec 2, 2016

That bit was reverted

sasl? ( >=dev-libs/cyrus-sasl-2 )
ssl? (
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl )
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

libressl needs :0= too

}

src_install() {
emake install DESTDIR="${D%/}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

default?


src_install() {
emake install DESTDIR="${D%/}"
dodoc NOTICE README.md
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dodoc NOTICE (as README.md will have been installed by einstalldocs)

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

Package-Manager: portage-2.3.2
Package-Manager: portage-2.3.2
@sbraz
Copy link
Member Author

sbraz commented Dec 2, 2016

I addressed all the changes you guys mentioned, thanks for the feedback!


src_install() {
default
dodoc NOTICE
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not put this in DOCS, so einstalldocs handles this for you?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dwfreed, please avoid the ping-pong. @sbraz has just been told to switch from dodoc to default + dodoc for additional files. It doesn't really matter how it's done, and there is really no point in changing the way it's done three times a day…

@gentoo-bot gentoo-bot closed this in 40c0c37 Dec 2, 2016
@mgorny
Copy link
Member

mgorny commented Dec 2, 2016

One little post-push remark: for minor changes like slot op addition, you can copy the stable keywords over to the new revision and remove the old one.

@mgorny
Copy link
Member

mgorny commented Dec 2, 2016

(I've done that)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
assigned PR successfully assigned to the package maintainer(s).
Projects
None yet
5 participants