summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Ospald <hasufell@gentoo.org>2012-05-27 13:33:11 +0000
committerJulian Ospald <hasufell@gentoo.org>2012-05-27 13:33:11 +0000
commit7084ea5c90208b88de937be3cd3b5712ad3cbdbb (patch)
tree98e6adf528ff31d286063f7d05f92e008348ae9a /app-admin
parentarm stable, bug #416333 (diff)
downloadhistorical-7084ea5c90208b88de937be3cd3b5712ad3cbdbb.tar.gz
historical-7084ea5c90208b88de937be3cd3b5712ad3cbdbb.tar.bz2
historical-7084ea5c90208b88de937be3cd3b5712ad3cbdbb.zip
version bump
Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/hardinfo/ChangeLog9
-rw-r--r--app-admin/hardinfo/Manifest19
-rw-r--r--app-admin/hardinfo/files/hardinfo-0.5.2_pre20120527-build.patch53
-rw-r--r--app-admin/hardinfo/hardinfo-0.5.2_pre20120527.ebuild34
4 files changed, 106 insertions, 9 deletions
diff --git a/app-admin/hardinfo/ChangeLog b/app-admin/hardinfo/ChangeLog
index cecef5b3ade1..88467183bafc 100644
--- a/app-admin/hardinfo/ChangeLog
+++ b/app-admin/hardinfo/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for app-admin/hardinfo
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/hardinfo/ChangeLog,v 1.1 2012/05/26 21:46:09 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hardinfo/ChangeLog,v 1.2 2012/05/27 13:33:10 hasufell Exp $
+
+*hardinfo-0.5.2_pre20120527 (27 May 2012)
+
+ 27 May 2012; Julian Ospald <hasufell@gentoo.org>
+ +hardinfo-0.5.2_pre20120527.ebuild,
+ +files/hardinfo-0.5.2_pre20120527-build.patch:
+ version bump
*hardinfo-0.5.1 (26 May 2012)
diff --git a/app-admin/hardinfo/Manifest b/app-admin/hardinfo/Manifest
index 96d62ea14666..b63e7eece5b9 100644
--- a/app-admin/hardinfo/Manifest
+++ b/app-admin/hardinfo/Manifest
@@ -2,18 +2,21 @@
Hash: SHA1
AUX hardinfo-0.5.1-makefile.patch 1762 RMD160 a3d64ebe32baa631f548054c5690d78b3269fd0b SHA1 90e15e911da84aacc1a514f62dd57560d3327df3 SHA256 eae4c51a3bb110dc8824d30ee01fd56a2e4acaff715b16b5ad77e6f607918ed3
+AUX hardinfo-0.5.2_pre20120527-build.patch 1447 RMD160 cbcb521cfbc60adc537b54fa38e266f7d2946c5f SHA1 1eb92fd6a04e93a16e6cdf4d29765501aa1c0514 SHA256 d2d113092c10b50002a86dbc9587a003e0e8aebce0da32b1ec7074dbc3c15dda
DIST hardinfo-0.5.1.tar.bz2 246924 RMD160 ef0c91fa8c0c032cf74a96e045e4823f7fe3b81e SHA1 983f0445aa60e02156bc5a5eaedeffb30b8e4d64 SHA256 a0df6c0d7c92a7d20710b8eb551197398a965aaae053782b89a32a160b731b7a
+DIST hardinfo-0.5.2_pre20120527.tar.xz 278524 RMD160 616cc14b45811b3fd6bcadddeaab36747f480f27 SHA1 af18c1acd4e7f6d93f37caf978d1f30acc19e842 SHA256 d01f1a59b2911f54e0aaea178c0c600f2505abafd0a46c54e80e9aa0fec2db56
EBUILD hardinfo-0.5.1.ebuild 800 RMD160 1c81e0476d12ac0ef72793f3eea20b0d8eae961e SHA1 461d469be7d1027a0caa0968353da44ed98c998c SHA256 632588f768c97bc5beb86b7c3a7ca0d1737fd07381f992164d6d364356da671d
-MISC ChangeLog 402 RMD160 36c1c66181fe12891d37e5420d1884c642fa138e SHA1 02dd82a564c3ba9b971894c972284a68adf28548 SHA256 11a39cb514bcd6dba6d2166276c41878880adeae508c0fbfba0c4ce0aefee921
+EBUILD hardinfo-0.5.2_pre20120527.ebuild 863 RMD160 4178179771c203b8ba9a8c7e019ffc708a16c3ce SHA1 c3a6ba73cc3136dd120f5de105f8fc5384fe219f SHA256 718384699c74ab959b07c83d9ac0e45d0f1331ec20422f490e92eca7633ff8eb
+MISC ChangeLog 599 RMD160 16866b12aaa23d1f12aefe52ced6efcb82957a62 SHA1 ab6b3c45e0af4dfb89a778d2dbf494cbb419301e SHA256 1289f5bd8c83bf4f715d7396475a346d02fa8eb6a6608c64052020f40cca85f6
MISC metadata.xml 234 RMD160 0be4d01dab7074a6ea9399163d385b7d916e9c8b SHA1 5a7cc936b96f31b2749fd10466491db01527fe3c SHA256 c4cff9874b0aee51bf55a8619e709beb39e4e479e0dfe494e5733fe3fccb644e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQEcBAEBAgAGBQJPwU6RAAoJEFpvPKfnPDWz97kIAKkFGQ7x2E1KKHE369L4xd2c
-bP9wkGyGQt2PxqU9RRoOlgpKZnn64RMP6R2l9Gg3kt57Yg6FKm0nBweyAM/BEFkb
-QRVwIUgOm+4iQnIw26FykUSvEk5lwLtCtzIGk2LAdSuXj3fvxNhPFITtowgNB6J9
-i0vS4VNdVpp9oh8anrerVGTLtBPG5g+L0vXJSay3jdyB5cP9AI8m0MRZ5lmzlE0F
-KSFRVsAZb17/CscjAlztRAHQ3s957AKF6qHI/KZbOgDFpLqe2Q0WoJR6riRT6EN9
-DDAlSDcgRDZ/cD9GLXKY553EnkrM3QgyMWF0qbQhdDUauTDYqy8kb2UNRy43TbY=
-=0V2P
+iQEcBAEBAgAGBQJPwiyGAAoJEFpvPKfnPDWzJoMH/jL4jB6BJLaxMGRYGByH7sO1
+YuVdzi8KYOPmbQ55WK6AiZMD5uQ9YegrcPnWEEjcIg3MAlHKNbzOY7M23dpG7O48
+MgxLplkDWvRbVt3C6ido+Qw/Ha+d6V/WDPO+OCSuKbN0igQAAJPFzPKVEHEPiWSE
+qxWCI5kN2YhZoFNw+uPB6Ssdt+GMF/bwQrqoSaRNCO92IikDFcmmmBryI8iVB267
+hPsz+Sq7RpNE4ZSizIG3sKNULrZcXaa3faNkjlTmDyUILFClZFqzLqX8rl2kjjqh
+FPLRXTJ3w6FedaMbeDbRK+Prdy2RdKzhsQB5Jge4gjgXrG0OWwhfVtHOVwueQ1g=
+=YyEs
-----END PGP SIGNATURE-----
diff --git a/app-admin/hardinfo/files/hardinfo-0.5.2_pre20120527-build.patch b/app-admin/hardinfo/files/hardinfo-0.5.2_pre20120527-build.patch
new file mode 100644
index 000000000000..76718a38ebd8
--- /dev/null
+++ b/app-admin/hardinfo/files/hardinfo-0.5.2_pre20120527-build.patch
@@ -0,0 +1,53 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sat May 26 01:30:39 UTC 2012
+Subject: build system
+
+use GNUInstallDirs and respect lib suffix
+
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -3,6 +3,8 @@
+
+ set(HARDINFO_VERSION "0.5.2pre")
+
++include(GNUInstallDirs)
++
+ if(${CMAKE_BUILD_TYPE} MATCHES "Debug")
+ set(HARDINFO_DEBUG 1)
+ endif()
+@@ -179,8 +181,8 @@
+ configure_file(hardinfo.desktop.cmake ${CMAKE_BINARY_DIR}/hardinfo.desktop @ONLY)
+
+ install(TARGETS hardinfo ${HARDINFO_MODULES}
+- RUNTIME DESTINATION bin
+- LIBRARY DESTINATION lib/hardinfo/modules
++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/hardinfo/modules
+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+ )
+ install(FILES ${CMAKE_BINARY_DIR}/hardinfo.desktop
+@@ -201,4 +203,4 @@
+ PATTERN "*.{hlp,png}"
+ PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+ )
+-
+\ No newline at end of file
++
+--- config.h.cmake
++++ config.h.cmake
+@@ -10,7 +10,7 @@
+ #define HOSTNAME ""
+ #define ARCH_@HARDINFO_ARCH@
+
+-#define LIBPREFIX "@CMAKE_INSTALL_PREFIX@/lib/hardinfo"
++#define LIBPREFIX "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/hardinfo"
+ #define PREFIX "@CMAKE_INSTALL_PREFIX@/share/hardinfo"
+
+ #cmakedefine LIBSOUP_FOUND
+@@ -32,4 +32,4 @@
+ #define ENABLE_BINRELOC 1
+ #define HAS_LINUX_WE 1
+
+-#endif /* __CONFIG_H__ */
+\ No newline at end of file
++#endif /* __CONFIG_H__ */
diff --git a/app-admin/hardinfo/hardinfo-0.5.2_pre20120527.ebuild b/app-admin/hardinfo/hardinfo-0.5.2_pre20120527.ebuild
new file mode 100644
index 000000000000..4610ac60c61c
--- /dev/null
+++ b/app-admin/hardinfo/hardinfo-0.5.2_pre20120527.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hardinfo/hardinfo-0.5.2_pre20120527.ebuild,v 1.1 2012/05/27 13:33:10 hasufell Exp $
+
+EAPI=4
+
+inherit cmake-utils eutils multilib
+
+DESCRIPTION="A system information and benchmark tool for Linux systems"
+HOMEPAGE="http://hardinfo.berlios.de/"
+SRC_URI="http://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2
+ net-libs/libsoup
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:2
+ x11-libs/pango"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-build.patch
+
+ if use amd64; then
+ sed \
+ -e 's/g_build_filename(prefix, "lib"/g_build_filename(prefix, "'$(get_libdir)'"/' \
+ -i hardinfo/binreloc.c || die
+ fi
+}