sci-libs/avogadrolibs: Fix double suffix

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 42 insertions, 17 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/Manifest b/sci-libs/avogadrolibs/Manifest
index bc81694655a8..e7c6cf85d1b5 100644
--- a/sci-libs/avogadrolibs/Manifest
+++ b/sci-libs/avogadrolibs/Manifest
@@ -1,24 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX avogadrolibs-0.7.2-6464.patch 902 SHA256 e4d0e73683ffd6da1a039bf6ea6544065c1d45533633c7793fb2329c924625d7 SHA512 3851a3c5f7c599e439b4faa491ea080264e60bf2a7c4d35e01a10726f901a5797026bf32535107b46ca44335c5723d9ec7f0b6a46e9eebf7ffd9f90c7f2103d3 WHIRLPOOL 2622bc8408f69f4deb0084d78265fe5c70f05f6095f94b1cb0a4b25793ec1d1c4e9f7ef8a13043ea1b6f185d1a7ea11579675ae8a5360e2582fd2e87dcd91074
 DIST avogadrolibs-0.7.2.tar.gz 637001 SHA256 217eb5d62082bbaacefe8ad3c8c8ddbbd41931d306038774f761c0155aeccc76 SHA512 a796af1ab3eb77eb2e5484e9e9cb9d7cf68759c9afbd48ddeb237513583e2c207c7c70b2e87b37843886fc737410456ee451e8fe5a21707bdc01fdf600d4cbb8 WHIRLPOOL 81f0d1949c0a93b9efd1f47f276929b01ca761a5875015be3feafb493be3629b0b8e00c0ba930e1ca73b79fc621a67f7e2ab41ae5e4fc10dddd18449238d933f
