Version bump for roccat-tools and its dependency libgaminggear. One input_device renamed, and couple of use flags added. Reproducible: Always
Created attachment 396274 [details, diff] Patch for /usr/portage/profiles/use.local.desc
Created attachment 396276 [details, diff] Patch for /usr/portage/profiles/desc/input_devices.desc
Created attachment 396278 [details] roccat-tools-3.0.0.ebuild
Created attachment 396280 [details] dev-libs/libgaminggear-0.6.0.ebuild
The first patch is wrong. use.local.desc is automatically generated # This file is deprecated as per GLEP 56 in favor of metadata.xml. Please add # your descriptions to your package's metadata.xml ONLY. # * generated automatically using egencache * Please update metadata.xml instead.
Created attachment 396530 [details, diff] Patch for metadata.xml
why unconfirmed and not updated yet ?
https://bugs.gentoo.org/attachment.cgi?id=396276 is wrong. Please run repoman full before you attach your patches. You remove a use flag that is used by the previous version of this package. You either need to fix the old ebuilds or keep both flags around
Created attachment 397134 [details, diff] Patch for /usr/portage/sys-apps/roccat-tools folder I updated all previous ebuilds to use new name for ryosmk. The big patch now includes new ebuild and updates to old ebuilds and Manifest and metadata... RepoMan sez: "If everyone were like you, I'd be out of business!"
So I see this + MODELS=${MODELS/ryosmk/ryos} mycmakeargs=( -DDEVICES=${MODELS// /;} \ -DUDEVDIR="${UDEVDIR/"//"//}" ) cmake-utils_src_configure diff -rupN roccat-tools.old/roccat-tools-2.2.0.ebuild roccat-tools/roccat-tools-2.2.0.ebuild --- roccat-tools.old/roccat-tools-2.2.0.ebuild 2014-10-04 13:34:01.000000000 +0100 +++ roccat-tools/roccat-tools-2.2.0.ebuild 2015-02-21 11:48:43.167173598 +0000 @@ -28,7 +28,7 @@ IUSE_INPUT_DEVICES=" input_devices_roccat_lua input_devices_roccat_pyra input_devices_roccat_savu - input_devices_roccat_ryos + input_devices_roccat_ryosmk First you replace /ryosmk/ with /ryos/ but later in INPUT_DEVICES you are using ryosmk instead of ryos Can I ask what is going on here? Why is the ryosmk vs ryos change necessary and why are the ebuild inconsistence in terms of ryaosmk and ryos.
Well the story is - it used to be called ryos, but now upstream renamed it to ryosmk. The actual device name maps to name of folder which cmake will look for, so in older versions, I have to map it back to ryos as that's how the folder was called. But in order to be able to remove legacy "ryos" device name and avoid confusion of having both ryos and ryosmk as input devices, externally to user it will all look like ryosmk now.
To clarify further - ryosmk is used in 3.0.0 as is, so no mangling involved. Mangling is needed only in old versions.
I tried to apply the first patch but it completely fails (except the part that it creates the 3.0.0 ebuild) Are you sue you are using an up2date tree? patching file roccat-tools-2.0.0.ebuild Hunk #1 FAILED at 28. Hunk #2 FAILED at 51. 2 out of 2 hunks FAILED -- saving rejects to file roccat-tools-2.0.0.ebuild.rej (Stripping trailing CRs from patch; use --binary to disable.) patching file roccat-tools-2.1.0.ebuild Hunk #1 FAILED at 28. Hunk #2 FAILED at 51. 2 out of 2 hunks FAILED -- saving rejects to file roccat-tools-2.1.0.ebuild.rej (Stripping trailing CRs from patch; use --binary to disable.) patching file roccat-tools-2.2.0.ebuild Hunk #1 FAILED at 28. Hunk #2 FAILED at 51. ... etc etc
Created attachment 397136 [details, diff] Patch for /usr/portage/sys-apps/roccat-tools folder No idea what happened... But this patch definitely works now against latest portage tree.
(In reply to Dmitry Pisklov from comment #14) > Created attachment 397136 [details, diff] [details, diff] > Patch for /usr/portage/sys-apps/roccat-tools folder > > No idea what happened... But this patch definitely works now against latest > portage tree. it still does not apply to me. Anyway. I will apply it manually at some point.
patch -u -p1 --dry-run < attachment.cgi\?id\=397136 (Stripping trailing CRs from patch; use --binary to disable.) checking file Manifest Hunk #1 FAILED at 4. 1 out of 1 hunk FAILED (Stripping trailing CRs from patch; use --binary to disable.) checking file metadata.xml (Stripping trailing CRs from patch; use --binary to disable.) checking file roccat-tools-2.0.0.ebuild Hunk #1 FAILED at 28. Hunk #2 FAILED at 51. 2 out of 2 hunks FAILED (Stripping trailing CRs from patch; use --binary to disable.) checking file roccat-tools-2.1.0.ebuild Hunk #1 FAILED at 28. Hunk #2 FAILED at 51. 2 out of 2 hunks FAILED (Stripping trailing CRs from patch; use --binary to disable.) checking file roccat-tools-2.2.0.ebuild Hunk #1 FAILED at 28. Hunk #2 FAILED at 51. 2 out of 2 hunks FAILED (Stripping trailing CRs from patch; use --binary to disable.) checking file roccat-tools-2.4.0.ebuild Hunk #1 FAILED at 28. Hunk #2 FAILED at 52. 2 out of 2 hunks FAILED (Stripping trailing CRs from patch; use --binary to disable.) checking file roccat-tools-3.0.0.ebuild patch unexpectedly ends in middle of line patch: **** malformed patch at line 205: It it possible to patch against the cvs tree and generate a patch using 'cvs diff -u' ?
It does not even apply to my /usr/portage copy. Can you generate it using "diff -Naur" please? I think the missing "-a" option might be the problem.
Created attachment 397142 [details] roccat-tools folder I give up on that goddamn diff... Tried with -Nuar and tried applying resulting patch - it fails... I'm too bad with diff or diff/patch are too bad on their own. This time just tarball of directory (it will need digesting, I think, as Manifest might not be up-to-date)
Like I said before please add repoman full in your ebuilds ebuild.minorsyn 2 dev-libs/libgaminggear/libgaminggear-0.6.0.ebuild: Unquoted Variable on line: 31 dev-libs/libgaminggear/libgaminggear-0.6.0.ebuild: Trailing whitespace error on line: 31 I fixed these and committed libgaminggear-0.6.0 +*libgaminggear-0.6.0 (21 Feb 2015) + + 21 Feb 2015; Markos Chandras <hwoarang@gentoo.org> + +libgaminggear-0.6.0.ebuild: + Version bump. Bug #539906 by Dmitry Pisklov + I also committed the input_devices.desc patch + 21 Feb 2015; Markos Chandras <hwoarang@gentoo.org> desc/input_devices.desc: + Drop roccat_ryos and add roccat_ryosmk. Bug #539906 by Dmitry Pisklov + In the roccat-tools ebuilds you have a mixture of tabs and spaces. Please try to keep it consistent. ebuild.minorsyn 49 sys-apps/roccat-tools/roccat-tools-3.0.0.ebuild: Ebuild contains leading spaces on line: 17 sys-apps/roccat-tools/roccat-tools-3.0.0.ebuild: Ebuild contains leading spaces on line: 18 sys-apps/roccat-tools/roccat-tools-3.0.0.ebuild: Ebuild contains leading spaces on line: 19 sys-apps/roccat-tools/roccat-tools-3.0.0.ebuild: Ebuild contains leading spaces on line: 20 sys-apps/roccat-tools/roccat-tools-3.0.0.ebuild: Ebuild contains leading spaces on line: 21 sys-apps/roccat-tools/roccat-tools-3.0.0.ebuild: Ebuild contains leading spaces on line: 22 sys-apps/roccat-tools/roccat-tools-3.0.0.ebuild: Ebuild contains leading spaces on line: 23 sys-apps/roccat-tools/roccat-tools-3.0.0.ebuild: Ebuild contains leading spaces on line: 24 ... and many many more Tabs are usually preferred. I think your editor may be partially broken. I fixed 3.0.0 myself and committed it myself but next time I will be less tolerant :) +*roccat-tools-3.0.0 (21 Feb 2015) + + 21 Feb 2015; Markos Chandras <hwoarang@gentoo.org> +roccat-tools-3.0.0.ebuild, + metadata.xml, roccat-tools-2.0.0.ebuild, roccat-tools-2.1.0.ebuild, + roccat-tools-2.2.0.ebuild, roccat-tools-2.4.0.ebuild: + Version bump. Bug #539906 by Dmitry Pisklov. Update input devices to old + ebuilds as well +
Thank you! Yes my vim is setup to replace tabs with spaces... That might be the trouble. Next time will try to do better)
