Fix wxgtk depend #247008, remove old

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/dev-db/pgadmin3/ChangeLog b/dev-db/pgadmin3/ChangeLog
index 092650a776847e0576467104f02f4d256e7038cd..3325f7fbc07a1d99c0706749d3e70b11da895c6c 100644 (file)
--- 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/Manifest b/dev-db/pgadmin3/Manifest
index cde38077e67904e249c159c8addde584b3451a72..9916fc8a7f89db876f5072091ab507545834d05e 100644 (file)
--- a/dev-db/pgadmin3/Manifest
+++ b/dev-db/pgadmin3/Manifest
@@ -1,17 +1,9 @@
 AUX 1.8.2-as_needed_ssl_detect_broken.patch 317 RMD160 08ec52c3f550444e84f58f0ccd4a1c0875178102 SHA1 2a70ecf74a47c65068fcdf77e2217dc645346c91 SHA256 7f3521c928e0d14118fc30a45c66ccc21722c839f63bfffce4fd40cf7ae4928d
-DIST pgadmin3-1.10.0.tar.gz 12042723 RMD160 1530e0b614b37a5feac9bbe61c7c95657a3c8a5b SHA1 1ad2b46d6859371eadd0f1b4bb200d042e8f39c2 SHA256 2628e1685c08d1106184cf847e7a38d35844f79aaf4907002a5c0ed54249b1d9
-DIST pgadmin3-1.10.1.tar.gz 12080090 RMD160 20c585cbcf26939d2772291fcc6ef20a55d3e611 SHA1 bb6706e539c623a824668de8ce135273ba8e7482 SHA256 9c5f977e9f5def562f947c89e0f9b20e17ccad2f186d56c0db5e3506be30a91b
 DIST pgadmin3-1.10.2.tar.gz 12091611 RMD160 1d81739eafda0afb6077f79a755a675ad09205f6 SHA1 8fefde8e22a40b7f3009203a90088bd1eb3ab846 SHA256 958dcd69b55597504d82299435321fe18af7ab5fa06dfb3649af625dccaa1695
 DIST pgadmin3-1.10.3.tar.gz 12098537 RMD160 8db5b45c946fb4ed990f8386cb193f56c9a0cca9 SHA1 d5895ca8be9cccf0faa626b2b7be0049dd4abf92 SHA256 787321b5a4ff0af9668a254e9547f5269374bd127ddc0b238e34a6d40ec3540e
-DIST pgadmin3-1.4.3.tar.gz 6786185 RMD160 5b5127b7596484e0da8935ceb49351f33ac8757e SHA1 ef6c8625aab2b2c79d4f6966cd6faaefe78df3de SHA256 77a6368dbc748a0164d543d0f660d21d31746677f84553ecbea1e2fffa30a352
 DIST pgadmin3-1.8.2.tar.gz 7951378 RMD160 302039687dac63e221844c21c0dfae8f042f3d92 SHA1 dc3117fb84dc77f13a2cf0518e46cd6067eaed15 SHA256 f86b84911b27e835810182443b20cf7826fe30af199d9abb2668502a7f10ec8f
