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

app-text/scrollkeeper-dtd: EAPI8 bump, use https #35843

Closed
wants to merge 1 commit into from

Conversation

mm1ke
Copy link
Contributor

@mm1ke mm1ke commented Mar 20, 2024

Pretty simple EAPI8 bump, also removed a blocker to !<app-text/scrollkeeper-9999-r1" which seems to be removed before the git migration..

--- scrollkeeper-dtd-1.0-r1.ebuild	2024-03-20 20:47:16.708564262 +0100
+++ scrollkeeper-dtd-1.0-r2.ebuild	2024-03-20 20:52:00.677064676 +0100
@@ -1,24 +1,21 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DTD_FILE="scrollkeeper-omf.dtd"
 
 DESCRIPTION="DTD from the Scrollkeeper package"
-HOMEPAGE="http://scrollkeeper.sourceforge.net/"
-SRC_URI="http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/${DTD_FILE}"
+HOMEPAGE="https://scrollkeeper.sourceforge.net/"
+SRC_URI="https://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/${DTD_FILE}"
+S="${WORKDIR}"
 
 LICENSE="FDL-1.1"
 SLOT="1.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
-IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
 
 RDEPEND=">=dev-libs/libxml2-2.4.19"
-DEPEND="${RDEPEND}
-	!<app-text/scrollkeeper-9999-r1"
-
-S="${WORKDIR}"
+DEPEND="${RDEPEND}"
 
 src_unpack() { :; }
 
@@ -35,23 +32,23 @@
 	einfo "Installing catalog..."
 
 	# Install regular DOCTYPE catalog entry
-	"${EROOT}"usr/bin/xmlcatalog --noout --add "public" \
+	"${EROOT}"/usr/bin/xmlcatalog --noout --add "public" \
 		"-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" \
-		"${EROOT}"usr/share/xml/scrollkeeper/dtds/${DTD_FILE} \
-		"${EROOT}"etc/xml/catalog
+		"${EROOT}"/usr/share/xml/scrollkeeper/dtds/${DTD_FILE} \
+		"${EROOT}"/etc/xml/catalog
 
 	# Install catalog entry for calls like: xmllint --dtdvalid URL ...
-	"${EROOT}"usr/bin/xmlcatalog --noout --add "system" \
+	"${EROOT}"/usr/bin/xmlcatalog --noout --add "system" \
 		"${SRC_URI}" \
-		"${EROOT}"usr/share/xml/scrollkeeper/dtds/${DTD_FILE} \
-		"${EROOT}"etc/xml/catalog
+		"${EROOT}"/usr/share/xml/scrollkeeper/dtds/${DTD_FILE} \
+		"${EROOT}"/etc/xml/catalog
 }
 
 pkg_postrm() {
 	# Remove all sk-dtd from the cache
 	einfo "Cleaning catalog..."
 
-	"${EROOT}"usr/bin/xmlcatalog --noout --del \
-		"${EROOT}"usr/share/xml/scrollkeeper/dtds/${DTD_FILE} \
-		"${EROOT}"etc/xml/catalog
+	"${EROOT}"/usr/bin/xmlcatalog --noout --del \
+		"${EROOT}"/usr/share/xml/scrollkeeper/dtds/${DTD_FILE} \
+		"${EROOT}"/etc/xml/catalog
 }

@gentoo-bot
Copy link

Pull Request assignment

Submitter: @mm1ke
Areas affected: ebuilds
Packages affected: app-text/scrollkeeper-dtd

app-text/scrollkeeper-dtd: @gentoo/gnome

Linked bugs

No bugs to link found. If your pull request references any of the Gentoo bug reports, please add appropriate GLEP 66 tags to the commit message and request reassignment.

If you do not receive any reply to this pull request, please open or link a bug to attract the attention of maintainers.


In order to force reassignment and/or bug reference scan, please append [please reassign] to the pull request title.

Docs: Code of ConductCopyright policy (expl.) ● DevmanualGitHub PRsProxy-maint guide

@gentoo-bot gentoo-bot added assigned PR successfully assigned to the package maintainer(s). no bug found No Bug/Closes found in the commits. labels Mar 20, 2024
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2024-03-20 20:23 UTC
Newest commit scanned: af449bd
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/f755a24f2a/output.html

Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at>
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2024-04-10 20:44 UTC
Newest commit scanned: a0791d7
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/382eba7d59/output.html

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). no bug found No Bug/Closes found in the commits.
Projects
None yet
4 participants