diff options
| author | V3n3RiX <venerix@rogentos.ro> | 2015-07-24 17:12:35 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@rogentos.ro> | 2015-07-24 17:12:35 +0100 |
| commit | 70b1855e16ed079d320176747f40e98693623952 (patch) | |
| tree | 6661d84aeb2127a71fa2001856a941ca1425af24 /net-dns | |
| parent | df385d64c8534771af36e9a464fb1763f5f37078 (diff) | |
| parent | 5c8180e20f801d69d51cca9c09c773f120e7bb64 (diff) | |
Merge upstream
Diffstat (limited to 'net-dns')
| -rw-r--r-- | net-dns/avahi-gtk/avahi-gtk-0.6.31-r6.ebuild | 3 | ||||
| -rw-r--r-- | net-dns/avahi-libs/avahi-libs-0.6.31-r6.ebuild | 9 |
2 files changed, 2 insertions, 10 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 a05ca09d..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 diff --git a/net-dns/avahi-libs/avahi-libs-0.6.31-r6.ebuild b/net-dns/avahi-libs/avahi-libs-0.6.31-r6.ebuild index 8c4a2638..3f5eb860 100644 --- a/net-dns/avahi-libs/avahi-libs-0.6.31-r6.ebuild +++ b/net-dns/avahi-libs/avahi-libs-0.6.31-r6.ebuild @@ -80,15 +80,6 @@ src_configure() { } src_install() { - if use abi_x86_32 ; then insinto /usr/include/ doins avahi-ui/avahi-ui.h - insinto /usr/include/${CHOST}/avahi-ui/ - doins "${WORKDIR}"/avahi-0.6.31-abi_x86_32.x86/avahi-ui/avahi-ui.h - elif use abi_x86_64 ; then - insinto /usr/include/ - doins avahi-ui/avahi-ui.h - insinto /usr/include/${CHOST}/avahi-ui/ - doins "${WORKDIR}"/avahi-0.6.31-abi_x86_64.amd64/avahi-ui/avahi-ui.h - fi } |