diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-02-15 16:58:00 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-02-15 16:58:00 +0000 |
| commit | 434d713861b70f6c6563d6ee50a8e64f14c970d9 (patch) | |
| tree | b72c523c72e764420f835ba9d63d43ffef687dcf /app-laptop | |
| parent | f78108598211053d41752a83e0345441bb9014ae (diff) | |
gentoo resync : 15.02.2018
Diffstat (limited to 'app-laptop')
| -rw-r--r-- | app-laptop/Manifest.gz | bin | 3397 -> 3400 bytes | |||
| -rw-r--r-- | app-laptop/ibam/Manifest | 6 | ||||
| -rw-r--r-- | app-laptop/ibam/files/ibam-0.5.2-build.patch | 8 | ||||
| -rw-r--r-- | app-laptop/ibam/ibam-0.5.2-r4.ebuild (renamed from app-laptop/ibam/ibam-0.5.2-r3.ebuild) | 19 |
4 files changed, 17 insertions, 16 deletions
diff --git a/app-laptop/Manifest.gz b/app-laptop/Manifest.gz Binary files differindex d9ed60be8d75..b78a57a84427 100644 --- a/app-laptop/Manifest.gz +++ b/app-laptop/Manifest.gz diff --git a/app-laptop/ibam/Manifest b/app-laptop/ibam/Manifest index e4c776177a9d..aa4d3c425687 100644 --- a/app-laptop/ibam/Manifest +++ b/app-laptop/ibam/Manifest @@ -1,5 +1,5 @@ -AUX ibam-0.5.2-build.patch 1317 BLAKE2B be4dfa7a24266fe68a67f5cdb0a2294f545fdae3a3e9d171f56e6e601928c2f521d16ec8ac2641c872f044e456ebbd2f86b36abfdf40cdd5a0a3fa27cffcecb9 SHA512 7675b497b516f750d74604072d138876ee84684d8f12f1d8be3bcf0173f321a63fc0f3def0c519091506275e55027bf13fedb1c328983ac8016f6c78210b95f4 +AUX ibam-0.5.2-build.patch 1311 BLAKE2B 3e58e55331cf21e1f9bf7825d89c7c72a7fdb83decc1ba4942019de347facab1ef19534dadb079c13b7c9761ef864b7e3611e5f17d5e1c3411eda23ff1a8d3be SHA512 415d36b8d9b212ccc84728e83ce11ffea439542766d9ad6f53659618194a144dff491589a4ed49c0f3707ac37199773925eb357166915193c55e77e246e2d00e DIST ibam-0.5.2.tar.gz 22149 BLAKE2B a3d9398dc34004203643d3198a3994ef3b432b909bdf9713a91a1d938a19ab9d0345105a60f3357288c2f3d2a325498a0787138e50fb445f1ea11851f1d7de1c SHA512 c70d728a2f1250ed291e663bd9f4e9ba01308fce14edf1ffd1902057de7e5527548bd06e2e3caaaeabc064d0ee123f536a626fd50b84092f6fc9201fc6bdba58 -DIST ibam_0.5.2-2.diff.gz 5914 BLAKE2B 791062b242e21d6e9624309a2bed82745fd266c935e2b73dc0104a4aa7433080dbc775edd92bdde7fb1b52383a7ab96b21b3b4f843a9c5a9671c514cf3d472da SHA512 baad1e6bdc416de6d82181e55ba5a8c9871dcdaf756172558d093384cd2f4d0fe89d37f1266407e2bea784d18e429eeab5fde0a304b63bce97c73ba9391e7556 -EBUILD ibam-0.5.2-r3.ebuild 1141 BLAKE2B 25e0c16a01be870fb20a611b8d91ddbc98236b815385d0fca31da33c09bc88029a82ccf441482068853cc209ce8d8d54eb1642dce328fee855cf9396ec0df828 SHA512 d77950a8d21151dc20a81168516b2f3b58d21dc96ea97563f3f413969c80d5d8f3bd27c3e6e93f4d1f091ec54d9668ce4081f8958bc340d5aafb05cd7939aeb8 +DIST ibam_0.5.2-2.1.diff.gz 6115 BLAKE2B 8a1ada53ed39a379f11158583b337166d74d17de808a44e3d3fb225eecef5e3f3b782088072f94dbad387b258254ccbe3fdce7d5655ff201c41d66dbeb7c6d61 SHA512 f6707e42626891aa87697bc28f124345f9f1d0dfb35620f6386dc1dca6b9c5e3a73571bf04e933091c1995d1156925029c0199c5caace497ff891c93f9011ac3 +EBUILD ibam-0.5.2-r4.ebuild 1175 BLAKE2B 4d2e45f591d7b7e713e4e8999fc28f4772d7cd9baa60b014d6630b70964c9f723c1bdd937aa54583a35679d929f08b4858912e95fe56e50ca025890381fdeebc SHA512 6056a58fdaa44212b2dac5e93281a2864d5586ddee4c970715281a69135364e33dae65c68bcc90c693cfc0d19bf632cf91bfa65f164fdb3b7aa149d50087128c MISC metadata.xml 330 BLAKE2B 23b7606f4008dab2d8de06938cd2c36bda69bbc025bca0d2234224d37242359299a65b17b5c55b3080d7fcea4ac7a9e4c2359437e355f960b6c217b0931bccd6 SHA512 bc1e4eee7bc08f8e90b37ca0401fd7ad68645a6c50d22d22816ea944c50e47b1b00bc7da95eea38bd0e77f7c1c8baaea0a63c26cfbc9b6941a96612f145a9059 diff --git a/app-laptop/ibam/files/ibam-0.5.2-build.patch b/app-laptop/ibam/files/ibam-0.5.2-build.patch index 77854b5f3d5a..665e50798b18 100644 --- a/app-laptop/ibam/files/ibam-0.5.2-build.patch +++ b/app-laptop/ibam/files/ibam-0.5.2-build.patch @@ -1,5 +1,5 @@ ---- Makefile -+++ Makefile +--- /Makefile ++++ /Makefile @@ -17,8 +17,8 @@ # IBAM_VERSION=0.5.2 @@ -22,7 +22,7 @@ ibam-krell.so: ibam-krell.o - $(CC) $(CFLAGS) -fPIC -shared -Wl -o ibam-krell.so ibam-krell.o -+ $(CXX) $(LDFLAGS) $(CXXFLAGS) -fPIC -shared -Wl -o ibam-krell.so ibam-krell.o ++ $(CXX) $(LDFLAGS) $(CXXFLAGS) -fPIC -shared -o ibam-krell.so ibam-krell.o ibam-krell.o: ibam-krell.cpp ibam.hpp ibam.inl - $(CC) $(CFLAGS) -fPIC `pkg-config gtk+-2.0 --cflags` `gdk-pixbuf-config --cflags` -c ibam-krell.cpp @@ -32,7 +32,7 @@ ibam-krell1.so: ibam-krell1.o - $(CC) $(CFLAGS) -shared -Wl -o ibam-krell1.so ibam-krell1.o -+ $(CXX) $(LDFLAGS) $(CXXFLAGS) -shared -Wl -o ibam-krell1.so ibam-krell1.o ++ $(CXX) $(LDFLAGS) $(CXXFLAGS) -shared -o ibam-krell1.so ibam-krell1.o ibam-krell1.o: ibam-krell1.cpp ibam.hpp ibam.inl - $(CC) $(CFLAGS) -fPIC `gtk-config --cflags` `imlib-config --cflags-gdk` -c ibam-krell1.cpp diff --git a/app-laptop/ibam/ibam-0.5.2-r3.ebuild b/app-laptop/ibam/ibam-0.5.2-r4.ebuild index 2cd5cf10f92e..2076603b9f60 100644 --- a/app-laptop/ibam/ibam-0.5.2-r3.ebuild +++ b/app-laptop/ibam/ibam-0.5.2-r4.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI="6" -PATCH_LEVEL=2 +PATCH_LEVEL="2.1" -inherit eutils multilib toolchain-funcs +inherit toolchain-funcs DESCRIPTION="Intelligent Battery Monitor" HOMEPAGE="http://ibam.sourceforge.net/" @@ -28,14 +28,15 @@ DEPEND=" gkrellm? ( virtual/pkgconfig )" src_prepare() { - epatch \ + eapply \ "${FILESDIR}"/${P}-build.patch \ "${WORKDIR}"/${PN}_${PV}-${PATCH_LEVEL}.diff - local f - for f in $(find . -name '*.dpatch'); do - epatch "${f}" - done + eapply debian/patches/02*.dpatch + eapply debian/patches/03*.dpatch + eapply debian/patches/05*.dpatch + + eapply_user } src_compile() { |