From a3e942f124b5275b9e07bd9152b4c23b8d1916fa Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 4 Jul 2011 11:10:01 +0200
Subject: [PATCH] avahi: rebuild with -fPIC, add missing deps.

---
 srcpkgs/avahi/avahi-compat-libs-devel.template | 2 ++
 srcpkgs/avahi/avahi-compat-libs.template       | 2 ++
 srcpkgs/avahi/avahi-glib-libs-devel.template   | 5 ++---
 srcpkgs/avahi/avahi-glib-libs.template         | 2 ++
 srcpkgs/avahi/avahi-libs-devel.template        | 2 ++
 srcpkgs/avahi/avahi-libs.template              | 3 +++
 srcpkgs/avahi/avahi-ui-libs-devel.template     | 6 +++++-
 srcpkgs/avahi/avahi-ui-libs-gtk3.template      | 2 ++
 srcpkgs/avahi/avahi-ui-libs.template           | 2 ++
 srcpkgs/avahi/template                         | 5 ++++-
 10 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/avahi/avahi-compat-libs-devel.template b/srcpkgs/avahi/avahi-compat-libs-devel.template
index 4f554fd2d99..07c3364bb00 100644
--- a/srcpkgs/avahi/avahi-compat-libs-devel.template
+++ b/srcpkgs/avahi/avahi-compat-libs-devel.template
@@ -6,6 +6,8 @@ long_desc="${long_desc}
  This package contains development files for the HOWL compatibility
  libraries provided by Avahi."
 
+revision=1
+
 Add_dependency run avahi-libs-devel
 Add_dependency run avahi-compat-libs
 
diff --git a/srcpkgs/avahi/avahi-compat-libs.template b/srcpkgs/avahi/avahi-compat-libs.template
index c062b3cfb21..8a3f99531f5 100644
--- a/srcpkgs/avahi/avahi-compat-libs.template
+++ b/srcpkgs/avahi/avahi-compat-libs.template
@@ -6,6 +6,8 @@ long_desc="${long_desc}
  This package contains howl/mDNSResponder compatibility shared
  libraries provided by Avahi."
 
+revision=1
+
 Add_dependency run glibc
 Add_dependency run libssp
 Add_dependency run dbus-libs
diff --git a/srcpkgs/avahi/avahi-glib-libs-devel.template b/srcpkgs/avahi/avahi-glib-libs-devel.template
index 63a6f58148c..d3dee04aae9 100644
--- a/srcpkgs/avahi/avahi-glib-libs-devel.template
+++ b/srcpkgs/avahi/avahi-glib-libs-devel.template
@@ -6,9 +6,8 @@ long_desc="${long_desc}
  This package contains development files for the glib libraries
  provided by Avahi."
 
