aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReuben D'Netto <rdnetto@gmail.com>2018-04-11 19:11:07 +1000
committerPaul Healy <lmiphay@gmail.com>2018-04-14 16:59:30 +0100
commit70d506f9333d126672c481048611afd222c9e55d (patch)
tree1be78d95ac812edf5c6f8da76d7bfd73b74e10ac
parentapp-misc/homeassistant: Added systemd service (diff)
downloadlmiphay-70d506f9333d126672c481048611afd222c9e55d.tar.gz
lmiphay-70d506f9333d126672c481048611afd222c9e55d.tar.bz2
lmiphay-70d506f9333d126672c481048611afd222c9e55d.zip
pull in bdb98d51909440eba2acbc3a59767b0c295ae143 from rdnetto
-rw-r--r--app-misc/homeassistant-bin/Manifest5
-rw-r--r--app-misc/homeassistant-bin/homeassistant-bin-9999.ebuild1
2 files changed, 5 insertions, 1 deletions
diff --git a/app-misc/homeassistant-bin/Manifest b/app-misc/homeassistant-bin/Manifest
index eaf95bc..a7e0109 100644
--- a/app-misc/homeassistant-bin/Manifest
+++ b/app-misc/homeassistant-bin/Manifest
@@ -5,5 +5,10 @@ AUX homeassistant.service 286 BLAKE2B a32f1f24e44341c689abef462f42db04c82f5f0ebc
AUX recorder.yaml 114 BLAKE2B af04840805aa13124208584e7f1d40335905a083ee7deead5c0e4324c969f2a231c801c23e42075782950aba7535496d92747bf03efd73a80b0d07e8492d18f6 SHA512 cb4e353e54fb6dc7034569b8d62ddcdca92680c23c2c4e1ce707d21cf95e93f41a0c44521d8c3ee90b68c830f6b8e65dab82ae64bfa09727ae384550f7de0c94
AUX update-homeassistant 1326 BLAKE2B 917bdd332c4e5dea5177eecd11a7f8d72b911fddfdc8e5eb54960c526fe8c735e20d44e570cf7aeb99669d2a9670c70da1c5fbc30efb284d1f0f330799de6e24 SHA512 3c05f0d6d1bde0e1526c3e679568794c07091e7856dfd8793e13feec6f22725ddaa3163ca2c81d9df86cf73573f932e561743f05de420b350a0b68f6a9582aca
EBUILD homeassistant-bin-0.65.5.ebuild 2751 BLAKE2B 998443da2816988e135abce3dac4805919ee8d67dc337df6104b22cc6a2b405b67bc4cb8377297e535d17b5c812a4b60dd9c374ec743c64ba49f652c38969ce7 SHA512 f21ca4aa9de921133e03b6142993551eb15a6384f8c82c2fd1a336f7482b533d0b91db325bbd040ab2df6b29e0f0ed566d2b6f28e6d1fac8bdcb732e78d76b18
+<<<<<<< HEAD
EBUILD homeassistant-bin-0.66.1.ebuild 2807 BLAKE2B 3ef092dbd32912e10e05ade562d48cefdb6e64adc0fb24d828f710613f1726dae221594d1de96ef45b78fc4268cfd287a9e533eb5272443c2ed0803c30a83861 SHA512 e9e40961857a9624936f656b316f0f34eb2991447c37d5abfde814501ab68cee0da0ea9fe86c8bc4f6dc14a4a0cef21ad6e50315577575412be0ff3d9ca1eeda
EBUILD homeassistant-bin-9999.ebuild 2584 BLAKE2B 4e0c4e9df27634de885c6715afa156d7c1fe685d87ae09f2ce663e00fb7ab61e6e768e7bb261903163ad7396bafd2f4368149fc5f7217368653e951ca865538d SHA512 80ee4286138a936f260e0240c37a59bc9593dd72ff922cb48c1eb6e83b1e610bde03c701e6d17eee5297597ccfc1b4eaca27eab9e5b49ca49942e0690093ac5e
+=======
+EBUILD homeassistant-bin-0.66.1.ebuild 2837 BLAKE2B 50d0043d4074b0a3970518da516d6c0672155053d58aec8e2878d5c73463d447bd35a642d8efd5c3f3d9f0d7ced00464c0b8f547d8f18a22ffb4360b8687c7b7 SHA512 563060777302f039194a774699a77b7a324e171c96e30b3fbc5c5d53128fc980cec8afdc4340b2edfa2a3335bca7091113c4c8d28728e54a869b289346d71ab9
+EBUILD homeassistant-bin-9999.ebuild 2596 BLAKE2B 94d19b7e841266131b852702ec8c4a81dc79ef3b159bdfac401a431fca40cb2012b486a89d11f2c1ad73d406def59eed33d01a100ffa62168e794f4806ca62c0 SHA512 0c1390fa8bf5d2fb8cbb7d4ba03dabc2c7ca5d4f9678086178f8bf5b2891753ddaa9aed92c927e69d96838cfd0d383d9ae711730f982383878ffd03b70e0e6b5
+>>>>>>> bdb98d5... app-misc/homeassistant-bin: Don't set KEYWORDS on 9999
diff --git a/app-misc/homeassistant-bin/homeassistant-bin-9999.ebuild b/app-misc/homeassistant-bin/homeassistant-bin-9999.ebuild
index aab0479..f231c69 100644
--- a/app-misc/homeassistant-bin/homeassistant-bin-9999.ebuild
+++ b/app-misc/homeassistant-bin/homeassistant-bin-9999.ebuild
@@ -15,7 +15,6 @@ SRC_URI="" # pip installs latest HA from PyPI
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64"
IUSE="maint"
DEPEND="