Fix wxgtk depend #247008, remove old

(Portage version: 2.2_rc67/cvs/Linux x86_64)

7 files changed, 16 insertions, 244 deletions

diff --git a/dev-db/pgadmin3/ChangeLog b/dev-db/pgadmin3/ChangeLog
index 092650a77684..3325f7fbc07a 100644
--- a/dev-db/pgadmin3/ChangeLog
+++ b/dev-db/pgadmin3/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/pgadmin3
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/ChangeLog,v 1.45 2010/07/05 20:00:01 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/ChangeLog,v 1.46 2010/07/05 20:18:58 patrick Exp $
+
+  05 Jul 2010; Patrick Lauer <patrick@gentoo.org> -pgadmin3-1.4.3.ebuild,
+  -pgadmin3-1.8.4.ebuild, -pgadmin3-1.10.0.ebuild, -pgadmin3-1.10.1.ebuild,
+  pgadmin3-1.10.2.ebuild, pgadmin3-1.10.3.ebuild:
+  Fix wxgtk depend #247008, remove old
 
 *pgadmin3-1.10.3 (05 Jul 2010)
 
diff --git a/dev-db/pgadmin3/pgadmin3-1.10.0.ebuild b/dev-db/pgadmin3/pgadmin3-1.10.0.ebuild
deleted file mode 100644
index 5c4c2354870d..000000000000
--- a/dev-db/pgadmin3/pgadmin3-1.10.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/pgadmin3-1.10.0.ebuild,v 1.2 2010/06/17 18:16:44 patrick Exp $
-
-EAPI="1"
-
-WX_GTK_VER="2.8"
-
-inherit wxwidgets eutils autotools
-
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
-
-DESCRIPTION="wxWidgets GUI for PostgreSQL."
-HOMEPAGE="http://www.pgadmin.org/"
-SRC_URI="mirror://postgresql/pgadmin3/release/v${PV}/src/${P}.tar.gz"
-LICENSE="Artistic"
-SLOT="0"
-IUSE="debug"
-
-DEPEND="x11-libs/wxGTK:2.8
-	dev-db/postgresql-base
-	>=dev-libs/libxml2-2.5
-	>=dev-libs/libxslt-1.1"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/1.8.2-as_needed_ssl_detect_broken.patch"
-	eautoreconf
-}
-
-src_compile() {
-	econf \
-		--with-wx-version=2.8 \
-		$(use_enable debug)
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "einstall failed"
-
-	insinto /usr/share/pixmaps
-	newins "${S}/pgadmin/include/images/elephant48.xpm" pgadmin3.xpm
-
-	insinto /usr/share/pgadmin3
-	newins "${S}/pgadmin/include/images/elephant48.xpm" pgadmin3.xpm
-
-	insinto /usr/share/applications
-	doins "${S}/pkg/pgadmin3.desktop"
-
-	# Fixing world-writable files
-	chmod -R go-w "${D}/usr/share"
-}
diff --git a/dev-db/pgadmin3/pgadmin3-1.10.1.ebuild b/dev-db/pgadmin3/pgadmin3-1.10.1.ebuild
deleted file mode 100644
index 0d6e44315a32..000000000000
--- a/dev-db/pgadmin3/pgadmin3-1.10.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/pgadmin3-1.10.1.ebuild,v 1.2 2010/06/17 18:16:44 patrick Exp $
-
-EAPI="1"
-
-WX_GTK_VER="2.8"
-
-inherit wxwidgets eutils autotools
-
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
-
-DESCRIPTION="wxWidgets GUI for PostgreSQL."
-HOMEPAGE="http://www.pgadmin.org/"
-SRC_URI="mirror://postgresql/pgadmin3/release/v${PV}/src/${P}.tar.gz"
-LICENSE="Artistic"
-SLOT="0"
-IUSE="debug"
-
-DEPEND="x11-libs/wxGTK:2.8
-	dev-db/postgresql-base
-	>=dev-libs/libxml2-2.5
-	>=dev-libs/libxslt-1.1"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/1.8.2-as_needed_ssl_detect_broken.patch"
-	eautoreconf
-}
-
-src_compile() {
-	econf \
-		--with-wx-version=2.8 \
-		$(use_enable debug)
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "einstall failed"
-
-	insinto /usr/share/pixmaps
-	newins "${S}/pgadmin/include/images/elephant48.xpm" pgadmin3.xpm
-
-	insinto /usr/share/pgadmin3
-	newins "${S}/pgadmin/include/images/elephant48.xpm" pgadmin3.xpm
-
-	insinto /usr/share/applications
-	doins "${S}/pkg/pgadmin3.desktop"
-
-	# Fixing world-writable files
-	chmod -R go-w "${D}/usr/share"
-}
diff --git a/dev-db/pgadmin3/pgadmin3-1.10.2.ebuild b/dev-db/pgadmin3/pgadmin3-1.10.2.ebuild
index 7963ef07e432..989edade28f0 100644
--- a/dev-db/pgadmin3/pgadmin3-1.10.2.ebuild
+++ b/dev-db/pgadmin3/pgadmin3-1.10.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/pgadmin3-1.10.2.ebuild,v 1.2 2010/06/17 18:16:44 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/pgadmin3-1.10.2.ebuild,v 1.3 2010/07/05 20:18:58 patrick Exp $
 
-EAPI="1"
+EAPI="2"
 
 WX_GTK_VER="2.8"
 
@@ -17,24 +17,21 @@ LICENSE="Artistic"
 SLOT="0"
 IUSE="debug"
 
