Big EAPI update and misc build fixes

10 files changed, 22 insertions, 20 deletions

diff --git a/dev-db/postgresql-fdw-mysql/Manifest b/dev-db/postgresql-fdw-mysql/Manifest
index e89e751..c206fee 100644
--- a/dev-db/postgresql-fdw-mysql/Manifest
+++ b/dev-db/postgresql-fdw-mysql/Manifest
@@ -1,4 +1,4 @@
 DIST REL-2_5_1.tar.gz 42615 BLAKE2B 54e7162a2740ee15bf060e443317d23954b9ed7809c782dc8953982fcbad815aa08876340e4c5085cbecab551116bd297b2894575f6d81633f1cae60b5d26d0d SHA512 a3b10f165b15ca4bfdefabb4f4d173b7fc94012278fb718737e18d6d7a5bcc1be6fb9e0f97626e0ab444e33f3b2426b35f7b9986c625c09977535d8e5fcb6951
 DIST REL-2_5_3.tar.gz 42804 BLAKE2B abefcaf890453ec842e80ace850b0faaf1468bda3717c50a4ef6e39324bc9c1a4a6997a6f057a33bfe4db313b84011ebc8a9e7b581678128676b57c6991ae58a SHA512 d9e74ac98003215d8a2e27e955c2d82faca6d1bf22884c9b3ed998fe88513d4a9003a8fe6e2eafb9d6df4e99a5a92db9612426afae27f1692d8807d478cfc912
 EBUILD postgresql-fdw-mysql-2.5.1-r1.ebuild 592 BLAKE2B d6b33c57d39450b3b45a9c77f893863cda6f9443649ce3690aef1bbac97ab0013867a13fb5a31738efc96f3788071c098de56fbc01440e808b846cc3a5958927 SHA512 1c65d9ef97f3642e42ac05f2152661b68321de395a946c93b23c1950b078a0e6d8b6105ba6725ecac3d01c6a07edcf5d317f0ccaa0e2497ef1916209d4a8c3a2
-EBUILD postgresql-fdw-mysql-2.5.3-r1.ebuild 590 BLAKE2B 57f92e2c28ed557a3a4d39bd6838e3ee959612e5c629d155b1b2908da4e411639488d6e00e26635c2e08f4c4917d4b7b448083f4b261bc094b2e40feae8459cd SHA512 c599e32b17564b192dbaf5346bc08df0114d098172f29abdc61577f4b36223c2c063a317475303070f44728022e80e8c63db881446b16b293c18ab8134506049
+EBUILD postgresql-fdw-mysql-2.5.3-r1.ebuild 594 BLAKE2B bfe9eeef574e3aa9f469fb22dd5fcdf65c85529bbab5dda008840c1d3e48a97fc6c9e1cfd24c54437eb5fdf60cad607c6013e1dc53b92e920fcc80e083619f54 SHA512 4cd380d2c08694157447f0861da6e9402ac513a7c19ebcc7242429568be436da79ee471d2eac0fed256f39b92512031c90a3f9046c2d0249c3734bd11688b6ce
diff --git a/dev-db/postgresql-fdw-mysql/postgresql-fdw-mysql-2.5.3-r1.ebuild b/dev-db/postgresql-fdw-mysql/postgresql-fdw-mysql-2.5.3-r1.ebuild
index 94d3017..197e5ce 100644
--- a/dev-db/postgresql-fdw-mysql/postgresql-fdw-mysql-2.5.3-r1.ebuild
+++ b/dev-db/postgresql-fdw-mysql/postgresql-fdw-mysql-2.5.3-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI="7"
 
 DESCRIPTION="PostgreSQL foreign data wrapper for MySQL"
 HOMEPAGE="https://github.com/EnterpriseDB/mysql_fdw"
@@ -22,10 +22,10 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 src_compile() {
-	make USE_PGXS=1
+	emake USE_PGXS=1
 }
 
 src_install() {
-	make USE_PGXS=1 install DESTDIR="${D}"
+	emake USE_PGXS=1 install DESTDIR="${D}"
 }
 
