summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2014-01-16 19:26:41 +0000
committerJustin Lecher <jlec@gentoo.org>2014-01-16 19:26:41 +0000
commit7022e5efc489b8fa92ff92f236c728add28f0beb (patch)
tree0c90b1878949bf42005ad8c24c6dcb2cb317a30d
parentsci-libs/avogadrolibs: Drop versionator.eclass (diff)
downloadgentoo-2-7022e5efc489b8fa92ff92f236c728add28f0beb.tar.gz
gentoo-2-7022e5efc489b8fa92ff92f236c728add28f0beb.tar.bz2
gentoo-2-7022e5efc489b8fa92ff92f236c728add28f0beb.zip
sci-libs/avogadrolibs: Fix double suffix
(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
-rw-r--r--sci-libs/avogadrolibs/ChangeLog8
-rw-r--r--sci-libs/avogadrolibs/avogadrolibs-0.7.2-r1.ebuild (renamed from sci-libs/avogadrolibs/avogadrolibs-0.7.2.ebuild)4
-rw-r--r--sci-libs/avogadrolibs/files/avogadrolibs-0.7.2-6464.patch16
3 files changed, 26 insertions, 2 deletions
diff --git a/sci-libs/avogadrolibs/ChangeLog b/sci-libs/avogadrolibs/ChangeLog
index b33948307244..4c330b92ce70 100644
--- a/sci-libs/avogadrolibs/ChangeLog
+++ b/sci-libs/avogadrolibs/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sci-libs/avogadrolibs
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/avogadrolibs/ChangeLog,v 1.3 2014/01/16 18:56:42 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/avogadrolibs/ChangeLog,v 1.4 2014/01/16 19:26:41 jlec Exp $
+
+*avogadrolibs-0.7.2-r1 (16 Jan 2014)
+
+ 16 Jan 2014; Justin Lecher <jlec@gentoo.org> -avogadrolibs-0.7.2.ebuild,
+ +avogadrolibs-0.7.2-r1.ebuild, +files/avogadrolibs-0.7.2-6464.patch:
+ Fix double suffix
16 Jan 2014; Justin Lecher <jlec@gentoo.org> avogadrolibs-0.7.2.ebuild:
Drop versionator.eclass
diff --git a/sci-libs/avogadrolibs/avogadrolibs-0.7.2.ebuild b/sci-libs/avogadrolibs/avogadrolibs-0.7.2-r1.ebuild
index 585c034b8cbc..2ec306a36cd1 100644
--- a/sci-libs/avogadrolibs/avogadrolibs-0.7.2.ebuild
+++ b/sci-libs/avogadrolibs/avogadrolibs-0.7.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/avogadrolibs/avogadrolibs-0.7.2.ebuild,v 1.3 2014/01/16 18:56:42 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/avogadrolibs/avogadrolibs-0.7.2-r1.ebuild,v 1.1 2014/01/16 19:26:41 jlec Exp $
EAPI=5
@@ -34,6 +34,8 @@ RDEPEND="
DEPEND="${DEPEND}
test? ( dev-cpp/gtest )"
+PATCHES=( "${FILESDIR}"/${P}-6464.patch )
+
src_configure() {
local mycmakeargs=(
-DUSE_PROTOCALL=OFF
diff --git a/sci-libs/avogadrolibs/files/avogadrolibs-0.7.2-6464.patch b/sci-libs/avogadrolibs/files/avogadrolibs-0.7.2-6464.patch
new file mode 100644
index 000000000000..f763c242cc48
--- /dev/null
+++ b/sci-libs/avogadrolibs/files/avogadrolibs-0.7.2-6464.patch
@@ -0,0 +1,16 @@
+ cmake/AvogadroLibsConfig.cmake.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/AvogadroLibsConfig.cmake.in b/cmake/AvogadroLibsConfig.cmake.in
+index ad57195..8a63400 100644
+--- a/cmake/AvogadroLibsConfig.cmake.in
++++ b/cmake/AvogadroLibsConfig.cmake.in
+@@ -10,7 +10,7 @@ set(AvogadroLibs_VERSION "${AvogadroLibs_VERSION_MAJOR}.${AvogadroLibs_V
+
+ set(AvogadroLibs_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@")
+ set(AvogadroLibs_INCLUDE_DIRS "${AvogadroLibs_INSTALL_PREFIX}/@INSTALL_INCLUDE_DIR@")
+-set(AvogadroLibs_LIBRARY_DIR "${AvogadroLibs_INSTALL_PREFIX}/@INSTALL_LIBRARY_DIR@@LIB_SUFFIX@")
++set(AvogadroLibs_LIBRARY_DIR "${AvogadroLibs_INSTALL_PREFIX}/@INSTALL_LIBRARY_DIR@")
+ set(AvogadroLibs_RUNTIME_DIR "${AvogadroLibs_INSTALL_PREFIX}/@INSTALL_RUNTIME_DIR@")
+ set(AvogadroLibs_CMAKE_DIR "${AvogadroLibs_LIBRARY_DIR}/cmake/avogadrolibs")
+