Backup_Repos/pentoo-overlay
1
0
Fork 0
mirror of https://github.com/pentoo/pentoo-overlay synced 2026-04-20 05:41:12 +02:00
Code Issues Projects Releases Wiki Activity

profile: resolve merge conflict

Browse source
This commit is contained in:
Rick Farina (Zero_Chaos) 2020-05-26 22:15:36 -04:00
parent aa80ca3498
commit fded90f2dd
No known key found for this signature in database
GPG key ID: A29433C0AA431DDC
4 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pentoo/zero-system/zero-system-2020.1-r1.ebuild → pentoo/zero-system/zero-system-2020.1-r2.ebuild
View file

@ -37,9 +37,6 @@ PDEPEND="
net-dns/dnsmasq
dev-util/pkgcheck
dev-vcs/cvs
media-tv/v4l-utils
media-video/openshot
media-video/vidcutter
net-misc/axel
net-misc/keychain
sys-apps/earlyoom
@ -91,6 +88,11 @@ PDEPEND="
media-sound/asunder
net-wireless/md380tools
dev-embedded/arduino
media-tv/v4l-utils
media-video/openshot
media-video/vidcutter
media-video/streamdeck-ui
x11-misc/xdotool
)
"

3
profiles/pentoo/base/package.accept_keywords/dev-python
View file

@ -1,3 +1,6 @@
~dev-python/pyside2-5.14.1
~dev-python/shiboken2-5.14.1
~dev-python/pyscard-1.9.9
~dev-python/pyotherside-1.5.9 ~amd64
~dev-python/pybind11-2.4.3

3
profiles/pentoo/base/package.use/dev-python
View file

@ -23,5 +23,4 @@ dev-python/django-constance database
#required by mitmproxy
app-arch/brotli python
#required by rfcat, qml flag
dev-python/pyside2 gui network
dev-python/pyside2 designer gui network widgets

1
profiles/pentoo/zero-system/package.accept_keywords/media-video
View file

@ -1,4 +1,5 @@
media-video/obs-studio
media-video/obs-v4l2sink
media-video/openshot
media-video/streamdeck-ui
media-video/vidcutter