-EBUILD avogadrolibs-0.7.2.ebuild 1203 SHA256 5597b929e12b86c6a821782c42b47fa6ee1c15afbcc788933604d49517bcd07c SHA512 7b4d44d01cb9ed7e0d9037b5d7148f5b4c998dc5d479e85b93d37c38a097f2010b1d48d5c8f4af03775aa30fd7bcbf158e90ca79681fc42d66132903118f44a5 WHIRLPOOL 6b926b5ea46729beaadc7c041ef6ee7ab60b595f5caba52036947ee2f8adf2c01e62eb4af948a9cbdb5e1ea8e04a5161c0d41cbdf29dec5e0a5874ef032a76f0
-MISC ChangeLog 1300 SHA256 4d5a4c4ee2e5ef44e5224f1da4bcba3fa9335d7cd378657b984bb708edd8c286 SHA512 2b92d66754047562f07463addb076442bcb748fa2c25ce9c784a882e6d253f922e6204f8563198d13db57ec31a99d92ff81a40d7bd951d0a5ab89cf5955ade7a WHIRLPOOL 0f0498c74f352b55fa35231ee936c4b50ff779aa75cc1580a0e990ae30ca4065a6dca0410b10615b04e8f96f0902f57b25075e30f9808570508f7750675d28cd
+EBUILD avogadrolibs-0.7.2-r1.ebuild 1249 SHA256 18494ca76484447b5983113b691bd142e0f57ede4520752960b44a3601bc6b8e SHA512 22cdeadce4d1c9843b4841038c2e211309ad2b3feb9984dd5326e0275b32407a346c84dede6fdd4d2172394f9f8af1150949c8373619f76ae072288ca671df30 WHIRLPOOL f8ae76cc5747ee437ef847d1b936d1e94b10ab56bc95533c202fa92154034c8f0a459c0ff8aa3913a0acc3efa23b60833cf0f752af86472b6c334de04124fccc
+MISC ChangeLog 1505 SHA256 4e922105085ad8b3973f73e15a2249bc8b2f5b794c79d9c6d29fb85d8a5cb7f3 SHA512 63090c4ecc6a9e1d2a3c8a771d620b777627356a0f9b2c517b19ace590c399e76f1e59df10e870fd5d01492ae9f0df0a20ce61cf2a2efe92c50de1e03334edc1 WHIRLPOOL 5b323632adf6fb3b903df317f31066f99806f9a9940087610cd2b9a433874b9da5aa416acf469a06a31935e7c5fabef655cae93f6ad2a8fd6f6b52faa97c831b
 MISC metadata.xml 397 SHA256 0ebbec4474d6d325aecba6341acd93a7e81a0322151dafbf374c2c342bc502aa SHA512 f7ef079598ab6c4797a1a53a89ffa637700527324b70671ff0f2b8aff04f7d2108d190a728718f20b3fd3ad684b984cd19bc7c3063c5d8f0ac3d09afed376a4f WHIRLPOOL 20a40a96d0754c737b576c355c4c770235e8f355cddd041b7ca56f8a5b780ba04e63df9582cd1da60804e44859718c3bcd4e3dd77bb31e2352acdad17c26c099
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJS2CtrAAoJELnU8jG9FVirfzIP/1mTDJ2Y/Vosoy7iF75zeyL0
-BSRjBP8+x0yp/D7FY7fA8J4sot1+d9sTQIQnIfn/TOTfz6/4+VpFFtCW7VVZQDey
-7Rl/fgSGWDoUdDpSxEbPHqqXpVK6s39XrG2o1LRiUiczr0d6/IWg0A4Ds21lx3b6
-8uV9N15xu+x9YAxU5Y23zzjR88X3gTA8pSJTOmaugUdvOo3zwtiASqNHGSr83Voe
-1ZcEsLRaejkIWvUNj2aw9mx+HaZvdt0pDqfxFC9YMeJKuc0PIPffjet5hdVTkfA9
-4jBEThTeQjs21MeR4vVIyta81lWdzi/NsXQqhRuotc3/6FiM4KUM5XCzotV6QJIH
-yPAAY+qvpv1wKLOrI6bo1pBiQWp0155w1IorwbyxzknqeaCYFqDQdMczCBetK6VZ
-gcmLxz+DRBY/NG+WcnJgJBDyhbDL2sD1n6PfwtBtJdG3XHxWP4sWa3ZUNpyYtG0i
-m73UuibJxhTkLIpQVSQeMcRda6o4Ax64ldAeeQBSXiLreS+oL5hodbiFpKUCXuBl
-a+bq7QHkwZ25uKXfPmdo7rkvndi/CRCUpsyY55/tIe7FY+vJdy0mBQkepfUeQ5lS
-wKL5e9pfSJKHOQSTJNZ7ZeOPlAQdNiuolc0PHsl+qpUCiob9U6LG3faEmAtKh4kw
-84SCbnVeFHX4eKem7qAX
-=eVkt
+iQIcBAEBCgAGBQJS2DJyAAoJELnU8jG9FVir+VcP/RajtcqbXhVLxi/7s3pYwOWE
+jrQfqoy2oboq7y4jsRYG7scK+d24k/4Z+usL4PWUFNDsABbwg3u1vz+XVuTj+lVR
+laHhCPB0h6ZhXKI611mU+BtHB2/xrrK1Zzt+NGb5e/uSfrWvGliE4F1j7lF2Y8uf
+pxAG7OdrNmar92Ikva8RZdjTHL0KYnE7VH0ue/n5HnnAzDrIScgXF8VI/1rql04t
+y3eHTlnqGOaHpP892dcpDPNl1jcy3k8JP0bksw0DTX/wkBUesqDhbo7UPosVg9h6
+RWF8qfavFeXOF3r373/ZUc4Bi4BOy7U8cGE8gmi6dcELzqUIdoZqLpQzgO92e3ks
+waf9o2ZUc+ZIhRwkUr3QYmdvXR3Dlnb4EjDBGvuylsHuQY+SDivUPOtHvT2BxbUu
+UI+QhEs/OFbB0Kxus0s8QUy7eTQMFYrBEukenbcHeXJaRRbdwGLa7AUEdvOegoVW
+snZAfpRxTr9Vhqre9Tj2xPvvHHx9vUqj4jppeaxvOn00qgYe9KrtytBf5A12YgwI
+Cv57tB1Chwa7R0RgIu17NdzwcFkySoEKNGiKCv3gqZ8+14zsPDVjVC9VS07JkdNv
+K1b7nxfsCqOUuO9+Jn9GFSbutbyquvfJzoMM4W92DHTOJbtdWAM7F9CZfUJEzQRe
+wti6lRMI/b+QR0oZ9KoT
+=HA32
 -----END PGP SIGNATURE-----
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")
+