-Add_dependency run glibc-devel
-Add_dependency run avahi-libs-devel
-Add_dependency run glib-devel
+revision=1
+Add_dependency run avahi-glib-libs
 
 do_install()
 {
diff --git a/srcpkgs/avahi/avahi-glib-libs.template b/srcpkgs/avahi/avahi-glib-libs.template
index a63a2176ff8..a248a1ba68e 100644
--- a/srcpkgs/avahi/avahi-glib-libs.template
+++ b/srcpkgs/avahi/avahi-glib-libs.template
@@ -5,6 +5,8 @@ long_desc="${long_desc}
 
  This package contains the glib shared libraries provided by Avahi."
 
+revision=1
+
 Add_dependency run glibc
 Add_dependency run libssp
 Add_dependency run dbus-libs
diff --git a/srcpkgs/avahi/avahi-libs-devel.template b/srcpkgs/avahi/avahi-libs-devel.template
index cc663d467cc..49b364b229f 100644
--- a/srcpkgs/avahi/avahi-libs-devel.template
+++ b/srcpkgs/avahi/avahi-libs-devel.template
@@ -6,6 +6,8 @@ long_desc="${long_desc}
  This package contains development files for the core libraries
  provided by Avahi."
 
+revision=1
+
 Add_dependency run glibc-devel
 Add_dependency run libssp-devel
 Add_dependency run dbus-devel
diff --git a/srcpkgs/avahi/avahi-libs.template b/srcpkgs/avahi/avahi-libs.template
index 380ab8be27c..af0f5713ddc 100644
--- a/srcpkgs/avahi/avahi-libs.template
+++ b/srcpkgs/avahi/avahi-libs.template
@@ -5,9 +5,12 @@ long_desc="${long_desc}
 
  This package contains core shared libraries provided by Avahi."
 
+revision=1
+
 Add_dependency run glibc
 Add_dependency run libssp
 Add_dependency run dbus-libs
+Add_dependency run gdbm
 
 do_install()
 {
diff --git a/srcpkgs/avahi/avahi-ui-libs-devel.template b/srcpkgs/avahi/avahi-ui-libs-devel.template
index 02b788746d7..54b01cf1b67 100644
--- a/srcpkgs/avahi/avahi-ui-libs-devel.template
+++ b/srcpkgs/avahi/avahi-ui-libs-devel.template
@@ -6,11 +6,15 @@ long_desc="${long_desc}
  This package contains development files for the UI libraries
  provided by Avahi."
 
+revision=1
+
 Add_dependency run glibc-devel
-Add_dependency run avahi-libs-devel
 Add_dependency run gtk+-devel
 Add_dependency run gtk+3-devel
 Add_dependency run gdbm-devel
+Add_dependency run avahi-libs-devel
+Add_dependency run avahi-ui-libs
+Add_dependency run avahi-ui-libs-gtk3
 
 do_install()
 {
diff --git a/srcpkgs/avahi/avahi-ui-libs-gtk3.template b/srcpkgs/avahi/avahi-ui-libs-gtk3.template
index c0f523c7907..d61e147a7d5 100644
--- a/srcpkgs/avahi/avahi-ui-libs-gtk3.template
+++ b/srcpkgs/avahi/avahi-ui-libs-gtk3.template
@@ -5,6 +5,8 @@ long_desc="${long_desc}
 
  This package contains the GTK+3 UI shared libraries provided by Avahi."
 
+revision=1
+
 Add_dependency run glibc
 Add_dependency run libssp
 Add_dependency run gdbm
diff --git a/srcpkgs/avahi/avahi-ui-libs.template b/srcpkgs/avahi/avahi-ui-libs.template
index 02fb7eb2f84..ae85bb34a37 100644
--- a/srcpkgs/avahi/avahi-ui-libs.template
+++ b/srcpkgs/avahi/avahi-ui-libs.template
@@ -5,6 +5,8 @@ long_desc="${long_desc}
 
  This package contains the UI shared libraries provided by Avahi."
 
+revision=1
+
 Add_dependency run glibc
 Add_dependency run avahi-libs
 Add_dependency run dbus-libs
diff --git a/srcpkgs/avahi/template b/srcpkgs/avahi/template
index 000e10e795c..c7696fd08f2 100644
--- a/srcpkgs/avahi/template
+++ b/srcpkgs/avahi/template
@@ -19,6 +19,9 @@ long_desc="
  a network and instantly find printers to print to, files to look at and
  people to talk to."
 
+# Build PIC objects!
+CFLAGS="-fPIC"
+
 # Create avahi and netdev system accounts.
 system_accounts="avahi netdev"
 openrc_services="avahi-daemon default true avahi-dnsconfd default true"
@@ -51,7 +54,7 @@ Add_dependency build libdaemon-devel
 Add_dependency build gdbm-devel
 Add_dependency build glib-devel
 Add_dependency build expat-devel
-Add_dependency build pygtk
+Add_dependency build pygtk-devel
 Add_dependency build dbus-python
 Add_dependency build libglade-devel
 Add_dependency build gtk+3-devel