From 076daba560ef545af7296439b6f65710bf7d575c Mon Sep 17 00:00:00 2001
From: Albert Hopkins <marduk@python.net>
Date: Wed, 7 Jan 2015 22:27:18 +0000
Subject: [PATCH] airport: Updates.

---
 appliances/airport/Makefile         | 4 ++--
 appliances/airport/make.conf        | 4 ++--
 appliances/airport/package.keywords | 4 ++--
 appliances/airport/package.use      | 1 +
 appliances/airport/world            | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/appliances/airport/Makefile b/appliances/airport/Makefile
index c7c7f3c..3048c87 100644
--- a/appliances/airport/Makefile
+++ b/appliances/airport/Makefile
@@ -1,7 +1,7 @@
 APP_ROOT := /var/airport
 AIRPORT_REPO ?= https://bitbucket.org/marduk/airport
 AIRPORT_BRANCH ?= default
-PGVER := 9.3
+PGVER := 9.4
 
 rcdefault := /etc/runlevels/default
 
@@ -12,7 +12,7 @@ postinstall: airport.service settings.py local.start local.stop issue nginx.conf
 	sed -i 's/^PG_INITDB_OPTS.*/PG_INITDB_OPTS="--locale=en_US.UTF-8"/' $(CHROOT)/etc/conf.d/postgresql-$(PGVER)
 	$(inroot) eselect postgresql set $(PGVER)
 	rm -rf $(CHROOT)/var/lib/postgresql/$(PGVER)
-	yes | $(inroot) $(EMERGE) --config postgresql-server:$(PGVER)
+	yes | $(inroot) $(EMERGE) --config postgresql:$(PGVER)
 	$(inroot) rc-update add postgresql-$(PGVER) default
 	$(inroot) chsh -s /bin/sh postgres
 	$(inroot) $(EMERGE) -1n $(USEPKG) dev-python/virtualenv
diff --git a/appliances/airport/make.conf b/appliances/airport/make.conf
index 3785540..e5dde09 100644
--- a/appliances/airport/make.conf
+++ b/appliances/airport/make.conf
@@ -1,4 +1,4 @@
 # Settings for Airport
-PYTHON_TARGETS="python3_3"
-USE_PYTHON="3.3"
+PYTHON_TARGETS="python3_4"
+USE_PYTHON="3.4"
 NGINX_MODULES_HTTP="auth_basic gzip proxy referer rewrite headers_more uwsgi"
diff --git a/appliances/airport/package.keywords b/appliances/airport/package.keywords
index 3e488a7..3628c22 100644
--- a/appliances/airport/package.keywords
+++ b/appliances/airport/package.keywords
@@ -1,3 +1,3 @@
-dev-db/postgresql-base:9.3 **
-dev-db/postgresql-server:9.3 **
+dev-db/postgresql:9.4 **
+dev-python/virtualenv **
 sys-kernel/gentoo-sources ~amd64 ~x86
diff --git a/appliances/airport/package.use b/appliances/airport/package.use
index 70bb768..fbffdb2 100644
--- a/appliances/airport/package.use
+++ b/appliances/airport/package.use
@@ -13,4 +13,5 @@ sys-fs/udev openrc
 sys-kernel/gentoo-sources symlink
 sys-libs/ncurses minimal
 
+dev-db/postgresql server
 www-servers/nginx http                                                               
diff --git a/appliances/airport/world b/appliances/airport/world
index b53561a..cc87d23 100644
--- a/appliances/airport/world
+++ b/appliances/airport/world
@@ -1,2 +1,2 @@
-dev-db/postgresql-server:9.3
+dev-db/postgresql:9.4
 www-servers/nginx