-DEPEND="x11-libs/wxGTK:2.8
+DEPEND="x11-libs/wxGTK:2.8[X]
 	dev-db/postgresql-base
 	>=dev-libs/libxml2-2.5
 	>=dev-libs/libxslt-1.1"
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}/1.8.2-as_needed_ssl_detect_broken.patch"
 	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	econf \
 		--with-wx-version=2.8 \
 		$(use_enable debug)
-	emake || die "emake failed"
 }
 
 src_install() {
diff --git a/dev-db/pgadmin3/pgadmin3-1.10.3.ebuild b/dev-db/pgadmin3/pgadmin3-1.10.3.ebuild
index 2c26d92d02f1..6bddd4fbff35 100644
--- a/dev-db/pgadmin3/pgadmin3-1.10.3.ebuild
+++ b/dev-db/pgadmin3/pgadmin3-1.10.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/pgadmin3-1.10.3.ebuild,v 1.1 2010/07/05 20:00:01 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/pgadmin3-1.10.3.ebuild,v 1.2 2010/07/05 20:18:58 patrick Exp $
 
-EAPI="1"
+EAPI="2"
 
 WX_GTK_VER="2.8"
 
@@ -17,24 +17,21 @@ LICENSE="Artistic"
 SLOT="0"
 IUSE="debug"
 
-DEPEND="x11-libs/wxGTK:2.8
+DEPEND="x11-libs/wxGTK:2.8[X]
 	dev-db/postgresql-base
 	>=dev-libs/libxml2-2.5
 	>=dev-libs/libxslt-1.1"
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}/1.8.2-as_needed_ssl_detect_broken.patch"
 	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	econf \
 		--with-wx-version=2.8 \
 		$(use_enable debug)
-	emake || die "emake failed"
 }
 
 src_install() {
diff --git a/dev-db/pgadmin3/pgadmin3-1.4.3.ebuild b/dev-db/pgadmin3/pgadmin3-1.4.3.ebuild
deleted file mode 100644
index 1e3ba9d80354..000000000000
--- a/dev-db/pgadmin3/pgadmin3-1.4.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/pgadmin3-1.4.3.ebuild,v 1.8 2010/06/17 18:16:44 patrick Exp $
-
-inherit wxwidgets eutils autotools
-
-KEYWORDS="alpha amd64 ppc sparc x86"
-
-DESCRIPTION="wxWidgets GUI for PostgreSQL."
-HOMEPAGE="http://www.pgadmin.org/"
-SRC_URI="mirror://postgresql/pgadmin3/release/v${PV}/src/${P}.tar.gz"
-LICENSE="Artistic"
-SLOT="0"
-IUSE="debug"
-
-DEPEND="=x11-libs/wxGTK-2.6*
-	>=dev-db/postgresql-base-7.4
-	>=dev-libs/libxml2-2.5
-	>=dev-libs/libxslt-1.1"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	export WX_GTK_VER=2.6
-	export WX_HOME=/usr
-	need-wxwidgets unicode
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# --debug=yes/no for wx_config is only needed if wxGTK debug and
-	# release versions are installed aside. Which is not possible
-	# on Gentoo at the moment.
-	sed -i \
-		-e 's/--debug=[yesno]* //g' \
-		acinclude.m4 || die "sed failed"
-	eautoreconf
-}
-
-src_compile() {
-	cd "${S}"
-
-	# pgadmin3 inserts WX_HOME before the WX_CONFIG path below, so we have to strip "/usr" from it
-	econf \
-		--with-wx-config=${WX_CONFIG/\/usr} \
-		$(use_enable debug) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	cd "${S}"
-
-	einstall || die "einstall failed"
-
-	insinto /usr/share/pixmaps
-	newins "${S}/src/include/images/elephant48.xpm" pgadmin3.xpm
-
-	insinto /usr/share/pgadmin3
-	newins "${S}/src/include/images/elephant48.xpm" pgadmin3.xpm
-
-	insinto /usr/share/applications
-	doins "${S}/pkg/pgadmin3.desktop"
-}
diff --git a/dev-db/pgadmin3/pgadmin3-1.8.4.ebuild b/dev-db/pgadmin3/pgadmin3-1.8.4.ebuild
deleted file mode 100644
index 428fbb15873b..000000000000
--- a/dev-db/pgadmin3/pgadmin3-1.8.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/pgadmin3-1.8.4.ebuild,v 1.3 2010/06/17 18:16:44 patrick Exp $
-
-EAPI="1"
-
-WX_GTK_VER="2.8"
-
-inherit wxwidgets eutils autotools
-
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
-
-DESCRIPTION="wxWidgets GUI for PostgreSQL."
-HOMEPAGE="http://www.pgadmin.org/"
-SRC_URI="mirror://postgresql/pgadmin3/release/v${PV}/src/${P}.tar.gz"
-LICENSE="Artistic"
-SLOT="0"
-IUSE="debug"
-
-DEPEND="x11-libs/wxGTK:2.8
-	dev-db/postgresql-base
-	>=dev-libs/libxml2-2.5
-	>=dev-libs/libxslt-1.1"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/1.8.2-as_needed_ssl_detect_broken.patch"
-	eautoreconf
-}
-
-src_compile() {
-	econf \
-		--with-wx-version=2.8 \
-		$(use_enable debug)
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "einstall failed"
-
-	insinto /usr/share/pixmaps
-	newins "${S}/pgadmin/include/images/elephant48.xpm" pgadmin3.xpm
-
-	insinto /usr/share/pgadmin3
-	newins "${S}/pgadmin/include/images/elephant48.xpm" pgadmin3.xpm
-
-	insinto /usr/share/applications
-	doins "${S}/pkg/pgadmin3.desktop"
-
-	# Fixing world-writable files
-	chmod -R go-w "${D}/usr/share"
-}