-DIST pgadmin3-1.8.4.tar.gz 7973205 RMD160 466fa7fbb734f9bc63fb2375da0c87fe3d47b7f1 SHA1 c3103792c678183c5a9081daac56ebf467d674ff SHA256 c1920cc460b83edbbd140d070de61df5ae801868a9bdef1b5ec0cdd3b7aad92d
-EBUILD pgadmin3-1.10.0.ebuild 1270 RMD160 208a6f6278a0d523cac9511a4c0942462120901f SHA1 ef82392f7fc50768a893140daa380e979326f9dc SHA256 93f3f19f13f5339ffc6f05569a72cec0f2cec196c313f8ca83ff7210900e9d03
-EBUILD pgadmin3-1.10.1.ebuild 1270 RMD160 9f3f58411c5fa6332b63246fe606f29499b30203 SHA1 88d74b66165fb4acfecdd844cd187deac3561c08 SHA256 36d2b2686dcf65b3ca5f84f71c41cfdb417ee2dd26dcac568b27778154a8544e
-EBUILD pgadmin3-1.10.2.ebuild 1270 RMD160 da1bb9962c7da35abd624c0c73b6ed285c0f3391 SHA1 06b231f5b2b1119f1323de4111002673cad8e849 SHA256 fe2195a18ae59521e5947ca8bf0af9e11b85f7ff3c2bc4fcd3bebda6e1f65c12
-EBUILD pgadmin3-1.10.3.ebuild 1270 RMD160 f6e2082ec28362182ab2c5b415b783a82f1f1b5a SHA1 d775730fea75fd486c8028c25b496b83db39aac9 SHA256 0a3735c725fbb4f6a518181965f173ddb71f65b74f5f811ad951f2d77f09b11d
-EBUILD pgadmin3-1.4.3.ebuild 1560 RMD160 13240e6e65c5429ac73c38cd14d84ba6eab4f405 SHA1 82f7079f093ed067d2a8a8d3c0bd7c6a9d91b5c1 SHA256 a5c26dcb8bafc2d4191ec0b251914ae73021043187ebb1b0a136e75dad46df46
+EBUILD pgadmin3-1.10.2.ebuild 1223 RMD160 b4ba7a33b7150b8ebddf00b1e01a66f64d7d5663 SHA1 24199415735356eb268c56c1d9d547ba37b7d277 SHA256 2cd1b250968c88d992aecdde5ed2b79c73881817e9757efea29d04104b3e8424
+EBUILD pgadmin3-1.10.3.ebuild 1223 RMD160 7a448f50a96980b30a90cb4bf7c47bcbdaf0ea21 SHA1 792f74370d73e3ebf3c76d25e0d9bd9db3146598 SHA256 b251b5621b4e7a4867fa7efc74d551a0c2d4ff1a5a7d25fda32edf1e17843d38
 EBUILD pgadmin3-1.8.2.ebuild 1190 RMD160 221b35821a7379835aecd524f3f77a5e6d975760 SHA1 fcac92a653e957c0395c8929f5a4f3c5ffc049a4 SHA256 011b01bab8432815fec85740adb06b8561ff5b3ce1972c8d4013593f5f26aeb3
-EBUILD pgadmin3-1.8.4.ebuild 1269 RMD160 1f13ce0b71a053078679a519fbcf3267b82af9cd SHA1 7f66a9ff704db4c92bedf76ffb7da8139c7e8ac0 SHA256 fdfc2bb9abd4ee6021d2b64b25a20f57828027a7bd573d0b8201fb0bd0eb2962
-MISC ChangeLog 6286 RMD160 ff2ef3e1395d1020c62b2634db7021a4db3b252e SHA1 c037d445f9d3a81a7ab5040e46529fa855c3cc97 SHA256 59453d376df43871ef16acfcc52f88534fdf3bb8dbd271f0d9713eb2653a7728
+MISC ChangeLog 6526 RMD160 eef8a80aa1e1bab0ebdd6f86e981ae2f6e53ecb7 SHA1 562251950110fdcee4a862c10082b96f3ee6e17c SHA256 c92825f79d4cdde2d4a00b683425da4286aae784be85f02f425c6c4c29bcb96c
 MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b

diff --git a/dev-db/pgadmin3/pgadmin3-1.10.0.ebuild b/dev-db/pgadmin3/pgadmin3-1.10.0.ebuild
deleted file mode 100644 (file)
index 5c4c235..0000000
--- 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 (file)
index 0d6e443..0000000
--- 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 7963ef07e43275380971c4d9e0650cbff21ffa6a..989edade28f0af42856096737abbdb96350d4adb 100644 (file)
--- 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 2c26d92d02f1254ba8397028fe4b3f908a0468a0..6bddd4fbff358de24263045ed84fb51e4274925b 100644 (file)
--- 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 (file)
index 1e3ba9d..0000000
--- 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 (file)
index 428fbb1..0000000
--- 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"
-}