diff options
| author | BlackNoxis <steven.darklight@gmail.com> | 2015-07-14 16:57:08 +0300 |
|---|---|---|
| committer | BlackNoxis <steven.darklight@gmail.com> | 2015-07-14 16:57:08 +0300 |
| commit | e07969fc0b6f881d9a7b9e27edce140a7248e22c (patch) | |
| tree | f9d330c4e7fccf8846acefacd203c3e22224557c /net-dns/avahi-gtk/avahi-gtk-0.6.31-r6.ebuild | |
| parent | e1c25a865aeaa3ae9e84c4131690cbbb948f434d (diff) | |
| parent | 4417f6ba1c8e7b6ea05afe3173ba4142829dc79c (diff) | |
Merge branch 'master' of github.com:Rogentos/kogaion-desktop
Diffstat (limited to 'net-dns/avahi-gtk/avahi-gtk-0.6.31-r6.ebuild')
| -rw-r--r-- | net-dns/avahi-gtk/avahi-gtk-0.6.31-r6.ebuild | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/net-dns/avahi-gtk/avahi-gtk-0.6.31-r6.ebuild b/net-dns/avahi-gtk/avahi-gtk-0.6.31-r6.ebuild index 1717cfd3..b5e277db 100644 --- a/net-dns/avahi-gtk/avahi-gtk-0.6.31-r6.ebuild +++ b/net-dns/avahi-gtk/avahi-gtk-0.6.31-r6.ebuild @@ -159,7 +159,8 @@ multilib_src_install() { # Workaround for avahi-ui.h collision between avahi-gtk and avahi-gtk3 root_avahi_ui="${ROOT}usr/include/avahi-ui/avahi-ui.h" if [ -e "${root_avahi_ui}" ]; then - rm -f "${D}usr/include/avahi-ui/avahi-ui.h" + rm -f "${D}/usr/include/avahi-ui/avahi-ui.h" + rm -f "${ED}/usr/include/avahi-ui/avahi-ui.h" fi # provided by avahi-gtk3 @@ -169,6 +170,11 @@ multilib_src_install() { rm "${D}"usr/share/applications/bssh.desktop || die rm "${D}"usr/share/applications/bvnc.desktop || die fi + + if [ -e "${root_avahi_ui}" ]; then + rm -f "${ED}/usr/include/avahi-ui/avahi-ui.h" + rm -f "${D}/usr/include/avahi-ui/avahi-ui.h" + fi } multilib_src_install_all() { |