Update pconfigure to 0.11.0

4 files changed, 51 insertions, 35 deletions

diff --git a/sys-devel/pconfigure/Manifest b/sys-devel/pconfigure/Manifest
index 330a6ba..ed966e4 100644
--- a/sys-devel/pconfigure/Manifest
+++ b/sys-devel/pconfigure/Manifest
@@ -1,10 +1,9 @@
 AUX pconfigure-0.10.4-bootstrap.patch 803 SHA256 d85ef34c9419b850ca011fb89116cea1dabf5c42e8b56b3c2375a3de35965c2f SHA512 42517f68008a94afe8abc0e8a0ed1d3c37abde6e9ffccba9c293340e747c8a70ed1551486ad71eb271f8ccf699371de3929d196b44d7ada8cd0db084e917ac8b WHIRLPOOL b7211f7b6454ad14561a81762cb811bdd398d36bff88b78561bf2f9f196e8259b4cb6c56409da0c8d7ebdee8a60fcac74a9a7a4aa8d8e52e7056421426d102a3
+AUX pconfigure-0.11.0-destdir.patch 2061 SHA256 3bad722d97f63f1e75b101aeab29a9068edbb880b10761161c95b42ad009cd7f SHA512 362e675daf92478e528832e840e589ab52ae28d4295c8550bc8801c826849533b4b1f7077b0eb8aa0c3e76e9b5a996609fa70705b42c8ac1f54cfa9afd141b21 WHIRLPOOL 0b29b0ded8af6805b82b441da79ca3dfb3beed3c4cd4ec5feacf8dfa9eb95f3671ec685802f6d4729d0c04e36eafa7711e7fababd890110a3cf976e57db2b6d5
 AUX pconfigure-0.9.4-glibc_2.20.patch 1044 SHA256 318b4df9d268bee5bc428143fcad537f78bdb8a1c3ab370503f6908803d4844b SHA512 5530d1636280cba4b5aaa808628fa03d963e2416f9c518b6408459a4b7256c2c91f4c5f88d7e0df9793f0722ca80250bf0a94b7479de476dcb5de6358503f9a2 WHIRLPOOL fcc2aaca13bc53cd5b9c298fede769d8542cbfab22ef8502c9474d8d6af39238e400ab3fe48c29514df0218158118812df6487579b9e53b7bab98481a3bf1375
-DIST pconfigure-0.10.3.tar.gz 172786 SHA256 89abbee1c5cab4fdf5cb7b1c4d80dac7911ced438894821ae7d6674c336707e8 SHA512 bde9a065b6e4397ac6274f7b9bfc7256cc4056170e95e815374d7720462402e8ed18b233a12b881af1572ed11dca1441ed3570ba60936d9ebf411b85e7feca03 WHIRLPOOL 65abbf8cd719a30a211a166acff1e317b496e00723409fa7cce6fc9ec681d19fc5676bd5b391bffd8775e86bf6fbf564506f2c8416c2bde9815c042e89161718
 DIST pconfigure-0.10.4.tar.gz 177891 SHA256 b2ff6a338aae1753463625a32a152d9b13a221418660a5c5ee880b3fa5571533 SHA512 0703a186d34660bb83d3472ec8fc75d3457702a4a92cfe6797982960d7f9d7f62d83eb7cb68dbb7cc7d3d09ebe20492234b661d096df1db448af9b9eca55ded5 WHIRLPOOL cca2d9066c1b80486d1f9d4750565bd97ee718c9d8d2763641d81108b4a5b2f8f7a17c15693ba2509c7fcccc989d9184adf261fc25574527e11b3c2f0040f3b7
-DIST pconfigure-0.9.2.tar.gz 154149 SHA256 fda942653e5ba279f3f6250a0282275802bc81979f1d1e78768ee3cacb0b9694 SHA512 a27e0d75cc5425eb40cc718fa781685433f1dd5ff0f6bbb262cd1e0d8e1d5b369a25ccd5c046adadc843e392279d18b696e165402fed2758ba36dbafb600f3f3 WHIRLPOOL f9e22e6e28b67ca62e7a68798e6ee7a13fef388922f847a635e775bde251efca66bcb16d6688e26d01399b53aa9734c8e89ef0825ce9aa1bb12f243dd971041c
+DIST pconfigure-0.11.0.tar.gz 254808 SHA256 10033650f6f727c87901d4210001eaa053052735013ec3ca70a8bfb374eddf9e SHA512 bcac5c091df6863bda61832f48203121be0e4137fe905bd4d2f067096c6ef2d3baeeea2928902a4472911886745dd4b3ee29697cde911e4fb349ae7f949a793c WHIRLPOOL 677ee229bd5064d5b8008e3e3350b044d02559db8a4fec26f09d506f4ddc0b0c18b0875c0ec84afd3dbffd23c173be05de432ae1bb397d64ce65cdee140c4c5c
 DIST pconfigure-0.9.4.tar.gz 164913 SHA256 e29319a02637823a063b7b01394a3235069a5d1b6bdb622d87707605c93a9983 SHA512 8449f477848d077dde187d58aa2b7636902d107c6a226a16dfb92ff8b467758f209f3b6b0bd7b41b34e5e9acb42e2750d72712e59368bace0c592296c075c644 WHIRLPOOL df0560dc64fe9fa2b9dafdac699ac1dbba18e8e538121d79fc7364fb837f7e3eddd25e346aadb146283e72b7cb8d42faf67a3bdfc3ad5ba217448476c2a8c021
