summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordakkar <dakkar@thenautilus.net>2014-03-16 15:45:46 +0000
committerdakkar <dakkar@thenautilus.net>2014-03-16 15:45:46 +0000
commit2aee175df574ba1ca7257962ebb7a583f58a57d8 (patch)
treeaf4749829c8e82c99d532e581918745de5f29efe
parentlircd manifest (diff)
downloadgentoo-overlay-2aee175df574ba1ca7257962ebb7a583f58a57d8.tar.gz
gentoo-overlay-2aee175df574ba1ca7257962ebb7a583f58a57d8.tar.bz2
gentoo-overlay-2aee175df574ba1ca7257962ebb7a583f58a57d8.zip
lircd fix patch conflict
-rw-r--r--app-misc/lirc/Manifest2
-rw-r--r--app-misc/lirc/lirc-0.9.0-r5.ebuild2
2 files changed, 2 insertions, 2 deletions
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index f05d157..1983669 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -24,4 +24,4 @@ AUX modprobed.lirc 549 SHA256 b4951252321ea326d3ec401e5ff1112716c5aaf5b2ca94d9f5
AUX modulesd.lirc 482 SHA256 3906b61951e1245cb3c9b16e81255a735f7bcdbbfcbedcdf44cd53236e2a3f28 SHA512 07ae7c7288878f65857962bb3a343b83d58eca6447299253dd297dec6443b95d89f46ebcbe1f1ac66ec5062f8134a2e19ecc3ce397b2f8d0d27f203a2a103fcc WHIRLPOOL 2bc4c45d3fd314cc88d50f79974b2aafa4e55a7df7383cbd2f3ddf5b66e144b5700f8d411f79ea458caec0da3e47d5e0db2c34e1efcc2d748c473fe2c5ae7389
DIST lirc-0.9.0.tar.bz2 857286 SHA256 6323afae6ad498d4369675f77ec3dbb680fe661bea586aa296e67f2e2daba4ff SHA512 e91534c63e6065bd7da3b15e1676edf1672b8beb21864a6825df86247d7d165bf2dee6f8191732933e24e42a406e46afc55559948e4061eed2de7b08fac13431 WHIRLPOOL 0a1c00b07898aa7a5d78865fb73c6d26c6331dd0a4945773a801d29e40298b365eb58cae113a95fcf73be678a24ac082ad0868e8051303d732882fb82a859a7b
EBUILD lirc-0.9.0-r3.ebuild 12895 SHA256 3c413e62975a799d7c5e99640b0a67561f4e6cf6dee80ba2a48f2021c1e728de SHA512 708b79d0d3be5730b7c69c94259a7d19af206f766a6bd30c3f7812f7cffbffa68238b7a905dcfea9a44513a370f12504531f7d746360e844b2a042b4ee21c8c7 WHIRLPOOL 26cc54ec8b102216f52e8753bf57952099b6b6dffad6f0d7d0fb3e5e7f8f87e4d43d9ce19cdec1f47f5c116d73e10adfa4d756b45739599a8a61dc87acd78f0c
-EBUILD lirc-0.9.0-r5.ebuild 13637 SHA256 f8a028407c19d8e3349e053a4d7fe262fb393bdecc1f083795aa65028c73f01e SHA512 0e4dd683b19fefd641acb6e8e71ca84a57fc259f28e7ab2b216d799283b6d51a293c904618a433bec5cb4e5dd3539a372aa61729470d2879c7abff895b6d503e WHIRLPOOL 2a85c15d89ea59674ef33c89fdd29f94cf35f76a2a603aaef93465caa178fd618d341a160187decbaa4edc0a4ab6c43f58e6786d41bf7432f5fbebce078cef53
+EBUILD lirc-0.9.0-r5.ebuild 13663 SHA256 4740431a36e1c24e43f969e3f36210503039eda952dbcb526f5672a402098c04 SHA512 2ad1d5e6058d33fa9e12281cb99a8e74b0ccbb57752dce884c2f8387873ade5e8c544368ebb56e8bb8112bfe68a2cd43cef48ca7112f6a52e51dd65324e5fda7 WHIRLPOOL 0a298ed984abe581b98de72df92a1df4b314d2cdce3439d8209256acb2fc0725d9e84e62c4896ad23eb0acfad271d2df5107a52d122596c46bf5f6cf0e235a71
diff --git a/app-misc/lirc/lirc-0.9.0-r5.ebuild b/app-misc/lirc/lirc-0.9.0-r5.ebuild
index 893b263..807d5d8 100644
--- a/app-misc/lirc/lirc-0.9.0-r5.ebuild
+++ b/app-misc/lirc/lirc-0.9.0-r5.ebuild
@@ -302,7 +302,7 @@ src_prepare() {
# Apply fix for missing __devinit __devexit defines in kernel 3.8+ (bug 461532)
epatch "${FILESDIR}"/${P}-kernel-3.8-fixes.patch
# Add support for zotac remote, bug 342848
- epatch "${FILESDIR}"/${P}-add-zotac-support.patch
+ use lirc_devices_zotac && epatch "${FILESDIR}"/${P}-add-zotac-support.patch
# Use fixed font
epatch "${FILESDIR}"/${P}-fixed-font.patch