diff --git a/dev-db/postgresql-fdw-tds/Manifest b/dev-db/postgresql-fdw-tds/Manifest
index 1d1d9d9..d882135 100644
--- a/dev-db/postgresql-fdw-tds/Manifest
+++ b/dev-db/postgresql-fdw-tds/Manifest
@@ -1,2 +1,2 @@
-DIST v1.0.7.tar.gz 22290 BLAKE2B 95df7f8aa68a99f70025c4e404a2f99d13bf58fd4cf215384ccba7034207a817540e609172701d0e0650ef240de416d60b3f6961a67c571968a67e4330fa19f0 SHA512 55ec6cb5028055851170e9409b268ae2b23bddd38d0e4227b034b086384bfc4621f88219c6f9482203785600993bcfb4b132e1e3dca1e6a2222cb79ed65da4be
-EBUILD postgresql-fdw-tds-1.0.7.ebuild 554 BLAKE2B 2a67c0118d5ada8db7205cc5f3347910395c9e178d783778868e14938fcbc3edd28a6468237d537c355b189aad835d09524db524b20baf76c9152dded4d02077 SHA512 5f30554dece3f6cc1d2ce3af685e515530cbbdd732a7d27469b9f024283c3bbb5eda965bffc505a0585c5aaa6a71a1c838f76ed9d755ea17c55564ba8a9955d8
+DIST v2.0.1.tar.gz 62848 BLAKE2B 842ef665ab2f88eb16dfc4463d1cc1821a86b366030d68b7d216ebb7a05259c02f42b00ac349f360b5934af778e2ecd0ec2d83eaaee6ffb82ede8bb62b80618f SHA512 f76d0e226a2b783067f48c52c8c4489d889075395050ab3bed6f1050b8e5bf2361caf918d93673bd7b476f15643a24519e066f92cb1fee114f0bf162dc755fb6
+EBUILD postgresql-fdw-tds-2.0.1.ebuild 558 BLAKE2B fd23356e15d6a56bbd85e90ae3b42e7e208d787edb16aeb660954ba34e95b74a59c86ac8c2e67610919d671afea5ff82cc178e291cf3a4627cd96b14ac172ab3 SHA512 20c918ca6555ef7ea9dc35d1df6a646fc64217ea0070f68f853fe982fd4ea3abe5d39272ec9daed7b8cfc6d4a5460da93c9c9f393b062270082fe5a0333e5657
diff --git a/dev-db/postgresql-fdw-tds/postgresql-fdw-tds-1.0.7.ebuild b/dev-db/postgresql-fdw-tds/postgresql-fdw-tds-2.0.1.ebuild
index 435d032..37a2f4b 100644
--- a/dev-db/postgresql-fdw-tds/postgresql-fdw-tds-1.0.7.ebuild
+++ b/dev-db/postgresql-fdw-tds/postgresql-fdw-tds-2.0.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI="7"
 
 DESCRIPTION="PostgreSQL foreign data wrapper for TDS"
 HOMEPAGE="https://github.com/GeoffMontee/tds_fdw"
@@ -17,15 +17,15 @@ S="${WORKDIR}/tds_fdw-${PV}"
 
 DEPEND="
 	dev-db/freetds
-	>=dev-db/postgresql-9.1
+	>=dev-db/postgresql-9.2
 	"
 RDEPEND="${DEPEND}"
 
 src_compile() {
-	make USE_PGXS=1
+	emake USE_PGXS=1
 }
 
 src_install() {
-	make USE_PGXS=1 install DESTDIR="${D}"
+	emake USE_PGXS=1 install DESTDIR="${D}"
 }
 
diff --git a/dev-db/postgresql_autodoc/Manifest b/dev-db/postgresql_autodoc/Manifest
index 8743388..553f438 100644
--- a/dev-db/postgresql_autodoc/Manifest
+++ b/dev-db/postgresql_autodoc/Manifest
@@ -1,2 +1,2 @@
-DIST 11c3c47ae009360d7633ba24c130285fbca18277.tar.gz 32894 BLAKE2B 7fbaf9ada60ebf153dc666c2410d7985b95d9a1b33f6a87304f7409f89c771bcb3af13778879c725d4f8b244e2df7aec24db2f1f77211a5a986b10dfb05434d9 SHA512 4820bdfc8c54cc5244fafd75e589d2bd7d60620dcba10ca21775c6267620583f6f859e32aa70b372cc2e99d3e7dc9515989026dccd9f4c8939cdd0340e71eb6e
-EBUILD postgresql_autodoc-1.41.20171101.ebuild 752 BLAKE2B 34e272b752b4e254f2e60f80debfb78a43decb06b72ea79469eea3ad1f5285b06ea9dc763524f648508e7979d4449b1caed7a20af8716108e52c3716a4394a3b SHA512 9a3632c948eb51686832672d39b13206bb8994027fdf55fece559753d05c8c9df307551680c1fe895ceab07c83f9bf159dec90cd63758f1e57a87355a4f4ff43
+DIST postgresql_autodoc-1.41.20171101.tar.gz 32894 BLAKE2B 7fbaf9ada60ebf153dc666c2410d7985b95d9a1b33f6a87304f7409f89c771bcb3af13778879c725d4f8b244e2df7aec24db2f1f77211a5a986b10dfb05434d9 SHA512 4820bdfc8c54cc5244fafd75e589d2bd7d60620dcba10ca21775c6267620583f6f859e32aa70b372cc2e99d3e7dc9515989026dccd9f4c8939cdd0340e71eb6e
+EBUILD postgresql_autodoc-1.41.20171101.ebuild 811 BLAKE2B e2b565d110201b19d1deed8cd45a6e4291f7e276660aa2ff2222eda5e68d66ffea7b118c89162e34c01063e7cb99a64cb849f8ac12692c18b36b6468a523caa5 SHA512 58e292bd7d29a6e92714e42efb88d56f6eddeac32bb3d90ad4ba7bb41a7c1d446394c872150f849baef9e71beb73814d570e1b8671be62fa926f1f6c931fb592
diff --git a/dev-db/postgresql_autodoc/postgresql_autodoc-1.41.20171101.ebuild b/dev-db/postgresql_autodoc/postgresql_autodoc-1.41.20171101.ebuild
index c0adc27..f92f35c 100644
--- a/dev-db/postgresql_autodoc/postgresql_autodoc-1.41.20171101.ebuild
+++ b/dev-db/postgresql_autodoc/postgresql_autodoc-1.41.20171101.ebuild
@@ -2,10 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvs/lportage/dev-db/postgresql_autodoc/postgresql_autodoc-1.31.ebuild,v 1.1 2008-11-13 19:20:50 dan.goodliffe Exp $
 