-EBUILD pconfigure-0.10.3.ebuild 750 SHA256 6decba3ce198e251b36dd7aa0b1db1f7332e9d771a1d693a3e7fca34ac14950d SHA512 25d4f5726061f29a4f77eeb2fc6ec904237ba1155a98391de9939ce83feec72e8c2e897d95f37f0e38628c6d17707f5d7e4a75b4b83a6fc1690ef64becd727f1 WHIRLPOOL b15dcdda27bd89f63e8d1d3d20b0178d0c12479b67e13385257dc1c7f34f09b9b7314d3c0f1e7277d6302e4471cb6c48fba49d5abd67e131757b8baa7a9f7e89
 EBUILD pconfigure-0.10.4.ebuild 906 SHA256 ee91c2c72d7c44f64eaeeea22db2653bef0103db3c94a74734443bb7a19ef99b SHA512 68eb99223a13267784e0fc9f33982fda683bc068b87b6d6969414bc85cc0913365f0494faacf13391ad94c5646746472634b581983b1f9df2f2a8b3723200a42 WHIRLPOOL 1ebf5c6f03e13613e74a0f7660dcdb86fcd85ee3f194906ee5e1f6e3c5dafbf0b54e276022415f0ecbe9c2217284d21e9b1ce4aba15c6a0f4255a43e26ff89e4
-EBUILD pconfigure-0.9.2.ebuild 833 SHA256 c0032acc004d1becda5071cf9d176b2d64b8dae710313e2b584758caa0711d54 SHA512 7eff9612c0e2799ca48f2c4ebcbf544c093f99da1f50935addb4ca1c1cc36ba772bafe13dd43d81e97163dbd7a328504b27a4ab25be9925b37c97783bbc7b139 WHIRLPOOL ab4f8979cdd7500ce449c60850963d3f04e3587a4b688ee9d698cb71f0a05e9d09de1ca3c7bf8cfcb7530f99e47dca1dfbecd7e67f0aac430af9b1a78299d057
+EBUILD pconfigure-0.11.0.ebuild 1031 SHA256 2d7f78ef9987ccb88ca607e5e8c535b23ab8e2b723ebc364df070b169285be62 SHA512 aa06f9fa8c18146894f70ac6fbed035355f7a5daee239ba2cd3184ce6fc3079b4b13f264dbc71e47eed9557818a4cb1d70c5c5671192057f104aa0d4139e8d44 WHIRLPOOL 98b8684021708552b777b7bb2f618e4a388c9f8bbd3169613f07239a57c37b120f70114ceac31e41a977d46a1ad1c6d4178e72d8040ced1075f675235f84c90e
 EBUILD pconfigure-0.9.4-r1.ebuild 907 SHA256 a59f0d9df1a1065ad004f8b8ab9c1c3241f966c29f69ab5e411136c1c7e89753 SHA512 ef2b4acafceee35f165b6e4fa6c2b1b38c2b7e87a86284fc246bf0dbff1198819a84e657dca4acc34aa8af8d8e7166ffcc471cfdbb75a23d0e1dda3a7989dedc WHIRLPOOL 98afa6c2835ef27eebf8cc4f9faf3d97141a854c36dd411a205dbaab75588246c89fb4bd094e137d34bae12fbb1e76f208db08a226fd5d3169370c59adac0bbc
