commit: b55e4172724289ad70018689f7af10fb0e7d4b6c Author: Alexey Sokolov <sokolov <AT> google <DOT> com> AuthorDate: Fri Dec 11 15:04:32 2020 +0000 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> CommitDate: Fri Dec 11 18:36:54 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b55e4172
app-misc/OpenRGB: version 0.5 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org> Closes: https://github.com/gentoo/gentoo/pull/18609 Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> app-misc/OpenRGB/Manifest | 1 + .../OpenRGB/{OpenRGB-9999.ebuild => OpenRGB-0.5.ebuild} | 9 ++------- app-misc/OpenRGB/OpenRGB-9999.ebuild | 9 ++------- app-misc/OpenRGB/files/OpenRGB-0.5-build-system.patch | 13 +++++++++++++ 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/app-misc/OpenRGB/Manifest b/app-misc/OpenRGB/Manifest index be8a7c45393..c2ca31416fa 100644 --- a/app-misc/OpenRGB/Manifest +++ b/app-misc/OpenRGB/Manifest @@ -1 +1,2 @@ DIST OpenRGB-release_0.4.tar.bz2 2195819 BLAKE2B 6416e143707e5ae48d0f26d205e1cc27571299d7d4b8483d18cc03db237d71ebc3574973fc1540dacc24662c536888e575e89db417e52dc9672d412fe41c540b SHA512 9ecdf0a0aec5916b1c705c1ad0bd567f46f9b0a4409211cb195ec7a4bfbc95c80bde13798839d23e867ed613cb34c6e9629da4aac942490f58ca9528f5f0a8bd +DIST OpenRGB-release_0.5.tar.bz2 24183948 BLAKE2B c3e6eaab2224f97287a454375486cdacc6814f35fe6752271293d30110d066998d95a901224929cdec7f57a3983fa9d8f5dc488a2ccb6d128df36fac6bc4582a SHA512 d0bd69de94e7e94b9972c07851602d8437b4485d02e83e2fe84f21292acbeef32624ec82d5cb79de85a4dfec35431c469b124b0cc41cf1f741e6e52803dd82eb diff --git a/app-misc/OpenRGB/OpenRGB-9999.ebuild b/app-misc/OpenRGB/OpenRGB-0.5.ebuild similarity index 87% copy from app-misc/OpenRGB/OpenRGB-9999.ebuild copy to app-misc/OpenRGB/OpenRGB-0.5.ebuild index 1499b76f727..6c5d8e23cd0 100644 --- a/app-misc/OpenRGB/OpenRGB-9999.ebuild +++ b/app-misc/OpenRGB/OpenRGB-0.5.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit qmake-utils udev +inherit qmake-utils if [[ ${PV} == *9999* ]]; then inherit git-r3 @@ -18,7 +18,6 @@ DESCRIPTION="Open source RGB lighting control that doesn't depend on manufacture HOMEPAGE="https://gitlab.com/CalcProgrammer1/OpenRGB/"; LICENSE="GPL-2" SLOT="0" -IUSE="udev" RDEPEND=" dev-libs/hidapi:= @@ -39,7 +38,7 @@ src_prepare() { default rm -r dependencies/{hidapi,libusb,json}* || die if [[ ${PV} != *9999* ]]; then - eapply "${FILESDIR}/OpenRGB-0.2-build-system.patch" + eapply "${FILESDIR}/OpenRGB-0.5-build-system.patch" fi } @@ -51,8 +50,4 @@ src_install() { emake INSTALL_ROOT="${ED}" install dodoc README.md OpenRGB.patch - - if use udev; then - udev_dorules 60-openrgb.rules - fi } diff --git a/app-misc/OpenRGB/OpenRGB-9999.ebuild b/app-misc/OpenRGB/OpenRGB-9999.ebuild index 1499b76f727..6c5d8e23cd0 100644 --- a/app-misc/OpenRGB/OpenRGB-9999.ebuild +++ b/app-misc/OpenRGB/OpenRGB-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit qmake-utils udev +inherit qmake-utils if [[ ${PV} == *9999* ]]; then inherit git-r3 @@ -18,7 +18,6 @@ DESCRIPTION="Open source RGB lighting control that doesn't depend on manufacture HOMEPAGE="https://gitlab.com/CalcProgrammer1/OpenRGB/"; LICENSE="GPL-2" SLOT="0" -IUSE="udev" RDEPEND=" dev-libs/hidapi:= @@ -39,7 +38,7 @@ src_prepare() { default rm -r dependencies/{hidapi,libusb,json}* || die if [[ ${PV} != *9999* ]]; then - eapply "${FILESDIR}/OpenRGB-0.2-build-system.patch" + eapply "${FILESDIR}/OpenRGB-0.5-build-system.patch" fi } @@ -51,8 +50,4 @@ src_install() { emake INSTALL_ROOT="${ED}" install dodoc README.md OpenRGB.patch - - if use udev; then - udev_dorules 60-openrgb.rules - fi } diff --git a/app-misc/OpenRGB/files/OpenRGB-0.5-build-system.patch b/app-misc/OpenRGB/files/OpenRGB-0.5-build-system.patch new file mode 100644 index 00000000000..fe805988af5 --- /dev/null +++ b/app-misc/OpenRGB/files/OpenRGB-0.5-build-system.patch @@ -0,0 +1,13 @@ +diff --git a/OpenRGB.pro b/OpenRGB.pro +index 91e0079..7f279dd 100644 +--- a/OpenRGB.pro ++++ b/OpenRGB.pro +@@ -26,8 +26,5 @@ TEMPLATE = app + win32:BUILDDATE = $$system(date /t) + unix:BUILDDATE = $$system(date -R -d "@${SOURCE_DATE_EPOCH:-$(date +%s)}") +-GIT_COMMIT_ID = $$system(git --git-dir $$_PRO_FILE_PWD_/.git --work-tree $$_PRO_FILE_PWD_ rev-parse HEAD) +-GIT_COMMIT_DATE = $$system(git --git-dir $$_PRO_FILE_PWD_/.git --work-tree $$_PRO_FILE_PWD_ show -s --format=%ci HEAD) +-GIT_BRANCH = $$system(git --git-dir $$_PRO_FILE_PWD_/.git --work-tree $$_PRO_FILE_PWD_ rev-parse --abbrev-ref HEAD) + + DEFINES += \ + VERSION_STRING=\\"\"\"$$VERSION\\"\"\" \