+EAPI="7"
 DESCRIPTION="PostgreSQL Autodoc"
 HOMEPAGE="https://github.com/cbbrowne/autodoc"
 COMMIT_HASH="11c3c47ae009360d7633ba24c130285fbca18277"
-SRC_URI="https://github.com/cbbrowne/autodoc/archive/${COMMIT_HASH}.tar.gz"
+SRC_URI="https://github.com/cbbrowne/autodoc/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
 
 LICENSE=""
 SLOT="0"
@@ -20,9 +21,10 @@ DEPEND="
 	sys-apps/sed
 	dev-lang/perl"
 RDEPEND="${DEPEND}"
+S="$WORKDIR/autodoc-$COMMIT_HASH"
 
 src_install() {
-	make \
+	emake \
 		PREFIX="/usr" \
 		DESTDIR="${D}" \
 		install -C "${WORKDIR}/autodoc-${COMMIT_HASH}"
diff --git a/dev-db/squirrel-sql/Manifest b/dev-db/squirrel-sql/Manifest
index ce90583..3f75553 100644
--- a/dev-db/squirrel-sql/Manifest
+++ b/dev-db/squirrel-sql/Manifest
@@ -1,6 +1,6 @@
 DIST squirrelsql-3.7.1-optional.zip 53858852 BLAKE2B 55fdbb0427f69d0545850810f24d3b3e9c1db74425e2e4382dd96ead0ecaececa52a48566090fb85b374dd7f540c6579dd598cde92fcfdfda24442e1f9de38a2 SHA512 88b4b7bc41fd42914489b7a0e14b10213612fee3268705e2c4aa9de56f12855aabed4fc5a178f3f6f7e2c9ab1607d64cfc42ade5c9f0b0ce5403d27d03a9f005
 DIST squirrelsql-3.8.1-optional.zip 57206115 BLAKE2B 258c3c047df8ff48b1a19c139dc123b3f9154143d500c52fb1e8735a06f214e03f34ea65ae652f5ba0fd9970bdff1fe9471d4c2d4d0d22702932a5d7c23fa782 SHA512 9dbbf22287e369c5b42f9c20002659efb0fd32b7f9eae0cc51b92cde884e815f746caad205d3dfb042a3551b202ce2c4a82a5e060a61f6ee4ae1ce8931dc6f98
 DIST squirrelsql-3.9.1-optional.zip 57129398 BLAKE2B be7ffa18a4c6a6899f5e43f399200324423164dbfc05ad89b3fa95fd2d0ad98d1972aa2db00e61aaaaa9fec222dd74fa33bff2a5fd19939dbf9bd476ffbe81bc SHA512 b1c5cbdb255c328e4d61763398b4908a130931a5de3333acb5098b505627020900e70b260b3d626ff532611419faf63e9cf37b950b8ea5fed4972ae7aa0b50e0
-EBUILD squirrel-sql-3.7.1.ebuild 872 BLAKE2B 034c02fce6d2f1ca350a391d61c4fbde61fcabf026c84ea8ca395915623219c08def58d34424e4f120f62c422a757fa37125bc4679e02a9613a5d88b41c15c16 SHA512 d1a45595d148e910b04816e59d83a73541a1baada27f607524656268165344517e262e878ea77753e7ab6f0bf3b84dbce0317680c4a461d33f651222c9569708
-EBUILD squirrel-sql-3.8.1.ebuild 872 BLAKE2B 034c02fce6d2f1ca350a391d61c4fbde61fcabf026c84ea8ca395915623219c08def58d34424e4f120f62c422a757fa37125bc4679e02a9613a5d88b41c15c16 SHA512 d1a45595d148e910b04816e59d83a73541a1baada27f607524656268165344517e262e878ea77753e7ab6f0bf3b84dbce0317680c4a461d33f651222c9569708
-EBUILD squirrel-sql-3.9.1.ebuild 872 BLAKE2B 034c02fce6d2f1ca350a391d61c4fbde61fcabf026c84ea8ca395915623219c08def58d34424e4f120f62c422a757fa37125bc4679e02a9613a5d88b41c15c16 SHA512 d1a45595d148e910b04816e59d83a73541a1baada27f607524656268165344517e262e878ea77753e7ab6f0bf3b84dbce0317680c4a461d33f651222c9569708
+EBUILD squirrel-sql-3.7.1.ebuild 874 BLAKE2B 501b4534cefb15ff3252db1adbe4c2d816e46eb00aea15f561689d7b5768306e82c2842c2ad1ce81d6c35df59a5f85d5e6f7ae6528f69a45dcd2b77148c2231b SHA512 9b05d81cd767d827644d37015247a65eac81106b7bab7a2bfdd9b4c904fcdddb2f2572a02c222a260f2d3dfa43d819277b7a95f8ae4dbb0f21ae0a551f119d4a
+EBUILD squirrel-sql-3.8.1.ebuild 874 BLAKE2B 501b4534cefb15ff3252db1adbe4c2d816e46eb00aea15f561689d7b5768306e82c2842c2ad1ce81d6c35df59a5f85d5e6f7ae6528f69a45dcd2b77148c2231b SHA512 9b05d81cd767d827644d37015247a65eac81106b7bab7a2bfdd9b4c904fcdddb2f2572a02c222a260f2d3dfa43d819277b7a95f8ae4dbb0f21ae0a551f119d4a
+EBUILD squirrel-sql-3.9.1.ebuild 874 BLAKE2B 501b4534cefb15ff3252db1adbe4c2d816e46eb00aea15f561689d7b5768306e82c2842c2ad1ce81d6c35df59a5f85d5e6f7ae6528f69a45dcd2b77148c2231b SHA512 9b05d81cd767d827644d37015247a65eac81106b7bab7a2bfdd9b4c904fcdddb2f2572a02c222a260f2d3dfa43d819277b7a95f8ae4dbb0f21ae0a551f119d4a
diff --git a/dev-db/squirrel-sql/squirrel-sql-3.7.1.ebuild b/dev-db/squirrel-sql/squirrel-sql-3.7.1.ebuild
index 14b9518..57462a3 100644
--- a/dev-db/squirrel-sql/squirrel-sql-3.7.1.ebuild
+++ b/dev-db/squirrel-sql/squirrel-sql-3.7.1.ebuild
@@ -1,4 +1,4 @@
-EAPI=6
+EAPI="7"
 
 DESCRIPTION="SQuirreL SQL Client is a graphical Java program that will allow you to view the structure of a JDBC compliant database, browse the data in tables, issue SQL commands etc"
 HOMEPAGE="http://www.squirrelsql.org/"
diff --git a/dev-db/squirrel-sql/squirrel-sql-3.8.1.ebuild b/dev-db/squirrel-sql/squirrel-sql-3.8.1.ebuild
index 14b9518..57462a3 100644
--- a/dev-db/squirrel-sql/squirrel-sql-3.8.1.ebuild
+++ b/dev-db/squirrel-sql/squirrel-sql-3.8.1.ebuild
@@ -1,4 +1,4 @@
-EAPI=6
+EAPI="7"
 
 DESCRIPTION="SQuirreL SQL Client is a graphical Java program that will allow you to view the structure of a JDBC compliant database, browse the data in tables, issue SQL commands etc"
 HOMEPAGE="http://www.squirrelsql.org/"
diff --git a/dev-db/squirrel-sql/squirrel-sql-3.9.1.ebuild b/dev-db/squirrel-sql/squirrel-sql-3.9.1.ebuild
index 14b9518..57462a3 100644
--- a/dev-db/squirrel-sql/squirrel-sql-3.9.1.ebuild
+++ b/dev-db/squirrel-sql/squirrel-sql-3.9.1.ebuild
@@ -1,4 +1,4 @@
-EAPI=6
+EAPI="7"
 
 DESCRIPTION="SQuirreL SQL Client is a graphical Java program that will allow you to view the structure of a JDBC compliant database, browse the data in tables, issue SQL commands etc"
 HOMEPAGE="http://www.squirrelsql.org/"