diff --git a/sys-devel/pconfigure/files/pconfigure-0.11.0-destdir.patch b/sys-devel/pconfigure/files/pconfigure-0.11.0-destdir.patch
new file mode 100644
index 0000000..6c72d0b
--- /dev/null
+++ b/sys-devel/pconfigure/files/pconfigure-0.11.0-destdir.patch
@@ -0,0 +1,39 @@
+diff --git a/src/pconfigure++/languages/bash.c++ b/src/pconfigure++/languages/bash.c++
+index 69b6df5..134b211 100644
+--- a/src/pconfigure++/languages/bash.c++
++++ b/src/pconfigure++/languages/bash.c++
+@@ -128,7 +128,7 @@ language_bash::targets(const context::ptr& ctx) const
+                                                              commands,
+                                                              comment);
+ 
+-        auto install_path = ctx->prefix + "/" + target;
++        auto install_path = "$(DESTDIR)/" + ctx->prefix + "/" + target;
+ 
+         auto global_install_targets = std::vector<makefile::global_targets>{
+             makefile::global_targets::INSTALL,
+diff --git a/src/pconfigure++/languages/cxx.c++ b/src/pconfigure++/languages/cxx.c++
+index 8c330c6..a6e22ed 100644
+--- a/src/pconfigure++/languages/cxx.c++
++++ b/src/pconfigure++/languages/cxx.c++
+@@ -581,7 +581,7 @@ language_cxx::link_objects(const context::ptr& ctx,
+      * Makefile, we build the "copy" targets that depend on the generated
+      * Makefile. */
+     auto cp_install_target = std::make_shared<cp_target>(
+-        ctx->prefix + "/" + bin_dir + "/" + ctx->cmd->data(),
++        "$(DESTDIR)/" + ctx->prefix + "/" + bin_dir + "/" + ctx->cmd->data(),
+         install_target,
+         language_cxx::install_target::TRUE,
+         shared_comments + std::vector<std::string>{"cp_install_target"}
+diff --git a/src/pconfigure++/languages/implicit_h.c++ b/src/pconfigure++/languages/implicit_h.c++
+index 323e21e..c56bc33 100644
+--- a/src/pconfigure++/languages/implicit_h.c++
++++ b/src/pconfigure++/languages/implicit_h.c++
+@@ -63,7 +63,7 @@ language_implicit_h::targets(const context::ptr& ctx) const
+             abort();
+         }
+ 
+-        auto install_path = ctx->prefix + "/" + ctx->hdr_dir + ctx->cmd->data();
++        auto install_path = "$(DESTDIR)/" + ctx->prefix + "/" + ctx->hdr_dir + ctx->cmd->data();
+         auto header_path = ctx->hdr_dir + "/" + ctx->cmd->data();
+         
+         auto global_install_targets = std::vector<makefile::global_targets>{
diff --git a/sys-devel/pconfigure/pconfigure-0.10.3.ebuild b/sys-devel/pconfigure/pconfigure-0.10.3.ebuild
deleted file mode 100644
index 1e10621..0000000
--- a/sys-devel/pconfigure/pconfigure-0.10.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-EAPI="4"
-inherit eutils
-
-DESCRIPTION="Palmer Dabbelt's Configure Replacement"
-HOMEPAGE="http://www.dabbelt.com/~palmer/software/pconfigure/"
-SRC_URI="https://github.com/palmer-dabbelt/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 amd64-linux arm"
-IUSE="scala"
-
-RDEPEND="dev-util/pkgconfig
-         dev-util/strace
-	 sys-devel/make
-         sys-devel/gcc
-         sys-libs/talloc
-         scala? ( dev-lang/scala )
-         "
-
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	echo "LANGUAGES += c" >> Configfile.local
-	echo "COMPILEOPTS += -DPBASHC_SHEBANG=\\\"\#\!${EPREFIX}/bin/bash\\\""\
-	     >> Configfile.local
-
-        sh bootstrap.sh --prefix ${EPREFIX}/usr \
-           || die "Failed to bootstap pconfigure"
-}
diff --git a/sys-devel/pconfigure/pconfigure-0.9.2.ebuild b/sys-devel/pconfigure/pconfigure-0.11.0.ebuild
index 2a1d84e..56dee67 100644
--- a/sys-devel/pconfigure/pconfigure-0.9.2.ebuild
+++ b/sys-devel/pconfigure/pconfigure-0.11.0.ebuild
@@ -7,7 +7,7 @@ SRC_URI="https://github.com/palmer-dabbelt/${PN}/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 amd64-linux"
+KEYWORDS="amd64 amd64-linux arm"
 IUSE="scala"
 
 RDEPEND="dev-util/pkgconfig
@@ -20,11 +20,19 @@ RDEPEND="dev-util/pkgconfig
 
 DEPEND="${RDEPEND}"
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-destdir.patch"
+}
+
 src_configure() {
 	echo "LANGUAGES += c" >> Configfile.local
 	for i in $(echo ${CFLAGS}); do
 		echo "COMPILEOPTS += ${i}" >> Configfile.local
 	done
+	echo "LANGUAGES += c++" >> Configfile.local
+	for i in $(echo ${CXXFLAGS}); do
+		echo "COMPILEOPTS += ${i}" >> Configfile.local
+	done
 	echo "COMPILEOPTS += -DPBASHC_SHEBANG=\\\"\#\!${EPREFIX}/bin/bash\\\""\
 	     >> Configfile.local