* [gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-wine/
@ 2017-04-10 17:22 NP Hardass
0 siblings, 0 replies; 37+ messages in thread
From: NP Hardass @ 2017-04-10 17:22 UTC (permalink / raw
To: gentoo-commits
commit: a40a3dace2c9d0ae3716ccb9c8452613a3ee0758
Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 10 16:48:11 2017 +0000
Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Mon Apr 10 17:21:48 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a40a3dac
app-eselect/eselect-wine: Eselect module for slotted/split wine
Imported from wine-a-holics overlay
Package-Manager: Portage-2.3.3, Repoman-2.3.1
app-eselect/eselect-wine/Manifest | 1 +
app-eselect/eselect-wine/eselect-wine-1.0.ebuild | 47 ++++++++++++++++++++++++
app-eselect/eselect-wine/metadata.xml | 8 ++++
3 files changed, 56 insertions(+)
diff --git a/app-eselect/eselect-wine/Manifest b/app-eselect/eselect-wine/Manifest
new file mode 100644
index 00000000000..7a7bb0c432e
--- /dev/null
+++ b/app-eselect/eselect-wine/Manifest
@@ -0,0 +1 @@
+DIST wine.eselect-1.0 18653 SHA256 d8cae88a4f02c27db7e6423ceb4f2cf248af7136d32abda18349b74fa5a293b4 SHA512 cf52c8f5e72efb722f84eb5475f44ef9471122898cf6703d534c7c550d89477904f3da7aab4617be62f84c2d2c6bd8b8e711928436145f8424029f11505b3b8f WHIRLPOOL 70014c35bdf71d95f7c1ecc5d18bfc7a405d869bdb29cf4869f80c17a1e435085242b9ad66867e577279074284918c07778c07087d9561c470f70b12188d2372
diff --git a/app-eselect/eselect-wine/eselect-wine-1.0.ebuild b/app-eselect/eselect-wine/eselect-wine-1.0.ebuild
new file mode 100644
index 00000000000..1dd42a73cde
--- /dev/null
+++ b/app-eselect/eselect-wine/eselect-wine-1.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Manage active wine version"
+HOMEPAGE="http://bitbucket.org/NP-Hardass/eselect-wine"
+SRC_URI="http://bitbucket.org/NP-Hardass/${PN}/raw/v${PV}/wine.eselect -> wine.eselect-${PV}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="app-admin/eselect
+ dev-util/desktop-file-utils
+ !!app-emulation/wine:0"
+
+S=${WORKDIR}
+
+src_install() {
+ keepdir /etc/eselect/wine
+
+ insinto /usr/share/eselect/modules
+ newins "${DISTDIR}"/wine.eselect-${PV} wine.eselect
+}
+
+pkg_postinst() {
+ # <eselect-wine-v0.3_rc7 installed symlinks with leading double-slashes.
+ # In /usr/include this breaks gcc build.
+ # http://bugs.gentoo.org/434180
+ if [[ $(readlink "${EROOT%/}"/usr/include/wine) == //* ]]; then
+ ewarn "Leading double slash in ${EPREFIX%/}/usr/include/wine symlink detected."
+ ewarn "Re-setting wine symlinks..."
+ eselect wine update --if-unset
+ fi
+}
+
+pkg_prerm() {
+ # Avoid conflicts with wine[-multislot] installed later
+ if [[ -z ${REPLACED_BY_VERSION} ]]; then
+ elog "${PN} is being uninstalled, removing symlinks"
+ eselect wine unset --all || die
+ else
+ einfo "${PN} is being updated/reinstalled, not modifying symlinks"
+ fi
+}
diff --git a/app-eselect/eselect-wine/metadata.xml b/app-eselect/eselect-wine/metadata.xml
new file mode 100644
index 00000000000..8c68ad9f558
--- /dev/null
+++ b/app-eselect/eselect-wine/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>NP-Hardass@gentoo.org</email>
+ <name>NP-Hardass</name>
+ </maintainer>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-wine/
@ 2017-04-11 6:03 NP Hardass
0 siblings, 0 replies; 37+ messages in thread
From: NP Hardass @ 2017-04-11 6:03 UTC (permalink / raw
To: gentoo-commits
commit: 1589c01a49132c324ae21d37cf0229246c6330f6
Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 11 06:02:58 2017 +0000
Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Tue Apr 11 06:03:15 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1589c01a
app-eselect/eselect-wine: Add eroen to metadata as co-maintainer
Package-Manager: Portage-2.3.3, Repoman-2.3.1
app-eselect/eselect-wine/metadata.xml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/app-eselect/eselect-wine/metadata.xml b/app-eselect/eselect-wine/metadata.xml
index 8c68ad9f558..5f4f92ea6f4 100644
--- a/app-eselect/eselect-wine/metadata.xml
+++ b/app-eselect/eselect-wine/metadata.xml
@@ -5,4 +5,8 @@
<email>NP-Hardass@gentoo.org</email>
<name>NP-Hardass</name>
</maintainer>
+ <maintainer type="person">
+ <email>gentoo-wine@eroen.eu</email>
+ <name>eroen</name>
+ </maintainer>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-wine/
@ 2017-04-12 1:37 NP Hardass
0 siblings, 0 replies; 37+ messages in thread
From: NP Hardass @ 2017-04-12 1:37 UTC (permalink / raw
To: gentoo-commits
commit: eddc89851730ca693f023c3010cdf40b04a10151
Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 12 01:36:43 2017 +0000
Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Wed Apr 12 01:37:08 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eddc8985
app-eselect/eselect-wine: Add support for localized manpaged, #615218
Package-Manager: Portage-2.3.5, Repoman-2.3.2
app-eselect/eselect-wine/Manifest | 2 +-
.../eselect-wine/{eselect-wine-1.0.ebuild => eselect-wine-1.1.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-eselect/eselect-wine/Manifest b/app-eselect/eselect-wine/Manifest
index 7a7bb0c432e..d16d3d44e33 100644
--- a/app-eselect/eselect-wine/Manifest
+++ b/app-eselect/eselect-wine/Manifest
@@ -1 +1 @@
-DIST wine.eselect-1.0 18653 SHA256 d8cae88a4f02c27db7e6423ceb4f2cf248af7136d32abda18349b74fa5a293b4 SHA512 cf52c8f5e72efb722f84eb5475f44ef9471122898cf6703d534c7c550d89477904f3da7aab4617be62f84c2d2c6bd8b8e711928436145f8424029f11505b3b8f WHIRLPOOL 70014c35bdf71d95f7c1ecc5d18bfc7a405d869bdb29cf4869f80c17a1e435085242b9ad66867e577279074284918c07778c07087d9561c470f70b12188d2372
+DIST wine.eselect-1.1 18768 SHA256 e478ad4b7d51a064ab0ba5bd266d7c6a31f2bd6b24affbe67f03d76c932a628f SHA512 d7b17f826900cdc7bd55dae36e45b738862ca7d114fb8cf3cfd6bf887427ff7c462bb47475b61b704a206c92339bbbe6f9f6dcb2c20235d3148c8aae49006eda WHIRLPOOL df0463604bede4e6539b12e18ecaa9efa7a1e3638d211de416560590068b9c2e6eb97fe821335e54a0eceadbee1985712af2b864c8764fcf1ee4b37a1bcb4ae1
diff --git a/app-eselect/eselect-wine/eselect-wine-1.0.ebuild b/app-eselect/eselect-wine/eselect-wine-1.1.ebuild
similarity index 100%
rename from app-eselect/eselect-wine/eselect-wine-1.0.ebuild
rename to app-eselect/eselect-wine/eselect-wine-1.1.ebuild
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-wine/
@ 2017-08-07 14:10 NP Hardass
0 siblings, 0 replies; 37+ messages in thread
From: NP Hardass @ 2017-08-07 14:10 UTC (permalink / raw
To: gentoo-commits
commit: a3e74b0043a0796cf295548db248bfd98a609385
Author: Jonas Stein <jstein <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 6 13:52:30 2017 +0000
Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Mon Aug 7 14:09:55 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3e74b00
app-eselect/eselect-wine: Update contact
Update mail contact as requested by eroen.
Package-Manager: Portage-2.3.6, Repoman-2.3.3
app-eselect/eselect-wine/metadata.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-eselect/eselect-wine/metadata.xml b/app-eselect/eselect-wine/metadata.xml
index f137433051a..1ded1127484 100644
--- a/app-eselect/eselect-wine/metadata.xml
+++ b/app-eselect/eselect-wine/metadata.xml
@@ -6,7 +6,7 @@
<name>NP-Hardass</name>
</maintainer>
<maintainer type="person">
- <email>gentoo-wine@eroen.eu</email>
+ <email>gentoo@eroen.eu</email>
<name>eroen</name>
</maintainer>
<upstream>
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-wine/
@ 2017-09-13 23:54 NP Hardass
0 siblings, 0 replies; 37+ messages in thread
From: NP Hardass @ 2017-09-13 23:54 UTC (permalink / raw
To: gentoo-commits
commit: 65df004b338d80ff9fa42ddbf28c6034dad16757
Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 13 23:53:46 2017 +0000
Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Wed Sep 13 23:54:10 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65df004b
app-eselect/eselect-wine: Bump to 1.2, supports includedir
Package-Manager: Portage-2.3.8, Repoman-2.3.3
app-eselect/eselect-wine/Manifest | 2 +-
.../eselect-wine/{eselect-wine-1.1.ebuild => eselect-wine-1.2.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-eselect/eselect-wine/Manifest b/app-eselect/eselect-wine/Manifest
index d16d3d44e33..e5a310e2b33 100644
--- a/app-eselect/eselect-wine/Manifest
+++ b/app-eselect/eselect-wine/Manifest
@@ -1 +1 @@
-DIST wine.eselect-1.1 18768 SHA256 e478ad4b7d51a064ab0ba5bd266d7c6a31f2bd6b24affbe67f03d76c932a628f SHA512 d7b17f826900cdc7bd55dae36e45b738862ca7d114fb8cf3cfd6bf887427ff7c462bb47475b61b704a206c92339bbbe6f9f6dcb2c20235d3148c8aae49006eda WHIRLPOOL df0463604bede4e6539b12e18ecaa9efa7a1e3638d211de416560590068b9c2e6eb97fe821335e54a0eceadbee1985712af2b864c8764fcf1ee4b37a1bcb4ae1
+DIST wine.eselect-1.2 19369 SHA256 76794f2b821a00352ff2166c80c1a6fbd9b3ae77893fed1b6578f64519db0f2d SHA512 5b51b7ed161ace33f1dd74197bb524d1785c38e7da48dd2bc7cc420c7d0eb0a01dc7b74e5bc2911bc11bd15e9c25e4345ce23a2cbb1b935815a0931808f5cab3 WHIRLPOOL bb75755cab30c272312b14062f69e3c3af737731b9887fa2addbffb23d95daab712628a117c64d30e5a5bcb76b930698b857929b21a0e8a76fe374c8c424336b
diff --git a/app-eselect/eselect-wine/eselect-wine-1.1.ebuild b/app-eselect/eselect-wine/eselect-wine-1.2.ebuild
similarity index 100%
rename from app-eselect/eselect-wine/eselect-wine-1.1.ebuild
rename to app-eselect/eselect-wine/eselect-wine-1.2.ebuild
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-wine/
@ 2017-09-15 6:01 NP Hardass
0 siblings, 0 replies; 37+ messages in thread
From: NP Hardass @ 2017-09-15 6:01 UTC (permalink / raw
To: gentoo-commits
commit: 8ca113f247560d7799b71ff901eeca3fd7ec4464
Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 15 05:39:46 2017 +0000
Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Fri Sep 15 06:01:22 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ca113f2
app-eselect/eselect-wine: Bump to 1.2.2: Fix symlink validity check
Thanks to Arfrever for pointing it out
Package-Manager: Portage-2.3.8, Repoman-2.3.3
app-eselect/eselect-wine/Manifest | 2 +-
.../eselect-wine/{eselect-wine-1.2.ebuild => eselect-wine-1.2.2.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-eselect/eselect-wine/Manifest b/app-eselect/eselect-wine/Manifest
index e5a310e2b33..28e94593ff8 100644
--- a/app-eselect/eselect-wine/Manifest
+++ b/app-eselect/eselect-wine/Manifest
@@ -1 +1 @@
-DIST wine.eselect-1.2 19369 SHA256 76794f2b821a00352ff2166c80c1a6fbd9b3ae77893fed1b6578f64519db0f2d SHA512 5b51b7ed161ace33f1dd74197bb524d1785c38e7da48dd2bc7cc420c7d0eb0a01dc7b74e5bc2911bc11bd15e9c25e4345ce23a2cbb1b935815a0931808f5cab3 WHIRLPOOL bb75755cab30c272312b14062f69e3c3af737731b9887fa2addbffb23d95daab712628a117c64d30e5a5bcb76b930698b857929b21a0e8a76fe374c8c424336b
+DIST wine.eselect-1.2.1 19377 SHA256 f681937a6b4d88461fa03399d3218d159879c3650ac4a4064fa04c12b5d6e0f3 SHA512 112c4b34493ed48ce9026f7dea2110ebd1198c19e1b7538c5c0d3a22734f4fe88205b2535852aaae67a19dd937a42929cb4d0051288425071c2eeca0ff54761f WHIRLPOOL 0d09f96d792b9b667470c609aab50abf598e48ce28857b3db05590545c2a1199e13134e61af3aa89380d09885e5bf6a147ffa9cb5eb951e60f181dcb6b6a0269
diff --git a/app-eselect/eselect-wine/eselect-wine-1.2.ebuild b/app-eselect/eselect-wine/eselect-wine-1.2.2.ebuild
similarity index 100%
rename from app-eselect/eselect-wine/eselect-wine-1.2.ebuild
rename to app-eselect/eselect-wine/eselect-wine-1.2.2.ebuild
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-wine/
@ 2017-09-15 6:10 NP Hardass
0 siblings, 0 replies; 37+ messages in thread
From: NP Hardass @ 2017-09-15 6:10 UTC (permalink / raw
To: gentoo-commits
commit: 3b02244041cac7bdc21cae1be35c3e81e6f6ed09
Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 15 06:09:56 2017 +0000
Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Fri Sep 15 06:10:09 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b022440
app-eselect/eselect-wine: Fix manifest
Package-Manager: Portage-2.3.8, Repoman-2.3.3
app-eselect/eselect-wine/Manifest | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-eselect/eselect-wine/Manifest b/app-eselect/eselect-wine/Manifest
index 28e94593ff8..a43ef3ddffd 100644
--- a/app-eselect/eselect-wine/Manifest
+++ b/app-eselect/eselect-wine/Manifest
@@ -1 +1 @@
-DIST wine.eselect-1.2.1 19377 SHA256 f681937a6b4d88461fa03399d3218d159879c3650ac4a4064fa04c12b5d6e0f3 SHA512 112c4b34493ed48ce9026f7dea2110ebd1198c19e1b7538c5c0d3a22734f4fe88205b2535852aaae67a19dd937a42929cb4d0051288425071c2eeca0ff54761f WHIRLPOOL 0d09f96d792b9b667470c609aab50abf598e48ce28857b3db05590545c2a1199e13134e61af3aa89380d09885e5bf6a147ffa9cb5eb951e60f181dcb6b6a0269
+DIST wine.eselect-1.2.2 19370 SHA256 e72f3d7cbdb3d7254ca0c52165adeae977e78ab68cde843622b99088ecc74e2b SHA512 6380e904ca824b1fe45cf651637f1cfe931f0c7519db49cb0794826ebbc8bdebc480fe7eb16601dc37123b44ea2d10aec49aa9fe622cad3e67ffb0f730292614 WHIRLPOOL 3f2cdc1128c831672605a46c8e7ac7a524d9a42e7355928806c448463131518f4bd47c633a687d8af1ae0fb7eb3c702755103ee2fedaf37c3e30477286b910cb
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-wine/
@ 2017-09-28 22:32 NP Hardass
0 siblings, 0 replies; 37+ messages in thread
From: NP Hardass @ 2017-09-28 22:32 UTC (permalink / raw
To: gentoo-commits
commit: e70c6c92f502761b81281f49a37dcfaf90e35ce6
Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 27 19:46:27 2017 +0000
Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Thu Sep 28 22:32:21 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e70c6c92
app-eselect/eselect-wine: Stable for amd64, x86
Package-Manager: Portage-2.3.10, Repoman-2.3.3
app-eselect/eselect-wine/eselect-wine-1.2.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-eselect/eselect-wine/eselect-wine-1.2.2.ebuild b/app-eselect/eselect-wine/eselect-wine-1.2.2.ebuild
index 1dd42a73cde..103fd730d6e 100644
--- a/app-eselect/eselect-wine/eselect-wine-1.2.2.ebuild
+++ b/app-eselect/eselect-wine/eselect-wine-1.2.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://bitbucket.org/NP-Hardass/${PN}/raw/v${PV}/wine.eselect -> wine.e
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="-* amd64 x86 ~x86-fbsd"
IUSE=""
RDEPEND="app-admin/eselect
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-wine/
@ 2017-09-29 3:07 NP Hardass
0 siblings, 0 replies; 37+ messages in thread
From: NP Hardass @ 2017-09-29 3:07 UTC (permalink / raw
To: gentoo-commits
commit: f35d43e6fba98d46f65c5f91971217585126fb05
Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 29 02:55:41 2017 +0000
Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Fri Sep 29 03:06:59 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f35d43e6
app-eselect/eselect-wine: Change http to https
Package-Manager: Portage-2.3.10, Repoman-2.3.3
app-eselect/eselect-wine/eselect-wine-1.2.2.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/app-eselect/eselect-wine/eselect-wine-1.2.2.ebuild b/app-eselect/eselect-wine/eselect-wine-1.2.2.ebuild
index 103fd730d6e..b65240008ca 100644
--- a/app-eselect/eselect-wine/eselect-wine-1.2.2.ebuild
+++ b/app-eselect/eselect-wine/eselect-wine-1.2.2.ebuild
@@ -4,8 +4,8 @@
EAPI=6
DESCRIPTION="Manage active wine version"
-HOMEPAGE="http://bitbucket.org/NP-Hardass/eselect-wine"
-SRC_URI="http://bitbucket.org/NP-Hardass/${PN}/raw/v${PV}/wine.eselect -> wine.eselect-${PV}"
+HOMEPAGE="https://bitbucket.org/NP-Hardass/eselect-wine"
+SRC_URI="https://bitbucket.org/NP-Hardass/${PN}/raw/v${PV}/wine.eselect -> wine.eselect-${PV}"
LICENSE="GPL-2+"
SLOT="0"
@@ -28,7 +28,7 @@ src_install() {
pkg_postinst() {
# <eselect-wine-v0.3_rc7 installed symlinks with leading double-slashes.
# In /usr/include this breaks gcc build.
- # http://bugs.gentoo.org/434180
+ # https://bugs.gentoo.org/434180
if [[ $(readlink "${EROOT%/}"/usr/include/wine) == //* ]]; then
ewarn "Leading double slash in ${EPREFIX%/}/usr/include/wine symlink detected."
ewarn "Re-setting wine symlinks..."
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-wine/
@ 2021-02-07 1:43 Sam James
0 siblings, 0 replies; 37+ messages in thread
From: Sam James @ 2021-02-07 1:43 UTC (permalink / raw
To: gentoo-commits
commit: 7229cbd0e6377d2cc122bdafe133cb2be7fc6e93
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 7 01:42:16 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 7 01:43:40 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7229cbd0
app-eselect/eselect-wine: mark ALLARCHES
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-eselect/eselect-wine/metadata.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/app-eselect/eselect-wine/metadata.xml b/app-eselect/eselect-wine/metadata.xml
index 1ded1127484..2c65a131bcc 100644
--- a/app-eselect/eselect-wine/metadata.xml
+++ b/app-eselect/eselect-wine/metadata.xml
@@ -12,4 +12,5 @@
<upstream>
<remote-id type="bitbucket">NP-Hardass/eselect-wine</remote-id>
</upstream>
+ <stabilize-allarches/>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-wine/
@ 2022-07-24 8:26 Joonas Niilola
0 siblings, 0 replies; 37+ messages in thread
From: Joonas Niilola @ 2022-07-24 8:26 UTC (permalink / raw
To: gentoo-commits
commit: 3dc25d062bf25ddfc5f346cf93842617795f2d8e
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 24 08:24:48 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Jul 24 08:26:15 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dc25d06
app-eselect/eselect-wine: drop to maintainer-needed
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
app-eselect/eselect-wine/metadata.xml | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/app-eselect/eselect-wine/metadata.xml b/app-eselect/eselect-wine/metadata.xml
index fc36bd86a2a1..e8ff4f1c8f62 100644
--- a/app-eselect/eselect-wine/metadata.xml
+++ b/app-eselect/eselect-wine/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>gentoo@eroen.eu</email>
- <name>eroen</name>
- </maintainer>
+ <!-- maintainer-needed -->
<upstream>
<remote-id type="bitbucket">np-hardass/eselect-wine</remote-id>
</upstream>
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-wine/
@ 2022-08-11 18:41 Nick Sarnie
0 siblings, 0 replies; 37+ messages in thread
From: Nick Sarnie @ 2022-08-11 18:41 UTC (permalink / raw
To: gentoo-commits
commit: fb0ade47878dd8b70c8f2ae2e1951e6aa3944395
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 11 18:39:51 2022 +0000
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Thu Aug 11 18:39:51 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb0ade47
app-eselect/eselect-wine: update maintainers
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>
app-eselect/eselect-wine/metadata.xml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/app-eselect/eselect-wine/metadata.xml b/app-eselect/eselect-wine/metadata.xml
index e8ff4f1c8f62..280cd5c41bf0 100644
--- a/app-eselect/eselect-wine/metadata.xml
+++ b/app-eselect/eselect-wine/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="project">
+ <email>wine@gentoo.org</email>
+ <name>Wine</name>
+ </maintainer>
<upstream>
<remote-id type="bitbucket">np-hardass/eselect-wine</remote-id>
</upstream>
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-wine/
@ 2022-10-12 13:47 Ionen Wolkens
0 siblings, 0 replies; 37+ messages in thread
From: Ionen Wolkens @ 2022-10-12 13:47 UTC (permalink / raw
To: gentoo-commits
commit: 929c5121791ac35aaba095cc63d1170ba4b2935a
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 12 13:42:42 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Oct 12 13:42:58 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=929c5121
app-eselect/eselect-wine: cleanup ancient blocker
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
app-eselect/eselect-wine/eselect-wine-1.2.2-r1.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/app-eselect/eselect-wine/eselect-wine-1.2.2-r1.ebuild b/app-eselect/eselect-wine/eselect-wine-1.2.2-r1.ebuild
index 5b3e569a49d6..118235805089 100644
--- a/app-eselect/eselect-wine/eselect-wine-1.2.2-r1.ebuild
+++ b/app-eselect/eselect-wine/eselect-wine-1.2.2-r1.ebuild
@@ -14,8 +14,7 @@ KEYWORDS="-* ~amd64 ~x86"
RDEPEND="
app-admin/eselect
- dev-util/desktop-file-utils
- !app-emulation/wine:0"
+ dev-util/desktop-file-utils"
PATCHES=(
"${FILESDIR}"/${P}-proton.patch
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-wine/
@ 2022-10-12 13:47 Ionen Wolkens
0 siblings, 0 replies; 37+ messages in thread
From: Ionen Wolkens @ 2022-10-12 13:47 UTC (permalink / raw
To: gentoo-commits
commit: 3a1068247a14c218a031142850f2f1d9f7fd5972
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 12 04:23:22 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Oct 12 13:42:58 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a106824
app-eselect/eselect-wine: stabilize 1.2.2-r1 for ALLARCHES
Not useful in stable given wine-proton isn't, but no reason to
keep multiple versions of this -- so stabling to cleanup.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
app-eselect/eselect-wine/eselect-wine-1.2.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-eselect/eselect-wine/eselect-wine-1.2.2-r1.ebuild b/app-eselect/eselect-wine/eselect-wine-1.2.2-r1.ebuild
index 118235805089..7a4d765fd1c1 100644
--- a/app-eselect/eselect-wine/eselect-wine-1.2.2-r1.ebuild
+++ b/app-eselect/eselect-wine/eselect-wine-1.2.2-r1.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/NP-Hardass-eselect-wine-f18b76f9c90c"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
RDEPEND="
app-admin/eselect
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-wine/
@ 2022-10-12 13:47 Ionen Wolkens
0 siblings, 0 replies; 37+ messages in thread
From: Ionen Wolkens @ 2022-10-12 13:47 UTC (permalink / raw
To: gentoo-commits
commit: ce664ed6b5f9a6918f20e36b5109ef3c40fa2d29
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 12 04:23:32 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Oct 12 13:42:58 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce664ed6
app-eselect/eselect-wine: drop 1.2.2-r0
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
app-eselect/eselect-wine/Manifest | 1 -
app-eselect/eselect-wine/eselect-wine-1.2.2.ebuild | 47 ----------------------
2 files changed, 48 deletions(-)
diff --git a/app-eselect/eselect-wine/Manifest b/app-eselect/eselect-wine/Manifest
index 0cff0f3f9795..f72d6e365f3d 100644
--- a/app-eselect/eselect-wine/Manifest
+++ b/app-eselect/eselect-wine/Manifest
@@ -1,2 +1 @@
DIST eselect-wine-1.2.2.tar.gz 4712 BLAKE2B 6ce92654cf2a5197c18bc84f8db52a11f198f81f0a8116f1986e74a1795ad475d22ff5a7cb9e9e31ce8ca813059b33cfbc52763110238cb378b15bebeb4b4271 SHA512 39f4d91461f72aeb07292dc7479c5cb7fc080b843bac57dec85c43d8751227e6953d32d52d4a14387d398b73120a32b79370d686c823f230dfd1d8b32ac8113a
-DIST wine.eselect-1.2.2 19370 BLAKE2B 957eb84b7ccb24d12eba876a538f0420ab05506c87086b65c27326c80da9adcfbff032c7ecc7b5763012c6d72cc53f643f0d3ffe02687adb103517dedfad2f0e SHA512 6380e904ca824b1fe45cf651637f1cfe931f0c7519db49cb0794826ebbc8bdebc480fe7eb16601dc37123b44ea2d10aec49aa9fe622cad3e67ffb0f730292614
diff --git a/app-eselect/eselect-wine/eselect-wine-1.2.2.ebuild b/app-eselect/eselect-wine/eselect-wine-1.2.2.ebuild
deleted file mode 100644
index b38ee9c21af7..000000000000
--- a/app-eselect/eselect-wine/eselect-wine-1.2.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Manage active wine version"
-HOMEPAGE="https://bitbucket.org/NP-Hardass/eselect-wine"
-SRC_URI="https://bitbucket.org/NP-Hardass/${PN}/raw/v${PV}/wine.eselect -> wine.eselect-${PV}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-
-RDEPEND="app-admin/eselect
- dev-util/desktop-file-utils
- !!app-emulation/wine:0"
-
-S=${WORKDIR}
-
-src_install() {
- keepdir /etc/eselect/wine
-
- insinto /usr/share/eselect/modules
- newins "${DISTDIR}"/wine.eselect-${PV} wine.eselect
-}
-
-pkg_postinst() {
- # <eselect-wine-v0.3_rc7 installed symlinks with leading double-slashes.
- # In /usr/include this breaks gcc build.
- # https://bugs.gentoo.org/434180
- if [[ $(readlink "${EROOT%/}"/usr/include/wine) == //* ]]; then
- ewarn "Leading double slash in ${EPREFIX}/usr/include/wine symlink detected."
- ewarn "Re-setting wine symlinks..."
- eselect wine update --if-unset
- fi
-}
-
-pkg_prerm() {
- # Avoid conflicts with wine[-multislot] installed later
- if [[ -z ${REPLACED_BY_VERSION} ]]; then
- elog "${PN} is being uninstalled, removing symlinks"
- eselect wine unset --all || die
- else
- einfo "${PN} is being updated/reinstalled, not modifying symlinks"
- fi
-}
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-wine/
@ 2022-11-16 15:02 Ionen Wolkens
0 siblings, 0 replies; 37+ messages in thread
From: Ionen Wolkens @ 2022-11-16 15:02 UTC (permalink / raw
To: gentoo-commits
commit: 1954598a4b9fee10c063f6be17d07b47e7e93e4b
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 16 03:30:33 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Nov 16 15:01:04 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1954598a
app-eselect/eselect-wine: add 2.0.0, unkeyworded for testing
Complete rewrite but for notable bits:
- removes register/deregister, can auto-update without this
- no longer touch files in /usr at runtime wrt bug #632576, in this
case it was particularly invasive doing *many* modifications to
/usr/bin and /usr/share/man
- handle /usr/lib/wine fwiw wrt bug #657748 (installed by the
ebuild), albeit winebuild can find the right path nowadays
- fix prefix wrt bug #717470
- give feedback when switching wrt bug #874612
- tries harder to not unexpectedly switch variant/version, and
no longer need ebuild checks wrt bug #881035
- no longer hardcodes variants and so can support any random ones,
i.e. an overlay can do wine-tkg or wine-myfunnyfork
- --all, --vanilla, etc.. options were removed, but can still
perform similar actions (see `help`)
- `list` can now show selections for all variants at once
- `unset` removed, not seeing a motivation (esp if not polluting /usr)
- half+ the original size, and switches variant noticeably faster
Still experimental and subject to changes, so unkeyworded for now.
See README.rst for more notes, or the tarball's impl.rst for details.
ebuild itself needs some nonsense largely caused by being difficult
to get rid of the old eselect plus portage limitations.
Bug: https://bugs.gentoo.org/632576
Bug: https://bugs.gentoo.org/657748
Bug: https://bugs.gentoo.org/717470
Bug: https://bugs.gentoo.org/874612
Bug: https://bugs.gentoo.org/881035
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
app-eselect/eselect-wine/Manifest | 1 +
app-eselect/eselect-wine/eselect-wine-2.0.0.ebuild | 88 ++++++++++++++++++++++
2 files changed, 89 insertions(+)
diff --git a/app-eselect/eselect-wine/Manifest b/app-eselect/eselect-wine/Manifest
index f72d6e365f3d..36b4463cb6fa 100644
--- a/app-eselect/eselect-wine/Manifest
+++ b/app-eselect/eselect-wine/Manifest
@@ -1 +1,2 @@
DIST eselect-wine-1.2.2.tar.gz 4712 BLAKE2B 6ce92654cf2a5197c18bc84f8db52a11f198f81f0a8116f1986e74a1795ad475d22ff5a7cb9e9e31ce8ca813059b33cfbc52763110238cb378b15bebeb4b4271 SHA512 39f4d91461f72aeb07292dc7479c5cb7fc080b843bac57dec85c43d8751227e6953d32d52d4a14387d398b73120a32b79370d686c823f230dfd1d8b32ac8113a
+DIST eselect-wine-2.0.0.tar.xz 7440 BLAKE2B f889465985566c3cdb9035ec1eca79c506a39f6c3f05f7b20e3a2af70ab3202a6efdc2dc28468ee5b484aa037ebf034bf7ae881a5694459f37702291e8c14850 SHA512 7d5bf0d8abb0634adcbdcd1201eb8c69745e419dc484319e6af9446439b9595b00c6d1bb813390179e5e65843ec3a45079dd38ef7d92c1c97f86fd0aca095607
diff --git a/app-eselect/eselect-wine/eselect-wine-2.0.0.ebuild b/app-eselect/eselect-wine/eselect-wine-2.0.0.ebuild
new file mode 100644
index 000000000000..50b4a4c56409
--- /dev/null
+++ b/app-eselect/eselect-wine/eselect-wine-2.0.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Manage active Wine slots and variants"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Wine"
+SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz"
+#SRC_URI="https://gitweb.gentoo.org/proj/eselect-wine.git/snapshot/${P}.tar.bz2" # not up yet
+
+LICENSE="GPL-2+"
+SLOT="0"
+# rewrite that really needs testing so it doesn't break any bottles
+#KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-admin/eselect"
+
+pkg_pretend() {
+ # not-owned {bin,include}/wine is removed by pkg_preinst's unset, but
+ # portage currently checks collisions and errors out /before/ pkg_preinst
+ has_version '<app-eselect/eselect-wine-2' &&
+ has collision-protect ${FEATURES} &&
+ eerror "!Warning! may need to disable FEATURES=collision-protect to merge ${P}"
+}
+
+src_install() {
+ insinto /usr/share/eselect/modules
+ doins wine.eselect
+
+ keepdir /etc/eselect/wine
+
+ newenvd - 60${PN} <<-EOF
+ PATH="${EPREFIX}/etc/eselect/wine/bin"
+ MANPATH="${EPREFIX}/etc/eselect/wine/share/man"
+ XDG_DATA_DIRS="${EPREFIX}/etc/eselect/wine/share"
+ EOF
+
+ # links for building, e.g. wineasio (bug #657748)
+ dosym -r /etc/eselect/wine/wine /usr/lib/wine
+ dosym -r /etc/eselect/wine/include /usr/include/wine
+
+ # not required, but useful for e.g. binfmt that's not looking in PATH
+ # (not doing this for everything as it gets troublesome to track)
+ dosym -r /etc/eselect/wine/bin/wine /usr/bin/wine
+
+ einstalldocs
+}
+
+pkg_preinst() {
+ if has_version '<app-eselect/eselect-wine-2'; then
+ # keep copy of still-set 'active' to auto-select same slots
+ [[ ! -e ${EROOT}/etc/eselect/wine/active ]] ||
+ cp "${EROOT}"/etc/eselect/wine/{active,eselect-wine-migration} || die
+
+ # managed differently, need cleanup
+ eselect wine unset --all || die
+ rm -f "${EROOT}"/etc/eselect/wine/{active,installed,links/{any,vanilla,staging,proton,wine}} || die
+ rmdir "${EROOT}"/etc/eselect/wine/links 2>/dev/null
+
+ # some rare man dirs were created by old eselect, cleanup if now empty
+ rmdir "${EROOT}"/usr/share/man/{de,fr,pl}.UTF-8{/man1,} 2>/dev/null
+ fi
+
+ # lacking QA_BROKEN_SYMLINK, and rather avoid live /usr changes wrt
+ # bug #632576, nor create "owned" placeholders that will be clobbered
+ [[ -e ${EROOT}/etc/eselect/wine/bin/wine ]] ||
+ eqawarn "QA Note: broken symlinks QA is normal on first merge, targets created after"
+}
+
+pkg_postinst() {
+ eselect wine update --if-unset || die
+
+ rm -f "${EROOT}"/etc/eselect/wine/eselect-wine-migration || die # see preinst
+
+ if [[ ! ${REPLACING_VERSIONS##* } ]] ||
+ ver_test ${REPLACING_VERSIONS##* } -lt 2; then
+ elog
+ if [[ ${REPLACING_VERSIONS} ]]; then
+ elog "Note: if seen bin/wine or include/wine collision messages, it is harmless"
+ elog "${PN} changed a bit, suggest reviewing 'eselect wine help' (and list)."
+ fi
+ elog "Please run '. ${EROOT}/etc/profile' to update PATH in current shells."
+ fi
+}
+
+pkg_prerm() {
+ [[ ${REPLACED_BY_VERSION} ]] || eselect wine update --reset # no die
+}
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-wine/
@ 2022-11-16 17:01 Ionen Wolkens
0 siblings, 0 replies; 37+ messages in thread
From: Ionen Wolkens @ 2022-11-16 17:01 UTC (permalink / raw
To: gentoo-commits
commit: 25080fed8a2e6f4d603bed188342b9569d960b3e
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 16 17:00:11 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Nov 16 17:00:36 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25080fed
app-eselect/eselect-wine: switch upstream metadata to gentoo
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
app-eselect/eselect-wine/metadata.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-eselect/eselect-wine/metadata.xml b/app-eselect/eselect-wine/metadata.xml
index 280cd5c41bf0..5db33c7f62f9 100644
--- a/app-eselect/eselect-wine/metadata.xml
+++ b/app-eselect/eselect-wine/metadata.xml
@@ -5,8 +5,8 @@
<email>wine@gentoo.org</email>
<name>Wine</name>
</maintainer>
+ <stabilize-allarches/>
<upstream>
- <remote-id type="bitbucket">np-hardass/eselect-wine</remote-id>
+ <remote-id type="gentoo">proj/eselect-wine</remote-id>
</upstream>
- <stabilize-allarches/>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-wine/
@ 2022-11-17 7:53 Ionen Wolkens
0 siblings, 0 replies; 37+ messages in thread
From: Ionen Wolkens @ 2022-11-17 7:53 UTC (permalink / raw
To: gentoo-commits
commit: d4b3ba03339d6a70aae2cc7cf933f76a07392db9
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 17 07:50:14 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Nov 17 07:52:58 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4b3ba03
app-eselect/eselect-wine: bigger warning for collision-protect
Easy to miss with the wall of text portage gives.
Note users typically don't have this enabled, it's primarily Gentoo
devs that may use this more aggressive version of protect-owned.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
app-eselect/eselect-wine/eselect-wine-2.0.0.ebuild | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/app-eselect/eselect-wine/eselect-wine-2.0.0.ebuild b/app-eselect/eselect-wine/eselect-wine-2.0.0.ebuild
index 50b4a4c56409..5129be25c9b1 100644
--- a/app-eselect/eselect-wine/eselect-wine-2.0.0.ebuild
+++ b/app-eselect/eselect-wine/eselect-wine-2.0.0.ebuild
@@ -16,11 +16,17 @@ SLOT="0"
RDEPEND="app-admin/eselect"
pkg_pretend() {
- # not-owned {bin,include}/wine is removed by pkg_preinst's unset, but
- # portage currently checks collisions and errors out /before/ pkg_preinst
- has_version '<app-eselect/eselect-wine-2' &&
- has collision-protect ${FEATURES} &&
- eerror "!Warning! may need to disable FEATURES=collision-protect to merge ${P}"
+ # /usr/bin/wine and /usr/include/wine are removed by pkg_preinst's unset,
+ # but portage currently checks collisions and errors out /before/ preinst
+ if has_version '<app-eselect/eselect-wine-2' &&
+ has collision-protect ${FEATURES}
+ then
+ eerror
+ eerror "!Warning! will likely need to either disable FEATURES=collision-protect or"
+ eerror "delete ${EROOT}/usr/bin/wine and ${EROOT}/usr/include/wine to merge ${P}"
+ eerror "(these files should be orphaned, so default FEATURES=protect-owned is fine)"
+ eerror
+ fi
}
src_install() {
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-wine/
@ 2022-11-20 17:12 Ionen Wolkens
0 siblings, 0 replies; 37+ messages in thread
From: Ionen Wolkens @ 2022-11-20 17:12 UTC (permalink / raw
To: gentoo-commits
commit: 8dfdd520da1bce62fe3c2a0c781d26980184587e
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 20 17:08:40 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Nov 20 17:12:22 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dfdd520
app-eselect/eselect-wine: switch tarball
Meant to do this on a bugfix bump before keywording, but
still know of no issues to fix (how troublesome).
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
app-eselect/eselect-wine/Manifest | 2 +-
app-eselect/eselect-wine/eselect-wine-2.0.0.ebuild | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/app-eselect/eselect-wine/Manifest b/app-eselect/eselect-wine/Manifest
index 36b4463cb6fa..311d29dba343 100644
--- a/app-eselect/eselect-wine/Manifest
+++ b/app-eselect/eselect-wine/Manifest
@@ -1,2 +1,2 @@
DIST eselect-wine-1.2.2.tar.gz 4712 BLAKE2B 6ce92654cf2a5197c18bc84f8db52a11f198f81f0a8116f1986e74a1795ad475d22ff5a7cb9e9e31ce8ca813059b33cfbc52763110238cb378b15bebeb4b4271 SHA512 39f4d91461f72aeb07292dc7479c5cb7fc080b843bac57dec85c43d8751227e6953d32d52d4a14387d398b73120a32b79370d686c823f230dfd1d8b32ac8113a
-DIST eselect-wine-2.0.0.tar.xz 7440 BLAKE2B f889465985566c3cdb9035ec1eca79c506a39f6c3f05f7b20e3a2af70ab3202a6efdc2dc28468ee5b484aa037ebf034bf7ae881a5694459f37702291e8c14850 SHA512 7d5bf0d8abb0634adcbdcd1201eb8c69745e419dc484319e6af9446439b9595b00c6d1bb813390179e5e65843ec3a45079dd38ef7d92c1c97f86fd0aca095607
+DIST eselect-wine-2.0.0.tar.bz2 7336 BLAKE2B facbad9bb4a937a310b1f81c5eb9fd1e29ce1a04cf524f7fd1f6322715d15e639fa27e99220cfc5b3659932d5ee57864a4615523e2dc5142da8ad7e9b49290fc SHA512 ec89b4b2fb3bf60e00983f7dd2c2aaa4c797005516f03573000482c5efa1f62e73d0bc149bb9203c5186a7a0a259d7461e95f077deadfd6791ea8d5bc5cb3c00
diff --git a/app-eselect/eselect-wine/eselect-wine-2.0.0.ebuild b/app-eselect/eselect-wine/eselect-wine-2.0.0.ebuild
index 5129be25c9b1..9d8edced51a5 100644
--- a/app-eselect/eselect-wine/eselect-wine-2.0.0.ebuild
+++ b/app-eselect/eselect-wine/eselect-wine-2.0.0.ebuild
@@ -5,8 +5,7 @@ EAPI=8
DESCRIPTION="Manage active Wine slots and variants"
HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Wine"
-SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz"
-#SRC_URI="https://gitweb.gentoo.org/proj/eselect-wine.git/snapshot/${P}.tar.bz2" # not up yet
+SRC_URI="https://gitweb.gentoo.org/proj/eselect-wine.git/snapshot/${P}.tar.bz2"
LICENSE="GPL-2+"
SLOT="0"
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-wine/
@ 2022-11-23 20:39 Ionen Wolkens
0 siblings, 0 replies; 37+ messages in thread
From: Ionen Wolkens @ 2022-11-23 20:39 UTC (permalink / raw
To: gentoo-commits
commit: 5bf131a2a1d9365fcf992468091ce2814782dc3e
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 23 16:10:41 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Nov 23 20:38:21 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bf131a2
app-eselect/eselect-wine: unleash eselect-wine-2
Had expected to need a 2.0.1 before this, but no issues reported
so far. Let's see how it goes.
I do imagine it may cause some confusion given portage doesn't
make emerging it pretty and need to source /etc/profile at
least once, but have no "good" solutions to these beside warnings.
(also expecting a benign tinderbox bug about symlinks which can't
be silenced currently)
Closes: https://bugs.gentoo.org/632576
Closes: https://bugs.gentoo.org/657748
Closes: https://bugs.gentoo.org/717470
Closes: https://bugs.gentoo.org/874612
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
app-eselect/eselect-wine/eselect-wine-2.0.0.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/app-eselect/eselect-wine/eselect-wine-2.0.0.ebuild b/app-eselect/eselect-wine/eselect-wine-2.0.0.ebuild
index 135547b3e333..92c25353de07 100644
--- a/app-eselect/eselect-wine/eselect-wine-2.0.0.ebuild
+++ b/app-eselect/eselect-wine/eselect-wine-2.0.0.ebuild
@@ -9,8 +9,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/eselect-wine.git/snapshot/${P}.tar.bz2"
LICENSE="GPL-2+"
SLOT="0"
-# rewrite that really needs testing so it doesn't break any bottles
-#KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
RDEPEND="app-admin/eselect"
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-wine/
@ 2022-11-23 20:39 Ionen Wolkens
0 siblings, 0 replies; 37+ messages in thread
From: Ionen Wolkens @ 2022-11-23 20:39 UTC (permalink / raw
To: gentoo-commits
commit: 905fdfb2add2da5f6ec150825c2259cfb966dafe
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 23 19:08:36 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Nov 23 20:38:20 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=905fdfb2
app-eselect/eselect-wine: adjust elog text
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
app-eselect/eselect-wine/eselect-wine-2.0.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-eselect/eselect-wine/eselect-wine-2.0.0.ebuild b/app-eselect/eselect-wine/eselect-wine-2.0.0.ebuild
index 9d8edced51a5..135547b3e333 100644
--- a/app-eselect/eselect-wine/eselect-wine-2.0.0.ebuild
+++ b/app-eselect/eselect-wine/eselect-wine-2.0.0.ebuild
@@ -81,8 +81,8 @@ pkg_postinst() {
ver_test ${REPLACING_VERSIONS##* } -lt 2; then
elog
if [[ ${REPLACING_VERSIONS} ]]; then
- elog "Note: if seen bin/wine or include/wine collision messages, it is harmless"
elog "${PN} changed a bit, suggest reviewing 'eselect wine help' (and list)."
+ elog "Note: if seen bin/wine or include/wine merge collisions, they are harmless."
fi
elog "Please run '. ${EROOT}/etc/profile' to update PATH in current shells."
fi
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-wine/
@ 2022-11-29 0:27 Ionen Wolkens
0 siblings, 0 replies; 37+ messages in thread
From: Ionen Wolkens @ 2022-11-29 0:27 UTC (permalink / raw
To: gentoo-commits
commit: 06de42a09142d4bc632638bf63fa21c55c4a2dbb
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 29 00:25:56 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Nov 29 00:26:16 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06de42a0
app-eselect/eselect-wine: add 2.0.1
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
app-eselect/eselect-wine/Manifest | 1 +
app-eselect/eselect-wine/eselect-wine-2.0.1.ebuild | 92 ++++++++++++++++++++++
2 files changed, 93 insertions(+)
diff --git a/app-eselect/eselect-wine/Manifest b/app-eselect/eselect-wine/Manifest
index 311d29dba343..e4b17b5785bf 100644
--- a/app-eselect/eselect-wine/Manifest
+++ b/app-eselect/eselect-wine/Manifest
@@ -1,2 +1,3 @@
DIST eselect-wine-1.2.2.tar.gz 4712 BLAKE2B 6ce92654cf2a5197c18bc84f8db52a11f198f81f0a8116f1986e74a1795ad475d22ff5a7cb9e9e31ce8ca813059b33cfbc52763110238cb378b15bebeb4b4271 SHA512 39f4d91461f72aeb07292dc7479c5cb7fc080b843bac57dec85c43d8751227e6953d32d52d4a14387d398b73120a32b79370d686c823f230dfd1d8b32ac8113a
DIST eselect-wine-2.0.0.tar.bz2 7336 BLAKE2B facbad9bb4a937a310b1f81c5eb9fd1e29ce1a04cf524f7fd1f6322715d15e639fa27e99220cfc5b3659932d5ee57864a4615523e2dc5142da8ad7e9b49290fc SHA512 ec89b4b2fb3bf60e00983f7dd2c2aaa4c797005516f03573000482c5efa1f62e73d0bc149bb9203c5186a7a0a259d7461e95f077deadfd6791ea8d5bc5cb3c00
+DIST eselect-wine-2.0.1.tar.bz2 7391 BLAKE2B 646b4f07988448c70d2bdb0057b4b5e4a36fbd8f6dd1475cb131c26b4d10afb1a274c53aba0f705497f840f45b53fda4307882c588b69bcf5e8754ad153ea4de SHA512 a90da162bfd80a9f2f9a688e765152e1b03f5d27742f67a8485546cb663547f2f6eea302e857454e3cf00632967b8d83e9578f6be36171178f7e78aa3adf3838
diff --git a/app-eselect/eselect-wine/eselect-wine-2.0.1.ebuild b/app-eselect/eselect-wine/eselect-wine-2.0.1.ebuild
new file mode 100644
index 000000000000..92c25353de07
--- /dev/null
+++ b/app-eselect/eselect-wine/eselect-wine-2.0.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Manage active Wine slots and variants"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Wine"
+SRC_URI="https://gitweb.gentoo.org/proj/eselect-wine.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-admin/eselect"
+
+pkg_pretend() {
+ # /usr/bin/wine and /usr/include/wine are removed by pkg_preinst's unset,
+ # but portage currently checks collisions and errors out /before/ preinst
+ if has_version '<app-eselect/eselect-wine-2' &&
+ has collision-protect ${FEATURES}
+ then
+ eerror
+ eerror "!Warning! will likely need to either disable FEATURES=collision-protect or"
+ eerror "delete ${EROOT}/usr/bin/wine and ${EROOT}/usr/include/wine to merge ${P}"
+ eerror "(these files should be orphaned, so default FEATURES=protect-owned is fine)"
+ eerror
+ fi
+}
+
+src_install() {
+ insinto /usr/share/eselect/modules
+ doins wine.eselect
+
+ keepdir /etc/eselect/wine
+
+ newenvd - 60${PN} <<-EOF
+ PATH="${EPREFIX}/etc/eselect/wine/bin"
+ MANPATH="${EPREFIX}/etc/eselect/wine/share/man"
+ XDG_DATA_DIRS="${EPREFIX}/etc/eselect/wine/share"
+ EOF
+
+ # links for building, e.g. wineasio (bug #657748)
+ dosym -r /etc/eselect/wine/wine /usr/lib/wine
+ dosym -r /etc/eselect/wine/include /usr/include/wine
+
+ # not required, but useful for e.g. binfmt that's not looking in PATH
+ # (not doing this for everything as it gets troublesome to track)
+ dosym -r /etc/eselect/wine/bin/wine /usr/bin/wine
+
+ einstalldocs
+}
+
+pkg_preinst() {
+ if has_version '<app-eselect/eselect-wine-2'; then
+ # keep copy of still-set 'active' to auto-select same slots
+ [[ ! -e ${EROOT}/etc/eselect/wine/active ]] ||
+ cp "${EROOT}"/etc/eselect/wine/{active,eselect-wine-migration} || die
+
+ # managed differently, need cleanup
+ eselect wine unset --all || die
+ rm -f "${EROOT}"/etc/eselect/wine/{active,installed,links/{any,vanilla,staging,proton,wine}} || die
+ rmdir "${EROOT}"/etc/eselect/wine/links 2>/dev/null
+
+ # some rare man dirs were created by old eselect, cleanup if now empty
+ rmdir "${EROOT}"/usr/share/man/{de,fr,pl}.UTF-8{/man1,} 2>/dev/null
+ fi
+
+ # lacking QA_BROKEN_SYMLINK, and rather avoid live /usr changes wrt
+ # bug #632576, nor create "owned" placeholders that will be clobbered
+ [[ -e ${EROOT}/etc/eselect/wine/bin/wine ]] ||
+ eqawarn "QA Note: broken symlinks QA is normal on first merge, targets created after"
+}
+
+pkg_postinst() {
+ eselect wine update --if-unset || die
+
+ rm -f "${EROOT}"/etc/eselect/wine/eselect-wine-migration || die # see preinst
+
+ if [[ ! ${REPLACING_VERSIONS##* } ]] ||
+ ver_test ${REPLACING_VERSIONS##* } -lt 2; then
+ elog
+ if [[ ${REPLACING_VERSIONS} ]]; then
+ elog "${PN} changed a bit, suggest reviewing 'eselect wine help' (and list)."
+ elog "Note: if seen bin/wine or include/wine merge collisions, they are harmless."
+ fi
+ elog "Please run '. ${EROOT}/etc/profile' to update PATH in current shells."
+ fi
+}
+
+pkg_prerm() {
+ [[ ${REPLACED_BY_VERSION} ]] || eselect wine update --reset # no die
+}
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-wine/
@ 2022-12-02 3:18 Ionen Wolkens
0 siblings, 0 replies; 37+ messages in thread
From: Ionen Wolkens @ 2022-12-02 3:18 UTC (permalink / raw
To: gentoo-commits
commit: d182e5936101302035dc47e9c54b0f8f0525c7bc
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 1 16:29:31 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Dec 2 03:13:59 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d182e593
app-eselect/eselect-wine: drop 2.0.0
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
app-eselect/eselect-wine/Manifest | 1 -
app-eselect/eselect-wine/eselect-wine-2.0.0.ebuild | 92 ----------------------
2 files changed, 93 deletions(-)
diff --git a/app-eselect/eselect-wine/Manifest b/app-eselect/eselect-wine/Manifest
index e4b17b5785bf..6991edec0e0f 100644
--- a/app-eselect/eselect-wine/Manifest
+++ b/app-eselect/eselect-wine/Manifest
@@ -1,3 +1,2 @@
DIST eselect-wine-1.2.2.tar.gz 4712 BLAKE2B 6ce92654cf2a5197c18bc84f8db52a11f198f81f0a8116f1986e74a1795ad475d22ff5a7cb9e9e31ce8ca813059b33cfbc52763110238cb378b15bebeb4b4271 SHA512 39f4d91461f72aeb07292dc7479c5cb7fc080b843bac57dec85c43d8751227e6953d32d52d4a14387d398b73120a32b79370d686c823f230dfd1d8b32ac8113a
-DIST eselect-wine-2.0.0.tar.bz2 7336 BLAKE2B facbad9bb4a937a310b1f81c5eb9fd1e29ce1a04cf524f7fd1f6322715d15e639fa27e99220cfc5b3659932d5ee57864a4615523e2dc5142da8ad7e9b49290fc SHA512 ec89b4b2fb3bf60e00983f7dd2c2aaa4c797005516f03573000482c5efa1f62e73d0bc149bb9203c5186a7a0a259d7461e95f077deadfd6791ea8d5bc5cb3c00
DIST eselect-wine-2.0.1.tar.bz2 7391 BLAKE2B 646b4f07988448c70d2bdb0057b4b5e4a36fbd8f6dd1475cb131c26b4d10afb1a274c53aba0f705497f840f45b53fda4307882c588b69bcf5e8754ad153ea4de SHA512 a90da162bfd80a9f2f9a688e765152e1b03f5d27742f67a8485546cb663547f2f6eea302e857454e3cf00632967b8d83e9578f6be36171178f7e78aa3adf3838
diff --git a/app-eselect/eselect-wine/eselect-wine-2.0.0.ebuild b/app-eselect/eselect-wine/eselect-wine-2.0.0.ebuild
deleted file mode 100644
index 92c25353de07..000000000000
--- a/app-eselect/eselect-wine/eselect-wine-2.0.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Manage active Wine slots and variants"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Wine"
-SRC_URI="https://gitweb.gentoo.org/proj/eselect-wine.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="app-admin/eselect"
-
-pkg_pretend() {
- # /usr/bin/wine and /usr/include/wine are removed by pkg_preinst's unset,
- # but portage currently checks collisions and errors out /before/ preinst
- if has_version '<app-eselect/eselect-wine-2' &&
- has collision-protect ${FEATURES}
- then
- eerror
- eerror "!Warning! will likely need to either disable FEATURES=collision-protect or"
- eerror "delete ${EROOT}/usr/bin/wine and ${EROOT}/usr/include/wine to merge ${P}"
- eerror "(these files should be orphaned, so default FEATURES=protect-owned is fine)"
- eerror
- fi
-}
-
-src_install() {
- insinto /usr/share/eselect/modules
- doins wine.eselect
-
- keepdir /etc/eselect/wine
-
- newenvd - 60${PN} <<-EOF
- PATH="${EPREFIX}/etc/eselect/wine/bin"
- MANPATH="${EPREFIX}/etc/eselect/wine/share/man"
- XDG_DATA_DIRS="${EPREFIX}/etc/eselect/wine/share"
- EOF
-
- # links for building, e.g. wineasio (bug #657748)
- dosym -r /etc/eselect/wine/wine /usr/lib/wine
- dosym -r /etc/eselect/wine/include /usr/include/wine
-
- # not required, but useful for e.g. binfmt that's not looking in PATH
- # (not doing this for everything as it gets troublesome to track)
- dosym -r /etc/eselect/wine/bin/wine /usr/bin/wine
-
- einstalldocs
-}
-
-pkg_preinst() {
- if has_version '<app-eselect/eselect-wine-2'; then
- # keep copy of still-set 'active' to auto-select same slots
- [[ ! -e ${EROOT}/etc/eselect/wine/active ]] ||
- cp "${EROOT}"/etc/eselect/wine/{active,eselect-wine-migration} || die
-
- # managed differently, need cleanup
- eselect wine unset --all || die
- rm -f "${EROOT}"/etc/eselect/wine/{active,installed,links/{any,vanilla,staging,proton,wine}} || die
- rmdir "${EROOT}"/etc/eselect/wine/links 2>/dev/null
-
- # some rare man dirs were created by old eselect, cleanup if now empty
- rmdir "${EROOT}"/usr/share/man/{de,fr,pl}.UTF-8{/man1,} 2>/dev/null
- fi
-
- # lacking QA_BROKEN_SYMLINK, and rather avoid live /usr changes wrt
- # bug #632576, nor create "owned" placeholders that will be clobbered
- [[ -e ${EROOT}/etc/eselect/wine/bin/wine ]] ||
- eqawarn "QA Note: broken symlinks QA is normal on first merge, targets created after"
-}
-
-pkg_postinst() {
- eselect wine update --if-unset || die
-
- rm -f "${EROOT}"/etc/eselect/wine/eselect-wine-migration || die # see preinst
-
- if [[ ! ${REPLACING_VERSIONS##* } ]] ||
- ver_test ${REPLACING_VERSIONS##* } -lt 2; then
- elog
- if [[ ${REPLACING_VERSIONS} ]]; then
- elog "${PN} changed a bit, suggest reviewing 'eselect wine help' (and list)."
- elog "Note: if seen bin/wine or include/wine merge collisions, they are harmless."
- fi
- elog "Please run '. ${EROOT}/etc/profile' to update PATH in current shells."
- fi
-}
-
-pkg_prerm() {
- [[ ${REPLACED_BY_VERSION} ]] || eselect wine update --reset # no die
-}
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-wine/
@ 2022-12-02 3:18 Ionen Wolkens
0 siblings, 0 replies; 37+ messages in thread
From: Ionen Wolkens @ 2022-12-02 3:18 UTC (permalink / raw
To: gentoo-commits
commit: 61dd39c8b5bdd4171891b37cfaf3c33ae3d3f15f
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 1 16:29:46 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Dec 2 03:13:59 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61dd39c8
app-eselect/eselect-wine: stabilize 2.0.1 for ALLARCHES
Still early, but needed to setabilize wine-vanilla-7.0.1
and wine-proton-7.0.5 without falling back to old eselect.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
app-eselect/eselect-wine/eselect-wine-2.0.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-eselect/eselect-wine/eselect-wine-2.0.1.ebuild b/app-eselect/eselect-wine/eselect-wine-2.0.1.ebuild
index 92c25353de07..8a665f8d91e8 100644
--- a/app-eselect/eselect-wine/eselect-wine-2.0.1.ebuild
+++ b/app-eselect/eselect-wine/eselect-wine-2.0.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/eselect-wine.git/snapshot/${P}.tar.bz2"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="app-admin/eselect"
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-wine/
@ 2022-12-03 1:03 Ionen Wolkens
0 siblings, 0 replies; 37+ messages in thread
From: Ionen Wolkens @ 2022-12-03 1:03 UTC (permalink / raw
To: gentoo-commits
commit: 77a11023eaa26a4403092173fd81ec6d828d5377
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 3 00:57:16 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Dec 3 01:03:10 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77a11023
app-eselect/eselect-wine: use later (95) priority for env.d
Shouldn't(?) have a real impact but it seems wasteful for
its XDG_DATA_DIRS be searched earlier than 90xdg-data-base
(aka >90 will cause it to add wine's after /usr/share).
Also wouldn't want wine's semi-random binaries to have priority,
albeit PATH already typically came last with 60.
(reminder need to `. /etc/profile` to update in current shells)
Bug: https://bugs.gentoo.org/884077
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../{eselect-wine-2.0.1.ebuild => eselect-wine-2.0.1-r1.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-eselect/eselect-wine/eselect-wine-2.0.1.ebuild b/app-eselect/eselect-wine/eselect-wine-2.0.1-r1.ebuild
similarity index 99%
rename from app-eselect/eselect-wine/eselect-wine-2.0.1.ebuild
rename to app-eselect/eselect-wine/eselect-wine-2.0.1-r1.ebuild
index 8a665f8d91e8..9970fb76df07 100644
--- a/app-eselect/eselect-wine/eselect-wine-2.0.1.ebuild
+++ b/app-eselect/eselect-wine/eselect-wine-2.0.1-r1.ebuild
@@ -33,7 +33,7 @@ src_install() {
keepdir /etc/eselect/wine
- newenvd - 60${PN} <<-EOF
+ newenvd - 95${PN} <<-EOF
PATH="${EPREFIX}/etc/eselect/wine/bin"
MANPATH="${EPREFIX}/etc/eselect/wine/share/man"
XDG_DATA_DIRS="${EPREFIX}/etc/eselect/wine/share"
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-wine/
@ 2022-12-03 13:52 Ionen Wolkens
0 siblings, 0 replies; 37+ messages in thread
From: Ionen Wolkens @ 2022-12-03 13:52 UTC (permalink / raw
To: gentoo-commits
commit: 79cce30abd02567f8465f879a91b273544126c84
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 3 13:43:06 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Dec 3 13:52:10 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79cce30a
app-eselect/eselect-wine: optionally rdepend on xdg-utils
Being optional makes some sense for headless system, albeit most
desktop ones will typically want xdg-open from this around.
Closes: https://bugs.gentoo.org/884077
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
...lect-wine-2.0.1-r1.ebuild => eselect-wine-2.0.1-r2.ebuild} | 11 ++++++++---
app-eselect/eselect-wine/metadata.xml | 3 +++
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/app-eselect/eselect-wine/eselect-wine-2.0.1-r1.ebuild b/app-eselect/eselect-wine/eselect-wine-2.0.1-r2.ebuild
similarity index 92%
rename from app-eselect/eselect-wine/eselect-wine-2.0.1-r1.ebuild
rename to app-eselect/eselect-wine/eselect-wine-2.0.1-r2.ebuild
index 9970fb76df07..6c0f23f8bccb 100644
--- a/app-eselect/eselect-wine/eselect-wine-2.0.1-r1.ebuild
+++ b/app-eselect/eselect-wine/eselect-wine-2.0.1-r2.ebuild
@@ -10,8 +10,12 @@ SRC_URI="https://gitweb.gentoo.org/proj/eselect-wine.git/snapshot/${P}.tar.bz2"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="amd64 x86"
+IUSE="+xdg"
-RDEPEND="app-admin/eselect"
+# xdg-utils needed for bug #884077
+RDEPEND="
+ app-admin/eselect
+ xdg? ( x11-misc/xdg-utils )"
pkg_pretend() {
# /usr/bin/wine and /usr/include/wine are removed by pkg_preinst's unset,
@@ -35,8 +39,9 @@ src_install() {
newenvd - 95${PN} <<-EOF
PATH="${EPREFIX}/etc/eselect/wine/bin"
- MANPATH="${EPREFIX}/etc/eselect/wine/share/man"
- XDG_DATA_DIRS="${EPREFIX}/etc/eselect/wine/share"
+ MANPATH="${EPREFIX}/etc/eselect/wine/share/man"\
+ $(usev xdg "
+ XDG_DATA_DIRS=\"${EPREFIX}/etc/eselect/wine/share\"")
EOF
# links for building, e.g. wineasio (bug #657748)
diff --git a/app-eselect/eselect-wine/metadata.xml b/app-eselect/eselect-wine/metadata.xml
index 5db33c7f62f9..c4441da93cdc 100644
--- a/app-eselect/eselect-wine/metadata.xml
+++ b/app-eselect/eselect-wine/metadata.xml
@@ -6,6 +6,9 @@
<name>Wine</name>
</maintainer>
<stabilize-allarches/>
+ <use>
+ <flag name="xdg">Make use of XDG_DATA_DIRS to provide desktop entries</flag>
+ </use>
<upstream>
<remote-id type="gentoo">proj/eselect-wine</remote-id>
</upstream>
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-wine/
@ 2022-12-03 14:08 Ionen Wolkens
0 siblings, 0 replies; 37+ messages in thread
From: Ionen Wolkens @ 2022-12-03 14:08 UTC (permalink / raw
To: gentoo-commits
commit: d1cc46762fc0f67957903de65bdd036e55c6ab1f
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 3 14:06:35 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Dec 3 14:06:37 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1cc4676
app-eselect/eselect-wine: adjust env.d formatting
Look a bit better and avoids having some trailing tabs
with USE=-xdg (albeit they are of no consequence).
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
app-eselect/eselect-wine/eselect-wine-2.0.1-r2.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/app-eselect/eselect-wine/eselect-wine-2.0.1-r2.ebuild b/app-eselect/eselect-wine/eselect-wine-2.0.1-r2.ebuild
index 6c0f23f8bccb..87e5f10d2eaf 100644
--- a/app-eselect/eselect-wine/eselect-wine-2.0.1-r2.ebuild
+++ b/app-eselect/eselect-wine/eselect-wine-2.0.1-r2.ebuild
@@ -39,8 +39,7 @@ src_install() {
newenvd - 95${PN} <<-EOF
PATH="${EPREFIX}/etc/eselect/wine/bin"
- MANPATH="${EPREFIX}/etc/eselect/wine/share/man"\
- $(usev xdg "
+ MANPATH="${EPREFIX}/etc/eselect/wine/share/man"$(usev xdg "
XDG_DATA_DIRS=\"${EPREFIX}/etc/eselect/wine/share\"")
EOF
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-wine/
@ 2022-12-03 22:40 Ionen Wolkens
0 siblings, 0 replies; 37+ messages in thread
From: Ionen Wolkens @ 2022-12-03 22:40 UTC (permalink / raw
To: gentoo-commits
commit: 9d8c00974a9e9fca5e698f65bc0adc1a28367b62
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 3 22:22:49 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Dec 3 22:40:03 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d8c0097
app-eselect/eselect-wine: use a bit clearer USE=xdg description
Could argue not many will even want this to work, albeit keeping
IUSE=+xdg default to maintain what normally works out of the box
with Wine.
Bug: https://bugs.gentoo.org/884077
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
app-eselect/eselect-wine/metadata.xml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/app-eselect/eselect-wine/metadata.xml b/app-eselect/eselect-wine/metadata.xml
index c4441da93cdc..c8c7d6ad97d2 100644
--- a/app-eselect/eselect-wine/metadata.xml
+++ b/app-eselect/eselect-wine/metadata.xml
@@ -7,7 +7,10 @@
</maintainer>
<stabilize-allarches/>
<use>
- <flag name="xdg">Make use of XDG_DATA_DIRS to provide desktop entries</flag>
+ <flag name="xdg">
+ Set XDG_DATA_DIRS to use the selected wine.desktop,
+ allows e.g. 'xdg-open my.exe' for file managers
+ </flag>
</use>
<upstream>
<remote-id type="gentoo">proj/eselect-wine</remote-id>
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-wine/
@ 2022-12-05 20:46 Ionen Wolkens
0 siblings, 0 replies; 37+ messages in thread
From: Ionen Wolkens @ 2022-12-05 20:46 UTC (permalink / raw
To: gentoo-commits
commit: c8ec67dd4d4e59068b4c0b79604d33e72acf8798
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 5 20:43:48 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Dec 5 20:45:54 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8ec67dd
app-eselect/eselect-wine: add 2.0.2, drop 2.0.1-r2
Trivial release that only change an informational message,
so straight to stable.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
app-eselect/eselect-wine/Manifest | 2 +-
.../{eselect-wine-2.0.1-r2.ebuild => eselect-wine-2.0.2.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-eselect/eselect-wine/Manifest b/app-eselect/eselect-wine/Manifest
index 6991edec0e0f..7f920ee9e760 100644
--- a/app-eselect/eselect-wine/Manifest
+++ b/app-eselect/eselect-wine/Manifest
@@ -1,2 +1,2 @@
DIST eselect-wine-1.2.2.tar.gz 4712 BLAKE2B 6ce92654cf2a5197c18bc84f8db52a11f198f81f0a8116f1986e74a1795ad475d22ff5a7cb9e9e31ce8ca813059b33cfbc52763110238cb378b15bebeb4b4271 SHA512 39f4d91461f72aeb07292dc7479c5cb7fc080b843bac57dec85c43d8751227e6953d32d52d4a14387d398b73120a32b79370d686c823f230dfd1d8b32ac8113a
-DIST eselect-wine-2.0.1.tar.bz2 7391 BLAKE2B 646b4f07988448c70d2bdb0057b4b5e4a36fbd8f6dd1475cb131c26b4d10afb1a274c53aba0f705497f840f45b53fda4307882c588b69bcf5e8754ad153ea4de SHA512 a90da162bfd80a9f2f9a688e765152e1b03f5d27742f67a8485546cb663547f2f6eea302e857454e3cf00632967b8d83e9578f6be36171178f7e78aa3adf3838
+DIST eselect-wine-2.0.2.tar.bz2 7449 BLAKE2B ce933920a7b6d1df0c0e5f5ae27b1ad1c7467489bd2d35c977b1d9894012b6bcb52d2830c3ebcef9228de40c6f31650e78d40051c82badf959c51339fe6bfa10 SHA512 c49c08e25d7e15c04205608118ea38e970db31f394534efd44070eec5c2148463c09d2b2787a9bb9c1b5f29010e99b4769d3f219b3ae826ceae56757aab596d1
diff --git a/app-eselect/eselect-wine/eselect-wine-2.0.1-r2.ebuild b/app-eselect/eselect-wine/eselect-wine-2.0.2.ebuild
similarity index 100%
rename from app-eselect/eselect-wine/eselect-wine-2.0.1-r2.ebuild
rename to app-eselect/eselect-wine/eselect-wine-2.0.2.ebuild
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-wine/
@ 2022-12-29 20:29 Ionen Wolkens
0 siblings, 0 replies; 37+ messages in thread
From: Ionen Wolkens @ 2022-12-29 20:29 UTC (permalink / raw
To: gentoo-commits
commit: ac00dfecda10fa71c1181703173c0a8e9eda3a86
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 19 07:49:06 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Dec 29 20:28:53 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac00dfec
app-eselect/eselect-wine: cleanup collision messages
The new app-alternatives/* cause similar issues and eselect-wine isn't
unusual enough to need this special handling, portage-3.0.41 is also
now stable and gives nicer messages.
Majority of people will have migrated by now too.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
app-eselect/eselect-wine/eselect-wine-2.0.2.ebuild | 18 +-----------------
1 file changed, 1 insertion(+), 17 deletions(-)
diff --git a/app-eselect/eselect-wine/eselect-wine-2.0.2.ebuild b/app-eselect/eselect-wine/eselect-wine-2.0.2.ebuild
index 87e5f10d2eaf..953f7e1c910d 100644
--- a/app-eselect/eselect-wine/eselect-wine-2.0.2.ebuild
+++ b/app-eselect/eselect-wine/eselect-wine-2.0.2.ebuild
@@ -17,20 +17,6 @@ RDEPEND="
app-admin/eselect
xdg? ( x11-misc/xdg-utils )"
-pkg_pretend() {
- # /usr/bin/wine and /usr/include/wine are removed by pkg_preinst's unset,
- # but portage currently checks collisions and errors out /before/ preinst
- if has_version '<app-eselect/eselect-wine-2' &&
- has collision-protect ${FEATURES}
- then
- eerror
- eerror "!Warning! will likely need to either disable FEATURES=collision-protect or"
- eerror "delete ${EROOT}/usr/bin/wine and ${EROOT}/usr/include/wine to merge ${P}"
- eerror "(these files should be orphaned, so default FEATURES=protect-owned is fine)"
- eerror
- fi
-}
-
src_install() {
insinto /usr/share/eselect/modules
doins wine.eselect
@@ -83,10 +69,8 @@ pkg_postinst() {
if [[ ! ${REPLACING_VERSIONS##* } ]] ||
ver_test ${REPLACING_VERSIONS##* } -lt 2; then
elog
- if [[ ${REPLACING_VERSIONS} ]]; then
+ [[ ${REPLACING_VERSIONS} ]] &&
elog "${PN} changed a bit, suggest reviewing 'eselect wine help' (and list)."
- elog "Note: if seen bin/wine or include/wine merge collisions, they are harmless."
- fi
elog "Please run '. ${EROOT}/etc/profile' to update PATH in current shells."
fi
}
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-wine/
@ 2023-03-03 5:26 Ionen Wolkens
0 siblings, 0 replies; 37+ messages in thread
From: Ionen Wolkens @ 2023-03-03 5:26 UTC (permalink / raw
To: gentoo-commits
commit: 86d3e174d2581952f280e073b474b2e2451ee72e
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 2 19:10:52 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Mar 3 05:21:02 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86d3e174
app-eselect/eselect-wine: don't fail if migration file exists
May have been left there if other preinst commands failed
(like eselect wine unset --all which can be fickle).
Alternatively could cp -f, but best avoid clobbering more
files we don't own as much as possible. Guess a better
approach would've been to put it in ${T} and tell eselect
where to find it in postinst but at this point not going
to worry about due-to-be-removed cruft.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
app-eselect/eselect-wine/eselect-wine-2.0.2.ebuild | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/app-eselect/eselect-wine/eselect-wine-2.0.2.ebuild b/app-eselect/eselect-wine/eselect-wine-2.0.2.ebuild
index 953f7e1c910d..dc64574f7852 100644
--- a/app-eselect/eselect-wine/eselect-wine-2.0.2.ebuild
+++ b/app-eselect/eselect-wine/eselect-wine-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -43,8 +43,10 @@ src_install() {
pkg_preinst() {
if has_version '<app-eselect/eselect-wine-2'; then
# keep copy of still-set 'active' to auto-select same slots
- [[ ! -e ${EROOT}/etc/eselect/wine/active ]] ||
+ if [[ -e ${EROOT}/etc/eselect/wine/active &&
+ ! -e ${EROOT}/etc/eselect/wine/eselect-wine-migration ]]; then
cp "${EROOT}"/etc/eselect/wine/{active,eselect-wine-migration} || die
+ fi
# managed differently, need cleanup
eselect wine unset --all || die
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-wine/
@ 2023-07-30 16:18 Ionen Wolkens
0 siblings, 0 replies; 37+ messages in thread
From: Ionen Wolkens @ 2023-07-30 16:18 UTC (permalink / raw
To: gentoo-commits
commit: 128b13f15d285daec216c6092bf0eab189743d6d
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 29 21:39:20 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Jul 30 16:17:04 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=128b13f1
app-eselect/eselect-wine: revbump without /usr/bin/wine symlink
To ~arch for now in case this end up having unexpected
consequences, albeit will not wait all that long.
Also adjust messages (both first merge and update from -r0)
to advertise the full path if users need it.
Closes: https://bugs.gentoo.org/911245
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../eselect-wine/eselect-wine-2.0.2-r1.ebuild | 91 ++++++++++++++++++++++
1 file changed, 91 insertions(+)
diff --git a/app-eselect/eselect-wine/eselect-wine-2.0.2-r1.ebuild b/app-eselect/eselect-wine/eselect-wine-2.0.2-r1.ebuild
new file mode 100644
index 000000000000..1ef98a08e3ec
--- /dev/null
+++ b/app-eselect/eselect-wine/eselect-wine-2.0.2-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Manage active Wine slots and variants"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Wine"
+SRC_URI="https://gitweb.gentoo.org/proj/eselect-wine.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+xdg"
+
+# xdg-utils needed for bug #884077
+RDEPEND="
+ app-admin/eselect
+ xdg? ( x11-misc/xdg-utils )
+"
+
+src_install() {
+ insinto /usr/share/eselect/modules
+ doins wine.eselect
+
+ keepdir /etc/eselect/wine
+
+ newenvd - 95${PN} <<-EOF
+ PATH="${EPREFIX}/etc/eselect/wine/bin"
+ MANPATH="${EPREFIX}/etc/eselect/wine/share/man"$(usev xdg "
+ XDG_DATA_DIRS=\"${EPREFIX}/etc/eselect/wine/share\"")
+ EOF
+
+ # links for building, e.g. wineasio (bug #657748), albeit this
+ # should be rarely used directly nowadays and could be removable
+ # (removing would also solve the one-time QA issue described below)
+ dosym -r /etc/eselect/wine/wine /usr/lib/wine
+ dosym -r /etc/eselect/wine/include /usr/include/wine
+
+ einstalldocs
+}
+
+pkg_preinst() {
+ if has_version '<app-eselect/eselect-wine-2'; then
+ # keep copy of still-set 'active' to auto-select same slots
+ if [[ -e ${EROOT}/etc/eselect/wine/active &&
+ ! -e ${EROOT}/etc/eselect/wine/eselect-wine-migration ]]; then
+ cp "${EROOT}"/etc/eselect/wine/{active,eselect-wine-migration} || die
+ fi
+
+ # managed differently, need cleanup
+ eselect wine unset --all || die
+ rm -f "${EROOT}"/etc/eselect/wine/{active,installed,links/{any,vanilla,staging,proton,wine}} || die
+ rmdir "${EROOT}"/etc/eselect/wine/links 2>/dev/null
+
+ # some rare man dirs were created by old eselect, cleanup if now empty
+ rmdir "${EROOT}"/usr/share/man/{de,fr,pl}.UTF-8{/man1,} 2>/dev/null
+ fi
+
+ # lacking QA_BROKEN_SYMLINK, and rather avoid live /usr changes wrt
+ # bug #632576, nor create "owned" placeholders that will be clobbered
+ [[ -e ${EROOT}/etc/eselect/wine/bin/wine ]] ||
+ eqawarn "QA Note: broken symlinks QA is normal on first merge, targets created after"
+}
+
+pkg_postinst() {
+ eselect wine update --if-unset || die
+
+ rm -f "${EROOT}"/etc/eselect/wine/eselect-wine-migration || die # see preinst
+
+ if [[ ! ${REPLACING_VERSIONS##* } ]] ||
+ ver_test ${REPLACING_VERSIONS##* } -lt 2; then
+ elog
+ [[ ${REPLACING_VERSIONS} ]] &&
+ elog "${PN} changed a bit, suggest reviewing 'eselect wine help' (and list)."
+ elog "Please run '. ${EROOT}/etc/profile' to update PATH in current shells."
+ elog "Wine can otherwise be executed directly at '${EROOT}/etc/eselect/wine/bin/wine'."
+ fi
+
+ if [[ ${REPLACING_VERSIONS##* } ]] &&
+ ver_test ${REPLACING_VERSIONS##* } -lt 2.0.2-r1; then
+ elog
+ elog "Be warned that >=${PN}-2.0.2-r1 no longer installs the"
+ elog "'${EROOT}/usr/bin/wine' symbolic link. wine(1) can still be found"
+ elog "in PATH but, if using the direct location for scripts and/or binfmt,"
+ elog "then please update these to use: '${EROOT}/etc/eselect/wine/bin/wine'"
+ fi
+}
+
+pkg_prerm() {
+ [[ ${REPLACED_BY_VERSION} ]] || eselect wine update --reset # no die
+}
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-wine/
@ 2023-07-30 19:29 Ionen Wolkens
0 siblings, 0 replies; 37+ messages in thread
From: Ionen Wolkens @ 2023-07-30 19:29 UTC (permalink / raw
To: gentoo-commits
commit: 04c08db77622e753d16eb40614fec83161115978
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 30 19:20:12 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Jul 30 19:28:49 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04c08db7
app-eselect/eselect-wine: add further note about PATH
Also swap EROOT for EPREFIX given this is settings for use
after using ROOT, and not to be found immediately. Except
maybe the /etc/profile one albeit it'd be a bit weird still.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
app-eselect/eselect-wine/eselect-wine-2.0.2-r1.ebuild | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/app-eselect/eselect-wine/eselect-wine-2.0.2-r1.ebuild b/app-eselect/eselect-wine/eselect-wine-2.0.2-r1.ebuild
index 1ef98a08e3ec..8abf0116e6e0 100644
--- a/app-eselect/eselect-wine/eselect-wine-2.0.2-r1.ebuild
+++ b/app-eselect/eselect-wine/eselect-wine-2.0.2-r1.ebuild
@@ -72,17 +72,21 @@ pkg_postinst() {
elog
[[ ${REPLACING_VERSIONS} ]] &&
elog "${PN} changed a bit, suggest reviewing 'eselect wine help' (and list)."
- elog "Please run '. ${EROOT}/etc/profile' to update PATH in current shells."
- elog "Wine can otherwise be executed directly at '${EROOT}/etc/eselect/wine/bin/wine'."
+ elog "Please run '. ${EROOT}/etc/profile' to update PATH in current shells"
+ elog "(PATH should have ':${EPREFIX}/etc/eselect/wine/bin'). Wine can otherwise"
+ elog "be executed directly from '${EPREFIX}/etc/eselect/wine/bin/wine'."
fi
if [[ ${REPLACING_VERSIONS##* } ]] &&
ver_test ${REPLACING_VERSIONS##* } -lt 2.0.2-r1; then
elog
elog "Be warned that >=${PN}-2.0.2-r1 no longer installs the"
- elog "'${EROOT}/usr/bin/wine' symbolic link. wine(1) can still be found"
+ elog "'${EPREFIX}/usr/bin/wine' symbolic link. wine(1) can still be found"
elog "in PATH but, if using the direct location for scripts and/or binfmt,"
- elog "then please update these to use: '${EROOT}/etc/eselect/wine/bin/wine'"
+ elog "then please update these to use: '${EPREFIX}/etc/eselect/wine/bin/wine'"
+ elog
+ elog "If wine is not found in PATH, please ensure that not overriding the"
+ elog "default PATH value that should include ':${EPREFIX}/etc/eselect/wine/bin'"
fi
}
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-wine/
@ 2023-08-06 4:32 Ionen Wolkens
0 siblings, 0 replies; 37+ messages in thread
From: Ionen Wolkens @ 2023-08-06 4:32 UTC (permalink / raw
To: gentoo-commits
commit: 261505295d69890dbdd6badba328b2b930e39665
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 6 03:15:32 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Aug 6 04:27:45 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26150529
app-eselect/eselect-wine: stabilize 2.0.2-r1 for ALLARCHES
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
app-eselect/eselect-wine/eselect-wine-2.0.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-eselect/eselect-wine/eselect-wine-2.0.2-r1.ebuild b/app-eselect/eselect-wine/eselect-wine-2.0.2-r1.ebuild
index 8abf0116e6e0..e2fbb4428e06 100644
--- a/app-eselect/eselect-wine/eselect-wine-2.0.2-r1.ebuild
+++ b/app-eselect/eselect-wine/eselect-wine-2.0.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/eselect-wine.git/snapshot/${P}.tar.bz2"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+xdg"
# xdg-utils needed for bug #884077
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-wine/
@ 2023-08-23 15:41 Ionen Wolkens
0 siblings, 0 replies; 37+ messages in thread
From: Ionen Wolkens @ 2023-08-23 15:41 UTC (permalink / raw
To: gentoo-commits
commit: e1d45f7d9489c3a7d5ca1cccebe2d2d2c91d23dd
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 23 15:40:43 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Aug 23 15:40:43 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1d45f7d
app-eselect/eselect-wine: fix /usr/include/wine symlink
Had double wine/wine, and turns out wineasio still makes use of this,
albeit usefulness of it is still questionable.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../{eselect-wine-2.0.2-r1.ebuild => eselect-wine-2.0.2-r2.ebuild} | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/app-eselect/eselect-wine/eselect-wine-2.0.2-r1.ebuild b/app-eselect/eselect-wine/eselect-wine-2.0.2-r2.ebuild
similarity index 92%
rename from app-eselect/eselect-wine/eselect-wine-2.0.2-r1.ebuild
rename to app-eselect/eselect-wine/eselect-wine-2.0.2-r2.ebuild
index e2fbb4428e06..da39532a82a4 100644
--- a/app-eselect/eselect-wine/eselect-wine-2.0.2-r1.ebuild
+++ b/app-eselect/eselect-wine/eselect-wine-2.0.2-r2.ebuild
@@ -30,11 +30,10 @@ src_install() {
XDG_DATA_DIRS=\"${EPREFIX}/etc/eselect/wine/share\"")
EOF
- # links for building, e.g. wineasio (bug #657748), albeit this
- # should be rarely used directly nowadays and could be removable
- # (removing would also solve the one-time QA issue described below)
+ # links to help building, e.g. wineasio (bug #657748),
+ # albeit in general these are not particularly important
dosym -r /etc/eselect/wine/wine /usr/lib/wine
- dosym -r /etc/eselect/wine/include /usr/include/wine
+ dosym -r /etc/eselect/wine/include/wine /usr/include/wine
einstalldocs
}
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-wine/
@ 2023-08-23 15:41 Ionen Wolkens
0 siblings, 0 replies; 37+ messages in thread
From: Ionen Wolkens @ 2023-08-23 15:41 UTC (permalink / raw
To: gentoo-commits
commit: c664310e64126196cc86056790636f1206accf1e
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 23 15:40:30 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Aug 23 15:40:30 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c664310e
app-eselect/eselect-wine: drop 2.0.2
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
app-eselect/eselect-wine/eselect-wine-2.0.2.ebuild | 82 ----------------------
1 file changed, 82 deletions(-)
diff --git a/app-eselect/eselect-wine/eselect-wine-2.0.2.ebuild b/app-eselect/eselect-wine/eselect-wine-2.0.2.ebuild
deleted file mode 100644
index dc64574f7852..000000000000
--- a/app-eselect/eselect-wine/eselect-wine-2.0.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Manage active Wine slots and variants"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Wine"
-SRC_URI="https://gitweb.gentoo.org/proj/eselect-wine.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+xdg"
-
-# xdg-utils needed for bug #884077
-RDEPEND="
- app-admin/eselect
- xdg? ( x11-misc/xdg-utils )"
-
-src_install() {
- insinto /usr/share/eselect/modules
- doins wine.eselect
-
- keepdir /etc/eselect/wine
-
- newenvd - 95${PN} <<-EOF
- PATH="${EPREFIX}/etc/eselect/wine/bin"
- MANPATH="${EPREFIX}/etc/eselect/wine/share/man"$(usev xdg "
- XDG_DATA_DIRS=\"${EPREFIX}/etc/eselect/wine/share\"")
- EOF
-
- # links for building, e.g. wineasio (bug #657748)
- dosym -r /etc/eselect/wine/wine /usr/lib/wine
- dosym -r /etc/eselect/wine/include /usr/include/wine
-
- # not required, but useful for e.g. binfmt that's not looking in PATH
- # (not doing this for everything as it gets troublesome to track)
- dosym -r /etc/eselect/wine/bin/wine /usr/bin/wine
-
- einstalldocs
-}
-
-pkg_preinst() {
- if has_version '<app-eselect/eselect-wine-2'; then
- # keep copy of still-set 'active' to auto-select same slots
- if [[ -e ${EROOT}/etc/eselect/wine/active &&
- ! -e ${EROOT}/etc/eselect/wine/eselect-wine-migration ]]; then
- cp "${EROOT}"/etc/eselect/wine/{active,eselect-wine-migration} || die
- fi
-
- # managed differently, need cleanup
- eselect wine unset --all || die
- rm -f "${EROOT}"/etc/eselect/wine/{active,installed,links/{any,vanilla,staging,proton,wine}} || die
- rmdir "${EROOT}"/etc/eselect/wine/links 2>/dev/null
-
- # some rare man dirs were created by old eselect, cleanup if now empty
- rmdir "${EROOT}"/usr/share/man/{de,fr,pl}.UTF-8{/man1,} 2>/dev/null
- fi
-
- # lacking QA_BROKEN_SYMLINK, and rather avoid live /usr changes wrt
- # bug #632576, nor create "owned" placeholders that will be clobbered
- [[ -e ${EROOT}/etc/eselect/wine/bin/wine ]] ||
- eqawarn "QA Note: broken symlinks QA is normal on first merge, targets created after"
-}
-
-pkg_postinst() {
- eselect wine update --if-unset || die
-
- rm -f "${EROOT}"/etc/eselect/wine/eselect-wine-migration || die # see preinst
-
- if [[ ! ${REPLACING_VERSIONS##* } ]] ||
- ver_test ${REPLACING_VERSIONS##* } -lt 2; then
- elog
- [[ ${REPLACING_VERSIONS} ]] &&
- elog "${PN} changed a bit, suggest reviewing 'eselect wine help' (and list)."
- elog "Please run '. ${EROOT}/etc/profile' to update PATH in current shells."
- fi
-}
-
-pkg_prerm() {
- [[ ${REPLACED_BY_VERSION} ]] || eselect wine update --reset # no die
-}
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-wine/
@ 2024-07-25 21:49 Ionen Wolkens
0 siblings, 0 replies; 37+ messages in thread
From: Ionen Wolkens @ 2024-07-25 21:49 UTC (permalink / raw
To: gentoo-commits
commit: 9690bfe5333ba0c1da42b58e4865aa607d3bf2d3
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 25 21:33:29 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Jul 25 21:47:36 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9690bfe5
app-eselect/eselect-wine: make postinst warning more visible
Kind of occasional but it confuse a user now and then, try to increase
chances that it will be spotted on first merge. Also extend a bit given
some shells (like fish) need special attention.
Bug: https://bugs.gentoo.org/936641
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../eselect-wine/eselect-wine-2.0.2-r2.ebuild | 27 ++++++++++++----------
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/app-eselect/eselect-wine/eselect-wine-2.0.2-r2.ebuild b/app-eselect/eselect-wine/eselect-wine-2.0.2-r2.ebuild
index da39532a82a4..3c19a046d3b2 100644
--- a/app-eselect/eselect-wine/eselect-wine-2.0.2-r2.ebuild
+++ b/app-eselect/eselect-wine/eselect-wine-2.0.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -69,23 +69,26 @@ pkg_postinst() {
if [[ ! ${REPLACING_VERSIONS##* } ]] ||
ver_test ${REPLACING_VERSIONS##* } -lt 2; then
elog
- [[ ${REPLACING_VERSIONS} ]] &&
- elog "${PN} changed a bit, suggest reviewing 'eselect wine help' (and list)."
- elog "Please run '. ${EROOT}/etc/profile' to update PATH in current shells"
- elog "(PATH should have ':${EPREFIX}/etc/eselect/wine/bin'). Wine can otherwise"
- elog "be executed directly from '${EPREFIX}/etc/eselect/wine/bin/wine'."
+ elog "Warning:"
+ elog
+ elog "Please either run '. ${EPREFIX}/etc/profile' to update PATH in current shells"
+ elog "or re-login, otherwise running e.g. 'wine' without the full path will fail."
+ elog "(PATH should have ':${EPREFIX}/etc/eselect/wine/bin'). If needed, selected"
+ elog "'wine' can be executed using '${EPREFIX}/etc/eselect/wine/bin/wine'."
+ elog
+ elog "If still have issues, verify that shell configurations in \$HOME are not"
+ elog "overriding PATH, also non-POSIX shells (e.g. fish) may need manual handling."
+ elog
+ # note: not using EROOT given it wouldn't make much sense to update configs
+ # using that path or source profile outside the ROOT
fi
if [[ ${REPLACING_VERSIONS##* } ]] &&
ver_test ${REPLACING_VERSIONS##* } -lt 2.0.2-r1; then
- elog
- elog "Be warned that >=${PN}-2.0.2-r1 no longer installs the"
- elog "'${EPREFIX}/usr/bin/wine' symbolic link. wine(1) can still be found"
+ elog "Note that >=${PN}-2.0.2-r1 no longer installs the"
+ elog "'${EPREFIX}/usr/bin/wine' symbolic link. 'wine' can still be found"
elog "in PATH but, if using the direct location for scripts and/or binfmt,"
elog "then please update these to use: '${EPREFIX}/etc/eselect/wine/bin/wine'"
- elog
- elog "If wine is not found in PATH, please ensure that not overriding the"
- elog "default PATH value that should include ':${EPREFIX}/etc/eselect/wine/bin'"
fi
}
^ permalink raw reply related [flat|nested] 37+ messages in thread
end of thread, other threads:[~2024-07-25 21:49 UTC | newest]
Thread overview: 37+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-03 14:08 [gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-wine/ Ionen Wolkens
-- strict thread matches above, loose matches on Subject: below --
2024-07-25 21:49 Ionen Wolkens
2023-08-23 15:41 Ionen Wolkens
2023-08-23 15:41 Ionen Wolkens
2023-08-06 4:32 Ionen Wolkens
2023-07-30 19:29 Ionen Wolkens
2023-07-30 16:18 Ionen Wolkens
2023-03-03 5:26 Ionen Wolkens
2022-12-29 20:29 Ionen Wolkens
2022-12-05 20:46 Ionen Wolkens
2022-12-03 22:40 Ionen Wolkens
2022-12-03 13:52 Ionen Wolkens
2022-12-03 1:03 Ionen Wolkens
2022-12-02 3:18 Ionen Wolkens
2022-12-02 3:18 Ionen Wolkens
2022-11-29 0:27 Ionen Wolkens
2022-11-23 20:39 Ionen Wolkens
2022-11-23 20:39 Ionen Wolkens
2022-11-20 17:12 Ionen Wolkens
2022-11-17 7:53 Ionen Wolkens
2022-11-16 17:01 Ionen Wolkens
2022-11-16 15:02 Ionen Wolkens
2022-10-12 13:47 Ionen Wolkens
2022-10-12 13:47 Ionen Wolkens
2022-10-12 13:47 Ionen Wolkens
2022-08-11 18:41 Nick Sarnie
2022-07-24 8:26 Joonas Niilola
2021-02-07 1:43 Sam James
2017-09-29 3:07 NP Hardass
2017-09-28 22:32 NP Hardass
2017-09-15 6:10 NP Hardass
2017-09-15 6:01 NP Hardass
2017-09-13 23:54 NP Hardass
2017-08-07 14:10 NP Hardass
2017-04-12 1:37 NP Hardass
2017-04-11 6:03 NP Hardass
2017-04-10 17:22 NP Hardass
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox