| 1 |
commit: a320ae500c5ce81b923211e01c72105c068958b0 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Sep 21 19:50:45 2017 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 21 19:51:37 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a320ae50 |
| 7 |
|
| 8 |
net-libs/nfqueue-bindings: fix python_export in src_prepare (bug 606528) |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/606528 |
| 11 |
Package-Manager: Portage-2.3.10, Repoman-2.3.3 |
| 12 |
|
| 13 |
.../nfqueue-bindings/nfqueue-bindings-0.5.ebuild | 20 +++++++++++++------- |
| 14 |
.../nfqueue-bindings/nfqueue-bindings-0.6.ebuild | 20 +++++++++++++------- |
| 15 |
2 files changed, 26 insertions(+), 14 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-libs/nfqueue-bindings/nfqueue-bindings-0.5.ebuild b/net-libs/nfqueue-bindings/nfqueue-bindings-0.5.ebuild |
| 18 |
index 9b53a58b9d8..864546a6d19 100644 |
| 19 |
--- a/net-libs/nfqueue-bindings/nfqueue-bindings-0.5.ebuild |
| 20 |
+++ b/net-libs/nfqueue-bindings/nfqueue-bindings-0.5.ebuild |
| 21 |
@@ -47,13 +47,19 @@ pkg_setup() { |
| 22 |
} |
| 23 |
|
| 24 |
src_prepare() { |
| 25 |
- # Fix Perl destination directory |
| 26 |
- perl_set_version |
| 27 |
- sed -i "s|\${LIB_INSTALL_DIR}/perl\${PERL_VERSION}/|${VENDOR_ARCH}|" perl/CMakeLists.txt || die |
| 28 |
- sed -i "s|\${LIB_INSTALL_DIR}/python\${PYTHON_VERSION}/dist-packages/|$(python_get_sitedir)|" python/CMakeLists.txt || die |
| 29 |
- # Disable Perl/Python from USE flags |
| 30 |
- use perl || sed -i 's|ADD_SUBDIRECTORY(perl)||' CMakeLists.txt || die |
| 31 |
- use python || sed -i 's|ADD_SUBDIRECTORY(python)||' CMakeLists.txt || die |
| 32 |
+ if use perl; then |
| 33 |
+ # Fix Perl destination directory |
| 34 |
+ perl_set_version |
| 35 |
+ sed -i "s|\${LIB_INSTALL_DIR}/perl\${PERL_VERSION}/|${VENDOR_ARCH}|" perl/CMakeLists.txt || die |
| 36 |
+ else |
| 37 |
+ sed -i 's|ADD_SUBDIRECTORY(perl)||' CMakeLists.txt || die |
| 38 |
+ fi |
| 39 |
+ |
| 40 |
+ if use python; then |
| 41 |
+ sed -i "s|\${LIB_INSTALL_DIR}/python\${PYTHON_VERSION}/dist-packages/|$(python_get_sitedir)|" python/CMakeLists.txt || die |
| 42 |
+ else |
| 43 |
+ sed -i 's|ADD_SUBDIRECTORY(python)||' CMakeLists.txt || die |
| 44 |
+ fi |
| 45 |
} |
| 46 |
|
| 47 |
src_install() { |
| 48 |
|
| 49 |
diff --git a/net-libs/nfqueue-bindings/nfqueue-bindings-0.6.ebuild b/net-libs/nfqueue-bindings/nfqueue-bindings-0.6.ebuild |
| 50 |
index 2282bae8496..6c7f4afc4a1 100644 |
| 51 |
--- a/net-libs/nfqueue-bindings/nfqueue-bindings-0.6.ebuild |
| 52 |
+++ b/net-libs/nfqueue-bindings/nfqueue-bindings-0.6.ebuild |
| 53 |
@@ -45,13 +45,19 @@ pkg_setup() { |
| 54 |
} |
| 55 |
|
| 56 |
src_prepare() { |
| 57 |
- # Fix Perl destination directory |
| 58 |
- perl_set_version |
| 59 |
- sed -i "s|\${LIB_INSTALL_DIR}/perl\${PERL_VERSION}/|${VENDOR_ARCH}|" perl/CMakeLists.txt || die |
| 60 |
- sed -i "s|\${LIB_INSTALL_DIR}/python\${PYTHON_VERSION}/dist-packages/|$(python_get_sitedir)|" python/CMakeLists.txt || die |
| 61 |
- # Disable Perl/Python from USE flags |
| 62 |
- use perl || sed -i 's|ADD_SUBDIRECTORY(perl)||' CMakeLists.txt || die |
| 63 |
- use python || sed -i 's|ADD_SUBDIRECTORY(python)||' CMakeLists.txt || die |
| 64 |
+ if use perl; then |
| 65 |
+ # Fix Perl destination directory |
| 66 |
+ perl_set_version |
| 67 |
+ sed -i "s|\${LIB_INSTALL_DIR}/perl\${PERL_VERSION}/|${VENDOR_ARCH}|" perl/CMakeLists.txt || die |
| 68 |
+ else |
| 69 |
+ sed -i 's|ADD_SUBDIRECTORY(perl)||' CMakeLists.txt || die |
| 70 |
+ fi |
| 71 |
+ |
| 72 |
+ if use python; then |
| 73 |
+ sed -i "s|\${LIB_INSTALL_DIR}/python\${PYTHON_VERSION}/dist-packages/|$(python_get_sitedir)|" python/CMakeLists.txt || die |
| 74 |
+ else |
| 75 |
+ sed -i 's|ADD_SUBDIRECTORY(python)||' CMakeLists.txt || die |
| 76 |
+ fi |
| 77 |
} |
| 78 |
|
| 79 |
src_install() { |
Archives