Version bump. Drop older.

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

3 files changed, 17 insertions, 67 deletions

diff --git a/dev-db/pgadmin3/ChangeLog b/dev-db/pgadmin3/ChangeLog
index f7e62c1c3b1b..64c1786573c3 100644
--- a/dev-db/pgadmin3/ChangeLog
+++ b/dev-db/pgadmin3/ChangeLog
@@ -1,6 +1,12 @@
 # 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.49 2010/08/30 20:18:21 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/ChangeLog,v 1.50 2010/09/21 08:59:43 scarabeus Exp $
+
+*pgadmin3-1.12.0 (21 Sep 2010)
+
+  21 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -pgadmin3-1.10.3.ebuild, -pgadmin3-1.10.5.ebuild, +pgadmin3-1.12.0.ebuild:
+  Version bump. Drop older.
 
 *pgadmin3-1.10.5 (30 Aug 2010)
 
diff --git a/dev-db/pgadmin3/pgadmin3-1.10.5.ebuild b/dev-db/pgadmin3/pgadmin3-1.10.5.ebuild
deleted file mode 100644
index fc03e03d971d..000000000000
--- a/dev-db/pgadmin3/pgadmin3-1.10.5.ebuild
+++ /dev/null
@@ -1,51 +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.5.ebuild,v 1.1 2010/08/30 20:18:21 patrick Exp $
-
-EAPI="2"
-
-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[X]
-	dev-db/postgresql-base
-	>=dev-libs/libxml2-2.5
-	>=dev-libs/libxslt-1.1"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/1.8.2-as_needed_ssl_detect_broken.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-wx-version=2.8 \
-		$(use_enable debug)
-}
-
-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.3.ebuild b/dev-db/pgadmin3/pgadmin3-1.12.0.ebuild
index 6bddd4fbff35..a83ce97ec835 100644
--- a/dev-db/pgadmin3/pgadmin3-1.10.3.ebuild
+++ b/dev-db/pgadmin3/pgadmin3-1.12.0.ebuild
@@ -1,19 +1,19 @@
 # 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.2 2010/07/05 20:18:58 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/pgadmin3-1.12.0.ebuild,v 1.1 2010/09/21 08:59:43 scarabeus Exp $
 
-EAPI="2"
+EAPI=3
 
 WX_GTK_VER="2.8"
 
-inherit wxwidgets eutils autotools
-
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+inherit wxwidgets
 
 DESCRIPTION="wxWidgets GUI for PostgreSQL."
 HOMEPAGE="http://www.pgadmin.org/"
-SRC_URI="mirror://postgresql/pgadmin3/release/v${PV}/src/${P}.tar.gz"
+SRC_URI="mirror://postgresql/${PN}/release/v${PV}/src/${P}.tar.gz"
+
 LICENSE="Artistic"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
 SLOT="0"
 IUSE="debug"
 
@@ -23,11 +23,6 @@ DEPEND="x11-libs/wxGTK:2.8[X]
 	>=dev-libs/libxslt-1.1"
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}/1.8.2-as_needed_ssl_detect_broken.patch"
-	eautoreconf
-}
-
 src_configure() {
 	econf \
 		--with-wx-version=2.8 \
@@ -38,14 +33,14 @@ src_install() {
 	emake DESTDIR="${D}" install || die "einstall failed"
 
 	insinto /usr/share/pixmaps
-	newins "${S}/pgadmin/include/images/elephant48.xpm" pgadmin3.xpm
+	newins "${S}/pgadmin/include/images/pgAdmin3.png" ${PN}.png || die
 
 	insinto /usr/share/pgadmin3
-	newins "${S}/pgadmin/include/images/elephant48.xpm" pgadmin3.xpm
+	newins "${S}/pgadmin/include/images/pgAdmin3.png" ${PN}.png || die
 
 	insinto /usr/share/applications
-	doins "${S}/pkg/pgadmin3.desktop"
+	doins "${S}/pkg/pgadmin3.desktop" || die
 
 	# Fixing world-writable files
-	chmod -R go-w "${D}/usr/share"
+	chmod -R go-w "${D}/usr/share" || die
 }