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.

Sign up for GitHub

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

Jump to bottom

Davical 1.1.7 #6832

Closed
wants to merge 2 commits into from
Closed

Davical 1.1.7 #6832

wants to merge 2 commits into from

Conversation

tillschaefer
Copy link
Contributor

closes: https://bugs.gentoo.org/573218

  • updated header
  • updated EAPI to 6
  • removed patches applied upstream
  • adjust to new folder structure of davical tarball

SoapGentoo
SoapGentoo suggested changes Jan 11, 2018
View reviewed changes
dev-php/awl/awl-0.58.ebuild Outdated
src_unpack() {
default_src_unpack
mv awl-* awl-${PV} || die "tarballs root folder not found"
}
Copy link
Member

Choose a reason for hiding this comment

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

scrap all of this and just inherit vcs-snapshot

dev-php/awl/awl-0.58.ebuild Outdated

src_install() {
dodoc debian/changelog
use doc && dohtml -r "docs/api/"
Copy link
Member

Choose a reason for hiding this comment

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

dohtml is deprecated in EAPI 6. Do

HTML_DOCS=( docs/api/. )
einstalldocs

dev-php/awl/awl-0.58.ebuild Outdated
src_install() {
dodoc debian/changelog
use doc && dohtml -r "docs/api/"
insinto "/usr/share/php/${PN}"
Copy link
Member

Choose a reason for hiding this comment

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

drop the quotes, not needed, ${PN} will never contain a space

www-apps/davical/davical-1.1.6.ebuild Outdated
src_unpack() {
default_src_unpack
mv davical-* ${P} || die "tarballs root folder not found"
}
Copy link
Member

Choose a reason for hiding this comment

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

same here

www-apps/davical/davical-1.1.6.ebuild Outdated

einfo "Installing web files"
insinto "${MY_HTDOCSDIR}"
doins -r htdocs/* htdocs/.htaccess
Copy link
Member

Choose a reason for hiding this comment

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

doins -r htdocs/. htdocs/.htaccess

www-apps/davical/davical-1.1.6.ebuild Outdated
einfo "Installing main files and i18n"
insinto "${MY_HOSTROOTDIR}/${PN}"
doins -r inc locale
rm "${D}/${MY_HOSTROOTDIR}/${PN}/inc/always.php.in" || die
Copy link
Member

Choose a reason for hiding this comment

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

rm "${ED}/${MY_HOSTROOTDIR}/${PN}/inc/always.php.in" || die

www-apps/davical/davical-1.1.6.ebuild Outdated

einfo "Installing sql files"
insinto "${MY_SQLSCRIPTSDIR}"
doins -r dba/*
Copy link
Member

Choose a reason for hiding this comment

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

doins -r dba/. (avoid unnecessary globs)

www-apps/davical/davical-1.1.6.ebuild Outdated

if use doc ; then
einfo "Installing documentation"
dohtml -r docs/api/ docs/website/
Copy link
Member

Choose a reason for hiding this comment

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

dohtml again

www-apps/davical/davical-1.1.6.ebuild Outdated
fi

insinto /etc/${PN}
doins config/* "${FILESDIR}/vhost-example"
Copy link
Member

Choose a reason for hiding this comment

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

globs

www-apps/davical/davical-1.1.6.ebuild Outdated

EAPI=6

inherit webapp eutils
Copy link
Member

Choose a reason for hiding this comment

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

why do you inherit eutils?

@gentoo-repo-qa-bot
Copy link
Collaborator

Pull Request assignment

Areas affected: ebuilds
Packages affected: dev-php/awl, www-apps/davical

dev-php/awl: patrick, @gentoo/php
www-apps/davical: patrick

At least one of the listed packages is maintained entirely by non-GitHub developers!

Bugs linked: 573218

@gentoo-repo-qa-bot gentoo-repo-qa-bot added need assignment It was impossible to assign the PR correctly. Please assign it manually. bug linked Bug/Closes found in footer, and cross-linked with the PR. labels Jan 11, 2018
@tillschaefer
Copy link
Contributor Author

updated to respect change requests
remove doc useflag since doc generation is broken

SoapGentoo
SoapGentoo suggested changes Jan 12, 2018
View reviewed changes
dev-php/awl/awl-0.58.ebuild Outdated
# Distributed under the terms of the GNU General Public License v2

EAPI=6
inherit vcs-snapshot eutils
Copy link
Member

Choose a reason for hiding this comment

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

why is eutils still here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

leftover from einstalldocs .. will remove it

@SoapGentoo
Copy link
Member

@grknight @orlitzky please review, I am happy now

@tillschaefer
Copy link
Contributor Author

bumped to new version which was just released upstream (identical ebuild)

@orlitzky
Copy link
Contributor

The latest changelog entry suggests that the doc generation might be unbroken now:

2018-01-11 Florian Schlichting <fsfs@debian.org>
 	* release awl 0.59
 	* switch to doxygen for api docs

Up to you if you feel like trying to get it to work.

@tillschaefer tillschaefer changed the title Davical 1.1.6 Davical 1.1.7 Jan 12, 2018
@tillschaefer
Copy link
Contributor Author

If thats ok, I would like to leave it that way for now (without doc).

@orlitzky
Copy link
Contributor

No problem, we can add it later if anyone cares.

Does the awl dependency in the davical ebuild need to be updated now?

@tillschaefer
Copy link
Contributor Author

yes, you are right.

@orlitzky
Copy link
Contributor

I pulled the awl commit a second ago, thanks. For davical... does this work?

doins config/. "${FILESDIR}/vhost-example"

I got no config files installed, and it looks like there should be an -r there.

Once that's fixed, I don't know how the webapp-config stuff works, so you might want to get patrick to ACK that on IRC, or just go ahead with a promise that you'll fix it if it doesn't work for some reason.

@tillschaefer
Copy link
Contributor Author

Regarding the doins: This is changed now. I did not noticed the problem, since the missing files are only example configurations.

Since I cannot reach Patrick on IRC, I am willing to respond to any non-working bugs that are coming up. Should I add myself as proxy-maintainer or how can I get notified about new bugs otherwise?

@orlitzky
Copy link
Contributor

I pinged patrick on IRC (he goes by bonsaikitten at the moment).

@orlitzky
Copy link
Contributor

orlitzky commented Jan 15, 2018 •
edited

<bonsaikitten> mjo: I'm not currently using it, so feel free to take over

So feel free to update metadata.xml.

@tillschaefer
Copy link
Contributor Author

tillschaefer commented Jan 15, 2018 •
edited

take over = remove patrick, right? Otherwise I will re-add him.

@orlitzky
Copy link
Contributor

Yeah that's fine. If he's not using it anymore, he can do without the bug mail. @SoapGentoo I guess you'll want to create him a maintainer bug and all that stuff, but otherwise this LGTM now.

@tillschaefer
Copy link
Contributor Author

tillschaefer commented Jan 15, 2018 •
edited

I already have a maintainer bug: https://bugs.gentoo.org/643946 (created for nfoview)

@tillschaefer
www-apps/davical: bump to 1.1.7
94419b6 
Patches form 1.1.3.1-r2 are no longer needed as they are
integrated upstream. Drop doc useflag since generation is broken.

Closes: https://bugs.gentoo.org/573218
Package-Manager: Portage-2.3.13, Repoman-2.3.3
@tillschaefer
www-apps/davical: take over maintainership
68aea3a 
add upstream remote-id

Package-Manager: Portage-2.3.13, Repoman-2.3.3
@gentoo-repo-qa-bot
Copy link
Collaborator

😞 The QA check for this pull request has found the following issues:

Issues inherited from Gentoo (may be modified by PR):
https://qa-reports.gentoo.org/output/gentoo-ci/1b6d154dc/output.html#net-print/hplip-plugin

NeddySeagoon pushed a commit to NeddySeagoon/gentoo-arm64 that referenced this pull request Jan 21, 2018
@tillschaefer @NeddySeagoon
www-apps/davical: bump to 1.1.7
6125db3 
Patches form 1.1.3.1-r2 are no longer needed as they are
integrated upstream. Drop doc useflag since generation is broken.

Closes: https://bugs.gentoo.org/573218
Package-Manager: Portage-2.3.13, Repoman-2.3.3
Closes: gentoo#6832
@tillschaefer tillschaefer mentioned this pull request Apr 25, 2018
Closed
gentoo-repo-qa-bot pushed a commit to gentoo-mirror/gentoo that referenced this pull request Apr 25, 2018
@tillschaefer
dev-php/awl: take over maintainership
07ddb99 
see gentoo/gentoo#6832 (comment)

Package-Manager: Portage-2.3.24, Repoman-2.3.6
tillschaefer added a commit to tillschaefer/gentoo that referenced this pull request Apr 26, 2018
@tillschaefer
dev-php/awl: take over maintainership
159dc6a 
see gentoo#6832 (comment)

Package-Manager: Portage-2.3.24, Repoman-2.3.6
tillschaefer added a commit to tillschaefer/gentoo that referenced this pull request Apr 26, 2018
@tillschaefer
dev-php/awl: take over maintainership
8b14f15 
see gentoo#6832 (comment)

Package-Manager: Portage-2.3.24, Repoman-2.3.6
gentoo-bot pushed a commit that referenced this pull request Apr 27, 2018
@tillschaefer @SoapGentoo
dev-php/awl: take over maintainership
17fbf60 
see #6832 (comment)

Package-Manager: Portage-2.3.24, Repoman-2.3.6
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SoapGentoo SoapGentoo SoapGentoo approved these changes

Assignees
No one assigned
Labels
bug linked Bug/Closes found in footer, and cross-linked with the PR. need assignment It was impossible to assign the PR correctly. Please assign it manually.
Projects
None yet
Milestone
No milestone
4 participants
@tillschaefer @gentoo-repo-qa-bot @SoapGentoo @orlitzky